Merge branch 'main' into main-restart-canary-steps

Author: Samze

.github/dependabot.yml

@@ -29,21 +29,6 @@ updates:
     dependencies:
       patterns:
         - '*'
-- package-ecosystem: gomod
-  directory: '/'
-  target-branch: 'v7'
-  schedule:
-    interval: weekly
-    day:      monday
-    time:     '01:00'
-    timezone: US/Pacific
-  open-pull-requests-limit: 2
-  commit-message:
-    prefix: '[v7](go)'
-  groups:
-    dependencies:
-      patterns:
-        - '*'
 - package-ecosystem: 'github-actions'
   directory: '/'
   schedule:
@@ -73,18 +58,3 @@ updates:
     dependencies:
       patterns:
         - '*'
-- package-ecosystem: 'github-actions'
-  directory: '/'
-  target-branch: 'v7'
-  schedule:
-    interval: weekly
-    day:      monday
-    time:     '01:00'
-    timezone: US/Pacific
-  open-pull-requests-limit: 2
-  commit-message:
-    prefix: '[v7](gha)'
-  groups:
-    dependencies:
-      patterns:
-        - '*'

.github/workflows/golangci-lint.yml

@@ -5,7 +5,6 @@ on:
     tags:
       - "v9.*"
       - "v8.*"
-      - "v7.*"
   pull_request:
     types:
       - opened
@@ -15,7 +14,6 @@ on:
       - main
       - v9
       - v8
-      - v7
     paths-ignore:
       - "doc/**"
       - ".gitpod.yml"

.github/workflows/tests-integration.yml

@@ -56,12 +56,10 @@ on:
   push:
     tags:
       - "v8.*"
-      - "v7.*"
   pull_request_target:
     branches:
       - main
       - v8
-      - v7
     paths-ignore:
       - "doc/**"
       - ".gitpod.yml"

.github/workflows/tests-unit.yml

@@ -13,13 +13,11 @@ on:
     tags:
       - "v9.*"
       - "v8.*"
-      - "v7.*"
   pull_request:
     branches:
       - main
       - v9
       - v8
-      - v7
     paths-ignore:
       - "doc/**"
       - ".gitpod.yml"

.github/workflows/util-code-quality.yml

@@ -6,7 +6,6 @@ on:
     branches:
       - main
       - v8
-      - v7
   schedule:
     - cron: '45 5 * * *'
 

integration/v7/isolated/auth_command_test.go

@@ -27,7 +27,9 @@ var _ = Describe("auth command", func() {
 
 			Eventually(session).Should(Say("USAGE:"))
 			Eventually(session).Should(Say("cf auth USERNAME PASSWORD\n"))
-			Eventually(session).Should(Say("cf auth CLIENT_ID CLIENT_SECRET --client-credentials\n\n"))
+			Eventually(session).Should(Say("cf auth CLIENT_ID CLIENT_SECRET --client-credentials\n"))
+			Eventually(session).Should(Say("cf auth CLIENT_ID CLIENT_SECRET --assertion ID-TOKEN\n"))
+			Eventually(session).Should(Say("cf auth CLIENT_ID --client-credentials --assertion ACCESS-TOKEN\n"))
 
 			Eventually(session).Should(Say("ENVIRONMENT VARIABLES:"))
 			Eventually(session).Should(Say(`CF_USERNAME=user\s+Authenticating user. Overridden if USERNAME argument is provided.`))
@@ -44,7 +46,8 @@ var _ = Describe("auth command", func() {
 
 			Eventually(session).Should(Say("OPTIONS:"))
 			Eventually(session).Should(Say("--client-credentials\\s+Use \\(non-user\\) service account \\(also called client credentials\\)\n"))
-			Eventually(session).Should(Say("--origin\\s+Indicates the identity provider to be used for authentication\n\n"))
+			Eventually(session).Should(Say("--origin\\s+Indicates the identity provider to be used for authentication\n"))
+			Eventually(session).Should(Say("--assertion\\s+Token based authentication with assertion \\(user\\) or in combination with client-credentials \\(non-user\\)\n"))
 
 			Eventually(session).Should(Say("SEE ALSO:"))
 			Eventually(session).Should(Say("api, login, target"))