diff --git a/build.gradle b/build.gradle index ee3e5143a43..f4150849467 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ allprojects { apply plugin: 'groovy' ext { - spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.111.0' + spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.111.1' } def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion] diff --git a/clouddriver-appengine/clouddriver-appengine.gradle b/clouddriver-appengine/clouddriver-appengine.gradle index 00ea9d5ef92..7fbfac3b775 100644 --- a/clouddriver-appengine/clouddriver-appengine.gradle +++ b/clouddriver-appengine/clouddriver-appengine.gradle @@ -4,6 +4,7 @@ dependencies { compile spinnaker.dependency("frigga") compile spinnaker.dependency("bootActuator") compile spinnaker.dependency("bootWeb") + compile spinnaker.dependency("korkArtifacts") // TODO(dpeach): move to spinnaker/spinnaker-dependencies. compile "com.google.apis:google-api-services-appengine:v1-rev4-1.22.0" diff --git a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/ops/DeployAppengineAtomicOperation.groovy b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/ops/DeployAppengineAtomicOperation.groovy index e317a982866..0a56f69d9bf 100644 --- a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/ops/DeployAppengineAtomicOperation.groovy +++ b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/ops/DeployAppengineAtomicOperation.groovy @@ -17,13 +17,13 @@ package com.netflix.spinnaker.clouddriver.appengine.deploy.ops import com.netflix.spinnaker.clouddriver.appengine.AppengineJobExecutor -import com.netflix.spinnaker.clouddriver.appengine.gcsClient.AppengineGcsRepositoryClient import com.netflix.spinnaker.clouddriver.appengine.deploy.AppengineMutexRepository import com.netflix.spinnaker.clouddriver.appengine.deploy.AppengineServerGroupNameResolver import com.netflix.spinnaker.clouddriver.appengine.deploy.description.DeployAppengineDescription import com.netflix.spinnaker.clouddriver.appengine.deploy.exception.AppengineOperationException -import com.netflix.spinnaker.clouddriver.appengine.storage.config.StorageConfigurationProperties +import com.netflix.spinnaker.clouddriver.appengine.gcsClient.AppengineGcsRepositoryClient import com.netflix.spinnaker.clouddriver.appengine.storage.GcsStorageService +import com.netflix.spinnaker.clouddriver.appengine.storage.config.StorageConfigurationProperties import com.netflix.spinnaker.clouddriver.data.task.Task import com.netflix.spinnaker.clouddriver.data.task.TaskRepository import com.netflix.spinnaker.clouddriver.deploy.DeploymentResult diff --git a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/validators/DeployAppengineDescriptionValidator.groovy b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/validators/DeployAppengineDescriptionValidator.groovy index bafe89e95a2..bb1491f7c01 100644 --- a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/validators/DeployAppengineDescriptionValidator.groovy +++ b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/validators/DeployAppengineDescriptionValidator.groovy @@ -53,6 +53,7 @@ class DeployAppengineDescriptionValidator extends DescriptionValidator storage.downloadStorageObject(obj, dest) }) } diff --git a/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/StorageConfiguration.java b/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/StorageConfiguration.java index dd94f7f8aa2..7525937f295 100644 --- a/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/StorageConfiguration.java +++ b/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/StorageConfiguration.java @@ -17,32 +17,25 @@ package com.netflix.spinnaker.clouddriver.appengine.storage; import com.netflix.spinnaker.clouddriver.appengine.storage.config.StorageConfigurationProperties; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.beans.factory.annotation.Autowired; + import java.io.IOException; import java.security.GeneralSecurityException; @Configuration -@EnableConfigurationProperties -@EnableScheduling @ConditionalOnProperty("storage.gcs.enabled") +@EnableConfigurationProperties(StorageConfigurationProperties.class) +@EnableScheduling class StorageConfiguration { @Autowired StorageConfigurationProperties storageAccountInfo; - @Bean - @ConfigurationProperties("storage.gcs") - StorageConfigurationProperties storageConfigurationProperties() { - return new StorageConfigurationProperties(); - } - @Bean GcsStorageService.Factory storageServiceFactory(String clouddriverUserAgentApplicationName) { try { diff --git a/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/config/StorageConfigurationProperties.java b/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/config/StorageConfigurationProperties.java index 126df0d2132..8e7ea4df413 100644 --- a/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/config/StorageConfigurationProperties.java +++ b/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/config/StorageConfigurationProperties.java @@ -17,15 +17,17 @@ package com.netflix.spinnaker.clouddriver.appengine.storage.config; import groovy.transform.ToString; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; import retrofit.client.Response; import retrofit.mime.TypedByteArray; + import java.util.ArrayList; import java.util.List; import java.util.NoSuchElementException; -import lombok.Data; - @Data +@ConfigurationProperties("storage.gcs") public class StorageConfigurationProperties { @Data @ToString(includeNames = true)