Skip to content

Commit 7d27d51

Browse files
ashraffoudaclaude
ashraffouda
and
claude
authored
Migrate zosbase -> zos_base dependency (v1.1.0) (#1542)
* Migrate zosbase -> zos_base dependency (v1.1.0) zosbase was renamed to github.com/threefoldtech/zos_base. Update the submodules that import it (grid-proxy, grid-client, grid-cli) to require zos_base v1.1.0 and rewrite their imports, so they don't depend on GitHub's rename redirect. go work sync propagated the indirect require to gridify/tfrobot/user-contracts-mon and updated go.work.sum. Whole workspace builds (go build ./... across all 11 modules). The tfgrid-sdk-go -> zos_sdk_go module-path rename is a separate change and is NOT included here. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Complete standalone go.sum for indirect submodules Add the zos_base@v1.1.0 go.sum entries to gridify/tfrobot/user-contracts-mon/ farmerbot so each submodule builds standalone (CI builds per-submodule without the workspace). Verified go build ./... passes standalone for all 11 modules. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * ci(lint): fix govet reflect.Ptr and drop noisy goconst - grid-proxy param_parser.go: reflect.Ptr -> reflect.Pointer (govet inline) - .golangci.yml: remove goconst from enabled linters. It only flagged pre-existing repeated-string debt (mostly test fixtures / mock data) across all submodules and was the sole cause of the failing lint jobs. Verified golangci-lint run is clean for every affected submodule. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 829f742 commit 7d27d51

64 files changed

Lines changed: 87 additions & 88 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
version: "2"
22
linters:
33
enable:
4-
- goconst
54
- misspell
65
- unconvert
76
exclusions:

‎farmerbot/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ require (
5252
github.com/rivo/uniseg v0.4.7 // indirect
5353
github.com/rs/cors v1.11.1 // indirect
5454
github.com/spf13/pflag v1.0.6 // indirect
55-
github.com/threefoldtech/zosbase v1.0.9 // indirect
55+
github.com/threefoldtech/zos_base v1.1.0 // indirect
5656
github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect
5757
go.opentelemetry.io/otel v1.39.0 // indirect
5858
go.opentelemetry.io/otel/trace v1.39.0 // indirect

‎farmerbot/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
123123
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
124124
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00 h1:Q/vkWlTfZBCo4SclrbpSV35sSg/EF2MIIi0LgxPdzCI=
125125
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00/go.mod h1:cOL5YgHUmDG5SAXrsZxFjUECRQQuAqOoqvXhZG5sEUw=
126-
github.com/threefoldtech/zosbase v1.0.9 h1:jZ/km4PiOnJHSqpfg4cJRC3k9GE+vzX5LF1MaJnXOoU=
127-
github.com/threefoldtech/zosbase v1.0.9/go.mod h1:HIDT3p2LZsaUp4TQa5A/AB1MdW0YAPUEaK+lkc3gSsM=
126+
github.com/threefoldtech/zos_base v1.1.0 h1:WpjxPCzEgHOkMorhkKcpqRKXnsvL4euXOBnR2IdI/AM=
127+
github.com/threefoldtech/zos_base v1.1.0/go.mod h1:pVOuEZ6lobb3XPmiZwrzdxahuM29hU7wKqfX+Vih1cI=
128128
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
129129
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
130130
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=

‎grid-cli/cmd/deploy_gateway.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package cmd
44
import (
55
"github.com/rs/zerolog/log"
66
"github.com/spf13/cobra"
7-
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
7+
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
88
)
99

1010
// deployGatewayCmd represents the deploy gateway command

‎grid-cli/cmd/deploy_zdb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/threefoldtech/tfgrid-sdk-go/grid-cli/internal/filters"
1313
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/deployer"
1414
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
15-
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
15+
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
1616
)
1717

1818
// deployZDBCmd represents the deploy zdb command

‎grid-cli/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/stretchr/testify v1.11.1
1111
github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.15.18
1212
github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.17.0
13-
github.com/threefoldtech/zosbase v1.0.9
13+
github.com/threefoldtech/zos_base v1.1.0
1414
github.com/vedhavyas/go-subkey v1.0.3
1515
)
1616

‎grid-cli/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
132132
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
133133
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00 h1:Q/vkWlTfZBCo4SclrbpSV35sSg/EF2MIIi0LgxPdzCI=
134134
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00/go.mod h1:cOL5YgHUmDG5SAXrsZxFjUECRQQuAqOoqvXhZG5sEUw=
135-
github.com/threefoldtech/zosbase v1.0.9 h1:jZ/km4PiOnJHSqpfg4cJRC3k9GE+vzX5LF1MaJnXOoU=
136-
github.com/threefoldtech/zosbase v1.0.9/go.mod h1:HIDT3p2LZsaUp4TQa5A/AB1MdW0YAPUEaK+lkc3gSsM=
135+
github.com/threefoldtech/zos_base v1.1.0 h1:WpjxPCzEgHOkMorhkKcpqRKXnsvL4euXOBnR2IdI/AM=
136+
github.com/threefoldtech/zos_base v1.1.0/go.mod h1:pVOuEZ6lobb3XPmiZwrzdxahuM29hU7wKqfX+Vih1cI=
137137
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
138138
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
139139
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=

‎grid-client/deployer/deployer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
2020
proxy "github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/client"
2121
proxyTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/types"
22-
"github.com/threefoldtech/zosbase/pkg/gridtypes"
22+
"github.com/threefoldtech/zos_base/pkg/gridtypes"
2323
"go.opentelemetry.io/otel/attribute"
2424
"go.opentelemetry.io/otel/codes"
2525
"go.opentelemetry.io/otel/trace"

‎grid-client/deployer/deployer_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
1919
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
2020
proxyTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/types"
21-
"github.com/threefoldtech/zosbase/pkg/gridtypes"
22-
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
21+
"github.com/threefoldtech/zos_base/pkg/gridtypes"
22+
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
2323
subkey "github.com/vedhavyas/go-subkey"
2424
)
2525

‎grid-client/deployer/deployment_deployer_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/state"
2020
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
2121
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
22-
"github.com/threefoldtech/zosbase/pkg/gridtypes"
23-
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
22+
"github.com/threefoldtech/zos_base/pkg/gridtypes"
23+
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
2424
)
2525

2626
var (

0 commit comments

Comments
 (0)