Skip to content

fix(cli): use image.location value instead of digest on svc package #4055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Oct 4, 2022
Merged

fix(cli): use image.location value instead of digest on svc package #4055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ac5472
fix(cli): use `image.location` value instead of digest on `svc package`
efekarakus Oct 3, 2022
6a3d8d7
Merge branch 'mainline' into troubleshoot/2912
mergify[bot] Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/pkg/cli/deploy/svc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ func (d *workloadDeployer) runtimeConfig(in *StackRuntimeConfiguration) (*stack.
if err != nil {
return nil, fmt.Errorf("get version of environment %q: %w", d.env.Name, err)
}
if in.ImageDigest == nil {
if len(aws.StringValue(in.ImageDigest)) == 0 {
return &stack.RuntimeConfig{
AddonsTemplateURL: in.AddonsURL,
EnvFileARN: in.EnvFileARN,
Expand Down
6 changes: 2 additions & 4 deletions internal/pkg/cli/svc_package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,7 @@ func (o *packageSvcOpts) getWorkloadStack(generator workloadStackGenerator) (*cf
if err != nil {
return nil, err
}
uploadOut := clideploy.UploadArtifactsOutput{
ImageDigest: aws.String(""),
}
var uploadOut clideploy.UploadArtifactsOutput
if o.uploadAssets {
out, err := generator.UploadArtifacts()
if err != nil {
Expand All @@ -334,7 +332,7 @@ func (o *packageSvcOpts) getWorkloadStack(generator workloadStackGenerator) (*cf
EnvFileARN: uploadOut.EnvFileARN,
AddonsURL: uploadOut.AddonsURL,
CustomResourceURLs: uploadOut.CustomResourceURLs,
},
},
})
if err != nil {
return nil, fmt.Errorf("generate workload %s template against environment %s: %w", o.name, o.envName, err)
Expand Down
1 change: 0 additions & 1 deletion internal/pkg/cli/svc_package_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ count: 1`
m.generator.EXPECT().AddonsTemplate().Return("", nil)
m.generator.EXPECT().GenerateCloudFormationTemplate(&deploy.GenerateCloudFormationTemplateInput{
StackRuntimeConfiguration: deploy.StackRuntimeConfiguration{
ImageDigest: aws.String(""),
RootUserARN: mockARN,
},
}).Return(&deploy.GenerateCloudFormationTemplateOutput{
Expand Down