Skip to content

Commit 325ce43

Browse files
author
root
committed
Change GCP credential file generator to use deterministic uuidv5() instead of uuid4() so the credentials filename is always the same (based on the service connection name.)
Bump version to current sprint.
1 parent 648beac commit 325ce43

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

Tasks/TerraformTask/TerraformTaskV4/Tests/InitTests/GCP/GCPInitFailInvalidWorkingDirectory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers> {
3838
}
3939
}
4040

41-
tr.registerMock('uuid/v4', () => '123');
41+
tr.registerMock('uuid/v5', () => '123');
4242
tr.setAnswers(a);
4343

4444
tr.run();

Tasks/TerraformTask/TerraformTaskV4/Tests/InitTests/GCP/GCPInitSuccessAdditionalArgs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers> {
3838
}
3939
}
4040

41-
tr.registerMock('uuid/v4', () => '123');
41+
tr.registerMock('uuid/v5', () => '123');
4242
tr.setAnswers(a);
4343

4444
tr.run();

Tasks/TerraformTask/TerraformTaskV4/Tests/InitTests/GCP/GCPInitSuccessEmptyWorkingDir.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers> {
3838
}
3939
}
4040

41-
tr.registerMock('uuid/v4', () => '123');
41+
tr.registerMock('uuid/v5', () => '123');
4242
tr.setAnswers(a);
4343

4444
tr.run();

Tasks/TerraformTask/TerraformTaskV4/Tests/InitTests/GCP/GCPInitSuccessNoAdditionalArgs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers> {
3838
}
3939
}
4040

41-
tr.registerMock('uuid/v4', () => '123');
41+
tr.registerMock('uuid/v5', () => '123');
4242
tr.setAnswers(a);
4343

4444
tr.run();

Tasks/TerraformTask/TerraformTaskV4/src/gcp-terraform-command-handler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {ToolRunner} from 'azure-pipelines-task-lib/toolrunner';
33
import {TerraformAuthorizationCommandInitializer} from './terraform-commands';
44
import {BaseTerraformCommandHandler} from './base-terraform-command-handler';
55
import path = require('path');
6-
import * as uuidV4 from 'uuid/v4';
6+
import * as uuidV5 from 'uuid/v5';
77

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

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

1818
let clientEmail = tasks.getEndpointAuthorizationParameter(serviceName, "Issuer", false);
1919
let tokenUri = tasks.getEndpointAuthorizationParameter(serviceName, "Audience", false);

Tasks/TerraformTask/TerraformTaskV4/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"demands": [],
1515
"version": {
1616
"Major": "4",
17-
"Minor": "228",
17+
"Minor": "236",
1818
"Patch": "0"
1919
},
2020
"instanceNameFormat": "Terraform : $(provider)",

Tasks/TerraformTask/TerraformTaskV4/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"demands": [],
1414
"version": {
1515
"Major": "4",
16-
"Minor": "228",
16+
"Minor": "236",
1717
"Patch": "0"
1818
},
1919
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

0 commit comments

Comments
 (0)