mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-01 16:21:06 +00:00
use google_project_service for tests that enable the compute api (#1464)
This commit is contained in:
parent
d78725f866
commit
93689454f6
@ -212,9 +212,9 @@ resource "google_project" "project" {
|
|||||||
billing_account = "%s"
|
billing_account = "%s"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_project_services" "services" {
|
resource "google_project_service" "compute" {
|
||||||
project = "${google_project.project.project_id}"
|
project = "${google_project.project.project_id}"
|
||||||
services = ["compute.googleapis.com"]
|
service = "compute.googleapis.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_compute_project_metadata" "fizzbuzz" {
|
resource "google_compute_project_metadata" "fizzbuzz" {
|
||||||
@ -223,7 +223,7 @@ resource "google_compute_project_metadata" "fizzbuzz" {
|
|||||||
banana = "orange"
|
banana = "orange"
|
||||||
sofa = "darwinism"
|
sofa = "darwinism"
|
||||||
}
|
}
|
||||||
depends_on = ["google_project_services.services"]
|
depends_on = ["google_project_service.compute"]
|
||||||
}`, projectID, name, org, billing)
|
}`, projectID, name, org, billing)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -236,9 +236,9 @@ resource "google_project" "project" {
|
|||||||
billing_account = "%s"
|
billing_account = "%s"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_project_services" "services" {
|
resource "google_project_service" "compute" {
|
||||||
project = "${google_project.project.project_id}"
|
project = "${google_project.project.project_id}"
|
||||||
services = ["compute.googleapis.com"]
|
service = "compute.googleapis.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_compute_project_metadata" "fizzbuzz" {
|
resource "google_compute_project_metadata" "fizzbuzz" {
|
||||||
@ -247,7 +247,7 @@ resource "google_compute_project_metadata" "fizzbuzz" {
|
|||||||
kiwi = "papaya"
|
kiwi = "papaya"
|
||||||
finches = "darwinism"
|
finches = "darwinism"
|
||||||
}
|
}
|
||||||
depends_on = ["google_project_services.services"]
|
depends_on = ["google_project_service.compute"]
|
||||||
}`, projectID, name, org, billing)
|
}`, projectID, name, org, billing)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -260,9 +260,9 @@ resource "google_project" "project" {
|
|||||||
billing_account = "%s"
|
billing_account = "%s"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_project_services" "services" {
|
resource "google_project_service" "compute" {
|
||||||
project = "${google_project.project.project_id}"
|
project = "${google_project.project.project_id}"
|
||||||
services = ["compute.googleapis.com"]
|
service = "compute.googleapis.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_compute_project_metadata" "fizzbuzz" {
|
resource "google_compute_project_metadata" "fizzbuzz" {
|
||||||
@ -272,7 +272,7 @@ resource "google_compute_project_metadata" "fizzbuzz" {
|
|||||||
genghis_khan = "french bread"
|
genghis_khan = "french bread"
|
||||||
happy = "smiling"
|
happy = "smiling"
|
||||||
}
|
}
|
||||||
depends_on = ["google_project_services.services"]
|
depends_on = ["google_project_service.compute"]
|
||||||
}`, projectID, name, org, billing)
|
}`, projectID, name, org, billing)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -285,9 +285,9 @@ resource "google_project" "project" {
|
|||||||
billing_account = "%s"
|
billing_account = "%s"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_project_services" "services" {
|
resource "google_project_service" "compute" {
|
||||||
project = "${google_project.project.project_id}"
|
project = "${google_project.project.project_id}"
|
||||||
services = ["compute.googleapis.com"]
|
service = "compute.googleapis.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_compute_project_metadata" "fizzbuzz" {
|
resource "google_compute_project_metadata" "fizzbuzz" {
|
||||||
@ -297,6 +297,6 @@ resource "google_compute_project_metadata" "fizzbuzz" {
|
|||||||
paris = "french bread"
|
paris = "french bread"
|
||||||
happy = "laughing"
|
happy = "laughing"
|
||||||
}
|
}
|
||||||
depends_on = ["google_project_services.services"]
|
depends_on = ["google_project_service.compute"]
|
||||||
}`, projectID, name, org, billing)
|
}`, projectID, name, org, billing)
|
||||||
}
|
}
|
||||||
|
@ -109,25 +109,25 @@ resource "google_project" "service" {
|
|||||||
billing_account = "%s"
|
billing_account = "%s"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_project_services" "host" {
|
resource "google_project_service" "host" {
|
||||||
project = "${google_project.host.project_id}"
|
project = "${google_project.host.project_id}"
|
||||||
services = ["compute.googleapis.com"]
|
service = "compute.googleapis.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_project_services" "service" {
|
resource "google_project_service" "service" {
|
||||||
project = "${google_project.service.project_id}"
|
project = "${google_project.service.project_id}"
|
||||||
services = ["compute.googleapis.com"]
|
service = "compute.googleapis.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_compute_shared_vpc_host_project" "host" {
|
resource "google_compute_shared_vpc_host_project" "host" {
|
||||||
project = "${google_project.host.project_id}"
|
project = "${google_project.host.project_id}"
|
||||||
depends_on = ["google_project_services.host"]
|
depends_on = ["google_project_service.host"]
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_compute_shared_vpc_service_project" "service" {
|
resource "google_compute_shared_vpc_service_project" "service" {
|
||||||
host_project = "${google_project.host.project_id}"
|
host_project = "${google_project.host.project_id}"
|
||||||
service_project = "${google_project.service.project_id}"
|
service_project = "${google_project.service.project_id}"
|
||||||
depends_on = ["google_compute_shared_vpc_host_project.host", "google_project_services.service"]
|
depends_on = ["google_compute_shared_vpc_host_project.host", "google_project_service.service"]
|
||||||
}`, hostProject, hostProject, org, billing, serviceProject, serviceProject, org, billing)
|
}`, hostProject, hostProject, org, billing, serviceProject, serviceProject, org, billing)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -147,14 +147,14 @@ resource "google_project" "service" {
|
|||||||
billing_account = "%s"
|
billing_account = "%s"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_project_services" "host" {
|
resource "google_project_service" "host" {
|
||||||
project = "${google_project.host.project_id}"
|
project = "${google_project.host.project_id}"
|
||||||
services = ["compute.googleapis.com"]
|
service = "compute.googleapis.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_project_services" "service" {
|
resource "google_project_service" "service" {
|
||||||
project = "${google_project.service.project_id}"
|
project = "${google_project.service.project_id}"
|
||||||
services = ["compute.googleapis.com"]
|
service = "compute.googleapis.com"
|
||||||
}
|
}
|
||||||
`, hostProject, hostProject, org, billing, serviceProject, serviceProject, org, billing)
|
`, hostProject, hostProject, org, billing, serviceProject, serviceProject, org, billing)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user