chore(manifest): add from_tag for workload #3727
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,19 +11,18 @@ import ( | |
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/ec2" | ||
| "github.com/aws/copilot-cli/internal/pkg/aws/ec2/mocks" | ||
| "github.com/golang/mock/gomock" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| var ( | ||
| inAppEnvFilters = []Filter{ | ||
| { | ||
| Name: fmt.Sprintf(FmtTagFilter, "copilot-application"), | ||
| Values: []string{"my-app"}, | ||
| }, | ||
| { | ||
| Name: fmt.Sprintf(FmtTagFilter, "copilot-environment"), | ||
| Values: []string{"my-env"}, | ||
| }, | ||
| } | ||
|
|
@@ -42,6 +41,33 @@ var ( | |
| } | ||
| ) | ||
|
|
||
| func TestEC2_FilterForTags(t *testing.T) { | ||
| testCases := map[string]struct { | ||
| inValues []string | ||
| wanted Filter | ||
| }{ | ||
| "with no values": { | ||
| wanted: Filter{ | ||
| Name: "tag-key", | ||
| Values: []string{"mockKey"}, | ||
| }, | ||
| }, | ||
| "with values": { | ||
| inValues: []string{"foo", "bar"}, | ||
| wanted: Filter{ | ||
| Name: "tag:mockKey", | ||
| Values: []string{"foo", "bar"}, | ||
| }, | ||
| }, | ||
| } | ||
| for name, tc := range testCases { | ||
| t.Run(name, func(t *testing.T) { | ||
| filter := FilterForTags("mockKey", tc.inValues...) | ||
| require.Equal(t, tc.wanted, filter) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestEC2_extractResource(t *testing.T) { | ||
| testCases := map[string]struct { | ||
| displayString string | ||
|
|
@@ -802,6 +828,17 @@ func TestEC2_SubnetIDs(t *testing.T) { | |
| }, | ||
| wantedError: fmt.Errorf("describe subnets: error describing subnets"), | ||
| }, | ||
| "cannot get any subnets": { | ||
| inFilter: inAppEnvFilters, | ||
| mockEC2Client: func(m *mocks.Mockapi) { | ||
| m.EXPECT().DescribeSubnets(&ec2.DescribeSubnetsInput{ | ||
| Filters: toEC2Filter(inAppEnvFilters), | ||
| }).Return(&ec2.DescribeSubnetsOutput{ | ||
| Subnets: []*ec2.Subnet{}, | ||
| }, nil) | ||
| }, | ||
| wantedError: fmt.Errorf("cannot find any subnets"), | ||
| }, | ||
| "successfully get subnets": { | ||
| inFilter: inAppEnvFilters, | ||
| mockEC2Client: func(m *mocks.Mockapi) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ import ( | |
| "fmt" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/aws/session" | ||
| "github.com/aws/aws-sdk-go/service/ssm" | ||
| "github.com/aws/copilot-cli/internal/pkg/describe" | ||
|
|
||
|
|
@@ -44,6 +45,7 @@ type deployJobOpts struct { | |
| // cached variables | ||
| targetApp *config.Application | ||
| targetEnv *config.Environment | ||
| envSess *session.Session | ||
|
There was a problem hiding this comment. 😰 were we not using the correct session for job deploy this entire time>>> There was a problem hiding this comment. it is actually used here |
||
| appliedManifest interface{} | ||
| rootUserARN string | ||
| } | ||
|
|
@@ -149,6 +151,7 @@ func (o *deployJobOpts) Execute() error { | |
| interpolator: o.newInterpolator(o.appName, o.envName), | ||
| ws: o.ws, | ||
| unmarshal: o.unmarshal, | ||
| sess: o.envSess, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
|
|
@@ -220,6 +223,11 @@ func (o *deployJobOpts) configureClients() error { | |
| if err != nil { | ||
| return fmt.Errorf("create default session: %w", err) | ||
| } | ||
| envSess, err := o.sessProvider.FromRole(env.ManagerRoleARN, env.Region) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| o.envSess = envSess | ||
|
|
||
| // client to retrieve caller identity. | ||
| caller, err := identity.New(defaultSess).Get() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ import ( | |
| "strings" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/aws/session" | ||
| "github.com/aws/aws-sdk-go/service/ssm" | ||
| "github.com/aws/copilot-cli/internal/pkg/aws/identity" | ||
| "github.com/aws/copilot-cli/internal/pkg/aws/tags" | ||
|
|
@@ -63,6 +64,7 @@ type deploySvcOpts struct { | |
| // cached variables | ||
| targetApp *config.Application | ||
| targetEnv *config.Environment | ||
| envSess *session.Session | ||
| svcType string | ||
| appliedManifest interface{} | ||
| rootUserARN string | ||
|
|
@@ -185,6 +187,7 @@ func (o *deploySvcOpts) Execute() error { | |
| interpolator: o.newInterpolator(o.appName, o.envName), | ||
| ws: o.ws, | ||
| unmarshal: o.unmarshal, | ||
| sess: o.envSess, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
|
|
@@ -327,6 +330,11 @@ func (o *deploySvcOpts) configureClients() error { | |
| if err != nil { | ||
| return fmt.Errorf("create default session: %w", err) | ||
| } | ||
| envSess, err := o.sessProvider.FromRole(env.ManagerRoleARN, env.Region) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| o.envSess = envSess | ||
|
|
||
| // client to retrieve caller identity. | ||
| caller, err := identity.New(defaultSess).Get() | ||
|
|
@@ -353,6 +361,7 @@ type workloadManifestInput struct { | |
| envName string | ||
| ws wsWlDirReader | ||
| interpolator interpolator | ||
| sess *session.Session | ||
| unmarshal func([]byte) (manifest.WorkloadManifest, error) | ||
| } | ||
|
|
||
|
|
@@ -371,10 +380,13 @@ func workloadManifest(in *workloadManifestInput) (manifest.WorkloadManifest, err | |
| } | ||
| envMft, err := mft.ApplyEnv(in.envName) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("apply environment %s override: %w", in.envName, err) | ||
| } | ||
| if err := envMft.Validate(); err != nil { | ||
| return nil, fmt.Errorf("validate manifest against environment %q: %w", in.envName, err) | ||
| } | ||
| if err := envMft.Load(in.sess); err != nil { | ||
| return nil, fmt.Errorf("load dynamic content: %w", err) | ||
| } | ||
| return envMft, nil | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import ( | |
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws/session" | ||
| "github.com/aws/copilot-cli/internal/pkg/manifest" | ||
| "github.com/aws/copilot-cli/internal/pkg/template" | ||
| "github.com/golang/mock/gomock" | ||
|
|
@@ -348,6 +349,14 @@ func (m *mockWorkloadMft) Validate() error { | |
| return nil | ||
| } | ||
|
|
||
| func (m *mockWorkloadMft) Load(sess *session.Session) error { | ||
| return nil | ||
| } | ||
|
|
||
| func (m *mockWorkloadMft) Manifest() interface{} { | ||
| return nil | ||
| } | ||
|
|
||
| func (m *mockWorkloadMft) RequiredEnvironmentFeatures() []string { | ||
| return m.mockRequiredEnvironmentFeatures() | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ import ( | |
| "path/filepath" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/aws/session" | ||
| "github.com/aws/aws-sdk-go/service/ssm" | ||
| clideploy "github.com/aws/copilot-cli/internal/pkg/cli/deploy" | ||
| "github.com/aws/copilot-cli/internal/pkg/deploy" | ||
|
|
@@ -78,6 +79,7 @@ type packageSvcOpts struct { | |
| // cached variables | ||
| targetApp *config.Application | ||
| targetEnv *config.Environment | ||
| envSess *session.Session | ||
| appliedManifest manifest.WorkloadManifest | ||
| rootUserARN string | ||
| } | ||
|
|
@@ -136,10 +138,10 @@ func newWkldTplGenerator(o *packageSvcOpts) (workloadTemplateGenerator, error) { | |
| App: targetApp, | ||
| Env: targetEnv, | ||
| ImageTag: o.tag, | ||
| Mft: o.appliedManifest.Manifest(), | ||
| RawMft: raw, | ||
| } | ||
| switch t := o.appliedManifest.Manifest().(type) { | ||
| case *manifest.LoadBalancedWebService: | ||
| deployer, err = clideploy.NewLBWSDeployer(&in) | ||
| case *manifest.BackendService: | ||
|
|
@@ -275,6 +277,15 @@ func (o *packageSvcOpts) configureClients() error { | |
| if err != nil { | ||
| return fmt.Errorf("create default session: %w", err) | ||
| } | ||
| targetEnv, err := o.getTargetEnv() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| envSess, err := o.sessProvider.FromRole(targetEnv.ManagerRoleARN, targetEnv.Region) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| o.envSess = envSess | ||
| // client to retrieve caller identity. | ||
| caller, err := identity.New(defaultSess).Get() | ||
| if err != nil { | ||
|
|
@@ -308,6 +319,7 @@ func (o *packageSvcOpts) getSvcTemplates(env *config.Environment) (*wkldCfnTempl | |
| interpolator: o.newInterpolator(o.appName, o.envName), | ||
| ws: o.ws, | ||
| unmarshal: o.unmarshal, | ||
| sess: o.envSess, | ||
| }) | ||
| if err != nil { | ||
| return nil, err | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -542,9 +542,10 @@ func TestBackendService_TemplateAndParamsGeneration(t *testing.T) { | |
| paramsBytes, err := ioutil.ReadFile(tc.ParamsPath) | ||
| require.NoError(t, err) | ||
|
|
||
| dynamicMft, err := manifest.UnmarshalWorkload([]byte(manifestBytes)) | ||
| require.NoError(t, err) | ||
| require.NoError(t, dynamicMft.Validate()) | ||
| mft := dynamicMft.Manifest() | ||
|
|
||
| envConfig := &manifest.Environment{ | ||
| Workload: manifest.Workload{ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| //go:build integration || localintegration | ||
|
|
||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
@@ -48,11 +47,11 @@ func TestGrpcLoadBalancedWebService_Template(t *testing.T) { | |
| require.NoError(t, err) | ||
| envMft, err := mft.ApplyEnv(tc.envName) | ||
| require.NoError(t, err) | ||
| err = envMft.Validate() | ||
| require.NoError(t, err) | ||
| content := envMft.Manifest() | ||
|
There was a problem hiding this comment. Do you thing we also want to add the There was a problem hiding this comment. If we add it it is not local anymore lol There was a problem hiding this comment. It is not local only if it has There was a problem hiding this comment.
There was a problem hiding this comment. I feel like the only reason why these tests have all these Another way that I think about it is that I think these integration tests were meant to test that "given a manifest input, do I eventually get an expected template". Without calling There was a problem hiding this comment. that's true. IMO we need to
|
||
|
|
||
| v, ok := content.(*manifest.LoadBalancedWebService) | ||
| require.True(t, ok) | ||
|
|
||
| envConfig := &manifest.Environment{ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,11 +67,11 @@ func TestNetworkLoadBalancedWebService_Template(t *testing.T) { | |
| require.NoError(t, err) | ||
| envMft, err := mft.ApplyEnv(tc.envName) | ||
| require.NoError(t, err) | ||
| err = envMft.Validate() | ||
| require.NoError(t, err) | ||
| content := envMft.Manifest() | ||
|
|
||
| v, ok := content.(*manifest.LoadBalancedWebService) | ||
| require.True(t, ok) | ||
|
|
||
| svcDiscoveryEndpointName := fmt.Sprintf("%s.%s.local", tc.envName, appName) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,11 +67,11 @@ func TestLoadBalancedWebService_Template(t *testing.T) { | |
| require.NoError(t, err) | ||
| envMft, err := mft.ApplyEnv(tc.envName) | ||
| require.NoError(t, err) | ||
| err = envMft.Validate() | ||
| require.NoError(t, err) | ||
| content := envMft.Manifest() | ||
|
|
||
| v, ok := content.(*manifest.LoadBalancedWebService) | ||
| require.True(t, ok) | ||
|
|
||
| svcDiscoveryEndpointName := fmt.Sprintf("%s.%s.local", tc.envName, appName) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, this is a really clean function signature 👍 😍