tianzixuan/gradle-build-action
1
0
Fork 0
mirror of https://github.com/gradle/gradle-build-action.git synced 2025-10-31 23:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace spaces with underscore in job correlator

Browse Source
This commit is contained in:
daz
2023-07-07 11:38:30 -06:00
parent ee7ca6ac9b
commit c0186c5832
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dependency-graph.ts
View File

@@ -171,5 +171,8 @@ function describeMatrix(matrixJson: string): string {
} }
function sanitize(value: string): string { function sanitize(value: string): string {
return value.replace(/[^a-zA-Z0-9_-]/g, '').toLowerCase() return value
.replace(/[^a-zA-Z0-9_-\s]/g, '')
.replace(/\s+/g, '_')
.toLowerCase()
} }

8
test/jest/dependency-graph.test.ts
View File

@@ -4,12 +4,16 @@ describe('dependency-graph', () => {
describe('constructs job correlator', () => { describe('constructs job correlator', () => {
it('removes commas from workflow name', () => { it('removes commas from workflow name', () => {
const id = dependencyGraph.constructJobCorrelator('Workflow, with,commas', 'jobid', '{}') const id = dependencyGraph.constructJobCorrelator('Workflow, with,commas', 'jobid', '{}')
expect(id).toBe('workflowwithcommas-jobid') expect(id).toBe('workflow_withcommas-jobid')
}) })
it('removes non word characters', () => { it('removes non word characters', () => {
const id = dependencyGraph.constructJobCorrelator('Workflow!_with()characters', 'job-*id', '{"foo": "bar!@#$%^&*("}') const id = dependencyGraph.constructJobCorrelator('Workflow!_with()characters', 'job-*id', '{"foo": "bar!@#$%^&*("}')
expect(id).toBe('workflow_withcharacters-job-id-bar') expect(id).toBe('workflow_withcharacters-job-id-bar')
}) })
it('replaces spaces', () => {
const id = dependencyGraph.constructJobCorrelator('Workflow !_ with () characters, and spaces', 'job-*id', '{"foo": "bar!@#$%^&*("}')
expect(id).toBe('workflow___with_characters_and_spaces-job-id-bar')
})
it('without matrix', () => { it('without matrix', () => {
const id = dependencyGraph.constructJobCorrelator('workflow', 'jobid', 'null') const id = dependencyGraph.constructJobCorrelator('workflow', 'jobid', 'null')
expect(id).toBe('workflow-jobid') expect(id).toBe('workflow-jobid')
@@ -24,7 +28,7 @@ describe('dependency-graph', () => {
}) })
it('with composite matrix value', () => { it('with composite matrix value', () => {
const id = dependencyGraph.constructJobCorrelator('workflow', 'jobid', '{"os": "windows", "java-version": "21.1", "other": "Value, with COMMA"}') const id = dependencyGraph.constructJobCorrelator('workflow', 'jobid', '{"os": "windows", "java-version": "21.1", "other": "Value, with COMMA"}')
expect(id).toBe('workflow-jobid-windows-211-valuewithcomma') expect(id).toBe('workflow-jobid-windows-211-value_with_comma')
}) })
}) })
}) })