diff --git a/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap b/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap index 2d66d38c4f89dd82d43b9934b47fb0ee645dbd56..65cddbfc6e411d0662dcbe53519aad00dd8fd19e 100644 --- a/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap +++ b/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap @@ -286,9 +286,9 @@ Array [ "env": Object { "CGO_ENABLED": "1", "GIT_CONFIG_COUNT": "3", - "GIT_CONFIG_KEY_0": "url.\\"https://ssh:some-token@github.com/\\".insteadOf", - "GIT_CONFIG_KEY_1": "url.\\"https://git:some-token@github.com/\\".insteadOf", - "GIT_CONFIG_KEY_2": "url.\\"https://some-token@github.com/\\".insteadOf", + "GIT_CONFIG_KEY_0": "url.https://ssh:some-token@github.com/.insteadOf", + "GIT_CONFIG_KEY_1": "url.https://git:some-token@github.com/.insteadOf", + "GIT_CONFIG_KEY_2": "url.https://some-token@github.com/.insteadOf", "GIT_CONFIG_VALUE_0": "ssh://git@github.com/", "GIT_CONFIG_VALUE_1": "git@github.com:", "GIT_CONFIG_VALUE_2": "https://github.com/", diff --git a/lib/manager/gomod/artifacts.spec.ts b/lib/manager/gomod/artifacts.spec.ts index abf07a3a456faa424fdec6f4a3cd68b1fb80e740..f37a32da154beed47823574a7f697e6488ff4ec8 100644 --- a/lib/manager/gomod/artifacts.spec.ts +++ b/lib/manager/gomod/artifacts.spec.ts @@ -248,17 +248,16 @@ describe('manager/gomod/artifacts', () => { env: expect.objectContaining({ GIT_CONFIG_COUNT: '6', GIT_CONFIG_KEY_0: - 'url."https://ssh:some-token@github.com/".insteadOf', + 'url.https://ssh:some-token@github.com/.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://git:some-token@github.com/".insteadOf', - GIT_CONFIG_KEY_2: - 'url."https://some-token@github.com/".insteadOf', + 'url.https://git:some-token@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://some-token@github.com/.insteadOf', GIT_CONFIG_KEY_3: - 'url."https://ssh:some-enterprise-token@github.enterprise.com/".insteadOf', + 'url.https://ssh:some-enterprise-token@github.enterprise.com/.insteadOf', GIT_CONFIG_KEY_4: - 'url."https://git:some-enterprise-token@github.enterprise.com/".insteadOf', + 'url.https://git:some-enterprise-token@github.enterprise.com/.insteadOf', GIT_CONFIG_KEY_5: - 'url."https://some-enterprise-token@github.enterprise.com/".insteadOf', + 'url.https://some-enterprise-token@github.enterprise.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/', GIT_CONFIG_VALUE_1: 'git@github.com:', GIT_CONFIG_VALUE_2: 'https://github.com/', @@ -303,11 +302,11 @@ describe('manager/gomod/artifacts', () => { env: expect.objectContaining({ GIT_CONFIG_COUNT: '3', GIT_CONFIG_KEY_0: - 'url."https://gitlab-ci-token:some-enterprise-token@gitlab.enterprise.com/".insteadOf', + 'url.https://gitlab-ci-token:some-enterprise-token@gitlab.enterprise.com/.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://gitlab-ci-token:some-enterprise-token@gitlab.enterprise.com/".insteadOf', + 'url.https://gitlab-ci-token:some-enterprise-token@gitlab.enterprise.com/.insteadOf', GIT_CONFIG_KEY_2: - 'url."https://gitlab-ci-token:some-enterprise-token@gitlab.enterprise.com/".insteadOf', + 'url.https://gitlab-ci-token:some-enterprise-token@gitlab.enterprise.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@gitlab.enterprise.com/', GIT_CONFIG_VALUE_1: 'git@gitlab.enterprise.com:', GIT_CONFIG_VALUE_2: 'https://gitlab.enterprise.com/', @@ -354,17 +353,17 @@ describe('manager/gomod/artifacts', () => { env: expect.objectContaining({ GIT_CONFIG_COUNT: '6', GIT_CONFIG_KEY_0: - 'url."https://gitlab-ci-token:some-enterprise-token-repo1@gitlab.enterprise.com/repo1".insteadOf', + 'url.https://gitlab-ci-token:some-enterprise-token-repo1@gitlab.enterprise.com/repo1.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://gitlab-ci-token:some-enterprise-token-repo1@gitlab.enterprise.com/repo1".insteadOf', + 'url.https://gitlab-ci-token:some-enterprise-token-repo1@gitlab.enterprise.com/repo1.insteadOf', GIT_CONFIG_KEY_2: - 'url."https://gitlab-ci-token:some-enterprise-token-repo1@gitlab.enterprise.com/repo1".insteadOf', + 'url.https://gitlab-ci-token:some-enterprise-token-repo1@gitlab.enterprise.com/repo1.insteadOf', GIT_CONFIG_KEY_3: - 'url."https://gitlab-ci-token:some-enterprise-token-repo2@gitlab.enterprise.com/repo2".insteadOf', + 'url.https://gitlab-ci-token:some-enterprise-token-repo2@gitlab.enterprise.com/repo2.insteadOf', GIT_CONFIG_KEY_4: - 'url."https://gitlab-ci-token:some-enterprise-token-repo2@gitlab.enterprise.com/repo2".insteadOf', + 'url.https://gitlab-ci-token:some-enterprise-token-repo2@gitlab.enterprise.com/repo2.insteadOf', GIT_CONFIG_KEY_5: - 'url."https://gitlab-ci-token:some-enterprise-token-repo2@gitlab.enterprise.com/repo2".insteadOf', + 'url.https://gitlab-ci-token:some-enterprise-token-repo2@gitlab.enterprise.com/repo2.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@gitlab.enterprise.com/repo1', GIT_CONFIG_VALUE_1: 'git@gitlab.enterprise.com:repo1', GIT_CONFIG_VALUE_2: 'https://gitlab.enterprise.com/repo1', @@ -414,11 +413,11 @@ describe('manager/gomod/artifacts', () => { env: expect.objectContaining({ GIT_CONFIG_COUNT: '3', GIT_CONFIG_KEY_0: - 'url."https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/".insteadOf', + 'url.https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/".insteadOf', + 'url.https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/.insteadOf', GIT_CONFIG_KEY_2: - 'url."https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/".insteadOf', + 'url.https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@gitlab.enterprise.com/', GIT_CONFIG_VALUE_1: 'git@gitlab.enterprise.com:', GIT_CONFIG_VALUE_2: 'https://gitlab.enterprise.com/', @@ -473,29 +472,28 @@ describe('manager/gomod/artifacts', () => { env: expect.objectContaining({ GIT_CONFIG_COUNT: '12', GIT_CONFIG_KEY_0: - 'url."https://ssh:some-token@github.com/".insteadOf', + 'url.https://ssh:some-token@github.com/.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://git:some-token@github.com/".insteadOf', - GIT_CONFIG_KEY_2: - 'url."https://some-token@github.com/".insteadOf', + 'url.https://git:some-token@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://some-token@github.com/.insteadOf', GIT_CONFIG_KEY_3: - 'url."https://ssh:some-token@api.github.com/".insteadOf', + 'url.https://ssh:some-token@api.github.com/.insteadOf', GIT_CONFIG_KEY_4: - 'url."https://git:some-token@api.github.com/".insteadOf', + 'url.https://git:some-token@api.github.com/.insteadOf', GIT_CONFIG_KEY_5: - 'url."https://some-token@api.github.com/".insteadOf', + 'url.https://some-token@api.github.com/.insteadOf', GIT_CONFIG_KEY_6: - 'url."https://ssh:some-enterprise-token@github.enterprise.com/".insteadOf', + 'url.https://ssh:some-enterprise-token@github.enterprise.com/.insteadOf', GIT_CONFIG_KEY_7: - 'url."https://git:some-enterprise-token@github.enterprise.com/".insteadOf', + 'url.https://git:some-enterprise-token@github.enterprise.com/.insteadOf', GIT_CONFIG_KEY_8: - 'url."https://some-enterprise-token@github.enterprise.com/".insteadOf', + 'url.https://some-enterprise-token@github.enterprise.com/.insteadOf', GIT_CONFIG_KEY_9: - 'url."https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/".insteadOf', + 'url.https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/.insteadOf', GIT_CONFIG_KEY_10: - 'url."https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/".insteadOf', + 'url.https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/.insteadOf', GIT_CONFIG_KEY_11: - 'url."https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/".insteadOf', + 'url.https://gitlab-ci-token:some-gitlab-token@gitlab.enterprise.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/', GIT_CONFIG_VALUE_1: 'git@github.com:', GIT_CONFIG_VALUE_2: 'https://github.com/', @@ -549,11 +547,10 @@ describe('manager/gomod/artifacts', () => { env: expect.objectContaining({ GIT_CONFIG_COUNT: '3', GIT_CONFIG_KEY_0: - 'url."https://ssh:some-token@github.com/".insteadOf', + 'url.https://ssh:some-token@github.com/.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://git:some-token@github.com/".insteadOf', - GIT_CONFIG_KEY_2: - 'url."https://some-token@github.com/".insteadOf', + 'url.https://git:some-token@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://some-token@github.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/', GIT_CONFIG_VALUE_1: 'git@github.com:', GIT_CONFIG_VALUE_2: 'https://github.com/', diff --git a/lib/util/git/auth.spec.ts b/lib/util/git/auth.spec.ts index 357a34b7fc064fd89b1a8624d3159bc7b8a6ab9c..4e0618b6258a29ac9ffccff6b01e84a790223336 100644 --- a/lib/util/git/auth.spec.ts +++ b/lib/util/git/auth.spec.ts @@ -15,9 +15,9 @@ describe('util/git/auth', () => { }) ).toStrictEqual({ GIT_CONFIG_COUNT: '3', - GIT_CONFIG_KEY_0: 'url."https://ssh:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_1: 'url."https://git:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_2: 'url."https://token1234@github.com/".insteadOf', + GIT_CONFIG_KEY_0: 'url.https://ssh:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_1: 'url.https://git:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://token1234@github.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/', GIT_CONFIG_VALUE_1: 'git@github.com:', GIT_CONFIG_VALUE_2: 'https://github.com/', @@ -33,9 +33,9 @@ describe('util/git/auth', () => { }) ).toStrictEqual({ GIT_CONFIG_COUNT: '3', - GIT_CONFIG_KEY_0: 'url."https://ssh:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_1: 'url."https://git:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_2: 'url."https://token1234@github.com/".insteadOf', + GIT_CONFIG_KEY_0: 'url.https://ssh:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_1: 'url.https://git:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://token1234@github.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/', GIT_CONFIG_VALUE_1: 'git@github.com:', GIT_CONFIG_VALUE_2: 'https://github.com/', @@ -52,11 +52,11 @@ describe('util/git/auth', () => { ).toStrictEqual({ GIT_CONFIG_COUNT: '3', GIT_CONFIG_KEY_0: - 'url."https://x-access-token:token1234@github.com/".insteadOf', + 'url.https://x-access-token:token1234@github.com/.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://x-access-token:token1234@github.com/".insteadOf', + 'url.https://x-access-token:token1234@github.com/.insteadOf', GIT_CONFIG_KEY_2: - 'url."https://x-access-token:token1234@github.com/".insteadOf', + 'url.https://x-access-token:token1234@github.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/', GIT_CONFIG_VALUE_1: 'git@github.com:', GIT_CONFIG_VALUE_2: 'https://github.com/', @@ -76,9 +76,9 @@ describe('util/git/auth', () => { ) ).toStrictEqual({ GIT_CONFIG_COUNT: '4', - GIT_CONFIG_KEY_1: 'url."https://ssh:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_2: 'url."https://git:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_3: 'url."https://token1234@github.com/".insteadOf', + GIT_CONFIG_KEY_1: 'url.https://ssh:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://git:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_3: 'url.https://token1234@github.com/.insteadOf', GIT_CONFIG_VALUE_1: 'ssh://git@github.com/', GIT_CONFIG_VALUE_2: 'git@github.com:', GIT_CONFIG_VALUE_3: 'https://github.com/', @@ -99,9 +99,9 @@ describe('util/git/auth', () => { ) ).toStrictEqual({ GIT_CONFIG_COUNT: '4', - GIT_CONFIG_KEY_1: 'url."https://ssh:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_2: 'url."https://git:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_3: 'url."https://token1234@github.com/".insteadOf', + GIT_CONFIG_KEY_1: 'url.https://ssh:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://git:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_3: 'url.https://token1234@github.com/.insteadOf', GIT_CONFIG_VALUE_1: 'ssh://git@github.com/', GIT_CONFIG_VALUE_2: 'git@github.com:', GIT_CONFIG_VALUE_3: 'https://github.com/', @@ -118,9 +118,9 @@ describe('util/git/auth', () => { }) ).toStrictEqual({ GIT_CONFIG_COUNT: '4', - GIT_CONFIG_KEY_1: 'url."https://ssh:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_2: 'url."https://git:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_3: 'url."https://token1234@github.com/".insteadOf', + GIT_CONFIG_KEY_1: 'url.https://ssh:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://git:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_3: 'url.https://token1234@github.com/.insteadOf', GIT_CONFIG_VALUE_1: 'ssh://git@github.com/', GIT_CONFIG_VALUE_2: 'git@github.com:', GIT_CONFIG_VALUE_3: 'https://github.com/', @@ -140,9 +140,9 @@ describe('util/git/auth', () => { ) ).toStrictEqual({ GIT_CONFIG_COUNT: '3', - GIT_CONFIG_KEY_0: 'url."https://ssh:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_1: 'url."https://git:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_2: 'url."https://token1234@github.com/".insteadOf', + GIT_CONFIG_KEY_0: 'url.https://ssh:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_1: 'url.https://git:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://token1234@github.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/', GIT_CONFIG_VALUE_1: 'git@github.com:', GIT_CONFIG_VALUE_2: 'https://github.com/', @@ -160,9 +160,9 @@ describe('util/git/auth', () => { }) ).toStrictEqual({ GIT_CONFIG_COUNT: '3', - GIT_CONFIG_KEY_0: 'url."https://ssh:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_1: 'url."https://git:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_2: 'url."https://token1234@github.com/".insteadOf', + GIT_CONFIG_KEY_0: 'url.https://ssh:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_1: 'url.https://git:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://token1234@github.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/', GIT_CONFIG_VALUE_1: 'git@github.com:', GIT_CONFIG_VALUE_2: 'https://github.com/', @@ -179,11 +179,11 @@ describe('util/git/auth', () => { ).toStrictEqual({ GIT_CONFIG_COUNT: '3', GIT_CONFIG_KEY_0: - 'url."https://gitlab-ci-token:token1234@gitlab.com/".insteadOf', + 'url.https://gitlab-ci-token:token1234@gitlab.com/.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://gitlab-ci-token:token1234@gitlab.com/".insteadOf', + 'url.https://gitlab-ci-token:token1234@gitlab.com/.insteadOf', GIT_CONFIG_KEY_2: - 'url."https://gitlab-ci-token:token1234@gitlab.com/".insteadOf', + 'url.https://gitlab-ci-token:token1234@gitlab.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@gitlab.com/', GIT_CONFIG_VALUE_1: 'git@gitlab.com:', GIT_CONFIG_VALUE_2: 'https://gitlab.com/', @@ -216,9 +216,9 @@ describe('util/git/auth', () => { }) ).toStrictEqual({ GIT_CONFIG_COUNT: '3', - GIT_CONFIG_KEY_0: 'url."http://ssh:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_1: 'url."http://git:token1234@github.com/".insteadOf', - GIT_CONFIG_KEY_2: 'url."http://token1234@github.com/".insteadOf', + GIT_CONFIG_KEY_0: 'url.http://ssh:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_1: 'url.http://git:token1234@github.com/.insteadOf', + GIT_CONFIG_KEY_2: 'url.http://token1234@github.com/.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/', GIT_CONFIG_VALUE_1: 'git@github.com:', GIT_CONFIG_VALUE_2: 'http://github.com/', @@ -234,11 +234,9 @@ describe('util/git/auth', () => { }) ).toStrictEqual({ GIT_CONFIG_COUNT: '3', - GIT_CONFIG_KEY_0: - 'url."https://ssh:token1234@github.com/org".insteadOf', - GIT_CONFIG_KEY_1: - 'url."https://git:token1234@github.com/org".insteadOf', - GIT_CONFIG_KEY_2: 'url."https://token1234@github.com/org".insteadOf', + GIT_CONFIG_KEY_0: 'url.https://ssh:token1234@github.com/org.insteadOf', + GIT_CONFIG_KEY_1: 'url.https://git:token1234@github.com/org.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://token1234@github.com/org.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/org', GIT_CONFIG_VALUE_1: 'git@github.com:org', GIT_CONFIG_VALUE_2: 'https://github.com/org', @@ -255,11 +253,10 @@ describe('util/git/auth', () => { ).toStrictEqual({ GIT_CONFIG_COUNT: '3', GIT_CONFIG_KEY_0: - 'url."https://ssh:token1234@github.com/org/repo".insteadOf', + 'url.https://ssh:token1234@github.com/org/repo.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://git:token1234@github.com/org/repo".insteadOf', - GIT_CONFIG_KEY_2: - 'url."https://token1234@github.com/org/repo".insteadOf', + 'url.https://git:token1234@github.com/org/repo.insteadOf', + GIT_CONFIG_KEY_2: 'url.https://token1234@github.com/org/repo.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com/org/repo', GIT_CONFIG_VALUE_1: 'git@github.com:org/repo', GIT_CONFIG_VALUE_2: 'https://github.com/org/repo', @@ -279,11 +276,11 @@ describe('util/git/auth', () => { ).toStrictEqual({ GIT_CONFIG_COUNT: '3', GIT_CONFIG_KEY_0: - 'url."https://ssh:token1234@github.com:89/org/repo.git".insteadOf', + 'url.https://ssh:token1234@github.com:89/org/repo.git.insteadOf', GIT_CONFIG_KEY_1: - 'url."https://git:token1234@github.com:89/org/repo.git".insteadOf', + 'url.https://git:token1234@github.com:89/org/repo.git.insteadOf', GIT_CONFIG_KEY_2: - 'url."https://token1234@github.com:89/org/repo.git".insteadOf', + 'url.https://token1234@github.com:89/org/repo.git.insteadOf', GIT_CONFIG_VALUE_0: 'ssh://git@github.com:89/org/repo.git', GIT_CONFIG_VALUE_1: 'ssh://git@github.com:89/org/repo.git', GIT_CONFIG_VALUE_2: 'https://github.com:89/org/repo.git', diff --git a/lib/util/git/auth.ts b/lib/util/git/auth.ts index 5d2c6c006fee5c456cb1f0e861be69d8fd379465..512a1ebe17f0cf1704ed5f76d69eac34d01ec58c 100644 --- a/lib/util/git/auth.ts +++ b/lib/util/git/auth.ts @@ -51,7 +51,7 @@ export function getGitAuthenticatedEnvironmentVariables( for (const rule of authenticationRules) { newEnvironmentVariables[ `GIT_CONFIG_KEY_${gitConfigCount}` - ] = `url."${rule.url}".insteadOf`; + ] = `url.${rule.url}.insteadOf`; newEnvironmentVariables[`GIT_CONFIG_VALUE_${gitConfigCount}`] = rule.insteadOf; gitConfigCount++;