refactor: remove depNameShort (#9114)

renovatebot · Mar 13, 2021 · edfac73 · edfac73
1 parent b7b268e
commit edfac73
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 8 deletions.
diff --git a/lib/config/__snapshots__/migration.spec.ts.snap b/lib/config/__snapshots__/migration.spec.ts.snap
@@ -87,7 +87,7 @@ Object {
   "binarySource": "global",
   "branchName": "{{{branchPrefix}}}{{{additionalBranchPrefix}}}{{{branchTopic}}}{{{packageFileDir}}}",
   "branchPrefix": "renovate/",
-  "commitMessage": "{{#if semanticCommitType}}{{semanticCommitType}}{{#if semanticCommitScope}}({{semanticCommitScope}}){{/if}}: {{/if}}some commit message",
+  "commitMessage": "{{#if semanticCommitType}}{{semanticCommitType}}{{#if semanticCommitScope}}({{semanticCommitScope}}){{/if}}: {{/if}}some commit message {{depName}}",
   "constraints": Object {
     "python": "3.7",
   },

diff --git a/lib/config/migration.spec.ts b/lib/config/migration.spec.ts
@@ -73,7 +73,7 @@ describe('config/migration', () => {
         meteor: true,
         autodiscover: 'true' as never,
         schedule: 'on the last day of the month' as never,
-        commitMessage: '{{semanticPrefix}}some commit message',
+        commitMessage: '{{semanticPrefix}}some commit message {{depNameShort}}',
         prTitle: '{{semanticPrefix}}some pr title',
         semanticPrefix: 'fix(deps): ',
         pathRules: [

diff --git a/lib/config/migration.ts b/lib/config/migration.ts
@@ -166,6 +166,8 @@ export function migrateConfig(
         }
       } else if (is.string(val) && val.includes('{{baseDir}}')) {
         migratedConfig[key] = val.replace(/{{baseDir}}/g, '{{packageFileDir}}');
+      } else if (is.string(val) && val.includes('{{depNameShort}}')) {
+        migratedConfig[key] = val.replace(/{{depNameShort}}/g, '{{depName}}');
       } else if (key === 'gitFs') {
         delete migratedConfig.gitFs;
       } else if (key === 'rebaseStalePrs') {

diff --git a/lib/manager/terraform/index.ts b/lib/manager/terraform/index.ts
@@ -4,7 +4,7 @@ export { extractPackageFile } from './extract';
 
 export const defaultConfig = {
   commitMessageTopic:
-    'Terraform {{managerData.terraformDependencyType}} {{depNameShort}}',
+    'Terraform {{managerData.terraformDependencyType}} {{depName}}',
   fileMatch: ['\\.tf$'],
   versioning: hashicorpVersioning.id,
 };
diff --git a/lib/manager/terragrunt/index.ts b/lib/manager/terragrunt/index.ts
@@ -3,7 +3,7 @@ import * as hashicorpVersioning from '../../versioning/hashicorp';
 export { extractPackageFile } from './extract';
 
 export const defaultConfig = {
-  commitMessageTopic: 'Terragrunt dependency {{depNameShort}}',
+  commitMessageTopic: 'Terragrunt dependency {{depName}}',
   fileMatch: ['(^|/)terragrunt\\.hcl$'],
   versioning: hashicorpVersioning.id,
 };
diff --git a/lib/manager/types.ts b/lib/manager/types.ts
@@ -107,7 +107,6 @@ export interface Package<T> extends ManagerData<T> {
   currentValue?: string;
   currentDigest?: string;
   depName?: string;
-  depNameShort?: string;
   depType?: string;
   fileReplacePosition?: number;
   groupName?: string;

diff --git a/lib/util/template/index.ts b/lib/util/template/index.ts
@@ -48,7 +48,6 @@ export const allowedFields = {
     'The dependency name already linked to its home page using markdown',
   depNameSanitized:
     'The depName field sanitized for use in branches after removing spaces and special characters',
-  depNameShort: 'Shortened depName',
   depType: 'The dependency type (if extracted - manager-dependent)',
   displayFrom: 'The current value, formatted for display',
   displayTo: 'The to value, formatted for display',

diff --git a/lib/workers/repository/updates/flatten.spec.ts b/lib/workers/repository/updates/flatten.spec.ts
@@ -113,7 +113,6 @@ describe('workers/repository/updates/flatten', () => {
         res.filter((r) => r.updateType === 'lockFileMaintenance')
       ).toHaveLength(2);
       expect(res.filter((r) => r.isVulnerabilityAlert)).toHaveLength(1);
-      expect(res.filter((r) => r.depNameShort)).toHaveLength(10); // lockFileMaintenance has no depName
     });
   });
 });
diff --git a/lib/workers/repository/updates/flatten.ts b/lib/workers/repository/updates/flatten.ts
@@ -18,7 +18,6 @@ export function applyUpdateConfig(input: BranchUpgradeConfig): any {
   const updateConfig = { ...input };
   delete updateConfig.packageRules;
   // TODO: Remove next line once #8075 is complete
-  updateConfig.depNameShort ||= updateConfig.depName;
   updateConfig.depNameSanitized = updateConfig.depName
     ? updateConfig.depName
         .replace('@types/', '')