-
Notifications
You must be signed in to change notification settings - Fork 20
Return error when cfn template container does not have an image #1522
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.
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
Open
edwardrf
wants to merge
7
commits into
main
Choose a base branch
from
edw/cfn-no-image-error
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+13
−4
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4c2b1d4
Return error when cfn template container does not have an image
edw-defang 0ec895d
Trim space before test image empty
edw-defang 8e626a0
Update src/pkg/clouds/aws/ecs/cfn/setup.go
edwardrf 0506d7b
Update src/pkg/clouds/aws/ecs/cfn/setup.go
edwardrf 0c855b4
Merge branch 'main' into edw/cfn-no-image-error
edwardrf 24c27d1
Update src/pkg/clouds/aws/ecs/cfn/setup.go
lionello 56b0656
Merge branch 'main' into edw/cfn-no-image-error
edwardrf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ import ( | |
| "crypto/sha256" | ||
| "encoding/hex" | ||
| "encoding/json" | ||
| "fmt" | ||
| "math" | ||
| "os" | ||
| "strconv" | ||
|
|
@@ -58,7 +59,7 @@ type TemplateOverrides struct { | |
|
|
||
| const TemplateRevision = 1 // bump this when the template changes! | ||
|
|
||
| func createTemplate(stack string, containers []types.Container, overrides TemplateOverrides) *cloudformation.Template { | ||
| func createTemplate(stack string, containers []types.Container, overrides TemplateOverrides) (*cloudformation.Template, error) { | ||
| prefix := stack + "-" | ||
|
|
||
| defaultTags := []tags.Tag{ | ||
|
|
@@ -182,6 +183,9 @@ func createTemplate(stack string, containers []types.Container, overrides Templa | |
| // TODO: support pull through cache for other registries | ||
| // TODO: support private repos (with or without pull-through cache) | ||
| } | ||
| if strings.TrimSpace(image) == "" { | ||
| return nil, fmt.Errorf("container %v is using invalid image: %q", task.Name, task.Image) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is good to have, but I'd add another check higher up the stack with a more user-facing error message. |
||
| } | ||
| images = append(images, image) | ||
| } | ||
|
|
||
|
|
@@ -545,5 +549,5 @@ func createTemplate(stack string, containers []types.Container, overrides Templa | |
| Value: cloudformation.Int(TemplateRevision), | ||
| } | ||
|
|
||
| return template | ||
| return template, nil | ||
| } | ||
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.
a bit random to have
TrimSpacehere?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.
Yeah, a bit premature optimisation, just trying to avoid "\t", "\n" kind of situation.
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.
Let's not do it