feat(build): add halyard-integration module to exercise the just-built docker image

.github/workflows/build.yml

@@ -37,6 +37,19 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
         run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
+      - name: Build local slim container image for testing
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile.slim
+          load: true
+          platforms: local
+          tags: |
+            "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated"
+      - name: Test local slim container image
+        env:
+          FULL_DOCKER_IMAGE_NAME: "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated"
+        run: ./gradlew ${{ steps.build_variables.outputs.REPO }}-integration:test
       - name: Login to GAR
         # Only run this on repositories in the 'spinnaker' org, not on forks.
         if: startsWith(github.repository, 'spinnaker/')

.github/workflows/pr.yml

@@ -51,3 +51,16 @@ jobs:
           tags: |
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-ubuntu"
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-ubuntu"
+      - name: Build local slim container image for testing
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile.slim
+          load: true
+          platforms: local
+          tags: |
+            "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}"
+      - name: Test local slim container image
+        env:
+          FULL_DOCKER_IMAGE_NAME: "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}"
+        run: ./gradlew ${{ steps.build_variables.outputs.REPO }}-integration:test

Dockerfile.slim

@@ -34,4 +34,6 @@ RUN adduser -S -G spinnaker -u 1000 spinnaker
 COPY halyard-web/build/install/halyard /opt/halyard
 USER spinnaker
 
+HEALTHCHECK CMD curl http://localhost:8064/health | grep UP || exit 1
+
 CMD ["/opt/halyard/bin/halyard"]

Dockerfile.ubuntu

@@ -30,4 +30,6 @@ RUN adduser --system --uid 1000 --group spinnaker
 COPY halyard-web/build/install/halyard /opt/halyard
 USER spinnaker
 
+HEALTHCHECK CMD curl http://localhost:8064/health | grep UP || exit 1
+
 CMD ["/opt/halyard/bin/halyard"]

halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/services/v1/DeploymentService.java

@@ -29,6 +29,7 @@
 import com.netflix.spinnaker.halyard.core.problem.v1.ProblemSet;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -43,7 +44,7 @@ public class DeploymentService {
 
   @Autowired private HalconfigParser halconfigParser;
 
-  @Autowired private PersistentStorageService storageService;
+  @Lazy @Autowired private PersistentStorageService storageService;
 
   public void setDeploymentConfiguration(
       String deploymentName, DeploymentConfiguration deploymentConfiguration) {

halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/validate/v1/ValidatorCollection.java

@@ -26,6 +26,7 @@
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -35,6 +36,7 @@
 @Slf4j
 @Component
 public class ValidatorCollection {
+  @Lazy
   @Autowired(required = false)
   private List<Validator> validators = new ArrayList<>();
 

halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/validate/v1/providers/ecs/EcsAccountValidator.java

@@ -6,7 +6,6 @@
 import com.netflix.spinnaker.halyard.config.problem.v1.ConfigProblemSetBuilder;
 import com.netflix.spinnaker.halyard.config.services.v1.AccountService;
 import com.netflix.spinnaker.halyard.config.services.v1.ConfigService;
-import com.netflix.spinnaker.halyard.config.services.v1.ProviderService;
 import com.netflix.spinnaker.halyard.core.problem.v1.Problem.Severity;
 import java.util.List;
 import java.util.Optional;
@@ -15,8 +14,6 @@
 
 @Component
 public class EcsAccountValidator extends Validator<EcsAccount> {
-  @Autowired ProviderService providerService;
-
   @Autowired AccountService accountService;
 
   @Autowired ConfigService configService;

halyard-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/GoogleProfileReader.java

@@ -19,22 +19,15 @@
 package com.netflix.spinnaker.halyard.core.registry.v1;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.api.client.http.HttpRequestInitializer;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.storage.Storage;
-import com.google.api.services.storage.StorageScopes;
-import com.netflix.spinnaker.halyard.core.provider.v1.google.GoogleCredentials;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collections;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
 
@@ -56,16 +49,6 @@ private Yaml getYamlParser() {
     return applicationContext.getBean(Yaml.class);
   }
 
-  @Bean
-  public Storage applicationDefaultGoogleStorage() {
-    return createGoogleStorage(true);
-  }
-
-  @Bean
-  public Storage unauthenticatedGoogleStorage() {
-    return createGoogleStorage(false);
-  }
-
   public InputStream readProfile(String artifactName, String version, String profileName)
       throws IOException {
     String path = profilePath(artifactName, version, profileName);
@@ -118,36 +101,4 @@ private InputStream getContents(String objectName) throws IOException {
 
     return new ByteArrayInputStream(output.toByteArray());
   }
-
-  private Storage createGoogleStorage(boolean useApplicationDefaultCreds) {
-    JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
-    String applicationName = "Spinnaker/Halyard";
-    HttpRequestInitializer requestInitializer = null;
-
-    if (useApplicationDefaultCreds) {
-      try {
-        com.google.auth.oauth2.GoogleCredentials credentials =
-            com.google.auth.oauth2.GoogleCredentials.getApplicationDefault();
-        if (credentials.createScopedRequired()) {
-          credentials =
-              credentials.createScoped(
-                  Collections.singleton(StorageScopes.DEVSTORAGE_FULL_CONTROL));
-        }
-        requestInitializer = GoogleCredentials.setHttpTimeout(credentials);
-        log.info("Loaded application default credential for reading BOMs & profiles.");
-      } catch (Exception e) {
-        log.debug(
-            "No application default credential could be loaded for reading BOMs & profiles. Continuing unauthenticated: {}",
-            e.getMessage());
-      }
-    }
-    if (requestInitializer == null) {
-      requestInitializer = GoogleCredentials.retryRequestInitializer();
-    }
-
-    return new Storage.Builder(
-            GoogleCredentials.buildHttpTransport(), jsonFactory, requestInitializer)
-        .setApplicationName(applicationName)
-        .build();
-  }
 }

halyard-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/GoogleProfileReaderConfig.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2017 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package com.netflix.spinnaker.halyard.core.registry.v1;
+
+import com.google.api.client.http.HttpRequestInitializer;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.services.storage.Storage;
+import com.google.api.services.storage.StorageScopes;
+import com.netflix.spinnaker.halyard.core.provider.v1.google.GoogleCredentials;
+import java.util.Collections;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnProperty("spinnaker.config.input.gcs.enabled")
+@Slf4j
+public class GoogleProfileReaderConfig {
+  @Bean
+  public Storage applicationDefaultGoogleStorage() {
+    return createGoogleStorage(true);
+  }
+
+  @Bean
+  public Storage unauthenticatedGoogleStorage() {
+    return createGoogleStorage(false);
+  }
+
+  private Storage createGoogleStorage(boolean useApplicationDefaultCreds) {
+    JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+    String applicationName = "Spinnaker/Halyard";
+    HttpRequestInitializer requestInitializer = null;
+
+    if (useApplicationDefaultCreds) {
+      try {
+        com.google.auth.oauth2.GoogleCredentials credentials =
+            com.google.auth.oauth2.GoogleCredentials.getApplicationDefault();
+        if (credentials.createScopedRequired()) {
+          credentials =
+              credentials.createScoped(
+                  Collections.singleton(StorageScopes.DEVSTORAGE_FULL_CONTROL));
+        }
+        requestInitializer = GoogleCredentials.setHttpTimeout(credentials);
+        log.info("Loaded application default credential for reading BOMs & profiles.");
+      } catch (Exception e) {
+        log.debug(
+            "No application default credential could be loaded for reading BOMs & profiles. Continuing unauthenticated: {}",
+            e.getMessage());
+      }
+    }
+    if (requestInitializer == null) {
+      requestInitializer = GoogleCredentials.retryRequestInitializer();
+    }
+
+    return new Storage.Builder(
+            GoogleCredentials.buildHttpTransport(), jsonFactory, requestInitializer)
+        .setApplicationName(applicationName)
+        .build();
+  }
+}

halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/SpinnakerMonitoringDaemonService.java

@@ -47,8 +47,6 @@ public abstract class SpinnakerMonitoringDaemonService
 
   @Autowired MetricRegistryProfileFactoryBuilder metricRegistryProfileFactoryBuilder;
 
-  @Autowired List<SpinnakerService> services;
-
   @Override
   public SpinnakerArtifact getArtifact() {
     return SpinnakerArtifact.SPINNAKER_MONITORING_DAEMON;

halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/distributed/google/GoogleClouddriverBootstrapService.java

@@ -27,6 +27,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @EqualsAndHashCode(callSuper = true)
@@ -37,7 +38,7 @@ public class GoogleClouddriverBootstrapService extends ClouddriverBootstrapServi
   final DeployPriority deployPriority = new DeployPriority(6);
   final boolean requiredToBootstrap = true;
 
-  @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
+  @Lazy @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
 
   @Override
   public List<SidecarService> getSidecars(SpinnakerRuntimeSettings runtimeSettings) {

halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/distributed/google/GoogleClouddriverService.java

@@ -28,6 +28,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @EqualsAndHashCode(callSuper = true)
@@ -38,7 +39,7 @@ public class GoogleClouddriverService extends ClouddriverService
   final DeployPriority deployPriority = new DeployPriority(4);
   final boolean requiredToBootstrap = false;
 
-  @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
+  @Lazy @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
 
   @Override
   public List<Profile> getProfiles(

halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/distributed/google/GoogleConsulServerService.java

@@ -30,14 +30,15 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @EqualsAndHashCode(callSuper = true)
 @Component
 @Data
 public class GoogleConsulServerService extends ConsulServerService
     implements GoogleDistributedService<ConsulApi> {
-  @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
+  @Lazy @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
 
   @Override
   public String getDefaultInstanceType() {

halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/distributed/google/GoogleDeckService.java

@@ -27,6 +27,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @EqualsAndHashCode(callSuper = true)
@@ -37,7 +38,7 @@ public class GoogleDeckService extends DeckService
   final DeployPriority deployPriority = new DeployPriority(4);
   final boolean requiredToBootstrap = false;
 
-  @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
+  @Lazy @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
 
   @Override
   public List<SidecarService> getSidecars(SpinnakerRuntimeSettings runtimeSettings) {

halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/distributed/google/GoogleEchoService.java

@@ -27,6 +27,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @EqualsAndHashCode(callSuper = true)
@@ -37,7 +38,7 @@ public class GoogleEchoService extends EchoService
   final DeployPriority deployPriority = new DeployPriority(4);
   final boolean requiredToBootstrap = false;
 
-  @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
+  @Lazy @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
 
   @Override
   public List<SidecarService> getSidecars(SpinnakerRuntimeSettings runtimeSettings) {

halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/distributed/google/GoogleFiatService.java

@@ -27,6 +27,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @EqualsAndHashCode(callSuper = true)
@@ -37,7 +38,7 @@ public class GoogleFiatService extends FiatService
   final DeployPriority deployPriority = new DeployPriority(4);
   final boolean requiredToBootstrap = false;
 
-  @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
+  @Lazy @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
 
   @Override
   public List<SidecarService> getSidecars(SpinnakerRuntimeSettings runtimeSettings) {

halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/distributed/google/GoogleFront50Service.java

@@ -28,6 +28,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @EqualsAndHashCode(callSuper = true)
@@ -38,7 +39,7 @@ public class GoogleFront50Service extends Front50Service
   final DeployPriority deployPriority = new DeployPriority(4);
   final boolean requiredToBootstrap = false;
 
-  @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
+  @Lazy @Delegate @Autowired GoogleDistributedServiceDelegate googleDistributedServiceDelegate;
 
   @Override
   public List<Profile> getProfiles(