From aab2a60cb02c629700ef49737a4925e4cbfae8a5 Mon Sep 17 00:00:00 2001
From: Edgar Garcia <63310723+edgarulg@users.noreply.github.com>
Date: Thu, 17 Oct 2024 15:14:23 -0600
Subject: [PATCH] feat(gce): add partnerMetadata in instanceProperties for GCE
 deployment (#6297)

* feat(gce): add partner metadata in instanceProperties

* feat(gce): format instanceProperties
---
 .../BaseGoogleInstanceDescription.groovy      |  2 ++
 .../handlers/BasicGoogleDeployHandler.groovy  | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/description/BaseGoogleInstanceDescription.groovy b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/description/BaseGoogleInstanceDescription.groovy
index 60f0850056..eed888a402 100644
--- a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/description/BaseGoogleInstanceDescription.groovy
+++ b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/description/BaseGoogleInstanceDescription.groovy
@@ -16,6 +16,7 @@
 
 package com.netflix.spinnaker.clouddriver.google.deploy.description
 
+import com.google.api.services.compute.model.StructuredEntries
 import com.netflix.spinnaker.clouddriver.google.model.GoogleDisk
 import com.netflix.spinnaker.clouddriver.google.model.GoogleLabeledResource
 import com.netflix.spinnaker.kork.artifacts.model.Artifact
@@ -69,6 +70,7 @@ class BaseGoogleInstanceDescription extends AbstractGoogleCredentialsDescription
   String accountName
 
   Map<String, String> resourceManagerTags
+  Map<String, StructuredEntries> partnerMetadata
 
   // The source of the image to deploy
   // ARTIFACT: An artifact of type gce/image stored in imageArtifact
diff --git a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy
index 53d91cc45f..304d3c3fb3 100644
--- a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy
+++ b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy
@@ -416,17 +416,20 @@ class BasicGoogleDeployHandler implements DeployHandler<BasicGoogleDeployDescrip
         "Accelerators are only supported with regional server groups if the zones are specified by the user.");
     }
 
-    def instanceProperties = new InstanceProperties(machineType: machineTypeName,
-                                                    disks: attachedDisks,
-                                                    guestAccelerators: description.acceleratorConfigs ?: [],
-                                                    networkInterfaces: [networkInterface],
-                                                    canIpForward: canIpForward,
-                                                    metadata: metadata,
-                                                    tags: tags,
-                                                    labels: labels,
-                                                    scheduling: scheduling,
-                                                    serviceAccounts: serviceAccount,
-                                                    resourceManagerTags: description.resourceManagerTags,)
+    def instanceProperties = new InstanceProperties(
+      machineType: machineTypeName,
+      disks: attachedDisks,
+      guestAccelerators: description.acceleratorConfigs ?: [],
+      networkInterfaces: [networkInterface],
+      canIpForward: canIpForward,
+      metadata: metadata,
+      tags: tags,
+      labels: labels,
+      scheduling: scheduling,
+      serviceAccounts: serviceAccount,
+      resourceManagerTags: description.resourceManagerTags,
+      partnerMetadata: description.partnerMetadata,
+    )
 
     if (GCEUtil.isShieldedVmCompatible(bootImage)) {
       def shieldedVmConfig = GCEUtil.buildShieldedVmConfig(description)