backport of commit 0f0fe19

.circleci/config/commands/go_test.yml

@@ -12,6 +12,9 @@ parameters:
   save_cache:
     type: boolean
     default: false
+  go_image:
+    type: string
+    default: "docker.mirror.hashicorp.services/cimg/go:1.19.2"
   use_docker:
     type: boolean
     default: false
@@ -134,7 +137,7 @@ steps:
             -e NO_PROXY \
             -e VAULT_TEST_LOG_DIR=<< parameters.log_dir >> \
             --network ${TEST_DOCKER_NETWORK_NAME} \
-            $GO_IMAGE \
+            << parameters.go_image >> \
             tail -f /dev/null)"
           mkdir workspace
           echo ${CONTAINER_ID} > workspace/container_id

.circleci/config/commands/setup-go.yml

@@ -13,12 +13,11 @@ parameters:
     default: github.com/hashicorp/*
 steps:
   - run:
+      working_directory: ~/
       name: Setup Go
       command: |
-        GO_VERSION=$(cat .go-version)
         [ -n "$GO_VERSION" ] || { echo "You must set GO_VERSION"; exit 1; }
         # Install Go
-        cd ~
         curl -sSLO "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz"
         sudo rm -rf /usr/local/go
         sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"

.circleci/config/executors/@executors.yml

@@ -1,16 +1,13 @@
-references:
-  environment: &ENVIRONMENT
-    CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
-    GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3)
-    GOFUMPT_VERSION: 0.3.1 # Pin gofumpt to patch version (ex: 1.2.3)
-    GO_TAGS: ""
-    GO_IMAGE: &GO_IMAGE "docker.mirror.hashicorp.services/cimg/go:1.19.2"
-
 go-machine:
   machine:
     image: ubuntu-2004:202201-02
-  environment: *ENVIRONMENT
   shell: /usr/bin/env bash -euo pipefail -c
+  environment:
+    CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
+    GO_VERSION: 1.19.2 # Pin Go to patch version (ex: 1.2.3)
+    GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3)
+    GOFUMPT_VERSION: 0.3.1 # Pin gofumpt to patch version (ex: 1.2.3)
+    GO_TAGS: ""
   working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 node:
   docker:
@@ -33,18 +30,24 @@ semgrep:
 docker-env-go-test-remote-docker:
   resource_class: medium
   docker:
-    - image: *GO_IMAGE
-  environment: *ENVIRONMENT
+    - image: "docker.mirror.hashicorp.services/cimg/go:1.19.2"
+  environment:
+    CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
+    GO_TAGS: ""
   working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 docker-env-go-test:
   resource_class: large
   docker:
-    - image: *GO_IMAGE
-  environment: *ENVIRONMENT
+    - image: "docker.mirror.hashicorp.services/cimg/go:1.19.2"
+  environment:
+    CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
+    GO_TAGS: ""
   working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 docker-env-go-test-race:
   resource_class: xlarge
   docker:
-    - image: *GO_IMAGE
-  environment: *ENVIRONMENT
+    - image: "docker.mirror.hashicorp.services/cimg/go:1.19.2"
+  environment:
+    CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
+    GO_TAGS: ""
   working_directory: /home/circleci/go/src/github.com/hashicorp/vault

.circleci/config/jobs/build-go-dev.yml

@@ -1,7 +1,7 @@
 executor: go-machine
 steps:
-  - checkout
   - setup-go
+  - checkout
   - restore_go_mod_cache
   - attach_workspace:
       at: .

.circleci/config/jobs/fmt.yml

@@ -1,10 +1,10 @@
 description: Ensure go formatting is correct.
 executor: go-machine
 steps:
-  - checkout
   # Setup Go enabling the proxy for downloading modules.
   - setup-go:
       GOPROXY: https://proxy.golang.org,direct
+  - checkout
   - run:
       name: make fmt
       command: |

.circleci/config/jobs/pre-flight-checks.yml

@@ -1,10 +1,10 @@
 description: Ensure nothing obvious is broken, and pre-cache Go modules.
 executor: go-machine
 steps:
-  - checkout
   # Setup Go enabling the proxy for downloading modules.
   - setup-go:
       GOPROXY: https://proxy.golang.org,direct
+  - checkout
   - run:
       name: Install CircleCI CLI
       environment:

.circleci/config/jobs/test-go-nightly.yml

@@ -1,7 +1,7 @@
 executor: go-machine
 steps:
-  - checkout
   - setup-go
+  - checkout
   - restore_go_mod_cache
   - go_test:
       log_dir: "/tmp/testlogs"

.github/enos-run-matrices/ent.json

@@ -0,0 +1,24 @@
+{
+  "include": [
+    {
+      "scenario": "smoke backend:consul consul_version:1.12.3 distro:ubuntu seal:awskms arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "smoke backend:raft consul_version:1.12.3 distro:ubuntu seal:shamir arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-2"
+    },
+    {
+      "scenario": "upgrade backend:raft consul_version:1.11.7 distro:rhel seal:shamir arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "upgrade backend:consul consul_version:1.11.7 distro:rhel seal:awskms arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-2"
+    },
+    {
+      "scenario": "autopilot distro:ubuntu seal:shamir arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-1"
+    }
+  ]
+}

.github/enos-run-matrices/oss.json

@@ -0,0 +1,20 @@
+{
+  "include": [
+    {
+      "scenario": "smoke backend:consul consul_version:1.12.3 distro:ubuntu seal:awskms arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "smoke backend:raft consul_version:1.12.3 distro:ubuntu seal:shamir arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-2"
+    },
+    {
+      "scenario": "upgrade backend:raft consul_version:1.11.7 distro:rhel seal:shamir arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "upgrade backend:consul consul_version:1.11.7 distro:rhel seal:awskms arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-2"
+    }
+  ]
+}

.github/workflows/backport.yml

@@ -11,11 +11,11 @@ jobs:
   backport-targeted-release-branch:
     if: github.event.pull_request.merged
     runs-on: ubuntu-latest
-    container: hashicorpdev/backport-assistant:0.3.0
+    container: hashicorpdev/backport-assistant:0.2.5
     steps:
       - name: Backport changes to targeted release branch
         run: |
-          backport-assistant backport -merge-method=squash -gh-automerge 
+          backport-assistant backport
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.[+\\w]+)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"

.github/workflows/build-vault-oss.yml

@@ -58,6 +58,8 @@ jobs:
           GOARCH: ${{ inputs.goarch }}
           GOOS: ${{ inputs.goos }}
           GO_TAGS: ${{ inputs.go-tags }}
+          # We started stripping symbol tables in 1.13.x
+          KEEP_SYMBOLS: true
         run: make crt-build
       - name: Determine artifact basename
         env: