Skip to content

Commit 55b06bf

Browse files
eeatoneeaton
authored
fix(vars): remove additional variables leftover from env monitoring project (terraform-google-modules#1281)
1 parent 822cc42 commit 55b06bf

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

‎2-environments/modules/env_baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
| assured\_workload\_configuration | Assured Workload configuration. See https://cloud.google.com/assured-workloads ."<br> enabled: If the assured workload should be created.<br> location: The location where the workload will be created.<br> display\_name: User-assigned resource display name.<br> compliance\_regime: Supported Compliance Regimes. See https://cloud.google.com/assured-workloads/docs/reference/rest/Shared.Types/ComplianceRegime .<br> resource\_type: The type of resource. One of CONSUMER\_FOLDER, KEYRING, or ENCRYPTION\_KEYS\_PROJECT. | <pre>object({<br> enabled = optional(bool, false)<br> location = optional(string, "us-central1")<br> display_name = optional(string, "FEDRAMP-MODERATE")<br> compliance_regime = optional(string, "FEDRAMP_MODERATE")<br> resource_type = optional(string, "CONSUMER_FOLDER")<br> })</pre> | `{}` | no |
77
| env | The environment to prepare (ex. development) | `string` | n/a | yes |
88
| environment\_code | A short form of the folder level resources (environment) within the Google Cloud organization (ex. d). | `string` | n/a | yes |
9-
| project\_budget | Budget configuration for projects.<br> budget\_amount: The amount to use as the budget.<br> alert\_spent\_percents: A list of percentages of the budget to alert on when threshold is exceeded.<br> alert\_pubsub\_topic: The name of the Cloud Pub/Sub topic where budget related messages will be published, in the form of `projects/{project_id}/topics/{topic_id}`.<br> alert\_spend\_basis: The type of basis used to determine if spend has passed the threshold. Possible choices are `CURRENT_SPEND` or `FORECASTED_SPEND` (default). | <pre>object({<br> base_network_budget_amount = optional(number, 1000)<br> base_network_alert_spent_percents = optional(list(number), [1.2])<br> base_network_alert_pubsub_topic = optional(string, null)<br> base_network_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br> restricted_network_budget_amount = optional(number, 1000)<br> restricted_network_alert_spent_percents = optional(list(number), [1.2])<br> restricted_network_alert_pubsub_topic = optional(string, null)<br> restricted_network_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br> monitoring_budget_amount = optional(number, 1000)<br> monitoring_alert_spent_percents = optional(list(number), [1.2])<br> monitoring_alert_pubsub_topic = optional(string, null)<br> monitoring_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br> secret_budget_amount = optional(number, 1000)<br> secret_alert_spent_percents = optional(list(number), [1.2])<br> secret_alert_pubsub_topic = optional(string, null)<br> secret_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br> kms_budget_amount = optional(number, 1000)<br> kms_alert_spent_percents = optional(list(number), [1.2])<br> kms_alert_pubsub_topic = optional(string, null)<br> kms_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br> })</pre> | `{}` | no |
9+
| project\_budget | Budget configuration for projects.<br> budget\_amount: The amount to use as the budget.<br> alert\_spent\_percents: A list of percentages of the budget to alert on when threshold is exceeded.<br> alert\_pubsub\_topic: The name of the Cloud Pub/Sub topic where budget related messages will be published, in the form of `projects/{project_id}/topics/{topic_id}`.<br> alert\_spend\_basis: The type of basis used to determine if spend has passed the threshold. Possible choices are `CURRENT_SPEND` or `FORECASTED_SPEND` (default). | <pre>object({<br> base_network_budget_amount = optional(number, 1000)<br> base_network_alert_spent_percents = optional(list(number), [1.2])<br> base_network_alert_pubsub_topic = optional(string, null)<br> base_network_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br> restricted_network_budget_amount = optional(number, 1000)<br> restricted_network_alert_spent_percents = optional(list(number), [1.2])<br> restricted_network_alert_pubsub_topic = optional(string, null)<br> restricted_network_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br> secret_budget_amount = optional(number, 1000)<br> secret_alert_spent_percents = optional(list(number), [1.2])<br> secret_alert_pubsub_topic = optional(string, null)<br> secret_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br> kms_budget_amount = optional(number, 1000)<br> kms_alert_spent_percents = optional(list(number), [1.2])<br> kms_alert_pubsub_topic = optional(string, null)<br> kms_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br> })</pre> | `{}` | no |
1010
| remote\_state\_bucket | Backend bucket to load Terraform Remote State Data from previous steps. | `string` | n/a | yes |
1111
| tfc\_org\_name | Name of the TFC organization | `string` | n/a | yes |
1212

‎2-environments/modules/env_baseline/variables.tf

-4
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ variable "project_budget" {
5151
restricted_network_alert_spent_percents = optional(list(number), [1.2])
5252
restricted_network_alert_pubsub_topic = optional(string, null)
5353
restricted_network_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")
54-
monitoring_budget_amount = optional(number, 1000)
55-
monitoring_alert_spent_percents = optional(list(number), [1.2])
56-
monitoring_alert_pubsub_topic = optional(string, null)
57-
monitoring_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")
5854
secret_budget_amount = optional(number, 1000)
5955
secret_alert_spent_percents = optional(list(number), [1.2])
6056
secret_alert_pubsub_topic = optional(string, null)

0 commit comments

Comments
 (0)