Merge branch 'main' into remove-iaas-from-java-sdk-blocklist

Author: marceljk

.github/workflows/ci.yaml

@@ -43,11 +43,6 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install SSH Key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          known_hosts: ${{ vars.SSH_KNOWN_HOSTS }}
       - name: Install Java
         uses: actions/setup-java@v4
         with:
@@ -80,11 +75,6 @@ jobs:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install SSH Key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          known_hosts: ${{ vars.SSH_KNOWN_HOSTS }}
       - name: Install Java
         uses: actions/setup-java@v4
         with:
@@ -120,11 +110,6 @@ jobs:
       matrix:
         java-version: ["17", "21", "25"]
     steps:
-      - name: Install SSH Key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          known_hosts: ${{ vars.SSH_KNOWN_HOSTS }}
       - name: Install Java
         uses: actions/setup-java@v4
         with:

scripts/download-oas.sh

@@ -30,12 +30,6 @@ fi
 
 git clone "${OAS_REPO}" "${ROOT_DIR}/oas" --quiet
 
-# OPTIONAL: Lock to a specific commit
-if [[ "$OAS_REPO" == "https://github.com/stackitcloud/stackit-api-specifications.git" ]]; then
-	cd "${ROOT_DIR}/oas"
-	git checkout 335aa32af4d6c0d2a036b8567773da2f051f7efb
-fi
-
 # NOTE: Everything below is needed for the "compatibility layer" logic. 
 # It can be completely removed once the compatibility layer isn't needed anymore in the SDK.
 

scripts/generate-sdk/languages/go.sh

@@ -200,7 +200,30 @@ generate_go_sdk() {
 
             # generate package.go
             printf "package ${service}\n" > "${SERVICES_FOLDER}/${service}/package.go" 
+        
+            # If the service has a CHANGELOG file, move it inside the service folder
+            if [ -f "${sdk_services_backup_dir}/${service}/CHANGELOG.md" ]; then
+                echo "Found ${service} \"CHANGELOG\" file"
+                cp -r "${sdk_services_backup_dir}/${service}/CHANGELOG.md" "${SERVICES_FOLDER}/${service}/CHANGELOG.md"
+            fi
 
+            # If the service has a NOTICE file, move it inside the service folder
+            if [ -f "${sdk_services_backup_dir}/${service}/NOTICE.txt" ]; then
+                echo "Found ${service} \"NOTICE\" file"
+                cp -r "${sdk_services_backup_dir}/${service}/NOTICE.txt" "${SERVICES_FOLDER}/${service}/NOTICE.txt"
+            fi
+
+            # If the service has a VERSION file, move it inside the service folder
+            if [ -f "${sdk_services_backup_dir}/${service}/VERSION" ]; then
+                echo "Found ${service} \"VERSION\" file"
+                cp -r "${sdk_services_backup_dir}/${service}/VERSION" "${SERVICES_FOLDER}/${service}/VERSION"
+            fi
+
+            # If the service has oas_commit file, move it inside the service folder
+            if [ -f "${sdk_services_backup_dir}/${service}/oas_commit" ]; then
+                echo "Found ${service} \"oas_commit\" file"
+                cp -r "${sdk_services_backup_dir}/${service}/oas_commit" "${SERVICES_FOLDER}/${service}/oas_commit"
+            fi
 
             cd "${SERVICES_FOLDER}/${service}"
             go work use .
@@ -298,6 +321,12 @@ generate_go_sdk() {
             echo "Found ${service} \"VERSION\" file"
             cp -r "${sdk_services_backup_dir}/${service}/VERSION" "${SERVICES_FOLDER}/${service}/VERSION"
         fi
+
+        # If the service has oas_commit file, move it inside the service folder
+        if [ -f "${sdk_services_backup_dir}/${service}/oas_commit" ]; then
+            echo "Found ${service} \"oas_commit\" file"
+            cp -r "${sdk_services_backup_dir}/${service}/oas_commit" "${SERVICES_FOLDER}/${service}/oas_commit"
+        fi
 
         cd "${SERVICES_FOLDER}/${service}"
         go work use .