Merge remote-tracking branch 'origin/main' into cert-ocsp-docs

.circleci/Makefile

@@ -35,6 +35,8 @@ CONFIG_SOURCE  := Makefile $(SOURCE_YML) | $(SOURCE_DIR)
 OUT            := config.yml
 TMP            := .tmp/config-processed
 CONFIG_PACKED  := .tmp/config-packed
+GO_VERSION_FILE := ../.go-version
+GO_VERSION     := $(shell cat $(GO_VERSION_FILE))
 
 default: help
 
@@ -54,7 +56,7 @@ $(SOURCE_DIR):
 $(shell [ -d .tmp ] || mkdir .tmp)
 
 .PHONY: $(CONFIG)
-$(CONFIG): $(OUT)
+$(CONFIG): $(OUT) $(GO_VERSION_FILE)
 
 .PHONY: $(VERIFY)
 $(VERIFY): config-up-to-date
@@ -72,12 +74,15 @@ export GENERATED_FILE_HEADER
 # it them moves that file to $@. This makes is an atomic operation, so if it fails
 # make doesn't consider a half-baked file up to date.
 define GEN_CONFIG
+	@yq -y -i ".references.environment.GO_IMAGE = \"docker.mirror.hashicorp.services/cimg/go:$(GO_VERSION)\"" $(SOURCE_DIR)/executors/\@executors.yml
+
 	@$(CIRCLECI) config pack $(SOURCE_DIR) > $(CONFIG_PACKED)
 	@echo "$$GENERATED_FILE_HEADER" > $@.tmp || { rm -f $@; exit 1; }
 	@$(CIRCLECI) config process $(CONFIG_PACKED) >> $@.tmp || { rm -f $@.tmp; exit 1; }
 	@mv -f $@.tmp $@
 endef
 
+.PHONY: $(OUT)
 $(OUT): $(CONFIG_SOURCE) 
 	$(GEN_CONFIG)
 	@echo "$@ updated"

.circleci/config/executors/@executors.yml

@@ -1,22 +1,25 @@
 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"
-
+  environment:
+    CIRCLECI_CLI_VERSION: 0.1.5546
+    GOTESTSUM_VERSION: 0.5.2
+    GOFUMPT_VERSION: 0.3.1
+    GO_TAGS: ''
+    GO_IMAGE: docker.mirror.hashicorp.services/cimg/go:1.19.4
 go-machine:
   machine:
-    image: ubuntu-2004:202201-02
-  environment: *ENVIRONMENT
+    image: ubuntu-2004:2022.10.1
+  environment:
+    CIRCLECI_CLI_VERSION: 0.1.5546
+    GOTESTSUM_VERSION: 0.5.2
+    GOFUMPT_VERSION: 0.3.1
+    GO_TAGS: ''
+    GO_IMAGE: docker.mirror.hashicorp.services/cimg/go:1.19.4
   shell: /usr/bin/env bash -euo pipefail -c
   working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 node:
   docker:
     - image: docker.mirror.hashicorp.services/circleci/node:14-browsers
       environment:
-        # See https://git.io/vdao3 for details.
         JOBS: 2
   shell: /usr/bin/env bash -euo pipefail -c
   working_directory: /home/circleci/go/src/github.com/hashicorp/vault
@@ -33,18 +36,33 @@ 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.4
+  environment:
+    CIRCLECI_CLI_VERSION: 0.1.5546
+    GOTESTSUM_VERSION: 0.5.2
+    GOFUMPT_VERSION: 0.3.1
+    GO_TAGS: ''
+    GO_IMAGE: docker.mirror.hashicorp.services/cimg/go:1.19.4
   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.4
+  environment:
+    CIRCLECI_CLI_VERSION: 0.1.5546
+    GOTESTSUM_VERSION: 0.5.2
+    GOFUMPT_VERSION: 0.3.1
+    GO_TAGS: ''
+    GO_IMAGE: docker.mirror.hashicorp.services/cimg/go:1.19.4
   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.4
+  environment:
+    CIRCLECI_CLI_VERSION: 0.1.5546
+    GOTESTSUM_VERSION: 0.5.2
+    GOFUMPT_VERSION: 0.3.1
+    GO_TAGS: ''
+    GO_IMAGE: docker.mirror.hashicorp.services/cimg/go:1.19.4
   working_directory: /home/circleci/go/src/github.com/hashicorp/vault

.github/configs/milestone-check.json

@@ -0,0 +1,8 @@
+[
+    {
+      "type": "check-milestone",
+      "title": "Milestone Check",
+      "success": "Milestone set",
+      "failure": "Milestone not set"
+    }
+  ]

.github/enos-run-matrices/build-github-oss-linux-amd64-zip.json

@@ -0,0 +1,54 @@
+{
+  "include": [
+    {
+      "scenario": "smoke backend:raft consul_version:1.14.2 distro:ubuntu seal:shamir arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-1",
+      "test_group": 3
+    },
+    {
+      "scenario": "smoke backend:raft consul_version:1.13.4 distro:rhel seal:awskms arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-2",
+      "test_group": 4
+    },
+    {
+      "scenario": "smoke backend:consul consul_version:1.14.2 distro:ubuntu seal:shamir arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-1",
+      "test_group": 1
+    },
+    {
+      "scenario": "smoke backend:consul consul_version:1.13.4 distro:rhel seal:awskms arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-2",
+      "test_group": 5
+    },
+    {
+      "scenario": "smoke backend:consul consul_version:1.12.7 distro:ubuntu seal:shamir arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-1",
+      "test_group": 2
+    },
+    {
+      "scenario": "upgrade backend:raft consul_version:1.14.2 distro:rhel seal:awskms arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-2",
+      "test_group": 3
+    },
+    {
+      "scenario": "upgrade backend:raft consul_version:1.14.2 distro:ubuntu seal:shamir arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-1",
+      "test_group": 5
+    },
+    {
+      "scenario": "upgrade backend:consul consul_version:1.14.2 distro:rhel seal:awskms arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-2",
+      "test_group": 4
+    },
+    {
+      "scenario": "upgrade backend:consul consul_version:1.13.4 distro:ubuntu seal:shamir arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-1",
+      "test_group": 2
+    },
+    {
+      "scenario": "upgrade backend:consul consul_version:1.12.7 distro:rhel seal:awskms arch:amd64 artifact_source:crt edition:oss artifact_type:bundle",
+      "aws_region": "us-west-2",
+      "test_group": 1
+    }
+  ]
+}