From 6fb548c2f0582c3f6af05c06ccf30ea5c59f29d2 Mon Sep 17 00:00:00 2001
From: Erik Schultink <eschultink@users.noreply.github.com>
Date: Thu, 14 Mar 2024 13:28:18 -0700
Subject: [PATCH] attempt to fix resource naming collision

---
 .github/workflows/terraform_integration.yaml | 2 +-
 .idea/.gitignore                             | 2 ++
 .idea/terraform-aws-worklytics-export.iml    | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/terraform_integration.yaml b/.github/workflows/terraform_integration.yaml
index a44b4f8..97e77c1 100644
--- a/.github/workflows/terraform_integration.yaml
+++ b/.github/workflows/terraform_integration.yaml
@@ -63,7 +63,7 @@ jobs:
           terraform init
           terraform apply -auto-approve \
             -var="aws_account_id=${{ env.AWS_ACCOUNT_ID }}" \
-            -var="resource_name_prefix=tf_aws_w8s_export_ci_${{ env.timestamp}}" \
+            -var="resource_name_prefix=tf_aws_w8s_export_ci_${{ matrix.terraform_version }}_${{ env.timestamp}}" \
             -var="worklytics_tenant_id=${{ env.EXAMPLE_TENANT_SA_ID }}"
           echo "worklytics_export_bucket_id=$(terraform output -raw worklytics_export_bucket_id)" >> $GITHUB_OUTPUT
           echo "worklytics_tenant_aws_role_arn=$(terraform output -raw worklytics_tenant_aws_role_arn)" >> $GITHUB_OUTPUT
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 13566b8..a9d7db9 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -6,3 +6,5 @@
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+# GitHub Copilot persisted chat sessions
+/copilot/chatSessions
diff --git a/.idea/terraform-aws-worklytics-export.iml b/.idea/terraform-aws-worklytics-export.iml
index d6ebd48..dc88000 100644
--- a/.idea/terraform-aws-worklytics-export.iml
+++ b/.idea/terraform-aws-worklytics-export.iml
@@ -2,7 +2,9 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.idea/copilot/chatSessions" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>