Merge branch 'master' into fixTypo

Author: subinataws

README.md

@@ -22,6 +22,15 @@ The only required input is `project-name`.
    that CodeBuild requires.
    By default, the action uses the buildspec file location
    that you configured in the CodeBuild project.
+1. **compute-type-override** (optional) :
+   The name of a compute type for this build that overrides the one specified
+   in the build project.
+1. **environment-type-override** (optional) :
+   A container type for this build that overrides the one specified in the
+   build project.
+1. **image-override** (optional) :
+   The name of an image for this build that overrides the one specified
+   in the build project.
 1. **env-vars-for-codebuild** (optional) :
    A comma-separated list of the names of environment variables
    that the action passes from GitHub Actions to CodeBuild.
@@ -162,6 +171,9 @@ this will overwrite them.
   with:
     project-name: CodeBuildProjectName
     buildspec-override: path/to/buildspec.yaml
+    compute-type-override: compute-type
+    environment-type-override: environment-type
+    image-override: ecr-image-uri
     env-vars-for-codebuild: |
       custom,
       requester,

action.yml

@@ -10,6 +10,15 @@ inputs:
   buildspec-override:
     description: 'Buildspec Override'
     required: false
+  compute-type-override:
+    description: 'The name of a compute type for this build that overrides the one specified in the build project.'
+    required: false
+  environment-type-override:
+    description: 'A container type for this build that overrides the one specified in the build project.'
+    required: false
+  image-override:
+    description: 'The name of an image for this build that overrides the one specified in the build project.'
+    required: false
   env-vars-for-codebuild:
     description: 'Comma separated list of environment variables to send to CodeBuild'
     required: false

code-build.js

@@ -169,6 +169,14 @@ function githubInputs() {
   const buildspecOverride =
     core.getInput("buildspec-override", { required: false }) || undefined;
 
+  const computeTypeOverride =
+    core.getInput("compute-type-override", { required: false }) || undefined;
+
+  const environmentTypeOverride =
+    core.getInput("environment-type-override", { required: false }) || undefined;
+  const imageOverride = 
+    core.getInput("image-override", { required: false }) || undefined;
+
   const envPassthrough = core
     .getInput("env-vars-for-codebuild", { required: false })
     .split(",")
@@ -181,6 +189,9 @@ function githubInputs() {
     repo,
     sourceVersion,
     buildspecOverride,
+    computeTypeOverride,
+    environmentTypeOverride,
+    imageOverride,
     envPassthrough,
   };
 }
@@ -192,6 +203,9 @@ function inputs2Parameters(inputs) {
     repo,
     sourceVersion,
     buildspecOverride,
+    computeTypeOverride,
+    environmentTypeOverride,
+    imageOverride,
     envPassthrough = [],
   } = inputs;
 
@@ -212,6 +226,9 @@ function inputs2Parameters(inputs) {
     sourceTypeOverride,
     sourceLocationOverride,
     buildspecOverride,
+    computeTypeOverride,
+    environmentTypeOverride,
+    imageOverride,
     environmentVariablesOverride,
   };
 }
@@ -234,13 +251,18 @@ function buildSdk() {
 }
 
 function logName(Arn) {
-  const [logGroupName, logStreamName] = Arn.split(":log-group:")
-    .pop()
-    .split(":log-stream:");
-  if (logGroupName === "null" || logStreamName === "null")
-    return {
-      logGroupName: undefined,
-      logStreamName: undefined,
-    };
-  return { logGroupName, logStreamName };
+  const logs = {
+    logGroupName: undefined,
+    logStreamName: undefined,
+  };
+  if (Arn) {
+    const [logGroupName, logStreamName] = Arn.split(":log-group:")
+      .pop()
+      .split(":log-stream:");
+    if (logGroupName !== "null" && logStreamName !== "null") {
+      logs.logGroupName = logGroupName;
+      logs.logStreamName = logStreamName;
+    }
+  }
+  return logs;
 }

dist/index.js

@@ -8,7 +8,7 @@ const cb = require("./code-build");
 const assert = require("assert");
 const yargs = require("yargs");
 
-const { projectName, buildspecOverride, envPassthrough, remote } = yargs
+const { projectName, buildspecOverride, computeTypeOverride, environmentTypeOverride, imageOverride, envPassthrough, remote } = yargs
   .option("project-name", {
     alias: "p",
     describe: "AWS CodeBuild Project Name",
@@ -20,6 +20,21 @@ const { projectName, buildspecOverride, envPassthrough, remote } = yargs
     describe: "Path to buildspec file",
     type: "string",
   })
+  .option("compute-type-override", {
+    alias: "c",
+    describe: "The name of a compute type for this build that overrides the one specified in the build project.",
+    type: "string",
+  })
+  .option("environment-type-override", {
+    alias: "et",
+    describe: "A container type for this build that overrides the one specified in the build project.",
+    type: "string",
+  })
+  .option("image-override", {
+    alias: "i",
+    describe: "The name of an image for this build that overrides the one specified in the build project.",
+    type: "string",
+  })
   .option("env-vars-for-codebuild", {
     alias: "e",
     describe: "List of environment variables to send to CodeBuild",
@@ -39,6 +54,9 @@ const params = cb.inputs2Parameters({
   ...githubInfo(remote),
   sourceVersion: BRANCH_NAME,
   buildspecOverride,
+  computeTypeOverride,
+  environmentTypeOverride,
+  imageOverride,
   envPassthrough,
 });
 

local.js

@@ -12,7 +12,7 @@
   "author": "aws-crypto-tools-team@amazon.com",
   "license": "Apache-2.0",
   "dependencies": {
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.9.1",
     "@actions/exec": "^1.0.3",
     "@actions/github": "^2.1.1",
     "aws-sdk": "^2.814.0",