Skip to content

Fix failed tests related to google_service_networking_connection #540

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
modular-magician merged 1 commit into from
Sep 21, 2023
Merged

Fix failed tests related to google_service_networking_connection #540

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
10 changes: 5 additions & 5 deletions cloudbuild_bitbucket_server_config_peered_network/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ resource "google_project_service" "servicenetworking" {
service = "servicenetworking.googleapis.com"
disable_on_destroy = false
}
data "google_compute_network" "vpc_network" {

resource "google_compute_network" "vpc_network" {
name = "vpc-network-${local.name_suffix}"
depends_on = [google_project_service.servicenetworking]
}
Expand All @@ -15,11 +15,11 @@ resource "google_compute_global_address" "private_ip_alloc" {
purpose = "VPC_PEERING"
address_type = "INTERNAL"
prefix_length = 16
network = data.google_compute_network.vpc_network.id
network = google_compute_network.vpc_network.id
}

resource "google_service_networking_connection" "default" {
network = data.google_compute_network.vpc_network.id
network = google_compute_network.vpc_network.id
service = "servicenetworking.googleapis.com"
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
depends_on = [google_project_service.servicenetworking]
Expand All @@ -36,7 +36,7 @@ resource "google_cloudbuild_bitbucket_server_config" "bbs-config-with-peered-net
}
username = "test"
api_key = "<api-key>"
peered_network = replace(data.google_compute_network.vpc_network.id, data.google_project.project.name, data.google_project.project.number)
peered_network = replace(google_compute_network.vpc_network.id, data.google_project.project.name, data.google_project.project.number)
ssl_ca = "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n"
depends_on = [google_service_networking_connection.default]
}
8 changes: 4 additions & 4 deletions tpu_node_full/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ resource "google_tpu_node" "tpu" {
}
}

data "google_compute_network" "network" {
name = "default"
resource "google_compute_network" "network" {
name = "tpu-node-network-${local.name_suffix}"
}

resource "google_compute_global_address" "service_range" {
name = "my-global-address-${local.name_suffix}"
purpose = "VPC_PEERING"
address_type = "INTERNAL"
prefix_length = 16
network = data.google_compute_network.network.id
network = google_compute_network.network.id
}

resource "google_service_networking_connection" "private_service_connection" {
network = data.google_compute_network.network.id
network = google_compute_network.network.id
service = "servicenetworking.googleapis.com"
reserved_peering_ranges = [google_compute_global_address.service_range.name]
}
8 changes: 4 additions & 4 deletions vertex_ai_index_endpoint/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ resource "google_vertex_ai_index_endpoint" "index_endpoint" {
labels = {
label-one = "value-one"
}
network = "projects/${data.google_project.project.number}/global/networks/${data.google_compute_network.vertex_network.name}"
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.vertex_network.name}"
depends_on = [
google_service_networking_connection.vertex_vpc_connection
]
}

resource "google_service_networking_connection" "vertex_vpc_connection" {
network = data.google_compute_network.vertex_network.id
network = google_compute_network.vertex_network.id
service = "servicenetworking.googleapis.com"
reserved_peering_ranges = [google_compute_global_address.vertex_range.name]
}
Expand All @@ -22,10 +22,10 @@ resource "google_compute_global_address" "vertex_range" {
purpose = "VPC_PEERING"
address_type = "INTERNAL"
prefix_length = 24
network = data.google_compute_network.vertex_network.id
network = google_compute_network.vertex_network.id
}

data "google_compute_network" "vertex_network" {
resource "google_compute_network" "vertex_network" {
name = "network-name-${local.name_suffix}"
}

Expand Down