iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update validation for session_manager connectivity 

Validation will now check that either a IamInstanceProfile or a TemporaryIamInstanceProfilePolicyDocument is set
This commit is contained in:
Wilken Rivera 2020-04-29 15:15:27 -04:00
parent 2f09b74587
commit f498866c3a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builder/amazon/common/run_config.go
View File

@ -464,8 +464,7 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
errs = append(errs, msg) errs = append(errs, msg)
} }
// TODO (nywilken) add support for temporary iam instance policy generation if c.IamInstanceProfile == "" && c.TemporaryIamInstanceProfilePolicyDocument == nil {
if c.IamInstanceProfile == "" {
msg := fmt.Errorf(`no iam_instance_profile defined; when using %q a valid instance profile with AmazonSSMManagedInstanceCore permissions is required`, c.SSHInterface) msg := fmt.Errorf(`no iam_instance_profile defined; when using %q a valid instance profile with AmazonSSMManagedInstanceCore permissions is required`, c.SSHInterface)
errs = append(errs, msg) errs = append(errs, msg)
} }
@ -544,7 +543,7 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
if c.EnableT2Unlimited { if c.EnableT2Unlimited {
if c.SpotPrice != "" { if c.SpotPrice != "" {
errs = append(errs, fmt.Errorf("Error: T2 Unlimited cannot be used in conjuction with Spot Instances")) errs = append(errs, fmt.Errorf("Error: T2 Unlimited cannot be used in conjunction with Spot Instances"))
} }
firstDotIndex := strings.Index(c.InstanceType, ".") firstDotIndex := strings.Index(c.InstanceType, ".")
if firstDotIndex == -1 { if firstDotIndex == -1 {
@ -562,5 +561,6 @@ func (c *RunConfig) IsSpotInstance() bool {
} }
func (c *RunConfig) SSMAgentEnabled() bool { func (c *RunConfig) SSMAgentEnabled() bool {
return c.SSHInterface == "session_manager" && c.IamInstanceProfile != "" hasIamInstanceProfile := c.IamInstanceProfile != "" || c.TemporaryIamInstanceProfilePolicyDocument != nil
return c.SSHInterface == "session_manager" && hasIamInstanceProfile
} }