From e4672c01e285663680eac259af131199d68051f3 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Mon, 7 Apr 2025 14:16:07 +0200 Subject: [PATCH 1/9] move db version handlers to version.go --- node-registrar/pkg/db/nodes.go | 30 -------------------------- node-registrar/pkg/db/version.go | 37 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 node-registrar/pkg/db/version.go diff --git a/node-registrar/pkg/db/nodes.go b/node-registrar/pkg/db/nodes.go index abb6ee1..591a90e 100644 --- a/node-registrar/pkg/db/nodes.go +++ b/node-registrar/pkg/db/nodes.go @@ -117,33 +117,3 @@ func (db *Database) CreateUptimeReport(report *UptimeReport) error { return nil }) } - -func (db *Database) SetZOSVersion(version string) error { - var current ZosVersion - result := db.gormDB.Where(ZosVersion{Key: ZOS4VersionKey}).Attrs(ZosVersion{Version: version}).FirstOrCreate(¤t) - - if result.Error != nil { - return result.Error - } - - if result.RowsAffected == 0 { - if current.Version == version { - return errors.New("version already set") - } - return db.gormDB.Model(¤t). - Select("version"). - Update("version", version).Error - } - return nil -} - -func (db *Database) GetZOSVersion() (string, error) { - var setting ZosVersion - if err := db.gormDB.Where("key = ?", "zos_4").First(&setting).Error; err != nil { - if errors.Is(err, gorm.ErrRecordNotFound) { - return "", ErrRecordNotFound - } - return "", err - } - return setting.Version, nil -} diff --git a/node-registrar/pkg/db/version.go b/node-registrar/pkg/db/version.go new file mode 100644 index 0000000..7741e3f --- /dev/null +++ b/node-registrar/pkg/db/version.go @@ -0,0 +1,37 @@ +package db + +import ( + "errors" + + "gorm.io/gorm" +) + +func (db *Database) SetZOSVersion(version string) error { + var current ZosVersion + result := db.gormDB.Where(ZosVersion{Key: ZOS4VersionKey}).Attrs(ZosVersion{Version: version}).FirstOrCreate(¤t) + + if result.Error != nil { + return result.Error + } + + if result.RowsAffected == 0 { + if current.Version == version { + return ErrVersionAlreadySet + } + return db.gormDB.Model(¤t). + Select("version"). + Update("version", version).Error + } + return nil +} + +func (db *Database) GetZOSVersion() (string, error) { + var setting ZosVersion + if err := db.gormDB.Where("key = ?", "zos_4").First(&setting).Error; err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return "", ErrRecordNotFound + } + return "", err + } + return setting.Version, nil +} From c7672c4641eea2a17dfa9ef42e623162d8429d8e Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Mon, 7 Apr 2025 14:16:58 +0200 Subject: [PATCH 2/9] update registrar version to be not encoded --- go.work.sum | 9 ++++++++ node-registrar/go.mod | 19 ++++++++-------- node-registrar/go.sum | 32 +++++++++++++-------------- node-registrar/pkg/db/db.go | 1 + node-registrar/pkg/db/models.go | 5 +++-- node-registrar/pkg/server/handlers.go | 26 +++++++++++++++++++++- 6 files changed, 64 insertions(+), 28 deletions(-) diff --git a/go.work.sum b/go.work.sum index 59865b4..3a68022 100644 --- a/go.work.sum +++ b/go.work.sum @@ -51,6 +51,9 @@ github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61/go.mod h1:Q0X6pkwTILD github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/gballet/go-verkle v0.0.0-20220902153445-097bd83b7732/go.mod h1:o/XfIXWi4/GqbQirfRm5uTbXMG5NpqxkxblnbZ+QM9I= github.com/getsentry/sentry-go v0.18.0/go.mod h1:Kgon4Mby+FJ7ZWHFUAZgVaIa8sxHtnRJRLTXZr51aKQ= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/goccmack/gocc v0.0.0-20230228185258-2292f9e40198/go.mod h1:DTh/Y2+NbnOVVoypCCQrovMPDKUGp4yZpSbWg5D0XIM= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= @@ -102,6 +105,7 @@ github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -119,6 +123,7 @@ golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= @@ -126,15 +131,19 @@ golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= diff --git a/node-registrar/go.mod b/node-registrar/go.mod index 693faef..f2561f8 100644 --- a/node-registrar/go.mod +++ b/node-registrar/go.mod @@ -4,8 +4,9 @@ go 1.23.0 require ( github.com/cosmos/go-bip39 v1.0.0 - github.com/gin-contrib/cors v1.5.0 - github.com/gin-gonic/gin v1.9.1 + github.com/gin-contrib/cors v1.7.3 + github.com/gin-gonic/gin v1.10.0 + github.com/go-playground/validator/v10 v10.26.0 github.com/lib/pq v1.10.9 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.33.0 @@ -28,7 +29,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/base58 v1.0.4 // indirect github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.3 // indirect + github.com/gabriel-vasile/mimetype v1.4.8 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect @@ -62,12 +63,12 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.12.0 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/text v0.15.0 // indirect - golang.org/x/tools v0.16.1 // indirect + golang.org/x/crypto v0.33.0 // indirect + golang.org/x/net v0.34.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/text v0.22.0 // indirect + golang.org/x/tools v0.22.0 // indirect google.golang.org/protobuf v1.36.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/node-registrar/go.sum b/node-registrar/go.sum index 9025429..54ff7eb 100644 --- a/node-registrar/go.sum +++ b/node-registrar/go.sum @@ -29,10 +29,10 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= -github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= -github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= -github.com/gin-contrib/cors v1.5.0 h1:DgGKV7DDoOn36DFkNtbHrjoRiT5ExCe+PC9/xp7aKvk= -github.com/gin-contrib/cors v1.5.0/go.mod h1:TvU7MAZ3EwrPLI2ztzTt3tqgvBCq+wn8WpZmfADjupI= +github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= +github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= +github.com/gin-contrib/cors v1.7.3 h1:hV+a5xp8hwJoTw7OY+a70FsL8JkVVFTXw9EcfrYUdns= +github.com/gin-contrib/cors v1.7.3/go.mod h1:M3bcKZhxzsvI+rlRSkkxHyljJt1ESd93COUvemZ79j4= github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4= github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -58,8 +58,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74= -github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k= +github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -165,8 +165,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -175,12 +175,12 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= 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-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -191,8 +191,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/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.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -200,8 +200,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/node-registrar/pkg/db/db.go b/node-registrar/pkg/db/db.go index ab1d148..d3c1c3f 100644 --- a/node-registrar/pkg/db/db.go +++ b/node-registrar/pkg/db/db.go @@ -33,6 +33,7 @@ type Database struct { var ( ErrRecordNotFound = errors.New("could not find any records") ErrRecordAlreadyExists = errors.New("record already exists") + ErrVersionAlreadySet = errors.New("version already set") ) func NewDB(c Config) (Database, error) { diff --git a/node-registrar/pkg/db/models.go b/node-registrar/pkg/db/models.go index ee98059..c115512 100644 --- a/node-registrar/pkg/db/models.go +++ b/node-registrar/pkg/db/models.go @@ -74,8 +74,9 @@ type UptimeReport struct { } type ZosVersion struct { - Key string `gorm:"primaryKey;size:50"` - Version string `gorm:"not null"` + Key string `gorm:"primaryKey;size:50"` + Version string `gorm:"not null"` + SafeToUpgrade bool `json:"safe_to_upgrade"` } type Interface struct { diff --git a/node-registrar/pkg/server/handlers.go b/node-registrar/pkg/server/handlers.go index 86b6dff..d94d302 100644 --- a/node-registrar/pkg/server/handlers.go +++ b/node-registrar/pkg/server/handlers.go @@ -5,11 +5,14 @@ import ( "errors" "fmt" "net/http" + "regexp" "strconv" "strings" "time" "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin/binding" + "github.com/go-playground/validator/v10" "github.com/lib/pq" "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/pkg/db" ) @@ -713,9 +716,12 @@ func (s *Server) getAccountHandler(c *gin.Context) { } type ZOSVersionRequest struct { - Version string `json:"version" binding:"required,base64"` + Version string `json:"version" binding:"required,versionfmt"` + SafeToUpgrade bool `json:"safe_to_upgrade" binding:"required"` } +var versionRegex = regexp.MustCompile(`^v\d+\.\d+\.\d+$`) + // @Summary Set ZOS Version // @Description Sets the ZOS version // @Tags ZOS @@ -735,6 +741,11 @@ func (s *Server) setZOSVersionHandler(c *gin.Context) { return } + if err := addVersionValidator(); err != nil { + c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + var req ZOSVersionRequest if err := c.ShouldBindJSON(&req); err != nil { c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": err.Error()}) @@ -825,3 +836,16 @@ func validateTimestampHint(timestampHint int64) error { return nil } + +func addVersionValidator() error { + // Register the custom validation + if v, ok := binding.Validator.Engine().(*validator.Validate); ok { + if err := v.RegisterValidation("versionfmt", func(fl validator.FieldLevel) bool { + version := fl.Field().String() + return versionRegex.MatchString(version) + }); err != nil { + return err + } + } + return nil +} From 022d2cfe64374cb136a11bde97d1a2118618e3c5 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Mon, 7 Apr 2025 15:15:49 +0200 Subject: [PATCH 3/9] update registrar client to expect ZosVersion instead of encoded string --- node-registrar/client/zos_version.go | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/node-registrar/client/zos_version.go b/node-registrar/client/zos_version.go index 74f4bce..ae6de36 100644 --- a/node-registrar/client/zos_version.go +++ b/node-registrar/client/zos_version.go @@ -2,11 +2,9 @@ package client import ( "bytes" - "encoding/base64" "encoding/json" "net/http" "net/url" - "strings" "time" "github.com/pkg/errors" @@ -80,23 +78,13 @@ func (c *RegistrarClient) setZosVersion(v string, safeToUpgrade bool) (err error SafeToUpgrade: safeToUpgrade, } - jsonData, err := json.Marshal(version) + var body bytes.Buffer + err = json.NewEncoder(&body).Encode(version) if err != nil { - return errors.Wrap(err, "failed to marshal zos version") + return errors.Wrap(err, "failed to encode request body") } - encodedVersion := struct { - Version string `json:"version"` - }{ - Version: base64.StdEncoding.EncodeToString(jsonData), - } - - jsonData, err = json.Marshal(encodedVersion) - if err != nil { - return errors.Wrap(err, "failed to marshal zos version in hex format") - } - - req, err := http.NewRequest("PUT", url, bytes.NewReader(jsonData)) + req, err := http.NewRequest("PUT", url, &body) if err != nil { return errors.Wrap(err, "failed to construct http request to the registrar") } From 5a5e4a59060cdd9df39353d6a6084a7c812b2c11 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Mon, 7 Apr 2025 15:45:31 +0200 Subject: [PATCH 4/9] return Zos4Version from db --- node-registrar/pkg/db/version.go | 20 ++++++++++---------- node-registrar/pkg/server/handlers.go | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/node-registrar/pkg/db/version.go b/node-registrar/pkg/db/version.go index 7741e3f..8367360 100644 --- a/node-registrar/pkg/db/version.go +++ b/node-registrar/pkg/db/version.go @@ -2,36 +2,36 @@ package db import ( "errors" + "reflect" "gorm.io/gorm" ) -func (db *Database) SetZOSVersion(version string) error { +func (db *Database) SetZOSVersion(version ZosVersion) error { var current ZosVersion - result := db.gormDB.Where(ZosVersion{Key: ZOS4VersionKey}).Attrs(ZosVersion{Version: version}).FirstOrCreate(¤t) + result := db.gormDB.Where(ZosVersion{Key: ZOS4VersionKey}).Attrs(ZosVersion{Version: version.Version}).FirstOrCreate(¤t) if result.Error != nil { return result.Error } if result.RowsAffected == 0 { - if current.Version == version { + if reflect.DeepEqual(current, version) { return ErrVersionAlreadySet } return db.gormDB.Model(¤t). Select("version"). - Update("version", version).Error + Updates(version).Error } return nil } -func (db *Database) GetZOSVersion() (string, error) { - var setting ZosVersion - if err := db.gormDB.Where("key = ?", "zos_4").First(&setting).Error; err != nil { +func (db *Database) GetZOSVersion() (version ZosVersion, err error) { + if err := db.gormDB.Where("key = ?", "zos_4").First(&version).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { - return "", ErrRecordNotFound + return version, ErrRecordNotFound } - return "", err + return version, err } - return setting.Version, nil + return version, nil } diff --git a/node-registrar/pkg/server/handlers.go b/node-registrar/pkg/server/handlers.go index d94d302..3afad88 100644 --- a/node-registrar/pkg/server/handlers.go +++ b/node-registrar/pkg/server/handlers.go @@ -752,7 +752,7 @@ func (s *Server) setZOSVersionHandler(c *gin.Context) { return } - if err := s.db.SetZOSVersion(req.Version); err != nil { + if err := s.db.SetZOSVersion(db.ZosVersion{Version: req.Version, SafeToUpgrade: req.SafeToUpgrade}); err != nil { status := http.StatusInternalServerError if err.Error() == "version already set" { status = http.StatusConflict From 7982eeac43bb9172f8e951199c8037b9a877e404 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Tue, 8 Apr 2025 14:06:05 +0200 Subject: [PATCH 5/9] fix version update --- node-registrar/pkg/db/version.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/node-registrar/pkg/db/version.go b/node-registrar/pkg/db/version.go index 8367360..2172373 100644 --- a/node-registrar/pkg/db/version.go +++ b/node-registrar/pkg/db/version.go @@ -2,11 +2,12 @@ package db import ( "errors" - "reflect" "gorm.io/gorm" ) +const zos4Key = "zos_4" + func (db *Database) SetZOSVersion(version ZosVersion) error { var current ZosVersion result := db.gormDB.Where(ZosVersion{Key: ZOS4VersionKey}).Attrs(ZosVersion{Version: version.Version}).FirstOrCreate(¤t) @@ -16,18 +17,25 @@ func (db *Database) SetZOSVersion(version ZosVersion) error { } if result.RowsAffected == 0 { - if reflect.DeepEqual(current, version) { + update := map[string]any{} + if current.Version != version.Version { + update["version"] = version.Version + } + if current.SafeToUpgrade != version.SafeToUpgrade { + update["safe_to_upgrade"] = version.SafeToUpgrade + } + if len(update) == 0 { return ErrVersionAlreadySet } return db.gormDB.Model(¤t). - Select("version"). + Where("key = ?", zos4Key). Updates(version).Error } return nil } func (db *Database) GetZOSVersion() (version ZosVersion, err error) { - if err := db.gormDB.Where("key = ?", "zos_4").First(&version).Error; err != nil { + if err := db.gormDB.Where("key = ?", zos4Key).First(&version).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return version, ErrRecordNotFound } From 213449616b5c7b88dbc3c0d346b0ab98464972a4 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Wed, 9 Apr 2025 16:25:24 +0200 Subject: [PATCH 6/9] add fallback mechanism go version decoding --- node-registrar/client/zos_version.go | 24 ++++++++++++++++++++++++ node-registrar/pkg/server/handlers.go | 6 +++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/node-registrar/client/zos_version.go b/node-registrar/client/zos_version.go index ae6de36..3e1c537 100644 --- a/node-registrar/client/zos_version.go +++ b/node-registrar/client/zos_version.go @@ -2,9 +2,12 @@ package client import ( "bytes" + "encoding/base64" "encoding/json" + "io" "net/http" "net/url" + "strings" "time" "github.com/pkg/errors" @@ -59,6 +62,27 @@ func (c *RegistrarClient) getZosVersion() (version ZosVersion, err error) { return version, err } + err = json.Unmarshal(bodyBytes, &version) + if err != nil { + // try decoding base64 version + var versionString string + err = json.Unmarshal(bodyBytes, &versionString) + if err != nil { + return version, err + } + + decodedVersion, err := base64.StdEncoding.DecodeString(versionString) + if err != nil { + return version, err + } + + correctedJSON := strings.ReplaceAll(string(decodedVersion), "'", "\"") + + err = json.Unmarshal([]byte(correctedJSON), &version) + + return version, err + } + return } diff --git a/node-registrar/pkg/server/handlers.go b/node-registrar/pkg/server/handlers.go index 3afad88..24e447b 100644 --- a/node-registrar/pkg/server/handlers.go +++ b/node-registrar/pkg/server/handlers.go @@ -720,8 +720,6 @@ type ZOSVersionRequest struct { SafeToUpgrade bool `json:"safe_to_upgrade" binding:"required"` } -var versionRegex = regexp.MustCompile(`^v\d+\.\d+\.\d+$`) - // @Summary Set ZOS Version // @Description Sets the ZOS version // @Tags ZOS @@ -837,8 +835,10 @@ func validateTimestampHint(timestampHint int64) error { return nil } +// addVersionValidato registers a custom validator for version func addVersionValidator() error { - // Register the custom validation + versionRegex := regexp.MustCompile(`^v\d+\.\d+\.\d+$`) + if v, ok := binding.Validator.Engine().(*validator.Validate); ok { if err := v.RegisterValidation("versionfmt", func(fl validator.FieldLevel) bool { version := fl.Field().String() From 22a67c304f8439a57500c4fc4aeb0e5a3ae46fa8 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Wed, 9 Apr 2025 18:02:25 +0200 Subject: [PATCH 7/9] add fallback for setting version --- node-registrar/client/zos_version.go | 59 ++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/node-registrar/client/zos_version.go b/node-registrar/client/zos_version.go index 3e1c537..8d13e70 100644 --- a/node-registrar/client/zos_version.go +++ b/node-registrar/client/zos_version.go @@ -4,7 +4,6 @@ import ( "bytes" "encoding/base64" "encoding/json" - "io" "net/http" "net/url" "strings" @@ -97,6 +96,26 @@ func (c *RegistrarClient) setZosVersion(v string, safeToUpgrade bool) (err error return errors.Wrap(err, "failed to construct registrar url") } + sendRequest := func(body bytes.Buffer) (resp *http.Response, err error) { + req, err := http.NewRequest("PUT", url, &body) + if err != nil { + return resp, errors.Wrap(err, "failed to construct http request to the registrar") + } + + authHeader, err := c.signRequest(time.Now().Unix()) + if err != nil { + return resp, errors.Wrap(err, "failed to sign request") + } + req.Header.Set("X-Auth", authHeader) + req.Header.Set("Content-Type", "application/json") + + resp, err = c.httpClient.Do(req) + if err != nil { + return resp, errors.Wrap(err, "failed to send request to get zos version from the registrar") + } + return resp, nil + } + version := ZosVersion{ Version: v, SafeToUpgrade: safeToUpgrade, @@ -108,27 +127,35 @@ func (c *RegistrarClient) setZosVersion(v string, safeToUpgrade bool) (err error return errors.Wrap(err, "failed to encode request body") } - req, err := http.NewRequest("PUT", url, &body) + resp, err := sendRequest(body) if err != nil { - return errors.Wrap(err, "failed to construct http request to the registrar") + return err } + defer resp.Body.Close() - authHeader, err := c.signRequest(time.Now().Unix()) - if err != nil { - return errors.Wrap(err, "failed to sign request") - } - req.Header.Set("X-Auth", authHeader) - req.Header.Set("Content-Type", "application/json") + if resp.StatusCode == http.StatusBadRequest { + // fallback to old encoded format + jsonData, err := json.Marshal(version) + if err != nil { + return errors.Wrap(err, "failed to marshal zos version") + } - resp, err := c.httpClient.Do(req) - if err != nil { - return errors.Wrap(err, "failed to send request to get zos version from the registrar") - } + encodedVersion := struct { + Version string `json:"version"` + }{ + Version: base64.StdEncoding.EncodeToString(jsonData), + } - if resp == nil { - return errors.New("no response received") + jsonData, err = json.Marshal(encodedVersion) + if err != nil { + return errors.Wrap(err, "failed to marshal zos version in hex format") + } + + resp, err = sendRequest(*bytes.NewBuffer(jsonData)) + if err != nil { + return err + } } - defer resp.Body.Close() if resp.StatusCode != http.StatusOK { return parseResponseError(resp.Body) From 348ec0252f9776da808eeb9fa8532e82d01749e4 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Tue, 10 Jun 2025 17:18:35 +0300 Subject: [PATCH 8/9] fix get zos version after rebase --- go.work.sum | 5 ++-- node-registrar/client/zos_version.go | 39 +++++++++++----------------- node-registrar/go.mod | 1 - node-registrar/go.sum | 18 ++++++------- 4 files changed, 25 insertions(+), 38 deletions(-) diff --git a/go.work.sum b/go.work.sum index 3a68022..2f2bdc1 100644 --- a/go.work.sum +++ b/go.work.sum @@ -51,8 +51,6 @@ github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61/go.mod h1:Q0X6pkwTILD github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/gballet/go-verkle v0.0.0-20220902153445-097bd83b7732/go.mod h1:o/XfIXWi4/GqbQirfRm5uTbXMG5NpqxkxblnbZ+QM9I= github.com/getsentry/sentry-go v0.18.0/go.mod h1:Kgon4Mby+FJ7ZWHFUAZgVaIa8sxHtnRJRLTXZr51aKQ= -github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= -github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/goccmack/gocc v0.0.0-20230228185258-2292f9e40198/go.mod h1:DTh/Y2+NbnOVVoypCCQrovMPDKUGp4yZpSbWg5D0XIM= @@ -63,6 +61,7 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= @@ -143,9 +142,9 @@ golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/plot v0.15.2/go.mod h1:DX+x+DWso3LTha+AdkJEv5Txvi+Tql3KAGkehP0/Ubg= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= diff --git a/node-registrar/client/zos_version.go b/node-registrar/client/zos_version.go index 8d13e70..214b88d 100644 --- a/node-registrar/client/zos_version.go +++ b/node-registrar/client/zos_version.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/base64" "encoding/json" + "io" "net/http" "net/url" "strings" @@ -43,42 +44,32 @@ func (c *RegistrarClient) getZosVersion() (version ZosVersion, err error) { return version, errors.Wrapf(err, "failed to get zos version with status code %s", resp.Status) } - var versionString string - err = json.NewDecoder(resp.Body).Decode(&versionString) + // read version body + versionBytes, err := io.ReadAll(resp.Body) if err != nil { return version, err } - versionBytes, err := base64.StdEncoding.DecodeString(versionString) - if err != nil { - return version, err + // try parsing res to ZosVersion struct + if err := json.Unmarshal(versionBytes, &version); err == nil { + return version, nil } - correctedJSON := strings.ReplaceAll(string(versionBytes), "'", "\"") - - err = json.NewDecoder(strings.NewReader(correctedJSON)).Decode(&version) - if err != nil { + // otherwise it's the old encrypted version + var versionString string + if err := json.Unmarshal(versionBytes, &versionString); err != nil { return version, err } - err = json.Unmarshal(bodyBytes, &version) + versionBytes, err = base64.StdEncoding.DecodeString(versionString) if err != nil { - // try decoding base64 version - var versionString string - err = json.Unmarshal(bodyBytes, &versionString) - if err != nil { - return version, err - } - - decodedVersion, err := base64.StdEncoding.DecodeString(versionString) - if err != nil { - return version, err - } - - correctedJSON := strings.ReplaceAll(string(decodedVersion), "'", "\"") + return version, err + } - err = json.Unmarshal([]byte(correctedJSON), &version) + correctedJSON := strings.ReplaceAll(string(versionBytes), "'", "\"") + err = json.NewDecoder(strings.NewReader(correctedJSON)).Decode(&version) + if err != nil { return version, err } diff --git a/node-registrar/go.mod b/node-registrar/go.mod index f2561f8..3e5e576 100644 --- a/node-registrar/go.mod +++ b/node-registrar/go.mod @@ -37,7 +37,6 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.17.0 // indirect github.com/goccy/go-json v0.10.4 // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect diff --git a/node-registrar/go.sum b/node-registrar/go.sum index 54ff7eb..71ecc45 100644 --- a/node-registrar/go.sum +++ b/node-registrar/go.sum @@ -37,8 +37,8 @@ github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= -github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= @@ -63,8 +63,8 @@ github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAu github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= @@ -168,8 +168,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y 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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -205,11 +205,9 @@ golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= -golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From aff5d33ad80be99680bec51f6a09cd91dad910ca Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Wed, 11 Jun 2025 13:15:48 +0300 Subject: [PATCH 9/9] update client to retry on failure not only on bad request --- node-registrar/client/zos_version.go | 67 +++++++++++++++------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/node-registrar/client/zos_version.go b/node-registrar/client/zos_version.go index 214b88d..72b8ca3 100644 --- a/node-registrar/client/zos_version.go +++ b/node-registrar/client/zos_version.go @@ -87,24 +87,34 @@ func (c *RegistrarClient) setZosVersion(v string, safeToUpgrade bool) (err error return errors.Wrap(err, "failed to construct registrar url") } - sendRequest := func(body bytes.Buffer) (resp *http.Response, err error) { + sendRequest := func(body bytes.Buffer) (err error) { req, err := http.NewRequest("PUT", url, &body) if err != nil { - return resp, errors.Wrap(err, "failed to construct http request to the registrar") + return errors.Wrap(err, "failed to construct http request to the registrar") } authHeader, err := c.signRequest(time.Now().Unix()) if err != nil { - return resp, errors.Wrap(err, "failed to sign request") + return errors.Wrap(err, "failed to sign request") } req.Header.Set("X-Auth", authHeader) req.Header.Set("Content-Type", "application/json") - resp, err = c.httpClient.Do(req) + resp, err := c.httpClient.Do(req) if err != nil { - return resp, errors.Wrap(err, "failed to send request to get zos version from the registrar") + return errors.Wrap(err, "failed to send request to get zos version from the registrar") } - return resp, nil + + if resp == nil { + return errors.New("no response received") + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return parseResponseError(resp.Body) + } + + return nil } version := ZosVersion{ @@ -118,38 +128,31 @@ func (c *RegistrarClient) setZosVersion(v string, safeToUpgrade bool) (err error return errors.Wrap(err, "failed to encode request body") } - resp, err := sendRequest(body) - if err != nil { - return err + // return if the request returned with no error + if err := sendRequest(body); err == nil { + return nil } - defer resp.Body.Close() - - if resp.StatusCode == http.StatusBadRequest { - // fallback to old encoded format - jsonData, err := json.Marshal(version) - if err != nil { - return errors.Wrap(err, "failed to marshal zos version") - } - encodedVersion := struct { - Version string `json:"version"` - }{ - Version: base64.StdEncoding.EncodeToString(jsonData), - } + // fallback to old encoded format + jsonData, err := json.Marshal(version) + if err != nil { + return errors.Wrap(err, "failed to marshal zos version") + } - jsonData, err = json.Marshal(encodedVersion) - if err != nil { - return errors.Wrap(err, "failed to marshal zos version in hex format") - } + encodedVersion := struct { + Version string `json:"version"` + }{ + Version: base64.StdEncoding.EncodeToString(jsonData), + } - resp, err = sendRequest(*bytes.NewBuffer(jsonData)) - if err != nil { - return err - } + jsonData, err = json.Marshal(encodedVersion) + if err != nil { + return errors.Wrap(err, "failed to marshal zos version in hex format") } - if resp.StatusCode != http.StatusOK { - return parseResponseError(resp.Body) + err = sendRequest(*bytes.NewBuffer(jsonData)) + if err != nil { + return err } return