fix: update default config application

redhat-plumbers-in-action · Oct 18, 2024 · 4e2950c · 4e2950c
1 parent f9f9f76
commit 4e2950c
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 5 deletions.
diff --git a/dist/config.js b/dist/config.js
diff --git a/dist/config.js.map b/dist/config.js.map
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "@octokit/types": "13.6.1",
     "@probot/octokit-plugin-config": "3.0.2",
     "bugzilla": "3.1.2",
+    "deepmerge": "^4.3.1",
     "dotenv": "16.4.5",
     "jira.js": "4.0.2",
     "node-fetch": "3.3.2",

diff --git a/src/config.ts b/src/config.ts
@@ -1,5 +1,6 @@
 import { debug, getInput } from '@actions/core';
 import { context } from '@actions/github';
+import deepmerge from 'deepmerge';
 
 import { CustomOctokit } from './octokit';
 import { configSchema, ConfigLabels, ConfigProducts } from './schema/config';
@@ -31,7 +32,8 @@ export class Config {
       await octokit.config.get({
         ...context.repo,
         path,
-        defaults: Config.defaults,
+        defaults: configs =>
+          deepmerge.all([this.defaults, ...configs]) as Partial<Config>,
       })
     ).config;
 

diff --git a/yarn.lock b/yarn.lock
@@ -1240,6 +1240,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deepmerge@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "deepmerge@npm:4.3.1"
+  checksum: 10c0/e53481aaf1aa2c4082b5342be6b6d8ad9dfe387bc92ce197a66dea08bd4265904a087e75e464f14d1347cf2ac8afe1e4c16b266e0561cc5df29382d3c5f80044
+  languageName: node
+  linkType: hard
+
 "delayed-stream@npm:~1.0.0":
   version: 1.0.0
   resolution: "delayed-stream@npm:1.0.0"
@@ -2453,6 +2460,7 @@ __metadata:
     "@vercel/ncc": "npm:0.38.2"
     "@vitest/coverage-v8": "npm:2.1.3"
     bugzilla: "npm:3.1.2"
+    deepmerge: "npm:^4.3.1"
     dotenv: "npm:16.4.5"
     jira.js: "npm:4.0.2"
     node-fetch: "npm:3.3.2"