Skip to content

Commit f2113b7

Browse files
Jonas-IsrJonas-Isr
committed
Merge branch 'main' into automate-release-notes
2 parents 3e7c1fe + d4abd9d commit f2113b7

File tree

306 files changed

+511
-536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+511
-536
lines changed

‎.github/workflows/fosstars-report.yml‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ name: "Fosstars (Security)"
22
on:
33
workflow_dispatch:
44
schedule:
5-
- cron: "0 0 * * *" # every day at midnight
5+
- cron: '42 03 * * MON-FRI' # 03:42 on weekdays, a somewhat random time to avoid producing load spikes on the GH actions infrastructure
66

77
env:
88
MVN_MULTI_THREADED_ARGS: --batch-mode --no-transfer-progress --fail-at-end --show-version --threads 1C
99
JAVA_VERSION: 17
10+
CVE_CACHE_KEY: cve-db
11+
CVE_CACHE_DIR: ~/.m2/repository/org/owasp/dependency-check-data
12+
CVE_CACHE_REF: refs/heads/main
1013

1114
jobs:
1215
create_fosstars_report:
@@ -22,29 +25,47 @@ jobs:
2225
distribution: "temurin"
2326
java-version: ${{ env.JAVA_VERSION }}
2427
cache: 'maven'
28+
2529
- name: Restore CVE Database
2630
uses: actions/cache/restore@v4
2731
with:
2832
path: ${{ env.CVE_CACHE_DIR }}
2933
key: ${{ env.CVE_CACHE_KEY }}
30-
fail-on-cache-miss: true
34+
# fail-on-cache-miss: true
3135

3236
- name: "Build SDK"
3337
run: |
3438
MVN_ARGS="${{ env.MVN_MULTI_THREADED_ARGS }} clean install -DskipTests -DskipFormatting"
3539
mvn $MVN_ARGS
3640
37-
- name: "OWASP Dependency check"
38-
run: mvn org.owasp:dependency-check-maven:10.0.4:check -DnvdApiKey=$NVD_API_KEY -DfailBuildOnCVSS=7 -DskipProvidedScope=true -DsuppressionFile=.pipeline/dependency-check-suppression.xml
39-
env:
40-
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
41-
42-
- name: "Fosstars rating"
41+
- name: "Fosstars Rating"
4342
uses: SAP/[email protected]
4443
with:
4544
report-branch: fosstars-report
4645
token: ${{ secrets.GITHUB_TOKEN }}
4746

47+
- name: "CVE Scan"
48+
env:
49+
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
50+
run: |
51+
mvn -T1 --no-transfer-progress dependency-check:check
52+
53+
- name: Delete Old CVE Cache
54+
run: |
55+
CACHE_IDS=$(gh cache list --key "${{ env.CVE_CACHE_KEY }}" --ref "${{ env.CVE_CACHE_REF }}" --json id | jq -r '.[] | .id')
56+
for CACHE_ID in $CACHE_IDS; do
57+
echo "Deleting cache with ID: $CACHE_ID"
58+
gh cache delete "${CACHE_ID}"
59+
done
60+
env:
61+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62+
63+
- name: Create Updated CVE Cache
64+
uses: actions/cache/save@v4
65+
with:
66+
path: ${{ env.CVE_CACHE_DIR }}
67+
key: ${{ env.CVE_CACHE_KEY }}
68+
4869
- name: "Slack Notification"
4970
if: failure()
5071
uses: slackapi/[email protected]

‎.github/workflows/update-vulnerability-database.yaml‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎.pipeline/checkstyle-suppressions.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<suppressions>
88
<!-- Suppress generated clients -->
99
<suppress files="[/\\]core[/\\]client[/\\]" checks=".*"/>
10-
<suppress files="[/\\]orchestration[/\\]client[/\\]" checks=".*"/>
10+
<suppress files="[/\\]core[/\\]model[/\\]" checks=".*"/>
11+
<suppress files="[/\\]orchestration[/\\]model[/\\]" checks=".*"/>
1112
<!-- Suppress TODOs -->
1213
<suppress files="OpenAiChatCompletionParameters.java" checks="TodoComment" lines="95" />
1314
<suppress files="OpenAiChatMessage.java" checks="TodoComment" lines="255,271" />

‎.pipeline/spotbugs-exclusions.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
<Match>
44
<Or>
55
<Package name="com.sap.ai.sdk.core.client"/>
6-
<Package name="com.sap.ai.sdk.core.client.model"/>
7-
<Package name="com.sap.ai.sdk.orchestration.client"/>
8-
<Package name="com.sap.ai.sdk.orchestration.client.model"/>
6+
<Package name="com.sap.ai.sdk.core.model"/>
7+
<Package name="com.sap.ai.sdk.orchestration.model"/>
98
</Or>
109
</Match>
1110
</FindBugsFilter>

‎core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<configuration>
176176
<inputSpec>${project.basedir}/src/main/resources/spec/aicore.yaml</inputSpec>
177177
<apiPackage>com.sap.ai.sdk.core.client</apiPackage>
178-
<modelPackage>com.sap.ai.sdk.core.client.model</modelPackage>
178+
<modelPackage>com.sap.ai.sdk.core.model</modelPackage>
179179
<additionalProperties>
180180
<pojoBuilderMethodName>create</pojoBuilderMethodName>
181181
<pojoBuildMethodName/>

‎core/src/main/java/com/sap/ai/sdk/core/DeploymentCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.sap.ai.sdk.core;
22

33
import com.sap.ai.sdk.core.client.DeploymentApi;
4-
import com.sap.ai.sdk.core.client.model.AiDeployment;
4+
import com.sap.ai.sdk.core.model.AiDeployment;
55
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
66
import java.util.HashSet;
77
import java.util.Map;

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import com.sap.ai.sdk.core.AiCoreDestination;
44
import com.sap.ai.sdk.core.AiCoreService;
5-
import com.sap.ai.sdk.core.client.model.BckndAllArgoCDApplicationData;
6-
import com.sap.ai.sdk.core.client.model.BckndArgoCDApplicationBaseData;
7-
import com.sap.ai.sdk.core.client.model.BckndArgoCDApplicationCreationResponse;
8-
import com.sap.ai.sdk.core.client.model.BckndArgoCDApplicationData;
9-
import com.sap.ai.sdk.core.client.model.BckndArgoCDApplicationDeletionResponse;
10-
import com.sap.ai.sdk.core.client.model.BckndArgoCDApplicationModificationResponse;
11-
import com.sap.ai.sdk.core.client.model.BckndArgoCDApplicationRefreshResponse;
12-
import com.sap.ai.sdk.core.client.model.BckndArgoCDApplicationStatus;
13-
import com.sap.ai.sdk.core.client.model.KubesubmitV4ApplicationsCreateRequest;
5+
import com.sap.ai.sdk.core.model.BckndAllArgoCDApplicationData;
6+
import com.sap.ai.sdk.core.model.BckndArgoCDApplicationBaseData;
7+
import com.sap.ai.sdk.core.model.BckndArgoCDApplicationCreationResponse;
8+
import com.sap.ai.sdk.core.model.BckndArgoCDApplicationData;
9+
import com.sap.ai.sdk.core.model.BckndArgoCDApplicationDeletionResponse;
10+
import com.sap.ai.sdk.core.model.BckndArgoCDApplicationModificationResponse;
11+
import com.sap.ai.sdk.core.model.BckndArgoCDApplicationRefreshResponse;
12+
import com.sap.ai.sdk.core.model.BckndArgoCDApplicationStatus;
13+
import com.sap.ai.sdk.core.model.KubesubmitV4ApplicationsCreateRequest;
1414
import com.sap.cloud.sdk.services.openapi.core.AbstractOpenApiService;
1515
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
1616
import java.util.HashMap;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import com.sap.ai.sdk.core.AiCoreDestination;
44
import com.sap.ai.sdk.core.AiCoreService;
5-
import com.sap.ai.sdk.core.client.model.AiArtifact;
6-
import com.sap.ai.sdk.core.client.model.AiArtifactCreationResponse;
7-
import com.sap.ai.sdk.core.client.model.AiArtifactList;
8-
import com.sap.ai.sdk.core.client.model.AiArtifactPostData;
5+
import com.sap.ai.sdk.core.model.AiArtifact;
6+
import com.sap.ai.sdk.core.model.AiArtifactCreationResponse;
7+
import com.sap.ai.sdk.core.model.AiArtifactList;
8+
import com.sap.ai.sdk.core.model.AiArtifactPostData;
99
import com.sap.cloud.sdk.services.openapi.apiclient.ApiClient;
1010
import com.sap.cloud.sdk.services.openapi.core.AbstractOpenApiService;
1111
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import com.sap.ai.sdk.core.AiCoreDestination;
44
import com.sap.ai.sdk.core.AiCoreService;
5-
import com.sap.ai.sdk.core.client.model.AiConfiguration;
6-
import com.sap.ai.sdk.core.client.model.AiConfigurationBaseData;
7-
import com.sap.ai.sdk.core.client.model.AiConfigurationCreationResponse;
8-
import com.sap.ai.sdk.core.client.model.AiConfigurationList;
5+
import com.sap.ai.sdk.core.model.AiConfiguration;
6+
import com.sap.ai.sdk.core.model.AiConfigurationBaseData;
7+
import com.sap.ai.sdk.core.model.AiConfigurationCreationResponse;
8+
import com.sap.ai.sdk.core.model.AiConfigurationList;
99
import com.sap.cloud.sdk.services.openapi.apiclient.ApiClient;
1010
import com.sap.cloud.sdk.services.openapi.core.AbstractOpenApiService;
1111
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
import com.sap.ai.sdk.core.AiCoreDestination;
44
import com.sap.ai.sdk.core.AiCoreService;
5-
import com.sap.ai.sdk.core.client.model.AiDeploymentBulkModificationRequest;
6-
import com.sap.ai.sdk.core.client.model.AiDeploymentBulkModificationResponse;
7-
import com.sap.ai.sdk.core.client.model.AiDeploymentCreationRequest;
8-
import com.sap.ai.sdk.core.client.model.AiDeploymentCreationResponse;
9-
import com.sap.ai.sdk.core.client.model.AiDeploymentDeletionResponse;
10-
import com.sap.ai.sdk.core.client.model.AiDeploymentList;
11-
import com.sap.ai.sdk.core.client.model.AiDeploymentModificationRequest;
12-
import com.sap.ai.sdk.core.client.model.AiDeploymentModificationResponse;
13-
import com.sap.ai.sdk.core.client.model.AiDeploymentResponseWithDetails;
14-
import com.sap.ai.sdk.core.client.model.RTALogCommonResponse;
5+
import com.sap.ai.sdk.core.model.AiDeploymentBulkModificationRequest;
6+
import com.sap.ai.sdk.core.model.AiDeploymentBulkModificationResponse;
7+
import com.sap.ai.sdk.core.model.AiDeploymentCreationRequest;
8+
import com.sap.ai.sdk.core.model.AiDeploymentCreationResponse;
9+
import com.sap.ai.sdk.core.model.AiDeploymentDeletionResponse;
10+
import com.sap.ai.sdk.core.model.AiDeploymentList;
11+
import com.sap.ai.sdk.core.model.AiDeploymentModificationRequest;
12+
import com.sap.ai.sdk.core.model.AiDeploymentModificationResponse;
13+
import com.sap.ai.sdk.core.model.AiDeploymentResponseWithDetails;
14+
import com.sap.ai.sdk.core.model.RTALogCommonResponse;
1515
import com.sap.cloud.sdk.services.openapi.apiclient.ApiClient;
1616
import com.sap.cloud.sdk.services.openapi.core.AbstractOpenApiService;
1717
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;

0 commit comments

Comments
 (0)