cli: fix demo endpoint generation

mostafa-asg · May 8, 2018 · e3e0931 · e3e0931
1 parent 40adf93
commit e3e0931
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/cli/packages/prisma-cli-core/src/utils/EndpointDialog.ts b/cli/packages/prisma-cli-core/src/utils/EndpointDialog.ts
@@ -342,6 +342,8 @@ export class EndpointDialog {
       stage = await this.askForStage('dev')
     }
 
+    workspace = workspace || cluster.workspaceSlug
+
     return {
       endpoint: cluster.getApiEndpoint(service, stage, workspace),
       cluster,

diff --git a/cli/packages/prisma-yml/src/PrismaDefinition.ts b/cli/packages/prisma-yml/src/PrismaDefinition.ts
@@ -160,6 +160,8 @@ export class PrismaDefinitionClass {
     const clusterName = this.getClusterName()
     const cluster = this.env.clusterByName(clusterName!)!
     if (
+      this.definition &&
+      this.definition.cluster &&
       clusterName &&
       cluster &&
       cluster.shared &&
@@ -177,6 +179,22 @@ and execute ${chalk.bold.green(
         )} again, to get that value auto-filled.`,
       )
     }
+    if (
+      this.definition &&
+      this.definition.endpoint &&
+      clusterName &&
+      cluster &&
+      cluster.shared &&
+      !cluster.isPrivate &&
+      !this.getWorkspace() &&
+      clusterName !== 'shared-public-demo'
+    ) {
+      throw new Error(
+        `The provided endpoint ${
+          this.definition.endpoint
+        } points to a demo cluster, but is missing the workspace slug. A valid demo endpoint looks like this: https://eu1.prisma.sh/myworkspace/service-name/stage-name`,
+      )
+    }
     this.env.sharedClusters
   }