Merge branch 'main' into fix/140

Author: taoyong-ty

README.md

@@ -115,6 +115,9 @@ The only required input is `project-name`.
 1. **hide-cloudwatch-logs** (optional) :
    Set to `true` if you do not want CloudWatch Logs to be streamed to GitHub Action.
 
+1. **disable-github-env-vars** (optional) :
+   Set to `true` if you want do disable github environment variables in codebuild.
+
 ### Outputs
 
 1. **aws-build-id** : The CodeBuild build ID of the build that the action ran.

action.yml

@@ -37,6 +37,9 @@ inputs:
   hide-cloudwatch-logs:
     description: 'Set to `true` to prevent the CloudWatch logs from streaming the output to GitHub'
     required: false
+  disable-github-env-vars:
+    description: 'Set to `true` if you want do disable github environment variables in codebuild'
+    required: false
 outputs:
   aws-build-id:
     description: 'The AWS CodeBuild Build ID for this build.'

code-build.js

@@ -219,6 +219,9 @@ function githubInputs() {
   const hideCloudWatchLogs =
     core.getInput("hide-cloudwatch-logs", { required: false }) === "true";
 
+  const disableGithubEnvVars =
+    core.getInput("disable-github-env-vars", { required: false }) === "true";
+
   return {
     projectName,
     owner,
@@ -234,6 +237,7 @@ function githubInputs() {
     updateBackOff,
     disableSourceOverride,
     hideCloudWatchLogs,
+    disableGithubEnvVars,
   };
 }
 
@@ -250,6 +254,7 @@ function inputs2Parameters(inputs) {
     imagePullCredentialsTypeOverride,
     envPassthrough = [],
     disableSourceOverride,
+    disableGithubEnvVars,
   } = inputs;
 
   const sourceOverride = !disableSourceOverride
@@ -262,7 +267,9 @@ function inputs2Parameters(inputs) {
 
   const environmentVariablesOverride = Object.entries(process.env)
     .filter(
-      ([key]) => key.startsWith("GITHUB_") || envPassthrough.includes(key)
+      ([key]) =>
+        (!disableGithubEnvVars && key.startsWith("GITHUB_")) ||
+        envPassthrough.includes(key)
     )
     .map(([name, value]) => ({ name, value, type: "PLAINTEXT" }));
 

dist/index.js

@@ -225,6 +225,9 @@ function githubInputs() {
   const hideCloudWatchLogs =
     core.getInput("hide-cloudwatch-logs", { required: false }) === "true";
 
+  const disableGithubEnvVars =
+    core.getInput("disable-github-env-vars", { required: false }) === "true";
+
   return {
     projectName,
     owner,
@@ -240,6 +243,7 @@ function githubInputs() {
     updateBackOff,
     disableSourceOverride,
     hideCloudWatchLogs,
+    disableGithubEnvVars,
   };
 }
 
@@ -256,6 +260,7 @@ function inputs2Parameters(inputs) {
     imagePullCredentialsTypeOverride,
     envPassthrough = [],
     disableSourceOverride,
+    disableGithubEnvVars,
   } = inputs;
 
   const sourceOverride = !disableSourceOverride
@@ -268,7 +273,9 @@ function inputs2Parameters(inputs) {
 
   const environmentVariablesOverride = Object.entries(process.env)
     .filter(
-      ([key]) => key.startsWith("GITHUB_") || envPassthrough.includes(key)
+      ([key]) =>
+        (!disableGithubEnvVars && key.startsWith("GITHUB_")) ||
+        envPassthrough.includes(key)
     )
     .map(([name, value]) => ({ name, value, type: "PLAINTEXT" }));
 

test/code-build-test.js

@@ -88,6 +88,7 @@ describe("githubInputs", () => {
       .and.to.equal(undefined);
     expect(test).to.haveOwnProperty("envPassthrough").and.to.deep.equal([]);
     expect(test).to.haveOwnProperty("hideCloudWatchLogs").and.to.equal(false);
+    expect(test).to.haveOwnProperty("disableGithubEnvVars").and.to.equal(false);
   });
 
   it("a project name is required.", () => {
@@ -413,6 +414,29 @@ describe("inputs2Parameters", () => {
     expect(test).to.not.haveOwnProperty("sourceLocationOverride");
     expect(test).to.not.haveOwnProperty("sourceVersion");
   });
+
+  it("can process disable-github-env-vars", () => {
+    process.env[`GITHUB_REPOSITORY`] = repoInfo;
+    process.env[`GITHUB_SHA`] = sha;
+
+    const test = inputs2Parameters({
+      projectName,
+      sourceVersion: sha,
+      owner: "owner",
+      repo: "repo",
+      disableGithubEnvVars: true,
+    });
+
+    const [repoEnv] = test.environmentVariablesOverride.filter(
+      ({ name }) => name === "GITHUB_REPOSITORY"
+    );
+    expect(repoEnv).to.equal(undefined);
+
+    const [shaEnv] = test.environmentVariablesOverride.filter(
+      ({ name }) => name === "GITHUB_SHA"
+    );
+    expect(shaEnv).to.equal(undefined);
+  });
 });
 
 describe("waitForBuildEndTime", () => {