use production_environments - a comma separated string

github · Sep 15, 2023 · b3290f0 · b3290f0
1 parent a65073b
commit b3290f0
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/__tests__/functions/help.test.js b/__tests__/functions/help.test.js
@@ -30,7 +30,7 @@ const defaultInputs = {
   stable_branch: 'main',
   noop_trigger: '.noop',
   lock_trigger: '.lock',
-  production_environment: 'production',
+  production_environments: 'production',
   environment_targets: 'production,staging,development',
   unlock_trigger: '.unlock',
   help_trigger: '.help',
@@ -62,7 +62,7 @@ test('successfully calls help with non-defaults', async () => {
     stable_branch: 'main',
     noop_trigger: '.noop',
     lock_trigger: '.lock',
-    production_environment: 'production',
+    production_environments: 'production',
     environment_targets: 'production,staging,development',
     unlock_trigger: '.unlock',
     help_trigger: '.help',
@@ -93,7 +93,7 @@ test('successfully calls help with non-defaults', async () => {
     stable_branch: 'main',
     noop_trigger: '.noop',
     lock_trigger: '.lock',
-    production_environment: 'production',
+    production_environments: 'production,production-eu,production-ap',
     environment_targets: 'production,staging,development',
     unlock_trigger: '.unlock',
     help_trigger: '.help',

diff --git a/__tests__/main.test.js b/__tests__/main.test.js
@@ -39,7 +39,7 @@ beforeEach(() => {
   process.env.INPUT_ENVIRONMENT_TARGETS = 'production,development,staging'
   process.env.INPUT_ENVIRONMENT_URLS = ''
   process.env.INPUT_PARAM_SEPARATOR = '|'
-  process.env.INPUT_PRODUCTION_ENVIRONMENT = 'production'
+  process.env.INPUT_PRODUCTION_ENVIRONMENTS = 'production'
   process.env.INPUT_STABLE_BRANCH = 'main'
   process.env.INPUT_NOOP_TRIGGER = '.noop'
   process.env.INPUT_LOCK_TRIGGER = '.lock'

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/functions/help.js b/src/functions/help.js
@@ -122,8 +122,8 @@ export async function help(octokit, context, reactionId, inputs) {
 
   - \`${inputs.environment}\` - The default environment for this Action
   - \`${
-    inputs.production_environment
-  }\` - The environment that is considered "production"
+    inputs.production_environments
+  }\` - The environments that are considered "production"
   - \`${
     inputs.environment_targets
   }\` - The list of environments that can be targeted for deployment

diff --git a/src/main.js b/src/main.js
@@ -35,7 +35,9 @@ export async function run() {
     const stable_branch = core.getInput('stable_branch')
     const noop_trigger = core.getInput('noop_trigger')
     const lock_trigger = core.getInput('lock_trigger')
-    const production_environment = core.getInput('production_environment')
+    const production_environments = await stringToArray(
+      core.getInput('production_environments')
+    )
     const environment_targets = core.getInput('environment_targets')
     const draft_permitted_targets = core.getInput('draft_permitted_targets')
     const unlock_trigger = core.getInput('unlock_trigger')
@@ -169,7 +171,7 @@ export async function run() {
         stable_branch: stable_branch,
         noop_trigger: noop_trigger,
         lock_trigger: lock_trigger,
-        production_environment: production_environment,
+        production_environments: production_environments,
         environment_targets: environment_targets,
         unlock_trigger: unlock_trigger,
         global_lock_flag: global_lock_flag,
@@ -553,12 +555,10 @@ export async function run() {
       })
     }
 
-    // Check if the environment is a production_environment
-    var productionEnvironment = false
-    if (environment === production_environment.trim()) {
-      productionEnvironment = true
-    }
-    core.debug(`production_environment: ${productionEnvironment}`)
+    // Check if the environment is a production environment
+    const isProductionEnvironment =
+      production_environments.includes(environment)
+    core.debug(`production_environment: ${isProductionEnvironment}`)
 
     // if update_branch is set to 'disabled', then set auto_merge to false, otherwise set it to true
     const auto_merge = update_branch === 'disabled' ? false : true
@@ -573,7 +573,7 @@ export async function run() {
       environment: environment,
       // description: "",
       // :description note: Short description of the deployment.
-      production_environment: productionEnvironment,
+      production_environment: isProductionEnvironment,
       // :production_environment note: specifies if the given environment is one that end-users directly interact with. Default: true when environment is production and false otherwise.
       payload: {
         type: 'branch-deploy'