actions/k8s-set-context
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed getArcKubeconfig from promise to async function

Browse Source
This commit is contained in:
Atharva Mulmuley 2021-06-03 13:58:17 +05:30
parent b903fa8c1a
commit f6361247fd
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
__tests__/run.test.ts
View File

@ -223,8 +223,8 @@ describe('Testing all functions.', () => {
jest.spyOn(arc,'sleep').mockImplementation(); jest.spyOn(arc,'sleep').mockImplementation();
jest.spyOn(fs, 'chmodSync').mockImplementation(() => {}); jest.spyOn(fs, 'chmodSync').mockImplementation(() => {});
jest.spyOn(core, 'exportVariable').mockImplementation(() => {}); jest.spyOn(core, 'exportVariable').mockImplementation(() => {});
await arc.getArcKubeconfig(); expect(await arc.getArcKubeconfig());
//expect(core.getInput).toBeCalledTimes(4); expect(core.getInput).toBeCalledTimes(4);
expect(io.which).toHaveBeenCalledWith("az",true); expect(io.which).toHaveBeenCalledWith("az",true);
expect(arc.executeAzCliCommand).toHaveBeenNthCalledWith(1,`account show`, false); expect(arc.executeAzCliCommand).toHaveBeenNthCalledWith(1,`account show`, false);
expect(arc.executeAzCliCommand).toHaveBeenNthCalledWith(2,`extension remove -n connectedk8s`, false); expect(arc.executeAzCliCommand).toHaveBeenNthCalledWith(2,`extension remove -n connectedk8s`, false);

6
src/arc-login.ts
View File

@ -8,7 +8,7 @@ var azPath: string;
const kubeconfig_timeout = 120;//timeout in seconds const kubeconfig_timeout = 120;//timeout in seconds
export async function getArcKubeconfig(): Promise<string> { export async function getArcKubeconfig() {
try { try {
let method = core.getInput('method'); let method = core.getInput('method');
if (method != 'service-account' && method != 'service-principal'){ if (method != 'service-account' && method != 'service-principal'){
@ -59,8 +59,8 @@ export async function getArcKubeconfig(): Promise<string> {
fs.chmodSync(kubeconfigPath, '600'); fs.chmodSync(kubeconfigPath, '600');
core.exportVariable('KUBECONFIG', kubeconfigPath); core.exportVariable('KUBECONFIG', kubeconfigPath);
console.log('KUBECONFIG environment variable is set'); console.log('KUBECONFIG environment variable is set');
} catch (ex) { } catch (error) {
return Promise.reject(ex); throw new Error(error);
} }
} }

7
src/login.ts
View File

@ -107,9 +107,12 @@ export async function run() {
let kubeconfig = ''; let kubeconfig = '';
const cluster_type = core.getInput('cluster-type', { required: true }); const cluster_type = core.getInput('cluster-type', { required: true });
if (cluster_type == 'arc') { if (cluster_type == 'arc') {
await getArcKubeconfig().catch(ex => { try{
await getArcKubeconfig();
}
catch (ex){
throw new Error('Error: Could not get the KUBECONFIG for arc cluster: ' + ex); throw new Error('Error: Could not get the KUBECONFIG for arc cluster: ' + ex);
}); }
} }
else { else {
const runnerTempDirectory = process.env['RUNNER_TEMP']; // Using process.env until the core libs are updated const runnerTempDirectory = process.env['RUNNER_TEMP']; // Using process.env until the core libs are updated