From 28d3222065782e8b28334a3092b8c601f03ce6a1 Mon Sep 17 00:00:00 2001 From: Edgar Garcia Date: Thu, 16 Jan 2025 13:02:09 -0600 Subject: [PATCH 1/3] fix(google): populate resourceManagerTags & partnerMetadata when cloning server group --- .../serverGroup/configure/serverGroupCommandBuilder.service.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js b/packages/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js index 7df1608c79b..4b0889c34b7 100644 --- a/packages/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js +++ b/packages/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js @@ -521,6 +521,8 @@ angular populateTags(serverGroup.launchConfig.instanceTemplate.properties.tags, command); populateLabels(serverGroup.instanceTemplateLabels, command); populateAuthScopes(serverGroup.launchConfig.instanceTemplate.properties.serviceAccounts, command); + populateResourceManagerTags(serverGroup.resourceManagerTags, command); + populatePartnerMetadata(serverGroup.partnerMetadata, command); return populateDisksFromExisting(serverGroup.launchConfig.instanceTemplate.properties.disks, command).then( function () { From e8427721fea7498909d2f2cd9515a75ad8c65cb0 Mon Sep 17 00:00:00 2001 From: Edgar Garcia Date: Thu, 16 Jan 2025 14:42:57 -0600 Subject: [PATCH 2/3] fix(google): add logs for debug --- .../serverGroup/details/serverGroupDetails.gce.controller.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/google/src/serverGroup/details/serverGroupDetails.gce.controller.js b/packages/google/src/serverGroup/details/serverGroupDetails.gce.controller.js index 3b7e712fcb6..9baaa385f9a 100644 --- a/packages/google/src/serverGroup/details/serverGroupDetails.gce.controller.js +++ b/packages/google/src/serverGroup/details/serverGroupDetails.gce.controller.js @@ -471,6 +471,11 @@ angular return serverGroup; }, serverGroupCommand: () => { + /* eslint-disable no-console */ + console.log('showing server group to clone'); + console.log(serverGroup); + console.log(app); + /* eslint-enable no-console */ return gceServerGroupCommandBuilder.buildServerGroupCommandFromExisting(app, serverGroup); }, }, From 043ba9106c220d514e5db9bbd3113752726a3103 Mon Sep 17 00:00:00 2001 From: Edgar Garcia Date: Fri, 17 Jan 2025 11:20:16 -0600 Subject: [PATCH 3/3] fix(google): populate resourceManagerTags & partnerMetadata from launchConfig when clone serverGroup --- .../configure/serverGroupCommandBuilder.service.js | 7 +++++-- .../details/serverGroupDetails.gce.controller.js | 5 ----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js b/packages/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js index 4b0889c34b7..544ce5a9ed8 100644 --- a/packages/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js +++ b/packages/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js @@ -521,8 +521,11 @@ angular populateTags(serverGroup.launchConfig.instanceTemplate.properties.tags, command); populateLabels(serverGroup.instanceTemplateLabels, command); populateAuthScopes(serverGroup.launchConfig.instanceTemplate.properties.serviceAccounts, command); - populateResourceManagerTags(serverGroup.resourceManagerTags, command); - populatePartnerMetadata(serverGroup.partnerMetadata, command); + populateResourceManagerTags( + serverGroup.launchConfig.instanceTemplate.properties.resourceManagerTags, + command, + ); + populatePartnerMetadata(serverGroup.launchConfig.instanceTemplate.properties.partnerMetadata, command); return populateDisksFromExisting(serverGroup.launchConfig.instanceTemplate.properties.disks, command).then( function () { diff --git a/packages/google/src/serverGroup/details/serverGroupDetails.gce.controller.js b/packages/google/src/serverGroup/details/serverGroupDetails.gce.controller.js index 9baaa385f9a..3b7e712fcb6 100644 --- a/packages/google/src/serverGroup/details/serverGroupDetails.gce.controller.js +++ b/packages/google/src/serverGroup/details/serverGroupDetails.gce.controller.js @@ -471,11 +471,6 @@ angular return serverGroup; }, serverGroupCommand: () => { - /* eslint-disable no-console */ - console.log('showing server group to clone'); - console.log(serverGroup); - console.log(app); - /* eslint-enable no-console */ return gceServerGroupCommandBuilder.buildServerGroupCommandFromExisting(app, serverGroup); }, },