Merge branch 'main' into chore/enable-owasp-cache

Author: MatKuhr

.github/workflows/e2e-test.yaml

@@ -2,16 +2,24 @@ name: "End-to-end Tests"
 on:
   workflow_dispatch:
   schedule:
-    - cron: 0 2 * * *
+    - cron: 15 2 * * MON-FRI
 
 env:
   MVN_MULTI_THREADED_ARGS: --batch-mode --no-transfer-progress --fail-at-end --show-version --threads 1C
   JAVA_VERSION: 17
 
 jobs:
-
   end-to-end-tests:
-    # https://wiki.one.int.sap/wiki/display/DevFw/SUGAR
+    strategy:
+      fail-fast: false
+      matrix:
+        environment: [ canary, production ]
+        exclude:
+          - environment: production
+            # secret-name: AI_CORE_PRODUCTION
+        include:
+          - environment: canary
+            secret-name: AI_CORE_CANARY
     runs-on: ubuntu-latest
     steps:
 
@@ -33,10 +41,10 @@ jobs:
       - name: "Run tests"
         run: |
           MVN_ARGS="${{ env.MVN_MULTI_THREADED_ARGS }} surefire:test -pl :spring-app -DskipTests=false"
-          mvn $MVN_ARGS
+          mvn $MVN_ARGS "-Daicore.landscape=${{ matrix.environment }}"
         env:
           # See "End-to-end test application instructions" on the README.md to update the secret
-          AICORE_SERVICE_KEY: ${{ secrets.AICORE_SERVICE_KEY }}
+          AICORE_SERVICE_KEY: ${{ secrets[matrix.secret-name] }}
 
       - name: "Start Application Locally"
         run: |
@@ -53,7 +61,7 @@ jobs:
           done
         env:
           # See "End-to-end test application instructions" on the README.md to update the secret
-          AICORE_SERVICE_KEY: ${{ secrets.AICORE_SERVICE_KEY }}
+          AICORE_SERVICE_KEY: ${{ secrets[matrix.secret-name] }}
 
       - name: "Health Check"
         # print response body with headers to stdout.  q:body only  O:print  -:stdout  S:headers

core/pom.xml

@@ -157,6 +157,8 @@
             <groupId>com.sap.cloud.sdk.datamodel</groupId>
             <artifactId>openapi-generator-maven-plugin</artifactId>
             <configuration>
+              <skip>true</skip>
+              <!-- TODO: remove this once Cloud SDK 5.15.0 is released -->
               <outputDirectory>${project.basedir}/src/main/java</outputDirectory>
               <apiMaturity>released</apiMaturity>
               <enableOneOfAnyOfGeneration>true</enableOneOfAnyOfGeneration>

core/src/main/java/com/sap/ai/sdk/core/client/ApplicationApi.java

@@ -27,7 +27,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
- * AI Core in version 2.35.0.
+ * AI Core in version 2.36.0.
  *
  * <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
  * batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/ArtifactApi.java

@@ -24,7 +24,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
- * AI Core in version 2.35.0.
+ * AI Core in version 2.36.0.
  *
  * <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
  * batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/ConfigurationApi.java

@@ -24,7 +24,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
- * AI Core in version 2.35.0.
+ * AI Core in version 2.36.0.
  *
  * <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
  * batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/DeploymentApi.java

@@ -31,7 +31,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
- * AI Core in version 2.35.0.
+ * AI Core in version 2.36.0.
  *
  * <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
  * batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/DockerRegistrySecretApi.java

@@ -25,7 +25,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
- * AI Core in version 2.35.0.
+ * AI Core in version 2.36.0.
  *
  * <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
  * batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/ExecutableApi.java

@@ -20,7 +20,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
- * AI Core in version 2.35.0.
+ * AI Core in version 2.36.0.
  *
  * <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
  * batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/ExecutionApi.java

@@ -31,7 +31,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
- * AI Core in version 2.35.0.
+ * AI Core in version 2.36.0.
  *
  * <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
  * batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/ExecutionScheduleApi.java

@@ -25,7 +25,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
- * AI Core in version 2.35.0.
+ * AI Core in version 2.36.0.
  *
  * <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
  * batch job, for example to pre-process or train your models, or perform batch inference. Serve