From d8d96f071b77fab5578ab07fe434dba58e77ccb2 Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Thu, 20 Oct 2022 19:02:47 +0200
Subject: Extract constant

---
 .../hosted/controller/application/pkg/ApplicationPackageValidator.java | 2 +-
 .../java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'controller-server/src/main/java/com/yahoo')

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
index 63bfe871c76..18b323c26cb 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
@@ -117,7 +117,7 @@ public class ApplicationPackageValidator {
             String endpointString = instance == null ? "Application endpoint '" + endpoint.endpointId() + "'"
                                                      : "Endpoint '" + endpoint.endpointId() + "' in " + instance;
             if (Set.of(CloudName.GCP, CloudName.AWS).containsAll(clouds)) { } // Everything is fine!
-            else if (Set.of(CloudName.from("yahoo")).containsAll(clouds)) {
+            else if (Set.of(CloudName.YAHOO).containsAll(clouds)) {
                 if (endpoint.level() == Level.application && regions.length != 1) {
                     throw new IllegalArgumentException(endpointString + " cannot contain different regions: " +
                                                        endpoint.regions().stream().sorted().toList());
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
index 31f79c78ad5..f6a5bb5519d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
@@ -30,7 +30,6 @@ import static com.yahoo.yolean.Exceptions.uncheck;
 public class CostCalculator {
 
     private static final double SELF_HOSTED_DISCOUNT = .5;
-    private static final CloudName cloudName = CloudName.from("yahoo");
 
     public static String resourceShareByPropertyToCsv(NodeRepository nodeRepository,
                                                       Controller controller,
@@ -48,7 +47,7 @@ public class CostCalculator {
         // Sum up allocations
         Map<Property, ResourceAllocation> allocationByProperty = new HashMap<>();
         var nodes = controller.zoneRegistry().zones()
-                              .reachable().in(Environment.prod).in(cloudName).zones().stream()
+                              .reachable().in(Environment.prod).in(CloudName.YAHOO).zones().stream()
                               .flatMap(zone -> uncheck(() -> nodeRepository.list(zone.getId(), NodeFilter.all()).stream()))
                               .filter(node -> node.owner().isPresent() && !node.owner().get().tenant().equals(SystemApplication.TENANT))
                               .collect(Collectors.toList());
-- 
cgit v1.2.3