Skip to content

Commit

Permalink
Remove billing_project variable from provider
Browse files Browse the repository at this point in the history
configuration
  • Loading branch information
brettcurtis committed Dec 4, 2023
1 parent 3b857a2 commit 45f7e07
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
1 change: 0 additions & 1 deletion global/infra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ No modules.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_billing_account"></a> [billing\_account](#input\_billing\_account) | The alphanumeric ID of the billing account this project belongs to | `string` | n/a | yes |
| <a name="input_billing_project"></a> [billing\_project](#input\_billing\_project) | The quota project to send in `user_project_override`, used for all requests sent from the provider. If set on a resource that supports sending the resource project, this value will supersede the resource project. This field is ignored if `user_project_override` is set to false or unset | `string` | n/a | yes |
| <a name="input_customer_id"></a> [customer\_id](#input\_customer\_id) | The unique customer ID assigned to you when you signed up for Google Workspace or Cloud Identity. You can look up this ID in your Admin console | `string` | n/a | yes |
| <a name="input_folder_iam_policies"></a> [folder\_iam\_policies](#input\_folder\_iam\_policies) | A map of authoritative IAM policies for the folder, replaces any existing policy already attached | <pre>map(object({<br> service = string<br> environment = string<br> bindings = list(object({<br> members = list(string)<br> role = string<br> }))<br> }))</pre> | n/a | yes |
| <a name="input_folder_services"></a> [folder\_services](#input\_folder\_services) | A map of folder services to create | <pre>map(object({<br> display_name = string<br> environments = list(string)<br> monthly_budget_amount = optional(number, 10)<br> parent = string<br> }))</pre> | n/a | yes |
Expand Down
8 changes: 4 additions & 4 deletions global/infra/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ terraform {

# This is only needed during bootstrapping.

provider "google" {
billing_project = var.billing_project
user_project_override = true
}
# provider "google" {
# billing_project = var.billing_project
# user_project_override = true
# }

# IAM Policy Data Source
# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/iam_policy
Expand Down
8 changes: 4 additions & 4 deletions global/infra/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ variable "billing_account" {
# The google_cloud_identity_group resource requires this if you are using User ADCs (Application Default Credentials).
# This is only needed during bootstrapping.

variable "billing_project" {
description = "The quota project to send in `user_project_override`, used for all requests sent from the provider. If set on a resource that supports sending the resource project, this value will supersede the resource project. This field is ignored if `user_project_override` is set to false or unset"
type = string
}
# variable "billing_project" {
# description = "The quota project to send in `user_project_override`, used for all requests sent from the provider. If set on a resource that supports sending the resource project, this value will supersede the resource project. This field is ignored if `user_project_override` is set to false or unset"
# type = string
# }

variable "customer_id" {
description = "The unique customer ID assigned to you when you signed up for Google Workspace or Cloud Identity. You can look up this ID in your Admin console"
Expand Down

0 comments on commit 45f7e07

Please sign in to comment.