provider/google: instance template support for metadata_startup_script

builtin/providers/google/resource_compute_instance_template.go

@@ -168,7 +168,15 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 			},
 
 			"metadata": &schema.Schema{
-				Type:     schema.TypeMap,
+				Type:         schema.TypeMap,
+				Optional:     true,
+				ForceNew:     true,
+				Elem:         schema.TypeString,
+				ValidateFunc: validateInstanceMetadata,
+			},
+
+			"metadata_startup_script": &schema.Schema{
+				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
@@ -694,6 +702,20 @@ func resourceComputeInstanceTemplateRead(d *schema.ResourceData, meta interface{
 		return fmt.Errorf("Error reading instance template: %s", err)
 	}
 
+	// Synch metadata
+	md := instanceTemplate.Properties.Metadata
+
+	_md := MetadataFormatSchema(d.Get("metadata").(map[string]interface{}), md)
+	delete(_md, "startup-script")
+
+	if script, scriptExists := d.GetOk("metadata_startup_script"); scriptExists {
+		d.Set("metadata_startup_script", script)
+	}
+
+	if err = d.Set("metadata", _md); err != nil {
+		return fmt.Errorf("Error setting metadata: %s", err)
+	}
+
 	// Set the metadata fingerprint if there is one.
 	if instanceTemplate.Properties.Metadata != nil {
 		d.Set("metadata_fingerprint", instanceTemplate.Properties.Metadata.Fingerprint)

builtin/providers/google/resource_compute_instance_template_test.go

@@ -294,6 +294,8 @@ resource "google_compute_instance_template" "foobar" {
 		foo = "bar"
 	}
 
+	metadata_startup_script = "echo Hello"
+
 	service_account {
 		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 	}

website/source/docs/providers/google/r/compute_instance_template.html.markdown

@@ -52,6 +52,8 @@ resource "google_compute_instance_template" "foobar" {
     foo = "bar"
   }
 
+  metadata_startup_script = "echo hi > /test.txt"
+
   service_account {
     scopes = ["userinfo-email", "compute-ro", "storage-ro"]
   }
@@ -133,6 +135,11 @@ The following arguments are supported:
 * `metadata` - (Optional) Metadata key/value pairs to make available from
     within instances created from this template.
 
+* `metadata_startup_script` - (Optional) An alternative to using the
+    startup-script metadata key. This replaces the startup-script metadata key
+    on the created instance template and thus the two mechanisms are not allowed
+    to be used simultaneously.
+
 * `network_interface` - (Required) Networks to attach to instances created from
     this template. This can be specified multiple times for multiple networks.
     Structure is documented below.