Merge pull request #39 from max-soe/master

Share the snapshots of private stemcells
cloudfoundry · May 16, 2024 · 5f7466a · 5f7466a
2 parents 4345f2c + acf67f3
commit 5f7466a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/driver/copy_ami_driver.go b/driver/copy_ami_driver.go
@@ -143,10 +143,6 @@ func (d *SDKCopyAmiDriver) Create(driverConfig resources.AmiDriverConfig) (resou
 		}
 	}
 
-	if driverConfig.Encrypted {
-		return resources.Ami{ID: *amiIDptr, Region: dstRegion}, nil
-	}
-
 	var snapshotIDptr *string
 	var snapshotErr error
 
@@ -221,6 +217,25 @@ func (d *SDKCopyAmiDriver) Create(driverConfig resources.AmiDriverConfig) (resou
 		d.logger.Printf("Error tagging Snapshot: %s, Error: %s ", *snapshotIDptr, err.Error())
 	}
 
+	for _, account := range driverConfig.SharedWithAccounts {
+		modifySnapshotAttributeInput := &ec2.ModifySnapshotAttributeInput{
+			SnapshotId:    snapshotIDptr,
+			Attribute:     aws.String("createVolumePermission"),
+			OperationType: aws.String("add"),
+			UserIds: []*string{
+				aws.String(account),
+			},
+		}
+		_, err = ec2Client.ModifySnapshotAttribute(modifySnapshotAttributeInput)
+		if err != nil {
+			return resources.Ami{}, fmt.Errorf("sharing snapshot with id %s with account %s: %v", *snapshotIDptr, account, err)
+		}
+	}
+
+	if driverConfig.Encrypted {
+		return resources.Ami{ID: *amiIDptr, Region: dstRegion}, nil
+	}
+
 	modifySnapshotAttributeInput := &ec2.ModifySnapshotAttributeInput{
 		SnapshotId:    snapshotIDptr,
 		Attribute:     aws.String("createVolumePermission"),

diff --git a/driver/create_ami_driver.go b/driver/create_ami_driver.go
@@ -153,6 +153,19 @@ func (d *SDKCreateAmiDriver) Create(driverConfig resources.AmiDriverConfig) (res
 		if err != nil {
 			return resources.Ami{}, fmt.Errorf("failed to share AMI '%s' with account '%s': %w", *amiIDptr, account, err)
 		}
+
+		modifySnapshotAttributeInput := &ec2.ModifySnapshotAttributeInput{
+			SnapshotId:    aws.String(driverConfig.SnapshotID),
+			Attribute:     aws.String("createVolumePermission"),
+			OperationType: aws.String("add"),
+			UserIds: []*string{
+				aws.String(account),
+			},
+		}
+		_, err = d.ec2Client.ModifySnapshotAttribute(modifySnapshotAttributeInput)
+		if err != nil {
+			return resources.Ami{}, fmt.Errorf("sharing snapshot with id %s with account %s: %v", driverConfig.SnapshotID, account, err)
+		}
 	}
 
 	d.logger.Printf("waiting for AMI: %s to be available\n", *amiIDptr)