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.

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

Add example, tests and fix for Google APIs PSC endpoint #2369

Merged
merged 2 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions modules/net-address/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,25 @@ module "addresses" {
# tftest modules=2 resources=3 fixtures=fixtures/cloudsql-instance.tf inventory=psc-service-attachment.yaml e2e
```

Specify `vpc-sc` or `all-apis` in `psc_service_attachment_link` to targe Google APIs.
```hcl
module "addresses" {
source = "./fabric/modules/net-address"
project_id = var.project_id
psc_addresses = {
googleapis = {
address = "10.0.32.32"
network = var.vpc.self_link
service_attachment = {
psc_service_attachment_link = "all-apis"
}
}
}
}
# tftest modules=1 resources=2 inventory=psc-service-attachment-all-apis.yaml e2e
```



### IPSec Interconnect addresses

Expand Down
2 changes: 1 addition & 1 deletion modules/net-address/psc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ resource "google_compute_global_forwarding_rule" "psc_consumer" {
for_each = { for name, psc in local.global_psc : name => psc if psc.service_attachment != null }
name = coalesce(each.value.name, each.key)
project = var.project_id
subnetwork = each.value.subnet_self_link
network = each.value.network
ip_address = google_compute_global_address.psc[each.key].self_link
load_balancing_scheme = ""
target = each.value.service_attachment.psc_service_attachment_link
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Copyright 2024 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

values:
module.addresses.google_compute_global_address.psc["googleapis"]:
address: 10.0.32.32
address_type: INTERNAL
description: Terraform managed.
name: googleapis
network: projects/xxx/global/networks/aaa
project: project-id
purpose: PRIVATE_SERVICE_CONNECT
module.addresses.google_compute_global_forwarding_rule.psc_consumer["googleapis"]:
load_balancing_scheme: ''
metadata_filters: []
name: googleapis
network: projects/xxx/global/networks/aaa
port_range: null
project: project-id
source_ip_ranges: null
target: all-apis

counts:
google_compute_global_address: 1
google_compute_global_forwarding_rule: 1
modules: 1
resources: 2
Loading