Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-01-13 16:39:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

image: choose unique AWS image names based on the attestation variant (#1868)

Browse Source
This commit is contained in:
Malte Poll 2023-06-06 08:35:26 +02:00 committed by GitHub
parent 99a88c033c
commit f7f11c32f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/osimage/aws/awsupload.go
View File

@ -74,7 +74,7 @@ func New(region, bucketName string, log *logger.Logger) (*Uploader, error) {
// Upload uploads an OS image to AWS. // Upload uploads an OS image to AWS.
func (u *Uploader) Upload(ctx context.Context, req *osimage.UploadRequest) ([]versionsapi.ImageInfoEntry, error) { func (u *Uploader) Upload(ctx context.Context, req *osimage.UploadRequest) ([]versionsapi.ImageInfoEntry, error) {
blobName := fmt.Sprintf("image-%s-%s-%d.raw", req.Version.Stream, req.Version.Version, req.Timestamp.Unix()) blobName := fmt.Sprintf("image-%s-%s-%d.raw", req.Version.Stream, req.Version.Version, req.Timestamp.Unix())
imageName := imageName(req.Version, req.Timestamp) imageName := imageName(req.Version, req.AttestationVariant, req.Timestamp)
allRegions := []string{u.region} allRegions := []string{u.region}
allRegions = append(allRegions, replicationRegions...) allRegions = append(allRegions, replicationRegions...)
// TODO(malt3): make this configurable // TODO(malt3): make this configurable
@ -478,11 +478,11 @@ func (u *Uploader) ensureImageDeleted(ctx context.Context, imageName, region str
return nil return nil
} }
func imageName(version versionsapi.Version, timestamp time.Time) string { func imageName(version versionsapi.Version, attestationVariant string, timestamp time.Time) string {
if version.Stream == "stable" { if version.Stream == "stable" {
return fmt.Sprintf("constellation-%s", version.Version) return fmt.Sprintf("constellation-%s-%s", version.Version, attestationVariant)
} }
return fmt.Sprintf("constellation-%s-%s-%s", version.Stream, version.Version, timestamp.Format(timestampFormat)) return fmt.Sprintf("constellation-%s-%s-%s-%s", version.Stream, version.Version, attestationVariant, timestamp.Format(timestampFormat))
} }
func waitForSnapshotImport(ctx context.Context, ec2C ec2API, importTaskID string) (string, error) { func waitForSnapshotImport(ctx context.Context, ec2C ec2API, importTaskID string) (string, error) {