Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allowing user-defined env variable to be accessible #16

Merged
merged 2 commits into from
Feb 4, 2020
Merged

Allowing user-defined env variable to be accessible #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f246429
Allowing user-defined env variable to be accessible
jalajmsft Jan 30, 2020
3d5fb17
Resolving PR comments
jalajmsft Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as io from '@actions/io';
import * as os from 'os';
import * as path from 'path';

import { createScriptFile, TEMP_DIRECTORY, NullOutstreamStringWritable, deleteFile, getCurrentTime } from './utils';
import { createScriptFile, TEMP_DIRECTORY, NullOutstreamStringWritable, deleteFile, getCurrentTime, checkIfEnvironmentVariableIsOmitted } from './utils';

const START_SCRIPT_EXECUTION_MARKER: string = `Starting script execution via docker image mcr.microsoft.com/azure-cli:`;
const BASH_ARG: string = `bash --noprofile --norc -e `;
Expand Down Expand Up @@ -35,10 +35,11 @@ const run = async () => {
inlineScript = ` set -e >&2; echo '${START_SCRIPT_EXECUTION_MARKER}' >&2; ${inlineScript}`;
scriptFileName = await createScriptFile(inlineScript);
let startCommand: string = ` ${BASH_ARG}${CONTAINER_TEMP_DIRECTORY}/${scriptFileName} `;
let gitHubEnvironmentVariables = '';
let environmentVariables = '';
for (let key in process.env){
if (key.toUpperCase().startsWith("GITHUB_") && key.toUpperCase() !== 'GITHUB_WORKSPACE' && process.env[key]){
gitHubEnvironmentVariables += ` -e "${key}=${process.env[key]}" `;
// if (key.toUpperCase().startsWith("GITHUB_") && key.toUpperCase() !== 'GITHUB_WORKSPACE' && process.env[key]){
if(!checkIfEnvironmentVariableIsOmitted(key) && process.env[key]){
environmentVariables += ` -e "${key}=${process.env[key]}" `;
}
}
/*
Expand All @@ -50,7 +51,7 @@ const run = async () => {
*/
let command: string = `run --workdir ${CONTAINER_WORKSPACE} -v ${process.env.GITHUB_WORKSPACE}:${CONTAINER_WORKSPACE} `;
command += ` -v ${process.env.HOME}/.azure:/root/.azure -v ${TEMP_DIRECTORY}:${CONTAINER_TEMP_DIRECTORY} `;
command += ` ${gitHubEnvironmentVariables} `;
command += ` ${environmentVariables} `;
command += `-e GITHUB_WORKSPACE=${CONTAINER_WORKSPACE} `;
command += `--name ${CONTAINER_NAME} `;
command += ` mcr.microsoft.com/azure-cli:${azcliversion} ${startCommand}`;
Expand Down
51 changes: 50 additions & 1 deletion src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,53 @@ export class NullOutstreamStringWritable extends stream.Writable {
callback();
}
}
};
};

export const checkIfEnvironmentVariableIsOmitted = (key: string): boolean => {

const omitEnvironmentVariables: string [] = [
jalajmsft marked this conversation as resolved.
Show resolved Hide resolved
'LANG',
'HOSTNAME',
'PWD',
'HOME',
'PYTHON_VERSION',
'PYTHON_PIP_VERSION',
'SHLVL',
'PATH',
'GPG_KEY',
'CONDA',
'AGENT_TOOLSDIRECTORY',
'GITHUB_WORKSPACE',
'RUNNER_PERFLOG',
'RUNNER_WORKSPACE',
'RUNNER_TEMP',
'RUNNER_TRACKING_ID',
'RUNNER_TOOL_CACHE',
'DOTNET_SKIP_FIRST_TIME_EXPERIENCE',
'JOURNAL_STREAM',
'DEPLOYMENT_BASEPATH',
'VCPKG_INSTALLATION_ROOT',
'PERFLOG_LOCATION_SETTING'
];

const omitEnvironmentVariablesWithPrefix: string [] = [
'JAVA_',
'LEIN_',
'M2_',
'BOOST_',
'GOROOT',
'ANDROID_',
'GRADLE_',
'ANT_',
'CHROME',
'SELENIUM_',
'INPUT_'
];
for (let i = 0; i < omitEnvironmentVariables.length; i++){
if (omitEnvironmentVariables[i] === key.toUpperCase()){
return true;
}
}

return omitEnvironmentVariablesWithPrefix.some((prefix: string) => key.toUpperCase().startsWith(prefix));
}