added support for customer managed keys for mws. #332

stikkireddy · 2020-09-21T16:35:53Z

Docs:

docs update
change log update
readme update

Integration Tests (MWS only):

PASS workspace/acceptance

mws.TestMwsAccMissingResources/Credential (0.79s)
mws.TestMwsAccMissingResources/Network (0.36s)
mws.TestMwsAccMissingResources/Storage (0.36s)
mws.TestMwsAccMissingResources/Workspace (0.47s)
mws.TestMwsAccMissingResources (6.63s)
mws.TestMwsAccCreds (1.98s)
mws.TestMwsAccCustomerManagedKeys (2.11s)
mws.TestMwsAccStorageConfigurations (1.69s)
mws.TestMwsAccWorkspace (0.54s)

PASS mws

mws/acceptance.TestMwsAccCustomerManagedKeys (62.61s)
mws/acceptance.TestMwsAccCredentials (53.14s)
mws/acceptance.TestMwsAccNetworks (51.71s)
mws/acceptance.TestMwsAccStorageConfigurations (52.86s)
mws/acceptance.TestMwsAccWorkspaces (121.85s)

TravisBuddy · 2020-09-21T16:39:26Z

Travis tests have failed

Hey @stikkireddy,
Please read the following log in order to understand the failure reason.
It'll be awesome if you fix what's wrong and commit the changes.

2nd Build

View build log

curl -sSL "https://github.com/gotestyourself/gotestsum/releases/download/v0.4.2/gotestsum_0.4.2_linux_amd64.tar.gz" | sudo tar -xz -C /usr/local/bin gotestsum

The command "curl -sSL "https://github.com/gotestyourself/gotestsum/releases/download/v0.4.2/gotestsum_0.4.2_linux_amd64.tar.gz" | sudo tar -xz -C /usr/local/bin gotestsum" exited with 0.
$ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.25.0
golangci/golangci-lint info checking GitHub for tag 'v1.25.0'
golangci/golangci-lint info found version: 1.25.0 for v1.25.0/linux/amd64
golangci/golangci-lint info installed /home/travis/gopath/bin/golangci-lint
The command "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.25.0" exited with 0.
$ time make lint
✓ Linting source code with golangci-lint make sure you run make fmt ...
mws/resource_customer_managed_key_test.go:38: unnecessary trailing newline (whitespace)

}
Makefile:10: recipe for target 'lint' failed
make: *** [lint] Error 1

real	0m27.103s
user	0m45.861s
sys	0m1.497s
The command "time make lint" exited with 2.
$ time make test
✓ Running tests...
∅  .
✓  access (58ms) (coverage: 83.5% of statements)
✓  access/acceptance (15ms)
✓  common (114ms) (coverage: 68.2% of statements)
✓  compute/acceptance (24ms)
✓  identity (69ms) (coverage: 42.4% of statements)
✓  compute (1.759s) (coverage: 72.0% of statements)
✓  internal (12ms) (coverage: 67.5% of statements)
✓  internal/qa (8ms) (coverage: 54.0% of statements)
✓  identity/acceptance (20ms)
∅  internal/acceptance
✓  internal/sanity (32ms) (coverage: 100.0% of statements)
✓  mws (1.131s) (coverage: 73.4% of statements)
✓  mws/acceptance (23ms)
✓  provider (109ms) (coverage: 70.7% of statements)
✓  storage (131ms) (coverage: 73.5% of statements)
✓  storage/acceptance (58ms)
✓  workspace/acceptance (15ms)
✓  workspace (10.045s) (coverage: 62.9% of statements)

DONE 573 tests, 66 skipped in 35.313s

real	0m35.321s
user	0m36.847s
sys	0m4.719s
The command "time make test" exited with 0.
$ time make build
✓ Building source code with go build...

real	0m2.943s
user	0m3.603s
sys	0m0.445s
The command "time make build" exited with 0.
store build cache
changes detected (content changed, file is created, or file is deleted):\n/home/travis/.cache/go-build/01/01efa3ed220fac1988c0defea7ff4eaf1841521e410f79a00fcdab6cea4fbef4-a
/home/travis/.cache/go-build/06/063328c3c3b292ea2d1229f1761fefb7a849a31173cd5a6cf3de7724afe86c15-a
/home/travis/.cache/go-build/08/08aee0c56cedb60f8ac24d6813836f385f993c8150a66091de97dcd86aeee47d-a
/home/travis/.cache/go-build/0c/0cb8baea320c43841ea84ef78b4ee6924ad237f7d5f20c581d5830665f3022b2-a
/home/travis/.cache/go-build/0d/0d4d8e5e54822eaff90433c439c9af7a7c9fcd757acfac8061413c61e1130403-a
/home/travis/.cache/go-build/12/12e14117997ab31e1b460cd6d2d12c86e215c522fb4c76544c868741ab5bbd57-a
/home/travis/.cache/go-build/12/12fdea6856cbedc54d16795e68c2f7c7ff25768996efa944e61b17a0cb019978-a
/home/travis/.cache/go-build/13/130e62500a1235858d2c19f1150bd1de3c80bdaf514ba247e29d467c0fa3fb9c-a
/home/travis/.cache/go-build/13/135568d9b932b22af1419ecb1fb6260393496fed3fd6071e1ebe874dc692d453-a
/home/travis/.cache/go-build/15/159c5315d8362de9ed3786c7108c3bfe53235fdcd471e43696a88c8844ff50cb-a
/home/trav\n...
changes detected, packing new archive
uploading PR.332/cache--linux-xenial-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855--go-1.14.x.tgz
cache uploaded


Done. Your build exited with 1.

curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.25.0

golangci/golangci-lint info checking GitHub for tag 'v1.25.0'
golangci/golangci-lint info found version: 1.25.0 for v1.25.0/linux/amd64
golangci/golangci-lint info installed /home/travis/gopath/bin/golangci-lint

time make lint

✓ Linting source code with golangci-lint make sure you run make fmt ...
mws/resource_customer_managed_key_test.go:38: unnecessary trailing newline (whitespace)

}
Makefile:10: recipe for target 'lint' failed
make: *** [lint] Error 1

real	0m27.103s
user	0m45.861s
sys	0m1.497s

TravisBuddy Request Identifier: 01a28bf0-fc29-11ea-a343-ef792cdaf85e

nfx

add 0.2.6 changelog entry
add reference to resource doc to README.md
consider writing "[Read|Create|Delete]Context" resources not to trigger deprecation messages related to SDKv2

mws/mws.go

scripts/modules/aws-mws-common/kms.tf

mws/resource_customer_managed_key.go

mws/acceptance/cmk_test.go

TravisBuddy · 2020-09-21T16:57:18Z

Hey @stikkireddy,
Your changes look good to me!

View build log

TravisBuddy Request Identifier: 80dd4700-fc2b-11ea-a343-ef792cdaf85e

codecov-commenter · 2020-09-21T17:00:18Z

Codecov Report

Merging #332 into master will increase coverage by 1.02%.
The diff coverage is 65.62%.

@@            Coverage Diff             @@
##           master     #332      +/-   ##
==========================================
+ Coverage   63.66%   64.69%   +1.02%     
==========================================
  Files          55       55              
  Lines        6160     6225      +65     
==========================================
+ Hits         3922     4027     +105     
+ Misses       1877     1831      -46     
- Partials      361      367       +6

Impacted Files	Coverage Δ
compute/model.go	`94.44% <ø> (ø)`
mws/mws.go	`54.54% <ø> (ø)`
internal/qa/testing.go	`45.62% <25.00%> (-2.59%)`	⬇️
mws/resource_customer_managed_key.go	`79.31% <79.31%> (ø)`
compute/libraries.go	`98.96% <100.00%> (+54.07%)`	⬆️
compute/resource_cluster.go	`77.45% <100.00%> (+0.60%)`	⬆️
provider/provider.go	`91.80% <100.00%> (+0.02%)`	⬆️

mws/mws.go

…ariable: DATABRICKS_AWS_ACCOUNT_ID

…xt create, read & deletes

TravisBuddy · 2020-09-22T01:20:28Z

Hey @stikkireddy,
Your changes look good to me!

View build log

TravisBuddy Request Identifier: cb672520-fc71-11ea-a56a-67316b5b87cd

TravisBuddy · 2020-09-22T01:29:55Z

Hey @stikkireddy,
Your changes look good to me!

View build log

TravisBuddy Request Identifier: 1db5e540-fc73-11ea-a56a-67316b5b87cd

nfx

do we need to keep the variable for aws account id?

scripts/modules/aws-mws-common/kms.tf

scripts/README.md

… variable and moved it to a default in the variable in kms

TravisBuddy · 2020-09-23T12:48:16Z

Hey @stikkireddy,
Your changes look good to me!

View build log

TravisBuddy Request Identifier: 0b89cd40-fd9b-11ea-a706-8f9ec0eccd66

nfx

✅

…-databricks into cmk-feature

TravisBuddy · 2020-09-23T16:15:03Z

Hey @stikkireddy,
Your changes look good to me!

View build log

TravisBuddy Request Identifier: ee6c7830-fdb7-11ea-a706-8f9ec0eccd66

…-databricks into cmk-feature � Conflicts: � docs/changelog.md � internal/qa/testing.go

…vider-databricks into cmk-feature

TravisBuddy · 2020-09-23T16:39:47Z

Hey @stikkireddy,
Your changes look good to me!

View build log

TravisBuddy Request Identifier: 6305af10-fdbb-11ea-a706-8f9ec0eccd66

added support for customer managed keys for mws.

57f303b

stikkireddy requested a review from nfx September 21, 2020 16:35

stikkireddy marked this pull request as draft September 21, 2020 16:38

stikkireddy linked an issue Sep 21, 2020 that may be closed by this pull request

[FEATURE] Support for Customer Managed Keys #333

Closed

fixed linting issue and added missing test

f87776a

nfx requested changes Sep 21, 2020

View reviewed changes

nfx reviewed Sep 21, 2020

View reviewed changes

mws/mws.go Outdated Show resolved Hide resolved

added chlog, readme, fixed docs, made requested changes

da095c2

nfx added this to the v0.3.0 milestone Sep 21, 2020

stikkireddy added 2 commits September 21, 2020 15:59

simplified create request and added requirement for MWS environment v…

bf95110

…ariable: DATABRICKS_AWS_ACCOUNT_ID

support testing for context from identity PR; switched to using Conte…

769b946

…xt create, read & deletes

moved AwsKeyInfo & CustomerManagedKey structs from MWS to CMK

efeeae4

stikkireddy marked this pull request as ready for review September 22, 2020 01:26

stikkireddy requested a review from nfx September 22, 2020 01:28

nfx requested changes Sep 22, 2020

View reviewed changes

scripts/modules/aws-mws-common/kms.tf Outdated Show resolved Hide resolved

scripts/README.md Outdated Show resolved Hide resolved

removed the requirement of DATABRICKS_AWS_ACCOUNT_ID from environment…

e67d912

… variable and moved it to a default in the variable in kms

stikkireddy requested a review from nfx September 23, 2020 14:39

removed requierd env

8a25605

nfx approved these changes Sep 23, 2020

View reviewed changes

Merge branch 'master' of github.com:databrickslabs/terraform-provider…

163aa04

…-databricks into cmk-feature

stikkireddy added 3 commits September 23, 2020 12:24

Merge branch 'master' of github.com:databrickslabs/terraform-provider…

2ce6b83

…-databricks into cmk-feature � Conflicts: � docs/changelog.md � internal/qa/testing.go

resolved merge conflicts

8087349

Merge branch 'cmk-feature' of github.com:databrickslabs/terraform-pro…

e237d10

…vider-databricks into cmk-feature

nfx approved these changes Sep 23, 2020

View reviewed changes

nfx merged commit 8612fd0 into master Sep 23, 2020

nfx deleted the cmk-feature branch September 23, 2020 16:51

nfx modified the milestones: v0.3.0, 0.2.6 Sep 27, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

added support for customer managed keys for mws. #332

added support for customer managed keys for mws. #332

stikkireddy commented Sep 21, 2020 •

edited

TravisBuddy commented Sep 21, 2020

nfx left a comment

TravisBuddy commented Sep 21, 2020

codecov-commenter commented Sep 21, 2020 •

edited

TravisBuddy commented Sep 22, 2020

TravisBuddy commented Sep 22, 2020

nfx left a comment

TravisBuddy commented Sep 23, 2020

nfx left a comment

TravisBuddy commented Sep 23, 2020

TravisBuddy commented Sep 23, 2020

added support for customer managed keys for mws. #332

added support for customer managed keys for mws. #332

Conversation

stikkireddy commented Sep 21, 2020 • edited

TravisBuddy commented Sep 21, 2020

Travis tests have failed

2nd Build

TravisBuddy Request Identifier: 01a28bf0-fc29-11ea-a343-ef792cdaf85e

nfx left a comment

Choose a reason for hiding this comment

TravisBuddy commented Sep 21, 2020

TravisBuddy Request Identifier: 80dd4700-fc2b-11ea-a343-ef792cdaf85e

codecov-commenter commented Sep 21, 2020 • edited

Codecov Report

TravisBuddy commented Sep 22, 2020

TravisBuddy Request Identifier: cb672520-fc71-11ea-a56a-67316b5b87cd

TravisBuddy commented Sep 22, 2020

TravisBuddy Request Identifier: 1db5e540-fc73-11ea-a56a-67316b5b87cd

nfx left a comment

Choose a reason for hiding this comment

TravisBuddy commented Sep 23, 2020

TravisBuddy Request Identifier: 0b89cd40-fd9b-11ea-a706-8f9ec0eccd66

nfx left a comment

Choose a reason for hiding this comment

TravisBuddy commented Sep 23, 2020

TravisBuddy Request Identifier: ee6c7830-fdb7-11ea-a706-8f9ec0eccd66

TravisBuddy commented Sep 23, 2020

TravisBuddy Request Identifier: 6305af10-fdbb-11ea-a706-8f9ec0eccd66

stikkireddy commented Sep 21, 2020 •

edited

codecov-commenter commented Sep 21, 2020 •

edited