don't send password updates if no change #1912
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
raymonstah
commented
Jun 20, 2023
Comment on lines
-866
to
-903
| if v, ok := d.GetOk(prefix + "hosts"); ok { | ||
| log.Printf("[DEBUG] Cassandra hosts: %v", v.([]interface{})) | ||
| var hosts []string | ||
| for _, host := range v.([]interface{}) { | ||
| if v == nil { | ||
| continue | ||
| } | ||
| hosts = append(hosts, host.(string)) | ||
| } | ||
| data["hosts"] = strings.Join(hosts, ",") | ||
| } | ||
| if v, ok := d.GetOkExists(prefix + "port"); ok { | ||
| data["port"] = v.(int) | ||
| } | ||
| if v, ok := d.GetOk(prefix + "username"); ok { | ||
| data["username"] = v.(string) | ||
| } | ||
| if v, ok := d.GetOk("cassandra.0.password"); ok { | ||
| data["password"] = v.(string) | ||
| } | ||
| if v, ok := d.GetOkExists(prefix + "tls"); ok { | ||
| data["tls"] = v.(bool) | ||
| } | ||
| if v, ok := d.GetOkExists("cassandra.0.insecure_tls"); ok { | ||
| data["insecure_tls"] = v.(bool) | ||
| } | ||
| if v, ok := d.GetOkExists("cassandra.0.pem_bundle"); ok { | ||
| data["pem_bundle"] = v.(string) | ||
| } | ||
| if v, ok := d.GetOkExists(prefix + "pem_json"); ok { | ||
| data["pem_json"] = v.(string) | ||
| } | ||
| if v, ok := d.GetOkExists(prefix + "protocol_version"); ok { | ||
| data["protocol_version"] = v.(int) | ||
| } | ||
| if v, ok := d.GetOkExists(prefix + "connect_timeout"); ok { | ||
| data["connect_timeout"] = v.(int) | ||
| } |
There was a problem hiding this comment.
this block was moved to its own function
Comment on lines
-913
to
+876
| if v, ok := d.GetOk(prefix + "public_key"); ok { | ||
| data["public_key"] = v.(string) | ||
| } | ||
| if v, ok := d.GetOk(prefix + "private_key"); ok { | ||
| data["private_key"] = v.(string) | ||
| } | ||
| if v, ok := d.GetOk(prefix + "project_id"); ok { | ||
| data["project_id"] = v.(string) | ||
| } | ||
| setMongoDBAtlasDatabaseConnectionData(d, prefix, data) |
There was a problem hiding this comment.
this block was moved to its own function
fairclothjm
reviewed
Jun 21, 2023
docker-compose.yaml
Outdated
| ports: | ||
| - "9042:9042" | ||
| volumes: | ||
| - ./cassandra.yaml:/etc/cassandra/cassandra.yaml |
There was a problem hiding this comment.
nit: could we move the cassandra.yaml file out of the top-level directory? Since it is only for testing, I find it to be out of place here. Maybe we could put it in ./testdata?
fairclothjm
reviewed
Jun 21, 2023
| @@ -823,6 +824,27 @@ func TestAccDatabaseSecretBackendConnection_elasticsearch(t *testing.T) { | |||
| resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "elasticsearch.0.tls_server_name", "test"), | |||
| ), | |||
| }, | |||
| { | |||
| PreConfig: func() { | |||
| // Uncomment block below to actually rotate root. We're avoiding doing this in CI test runs | |||
There was a problem hiding this comment.
If we wanted to enable this, we could create a Vault user specifically for this tests. Example: https://github.com/hashicorp/vault-plugin-database-elasticsearch#create-a-role-for-vault
I don't think it is strictly necessary though since the behavior seems well tested enough.
fairclothjm
approved these changes
Jun 21, 2023
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.
Closes #1629 (again).
Prevents sending the password to Vault when there is no change in the Terraform state.
Updates the remaining database engines:
Elasticache was left out since it doesn't use a traditional password as far as I can tell. I believe it's just an alias for the AWS Secret Key.
In addition:
docker-compose.ymlto include database engines for easier testing