Merge branch 'main' into kms-beta

JanStern · web-flow · commit 36daef5f438c · 2025-09-05T21:07:23.000+02:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v5
       
       - name: Install go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -21,26 +21,26 @@ jobs:
     runs-on: macOS-latest
     env:
       SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
-      # Needed to publish new packages to our S3-hosted APT repo
-      AWS_ACCESS_KEY_ID: ${{ secrets.OBJECT_STORAGE_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.OBJECT_STORAGE_SECRET_ACCESS_KEY }}
     steps:
       - name: Checkout
         uses: actions/checkout@v5
         with:
           # Allow goreleaser to access older tag information.
           fetch-depth: 0
+      
       - name: Install go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true
+      
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@v6
         id: import_gpg
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
+      
       - name: Set up keychain
         run: |
           echo -n $SIGNING_CERTIFICATE_BASE64 | base64 -d -o ./ApplicationID.p12
@@ -61,17 +61,54 @@ jobs:
           APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
           SIGNING_CERTIFICATE_BASE64: ${{ secrets.APPLICATION_ID_CERT }}
           AUTHKEY_BASE64: ${{ secrets.APPLE_API_KEY }}
-      - name: Install Aptly
-        run: brew install aptly
       - name: Install Snapcraft
         uses: samuelmeuli/action-snapcraft@v3
+      
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.CLI_RELEASE }}
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
+
+      # artifacts need to be passed to the "publish-apt" job somehow
+      - name: Upload artifacts to workflow
+        uses: actions/upload-artifact@v4
+        with:
+          name: goreleaser-dist-temp
+          path: dist
+          retention-days: 1
+  
+  publish-apt:
+    name: Publish APT
+    runs-on: macOS-latest
+    needs: [goreleaser]
+    env:
+      # Needed to publish new packages to our S3-hosted APT repo
+      AWS_ACCESS_KEY_ID: ${{ secrets.OBJECT_STORAGE_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.OBJECT_STORAGE_SECRET_ACCESS_KEY }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      # use the artifacts from the "goreleaser" job
+      - name: Download artifacts from workflow
+        uses: actions/download-artifact@v5
+        with:
+          name: goreleaser-dist-temp
+          path: dist
+      
+      - name: Install Aptly
+        run: brew install aptly
+      
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        id: import_gpg
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+      
       - name: Publish packages to APT repo
         if: contains(github.ref_name, '-') == false
         env:
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -23,7 +23,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: "Mark old PRs as stale"
-        uses: actions/stale@v9
+        uses: actions/stale@v10
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-pr-message: "This PR was marked as stale after ${{ env.DAYS_BEFORE_PR_STALE }} days of inactivity and will be closed after another ${{ env.DAYS_BEFORE_PR_CLOSE }} days of further inactivity. If this PR should be kept open, just add a comment, remove the stale label or push new commits to it."
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -124,7 +124,7 @@ homebrew_casks:
       name: CLI Release Bot
       email: noreply@stackit.de
     homepage: "https://github.com/stackitcloud/stackit-cli"
-    description: "A command-line interface to manage STACKIT resources.\nThis CLI is in a beta state. More services and functionality will be supported soon."
+    description: "A command-line interface to manage STACKIT resources."
     license: "Apache-2.0"
     # If set to auto, the release will not be uploaded to the homebrew tap repo
     # if the tag has a prerelease indicator (e.g. v0.0.1-alpha1)
@@ -144,12 +144,12 @@ snapcrafts:
     # centre graphical frontends
     title: STACKIT CLI
     summary: A command-line interface to manage STACKIT resources.
-    description: "A command-line interface to manage STACKIT resources.\nThis CLI is in a beta state. More services and functionality will be supported soon."
+    description: "A command-line interface to manage STACKIT resources."
     license: Apache-2.0
     confinement: classic
     # Grade "devel" will only release to `edge` and `beta` channels
     # Grade "stable" will also release to the `candidate` and `stable` channels
-    grade: devel
+    grade: stable
     # Whether to publish the Snap to the store
     publish: true
 
diff --git a/AUTHENTICATION.md b/AUTHENTICATION.md
@@ -92,7 +92,12 @@ The expected format of the service account key is a **json** with the following
 > - setting the environment variable `STACKIT_PRIVATE_KEY_PATH`
 > - setting `STACKIT_PRIVATE_KEY_PATH` in the credentials file (see above)
 
-4. The CLI will search for the keys and, if valid, will use them to get access and refresh tokens which will be used to authenticate all the requests.
+4. Alternative, if you want to pass the keys directly without storing a file on disk:
+
+   - setting the environment variable `STACKIT_SERVICE_ACCOUNT_KEY` with the content of the service account key
+   - optional: setting the environment variable `STACKIT_PRIVATE_KEY` with the content of the private key
+
+5. The CLI will search for the keys and, if valid, will use them to get access and refresh tokens which will be used to authenticate all the requests.
 
 ### Token flow
 
diff --git a/INSTALLATION.md b/INSTALLATION.md
@@ -67,7 +67,7 @@ $ stackit config profile import -c @default.json --name myProfile
 The STACKIT CLI is available as a [Snap](https://snapcraft.io/stackit), and can be installed via:
 
 ```shell
-sudo snap install stackit --beta --classic
+sudo snap install stackit --classic
 ```
 
 or via the [Snap Store](https://snapcraft.io/snap-store) for desktop.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 <br>
 </div>
 
-# STACKIT CLI (BETA)
+# STACKIT CLI
 
 [![Go Report Card](https://goreportcard.com/badge/github.com/stackitcloud/stackit-cli)](https://goreportcard.com/report/github.com/stackitcloud/stackit-cli) ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/stackitcloud/stackit-cli) [![GitHub License](https://img.shields.io/github/license/stackitcloud/stackit-cli)](https://www.apache.org/licenses/LICENSE-2.0)
 
@@ -19,7 +19,6 @@ The STACKIT CLI allows you to manage your STACKIT services and resources as well
 - DNS zones and record-sets
 - Databases such as PostgreSQL Flex, MongoDB Flex and SQLServer Flex
 
-This CLI is in a BETA state. More services and functionality will be supported soon.
 Your feedback is appreciated! 
 Feel free to open [GitHub issues](https://github.com/stackitcloud/stackit-cli) to provide feature requests and bug reports.
 
diff --git a/docs/stackit.md b/docs/stackit.md
@@ -5,8 +5,7 @@ Manage STACKIT resources using the command line
 ### Synopsis
 
 Manage STACKIT resources using the command line.
-This CLI is in a BETA state.
-More services and functionality will be supported soon. Your feedback is appreciated!
+Your feedback is appreciated!
 
 ```
 stackit [flags]
diff --git a/go.mod b/go.mod
@@ -243,7 +243,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.1
 	github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.1
 	github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.3.1
-	github.com/stackitcloud/stackit-sdk-go/services/observability v0.12.0
+	github.com/stackitcloud/stackit-sdk-go/services/observability v0.14.0
 	github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.25.1
 	github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.1
 	github.com/subosito/gotenv v1.6.0 // indirect
diff --git a/go.sum b/go.sum
@@ -587,8 +587,8 @@ github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.2 h1:BQ+qAkVS/a
 github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.2/go.mod h1:oc8Mpwl7O6EZwG0YxfhOzNCJwNQBWK5rFh764OtxoMY=
 github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.3.1 h1:4jsFLbDVEosYTgQz6lPds1E9KDOiHwjuhWqcG+lo5B4=
 github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.3.1/go.mod h1:j1SHAS5lN8F9b/iPUOfjAl9QAA9tOT7NKOiDEzcM2zc=
-github.com/stackitcloud/stackit-sdk-go/services/observability v0.12.0 h1:myi6k4LQJJGaMGwzBKp5hlatrCNNf8FR+/gqnzxnGb8=
-github.com/stackitcloud/stackit-sdk-go/services/observability v0.12.0/go.mod h1:tJEOi6L0le4yQZPGwalup/PZ13gqs1aCQDqlUs2cYW0=
+github.com/stackitcloud/stackit-sdk-go/services/observability v0.14.0 h1:oewwaYjABWbNqDkmSwIXmjDBK4a46+tnznyZSXh3Xk0=
+github.com/stackitcloud/stackit-sdk-go/services/observability v0.14.0/go.mod h1:tJEOi6L0le4yQZPGwalup/PZ13gqs1aCQDqlUs2cYW0=
 github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.1 h1:50n87uZn0EvSP9hJGLqd3Wm2hfqbyh7BMGGCk7axgqA=
 github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.1/go.mod h1:jfguuSPa56Z5Bzs/Xg/CI37XzPo5Zn5lzC5LhfuT8Qc=
 github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.2.1 h1:K8vXele3U6b5urcSIpq21EkVblWfPDY3eMPSuQ48TkI=
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -54,7 +54,7 @@ func NewRootCmd(version, date string, p *print.Printer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:               "stackit",
 		Short:             "Manage STACKIT resources using the command line",
-		Long:              "Manage STACKIT resources using the command line.\nThis CLI is in a BETA state.\nMore services and functionality will be supported soon. Your feedback is appreciated!",
+		Long:              "Manage STACKIT resources using the command line.\nYour feedback is appreciated!",
 		Args:              args.NoArgs,
 		SilenceErrors:     true, // Error is beautified in a custom way before being printed
 		SilenceUsage:      true,
@@ -97,7 +97,7 @@ func NewRootCmd(version, date string, p *print.Printer) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			if flags.FlagToBoolValue(p, cmd, "version") {
-				p.Outputf("STACKIT CLI (beta)\n")
+				p.Outputf("STACKIT CLI\n")
 
 				parsedDate, err := time.Parse(time.RFC3339, date)
 				if err != nil {
diff --git a/internal/pkg/auth/templates/login-successful.html b/internal/pkg/auth/templates/login-successful.html
@@ -6,7 +6,7 @@
     <base href="/" />
     <meta
       name="description"
-      content="A command-line interface to manage STACKIT resources. This CLI is in a BETA state. More services and functionality will be supported soon."
+      content="A command-line interface to manage STACKIT resources."
     />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta property="og:title" content="STACKIT" />
diff --git a/scripts/publish-apt-packages.sh b/scripts/publish-apt-packages.sh
@@ -4,8 +4,6 @@
 # Usage: ./publish-apt-packages.sh
 set -eo pipefail
 
-ROOT_DIR=$(git rev-parse --show-toplevel)
-
 PACKAGES_BUCKET_URL="https://packages.stackit.cloud"
 PUBLIC_KEY_FILE_PATH="keys/key.gpg"
 APT_REPO_PATH="apt/cli"
@@ -27,7 +25,7 @@ aptly mirror create -config "${APTLY_CONFIG_FILE_PATH}" -keyring="${CUSTOM_KEYRI
 
 # Update the mirror to the latest state
 printf "\n>>> Updating mirror \n"
-aptly mirror update -keyring="${CUSTOM_KEYRING_FILE}" current
+aptly mirror update -keyring="${CUSTOM_KEYRING_FILE}" -max-tries=5 current
 
 # Create a snapshot of the mirror
 printf "\n>>> Creating snapshop from mirror \n"
