Initial addition of generated Image to Terraform.

google-beta/provider.go

@@ -143,7 +143,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_compute_attached_disk":                 resourceComputeAttachedDisk(),
 			"google_compute_backend_service":               resourceComputeBackendService(),
 			"google_compute_global_forwarding_rule":        resourceComputeGlobalForwardingRule(),
-			"google_compute_image":                         resourceComputeImage(),
 			"google_compute_instance":                      resourceComputeInstance(),
 			"google_compute_instance_from_template":        resourceComputeInstanceFromTemplate(),
 			"google_compute_instance_group":                resourceComputeInstanceGroup(),

google-beta/provider_compute_gen.go

@@ -27,6 +27,7 @@ var GeneratedComputeResourcesMap = map[string]*schema.Resource{
 	"google_compute_http_health_check":       resourceComputeHttpHealthCheck(),
 	"google_compute_https_health_check":      resourceComputeHttpsHealthCheck(),
 	"google_compute_health_check":            resourceComputeHealthCheck(),
+	"google_compute_image":                   resourceComputeImage(),
 	"google_compute_interconnect_attachment": resourceComputeInterconnectAttachment(),
 	"google_compute_region_autoscaler":       resourceComputeRegionAutoscaler(),
 	"google_compute_region_disk":             resourceComputeRegionDisk(),

google-beta/resource_compute_address_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -150,10 +151,13 @@ resource "google_compute_instance" "instance_with_ip" {
 }
 
 func testAccCheckComputeAddressDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_address" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 

google-beta/resource_compute_autoscaler_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -110,10 +111,13 @@ data "google_compute_image" "debian_9" {
 }
 
 func testAccCheckComputeAutoscalerDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_autoscaler" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 

google-beta/resource_compute_backend_bucket_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -61,10 +62,13 @@ resource "google_storage_bucket" "image_bucket" {
 }
 
 func testAccCheckComputeBackendBucketDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_backend_bucket" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 

google-beta/resource_compute_disk_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -59,10 +60,13 @@ resource "google_compute_disk" "default" {
 }
 
 func testAccCheckComputeDiskDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_disk" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 

google-beta/resource_compute_firewall_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -69,10 +70,13 @@ resource "google_compute_network" "default" {
 }
 
 func testAccCheckComputeFirewallDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_firewall" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 

google-beta/resource_compute_forwarding_rule_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -59,10 +60,13 @@ resource "google_compute_target_pool" "default" {
 }
 
 func testAccCheckComputeForwardingRuleDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_forwarding_rule" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 

google-beta/resource_compute_global_address_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -53,10 +54,13 @@ resource "google_compute_global_address" "default" {
 }
 
 func testAccCheckComputeGlobalAddressDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_global_address" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 

google-beta/resource_compute_health_check_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -60,10 +61,13 @@ resource "google_compute_health_check" "internal-health-check" {
 }
 
 func testAccCheckComputeHealthCheckDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_health_check" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 

google-beta/resource_compute_http_health_check_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -57,10 +58,13 @@ resource "google_compute_http_health_check" "default" {
 }
 
 func testAccCheckComputeHttpHealthCheckDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_http_health_check" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 

google-beta/resource_compute_https_health_check_generated_test.go

@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -57,10 +58,13 @@ resource "google_compute_https_health_check" "default" {
 }
 
 func testAccCheckComputeHttpsHealthCheckDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_https_health_check" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)