feat(gce): add resourceManagerTags in input

Author: edgarulg

clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtil.groovy

@@ -827,6 +827,10 @@ class GCEUtil {
     return new Tags(items: tagsList)
   }
 
+  static Map<String, String> buildResourceManagerTagsFromMap(Map<String, String> tagsMap) {
+    return tagsMap
+  }
+
 
   static Autoscaler buildAutoscaler(String serverGroupName,
                                     String targetLink,
@@ -938,23 +942,23 @@ class GCEUtil {
     return scheduling
   }
 
-  static ShieldedVmConfig buildShieldedVmConfig(BaseGoogleInstanceDescription description) {
-    def shieldedVmConfig = new ShieldedVmConfig()
-
-    if (description.enableSecureBoot != null) {
-      shieldedVmConfig.enableSecureBoot = description.enableSecureBoot
-    }
-
-    if (description.enableVtpm != null) {
-      shieldedVmConfig.enableVtpm = description.enableVtpm
-    }
-
-    if (description.enableIntegrityMonitoring != null) {
-      shieldedVmConfig.enableIntegrityMonitoring = description.enableIntegrityMonitoring
-    }
-
-    return shieldedVmConfig
-  }
+//  static ShieldedVmConfig buildShieldedVmConfig(BaseGoogleInstanceDescription description) {
+//    def shieldedVmConfig = new ShieldedVmConfig()
+//
+//    if (description.enableSecureBoot != null) {
+//      shieldedVmConfig.enableSecureBoot = description.enableSecureBoot
+//    }
+//
+//    if (description.enableVtpm != null) {
+//      shieldedVmConfig.enableVtpm = description.enableVtpm
+//    }
+//
+//    if (description.enableIntegrityMonitoring != null) {
+//      shieldedVmConfig.enableIntegrityMonitoring = description.enableIntegrityMonitoring
+//    }
+//
+//    return shieldedVmConfig
+//  }
 
   static void updateStatusAndThrowNotFoundException(String errorMsg, Task task, String phase) {
     task.updateStatus phase, errorMsg

clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/description/BaseGoogleInstanceDescription.groovy

@@ -68,6 +68,8 @@ class BaseGoogleInstanceDescription extends AbstractGoogleCredentialsDescription
 
   String accountName
 
+  Map<String, String> resourceManagerTags
+
   // The source of the image to deploy
   // ARTIFACT: An artifact of type gce/image stored in imageArtifact
   // STRING:   A string representing a GCE image name in the current

clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy

@@ -415,6 +415,7 @@ class BasicGoogleDeployHandler implements DeployHandler<BasicGoogleDeployDescrip
       checkArgument(!description.regional || description.selectZones,
         "Accelerators are only supported with regional server groups if the zones are specified by the user.");
     }
+    def resourceManagerTags = GCEUtil.buildResourceManagerTagsFromMap(description.resourceManagerTags)
 
     def instanceProperties = new InstanceProperties(machineType: machineTypeName,
                                                     disks: attachedDisks,
@@ -425,7 +426,8 @@ class BasicGoogleDeployHandler implements DeployHandler<BasicGoogleDeployDescrip
                                                     tags: tags,
                                                     labels: labels,
                                                     scheduling: scheduling,
-                                                    serviceAccounts: serviceAccount)
+                                                    serviceAccounts: serviceAccount,
+      resourceManagerTags: resourceManagerTags)
 
     if (GCEUtil.isShieldedVmCompatible(bootImage)) {
       def shieldedVmConfig = GCEUtil.buildShieldedVmConfig(description)