Merge branch 'main' into add_dest_app_port

Author: mauricebrinkmann

.github/CONTRIBUTING.md

@@ -10,8 +10,8 @@ mailing list.
 The cf CLI follows a branching model:
 - V9 (Next major release) of the cf CLI is built from the [main branch](https://github.com/cloudfoundry/cli/tree/main). **This branch is under active development**.
 - V8 of the cf CLI is built from the [v8 branch](https://github.com/cloudfoundry/cli/tree/v8). **This branch is under active development**.
-- V7 of the cf CLI is built from the [v7 branch](https://github.com/cloudfoundry/cli/tree/v7). **This branch is maintenance only** and will only be updated to patch CVEs and very severe blocking defects.
-- V6 of the cf CLI is built from the [v6 branch](https://github.com/cloudfoundry/cli/tree/v6). **This branch is maintenance only** and will only be updated to patch CVEs and very severe blocking defects.
+- V7 of the cf CLI is built from the [v7 branch](https://github.com/cloudfoundry/cli/tree/v7). **This branch is no longer maintained**.
+- V6 of the cf CLI is built from the [v6 branch](https://github.com/cloudfoundry/cli/tree/v6). **This branch is no longer maintained**.
 
 ## Prerequisites
 Before working on a PR to the CLI code base, please:
@@ -33,11 +33,11 @@ After reaching out to the CLI team and the conclusion is to make a PR, please fo
    [Product Style Guide](https://github.com/cloudfoundry/cli/wiki/CLI-Product-Specific-Style-Guide),
    and [Internationalization Guide](https://github.com/cloudfoundry/cli/wiki/Internationalization-Guide).
 1. Fork the project repository.
-1. Create a feature branch from the earliest branch that's [appropriate for your change](#cli-versions) (e.g. `git checkout v7 && git checkout -b better_cli`) and make changes on this branch
+1. Create a feature branch from the earliest branch that's [appropriate for your change](#cli-versions) (e.g. `git checkout v8 && git checkout -b better_cli`) and make changes on this branch
    * Follow the other sections on this page to [set up your development environment](#development-environment-setup), [build `cf`](#building-the-cf-binary) and [run the tests](#testing).
    * Tests are required for any changes.
 1. Push to your fork (e.g. `git push origin better_cli`) and [submit a pull request](https://help.github.com/articles/creating-a-pull-request)
-1. The cf CLI team will merge your changes from the versioned branch (e.g. v7) to main for you after the PR is merged.
+1. The cf CLI team will merge your changes from the versioned branch (e.g. v8) to main for you after the PR is merged.
 
 Note: All contributions must be sent using GitHub Pull Requests.
 We prefer a small, focused pull request with a clear message

.github/ISSUE_TEMPLATE/bug_report.md

@@ -32,9 +32,8 @@ Steps to reproduce the behavior; include the exact CLI commands and verbose outp
 - version of the CC API Release you are on
 
 **Notes regarding V6 and V7 CLI support:** 
-- V6:
-  - Minimum supported version of CF Deployment: v7.0.0 (CAPI Release: 1.74.0 (APIs 2.128.0 and 3.63.0))
-  - Maximum supported version of CF Deployment: v13.4.0 (CAPI Release: 1.94.0 (APIs 2.149.0 and 3.84.0))
-- V7:
-  - Minimum supported version of CF Deployment: v13.5.0 (CAPI Release: 1.95.0 (APIs 2.150.0 and 3.85.0))
+- V6: **No longer maintained or released**
+  - Last supported version of CF Deployment: v13.4.0 (CAPI Release: 1.94.0 (APIs 2.149.0 and 3.84.0))
+- V7: **No longer maintained or released**
+  - Last supported version of CF Deployment: v13.5.0 (CAPI Release: 1.95.0 (APIs 2.150.0 and 3.85.0))
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -31,4 +31,4 @@ A clear and concise description of any alternative solutions or features you've
 Add any other context or screenshots about the feature request here.
 
 **Note:**
-As of the GA of the v7 CLI, the v6 line is no longer under active development and will be updated only to patch CVEs or fix severe blocking defects with no workarounds.
+The v7 and v6 CLI versions are no longer maintained.

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@ If your contribution falls under a company CLA but your membership is not public
 * Contributions must conform to our [style guide](https://github.com/cloudfoundry/cli/wiki/CLI-Product-Specific-Style-Guide). Please reach out to us if you have questions.
 
 
-#### Note: Please create separate PR for every branch (main, v8 and v7) as needed.
+#### Note: Please create separate PR for every branch (main and v8) as needed.
 
 ## Description of the Change
 

.github/workflows/check-cves.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
     - name: Check out codebase
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Scan current project
       id: scan
@@ -26,7 +26,7 @@ jobs:
       if: always()
 
     - name: Archive CVE scan results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: cve-scan-results-${{ github.sha }}-${{ github.run_id }}-${{ github.run_number }}

.github/workflows/create-bosh-lite.yml

@@ -46,13 +46,13 @@ jobs:
           sudo apt install -y build-essential unzip wamerican
 
       - name: Checkout bosh-bootloader
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: cloudfoundry/bosh-bootloader
           path: bosh-bootloader
 
       - name: Checkout cli
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: cli
 
@@ -97,14 +97,14 @@ jobs:
           gsutil -m cp -R -P ./$env_name gs://cf-cli-bosh-lites/
 
       - name: Checkout cf-deployment
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: cloudfoundry/cf-deployment
           ref: release-candidate
           path: cf-deployment
 
       - name: Checkout bosh-deployment
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: cloudfoundry/bosh-deployment
           path: bosh-deployment

.github/workflows/delete-bosh-lite.yml

@@ -46,12 +46,12 @@ jobs:
           sudo apt install -y build-essential unzip wamerican
 
       - name: Checkout cli
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: cli
 
       - name: Checkout bosh-bootloader
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: cloudfoundry/bosh-bootloader
           path: bosh-bootloader

.github/workflows/golangci-lint.yml

@@ -23,15 +23,15 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: '0'
       - name: Set up Go 1.x
         uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v8
+        uses: golangci/golangci-lint-action@v9
         with:
           version: v2.4
           args: -v
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: '0'
     - name: Set Up Go

.github/workflows/release-build-sign-upload.yml

@@ -71,7 +71,7 @@ jobs:
 
     steps:
     - name: Checkout cli
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Bump version
       id: bump-version
@@ -127,10 +127,10 @@ jobs:
       run: echo "VERSION_BUILD $VERSION_BUILD"
 
     - name: Checkout cli
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Checkout cli-ci
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         repository: cloudfoundry/cli-ci.git
         path: cli-ci
@@ -151,7 +151,7 @@ jobs:
         go env
 
     - name: Go Assets Cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ${{ steps.go-cache-paths.outputs.go-mod }}
@@ -169,7 +169,7 @@ jobs:
         make out/cf-cli_linux_arm64
 
     - name: Store Linux Binaries
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         if-no-files-found: error
         name: cf-cli-linux-binaries
@@ -274,7 +274,7 @@ jobs:
       working-directory: signed-redhat-installer
 
     - name: Store Signed Linux RPM Packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         if-no-files-found: error
         name: cf-cli-linux-rpm-packages
@@ -375,7 +375,7 @@ jobs:
       working-directory: packaged-deb
 
     - name: Store Debian Packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         if-no-files-found: error
         name: cf-cli-linux-deb-packages
@@ -396,17 +396,17 @@ jobs:
       run: echo "VERSION_BUILD $VERSION_BUILD"
 
     - name: Checkout cli
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Checkout cli-ci
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         repository: cloudfoundry/cli-ci.git
         path: cli-ci
         ref: main
 
     - name: Checkout bomutils
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         repository: hogliux/bomutils.git
         ref: 0.2
@@ -428,7 +428,7 @@ jobs:
         cat "$(brew --repository)/Library/Taps/pivotalsoftware/homebrew-gon/gon.rb" > .github/brew-formulae
 
     - name: Configure Homebrew cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ~/Library/Caches/Homebrew/gon--*
@@ -448,7 +448,7 @@ jobs:
         go env
 
     - name: Go Assets Cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ${{ steps.go-cache-paths.outputs.go-mod }}
@@ -465,7 +465,7 @@ jobs:
         make out/cf-cli_macosarm
 
     - name: Store macOS Binaries
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         if-no-files-found: error
         name: cf-cli-macos-binaries
@@ -605,7 +605,7 @@ jobs:
           "signed-macos-installer/cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_macosarm.pkg"
 
     - name: Store macOS Signed Packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         if-no-files-found: error
         name: cf-cli-macos-packages
@@ -625,7 +625,7 @@ jobs:
       VERSION_MAJOR: ${{ needs.setup.outputs.version-major }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up Go
@@ -691,7 +691,7 @@ jobs:
           New-Item -ItemType SymbolicLink -Target .\out\cf-cli_winx64.exe -Path .\out\cf-cli_winx64-link.exe
 
       - name: Save signed binaries as a GitHub Action Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: cf-cli-windows-binaries
           if-no-files-found: error
@@ -736,7 +736,7 @@ jobs:
           Get-ChildItem "${env:RUNNER_TEMP}"
 
       - name: Save installer and dist files as a GitHub Action Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: cf-cli-windows-packages
           if-no-files-found: error
@@ -768,10 +768,10 @@ jobs:
     steps:
 
     - name: Checkout cli
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Download signed artifacts
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         path: signed # download all artifacts to 'signed/'
 
@@ -857,7 +857,7 @@ jobs:
           signed/winx64/*zip
 
     - name: Store Artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         if-no-files-found: error
         name: final-artifacts
@@ -894,7 +894,7 @@ jobs:
     steps:
 
     - name: Download Signed Linux Packages
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         name: cf-cli-linux-rpm-packages
 
@@ -921,7 +921,7 @@ jobs:
     steps:
 
     - name: Download Signed Linux Packages
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         name: cf-cli-linux-deb-packages
 
@@ -949,7 +949,7 @@ jobs:
     steps:
 
     - name: Download Signed macOS Packages
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         name: cf-cli-macos-packages
 
@@ -973,7 +973,7 @@ jobs:
     steps:
 
     - name: Download Signed Windows Binaries
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         name: cf-cli-windows-binaries
 
@@ -983,7 +983,7 @@ jobs:
         Get-AuthenticodeSignature -Verbose -ErrorAction Stop .\cf-cli_winx64.exe
 
     - name: Download Signed Windows Binaries
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         name: cf-cli-windows-packages
 
@@ -1013,13 +1013,13 @@ jobs:
     - s3-upload
     steps:
     - name: Download signed artifacts
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         name: final-artifacts
         path: ${{ env.ARTIFACTS_DIR }}
 
     - name: Checkout CLI
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         path: ${{ env.REPO_DIR }}
 
@@ -1059,7 +1059,7 @@ jobs:
       VERSION_BUILD: ${{ needs.setup.outputs.version-build }}
     steps:
     - name: Checkout CLAW
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         repository: cloudfoundry/CLAW
         ref: master