From 1aa1fcc6cf4b314034d2686517fee0d16a95d7b7 Mon Sep 17 00:00:00 2001
From: Khuzaima-Shakeel <Khuzaima.Shakeel@ibm.com>
Date: Wed, 22 Nov 2023 14:52:22 +0530
Subject: [PATCH 1/3] migrating tim repos to pull cra config from a file

---
 .github/workflows/ci.yml |  2 +-
 cra-config.yml           | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 cra-config.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9562012e..59b82cd9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,5 +12,5 @@ jobs:
     with:
       craSCCv2: true
       craTarget: "examples/fscloud"
-      craRuleIgnoreFile: "cra-tf-validate-ignore-rules.json"
+      craConfigYamlFile: "cra-config.yaml"
       craEnvironmentVariables: "TF_VAR_existing_kms_instance_guid=${{ vars.HPCS_SOUTH_GUID }},TF_VAR_kms_key_crn=${{ vars.HPCS_SOUTH_KEY_CRN }}"
diff --git a/cra-config.yml b/cra-config.yml
new file mode 100644
index 00000000..4e64a46a
--- /dev/null
+++ b/cra-config.yml
@@ -0,0 +1,11 @@
+cra=# More info about this file at https://github.com/terraform-ibm-modules/common-pipeline-assets/blob/main/.github/workflows/terraform-test-pipeline.md#cra-config-yaml
+version: "v1"
+CRA_TARGETS:
+  - CRA_TARGET: "examples/fscloud" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
+    CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json" # CRA Ignore file to use. If not provided, it checks the repo root directory for `cra-tf-validate-ignore-rules.json`
+    PROFILE_ID: "0e6e7b5a-817d-4344-ab6f-e5d7a9c49520" # SCC profile ID (currently set to the FSCloud 1.4.0 profile).
+    # SCC_INSTANCE_ID: "" # The SCC instance ID to use to download profile for CRA scan. If not provided, a default global value will be used.
+    # SCC_REGION: "" # The IBM Cloud region that the SCC instance is in. If not provided, a default global value will be used.
+    # CRA_ENVIRONMENT_VARIABLES:  # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs.
+    #   TF_VAR_sample: "sample value"
+    #   TF_VAR_other:  "another value"

From 73dda67d75d4dff75c976df1943536c680560843 Mon Sep 17 00:00:00 2001
From: Khuzaima Shakeel <56439894+Khuzaima05@users.noreply.github.com>
Date: Wed, 22 Nov 2023 16:28:32 +0530
Subject: [PATCH 2/3] Update ci.yml

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 59b82cd9..b1c919c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,5 @@ jobs:
     secrets: inherit
     with:
       craSCCv2: true
-      craTarget: "examples/fscloud"
       craConfigYamlFile: "cra-config.yaml"
       craEnvironmentVariables: "TF_VAR_existing_kms_instance_guid=${{ vars.HPCS_SOUTH_GUID }},TF_VAR_kms_key_crn=${{ vars.HPCS_SOUTH_KEY_CRN }}"

From a200be559613d51e7772ff43405e7c9361406d03 Mon Sep 17 00:00:00 2001
From: Khuzaima Shakeel <56439894+Khuzaima05@users.noreply.github.com>
Date: Wed, 22 Nov 2023 16:29:07 +0530
Subject: [PATCH 3/3] Update and rename cra-config.yml to cra-config.yaml

---
 cra-config.yml => cra-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename cra-config.yml => cra-config.yaml (84%)

diff --git a/cra-config.yml b/cra-config.yaml
similarity index 84%
rename from cra-config.yml
rename to cra-config.yaml
index 4e64a46a..bfbd9302 100644
--- a/cra-config.yml
+++ b/cra-config.yaml
@@ -1,4 +1,4 @@
-cra=# More info about this file at https://github.com/terraform-ibm-modules/common-pipeline-assets/blob/main/.github/workflows/terraform-test-pipeline.md#cra-config-yaml
+# More info about this file at https://github.com/terraform-ibm-modules/common-pipeline-assets/blob/main/.github/workflows/terraform-test-pipeline.md#cra-config-yaml
 version: "v1"
 CRA_TARGETS:
   - CRA_TARGET: "examples/fscloud" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.