Merge pull request #148 from nttcom/update/go1.22.2

Bump go from 1.22.1 to 1.22.2
nttcom · Apr 10, 2024 · eba5e34 · eba5e34
2 parents 96ec70a + bfd45b9
commit eba5e34
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 24 deletions.
diff --git a/build/package/Dockerfile b/build/package/Dockerfile
@@ -5,10 +5,10 @@ LABEL maintainer "Motoki TAKENAKA <m.takenaka@ntt.com>"
 RUN apt-get update \
  && apt-get install -y bash-completion curl iproute2
 
-# Setup Go 1.18.8
-RUN curl -o ~/go1.18.8.linux-amd64.tar.gz -LO https://go.dev/dl/go1.18.8.linux-amd64.tar.gz \
+# Setup Go 1.22.2
+RUN curl -o ~/go1.22.2.linux-amd64.tar.gz -LO https://go.dev/dl/go1.22.2.linux-amd64.tar.gz \
     && rm -rf /usr/local/go \
-    && tar -C /usr/local -xzf ~/go1.18.8.linux-amd64.tar.gz \
+    && tar -C /usr/local -xzf ~/go1.22.2.linux-amd64.tar.gz \
     && echo "export PATH=$PATH:/usr/local/go/bin" > ~/.bashrc
 
 # Enable Completion 

diff --git a/cmd/pola/root.go b/cmd/pola/root.go
@@ -36,7 +36,10 @@ func newRootCmd() *cobra.Command {
 }
 
 func persistentPreRunE(cmd *cobra.Command, args []string) error {
-	conn, err := grpc.Dial(net.JoinHostPort(cmd.Flag("host").Value.String(), cmd.Flag("port").Value.String()), grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(
+		net.JoinHostPort(cmd.Flag("host").Value.String(), cmd.Flag("port").Value.String()),
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
 	if err != nil {
 		return fmt.Errorf("failed to dial polad connection: %v", err)
 	}

diff --git a/go.mod b/go.mod
@@ -1,13 +1,13 @@
 module github.com/nttcom/pola
 
-go 1.22.1
+go 1.22.2
 
 require (
 	github.com/golang/protobuf v1.5.4
 	github.com/osrg/gobgp/v3 v3.25.0
 	github.com/spf13/cobra v1.8.0
 	go.uber.org/zap v1.27.0
-	google.golang.org/grpc v1.62.1
+	google.golang.org/grpc v1.63.2
 	google.golang.org/protobuf v1.33.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -17,8 +17,8 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/net v0.20.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
 )
diff --git a/go.sum b/go.sum
@@ -24,16 +24,16 @@ go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
-google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
-google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
+google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
+google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

diff --git a/internal/pkg/gobgp/interface.go b/internal/pkg/gobgp/interface.go
@@ -30,7 +30,10 @@ func GetBgplsNlris(serverAddr string, serverPort string) ([]table.TedElem, error
 	gobgpAddress := serverAddr + ":" + serverPort
 
 	// Get connection
-	cc, err := grpc.Dial(gobgpAddress, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	cc, err := grpc.NewClient(
+		gobgpAddress,
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
 	if err != nil {
 		return nil, err
 	}

diff --git a/tools/grpc/go/add_sr-policy/add_sr-policy.go b/tools/grpc/go/add_sr-policy/add_sr-policy.go
@@ -20,7 +20,10 @@ import (
 
 func main() {
 	flag.Parse()
-	conn, err := grpc.Dial("localhost:50051", grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(
+		"localhost:50051",
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
 	if err != nil {
 		log.Fatalf("Can't connect: %v", err)
 	}

diff --git a/tools/grpc/go/add_sr-policy_no_ls/add_sr-policy_no_ls.go b/tools/grpc/go/add_sr-policy_no_ls/add_sr-policy_no_ls.go
@@ -20,7 +20,10 @@ import (
 
 func main() {
 	flag.Parse()
-	conn, err := grpc.Dial("localhost:50051", grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(
+		"localhost:50051",
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
 	if err != nil {
 		log.Fatalf("Can't connect: %v", err)
 	}

diff --git a/tools/grpc/go/del_session/del_session.go b/tools/grpc/go/del_session/del_session.go
@@ -20,7 +20,10 @@ import (
 
 func main() {
 	flag.Parse()
-	conn, err := grpc.Dial("localhost:50051", grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(
+		"localhost:50051",
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
 	if err != nil {
 		log.Fatalf("did not connect: %v", err)
 	}

diff --git a/tools/grpc/go/show_session/show_session.go b/tools/grpc/go/show_session/show_session.go
@@ -22,7 +22,10 @@ import (
 
 func main() {
 	flag.Parse()
-	conn, err := grpc.Dial("localhost:50051", grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(
+		"localhost:50051",
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
 	if err != nil {
 		log.Fatalf("did not connect: %v", err)
 	}

diff --git a/tools/grpc/go/show_sr-policy/show_sr-policy_list.go b/tools/grpc/go/show_sr-policy/show_sr-policy_list.go
@@ -22,7 +22,10 @@ import (
 
 func main() {
 	flag.Parse()
-	conn, err := grpc.Dial("localhost:50051", grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(
+		"localhost:50051",
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
 	if err != nil {
 		log.Fatalf("did not connect: %v", err)
 	}

diff --git a/tools/grpc/go/show_ted/show_ted.go b/tools/grpc/go/show_ted/show_ted.go
@@ -21,7 +21,10 @@ import (
 
 func main() {
 	flag.Parse()
-	conn, err := grpc.Dial("localhost:50051", grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(
+		"localhost:50051",
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
 	if err != nil {
 		log.Fatalf("did not connect: %v", err)
 	}