remove print (#1207)

* remove print

* change tag naming

* fix initial creation

* release 4.2.1

Author: iakov-gan

cfn-templates/cid-cfn.yml

@@ -1,6 +1,6 @@
 # https://github.com/aws-samples/aws-cudos-framework-deployment/blob/main/cfn-templates/cid-cfn.yml
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deployment of Cloud Intelligence Dashboards v4.2.0 - AWS Solution SO9011
+Description: Deployment of Cloud Intelligence Dashboards v4.2.1 - AWS Solution SO9011
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -2070,7 +2070,7 @@ Resources:
       SourceBucket: !Ref ReferenceAssetsBucket
       DestinationBucket: !Ref LocalAssetsBucket
       Keys:
-        - 'cid-resource-lambda-layer/cid-4.2.0.zip' #replace version here if needed
+        - 'cid-resource-lambda-layer/cid-4.2.1.zip' #replace version here if needed
 
   CidResourceLambdaLayer:
     Type: AWS::Lambda::LayerVersion
@@ -2085,7 +2085,7 @@ Resources:
             - LambdaLayerBucketPrefixIsManaged
             - !FindInMap [RegionMap, !Ref 'AWS::Region', BucketName]
             - !Sub '${LambdaLayerBucketPrefix}-${AWS::Region}' # Region added for backward compatibility
-        S3Key: 'cid-resource-lambda-layer/cid-4.2.0.zip' #replace version here if needed
+        S3Key: 'cid-resource-lambda-layer/cid-4.2.1.zip' #replace version here if needed
       CompatibleRuntimes:
         - python3.10
         - python3.11

cid/_version.py

@@ -1,2 +1,2 @@
-__version__ = '4.2.0'
+__version__ = '4.2.1'
 

cid/builtin/core/data/resources.yaml

@@ -139,6 +139,7 @@ datasets:
         - DataExports
       views:
         - ec2_running_cost
+        - account_map
     schedules:
       - default
   # CID dataset
@@ -149,6 +150,7 @@ datasets:
         - DataExports
       views:
         - compute_savings_plan_eligible_spend
+        - account_map
     schedules:
       - default
   # CID dataset
@@ -906,8 +908,8 @@ views:
         - compute_optimizer_idle_options
 
   # Shared views
-  #account_map:
-  #  File: queries/shared/account_map.sql
+  account_map:
+    File: queries/shared/account_map.sql
   business_units_map:
     File: queries/shared/business_units_map.sql
   aws_accounts:

cid/helpers/quicksight/dashboard_patching.py

@@ -30,6 +30,7 @@ def format_field_name(field_name: str, ignore_prefix: bool=False) -> str:
         assert format_field_name('account_name') == 'Account Name'
         assert format_field_name('a_c_r_o_n_y_m') == 'ACRONYM'
         assert format_field_name('tag_a_c_r_o_n_y_m') == 'Tag ACRONYM'
+        assert format_field_name('tag_service') == 'Tag Service'
     """
     parts = field_name.split('_')
     result = []
@@ -47,11 +48,15 @@ def format_field_name(field_name: str, ignore_prefix: bool=False) -> str:
             result.append(parts[i].title())
             i += 1
     title = ' '.join(result)
+    title = title.replace('Aws ', 'AWS ')
     if ignore_prefix:
+        new_title = title
         if title.startswith('Cost Category '):
-            title = title.replace('Cost Category ', '')
-        if title.startswith('Tag '):
-            title = title.replace('Tag ', '')
+            new_title = title.replace('Cost Category ', '')
+        elif title.startswith('Tag '):
+            new_title = title.replace('Tag ', '')
+        if title.lower() not in ('service', 'region', 'account'): # leave prefix for special terms
+            title = new_title
     return title
 
 def align_grid_position(elements: List[Dict[str, Any]]) -> None:

cid/utils.py

@@ -305,7 +305,7 @@ def get_parameter(param_name, message, choices=None, default=None, none_as_disab
                 ).execute()
     else: # it is a text entry
         if isinstance(default, str) and template_variables:
-            print(template_variables)
+            logger.debug(f'template_variables = {template_variables}')
             default=default.format(**template_variables)
         print()
         if not isatty():