Skip to content

Commit 3a3da48

Browse files
committed
Use self link in service networking connection
This commit adds a network data source to the private_service_access submodule and uses that data source to obtain the required network attributes. This change fixes the following issue: > Error: Provider produced inconsistent final plan > > When expanding the plan for > module.private-service-access.google_service_networking_connection.private_service_access > to include new values learned so far during apply, provider "google-beta" > produced an invalid new value for .network: was > cty.StringVal("test-vpc-private-access"), but now > cty.StringVal("https://www.googleapis.com/compute/v1/projects/test-project/global/networks/test-vpc-private-access"). > > This is a bug in the provider, which should be reported in the provider's own > issue tracker.
1 parent e5a34c0 commit 3a3da48

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ project adheres to [Semantic Versioning](http://semver.org/).
1616

1717
- the root module has been deprecated [#56]
1818

19+
### Fixed
20+
21+
- The network reference in the `private_service_access` module uses the self link. [#61]
22+
1923
## [1.2.0] - 2019-07-30
2024

2125
## [1.1.2] - 2019-06-14
@@ -36,5 +40,6 @@ project adheres to [Semantic Versioning](http://semver.org/).
3640
[1.0.1]: https://github.com/terraform-google-modules/terraform-google-sql-db/compare/1.0.0...1.0.1
3741
[1.0.0]: https://github.com/terraform-google-modules/terraform-google-sql-db/releases/tag/1.0.0
3842

43+
[#61]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/61
3944
[#56]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/56
4045
[#43]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/43

modules/private_service_access/main.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,33 @@
1414
* limitations under the License.
1515
*/
1616

17+
data "google_compute_network" "main" {
18+
name = "${var.vpc_network}"
19+
20+
project = "${var.project_id}"
21+
}
22+
1723
// We define a VPC peering subnet that will be peered with the
1824
// Cloud SQL instance network. The Cloud SQL instance will
1925
// have a private IP within the provided range.
2026
// https://cloud.google.com/vpc/docs/configure-private-services-access
2127
resource "google_compute_global_address" "google-managed-services-range" {
2228
provider = "google-beta"
2329
project = "${var.project_id}"
24-
name = "google-managed-services-${var.vpc_network}"
30+
name = "google-managed-services-${data.google_compute_network.main.name}"
2531
purpose = "VPC_PEERING"
2632
address = "${var.address}"
2733
prefix_length = "${var.prefix_length}"
2834
ip_version = "${var.ip_version}"
2935
labels = "${var.labels}"
3036
address_type = "INTERNAL"
31-
network = "${var.vpc_network}"
37+
network = "${data.google_compute_network.main.self_link}"
3238
}
3339

3440
# Creates the peering with the producer network.
3541
resource "google_service_networking_connection" "private_service_access" {
3642
provider = "google-beta"
37-
network = "${google_compute_global_address.google-managed-services-range.network}"
43+
network = "${data.google_compute_network.main.self_link}"
3844
service = "servicenetworking.googleapis.com"
3945
reserved_peering_ranges = ["${google_compute_global_address.google-managed-services-range.name}"]
4046
}

0 commit comments

Comments
 (0)