fix merge conflicts

Author: samhstn

infra/codebuild.yaml

@@ -19,33 +19,7 @@ Resources:
           PolicyDocument:
             Version: 2012-10-17
             Statement:
-              # todo: add s3 role
-              - Effect: Allow
-                Action:
-                  - logs:CreateLogGroup
-                  - logs:CreateLogStream
-                  - logs:DescribeLogStreams
-                  - logs:PutLogEvents
-                Resource:
-                  !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/*"
-
-  UpdateInfraRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: samhstn-update-infra-role
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          Effect: Allow
-          Principal:
-            Service: codebuild.amazonaws.com
-          Action: sts:AssumeRole
-      Policies:
-        - PolicyName: samhstn-codebuild-build-policy
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              # todo: add s3 role
+              # todo: add separate test and build roles
               - Effect: Allow
                 Action:
                   - logs:CreateLogGroup
@@ -108,21 +82,6 @@ Resources:
         Type: CODEPIPELINE
         BuildSpec: infra/buildspecs/test.yaml
 
-  UpdateInfra:
-    type: AWS::CodeBuild::Project
-    Properties:
-      Name: UpdateInfra
-      Artifacts:
-        Type: CODEPIPELINE
-      Environment:
-        Type: LINUX_CONTAINER
-        ComputeType: BUILD_GENERAL1_SMALL
-        Image: aws/codebuild/nodejs:10.14.1
-      ServiceRole: !Ref UpdateInfraRole
-      Source:
-        Type: CODEPIPELINE
-        BuildSpec: infra/buildspecs/update_infra.yml
-
   Build:
     Type: AWS::CodeBuild::Project
     Properties:

infra/master_pipeline.yaml

@@ -37,7 +37,6 @@ Resources:
                   - codebuild:StartBuild
                 Resource:
                   - !Sub "arn:aws:codebuild:${AWS::Region}:${AWS::AccountId}:project/Test"
-                  - !Sub "arn:aws:codebuild:${AWS::Region}:${AWS::AccountId}:project/UpdateInfra"
                   - !Sub "arn:aws:codebuild:${AWS::Region}:${AWS::AccountId}:project/Build"
 
   Pipeline:
@@ -78,19 +77,6 @@ Resources:
               Configuration:
                 ProjectName: Test
               RunOrder: 2
-        - Name: UpdateInfra
-          Actions:
-            - Name: UpdateInfra
-              ActionTypeId:
-                Category: Build
-                Owner: AWS
-                Version: 1
-                Provider: CodeBuild
-                InputArtifacts:
-                  - Name: SourceOutput
-                Configuration:
-                  ProjectName: UpdateInfra
-                RunOrder: 3
         - Name: Deploy
           Actions:
             - Name: Deploy
@@ -105,7 +91,7 @@ Resources:
                 - Name: SourceOutput
               Configuration:
                 ProjectName: Build
-              RunOrder: 4
+              RunOrder: 3
 
   GithubWebhook:
     Type: AWS::CodePipeline::Webhook