From b2a6b6e641c215fe3747e51adcbb46ac14f571b0 Mon Sep 17 00:00:00 2001 From: Aaron Moat <2937187+AaronMoat@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:13:24 +1100 Subject: [PATCH] Wording updates --- src/cli/__snapshots__/format.int.test.ts.snap | 16 ++++++------- src/cli/configure/patchRenovateConfig.test.ts | 24 +++++++++---------- src/cli/configure/patchRenovateConfig.ts | 8 +++---- .../configure/upgrade/patches/7.3.1/index.ts | 4 ++-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/cli/__snapshots__/format.int.test.ts.snap b/src/cli/__snapshots__/format.int.test.ts.snap index 38fa0e33f..59c6a545f 100644 --- a/src/cli/__snapshots__/format.int.test.ts.snap +++ b/src/cli/__snapshots__/format.int.test.ts.snap @@ -10,9 +10,9 @@ Updating skuba... Patch skipped: Add empty exports to Jest files for compliance with TypeScript isolated modules -Patch skipped: Update renovate config for private Renovate auth - owner does not map to any of SEEK's renovate auth config +Patch skipped: Update Renovate config to support private SEEK packages - owner does not map to a SEEK preset -Patch skipped: Swap node distroless Docker image to -debian11 variant - no Dockerfile found +Patch skipped: Upgrade Node.js Distroless Docker image to -debian11 variant - no Dockerfile found Patch skipped: Add keepAliveTimeout to server listener - no listener file found @@ -77,9 +77,9 @@ Updating skuba... Patch skipped: Add empty exports to Jest files for compliance with TypeScript isolated modules -Patch skipped: Update renovate config for private Renovate auth - owner does not map to any of SEEK's renovate auth config +Patch skipped: Update Renovate config to support private SEEK packages - owner does not map to a SEEK preset -Patch skipped: Swap node distroless Docker image to -debian11 variant - no Dockerfile found +Patch skipped: Upgrade Node.js Distroless Docker image to -debian11 variant - no Dockerfile found Patch skipped: Add keepAliveTimeout to server listener - no listener file found @@ -137,9 +137,9 @@ Updating skuba... Patch skipped: Add empty exports to Jest files for compliance with TypeScript isolated modules -Patch skipped: Update renovate config for private Renovate auth - owner does not map to any of SEEK's renovate auth config +Patch skipped: Update Renovate config to support private SEEK packages - owner does not map to a SEEK preset -Patch skipped: Swap node distroless Docker image to -debian11 variant - no Dockerfile found +Patch skipped: Upgrade Node.js Distroless Docker image to -debian11 variant - no Dockerfile found Patch skipped: Add keepAliveTimeout to server listener - no listener file found @@ -170,9 +170,9 @@ Updating skuba... Patch skipped: Add empty exports to Jest files for compliance with TypeScript isolated modules -Patch skipped: Update renovate config for private Renovate auth - owner does not map to any of SEEK's renovate auth config +Patch skipped: Update Renovate config to support private SEEK packages - owner does not map to a SEEK preset -Patch skipped: Swap node distroless Docker image to -debian11 variant - no Dockerfile found +Patch skipped: Upgrade Node.js Distroless Docker image to -debian11 variant - no Dockerfile found Patch skipped: Add keepAliveTimeout to server listener - no listener file found diff --git a/src/cli/configure/patchRenovateConfig.test.ts b/src/cli/configure/patchRenovateConfig.test.ts index 4c554a2f6..db15e106b 100644 --- a/src/cli/configure/patchRenovateConfig.test.ts +++ b/src/cli/configure/patchRenovateConfig.test.ts @@ -139,7 +139,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('format')).resolves.toEqual({ result: 'skip', - reason: 'no renovate config found', + reason: 'no config found', }); expect(volToJson()).toStrictEqual(files); @@ -183,7 +183,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('format')).resolves.toEqual({ result: 'skip', - reason: 'could not find git root', + reason: 'no Git root found', }); expect(volToJson()).toStrictEqual(files); @@ -200,7 +200,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('format')).resolves.toEqual({ result: 'skip', - reason: "owner does not map to any of SEEK's renovate auth config", + reason: 'owner does not map to a SEEK preset', }); expect(volToJson()).toStrictEqual(files); @@ -220,7 +220,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('format')).resolves.toEqual({ result: 'skip', - reason: "owner does not map to any of SEEK's renovate auth config", + reason: 'owner does not map to a SEEK preset', }); expect(volToJson()).toStrictEqual(files); @@ -262,7 +262,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('format')).resolves.toEqual({ result: 'skip', - reason: 'renovate config already has private auth', + reason: 'config already has a SEEK preset', }); expect(volToJson()).toStrictEqual(files); @@ -282,7 +282,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('format')).resolves.toEqual({ result: 'skip', - reason: 'renovate config already has private auth', + reason: 'config already has a SEEK preset', }); expect(volToJson()).toStrictEqual(files); @@ -356,7 +356,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('lint')).resolves.toEqual({ result: 'skip', - reason: 'no renovate config found', + reason: 'no config found', }); expect(volToJson()).toStrictEqual(files); @@ -373,7 +373,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('lint')).resolves.toEqual({ result: 'skip', - reason: 'could not find git root', + reason: 'no Git root found', }); expect(volToJson()).toStrictEqual(files); @@ -390,7 +390,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('lint')).resolves.toEqual({ result: 'skip', - reason: "owner does not map to any of SEEK's renovate auth config", + reason: 'owner does not map to a SEEK preset', }); expect(volToJson()).toStrictEqual(files); @@ -410,7 +410,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('lint')).resolves.toEqual({ result: 'skip', - reason: "owner does not map to any of SEEK's renovate auth config", + reason: 'owner does not map to a SEEK preset', }); expect(volToJson()).toStrictEqual(files); @@ -452,7 +452,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('lint')).resolves.toEqual({ result: 'skip', - reason: 'renovate config already has private auth', + reason: 'config already has a SEEK preset', }); expect(volToJson()).toStrictEqual(files); @@ -472,7 +472,7 @@ describe('patchRenovateConfig', () => { await expect(tryPatchRenovateConfig('lint')).resolves.toEqual({ result: 'skip', - reason: 'renovate config already has private auth', + reason: 'config already has a SEEK preset', }); expect(volToJson()).toStrictEqual(files); diff --git a/src/cli/configure/patchRenovateConfig.ts b/src/cli/configure/patchRenovateConfig.ts index 6d8a3645f..57c97c1e6 100644 --- a/src/cli/configure/patchRenovateConfig.ts +++ b/src/cli/configure/patchRenovateConfig.ts @@ -105,7 +105,7 @@ const patchRenovateConfig = async ( if (!presetToAdd) { return { result: 'skip', - reason: "owner does not map to any of SEEK's renovate auth config", + reason: 'owner does not map to a SEEK preset', }; } @@ -118,7 +118,7 @@ const patchRenovateConfig = async ( const config = maybeConfigs.find((maybeConfig) => Boolean(maybeConfig.input)); if (!config?.input) { - return { result: 'skip', reason: 'no renovate config found' }; + return { result: 'skip', reason: 'no config found' }; } if ( @@ -131,7 +131,7 @@ const patchRenovateConfig = async ( ) { return { result: 'skip', - reason: 'renovate config already has private auth', + reason: 'config already has a SEEK preset', }; } @@ -165,7 +165,7 @@ export const tryPatchRenovateConfig = (async ( // with Renovate config that should be relative to the repository root. const gitRoot = await Git.findRoot({ dir }); if (!gitRoot) { - return { result: 'skip', reason: 'could not find git root' }; + return { result: 'skip', reason: 'no Git root found' }; } return await patchRenovateConfig(mode, gitRoot); diff --git a/src/cli/configure/upgrade/patches/7.3.1/index.ts b/src/cli/configure/upgrade/patches/7.3.1/index.ts index c303df123..b0f815f8a 100644 --- a/src/cli/configure/upgrade/patches/7.3.1/index.ts +++ b/src/cli/configure/upgrade/patches/7.3.1/index.ts @@ -13,11 +13,11 @@ export const patches: Patches = [ }, { apply: tryPatchRenovateConfig, - description: 'Update renovate config for private Renovate auth', + description: 'Update Renovate config to support private SEEK packages', }, { apply: tryPatchDockerfile, - description: 'Swap node distroless Docker image to -debian11 variant', + description: 'Upgrade Node.js Distroless Docker image to -debian11 variant', }, { apply: tryPatchServerListener,