X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7109ea1b2a49bc7fdbdbfd2302eb2457750ce5cd..c38a28a51ba3fbe3fe58e72a5e16c27f79c89719:/lib/cloud/ec2/ec2.go

diff --git a/lib/cloud/ec2/ec2.go b/lib/cloud/ec2/ec2.go
index c630e95418..d373d2b718 100644
--- a/lib/cloud/ec2/ec2.go
+++ b/lib/cloud/ec2/ec2.go
@@ -32,7 +32,7 @@ type ec2InstanceSetConfig struct {
 	AccessKeyID      string
 	SecretAccessKey  string
 	Region           string
-	SecurityGroupIDs []string
+	SecurityGroupIDs arvados.StringSet
 	SubnetID         string
 	AdminUsername    string
 	EBSVolumeType    string
@@ -56,7 +56,7 @@ type ec2InstanceSet struct {
 	keys          map[string]string
 }
 
-func newEC2InstanceSet(config json.RawMessage, instanceSetID cloud.InstanceSetID, logger logrus.FieldLogger) (prv cloud.InstanceSet, err error) {
+func newEC2InstanceSet(config json.RawMessage, instanceSetID cloud.InstanceSetID, _ cloud.SharedResourceTags, logger logrus.FieldLogger) (prv cloud.InstanceSet, err error) {
 	instanceSet := &ec2InstanceSet{
 		instanceSetID: instanceSetID,
 		logger:        logger,
@@ -161,6 +161,11 @@ func (instanceSet *ec2InstanceSet) Create(
 		})
 	}
 
+	var groups []string
+	for sg := range instanceSet.ec2config.SecurityGroupIDs {
+		groups = append(groups, sg)
+	}
+
 	rii := ec2.RunInstancesInput{
 		ImageId:      aws.String(string(imageID)),
 		InstanceType: &instanceType.ProviderType,
@@ -173,7 +178,7 @@ func (instanceSet *ec2InstanceSet) Create(
 				AssociatePublicIpAddress: aws.Bool(false),
 				DeleteOnTermination:      aws.Bool(true),
 				DeviceIndex:              aws.Int64(0),
-				Groups:                   aws.StringSlice(instanceSet.ec2config.SecurityGroupIDs),
+				Groups:                   aws.StringSlice(groups),
 				SubnetId:                 &instanceSet.ec2config.SubnetID,
 			}},
 		DisableApiTermination:             aws.Bool(false),