update to go1.18.9, gofmt, and regenerate proto

some of the "go get" installs now expect a newer version of Go, and
we want the version to match the version in the 20.10 branch in moby,
which is what this repository is used for.

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

Dockerfile

@@ -1,21 +1,23 @@
-ARG GO_VERSION=1.13.8
+ARG GO_VERSION=1.18.9
 
 FROM golang:${GO_VERSION}-buster as dev
 RUN apt-get update && apt-get -y install iptables \
 		protobuf-compiler
 
-RUN go get -d github.com/gogo/protobuf/protoc-gen-gogo && \
-		cd /go/src/github.com/gogo/protobuf/protoc-gen-gogo && \
-		git reset --hard 30cf7ac33676b5786e78c746683f0d4cd64fa75b && \
-		go install
+RUN git clone https://github.com/gogo/protobuf.git  /go/src/github.com/gogo/protobuf \
+  && cd /go/src/github.com/gogo/protobuf/protoc-gen-gogo \
+  && git reset --hard 30cf7ac33676b5786e78c746683f0d4cd64fa75b \
+  && GO111MODULE=off go install
 
-RUN go get golang.org/x/lint/golint \
-		golang.org/x/tools/cmd/cover \
-		github.com/mattn/goveralls \
-		github.com/gordonklaus/ineffassign \
-		github.com/client9/misspell/cmd/misspell
+RUN go install golang.org/x/lint/golint@latest \
+ && go install golang.org/x/tools/cmd/cover@latest \
+ && go install github.com/mattn/goveralls@latest \
+ && go install github.com/gordonklaus/ineffassign@latest \
+ && go install github.com/client9/misspell/cmd/misspell@latest
 
 WORKDIR /go/src/github.com/docker/libnetwork
+ENV GO111MODULE=off
+
 
 FROM dev
 

Makefile

@@ -45,8 +45,8 @@ build: builder
 build-local:
 	@echo "🐳 $@"
 	@mkdir -p "bin"
-	go build -tags experimental -o "bin/dnet" ./cmd/dnet
-	go build -o "bin/docker-proxy" ./cmd/proxy
+	GO111MODULE=off go build -tags experimental -o "bin/dnet" ./cmd/dnet
+	GO111MODULE=off go build -o "bin/docker-proxy" ./cmd/proxy
 	CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic
 	CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go
 
@@ -82,8 +82,8 @@ cross: builder
 
 cross-local:
 	@echo "🐳 $@"
-	go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
-	go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
+	GO111MODULE=off go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
+	GO111MODULE=off go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
 
 # Rebuild protocol buffers.
 # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt.
@@ -125,7 +125,7 @@ unit-tests: builder
 unit-tests-local:
 	@echo "🐳 Running tests... "
 	@echo "mode: count" > coverage.coverprofile
-	@go build -o "bin/docker-proxy" ./cmd/proxy
+	@GO111MODULE=off go build -o "bin/docker-proxy" ./cmd/proxy
 	@for dir in $$( find . -maxdepth 10 -not -path './.git*' -not -path '*/_*' -not -path './vendor/*' -type d); do \
 	if ls $$dir/*.go &> /dev/null; then \
 		pushd . &> /dev/null ; \

api/api.go

@@ -278,6 +278,7 @@ func processCreateDefaults(c libnetwork.NetworkController, nc *networkCreate) {
 /***************************
  NetworkController interface
 ****************************/
+
 func procCreateNetwork(c libnetwork.NetworkController, vars map[string]string, body []byte) (interface{}, *responseStatus) {
 	var create networkCreate
 
@@ -385,6 +386,7 @@ func procCreateSandbox(c libnetwork.NetworkController, vars map[string]string, b
 /******************
  Network interface
 *******************/
+
 func procCreateEndpoint(c libnetwork.NetworkController, vars map[string]string, body []byte) (interface{}, *responseStatus) {
 	var ec endpointCreate
 
@@ -483,6 +485,7 @@ func procDeleteNetwork(c libnetwork.NetworkController, vars map[string]string, b
 /******************
  Endpoint interface
 *******************/
+
 func procJoinEndpoint(c libnetwork.NetworkController, vars map[string]string, body []byte) (interface{}, *responseStatus) {
 	var ej endpointJoin
 	var setFctList []libnetwork.EndpointOption
@@ -561,6 +564,7 @@ func procDeleteEndpoint(c libnetwork.NetworkController, vars map[string]string,
 /******************
  Service interface
 *******************/
+
 func procGetServices(c libnetwork.NetworkController, vars map[string]string, body []byte) (interface{}, *responseStatus) {
 	// Look for query filters and validate
 	nwName, filterByNwName := vars[urlNwName]
@@ -734,6 +738,7 @@ func procDetachBackend(c libnetwork.NetworkController, vars map[string]string, b
 /******************
  Sandbox interface
 *******************/
+
 func procGetSandbox(c libnetwork.NetworkController, vars map[string]string, body []byte) (interface{}, *responseStatus) {
 	if epT, ok := vars[urlEpID]; ok {
 		sv, errRsp := findService(c, epT, byID)
@@ -816,6 +821,7 @@ func procDeleteSandbox(c libnetwork.NetworkController, vars map[string]string, b
 /***********
   Utilities
 ************/
+
 const (
 	byID = iota
 	byName

bitseq/sequence.go

@@ -621,13 +621,14 @@ func findSequence(head *sequence, bytePos uint64) (*sequence, *sequence, uint64,
 // Remove current sequence if empty.
 // Check if new sequence can be merged with neighbour (previous/next) sequences.
 //
-//
 // Identify "current" sequence containing block:
-//                                      [prev seq] [current seq] [next seq]
+//
+//	[prev seq] [current seq] [next seq]
 //
 // Based on block position, resulting list of sequences can be any of three forms:
 //
-//        block position                        Resulting list of sequences
+//	block position                        Resulting list of sequences
+//
 // A) block is first in current:         [prev seq] [new] [modified current seq] [next seq]
 // B) block is last in current:          [prev seq] [modified current seq] [new] [next seq]
 // C) block is in the middle of current: [prev seq] [curr pre] [new] [curr post] [next seq]

client/types.go

@@ -31,6 +31,7 @@ type SandboxResource struct {
 /***********
   Body types
   ************/
+
 type ipamConf struct {
 	PreferredPool string
 	SubPool       string

datastore/datastore.go

@@ -14,7 +14,7 @@ import (
 	"github.com/docker/libnetwork/types"
 )
 
-//DataStore exported
+// DataStore exported
 type DataStore interface {
 	// GetObject gets data from datastore and unmarshals to the specified object
 	GetObject(key string, o KVObject) error
@@ -174,14 +174,14 @@ func (cfg *ScopeCfg) IsValid() bool {
 	return true
 }
 
-//Key provides convenient method to create a Key
+// Key provides convenient method to create a Key
 func Key(key ...string) string {
 	keychain := append(rootChain, key...)
 	str := strings.Join(keychain, "/")
 	return str + "/"
 }
 
-//ParseKey provides convenient method to unpack the key to complement the Key function
+// ParseKey provides convenient method to unpack the key to complement the Key function
 func ParseKey(key string) ([]string, error) {
 	chain := strings.Split(strings.Trim(key, "/"), "/")
 

drivers/bridge/bridge.go

@@ -781,8 +781,8 @@ func (d *driver) createNetwork(config *networkConfiguration) (err error) {
 		// Setup IP6Tables.
 		{config.EnableIPv6 && d.config.EnableIP6Tables, network.setupIP6Tables},
 
-		//We want to track firewalld configuration so that
-		//if it is started/reloaded, the rules can be applied correctly
+		// We want to track firewalld configuration so that
+		// if it is started/reloaded, the rules can be applied correctly
 		{d.config.EnableIPTables, network.setupFirewalld},
 		// same for IPv6
 		{config.EnableIPv6 && d.config.EnableIP6Tables, network.setupFirewalld6},
@@ -796,7 +796,7 @@ func (d *driver) createNetwork(config *networkConfiguration) (err error) {
 		// Add inter-network communication rules.
 		{d.config.EnableIPTables, setupNetworkIsolationRules},
 
-		//Configure bridge networking filtering if ICC is off and IP tables are enabled
+		// Configure bridge networking filtering if ICC is off and IP tables are enabled
 		{!config.EnableICC && d.config.EnableIPTables, setupBridgeNetFiltering},
 	} {
 		if step.Condition {

drivers/bridge/netlink_deprecated_linux_rawsockaddr_data_int8.go

@@ -1,3 +1,4 @@
+//go:build !arm && !ppc64 && !ppc64le && !riscv64
 // +build !arm,!ppc64,!ppc64le,!riscv64
 
 package bridge

drivers/bridge/netlink_deprecated_linux_rawsockaddr_data_uint8.go

@@ -1,3 +1,4 @@
+//go:build arm || ppc64 || ppc64le || riscv64
 // +build arm ppc64 ppc64le riscv64
 
 package bridge

drivers/bridge/netlink_deprecated_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package bridge

drivers/bridge/setup_bridgenetfiltering.go

@@ -20,7 +20,7 @@ const (
 	ipvboth
 )
 
-//Gets the IP version in use ( [ipv4], [ipv6] or [ipv4 and ipv6] )
+// Gets the IP version in use ( [ipv4], [ipv6] or [ipv4 and ipv6] )
 func getIPVersion(config *networkConfiguration) ipVersion {
 	ipVersion := ipv4
 	if config.AddressIPv6 != nil || config.EnableIPv6 {
@@ -49,7 +49,7 @@ func setupBridgeNetFiltering(config *networkConfiguration, i *bridgeInterface) e
 	return nil
 }
 
-//Enable bridge net filtering if ip forwarding is enabled. See github issue #11404
+// Enable bridge net filtering if ip forwarding is enabled. See github issue #11404
 func checkBridgeNetFiltering(config *networkConfiguration, i *bridgeInterface) error {
 	ipVer := getIPVersion(config)
 	iface := config.BridgeName
@@ -119,7 +119,7 @@ func getBridgeNFKernelParam(ipVer ipVersion) string {
 	}
 }
 
-//Gets the value of the kernel parameters located at the given path
+// Gets the value of the kernel parameters located at the given path
 func getKernelBoolParam(path string) (bool, error) {
 	enabled := false
 	line, err := ioutil.ReadFile(path)
@@ -132,7 +132,7 @@ func getKernelBoolParam(path string) (bool, error) {
 	return enabled, err
 }
 
-//Sets the value of the kernel parameter located at the given path
+// Sets the value of the kernel parameter located at the given path
 func setKernelBoolParam(path string, on bool) error {
 	value := byte('0')
 	if on {
@@ -141,7 +141,7 @@ func setKernelBoolParam(path string, on bool) error {
 	return ioutil.WriteFile(path, []byte{value, '\n'}, 0644)
 }
 
-//Checks to see if packet forwarding is enabled
+// Checks to see if packet forwarding is enabled
 func isPacketForwardingEnabled(ipVer ipVersion, iface string) (bool, error) {
 	switch ipVer {
 	case ipv4, ipv6:

drivers/bridge/setup_ip_tables.go

@@ -22,6 +22,7 @@ const (
 	// bridge. A positive match identifies a packet originated from one bridge
 	// network's bridge destined to another bridge network's bridge and will
 	// result in the packet being dropped. No match returns to the parent chain.
+
 	IsolationChain1 = "DOCKER-ISOLATION-STAGE-1"
 	IsolationChain2 = "DOCKER-ISOLATION-STAGE-2"
 )

drivers/overlay/ostweaks_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package overlay

drivers/windows/port_mapping.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package windows

drivers/windows/windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 // Shim for the Host Network Service (HNS) to manage networking for

drivers/windows/windows_store.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package windows

drivers/windows/windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package windows

endpoint_info_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package libnetwork

endpoint_info_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package libnetwork

endpoint_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package libnetwork

firewall_others.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package libnetwork

ipams/builtin/builtin_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd || darwin
 // +build linux freebsd darwin
 
 package builtin

ipams/builtin/builtin_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package builtin

ipams/remote/api/api.go

@@ -34,14 +34,14 @@ func (capRes GetCapabilityResponse) ToCapability() *ipamapi.Capability {
 	}
 }
 
-// GetAddressSpacesResponse is the response to the ``get default address spaces`` request message
+// GetAddressSpacesResponse is the response to the “get default address spaces“ request message
 type GetAddressSpacesResponse struct {
 	Response
 	LocalDefaultAddressSpace  string
 	GlobalDefaultAddressSpace string
 }
 
-// RequestPoolRequest represents the expected data in a ``request address pool`` request message
+// RequestPoolRequest represents the expected data in a “request address pool“ request message
 type RequestPoolRequest struct {
 	AddressSpace string
 	Pool         string
@@ -50,45 +50,45 @@ type RequestPoolRequest struct {
 	V6           bool
 }
 
-// RequestPoolResponse represents the response message to a ``request address pool`` request
+// RequestPoolResponse represents the response message to a “request address pool“ request
 type RequestPoolResponse struct {
 	Response
 	PoolID string
 	Pool   string // CIDR format
 	Data   map[string]string
 }
 
-// ReleasePoolRequest represents the expected data in a ``release address pool`` request message
+// ReleasePoolRequest represents the expected data in a “release address pool“ request message
 type ReleasePoolRequest struct {
 	PoolID string
 }
 
-// ReleasePoolResponse represents the response message to a ``release address pool`` request
+// ReleasePoolResponse represents the response message to a “release address pool“ request
 type ReleasePoolResponse struct {
 	Response
 }
 
-// RequestAddressRequest represents the expected data in a ``request address`` request message
+// RequestAddressRequest represents the expected data in a “request address“ request message
 type RequestAddressRequest struct {
 	PoolID  string
 	Address string
 	Options map[string]string
 }
 
-// RequestAddressResponse represents the expected data in the response message to a ``request address`` request
+// RequestAddressResponse represents the expected data in the response message to a “request address“ request
 type RequestAddressResponse struct {
 	Response
 	Address string // in CIDR format
 	Data    map[string]string
 }
 
-// ReleaseAddressRequest represents the expected data in a ``release address`` request message
+// ReleaseAddressRequest represents the expected data in a “release address“ request message
 type ReleaseAddressRequest struct {
 	PoolID  string
 	Address string
 }
 
-// ReleaseAddressResponse represents the response message to a ``release address`` request
+// ReleaseAddressResponse represents the response message to a “release address“ request
 type ReleaseAddressResponse struct {
 	Response
 }

netutils/utils_linux.go

@@ -1,4 +1,6 @@
+//go:build linux
 // +build linux
+
 // Network utility functions.
 
 package netutils