fix cur table issue

aws-samples · Nov 6, 2024 · 7d173aa · 7d173aa
1 parent fedb14d
commit 7d173aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cfn-templates/cid-cfn.yml b/cfn-templates/cid-cfn.yml
@@ -1939,12 +1939,15 @@ Outputs:
     Description: Technical Value - GlueCatalog
     Value: !Ref GlueDataCatalog
     Export: { Name: !Sub 'cid${Suffix}-GlueCatalog'}
+  CurDatabaseName:
+    Description: Technical Value - CurDatabaseName
+    Value: !If [ UseCUR2, !ImportValue cid-DataExports-Database, !If [NeedDatabase, !Ref CidDatabase, !Ref DatabaseName ] ]
+    Export: { Name: !Sub 'cid${Suffix}-CurTableName'}
   CurTableName:
     Description: Technical Value - CurTableName
-    Value: !If [ NeedCURTable, !Ref MyCURTable, !Ref CURTableName ]
+    Value: !If [ UseCUR2, 'cur2', !If [ NeedCURTable, !Ref MyCURTable, !Ref CURTableName ] ]
     Export: { Name: !Sub 'cid${Suffix}-CurTableName'}
   QuickSightUser:
     Description: Technical Value - QuickSightUser
     Value: !Ref QuickSightUser
-    Export: { Name: !Sub 'cid${Suffix}-QuickSightUser'}
-
+    Export: { Name: !Sub 'cid${Suffix}-QuickSightUser'}
diff --git a/cfn-templates/cid-plugin.yml b/cfn-templates/cid-plugin.yml
@@ -43,6 +43,7 @@ Resources:
         athena-database: {Fn::ImportValue: "cid-AthenaDatabase"}
         glue-data-catalog: {Fn::ImportValue: "cid-GlueCatalog"}
         cur-table-name: {Fn::ImportValue: "cid-CurTableName"}
+        cur-database-name: {Fn::ImportValue: "cid-CurDatabaseName"}
         quicksight-user: {Fn::ImportValue: "cid-QuickSightUser"}
         share-with-account: 'yes'
         resources: !If [ResourcesUrlIsEmpty, !Ref 'AWS::NoValue', !Ref ResourcesUrl]