stackit-dev-tools/terraform-provider-stackitprivatepreview
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename credentials_id field to credential_id (#80)

Browse source 
* Rename credentials_id field to credential_id

* Address review comments
This commit is contained in:
João Palet 2023-10-12 15:57:05 +02:00 • committed by GitHub
parent b02db190bf
commit 5a5ac6640c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 722 additions and 722 deletions
Download patch file Download diff file Expand all files Collapse all files

54
stackit/internal/services/rabbitmq/rabbitmq_acc_test.go
View file

@ -56,7 +56,7 @@ func resourceConfig(acls *string) string {
instanceResource["version"],
aclsLine,
instanceResource["metrics_frequency"],
resourceConfigCredentials(),
resourceConfigCredential(),
)
}
@ -82,13 +82,13 @@ func resourceConfigWithUpdate() string {
instanceResource["plan_name"],
instanceResource["version"],
instanceResource["sgw_acl_valid"],
resourceConfigCredentials(),
resourceConfigCredential(),
)
}
func resourceConfigCredentials() string {
func resourceConfigCredential() string {
return `
resource "stackit_rabbitmq_credential" "credentials" {
resource "stackit_rabbitmq_credential" "credential" {
project_id = stackit_rabbitmq_instance.instance.project_id
instance_id = stackit_rabbitmq_instance.instance.instance_id
}
@ -119,17 +119,17 @@ func TestAccRabbitMQResource(t *testing.T) {
resource.TestCheckResourceAttr("stackit_rabbitmq_instance.instance", "name", instanceResource["name"]),
resource.TestCheckResourceAttrSet("stackit_rabbitmq_instance.instance", "parameters.sgw_acl"),
// Credentials data
// Credential data
resource.TestCheckResourceAttrPair(
"stackit_rabbitmq_credential.credentials", "project_id",
"stackit_rabbitmq_credential.credential", "project_id",
"stackit_rabbitmq_instance.instance", "project_id",
),
resource.TestCheckResourceAttrPair(
"stackit_rabbitmq_credential.credentials", "instance_id",
"stackit_rabbitmq_credential.credential", "instance_id",
"stackit_rabbitmq_instance.instance", "instance_id",
),
resource.TestCheckResourceAttrSet("stackit_rabbitmq_credential.credentials", "credentials_id"),
resource.TestCheckResourceAttrSet("stackit_rabbitmq_credential.credentials", "host"),
resource.TestCheckResourceAttrSet("stackit_rabbitmq_credential.credential", "credential_id"),
resource.TestCheckResourceAttrSet("stackit_rabbitmq_credential.credential", "host"),
),
},
// data source
@ -142,10 +142,10 @@ func TestAccRabbitMQResource(t *testing.T) {
instance_id = stackit_rabbitmq_instance.instance.instance_id
}
data "stackit_rabbitmq_credential" "credentials" {
project_id = stackit_rabbitmq_credential.credentials.project_id
instance_id = stackit_rabbitmq_credential.credentials.instance_id
credentials_id = stackit_rabbitmq_credential.credentials.credentials_id
data "stackit_rabbitmq_credential" "credential" {
project_id = stackit_rabbitmq_credential.credential.project_id
instance_id = stackit_rabbitmq_credential.credential.instance_id
credential_id = stackit_rabbitmq_credential.credential.credential_id
}`,
resourceConfig(nil),
),
@ -153,19 +153,19 @@ func TestAccRabbitMQResource(t *testing.T) {
// Instance data
resource.TestCheckResourceAttr("data.stackit_rabbitmq_instance.instance", "project_id", instanceResource["project_id"]),
resource.TestCheckResourceAttrPair("stackit_rabbitmq_instance.instance", "instance_id",
"data.stackit_rabbitmq_credential.credentials", "instance_id"),
"data.stackit_rabbitmq_credential.credential", "instance_id"),
resource.TestCheckResourceAttrPair("data.stackit_rabbitmq_instance.instance", "instance_id",
"data.stackit_rabbitmq_credential.credentials", "instance_id"),
"data.stackit_rabbitmq_credential.credential", "instance_id"),
resource.TestCheckResourceAttr("data.stackit_rabbitmq_instance.instance", "plan_id", instanceResource["plan_id"]),
resource.TestCheckResourceAttr("data.stackit_rabbitmq_instance.instance", "name", instanceResource["name"]),
resource.TestCheckResourceAttrSet("data.stackit_rabbitmq_instance.instance", "parameters.sgw_acl"),
// Credentials data
resource.TestCheckResourceAttr("data.stackit_rabbitmq_credential.credentials", "project_id", instanceResource["project_id"]),
resource.TestCheckResourceAttrSet("data.stackit_rabbitmq_credential.credentials", "credentials_id"),
resource.TestCheckResourceAttrSet("data.stackit_rabbitmq_credential.credentials", "host"),
resource.TestCheckResourceAttrSet("data.stackit_rabbitmq_credential.credentials", "port"),
resource.TestCheckResourceAttrSet("data.stackit_rabbitmq_credential.credentials", "uri"),
// Credential data
resource.TestCheckResourceAttr("data.stackit_rabbitmq_credential.credential", "project_id", instanceResource["project_id"]),
resource.TestCheckResourceAttrSet("data.stackit_rabbitmq_credential.credential", "credential_id"),
resource.TestCheckResourceAttrSet("data.stackit_rabbitmq_credential.credential", "host"),
resource.TestCheckResourceAttrSet("data.stackit_rabbitmq_credential.credential", "port"),
resource.TestCheckResourceAttrSet("data.stackit_rabbitmq_credential.credential", "uri"),
),
},
// Import
@ -186,21 +186,21 @@ func TestAccRabbitMQResource(t *testing.T) {
ImportStateVerify: true,
},
{
ResourceName: "stackit_rabbitmq_credential.credentials",
ResourceName: "stackit_rabbitmq_credential.credential",
ImportStateIdFunc: func(s *terraform.State) (string, error) {
r, ok := s.RootModule().Resources["stackit_rabbitmq_credential.credentials"]
r, ok := s.RootModule().Resources["stackit_rabbitmq_credential.credential"]
if !ok {
return "", fmt.Errorf("couldn't find resource stackit_rabbitmq_credential.credentials")
return "", fmt.Errorf("couldn't find resource stackit_rabbitmq_credential.credential")
}
instanceId, ok := r.Primary.Attributes["instance_id"]
if !ok {
return "", fmt.Errorf("couldn't find attribute instance_id")
}
credentialsId, ok := r.Primary.Attributes["credentials_id"]
credentialId, ok := r.Primary.Attributes["credential_id"]
if !ok {
return "", fmt.Errorf("couldn't find attribute credentials_id")
return "", fmt.Errorf("couldn't find attribute credential_id")
}
return fmt.Sprintf("%s,%s,%s", testutil.ProjectId, instanceId, credentialsId), nil
return fmt.Sprintf("%s,%s,%s", testutil.ProjectId, instanceId, credentialId), nil
},
ImportState: true,
ImportStateVerify: true,