feat: when changes-branch is provided use it to fetch manifest and co…

…nfig file
stainless-api · Sep 8, 2023 · e36644b · e36644b
1 parent 5129dda
commit e36644b
Show file tree

Hide file tree

Showing 41 changed files with 89 additions and 61 deletions.
diff --git a/__snapshots__/base.js b/__snapshots__/base.js
@@ -41,7 +41,7 @@ exports['Strategy buildReleasePullRequest should pass changelogHost to default b
 ---
 
 
-## 1.0.0 (1983-10-10)
+## 0.0.1 (1983-10-10)
 
 
 ### Bug Fixes

diff --git a/__snapshots__/dotnet-yoshi.js b/__snapshots__/dotnet-yoshi.js
@@ -3,7 +3,7 @@ exports['DotnetYoshi buildReleasePullRequest returns release PR changes with def
 ---
 
 
-## Version 1.0.0, released 1983-10-10
+## Version 0.0.1, released 1983-10-10
 
 
 ### Bug fixes
@@ -39,7 +39,7 @@ _More technical details can be found at [stainless-api/release-please](https://g
 `
 
 exports['DotnetYoshi buildUpdates builds common files 1'] = `
-## Version 1.0.0, released 1983-10-10
+## Version 0.0.1, released 1983-10-10
 
 
 ### Bug fixes

diff --git a/__snapshots__/go-yoshi.js b/__snapshots__/go-yoshi.js
@@ -3,7 +3,7 @@ exports['GoYoshi buildReleasePullRequest combines google-api-go-client autogener
 ---
 
 
-## 0.1.0 (1983-10-10)
+## 0.0.1 (1983-10-10)
 
 
 ### Features
@@ -22,7 +22,7 @@ exports['GoYoshi buildReleasePullRequest filters out submodule commits 1'] = `
 ---
 
 
-## 0.1.0 (1983-10-10)
+## 0.0.1 (1983-10-10)
 
 
 ### Bug Fixes
@@ -41,7 +41,7 @@ exports['GoYoshi buildReleasePullRequest filters out touched files not matching
 ---
 
 
-## 0.1.0 (1983-10-10)
+## 0.0.1 (1983-10-10)
 
 
 ### Bug Fixes

diff --git a/__snapshots__/java-yoshi-mono-repo.js b/__snapshots__/java-yoshi-mono-repo.js
@@ -22,7 +22,7 @@ exports['JavaYoshiMonoRepo buildUpdates omits non-breaking chores from changelog
           "breakingChangeNote": "update a very important dep"
         }
       ],
-      "version": "0.1.0",
+      "version": "0.0.1",
       "language": "JAVA",
       "artifactName": "cloud.google.com:foo",
       "id": "abc-123-efd-qwerty",
@@ -46,7 +46,7 @@ exports['JavaYoshiMonoRepo buildUpdates updates changelog.json 1'] = `
           "scope": "deps"
         }
       ],
-      "version": "0.1.0",
+      "version": "0.0.1",
       "language": "JAVA",
       "artifactName": "cloud.google.com:foo",
       "id": "abc-123-efd-qwerty",

diff --git a/__snapshots__/node.js b/__snapshots__/node.js
@@ -25,7 +25,7 @@ exports['Node buildReleasePullRequest updates changelog.json if present 1'] = `
           "scope": "deps"
         }
       ],
-      "version": "1.0.0",
+      "version": "0.0.1",
       "language": "JAVASCRIPT",
       "artifactName": "node-test-repo",
       "id": "abc-123-efd-qwerty",

diff --git a/__snapshots__/php-yoshi.js b/__snapshots__/php-yoshi.js
@@ -763,7 +763,7 @@ exports['PHPYoshi buildReleasePullRequest returns release PR changes with defaul
 ---
 
 
-## 1.0.0
+## 0.0.1
 
 <details><summary>google/client1 1.2.4</summary>
 

diff --git a/__snapshots__/python.js b/__snapshots__/python.js
@@ -25,7 +25,7 @@ exports['Python buildUpdates updates changelog.json if present 1'] = `
           "scope": "deps"
         }
       ],
-      "version": "0.1.0",
+      "version": "0.0.1",
       "language": "PYTHON",
       "artifactName": "google-cloud-automl",
       "id": "abc-123-efd-qwerty",

diff --git a/src/changelog-notes/default.ts b/src/changelog-notes/default.ts
@@ -103,9 +103,10 @@ export class DefaultChangelogNotes implements ChangelogNotes {
       };
     });
 
-    return conventionalChangelogWriter
+    const result = conventionalChangelogWriter
       .parseArray(changelogCommits, context, preset.writerOpts)
       .trim();
+    return result;
   }
 }
 

diff --git a/src/manifest.ts b/src/manifest.ts
@@ -411,12 +411,13 @@ export class Manifest {
     path?: string,
     releaseAs?: string
   ): Promise<Manifest> {
+    const changesBranch = manifestOptionOverrides.changesBranch ?? targetBranch;
     const [
       {config: repositoryConfig, options: manifestOptions},
       releasedVersions,
     ] = await Promise.all([
-      parseConfig(github, configFile, targetBranch, path, releaseAs),
-      parseReleasedVersions(github, manifestFile, targetBranch),
+      parseConfig(github, configFile, changesBranch, path, releaseAs),
+      parseReleasedVersions(github, manifestFile, changesBranch),
     ]);
     return new Manifest(
       github,
@@ -743,8 +744,6 @@ export class Manifest {
         openPullRequests.find(pr => pr.headBranchName === branchName) ||
         snoozedPullRequests.find(pr => pr.headBranchName === branchName);
 
-      this.logger.debug({existingPR});
-
       const releasePullRequest = await strategy.buildReleasePullRequest({
         commits: pathCommits,
         latestRelease,

diff --git a/src/strategies/base.ts b/src/strategies/base.ts
@@ -434,6 +434,7 @@ If you instead want to use the version number \`${newVersion}\` generated from c
       latestRelease,
       commits
     );
+
     if (this.changelogEmpty(releaseNotesBody)) {
       this.logger.info(
         `No user facing commits found since ${
@@ -751,7 +752,7 @@ If you instead want to use the version number \`${newVersion}\` generated from c
       return Version.parse(this.initialVersion);
     }
 
-    return Version.parse('1.0.0');
+    return Version.parse('0.0.1');
   }
 
   /**

diff --git a/src/strategies/go-yoshi.ts b/src/strategies/go-yoshi.ts
@@ -197,7 +197,7 @@ export class GoYoshi extends BaseStrategy {
   }
 
   protected initialReleaseVersion(): Version {
-    return Version.parse('0.1.0');
+    return Version.parse('0.0.1');
   }
 }
 

diff --git a/src/strategies/java-yoshi-mono-repo.ts b/src/strategies/java-yoshi-mono-repo.ts
@@ -315,7 +315,7 @@ export class JavaYoshiMonoRepo extends Java {
   }
 
   protected initialReleaseVersion(): Version {
-    return Version.parse('0.1.0');
+    return Version.parse('0.0.1');
   }
 }
 

diff --git a/src/strategies/java-yoshi.ts b/src/strategies/java-yoshi.ts
@@ -221,7 +221,7 @@ export class JavaYoshi extends Java {
   }
 
   protected initialReleaseVersion(): Version {
-    return Version.parse('0.1.0');
+    return Version.parse('0.0.1');
   }
 }
 

diff --git a/src/strategies/krm-blueprint.ts b/src/strategies/krm-blueprint.ts
@@ -75,6 +75,6 @@ export class KRMBlueprint extends BaseStrategy {
   }
 
   protected initialReleaseVersion(): Version {
-    return Version.parse('0.1.0');
+    return Version.parse('0.0.1');
   }
 }
diff --git a/src/strategies/python.ts b/src/strategies/python.ts
@@ -197,6 +197,6 @@ export class Python extends BaseStrategy {
   }
 
   protected initialReleaseVersion(): Version {
-    return Version.parse('0.1.0');
+    return Version.parse('0.0.1');
   }
 }
diff --git a/src/strategies/rust.ts b/src/strategies/rust.ts
@@ -130,7 +130,7 @@ export class Rust extends BaseStrategy {
   }
 
   protected initialReleaseVersion(): Version {
-    return Version.parse('0.1.0');
+    return Version.parse('0.0.1');
   }
 
   async getDefaultPackageName(): Promise<string | undefined> {

diff --git a/src/strategies/terraform-module.ts b/src/strategies/terraform-module.ts
@@ -110,6 +110,6 @@ export class TerraformModule extends BaseStrategy {
   }
 
   protected initialReleaseVersion(): Version {
-    return Version.parse('0.1.0');
+    return Version.parse('0.0.1');
   }
 }
diff --git a/test/manifest.ts b/test/manifest.ts
@@ -195,6 +195,33 @@ describe('Manifest', () => {
       expect(Object.keys(manifest.repositoryConfig)).lengthOf(8);
       expect(Object.keys(manifest.releasedVersions)).lengthOf(8);
     });
+    it('should fetch config and manifest from changes-branch when specified', async () => {
+      const getFileContentsStub = sandbox.stub(
+        github,
+        'getFileContentsOnBranch'
+      );
+      getFileContentsStub
+        .withArgs('release-please-config.json', 'next')
+        .resolves(
+          buildGitHubFileContent(fixturesPath, 'manifest/config/config.json')
+        )
+        .withArgs('.release-please-manifest.json', 'next')
+        .resolves(
+          buildGitHubFileContent(
+            fixturesPath,
+            'manifest/versions/versions.json'
+          )
+        );
+      const manifest = await Manifest.fromManifest(
+        github,
+        github.repository.defaultBranch,
+        undefined,
+        undefined,
+        {changesBranch: 'next'}
+      );
+      expect(Object.keys(manifest.repositoryConfig)).lengthOf(8);
+      expect(Object.keys(manifest.releasedVersions)).lengthOf(8);
+    });
     it('should limit manifest loading to the given path', async () => {
       const getFileContentsStub = sandbox.stub(
         github,
@@ -2235,9 +2262,9 @@ describe('Manifest', () => {
 
       const getFileContentsOnBranchStub = sandbox
         .stub(github, 'getFileContentsOnBranch')
-        .withArgs('release-please-config.json', 'main')
+        .withArgs('release-please-config.json', 'next')
         .resolves(buildGitHubFileRaw(JSON.stringify(config)))
-        .withArgs('.release-please-manifest.json', 'main')
+        .withArgs('.release-please-manifest.json', 'next')
         .resolves(
           buildGitHubFileRaw(
             JSON.stringify({
@@ -2473,9 +2500,9 @@ version = "3.0.0"
 
       const getFileContentsOnBranchStub = sandbox
         .stub(github, 'getFileContentsOnBranch')
-        .withArgs('release-please-config.json', 'main')
+        .withArgs('release-please-config.json', 'next')
         .resolves(buildGitHubFileRaw(JSON.stringify(config)))
-        .withArgs('.release-please-manifest.json', 'main')
+        .withArgs('.release-please-manifest.json', 'next')
         .resolves(
           buildGitHubFileRaw(
             JSON.stringify({
@@ -2594,9 +2621,9 @@ version = "3.0.0"
 
       const getFileContentsOnBranchStub = sandbox
         .stub(github, 'getFileContentsOnBranch')
-        .withArgs('release-please-config.json', 'main')
+        .withArgs('release-please-config.json', 'next')
         .resolves(buildGitHubFileRaw(JSON.stringify(config)))
-        .withArgs('.release-please-manifest.json', 'main')
+        .withArgs('.release-please-manifest.json', 'next')
         .resolves(
           buildGitHubFileRaw(
             JSON.stringify({
@@ -2725,9 +2752,9 @@ version = "3.0.0"
 
       const getFileContentsOnBranchStub = sandbox
         .stub(github, 'getFileContentsOnBranch')
-        .withArgs('release-please-config.json', 'main')
+        .withArgs('release-please-config.json', 'next')
         .resolves(buildGitHubFileRaw(JSON.stringify(config)))
-        .withArgs('.release-please-manifest.json', 'main')
+        .withArgs('.release-please-manifest.json', 'next')
         .resolves(
           buildGitHubFileRaw(
             JSON.stringify({
@@ -2828,7 +2855,7 @@ version = "3.0.0"
       const manifest = await Manifest.fromManifest(github, 'main');
       const pullRequests = await manifest.buildPullRequests([], []);
       expect(pullRequests).lengthOf(1);
-      expect(pullRequests[0].version?.toString()).to.eql('1.0.0');
+      expect(pullRequests[0].version?.toString()).to.eql('0.0.1');
     });
 
     it('should allow specifying a last release sha', async () => {
@@ -2921,7 +2948,7 @@ version = "3.0.0"
       const manifest = await Manifest.fromManifest(github, 'main');
       const pullRequests = await manifest.buildPullRequests([], []);
       expect(pullRequests).lengthOf(1);
-      expect(pullRequests[0].version?.toString()).to.eql('1.0.0');
+      expect(pullRequests[0].version?.toString()).to.eql('0.0.1');
     });
 
     it('should allow customizing pull request title with root package', async () => {

diff --git a/test/strategies/dart.ts b/test/strategies/dart.ts
@@ -51,7 +51,7 @@ describe('Dart', () => {
       ),
     ];
     it('returns release PR changes with defaultInitialVersion', async () => {
-      const expectedVersion = '1.0.0';
+      const expectedVersion = '0.0.1';
       const strategy = new Dart({
         targetBranch: 'main',
         github,

diff --git a/test/strategies/dotnet-yoshi.ts b/test/strategies/dotnet-yoshi.ts
@@ -62,9 +62,9 @@ describe('DotnetYoshi', () => {
         .resolves(buildGitHubFileContent(fixturesPath, 'apis.json'));
     });
     it('returns release PR changes with defaultInitialVersion', async () => {
-      const expectedVersion = '1.0.0';
+      const expectedVersion = '0.0.1';
       const expectedTitle =
-        'Release Google.Cloud.SecurityCenter.V1 version 1.0.0';
+        'Release Google.Cloud.SecurityCenter.V1 version 0.0.1';
       const strategy = new DotnetYoshi({
         targetBranch: 'main',
         github,

diff --git a/test/strategies/elixir.ts b/test/strategies/elixir.ts
@@ -46,7 +46,7 @@ describe('Elixir', () => {
   });
   describe('buildReleasePullRequest', () => {
     it('returns release PR changes with defaultInitialVersion', async () => {
-      const expectedVersion = '1.0.0';
+      const expectedVersion = '0.0.1';
       const strategy = new Elixir({
         targetBranch: 'main',
         github,

diff --git a/test/strategies/expo.ts b/test/strategies/expo.ts
@@ -57,7 +57,7 @@ describe('Expo', () => {
 
   describe('buildReleasePullRequest', () => {
     it('returns release PR changes with defaultInitialVersion', async () => {
-      const expectedVersion = '1.0.0';
+      const expectedVersion = '0.0.1';
 
       const getFileContentsStub = sandbox.stub(
         github,

diff --git a/test/strategies/go-yoshi.ts b/test/strategies/go-yoshi.ts
@@ -49,7 +49,7 @@ describe('GoYoshi', () => {
   });
   describe('buildReleasePullRequest', () => {
     it('returns release PR changes with defaultInitialVersion', async () => {
-      const expectedVersion = '0.1.0';
+      const expectedVersion = '0.0.1';
       const strategy = new GoYoshi({
         targetBranch: 'main',
         github,

diff --git a/test/strategies/go.ts b/test/strategies/go.ts
@@ -49,7 +49,7 @@ describe('Go', () => {
   });
   describe('buildReleasePullRequest', () => {
     it('returns release PR changes with defaultInitialVersion', async () => {
-      const expectedVersion = '1.0.0';
+      const expectedVersion = '0.0.1';
       const strategy = new Go({
         targetBranch: 'main',
         github,

diff --git a/test/strategies/helm.ts b/test/strategies/helm.ts
@@ -51,7 +51,7 @@ describe('Helm', () => {
   });
   describe('buildReleasePullRequest', () => {
     it('returns release PR changes with defaultInitialVersion', async () => {
-      const expectedVersion = '1.0.0';
+      const expectedVersion = '0.0.1';
       const strategy = new Helm({
         targetBranch: 'main',
         github,

diff --git a/test/strategies/java-yoshi-mono-repo.ts b/test/strategies/java-yoshi-mono-repo.ts
@@ -65,7 +65,7 @@ describe('JavaYoshiMonoRepo', () => {
   });
   describe('buildReleasePullRequest', () => {
     it('returns release PR changes with defaultInitialVersion', async () => {
-      const expectedVersion = '0.1.0';
+      const expectedVersion = '0.0.1';
       const strategy = new JavaYoshiMonoRepo({
         targetBranch: 'main',
         github,

diff --git a/test/strategies/java-yoshi.ts b/test/strategies/java-yoshi.ts
@@ -58,7 +58,7 @@ describe('JavaYoshi', () => {
   });
   describe('buildReleasePullRequest', () => {
     it('returns release PR changes with defaultInitialVersion', async () => {
-      const expectedVersion = '0.1.0';
+      const expectedVersion = '0.0.1';
       const strategy = new JavaYoshi({
         targetBranch: 'main',
         github,
-Original file line number
+Diff line change
@@ Expand Up @@
     ---
-    ## 1.0.0 (1983-10-10)
+    ## 0.0.1 (1983-10-10)
     ### Bug Fixes
@@ Expand Down @@