Merge pull request #133 from cristian-popa/feature/migrate-to-non-legacy-views

Feature/migrate to non legacy views

Author: megareez

.gitignore

@@ -45,3 +45,6 @@ venv.bak/
 .Trashes
 .VolumeIcon.icns
 .com.apple.timemachine.donotpresent
+
+#Local dev and testing files
+cfn-templates/parameters.local

cfn-templates/cudos-cfn.yml

@@ -193,7 +193,9 @@ Resources:
         Variables:
           DatabaseName: !Ref CURDatabaseName
           TableName: !Ref CURTableName
-          ViewTemplatesUri: 'https://raw.githubusercontent.com/aws-samples/aws-cudos-framework-deployment/main/legacy/cudos/view-templates'
+          ViewTemplatesUri: 'https://raw.githubusercontent.com/aws-samples/aws-cudos-framework-deployment/main/cid/builtin/core/data/queries'
+          ViewMetadataUri:  'https://raw.githubusercontent.com/aws-samples/aws-cudos-framework-deployment/main/cfn-templates'
+                            
       Code:
         ZipFile: |
           import os
@@ -216,6 +218,7 @@ Resources:
           database_name = os.environ["DatabaseName"]
           table_name = os.environ["TableName"]
           view_templates_uri = os.environ["ViewTemplatesUri"]
+          view_metadata_uri = os.environ["ViewMetadataUri"]
 
           def lambda_handler(event, context):
               logger.info(f"Cloud formation {event['RequestType']} event,"
@@ -262,18 +265,18 @@ Resources:
                   else:
                       query_mode = 'File'
                   logger.info(f"Step {step} completed, query mode is '{query_mode}'")
-                  step="Download View Metadata"
+                  step="Download View Metadata from " + f'{view_metadata_uri}/views_cid.json'
 
                   logger.info(f"Trying to {step}")
-                  view_dict=json.loads(str(http.request('GET', f'{view_templates_uri}/views.json').data.decode('utf-8')))
+                  view_dict=json.loads(str(http.request('GET', f'{view_metadata_uri}/views_cid.json').data.decode('utf-8')))
                   logger.info (f"Step '{step}' completed, the view metadata is: {view_dict}")
                   
                   for key in view_dict["view_templates"]:
                       sql_file_uri = view_templates_uri + '/' + view_dict["view_templates"][key][query_mode]
                       step = "Downloading view " + sql_file_uri
                       logger.info(step)
                       view_template = str(http.request('GET', sql_file_uri).data.decode('utf-8'))
-                      view_code = view_template.replace('${athena_cur_table_name}',table_name)
+                      view_code = view_template.replace('${cur_table_name}',table_name)
                       logger.info('Completed %s', step)
                       step = "Running athena query for view" + view_dict["view_templates"][key][query_mode] 
                       logger.info(step)

cfn-templates/views_cid.json

@@ -0,0 +1,40 @@
+{
+	"view_templates": {
+		"compute_savings_plan_eligible_spend": {
+			"__description__": "",
+			"spriFile": "cid/compute_savings_plan_eligible_spend.sql",
+			"spFile": "cid/compute_savings_plan_eligible_spend.sql",
+			"riFile": "cid/compute_savings_plan_eligible_spend.sql",
+			"File": "cid/compute_savings_plan_eligible_spend.sql"
+		},
+		"ec2_running_cost": {
+			"__description__": "",
+			"spriFile": "cid/ec2_running_cost_sp_ri.sql",
+			"spFile": "cid/ec2_running_cost_sp.sql",
+			"riFile": "cid/ec2_running_cost_ri.sql",
+			"File": "cid/ec2_running_cost.sql"
+		},
+		"ri_sp_mapping": {
+			"__description__": "",
+			"spriFile": "cid/ri_sp_mapping_sp_ri.sql",
+			"spFile": "cid/ri_sp_mapping_sp.sql",
+			"riFile": "cid/ri_sp_mapping_ri.sql",
+			"File": "cid/ri_sp_mapping.sql"
+		},
+		
+		"s3_view": {
+			"__description__": "",
+			"spriFile": "cid/s3.sql",
+			"spFile": "cid/s3.sql",
+			"riFile": "cid/s3.sql",
+			"File": "cid/s3.sql"
+		},
+		"summary_view": {
+			"__description__": "",
+			"spriFile": "cid/summary_view_sp_ri.sql",
+			"spFile": "cid/summary_view_sp.sql",
+			"riFile": "cid/summary_view_ri.sql",
+			"File": "cid/summary_view.sql"
+		}
+	}
+}