Validate instance type before CloudFormation #1007
Merged
Conversation
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
CloudFormation will try to validate the Default ECSInstanceType parameter based on the AllowedValues field which is problematic in regions that do not support our default t2.micro instance type such as eu-north-1. Resolves #1006
SoManyHs
reviewed
Apr 8, 2020
iamhopaul123
reviewed
Apr 8, 2020
Comment on lines
422
to
433
| param, err := cfnParams.GetParameter(ParameterKeyInstanceType) | ||
| if err == cloudformation.ParameterNotFoundError { | ||
| logrus.Infof("Defaulting instance type to %s", cloudformation.DefaultECSInstanceType) | ||
|
|
||
| cfnParams.Add(ParameterKeyInstanceType, cloudformation.DefaultECSInstanceType) | ||
|
|
||
| return cloudformation.DefaultECSInstanceType, nil | ||
| } else if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| return aws.StringValue(param.ParameterValue), err |
There was a problem hiding this comment.
Suggested change
| param, err := cfnParams.GetParameter(ParameterKeyInstanceType) | |
| if err == cloudformation.ParameterNotFoundError { | |
| logrus.Infof("Defaulting instance type to %s", cloudformation.DefaultECSInstanceType) | |
| cfnParams.Add(ParameterKeyInstanceType, cloudformation.DefaultECSInstanceType) | |
| return cloudformation.DefaultECSInstanceType, nil | |
| } else if err != nil { | |
| return "", err | |
| } | |
| return aws.StringValue(param.ParameterValue), err | |
| param, err := cfnParams.GetParameter(ParameterKeyInstanceType) | |
| if err == nil { | |
| return aws.StringValue(param.ParameterValue), err | |
| } | |
| if err == cloudformation.ParameterNotFoundError { | |
| logrus.Infof("Defaulting instance type to %s", cloudformation.DefaultECSInstanceType) | |
| cfnParams.Add(ParameterKeyInstanceType, cloudformation.DefaultECSInstanceType) | |
| return cloudformation.DefaultECSInstanceType, nil | |
| } | |
| return "", err |
Maybe like this?
There was a problem hiding this comment.
It's more standard to left-align the happy path. We should check for non-nil errors first and handle those.
Sample output runsUnsupported instance type flag
Default instance type is unsupported in specified region
Instance type flag is supported in specified region
|
|
I still need to run the integration tests against these proposed changes. |
|
Integ tests are passing now. I had to add |
|
Would be keen to get this merged. |
SoManyHs
approved these changes
Apr 29, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
CloudFormation will try to validate the Default ECSInstanceType parameter
based on the AllowedValues field which is problematic in regions that do
not support our default t2.micro instance type such as eu-north-1.
Resolves #1006
Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Documentation
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.