Merge pull request #331 from rosmo/add-resource-manager-tags

Add support for Secure Tags

Author: tanmay-hc

.web-docs/components/builder/googlecompute/README.md

@@ -312,6 +312,8 @@ builder.
 
 - `tags` ([]string) - Assign network tags to apply firewall rules to VM instance.
 
+- `resource_manager_tags` (map[string]string) - Assign Secure Tags to apply firewall rules to VM instance.
+
 - `use_internal_ip` (bool) - If true, use the instance's internal IP instead of its external IP
   during building.
 

builder/googlecompute/config.go

@@ -310,6 +310,8 @@ type Config struct {
 	Subnetwork string `mapstructure:"subnetwork" required:"false"`
 	// Assign network tags to apply firewall rules to VM instance.
 	Tags []string `mapstructure:"tags" required:"false"`
+	// Assign Secure Tags to apply firewall rules to VM instance.
+	ResourceManagerTags map[string]string `mapstructure:"resource_manager_tags" required:"false"`
 	// If true, use the instance's internal IP instead of its external IP
 	// during building.
 	UseInternalIP bool `mapstructure:"use_internal_ip" required:"false"`

builder/googlecompute/config.hcl2spec.go

@@ -211,6 +211,7 @@ func (s *StepCreateInstance) Run(ctx context.Context, state multistep.StateBag)
 		Scopes:                       c.Scopes,
 		Subnetwork:                   c.Subnetwork,
 		Tags:                         c.Tags,
+		ResourceManagerTags:          c.ResourceManagerTags,
 		Zone:                         c.Zone,
 		NetworkIP:                    c.NetworkIP,
 	})

builder/googlecompute/step_create_instance.go

@@ -258,6 +258,8 @@
 
 - `tags` ([]string) - Assign network tags to apply firewall rules to VM instance.
 
+- `resource_manager_tags` (map[string]string) - Assign Secure Tags to apply firewall rules to VM instance.
+
 - `use_internal_ip` (bool) - If true, use the instance's internal IP instead of its external IP
   during building.
 

docs-partials/builder/googlecompute/Config-not-required.mdx

@@ -742,6 +742,11 @@ func (d *driverGCE) RunInstance(c *InstanceConfig) (<-chan error, error) {
 			Items: c.Tags,
 		},
 	}
+	if len(c.ResourceManagerTags) > 0 {
+		instance.Params = &compute.InstanceParams{
+			ResourceManagerTags: c.ResourceManagerTags,
+		}
+	}
 
 	if c.MaxRunDurationInSeconds > 0 {
 		log.Printf("[DEBUG] setting max run duration to %d seconds", c.MaxRunDurationInSeconds)

lib/common/driver_gce.go

@@ -37,6 +37,8 @@ type InstanceConfig struct {
 	Scopes                       []string
 	Subnetwork                   string
 	Tags                         []string
-	Zone                         string
-	NetworkIP                    string
+	ResourceManagerTags          map[string]string
+
+	Zone      string
+	NetworkIP string
 }