From e334f5b37c9ea728183b4bf16ec83b0e46ef5e91 Mon Sep 17 00:00:00 2001
From: ffalor <35144141+ffalor@users.noreply.github.com>
Date: Fri, 17 Nov 2023 15:11:02 -0600
Subject: [PATCH] fix: prevents redirect issue with molecule and new powershell
 updates (#222)

Co-authored-by: Carlos Matos <carlos.matos@crowdstrike.com>
---
 .github/workflows/pwsh_install_ccid.yml   | 1 +
 .github/workflows/pwsh_install_policy.yml | 1 +
 .github/workflows/pwsh_migrate.yml        | 1 +
 molecule/pwsh_install_ccid/converge.yml   | 1 +
 molecule/pwsh_install_policy/converge.yml | 1 +
 molecule/pwsh_migrate/converge.yml        | 4 ++--
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pwsh_install_ccid.yml b/.github/workflows/pwsh_install_ccid.yml
index 619ceb1..1d5176c 100644
--- a/.github/workflows/pwsh_install_ccid.yml
+++ b/.github/workflows/pwsh_install_ccid.yml
@@ -29,6 +29,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
       FALCON_CLIENT_ID: ${{ secrets.FALCON_CLIENT_ID }}
       FALCON_CLIENT_SECRET: ${{ secrets.FALCON_CLIENT_SECRET }}
+      FALCON_CLOUD: ${{ secrets.FALCON_CLOUD }}
       FALCON_CID: ${{ secrets.FALCON_CID }}
       FALCON_PROV_TOKEN: ${{ secrets.FALCON_PROV_TOKEN }}
       AWS_REGION: "us-west-1"
diff --git a/.github/workflows/pwsh_install_policy.yml b/.github/workflows/pwsh_install_policy.yml
index 1842f6b..052aedb 100644
--- a/.github/workflows/pwsh_install_policy.yml
+++ b/.github/workflows/pwsh_install_policy.yml
@@ -29,6 +29,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
       FALCON_CLIENT_ID: ${{ secrets.FALCON_CLIENT_ID }}
       FALCON_CLIENT_SECRET: ${{ secrets.FALCON_CLIENT_SECRET }}
+      FALCON_CLOUD: ${{ secrets.FALCON_CLOUD }}
       FALCON_CID: ${{ secrets.FALCON_CID }}
       FALCON_PROV_TOKEN: ${{ secrets.FALCON_PROV_TOKEN }}
       AWS_REGION: "us-west-1"
diff --git a/.github/workflows/pwsh_migrate.yml b/.github/workflows/pwsh_migrate.yml
index e35e0c4..afec28e 100644
--- a/.github/workflows/pwsh_migrate.yml
+++ b/.github/workflows/pwsh_migrate.yml
@@ -29,6 +29,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
       FALCON_CLIENT_ID: ${{ secrets.FALCON_CLIENT_ID }}
       FALCON_CLIENT_SECRET: ${{ secrets.FALCON_CLIENT_SECRET }}
+      FALCON_CLOUD: ${{ secrets.FALCON_CLOUD }}
       FALCON_CID: ${{ secrets.FALCON_CID }}
       FALCON_PROV_TOKEN: ${{ secrets.FALCON_PROV_TOKEN }}
       AWS_REGION: "us-west-1"
diff --git a/molecule/pwsh_install_ccid/converge.yml b/molecule/pwsh_install_ccid/converge.yml
index 39eaf11..e820bb8 100644
--- a/molecule/pwsh_install_ccid/converge.yml
+++ b/molecule/pwsh_install_ccid/converge.yml
@@ -10,6 +10,7 @@
         -FalconClientSecret "{{ lookup('env', 'FALCON_CLIENT_SECRET') }}"
         -FalconCid "{{ lookup('env', 'FALCON_CID') }}"
         -ProvToken "{{ lookup('env', 'FALCON_PROV_TOKEN') }}"
+        -FalconCloud "{{ lookup('env', 'FALCON_CLOUD') }}"
     #   register: install_script
 
     # # Print stdout
diff --git a/molecule/pwsh_install_policy/converge.yml b/molecule/pwsh_install_policy/converge.yml
index 2a8609f..7ad22cb 100644
--- a/molecule/pwsh_install_policy/converge.yml
+++ b/molecule/pwsh_install_policy/converge.yml
@@ -8,6 +8,7 @@
         -FalconClientId "{{ lookup('env', 'FALCON_CLIENT_ID') }}"
         -FalconClientSecret "{{ lookup('env', 'FALCON_CLIENT_SECRET') }}"
         -ProvToken "{{ lookup('env', 'FALCON_PROV_TOKEN') }}"
+        -FalconCloud "{{ lookup('env', 'FALCON_CLOUD') }}"
     #   register: install_script
 
     # # Print stdout
diff --git a/molecule/pwsh_migrate/converge.yml b/molecule/pwsh_migrate/converge.yml
index dc4035d..4537c67 100644
--- a/molecule/pwsh_migrate/converge.yml
+++ b/molecule/pwsh_migrate/converge.yml
@@ -10,8 +10,8 @@
         -NewFalconClientSecret "{{ lookup('env', 'FALCON_CLIENT_SECRET') }}"
         -OldFalconClientId "{{ lookup('env', 'FALCON_CLIENT_ID') }}" `
         -OldFalconClientSecret "{{ lookup('env', 'FALCON_CLIENT_SECRET') }}"
-        -NewFalconCloud "us-2"
-        -OldFalconCloud "us-2"
+        -NewFalconCloud "{{ lookup('env', 'FALCON_CLOUD') }}"
+        -OldFalconCloud "{{ lookup('env', 'FALCON_CLOUD') }}"
         -ProvToken "{{ lookup('env', 'FALCON_PROV_TOKEN') }}"
         -RemoveHost
         -Tags "migrate1,migrate2"