Merge remote-tracking branch 'remotes/origin/master' into spring-properties-naming

# Conflicts:
#	operator-framework-spring-boot-starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/TestConfiguration.java

Author: s-soroosh

.github/workflows/master-snapshot-release.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Run unit tests
         run: mvn -B test -P no-integration-tests --file pom.xml
       - name: Set up Minikube
-        uses: manusa/actions-setup-minikube@v2.0.1
+        uses: manusa/actions-setup-minikube@v2.3.0
         with:
           minikube version: 'v1.15.1'
           kubernetes version: ${{ matrix.kubernetes }}

.github/workflows/pr.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Run unit tests
         run: mvn -B test -P no-integration-tests --file pom.xml
       - name: Set up Minikube
-        uses: manusa/actions-setup-minikube@v2.0.1
+        uses: manusa/actions-setup-minikube@v2.3.0
         with:
           minikube version: 'v1.15.1'
           kubernetes version: ${{ matrix.kubernetes }}

operator-framework-spring-boot-starter-test/pom.xml

@@ -52,5 +52,19 @@
       <artifactId>kubernetes-server-mock</artifactId>
       <version>4.12.0</version>
     </dependency>
+    <dependency>
+      <groupId>io.javaoperatorsdk</groupId>
+      <artifactId>operator-framework-spring-boot-starter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-test-autoconfigure</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

operator-framework-spring-boot-starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/EnableMockOperator.java

@@ -2,8 +2,21 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import org.springframework.boot.test.autoconfigure.properties.PropertyMapping;
 import org.springframework.context.annotation.Import;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Import(TestConfiguration.class)
-public @interface EnableMockOperator {}
+@PropertyMapping("io.javaoperatorsdk.test")
+public @interface EnableMockOperator {
+
+  /**
+   * Define a list of files that contain CustomResourceDefinitions for the tested operator. If the
+   * file to be loaded is shall be loaded from the classpath prefix it with 'classpath', otherwise
+   * provide a path relative to the current working directory.
+   *
+   * @return List of files
+   */
+  @PropertyMapping("crd-paths")
+  String[] crdPaths() default {};
+}

operator-framework-spring-boot-starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/TestConfiguration.java

@@ -6,27 +6,28 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.mockwebserver.Context;
+import io.javaoperatorsdk.operator.springboot.starter.OperatorAutoConfiguration;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
+import java.util.stream.Stream;
 import okhttp3.mockwebserver.MockWebServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ResourceUtils;
 
 @Configuration
+@ImportAutoConfiguration(OperatorAutoConfiguration.class)
+@EnableConfigurationProperties(TestConfigurationProperties.class)
 public class TestConfiguration {
 
   private static final Logger log = LoggerFactory.getLogger(TestConfiguration.class);
 
-  @Value("${javaoperatorsdk.test.crdPaths}")
-  private List<String> crdPaths;
-
   @Bean
   public KubernetesMockServer k8sMockServer() {
     final var server =
@@ -41,22 +42,24 @@ public KubernetesMockServer k8sMockServer() {
   }
 
   @Bean
-  public KubernetesClient kubernetesClient(KubernetesMockServer server) {
+  public KubernetesClient kubernetesClient(
+      KubernetesMockServer server, TestConfigurationProperties properties) {
     final var client = server.createClient();
 
-    crdPaths.forEach(
-        crdPath -> {
-          CustomResourceDefinition crd = null;
-          try {
-            crd = Serialization.unmarshal(new FileInputStream(ResourceUtils.getFile(crdPath)));
-          } catch (FileNotFoundException e) {
-            log.warn("CRD with path {} not found!", crdPath);
-            e.printStackTrace();
-            return;
-          }
-
-          client.apiextensions().v1().customResourceDefinitions().create(crd);
-        });
+    Stream.concat(properties.getCrdPaths().stream(), properties.getGlobalCrdPaths().stream())
+        .forEach(
+            crdPath -> {
+              CustomResourceDefinition crd;
+              try {
+                crd = Serialization.unmarshal(new FileInputStream(ResourceUtils.getFile(crdPath)));
+              } catch (FileNotFoundException e) {
+                log.warn("CRD with path {} not found!", crdPath);
+                e.printStackTrace();
+                return;
+              }
+
+              client.apiextensions().v1().customResourceDefinitions().create(crd);
+            });
 
     return client;
   }

operator-framework-spring-boot-starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/TestConfigurationProperties.java

@@ -0,0 +1,29 @@
+package io.javaoperatorsdk.operator.springboot.starter.test;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("io.javaoperatorsdk.test")
+public class TestConfigurationProperties {
+
+  private List<String> globalCrdPaths = new ArrayList<>();
+
+  private List<String> crdPaths = new ArrayList<>();
+
+  public List<String> getCrdPaths() {
+    return crdPaths;
+  }
+
+  public void setCrdPaths(List<String> crdPaths) {
+    this.crdPaths = crdPaths;
+  }
+
+  public List<String> getGlobalCrdPaths() {
+    return globalCrdPaths;
+  }
+
+  public void setGlobalCrdPaths(List<String> globalCrdPaths) {
+    this.globalCrdPaths = globalCrdPaths;
+  }
+}

operator-framework-spring-boot-starter-test/src/test/java/io/javaoperatorsdk/operator/springboot/starter/test/EnableMockOperatorTests.java

@@ -0,0 +1,40 @@
+package io.javaoperatorsdk.operator.springboot.starter.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.operator.Operator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.autoconfigure.json.JsonTest;
+import org.springframework.context.ApplicationContext;
+
+@JsonTest
+@EnableMockOperator(crdPaths = "classpath:crd.yml")
+class EnableMockOperatorTests {
+
+  @Autowired KubernetesClient client;
+
+  @Autowired ApplicationContext applicationContext;
+
+  @Test
+  void testCrdLoaded() {
+    assertThat(applicationContext.getBean(Operator.class)).isNotNull();
+    assertThat(
+            client
+                .customResourceDefinitions()
+                .withName("customservices.sample.javaoperatorsdk")
+                .get())
+        .isNotNull();
+    assertThat(
+            client
+                .customResourceDefinitions()
+                .withName("customservices.global.sample.javaoperatorsdk")
+                .get())
+        .isNotNull();
+  }
+
+  @SpringBootApplication
+  static class SpringBootTestApplication {}
+}

operator-framework-spring-boot-starter-test/src/test/resources/application.properties

@@ -0,0 +1 @@
+io.javaoperatorsdk.test.global-crd-paths=classpath:global-crd.yml

operator-framework-spring-boot-starter-test/src/test/resources/crd.yml

@@ -0,0 +1,17 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: customservices.sample.javaoperatorsdk
+spec:
+  group: sample.javaoperatorsdk
+  scope: Namespaced
+  names:
+    plural: customservices
+    singular: customservice
+    kind: CustomService
+    shortNames:
+      - cs
+  versions:
+    - name: v1
+      served: true
+      storage: true

operator-framework-spring-boot-starter-test/src/test/resources/global-crd.yml

@@ -0,0 +1,17 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: customservices.global.sample.javaoperatorsdk
+spec:
+  group: sample.javaoperatorsdk
+  scope: Namespaced
+  names:
+    plural: customservices
+    singular: customservice
+    kind: CustomService
+    shortNames:
+      - cs
+  versions:
+    - name: v1
+      served: true
+      storage: true