Removed duplicated directory

Author: marcodb-aws

data-collection/deploy/terraform/README.md

@@ -24,21 +24,20 @@ This module deploys the necessary IAM roles to each linked account for monitorin
 
 - Creates standardized IAM roles across member accounts
 - Configures granular permissions for various data collection features
-- Supports multiple optional monitoring components:
-  - Trusted Advisor
-  - Support Cases
-  - AWS Budgets
-  - Inventory Collection
-  - ECS Chargeback
-  - RDS Utilization
-  - Transit Gateway
-  - Service Quotas
-
 
 ### 3. Data Collection Module
 
 This module orchestrates the data collection process and deploys CloudFormation template for data collection as a wrapper
 
+## Version Locking
+
+For production deployments, you should lock module versions to a release tag to better control when and what updates are made.
+Use "*tag_version*" variable to select a release tag.
+```bash
+tag_version = "3.6.2"
+```
+
+For a complete list of release tags, visit [https://github.com/awslabs/cid-data-collection-framework/tags]https://github.com/awslabs/cid-data-collection-framework/tags.
 
 ## Deployment Process
 
@@ -102,4 +101,14 @@ Common issues and solutions:
 3. **Data Collection Failures**
    - Verify S3 bucket permissions
    - Check CloudWatch Logs for execution errors
-   - Ensure correct role ARNs are being used
+   - Ensure correct role ARNs are being used
+
+## Contributing
+
+Contributions to improve the solution are welcome! Please:
+
+1. Fork the repository
+2. Create a feature branch
+3. Submit a pull request with detailed description of changes
+4. Ensure all existing tests pass
+5. Add new tests as needed

data-collection/deploy/terraform/data-collection/main.tf

@@ -3,7 +3,7 @@ data "aws_caller_identity" "current" {}
 data "aws_partition" "current" {}
 
 locals {
-  template_url = "https://aws-managed-cost-intelligence-dashboards-${data.aws_region.current.name}.s3.amazonaws.com/cfn/data-collection/deploy-data-collection.yaml"
+  template_url = "https://aws-managed-cost-intelligence-dashboards-${data.aws_region.current.name}.s3.amazonaws.com/cfn/${var.tag_version}/data-collection/deploy-data-collection.yaml"
 }
 
 resource "aws_cloudformation_stack" "data_collection" {

data-collection/deploy/terraform/data-collection/terraform.tfvars

@@ -1,5 +1,6 @@
 # Default values for variables
 resource_prefix = "CID-DC-"
+tag_version = "3.6.2"
 
 destination_bucket = "cid-data-"
 management_account_id = "987654321987"  # Required: Add your management account IDs as a comma separated list

data-collection/deploy/terraform/data-collection/variables.tf

@@ -174,3 +174,14 @@ variable "tags" {
   type        = map(string)
   default     = {}
 }
+
+variable "tag_version" {
+  description = "GitHub tag version using for the deployment (e.g. 4.0.7)"
+  type        = string
+  default     = ""
+}
+
+validation {
+  condition     = var.tag_version == "" || can(regex("^\\d+\\.\\d+\\.\\d+$", var.tag_version))
+  error_message = "The tag_version must be in the format X.Y.Z where X, Y, and Z are digits (e.g., 4.0.7)"
+}

data-collection/deploy/terraform/management-accounts/main.tf

@@ -2,7 +2,7 @@ data "aws_region" "current" {}
 data "aws_partition" "current" {}
 
 locals {
-  template_url = "https://aws-managed-cost-intelligence-dashboards-${data.aws_region.current.name}.s3.amazonaws.com/cfn/data-collection/deploy-in-management-account.yaml"
+  template_url = "https://aws-managed-cost-intelligence-dashboards-${data.aws_region.current.name}.s3.amazonaws.com/cfn/${var.tag_version}/data-collection/deploy-in-management-account.yaml"
 }
 
 # Management account IAM role deployment

data-collection/deploy/terraform/management-accounts/terraform.tfvars

@@ -1,6 +1,7 @@
 resource_prefix = "CID-DC-"
 management_account_role = "Lambda-Assume-Role-Management-Account"
 data_collection_account_id = "123456789123"
+tag_version = "3.6.2"
 
 # Module flags
 backup_module = "yes"

data-collection/deploy/terraform/management-accounts/variables.tf

@@ -62,3 +62,14 @@ variable "service_quotas_module" {
   type        = string
   default     = "no"
 }
+
+variable "tag_version" {
+  description = "GitHub tag version using for the deployment (e.g. 4.0.7)"
+  type        = string
+  default     = ""
+}
+
+validation {
+  condition     = var.tag_version == "" || can(regex("^\\d+\\.\\d+\\.\\d+$", var.tag_version))
+  error_message = "The tag_version must be in the format X.Y.Z where X, Y, and Z are digits (e.g., 4.0.7)"
+}