Skip to content
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

Jump to bottom

Update project ID and number references #200

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Update project ID and number references #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5b8d83
Update project ID and number references
brettcurtis Sep 20, 2024
17c7342
Update project ID and number references
brettcurtis Sep 20, 2024
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
26 changes: 13 additions & 13 deletions .terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ Links to documentation and other resources required to develop and iterate in th

| Name | Version |
|------|---------|
| google | 5.39.1 |
| google | 6.3.0 |

#### Modules

| Name | Source | Version |
|------|--------|---------|
| datadog | github.com/osinfra-io/terraform-datadog-google-integration | v0.2.1 |
| project | github.com/osinfra-io/terraform-google-project | v0.3.0 |
| datadog | github.com/osinfra-io/terraform-datadog-google-integration | v0.3.0 |
| project | github.com/osinfra-io/terraform-google-project | v0.4.0 |

#### Resources

Expand Down
6 changes: 3 additions & 3 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module "datadog" {
is_cspm_enabled = true
is_security_command_center_enabled = true
labels = local.labels
project = module.project.project_id
project = module.project.id
}

# Google Project Module (osinfra.io)
Expand Down Expand Up @@ -78,7 +78,7 @@ resource "google_iam_workload_identity_pool" "this" {
description = "Workload Identity Pool for ${each.value.display_name}"
disabled = lookup(each.value, "disabled", false)
display_name = each.value.display_name
project = module.project.project_id
project = module.project.id
workload_identity_pool_id = each.key
}

Expand All @@ -93,7 +93,7 @@ resource "google_iam_workload_identity_pool_provider" "this" {
description = "Workload Identity Pool Provider for ${each.value.display_name}"
disabled = lookup(each.value, "disabled", false)
display_name = "${each.value.display_name} OIDC"
project = module.project.project_id
project = module.project.id
workload_identity_pool_id = google_iam_workload_identity_pool.this[each.key].workload_identity_pool_id
workload_identity_pool_provider_id = "${each.key}-oidc"

Expand Down
4 changes: 2 additions & 2 deletions outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

output "project_number" {
description = "The project number"
value = module.project.project_number
value = module.project.number
}

output "project_id" {
description = "The project ID"
value = module.project.project_id
value = module.project.id
}

output "workload_identity_pool_names" {
Expand Down