From 3cae8ded66f09e337a59b82b2803204d4fedecbc Mon Sep 17 00:00:00 2001 From: Jeyrs Chabu Date: Thu, 12 Sep 2019 19:46:58 -0700 Subject: [PATCH] fix(polling): Updating conditional property casing (#3143) - camel -> snake --- .../pipeline/ConditionAwareDeployStagePreprocessor.java | 2 +- .../spinnaker/orca/clouddriver/pollers/AccountCache.java | 2 +- .../clouddriver/pollers/EphemeralServerGroupsPoller.java | 2 +- .../pollers/RestorePinnedServerGroupsPoller.java | 2 +- .../orca/clouddriver/tasks/image/UpsertImageTagsTask.java | 2 +- .../OldPipelineCleanupPollingNotificationAgent.java | 6 +++--- .../orca/pipeline/RestrictExecutionDuringTimeWindow.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/ConditionAwareDeployStagePreprocessor.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/ConditionAwareDeployStagePreprocessor.java index c6ab633038..346975b430 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/ConditionAwareDeployStagePreprocessor.java +++ b/orca-clouddriver/src/main/groovy/com/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/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/AccountCache.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/AccountCache.java index e2cd379955..4e26f144ec 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/AccountCache.java +++ b/orca-clouddriver/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/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/EphemeralServerGroupsPoller.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/EphemeralServerGroupsPoller.java index ed51f069a7..11e4c0d230 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/EphemeralServerGroupsPoller.java +++ b/orca-clouddriver/src/main/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/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/RestorePinnedServerGroupsPoller.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/RestorePinnedServerGroupsPoller.java index 21a63745f7..27a696da1b 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/RestorePinnedServerGroupsPoller.java +++ b/orca-clouddriver/src/main/groovy/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/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/image/UpsertImageTagsTask.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/image/UpsertImageTagsTask.java index 334916dddd..2db1b6fd59 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/image/UpsertImageTagsTask.java +++ b/orca-clouddriver/src/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/orca-core/src/main/java/com/netflix/spinnaker/orca/notifications/scheduling/OldPipelineCleanupPollingNotificationAgent.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/notifications/scheduling/OldPipelineCleanupPollingNotificationAgent.java index 30cad8ee7d..496f3e94e7 100644 --- a/orca-core/src/main/java/com/netflix/spinnaker/orca/notifications/scheduling/OldPipelineCleanupPollingNotificationAgent.java +++ b/orca-core/src/main/java/com/netflix/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/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/RestrictExecutionDuringTimeWindow.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/RestrictExecutionDuringTimeWindow.java index 5309cd67ad..69d4750088 100644 --- a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/RestrictExecutionDuringTimeWindow.java +++ b/orca-core/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