mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-03 01:01:06 +00:00
Merge pull request #1917 from terraform-providers/paddy_debian_resolve_image
Fix the last of the debian-8 updates.
This commit is contained in:
commit
cd32fdfad4
@ -63,12 +63,17 @@ func testAccCheckComputeImageResolution(n string) resource.TestCheckFunc {
|
||||
family := rs.Primary.Attributes["family"]
|
||||
link := rs.Primary.Attributes["self_link"]
|
||||
|
||||
latestDebian, err := config.clientCompute.Images.GetFromFamily("debian-cloud", "debian-9").Do()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error retrieving latest debian: %s", err)
|
||||
}
|
||||
|
||||
images := map[string]string{
|
||||
"family/debian-8": "projects/debian-cloud/global/images/family/debian-8",
|
||||
"projects/debian-cloud/global/images/debian-8-jessie-v20170110": "projects/debian-cloud/global/images/debian-8-jessie-v20170110",
|
||||
"debian-8": "projects/debian-cloud/global/images/family/debian-8",
|
||||
"debian-8-jessie-v20170110": "projects/debian-cloud/global/images/debian-8-jessie-v20170110",
|
||||
"https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-8-jessie-v20170110": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-8-jessie-v20170110",
|
||||
"family/" + latestDebian.Family: "projects/debian-cloud/global/images/family/" + latestDebian.Family,
|
||||
"projects/debian-cloud/global/images/" + latestDebian.Name: "projects/debian-cloud/global/images/" + latestDebian.Name,
|
||||
latestDebian.Family: "projects/debian-cloud/global/images/family/" + latestDebian.Family,
|
||||
latestDebian.Name: "projects/debian-cloud/global/images/" + latestDebian.Name,
|
||||
latestDebian.SelfLink: latestDebian.SelfLink,
|
||||
|
||||
"global/images/" + name: "global/images/" + name,
|
||||
"global/images/family/" + family: "global/images/family/" + family,
|
||||
@ -95,10 +100,15 @@ func testAccCheckComputeImageResolution(n string) resource.TestCheckFunc {
|
||||
|
||||
func testAccComputeImage_resolving(name, family string) string {
|
||||
return fmt.Sprintf(`
|
||||
data "google_compute_image" "my_image" {
|
||||
family = "debian-9"
|
||||
project = "debian-cloud"
|
||||
}
|
||||
|
||||
resource "google_compute_disk" "foobar" {
|
||||
name = "%s"
|
||||
zone = "us-central1-a"
|
||||
image = "debian-8-jessie-v20160803"
|
||||
image = "${data.google_compute_image.my_image.self_link}"
|
||||
}
|
||||
resource "google_compute_image" "foobar" {
|
||||
name = "%s"
|
||||
|
Loading…
Reference in New Issue
Block a user