PR to merge develop into main

.github/scripts/generate-changelog.sh

@@ -150,7 +150,16 @@ generate_release_notes() {
 
 # Main execution
 main() {
-  # Generate changelog
+  # Handle --notes-only flag
+  if [[ "$*" == *"--notes-only"* ]]; then
+    generate_release_notes
+    if command -v prettier >/dev/null 2>&1; then
+      prettier --write "$RELEASE_NOTES_FILE"
+    fi
+    # echo "Release notes generated at $RELEASE_NOTES_FILE"
+    return 0
+  fi
+
   if [ -f "$CHANGELOG_FILE" ]; then
     echo "Updating existing changelog..."
     generate_changelog_content >"$TEMP_FILE"
@@ -162,17 +171,12 @@ main() {
     generate_changelog_content >"$CHANGELOG_FILE"
   fi
 
-  # Generate release notes
   generate_release_notes
 
-  # Format files if Prettier is available
   if command -v prettier >/dev/null 2>&1; then
     prettier --write "$CHANGELOG_FILE" "$RELEASE_NOTES_FILE"
-  else
-    echo "Note: Prettier is not installed. Skipping formatting."
   fi
 
-  # Update GitHub release
   if [ -n "${GITHUB_ACTIONS:-}" ] && [ -n "${GITHUB_TOKEN:-}" ]; then
     if gh release view "$RELEASE_TAG" >/dev/null 2>&1; then
       gh release edit "$RELEASE_TAG" --notes-file "$RELEASE_NOTES_FILE"
@@ -184,4 +188,10 @@ main() {
   echo "Changelog ($CHANGELOG_FILE) and release notes ($RELEASE_NOTES_FILE) generated successfully"
 }
 
+# Handle --notes-only flag
+if [[ "$*" == *"--notes-only"* ]]; then
+  main --notes-only
+  exit 0
+fi
+
 main "$@"

.github/workflows/releaser-internal.yaml

@@ -0,0 +1,116 @@
+name: Beta Release on Develop
+
+on:
+  push:
+    branches:
+      - develop
+    # paths-ignore:
+    #   - "**.md"
+  workflow_dispatch:
+
+# concurrency:
+#   group: release-develop
+#   cancel-in-progress: true
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    if: "contains(github.event.head_commit.message, '[release]') || github.event_name == 'workflow_dispatch'"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          cache: true
+
+      - name: Install dependencies
+        run: |
+          npm install --global semver
+          sudo apt-get -y install gh
+
+      - name: Get current tag
+        id: tags
+        run: |
+          CURRENT_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          echo "current_tag=$CURRENT_TAG" >> $GITHUB_OUTPUT
+
+      - name: Determine new version
+        id: new_version
+        run: |
+          CURRENT_TAG=${{ steps.tags.outputs.current_tag }}
+          echo "Current tag: ${CURRENT_TAG:-<none>}"
+          if [ -z "$CURRENT_TAG" ]; then
+            echo "First release - creating v0.1.0-beta-internal"
+            echo "new_tag=v0.1.0-beta-internal" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          VERSION=$(echo "$CURRENT_TAG" | sed 's/^v//' | sed 's/-beta-internal//')
+          NEW_VERSION=$(semver "$VERSION" -i patch)
+          NEW_TAG="v${NEW_VERSION}-beta-internal"
+          echo "new_tag=$NEW_TAG" >> $GITHUB_OUTPUT
+          echo "New tag: $NEW_TAG"
+
+      - name: Create release tag
+        if: steps.new_version.outputs.new_tag
+        run: |
+          echo "Creating tag: ${{ steps.new_version.outputs.new_tag }}"
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git tag -a "${{ steps.new_version.outputs.new_tag }}" -m "Release ${{ steps.new_version.outputs.new_tag }}"
+          git push origin "${{ steps.new_version.outputs.new_tag }}"
+          echo "Tag pushed successfully"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Generate Release Notes
+        if: steps.new_version.outputs.new_tag
+        env:
+          RELEASE_TAG: ${{ steps.new_version.outputs.new_tag }}
+          PREVIOUS_TAG: ${{ steps.tags.outputs.current_tag }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Make script executable
+          chmod +x .github/scripts/generate-changelog.sh
+
+          # Generate notes
+          .github/scripts/generate-changelog.sh --notes-only
+
+          # Add beta header to existing file (instead of renaming)
+          echo -e "## 🧪 BETA RELEASE\n*For testing purposes only*\n\n$(cat RELEASE_NOTES.md)" > RELEASE_NOTES.md
+
+          # Store for GoReleaser (multi-line safe)
+          {
+            echo "NOTES<<EOF"
+            cat RELEASE_NOTES.md
+            echo "EOF"
+          } >> $GITHUB_ENV
+
+          # Keep your prettier formatting
+          if command -v prettier >/dev/null 2>&1; then
+            prettier --write RELEASE_NOTES.md
+            # Update the env variable if formatting changed it
+            {
+              echo "NOTES<<EOF"
+              cat RELEASE_NOTES.md
+              echo "EOF"
+            } >> $GITHUB_ENV
+          fi
+
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          distribution: goreleaser
+          version: v2.9.0
+          args: release --clean -f ./.goreleaser-internal.yaml --release-notes RELEASE_NOTES.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/releaser.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      # - develop
   workflow_dispatch:
 
 concurrency:
@@ -168,7 +168,7 @@ jobs:
             --head ${{ steps.create_branch.outputs.branch_name }} \
             --title "Release ${{ steps.new_version.outputs.new_tag }}" \
             --body "Automated release PR for ${{ steps.new_version.outputs.new_tag }}" \
-            --reviewer mousamdahal || echo "PR creation failed, possibly no changes or reviewer issue"
+            --reviewer sarosejoshi || echo "PR creation failed, possibly no changes or reviewer issue"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.goreleaser-internal.yaml

@@ -0,0 +1,33 @@
+version: 2
+project_name: awsctl
+
+before:
+  hooks:
+    - go mod tidy
+    - go mod verify
+
+builds:
+  - env:
+      - CGO_ENABLED=0
+    binary: awsctl
+    goos:
+      - linux
+      - windows
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+    ldflags:
+      - -s -w -X main.Version={{.Version}}-beta-internal
+
+release:
+  github:
+    owner: berrybytes
+    name: awsctl
+  extra_files:
+    - glob: ./LICENSE
+    - glob: ./README.md
+  footer: >-
+    ---
+    BETA RELEASE - FOR TESTING ONLY
+    Released by [GoReleaser](https://github.com/goreleaser/goreleaser).

CHANGELOG.md

@@ -1,3 +1,53 @@
+# awsctl - v0.4.0
+
+## Changes since v0.3.0
+
+- [c9b909a](https://github.com/BerryBytes/awsctl/commit/c9b909aeabb6410473d40ec744d215e9722d8ae2) Edited the script to use dynamic version for local installation (sawnjordan <sawnjordan@gmail.com>)
+- [89cc9d0](https://github.com/BerryBytes/awsctl/commit/89cc9d0a54b7c52d05f11943e68ed68f44dd1336) Eks cmd now will prompt for region and profile only (sawnjordan <sawnjordan@gmail.com>)
+- [002e966](https://github.com/BerryBytes/awsctl/commit/002e96688a0bc6f5e936310a51f9cf6c6b876192) Increased the sso setup time limit from 30 sec to 10 min (sawnjordan <sawnjordan@gmail.com>)
+- [fe9001d](https://github.com/BerryBytes/awsctl/commit/fe9001d2660783fc81b7c92b422365463a7c1364) On sso setup, removed extra prompt and setup via start url and region (sawnjordan <sawnjordan@gmail.com>)
+- [0306d0e](https://github.com/BerryBytes/awsctl/commit/0306d0ed33239873aa626b0d624b9fa4f913e0ff) Increased the sso login timelimit to 10 minutes from 30 sec (sawnjordan <sawnjordan@gmail.com>)
+
+Generated on 2025-07-02T10:38:37Z
+
+# awsctl - v0.3.0
+
+## Changes since v0.2.0
+
+- [f45af40](https://github.com/BerryBytes/awsctl/commit/f45af409453e635ac4c144f73a26f38f71a49fc8) Changed reviewer to sarose sir instead of mousam (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [f94bc10](https://github.com/BerryBytes/awsctl/commit/f94bc10524a887e754b25116205ac7ffdff07dc6) Added version flag compatibility on the root command (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [1546539](https://github.com/BerryBytes/awsctl/commit/1546539c2f772929a98ff02e0bf58e4c904f2751) Removed zocli instance (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [0cdf2fe](https://github.com/BerryBytes/awsctl/commit/0cdf2fe73325efed69cc57baae2e530f14017125) Fixed the rds instance listing prompt issue of re-rendering (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [ca7caae](https://github.com/BerryBytes/awsctl/commit/ca7caaeb38dacca5c4ed896708554f7c79dc7ace) Added commit msg format in submitting PR docs (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [772ef34](https://github.com/BerryBytes/awsctl/commit/772ef349b09688367a56f00fc5fa183864d12b7b) Changed readme for first time installation of awsctl (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [ffd2350](https://github.com/BerryBytes/awsctl/commit/ffd2350dc2935955dd5b0c69a20d1e6e14f96d1e) Fixed region validation on setup cmd and double prompt on init cmd (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [a3c5ada](https://github.com/BerryBytes/awsctl/commit/a3c5ada58d7f2f274097603e19d7d2fe229cfa79) Added coderabbit integration info on readme (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [b19db49](https://github.com/BerryBytes/awsctl/commit/b19db4995c9cb73890e084c305db4e16eb9ce9dc) Changed commands.md for vpc endpoint for private instance (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [1d02fd5](https://github.com/BerryBytes/awsctl/commit/1d02fd5476fd13f3472a6740536452bb9541e11a) Included requirement for ec2 instance connect in commands.md (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [d7f5895](https://github.com/BerryBytes/awsctl/commit/d7f589522e1b0960507a1b4cb9461ff82f7db3b8) Added commands.md for details command usage and linked on readme (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [2a29cd6](https://github.com/BerryBytes/awsctl/commit/2a29cd66e780749fad6c382436b6c82a2754381e) Changed the command description on readme (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [4445f7b](https://github.com/BerryBytes/awsctl/commit/4445f7bd0a039880b0ff2d77a0318755a31a5a16) Remove the unwanted test files from previous sso flow (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [a7953f6](https://github.com/BerryBytes/awsctl/commit/a7953f681e905cb512a238ede487b0f9a2c76be4) Fixed access issue on rds while selecting profile for multiple profile (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [81f5e12](https://github.com/BerryBytes/awsctl/commit/81f5e12930949152f7a3703c1cebdb6d037036cf) Access issue on eks command while selecting profile (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [5b3212c](https://github.com/BerryBytes/awsctl/commit/5b3212c416f9b679f31ad46f8754ab27683e08f9) Silence the temp file removal (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [b7484d2](https://github.com/BerryBytes/awsctl/commit/b7484d2b558559b9b99af0b0ed75356ef0ea5c62) Fix golanci-lint issue (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [dccf4da](https://github.com/BerryBytes/awsctl/commit/dccf4da5aeef9af26935b04d5004012e08b40cb0) Fix golangci-lint issue (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [3a26940](https://github.com/BerryBytes/awsctl/commit/3a26940c1240d74da8bd40c1150b9e000aa3161e) Fixed golangci-lint issue (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [0ee5915](https://github.com/BerryBytes/awsctl/commit/0ee5915bc720b4d4544f6f67bcc392969ccf9e60) Fixed golangci-lint issue of github action (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [6f69fbd](https://github.com/BerryBytes/awsctl/commit/6f69fbde92cdc38048ca0d56f6c8502aeb2233f9) Added option to set default profile on sso init command (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [078340c](https://github.com/BerryBytes/awsctl/commit/078340c928b03c0a1e345647bde5d3ffb1866c51) Refactor code suggested by coderabbit (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [e97d547](https://github.com/BerryBytes/awsctl/commit/e97d547e7c406e9d6c7bd97cf1ea791abd292b7b) Fixed strict checking of region when user is authenticated (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [4c54d09](https://github.com/BerryBytes/awsctl/commit/4c54d094800ef3d078a5dca2f37be69dfefa9ac6) Added region validation for eks command (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [54624d6](https://github.com/BerryBytes/awsctl/commit/54624d6b04431cf051e8ef66a3a2a0767aea8da0) Handled user terminated error on manual cluster input (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [b834f91](https://github.com/BerryBytes/awsctl/commit/b834f91f2f9de35b893b538b3a2c01af9f9d97bf) Added input validation for manual update of eks cluster (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [d2e4a66](https://github.com/BerryBytes/awsctl/commit/d2e4a667b64fd2a4aa7d5d8e3f202ed3c96f6c35) Changed the config file to new structure and installation command to develop branch (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [0377e87](https://github.com/BerryBytes/awsctl/commit/0377e87c89d475bb755b31a731b71e1a8f338ca5) Added test case for prompter and changed the related file (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [a70ce84](https://github.com/BerryBytes/awsctl/commit/a70ce84ef43de9b436bd9b29ba739b7d061d5116) Added test cases for session.go file (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [9b26697](https://github.com/BerryBytes/awsctl/commit/9b266975271a67c39567d19d31d741a06a984263) Removed unused function from config (sanjog-lama <sanjog.gomden@berrybytes.com>)
+- [d0cdbe1](https://github.com/BerryBytes/awsctl/commit/d0cdbe10fde5cb273a3dff6d92368fee37fd8943) Changed the workflow of sso setup and init command and related files (sanjog-lama <sanjog.gomden@berrybytes.com>)
+
+Generated on 2025-06-25T07:36:37Z
+
 # awsctl - v0.2.0
 
 ## Changes since v0.1.0

CODE_OF_CONDUCT.md

@@ -0,0 +1,75 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We, as contributors and maintainers of awsctl, pledge to foster an open, inclusive, and harassment-free environment for everyone. Participation in our project and community is a respectful and welcoming experience, regardless of:
+
+- Age
+- Background
+- Disability
+- Ethnicity
+- Gender identity/expression
+- Experience level
+- Nationality
+- Personal appearance
+- Race
+- Religion
+- Technology choices
+
+## Our Standards
+
+### Encouraged Behaviors
+
+- **Collaboration**: Welcoming language and constructive feedback
+- **Empathy**: Respect differing perspectives and experiences
+- **Focus**: Prioritize solutions that benefit AWS users and the community
+
+### Unacceptable Behaviors
+
+- Harassment, trolling, or derogatory comments
+- Sexualized language/unwelcome advances
+- Doxing (sharing private info without consent)
+- Any behavior undermining a professional environment
+
+## Project Maintainer Responsibilities
+
+Maintainers will:
+
+1. Clarify and enforce these standards
+2. Address violations promptly and fairly
+3. Remove harmful content or contributors if needed
+
+## Scope
+
+Applies to all project spaces:
+
+- GitHub repositories, issues, PRs
+- Community forums (e.g., Discord, Slack)
+- Interactions when representing awsctl (e.g., conferences)
+
+### **Enforcement Guidelines**
+
+1. **First Instance:**
+
+   - The message is edited and marked as "abuse."
+   - Content added:
+     > "Dear user, we want AWSCTL to provide a welcoming and respectful environment. Your [comment/issue/PR] has been reported and marked as abuse according to our [Code of Conduct](./CODE_OF_CONDUCT.md). Thank you."
+
+2. **Second Instance:**
+
+   - The message is again edited and marked as "abuse."
+   - Results in a **7-day ban**.
+
+3. **Third Instance:**
+   - The message is edited and marked as "abuse."
+   - Results in a **permanent ban**.
+
+All enforcement actions are discussed among maintainers beforehand to ensure fairness. Reports must be resolved following the [GitHub Reporting Guidelines](https://docs.github.com/en/communities/moderating-comments-and-conversations/managing-reported-content-in-your-organizations-repository#resolving-a-report).
+
+## Attribution
+
+Adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4.
+
+---
+
+By participating in this project, you agree to abide by its terms.

CONTRIBUTING.md

@@ -34,5 +34,7 @@ Your contributions help make awsctl better for everyone. We appreciate your supp
 ### Contributors
 
 - [Mousam Dahal](https://github.com/mousamdahal)
-- [Sanjog Llama](https://github.com/sanjog-lama)
+- [Sanjog Lama](https://github.com/sanjog-lama)
+- [Sanjog Lama](https://github.com/sawnjordan)
 - [Konika Sitoula](https://github.com/konika-sitoula)
+- [Umesh Khatiwada](https://github.com/umesh-khatiwada)