From 90f94a47c6412b39d69b5aebe948440a639e03ae Mon Sep 17 00:00:00 2001
From: Vishal Nayak <vishalnayakv@gmail.com>
Date: Wed, 19 May 2021 16:22:39 -0400
Subject: [PATCH] build: vault v1.7.2
 (db0e4245d5119b5929e611ea4d9bf66e47f3f208)

---
 .circleci/config.yml       | 3719 +++++++++++++-----------------------
 packages-oss.lock/pkgs.yml |  302 +--
 2 files changed, 1500 insertions(+), 2521 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5b872c78d..48278d2b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,2444 +1,1423 @@
-### ***
-### WARNING: DO NOT manually EDIT or MERGE this file, it is generated by 'make ci-config'.
-### INSTEAD: Edit or merge the source in config/ then run 'make ci-config'.
-### ***
-# Orb 'circleci/slack@3.2.0' resolved to 'circleci/slack@3.2.0'
-version: 2
-jobs:
-  bundle-releases:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    steps:
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-all-package-cache-keys
-        name: Write all package cache keys
-    - run:
-        command: mkdir -p .buildcache && echo "*" > .buildcache/.gitignore
-        name: Ignore .buildcache
-    - restore_cache:
-        key: package-c87d721f1a377d4053235a55b44d6ab7b22a835e-{{checksum ".buildcache/cache-keys/package-c87d721f1a377d4053235a55b44d6ab7b22a835e"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-8011af2584631c61ee593eb570b4936fb3ccd34c-{{checksum ".buildcache/cache-keys/package-8011af2584631c61ee593eb570b4936fb3ccd34c"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-bfc2ea44573bbefd840eaac2593856deb0b0f5d2-{{checksum ".buildcache/cache-keys/package-bfc2ea44573bbefd840eaac2593856deb0b0f5d2"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-b1b28b61b31c6c4aae96907ca0dd964ed79ddd83-{{checksum ".buildcache/cache-keys/package-b1b28b61b31c6c4aae96907ca0dd964ed79ddd83"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6-{{checksum ".buildcache/cache-keys/package-68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0-{{checksum ".buildcache/cache-keys/package-13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-d2d87278a5e97aaf33a5a1df37ef41667e78114c-{{checksum ".buildcache/cache-keys/package-d2d87278a5e97aaf33a5a1df37ef41667e78114c"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-b5cc334e0759f17076a3c044c7d227ec426c3fb8-{{checksum ".buildcache/cache-keys/package-b5cc334e0759f17076a3c044c7d227ec426c3fb8"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-2e1eb2fe413615847f15b86482010df36a8385c4-{{checksum ".buildcache/cache-keys/package-2e1eb2fe413615847f15b86482010df36a8385c4"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-03464cbb7e730c5fd0615794f5f55092ddc9749c-{{checksum ".buildcache/cache-keys/package-03464cbb7e730c5fd0615794f5f55092ddc9749c"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-5502b4c650c7d2a9bc9fc98a4e2233389b754dd5-{{checksum ".buildcache/cache-keys/package-5502b4c650c7d2a9bc9fc98a4e2233389b754dd5"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e-{{checksum ".buildcache/cache-keys/package-5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-b3627d64e7ed43c6e293b229fad84ead0ef77bc3-{{checksum ".buildcache/cache-keys/package-b3627d64e7ed43c6e293b229fad84ead0ef77bc3"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-8482884aaae56b1f8f598c7d0218cf5688b4830e-{{checksum ".buildcache/cache-keys/package-8482884aaae56b1f8f598c7d0218cf5688b4830e"}}
-        name: Restore package cache
-    - restore_cache:
-        key: package-f327368a08912c61c859b101a10954145a0d62e0-{{checksum ".buildcache/cache-keys/package-f327368a08912c61c859b101a10954145a0d62e0"}}
-        name: Restore package cache
-    - run:
-        command: make package-meta-all
-        name: Write Package Metadata
-    - run:
-        command: make aliases
-        name: Write package aliases
-    - run:
-        command: ls -lahR .buildcache
-        name: List Build Cache
-    - run:
-        command: cp packages*.lock/pkgs.yml lockfile-a34ceb710379ab7c.yml
-        name: Update Lockfile Name
-    - run:
-        command: tar -czf packages-a34ceb710379ab7c.tar.gz .buildcache/packages lockfile-a34ceb710379ab7c.yml
-        name: Create Raw Package Tarball
-    - run:
-        command: tar -czf meta-a34ceb710379ab7c.tar.gz .buildcache/packages/store/*.json lockfile-a34ceb710379ab7c.yml
-        name: Create Metadata Tarball
-    - store_artifacts:
-        path: lockfile-a34ceb710379ab7c.yml
-    - store_artifacts:
-        path: packages-a34ceb710379ab7c.tar.gz
-    - store_artifacts:
-        path: meta-a34ceb710379ab7c.tar.gz
-    - store_artifacts:
-        path: .buildcache/packages
-    environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-  darwin_amd64_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: c87d721f1a377d4053235a55b44d6ab7b22a835e
-    steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-c87d721f1a377d4053235a55b44d6ab7b22a835e-{{checksum ".buildcache/cache-keys/package-c87d721f1a377d4053235a55b44d6ab7b22a835e"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-c87d721f1a377d4053235a55b44d6ab7b22a835e-{{checksum ".buildcache/cache-keys/package-c87d721f1a377d4053235a55b44d6ab7b22a835e"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  windows_386_package:
+version: "2.1"
+executors:
+  builder:
     docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
+      - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
     shell: /usr/bin/env bash -euo pipefail -c
     environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: 8482884aaae56b1f8f598c7d0218cf5688b4830e
-    steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-8482884aaae56b1f8f598c7d0218cf5688b4830e-{{checksum ".buildcache/cache-keys/package-8482884aaae56b1f8f598c7d0218cf5688b4830e"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-8482884aaae56b1f8f598c7d0218cf5688b4830e-{{checksum ".buildcache/cache-keys/package-8482884aaae56b1f8f598c7d0218cf5688b4830e"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  install-ui-dependencies:
-    docker:
-    - image: docker.mirror.hashicorp.services/node:10-buster
-    shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
-    steps:
-    - checkout
-    - restore_cache:
-        key: yarn-lock-v6-{{ checksum "ui/yarn.lock" }}
-    - run:
-        command: |
-          cd ui
-          yarn install
-          npm rebuild node-sass
-        name: Install UI dependencies
-    - save_cache:
-        key: yarn-lock-v6-{{ checksum "ui/yarn.lock" }}
-        paths:
-        - ui/node_modules
-  build-common-layers:
+      AUTO_INSTALL_TOOLS: "YES"
+      BUILDKIT_PROGRESS: plain
+      PRODUCT_REVISION: db0e4245d5119b5929e611ea4d9bf66e47f3f208
+  builder-machine:
+    resource_class: xlarge
     machine:
       image: ubuntu-1604:202007-01
-    resource_class: xlarge
-    shell: /usr/bin/env bash -euo pipefail -c
-    steps:
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        keys:
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Layer Cache: build-ui'
-    - run:
-        command: LAYER_SPEC_ID=06-build-ui-93790c2ff234916807dbadcc196cda8a852cfa76 make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -f packages*.lock/layer.mk 00-base-c6cdf1b224722d2520e082320f2a71875913247c-image
-        name: Build base layer
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -f packages*.lock/layer.mk 01-install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831-image
-        name: Build install-go layer
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -f packages*.lock/layer.mk 02-install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a-image
-        name: Build install-go-tools layer
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -f packages*.lock/layer.mk 03-set-workdir-0446c546bf80628f37cdca60645f728266d87e4a-image
-        name: Build set-workdir layer
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -f packages*.lock/layer.mk 04-install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919-image
-        name: Build install-yarn layer
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -f packages*.lock/layer.mk 05-ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be-image
-        name: Build ui-dependencies layer
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -f packages*.lock/layer.mk 06-build-ui-93790c2ff234916807dbadcc196cda8a852cfa76-image
-        name: Build build-ui layer
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -f packages*.lock/layer.mk 06-build-ui-93790c2ff234916807dbadcc196cda8a852cfa76-save
-        name: Build build-ui layer
-    - save_cache:
-        key: build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        name: 'Save Layer Cache: build-ui'
-        paths:
-        - .buildcache/archives/06-build-ui-93790c2ff234916807dbadcc196cda8a852cfa76.tar.gz
-    environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-  linux_arm64_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
     shell: /usr/bin/env bash -euo pipefail -c
     environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: b5cc334e0759f17076a3c044c7d227ec426c3fb8
-    steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-b5cc334e0759f17076a3c044c7d227ec426c3fb8-{{checksum ".buildcache/cache-keys/package-b5cc334e0759f17076a3c044c7d227ec426c3fb8"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-b5cc334e0759f17076a3c044c7d227ec426c3fb8-{{checksum ".buildcache/cache-keys/package-b5cc334e0759f17076a3c044c7d227ec426c3fb8"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  test-ui:
-    docker:
-    - image: docker.mirror.hashicorp.services/node:10-buster
-    shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
-    resource_class: medium+
+      AUTO_INSTALL_TOOLS: "YES"
+      BUILDKIT_PROGRESS: plain
+      PRODUCT_REVISION: db0e4245d5119b5929e611ea4d9bf66e47f3f208
+jobs:
+  build-common-layers:
+    executor: builder-machine
     steps:
-    - checkout
-    - restore_cache:
-        key: yarn-lock-v6-{{ checksum "ui/yarn.lock" }}
-    - attach_workspace:
-        at: .
-    - run:
-        command: |
-          set -x
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+          keys:
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Layer Cache: build-ui'
+      - run:
+          command: LAYER_SPEC_ID=06-build-ui-93790c2ff234916807dbadcc196cda8a852cfa76 make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          # Install Chrome
-          wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub \
-            | apt-key add -
-          echo "deb http://dl.google.com/linux/chrome/deb/ stable main" \
-            | tee /etc/apt/sources.list.d/google-chrome.list
-          apt-get update
-          apt-get -y install google-chrome-stable
-          rm /etc/apt/sources.list.d/google-chrome.list
-          rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+            make -f packages*.lock/layer.mk 00-base-c6cdf1b224722d2520e082320f2a71875913247c-image
+          name: Build base layer
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          # Add ./bin to the PATH so vault binary can be run by Ember tests
-          export PATH="${PWD}/bin:${PATH}"
+            make -f packages*.lock/layer.mk 01-install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831-image
+          name: Build install-go layer
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          # Run Ember tests
-          cd ui
-          mkdir -p test-results/qunit
-          yarn test:oss
-        name: Test UI
-    - store_artifacts:
-        path: ui/test-results
-    - store_test_results:
-        path: ui/test-results
-  linux_arm_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: d2d87278a5e97aaf33a5a1df37ef41667e78114c
-    steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-d2d87278a5e97aaf33a5a1df37ef41667e78114c-{{checksum ".buildcache/cache-keys/package-d2d87278a5e97aaf33a5a1df37ef41667e78114c"}}
-        name: Restore package cache
-    - run:
-        command: |2
+            make -f packages*.lock/layer.mk 02-install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a-image
+          name: Build install-go-tools layer
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
+            make -f packages*.lock/layer.mk 03-set-workdir-0446c546bf80628f37cdca60645f728266d87e4a-image
+          name: Build set-workdir layer
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+            make -f packages*.lock/layer.mk 04-install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919-image
+          name: Build install-yarn layer
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-d2d87278a5e97aaf33a5a1df37ef41667e78114c-{{checksum ".buildcache/cache-keys/package-d2d87278a5e97aaf33a5a1df37ef41667e78114c"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  test-ui-browserstack:
-    docker:
-    - image: docker.mirror.hashicorp.services/node:10-buster
-    shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
-    resource_class: medium+
-    steps:
-    - checkout
-    - restore_cache:
-        key: yarn-lock-v6-{{ checksum "ui/yarn.lock" }}
-    - attach_workspace:
-        at: .
-    - run:
-        command: |
-          # Add ./bin to the PATH so vault binary can be found.
-          export PATH="${PWD}"/bin:${PATH}
-          make test-ui-browserstack
-        name: Run Browserstack Tests
-  build-go-dev:
-    machine: true
-    shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
-    steps:
-    - run:
-        command: |
-          [ -n "$GO_VERSION" ] || { echo "You must set GO_VERSION"; exit 1; }
-          # Install Go
-          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"
-          rm -f "go${GO_VERSION}.linux-amd64.tar.gz"
-          GOPATH="/go"
-          mkdir $GOPATH 2>/dev/null || { sudo mkdir $GOPATH && sudo chmod 777 $GOPATH; }
-          echo "export GOPATH='$GOPATH'" >> "$BASH_ENV"
-          echo "export PATH='$PATH:$GOPATH/bin:/usr/local/go/bin'" >> "$BASH_ENV"
+            make -f packages*.lock/layer.mk 05-ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be-image
+          name: Build ui-dependencies layer
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          echo "$ go version"
-          go version
-        name: Setup Go
-        working_directory: ~/
-    - checkout
-    - attach_workspace:
-        at: .
-    - run:
-        command: |
-          # Move dev UI assets to expected location
-          rm -rf ./pkg
-          mkdir ./pkg
+            make -f packages*.lock/layer.mk 06-build-ui-93790c2ff234916807dbadcc196cda8a852cfa76-image
+          name: Build build-ui layer
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          # Build dev binary
-          make ci-bootstrap dev
-        name: Build dev binary
-    - persist_to_workspace:
-        paths:
-        - bin
-        root: .
-    environment:
-    - CIRCLECI_CLI_VERSION: 0.1.5546
-    - GO_TAGS: ''
-    - GO_VERSION: 1.15.11
-    - GO111MODULE: 'off'
-    - GOTESTSUM_VERSION: 0.5.2
-  algolia-index:
-    docker:
-    - image: node:12
-    steps:
-    - checkout
-    - run:
-        command: |
-          if  [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/vault.git" ]; then
-            echo "Not Vault OSS Repo, not indexing Algolia"
-            exit 0
-          fi
-          cd website/
-          npm install
-          node scripts/index_search_content.js
-        name: Push content to Algolia Index
-  linux_386_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: 68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6
+            make -f packages*.lock/layer.mk 06-build-ui-93790c2ff234916807dbadcc196cda8a852cfa76-save
+          name: Build build-ui layer
+      - save_cache:
+          paths:
+            - .buildcache/archives/06-build-ui-93790c2ff234916807dbadcc196cda8a852cfa76.tar.gz
+          key: build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+          name: 'Save Layer Cache: build-ui'
+  bundle-releases:
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6-{{checksum ".buildcache/cache-keys/package-68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6-{{checksum ".buildcache/cache-keys/package-68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  test-go-remote-docker:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/golang:1.15.11-buster
-    resource_class: large
-    working_directory: /go/src/github.com/hashicorp/vault
-    parallelism: 8
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-all-package-cache-keys
+          name: Write all package cache keys
+      - run:
+          command: mkdir -p .buildcache && echo "*" > .buildcache/.gitignore
+          name: Ignore .buildcache
+      - restore_cache:
+          key: package-24324a0e2cfdb78c4f51a15f636c140529e17be5-{{checksum ".buildcache/cache-keys/package-24324a0e2cfdb78c4f51a15f636c140529e17be5"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-7b79026682168a1cad0e2e8937c98d044785eb1c-{{checksum ".buildcache/cache-keys/package-7b79026682168a1cad0e2e8937c98d044785eb1c"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-2b4c38cf1ab6a0578a66101845f667709f55b38c-{{checksum ".buildcache/cache-keys/package-2b4c38cf1ab6a0578a66101845f667709f55b38c"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-48f562df21165e9a40d5fba36e96c30674c22b17-{{checksum ".buildcache/cache-keys/package-48f562df21165e9a40d5fba36e96c30674c22b17"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-99f7c24df34d79753e97241b686386fa8491120c-{{checksum ".buildcache/cache-keys/package-99f7c24df34d79753e97241b686386fa8491120c"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-ff84cd10e7c3ea57a7db2ec489543add2642d3ad-{{checksum ".buildcache/cache-keys/package-ff84cd10e7c3ea57a7db2ec489543add2642d3ad"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-87d4bca3886f986ff6903c85e0c40307106236df-{{checksum ".buildcache/cache-keys/package-87d4bca3886f986ff6903c85e0c40307106236df"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-8f36325d6b7a42cbde3e13678f417f19e7bc0787-{{checksum ".buildcache/cache-keys/package-8f36325d6b7a42cbde3e13678f417f19e7bc0787"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-59b42257bac0d6f30949e0ea0cf90995959e8fe4-{{checksum ".buildcache/cache-keys/package-59b42257bac0d6f30949e0ea0cf90995959e8fe4"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-51fb6d6c24bb20df28f33c748bb79efe604126a3-{{checksum ".buildcache/cache-keys/package-51fb6d6c24bb20df28f33c748bb79efe604126a3"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-35775516579359d29996463c040b0dc0c83db72e-{{checksum ".buildcache/cache-keys/package-35775516579359d29996463c040b0dc0c83db72e"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-72703ff1ff5990848288486cfd436d6a4e6ef780-{{checksum ".buildcache/cache-keys/package-72703ff1ff5990848288486cfd436d6a4e6ef780"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-9f8289233c9366967e5676bfca42b73151746bc4-{{checksum ".buildcache/cache-keys/package-9f8289233c9366967e5676bfca42b73151746bc4"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-55bef43a0584384b547a016010c2a4ba60c61926-{{checksum ".buildcache/cache-keys/package-55bef43a0584384b547a016010c2a4ba60c61926"}}
+          name: Restore package cache
+      - restore_cache:
+          key: package-8f5a339ec447984e16aafd1ac2e7321ef108cc9d-{{checksum ".buildcache/cache-keys/package-8f5a339ec447984e16aafd1ac2e7321ef108cc9d"}}
+          name: Restore package cache
+      - run:
+          command: make package-meta-all
+          name: Write Package Metadata
+      - run:
+          command: make aliases
+          name: Write package aliases
+      - run:
+          command: ls -lahR .buildcache
+          name: List Build Cache
+      - run:
+          command: cp packages*.lock/pkgs.yml lockfile-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff.yml
+          name: Update Lockfile Name
+      - run:
+          command: tar -czf packages-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff.tar.gz .buildcache/packages lockfile-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff.yml
+          name: Create Raw Package Tarball
+      - run:
+          command: tar -czf meta-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff.tar.gz .buildcache/packages/store/*.json lockfile-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff.yml
+          name: Create Metadata Tarball
+      - store_artifacts:
+          path: lockfile-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff.yml
+      - store_artifacts:
+          path: packages-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff.tar.gz
+      - store_artifacts:
+          path: meta-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff.tar.gz
+      - run:
+          command: mv ".buildcache/packages" "packages-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff"
+          name: Update Custom Build Paths
+      - store_artifacts:
+          path: packages-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff
+  darwin_amd64_package:
+    executor: builder
     steps:
-    - run:
-        command: |
-          # If the branch being tested starts with ui/ or docs/ we want to exit the job without failing
-          [[ "$CIRCLE_BRANCH" = ui/* || "$CIRCLE_BRANCH" = docs/* ]] && {
-            # stop the job from this step
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-24324a0e2cfdb78c4f51a15f636c140529e17be5-{{checksum ".buildcache/cache-keys/package-24324a0e2cfdb78c4f51a15f636c140529e17be5"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
             circleci-agent step halt
-          }
-          # exit with success either way
-          exit 0
-        name: Check branch name
-        working_directory: ~/
-    - checkout
-    - setup_remote_docker:
-        docker_layer_caching: true
-        version: 18.09.3
-    - run:
-        command: |
-          TZ=GMT date '+%Y%m%d' > /tmp/go-cache-key
-        name: Compute test cache key
-    - restore_cache:
-        keys:
-        - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
-    - run:
-        command: |
-          set -x
-
-          case "" in
-          *-race*) export VAULT_CI_GO_TEST_RACE=1;;
-          esac
-
-          # Install CircleCI CLI
-          curl -sSL \
-              "https://github.com/CircleCI-Public/circleci-cli/releases/download/v${CIRCLECI_CLI_VERSION}/circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64.tar.gz" \
-            | sudo tar --overwrite -xz \
-              -C /usr/local/bin \
-              "circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64/circleci"
-
-          USE_DOCKER=0
-          USE_DOCKER=1
-
-          # Split Go tests by prior test times.  If use_docker is true, only run
-          # tests that depend on docker, otherwise only those that don't.
-          if [ $USE_DOCKER == 1 ]; then
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          else
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          fi
-
-          # After running tests split step, we are now running the following steps
-          # in multiple different containers, each getting a different subset of
-          # the test packages in their package_names variable.  Each container
-          # has its own remote docker VM.
-
-          make prep
-          mkdir -p test-results/go-test
-
-          # Create a docker network for our testcontainer
-          if [ $USE_DOCKER == 1 ]; then
-            # Despite the fact that we're using a circleci image (thus getting the
-            # version they chose for the docker cli) and that we're specifying a
-            # docker version to use for the remote docker instances, we occasionally
-            # see "client version too new, max supported version 1.39" errors for
-            # reasons unclear.
-            export DOCKER_API_VERSION=1.39
-
-            export TEST_DOCKER_NETWORK_ID=$(docker network list -q -f 'name=vaulttest')
-            if [ -z $TEST_DOCKER_NETWORK_ID ]; then
-              TEST_DOCKER_NETWORK_ID=$(docker network create vaulttest)
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
             fi
 
-            # Start a docker testcontainer to run the tests in
-            docker run -d -e TEST_DOCKER_NETWORK_ID \
-              -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
-              -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
-              --network vaulttest --name \
-              testcontainer circleci/golang:1.15.11-buster \
-              tail -f /dev/null
-
-            # Run tests
-            test -d /tmp/go-cache && docker cp /tmp/go-cache testcontainer:/tmp/gocache
-            docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-            docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
-            docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
-
-            docker exec -w /go/src/github.com/hashicorp/vault/ \
-              -e GO111MODULE -e CIRCLECI -e GOCACHE=/tmp/gocache -e VAULT_CI_GO_TEST_RACE \
-              testcontainer \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                 \
-                ${package_names}
-          else
-            GOCACHE=/tmp/go-cache \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                 \
-                ${package_names}
-          fi
-        name: Run Go tests
-        no_output_timeout: 60m
-    - run:
-        command: |
-          docker cp testcontainer:/go/src/github.com/hashicorp/vault/test-results .
-          docker cp testcontainer:/tmp/gocache /tmp/go-cache
-        name: Copy test results
-        when: always
-    - store_artifacts:
-        path: test-results
-    - store_test_results:
-        path: test-results
-    - store_artifacts:
-        path: /tmp/testlogs
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-24324a0e2cfdb78c4f51a15f636c140529e17be5-{{checksum ".buildcache/cache-keys/package-24324a0e2cfdb78c4f51a15f636c140529e17be5"}}
+          name: Save package cache
     environment:
-    - CIRCLECI_CLI_VERSION: 0.1.5546
-    - GO_TAGS: ''
-    - GO111MODULE: 'off'
+      PACKAGE_SPEC_ID: 24324a0e2cfdb78c4f51a15f636c140529e17be5
   freebsd_386_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: 8011af2584631c61ee593eb570b4936fb3ccd34c
-    steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-8011af2584631c61ee593eb570b4936fb3ccd34c-{{checksum ".buildcache/cache-keys/package-8011af2584631c61ee593eb570b4936fb3ccd34c"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-8011af2584631c61ee593eb570b4936fb3ccd34c-{{checksum ".buildcache/cache-keys/package-8011af2584631c61ee593eb570b4936fb3ccd34c"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  test-go-race:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/golang:1.15.11-buster
-    resource_class: xlarge
-    working_directory: /go/src/github.com/hashicorp/vault
-    parallelism: 8
+    executor: builder
     steps:
-    - run:
-        command: |
-          # If the branch being tested starts with ui/ or docs/ we want to exit the job without failing
-          [[ "$CIRCLE_BRANCH" = ui/* || "$CIRCLE_BRANCH" = docs/* ]] && {
-            # stop the job from this step
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-7b79026682168a1cad0e2e8937c98d044785eb1c-{{checksum ".buildcache/cache-keys/package-7b79026682168a1cad0e2e8937c98d044785eb1c"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
             circleci-agent step halt
-          }
-          # exit with success either way
-          exit 0
-        name: Check branch name
-        working_directory: ~/
-    - checkout
-    - run:
-        command: |
-          TZ=GMT date '+%Y%m%d' > /tmp/go-cache-key
-        name: Compute test cache key
-    - restore_cache:
-        keys:
-        - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
-    - run:
-        command: |
-          set -x
-
-          case "-race" in
-          *-race*) export VAULT_CI_GO_TEST_RACE=1;;
-          esac
-
-          # Install CircleCI CLI
-          curl -sSL \
-              "https://github.com/CircleCI-Public/circleci-cli/releases/download/v${CIRCLECI_CLI_VERSION}/circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64.tar.gz" \
-            | sudo tar --overwrite -xz \
-              -C /usr/local/bin \
-              "circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64/circleci"
-
-          USE_DOCKER=0
-
-          # Split Go tests by prior test times.  If use_docker is true, only run
-          # tests that depend on docker, otherwise only those that don't.
-          if [ $USE_DOCKER == 1 ]; then
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          else
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          fi
-
-          # After running tests split step, we are now running the following steps
-          # in multiple different containers, each getting a different subset of
-          # the test packages in their package_names variable.  Each container
-          # has its own remote docker VM.
-
-          make prep
-          mkdir -p test-results/go-test
-
-          # Create a docker network for our testcontainer
-          if [ $USE_DOCKER == 1 ]; then
-            # Despite the fact that we're using a circleci image (thus getting the
-            # version they chose for the docker cli) and that we're specifying a
-            # docker version to use for the remote docker instances, we occasionally
-            # see "client version too new, max supported version 1.39" errors for
-            # reasons unclear.
-            export DOCKER_API_VERSION=1.39
-
-            export TEST_DOCKER_NETWORK_ID=$(docker network list -q -f 'name=vaulttest')
-            if [ -z $TEST_DOCKER_NETWORK_ID ]; then
-              TEST_DOCKER_NETWORK_ID=$(docker network create vaulttest)
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
             fi
 
-            # Start a docker testcontainer to run the tests in
-            docker run -d -e TEST_DOCKER_NETWORK_ID \
-              -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
-              -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
-              --network vaulttest --name \
-              testcontainer circleci/golang:1.15.11-buster \
-              tail -f /dev/null
-
-            # Run tests
-            test -d /tmp/go-cache && docker cp /tmp/go-cache testcontainer:/tmp/gocache
-            docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-            docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
-            docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
-
-            docker exec -w /go/src/github.com/hashicorp/vault/ \
-              -e GO111MODULE -e CIRCLECI -e GOCACHE=/tmp/gocache -e VAULT_CI_GO_TEST_RACE \
-              testcontainer \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                -race \
-                ${package_names}
-          else
-            GOCACHE=/tmp/go-cache \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                -race \
-                ${package_names}
-          fi
-        name: Run Go tests
-        no_output_timeout: 60m
-    - store_artifacts:
-        path: test-results
-    - store_test_results:
-        path: test-results
-    - store_artifacts:
-        path: /tmp/testlogs
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-7b79026682168a1cad0e2e8937c98d044785eb1c-{{checksum ".buildcache/cache-keys/package-7b79026682168a1cad0e2e8937c98d044785eb1c"}}
+          name: Save package cache
     environment:
-    - CIRCLECI_CLI_VERSION: 0.1.5546
-    - GO_TAGS: ''
-    - GO111MODULE: 'off'
+      PACKAGE_SPEC_ID: 7b79026682168a1cad0e2e8937c98d044785eb1c
   freebsd_amd64_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: bfc2ea44573bbefd840eaac2593856deb0b0f5d2
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-bfc2ea44573bbefd840eaac2593856deb0b0f5d2-{{checksum ".buildcache/cache-keys/package-bfc2ea44573bbefd840eaac2593856deb0b0f5d2"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-2b4c38cf1ab6a0578a66101845f667709f55b38c-{{checksum ".buildcache/cache-keys/package-2b4c38cf1ab6a0578a66101845f667709f55b38c"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-bfc2ea44573bbefd840eaac2593856deb0b0f5d2-{{checksum ".buildcache/cache-keys/package-bfc2ea44573bbefd840eaac2593856deb0b0f5d2"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  openbsd_386_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-2b4c38cf1ab6a0578a66101845f667709f55b38c-{{checksum ".buildcache/cache-keys/package-2b4c38cf1ab6a0578a66101845f667709f55b38c"}}
+          name: Save package cache
     environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: 5502b4c650c7d2a9bc9fc98a4e2233389b754dd5
+      PACKAGE_SPEC_ID: 2b4c38cf1ab6a0578a66101845f667709f55b38c
+  freebsd_arm_package:
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-5502b4c650c7d2a9bc9fc98a4e2233389b754dd5-{{checksum ".buildcache/cache-keys/package-5502b4c650c7d2a9bc9fc98a4e2233389b754dd5"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-48f562df21165e9a40d5fba36e96c30674c22b17-{{checksum ".buildcache/cache-keys/package-48f562df21165e9a40d5fba36e96c30674c22b17"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-5502b4c650c7d2a9bc9fc98a4e2233389b754dd5-{{checksum ".buildcache/cache-keys/package-5502b4c650c7d2a9bc9fc98a4e2233389b754dd5"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  linux_amd64_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-48f562df21165e9a40d5fba36e96c30674c22b17-{{checksum ".buildcache/cache-keys/package-48f562df21165e9a40d5fba36e96c30674c22b17"}}
+          name: Save package cache
     environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: 13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0
+      PACKAGE_SPEC_ID: 48f562df21165e9a40d5fba36e96c30674c22b17
+  linux_386_package:
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0-{{checksum ".buildcache/cache-keys/package-13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-99f7c24df34d79753e97241b686386fa8491120c-{{checksum ".buildcache/cache-keys/package-99f7c24df34d79753e97241b686386fa8491120c"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0-{{checksum ".buildcache/cache-keys/package-13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  website-docker-image:
-    docker:
-    - image: circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    steps:
-    - checkout
-    - setup_remote_docker
-    - run:
-        command: |
-          IMAGE_TAG="$(git rev-list -n1 HEAD -- website/Dockerfile website/package-lock.json)"
-          echo "Using $IMAGE_TAG"
-          if  [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/vault.git" ]; then
-            echo "Not Vault OSS Repo, not building website docker image"
-          elif curl https://hub.docker.com/v2/repositories/hashicorp/vault-website/tags/$IMAGE_TAG -fsL > /dev/null; then
-              echo "Dependencies have not changed, not building a new website docker image."
-          else
-              cd website/
-              docker build -t hashicorp/vault-website:$IMAGE_TAG .
-              docker tag hashicorp/vault-website:$IMAGE_TAG hashicorp/vault-website:latest
-              docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS
-              docker push hashicorp/vault-website
-          fi
-        name: Build Docker Image if Necessary
-  solaris_amd64_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-99f7c24df34d79753e97241b686386fa8491120c-{{checksum ".buildcache/cache-keys/package-99f7c24df34d79753e97241b686386fa8491120c"}}
+          name: Save package cache
     environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: b3627d64e7ed43c6e293b229fad84ead0ef77bc3
+      PACKAGE_SPEC_ID: 99f7c24df34d79753e97241b686386fa8491120c
+  linux_amd64_package:
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-b3627d64e7ed43c6e293b229fad84ead0ef77bc3-{{checksum ".buildcache/cache-keys/package-b3627d64e7ed43c6e293b229fad84ead0ef77bc3"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-ff84cd10e7c3ea57a7db2ec489543add2642d3ad-{{checksum ".buildcache/cache-keys/package-ff84cd10e7c3ea57a7db2ec489543add2642d3ad"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-b3627d64e7ed43c6e293b229fad84ead0ef77bc3-{{checksum ".buildcache/cache-keys/package-b3627d64e7ed43c6e293b229fad84ead0ef77bc3"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  test-go:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/golang:1.15.11-buster
-    resource_class: xlarge
-    working_directory: /go/src/github.com/hashicorp/vault
-    parallelism: 8
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-ff84cd10e7c3ea57a7db2ec489543add2642d3ad-{{checksum ".buildcache/cache-keys/package-ff84cd10e7c3ea57a7db2ec489543add2642d3ad"}}
+          name: Save package cache
+    environment:
+      PACKAGE_SPEC_ID: ff84cd10e7c3ea57a7db2ec489543add2642d3ad
+  linux_arm_package:
+    executor: builder
     steps:
-    - run:
-        command: |
-          # If the branch being tested starts with ui/ or docs/ we want to exit the job without failing
-          [[ "$CIRCLE_BRANCH" = ui/* || "$CIRCLE_BRANCH" = docs/* ]] && {
-            # stop the job from this step
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-87d4bca3886f986ff6903c85e0c40307106236df-{{checksum ".buildcache/cache-keys/package-87d4bca3886f986ff6903c85e0c40307106236df"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
             circleci-agent step halt
-          }
-          # exit with success either way
-          exit 0
-        name: Check branch name
-        working_directory: ~/
-    - checkout
-    - run:
-        command: |
-          TZ=GMT date '+%Y%m%d' > /tmp/go-cache-key
-        name: Compute test cache key
-    - restore_cache:
-        keys:
-        - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
-    - run:
-        command: |
-          set -x
-
-          case "" in
-          *-race*) export VAULT_CI_GO_TEST_RACE=1;;
-          esac
-
-          # Install CircleCI CLI
-          curl -sSL \
-              "https://github.com/CircleCI-Public/circleci-cli/releases/download/v${CIRCLECI_CLI_VERSION}/circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64.tar.gz" \
-            | sudo tar --overwrite -xz \
-              -C /usr/local/bin \
-              "circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64/circleci"
-
-          USE_DOCKER=0
-
-          # Split Go tests by prior test times.  If use_docker is true, only run
-          # tests that depend on docker, otherwise only those that don't.
-          if [ $USE_DOCKER == 1 ]; then
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          else
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          fi
-
-          # After running tests split step, we are now running the following steps
-          # in multiple different containers, each getting a different subset of
-          # the test packages in their package_names variable.  Each container
-          # has its own remote docker VM.
-
-          make prep
-          mkdir -p test-results/go-test
-
-          # Create a docker network for our testcontainer
-          if [ $USE_DOCKER == 1 ]; then
-            # Despite the fact that we're using a circleci image (thus getting the
-            # version they chose for the docker cli) and that we're specifying a
-            # docker version to use for the remote docker instances, we occasionally
-            # see "client version too new, max supported version 1.39" errors for
-            # reasons unclear.
-            export DOCKER_API_VERSION=1.39
-
-            export TEST_DOCKER_NETWORK_ID=$(docker network list -q -f 'name=vaulttest')
-            if [ -z $TEST_DOCKER_NETWORK_ID ]; then
-              TEST_DOCKER_NETWORK_ID=$(docker network create vaulttest)
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
             fi
 
-            # Start a docker testcontainer to run the tests in
-            docker run -d -e TEST_DOCKER_NETWORK_ID \
-              -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
-              -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
-              --network vaulttest --name \
-              testcontainer circleci/golang:1.15.11-buster \
-              tail -f /dev/null
-
-            # Run tests
-            test -d /tmp/go-cache && docker cp /tmp/go-cache testcontainer:/tmp/gocache
-            docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-            docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
-            docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
-
-            docker exec -w /go/src/github.com/hashicorp/vault/ \
-              -e GO111MODULE -e CIRCLECI -e GOCACHE=/tmp/gocache -e VAULT_CI_GO_TEST_RACE \
-              testcontainer \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                 \
-                ${package_names}
-          else
-            GOCACHE=/tmp/go-cache \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                 \
-                ${package_names}
-          fi
-        name: Run Go tests
-        no_output_timeout: 60m
-    - store_artifacts:
-        path: test-results
-    - store_test_results:
-        path: test-results
-    - store_artifacts:
-        path: /tmp/testlogs
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-87d4bca3886f986ff6903c85e0c40307106236df-{{checksum ".buildcache/cache-keys/package-87d4bca3886f986ff6903c85e0c40307106236df"}}
+          name: Save package cache
     environment:
-    - CIRCLECI_CLI_VERSION: 0.1.5546
-    - GO_TAGS: ''
-    - GO111MODULE: 'off'
-  test-go-nightly:
-    machine: true
-    shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
+      PACKAGE_SPEC_ID: 87d4bca3886f986ff6903c85e0c40307106236df
+  linux_arm64_package:
+    executor: builder
     steps:
-    - run:
-        command: |
-          # If the branch being tested starts with ui/ or docs/ we want to exit the job without failing
-          [[ "$CIRCLE_BRANCH" = ui/* || "$CIRCLE_BRANCH" = docs/* ]] && {
-            # stop the job from this step
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-8f36325d6b7a42cbde3e13678f417f19e7bc0787-{{checksum ".buildcache/cache-keys/package-8f36325d6b7a42cbde3e13678f417f19e7bc0787"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
             circleci-agent step halt
-          }
-          # exit with success either way
-          exit 0
-        name: Check branch name
-        working_directory: ~/
-    - run:
-        command: |
-          [ -n "$GO_VERSION" ] || { echo "You must set GO_VERSION"; exit 1; }
-          # Install Go
-          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"
-          rm -f "go${GO_VERSION}.linux-amd64.tar.gz"
-          GOPATH="/go"
-          mkdir $GOPATH 2>/dev/null || { sudo mkdir $GOPATH && sudo chmod 777 $GOPATH; }
-          echo "export GOPATH='$GOPATH'" >> "$BASH_ENV"
-          echo "export PATH='$PATH:$GOPATH/bin:/usr/local/go/bin'" >> "$BASH_ENV"
-
-          echo "$ go version"
-          go version
-        name: Setup Go
-        working_directory: ~/
-    - checkout
-    - run:
-        command: |
-          TZ=GMT date '+%Y%m%d' > /tmp/go-cache-key
-        name: Compute test cache key
-    - restore_cache:
-        keys:
-        - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
-    - run:
-        command: |
-          set -x
-
-          case "" in
-          *-race*) export VAULT_CI_GO_TEST_RACE=1;;
-          esac
-
-          # Install CircleCI CLI
-          curl -sSL \
-              "https://github.com/CircleCI-Public/circleci-cli/releases/download/v${CIRCLECI_CLI_VERSION}/circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64.tar.gz" \
-            | sudo tar --overwrite -xz \
-              -C /usr/local/bin \
-              "circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64/circleci"
-
-          USE_DOCKER=0
-
-          # Split Go tests by prior test times.  If use_docker is true, only run
-          # tests that depend on docker, otherwise only those that don't.
-          if [ $USE_DOCKER == 1 ]; then
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          else
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          fi
-
-          # After running tests split step, we are now running the following steps
-          # in multiple different containers, each getting a different subset of
-          # the test packages in their package_names variable.  Each container
-          # has its own remote docker VM.
-
-          make prep
-          mkdir -p test-results/go-test
-
-          # Create a docker network for our testcontainer
-          if [ $USE_DOCKER == 1 ]; then
-            # Despite the fact that we're using a circleci image (thus getting the
-            # version they chose for the docker cli) and that we're specifying a
-            # docker version to use for the remote docker instances, we occasionally
-            # see "client version too new, max supported version 1.39" errors for
-            # reasons unclear.
-            export DOCKER_API_VERSION=1.39
-
-            export TEST_DOCKER_NETWORK_ID=$(docker network list -q -f 'name=vaulttest')
-            if [ -z $TEST_DOCKER_NETWORK_ID ]; then
-              TEST_DOCKER_NETWORK_ID=$(docker network create vaulttest)
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
             fi
 
-            # Start a docker testcontainer to run the tests in
-            docker run -d -e TEST_DOCKER_NETWORK_ID \
-              -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
-              -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
-              --network vaulttest --name \
-              testcontainer circleci/golang:1.15.11-buster \
-              tail -f /dev/null
-
-            # Run tests
-            test -d /tmp/go-cache && docker cp /tmp/go-cache testcontainer:/tmp/gocache
-            docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-            docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
-            docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-8f36325d6b7a42cbde3e13678f417f19e7bc0787-{{checksum ".buildcache/cache-keys/package-8f36325d6b7a42cbde3e13678f417f19e7bc0787"}}
+          name: Save package cache
+    environment:
+      PACKAGE_SPEC_ID: 8f36325d6b7a42cbde3e13678f417f19e7bc0787
+  netbsd_386_package:
+    executor: builder
+    steps:
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-59b42257bac0d6f30949e0ea0cf90995959e8fe4-{{checksum ".buildcache/cache-keys/package-59b42257bac0d6f30949e0ea0cf90995959e8fe4"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-            docker exec -w /go/src/github.com/hashicorp/vault/ \
-              -e GO111MODULE -e CIRCLECI -e GOCACHE=/tmp/gocache -e VAULT_CI_GO_TEST_RACE \
-              testcontainer \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                 \
-                ${package_names}
-          else
-            GOCACHE=/tmp/go-cache \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                 \
-                ${package_names}
-          fi
-        name: Run Go tests
-        no_output_timeout: 60m
-    - save_cache:
-        key: go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
-        paths:
-        - /tmp/go-cache
-        when: always
-    - store_artifacts:
-        path: test-results
-    - store_test_results:
-        path: test-results
-    - store_artifacts:
-        path: /tmp/testlogs
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-59b42257bac0d6f30949e0ea0cf90995959e8fe4-{{checksum ".buildcache/cache-keys/package-59b42257bac0d6f30949e0ea0cf90995959e8fe4"}}
+          name: Save package cache
     environment:
-    - CIRCLECI_CLI_VERSION: 0.1.5546
-    - GO_TAGS: ''
-    - GO_VERSION: 1.15.11
-    - GO111MODULE: 'off'
-    - GOTESTSUM_VERSION: 0.5.2
+      PACKAGE_SPEC_ID: 59b42257bac0d6f30949e0ea0cf90995959e8fe4
   netbsd_amd64_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: 03464cbb7e730c5fd0615794f5f55092ddc9749c
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-03464cbb7e730c5fd0615794f5f55092ddc9749c-{{checksum ".buildcache/cache-keys/package-03464cbb7e730c5fd0615794f5f55092ddc9749c"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-51fb6d6c24bb20df28f33c748bb79efe604126a3-{{checksum ".buildcache/cache-keys/package-51fb6d6c24bb20df28f33c748bb79efe604126a3"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-03464cbb7e730c5fd0615794f5f55092ddc9749c-{{checksum ".buildcache/cache-keys/package-03464cbb7e730c5fd0615794f5f55092ddc9749c"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  openbsd_amd64_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-51fb6d6c24bb20df28f33c748bb79efe604126a3-{{checksum ".buildcache/cache-keys/package-51fb6d6c24bb20df28f33c748bb79efe604126a3"}}
+          name: Save package cache
     environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: 5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e
+      PACKAGE_SPEC_ID: 51fb6d6c24bb20df28f33c748bb79efe604126a3
+  openbsd_386_package:
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e-{{checksum ".buildcache/cache-keys/package-5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-35775516579359d29996463c040b0dc0c83db72e-{{checksum ".buildcache/cache-keys/package-35775516579359d29996463c040b0dc0c83db72e"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e-{{checksum ".buildcache/cache-keys/package-5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  netbsd_386_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-35775516579359d29996463c040b0dc0c83db72e-{{checksum ".buildcache/cache-keys/package-35775516579359d29996463c040b0dc0c83db72e"}}
+          name: Save package cache
     environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: 2e1eb2fe413615847f15b86482010df36a8385c4
+      PACKAGE_SPEC_ID: 35775516579359d29996463c040b0dc0c83db72e
+  openbsd_amd64_package:
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-2e1eb2fe413615847f15b86482010df36a8385c4-{{checksum ".buildcache/cache-keys/package-2e1eb2fe413615847f15b86482010df36a8385c4"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-72703ff1ff5990848288486cfd436d6a4e6ef780-{{checksum ".buildcache/cache-keys/package-72703ff1ff5990848288486cfd436d6a4e6ef780"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-2e1eb2fe413615847f15b86482010df36a8385c4-{{checksum ".buildcache/cache-keys/package-2e1eb2fe413615847f15b86482010df36a8385c4"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  freebsd_arm_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-72703ff1ff5990848288486cfd436d6a4e6ef780-{{checksum ".buildcache/cache-keys/package-72703ff1ff5990848288486cfd436d6a4e6ef780"}}
+          name: Save package cache
     environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: b1b28b61b31c6c4aae96907ca0dd964ed79ddd83
+      PACKAGE_SPEC_ID: 72703ff1ff5990848288486cfd436d6a4e6ef780
+  solaris_amd64_package:
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-b1b28b61b31c6c4aae96907ca0dd964ed79ddd83-{{checksum ".buildcache/cache-keys/package-b1b28b61b31c6c4aae96907ca0dd964ed79ddd83"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-9f8289233c9366967e5676bfca42b73151746bc4-{{checksum ".buildcache/cache-keys/package-9f8289233c9366967e5676bfca42b73151746bc4"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-b1b28b61b31c6c4aae96907ca0dd964ed79ddd83-{{checksum ".buildcache/cache-keys/package-b1b28b61b31c6c4aae96907ca0dd964ed79ddd83"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  windows_amd64_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-9f8289233c9366967e5676bfca42b73151746bc4-{{checksum ".buildcache/cache-keys/package-9f8289233c9366967e5676bfca42b73151746bc4"}}
+          name: Save package cache
     environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: f327368a08912c61c859b101a10954145a0d62e0
+      PACKAGE_SPEC_ID: 9f8289233c9366967e5676bfca42b73151746bc4
+  windows_386_package:
+    executor: builder
     steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-f327368a08912c61c859b101a10954145a0d62e0-{{checksum ".buildcache/cache-keys/package-f327368a08912c61c859b101a10954145a0d62e0"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
-        keys:
-        - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
-        - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
-        - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
-        - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
-        - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
-        - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
-        - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
-        - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-55bef43a0584384b547a016010c2a4ba60c61926-{{checksum ".buildcache/cache-keys/package-55bef43a0584384b547a016010c2a4ba60c61926"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
+            circleci-agent step halt
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
+            fi
 
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-f327368a08912c61c859b101a10954145a0d62e0-{{checksum ".buildcache/cache-keys/package-f327368a08912c61c859b101a10954145a0d62e0"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
-  pre-flight-checks:
-    docker:
-    - image: circleci/buildpack-deps
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-55bef43a0584384b547a016010c2a4ba60c61926-{{checksum ".buildcache/cache-keys/package-55bef43a0584384b547a016010c2a4ba60c61926"}}
+          name: Save package cache
     environment:
-    - CCI_VERSION: 0.1.5691
-    shell: /usr/bin/env bash -euo pipefail
-    steps:
-    - checkout
-    - run:
-        command: |
-          export CCI_PATH=/tmp/circleci-cli/$CCI_VERSION
-          mkdir -p $CCI_PATH
-          NAME=circleci-cli_${CCI_VERSION}_${ARCH}
-          URL=$BASE/v${CCI_VERSION}/${NAME}.tar.gz
-          curl -sSL $URL \
-            | tar --overwrite --strip-components=1 -xz -C $CCI_PATH "${NAME}/circleci"
-          # Add circleci to the path for subsequent steps.
-          echo "export PATH=$CCI_PATH:\$PATH" >> $BASH_ENV
-          # Done, print some debug info.
-          set -x
-          . $BASH_ENV
-          which circleci
-          circleci version
-        environment:
-          ARCH: linux_amd64
-          BASE: https://github.com/CircleCI-Public/circleci-cli/releases/download
-        name: Install CircleCI CLI
-    - run:
-        command: make ci-verify
-  test-go-race-remote-docker:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/golang:1.15.11-buster
-    resource_class: xlarge
-    working_directory: /go/src/github.com/hashicorp/vault
-    parallelism: 8
+      PACKAGE_SPEC_ID: 55bef43a0584384b547a016010c2a4ba60c61926
+  windows_amd64_package:
+    executor: builder
     steps:
-    - run:
-        command: |
-          # If the branch being tested starts with ui/ or docs/ we want to exit the job without failing
-          [[ "$CIRCLE_BRANCH" = ui/* || "$CIRCLE_BRANCH" = docs/* ]] && {
-            # stop the job from this step
+      - setup_remote_docker:
+          version: 19.03.12
+          docker_layer_caching: false
+      - add_ssh_keys:
+          fingerprints:
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
+      - checkout:
+          path: .
+      - run:
+          command: make -C packages*.lock write-package-cache-key
+          name: Write package cache key
+      - restore_cache:
+          key: package-8f5a339ec447984e16aafd1ac2e7321ef108cc9d-{{checksum ".buildcache/cache-keys/package-8f5a339ec447984e16aafd1ac2e7321ef108cc9d"}}
+          name: Restore package cache
+      - run:
+          command: |2
+
+            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
+              echo "No package found, continuing with build."
+              exit 0
+            fi
+            echo "Package already cached, skipping build."
             circleci-agent step halt
-          }
-          # exit with success either way
-          exit 0
-        name: Check branch name
-        working_directory: ~/
-    - checkout
-    - setup_remote_docker:
-        docker_layer_caching: true
-        version: 18.09.3
-    - run:
-        command: |
-          TZ=GMT date '+%Y%m%d' > /tmp/go-cache-key
-        name: Compute test cache key
-    - restore_cache:
-        keys:
-        - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
-    - run:
-        command: |
-          set -x
-
-          case "-race" in
-          *-race*) export VAULT_CI_GO_TEST_RACE=1;;
-          esac
-
-          # Install CircleCI CLI
-          curl -sSL \
-              "https://github.com/CircleCI-Public/circleci-cli/releases/download/v${CIRCLECI_CLI_VERSION}/circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64.tar.gz" \
-            | sudo tar --overwrite -xz \
-              -C /usr/local/bin \
-              "circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64/circleci"
-
-          USE_DOCKER=0
-          USE_DOCKER=1
-
-          # Split Go tests by prior test times.  If use_docker is true, only run
-          # tests that depend on docker, otherwise only those that don't.
-          if [ $USE_DOCKER == 1 ]; then
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          else
-            package_names=$(go list -test -json ./... |
-              jq -r 'select(.Deps != null) |
-                select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) |
-                .ForTest | select(. != null)' |
-                sort -u | circleci tests split --split-by=timings --timings-type=classname)
-          fi
-
-          # After running tests split step, we are now running the following steps
-          # in multiple different containers, each getting a different subset of
-          # the test packages in their package_names variable.  Each container
-          # has its own remote docker VM.
-
-          make prep
-          mkdir -p test-results/go-test
-
-          # Create a docker network for our testcontainer
-          if [ $USE_DOCKER == 1 ]; then
-            # Despite the fact that we're using a circleci image (thus getting the
-            # version they chose for the docker cli) and that we're specifying a
-            # docker version to use for the remote docker instances, we occasionally
-            # see "client version too new, max supported version 1.39" errors for
-            # reasons unclear.
-            export DOCKER_API_VERSION=1.39
-
-            export TEST_DOCKER_NETWORK_ID=$(docker network list -q -f 'name=vaulttest')
-            if [ -z $TEST_DOCKER_NETWORK_ID ]; then
-              TEST_DOCKER_NETWORK_ID=$(docker network create vaulttest)
+          name: Check cache status
+      - run:
+          command: make -C packages*.lock write-builder-cache-keys
+          name: Write builder layer cache keys
+      - restore_cache:
+          key: copy-source_eacc_{{checksum ".buildcache/cache-keys/copy-source-eacc5862b13cd01f4a132a04f9a3c4bd47e6bf5a"}}
+          keys:
+            - warm-go-build-vendor-cache_a061_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-a06158024a19b24cd3bcdb2ffaa49c451615aefa"}}
+            - build-static-assets_decb_{{checksum ".buildcache/cache-keys/build-static-assets-decbb509c6009a389b506c6ecead5f5ba9e0008e"}}
+            - build-ui_9379_{{checksum ".buildcache/cache-keys/build-ui-93790c2ff234916807dbadcc196cda8a852cfa76"}}
+            - ui-dependencies_5803_{{checksum ".buildcache/cache-keys/ui-dependencies-5803ed7824394d0ce61ada9c5becfa55dd7547be"}}
+            - install-yarn_8d10_{{checksum ".buildcache/cache-keys/install-yarn-8d102d518d5f4a9fa19b6e9f56f0921d0c0b9919"}}
+            - set-workdir_0446_{{checksum ".buildcache/cache-keys/set-workdir-0446c546bf80628f37cdca60645f728266d87e4a"}}
+            - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
+            - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
+            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
+          name: 'Restore Builder Image Cache: copy-source'
+      - run:
+          command: make -C packages*.lock load-builder-cache
+          name: Load whatever builder cache we have (if any) into the Docker daemon
+          no_output_timeout: 30m
+      - run:
+          command: |2-
+
+            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
+            eval "$(ssh-agent -s)"
+            if [ -f "$KEYFILE" ]; then
+              ssh-add "$KEYFILE"
+            else
+              echo "==> INFO: SSH key for github.com not found"
+              echo "    Attempts to access private repositories from within"
+              echo "    the build will fail, e.g. for private go modules, or"
+              echo "    attempts to directly clone private repositories."
             fi
 
-            # Start a docker testcontainer to run the tests in
-            docker run -d -e TEST_DOCKER_NETWORK_ID \
-              -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
-              -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
-              --network vaulttest --name \
-              testcontainer circleci/golang:1.15.11-buster \
-              tail -f /dev/null
-
-            # Run tests
-            test -d /tmp/go-cache && docker cp /tmp/go-cache testcontainer:/tmp/gocache
-            docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-            docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
-            docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
-
-            docker exec -w /go/src/github.com/hashicorp/vault/ \
-              -e GO111MODULE -e CIRCLECI -e GOCACHE=/tmp/gocache -e VAULT_CI_GO_TEST_RACE \
-              testcontainer \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                -race \
-                ${package_names}
-          else
-            GOCACHE=/tmp/go-cache \
-              gotestsum --format=short-verbose \
-                --junitfile test-results/go-test/results.xml \
-                --jsonfile test-results/go-test/results.json \
-                -- \
-                -tags "${GO_TAGS}" \
-                -timeout=60m \
-                -parallel=20 \
-                -race \
-                ${package_names}
-          fi
-        name: Run Go tests
-        no_output_timeout: 60m
-    - run:
-        command: |
-          docker cp testcontainer:/go/src/github.com/hashicorp/vault/test-results .
-          docker cp testcontainer:/tmp/gocache /tmp/go-cache
-        name: Copy test results
-        when: always
-    - store_artifacts:
-        path: test-results
-    - store_test_results:
-        path: test-results
-    - store_artifacts:
-        path: /tmp/testlogs
+            make -C packages*.lock package
+          name: Compile Package
+      - run:
+          command: ls -lahR .buildcache/packages
+          name: List packages
+      - save_cache:
+          paths:
+            - .buildcache/packages/store
+          key: package-8f5a339ec447984e16aafd1ac2e7321ef108cc9d-{{checksum ".buildcache/cache-keys/package-8f5a339ec447984e16aafd1ac2e7321ef108cc9d"}}
+          name: Save package cache
     environment:
-    - CIRCLECI_CLI_VERSION: 0.1.5546
-    - GO_TAGS: ''
-    - GO111MODULE: 'off'
+      PACKAGE_SPEC_ID: 8f5a339ec447984e16aafd1ac2e7321ef108cc9d
 workflows:
-  build-a34ceb710379ab7c:
-    jobs:
-    - build-common-layers
-    - darwin_amd64_package:
-        requires:
-        - build-common-layers
-    - bundle-releases:
-        requires:
-        - darwin_amd64_package
-        - freebsd_386_package
-        - freebsd_amd64_package
-        - freebsd_arm_package
-        - linux_386_package
-        - linux_amd64_package
-        - linux_arm_package
-        - linux_arm64_package
-        - netbsd_386_package
-        - netbsd_amd64_package
-        - openbsd_386_package
-        - openbsd_amd64_package
-        - solaris_amd64_package
-        - windows_386_package
-        - windows_amd64_package
-    - freebsd_386_package:
-        requires:
-        - build-common-layers
-    - freebsd_amd64_package:
-        requires:
-        - build-common-layers
-    - freebsd_arm_package:
-        requires:
-        - build-common-layers
-    - linux_386_package:
-        requires:
-        - build-common-layers
-    - linux_amd64_package:
-        requires:
-        - build-common-layers
-    - linux_arm_package:
-        requires:
-        - build-common-layers
-    - linux_arm64_package:
-        requires:
-        - build-common-layers
-    - netbsd_386_package:
-        requires:
-        - build-common-layers
-    - netbsd_amd64_package:
-        requires:
-        - build-common-layers
-    - openbsd_386_package:
-        requires:
-        - build-common-layers
-    - openbsd_amd64_package:
-        requires:
-        - build-common-layers
-    - solaris_amd64_package:
-        requires:
-        - build-common-layers
-    - windows_386_package:
-        requires:
-        - build-common-layers
-    - windows_amd64_package:
-        requires:
-        - build-common-layers
-  ci:
-    jobs:
-    - pre-flight-checks
-    - install-ui-dependencies:
-        requires:
-        - pre-flight-checks
-    - build-go-dev:
-        requires:
-        - pre-flight-checks
-    - test-ui:
-        requires:
-        - install-ui-dependencies
-        - build-go-dev
-    - test-ui-browserstack:
-        filters:
-          branches:
-            ignore: /pull\/[0-9]+/
-        requires:
-        - install-ui-dependencies
-        - build-go-dev
-    - test-go:
-        requires:
-        - pre-flight-checks
-    - test-go-remote-docker:
-        requires:
-        - pre-flight-checks
-    - test-go-race:
-        filters:
-          branches:
-            ignore:
-            - /^docs\/.*/
-            - /^ui\/.*/
-        requires:
-        - pre-flight-checks
-    - test-go-race-remote-docker:
-        filters:
-          branches:
-            ignore:
-            - /^docs\/.*/
-            - /^ui\/.*/
-        requires:
-        - pre-flight-checks
-    - website-docker-image:
-        filters:
-          branches:
-            only:
-            - master
-        context: vault-docs
-    - algolia-index:
-        filters:
-          branches:
-            only:
-            - stable-website
-        context: vault-docs
-  nightly-cachebuilder:
+  build-db0e4245d5119b5929e611ea4d9bf66e47f3f208-abc528c08d6d9bff:
     jobs:
-    - pre-flight-checks
-    - test-go-nightly
-    triggers:
-    - schedule:
-        cron: 0 9 * * *
-        filters:
-          branches:
-            only:
-            - master
-  version: 2
+      - build-common-layers: {}
+      - darwin_amd64_package:
+          requires:
+            - build-common-layers
+      - bundle-releases:
+          requires:
+            - darwin_amd64_package
+            - freebsd_386_package
+            - freebsd_amd64_package
+            - freebsd_arm_package
+            - linux_386_package
+            - linux_amd64_package
+            - linux_arm_package
+            - linux_arm64_package
+            - netbsd_386_package
+            - netbsd_amd64_package
+            - openbsd_386_package
+            - openbsd_amd64_package
+            - solaris_amd64_package
+            - windows_386_package
+            - windows_amd64_package
+      - freebsd_386_package:
+          requires:
+            - build-common-layers
+      - freebsd_amd64_package:
+          requires:
+            - build-common-layers
+      - freebsd_arm_package:
+          requires:
+            - build-common-layers
+      - linux_386_package:
+          requires:
+            - build-common-layers
+      - linux_amd64_package:
+          requires:
+            - build-common-layers
+      - linux_arm_package:
+          requires:
+            - build-common-layers
+      - linux_arm64_package:
+          requires:
+            - build-common-layers
+      - netbsd_386_package:
+          requires:
+            - build-common-layers
+      - netbsd_amd64_package:
+          requires:
+            - build-common-layers
+      - openbsd_386_package:
+          requires:
+            - build-common-layers
+      - openbsd_amd64_package:
+          requires:
+            - build-common-layers
+      - solaris_amd64_package:
+          requires:
+            - build-common-layers
+      - windows_386_package:
+          requires:
+            - build-common-layers
+      - windows_amd64_package:
+          requires:
+            - build-common-layers
diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml
index 994a14ff1..6a95715b6 100644
--- a/packages-oss.lock/pkgs.yml
+++ b/packages-oss.lock/pkgs.yml
@@ -1,11 +1,11 @@
 # ***
 # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec.
 # ***
-lockid: a34ceb710379ab7c
+lockid: abc528c08d6d9bff
 packagespec-version: 0.2.6
 cache-version: 10
 packages:
-  - packagespecid: c87d721f1a377d4053235a55b44d6ab7b22a835e
+  - packagespecid: 24324a0e2cfdb78c4f51a15f636c140529e17be5
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -13,13 +13,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: amd64
       GOOS: darwin
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: darwin_amd64_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -52,7 +52,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-c87d721f1a377d4053235a55b44d6ab7b22a835e
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-24324a0e2cfdb78c4f51a15f636c140529e17be5
         POST_PROCESSORS: apple-notarize av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -66,14 +66,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-c87d721f1a377d4053235a55b44d6ab7b22a835e-{{checksum ".buildcache/cache-keys/package-c87d721f1a377d4053235a55b44d6ab7b22a835e"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-24324a0e2cfdb78c4f51a15f636c140529e17be5-{{checksum ".buildcache/cache-keys/package-24324a0e2cfdb78c4f51a15f636c140529e17be5"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_darwin_amd64.zip
+        path: vault_1.7.2_darwin_amd64.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_darwin_amd64.zip
-  - packagespecid: 8011af2584631c61ee593eb570b4936fb3ccd34c
+        path: vault/vault_1.7.2/vault_1.7.2_darwin_amd64.zip
+  - packagespecid: 7b79026682168a1cad0e2e8937c98d044785eb1c
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -81,13 +81,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: "386"
       GOOS: freebsd
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: freebsd_386_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -120,7 +120,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-8011af2584631c61ee593eb570b4936fb3ccd34c
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-7b79026682168a1cad0e2e8937c98d044785eb1c
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -134,14 +134,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-8011af2584631c61ee593eb570b4936fb3ccd34c-{{checksum ".buildcache/cache-keys/package-8011af2584631c61ee593eb570b4936fb3ccd34c"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-7b79026682168a1cad0e2e8937c98d044785eb1c-{{checksum ".buildcache/cache-keys/package-7b79026682168a1cad0e2e8937c98d044785eb1c"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_freebsd_386.zip
+        path: vault_1.7.2_freebsd_386.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_freebsd_386.zip
-  - packagespecid: bfc2ea44573bbefd840eaac2593856deb0b0f5d2
+        path: vault/vault_1.7.2/vault_1.7.2_freebsd_386.zip
+  - packagespecid: 2b4c38cf1ab6a0578a66101845f667709f55b38c
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -149,13 +149,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: amd64
       GOOS: freebsd
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: freebsd_amd64_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -188,7 +188,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-bfc2ea44573bbefd840eaac2593856deb0b0f5d2
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-2b4c38cf1ab6a0578a66101845f667709f55b38c
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -202,14 +202,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-bfc2ea44573bbefd840eaac2593856deb0b0f5d2-{{checksum ".buildcache/cache-keys/package-bfc2ea44573bbefd840eaac2593856deb0b0f5d2"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-2b4c38cf1ab6a0578a66101845f667709f55b38c-{{checksum ".buildcache/cache-keys/package-2b4c38cf1ab6a0578a66101845f667709f55b38c"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_freebsd_amd64.zip
+        path: vault_1.7.2_freebsd_amd64.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_freebsd_amd64.zip
-  - packagespecid: b1b28b61b31c6c4aae96907ca0dd964ed79ddd83
+        path: vault/vault_1.7.2/vault_1.7.2_freebsd_amd64.zip
+  - packagespecid: 48f562df21165e9a40d5fba36e96c30674c22b17
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -217,13 +217,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: arm
       GOOS: freebsd
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: freebsd_arm_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -256,7 +256,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-b1b28b61b31c6c4aae96907ca0dd964ed79ddd83
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-48f562df21165e9a40d5fba36e96c30674c22b17
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -270,14 +270,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-b1b28b61b31c6c4aae96907ca0dd964ed79ddd83-{{checksum ".buildcache/cache-keys/package-b1b28b61b31c6c4aae96907ca0dd964ed79ddd83"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-48f562df21165e9a40d5fba36e96c30674c22b17-{{checksum ".buildcache/cache-keys/package-48f562df21165e9a40d5fba36e96c30674c22b17"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_freebsd_arm.zip
+        path: vault_1.7.2_freebsd_arm.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_freebsd_arm.zip
-  - packagespecid: 68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6
+        path: vault/vault_1.7.2/vault_1.7.2_freebsd_arm.zip
+  - packagespecid: 99f7c24df34d79753e97241b686386fa8491120c
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -285,13 +285,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: "386"
       GOOS: linux
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: linux_386_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -324,7 +324,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-99f7c24df34d79753e97241b686386fa8491120c
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -338,14 +338,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6-{{checksum ".buildcache/cache-keys/package-68a07255ceab08a2ee9eaf39c5ed35cfa0deeef6"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-99f7c24df34d79753e97241b686386fa8491120c-{{checksum ".buildcache/cache-keys/package-99f7c24df34d79753e97241b686386fa8491120c"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_linux_386.zip
+        path: vault_1.7.2_linux_386.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_linux_386.zip
-  - packagespecid: 13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0
+        path: vault/vault_1.7.2/vault_1.7.2_linux_386.zip
+  - packagespecid: ff84cd10e7c3ea57a7db2ec489543add2642d3ad
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -353,13 +353,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: amd64
       GOOS: linux
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: linux_amd64_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -392,7 +392,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-ff84cd10e7c3ea57a7db2ec489543add2642d3ad
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -406,14 +406,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0-{{checksum ".buildcache/cache-keys/package-13eec1ed78a1921f03ddaa233f2d649e2ef7c3a0"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-ff84cd10e7c3ea57a7db2ec489543add2642d3ad-{{checksum ".buildcache/cache-keys/package-ff84cd10e7c3ea57a7db2ec489543add2642d3ad"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_linux_amd64.zip
+        path: vault_1.7.2_linux_amd64.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_linux_amd64.zip
-  - packagespecid: d2d87278a5e97aaf33a5a1df37ef41667e78114c
+        path: vault/vault_1.7.2/vault_1.7.2_linux_amd64.zip
+  - packagespecid: 87d4bca3886f986ff6903c85e0c40307106236df
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -421,13 +421,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: arm
       GOOS: linux
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: linux_arm_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -460,7 +460,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-d2d87278a5e97aaf33a5a1df37ef41667e78114c
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-87d4bca3886f986ff6903c85e0c40307106236df
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -474,14 +474,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-d2d87278a5e97aaf33a5a1df37ef41667e78114c-{{checksum ".buildcache/cache-keys/package-d2d87278a5e97aaf33a5a1df37ef41667e78114c"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-87d4bca3886f986ff6903c85e0c40307106236df-{{checksum ".buildcache/cache-keys/package-87d4bca3886f986ff6903c85e0c40307106236df"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_linux_arm.zip
+        path: vault_1.7.2_linux_arm.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_linux_arm.zip
-  - packagespecid: b5cc334e0759f17076a3c044c7d227ec426c3fb8
+        path: vault/vault_1.7.2/vault_1.7.2_linux_arm.zip
+  - packagespecid: 8f36325d6b7a42cbde3e13678f417f19e7bc0787
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -489,13 +489,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: arm64
       GOOS: linux
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: linux_arm64_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -528,7 +528,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-b5cc334e0759f17076a3c044c7d227ec426c3fb8
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-8f36325d6b7a42cbde3e13678f417f19e7bc0787
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -542,14 +542,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-b5cc334e0759f17076a3c044c7d227ec426c3fb8-{{checksum ".buildcache/cache-keys/package-b5cc334e0759f17076a3c044c7d227ec426c3fb8"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-8f36325d6b7a42cbde3e13678f417f19e7bc0787-{{checksum ".buildcache/cache-keys/package-8f36325d6b7a42cbde3e13678f417f19e7bc0787"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_linux_arm64.zip
+        path: vault_1.7.2_linux_arm64.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_linux_arm64.zip
-  - packagespecid: 2e1eb2fe413615847f15b86482010df36a8385c4
+        path: vault/vault_1.7.2/vault_1.7.2_linux_arm64.zip
+  - packagespecid: 59b42257bac0d6f30949e0ea0cf90995959e8fe4
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -557,13 +557,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: "386"
       GOOS: netbsd
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: netbsd_386_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -596,7 +596,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-2e1eb2fe413615847f15b86482010df36a8385c4
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-59b42257bac0d6f30949e0ea0cf90995959e8fe4
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -610,14 +610,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-2e1eb2fe413615847f15b86482010df36a8385c4-{{checksum ".buildcache/cache-keys/package-2e1eb2fe413615847f15b86482010df36a8385c4"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-59b42257bac0d6f30949e0ea0cf90995959e8fe4-{{checksum ".buildcache/cache-keys/package-59b42257bac0d6f30949e0ea0cf90995959e8fe4"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_netbsd_386.zip
+        path: vault_1.7.2_netbsd_386.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_netbsd_386.zip
-  - packagespecid: 03464cbb7e730c5fd0615794f5f55092ddc9749c
+        path: vault/vault_1.7.2/vault_1.7.2_netbsd_386.zip
+  - packagespecid: 51fb6d6c24bb20df28f33c748bb79efe604126a3
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -625,13 +625,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: amd64
       GOOS: netbsd
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: netbsd_amd64_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -664,7 +664,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-03464cbb7e730c5fd0615794f5f55092ddc9749c
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-51fb6d6c24bb20df28f33c748bb79efe604126a3
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -678,14 +678,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-03464cbb7e730c5fd0615794f5f55092ddc9749c-{{checksum ".buildcache/cache-keys/package-03464cbb7e730c5fd0615794f5f55092ddc9749c"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-51fb6d6c24bb20df28f33c748bb79efe604126a3-{{checksum ".buildcache/cache-keys/package-51fb6d6c24bb20df28f33c748bb79efe604126a3"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_netbsd_amd64.zip
+        path: vault_1.7.2_netbsd_amd64.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_netbsd_amd64.zip
-  - packagespecid: 5502b4c650c7d2a9bc9fc98a4e2233389b754dd5
+        path: vault/vault_1.7.2/vault_1.7.2_netbsd_amd64.zip
+  - packagespecid: 35775516579359d29996463c040b0dc0c83db72e
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -693,13 +693,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: "386"
       GOOS: openbsd
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: openbsd_386_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -732,7 +732,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-5502b4c650c7d2a9bc9fc98a4e2233389b754dd5
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-35775516579359d29996463c040b0dc0c83db72e
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -746,14 +746,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-5502b4c650c7d2a9bc9fc98a4e2233389b754dd5-{{checksum ".buildcache/cache-keys/package-5502b4c650c7d2a9bc9fc98a4e2233389b754dd5"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-35775516579359d29996463c040b0dc0c83db72e-{{checksum ".buildcache/cache-keys/package-35775516579359d29996463c040b0dc0c83db72e"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_openbsd_386.zip
+        path: vault_1.7.2_openbsd_386.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_openbsd_386.zip
-  - packagespecid: 5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e
+        path: vault/vault_1.7.2/vault_1.7.2_openbsd_386.zip
+  - packagespecid: 72703ff1ff5990848288486cfd436d6a4e6ef780
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -761,13 +761,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: amd64
       GOOS: openbsd
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: openbsd_amd64_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -800,7 +800,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-72703ff1ff5990848288486cfd436d6a4e6ef780
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -814,14 +814,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e-{{checksum ".buildcache/cache-keys/package-5d8fce20ee42980fd83bf2f32d2cfe7c00c6b91e"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-72703ff1ff5990848288486cfd436d6a4e6ef780-{{checksum ".buildcache/cache-keys/package-72703ff1ff5990848288486cfd436d6a4e6ef780"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_openbsd_amd64.zip
+        path: vault_1.7.2_openbsd_amd64.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_openbsd_amd64.zip
-  - packagespecid: b3627d64e7ed43c6e293b229fad84ead0ef77bc3
+        path: vault/vault_1.7.2/vault_1.7.2_openbsd_amd64.zip
+  - packagespecid: 9f8289233c9366967e5676bfca42b73151746bc4
     inputs:
       BINARY_NAME: vault
       CGO_ENABLED: "0"
@@ -829,13 +829,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: amd64
       GOOS: solaris
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: solaris_amd64_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -868,7 +868,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-b3627d64e7ed43c6e293b229fad84ead0ef77bc3
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-9f8289233c9366967e5676bfca42b73151746bc4
         POST_PROCESSORS: av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -882,14 +882,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-b3627d64e7ed43c6e293b229fad84ead0ef77bc3-{{checksum ".buildcache/cache-keys/package-b3627d64e7ed43c6e293b229fad84ead0ef77bc3"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
+        PACKAGE_CACHE_KEY: package-9f8289233c9366967e5676bfca42b73151746bc4-{{checksum ".buildcache/cache-keys/package-9f8289233c9366967e5676bfca42b73151746bc4"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_solaris_amd64.zip
+        path: vault_1.7.2_solaris_amd64.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_solaris_amd64.zip
-  - packagespecid: 8482884aaae56b1f8f598c7d0218cf5688b4830e
+        path: vault/vault_1.7.2/vault_1.7.2_solaris_amd64.zip
+  - packagespecid: 55bef43a0584384b547a016010c2a4ba60c61926
     inputs:
       BINARY_NAME: vault.exe
       CGO_ENABLED: "0"
@@ -897,13 +897,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: "386"
       GOOS: windows
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: windows_386_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -936,7 +936,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-8482884aaae56b1f8f598c7d0218cf5688b4830e
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-55bef43a0584384b547a016010c2a4ba60c61926
         POST_PROCESSORS: microsoft-notarize av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -950,14 +950,14 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-8482884aaae56b1f8f598c7d0218cf5688b4830e-{{checksum ".buildcache/cache-keys/package-8482884aaae56b1f8f598c7d0218cf5688b4830e"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault.exe && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault.exe
+        PACKAGE_CACHE_KEY: package-55bef43a0584384b547a016010c2a4ba60c61926-{{checksum ".buildcache/cache-keys/package-55bef43a0584384b547a016010c2a4ba60c61926"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault.exe && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault.exe
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_windows_386.zip
+        path: vault_1.7.2_windows_386.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_windows_386.zip
-  - packagespecid: f327368a08912c61c859b101a10954145a0d62e0
+        path: vault/vault_1.7.2/vault_1.7.2_windows_386.zip
+  - packagespecid: 8f5a339ec447984e16aafd1ac2e7321ef108cc9d
     inputs:
       BINARY_NAME: vault.exe
       CGO_ENABLED: "0"
@@ -965,13 +965,13 @@ packages:
       GO111MODULE: "off"
       GOARCH: amd64
       GOOS: windows
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
+      PRODUCT_VERSION: 1.7.2
+      PRODUCT_VERSION_MMP: 1.7.2
+      PRODUCT_VERSION_PRE: '"''''"'
       YARN_VERSION: 1.19.1-1
     meta:
       BUILD_JOB_NAME: windows_amd64_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
+      BUNDLE_NAME: vault_1.7.2
       builtin:
         BUILD_LAYERS:
           - type: copy-source
@@ -1004,7 +1004,7 @@ packages:
           - type: base
             name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
             archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-f327368a08912c61c859b101a10954145a0d62e0
+        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-8f5a339ec447984e16aafd1ac2e7321ef108cc9d
         POST_PROCESSORS: microsoft-notarize av-scan
       circleci:
         BUILDER_CACHE_KEY_PREFIX_LIST:
@@ -1018,13 +1018,13 @@ packages:
           - install-go-tools_cdf4_{{checksum ".buildcache/cache-keys/install-go-tools-cdf428872e7b366a24af9f0f81367280b644737a"}}
           - install-go_dc2c_{{checksum ".buildcache/cache-keys/install-go-dc2c40795b9213e6b5cd2d4b83d35404f5564831"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-f327368a08912c61c859b101a10954145a0d62e0-{{checksum ".buildcache/cache-keys/package-f327368a08912c61c859b101a10954145a0d62e0"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault.exe && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault.exe
+        PACKAGE_CACHE_KEY: package-8f5a339ec447984e16aafd1ac2e7321ef108cc9d-{{checksum ".buildcache/cache-keys/package-8f5a339ec447984e16aafd1ac2e7321ef108cc9d"}}
+    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=1.7.2 -X $VERSION_PKG_PATH.VersionPrerelease="''"" -o $OUTPUT_DIR/vault.exe && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault.exe
     aliases:
       - type: local
-        path: vault_0.0.0-snapshot_windows_amd64.zip
+        path: vault_1.7.2_windows_amd64.zip
       - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_windows_amd64.zip
+        path: vault/vault_1.7.2/vault_1.7.2_windows_amd64.zip
 base-image: debian@sha256:68f4e2259032a4e6f5035804e64438b52af8dd5889528b305b9059183ea4cd2a
 layers:
   - depth: 0
-- 
GitLab