cleanup

.github/workflows/aws-tests.yml

@@ -48,6 +48,9 @@ jobs:
         id: aws-fargate-unity-build
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: eu-west-2
         with:
           remote: aws
           projectPath: ${{ matrix.projectPath }}

action/task-def-formation.yml

@@ -63,7 +63,13 @@ Parameters:
   AndroidKeyAliasPass:
     Type: String
     Default: '0'
-  BUILDID:
+  AWSRegion:
+    Type: String
+    Default: ''
+  AWSAccessKeyID:
+    Type: String
+    Default: ''
+  AWSSecretAccessKey:
     Type: String
     Default: ''
 Mappings:
@@ -195,7 +201,9 @@ Resources:
               ValueFrom: !Ref AndroidKeystoreBase64Secret
             - Name: 'ANDROID_KEYSTORE_PASS'
               ValueFrom: !Ref AndroidKeystorePassSecret
-            - Name: 'ANDROID_KEYALIAS_PASS'
+            - Name: 'AWS_ACCESS_KEY_ID'
+              ValueFrom: !Ref AndroidKeyAliasPassSecret
+            - Name: 'AWS_SECRET_ACCESS_KEY'
               ValueFrom: !Ref AndroidKeyAliasPassSecret
           LogConfiguration:
             LogDriver: awslogs
@@ -203,18 +211,6 @@ Resources:
               awslogs-group: !Ref ServiceName
               awslogs-region: !Ref 'AWS::Region'
               awslogs-stream-prefix: !Ref ServiceName
-          # not needed, excluded by default5
-          #   SecretOptions:
-          #     - Name: !Join [ "", [ 'GITHUB_TOKEN_', !Ref BUILDID ] ]
-          #       ValueFrom: !Ref GithubTokenSecret
-          #     - Name: !Join [ "", [ 'UNITY_LICENSE_', !Ref BUILDID ] ]
-          #       ValueFrom: !Ref UnityLicenseSecret
-          #     - Name: !Join [ "", [ 'ANDROID_KEYSTORE_BASE64_', !Ref BUILDID ] ]
-          #       ValueFrom: !Ref AndroidKeystoreBase64Secret
-          #     - Name: !Join [ "", [ 'ANDROID_KEYSTORE_PASS_', !Ref BUILDID ] ]
-          #       ValueFrom: !Ref AndroidKeystorePassSecret
-          #     - Name: !Join [ "", [ 'ANDROID_KEYALIAS_PASS_', !Ref BUILDID ] ]
-          #       ValueFrom: !Ref AndroidKeyAliasPassSecret
     Metadata:
       'AWS::CloudFormation::Designer':
         id: dabb0116-abe0-48a6-a8af-cf9111c879a5

src/model/aws.js

@@ -34,10 +34,6 @@ class AWS {
           name: 'GITHUB_SHA',
           value: process.env.GITHUB_SHA,
         },
-        {
-          name: 'BUILD_ID',
-          value: buildId,
-        },
       ],
       [
         {
@@ -68,10 +64,6 @@ class AWS {
       '/data',
       `/data/${buildId}/repo/`,
       [
-        {
-          name: 'BUILD_ID',
-          value: buildId,
-        },
         {
           name: 'GITHUB_WORKSPACE',
           value: `/data/${buildId}/repo/`,
@@ -160,10 +152,6 @@ class AWS {
           name: 'GITHUB_SHA',
           value: process.env.GITHUB_SHA,
         },
-        {
-          name: 'BUILD_ID',
-          value: buildId,
-        },
       ],
       [
         {
@@ -191,15 +179,24 @@ class AWS {
           value: process.env.GITHUB_SHA,
         },
         {
-          name: 'BUILD_ID',
-          value: buildId,
+          name: 'AWS_DEFAULT_REGION',
+          value: process.env.AWS_DEFAULT_REGION,
         },
+
       ],
       [
         {
           ParameterKey: 'GithubToken',
           ParameterValue: buildParameters.githubToken,
         },
+        {
+          ParameterKey: 'AWSAccessKeyID',
+          ParameterValue: process.env.AWS_ACCESS_KEY_ID,
+        },
+        {
+          ParameterKey: 'AWSSecretAccessKey',
+          ParameterValue: process.env.AWS_SECRET_ACCESS_KEY,
+        },
       ],
     );
     }
@@ -247,10 +244,6 @@ class AWS {
           ParameterKey: 'EFSMountDirectory',
           ParameterValue: mountdir,
         },
-        {
-          ParameterKey: 'BUILDID',
-          ParameterValue: jobId,
-        }
       ].concat(secrets),
     }).promise();
     try{

src/model/build-parameters.js

@@ -54,6 +54,7 @@ class BuildParameters {
       kubeContainerCPU: Input.kubeContainerCPU,
       kubeVolumeSize: Input.kubeVolumeSize,
       kubeVolume: Input.kubeVolume,
+      
     };
   }
 

src/model/input.js

@@ -116,6 +116,14 @@ class Input {
   static get kubeVolume() {
     return core.getInput('kubeVolume') || '';
   }
+
+  static get AWSAccessKeyID() {
+    return core.getInput('AWSAccessKeyID') || '';
+  }
+
+  static get AWSSecretAccessKey() {
+    return core.getInput('AWSSecretAccessKey') || '';
+  }
 }
 
 export default Input;