feat: resolved pipelien failing to upload rpm

Author: akhilmhdh

.github/workflows/release-package-deb.yml

@@ -88,12 +88,11 @@ jobs:
                   sudo apt-get update
                   sudo apt-get install -y rpm
 
-            # - name: Install rpmrepo-update
-            #   run: |
-            #       curl -L https://github.com/e2llm/rpmrepo-update/releases/latest/download/rpmrepo-update-linux-amd64 -o rpmrepo-update
-            #       chmod +x rpmrepo-update
-            #       sudo mv rpmrepo-update /usr/local/bin/
-            - run: pip install --upgrade cloudsmith-cli
+            - name: Install repogen
+              run: |
+                  curl -L https://github.com/ralt/repogen/releases/latest/download/repogen-linux-amd64 -o repogen
+                  chmod +x repogen
+                  sudo mv repogen /usr/local/bin/
 
             - name: Install AWS CLI
               run: |
@@ -110,10 +109,10 @@ jobs:
               env:
                   INFISICAL_BINARY_S3_BUCKET: ${{ secrets.INFISICAL_BINARY_S3_BUCKET }}
                   GPG_SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
+                  GPG_SIGNING_KEY_PASSPHRASE: ${{ secrets.GPG_SIGNING_KEY_PASSPHRASE }}
                   AWS_ACCESS_KEY_ID: ${{ secrets.INFISICAL_BINARY_REPO_AWS_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.INFISICAL_BINARY_REPO_AWS_SECRET_ACCESS_KEY }}
                   CLOUDFRONT_DISTRIBUTION_ID: ${{ secrets.INFISICAL_BINARY_REPO_CLOUDFRONT_DISTRIBUTION_ID }}
-                  CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
 
     create-github-release:
         name: Create GitHub Release

upload_to_s3.sh

@@ -5,34 +5,45 @@ for i in *.deb; do
     deb-s3 upload --bucket=$INFISICAL_BINARY_S3_BUCKET --prefix=deb --visibility=private --sign=$GPG_SIGNING_KEY_ID --preserve-versions  $i
 done
 
-# for i in *.rpm; do
-#     [ -f "$i" ] || break
-#     
-#     # strip out .amazon2023 suffix if present
-#     new_name=$(echo "$i" | sed 's/.amazon2023//g')
-#     if [ "$i" != "$new_name" ]; then
-#         mv "$i" "$new_name"
-#     fi
-#     
-#     #sign the rpm package
-#     rpmsign --addsign --key-id="$GPG_SIGNING_KEY_ID" "$new_name"
-#     
-#     aws s3 cp "$new_name" "s3://$INFISICAL_BINARY_S3_BUCKET/dummy/rpm/Packages/"
-# done
-
 for i in *.rpm; do
     [ -f "$i" ] || break
-    # stripe of amazon2023
+
+    # strip out .amazon2023 suffix if present
     new_name=$(echo "$i" | sed 's/.amazon2023//g')
-    # rename
     if [ "$i" != "$new_name" ]; then
         mv "$i" "$new_name"
     fi
 
-    cloudsmith push rpm --republish infisical/infisical-core/any-distro/any-version "$new_name"
+    # sign the rpm package
+    rpmsign --addsign --key-id="$GPG_SIGNING_KEY_ID" "$new_name"
+
+    # upload signed package to S3
+    aws s3 cp "$new_name" "s3://$INFISICAL_BINARY_S3_BUCKET/rpm/Packages/"
 done
 
-# regenerate RPM repository metadata with rpmrepo-update
-# if ls *.rpm 1> /dev/null 2>&1; then
-#     rpmrepo-update --backend s3 --repo-root s3://$INFISICAL_BINARY_S3_BUCKET/dummy/rpm --s3-region us-east-1 --sign-repodata --gpg-key "$GPG_SIGNING_KEY_ID" add *.rpm
-# fi
+# regenerate RPM repository metadata with repogen
+if ls *.rpm 1> /dev/null 2>&1; then
+    REPO_VERSION="40"
+    REPO_ARCH="x86_64"
+
+    # map S3 flat repodata into the versioned structure repogen expects
+    mkdir -p "repo/${REPO_VERSION}/${REPO_ARCH}/repodata"
+    aws s3 sync "s3://$INFISICAL_BINARY_S3_BUCKET/rpm/repodata" "repo/${REPO_VERSION}/${REPO_ARCH}/repodata" --delete
+
+    # export GPG private key for repogen
+    GPG_KEY_FILE=$(mktemp)
+    gpg --batch --pinentry-mode loopback --export-secret-keys --armor "$GPG_SIGNING_KEY_ID" > "$GPG_KEY_FILE"
+
+    # generate repo metadata incrementally
+    repogen generate \
+        --input-dir . \
+        --output-dir repo \
+        --incremental \
+        --gpg-key "$GPG_KEY_FILE" \
+        --gpg-passphrase "$GPG_SIGNING_KEY_PASSPHRASE"
+
+    rm -f "$GPG_KEY_FILE"
+
+    # sync the generated repodata back to the flat S3 structure
+    aws s3 sync "repo/${REPO_VERSION}/${REPO_ARCH}/repodata" "s3://$INFISICAL_BINARY_S3_BUCKET/rpm/repodata"
+fi