cid-cmd 4.4.0__tar.gz → 4.4.2__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 (123) hide show
  1. {cid_cmd-4.4.0/cid_cmd.egg-info → cid_cmd-4.4.2}/PKG-INFO +1 -1
  2. cid_cmd-4.4.2/cid/_version.py +2 -0
  3. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/common.py +1 -1
  4. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/cur.py +1 -1
  5. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/dashboard_patching.py +2 -1
  6. {cid_cmd-4.4.0 → cid_cmd-4.4.2/cid_cmd.egg-info}/PKG-INFO +1 -1
  7. cid_cmd-4.4.0/cid/_version.py +0 -2
  8. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/LICENSE +0 -0
  9. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/MANIFEST.in +0 -0
  10. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/README.md +0 -0
  11. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/__init__.py +0 -0
  12. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/base.py +0 -0
  13. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/__init__.py +0 -0
  14. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/__init__.py +0 -0
  15. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/cid/compute.json +0 -0
  16. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/cid/ec2_running_cost.json +0 -0
  17. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/cid/s3_view.json +0 -0
  18. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/cid/summary_view.json +0 -0
  19. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/co/dataset.json +0 -0
  20. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/cudos/hourly_view.json +0 -0
  21. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/cudos/resource_view.json +0 -0
  22. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/kpi/kpi_ebs_snap.json +0 -0
  23. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/kpi/kpi_ebs_storage_all.json +0 -0
  24. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/kpi/kpi_instance_all.json +0 -0
  25. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/kpi/kpi_s3_storage_all.json +0 -0
  26. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/kpi/kpi_tracker.json +0 -0
  27. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/shared/customer_all.json +0 -0
  28. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/trends/daily_anomaly_detection.json +0 -0
  29. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/trends/monthly_anomaly_detection.json +0 -0
  30. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/datasets/trends/monthly_bill_by_account.json +0 -0
  31. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/permissions/dashboard_permissions.json +0 -0
  32. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/permissions/dashboard_permissions_namespace.json +0 -0
  33. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/permissions/data_set_permissions.json +0 -0
  34. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/permissions/data_set_rls_permissions.json +0 -0
  35. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/permissions/data_source_permissions.json +0 -0
  36. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/permissions/folder_permissions.json +0 -0
  37. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/cid/compute_savings_plan_eligible_spend.sql +0 -0
  38. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/cid/ec2_running_cost.sql +0 -0
  39. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/cid/ri_sp_mapping.sql +0 -0
  40. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/cid/s3.sql +0 -0
  41. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/cid/summary_view.sql +0 -0
  42. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/all_options.sql +0 -0
  43. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/auto_scale.json +0 -0
  44. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/auto_scale_options.sql +0 -0
  45. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/ebs_volume.json +0 -0
  46. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/ebs_volume_options.sql +0 -0
  47. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/ec2_instance.json +0 -0
  48. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/ec2_instance_options.sql +0 -0
  49. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/ecs_service.json +0 -0
  50. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/ecs_service_options.sql +0 -0
  51. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/idle.json +0 -0
  52. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/idle_options.sql +0 -0
  53. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/lambda.json +0 -0
  54. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/lambda_options.sql +0 -0
  55. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/license.json +0 -0
  56. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/license_options.sql +0 -0
  57. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/rds_database.json +0 -0
  58. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/rds_instance_options.sql +0 -0
  59. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/co/rds_storage_options.sql +0 -0
  60. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/cudos/hourly_view.sql +0 -0
  61. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/cudos/resource_view.sql +0 -0
  62. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/kpi/first_kpi_instance_mapping_view.sql +0 -0
  63. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/kpi/kpi_ebs_snap_view.sql +0 -0
  64. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/kpi/kpi_ebs_storage_view.sql +0 -0
  65. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/kpi/kpi_instance_all_view.sql +0 -0
  66. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/kpi/kpi_s3_storage_view.sql +0 -0
  67. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/kpi/last_kpi_tracker_view.sql +0 -0
  68. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/account_map.sql +0 -0
  69. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/account_map_cur2.sql +0 -0
  70. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/account_map_dummy.sql +0 -0
  71. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/aws_accounts.sql +0 -0
  72. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/aws_regions.sql +0 -0
  73. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/aws_service_category_map.sql +0 -0
  74. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/business_units_map.sql +0 -0
  75. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/cur.yaml +0 -0
  76. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/customer_all_unlimited.sql +0 -0
  77. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/payer_account_name_map.sql +0 -0
  78. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/shared/ta_descriptions.sql +0 -0
  79. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/trends/daily_anomaly_detection.sql +0 -0
  80. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/trends/monthly_anomaly_detection.sql +0 -0
  81. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/queries/trends/monthly_bill_by_account.sql +0 -0
  82. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/core/data/resources.yaml +0 -0
  83. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/cli.py +0 -0
  84. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/commands/__init__.py +0 -0
  85. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/commands/command_base.py +0 -0
  86. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/commands/init_qs.py +0 -0
  87. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/exceptions.py +0 -0
  88. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/export.py +0 -0
  89. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/__init__.py +0 -0
  90. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/account_map.py +0 -0
  91. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/athena.py +0 -0
  92. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/cloudformation.py +0 -0
  93. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/csv2view.py +0 -0
  94. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/cur_proxy.py +0 -0
  95. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/diff.py +0 -0
  96. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/glue.py +0 -0
  97. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/iam.py +0 -0
  98. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/organizations.py +0 -0
  99. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/parameter_store.py +0 -0
  100. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/__init__.py +0 -0
  101. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/dashboard.py +0 -0
  102. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/dataset.py +0 -0
  103. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/datasource.py +0 -0
  104. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/definition.py +0 -0
  105. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/resource.py +0 -0
  106. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/template.py +0 -0
  107. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/version.py +0 -0
  108. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/randtime.py +0 -0
  109. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/s3.py +0 -0
  110. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/timezone.py +0 -0
  111. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/logger.py +0 -0
  112. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/plugin.py +0 -0
  113. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/test/python/test_csv2view.py +0 -0
  114. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/test/python/test_isolated_parameters.py +0 -0
  115. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/test/python/test_merge.py +0 -0
  116. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/utils.py +0 -0
  117. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid_cmd.egg-info/SOURCES.txt +0 -0
  118. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid_cmd.egg-info/dependency_links.txt +0 -0
  119. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid_cmd.egg-info/entry_points.txt +0 -0
  120. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid_cmd.egg-info/requires.txt +0 -0
  121. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid_cmd.egg-info/top_level.txt +0 -0
  122. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/pyproject.toml +0 -0
  123. {cid_cmd-4.4.0 → cid_cmd-4.4.2}/setup.cfg +0 -0
{cid_cmd-4.4.0/cid_cmd.egg-info → cid_cmd-4.4.2}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cid-cmd
3
- Version: 4.4.0
3
+ Version: 4.4.2
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
cid_cmd-4.4.2/cid/_version.py ADDED
@@ -0,0 +1,2 @@
1
+ __version__ = '4.4.2'
2
+
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/common.py RENAMED
@@ -1658,7 +1658,7 @@ class Cid():
1658
1658
  logger.debug(f'dataset {compiled_dataset.get("Name")} resource_tags = {resource_tags}')
1659
1659
  if cur_tags_json_required and resource_tags:
1660
1660
  custom_fields = {
1661
- name: f"parseJson(tags_json, '$.{name}')" # This syntax does not work: $[\"{name}\"]
1661
+ name: f"parseJson(tags_json, '$.{name.strip()}')" # This syntax does not work: $[\"{name}\"]
1662
1662
  for name in resource_tags
1663
1663
  }
1664
1664
  logger.debug(f'custom_fields = {custom_fields}')
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/cur.py RENAMED
@@ -260,7 +260,7 @@ class CUR(AbstractCUR):
260
260
  res, message = self.table_is_cur(table=metadata, return_reason=True)
261
261
  if not res:
262
262
  raise CidCritical(f'Provided cur-table-name "{table}" in database "{cur_database or self.athena.DatabaseName}" is not cur. {message}')
263
- return cur_database, metadata
263
+ return (cur_database or self.athena.DatabaseName), metadata
264
264
 
265
265
  all_cur_tables = []
266
266
  filter_names = None
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/quicksight/dashboard_patching.py RENAMED
@@ -35,7 +35,8 @@ def format_field_name(field_name: str, ignore_prefix: bool=False) -> str:
35
35
  """
36
36
  # Handle lowercase strings without underscores by inserting spaces at word boundaries (mainly for focus)
37
37
  if field_name.islower() and '_' not in field_name:
38
- field_name = re.sub(r'(account|period|discount|unit|price|category|name|id|cost|quantity)', r'_\1', field_name)
38
+ field_name = re.sub( r'(zone|id|name|type|category|unit|price|cost|quantity|start|status|class|description|frequency|currency|period)$', r'_\1', field_name)
39
+ field_name = re.sub(r'^(availability|billing|charge|commitment|consumed|contracted|effective|invoice|list|pricing|provider|publisher|region|resource|service|sku|sub|tags)', r'\1_', field_name)
39
40
  # First, handle camelCase by inserting underscores before uppercase letters
40
41
  field_name = re.sub(r'([a-z])([A-Z])', r'\1_\2', field_name) # This converts "ServiceCode" to "Service_Code"
41
42
  field_name = field_name.lower()
{cid_cmd-4.4.0 → cid_cmd-4.4.2/cid_cmd.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cid-cmd
3
- Version: 4.4.0
3
+ Version: 4.4.2
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
cid_cmd-4.4.0/cid/_version.py DELETED
@@ -1,2 +0,0 @@
1
- __version__ = '4.4.0'
2
-
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/LICENSE RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/MANIFEST.in RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/README.md RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/__init__.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/base.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/builtin/__init__.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/cli.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/commands/init_qs.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/exceptions.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/export.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/__init__.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/athena.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/csv2view.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/diff.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/glue.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/iam.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/randtime.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/s3.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/helpers/timezone.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/logger.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/plugin.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/cid/utils.py RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/pyproject.toml RENAMED
File without changes
{cid_cmd-4.4.0 → cid_cmd-4.4.2}/setup.cfg RENAMED
File without changes