From 02d3b9b77a1c02368412e9995b323ba02ab157a0 Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Tue, 10 Jan 2023 14:29:13 -0800 Subject: [PATCH 1/4] Change version to 1.52.1-dev (#5871) --- version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.go b/version.go index 243e06e8d3e3..87c67abd1c10 100644 --- a/version.go +++ b/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.52.0" +const Version = "1.52.1-dev" From e593b4a4da85229e72d8dc9757b6e78bbce9e5e0 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Tue, 17 Jan 2023 20:08:44 -0500 Subject: [PATCH 2/4] xds interop: Fix buildscripts not continuing on a failed test suite (v1.52.x backport) (#5938) --- test/kokoro/psm-security.sh | 2 +- test/kokoro/xds_k8s_lb.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/kokoro/psm-security.sh b/test/kokoro/psm-security.sh index 97aca28d79b7..f99cb9a87883 100755 --- a/test/kokoro/psm-security.sh +++ b/test/kokoro/psm-security.sh @@ -158,7 +158,7 @@ main() { local failed_tests=0 test_suites=("baseline_test" "security_test" "authz_test") for test in "${test_suites[@]}"; do - run_test $test || (( failed_tests++ )) + run_test $test || (( ++failed_tests )) done echo "Failed test suites: ${failed_tests}" if (( failed_tests > 0 )); then diff --git a/test/kokoro/xds_k8s_lb.sh b/test/kokoro/xds_k8s_lb.sh index 31aca363aafc..f1f01794a056 100755 --- a/test/kokoro/xds_k8s_lb.sh +++ b/test/kokoro/xds_k8s_lb.sh @@ -160,7 +160,7 @@ main() { local failed_tests=0 test_suites=("api_listener_test" "change_backend_service_test" "failover_test" "remove_neg_test" "round_robin_test" "affinity_test" "outlier_detection_test") for test in "${test_suites[@]}"; do - run_test $test || (( failed_tests++ )) + run_test $test || (( ++failed_tests )) done echo "Failed test suites: ${failed_tests}" if (( failed_tests > 0 )); then From f7ecbb24e152e5d00f8a12976b65fe69b3907667 Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Tue, 24 Jan 2023 13:12:36 -0800 Subject: [PATCH 3/4] Cherry pick: grpclb: rename `grpclbstate` package back to `state` (#5962) (#5963) --- balancer/grpclb/grpclb.go | 2 +- balancer/grpclb/grpclb_test.go | 2 +- balancer/grpclb/{grpclbstate => state}/state.go | 8 ++++---- internal/resolver/dns/dns_resolver.go | 2 +- internal/resolver/dns/dns_resolver_test.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename balancer/grpclb/{grpclbstate => state}/state.go (87%) diff --git a/balancer/grpclb/grpclb.go b/balancer/grpclb/grpclb.go index b0dd72fce141..dd15810d0aeb 100644 --- a/balancer/grpclb/grpclb.go +++ b/balancer/grpclb/grpclb.go @@ -32,7 +32,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/balancer" - "google.golang.org/grpc/balancer/grpclb/grpclbstate" + grpclbstate "google.golang.org/grpc/balancer/grpclb/state" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials" "google.golang.org/grpc/grpclog" diff --git a/balancer/grpclb/grpclb_test.go b/balancer/grpclb/grpclb_test.go index f8fbfe03d5d1..da2df41f2af8 100644 --- a/balancer/grpclb/grpclb_test.go +++ b/balancer/grpclb/grpclb_test.go @@ -36,7 +36,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/balancer" - "google.golang.org/grpc/balancer/grpclb/grpclbstate" + grpclbstate "google.golang.org/grpc/balancer/grpclb/state" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" "google.golang.org/grpc/internal" diff --git a/balancer/grpclb/grpclbstate/state.go b/balancer/grpclb/state/state.go similarity index 87% rename from balancer/grpclb/grpclbstate/state.go rename to balancer/grpclb/state/state.go index cece046be343..4ecfa1c21511 100644 --- a/balancer/grpclb/grpclbstate/state.go +++ b/balancer/grpclb/state/state.go @@ -16,9 +16,9 @@ * */ -// Package grpclbstate declares grpclb types to be set by resolvers wishing to -// pass information to grpclb via resolver.State Attributes. -package grpclbstate +// Package state declares grpclb types to be set by resolvers wishing to pass +// information to grpclb via resolver.State Attributes. +package state import ( "google.golang.org/grpc/resolver" @@ -27,7 +27,7 @@ import ( // keyType is the key to use for storing State in Attributes. type keyType string -const key = keyType("grpc.grpclb.grpclbstate") +const key = keyType("grpc.grpclb.state") // State contains gRPCLB-relevant data passed from the name resolver. type State struct { diff --git a/internal/resolver/dns/dns_resolver.go b/internal/resolver/dns/dns_resolver.go index d51302e65c62..b08ac30adfef 100644 --- a/internal/resolver/dns/dns_resolver.go +++ b/internal/resolver/dns/dns_resolver.go @@ -32,7 +32,7 @@ import ( "sync" "time" - grpclbstate "google.golang.org/grpc/balancer/grpclb/grpclbstate" + grpclbstate "google.golang.org/grpc/balancer/grpclb/state" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/internal/backoff" "google.golang.org/grpc/internal/envconfig" diff --git a/internal/resolver/dns/dns_resolver_test.go b/internal/resolver/dns/dns_resolver_test.go index bfed6a74ff38..6bfcf299b33c 100644 --- a/internal/resolver/dns/dns_resolver_test.go +++ b/internal/resolver/dns/dns_resolver_test.go @@ -34,7 +34,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "google.golang.org/grpc/balancer" - grpclbstate "google.golang.org/grpc/balancer/grpclb/grpclbstate" + grpclbstate "google.golang.org/grpc/balancer/grpclb/state" "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/leakcheck" "google.golang.org/grpc/internal/testutils" From 2b4813f8d7ce9f724d716be9cc69af645102af26 Mon Sep 17 00:00:00 2001 From: Arvind Bright Date: Tue, 24 Jan 2023 13:15:19 -0800 Subject: [PATCH 4/4] Change version to 1.52.1 (#5965) --- version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.go b/version.go index 87c67abd1c10..19b419bfeb29 100644 --- a/version.go +++ b/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.52.1-dev" +const Version = "1.52.1"