From 319cf7670d8bba1c91a1b7b6bfe9b891b57cab92 Mon Sep 17 00:00:00 2001
From: Edgar Garcia <edgar.garcia@harness.io>
Date: Thu, 17 Oct 2024 11:53:36 -0600
Subject: [PATCH 1/2] feat(gce): add partner metadata in instanceProperties

---
 .../deploy/description/BaseGoogleInstanceDescription.groovy   | 2 ++
 .../google/deploy/handlers/BasicGoogleDeployHandler.groovy    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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..3b90245d14 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
@@ -426,7 +426,9 @@ class BasicGoogleDeployHandler implements DeployHandler<BasicGoogleDeployDescrip
                                                     labels: labels,
                                                     scheduling: scheduling,
                                                     serviceAccounts: serviceAccount,
-                                                    resourceManagerTags: description.resourceManagerTags,)
+                                                    resourceManagerTags: description.resourceManagerTags,
+      partnerMetadata: description.partnerMetadata,
+    )
 
     if (GCEUtil.isShieldedVmCompatible(bootImage)) {
       def shieldedVmConfig = GCEUtil.buildShieldedVmConfig(description)

From 8a26b1ae8d8716b3cc09b65621ffebc0a6e5313b Mon Sep 17 00:00:00 2001
From: Edgar Garcia <edgar.garcia@harness.io>
Date: Thu, 17 Oct 2024 13:56:51 -0600
Subject: [PATCH 2/2] feat(gce): format instanceProperties

---
 .../handlers/BasicGoogleDeployHandler.groovy  | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

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 3b90245d14..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,18 @@ 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,
     )