		@@ -41,20 +41,20 @@ # STACKIT CLI release workflow.
		passphrase: ${{ secrets.GPG_PASSPHRASE }}
		- name: Set up keychain
		run: \|
		echo -n $SIGNING_CERTIFICATE_BASE64 \| base64 -d -o ./ApplicationID.p12
		KEYCHAIN_PATH=$RUNNER_TEMP/ios_signing_temp.keychain-db
		security create-keychain -p "${{ secrets.TEMP_KEYCHAIN }}" $KEYCHAIN_PATH
		security default-keychain -s $KEYCHAIN_PATH
		security unlock-keychain -p "${{ secrets.TEMP_KEYCHAIN }}" $KEYCHAIN_PATH
		security import ./ApplicationID.p12 -P "${{ secrets.APPLICATION_ID }}" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
		security list-keychain -d user -s $KEYCHAIN_PATH
		echo -n $AUTHKEY_BASE64 \| base64 -d -o ./AuthKey.p8
		xcrun notarytool store-credentials stackit-cli -i $APPLE_ISSUER -d $APPLE_KEY_ID -k AuthKey.p8 --keychain $KEYCHAIN_PATH
		rm ./ApplicationID.p12
		rm ./AuthKey.p8
		env:
		APPLE_ISSUER: ${{ secrets.APPLE_ISSUER }}
		APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
		SIGNING_CERTIFICATE_BASE64: ${{ secrets.APPLICATION_ID_CERT }}
		AUTHKEY_BASE64: ${{ secrets.APPLE_API_KEY }}
		# - name: Set up keychain
		# run: \|
		# echo -n $SIGNING_CERTIFICATE_BASE64 \| base64 -d -o ./ApplicationID.p12
		# KEYCHAIN_PATH=$RUNNER_TEMP/ios_signing_temp.keychain-db
		# security create-keychain -p "${{ secrets.TEMP_KEYCHAIN }}" $KEYCHAIN_PATH
		# security default-keychain -s $KEYCHAIN_PATH
		# security unlock-keychain -p "${{ secrets.TEMP_KEYCHAIN }}" $KEYCHAIN_PATH
		# security import ./ApplicationID.p12 -P "${{ secrets.APPLICATION_ID }}" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
		# security list-keychain -d user -s $KEYCHAIN_PATH
		# echo -n $AUTHKEY_BASE64 \| base64 -d -o ./AuthKey.p8
		# xcrun notarytool store-credentials stackit-cli -i $APPLE_ISSUER -d $APPLE_KEY_ID -k AuthKey.p8 --keychain $KEYCHAIN_PATH
		# rm ./ApplicationID.p12
		# rm ./AuthKey.p8
		# env:
		# APPLE_ISSUER: ${{ secrets.APPLE_ISSUER }}
		# APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
		# SIGNING_CERTIFICATE_BASE64: ${{ secrets.APPLICATION_ID_CERT }}
		# AUTHKEY_BASE64: ${{ secrets.APPLE_API_KEY }}
		- name: Install Aptly
		@@ -67,3 +67,3 @@ run: brew install aptly
		with:
		args: release --clean
		args: release --clean --skip=publish
		env:
		@@ -73,3 +73,2 @@ GITHUB_TOKEN: ${{ secrets.CLI_RELEASE }}
		- name: Publish packages to APT repo
		if: contains(github.ref_name, '-') == false
		env:
		@@ -76,0 +75,0 @@ GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

+1

-1

internal/cmd/secrets-manager/instance/delete/delete.go

+@@ -72,3 +72,3 @@ package delete
+			cmd.Printf("Deleted instance %s \n", model.InstanceId)
+			cmd.Printf("Deleted instance %q \n", model.InstanceId)
+			return nil
+@@ -75,0 +75,0 @@ },

+17

-16

scripts/publish-apt-packages.sh

		@@ -14,22 +14,23 @@ #!/bin/bash
		CUSTOM_KEYRING="custom-keyring"
		DISTRIBUTION="stackit"
		APTLY_CONFIG_FILE_PATH="./.aptly.conf"
		GORELEASER_PACKAGES_FOLDER="dist/"

		# Create a local mirror of the current state of the remote APT repository
		printf ">>> Creating mirror \n"
		curl ${OBJECT_STORAGE_ENDPOINT}/${PUBLIC_KEY_BUCKET_NAME}/${PUBLIC_KEY_FILE} >public.asc
		gpg --no-default-keyring --keyring ./${CUSTOM_KEYRING}.gpg --import public.asc
		aptly mirror create -keyring="${CUSTOM_KEYRING}.gpg" current "${OBJECT_STORAGE_ENDPOINT}/${APT_BUCKET_NAME}" stackit
		# # Create a local mirror of the current state of the remote APT repository
		# printf ">>> Creating mirror \n"
		# curl ${OBJECT_STORAGE_ENDPOINT}/${PUBLIC_KEY_BUCKET_NAME}/${PUBLIC_KEY_FILE} >public.asc
		# gpg --no-default-keyring --keyring ./${CUSTOM_KEYRING}.gpg --import public.asc
		# aptly mirror create -keyring="${CUSTOM_KEYRING}.gpg" current "${OBJECT_STORAGE_ENDPOINT}/${APT_BUCKET_NAME}" ${DISTRIBUTION}

		# Update the mirror to the latest state
		printf "\n>>> Updating mirror \n"
		aptly mirror update current
		# # Update the mirror to the latest state
		# printf "\n>>> Updating mirror \n"
		# aptly mirror update current

		# Create a snapshot of the mirror
		printf "\n>>> Creating snapshop from mirror \n"
		aptly snapshot create current-snapshot from mirror current
		# # Create a snapshot of the mirror
		# printf "\n>>> Creating snapshop from mirror \n"
		# aptly snapshot create current-snapshot from mirror current

		# Create a new fresh local APT repo
		printf "\n>>> Creating fresh local repo \n"
		aptly repo create -distribution="stackit-cli" new-repo
		aptly repo create -distribution="${DISTRIBUTION}" new-repo

		@@ -44,8 +45,8 @@ # Add new generated .deb packages to the new local repo

		# Merge new-snapshot into current-snapshot creating a new snapshot updated-snapshot
		printf "\n>>> Merging snapshots \n"
		aptly snapshot pull -no-remove -architectures="amd64,i386,arm64" current-snapshot new-snapshot updated-snapshot stackit
		# # Merge new-snapshot into current-snapshot creating a new snapshot updated-snapshot
		# printf "\n>>> Merging snapshots \n"
		# aptly snapshot pull -no-remove -architectures="amd64,i386,arm64" current-snapshot new-snapshot updated-snapshot ${DISTRIBUTION}

		# Publish the new snapshot to the remote repo
		printf "\n>>> Publishing updated snapshot \n"
		aptly publish switch -gpg-key="${GPG_PRIVATE_KEY_ID}" -passphrase "${GPG_PASSPHRASE}" -config "${APTLY_CONFIG_FILE_PATH}" stackit "s3:${APT_BUCKET_NAME}:" updated-snapshot
		aptly publish switch -gpg-key="${GPG_PRIVATE_KEY_ID}" -passphrase "${GPG_PASSPHRASE}" -config "${APTLY_CONFIG_FILE_PATH}" ${DISTRIBUTION} "s3:${APT_BUCKET_NAME}:" new-snapshot