Add new allowed_user_key_config field #1413
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fix introduces a new configuration block for the
ssh_secret_backend_role resource, which supports the new vault-1.10
updates to the allowed_user_key_lengths parameter. The new config block
is meant to supersede the current allowed_user_key_lengths provider
field.
Example role config:
resource "vault_ssh_secret_backend_role" "demo" {
name = "role1"
backend = vault_mount.demo.path
allowed_user_key_config {
type = "rsa"
lengths = [2048, 4096]
}
allowed_user_key_config {
type = "dss"
lengths = [2048, 4096]
}
}
benashz
changed the title
| log.Printf("[DEBUG] Writing role %q on SSH backend %q", name, backend) | ||
| _, err := client.Logical().Write(path, data) | ||
| if err != nil { | ||
| return fmt.Errorf("error writing role %q for backend %q: %s", name, backend, err) | ||
| // in the case where vault does not support a list of key lengths, |
There was a problem hiding this comment.
Nice catch! This error case had completely slipped my mind 馃槄
| return err | ||
| } | ||
|
|
||
| newField := "allowed_user_key_lengths" |
There was a problem hiding this comment.
Should this be allowed_user_key_config instead?
| v[keyType] = l | ||
| } | ||
|
|
||
| return d.Set(newField, v) |
There was a problem hiding this comment.
Since this is in the case the user set the legacyField in the TF config, should we be setting legacyField to v in the TF state instead?
There was a problem hiding this comment.
good catch, will update per your other comment.
marcboudreau
pushed a commit
to marcboudreau/terraform-provider-vault
that referenced
this pull request
Nov 6, 2022
This fix introduces a new configuration block for the
ssh_secret_backend_role resource, which supports the new vault-1.10
updates to the allowed_user_key_lengths parameter. The new config block
is meant to supersede the current allowed_user_key_lengths provider
field.
Example role config:
resource "vault_ssh_secret_backend_role" "demo" {
name = "role1"
backend = vault_mount.demo.path
allowed_user_key_config {
type = "rsa"
lengths = [2048, 4096]
}
allowed_user_key_config {
type = "dss"
lengths = [2048, 4096]
}
}
* Update docs
* Complete the field name refactoring
* Set the correct field in the legacy case
* Add changelog entry
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fix introduces a new configuration block for the
ssh_secret_backend_role resource, which supports the new vault-1.10
updates to the allowed_user_key_lengths parameter. The new config block
is meant to supersede the current allowed_user_key_lengths provider
field.
Example role config:
Community Note
Relates OR Closes #0000
Release note for CHANGELOG:
Output from acceptance testing: