allow codedeploy bucket to be created after roleset stack

stelligent · Oct 11, 2017 · a479900 · a479900
1 parent 684f3bf
commit a479900
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 31 deletions.
diff --git a/provider/aws/roleset.go b/provider/aws/roleset.go
@@ -232,16 +232,6 @@ func (rolesetMgr *iamRolesetManager) UpsertServiceRoleset(environmentName string
 		"Provider":        envProvider,
 	}
 
-	// Get the bucket name of the revision bucket
-	if envProvider == common.EnvProviderEc2 {
-		bucketStackName := common.CreateStackName(rolesetMgr.context.Config.Namespace, common.StackTypeBucket, "codedeploy")
-		bucketStack := rolesetMgr.context.StackManager.AwaitFinalStatus(bucketStackName)
-		if bucketStack == nil {
-			return fmt.Errorf("unable to find bucket stack named '%s'", bucketStackName)
-		}
-		stackParams["RevisionBucket"] = bucketStack.Outputs["Bucket"]
-	}
-
 	err = rolesetMgr.context.StackManager.UpsertStack(stackName, template, stackParams, stackTags, "")
 	if err != nil {
 		return err

diff --git a/provider/aws/roleset_test.go b/provider/aws/roleset_test.go
@@ -318,12 +318,6 @@ func TestIamRolesetManager_UpsertServiceRoleset_SharedEnv(t *testing.T) {
 			},
 		},
 	}
-	stackManagerMock.On("AwaitFinalStatus", "mu-bucket-codedeploy").Return(&common.Stack{
-		Status: "CREATE_COMPLETE",
-		Outputs: map[string]string{
-			"RevisionBucket": "baz",
-		},
-	}, nil)
 	stackManagerMock.On("AwaitFinalStatus", "mu-environment-env1").Return(&common.Stack{
 		Status: "CREATE_COMPLETE",
 		Tags: map[string]string{
@@ -335,7 +329,7 @@ func TestIamRolesetManager_UpsertServiceRoleset_SharedEnv(t *testing.T) {
 	err := i.UpsertServiceRoleset("env1", "sv1")
 	assert.Nil(err)
 	stackManagerMock.AssertExpectations(t)
-	stackManagerMock.AssertNumberOfCalls(t, "AwaitFinalStatus", 3)
+	stackManagerMock.AssertNumberOfCalls(t, "AwaitFinalStatus", 2)
 	stackManagerMock.AssertNumberOfCalls(t, "UpsertStack", 1)
 }
 

diff --git a/templates/assets.go b/templates/assets.go
diff --git a/templates/assets/service-iam.yml b/templates/assets/service-iam.yml
@@ -11,10 +11,6 @@ Parameters:
   ServiceName:
     Type: String
     Description: Name of service used for resource namespace
-  RevisionBucket:
-    Type: String
-    Description: Name of bucket for S3 artifacts
-    Default: ''
   Provider:
     Type: String
     Description: Provider type for services
@@ -91,8 +87,8 @@ Resources:
             - s3:ListBucketVersions
             - s3:ListMultipartUploadParts
             Resource:
-            - !Sub arn:aws:s3:::${RevisionBucket}
-            - !Sub arn:aws:s3:::${RevisionBucket}/*
+            - !Sub arn:aws:s3:::${Namespace}-codedeploy-${AWS::Region}-${AWS::AccountId}
+            - !Sub arn:aws:s3:::${Namespace}-codedeploy-${AWS::Region}-${AWS::AccountId}/*
           - Effect: Allow
             Action:
             - cloudformation:DescribeStackEvents