release-please 14.6.1 → 14.7.1

package/CHANGELOG.md

@@ -4,6 +4,26 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [14.7.1](https://github.com/googleapis/release-please/compare/v14.7.0...v14.7.1) (2022-09-22)
+
+
+### Bug Fixes
+
+* Handle pull request files returned as null ([#1651](https://github.com/googleapis/release-please/issues/1651)) ([4cea3dd](https://github.com/googleapis/release-please/commit/4cea3dd1b17ee31e27c1d246e83fcf39f28f0677))
+* **node:** Rethrow missing file error for package.json as a configuration error ([#1652](https://github.com/googleapis/release-please/issues/1652)) ([65ee57b](https://github.com/googleapis/release-please/commit/65ee57b433f67d87db3c2530dad4207218dae6d2))
+
+## [14.7.0](https://github.com/googleapis/release-please/compare/v14.6.1...v14.7.0) (2022-09-20)
+
+
+### Features
+
+* Easy proxy configuration ([#1639](https://github.com/googleapis/release-please/issues/1639)) ([4bb4c65](https://github.com/googleapis/release-please/commit/4bb4c658e3c30150432802b5ccc2aa5a96332f1e))
+
+
+### Bug Fixes
+
+* **commit-split:** Detect overlapping prefixes ([#1638](https://github.com/googleapis/release-please/issues/1638)) ([db51b29](https://github.com/googleapis/release-please/commit/db51b295d711e657ee5928bc32a3dbb88c793969)), closes [#1637](https://github.com/googleapis/release-please/issues/1637)
+
 ## [14.6.1](https://github.com/googleapis/release-please/compare/v14.6.0...v14.6.1) (2022-09-20)
 
 

package/build/src/github.d.ts

@@ -24,6 +24,10 @@ export interface GitHubOptions {
     octokitAPIs: OctokitAPIs;
     logger?: Logger;
 }
+interface ProxyOption {
+    host: string;
+    port: number;
+}
 interface GitHubCreateOptions {
     owner: string;
     repo: string;
@@ -33,6 +37,7 @@ interface GitHubCreateOptions {
     octokitAPIs?: OctokitAPIs;
     token?: string;
     logger?: Logger;
+    proxy?: ProxyOption;
 }
 declare type CommitFilter = (commit: Commit) => boolean;
 interface CommitIteratorOptions {
@@ -76,6 +81,7 @@ export declare class GitHub {
     private fileCache;
     private logger;
     private constructor();
+    static createDefaultAgent(baseUrl: string, defaultProxy?: ProxyOption): import("https-proxy-agent/dist/agent").default | import("http-proxy-agent/dist/agent").default | undefined;
     /**
      * Build a new GitHub client with auto-detected default branch.
      *

package/build/src/github.js

@@ -28,6 +28,8 @@ const logger_1 = require("./util/logger");
 const manifest_1 = require("./manifest");
 const signoff_commit_message_1 = require("./util/signoff-commit-message");
 const git_file_utils_1 = require("@google-automations/git-file-utils");
+const https_proxy_agent_1 = require("https-proxy-agent");
+const http_proxy_agent_1 = require("http-proxy-agent");
 class GitHub {
     constructor(options) {
         var _a;
@@ -344,6 +346,21 @@ class GitHub {
         this.fileCache = new git_file_utils_1.RepositoryFileCache(this.octokit, this.repository);
         this.logger = (_a = options.logger) !== null && _a !== void 0 ? _a : logger_1.logger;
     }
+    static createDefaultAgent(baseUrl, defaultProxy) {
+        if (!defaultProxy) {
+            return undefined;
+        }
+        const { host, port } = defaultProxy;
+        return new URL(baseUrl).protocol.replace(':', '') === 'http'
+            ? new http_proxy_agent_1.HttpProxyAgent({
+                host,
+                port,
+            })
+            : new https_proxy_agent_1.HttpsProxyAgent({
+                host,
+                port,
+            });
+    }
     /**
      * Build a new GitHub client with auto-detected default branch.
      *
@@ -367,6 +384,9 @@ class GitHub {
             octokit: new rest_1.Octokit({
                 baseUrl: apiUrl,
                 auth: options.token,
+                request: {
+                    agent: this.createDefaultAgent(apiUrl, options.proxy),
+                },
             }),
             request: request_1.request.defaults({
                 baseUrl: apiUrl,
@@ -470,7 +490,7 @@ class GitHub {
         }
     }
     async mergeCommitsGraphQL(targetBranch, cursor, options = {}) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this.logger.debug(`Fetching merge commits on branch ${targetBranch} with cursor: ${cursor}`);
         const query = `query pullRequestsSince($owner: String!, $repo: String!, $num: Int!, $maxFilesChanged: Int, $targetBranch: String!, $cursor: String) {
       repository(owner: $owner, name: $repo) {
@@ -551,7 +571,7 @@ class GitHub {
                 return pr.mergeCommit && pr.mergeCommit.oid === graphCommit.sha;
             });
             if (pullRequest) {
-                const files = pullRequest.files.nodes.map(node => node.path);
+                const files = (((_b = pullRequest.files) === null || _b === void 0 ? void 0 : _b.nodes) || []).map(node => node.path);
                 commit.pullRequest = {
                     sha: commit.sha,
                     number: pullRequest.number,
@@ -562,7 +582,7 @@ class GitHub {
                     labels: pullRequest.labels.nodes.map(node => node.name),
                     files,
                 };
-                if (((_b = pullRequest.files.pageInfo) === null || _b === void 0 ? void 0 : _b.hasNextPage) && options.backfillFiles) {
+                if (((_d = (_c = pullRequest.files) === null || _c === void 0 ? void 0 : _c.pageInfo) === null || _d === void 0 ? void 0 : _d.hasNextPage) && options.backfillFiles) {
                     this.logger.info(`PR #${pullRequest.number} has many files, backfilling`);
                     commit.files = await this.getCommitFiles(graphCommit.sha);
                 }

package/build/src/strategies/node.js

@@ -19,6 +19,7 @@ const package_lock_json_1 = require("../updaters/node/package-lock-json");
 const samples_package_json_1 = require("../updaters/node/samples-package-json");
 const changelog_1 = require("../updaters/changelog");
 const package_json_1 = require("../updaters/node/package-json");
+const errors_1 = require("../errors");
 class Node extends base_1.BaseStrategy {
     async buildUpdates(options) {
         var _a;
@@ -74,7 +75,15 @@ class Node extends base_1.BaseStrategy {
     }
     async getPkgJsonContents() {
         if (!this.pkgJsonContents) {
-            this.pkgJsonContents = await this.github.getFileContentsOnBranch(this.addPath('package.json'), this.targetBranch);
+            try {
+                this.pkgJsonContents = await this.github.getFileContentsOnBranch(this.addPath('package.json'), this.targetBranch);
+            }
+            catch (e) {
+                if (e instanceof errors_1.FileNotFoundError) {
+                    throw new errors_1.MissingRequiredFileError(this.addPath('package.json'), 'node', `${this.repository.owner}/${this.repository.repo}`);
+                }
+                throw e;
+            }
         }
         return this.pkgJsonContents;
     }

package/build/src/util/commit-split.js

@@ -44,7 +44,7 @@ class CommitSplit {
                 for (let exPath of paths) {
                     exPath = exPath.replace(/$/, '/');
                     exPath = exPath.replace(/^/, '/');
-                    if (newPath.indexOf(exPath) >= 0 || exPath.indexOf(newPath) >= 0) {
+                    if (newPath.startsWith(exPath) || exPath.startsWith(newPath)) {
                         throw new Error(`Path prefixes must be unique: ${newPath}, ${exPath}`);
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "14.6.1",
+  "version": "14.7.1",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -88,6 +88,8 @@
     "detect-indent": "^6.1.0",
     "diff": "^5.0.0",
     "figures": "^3.0.0",
+    "http-proxy-agent": "^5.0.0",
+    "https-proxy-agent": "^5.0.1",
     "js-yaml": "^4.0.0",
     "jsonpath": "^1.1.1",
     "node-html-parser": "^6.0.0",