Merge pull request #407 from Financial-Times/revert-402-CPP-1372-fix-…

…orb-deploy-change-api Revert #402 and update change-api-orb
Financial-Times · Apr 18, 2023 · 860b184 · 860b184
2 parents 4a8d37a + b003897
commit 860b184
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/orb/src/@orb.yml b/orb/src/@orb.yml
@@ -12,6 +12,6 @@ display:
 # If your orb requires other orbs, you can import them like this. Otherwise remove the "orbs" stanza.
 orbs:
   node: circleci/node@5.0.2
-  change-api: financial-times/change-api@1.0.1
+  change-api: financial-times/change-api@1.0.7
   aws-cli: circleci/aws-cli@3.1.4
   serverless-framework: circleci/serverless-framework@2.0.1
diff --git a/orb/src/jobs/deploy-production.yml b/orb/src/jobs/deploy-production.yml
@@ -6,13 +6,10 @@ parameters:
     default: ''
     type: string
   system-code:
-    type: env_var_name
-    default: CIRCLE_PROJECT_REPONAME
+    default: $CIRCLE_PROJECT_REPONAME
     description: >-
-      The environment variable containing the system-code of the system being changed.
-  environment:
-    default: production
-    description: The environment in which the system is being changed.
+      The system-code of the system being changed. Defaults to the repository
+      name.
     type: string
 
 executor: << parameters.executor >>
@@ -32,5 +29,5 @@ steps:
       name: Deploy to production
       command: npx dotcom-tool-kit deploy:production
   - change-api/change-log:
-      environment: << parameters.environment >>
+      environment: production
       system-code: << parameters.system-code >>
diff --git a/orb/src/jobs/heroku-promote.yml b/orb/src/jobs/heroku-promote.yml
@@ -3,13 +3,10 @@ parameters:
     default: default
     type: executor
   system-code:
-    type: env_var_name
-    default: CIRCLE_PROJECT_REPONAME
+    default: $CIRCLE_PROJECT_REPONAME
     description: >-
-      The environment variable containing the system-code of the system being changed.
-  environment:
-    default: production
-    description: The environment in which the system is being changed.
+      The system-code of the system being changed. Defaults to the repository
+      name.
     type: string
 
 executor: << parameters.executor >>
@@ -20,5 +17,5 @@ steps:
       name: Deploy to production
       command: npx dotcom-tool-kit deploy:production
   - change-api/change-log:
-      environment: << parameters.environment >>
+      environment: production
       system-code: << parameters.system-code >>