From 7d173aa8de5ba84420af92e555f822428eb3f809 Mon Sep 17 00:00:00 2001 From: Iakov Gan Date: Wed, 6 Nov 2024 15:05:53 +0100 Subject: [PATCH] fix cur table issue --- cfn-templates/cid-cfn.yml | 9 ++++++--- cfn-templates/cid-plugin.yml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cfn-templates/cid-cfn.yml b/cfn-templates/cid-cfn.yml index a1972e23..4d9bc561 100644 --- 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'} \ No newline at end of file diff --git a/cfn-templates/cid-plugin.yml b/cfn-templates/cid-plugin.yml index 35b85783..23d81f12 100644 --- 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]