cid-cmd 0.2.45__tar.gz → 0.3.0__tar.gz

{cid-cmd-0.2.45/cid_cmd.egg-info → cid_cmd-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cid-cmd
-Version: 0.2.45
+Version: 0.3.0
 Summary: Cloud Intelligence Dashboards deployment helper tool
 Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
 Author: AWS CUDOS Team
@@ -9,20 +9,21 @@ Keywords: aws,cmd,cli,cost intelligence dashboards
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: setuptools
-Requires-Dist: boto3>=1.29.5
+Requires-Dist: boto3>=1.34.70
 Requires-Dist: Click>=8.0
 Requires-Dist: PyYAML
 Requires-Dist: requests
 Requires-Dist: tzlocal>=4.0
 Requires-Dist: six>=1.15
 Requires-Dist: questionary>=1.10
+Requires-Dist: tqdm
 
 # Cloud Intelligence Dashboards (CUDOS Framework)
 
@@ -70,7 +71,7 @@ See more dashboards on the [workshop page](https://catalog.workshops.aws/awscid/
 
     Automation requires Python 3
 
-2. Make sure you have latest pip package installed
+2. Make sure you have the latest pip package installed
     ```bash
     python3 -m ensurepip --upgrade
     ```
@@ -92,16 +93,20 @@ Update only Dashboard
 ```bash
 cid-cmd update
 ```
-Update dashboard and all dependenies (Datasets and Athena View). WARNING: this will overide any customization of SQL files and Datasets.
+Update dashboard and all dependencies (Datasets and Athena View). WARNING: this will override any customization of SQL files and Datasets.
 ```bash
 cid-cmd update --force --recursive
 ```
-#### Show Dashboard status
+#### Show Dashboard Status
 Show dashboards status
 
 ```bash
 cid-cmd status
 ```
+[<img width="558" alt="status" src="https://github.com/aws-samples/aws-cudos-framework-deployment/assets/82834333/cae2015f-0f81-4593-80b3-c67ec1200fcd">](https://www.youtube.com/watch?v=ivr1MoGaApM)
+
+
+
 
 ####  Share QuickSight resources
 ```bash
@@ -109,21 +114,28 @@ cid-cmd share
 ```
 
 #### Initialize Amazon QuickSight
-One time action to intialize Amazon QuickSight Enerprise Edition.
+One time action to initialize Amazon QuickSight Enterprise Edition.
 
 ```bash
-cid-cmd initqs
+cid-cmd init-qs
 ```
 
+#### Initialize CUR
+One time action to initialize Athena table and Crawler from s3 with CUR data.
+
+```bash
+cid-cmd init-cur
+```
 
 #### Delete Dashboard and all dependencies unused by other
 Delete Dashboards and all dependencies unused by other CID-managed dashboards.(including QuickSight datasets, Athena views and tables)
 ```bash
 cid-cmd delete
 ```
+
 #### Delete Command Options:
 ```
- --dashboard-id TEXT QuickSight dashboard id 
+ --dashboard-id TEXT QuickSight dashboard id
  --athena-database TEXT Athena database
  ```
 
@@ -155,10 +167,10 @@ This command generates a SQL file that you can execute. Please mind [Athena Serv
 
 
 ## Cloud Formation
-CID is also provided in a form of CloudFormation telmplates. See detailed instuctions in the [Well Architected Labs](https://wellarchitectedlabs.com/cost/200_labs/200_cloud_intelligence/cost-usage-report-dashboards/dashboards/deploy_dashboards/) site.
+CID is also provided in a form of CloudFormation templates. See detailed instructions in the [Well Architected Labs](https://wellarchitectedlabs.com/cost/200_labs/200_cloud_intelligence/cost-usage-report-dashboards/dashboards/deploy_dashboards/) site.
 
 ## Terraform
-CID offers a set of Terraform modules to deploy CUR replicaion and CID dashboards. These modules act as a wrapper around CloudFormation.
+CID offers a set of Terraform modules to deploy CUR replication and CID dashboards. These modules act as a wrapper around CloudFormation.
 
   1. Create a bucket for consolidating CUR [terraform-modules/cur-setup-destination/](terraform-modules/cur-setup-destination/)
   2. Create a CUR in Payer Account(s) [terraform-modules/cur-setup-source/](terraform-modules/cur-setup-source/)

{cid-cmd-0.2.45 → cid_cmd-0.3.0}/README.md

@@ -44,7 +44,7 @@ See more dashboards on the [workshop page](https://catalog.workshops.aws/awscid/
 
     Automation requires Python 3
 
-2. Make sure you have latest pip package installed
+2. Make sure you have the latest pip package installed
     ```bash
     python3 -m ensurepip --upgrade
     ```
@@ -66,16 +66,20 @@ Update only Dashboard
 ```bash
 cid-cmd update
 ```
-Update dashboard and all dependenies (Datasets and Athena View). WARNING: this will overide any customization of SQL files and Datasets.
+Update dashboard and all dependencies (Datasets and Athena View). WARNING: this will override any customization of SQL files and Datasets.
 ```bash
 cid-cmd update --force --recursive
 ```
-#### Show Dashboard status
+#### Show Dashboard Status
 Show dashboards status
 
 ```bash
 cid-cmd status
 ```
+[<img width="558" alt="status" src="https://github.com/aws-samples/aws-cudos-framework-deployment/assets/82834333/cae2015f-0f81-4593-80b3-c67ec1200fcd">](https://www.youtube.com/watch?v=ivr1MoGaApM)
+
+
+
 
 ####  Share QuickSight resources
 ```bash
@@ -83,21 +87,28 @@ cid-cmd share
 ```
 
 #### Initialize Amazon QuickSight
-One time action to intialize Amazon QuickSight Enerprise Edition.
+One time action to initialize Amazon QuickSight Enterprise Edition.
 
 ```bash
-cid-cmd initqs
+cid-cmd init-qs
 ```
 
+#### Initialize CUR
+One time action to initialize Athena table and Crawler from s3 with CUR data.
+
+```bash
+cid-cmd init-cur
+```
 
 #### Delete Dashboard and all dependencies unused by other
 Delete Dashboards and all dependencies unused by other CID-managed dashboards.(including QuickSight datasets, Athena views and tables)
 ```bash
 cid-cmd delete
 ```
+
 #### Delete Command Options:
 ```
- --dashboard-id TEXT QuickSight dashboard id 
+ --dashboard-id TEXT QuickSight dashboard id
  --athena-database TEXT Athena database
  ```
 
@@ -129,10 +140,10 @@ This command generates a SQL file that you can execute. Please mind [Athena Serv
 
 
 ## Cloud Formation
-CID is also provided in a form of CloudFormation telmplates. See detailed instuctions in the [Well Architected Labs](https://wellarchitectedlabs.com/cost/200_labs/200_cloud_intelligence/cost-usage-report-dashboards/dashboards/deploy_dashboards/) site.
+CID is also provided in a form of CloudFormation templates. See detailed instructions in the [Well Architected Labs](https://wellarchitectedlabs.com/cost/200_labs/200_cloud_intelligence/cost-usage-report-dashboards/dashboards/deploy_dashboards/) site.
 
 ## Terraform
-CID offers a set of Terraform modules to deploy CUR replicaion and CID dashboards. These modules act as a wrapper around CloudFormation.
+CID offers a set of Terraform modules to deploy CUR replication and CID dashboards. These modules act as a wrapper around CloudFormation.
 
   1. Create a bucket for consolidating CUR [terraform-modules/cur-setup-destination/](terraform-modules/cur-setup-destination/)
   2. Create a CUR in Payer Account(s) [terraform-modules/cur-setup-source/](terraform-modules/cur-setup-source/)

cid_cmd-0.3.0/cid/_version.py

@@ -0,0 +1 @@
+__version__ = '0.3.0'

{cid-cmd-0.2.45 → cid_cmd-0.3.0}/cid/base.py

@@ -21,6 +21,12 @@ class CidBase():
     def account_id(self) -> str:
         return self.awsIdentity.get('Account')
 
+    @property
+    def domain(self) -> str:
+        if self.region.startswith('cn-'):
+            return 'amazonaws.cn'
+        return 'aws.amazon.com'
+
     @property
     def awsIdentity(self) -> dict:
         if not self._awsIdentity:

{cid-cmd-0.2.45 → cid_cmd-0.3.0}/cid/builtin/core/data/queries/kpi/last_kpi_tracker_view.sql

@@ -1,4 +1,3 @@
-
 CREATE OR REPLACE VIEW kpi_tracker AS 
 SELECT DISTINCT
 spend_all.billing_period
@@ -87,7 +86,7 @@ LEFT JOIN (
      summary_view
    WHERE (CAST("concat"("year", '-', "month", '-01') AS date) >= ("date_trunc"('month', current_date) - INTERVAL  '3' MONTH))
    GROUP BY 1, 2, 3
-)  spend_all ON (spend_all.linked_account_id = account_id))
+)  spend_all ON (spend_all.linked_account_id = account_id) AND (spend_all.payer_account_id = payer_account_id))
 LEFT JOIN (
    SELECT DISTINCT
      billing_period
@@ -153,7 +152,7 @@ LEFT JOIN (
    FROM
      kpi_instance_all
    GROUP BY 1, 2, 3
-)  instance_all ON ((instance_all.linked_account_id = account_id) AND (instance_all.billing_period = spend_all.billing_period)))
+)  instance_all ON ((instance_all.linked_account_id = account_id) AND (instance_all.billing_period = spend_all.billing_period) AND (instance_all.payer_account_id = spend_all.payer_account_id)))
 LEFT JOIN (
    SELECT DISTINCT
      billing_period
@@ -167,7 +166,7 @@ LEFT JOIN (
    FROM
      kpi_ebs_storage_all
    GROUP BY 1, 2, 3
-)  ebs_all ON ((ebs_all.linked_account_id = account_id) AND (ebs_all.billing_period = spend_all.billing_period)))
+)  ebs_all ON ((ebs_all.linked_account_id = account_id) AND (ebs_all.billing_period = spend_all.billing_period) AND (ebs_all.payer_account_id = spend_all.payer_account_id)))
 LEFT JOIN (
    SELECT DISTINCT
      billing_period
@@ -179,7 +178,7 @@ LEFT JOIN (
    FROM
      kpi_ebs_snap
    GROUP BY 1, 2, 3
-)  snap ON ((snap.linked_account_id = account_id) AND (snap.billing_period = spend_all.billing_period)))
+)  snap ON ((snap.linked_account_id = account_id) AND (snap.billing_period = spend_all.billing_period) AND (snap.payer_account_id = spend_all.payer_account_id)))
 LEFT JOIN (
    SELECT DISTINCT
      billing_period
@@ -191,5 +190,5 @@ LEFT JOIN (
    FROM
      kpi_s3_storage_all
    GROUP BY 1, 2, 3
-)  s3_all ON ((s3_all.linked_account_id = account_id) AND (s3_all.billing_period = spend_all.billing_period)))
+)  s3_all ON ((s3_all.linked_account_id = account_id) AND (s3_all.billing_period = spend_all.billing_period) AND (s3_all.payer_account_id = spend_all.payer_account_id)))
 WHERE (spend_all.billing_period >= ("date_trunc"('month', current_timestamp) - INTERVAL  '3' MONTH))

cid_cmd-0.3.0/cid/builtin/core/data/queries/shared/cur.yaml

@@ -0,0 +1,89 @@
+DatabaseName: "${athena_database_name}"
+TableInput:
+  Name: "${athenaTableName}"
+  Owner: owner
+  Retention: 0
+  TableType: EXTERNAL_TABLE
+  Parameters:
+    compressionType: none
+    classification: parquet
+    UPDATED_BY_CRAWLER: CidCurCrawler # Hard coded Crawler Name
+  StorageDescriptor:
+    BucketColumns: []
+    Compressed: false
+    Location: "${location}"
+    NumberOfBuckets: -1
+    InputFormat: org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat
+    OutputFormat: org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat
+    SerdeInfo:
+      Parameters:
+        serialization.format: '1'
+      SerializationLibrary: org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe
+    StoredAsSubDirectories: false
+    Columns: # All fields required for CID
+      - {"Name": "bill_bill_type", "Type": "string" }
+      - {"Name": "bill_billing_entity", "Type": "string" }
+      - {"Name": "bill_billing_period_end_date", "Type": "timestamp" }
+      - {"Name": "bill_billing_period_start_date", "Type": "timestamp" }
+      - {"Name": "bill_invoice_id", "Type": "string" }
+      - {"Name": "bill_payer_account_id", "Type": "string" }
+      - {"Name": "identity_line_item_id", "Type": "string" }
+      - {"Name": "identity_time_interval", "Type": "string" }
+      - {"Name": "line_item_availability_zone", "Type": "string" }
+      - {"Name": "line_item_legal_entity", "Type": "string" }
+      - {"Name": "line_item_line_item_description", "Type": "string" }
+      - {"Name": "line_item_line_item_type", "Type": "string" }
+      - {"Name": "line_item_operation", "Type": "string" }
+      - {"Name": "line_item_product_code", "Type": "string" }
+      - {"Name": "line_item_resource_id", "Type": "string" }
+      - {"Name": "line_item_unblended_cost", "Type": "double" }
+      - {"Name": "line_item_usage_account_id", "Type": "string" }
+      - {"Name": "line_item_usage_amount", "Type": "double" }
+      - {"Name": "line_item_usage_end_date", "Type": "timestamp" }
+      - {"Name": "line_item_usage_start_date", "Type": "timestamp" }
+      - {"Name": "line_item_usage_type", "Type": "string" }
+      - {"Name": "pricing_lease_contract_length", "Type": "string" }
+      - {"Name": "pricing_offering_class", "Type": "string" }
+      - {"Name": "pricing_public_on_demand_cost", "Type": "double" }
+      - {"Name": "pricing_purchase_option", "Type": "string" }
+      - {"Name": "pricing_term", "Type": "string" }
+      - {"Name": "pricing_unit", "Type": "string" }
+      - {"Name": "product_cache_engine", "Type": "string" }
+      - {"Name": "product_current_generation", "Type": "string" }
+      - {"Name": "product_database_engine", "Type": "string" }
+      - {"Name": "product_deployment_option", "Type": "string" }
+      - {"Name": "product_from_location", "Type": "string" }
+      - {"Name": "product_group", "Type": "string" }
+      - {"Name": "product_instance_type", "Type": "string" }
+      - {"Name": "product_instance_type_family", "Type": "string" }
+      - {"Name": "product_license_model", "Type": "string" }
+      - {"Name": "product_operating_system", "Type": "string" }
+      - {"Name": "product_physical_processor", "Type": "string" }
+      - {"Name": "product_processor_features", "Type": "string" }
+      - {"Name": "product_product_family", "Type": "string" }
+      - {"Name": "product_product_name", "Type": "string" }
+      - {"Name": "product_region", "Type": "string" }
+      - {"Name": "product_servicecode", "Type": "string" }
+      - {"Name": "product_storage", "Type": "string" }
+      - {"Name": "product_tenancy", "Type": "string" }
+      - {"Name": "product_to_location", "Type": "string" }
+      - {"Name": "product_volume_api_name", "Type": "string" }
+      - {"Name": "product_volume_type", "Type": "string" }
+      - {"Name": "reservation_amortized_upfront_fee_for_billing_period", "Type": "double" }
+      - {"Name": "reservation_effective_cost", "Type": "double" }
+      - {"Name": "reservation_end_time", "Type": "string" }
+      - {"Name": "reservation_reservation_a_r_n", "Type": "string" }
+      - {"Name": "reservation_start_time", "Type": "string" }
+      - {"Name": "reservation_unused_amortized_upfront_fee_for_billing_period", "Type": "double" }
+      - {"Name": "reservation_unused_recurring_fee", "Type": "double" }
+      - {"Name": "savings_plan_amortized_upfront_commitment_for_billing_period", "Type": "double" }
+      - {"Name": "savings_plan_end_time", "Type": "string" }
+      - {"Name": "savings_plan_offering_type", "Type": "string" }
+      - {"Name": "savings_plan_payment_option", "Type": "string" }
+      - {"Name": "savings_plan_purchase_term", "Type": "string" }
+      - {"Name": "savings_plan_savings_plan_a_r_n", "Type": "string" }
+      - {"Name": "savings_plan_savings_plan_effective_cost", "Type": "double" }
+      - {"Name": "savings_plan_start_time", "Type": "string" }
+      - {"Name": "savings_plan_total_commitment_to_date", "Type": "double" }
+      - {"Name": "savings_plan_used_commitment", "Type": "double" }
+  PartitionKeys: ${partitions} # can be a list

{cid-cmd-0.2.45 → cid_cmd-0.3.0}/cid/builtin/core/data/resources.yaml

@@ -542,7 +542,7 @@ views:
     File: co/ec2_instance.json
     parameters:
       s3FolderPath:
-        default: 's3://costoptimizationdata{account_id}/compute_optimizer/compute_optimizer_ec2_instance'
+        default: 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ec2_instance'
         description: Compute Optimiser EC2 report S3 path
 
   compute_optimizer_auto_scale_lines:
@@ -550,7 +550,7 @@ views:
     File: co/auto_scale.json
     parameters:
       s3FolderPath:
-        default: 's3://costoptimizationdata{account_id}/compute_optimizer/compute_optimizer_auto_scale'
+        default: 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_auto_scale'
         description: Compute Optimiser auto_scale report S3 path
 
   compute_optimizer_ebs_volume_lines:
@@ -558,7 +558,7 @@ views:
     File: co/ebs_volume.json
     parameters:
       s3FolderPath:
-        default: 's3://costoptimizationdata{account_id}/compute_optimizer/compute_optimizer_ebs_volume'
+        default: 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ebs_volume'
         description: Compute Optimiser EBS report S3 path
 
   compute_optimizer_lambda_lines:
@@ -566,7 +566,7 @@ views:
     File: co/lambda.json
     parameters:
       s3FolderPath:
-        default: 's3://costoptimizationdata{account_id}/compute_optimizer/compute_optimizer_lambda'
+        default: 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_lambda'
         description: Compute Optimiser Lambda report S3 path
 
   compute_optimizer_ec2_instance_options:
@@ -623,6 +623,19 @@ views:
         - aws_accounts
   ta_descriptions:
     File: shared/ta_descriptions.sql
+  cur:
+    type: Glue_Table
+    File: shared/cur.yaml
+    crawler: cur
+    parameters:
+      partitions:
+        type: cur.partitions
+        description: 'comma separated list of CUR partitions ex: ["source_account_id","cur_name_1","cur_name_2","year","month"] ex2: ["year","month"]'
+        default: '[{"Name":"source_account_id","Type":"string"},{"Name":"cur_name_1","Type":"string"},{"Name":"cur_name_2","Type":"string"},{"Name":"year","Type":"string"},{"Name":"month","Type":"string"}]'
+      location:
+        type: cur.location
+        description: 's3 path'
+        default: 's3://cid-{account_id}-shared/cur/'
 
 # Refresh Schedules for QuickSight DataSets
 schedules:
@@ -632,3 +645,45 @@ schedules:
       Interval: DAILY
       TimeOfTheDay: '02:00-05:00'
     RefreshType: FULL_REFRESH
+
+crawlers:
+  cur:
+    data:
+      Name:  'CidCmdCurCrawler'
+      Description: A recurring crawler that keeps your CUR table in Athena up-to-date.
+      Role:  ${crawler_role_arn}
+      DatabaseName: "${athena_database_name}"
+      Targets:
+        S3Targets:
+          - Path: ${location}
+            Exclusions:
+              - '**.json'
+              - '**.yml'
+              - '**.sql'
+              - '**.csv'
+              - '**.csv.metadata'
+              - '**.gz'
+              - '**.zip'
+              - '**/cost_and_usage_data_status/*'
+              - 'aws-programmatic-access-test-object'
+      SchemaChangePolicy:
+        DeleteBehavior: LOG
+      RecrawlPolicy:
+        RecrawlBehavior: CRAWL_EVERYTHING
+      Schedule: cron(0 2 * * ? *)
+      Configuration: |
+        {
+          "Version":1.0,
+          "Grouping": {
+            "TableGroupingPolicy": "CombineCompatibleSchemas"
+          },
+          "CrawlerOutput":{
+            "Tables":{
+              "AddOrUpdateBehavior":"MergeNewColumns"
+            }
+          }
+        }
+    parameters:
+      s3path:
+        default: 's3://cid-{account_id}-cur/cur/'
+        description: CUR path

{cid-cmd-0.2.45 → cid_cmd-0.3.0}/cid/cli.py

@@ -1,4 +1,6 @@
+import os
 import logging
+import platform
 
 import click
 
@@ -14,7 +16,6 @@ prog_name="CLOUD INTELLIGENCE DASHBOARDS (CID) CLI"
 print(f'{prog_name} {version}\n')
 
 if __version__ != latest_version and latest_version != 'UNDEFINED':
-    
     print('\033[93mUPDATE AVAILABLE\033[0m')
     print(f'\033[93mA new version {latest_version} is available, please consider update cid-cmd package via pip\033[0m\n\n')
     logger.info(f'A new version {latest_version} is available, please consider update cid-cmd package via pip')
@@ -67,6 +68,11 @@ def cid_command(func):
 @click.option('-y', '--yes', help='confirm all', is_flag=True, default=False)
 @click.pass_context
 def main(ctx, **kwargs):
+
+    # enable color for windows terminal
+    if platform.system() == "Windows":
+        os.system('color') #nosec B605, B607
+
     ctx.obj = Cid(**kwargs)
 
 
@@ -227,23 +233,48 @@ def cleanup(ctx, **kwargs):
 @cid_command
 def share(ctx, dashboard_id, **kwargs):
     """Share QuickSight resources (Dashboard, Datasets, DataSource)"""
-    
     ctx.obj.share(dashboard_id)
 
 @click.option('-v', '--verbose', count=True)
 @click.option('-y', '--yes', help='confirm all', is_flag=True, default=False)
 @cid_command
-def initqs(ctx, **kwargs):
+def init_qs(ctx, **kwargs):
     """Initialize Amazon QuickSight
 
     \b
-
      --enable-quicksight-enterprise (yes|no) Confirm the activation of QuickSight
-     --account-name NAME                     Unique QuickSight account name (Unique across all AWS users) 
+     --account-name NAME                     Unique QuickSight account name (Unique across all AWS users)
      --notification-email EMAIL              User's email for QuickSight notifications
     """
 
-    ctx.obj.initqs(**kwargs)
+    ctx.obj.init_qs(**kwargs)
+
+@click.option('-v', '--verbose', count=True)
+@cid_command
+def create_cur_table(ctx, **kwargs):
+    """Initialize CUR table
+
+    \b
+     --view-cur-location  s3://BUCKET/PATH   S3 path with CUR data. We support only 2 types of CUR path: 's3://{bucket}/cur' and 's3://{bucket}/{prefix}/{cur_name}/{cur_name}'
+     --crawler-role       ROLE               Name or ARN of crawler role
+    """
+
+    ctx.obj.create_cur_table(**kwargs)
+
+@click.option('-v', '--verbose', count=True)
+@click.option('-y', '--yes', help='confirm all', is_flag=True, default=False)
+@cid_command
+def teardown(ctx, **kwargs):
+    """Delete all CID assets
+
+    \b
+
+    THIS IS VERY DANGEROUS. DO NOT USE IT.
+    """
+
+    ctx.obj.teardown(**kwargs)
 
 if __name__ == '__main__':
     main()
+
+

{cid-cmd-0.2.45 → cid_cmd-0.3.0}/cid/commands/init_qs.py

@@ -1,5 +1,6 @@
 """ Command Init QuickSight
 """
+import re
 import time
 import logging
 
@@ -24,27 +25,27 @@ class InitQsCommand(Command):  # pylint: disable=too-few-public-methods
         self.cid = cid
 
     def execute(self, *args, **kwargs):
-        """Execute the initilization"""
+        """Execute the initialization"""
         self._create_quicksight_enterprise_subscription()
 
     def _create_quicksight_enterprise_subscription(self):
         """Enable QuickSight Enterprise if not enabled already"""
-        cid_print('Analysing QuickSight Status')
+        cid_print('Analyzing QuickSight Status')
         if self.cid.qs.edition(fresh=True) in ('ENTERPRISE', 'ENTERPRISE_AND_Q'):
             cid_print(f'QuickSight Edition is {self.cid.qs.edition()}')
             return
 
         cid_print(
-            '<BOLD><RED>IMPORTANT<END>: <BOLD>Amazion QuickSight Enterprise Edition is required for Cost Intelligence Dashboard. '
-            'This will lead to costs in your AWS account (https://aws.amazon.com/quicksight/pricing/).<END>'
+            '<BOLD><RED>IMPORTANT<END>: <BOLD>Amazon QuickSight Enterprise Edition is required for Cloud Intelligence Dashboards. '
+            'Enabling Amazon QuickSight Enterprise Edition will incur associated service charges. Make sure you aware about them following QuickSight pricing page (https://aws.amazon.com/quicksight/pricing/) and acknowledge by confirming enabling it. Alternatively you can enable QuickSight Enterprise Edition in the AWS console (https://docs.aws.amazon.com/quicksight/latest/user/signing-up.html) and run this command again.<END>'
         )
 
         if not self.cid.all_yes and not get_yesno_parameter(
                 param_name='enable-quicksight-enterprise',
-                message='Please, confirm enabling of Amazion QuickSight Enterprise',
+                message='Please, confirm enabling of Amazon QuickSight Enterprise',
                 default='no'
             ):
-            cid_print('\tInitalization cancelled')
+            cid_print('\tInitialization cancelled')
             return
 
         for counter in range(MAX_ITERATIONS):
@@ -57,6 +58,7 @@ class InitQsCommand(Command):  # pylint: disable=too-few-public-methods
                 'AccountName': account_name,
                 'NotificationEmail': email,
             }
+            cid_print('Initializing Amazon QuickSight in your AWS Account')
             try:
                 response = self.cid.qs.client.create_account_subscription(**params)
                 logger.debug(f'create_account_subscription resp: {response}')
@@ -74,16 +76,19 @@ class InitQsCommand(Command):  # pylint: disable=too-few-public-methods
         cid_print(f'\tQuickSight Edition is {self.cid.qs.edition()}.')
 
     def _get_account_name_for_quicksight(self):
-        """Get the account name for quicksight"""        
+        """Get the account name for quicksight"""
         for _ in range(MAX_ITERATIONS):
+            cid_print('Please, choose a descriptive name for your QuickSight account.')
+            cid_print('This will be used later to share it with your users. For test you can use AWS Account Id. This can NOT be changed later. If you are planning to use IdC stop now and create QuickSight Account in UI.')
             account_name = get_parameter(
                 'account-name',
-                message=(
-                    '\n\tPlease, choose a descriptive name for your QuickSight account. '
-                    'This will be used later to share it with your users. This can NOT be changed later.'
-                ),
+                message='Please enter a unique name [A-Za-z0-9-]',
                 default=self.cid.organizations.get_account_name()
             )
+            if not re.match('[A-Za-z0-9-]', account_name):
+                logger.error('account_name must match [A-Za-z0-9-]')
+                unset_parameter('account-name')
+                continue
             if account_name:
                 return account_name
             print('\t The account name must not be empty. Please, try again.')