add deployment type (#1241)

Author: iakov-gan

cfn-templates/cid-cfn.yml

@@ -40,6 +40,7 @@ Metadata:
           - DeployCUDOSDashboard
           - DataBucketsKmsKeysArns
           - ShareDashboard
+          - DeploymentType
           - CreateLocalAssetsBucket
           - ReferenceAssetsBucket
       - Label:
@@ -105,6 +106,8 @@ Metadata:
         default: "Create Local Assets Bucket"
       ReferenceAssetsBucket:
         default: "Reference Assets Bucket Name"
+      DeploymentType:
+        default: "Type of Deployment - Please do not change"
       CurrencySymbol:
         default: "Currency Symbol"
   cfn-lint:
@@ -262,9 +265,18 @@ Parameters:
   CurrencySymbol:
     Type: String
     Description: 'Currency Symbol. Please align with Currency of your CUR. Only supported for China region.'
-    Default: "USD"
-    AllowedValues: 
+    Default: "$"
+    AllowedValues:
       # Only currency symbols supported by QS
+      - "$" # US Dollar
+      - "£" # British Pound
+      - "€" # Euro
+      - "¥" # Japanese Yen
+      - "₩" # South Korean Won
+      - "kr" # Danish Krone
+      - "NT" # Taiwan Dollar
+      - "₹" # Indian Rupee
+      # for backward compatibility
       - "USD" # US Dollar         $
       - "GBP" # British Pound     £
       - "EUR" # Euro              €
@@ -273,6 +285,13 @@ Parameters:
       - "DKK" # Danish Krone      kr
       - "TWD" # Taiwan Dollar     NT
       - "INR" # Indian Rupee      ₹
+  DeploymentType:
+    Type: String
+    Description: 'Internal Deployment Type'
+    Default: "Lambda"
+    AllowedValues:
+      - "Lambda"
+      - "Terraform"
 
 Conditions:
   NeedCUDOSDashboard: !Equals [ !Ref DeployCUDOSDashboard, "yes" ]
@@ -607,7 +626,7 @@ Resources:
         ZipFile: |
           # Legacy lambda - will be deleted in next major update
           import cfnresponse
-          
+
           def lambda_handler(event, context):
               cfnresponse.send(event, context, cfnresponse.SUCCESS, {}, 'keep_it_constant', 'legacy')
     Metadata:
@@ -1855,6 +1874,7 @@ Resources:
         - !Ref CidResourceLambdaLayer
       Environment:
         Variables:
+          AWS_DEPLOYMENT_TYPE: !Ref DeploymentType
           athena_workgroup: !If [ NeedAthenaWorkgroup, !Ref MyAthenaWorkGroup, !Ref AthenaWorkgroup ]
           quicksight_datasource_id: !Select [ 1, !Split [ '/', !GetAtt CidAthenaDataSource.Arn]]
           quicksight_datasource_role_arn: !If [ NeedQuickSightDataSourceRole, !Sub "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/${QuickSightDataSourceRole}", "" ]

cid/common.py

@@ -282,16 +282,22 @@ def export(self, **kwargs):
         export_analysis(self.qs, self.athena, glue=self.glue)
 
     def track(self, action, dashboard_id):
-        """ Send dashboard_id and account_id to adoption tracker """
+        """ Send dashboard_id and account_id to CID adoption tracker """
         method = {'created':'PUT', 'updated':'PATCH', 'deleted': 'DELETE'}.get(action, None)
         if not method:
             logger.debug(f"This will not fail the deployment. Logging action {action} is not supported. This issue will be ignored")
             return
-        endpoint = 'https://okakvoavfg.execute-api.eu-west-1.amazonaws.com/'
+        endpoint = 'https://cid.workshops.aws.dev/adoption-tracking' # AWS Managed
+        if os.environ.get('AWS_DEPLOYMENT_TYPE'):
+            deployment_type = os.environ.get('AWS_DEPLOYMENT_TYPE')
+        elif os.environ.get('AWS_EXECUTION_ENV', '').startswith('AWS_Lambda'):
+            deployment_type = 'Lambda'
+        else:
+            deployment_type = 'CID'
         payload = {
             'dashboard_id': dashboard_id,
             'account_id': self.base.account_id,
-            action + '_via': 'Lambda' if os.environ.get('AWS_EXECUTION_ENV', '').startswith('AWS_Lambda') else 'CID',
+            action + '_via': deployment_type,
         }
         try:
             res = requests.request(