Skip to content

Stop using git.sr.ht/~spc/go-log and use copy on github.com #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamruzicka merged 6 commits into from
Apr 30, 2025
Merged

Stop using git.sr.ht/~spc/go-log and use copy on github.com #24

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf959e5
Stop using git.sr.ht/~spc/go-log and use copy on github.com
adamruzicka Apr 29, 2025
9e5bf9c
Build against yggdrasil-0.2.7 and srht patch
adamruzicka Apr 29, 2025
5313b27
Build against latest yggdrasil
adamruzicka Apr 29, 2025
5b09852
Update golang version to 1.23
Odilhao Apr 28, 2025
a2c61e0
Drop go <1.23
adamruzicka Apr 29, 2025
ff00e4a
Drop EL7 packit
adamruzicka Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ module github.com/theforeman/ygg_worker
go 1.19

require (
git.sr.ht/~spc/go-log v0.1.1
github.com/google/uuid v1.6.0
github.com/redhatinsights/yggdrasil v0.4.2
github.com/redhatinsights/yggdrasil_v0 v0.0.0-20210811162724-41397343c25b
github.com/subpop/go-log v0.1.2
google.golang.org/grpc v1.58.3
)

require (
git.sr.ht/~spc/go-log v0.1.1 // indirect
Copy link
Copy Markdown

@jirihnidek jirihnidek Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not seems as correct change. This "old" go module should not be required indirectly. If it was required indirectly, then it would cause problems anyway. I guess that you also have to update version of yggdrasil, where git.sr.ht/~spc/go-log v0.1.1 is not required.

github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
golang.org/x/net v0.23.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/redhatinsights/yggdrasil v0.4.2 h1:onXUovgkFn0bJr5aVPVcP7Xv6NcCLO7EbmvWxya5+yQ=
github.com/redhatinsights/yggdrasil v0.4.2/go.mod h1:zQKq1GVJq0Kn05pKN7CQmYbhUtqGe4WSduBUdTKlXqs=
github.com/subpop/go-log v0.1.2 h1:NgbZR6frmeDtC+96d+UxOkt4X/JxO626fokwL56Dff0=
github.com/subpop/go-log v0.1.2/go.mod h1:uAEovif98swmWm/8qYGrzGFahUIRQ/KwlBUpJuoOdds=
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
Expand Down
2 changes: 1 addition & 1 deletion src/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"syscall"
"time"

"git.sr.ht/~spc/go-log"
"github.com/subpop/go-log"

"github.com/redhatinsights/yggdrasil/worker"
pb "github.com/redhatinsights/yggdrasil_v0/protocol"
Expand Down
2 changes: 1 addition & 1 deletion src/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"sync"
"syscall"

"git.sr.ht/~spc/go-log"
"github.com/google/uuid"
"github.com/subpop/go-log"
)

const preStartErrorExitCode = 254
Expand Down
2 changes: 1 addition & 1 deletion src/runner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"syscall"
"testing"

"git.sr.ht/~spc/go-log"
"github.com/subpop/go-log"
)

func TestDispatch(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion src/update_aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"time"

"git.sr.ht/~spc/go-log"
"github.com/google/uuid"
"github.com/subpop/go-log"
)

const CountThreshold = 32
Expand Down
2 changes: 1 addition & 1 deletion yggdrasil
Open in desktop
Submodule yggdrasil updated 29 files
+0 −50 .copr/Makefile
+19 −0 .github/workflows/go.yml
+22 −19 .github/workflows/lint.yml
+73 −0 .packit.yaml
+10 −6 HACKING.md
+25 −8 Makefile
+32 −12 README.md
+3 −4 canonical_facts.go
+3 −1 canonical_facts_test.go
+64 −0 cmd/ygg/activate.go
+18 −0 cmd/ygg/facts.go
+367 −0 cmd/ygg/main.go
+222 −0 cmd/ygg/register.go
+44 −143 cmd/yggd/exec.go
+126 −0 cmd/yggd/exec_test.go
+10 −5 cmd/yggd/grpc.go
+14 −8 cmd/yggd/http.go
+132 −45 cmd/yggd/main.go
+38 −21 cmd/yggd/mqtt.go
+17 −2 cmd/yggd/tags.go
+5 −1 cmd/yggd/tls.go
+8 −8 cmd/yggd/util.go
+365 −0 cmd/yggd/worker.go
+90 −0 cmd/yggd/worker_test.go
+27 −9 go.mod
+41 −90 go.sum
+16 −2 worker/echo/main.go
+6 −2 worker/echo/server.go
+3 −6 yggdrasil.spec.in
Loading