Resolve PR #990 merge conflicts and fix js-yaml empty-document regression

index.js

@@ -8,6 +8,14 @@ const NopCommand = require('./lib/nopcommand')
 const SettingsGenerator = require('./lib/settingsGenerator')
 const AppOctokitClient = require('./lib/appOctokitClient')
 const env = require('./lib/env')
+const { getProxyForUrl } = require('proxy-from-env')
+const { setGlobalDispatcher, ProxyAgent } = require('undici')
+
+const baseUrl = env.GHE_HOST ? `${env.GHE_PROTOCOL || 'https'}://${env.GHE_HOST}` : 'https://api.github.com'
+const proxyAddress = getProxyForUrl(baseUrl)
+if (proxyAddress) {
+  setGlobalDispatcher(new ProxyAgent(proxyAddress))
+}
 
 let deploymentConfig
 
@@ -589,7 +597,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
           repo: env.ADMIN_REPO,
           path: oldPath,
           headers: {
-            'X-GitHub-Api-Version': '2022-11-28'
+            'X-GitHub-Api-Version': '2026-03-10'
           }
         })
         let content = Buffer.from(repofile.data.content, 'base64').toString()
@@ -603,7 +611,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
             repo: env.ADMIN_REPO,
             path: newPath,
             headers: {
-              'X-GitHub-Api-Version': '2022-11-28'
+              'X-GitHub-Api-Version': '2026-03-10'
             }
           })
         } catch (error) {
@@ -618,7 +626,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
               message: `Repo Renamed and safe-settings renamed the file from ${payload.changes.repository.name.from} to ${payload.repository.name}`,
               sha: repofile.data.sha,
               headers: {
-                'X-GitHub-Api-Version': '2022-11-28'
+                'X-GitHub-Api-Version': '2026-03-10'
               }
             })
             robot.log.debug(`Created a new setting file ${newPath}`)

lib/plugins/variables.js

@@ -6,7 +6,6 @@ module.exports = class Variables extends Diffable {
     super(...args)
 
     if (this.entries) {
-      // Force all names to uppercase to avoid comparison issues.
       this.entries.forEach((variable) => {
         variable.name = variable.name.toUpperCase()
       })

lib/settings.js

@@ -2025,7 +2025,7 @@ class Settings {
     // Copilot code review would recoommend using object assign but that would cause the error
     let repoConfig = this.config.repository
     if (repoConfig) {
-      repoConfig = Object.assign(repoConfig, { name: repo.repo, org: repo.owner })
+      repoConfig = Object.assign({}, repoConfig, { name: repo.repo, org: repo.owner })
     }
 
     const subOrgConfig = this.getSubOrgConfig(repo.repo)
@@ -2041,7 +2041,8 @@ class Settings {
     if (subOrgConfig) {
       let suborgRepoConfig = subOrgConfig.repository
       if (suborgRepoConfig) {
-        suborgRepoConfig = Object.assign(suborgRepoConfig, { name: repo.repo, org: repo.owner })
+        // Create a new object to avoid mutating the shared subOrgConfig.repository
+        suborgRepoConfig = Object.assign({}, suborgRepoConfig, { name: repo.repo, org: repo.owner })
         repoConfig = this.mergeDeep.mergeDeep({}, repoConfig, suborgRepoConfig)
       }
     }
@@ -2556,7 +2557,7 @@ class Settings {
       this.log.debug(` In getRepoConfigMap ${JSON.stringify(this.repo)}`)
       // GitHub getContent api has a hard limit of returning 1000 entries without
       // any pagination. They suggest to use Tree api.
-      // https://docs.github.com/en/rest/repos/contents?apiVersion=2022-11-28#get-repository-content
+      // https://docs.github.com/en/rest/repos/contents?apiVersion=2026-03-10#get-repository-content
 
       // get <CONFIG_PATH>/repos directory sha to use in the getTree api
       const repo = { owner: this.repo.owner, repo: env.ADMIN_REPO }

package.json

@@ -51,10 +51,10 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.6.0",
     "http-status-codes": "^2.2.0",
-    "jest": "^29.5.0",
-    "jest-junit": "^16.0.0",
+    "jest": "^29.7.0",
+    "jest-junit": "^17.0.0",
     "jest-when": "^3.5.2",
-    "lockfile-lint": "^4.14.0",
+    "lockfile-lint": "^4.14.1",
     "nock": "^14.0.1",
     "nodemon": "^3.1.9",
     "npm-run-all": "^4.1.5",