From a7a68fc97eeb9041635abce348de5b5e2c4ff9a2 Mon Sep 17 00:00:00 2001 From: Wanxian Yang Date: Wed, 10 Mar 2021 11:14:50 -0600 Subject: [PATCH 1/2] chore: quick fix --- internal/pkg/cli/env_show_test.go | 2 +- internal/pkg/describe/env.go | 10 +++++----- internal/pkg/describe/env_test.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/pkg/cli/env_show_test.go b/internal/pkg/cli/env_show_test.go index 77af75ba25b..0b6f42067ab 100644 --- a/internal/pkg/cli/env_show_test.go +++ b/internal/pkg/cli/env_show_test.go @@ -324,7 +324,7 @@ Resources ) }, - wantedContent: "{\"environment\":{\"app\":\"testApp\",\"name\":\"testEnv\",\"region\":\"us-west-2\",\"accountID\":\"123456789012\",\"prod\":false,\"registryURL\":\"\",\"executionRoleARN\":\"\",\"managerRoleARN\":\"\"},\"services\":[{\"app\":\"testApp\",\"name\":\"testSvc1\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc2\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc3\",\"type\":\"load-balanced\"}],\"tags\":{\"copilot-application\":\"testApp\",\"copilot-environment\":\"testEnv\",\"key1\":\"value1\",\"key2\":\"value2\"},\"resources\":[{\"type\":\"AWS::IAM::Role\",\"physicalID\":\"testApp-testEnv-CFNExecutionRole\"},{\"type\":\"testApp-testEnv-Cluster\",\"physicalID\":\"AWS::ECS::Cluster-jI63pYBWU6BZ\"}],\"environment_vpc\":{\"ID\":\"\",\"PublicSubnetIDs\":null,\"PrivateSubnetIDs\":null}}\n", + wantedContent: "{\"environment\":{\"app\":\"testApp\",\"name\":\"testEnv\",\"region\":\"us-west-2\",\"accountID\":\"123456789012\",\"prod\":false,\"registryURL\":\"\",\"executionRoleARN\":\"\",\"managerRoleARN\":\"\"},\"services\":[{\"app\":\"testApp\",\"name\":\"testSvc1\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc2\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc3\",\"type\":\"load-balanced\"}],\"tags\":{\"copilot-application\":\"testApp\",\"copilot-environment\":\"testEnv\",\"key1\":\"value1\",\"key2\":\"value2\"},\"resources\":[{\"type\":\"AWS::IAM::Role\",\"physicalID\":\"testApp-testEnv-CFNExecutionRole\"},{\"type\":\"testApp-testEnv-Cluster\",\"physicalID\":\"AWS::ECS::Cluster-jI63pYBWU6BZ\"}],\"environmentVPC\":{\"id\":\"\",\"publicSubnets\":null,\"privateSubnets\":null}}\n", }, } diff --git a/internal/pkg/describe/env.go b/internal/pkg/describe/env.go index d4dca0ebd8f..dc99c6b76a8 100644 --- a/internal/pkg/describe/env.go +++ b/internal/pkg/describe/env.go @@ -26,14 +26,14 @@ type EnvDescription struct { Services []*config.Workload `json:"services"` Tags map[string]string `json:"tags,omitempty"` Resources []*CfnResource `json:"resources,omitempty"` - EnvironmentVPC EnvironmentVPC `json:"environment_vpc"` + EnvironmentVPC EnvironmentVPC `json:"environmentVPC"` } // EnvironmentVPC holds the ID of the environment's VPC configuration. type EnvironmentVPC struct { - ID string - PublicSubnetIDs []string - PrivateSubnetIDs []string + ID string `json:"id"` + PublicSubnetIDs []string `json:"publicSubnets"` + PrivateSubnetIDs []string `json:"privateSubnets"` } // EnvDescriber retrieves information about an environment. @@ -130,7 +130,7 @@ func (d *EnvDescriber) Version() (string, error) { } func (d *EnvDescriber) loadStackInfo() (map[string]string, EnvironmentVPC, error) { - environmentVPC := EnvironmentVPC{} + var environmentVPC EnvironmentVPC tags := make(map[string]string) envStack, err := d.stackDescriber.Stack(stack.NameForEnv(d.app, d.env.Name)) diff --git a/internal/pkg/describe/env_test.go b/internal/pkg/describe/env_test.go index 61eaf30f206..3674fbc29f4 100644 --- a/internal/pkg/describe/env_test.go +++ b/internal/pkg/describe/env_test.go @@ -341,7 +341,7 @@ func TestEnvDescription_JSONString(t *testing.T) { Type: "load-balanced", } allSvcs := []*config.Workload{testSvc1, testSvc2, testSvc3} - wantedContent := "{\"environment\":{\"app\":\"testApp\",\"name\":\"testEnv\",\"region\":\"us-west-2\",\"accountID\":\"123456789012\",\"prod\":false,\"registryURL\":\"\",\"executionRoleARN\":\"\",\"managerRoleARN\":\"\",\"customConfig\":{}},\"services\":[{\"app\":\"testApp\",\"name\":\"testSvc1\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc2\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc3\",\"type\":\"load-balanced\"}],\"tags\":{\"key1\":\"value1\",\"key2\":\"value2\"},\"resources\":[{\"type\":\"AWS::IAM::Role\",\"physicalID\":\"testApp-testEnv-CFNExecutionRole\"},{\"type\":\"testApp-testEnv-Cluster\",\"physicalID\":\"AWS::ECS::Cluster-jI63pYBWU6BZ\"}],\"environment_vpc\":{\"ID\":\"\",\"PublicSubnetIDs\":null,\"PrivateSubnetIDs\":null}}\n" + wantedContent := "{\"environment\":{\"app\":\"testApp\",\"name\":\"testEnv\",\"region\":\"us-west-2\",\"accountID\":\"123456789012\",\"prod\":false,\"registryURL\":\"\",\"executionRoleARN\":\"\",\"managerRoleARN\":\"\",\"customConfig\":{}},\"services\":[{\"app\":\"testApp\",\"name\":\"testSvc1\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc2\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc3\",\"type\":\"load-balanced\"}],\"tags\":{\"key1\":\"value1\",\"key2\":\"value2\"},\"resources\":[{\"type\":\"AWS::IAM::Role\",\"physicalID\":\"testApp-testEnv-CFNExecutionRole\"},{\"type\":\"testApp-testEnv-Cluster\",\"physicalID\":\"AWS::ECS::Cluster-jI63pYBWU6BZ\"}],\"environmentVPC\":{\"id\":\"\",\"publicSubnets\":null,\"privateSubnets\":null}}\n" // GIVEN ctrl := gomock.NewController(t) From 69075d82d5e9fe5a3e4fdfd2213033890ecb5e9b Mon Sep 17 00:00:00 2001 From: Wanxian Yang Date: Wed, 10 Mar 2021 11:30:24 -0600 Subject: [PATCH 2/2] address feedback on json field namesC --- internal/pkg/cli/env_show_test.go | 2 +- internal/pkg/describe/env.go | 4 ++-- internal/pkg/describe/env_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/pkg/cli/env_show_test.go b/internal/pkg/cli/env_show_test.go index 0b6f42067ab..f55ef853496 100644 --- a/internal/pkg/cli/env_show_test.go +++ b/internal/pkg/cli/env_show_test.go @@ -324,7 +324,7 @@ Resources ) }, - wantedContent: "{\"environment\":{\"app\":\"testApp\",\"name\":\"testEnv\",\"region\":\"us-west-2\",\"accountID\":\"123456789012\",\"prod\":false,\"registryURL\":\"\",\"executionRoleARN\":\"\",\"managerRoleARN\":\"\"},\"services\":[{\"app\":\"testApp\",\"name\":\"testSvc1\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc2\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc3\",\"type\":\"load-balanced\"}],\"tags\":{\"copilot-application\":\"testApp\",\"copilot-environment\":\"testEnv\",\"key1\":\"value1\",\"key2\":\"value2\"},\"resources\":[{\"type\":\"AWS::IAM::Role\",\"physicalID\":\"testApp-testEnv-CFNExecutionRole\"},{\"type\":\"testApp-testEnv-Cluster\",\"physicalID\":\"AWS::ECS::Cluster-jI63pYBWU6BZ\"}],\"environmentVPC\":{\"id\":\"\",\"publicSubnets\":null,\"privateSubnets\":null}}\n", + wantedContent: "{\"environment\":{\"app\":\"testApp\",\"name\":\"testEnv\",\"region\":\"us-west-2\",\"accountID\":\"123456789012\",\"prod\":false,\"registryURL\":\"\",\"executionRoleARN\":\"\",\"managerRoleARN\":\"\"},\"services\":[{\"app\":\"testApp\",\"name\":\"testSvc1\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc2\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc3\",\"type\":\"load-balanced\"}],\"tags\":{\"copilot-application\":\"testApp\",\"copilot-environment\":\"testEnv\",\"key1\":\"value1\",\"key2\":\"value2\"},\"resources\":[{\"type\":\"AWS::IAM::Role\",\"physicalID\":\"testApp-testEnv-CFNExecutionRole\"},{\"type\":\"testApp-testEnv-Cluster\",\"physicalID\":\"AWS::ECS::Cluster-jI63pYBWU6BZ\"}],\"environmentVPC\":{\"id\":\"\",\"publicSubnetIDs\":null,\"privateSubnetIDs\":null}}\n", }, } diff --git a/internal/pkg/describe/env.go b/internal/pkg/describe/env.go index dc99c6b76a8..6669718469e 100644 --- a/internal/pkg/describe/env.go +++ b/internal/pkg/describe/env.go @@ -32,8 +32,8 @@ type EnvDescription struct { // EnvironmentVPC holds the ID of the environment's VPC configuration. type EnvironmentVPC struct { ID string `json:"id"` - PublicSubnetIDs []string `json:"publicSubnets"` - PrivateSubnetIDs []string `json:"privateSubnets"` + PublicSubnetIDs []string `json:"publicSubnetIDs"` + PrivateSubnetIDs []string `json:"privateSubnetIDs"` } // EnvDescriber retrieves information about an environment. diff --git a/internal/pkg/describe/env_test.go b/internal/pkg/describe/env_test.go index 3674fbc29f4..f47c3014f7b 100644 --- a/internal/pkg/describe/env_test.go +++ b/internal/pkg/describe/env_test.go @@ -341,7 +341,7 @@ func TestEnvDescription_JSONString(t *testing.T) { Type: "load-balanced", } allSvcs := []*config.Workload{testSvc1, testSvc2, testSvc3} - wantedContent := "{\"environment\":{\"app\":\"testApp\",\"name\":\"testEnv\",\"region\":\"us-west-2\",\"accountID\":\"123456789012\",\"prod\":false,\"registryURL\":\"\",\"executionRoleARN\":\"\",\"managerRoleARN\":\"\",\"customConfig\":{}},\"services\":[{\"app\":\"testApp\",\"name\":\"testSvc1\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc2\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc3\",\"type\":\"load-balanced\"}],\"tags\":{\"key1\":\"value1\",\"key2\":\"value2\"},\"resources\":[{\"type\":\"AWS::IAM::Role\",\"physicalID\":\"testApp-testEnv-CFNExecutionRole\"},{\"type\":\"testApp-testEnv-Cluster\",\"physicalID\":\"AWS::ECS::Cluster-jI63pYBWU6BZ\"}],\"environmentVPC\":{\"id\":\"\",\"publicSubnets\":null,\"privateSubnets\":null}}\n" + wantedContent := "{\"environment\":{\"app\":\"testApp\",\"name\":\"testEnv\",\"region\":\"us-west-2\",\"accountID\":\"123456789012\",\"prod\":false,\"registryURL\":\"\",\"executionRoleARN\":\"\",\"managerRoleARN\":\"\",\"customConfig\":{}},\"services\":[{\"app\":\"testApp\",\"name\":\"testSvc1\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc2\",\"type\":\"load-balanced\"},{\"app\":\"testApp\",\"name\":\"testSvc3\",\"type\":\"load-balanced\"}],\"tags\":{\"key1\":\"value1\",\"key2\":\"value2\"},\"resources\":[{\"type\":\"AWS::IAM::Role\",\"physicalID\":\"testApp-testEnv-CFNExecutionRole\"},{\"type\":\"testApp-testEnv-Cluster\",\"physicalID\":\"AWS::ECS::Cluster-jI63pYBWU6BZ\"}],\"environmentVPC\":{\"id\":\"\",\"publicSubnetIDs\":null,\"privateSubnetIDs\":null}}\n" // GIVEN ctrl := gomock.NewController(t)