Merge pull request #185 from stelligent/issue-184

Bug fixes

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

examples/basic/mu.yml

@@ -1,7 +1,7 @@
 ---
 
 environments:
-  - name: dev
+  - name: acceptance
     cluster:
       maxSize: 2
   - name: production

provider/aws/roleset.go

@@ -139,7 +139,8 @@ func (rolesetMgr *iamRolesetManager) UpsertEnvironmentRoleset(environmentName st
 		}
 	}
 	if environment == nil {
-		return fmt.Errorf("unable to find environment named '%s' in configuration", environmentName)
+		log.Warningf("unable to find environment named '%s' in configuration...skipping IAM roles", environmentName)
+		return nil
 	}
 
 	stackName := common.CreateStackName(rolesetMgr.context.Config.Namespace, common.StackTypeIam, "environment", environmentName)

provider/aws/roleset_test.go

@@ -245,7 +245,7 @@ func TestIamRolesetManager_UpsertEnvironmentRoleset(t *testing.T) {
 	}
 
 	err := i.UpsertEnvironmentRoleset("env1")
-	assert.NotNil(err)
+	assert.Nil(err)
 	stackManagerMock.AssertExpectations(t)
 	stackManagerMock.AssertNumberOfCalls(t, "UpsertStack", 0)
 

templates/assets/pipeline-iam.yml

@@ -97,7 +97,7 @@ Resources:
             Effect: Allow
             Resource:
             - !Sub 'arn:aws:codebuild:${AWS::Region}:${AWS::AccountId}:project/${Namespace}-pipeline-${ServiceName}-*'
-          - !If
+          - Fn::If:
             - IsCodeCommit
             - Action:
               - codecommit:GetBranch
@@ -129,15 +129,15 @@ Resources:
           - Action:
             - iam:PassRole
             Resource:
-            - !If
+            - Fn::If:
               - IsBuildEnabled
               - !GetAtt CodeBuildCIRole.Arn
               - !Ref AWS::NoValue
-            - !If
+            - Fn::If:
               - IsAcptEnabled
               - !GetAtt CodeBuildCDAcptRole.Arn
               - !Ref AWS::NoValue
-            - !If
+            - Fn::If:
               - IsProdEnabled
               - !GetAtt CodeBuildCDProdRole.Arn
               - !Ref AWS::NoValue
@@ -148,15 +148,15 @@ Resources:
     Properties:
       PolicyName: codepipeline-access
       Roles:
-      - !If
+      - Fn::If:
         - IsBuildEnabled
         - !Ref CodeBuildCIRole
         - !Ref AWS::NoValue
-      - !If
+      - Fn::If:
         - IsAcptEnabled
         - !Ref CodeBuildCDAcptRole
         - !Ref AWS::NoValue
-      - !If
+      - Fn::If:
         - IsProdEnabled
         - !Ref CodeBuildCDProdRole
         - !Ref AWS::NoValue
@@ -268,10 +268,7 @@ Resources:
             - s3:GetObjectVersion
             - s3:PutObject
             Resource:
-            - !Sub
-              - arn:aws:s3:::${BucketName}/*
-              - BucketName:
-                  Fn::ImportValue: !Sub ${Namespace}-bucket-codedeploy
+            - !Sub arn:aws:s3:::mu-codedeploy-${AWS::Region}-${AWS::AccountId}/*
             Effect: Allow
 
 

templates/assets/pipeline.yml

@@ -334,7 +334,7 @@ Resources:
             - RepositoryName: !Ref SourceRepo
               BranchName: !Ref SourceBranch
           RunOrder: 1
-      - !If
+      - Fn::If:
         - IsBuildEnabled
         - Name: Build
           Actions:
@@ -365,7 +365,7 @@ Resources:
               ProjectName: !Ref CodeBuildImage
             RunOrder: 2
         - !Ref AWS::NoValue
-      - !If
+      - Fn::If:
         - IsAcptEnabled
         - Name: Acceptance
           Actions:
@@ -396,7 +396,7 @@ Resources:
               ProjectName: !Ref TestAcceptance
             RunOrder: 2
         - !Ref AWS::NoValue
-      - !If
+      - Fn::If:
         - IsProdEnabled
         - Name: Production
           Actions: