Skip to content

Fix permanent diff on vault_rabbitmq_secret_backend_role #2545

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix permanent diff on vault_rabbitmq_secret_backend_role #2545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions vault/resource_rabbitmq_secret_backend_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"encoding/json"
"fmt"
"log"
"sort"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -289,8 +290,17 @@ func expandRabbitMQSecretBackendRoleVhostTopic(vhost []interface{}) (string, err

func flattenRabbitMQSecretBackendRoleVhost(vhost map[string]interface{}) []map[string]interface{} {
var vhosts []map[string]interface{}
for id, val := range vhost {
vals := val.(map[string]interface{})

// Get sorted keys
keys := make([]string, 0, len(vhost))
for k := range vhost {
keys = append(keys, k)
}
sort.Strings(keys)

// Process in sorted order
for _, id := range keys {
vals := vhost[id].(map[string]interface{})
vhosts = append(vhosts, map[string]interface{}{
"host": id,
"configure": vals["configure"],
Expand Down Expand Up @@ -328,4 +338,4 @@ func flattenRabbitMQSecretBackendRoleVhostTopic(topic map[string]interface{}) []
}

return topics
}
}
63 changes: 47 additions & 16 deletions vault/resource_rabbitmq_secret_backend_role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
package vault

import (
"context"
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"

"github.com/hashicorp/terraform-provider-vault/internal/provider"
"github.com/hashicorp/terraform-provider-vault/testutil"
Expand All @@ -28,9 +27,9 @@ func TestAccRabbitMQSecretBackendRole_basic(t *testing.T) {
resourceName := "vault_rabbitmq_secret_backend_role.test"
connectionUri, username, password := testutil.GetTestRMQCreds(t)
resource.Test(t, resource.TestCase{
ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(context.Background(), t),
PreCheck: func() { testutil.TestAccPreCheck(t) },
CheckDestroy: testAccRabbitMQSecretBackendRoleCheckDestroy,
ProviderFactories: providerFactories,
PreCheck: func() { testutil.TestAccPreCheck(t) },
CheckDestroy: testAccRabbitMQSecretBackendRoleCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccRabbitMQSecretBackendRoleConfig_basic(name, backend, connectionUri, username, password),
Expand Down Expand Up @@ -71,9 +70,9 @@ func TestAccRabbitMQSecretBackendRole_nested(t *testing.T) {
resourceName := "vault_rabbitmq_secret_backend_role.test"
connectionUri, username, password := testutil.GetTestRMQCreds(t)
resource.Test(t, resource.TestCase{
ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(context.Background(), t),
PreCheck: func() { testutil.TestAccPreCheck(t) },
CheckDestroy: testAccRabbitMQSecretBackendRoleCheckDestroy,
ProviderFactories: providerFactories,
PreCheck: func() { testutil.TestAccPreCheck(t) },
CheckDestroy: testAccRabbitMQSecretBackendRoleCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccRabbitMQSecretBackendRoleConfig_basic(name, backend, connectionUri, username, password),
Expand Down Expand Up @@ -114,9 +113,9 @@ func TestAccRabbitMQSecretBackendRole_topic(t *testing.T) {
resourceName := "vault_rabbitmq_secret_backend_role.test"
connectionUri, username, password := testutil.GetTestRMQCreds(t)
resource.Test(t, resource.TestCase{
ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(context.Background(), t),
PreCheck: func() { testutil.TestAccPreCheck(t) },
CheckDestroy: testAccRabbitMQSecretBackendRoleCheckDestroy,
ProviderFactories: providerFactories,
PreCheck: func() { testutil.TestAccPreCheck(t) },
CheckDestroy: testAccRabbitMQSecretBackendRoleCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccRabbitMQSecretBackendRoleConfig_topics(name, backend, connectionUri, username, password),
Expand Down Expand Up @@ -245,14 +244,14 @@ resource "vault_rabbitmq_secret_backend_role" "test" {
backend = vault_rabbitmq_secret_backend.test.path
name = "%s"
tags = %q

vhost_topic {
vhost {
topic = "amq.topic"
read = ".*"
write = ""
}

host = "/"
}
}
Expand Down Expand Up @@ -281,9 +280,41 @@ resource "vault_rabbitmq_secret_backend_role" "test" {
read = ""
write = ".*"
}

host = "/"
}
}
`, path, connectionUri, username, password, name, testAccRabbitMQSecretBackendRoleTags_updated)
}

func TestFlattenRabbitMQSecretBackendRoleVhost_Order(t *testing.T) {
input := map[string]interface{}{
"b-vhost": map[string]interface{}{
"configure": "c1",
"read": "r1",
"write": "w1",
},
"a-vhost": map[string]interface{}{
"configure": "c2",
"read": "r2",
"write": "w2",
},
"c-vhost": map[string]interface{}{
"configure": "c3",
"read": "r3",
"write": "w3",
},
}

result := flattenRabbitMQSecretBackendRoleVhost(input)

expectedOrder := []string{"a-vhost", "b-vhost", "c-vhost"}
if len(result) != len(expectedOrder) {
t.Fatalf("expected %d vhosts, got %d", len(expectedOrder), len(result))
}
for i, expectedHost := range expectedOrder {
if result[i]["host"] != expectedHost {
t.Errorf("expected host at index %d to be %q, got %q", i, expectedHost, result[i]["host"])
}
}
}
Loading