Skip to content
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

Jump to bottom

vendor: github.com/docker/docker v25.0.0-beta.1 #3158

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

vendor: github.com/docker/docker v25.0.0-beta.1 #3158

wants to merge 2 commits into from
+14,249 −8,235

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Nov 13, 2023 •
edited

vendor: google.golang.org/grpc v1.58.3

vendor: github.com/docker/docker v25.0.0-beta.1

full diff: moby/moby@6ce5aa1...v25.0.0-beta.1

- Description for the changelog

@thaJeztah thaJeztah self-assigned this Nov 13, 2023
@thaJeztah
Copy link
Member Author

Looks like we have some issues;

Protobufs aren't happy;

#21 [golangci-lint lint 2/2] RUN --mount=type=bind,target=.     --mount=type=cache,target=/root/.cache     --mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint     golangci-lint run ./...
#21 25.30 api/dispatcher.pb.go:955:31: stream.Context undefined (type Dispatcher_SessionServer has no field or method Context) (typecheck)
#21 25.30 	if err := p.authorize(stream.Context(), []string{"swarm-worker", "swarm-manager"}); err != nil {
#21 25.30 	                             ^
#21 25.30 api/dispatcher.pb.go:987:31: stream.Context undefined (type Dispatcher_TasksServer has no field or method Context) (typecheck)
#21 25.30 	if err := p.authorize(stream.Context(), []string{"swarm-worker", "swarm-manager"}); err != nil {
#21 25.30 	                             ^
#21 25.30 api/dispatcher.pb.go:995:31: stream.Context undefined (type Dispatcher_AssignmentsServer has no field or method Context) (typecheck)
#21 25.30 	if err := p.authorize(stream.Context(), []string{"swarm-worker", "swarm-manager"}); err != nil {
#21 25.30 	                             ^
#21 25.30 api/dispatcher.pb.go:2525:16: stream.Context undefined (type Dispatcher_SessionServer has no field or method Context) (typecheck)
#21 25.30 	ctx := stream.Context()
#21 25.30 	              ^
#21 25.30 api/dispatcher.pb.go:2681:16: stream.Context undefined (type Dispatcher_TasksServer has no field or method Context) (typecheck)
#21 25.30 	ctx := stream.Context()
#21 25.30 	              ^
#21 25.30 api/dispatcher.pb.go:2732:16: stream.Context undefined (type Dispatcher_AssignmentsServer has no field or method Context) (typecheck)
#21 25.30 	ctx := stream.Context()
#21 25.30 	              ^
#21 25.30 api/logbroker.pb.go:635:31: stream.Context undefined (type Logs_SubscribeLogsServer has no field or method Context) (typecheck)
#21 25.30 	if err := p.authorize(stream.Context(), []string{"swarm-manager"}); err != nil {
#21 25.30 	                             ^
#21 25.30 api/logbroker.pb.go:655:31: stream.Context undefined (type LogBroker_ListenSubscriptionsServer has no field or method Context) (typecheck)
#21 25.30 	if err := p.authorize(stream.Context(), []string{"swarm-worker", "swarm-manager"}); err != nil {
#21 25.30 	                             ^
#21 25.30 api/logbroker.pb.go:663:31: stream.Context undefined (type LogBroker_PublishLogsServer has no field or method Context) (typecheck)
#21 25.30 	if err := p.authorize(stream.Context(), []string{"swarm-worker", "swarm-manager"}); err != nil {
#21 25.30 	                             ^
#21 25.30 api/logbroker.pb.go:1798:16: stream.Context undefined (type Logs_SubscribeLogsServer has no field or method Context) (typecheck)
#21 25.30 	ctx := stream.Context()
#21 25.30 	              ^
#21 25.30 api/logbroker.pb.go:1921:16: stream.Context undefined (type LogBroker_ListenSubscriptionsServer has no field or method Context) (typecheck)
#21 25.30 	ctx := stream.Context()
#21 25.30 	              ^
#21 25.30 api/logbroker.pb.go:1972:16: stream.Context undefined (type LogBroker_PublishLogsServer has no field or method Context) (typecheck)
#21 25.30 	ctx := stream.Context()
#21 25.30 	              ^
#21 25.30 api/raft.pb.go:825:31: stream.Context undefined (type Raft_StreamRaftMessageServer has no field or method Context) (typecheck)
#21 25.30 	if err := p.authorize(stream.Context(), []string{"swarm-manager"}); err != nil {
#21 25.30 	                             ^
#21 25.30 api/raft.pb.go:2203:16: stream.Context undefined (type Raft_StreamRaftMessageServer has no field or method Context) (typecheck)
#21 25.30 	ctx := stream.Context()
#21 25.30 	              ^
#21 25.30 api/watch.pb.go:898:31: stream.Context undefined (type Watch_WatchServer has no field or method Context) (typecheck)
#21 25.30 	if err := p.authorize(stream.Context(), []string{"swarm-manager"}); err != nil {
#21 25.30 	                             ^
#21 25.30 api/watch.pb.go:2231:16: stream.Context undefined (type Watch_WatchServer has no field or method Context) (typecheck)
#21 25.30 	ctx := stream.Context()
#21 25.30 	              ^
#21 25.30 agent/csi/plugin/plugin.go:129:22: invalid operation: cannot compare np.nodeClient == nil (operator == not defined on untyped nil) (typecheck)
#21 25.30 	if np.nodeClient == nil {
#21 25.30 	                    ^
#21 25.30 agent/config.go:60:19: invalid operation: cannot compare c.Executor == nil (operator == not defined on untyped nil) (typecheck)
#21 25.30 	if c.Executor == nil {
#21 25.30 	                 ^
#21 25.30 api/naming/naming.go:7:2: "strings" imported but not used (typecheck)
#21 25.30 	"strings"
#21 25.30 	^
#21 25.30 template/context.go:114:30: invalid operation: cannot compare ctx.restrictedSecrets == nil (operator == not defined on untyped nil) (typecheck)
#21 25.30 	if ctx.restrictedSecrets == nil {
#21 25.30 	                            ^
#21 25.30 template/context.go:139:30: invalid operation: cannot compare ctx.restrictedConfigs == nil (operator == not defined on untyped nil) (typecheck)
#21 25.30 	if ctx.restrictedConfigs == nil {
#21 25.30 	                            ^
#21 25.30 template/getter.go:21:23: invalid operation: cannot compare t.dependencies == nil (operator == not defined on untyped nil) (typecheck)
#21 25.30 	if t.dependencies == nil {
#21 25.30 	                     ^
#21 25.30 template/getter.go:74:23: invalid operation: cannot compare t.dependencies == nil (operator == not defined on untyped nil) (typecheck)
#21 25.30 	if t.dependencies == nil {
#21 25.30 	                     ^
#21 25.30 manager/state/store/clusters.go:74:85: invalid operation: cannot compare tx.lookup(tableCluster, indexName, strings.ToLower(c.Spec.Annotations.Name)) != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if tx.lookup(tableCluster, indexName, strings.ToLower(c.Spec.Annotations.Name)) != nil {
#21 25.30 	                                                                                   ^
#21 25.30 manager/state/store/configs.go:68:84: invalid operation: cannot compare tx.lookup(tableConfig, indexName, strings.ToLower(c.Spec.Annotations.Name)) != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if tx.lookup(tableConfig, indexName, strings.ToLower(c.Spec.Annotations.Name)) != nil {
#21 25.30 	                                                                                  ^
#21 25.30 manager/state/store/extensions.go:85:82: invalid operation: cannot compare tx.lookup(tableExtension, indexName, strings.ToLower(e.Annotations.Name)) != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if tx.lookup(tableExtension, indexName, strings.ToLower(e.Annotations.Name)) != nil {
#21 25.30 	                                                                                ^
#21 25.30 manager/state/store/memory.go:255:19: invalid operation: cannot compare s.proposer == nil (operator == not defined on untyped nil) (typecheck)
#21 25.30 	if s.proposer == nil {
#21 25.30 	                 ^
#21 25.30 manager/state/store/memory.go:456:29: invalid operation: cannot compare batch.store.proposer != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if batch.store.proposer != nil {
#21 25.30 	                           ^
#21 25.30 manager/state/store/memory.go:469:29: invalid operation: cannot compare batch.store.proposer != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if batch.store.proposer != nil {
#21 25.30 	                           ^
#21 25.30 manager/state/store/memory.go:587:45: invalid operation: cannot compare tx.lookup(table, indexID, o.GetID()) != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if tx.lookup(table, indexID, o.GetID()) != nil {
#21 25.30 	                                           ^
#21 25.30 manager/state/store/memory.go:732:79: cannot convert v (variable of type byDesiredState) to int64 (typecheck)
#21 25.30 		it, err := tx.memDBTx.Get(table, indexDesiredState, strconv.FormatInt(int64(v), 10))
#21 25.30 		                                                                            ^
#21 25.30 manager/state/store/memory.go:738:76: cannot convert v (variable of type byTaskState) to int64 (typecheck)
#21 25.30 		it, err := tx.memDBTx.Get(table, indexTaskState, strconv.FormatInt(int64(v), 10))
#21 25.30 		                                                                         ^
#21 25.30 manager/state/store/memory.go:744:71: cannot convert v (variable of type byRole) to int64 (typecheck)
#21 25.30 		it, err := tx.memDBTx.Get(table, indexRole, strconv.FormatInt(int64(v), 10))
#21 25.30 		                                                                    ^
#21 25.30 manager/state/store/memory.go:750:77: cannot convert v (variable of type byMembership) to int64 (typecheck)
#21 25.30 		it, err := tx.memDBTx.Get(table, indexMembership, strconv.FormatInt(int64(v), 10))
#21 25.30 		                                                                          ^
#21 25.30 manager/state/store/memory.go:929:23: invalid operation: cannot compare store.proposer == nil (operator == not defined on untyped nil) (typecheck)
#21 25.30 	if store.proposer == nil {
#21 25.30 	                     ^
#21 25.30 manager/state/store/networks.go:68:85: invalid operation: cannot compare tx.lookup(tableNetwork, indexName, strings.ToLower(n.Spec.Annotations.Name)) != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if tx.lookup(tableNetwork, indexName, strings.ToLower(n.Spec.Annotations.Name)) != nil {
#21 25.30 	                                                                                   ^
#21 25.30 manager/state/store/resources.go:115:81: invalid operation: cannot compare tx.lookup(tableResource, indexName, strings.ToLower(r.Annotations.Name)) != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if tx.lookup(tableResource, indexName, strings.ToLower(r.Annotations.Name)) != nil {
#21 25.30 	                                                                               ^
#21 25.30 manager/state/store/secrets.go:68:84: invalid operation: cannot compare tx.lookup(tableSecret, indexName, strings.ToLower(s.Spec.Annotations.Name)) != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if tx.lookup(tableSecret, indexName, strings.ToLower(s.Spec.Annotations.Name)) != nil {
#21 25.30 	                                                                                  ^
#21 25.30 manager/state/store/services.go:89:85: invalid operation: cannot compare tx.lookup(tableService, indexName, strings.ToLower(s.Spec.Annotations.Name)) != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if tx.lookup(tableService, indexName, strings.ToLower(s.Spec.Annotations.Name)) != nil {
#21 25.30 	                                                                                   ^
#21 25.30 manager/state/store/volumes.go:73:84: invalid operation: cannot compare tx.lookup(tableVolume, indexName, strings.ToLower(v.Spec.Annotations.Name)) != nil (operator != not defined on untyped nil) (typecheck)
#21 25.30 	if tx.lookup(tableVolume, indexName, strings.ToLower(v.Spec.Annotations.Name)) != nil {
#21 25.30 	                                                                                  ^
#21 25.30 manager/state/raft/membership/cluster.go:90:14: m.NodeID undefined (type *Member has no field or method NodeID) (typecheck)
#21 25.30 			NodeID: m.NodeID,
#21 25.30 			          ^
#21 25.30 manager/state/raft/membership/cluster.go:91:14: m.Addr undefined (type *Member has no field or method Addr) (typecheck)
#21 25.30 			Addr:   m.Addr,
#21 25.30 			          ^
#21 25.30 manager/state/raft/membership/cluster.go:102:22: member.RaftID undefined (type *Member has no field or method RaftID) (typecheck)
#21 25.30 	if c.removed[member.RaftID] {
#21 25.30 	                    ^
#21 25.30 manager/state/raft/membership/cluster.go:106:19: member.RaftID undefined (type *Member has no field or method RaftID) (typecheck)
#21 25.30 	c.members[member.RaftID] = member
#21 25.30 	                 ^
#21 25.30 manager/state/raft/membership/cluster.go:136:15: oldMember.NodeID undefined (type *Member has no field or method NodeID) (typecheck)
#21 25.30 	if oldMember.NodeID != m.NodeID {
#21 25.30 	             ^
#21 25.30 manager/state/raft/membership/cluster.go:141:15: oldMember.Addr undefined (type *Member has no field or method Addr) (typecheck)
#21 25.30 	if oldMember.Addr == m.Addr {
#21 25.30 	             ^
#21 25.30 manager/controlapi/ca_rotation.go:26:7: previous case (typecheck)
#21 25.30 	case *api.RootCA:
#21 25.30 	     ^
#21 25.30 manager/csi/plugin.go:271:27: invalid operation: cannot compare p.controllerClient == nil (operator == not defined on untyped nil) (typecheck)
#21 25.30 	if p.controllerClient == nil {
#21 25.30 	                         ^
#21 25.30 manager/dispatcher/dispatcher.go:1135:3: oneModification declared but not used (typecheck)
#21 25.30 		oneModification := func() {
#21 25.30 		^
#21 25.30 manager/logbroker/broker.go:196:18: publish.SubscriptionID undefined (type *logMessage has no field or method SubscriptionID) (typecheck)
#21 25.30 		return publish.SubscriptionID == id
#21 25.30 		               ^
#21 ERROR: process "/bin/sh -c golangci-lint run ./..." did not complete successfully: exit code: 1
------
 > [golangci-lint lint 2/2] RUN --mount=type=bind,target=.     --mount=type=cache,target=/root/.cache     --mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint     golangci-lint run ./...:
25.30 	     ^
25.30 manager/csi/plugin.go:271:27: invalid operation: cannot compare p.controllerClient == nil (operator == not defined on untyped nil) (typecheck)
25.30 	if p.controllerClient == nil {
25.30 	                         ^
25.30 manager/dispatcher/dispatcher.go:1135:3: oneModification declared but not used (typecheck)
25.30 		oneModification := func() {
25.30 		^
25.30 manager/logbroker/broker.go:196:18: publish.SubscriptionID undefined (type *logMessage has no field or method SubscriptionID) (typecheck)
25.30 		return publish.SubscriptionID == id
25.30 		               ^
------

And grpc requires a newer Go version (this repo is still on go1.18)

docker run -t -v swarmkit-cache:/go -v /home/runner/work/swarmkit/swarmkit/:/go/src/github.com/docker/swarmkit moby/swarmkit make coverage
🐳 coverage
?   	github.com/moby/swarmkit/v2	[no test files]
# google.golang.org/grpc
vendor/google.golang.org/grpc/server.go:2096:14: undefined: atomic.Int64
note: module requires Go 1.19
FAIL	github.com/moby/swarmkit/v2/agent [build failed]
FAIL
make: *** [direct.mk:121: coverage] Error 2
make[1]: *** [containerized.mk:44: run] Error 2
make[1]: Leaving directory '/home/runner/work/swarmkit/swarmkit'
make: *** [containerized.mk:14: coverage] Error 2
Error: Process completed with exit code 2.

@thaJeztah
Copy link
Member Author

Go update was stuck on a failing test;

@thaJeztah thaJeztah mentioned this pull request Nov 14, 2023
Merged
@thaJeztah
vendor: google.golang.org/grpc v1.58.3
76408f3 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
vendor: github.com/docker/docker v25.0.0-beta.1
f292e0a 
full diff: moby/moby@6ce5aa1...v25.0.0-beta.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@thaJeztah thaJeztah

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@thaJeztah