Merge pull request #4018 from as14692/fix-grpcclient-refactor

Refactor: move gMSA grpcclient to ecs-agent/
aws · Nov 9, 2023 · 12aa125 · 12aa125
2 parents 7430801 + 4609629
commit 12aa125
Show file tree

Hide file tree

Showing 15 changed files with 1,215 additions and 15 deletions.
diff --git a/agent/go.mod b/agent/go.mod
@@ -30,8 +30,6 @@ require (
 	go.etcd.io/bbolt v1.3.6
 	golang.org/x/sys v0.13.0
 	golang.org/x/tools v0.12.0
-	google.golang.org/grpc v1.56.3
-	google.golang.org/protobuf v1.30.0
 	k8s.io/api v0.28.1
 )
 
@@ -71,6 +69,8 @@ require (
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.56.3 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/agent/taskresource/credentialspec/credentialspec_linux.go b/agent/taskresource/credentialspec/credentialspec_linux.go
@@ -36,8 +36,8 @@ import (
 
 	s3factory "github.com/aws/amazon-ecs-agent/agent/s3/factory"
 	ssmfactory "github.com/aws/amazon-ecs-agent/agent/ssm/factory"
-	credentialsfetcherclient "github.com/aws/amazon-ecs-agent/agent/taskresource/grpcclient"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
+	credentialsfetcherclient "github.com/aws/amazon-ecs-agent/ecs-agent/gmsacredclient"
 	"github.com/pkg/errors"
 )
 

diff --git a/...edentialsfetcher/credentialsfetcher.pb.go → ...edentialsfetcher/credentialsfetcher.pb.go b/...edentialsfetcher/credentialsfetcher.pb.go → ...edentialsfetcher/credentialsfetcher.pb.go
diff --git a/...edentialsfetcher/credentialsfetcher.proto → ...edentialsfetcher/credentialsfetcher.proto b/...edentialsfetcher/credentialsfetcher.proto → ...edentialsfetcher/credentialsfetcher.proto
diff --git a/...ialsfetcher/credentialsfetcher_grpc.pb.go → ...ialsfetcher/credentialsfetcher_grpc.pb.go b/...ialsfetcher/credentialsfetcher_grpc.pb.go → ...ialsfetcher/credentialsfetcher_grpc.pb.go
diff --git a/...ce/grpcclient/credentialsfetcherclient.go → ...msacredclient/credentialsfetcherclient.go b/...ce/grpcclient/credentialsfetcherclient.go → ...msacredclient/credentialsfetcherclient.go
diff --git a/agent/vendor/modules.txt b/agent/vendor/modules.txt
@@ -35,6 +35,8 @@ github.com/aws/amazon-ecs-agent/ecs-agent/doctor
 github.com/aws/amazon-ecs-agent/ecs-agent/ec2
 github.com/aws/amazon-ecs-agent/ecs-agent/ec2/mocks
 github.com/aws/amazon-ecs-agent/ecs-agent/eventstream
+github.com/aws/amazon-ecs-agent/ecs-agent/gmsacredclient
+github.com/aws/amazon-ecs-agent/ecs-agent/gmsacredclient/credentialsfetcher
 github.com/aws/amazon-ecs-agent/ecs-agent/httpclient
 github.com/aws/amazon-ecs-agent/ecs-agent/httpclient/mock
 github.com/aws/amazon-ecs-agent/ecs-agent/logger
@@ -478,7 +480,6 @@ google.golang.org/grpc/serviceconfig
 google.golang.org/grpc/stats
 google.golang.org/grpc/status
 google.golang.org/grpc/tap
-google.golang.org/grpc/test/bufconn
 # google.golang.org/protobuf v1.30.0
 ## explicit; go 1.11
 google.golang.org/protobuf/encoding/protojson