fix(nx-heroku): make org optional to allow personal apps

getlarge · Mar 2, 2023 · d4b8244 · d4b8244
1 parent 331812d
commit d4b8244
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/packages/nx-heroku/src/executors/common/heroku/apps.ts b/packages/nx-heroku/src/executors/common/heroku/apps.ts
@@ -121,16 +121,15 @@ export async function appExists(options: {
 export async function createApp(options: {
   appName: string;
   remoteName: string;
-  org: string;
+  org?: string;
   region?: string;
 }): Promise<{ stdout: string; stderr: string }> {
   const { appName, remoteName, org, region = 'eu' } = options;
   // outputs on success to stderr : Creating ${appName}... done, region is ${region}, stack is ${HEROKU_STACK}
   // outputs on success to stdout : https://<app-name>.herokuapp.com/ | https://git.heroku.com/<app-name>.git
-  return exec(
-    `heroku create ${appName} --remote ${remoteName} --region ${region} --stack ${HEROKU_STACK} --team ${org}`,
-    { encoding: 'utf-8' }
-  );
+  const baseCommand = `heroku apps:create ${appName} --remote ${remoteName} --region ${region} --stack ${HEROKU_STACK}`;
+  const command = org ? `${baseCommand} --team ${org}` : baseCommand;
+  return exec(command, { encoding: 'utf-8' });
 }
 
 export async function createAppRemote(options: {
@@ -156,12 +155,12 @@ export async function createPipeline(options: {
   appName: string;
   pipelineName: string;
   environment: Environment;
-  org: string;
+  org?: string;
 }): Promise<void> {
   const { appName, environment, org, pipelineName } = options;
-  await exec(
-    `heroku pipelines:create ${pipelineName} --app ${appName} --stage ${environment} --team ${org}`
-  );
+  const baseCommand = `heroku pipelines:create ${pipelineName} --app ${appName} --stage ${environment}`;
+  const command = org ? `${baseCommand} --team ${org}` : baseCommand;
+  await exec(command);
 }
 
 export async function addAppToPipeline(options: {

diff --git a/packages/nx-heroku/src/executors/deploy/schema.d.ts b/packages/nx-heroku/src/executors/deploy/schema.d.ts
@@ -4,7 +4,8 @@ import { Environment } from '../common/constants';
 export interface DeployExecutorSchema
   extends Omit<ExecutorBaseSchema, 'config'> {
   config: Environment[];
-  org: string;
+  // org not required to allow for personal apps
+  org?: string;
   repositoryName?: string;
   buildPacks: string[];
   variables?: Record<string, string>;

diff --git a/packages/nx-heroku/src/executors/deploy/schema.json b/packages/nx-heroku/src/executors/deploy/schema.json
@@ -189,5 +189,5 @@
       "type": "boolean"
     }
   },
-  "required": ["config", "apiKey", "email", "org", "buildPacks", "watchDelay"]
+  "required": ["config", "apiKey", "email", "buildPacks", "watchDelay"]
 }
diff --git a/packages/nx-heroku/src/executors/promote/schema.d.ts b/packages/nx-heroku/src/executors/promote/schema.d.ts
@@ -1,7 +1,7 @@
 import { ExecutorBaseSchema } from '../common/base-schema';
 
 export interface PromoteExecutorSchema extends ExecutorBaseSchema {
-  org: string;
+  org?: string;
   serviceUser: string;
   variables?: Record<string, string>;
 }
diff --git a/packages/nx-heroku/src/executors/promote/schema.json b/packages/nx-heroku/src/executors/promote/schema.json
@@ -45,5 +45,5 @@
       "type": "boolean"
     }
   },
-  "required": ["config", "apiKey", "email", "org"]
+  "required": ["config", "apiKey", "email"]
 }
diff --git a/packages/nx-heroku/src/generators/common/schema.d.ts b/packages/nx-heroku/src/generators/common/schema.d.ts
@@ -1,6 +1,6 @@
 export interface GeneratorSchema {
   projectName: string;
-  org: string;
+  org?: string;
   repositoryName?: string;
   appNamePrefix?: string;
   apiKey?: string;

diff --git a/packages/nx-heroku/src/generators/common/schema.json b/packages/nx-heroku/src/generators/common/schema.json
@@ -44,5 +44,5 @@
       "type": "boolean"
     }
   },
-  "required": ["projectName", "org"]
+  "required": ["projectName"]
 }