chore: extract writeAnalyticsConfig to publish

Author: mcasimir

packages/build/src/npm-packages.ts

@@ -1,7 +1,5 @@
 import { execFileSync } from 'child_process';
 import path from 'path';
-import writeAnalyticsConfig from './analytics';
-import Config from './config';
 
 const PLACEHOLDER_VERSION = '0.0.0-dev.0';
 const PROJECT_ROOT = path.resolve(__dirname, '..', '..', '..');
@@ -22,18 +20,11 @@ export function bumpNpmPackages(version: string): void {
     '--force-publish',
     '--yes'
   ], {
-    cwd: PROJECT_ROOT,
     stdio: 'inherit'
   });
 }
 
-export async function publishNpmPackages(config: Config): Promise<void> {
-  // ensures the segment api key to be present in the published packages
-  await writeAnalyticsConfig(
-    config.analyticsConfigFilePath,
-    config.segmentKey
-  );
-
+export function publishNpmPackages(): void {
   const packages = listNpmPackages();
 
   const versions = Array.from(new Set(packages.map(({ version }) => version)));
@@ -56,16 +47,16 @@ export async function publishNpmPackages(config: Config): Promise<void> {
     '--force-publish',
     '--yes'
   ], {
-    cwd: PROJECT_ROOT,
     stdio: 'inherit'
   });
 }
 
 function listNpmPackages(): {version: string}[] {
   const lernaListOutput = execFileSync(
     LERNA_BIN, [
+      'list',
       '--json',
-    ], { cwd: PROJECT_ROOT }
+    ]
   ).toString();
 
   const packages = JSON.parse(lernaListOutput);

packages/build/src/publish.spec.ts

@@ -4,6 +4,9 @@ import chai, { expect } from 'chai';
 import Config from './config';
 import path from 'path';
 import sinon from 'ts-sinon';
+import type writeAnalyticsConfigType from './analytics';
+import type { publishNpmPackages as publishNpmPackagesType } from './npm-packages';
+import type uploadDownloadCenterConfigType from './download-center';
 
 chai.use(require('sinon-chai'));
 
@@ -13,8 +16,9 @@ function createStubRepo(overrides?: any): GithubRepo {
 
 describe('publish', () => {
   let config: Config;
-  let uploadDownloadCenterConfig: (version: string, awsKey: string, awsSecret: string) => Promise<any>;
-  let publishNpmPackages: (config: Config) => Promise<void>;
+  let uploadDownloadCenterConfig: typeof uploadDownloadCenterConfigType;
+  let publishNpmPackages: typeof publishNpmPackagesType;
+  let writeAnalyticsConfig: typeof writeAnalyticsConfigType;
   let githubRepo: GithubRepo;
 
   beforeEach(() => {
@@ -50,6 +54,7 @@ describe('publish', () => {
 
     uploadDownloadCenterConfig = sinon.spy();
     publishNpmPackages = sinon.spy();
+    writeAnalyticsConfig = sinon.spy();
     githubRepo = createStubRepo();
   });
 
@@ -65,7 +70,8 @@ describe('publish', () => {
         config,
         githubRepo,
         uploadDownloadCenterConfig,
-        publishNpmPackages
+        publishNpmPackages,
+        writeAnalyticsConfig
       );
 
       expect(uploadDownloadCenterConfig).to.have.been.calledWith(
@@ -80,21 +86,25 @@ describe('publish', () => {
         config,
         githubRepo,
         uploadDownloadCenterConfig,
-        publishNpmPackages
+        publishNpmPackages,
+        writeAnalyticsConfig
       );
 
       expect(githubRepo.promoteRelease).to.have.been.calledWith(config);
     });
 
-    it('publishes NPM packages', async() => {
+    it('writes analytics config and then publishes NPM packages', async() => {
       await publish(
         config,
         githubRepo,
         uploadDownloadCenterConfig,
-        publishNpmPackages
+        publishNpmPackages,
+        writeAnalyticsConfig
       );
 
+      expect(writeAnalyticsConfig).to.have.been.calledOnce;
       expect(publishNpmPackages).to.have.been.calledWith();
+      expect(publishNpmPackages).to.have.been.calledAfter(writeAnalyticsConfig as any);
     });
   });
 
@@ -110,7 +120,8 @@ describe('publish', () => {
         config,
         githubRepo,
         uploadDownloadCenterConfig,
-        publishNpmPackages
+        publishNpmPackages,
+        writeAnalyticsConfig
       );
 
       expect(uploadDownloadCenterConfig).not.to.have.been.called;
@@ -121,7 +132,8 @@ describe('publish', () => {
         config,
         githubRepo,
         uploadDownloadCenterConfig,
-        publishNpmPackages
+        publishNpmPackages,
+        writeAnalyticsConfig
       );
 
       expect(githubRepo.promoteRelease).not.to.have.been.called;
@@ -132,7 +144,8 @@ describe('publish', () => {
         config,
         githubRepo,
         uploadDownloadCenterConfig,
-        publishNpmPackages
+        publishNpmPackages,
+        writeAnalyticsConfig
       );
 
       expect(publishNpmPackages).not.to.have.been.called;

packages/build/src/publish.ts

@@ -1,12 +1,16 @@
 import { GithubRepo } from './github-repo';
 import Config from './config';
 import { redactConfig } from './redact-config';
+import type writeAnalyticsConfigType from './analytics';
+import type { publishNpmPackages as publishNpmPackagesType } from './npm-packages';
+import type uploadDownloadCenterConfigType from './download-center';
 
 export default async function publish(
   config: Config,
   githubRepo: GithubRepo,
-  uploadDownloadCenterConfig: (version: string, awsKey: string, awsSecret: string) => Promise<any>,
-  publishNpmPackages: (config: Config) => Promise<void>,
+  uploadDownloadCenterConfig: typeof uploadDownloadCenterConfigType,
+  publishNpmPackages: typeof publishNpmPackagesType,
+  writeAnalyticsConfig: typeof writeAnalyticsConfigType
 ): Promise<void> {
   if (config.dryRun) return;
 
@@ -25,6 +29,12 @@ export default async function publish(
 
   await githubRepo.promoteRelease(config);
 
-  await publishNpmPackages(config);
+  // ensures the segment api key to be present in the published packages
+  await writeAnalyticsConfig(
+    config.analyticsConfigFilePath,
+    config.segmentKey
+  );
+
+  publishNpmPackages();
   console.info('mongosh: finished release process.');
 }