Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #288 - Added importers for SCIM resource #290

Merged
merged 4 commits into from
Sep 8, 2020
Merged

Fix #288 - Added importers for SCIM resource #290

merged 4 commits into from
Sep 8, 2020

Conversation

nfx
Copy link
Contributor

@nfx nfx commented Sep 1, 2020

And updated documentation for all resources, making it more clear to end user.

And updated documentation for all resources, making it more clear to end user.
@nfx nfx requested a review from stikkireddy September 1, 2020 11:07
@nfx nfx linked an issue Sep 1, 2020 that may be closed by this pull request
@TravisBuddy
Copy link

Hey @nfx,
Your changes look good to me!

View build log

TravisBuddy Request Identifier: f44e5640-ec43-11ea-831e-55c1b07d6d51

@codecov-commenter
Copy link

codecov-commenter commented Sep 1, 2020

Codecov Report

Merging #290 into master will decrease coverage by 0.05%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #290      +/-   ##
==========================================
- Coverage   64.18%   64.13%   -0.06%     
==========================================
  Files          55       55              
  Lines        6724     6730       +6     
==========================================
  Hits         4316     4316              
- Misses       2038     2044       +6     
  Partials      370      370              
Impacted Files Coverage Δ
identity/resource_scim_group.go 0.00% <0.00%> (ø)
identity/resource_scim_user.go 0.00% <0.00%> (ø)

@TravisBuddy
Copy link

Travis tests have failed

Hey @nfx,
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.

1st 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
travis_time:end:09457cd8:start=1599076464026519568,finish=1599076465455347430,duration=1428827862,event=script
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
travis_time:end:0b219e37:start=1599076465470743678,finish=1599076467933201926,duration=2462458248,event=script
time make lint
✓ Linting source code with golangci-lint make sure you run make fmt ...
identity/resource_scim_group.go:18:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
identity/resource_scim_user.go:31:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
Makefile:10: recipe for target 'lint' failed
make: *** [lint] Error 1

real	0m42.840s
user	1m13.520s
sys	0m3.725s
travis_time:end:05b685c4:start=1599076467940393366,finish=1599076510784915523,duration=42844522157,event=script

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 ...
identity/resource_scim_group.go:18:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
identity/resource_scim_user.go:31:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
Makefile:10: recipe for target 'lint' failed
make: *** [lint] Error 1

real	0m59.870s
user	1m35.935s
sys	0m6.066s
The command "time make lint" exited with 2.
$ time make test
✓ Running tests...
go: downloading github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.2-0.20200828083434-d39628234432
go: downloading github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
go: downloading github.com/mitchellh/go-testing-interface v1.0.4
go: downloading github.com/hashicorp/hcl/v2 v2.3.0
go: downloading golang.org/x/text v0.3.3
go: downloading github.com/hashicorp/terraform-plugin-test/v2 v2.0.0
go: downloading github.com/golang/protobuf v1.4.2
go: downloading google.golang.org/grpc v1.30.0
go: downloading github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02
go: downloading github.com/hashicorp/go-plugin v1.3.0
go: downloading github.com/hashicorp/terraform-exec v0.3.0
go: downloading cloud.google.com/go v0.61.0
go: downloading google.golang.org/api v0.29.0
go: downloading google.golang.org/protobuf v1.25.0
go: downloading google.golang.org/genproto v0.0.0-20200711021454-869866162049
go: downloading golang.org/x/net v0.0.0-20200707034311-ab3426394381
go: downloading github.com/ulikunitz/xz v0.5.7
go: downloading cloud.google.com/go/storage v1.10.0
go: downloading go.opencensus.io v0.22.4
go: downloading github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
go: downloading golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
∅  .
✓  access/acceptance (19ms)
✓  access (99ms) (coverage: 83.5% of statements)
✓  common (211ms) (coverage: 68.2% of statements)
✓  compute/acceptance (14ms)
✓  compute (711ms) (coverage: 68.6% of statements)
✓  identity (95ms) (coverage: 42.4% of statements)
✓  internal (6ms) (coverage: 67.5% of statements)
✓  identity/acceptance (28ms)
∅  internal/acceptance
✓  internal/qa (21ms) (coverage: 54.3% of statements)
✓  internal/sanity (21ms) (coverage: 100.0% of statements)
✓  mws (1.096s) (coverage: 70.5% of statements)
✓  mws/acceptance (27ms)
✓  provider (185ms) (coverage: 63.4% of statements)
✓  storage (125ms) (coverage: 73.5% of statements)
✓  storage/acceptance (49ms)
✓  workspace/acceptance (14ms)
✓  workspace (10.048s) (coverage: 62.9% of statements)

DONE 552 tests, 66 skipped in 78.260s

real	1m18.267s
user	1m56.119s
sys	0m13.154s
The command "time make test" exited with 0.
$ time make build
✓ Building source code with go build...
github.com/databrickslabs/databricks-terraform

real	0m2.720s
user	0m3.394s
sys	0m0.357s
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/00/0012b6df75f227de84d4bfbdb2147861677bd7b71776e8e785774804e8490365-d
/home/travis/.cache/go-build/00/002fe2f95acf805c21d5fd19bd73f602e9f7601d0e3fc639168a99daf259804c-d
/home/travis/.cache/go-build/00/00319a291bea162653864f435f36bc23fe369112f8d2a410bccfc8a6fef29f06-a
/home/travis/.cache/go-build/00/0032e6421b73e3969f05c8414e3d71be8d353e6d62ef460d902a3174d128c8cf-a
/home/travis/.cache/go-build/00/0038dc49ede2ed0d68b727bba57de7b1895b43bf125b9217357f592055744b08-d
/home/travis/.cache/go-build/00/003ad5099de67a6fe6b42525694b1bc0152674b33c9a175f97bb66a41b7e8c44-a
/home/travis/.cache/go-build/00/004fa8e35d5f202fe210fe18a962cf03e12833d5057bae108ff77bb5f1858c8b-a
/home/travis/.cache/go-build/00/00558ae7406fd08dde0c6f417bd87f9ab8c5b4d7045c260d69d6db1f64a6c3b8-a
/home/travis/.cache/go-build/00/005ae8af4386d8944b318016a78efae2260ddc057bbcc4a02deeae321aa6106f-d
/home/travis/.cache/go-build/00/0064e01d52223abd250f09604765efb173ff1d1710785b4d8c7551187440b20a-a
/home/trav\n...
changes detected, packing new archive
uploading PR.290/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 ...
identity/resource_scim_group.go:18:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
identity/resource_scim_user.go:31:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
Makefile:10: recipe for target 'lint' failed
make: *** [lint] Error 1

real	0m59.870s
user	1m35.935s
sys	0m6.066s
TravisBuddy Request Identifier: 0e8caf20-ed57-11ea-b6ba-27fe84eba218

@TravisBuddy
Copy link

Travis tests have failed

Hey @nfx,
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 ...
identity/resource_scim_group.go:18:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
identity/resource_scim_user.go:31:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
Makefile:10: recipe for target 'lint' failed
make: *** [lint] Error 1

real	0m26.240s
user	0m43.226s
sys	0m1.177s
The command "time make lint" exited with 2.
$ time make test
✓ Running tests...
∅  .
✓  access (56ms) (coverage: 83.5% of statements)
✓  access/acceptance (14ms)
✓  common (140ms) (coverage: 68.2% of statements)
✓  compute (621ms) (coverage: 68.6% of statements)
✓  compute/acceptance (15ms)
✓  identity (95ms) (coverage: 42.4% of statements)
✓  internal (7ms) (coverage: 67.5% of statements)
✓  internal/qa (10ms) (coverage: 54.3% of statements)
✓  identity/acceptance (27ms)
∅  internal/acceptance
✓  internal/sanity (13ms) (coverage: 100.0% of statements)
✓  mws (1.052s) (coverage: 70.5% of statements)
✓  mws/acceptance (18ms)
✓  provider (280ms) (coverage: 63.4% of statements)
✓  storage (481ms) (coverage: 73.5% of statements)
✓  storage/acceptance (426ms)
✓  workspace/acceptance (15ms)
✓  workspace (10.049s) (coverage: 62.9% of statements)

DONE 552 tests, 66 skipped in 53.993s

real	0m54.000s
user	0m30.950s
sys	0m4.123s
The command "time make test" exited with 0.
$ time make build
✓ Building source code with go build...

real	0m2.760s
user	0m3.422s
sys	0m0.373s
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/21/212a3a0345ab4c8b09ad6ff69484538caa5372a5a11ca5783d480e8b9c810376-a
/home/travis/.cache/go-build/21/21e0198da209ff7917d8b54c1a417b42fbef54c80031bde5e394c5740961ad99-a
/home/travis/.cache/go-build/29/29888d61cde7e884419a5c9b95e022a7ecd8a636325e9acab494773b26c8d7f3-a
/home/travis/.cache/go-build/32/32156698f8cfb2c6695e536eebe22509602683a541d3b62f74a404b799b6beef-a
/home/travis/.cache/go-build/37/37fe8fed330e781fcdcd146142e73911fbca7ebf3831a7fa7095383c9db40ce9-a
/home/travis/.cache/go-build/39/39093f5b4c243834dc5116f685a8146a177ba1671cdad5bd234d96a7d2938a38-a
/home/travis/.cache/go-build/3b/3bb954d19d592aa5def02eb6f44531deb706a569d457d79b31708e16d305e62a-a
/home/travis/.cache/go-build/3c/3cb8fad06508b43bff1e084aff6e47cfb81516c6fb5f6420b5656c433d111337-a
/home/travis/.cache/go-build/3d/3dae2b854586c5ec25b4957d0ca3bbf80d9016d0c7acf177ee03d40b49aaf5bd-a
/home/travis/.cache/go-build/41/4174a8f615a1f14722bc0ae2852b85fc597f8f75b791bb99ffacf42233515da1-a
/home/trav\n...
changes detected, packing new archive
uploading PR.290/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 ...
identity/resource_scim_group.go:18:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
identity/resource_scim_user.go:31:11: SA1019: schema.ImportStatePassthrough is deprecated: Please use the context aware ImportStatePassthroughContext instead  (staticcheck)
			State: schema.ImportStatePassthrough,
			       ^
Makefile:10: recipe for target 'lint' failed
make: *** [lint] Error 1

real	0m26.240s
user	0m43.226s
sys	0m1.177s
TravisBuddy Request Identifier: 2169af50-ee9a-11ea-9705-b7c481b3600a

@nfx nfx removed the request for review from stikkireddy September 8, 2020 13:47
@TravisBuddy
Copy link

Hey @nfx,
Your changes look good to me!

View build log

TravisBuddy Request Identifier: 4ad263f0-f1dd-11ea-ba41-b1d3a642fad8

@nfx nfx merged commit 6e7d1a2 into master Sep 8, 2020
@nfx nfx deleted the fix/288 branch September 8, 2020 14:16
@nfx nfx mentioned this pull request Sep 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ISSUE] Allow import of existing scim_user and scim_group resources
3 participants