Refactor to use constants like in other services

serverhorror · May 8, 2024 · 9a16363 · 9a16363
1 parent 262d210
commit 9a16363
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/org/ods/component/AbstractDeploymentStrategy.groovy b/src/org/ods/component/AbstractDeploymentStrategy.groovy
@@ -7,7 +7,7 @@ import org.ods.util.PodData
 
 abstract class AbstractDeploymentStrategy implements IDeploymentStrategy {
 
-    protected final List<String> DEPLOYMENT_KINDS = [
+    protected List<String> DEPLOYMENT_KINDS = [
         OpenShiftService.DEPLOYMENT_KIND, OpenShiftService.DEPLOYMENTCONFIG_KIND,
     ]
 

diff --git a/src/org/ods/component/HelmDeploymentStrategy.groovy b/src/org/ods/component/HelmDeploymentStrategy.groovy
@@ -80,6 +80,14 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
         this.options = new RolloutOpenShiftDeploymentOptions(config)
         this.openShift = openShift
         this.jenkins = jenkins
+
+        // Why? In Groovy protected fields are implicitly final.
+        // As per Google: This seems to be the idiomatic way to override protected fields
+        DEPLOYMENT_KINDS.clear()
+        DEPLOYMENT_KINDS.addAll(
+            OpenShiftService.DEPLOYMENT_KIND, OpenShiftService.DEPLOYMENTCONFIG_KIND,
+            OpenShiftService.STATEFULSET_KIND,
+        )
     }
 
     @Override
@@ -95,10 +103,8 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
         logger.info "Rolling out ${context.componentId} with HELM, selector: ${options.selector}"
         helmUpgrade(context.targetProject)
 
-        def deploymentKinds = DEPLOYMENT_KINDS << 'StatefulSet'
-
         def deploymentResources = openShift.getResourcesForComponent(
-            context.targetProject, deploymentKinds, options.selector
+            context.targetProject, DEPLOYMENT_KINDS, options.selector
         )
         logger.info("${this.class.name} -- DEPLOYMENT RESOURCES")
         logger.info(

diff --git a/src/org/ods/services/OpenShiftService.groovy b/src/org/ods/services/OpenShiftService.groovy
@@ -18,6 +18,7 @@ class OpenShiftService {
     static final String ROLLOUT_WAITING = 'waiting'
     static final String DEPLOYMENTCONFIG_KIND = 'DeploymentConfig'
     static final String DEPLOYMENT_KIND = 'Deployment'
+    static final String STATEFULSET_KIND = 'StatefulSet'
 
     private final IPipelineSteps steps
     private final ILogger logger