From a1de3b2bd6b8fd77f27fe5e1c30484ab7503e84d Mon Sep 17 00:00:00 2001 From: Cesar Ghali Date: Mon, 26 Feb 2018 18:05:53 -0800 Subject: [PATCH] alts: Change ALTS proto package name (#1886) --- credentials/alts/alts.go | 2 +- credentials/alts/alts_test.go | 2 +- credentials/alts/core/authinfo/authinfo.go | 2 +- credentials/alts/core/authinfo/authinfo_test.go | 2 +- credentials/alts/core/handshaker/handshaker.go | 2 +- credentials/alts/core/handshaker/handshaker_test.go | 2 +- credentials/alts/core/proto/{ => grpc_gcp}/altscontext.pb.go | 0 credentials/alts/core/proto/{ => grpc_gcp}/altscontext.proto | 0 credentials/alts/core/proto/{ => grpc_gcp}/handshaker.pb.go | 0 credentials/alts/core/proto/{ => grpc_gcp}/handshaker.proto | 0 .../core/proto/{ => grpc_gcp}/transport_security_common.pb.go | 0 .../core/proto/{ => grpc_gcp}/transport_security_common.proto | 0 interop/alts/client/client.go | 1 - interop/alts/server/server.go | 1 - 14 files changed, 6 insertions(+), 8 deletions(-) rename credentials/alts/core/proto/{ => grpc_gcp}/altscontext.pb.go (100%) rename credentials/alts/core/proto/{ => grpc_gcp}/altscontext.proto (100%) rename credentials/alts/core/proto/{ => grpc_gcp}/handshaker.pb.go (100%) rename credentials/alts/core/proto/{ => grpc_gcp}/handshaker.proto (100%) rename credentials/alts/core/proto/{ => grpc_gcp}/transport_security_common.pb.go (100%) rename credentials/alts/core/proto/{ => grpc_gcp}/transport_security_common.proto (100%) diff --git a/credentials/alts/alts.go b/credentials/alts/alts.go index a5881656..9875d4d9 100644 --- a/credentials/alts/alts.go +++ b/credentials/alts/alts.go @@ -36,7 +36,7 @@ import ( "google.golang.org/grpc/credentials/alts/core" "google.golang.org/grpc/credentials/alts/core/handshaker" "google.golang.org/grpc/credentials/alts/core/handshaker/service" - altspb "google.golang.org/grpc/credentials/alts/core/proto" + altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp" "google.golang.org/grpc/grpclog" ) diff --git a/credentials/alts/alts_test.go b/credentials/alts/alts_test.go index 0b884818..9c5e7eeb 100644 --- a/credentials/alts/alts_test.go +++ b/credentials/alts/alts_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/golang/protobuf/proto" - altspb "google.golang.org/grpc/credentials/alts/core/proto" + altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp" ) func TestInfoServerName(t *testing.T) { diff --git a/credentials/alts/core/authinfo/authinfo.go b/credentials/alts/core/authinfo/authinfo.go index 284edbff..2fe54b74 100644 --- a/credentials/alts/core/authinfo/authinfo.go +++ b/credentials/alts/core/authinfo/authinfo.go @@ -21,7 +21,7 @@ package authinfo import ( "google.golang.org/grpc/credentials" - altspb "google.golang.org/grpc/credentials/alts/core/proto" + altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp" ) var _ credentials.AuthInfo = (*altsAuthInfo)(nil) diff --git a/credentials/alts/core/authinfo/authinfo_test.go b/credentials/alts/core/authinfo/authinfo_test.go index b3d430a3..635d8049 100644 --- a/credentials/alts/core/authinfo/authinfo_test.go +++ b/credentials/alts/core/authinfo/authinfo_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - altspb "google.golang.org/grpc/credentials/alts/core/proto" + altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp" ) const ( diff --git a/credentials/alts/core/handshaker/handshaker.go b/credentials/alts/core/handshaker/handshaker.go index ac5a3385..d6568468 100644 --- a/credentials/alts/core/handshaker/handshaker.go +++ b/credentials/alts/core/handshaker/handshaker.go @@ -33,7 +33,7 @@ import ( "google.golang.org/grpc/credentials/alts/core" "google.golang.org/grpc/credentials/alts/core/authinfo" "google.golang.org/grpc/credentials/alts/core/conn" - altspb "google.golang.org/grpc/credentials/alts/core/proto" + altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp" ) const ( diff --git a/credentials/alts/core/handshaker/handshaker_test.go b/credentials/alts/core/handshaker/handshaker_test.go index d01cd1d9..322fcb4d 100644 --- a/credentials/alts/core/handshaker/handshaker_test.go +++ b/credentials/alts/core/handshaker/handshaker_test.go @@ -26,7 +26,7 @@ import ( "golang.org/x/net/context" grpc "google.golang.org/grpc" "google.golang.org/grpc/credentials/alts/core" - altspb "google.golang.org/grpc/credentials/alts/core/proto" + altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp" "google.golang.org/grpc/credentials/alts/core/testutil" ) diff --git a/credentials/alts/core/proto/altscontext.pb.go b/credentials/alts/core/proto/grpc_gcp/altscontext.pb.go similarity index 100% rename from credentials/alts/core/proto/altscontext.pb.go rename to credentials/alts/core/proto/grpc_gcp/altscontext.pb.go diff --git a/credentials/alts/core/proto/altscontext.proto b/credentials/alts/core/proto/grpc_gcp/altscontext.proto similarity index 100% rename from credentials/alts/core/proto/altscontext.proto rename to credentials/alts/core/proto/grpc_gcp/altscontext.proto diff --git a/credentials/alts/core/proto/handshaker.pb.go b/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go similarity index 100% rename from credentials/alts/core/proto/handshaker.pb.go rename to credentials/alts/core/proto/grpc_gcp/handshaker.pb.go diff --git a/credentials/alts/core/proto/handshaker.proto b/credentials/alts/core/proto/grpc_gcp/handshaker.proto similarity index 100% rename from credentials/alts/core/proto/handshaker.proto rename to credentials/alts/core/proto/grpc_gcp/handshaker.proto diff --git a/credentials/alts/core/proto/transport_security_common.pb.go b/credentials/alts/core/proto/grpc_gcp/transport_security_common.pb.go similarity index 100% rename from credentials/alts/core/proto/transport_security_common.pb.go rename to credentials/alts/core/proto/grpc_gcp/transport_security_common.pb.go diff --git a/credentials/alts/core/proto/transport_security_common.proto b/credentials/alts/core/proto/grpc_gcp/transport_security_common.proto similarity index 100% rename from credentials/alts/core/proto/transport_security_common.proto rename to credentials/alts/core/proto/grpc_gcp/transport_security_common.proto diff --git a/interop/alts/client/client.go b/interop/alts/client/client.go index 0b61470a..03feeacf 100644 --- a/interop/alts/client/client.go +++ b/interop/alts/client/client.go @@ -17,7 +17,6 @@ */ // This binary can only run on Google Cloud Platform (GCP). - package main import ( diff --git a/interop/alts/server/server.go b/interop/alts/server/server.go index dcbf2c79..d4e24dfd 100644 --- a/interop/alts/server/server.go +++ b/interop/alts/server/server.go @@ -17,7 +17,6 @@ */ // This binary can only run on Google Cloud Platform (GCP). - package main import (