fix(polling): Updating conditional property casing (#3143)

- camel -> snake
spinnaker · Sep 13, 2019 · 3cae8de · 3cae8de
1 parent 1aa65f7
commit 3cae8de
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/...om/netflix/spinnaker/orca/clouddriver/pipeline/ConditionAwareDeployStagePreprocessor.java b/...om/netflix/spinnaker/orca/clouddriver/pipeline/ConditionAwareDeployStagePreprocessor.java
@@ -33,7 +33,7 @@
 
 @Component
 @ConditionalOnBean(ConditionSupplier.class)
-@ConditionalOnExpression("${tasks.evaluateCondition.enabled:false}")
+@ConditionalOnExpression("${tasks.evaluate-condition.enabled:false}")
 public class ConditionAwareDeployStagePreprocessor implements DeployStagePreProcessor {
   private final Logger log = LoggerFactory.getLogger(ConditionAwareDeployStagePreprocessor.class);
   private final WaitForConditionStage waitForConditionStage;

diff --git a/...uddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/AccountCache.java b/...uddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/AccountCache.java
@@ -35,7 +35,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
-@ConditionalOnExpression(value = "${pollers.accountCache.enabled:false}")
+@ConditionalOnExpression(value = "${pollers.account-cache.enabled:false}")
 public class AccountCache extends AbstractPollingNotificationAgent {
   private final Logger log = LoggerFactory.getLogger(AccountCache.class);
 

diff --git a/...in/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/EphemeralServerGroupsPoller.java b/...in/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/EphemeralServerGroupsPoller.java
@@ -46,7 +46,7 @@
 
 @Slf4j
 @Component
-@ConditionalOnExpression(value = "${pollers.ephemeralServerGroups.enabled:false}")
+@ConditionalOnExpression(value = "${pollers.ephemeral-server-groups.enabled:false}")
 public class EphemeralServerGroupsPoller extends AbstractPollingNotificationAgent {
   private static final Logger log = LoggerFactory.getLogger(EphemeralServerGroupsPoller.class);
 

diff --git a/...roovy/com/netflix/spinnaker/orca/clouddriver/pollers/RestorePinnedServerGroupsPoller.java b/...roovy/com/netflix/spinnaker/orca/clouddriver/pollers/RestorePinnedServerGroupsPoller.java
@@ -74,7 +74,7 @@ public RestorePinnedServerGroupsPoller(
       Registry registry,
       ExecutionLauncher executionLauncher,
       ExecutionRepository executionRepository,
-      @Value("${pollers.restorePinnedServerGroups.username:spinnaker}") String username) {
+      @Value("${pollers.restore-pinned-server-groups.username:spinnaker}") String username) {
     this(
         notificationClusterLock,
         objectMapper,

diff --git a/...c/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/image/UpsertImageTagsTask.java b/...c/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/image/UpsertImageTagsTask.java
@@ -46,7 +46,7 @@ public class UpsertImageTagsTask extends AbstractCloudProviderAwareTask implemen
 
   @Autowired RetrySupport retrySupport;
 
-  @Value("${tasks.upsertImageTagsTimeoutMillis:600000}")
+  @Value("${tasks.upsert-image-tags-timeoutMillis:600000}")
   private Long upsertImageTagsTimeoutMillis;
 
   @Override

diff --git a/...x/spinnaker/orca/notifications/scheduling/OldPipelineCleanupPollingNotificationAgent.java b/...x/spinnaker/orca/notifications/scheduling/OldPipelineCleanupPollingNotificationAgent.java
@@ -112,9 +112,9 @@ public OldPipelineCleanupPollingNotificationAgent(
       ExecutionRepository executionRepository,
       Clock clock,
       Registry registry,
-      @Value("${pollers.oldPipelineCleanup.intervalMs:3600000}") long pollingIntervalMs,
-      @Value("${pollers.oldPipelineCleanup.thresholdDays:30}") int thresholdDays,
-      @Value("${pollers.oldPipelineCleanup.minimumPipelineExecutions:5}")
+      @Value("${pollers.old-pipeline-cleanup.interval-ms:3600000}") long pollingIntervalMs,
+      @Value("${pollers.old-pipeline-cleanup.threshold-days:30}") int thresholdDays,
+      @Value("${pollers.old-pipeline-cleanup.minimum-pipeline-executions:5}")
           int minimumPipelineExecutions) {
     super(clusterLock);
     this.executionRepository = executionRepository;

diff --git a/.../src/main/java/com/netflix/spinnaker/orca/pipeline/RestrictExecutionDuringTimeWindow.java b/.../src/main/java/com/netflix/spinnaker/orca/pipeline/RestrictExecutionDuringTimeWindow.java
@@ -136,7 +136,7 @@ public long getTimeout() {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    @Value("${tasks.executionWindow.timezone:America/Los_Angeles}")
+    @Value("${tasks.execution-window.timezone:America/Los_Angeles}")
     String timeZoneId;
 
     @Override