actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

always force alphanumeric characters for cloud formation

pull/263/head
Frostebite 2021-05-16 01:22:18 +01:00
parent c4b2d441c5
commit df9bcbb328
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/index.js vendored
View File

@ -1244,11 +1244,11 @@ class AWS {
].join(''); ].join('');
const indexp2 = taskDefCloudFormation.search(insertionStringSecrets) + insertionStringSecrets.length + '\n'.length; const indexp2 = taskDefCloudFormation.search(insertionStringSecrets) + insertionStringSecrets.length + '\n'.length;
const secretTemplate = ` const secretTemplate = `
${secret.ParameterKey}Secret: ${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}Secret:
Type: AWS::SecretsManager::Secret Type: AWS::SecretsManager::Secret
Properties: Properties:
Name: !Join [ "", [ '${secret.ParameterKey}', !Ref BUILDID ] ] Name: !Join [ "", [ '${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}', !Ref BUILDID ] ]
SecretString: !Ref ${secret.ParameterKey} SecretString: !Ref ${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}
`; `;
taskDefCloudFormation = [ taskDefCloudFormation = [
taskDefCloudFormation.slice(0, indexp2), taskDefCloudFormation.slice(0, indexp2),
@ -1259,8 +1259,10 @@ class AWS {
insertionStringContainerSecrets.length + insertionStringContainerSecrets.length +
'\n'.length; '\n'.length;
const containerDefinitionSecretTemplate = ` const containerDefinitionSecretTemplate = `
- Name: '${secret.EnvironmentVariable ? secret.EnvironmentVariable : secret.ParameterKey}' - Name: '${secret.EnvironmentVariable.replace(/[^\dA-Za-z]/g, '')
ValueFrom: !Ref ${secret.ParameterKey}Secret ? secret.EnvironmentVariable.replace(/[^\dA-Za-z]/g, '')
: secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}'
ValueFrom: !Ref ${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}Secret
`; `;
taskDefCloudFormation = [ taskDefCloudFormation = [
taskDefCloudFormation.slice(0, indexp3), taskDefCloudFormation.slice(0, indexp3),

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

14
src/model/remote-builder/aws.ts
View File

@ -78,11 +78,11 @@ class AWS {
const indexp2 = const indexp2 =
taskDefCloudFormation.search(insertionStringSecrets) + insertionStringSecrets.length + '\n'.length; taskDefCloudFormation.search(insertionStringSecrets) + insertionStringSecrets.length + '\n'.length;
const secretTemplate = ` const secretTemplate = `
${secret.ParameterKey}Secret: ${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}Secret:
Type: AWS::SecretsManager::Secret Type: AWS::SecretsManager::Secret
Properties: Properties:
Name: !Join [ "", [ '${secret.ParameterKey}', !Ref BUILDID ] ] Name: !Join [ "", [ '${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}', !Ref BUILDID ] ]
SecretString: !Ref ${secret.ParameterKey} SecretString: !Ref ${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}
`; `;
taskDefCloudFormation = [ taskDefCloudFormation = [
taskDefCloudFormation.slice(0, indexp2), taskDefCloudFormation.slice(0, indexp2),
@ -94,8 +94,12 @@ class AWS {
insertionStringContainerSecrets.length + insertionStringContainerSecrets.length +
'\n'.length; '\n'.length;
const containerDefinitionSecretTemplate = ` const containerDefinitionSecretTemplate = `
- Name: '${secret.EnvironmentVariable ? secret.EnvironmentVariable : secret.ParameterKey}' - Name: '${
ValueFrom: !Ref ${secret.ParameterKey}Secret secret.EnvironmentVariable.replace(/[^\dA-Za-z]/g, '')
? secret.EnvironmentVariable.replace(/[^\dA-Za-z]/g, '')
: secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')
}'
ValueFrom: !Ref ${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}Secret
`; `;
taskDefCloudFormation = [ taskDefCloudFormation = [
taskDefCloudFormation.slice(0, indexp3), taskDefCloudFormation.slice(0, indexp3),