From d1edf69c1ba644dce847d06a98f65812a4e1d651 Mon Sep 17 00:00:00 2001 From: German Muzquiz <35276119+german-muzquiz@users.noreply.github.com> Date: Mon, 14 Oct 2019 12:36:32 -0500 Subject: [PATCH] feat(secrets/gcs): Bumping orca dep for pulling gcs secrets module (#620) --- gradle.properties | 2 +- .../main/java/com/netflix/kayenta/canary/ExecutionMapper.java | 2 +- .../java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java | 2 +- .../com/netflix/kayenta/canary/util/FetchControllerUtils.java | 2 +- .../netflix/kayenta/controllers/CanaryJudgesController.java | 2 +- .../java/com/netflix/kayenta/index/CanaryConfigIndex.java | 2 +- .../kayenta/metrics/orca/MetricSetMixerServiceTask.java | 2 +- .../kayenta/retrofit/config/RetrofitClientFactory.java | 4 ++-- .../kayenta/influxdb/metrics/InfluxDbQueryBuilder.java | 2 +- .../com/netflix/kayenta/orca/controllers/AdminController.java | 2 +- kayenta-web/kayenta-web.gradle | 1 + .../com/netflix/kayenta/controllers/CanaryController.java | 2 +- .../kayenta/controllers/MetricsServiceMetadataController.java | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index dfc0195e2..2842fa26f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #Mon Jun 17 22:31:26 UTC 2019 -orcaVersion=7.11.0 +orcaVersion=7.52.0 kotlinVersion=1.3.20 enablePublishing=false spinnakerGradleVersion=7.0.1 diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/ExecutionMapper.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/ExecutionMapper.java index cad41366d..ff9650786 100644 --- a/kayenta-core/src/main/java/com/netflix/kayenta/canary/ExecutionMapper.java +++ b/kayenta-core/src/main/java/com/netflix/kayenta/canary/ExecutionMapper.java @@ -42,7 +42,7 @@ import java.util.stream.IntStream; import javax.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java index 0ab0dd50b..472db8033 100644 --- a/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java +++ b/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java @@ -35,7 +35,7 @@ import java.util.Map; import javax.annotation.Nonnull; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/util/FetchControllerUtils.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/util/FetchControllerUtils.java index 77a5e21c0..81bb6d3ac 100644 --- a/kayenta-core/src/main/java/com/netflix/kayenta/canary/util/FetchControllerUtils.java +++ b/kayenta-core/src/main/java/com/netflix/kayenta/canary/util/FetchControllerUtils.java @@ -22,7 +22,7 @@ import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; import java.util.stream.Stream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class FetchControllerUtils { diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/controllers/CanaryJudgesController.java b/kayenta-core/src/main/java/com/netflix/kayenta/controllers/CanaryJudgesController.java index c34378101..1d6402072 100644 --- a/kayenta-core/src/main/java/com/netflix/kayenta/controllers/CanaryJudgesController.java +++ b/kayenta-core/src/main/java/com/netflix/kayenta/controllers/CanaryJudgesController.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PathVariable; diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/index/CanaryConfigIndex.java b/kayenta-core/src/main/java/com/netflix/kayenta/index/CanaryConfigIndex.java index 04e0dd327..84d377612 100644 --- a/kayenta-core/src/main/java/com/netflix/kayenta/index/CanaryConfigIndex.java +++ b/kayenta-core/src/main/java/com/netflix/kayenta/index/CanaryConfigIndex.java @@ -25,7 +25,7 @@ import java.io.IOException; import java.util.*; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java b/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java index b8c048bb0..bd090b180 100644 --- a/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java +++ b/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java @@ -36,7 +36,7 @@ import java.util.*; import java.util.stream.Collectors; import javax.annotation.Nonnull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java b/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java index 45b80fee2..9c934f449 100644 --- a/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java +++ b/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java @@ -29,8 +29,8 @@ import java.net.Proxy; import java.nio.file.Files; import java.nio.file.Paths; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.tomcat.util.codec.binary.Base64; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; diff --git a/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/metrics/InfluxDbQueryBuilder.java b/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/metrics/InfluxDbQueryBuilder.java index e6576431b..c04ee6980 100644 --- a/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/metrics/InfluxDbQueryBuilder.java +++ b/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/metrics/InfluxDbQueryBuilder.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/AdminController.java b/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/AdminController.java index 135ce149f..217c2273f 100644 --- a/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/AdminController.java +++ b/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/AdminController.java @@ -21,9 +21,9 @@ import static com.netflix.appinfo.InstanceInfo.InstanceStatus.UP; import com.netflix.appinfo.InstanceInfo; -import com.netflix.config.validation.ValidationException; import com.netflix.discovery.StatusChangeEvent; import com.netflix.spinnaker.kork.eureka.RemoteStatusChangedEvent; +import com.netflix.spinnaker.kork.web.exceptions.ValidationException; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; diff --git a/kayenta-web/kayenta-web.gradle b/kayenta-web/kayenta-web.gradle index f6a06bac3..0fdcf02a3 100644 --- a/kayenta-web/kayenta-web.gradle +++ b/kayenta-web/kayenta-web.gradle @@ -40,4 +40,5 @@ dependencies { api "org.springframework.boot:spring-boot-starter-actuator" api "com.netflix.spinnaker.kork:kork-web" runtimeOnly "com.netflix.spinnaker.kork:kork-secrets-aws" + runtimeOnly "com.netflix.spinnaker.kork:kork-secrets-gcp" } diff --git a/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java b/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java index 41b0310fa..9fcba3b0f 100644 --- a/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java +++ b/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/kayenta-web/src/main/java/com/netflix/kayenta/controllers/MetricsServiceMetadataController.java b/kayenta-web/src/main/java/com/netflix/kayenta/controllers/MetricsServiceMetadataController.java index f9d0939c6..23bfa16e0 100644 --- a/kayenta-web/src/main/java/com/netflix/kayenta/controllers/MetricsServiceMetadataController.java +++ b/kayenta-web/src/main/java/com/netflix/kayenta/controllers/MetricsServiceMetadataController.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod;