release-please 14.1.2 → 14.2.2

package/CHANGELOG.md

@@ -4,6 +4,27 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [14.2.2](https://github.com/googleapis/release-please/compare/v14.2.1...v14.2.2) (2022-08-30)
+
+
+### Bug Fixes
+
+* look at merged_at field to determine merge status ([#1609](https://github.com/googleapis/release-please/issues/1609)) ([1c9beac](https://github.com/googleapis/release-please/commit/1c9beacb49d82f2aa594ef0511fa8d9cfd743b11))
+
+## [14.2.1](https://github.com/googleapis/release-please/compare/v14.2.0...v14.2.1) (2022-08-25)
+
+
+### Bug Fixes
+
+* allow providing logger to GitHub.create ([#1603](https://github.com/googleapis/release-please/issues/1603)) ([a14e906](https://github.com/googleapis/release-please/commit/a14e906991e0120d0a85d1c4d739999cd6c9f1e4))
+
+## [14.2.0](https://github.com/googleapis/release-please/compare/v14.1.2...v14.2.0) (2022-08-25)
+
+
+### Features
+
+* maintain an instance logger ([#1599](https://github.com/googleapis/release-please/issues/1599)) ([adb8053](https://github.com/googleapis/release-please/commit/adb805357d6344f1737bb3541ec7354e76f45cdc))
+
 ## [14.1.2](https://github.com/googleapis/release-please/compare/v14.1.1...v14.1.2) (2022-08-25)
 
 

package/build/src/commit.d.ts

@@ -1,4 +1,5 @@
 import { PullRequest } from './pull-request';
+import { Logger } from './util/logger';
 import * as parser from '@conventional-commits/parser';
 export interface Commit {
     sha: string;
@@ -23,4 +24,4 @@ export interface ConventionalCommit extends Commit {
  *   more commits returned as a single raw commit may contain multiple release
  *   messages.
  */
-export declare function parseConventionalCommits(commits: Commit[]): ConventionalCommit[];
+export declare function parseConventionalCommits(commits: Commit[], logger?: Logger): ConventionalCommit[];

package/build/src/commit.js

@@ -292,7 +292,7 @@ function parseCommits(message) {
  *   more commits returned as a single raw commit may contain multiple release
  *   messages.
  */
-function parseConventionalCommits(commits) {
+function parseConventionalCommits(commits, logger = logger_1.logger) {
     const conventionalCommits = [];
     for (const commit of commits) {
         const commitMessage = preprocessCommitMessage(commit);
@@ -315,7 +315,7 @@ function parseConventionalCommits(commits) {
             }
         }
         catch (_err) {
-            logger_1.logger.debug(`commit could not be parsed: ${commit.sha} ${commit.message.split('\n')[0]}`);
+            logger.debug(`commit could not be parsed: ${commit.sha} ${commit.message.split('\n')[0]}`);
         }
     }
     return conventionalCommits;

package/build/src/github.d.ts

@@ -10,6 +10,7 @@ import { ReleasePullRequest } from './release-pull-request';
 import { Update } from './update';
 import { Release } from './release';
 import { GitHubFileContents } from '@google-automations/git-file-utils';
+import { Logger } from 'code-suggester/build/src/types';
 declare type RequestBuilderType = typeof request;
 declare type DefaultFunctionType = RequestBuilderType['defaults'];
 declare type RequestFunctionType = ReturnType<DefaultFunctionType>;
@@ -21,6 +22,7 @@ export interface OctokitAPIs {
 export interface GitHubOptions {
     repository: Repository;
     octokitAPIs: OctokitAPIs;
+    logger?: Logger;
 }
 interface GitHubCreateOptions {
     owner: string;
@@ -30,6 +32,7 @@ interface GitHubCreateOptions {
     graphqlUrl?: string;
     octokitAPIs?: OctokitAPIs;
     token?: string;
+    logger?: Logger;
 }
 declare type CommitFilter = (commit: Commit) => boolean;
 interface CommitIteratorOptions {
@@ -71,6 +74,7 @@ export declare class GitHub {
     private request;
     private graphql;
     private fileCache;
+    private logger;
     private constructor();
     /**
      * Build a new GitHub client with auto-detected default branch.

package/build/src/github.js

@@ -30,6 +30,7 @@ const signoff_commit_message_1 = require("./util/signoff-commit-message");
 const git_file_utils_1 = require("@google-automations/git-file-utils");
 class GitHub {
     constructor(options) {
+        var _a;
         /**
          * Get the list of file paths modified in a given commit.
          *
@@ -38,7 +39,7 @@ class GitHub {
          * @throws {GitHubAPIError} on an API error
          */
         this.getCommitFiles = wrapAsync(async (sha) => {
-            logger_1.logger.debug(`Backfilling file list for commit: ${sha}`);
+            this.logger.debug(`Backfilling file list for commit: ${sha}`);
             const files = [];
             for await (const resp of this.octokit.paginate.iterator(this.octokit.repos.getCommit, {
                 owner: this.repository.owner,
@@ -52,10 +53,10 @@ class GitHub {
                 }
             }
             if (files.length >= 3000) {
-                logger_1.logger.warn(`Found ${files.length} files. This may not include all the files.`);
+                this.logger.warn(`Found ${files.length} files. This may not include all the files.`);
             }
             else {
-                logger_1.logger.debug(`Found ${files.length} files`);
+                this.logger.debug(`Found ${files.length} files`);
             }
             return files;
         });
@@ -69,26 +70,26 @@ class GitHub {
                     if (response) {
                         return response;
                     }
-                    logger_1.logger.trace('no GraphQL response, retrying');
+                    this.logger.trace('no GraphQL response, retrying');
                 }
                 catch (err) {
                     if (err.status !== 502) {
                         throw err;
                     }
                     if (maxRetries === 0) {
-                        logger_1.logger.warn('ran out of retries and response is required');
+                        this.logger.warn('ran out of retries and response is required');
                         throw err;
                     }
-                    logger_1.logger.info(`received 502 error, ${maxRetries} attempts remaining`);
+                    this.logger.info(`received 502 error, ${maxRetries} attempts remaining`);
                 }
                 maxRetries -= 1;
                 if (maxRetries >= 0) {
-                    logger_1.logger.trace(`sleeping ${seconds} seconds`);
+                    this.logger.trace(`sleeping ${seconds} seconds`);
                     await (0, exports.sleepInMs)(1000 * seconds);
                     seconds = Math.min(seconds * 2, MAX_SLEEP_SECONDS);
                 }
             }
-            logger_1.logger.trace('ran out of retries');
+            this.logger.trace('ran out of retries');
             return undefined;
         });
         /**
@@ -106,7 +107,7 @@ class GitHub {
             if (prefix) {
                 prefix = normalizePrefix(prefix);
             }
-            logger_1.logger.debug(`finding files by filename: ${filename}, ref: ${ref}, prefix: ${prefix}`);
+            this.logger.debug(`finding files by filename: ${filename}, ref: ${ref}, prefix: ${prefix}`);
             return await this.fileCache.findFilesByFilename(filename, ref, prefix);
         });
         this.createPullRequest = wrapAsync(async (pullRequest, targetBranch, message, updates, options) => {
@@ -122,7 +123,7 @@ class GitHub {
                 force: true,
                 fork: !!(options === null || options === void 0 ? void 0 : options.fork),
                 message,
-                logger: logger_1.logger,
+                logger: this.logger,
                 draft: !!(options === null || options === void 0 ? void 0 : options.draft),
                 labels: pullRequest.labels,
             });
@@ -178,11 +179,11 @@ class GitHub {
                 force: true,
                 fork: (options === null || options === void 0 ? void 0 : options.fork) === false ? false : true,
                 message,
-                logger: logger_1.logger,
+                logger: this.logger,
                 draft: releasePullRequest.draft,
             });
             if (prNumber !== number) {
-                logger_1.logger.warn(`updated code for ${prNumber}, but update requested for ${number}`);
+                this.logger.warn(`updated code for ${prNumber}, but update requested for ${number}`);
             }
             const response = await this.octokit.pulls.update({
                 owner: this.repository.owner,
@@ -273,7 +274,7 @@ class GitHub {
          * @throws {GitHubAPIError} on an API error
          */
         this.commentOnIssue = wrapAsync(async (comment, number) => {
-            logger_1.logger.debug(`adding comment to https://github.com/${this.repository.owner}/${this.repository.repo}/issue/${number}`);
+            this.logger.debug(`adding comment to https://github.com/${this.repository.owner}/${this.repository.repo}/issue/${number}`);
             const resp = await this.octokit.issues.createComment({
                 owner: this.repository.owner,
                 repo: this.repository.repo,
@@ -292,7 +293,7 @@ class GitHub {
             if (labels.length === 0) {
                 return;
             }
-            logger_1.logger.debug(`removing labels: ${labels} from issue/pull ${number}`);
+            this.logger.debug(`removing labels: ${labels} from issue/pull ${number}`);
             await Promise.all(labels.map(label => this.octokit.issues.removeLabel({
                 owner: this.repository.owner,
                 repo: this.repository.repo,
@@ -310,7 +311,7 @@ class GitHub {
             if (labels.length === 0) {
                 return;
             }
-            logger_1.logger.debug(`adding labels: ${labels} from issue/pull ${number}`);
+            this.logger.debug(`adding labels: ${labels} from issue/pull ${number}`);
             await this.octokit.issues.addLabels({
                 owner: this.repository.owner,
                 repo: this.repository.repo,
@@ -323,6 +324,7 @@ class GitHub {
         this.request = options.octokitAPIs.request;
         this.graphql = options.octokitAPIs.graphql;
         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;
     }
     /**
      * Build a new GitHub client with auto-detected default branch.
@@ -371,6 +373,7 @@ class GitHub {
                 defaultBranch: (_d = options.defaultBranch) !== null && _d !== void 0 ? _d : (await GitHub.defaultBranch(options.owner, options.repo, apis.octokit)),
             },
             octokitAPIs: apis,
+            logger: options.logger,
         };
         return new GitHub(opts);
     }
@@ -450,7 +453,7 @@ class GitHub {
     }
     async mergeCommitsGraphQL(targetBranch, cursor, options = {}) {
         var _a, _b;
-        logger_1.logger.debug(`Fetching merge commits on branch ${targetBranch} with cursor: ${cursor}`);
+        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) {
         ref(qualifiedName: $targetBranch) {
@@ -510,12 +513,12 @@ class GitHub {
             ...params,
         });
         if (!response) {
-            logger_1.logger.warn(`Did not receive a response for query: ${query}`, params);
+            this.logger.warn(`Did not receive a response for query: ${query}`, params);
             return null;
         }
         // if the branch does exist, return null
         if (!((_a = response.repository) === null || _a === void 0 ? void 0 : _a.ref)) {
-            logger_1.logger.warn(`Could not find commits for branch ${targetBranch} - it likely does not exist.`);
+            this.logger.warn(`Could not find commits for branch ${targetBranch} - it likely does not exist.`);
             return null;
         }
         const history = response.repository.ref.target.history;
@@ -542,7 +545,7 @@ class GitHub {
                     files,
                 };
                 if (((_b = pullRequest.files.pageInfo) === null || _b === void 0 ? void 0 : _b.hasNextPage) && options.backfillFiles) {
-                    logger_1.logger.info(`PR #${pullRequest.number} has many files, backfilling`);
+                    this.logger.info(`PR #${pullRequest.number} has many files, backfilling`);
                     commit.files = await this.getCommitFiles(graphCommit.sha);
                 }
                 else {
@@ -635,8 +638,8 @@ class GitHub {
         })) {
             for (const pull of pulls) {
                 // The REST API does not have an option for "merged"
-                // pull requests - they are closed with a `merge_commit_sha`
-                if (status !== 'MERGED' || pull.merge_commit_sha) {
+                // pull requests - they are closed with a `merged_at` timestamp
+                if (status !== 'MERGED' || pull.merged_at) {
                     results += 1;
                     yield {
                         headBranchName: pull.head.ref,
@@ -671,7 +674,7 @@ class GitHub {
      */
     async pullRequestsGraphQL(targetBranch, states = 'MERGED', cursor) {
         var _a;
-        logger_1.logger.debug(`Fetching ${states} pull requests on branch ${targetBranch} with cursor ${cursor}`);
+        this.logger.debug(`Fetching ${states} pull requests on branch ${targetBranch} with cursor ${cursor}`);
         const response = await this.graphqlRequest({
             query: `query mergedPullRequests($owner: String!, $repo: String!, $num: Int!, $maxFilesChanged: Int, $targetBranch: String!, $states: [PullRequestState!], $cursor: String) {
         repository(owner: $owner, name: $repo) {
@@ -716,7 +719,7 @@ class GitHub {
             maxFilesChanged: 64,
         });
         if (!((_a = response === null || response === void 0 ? void 0 : response.repository) === null || _a === void 0 ? void 0 : _a.pullRequests)) {
-            logger_1.logger.warn(`Could not find merged pull requests for branch ${targetBranch} - it likely does not exist.`);
+            this.logger.warn(`Could not find merged pull requests for branch ${targetBranch} - it likely does not exist.`);
             return null;
         }
         const pullRequests = (response.repository.pullRequests.nodes ||
@@ -770,7 +773,7 @@ class GitHub {
         }
     }
     async releaseGraphQL(cursor) {
-        logger_1.logger.debug(`Fetching releases with cursor ${cursor}`);
+        this.logger.debug(`Fetching releases with cursor ${cursor}`);
         const response = await this.graphqlRequest({
             query: `query releases($owner: String!, $repo: String!, $num: Int!, $cursor: String) {
         repository(owner: $owner, name: $repo) {
@@ -800,7 +803,7 @@ class GitHub {
             num: 25,
         });
         if (!response.repository.releases.nodes.length) {
-            logger_1.logger.warn('Could not find releases.');
+            this.logger.warn('Could not find releases.');
             return null;
         }
         const releases = response.repository.releases.nodes;
@@ -810,7 +813,7 @@ class GitHub {
                 .filter(release => !!release.tagCommit)
                 .map(release => {
                 if (!release.tag || !release.tagCommit) {
-                    logger_1.logger.debug(release);
+                    this.logger.debug(release);
                 }
                 return {
                     name: release.name || undefined,
@@ -871,7 +874,7 @@ class GitHub {
      * @throws {GitHubAPIError} on other API errors
      */
     async getFileContentsOnBranch(path, branch) {
-        logger_1.logger.debug(`Fetching ${path} from branch ${branch}`);
+        this.logger.debug(`Fetching ${path} from branch ${branch}`);
         try {
             return await this.fileCache.getFileContents(path, branch);
         }
@@ -950,14 +953,14 @@ class GitHub {
                 // if the file is missing and create = false, just continue
                 // to the next update, otherwise create the file.
                 if (!update.createIfMissing) {
-                    logger_1.logger.warn(`file ${update.path} did not exist`);
+                    this.logger.warn(`file ${update.path} did not exist`);
                     continue;
                 }
             }
             const contentText = content
                 ? Buffer.from(content.content, 'base64').toString('utf8')
                 : undefined;
-            const updatedContent = update.updater.updateContent(contentText);
+            const updatedContent = update.updater.updateContent(contentText, this.logger);
             if (updatedContent) {
                 changes.set(update.path, {
                     content: updatedContent,

package/build/src/manifest.d.ts

@@ -2,6 +2,7 @@ import { ChangelogSection } from './changelog-notes';
 import { GitHub, GitHubRelease } from './github';
 import { Version } from './version';
 import { PullRequest } from './pull-request';
+import { Logger } from './util/logger';
 import { ReleasePullRequest } from './release-pull-request';
 import { ReleaseType, VersioningStrategyType, ChangelogNotesType } from './factory';
 import { Release } from './release';
@@ -114,6 +115,7 @@ export interface ManifestOptions {
     groupPullRequestTitlePattern?: string;
     releaseSearchDepth?: number;
     commitSearchDepth?: number;
+    logger?: Logger;
 }
 export interface ReleaserPackageConfig extends ReleaserConfigJson {
     'package-name'?: string;
@@ -192,6 +194,7 @@ export declare class Manifest {
     private groupPullRequestTitlePattern?;
     readonly releaseSearchDepth: number;
     readonly commitSearchDepth: number;
+    readonly logger: Logger;
     /**
      * Create a Manifest from explicit config in code. This assumes that the
      * repository has a single component at the root path.