ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Google TestAcc to use Debian 8 images

This commit is contained in:
Christoph Blecker 2016-08-18 19:31:45 -07:00
parent e5ba2cb76f
commit a9cc6e2838
No known key found for this signature in database
GPG Key ID: B34A59A9D39F838B
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/google/resource_compute_backend_service_test.go
View File

@ -277,7 +277,7 @@ resource "google_compute_instance_template" "foobar" {
} }
disk { disk {
source_image = "debian-7-wheezy-v20160301" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
boot = true boot = true
} }

2
builtin/providers/google/resource_compute_disk_test.go
View File

@ -81,7 +81,7 @@ func testAccComputeDisk_basic(diskName string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "google_compute_disk" "foobar" { resource "google_compute_disk" "foobar" {
name = "%s" name = "%s"
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
size = 50 size = 50
type = "pd-ssd" type = "pd-ssd"
zone = "us-central1-a" zone = "us-central1-a"

10
builtin/providers/google/resource_compute_instance_group_manager_test.go
View File

@ -277,7 +277,7 @@ func testAccInstanceGroupManager_basic(template, target, igm1, igm2 string) stri
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
source_image = "debian-7-wheezy-v20160301" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
boot = true boot = true
} }
@ -331,7 +331,7 @@ func testAccInstanceGroupManager_update(template, target, igm string) string {
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
source_image = "debian-7-wheezy-v20160301" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
boot = true boot = true
} }
@ -380,7 +380,7 @@ func testAccInstanceGroupManager_update2(template1, target, template2, igm strin
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
source_image = "debian-7-wheezy-v20160301" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
boot = true boot = true
} }
@ -411,7 +411,7 @@ func testAccInstanceGroupManager_update2(template1, target, template2, igm strin
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
source_image = "debian-7-wheezy-v20160301" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
boot = true boot = true
} }
@ -456,7 +456,7 @@ func testAccInstanceGroupManager_updateLifecycle(tag, igm string) string {
tags = ["%s"] tags = ["%s"]
disk { disk {
source_image = "debian-7-wheezy-v20160301" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
boot = true boot = true
} }

6
builtin/providers/google/resource_compute_instance_group_test.go
View File

@ -190,7 +190,7 @@ func testAccComputeInstanceGroup_basic(instance string) string {
zone = "us-central1-c" zone = "us-central1-c"
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -238,7 +238,7 @@ func testAccComputeInstanceGroup_update(instance string) string {
count = 1 count = 1
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -273,7 +273,7 @@ func testAccComputeInstanceGroup_update2(instance string) string {
count = 3 count = 3
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {

16
builtin/providers/google/resource_compute_instance_template_test.go
View File

@ -26,7 +26,7 @@ func TestAccComputeInstanceTemplate_basic(t *testing.T) {
"google_compute_instance_template.foobar", &instanceTemplate), "google_compute_instance_template.foobar", &instanceTemplate),
testAccCheckComputeInstanceTemplateTag(&instanceTemplate, "foo"), testAccCheckComputeInstanceTemplateTag(&instanceTemplate, "foo"),
testAccCheckComputeInstanceTemplateMetadata(&instanceTemplate, "foo", "bar"), testAccCheckComputeInstanceTemplateMetadata(&instanceTemplate, "foo", "bar"),
testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20160301", true, true), testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-8-jessie-v20160803", true, true),
), ),
}, },
}, },
@ -66,7 +66,7 @@ func TestAccComputeInstanceTemplate_disks(t *testing.T) {
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckComputeInstanceTemplateExists( testAccCheckComputeInstanceTemplateExists(
"google_compute_instance_template.foobar", &instanceTemplate), "google_compute_instance_template.foobar", &instanceTemplate),
testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20160301", true, true), testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-8-jessie-v20160803", true, true),
testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "terraform-test-foobar", false, false), testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "terraform-test-foobar", false, false),
), ),
}, },
@ -276,7 +276,7 @@ resource "google_compute_instance_template" "foobar" {
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
source_image = "debian-7-wheezy-v20160301" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
boot = true boot = true
} }
@ -310,7 +310,7 @@ resource "google_compute_instance_template" "foobar" {
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
source_image = "debian-7-wheezy-v20160301" source_image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -328,7 +328,7 @@ resource "google_compute_instance_template" "foobar" {
var testAccComputeInstanceTemplate_disks = fmt.Sprintf(` var testAccComputeInstanceTemplate_disks = fmt.Sprintf(`
resource "google_compute_disk" "foobar" { resource "google_compute_disk" "foobar" {
name = "instancet-test-%s" name = "instancet-test-%s"
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
size = 10 size = 10
type = "pd-ssd" type = "pd-ssd"
zone = "us-central1-a" zone = "us-central1-a"
@ -339,7 +339,7 @@ resource "google_compute_instance_template" "foobar" {
machine_type = "n1-standard-1" machine_type = "n1-standard-1"
disk { disk {
source_image = "debian-7-wheezy-v20160301" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
disk_size_gb = 100 disk_size_gb = 100
boot = true boot = true
@ -372,7 +372,7 @@ func testAccComputeInstanceTemplate_subnet_auto(network string) string {
machine_type = "n1-standard-1" machine_type = "n1-standard-1"
disk { disk {
source_image = "debian-7-wheezy-v20160211" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
disk_size_gb = 10 disk_size_gb = 10
boot = true boot = true
@ -407,7 +407,7 @@ resource "google_compute_instance_template" "foobar" {
region = "us-central1" region = "us-central1"
disk { disk {
source_image = "debian-7-wheezy-v20160211" source_image = "debian-8-jessie-v20160803"
auto_delete = true auto_delete = true
disk_size_gb = 10 disk_size_gb = 10
boot = true boot = true

32
builtin/providers/google/resource_compute_instance_test.go
View File

@ -649,7 +649,7 @@ func testAccComputeInstance_basic_deprecated_network(instance string) string {
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network { network {
@ -671,7 +671,7 @@ func testAccComputeInstance_update_deprecated_network(instance string) string {
tags = ["baz"] tags = ["baz"]
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network { network {
@ -694,7 +694,7 @@ func testAccComputeInstance_basic(instance string) string {
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -743,7 +743,7 @@ func testAccComputeInstance_basic3(instance string) string {
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
image = "debian-cloud/debian-7-wheezy-v20160301" image = "debian-cloud/debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -791,7 +791,7 @@ func testAccComputeInstance_basic5(instance string) string {
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
image = "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20160301" image = "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -816,7 +816,7 @@ func testAccComputeInstance_forceNewAndChangeMetadata(instance string) string {
tags = ["baz"] tags = ["baz"]
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -840,7 +840,7 @@ func testAccComputeInstance_update(instance string) string {
tags = ["baz"] tags = ["baz"]
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -867,7 +867,7 @@ func testAccComputeInstance_ip(ip, instance string) string {
tags = ["foo", "bar"] tags = ["foo", "bar"]
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -898,7 +898,7 @@ func testAccComputeInstance_disks(disk, instance string, autodelete bool) string
zone = "us-central1-a" zone = "us-central1-a"
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
disk { disk {
@ -924,7 +924,7 @@ func testAccComputeInstance_local_ssd(instance string) string {
zone = "us-central1-a" zone = "us-central1-a"
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
disk { disk {
@ -947,7 +947,7 @@ func testAccComputeInstance_service_account(instance string) string {
zone = "us-central1-a" zone = "us-central1-a"
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -972,7 +972,7 @@ func testAccComputeInstance_scheduling(instance string) string {
zone = "us-central1-a" zone = "us-central1-a"
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -997,7 +997,7 @@ func testAccComputeInstance_subnet_auto(instance string) string {
zone = "us-central1-a" zone = "us-central1-a"
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -1028,7 +1028,7 @@ func testAccComputeInstance_subnet_custom(instance string) string {
zone = "us-central1-a" zone = "us-central1-a"
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -1056,7 +1056,7 @@ func testAccComputeInstance_address_auto(instance string) string {
zone = "us-central1-a" zone = "us-central1-a"
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {
@ -1084,7 +1084,7 @@ func testAccComputeInstance_address_custom(instance, address string) string {
zone = "us-central1-a" zone = "us-central1-a"
disk { disk {
image = "debian-7-wheezy-v20160301" image = "debian-8-jessie-v20160803"
} }
network_interface { network_interface {