From e9f2fde1146711e749ddfca8a1435a940e856a9a Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Sun, 13 Apr 2025 15:06:48 +0200 Subject: [PATCH 1/3] add toolchain --- tools/zos-update-worker/go.mod | 8 +++++--- tools/zos-update-worker/go.sum | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/zos-update-worker/go.mod b/tools/zos-update-worker/go.mod index ef062286..efa8c853 100644 --- a/tools/zos-update-worker/go.mod +++ b/tools/zos-update-worker/go.mod @@ -1,6 +1,8 @@ module github.com/threefoldtech/zos4/tools/zos-update-version -go 1.24 +go 1.23 + +toolchain go1.23.0 require ( github.com/pkg/errors v0.9.1 @@ -18,7 +20,7 @@ require ( github.com/gtank/ristretto255 v0.1.2 // indirect github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect - golang.org/x/crypto v0.35.0 // indirect + golang.org/x/crypto v0.33.0 // indirect ) require ( @@ -27,7 +29,7 @@ require ( github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/spf13/pflag v1.0.6 // indirect - golang.org/x/sys v0.31.0 // indirect + golang.org/x/sys v0.30.0 // indirect ) replace github.com/centrifuge/go-substrate-rpc-client/v4 v4.0.5 => github.com/threefoldtech/go-substrate-rpc-client/v4 v4.0.6-0.20220927094755-0f0d22c73cc7 diff --git a/tools/zos-update-worker/go.sum b/tools/zos-update-worker/go.sum index 5104691b..bf476bd7 100644 --- a/tools/zos-update-worker/go.sum +++ b/tools/zos-update-worker/go.sum @@ -62,16 +62,16 @@ github.com/vedhavyas/go-subkey/v2 v2.0.0/go.mod h1:95aZ+XDCWAUUynjlmi7BtPExjXgXx golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= -golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 1184142012605e3686dae0b4caebb8cbb4e66289 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Mon, 14 Apr 2025 14:50:11 +0200 Subject: [PATCH 2/3] add v1 prefix on new registrar client --- .../internal/update_worker.go | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/zos-update-worker/internal/update_worker.go b/tools/zos-update-worker/internal/update_worker.go index ccbaf484..80c959ee 100644 --- a/tools/zos-update-worker/internal/update_worker.go +++ b/tools/zos-update-worker/internal/update_worker.go @@ -3,6 +3,7 @@ package internal import ( "context" "fmt" + "net/url" "os" "path/filepath" "time" @@ -64,7 +65,12 @@ func NewWorker(src string, dst string, params Params) (*Worker, error) { clients := map[Network]client.RegistrarClient{} if params.QAUrl != "" { - cli, err := client.NewRegistrarClient(params.QAUrl) + url, err := url.JoinPath(params.QAUrl, "v1") + if err != nil { + return nil, err + } + + cli, err := client.NewRegistrarClient(url) if err != nil { return nil, errors.Wrap(err, "failed to create new registrar client for qa net") } @@ -72,7 +78,12 @@ func NewWorker(src string, dst string, params Params) (*Worker, error) { } if params.TestUrl != "" { - cli, err := client.NewRegistrarClient(params.TestUrl) + url, err := url.JoinPath(params.TestUrl, "v1") + if err != nil { + return nil, err + } + + cli, err := client.NewRegistrarClient(url) if err != nil { return nil, errors.Wrap(err, "failed to create new registrar client for test net") } @@ -80,7 +91,12 @@ func NewWorker(src string, dst string, params Params) (*Worker, error) { } if params.MainUrl != "" { - cli, err := client.NewRegistrarClient(params.MainUrl) + url, err := url.JoinPath(params.MainUrl, "v1") + if err != nil { + return nil, err + } + + cli, err := client.NewRegistrarClient(url) if err != nil { return nil, errors.Wrap(err, "failed to create new registrar client for main net") } From 6ae7a27528507ccc848d4d0b793f0509f46efde6 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Tue, 20 May 2025 12:28:52 +0300 Subject: [PATCH 3/3] add /api/v1 to urls --- .../internal/update_worker.go | 22 +++---------------- .../zos-update-worker/internal/worker_test.go | 6 ++--- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/tools/zos-update-worker/internal/update_worker.go b/tools/zos-update-worker/internal/update_worker.go index 80c959ee..ccbaf484 100644 --- a/tools/zos-update-worker/internal/update_worker.go +++ b/tools/zos-update-worker/internal/update_worker.go @@ -3,7 +3,6 @@ package internal import ( "context" "fmt" - "net/url" "os" "path/filepath" "time" @@ -65,12 +64,7 @@ func NewWorker(src string, dst string, params Params) (*Worker, error) { clients := map[Network]client.RegistrarClient{} if params.QAUrl != "" { - url, err := url.JoinPath(params.QAUrl, "v1") - if err != nil { - return nil, err - } - - cli, err := client.NewRegistrarClient(url) + cli, err := client.NewRegistrarClient(params.QAUrl) if err != nil { return nil, errors.Wrap(err, "failed to create new registrar client for qa net") } @@ -78,12 +72,7 @@ func NewWorker(src string, dst string, params Params) (*Worker, error) { } if params.TestUrl != "" { - url, err := url.JoinPath(params.TestUrl, "v1") - if err != nil { - return nil, err - } - - cli, err := client.NewRegistrarClient(url) + cli, err := client.NewRegistrarClient(params.TestUrl) if err != nil { return nil, errors.Wrap(err, "failed to create new registrar client for test net") } @@ -91,12 +80,7 @@ func NewWorker(src string, dst string, params Params) (*Worker, error) { } if params.MainUrl != "" { - url, err := url.JoinPath(params.MainUrl, "v1") - if err != nil { - return nil, err - } - - cli, err := client.NewRegistrarClient(url) + cli, err := client.NewRegistrarClient(params.MainUrl) if err != nil { return nil, errors.Wrap(err, "failed to create new registrar client for main net") } diff --git a/tools/zos-update-worker/internal/worker_test.go b/tools/zos-update-worker/internal/worker_test.go index 43871313..179c2f9b 100644 --- a/tools/zos-update-worker/internal/worker_test.go +++ b/tools/zos-update-worker/internal/worker_test.go @@ -11,9 +11,9 @@ func TestWorker(t *testing.T) { params := Params{ Interval: 1 * time.Second, - QAUrl: "https://registrar.qa4.grid.tf", - TestUrl: "https://registrar.test4.grid.tf", - MainUrl: "https://registrar.prod4.grid.tf", + QAUrl: "https://registrar.qa4.grid.tf/api/v1", + TestUrl: "https://registrar.test4.grid.tf/api/v1", + MainUrl: "https://registrar.prod4.grid.tf/api/v1", } src := testDir + "/tf-autobuilder" dst := testDir + "/tf-zos"