fix(provider/cf): getClusters NAMES_ONLY shouldn't fully hydrate (#4749)

Co-authored-by: Zach Smith <zachsmith@Zachs-MBP-2.attlocal.net>
spinnaker · Jul 17, 2020 · bc0acc2 · bc0acc2
1 parent 3b85259
commit bc0acc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/...y/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepository.java b/...y/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepository.java
@@ -105,7 +105,7 @@ private CloudFoundryCluster clusterFromCacheData(CacheData clusterData, Detail d
     CloudFoundryCluster cluster =
         objectMapper.convertValue(
             clusterData.getAttributes().get("resource"), CloudFoundryCluster.class);
-    if (detail.equals(Detail.NONE)) {
+    if (detail.equals(Detail.NONE) || detail.equals(Detail.NAMES_ONLY)) {
       return cluster.withServerGroups(emptySet());
     }
     return cluster.withServerGroups(

diff --git a/...c/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepositoryTest.java b/...c/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepositoryTest.java
@@ -157,14 +157,7 @@ void findCluster() {
             });
 
     assertThat(repo.findClusterByKey(clusterKey, NAMES_ONLY))
-        .hasValueSatisfying(
-            cluster ->
-                assertThat(cluster.getServerGroups())
-                    .hasOnlyOneElementSatisfying(
-                        serverGroup -> {
-                          assertThat(serverGroup.getLoadBalancers()).isEmpty();
-                          assertThat(serverGroup.getInstances()).isNotEmpty();
-                        }));
+        .hasValueSatisfying(cluster -> assertThat(cluster.getServerGroups()).isEmpty());
   }
 
   @Test