Skip to content

Fix CUR 2.0 export query and crawler IAM boundary #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alexanderamiri merged 1 commit into from
Mar 26, 2026
Merged

Fix CUR 2.0 export query and crawler IAM boundary #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions terraform/platform/cost-analytics/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ resource "aws_bcmdataexports_export" "cur" {
name = local.cur_report_name

data_query {
query_statement = "SELECT identity_line_item_id, identity_time_interval, bill_invoice_id, bill_invoicing_entity, bill_billing_entity, bill_bill_type, bill_payer_account_id, bill_billing_period_start_date, bill_billing_period_end_date, line_item_usage_account_id, line_item_line_item_type, line_item_usage_start_date, line_item_usage_end_date, line_item_product_code, line_item_usage_type, line_item_operation, line_item_availability_zone, line_item_resource_id, line_item_usage_amount, line_item_normalization_factor, line_item_normalized_usage_amount, line_item_currency_code, line_item_unblended_rate, line_item_unblended_cost, line_item_blended_rate, line_item_blended_cost, line_item_line_item_description, product_product_name, product_region, pricing_unit, pricing_public_on_demand_cost, pricing_public_on_demand_rate, pricing_term, pricing_offering_class, resource_tags_user_team, resource_tags_user_service, resource_tags_user_environment, resource_tags_user_repo, resource_tags_user_managed_by FROM COST_AND_USAGE_REPORT"
query_statement = "SELECT * FROM COST_AND_USAGE_REPORT"

table_configurations = {
COST_AND_USAGE_REPORT = {
Expand Down Expand Up @@ -196,7 +196,8 @@ resource "aws_glue_catalog_database" "cur" {
}

resource "aws_iam_role" "cur_crawler" {
name = local.crawler_role_name
name = local.crawler_role_name
permissions_boundary = var.org_boundary_arn

assume_role_policy = jsonencode({
Version = "2012-10-17"
Expand Down
7 changes: 6 additions & 1 deletion terraform/platform/cost-analytics/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ variable "billing_alarm_threshold_usd" {
}

variable "account_budget_usd" {
description = "Account-level monthly budget in USD — auto-deny at 100%"
description = "Account-level monthly budget in USD — notifications at 80% and 100%"
type = number
default = 500
}

variable "org_boundary_arn" {
description = "ARN of the org permission boundary (required for all IAM roles)"
type = string
}
1 change: 1 addition & 0 deletions terraform/platform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ module "cost_analytics" {
region = var.region
aws_account_id = var.aws_account_id
alerts_topic_arn = module.monitoring.alerts_topic_arn
org_boundary_arn = module.iam.org_boundary_arn
billing_alarm_threshold_usd = 200
account_budget_usd = 500

Expand Down