Switch sermodigital jose to golang jwt

.actrc

@@ -0,0 +1 @@
+--artifact-server-path /tmp/artifacts

.devcontainer/cli.code-workspace

@@ -0,0 +1,24 @@
+{
+	"folders": [
+		{ "path": ".." },
+		{ "path": "../../cli-ci" },
+		{ "path": "../../cli-private" },   
+		{ "path": "../../cli-workstation" }   
+
+	],
+	"settings": {
+		"github-actions.workflows.pinned.workflows": [
+			"cli/.github/workflows/integration.yml"
+		]
+	},
+	"extensions": {
+		"recommendations": [
+			"gitpod.gitpod-remote-ssh",
+			"ms-vsliveshare.vsliveshare",
+			"redhat.vscode-yaml",
+			"golang.go",
+			"vscodevim.vim",
+			"ms-vscode.makefile-tools"
+		]
+	}
+}

.github/CONTRIBUTING.md

@@ -8,9 +8,10 @@ mailing list.
 
 ## CLI Versions
 The cf CLI follows a branching model:
-- V8 of the cf CLI is built from the [master branch](https://github.com/cloudfoundry/cli/tree/master). **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.
+- 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 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:
@@ -32,19 +33,19 @@ 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. for v9 `git checkout main && git checkout -b main_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 master for you after the PR is merged.
+1. Push to your fork (e.g. `git push origin main_better_cli`) and [submit a pull request](https://help.github.com/articles/creating-a-pull-request)
+1. The cf CLI team will merge your PR after review.
 
 Note: All contributions must be sent using GitHub Pull Requests.
 We prefer a small, focused pull request with a clear message
 that conveys the intent of your change.
 
 # Development Environment Setup
 
-## Install Golang 1.16
+## Install Golang 1.18
 
 Documentation on installing GoLang can be found [here](https://golang.org/doc/install). While
 the CF CLI might be compatible with other versions of GoLang, this is the only
@@ -78,8 +79,8 @@ export PATH=<path-to-cli-directory>/out:$PATH # Puts the built CLI first in your
 
 ### Compiling for Other Operating Systems and Architectures
 
-The supported platforms for the CF CLI are Linux (32-bit and 64-bit), Windows
-(32-bit and 64-bit) and OSX (aka Darwin). The commands that build the binaries
+The supported platforms for the CF CLI are Linux (x86, x86-64 and arm64) , Windows
+(x86 and x86-64) and OSX (aka Darwin x86-64 and arm64). The commands that build the binaries
 can be seen in the [Makefile](/Makefile) where the target begins with the
 `out/cf-cli`.
 
@@ -96,12 +97,9 @@ how to cross compile binaries for other architectures.
 To run the unit tests:
 ```bash
 cd cli
-make units-full # will run all unit tests
-make units # runs all non-cf directory unit tests
+make units
 ```
-
-**Note: `make units-full` is recommended over `make units` if you are unsure of
-how wide-reaching the intended changes are.**
+(For historic reasons, there are multiple synonyms in the `Makefile`.)
 
 ## Running the Integration tests
 

.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

@@ -1,21 +1,18 @@
 Thank you for contributing to the CF CLI! Please read the following:
 
 
-* Please make sure you have implemented changes in line with the [contributing guidelines](https://github.com/cloudfoundry/cli/blob/master/.github/CONTRIBUTING.md)
+* Please make sure you have implemented changes in line with the [contributing guidelines](https://github.com/cloudfoundry/cli/blob/main/.github/CONTRIBUTING.md)
 * We're not allowed to accept any PRs without a signed CLA, no matter how small.
 If your contribution falls under a company CLA but your membership is not public, expect delays while we confirm.
 * All new code requires tests to protect against regressions.
-* Contributions must be made against the appropriate branch. See the [contributing guidelines](https://github.com/cloudfoundry/cli/blob/master/.github/CONTRIBUTING.md)
+* Contributions must be made against the appropriate branch. See the [contributing guidelines](https://github.com/cloudfoundry/cli/blob/main/.github/CONTRIBUTING.md)
 * 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.
 
 
-## Does this PR modify CLI v6, CLI v7, or CLI v8?
-
-Please see the contribution doc above or review [Architecture Guide](https://github.com/cloudfoundry/cli/wiki/Architecture-Guide).
+#### Note: Please create separate PR for every branch (main and v8) as needed.
 
 ## Description of the Change
 
-
 We must be able to understand the design of your change from this description.
 Keep in mind that the maintainer reviewing this PR may not be familiar with or
 have worked with the code here recently, so please walk us through the concepts.
@@ -25,13 +22,9 @@ have worked with the code here recently, so please walk us through the concepts.
 
 What benefits will be realized by the code change? What users would want this change? What user need is this change addressing? 
 
-## Why Should This Be In Core?
-
-Explain why this functionality should be in the cf CLI, as opposed to a plugin. 
-
 ## Applicable Issues
 
-List any applicable Github Issues here
+List any applicable GitHub Issues here
 
 ## How Urgent Is The Change?
 

.github/bosh-lite-files/bosh-lite-dns.tf

@@ -0,0 +1,11 @@
+variable "dns_zone_name" {}
+variable "system_domain_suffix" {}
+
+resource "google_dns_record_set" "default" {
+  name = "*.${var.env_id}.${var.system_domain_suffix}."
+  type = "A"
+  ttl = 300
+
+  managed_zone = var.dns_zone_name
+  rrdatas = [ google_compute_address.bosh-director-ip.address ]
+}

.github/bosh-lite-files/bosh-lite.tfvars

@@ -0,0 +1,2 @@
+system_domain_suffix="app-runtime-interfaces.ci.cloudfoundry.org"
+dns_zone_name="app-runtime-interfaces"

.github/bosh-lite-files/create-director-override.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+# Overrides bbl's generated create-director.sh so we can apply extra ops files
+# to the BOSH Lite director. Mirrors the stock bosh-lite-gcp plan-patch override
+# and adds director-inotify.yml (raises fs.inotify limits on the director host
+# so Noble app Envoy sidecars don't crash with "inotify_fd_ >= 0").
+bosh create-env \
+ ${BBL_STATE_DIR}/bosh-deployment/bosh.yml \
+ --state ${BBL_STATE_DIR}/vars/bosh-state.json \
+ --vars-store ${BBL_STATE_DIR}/vars/director-vars-store.yml \
+ --vars-file ${BBL_STATE_DIR}/vars/director-vars-file.yml \
+ --var-file gcp_credentials_json="${BBL_GCP_SERVICE_ACCOUNT_KEY_PATH}" \
+ -v project_id="${BBL_GCP_PROJECT_ID}" \
+ -v zone="${BBL_GCP_ZONE}" \
+ -v env_name="${ENV_NAME}" \
+ -o ${BBL_STATE_DIR}/bosh-deployment/gcp/cpi.yml \
+ -o ${BBL_STATE_DIR}/bosh-deployment/jumpbox-user.yml \
+ -o ${BBL_STATE_DIR}/bosh-deployment/uaa.yml \
+ -o ${BBL_STATE_DIR}/bosh-deployment/credhub.yml \
+ -o ${BBL_STATE_DIR}/bosh-deployment/bosh-lite.yml \
+ -o ${BBL_STATE_DIR}/bosh-deployment/bosh-lite-runc.yml \
+ -o ${BBL_STATE_DIR}/bosh-deployment/gcp/bosh-lite-vm-type.yml \
+ -o ${BBL_STATE_DIR}/bosh-deployment/gcp/director-inotify.yml \
+ -o ${BBL_STATE_DIR}/external-ip-gcp.yml \
+ -o ${BBL_STATE_DIR}/ip-forwarding.yml

.github/bosh-lite-files/force-delete-env.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+# Force-tears-down a bosh-lite environment directly via the GCP CPI and
+# gcloud, bypassing bbl/bosh's graceful deployment-deletion path entirely.
+#
+# Use this when `bbl down` hangs or fails - e.g. warden bind-mount
+# "target is busy" errors during deployment deletion, or SSH-tunnel
+# connectivity issues to an unhealthy director/jumpbox. `bosh delete-env`
+# only needs the local state file + the CPI (GCP API) to destroy a VM, so it
+# works even when the director/jumpbox is unresponsive or already gone.
+#
+# Usage: force-delete-env.sh <env-name>
+# Required env vars: BBL_GCP_SERVICE_ACCOUNT_KEY_PATH, GOOGLE_CLOUD_PROJECT,
+#                     BBL_GCP_REGION
+# Expects <env-name>/bbl-state to already be downloaded in the cwd.
+
+set -uo pipefail
+
+env_name="$1"
+state_dir="${env_name}/bbl-state"
+zone="$(jq -r '.gcp.zone' "${state_dir}/bbl-state.json")"
+
+echo "Force-deleting director VM for ${env_name}"
+bosh delete-env \
+  "${state_dir}/bosh-deployment/bosh.yml" \
+  --state "${state_dir}/vars/bosh-state.json" \
+  --vars-store "${state_dir}/vars/director-vars-store.yml" \
+  --vars-file "${state_dir}/vars/director-vars-file.yml" \
+  -o "${state_dir}/bosh-deployment/gcp/cpi.yml" \
+  -o "${state_dir}/bosh-deployment/jumpbox-user.yml" \
+  -o "${state_dir}/bosh-deployment/uaa.yml" \
+  -o "${state_dir}/bosh-deployment/credhub.yml" \
+  -o "${state_dir}/bbl-ops-files/gcp/bosh-director-ephemeral-ip-ops.yml" \
+  --var-file gcp_credentials_json="${BBL_GCP_SERVICE_ACCOUNT_KEY_PATH}" \
+  -v project_id="${GOOGLE_CLOUD_PROJECT}" \
+  -v zone="${zone}" \
+  --non-interactive || true
+
+echo "Force-deleting jumpbox VM for ${env_name}"
+bosh delete-env \
+  "${state_dir}/jumpbox-deployment/jumpbox.yml" \
+  --state "${state_dir}/vars/jumpbox-state.json" \
+  --vars-store "${state_dir}/vars/jumpbox-vars-store.yml" \
+  --vars-file "${state_dir}/vars/jumpbox-vars-file.yml" \
+  -o "${state_dir}/jumpbox-deployment/gcp/cpi.yml" \
+  --var-file gcp_credentials_json="${BBL_GCP_SERVICE_ACCOUNT_KEY_PATH}" \
+  -v project_id="${GOOGLE_CLOUD_PROJECT}" \
+  -v zone="${zone}" \
+  --non-interactive || true
+
+tfstate="${state_dir}/vars/terraform.tfstate"
+if [ -f "$tfstate" ]; then
+  echo "Deleting remaining terraform-managed network resources for ${env_name}"
+
+  jq -r '.resources[] | select(.type=="google_compute_firewall") | .instances[0].attributes.name' "$tfstate" | \
+    while read -r name; do gcloud compute firewall-rules delete "$name" --quiet || true; done
+
+  jq -r '.resources[] | select(.type=="google_dns_record_set") | "\(.instances[0].attributes.name)\t\(.instances[0].attributes.managed_zone)\t\(.instances[0].attributes.type)"' "$tfstate" | \
+    while IFS=$'\t' read -r name dns_zone rtype; do gcloud dns record-sets delete "$name" --zone "$dns_zone" --type "$rtype" --quiet || true; done
+
+  jq -r '.resources[] | select(.type=="google_compute_route") | .instances[0].attributes.name' "$tfstate" | \
+    while read -r name; do gcloud compute routes delete "$name" --quiet || true; done
+
+  jq -r '.resources[] | select(.type=="google_compute_router") | .instances[0].attributes.name' "$tfstate" | \
+    while read -r name; do gcloud compute routers delete "$name" --region "${BBL_GCP_REGION}" --quiet || true; done
+
+  jq -r '.resources[] | select(.type=="google_compute_address") | .instances[0].attributes.name' "$tfstate" | \
+    while read -r name; do gcloud compute addresses delete "$name" --region "${BBL_GCP_REGION}" --quiet || true; done
+
+  jq -r '.resources[] | select(.type=="google_compute_subnetwork") | .instances[0].attributes.name' "$tfstate" | \
+    while read -r name; do gcloud compute networks subnets delete "$name" --region "${BBL_GCP_REGION}" --quiet || true; done
+
+  jq -r '.resources[] | select(.type=="google_compute_network") | .instances[0].attributes.name' "$tfstate" | \
+    while read -r name; do gcloud compute networks delete "$name" --quiet || true; done
+fi
+
+echo "Force-delete complete for ${env_name}"

.github/dependabot.yml

@@ -1,10 +1,60 @@
 version: 2
 updates:
 - package-ecosystem: gomod
-  directory: "/"
+  directory: '/'
   schedule:
-    interval: daily
-    time: '11:00'
-  open-pull-requests-limit: 10
-  target-branch: "v7"
-  vendor: true
+    interval: weekly
+    day:      monday
+    time:     '01:00'
+    timezone: US/Pacific
+  open-pull-requests-limit: 2
+  commit-message:
+    prefix: '[main](go)'
+  groups:
+    dependencies:
+      patterns:
+        - '*'
+- package-ecosystem: gomod
+  directory: '/'
+  target-branch: 'v8'
+  schedule:
+    interval: weekly
+    day:      monday
+    time:     '01:00'
+    timezone: US/Pacific
+  open-pull-requests-limit: 2
+  commit-message:
+    prefix: '[v8](go)'
+  groups:
+    dependencies:
+      patterns:
+        - '*'
+- package-ecosystem: 'github-actions'
+  directory: '/'
+  schedule:
+    interval: weekly
+    day:      monday
+    time:     '01:00'
+    timezone: US/Pacific
+  open-pull-requests-limit: 2
+  commit-message:
+    prefix: '[main](gha)'
+  groups:
+    dependencies:
+      patterns:
+        - '*'
+- package-ecosystem: 'github-actions'
+  directory: '/'
+  target-branch: 'v8'
+  schedule:
+    interval: weekly
+    day:      monday
+    time:     '01:00'
+    timezone: US/Pacific
+  open-pull-requests-limit: 2
+  commit-message:
+    prefix: '[v8](gha)'
+  groups:
+    dependencies:
+      patterns:
+        - '*'

.github/license/CF_NOTICE

@@ -0,0 +1,36 @@
+Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
+
+This product contains software that is Copyright (c) 2013-2015 Pivotal Software, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0 (the "License").
+
+You may not use this project except in compliance with the License.
+
+
+Attribution notices:
+
+This product includes software from https://github.com/cloudfoundry/cli/tree/main/vendor/code.cloudfoundry.org/gofileutils/fileutils that is:
+Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
+Copyright (c) 2014-2015 Pivotal Software, Inc.
+and is licensed under the Apache License, Version 2.0.
+
+This product includes software from https://github.com/code.cloudfoundry.org/cli/tree/main/vendor/code.cloudfoundry.org/ykk that is:
+Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
+and is licensed under the Apache License, Version 2.0.
+
+This product includes software from https://github.com/code.cloudfoundry.org/cli/tree/main/vendor/code.cloudfoundry.org/cfnetworking-cli-api that is:
+Copyright (c) 2016-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
+and is licensed under the Apache License, Version 2.0.
+
+This product includes software from https://github.com/cloudfoundry/cli/tree/main/vendor/github.com/cloudfoundry/cli-plugin-repo/web that is:
+Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
+Copyright (c) 2015 Pivotal Software, Inc.
+and is licensed under the Apache License, Version 2.0.
+
+This product includes software from https://github.com/cloudfoundry/cli/tree/main/vendor/github.com/cloudfoundry/dropsonde that is:
+Copyright (c) 2014-2015 Pivotal Software, Inc.
+and is licensed under the Apache License, Version 2.0.
+
+This product includes software from https://github.com/cloudfoundry/cli/tree/main/vendor/github.com/docker/docker/pkg/term that is:
+Copyright 2012-2016 Docker, Inc.
+and is licensed under the Apache License, Version 2.0.