From 743e65f01ff390c068f51912fcb4d71e2bd03acc Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Mon, 28 Jun 2021 16:01:30 -0500 Subject: [PATCH 1/7] Update mongodb atlas plugin version --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index eb99500d304b..d58bdd2947a2 100644 --- a/go.mod +++ b/go.mod @@ -92,7 +92,7 @@ require ( github.com/hashicorp/vault-plugin-auth-oci v0.7.0 github.com/hashicorp/vault-plugin-database-couchbase v0.3.0 github.com/hashicorp/vault-plugin-database-elasticsearch v0.7.0 - github.com/hashicorp/vault-plugin-database-mongodbatlas v0.3.0 + github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0 github.com/hashicorp/vault-plugin-database-snowflake v0.1.1 github.com/hashicorp/vault-plugin-mock v0.16.1 github.com/hashicorp/vault-plugin-secrets-ad v0.10.0 @@ -105,7 +105,7 @@ require ( github.com/hashicorp/vault-plugin-secrets-openldap v0.4.0 github.com/hashicorp/vault-plugin-secrets-terraform v0.1.0 github.com/hashicorp/vault/api v1.0.5-0.20210210214158-405eced08457 - github.com/hashicorp/vault/sdk v0.1.14-0.20210505171055-299f311fa707 + github.com/hashicorp/vault/sdk v0.2.0 github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4 github.com/jcmturner/gokrb5/v8 v8.0.0 github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f diff --git a/go.sum b/go.sum index 778cccdf1225..b845e9586cd3 100644 --- a/go.sum +++ b/go.sum @@ -705,8 +705,8 @@ github.com/hashicorp/vault-plugin-database-couchbase v0.3.0 h1:C3Lfwr7xtdhOTnOf+ github.com/hashicorp/vault-plugin-database-couchbase v0.3.0/go.mod h1:Seivjno/BOtkqX41d/DDYtTg6zNoxIgNaUVZ3ObZYi4= github.com/hashicorp/vault-plugin-database-elasticsearch v0.7.0 h1:EYicFs5dl4Ax1uQMw+EfbCCrarScVrqdGS471KKXDDo= github.com/hashicorp/vault-plugin-database-elasticsearch v0.7.0/go.mod h1:813Nvr1IQqAKdlk3yIY97M5WyxMhWOrXtYioPf9PqJg= -github.com/hashicorp/vault-plugin-database-mongodbatlas v0.3.0 h1:qSTM0f71zhyYILdw2HiVw5zUumC+5QeI0F2vzDJvcUY= -github.com/hashicorp/vault-plugin-database-mongodbatlas v0.3.0/go.mod h1:ewrdsH4iFG5TGZu7euYf4BCzLl+hoFkaKaOGuF0UcjI= +github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0 h1:baCsn+MRffmcqkOf3p6Fh0fvw2llXl63Ts4Fl14Vn3A= +github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0/go.mod h1:ESNBxY0kbC8fZhyfYo0JcIwL4piI5+IZAHvnByceRoY= github.com/hashicorp/vault-plugin-database-snowflake v0.1.1 h1:QKNjvd1GuI69u7ZLNTnvZ2LoBg9ENX7C/U+sgH40QBU= github.com/hashicorp/vault-plugin-database-snowflake v0.1.1/go.mod h1:gUfFbYrFFxITKxeLJe2IHPnNkmSG5ldVF1OOxp1WW3c= github.com/hashicorp/vault-plugin-mock v0.16.1 h1:5QQvSUHxDjEEbrd2REOeacqyJnCLPD51IQzy71hx8P0= From 5d41b6a9fbebda869d0a64f68d57a8de61de4c28 Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Tue, 29 Jun 2021 14:05:26 -0500 Subject: [PATCH 2/7] go.mod was missing mongodbatlas plugin --- go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/go.mod b/go.mod index 865a92ef00ed..bbf50f62b26b 100644 --- a/go.mod +++ b/go.mod @@ -92,6 +92,7 @@ require ( github.com/hashicorp/vault-plugin-auth-oci v0.7.0 github.com/hashicorp/vault-plugin-database-couchbase v0.3.0 github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0 + github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0 github.com/hashicorp/vault-plugin-database-snowflake v0.1.1 github.com/hashicorp/vault-plugin-mock v0.16.1 github.com/hashicorp/vault-plugin-secrets-ad v0.10.0 From 93d7a2cda86ee9fc774d793a638ac31e0dfbb80f Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Tue, 29 Jun 2021 14:15:25 -0500 Subject: [PATCH 3/7] add changelog --- changelog/11956.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/11956.txt diff --git a/changelog/11956.txt b/changelog/11956.txt new file mode 100644 index 000000000000..2caec992b972 --- /dev/null +++ b/changelog/11956.txt @@ -0,0 +1,3 @@ +```release-note:feature +secrets/database/mongodbatlas: Add ability to customize dynamic usernames +``` From 0e6f339c779dac65ecb036735199f72d3d9e6a4a Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Thu, 1 Jul 2021 08:57:03 -0500 Subject: [PATCH 4/7] update build-go-dev circle ci job GOPROXY --- .circleci/config.yml | 2 +- .circleci/config/jobs/build-go-dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae58a0693085..c8ba59727fec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -751,7 +751,7 @@ jobs: mkdir ./pkg # Build dev binary - make ci-bootstrap dev + GOPROXY=file://$GOPATH/pkg/mod/cache/download make ci-bootstrap dev name: Build dev binary - persist_to_workspace: paths: diff --git a/.circleci/config/jobs/build-go-dev.yml b/.circleci/config/jobs/build-go-dev.yml index b193488e1c28..7012d0186ab5 100644 --- a/.circleci/config/jobs/build-go-dev.yml +++ b/.circleci/config/jobs/build-go-dev.yml @@ -13,7 +13,7 @@ steps: mkdir ./pkg # Build dev binary - make ci-bootstrap dev + GOPROXY=file://$GOPATH/pkg/mod/cache/download make ci-bootstrap dev - persist_to_workspace: root: . paths: From bb32232892c5a280d104dc33e0551a68abc560ac Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Thu, 1 Jul 2021 09:26:19 -0500 Subject: [PATCH 5/7] Revert "update build-go-dev circle ci job GOPROXY" This reverts commit 0e6f339c779dac65ecb036735199f72d3d9e6a4a. --- .circleci/config.yml | 2 +- .circleci/config/jobs/build-go-dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c8ba59727fec..ae58a0693085 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -751,7 +751,7 @@ jobs: mkdir ./pkg # Build dev binary - GOPROXY=file://$GOPATH/pkg/mod/cache/download make ci-bootstrap dev + make ci-bootstrap dev name: Build dev binary - persist_to_workspace: paths: diff --git a/.circleci/config/jobs/build-go-dev.yml b/.circleci/config/jobs/build-go-dev.yml index 7012d0186ab5..b193488e1c28 100644 --- a/.circleci/config/jobs/build-go-dev.yml +++ b/.circleci/config/jobs/build-go-dev.yml @@ -13,7 +13,7 @@ steps: mkdir ./pkg # Build dev binary - GOPROXY=file://$GOPATH/pkg/mod/cache/download make ci-bootstrap dev + make ci-bootstrap dev - persist_to_workspace: root: . paths: From 3f4bb81ec8436b7da95fba7d775488f715960f91 Mon Sep 17 00:00:00 2001 From: Sam Salisbury Date: Fri, 2 Jul 2021 17:24:38 +0100 Subject: [PATCH 6/7] ci: more complete go mod cache --- .circleci/config.yml | 19 ++++++++++--------- .circleci/config/commands/@caches.yml | 7 ++++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae58a0693085..d8ad23ecf9b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -740,7 +740,7 @@ jobs: - checkout - restore_cache: keys: - - v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} + - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} name: Restore exact go modules cache - attach_workspace: at: . @@ -892,7 +892,7 @@ jobs: - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }} - restore_cache: keys: - - v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} + - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} name: Restore exact go modules cache - run: command: | @@ -1149,7 +1149,7 @@ jobs: - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }} - restore_cache: keys: - - v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} + - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} name: Restore exact go modules cache - run: command: | @@ -1656,7 +1656,7 @@ jobs: - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }} - restore_cache: keys: - - v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} + - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} name: Restore exact go modules cache - run: command: | @@ -2238,12 +2238,13 @@ jobs: git config --global url."git@github.com:".insteadOf https://github.com/ - restore_cache: keys: - - v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} - - v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}} - - v1.2-{{checksum "go.sum"}} + - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} + - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}} + - v1.3-{{checksum "go.sum"}} name: Restore closest matching go modules cache - run: command: | + go list ./... go mod download -json ( cd sdk && go mod download -json; ) ( cd api && go mod download -json; ) @@ -2256,7 +2257,7 @@ jobs: } name: Verify downloading modules did not modify any files - save_cache: - key: v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} + key: v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} name: Save go modules cache paths: - /go/pkg/mod @@ -2302,7 +2303,7 @@ jobs: - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }} - restore_cache: keys: - - v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} + - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} name: Restore exact go modules cache - run: command: | diff --git a/.circleci/config/commands/@caches.yml b/.circleci/config/commands/@caches.yml index a4c0d1bf5f27..9a1bc4a7c574 100644 --- a/.circleci/config/commands/@caches.yml +++ b/.circleci/config/commands/@caches.yml @@ -17,9 +17,9 @@ restore_go_mod_cache_permissive: - restore_cache: name: Restore closest matching go modules cache keys: - - &gocachekey v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} - - v1.2-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}} - - v1.2-{{checksum "go.sum"}} + - &gocachekey v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}} + - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}} + - v1.3-{{checksum "go.sum"}} restore_go_mod_cache: steps: - restore_cache: @@ -39,6 +39,7 @@ refresh_go_mod_cache: - run: name: go mod download command: | + go list ./... go mod download -json ( cd sdk && go mod download -json; ) ( cd api && go mod download -json; ) From 2d5fe71a2f384e2d6e9ffc12029079631e8a32e3 Mon Sep 17 00:00:00 2001 From: Sam Salisbury Date: Fri, 2 Jul 2021 17:41:56 +0100 Subject: [PATCH 7/7] ci: doc use of go list ./... to populate mod cache --- .circleci/config.yml | 3 +++ .circleci/config/commands/@caches.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d8ad23ecf9b9..1619afa8cc0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2244,6 +2244,9 @@ jobs: name: Restore closest matching go modules cache - run: command: | + # go list ./... forces downloading some additional versions of modules that 'go mod + # download' misses. We need this because we make use of go list itself during + # code generation in later builds that rely on this module cache. go list ./... go mod download -json ( cd sdk && go mod download -json; ) diff --git a/.circleci/config/commands/@caches.yml b/.circleci/config/commands/@caches.yml index 9a1bc4a7c574..03e04cbc2bd4 100644 --- a/.circleci/config/commands/@caches.yml +++ b/.circleci/config/commands/@caches.yml @@ -39,6 +39,9 @@ refresh_go_mod_cache: - run: name: go mod download command: | + # go list ./... forces downloading some additional versions of modules that 'go mod + # download' misses. We need this because we make use of go list itself during + # code generation in later builds that rely on this module cache. go list ./... go mod download -json ( cd sdk && go mod download -json; )