fix: bitbucket stage (#6845)

* fix: bitbucket stage * fix: added iaas domain config
reapit · May 11, 2022 · d9528ff · d9528ff
1 parent a5a2654
commit d9528ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/deployment-service/src/functions/bitbucket-config.ts b/packages/deployment-service/src/functions/bitbucket-config.ts
@@ -2,9 +2,10 @@ import { httpHandler } from '@homeservenow/serverless-aws-handler'
 
 export const bitbucketConfig = httpHandler({
   handler: async () => {
+    const STAGE = process.env.ROOT_DOMAIN?.includes('prod.paas') ? '' : '-dev'
     return {
-      key: 'reapit',
-      name: 'Reapit App',
+      key: `reapit${STAGE}`,
+      name: `Reapit App ${STAGE}`,
       description: "Reapit's BitBucket app for running pipelines",
       vendor: {
         name: 'Reapit Foundations',

diff --git a/packages/deployment-service/src/functions/pipeline/pipeline-setup.ts b/packages/deployment-service/src/functions/pipeline/pipeline-setup.ts
@@ -77,7 +77,7 @@ export const pipelineSetup: SQSHandler = async (event: SQSEvent, context: Contex
             },
             Aliases: {
               Quantity: 1,
-              Items: [`${pipeline.subDomain}.${process.env.ROOT_DOMAIN}`],
+              Items: [`${pipeline.subDomain}.${process.env.IAAS_DOMAIN}`],
             },
             Comment: `Cloudfront distribution for pipeline [${pipeline.id}] [${
               process.env.NODE_ENV === 'production' ? 'prod' : 'dev'
@@ -125,7 +125,7 @@ export const pipelineSetup: SQSHandler = async (event: SQSEvent, context: Contex
                 Action: 'UPSERT',
                 ResourceRecordSet: {
                   Type: 'A',
-                  Name: `${pipeline.subDomain}.${process.env.ROOT_DOMAIN}`,
+                  Name: `${pipeline.subDomain}.${process.env.IAAS_DOMAIN}`,
                   AliasTarget: {
                     DNSName: frontDomain,
                     EvaluateTargetHealth: false,