release-please 13.4.5 → 13.4.6

package/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+### [13.4.6](https://github.com/googleapis/release-please/compare/v13.4.5...v13.4.6) (2022-02-01)
+
+
+### Bug Fixes
+
+* cargo workspace cargo lock handling ([#1260](https://github.com/googleapis/release-please/issues/1260)) ([55e9d38](https://github.com/googleapis/release-please/commit/55e9d3822d4d36d3123231f22dccacf35910929e))
+* krm blueprints should update yaml files ([#1269](https://github.com/googleapis/release-please/issues/1269)) ([d6ef98a](https://github.com/googleapis/release-please/commit/d6ef98a7031b599e38a505af2ffc51e85b3c6da6)), closes [#1268](https://github.com/googleapis/release-please/issues/1268)
+
 ### [13.4.5](https://github.com/googleapis/release-please/compare/v13.4.4...v13.4.5) (2022-02-01)
 
 

package/build/src/plugins/cargo-workspace.d.ts

@@ -45,6 +45,7 @@ export declare class CargoWorkspace extends WorkspacePlugin<CrateInfo> {
     protected bumpVersion(pkg: CrateInfo): Version;
     protected updateCandidate(existingCandidate: CandidateReleasePullRequest, pkg: CrateInfo, updatedVersions: VersionsMap): CandidateReleasePullRequest;
     protected newCandidate(pkg: CrateInfo, updatedVersions: VersionsMap): CandidateReleasePullRequest;
+    protected postProcessCandidates(candidates: CandidateReleasePullRequest[], updatedVersions: VersionsMap): CandidateReleasePullRequest[];
     protected buildGraph(allPackages: CrateInfo[]): Promise<DependencyGraph<CrateInfo>>;
     protected inScope(candidate: CandidateReleasePullRequest): boolean;
     protected packageNameFromPackage(pkg: CrateInfo): string;

package/build/src/plugins/cargo-workspace.js

@@ -113,10 +113,7 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin {
                     update.updater.changelogEntry = appendDependenciesSectionToChangelog(update.updater.changelogEntry, dependencyNotes);
                 }
                 else if (update.path === addPath(existingCandidate.path, 'Cargo.lock')) {
-                    update.updater = new cargo_lock_1.CargoLock({
-                        version,
-                        versionsMap: updatedVersions,
-                    });
+                    update.updater = new cargo_lock_1.CargoLock(updatedVersions);
                 }
                 return update;
             });
@@ -186,6 +183,18 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin {
             },
         };
     }
+    postProcessCandidates(candidates, updatedVersions) {
+        const rootCandidate = candidates.find(c => c.path === manifest_1.ROOT_PROJECT_PATH);
+        if (!rootCandidate) {
+            throw Error('Unable to find root candidate pull request');
+        }
+        rootCandidate.pullRequest.updates.push({
+            path: 'Cargo.lock',
+            createIfMissing: false,
+            updater: new cargo_lock_1.CargoLock(updatedVersions),
+        });
+        return candidates;
+    }
     async buildGraph(allPackages) {
         var _a, _b, _c;
         const workspaceCrateNames = new Set(allPackages.map(crateInfo => crateInfo.name));

package/build/src/plugins/node-workspace.d.ts

@@ -29,6 +29,7 @@ export declare class NodeWorkspace extends WorkspacePlugin<Package> {
     protected bumpVersion(pkg: Package): Version;
     protected updateCandidate(existingCandidate: CandidateReleasePullRequest, pkg: Package, updatedVersions: VersionsMap): CandidateReleasePullRequest;
     protected newCandidate(pkg: Package, updatedVersions: VersionsMap): CandidateReleasePullRequest;
+    protected postProcessCandidates(candidates: CandidateReleasePullRequest[], _updatedVersions: VersionsMap): CandidateReleasePullRequest[];
     protected buildGraph(allPackages: Package[]): Promise<DependencyGraph<Package>>;
     protected inScope(candidate: CandidateReleasePullRequest): boolean;
     protected packageNameFromPackage(pkg: Package): string;

package/build/src/plugins/node-workspace.js

@@ -190,6 +190,10 @@ class NodeWorkspace extends workspace_1.WorkspacePlugin {
             },
         };
     }
+    postProcessCandidates(candidates, _updatedVersions) {
+        // NOP for node workspaces
+        return candidates;
+    }
     async buildGraph(allPackages) {
         var _a, _b, _c, _d;
         const graph = new Map();

package/build/src/plugins/workspace.d.ts

@@ -83,6 +83,19 @@ export declare abstract class WorkspacePlugin<T> extends ManifestPlugin {
      * @returns {string} The package name.
      */
     protected abstract packageNameFromPackage(pkg: T): string;
+    /**
+     * Amend any or all in-scope candidates once all other processing has occured.
+     *
+     * This gives the workspace plugin once last chance to tweak the pull-requests
+     * once all the underlying information has been collated.
+     * @param {CandidateReleasePullRequest[]} candidates - The list of candidates
+     *   once all other workspace processing has occured.
+     * @param {VersionMap} updatedVersions - Map containing any component versions
+     *   that have changed.
+     * @returns {CandidateReleasePullRequest[]} potentially amended list of
+     *   candidates.
+     */
+    protected abstract postProcessCandidates(candidates: CandidateReleasePullRequest[], updatedVersions: VersionsMap): CandidateReleasePullRequest[];
     /**
      * Helper to invert the graph from package => packages that it depends on
      * to package => packages that depend on it.

package/build/src/plugins/workspace.js

@@ -98,6 +98,8 @@ class WorkspacePlugin extends plugin_1.ManifestPlugin {
         logger_1.logger.info(`Merging ${newCandidates.length} in-scope candidates`);
         const mergePlugin = new merge_1.Merge(this.github, this.targetBranch, this.repositoryConfig);
         newCandidates = await mergePlugin.run(newCandidates);
+        logger_1.logger.info(`Post-processing ${newCandidates.length} in-scope candidates`);
+        newCandidates = this.postProcessCandidates(newCandidates, updatedVersions);
         return [...outOfScopeCandidates, ...newCandidates];
     }
     /**

package/build/src/strategies/rust.js

@@ -102,10 +102,7 @@ class Rust extends base_1.BaseStrategy {
         updates.push({
             path: this.addPath('Cargo.lock'),
             createIfMissing: false,
-            updater: new cargo_lock_1.CargoLock({
-                version,
-                versionsMap,
-            }),
+            updater: new cargo_lock_1.CargoLock(versionsMap),
         });
         return updates;
     }

package/build/src/updaters/krm/krm-blueprint-version.js

@@ -32,7 +32,7 @@ class KRMBlueprintVersion extends default_1.DefaultUpdater {
         let matchRegex = '(cnrm/.*/)(v[0-9]+.[0-9]+.[0-9]+)+(-w+)?';
         // if explicit previous version, match only that version
         if ((_a = this.versionsMap) === null || _a === void 0 ? void 0 : _a.has('previousVersion')) {
-            matchRegex = `(cnrm/.*/)(${this.versionsMap.get('previousVersion')})+(-w+)?`;
+            matchRegex = `(cnrm/.*/)(v${this.versionsMap.get('previousVersion')})+(-w+)?`;
         }
         const oldVersion = content.match(new RegExp(matchRegex));
         if (oldVersion) {

package/build/src/updaters/rust/cargo-lock.d.ts

@@ -1,8 +1,11 @@
-import { DefaultUpdater } from '../default';
+import { Updater } from '../../update';
+import { VersionsMap } from '../../version';
 /**
  * Updates `Cargo.lock` lockfiles, preserving formatting and comments.
  */
-export declare class CargoLock extends DefaultUpdater {
+export declare class CargoLock implements Updater {
+    versionsMap: VersionsMap;
+    constructor(versionsMap: VersionsMap);
     /**
      * Given initial file contents, return updated contents.
      * @param {string} content The initial content

package/build/src/updaters/rust/cargo-lock.js

@@ -17,11 +17,13 @@ exports.CargoLock = void 0;
 const toml_edit_1 = require("../../util/toml-edit");
 const common_1 = require("./common");
 const logger_1 = require("../../util/logger");
-const default_1 = require("../default");
 /**
  * Updates `Cargo.lock` lockfiles, preserving formatting and comments.
  */
-class CargoLock extends default_1.DefaultUpdater {
+class CargoLock {
+    constructor(versionsMap) {
+        this.versionsMap = versionsMap;
+    }
     /**
      * Given initial file contents, return updated contents.
      * @param {string} content The initial content
@@ -29,9 +31,6 @@ class CargoLock extends default_1.DefaultUpdater {
      */
     updateContent(content) {
         let payload = content;
-        if (!this.versionsMap) {
-            throw new Error('updateContent called with no versions');
-        }
         const parsed = common_1.parseCargoLockfile(payload);
         if (!parsed.package) {
             logger_1.logger.error('is not a Cargo lockfile');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "13.4.5",
+  "version": "13.4.6",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",