Skip to content

Change GCP credential filename generation to be deterministic instead of random. #204

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers> {
}
}

tr.registerMock('uuid/v4', () => '123');
tr.registerMock('uuid/v5', () => '123');
tr.setAnswers(a);

tr.run();
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers> {
}
}

tr.registerMock('uuid/v4', () => '123');
tr.registerMock('uuid/v5', () => '123');
tr.setAnswers(a);

tr.run();
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers> {
}
}

tr.registerMock('uuid/v4', () => '123');
tr.registerMock('uuid/v5', () => '123');
tr.setAnswers(a);

tr.run();
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers> {
}
}

tr.registerMock('uuid/v4', () => '123');
tr.registerMock('uuid/v5', () => '123');
tr.setAnswers(a);

tr.run();
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import {ToolRunner} from 'azure-pipelines-task-lib/toolrunner';
import {TerraformAuthorizationCommandInitializer} from './terraform-commands';
import {BaseTerraformCommandHandler} from './base-terraform-command-handler';
import path = require('path');
import * as uuidV4 from 'uuid/v4';
import * as uuidV5 from 'uuid/v5';

export class TerraformCommandHandlerGCP extends BaseTerraformCommandHandler {
constructor() {
@@ -13,7 +13,7 @@ export class TerraformCommandHandlerGCP extends BaseTerraformCommandHandler {

private getJsonKeyFilePath(serviceName: string) {
// Get credentials for json file
const jsonKeyFilePath = path.resolve(`credentials-${uuidV4()}.json`);
const jsonKeyFilePath = path.resolve(`credentials-${uuidV5(serviceName, uuidV5.URL)}.json`);

let clientEmail = tasks.getEndpointAuthorizationParameter(serviceName, "Issuer", false);
let tokenUri = tasks.getEndpointAuthorizationParameter(serviceName, "Audience", false);
2 changes: 1 addition & 1 deletion Tasks/TerraformTask/TerraformTaskV4/task.json
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
"demands": [],
"version": {
"Major": "4",
"Minor": "228",
"Minor": "236",
"Patch": "0"
},
"instanceNameFormat": "Terraform : $(provider)",
2 changes: 1 addition & 1 deletion Tasks/TerraformTask/TerraformTaskV4/task.loc.json
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
"demands": [],
"version": {
"Major": "4",
"Minor": "228",
"Minor": "236",
"Patch": "0"
},
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",