Skip to content
This repository has been archived by the owner on Mar 10, 2024. It is now read-only.

Commit

Permalink
add http media_link url for resume as output, differentiate name form…
Browse files Browse the repository at this point in the history
… reume_gs_url for use wiht the gsutil CLI
  • Loading branch information
dpgraham4401 committed Sep 14, 2023
1 parent 57ad87f commit 927bd80
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 13 deletions.
11 changes: 8 additions & 3 deletions dev/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ output "bucket_url" {
value = module.storage.bucket_url
}

output "resume_url" {
description = "The URL of my resume object for use with the gsutil command"
value = module.storage.resume_url
output "resume_gs_url" {
description = "The Google Cloud Storage URL of the resume object for use with the gsutil command"
value = module.storage.resume_gs_url
}

output "resume_http_url" {
description = "The media link HTTP URL of the resume PDF object"
value = module.storage.resume_http_url
}

4 changes: 2 additions & 2 deletions global/folders/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module "common" {
version = "~> 3.2"

parent = "organizations/${var.org_id}"
names = [
names = [
"Common",
]
}
Expand All @@ -15,7 +15,7 @@ module "envs" {
version = "~> 3.2"

parent = "organizations/${var.org_id}"
names = [
names = [
"Production",
"Non-Production",
"Development",
Expand Down
2 changes: 1 addition & 1 deletion global/iam.tf
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ module "gh_oidc_dev" {
pool_id = var.pool_id
provider_id = "github"
pool_description = "A pool of identities to be used by GitHub Actions workflow runners"
sa_mapping = {
sa_mapping = {
# "cloud_run_service_account" = {
# sa_name = google_service_account.cloud_run_sa.name
# attribute = "attribute.repository/${var.github_org}/dpgraham-client"
Expand Down
6 changes: 3 additions & 3 deletions modules/sql/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ resource "google_sql_database_instance" "default" {
retention_unit = "COUNT"
}

enabled = local.backup_enabled
enabled = local.backup_enabled
# location = "us"
point_in_time_recovery_enabled = local.backup_enabled
start_time = "12:00"
Expand Down Expand Up @@ -78,8 +78,8 @@ resource "google_compute_global_address" "private_ip_range" {
}

resource "google_service_networking_connection" "sql_vpc_connection" {
network = var.vpc
service = "servicenetworking.googleapis.com"
network = var.vpc
service = "servicenetworking.googleapis.com"
reserved_peering_ranges = [
google_compute_global_address.private_ip_range.name
]
Expand Down
16 changes: 12 additions & 4 deletions modules/storage/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
output "storage_bucket_name" {
value = google_storage_bucket.default.name
description = "The name of the Google Cloud bucket. has a UUID appended to the name passed in to ensure uniqueness"
value = google_storage_bucket.default.name
}

output "bucket_url" {
value = google_storage_bucket.default.url
description = "The Cloud Storage URL of the content bucket"
value = google_storage_bucket.default.url
}

output "resume_url" {
value = "${google_storage_bucket.default.url}/${google_storage_bucket_object.resume.name}"
output "resume_gs_url" {
description = "The Google Cloud Storage URL of the resume object"
value = "${google_storage_bucket.default.url}/${google_storage_bucket_object.resume.name}"
}

output "resume_http_url" {
description = "The HTTP URL of the resume object"
value = google_storage_bucket_object.resume.media_link
}

0 comments on commit 927bd80

Please sign in to comment.