Skip to content
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

Jump to bottom

Loudly error when failing to make an AMI public #38

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Loudly error when failing to make an AMI public #38

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
53cb14c
Loudly error when failing to make an AMI public
klakin-pivotal Mar 20, 2024
8cb61f0
Remove nolint check now that we are checking for error
klakin-pivotal Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion driver/copy_ami_driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (d *SDKCopyAmiDriver) Create(driverConfig resources.AmiDriverConfig) (resou

if driverConfig.Accessibility == resources.PublicAmiAccessibility {
d.logger.Printf("making AMI: %s public", *amiIDptr)
ec2Client.ModifyImageAttribute(&ec2.ModifyImageAttributeInput{ //nolint:errcheck
_, err = ec2Client.ModifyImageAttribute(&ec2.ModifyImageAttributeInput{
ImageId: amiIDptr,
LaunchPermission: &ec2.LaunchPermissionModifications{
Add: []*ec2.LaunchPermission{
Expand All @@ -138,6 +138,9 @@ func (d *SDKCopyAmiDriver) Create(driverConfig resources.AmiDriverConfig) (resou
},
},
})
if err != nil {
return resources.Ami{}, fmt.Errorf("failed to make AMI '%s' public: %w", *amiIDptr, err)
}
}

if driverConfig.Encrypted {
Expand Down
27 changes: 27 additions & 0 deletions driver/copy_ami_driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,33 @@ var _ = Describe("CopyAmiDriver", func() {
})
})
})
Context("when making an AMI public", func() {
It("will return an error if it can't make the AMI public", func() {
amiProperties := resources.AmiProperties{
Name: fmt.Sprintf("BOSH-%s", strings.ToUpper(uuid.NewV4().String())),
VirtualizationType: resources.HvmAmiVirtualization,
Description: "bosh cpi test ami",
Accessibility: resources.PublicAmiAccessibility,
Encrypted: true,
KmsKeyId: multiRegionKey,
}
destinationRegionKmsKeyId := strings.ReplaceAll(multiRegionKey, creds.Region, destinationRegion)
amiCopyConfig := AmiCopyConfig{
amiId: privateAmiFixtureID,
encrypted: true,
kmsKeyId: destinationRegionKmsKeyId,
}
amiDriverConfig := resources.AmiDriverConfig{
ExistingAmiID: amiCopyConfig.amiId,
DestinationRegion: destinationRegion,
AmiProperties: amiProperties,
KmsKey: resources.KmsKey{ARN: amiCopyConfig.kmsKeyId},
}
amiCopyDriver := driverset.NewStandardRegionDriverSet(GinkgoWriter, creds).CopyAmiDriver()
_, err := amiCopyDriver.Create(amiDriverConfig)
Expect(err).To(HaveOccurred())
})
})
})

func copyAmi(amiCopyConfig AmiCopyConfig, cb ...func(*ec2.EC2, *ec2.DescribeImagesOutput)) {
Expand Down