Skip to content

Commit 73c3594

Browse files
committed
feat(gce): add logs for resourceManagerTags
1 parent 4823d3f commit 73c3594

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ import com.netflix.spinnaker.config.GoogleConfiguration
5252
import com.netflix.spinnaker.kork.artifacts.model.Artifact
5353
import groovy.util.logging.Slf4j
5454

55+
import java.util.stream.Collectors
56+
5557
import static com.netflix.spinnaker.clouddriver.google.cache.Keys.Namespace.HEALTH_CHECKS
5658
import static com.netflix.spinnaker.clouddriver.google.cache.Keys.Namespace.HTTP_HEALTH_CHECKS
5759

@@ -827,8 +829,11 @@ class GCEUtil {
827829
return new Tags(items: tagsList)
828830
}
829831

830-
static Map<String, String> buildResourceManagerTagsFromMap(Map<String, String> tagsMap) {
831-
return tagsMap
832+
static List<String> buildResourceManagerTagsFromMap(Map<String, String> tagsMap) {
833+
log.info("resource manager tags size: " + tagsMap.size())
834+
return tagsMap.entrySet().stream()
835+
.map(entry -> entry.getKey() + ":" + entry.getValue())
836+
.collect(Collectors.toList());
832837
}
833838

834839

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,12 @@ class BasicGoogleDeployHandler implements DeployHandler<BasicGoogleDeployDescrip
417417
}
418418
def resourceManagerTags = GCEUtil.buildResourceManagerTagsFromMap(description.resourceManagerTags)
419419

420+
log.info( "getting the resource manager tags")
421+
resourceManagerTags.forEach(log::info)
422+
423+
log.info( "getting normal tags")
424+
tags.forEach(log::info)
425+
420426
def instanceProperties = new InstanceProperties(machineType: machineTypeName,
421427
disks: attachedDisks,
422428
guestAccelerators: description.acceleratorConfigs ?: [],

0 commit comments

Comments
 (0)