chore(bakery): remove baseOs and baseLabel enums (#2003)

spinnaker · Feb 19, 2018 · 7e15dff · 7e15dff
1 parent f5d3390
commit 7e15dff
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 30 deletions.
diff --git a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/api/BakeRequest.groovy b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/api/BakeRequest.groovy
@@ -37,7 +37,7 @@ class BakeRequest {
 
   static final Default = new BakeRequest(user: System.getProperty("user.name"),
                                          cloudProviderType: CloudProviderType.aws,
-                                         baseLabel: Label.release,
+                                         baseLabel: "release",
                                          baseOs: "ubuntu")
 
   String user
@@ -48,7 +48,7 @@ class BakeRequest {
   String commitHash
   String buildInfoUrl
   CloudProviderType cloudProviderType
-  Label baseLabel
+  String baseLabel
   String baseOs
   String baseName
   String baseAmi
@@ -77,10 +77,6 @@ class BakeRequest {
     aws, azure, docker, gce, openstack, titus
   }
 
-  static enum Label {
-    release, candidate, previous, unstable, foundation
-  }
-
   static enum VmType {
     pv, hvm
   }

diff --git a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTask.groovy b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTask.groovy
@@ -124,8 +124,7 @@ class CreateBakeTask implements RetryableTask {
         stage.context.baseOs as String).toBlocking().single()
       packageType = baseImage.packageType as PackageType
     } else {
-      OperatingSystem operatingSystem = OperatingSystem.valueOf(stage.context.baseOs as String)
-      packageType = operatingSystem.packageType
+      packageType = new OperatingSystem(stage.context.baseOs as String).getPackageType()
     }
 
     PackageInfo packageInfo = new PackageInfo(stage,

diff --git a/...-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTaskSpec.groovy b/...-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTaskSpec.groovy
@@ -58,7 +58,7 @@ class CreateBakeTaskSpec extends Specification {
     package  : "hodor",
     user     : "bran",
     baseOs   : "ubuntu",
-    baseLabel: BakeRequest.Label.release.name()
+    baseLabel: "release"
   ]
 
   Execution pipeline = pipeline {
@@ -75,7 +75,7 @@ class CreateBakeTaskSpec extends Specification {
     user             : "bran",
     cloudProviderType: "aws",
     baseOs           : "ubuntu",
-    baseLabel        : BakeRequest.Label.release.name()
+    baseLabel        : "release"
   ]
 
   @Shared
@@ -85,7 +85,7 @@ class CreateBakeTaskSpec extends Specification {
     user             : "bran",
     cloudProviderType: "aws",
     baseOs           : "ubuntu",
-    baseLabel        : BakeRequest.Label.release.name(),
+    baseLabel        : "release",
     rebake           : true
   ]
 
@@ -229,7 +229,7 @@ class CreateBakeTaskSpec extends Specification {
     bake.user == bakeConfig.user
     bake.packageName == bakeConfig.package
     bake.baseOs == bakeConfig.baseOs
-    bake.baseLabel.name() == bakeConfig.baseLabel
+    bake.baseLabel == bakeConfig.baseLabel
   }
 
   @Unroll
@@ -569,7 +569,7 @@ class CreateBakeTaskSpec extends Specification {
       {
         it.user == "bran" &&
           it.packageName == "hodor_1.1_all" &&
-          it.baseLabel == BakeRequest.Label.release &&
+          it.baseLabel == "release" &&
           it.baseOs == "ubuntu" &&
           it.buildHost == "http://spinnaker.builds.test.netflix.net/" &&
           it.job == "SPINNAKER-package-echo" &&
@@ -609,7 +609,7 @@ class CreateBakeTaskSpec extends Specification {
       {
         it.user == "bran" &&
           it.packageName == "hodor_1.1_all" &&
-          it.baseLabel == BakeRequest.Label.release &&
+          it.baseLabel == "release" &&
           it.baseOs == "ubuntu" &&
           it.buildHost == null &&
           it.job == null &&
@@ -649,7 +649,7 @@ class CreateBakeTaskSpec extends Specification {
       {
         it.user == "bran" &&
           it.packageName == "hodor_1.1_all" &&
-          it.baseLabel == BakeRequest.Label.release &&
+          it.baseLabel == "release" &&
           it.baseOs == "ubuntu" &&
           it.buildHost == null &&
           it.job == null &&
@@ -688,7 +688,7 @@ class CreateBakeTaskSpec extends Specification {
     bake.user == bakeConfigWithCloudProviderType.user
     bake.packageName == bakeConfigWithCloudProviderType.package
     bake.baseOs == bakeConfigWithCloudProviderType.baseOs
-    bake.baseLabel.name() == bakeConfigWithCloudProviderType.baseLabel
+    bake.baseLabel == bakeConfigWithCloudProviderType.baseLabel
   }
 
   @Unroll
@@ -727,7 +727,7 @@ class CreateBakeTaskSpec extends Specification {
       {
         it.user == "bran" &&
           it.packageName == "hodor" &&
-          it.baseLabel == BakeRequest.Label.release &&
+          it.baseLabel == "release" &&
           it.baseOs == "ubuntu"
       } as BakeRequest,
       "1") >> Observable.from(runningStatus)
@@ -754,7 +754,7 @@ class CreateBakeTaskSpec extends Specification {
       {
         it.user == "bran" &&
           it.packageName == "hodor" &&
-          it.baseLabel == BakeRequest.Label.release &&
+          it.baseLabel == "release" &&
           it.baseOs == "ubuntu"
       } as BakeRequest,
       queryParameter) >> Observable.from(runningStatus)
@@ -771,7 +771,7 @@ class CreateBakeTaskSpec extends Specification {
       {
         it.user == "bran" &&
           it.packageName == "hodor" &&
-          it.baseLabel == BakeRequest.Label.release &&
+          it.baseLabel == "release" &&
           it.baseOs == "ubuntu"
       } as BakeRequest,
       null) >> Observable.from(runningStatus)

diff --git a/.../src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/quip/ResolveQuipVersionTask.groovy b/.../src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/quip/ResolveQuipVersionTask.groovy
@@ -60,8 +60,7 @@ class ResolveQuipVersionTask implements RetryableTask {
         stage.context.baseOs as String).toBlocking().single()
       packageType = baseImage.packageType
     } else {
-      OperatingSystem operatingSystem = OperatingSystem.valueOf(stage.context.baseOs as String)
-      packageType = operatingSystem.packageType
+      packageType = new OperatingSystem(stage.context.baseOs as String).getPackageType()
     }
     PackageInfo packageInfo = new PackageInfo(stage,
       packageType.packageType,

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/OperatingSystem.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/OperatingSystem.java
@@ -1,18 +1,14 @@
 package com.netflix.spinnaker.orca.pipeline.util;
 
-@Deprecated public enum OperatingSystem {
-  centos(PackageType.RPM),
-  ubuntu(PackageType.DEB),
-  trusty(PackageType.DEB),
-  xenial(PackageType.DEB);
+@Deprecated
+public class OperatingSystem {
+  private final PackageType packageType;
 
-  OperatingSystem(PackageType packageType) {
-    this.packageType = packageType;
+  public OperatingSystem(String os) {
+    this.packageType = os.toLowerCase().matches("centos|rhel|redhat") ? PackageType.RPM : PackageType.DEB;
   }
 
   public PackageType getPackageType() {
     return packageType;
   }
-
-  private final PackageType packageType;
 }