Max leases quota #948

rhys-evans · 2021-01-16T17:23:05Z

Community Note

Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
Please do not leave "+1" comments, they generate extra noise for pull request followers and do not help prioritize the request

Closes #947

Release note for CHANGELOG:

* Adds ability to manage lease-count quota's (Vault Enterprise Feature)

Output from acceptance testing:

TESTARGS="--run QuotaLeaseCount" make test
==> Checking that code complies with gofmt requirements...
go test -i $(go list ./... |grep -v 'vendor') || exit 1
echo $(go list ./... |grep -v 'vendor') | \
                xargs -t -n4 go test --run QuotaLeaseCount -timeout=30s -parallel=4
go test --run QuotaLeaseCount -timeout=30s -parallel=4 github.com/hashicorp/terraform-provider-vault github.com/hashicorp/terraform-provider-vault/cmd/coverage github.com/hashicorp/terraform-provider-vault/cmd/generate github.com/hashicorp/terraform-provider-vault/codegen
?       github.com/hashicorp/terraform-provider-vault   [no test files]
?       github.com/hashicorp/terraform-provider-vault/cmd/coverage      [no test files]
?       github.com/hashicorp/terraform-provider-vault/cmd/generate      [no test files]
ok      github.com/hashicorp/terraform-provider-vault/codegen   (cached) [no tests to run]
go test --run QuotaLeaseCount -timeout=30s -parallel=4 github.com/hashicorp/terraform-provider-vault/generated github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/decode github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/encode github.com/hashicorp/terraform-provider-vault/generated/resources/transform/alphabet
?       github.com/hashicorp/terraform-provider-vault/generated [no test files]
ok      github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/decode    (cached) [no tests to run]
ok      github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/encode    (cached) [no tests to run]
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/alphabet    (cached) [no tests to run]
go test --run QuotaLeaseCount -timeout=30s -parallel=4 github.com/hashicorp/terraform-provider-vault/generated/resources/transform/role github.com/hashicorp/terraform-provider-vault/generated/resources/transform/template github.com/hashicorp/terraform-provider-vault/generated/resources/transform/transformation github.com/hashicorp/terraform-provider-vault/schema
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/role        (cached) [no tests to run]
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/template    (cached) [no tests to run]
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/transformation      (cached) [no tests to run]
?       github.com/hashicorp/terraform-provider-vault/schema    [no test files]
go test --run QuotaLeaseCount -timeout=30s -parallel=4 github.com/hashicorp/terraform-provider-vault/util github.com/hashicorp/terraform-provider-vault/vault
ok      github.com/hashicorp/terraform-provider-vault/util      (cached) [no tests to run]
ok      github.com/hashicorp/terraform-provider-vault/vault     (cached)
...

The code for this PR was largely cloned from https://github.com/hashicorp/terraform-provider-vault/pull/825/files

1st draft, not tested Ref: hashicorp#947

TESTARGS="--run QuotaLeaseCount" make test

hashicorp-cla · 2021-01-16T17:23:09Z

All committers have signed the CLA.

This is due to hashicorp/vault#10712

rhysxevans · 2021-01-16T20:19:50Z

Hi, the quotaLeaseCountUpdate (in resource_quota_lease_count.go) function is as it is due to hashicorp/vault#10712

Removes , horrible quotaLeaseCountUpdate logic

tvoran · 2021-06-28T00:46:30Z

Hi @rhys-evans I see some of the update code has been commented out due to hashicorp/vault#10712, which has been closed. I wasn't able to reproduce that issue with vault enterprise 1.7.3, so it seems like those code blocks could be restored?

tvoran

Thanks for the patch! Please take a look at the comments; I think they're mostly leftover copy/paste from #825.

Also note that you'll need to make testacc to run the lease quota test in this PR:

TESTARGS="--run QuotaLeaseCount" make testacc

Currently it fails because vault expects max_leases as an int, but this patch is sending it as a float.

Do let us know if you'd like to work on these changes, otherwise we can take it over and finish it up.

vault/resource_quota_lease_count.go

vault/resource_quota_lease_count_test.go

vault/resource_quota_lease_count.go

When trying int in resource_quota_lease_count.go we get Error: rpc error: code = Unavailable desc = transport is closing Error: rpc error: code = Canceled desc = context canceled

rhysxevans · 2021-06-28T11:42:05Z

AULT_ADDR='http://0.0.0.0:8200' VAULT_TOKEN='xxxxxxxxxl' TF_ACC_ENTERPRISE=true TESTARGS="--run QuotaLeaseCount" make testacc
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test $(go list ./... |grep -v 'vendor') -v --run QuotaLeaseCount -timeout 120m
?       github.com/hashicorp/terraform-provider-vault   [no test files]
?       github.com/hashicorp/terraform-provider-vault/cmd/coverage      [no test files]
?       github.com/hashicorp/terraform-provider-vault/cmd/generate      [no test files]
testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/codegen   (cached) [no tests to run]
?       github.com/hashicorp/terraform-provider-vault/generated [no test files]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/decode    (cached) [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/encode    (cached) [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/alphabet    (cached) [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/role        (cached) [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/template    (cached) [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/transformation      (cached) [no tests to run]
?       github.com/hashicorp/terraform-provider-vault/schema    [no test files]
testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/util      (cached) [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

=== RUN   TestQuotaLeaseCount
--- PASS: TestQuotaLeaseCount (0.95s)
PASS
ok      github.com/hashicorp/terraform-provider-vault/vault     (cached)

go.mod

vendor/modules.txt

website/docs/r/quota_lease_count.md

vault/resource_quota_lease_count.go

rhys-evans · 2021-06-28T18:02:59Z

VAULT_ADDR='http://0.0.0.0:8200' VAULT_TOKEN='s.xxxxxxxx' TF_ACC_ENTERPRISE=true TESTARGS="--run QuotaLeaseCount" make testacc
Password:
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test $(go list ./... |grep -v 'vendor') -v --run QuotaLeaseCount -timeout 120m
?       github.com/hashicorp/terraform-provider-vault   [no test files]
?       github.com/hashicorp/terraform-provider-vault/cmd/coverage      [no test files]
?       github.com/hashicorp/terraform-provider-vault/cmd/generate      [no test files]
testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/codegen   (cached) [no tests to run]
?       github.com/hashicorp/terraform-provider-vault/generated [no test files]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/decode    3.843s [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/encode    4.665s [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/alphabet    1.564s [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/role        3.374s [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/template    2.176s [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/generated/resources/transform/transformation      1.097s [no tests to run]
?       github.com/hashicorp/terraform-provider-vault/schema    [no test files]
testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-vault/util      (cached) [no tests to run]
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
        A future release of golang/protobuf will delete this package,
        which has long been excluded from the compatibility promise.

=== RUN   TestQuotaLeaseCount
--- PASS: TestQuotaLeaseCount (1.05s)
PASS
ok      github.com/hashicorp/terraform-provider-vault/vault     6.429s

rhys-evans · 2021-06-28T18:03:38Z

ok, so seems to work with int instead of int64 , but I probably missed something else before. My fault

tvoran

Just one more small suggestion.

vault/resource_quota_lease_count_test.go

tvoran

Thanks!

Adds ability to manage lease-count quota's (Vault Enterprise Feature)

rhys-evans added 2 commits January 15, 2021 20:58

Add max-leases quota options

391025c

1st draft, not tested Ref: hashicorp#947

Fixes to pass tests

61472a0

TESTARGS="--run QuotaLeaseCount" make test

ghost added size/XL documentation labels Jan 16, 2021

rhys-evans mentioned this pull request Jan 16, 2021

Multiple lease count quotas on a mount path causes Vault to enter an inoperable state - "conflicting quota definitions detected" hashicorp/vault#10712

Closed

Force update to delete and recreate the resouce

5b4508f

This is due to hashicorp/vault#10712

rhys-evans marked this pull request as ready for review January 16, 2021 20:21

Move to force true for max-lease changes

e6f3f03

Removes , horrible quotaLeaseCountUpdate logic

tvoran self-requested a review June 24, 2021 00:41

tvoran requested changes Jun 28, 2021

View reviewed changes

update to requested changes

6b7fce7

When trying int in resource_quota_lease_count.go we get Error: rpc error: code = Unavailable desc = transport is closing Error: rpc error: code = Canceled desc = context canceled

github-actions bot added the dependencies label Jun 28, 2021

Merge branch 'master' into max-leases-quota

9dd4b05

tvoran requested changes Jun 28, 2021

View reviewed changes

rhys-evans force-pushed the max-leases-quota branch from 7ccb42f to 9dd4b05 Compare June 28, 2021 17:41

rhys-evans added 2 commits June 28, 2021 18:43

Update readme as requested

ba4a37f

revert go.mod as requested

816e9e7

github-actions bot removed the dependencies label Jun 28, 2021

Move to ints, from floats

9f498ff

tvoran reviewed Jun 28, 2021

View reviewed changes

vault/resource_quota_lease_count_test.go Outdated Show resolved Hide resolved

Fix RandIntRange Issue

1adea66

tvoran approved these changes Jun 28, 2021

View reviewed changes

tvoran merged commit 6836ef0 into hashicorp:master Jun 28, 2021

davidmontoyago pushed a commit to davidmontoyago/terraform-provider-vault that referenced this pull request Aug 17, 2021

Max leases quota (hashicorp#948)

632b515

Adds ability to manage lease-count quota's (Vault Enterprise Feature)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Max leases quota #948

Max leases quota #948

rhys-evans commented Jan 16, 2021 •

edited

Loading

hashicorp-cla commented Jan 16, 2021 •

edited

Loading

rhysxevans commented Jan 16, 2021

tvoran commented Jun 28, 2021

tvoran left a comment

rhysxevans commented Jun 28, 2021

rhys-evans commented Jun 28, 2021

rhys-evans commented Jun 28, 2021

tvoran left a comment

tvoran left a comment

Max leases quota #948

Max leases quota #948

Conversation

rhys-evans commented Jan 16, 2021 • edited Loading

Community Note

hashicorp-cla commented Jan 16, 2021 • edited Loading

rhysxevans commented Jan 16, 2021

tvoran commented Jun 28, 2021

tvoran left a comment

Choose a reason for hiding this comment

rhysxevans commented Jun 28, 2021

rhys-evans commented Jun 28, 2021

rhys-evans commented Jun 28, 2021

tvoran left a comment

Choose a reason for hiding this comment

tvoran left a comment

Choose a reason for hiding this comment

rhys-evans commented Jan 16, 2021 •

edited

Loading

hashicorp-cla commented Jan 16, 2021 •

edited

Loading