cid-cmd 4.2.0__tar.gz → 4.2.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (125) hide show
  1. {cid_cmd-4.2.0/cid_cmd.egg-info → cid_cmd-4.2.1}/PKG-INFO +1 -1
  2. cid_cmd-4.2.1/cid/_version.py +2 -0
  3. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/resources.yaml +4 -2
  4. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/quicksight/dashboard_patching.py +8 -3
  5. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/utils.py +1 -1
  6. {cid_cmd-4.2.0 → cid_cmd-4.2.1/cid_cmd.egg-info}/PKG-INFO +1 -1
  7. cid_cmd-4.2.0/cid/_version.py +0 -2
  8. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/LICENSE +0 -0
  9. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/MANIFEST.in +0 -0
  10. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/README.md +0 -0
  11. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/__init__.py +0 -0
  12. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/base.py +0 -0
  13. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/__init__.py +0 -0
  14. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/__init__.py +0 -0
  15. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/cid/compute.json +0 -0
  16. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/cid/ec2_running_cost.json +0 -0
  17. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/cid/s3_view.json +0 -0
  18. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/cid/summary_view.json +0 -0
  19. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/co/dataset.json +0 -0
  20. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/cudos/hourly_view.json +0 -0
  21. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/cudos/resource_view.json +0 -0
  22. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/kpi/kpi_ebs_snap.json +0 -0
  23. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/kpi/kpi_ebs_storage_all.json +0 -0
  24. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/kpi/kpi_instance_all.json +0 -0
  25. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/kpi/kpi_s3_storage_all.json +0 -0
  26. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/kpi/kpi_tracker.json +0 -0
  27. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/shared/customer_all.json +0 -0
  28. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/tao/dataset.json +0 -0
  29. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/trends/daily_anomaly_detection.json +0 -0
  30. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/trends/monthly_anomaly_detection.json +0 -0
  31. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/datasets/trends/monthly_bill_by_account.json +0 -0
  32. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/permissions/dashboard_permissions.json +0 -0
  33. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/permissions/dashboard_permissions_namespace.json +0 -0
  34. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/permissions/data_set_permissions.json +0 -0
  35. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/permissions/data_source_permissions.json +0 -0
  36. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/permissions/folder_permissions.json +0 -0
  37. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/cid/compute_savings_plan_eligible_spend.sql +0 -0
  38. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/cid/ec2_running_cost.sql +0 -0
  39. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/cid/ri_sp_mapping.sql +0 -0
  40. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/cid/s3.sql +0 -0
  41. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/cid/summary_view.sql +0 -0
  42. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/all_options.sql +0 -0
  43. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/auto_scale.json +0 -0
  44. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/auto_scale_options.sql +0 -0
  45. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/ebs_volume.json +0 -0
  46. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/ebs_volume_options.sql +0 -0
  47. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/ec2_instance.json +0 -0
  48. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/ec2_instance_options.sql +0 -0
  49. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/ecs_service.json +0 -0
  50. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/ecs_service_options.sql +0 -0
  51. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/idle.json +0 -0
  52. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/idle_options.sql +0 -0
  53. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/lambda.json +0 -0
  54. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/lambda_options.sql +0 -0
  55. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/license.json +0 -0
  56. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/license_options.sql +0 -0
  57. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/rds_database.json +0 -0
  58. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/rds_instance_options.sql +0 -0
  59. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/co/rds_storage_options.sql +0 -0
  60. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/cudos/hourly_view.sql +0 -0
  61. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/cudos/resource_view.sql +0 -0
  62. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/kpi/first_kpi_instance_mapping_view.sql +0 -0
  63. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/kpi/kpi_ebs_snap_view.sql +0 -0
  64. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/kpi/kpi_ebs_storage_view.sql +0 -0
  65. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/kpi/kpi_instance_all_view.sql +0 -0
  66. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/kpi/kpi_s3_storage_view.sql +0 -0
  67. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/kpi/last_kpi_tracker_view.sql +0 -0
  68. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/account_map.sql +0 -0
  69. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/account_map_cur2.sql +0 -0
  70. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/account_map_dummy.sql +0 -0
  71. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/aws_accounts.sql +0 -0
  72. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/aws_regions.sql +0 -0
  73. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/aws_service_category_map.sql +0 -0
  74. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/business_units_map.sql +0 -0
  75. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/cur.yaml +0 -0
  76. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/customer_all_unlimited.sql +0 -0
  77. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/payer_account_name_map.sql +0 -0
  78. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/shared/ta_descriptions.sql +0 -0
  79. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/tao/glue_table.json +0 -0
  80. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/tao/ta_org_view.sql +0 -0
  81. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/trends/daily_anomaly_detection.sql +0 -0
  82. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/trends/monthly_anomaly_detection.sql +0 -0
  83. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/builtin/core/data/queries/trends/monthly_bill_by_account.sql +0 -0
  84. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/cli.py +0 -0
  85. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/commands/__init__.py +0 -0
  86. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/commands/command_base.py +0 -0
  87. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/commands/init_qs.py +0 -0
  88. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/common.py +0 -0
  89. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/exceptions.py +0 -0
  90. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/export.py +0 -0
  91. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/__init__.py +0 -0
  92. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/account_map.py +0 -0
  93. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/athena.py +0 -0
  94. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/cloudformation.py +0 -0
  95. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/csv2view.py +0 -0
  96. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/cur.py +0 -0
  97. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/cur_proxy.py +0 -0
  98. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/diff.py +0 -0
  99. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/glue.py +0 -0
  100. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/iam.py +0 -0
  101. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/organizations.py +0 -0
  102. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/parameter_store.py +0 -0
  103. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/quicksight/__init__.py +0 -0
  104. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/quicksight/dashboard.py +0 -0
  105. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/quicksight/dataset.py +0 -0
  106. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/quicksight/datasource.py +0 -0
  107. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/quicksight/definition.py +0 -0
  108. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/quicksight/resource.py +0 -0
  109. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/quicksight/template.py +0 -0
  110. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/quicksight/version.py +0 -0
  111. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/randtime.py +0 -0
  112. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/s3.py +0 -0
  113. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/helpers/timezone.py +0 -0
  114. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/logger.py +0 -0
  115. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/plugin.py +0 -0
  116. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/test/python/test_csv2view.py +0 -0
  117. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/test/python/test_isolated_parameters.py +0 -0
  118. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid/test/python/test_merge.py +0 -0
  119. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid_cmd.egg-info/SOURCES.txt +0 -0
  120. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid_cmd.egg-info/dependency_links.txt +0 -0
  121. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid_cmd.egg-info/entry_points.txt +0 -0
  122. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid_cmd.egg-info/requires.txt +0 -0
  123. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/cid_cmd.egg-info/top_level.txt +0 -0
  124. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/pyproject.toml +0 -0
  125. {cid_cmd-4.2.0 → cid_cmd-4.2.1}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cid-cmd
3
- Version: 4.2.0
3
+ Version: 4.2.1
4
4
  Summary: Cloud Intelligence Dashboards deployment helper tool
5
5
  Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
6
6
  Author: AWS CUDOS Team
@@ -0,0 +1,2 @@
1
+ __version__ = '4.2.1'
2
+
@@ -139,6 +139,7 @@ datasets:
139
139
  - DataExports
140
140
  views:
141
141
  - ec2_running_cost
142
+ - account_map
142
143
  schedules:
143
144
  - default
144
145
  # CID dataset
@@ -149,6 +150,7 @@ datasets:
149
150
  - DataExports
150
151
  views:
151
152
  - compute_savings_plan_eligible_spend
153
+ - account_map
152
154
  schedules:
153
155
  - default
154
156
  # CID dataset
@@ -906,8 +908,8 @@ views:
906
908
  - compute_optimizer_idle_options
907
909
 
908
910
  # Shared views
909
- #account_map:
910
- # File: queries/shared/account_map.sql
911
+ account_map:
912
+ File: queries/shared/account_map.sql
911
913
  business_units_map:
912
914
  File: queries/shared/business_units_map.sql
913
915
  aws_accounts:
@@ -30,6 +30,7 @@ def format_field_name(field_name: str, ignore_prefix: bool=False) -> str:
30
30
  assert format_field_name('account_name') == 'Account Name'
31
31
  assert format_field_name('a_c_r_o_n_y_m') == 'ACRONYM'
32
32
  assert format_field_name('tag_a_c_r_o_n_y_m') == 'Tag ACRONYM'
33
+ assert format_field_name('tag_service') == 'Tag Service'
33
34
  """
34
35
  parts = field_name.split('_')
35
36
  result = []
@@ -47,11 +48,15 @@ def format_field_name(field_name: str, ignore_prefix: bool=False) -> str:
47
48
  result.append(parts[i].title())
48
49
  i += 1
49
50
  title = ' '.join(result)
51
+ title = title.replace('Aws ', 'AWS ')
50
52
  if ignore_prefix:
53
+ new_title = title
51
54
  if title.startswith('Cost Category '):
52
- title = title.replace('Cost Category ', '')
53
- if title.startswith('Tag '):
54
- title = title.replace('Tag ', '')
55
+ new_title = title.replace('Cost Category ', '')
56
+ elif title.startswith('Tag '):
57
+ new_title = title.replace('Tag ', '')
58
+ if title.lower() not in ('service', 'region', 'account'): # leave prefix for special terms
59
+ title = new_title
55
60
  return title
56
61
 
57
62
  def align_grid_position(elements: List[Dict[str, Any]]) -> None:
@@ -305,7 +305,7 @@ def get_parameter(param_name, message, choices=None, default=None, none_as_disab
305
305
  ).execute()
306
306
  else: # it is a text entry
307
307
  if isinstance(default, str) and template_variables:
308
- print(template_variables)
308
+ logger.debug(f'template_variables = {template_variables}')
309
309
  default=default.format(**template_variables)
310
310
  print()
311
311
  if not isatty():
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cid-cmd
3
- Version: 4.2.0
3
+ Version: 4.2.1
4
4
  Summary: Cloud Intelligence Dashboards deployment helper tool
5
5
  Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
6
6
  Author: AWS CUDOS Team
@@ -1,2 +0,0 @@
1
- __version__ = '4.2.0'
2
-
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes