From e655e73886798e63fe223c28e213915a0d2d183c Mon Sep 17 00:00:00 2001 From: SoTrx <11771975+SoTrx@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:05:20 +0000 Subject: [PATCH] test: Updating Dapr conflict prompt with new building block ConfigurationStore again Signed-off-by: SoTrx <11771975+SoTrx@users.noreply.github.com> --- pkg/daprrp/processors/configurationstores/processor_test.go | 2 +- pkg/daprrp/processors/pubsubbrokers/processor_test.go | 2 +- pkg/daprrp/processors/secretstores/processor_test.go | 2 +- pkg/daprrp/processors/statestores/processor_test.go | 2 +- .../noncloud/resources/dapr_component_name_conflict_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/daprrp/processors/configurationstores/processor_test.go b/pkg/daprrp/processors/configurationstores/processor_test.go index a6d888c9b1..87ee8bd8f2 100644 --- a/pkg/daprrp/processors/configurationstores/processor_test.go +++ b/pkg/daprrp/processors/configurationstores/processor_test.go @@ -502,6 +502,6 @@ func Test_Process(t *testing.T) { err = processor.Process(context.Background(), resource, options) require.Error(t, err) assert.IsType(t, &processors.ValidationError{}, err) - assert.Equal(t, fmt.Sprintf("the Dapr component name '\"%s\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again", componentName), err.Error()) + assert.Equal(t, fmt.Sprintf("the Dapr component name '\"%s\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again.", componentName), err.Error()) }) } diff --git a/pkg/daprrp/processors/pubsubbrokers/processor_test.go b/pkg/daprrp/processors/pubsubbrokers/processor_test.go index 8453c89dec..e9286c7005 100644 --- a/pkg/daprrp/processors/pubsubbrokers/processor_test.go +++ b/pkg/daprrp/processors/pubsubbrokers/processor_test.go @@ -500,6 +500,6 @@ func Test_Process(t *testing.T) { err = processor.Process(context.Background(), resource, options) require.Error(t, err) assert.IsType(t, &processors.ValidationError{}, err) - assert.Equal(t, "the Dapr component name '\"test-dapr-pubsub-broker\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again", err.Error()) + assert.Equal(t, "the Dapr component name '\"test-dapr-pubsub-broker\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again.", err.Error()) }) } diff --git a/pkg/daprrp/processors/secretstores/processor_test.go b/pkg/daprrp/processors/secretstores/processor_test.go index 314019ca78..5170130fea 100644 --- a/pkg/daprrp/processors/secretstores/processor_test.go +++ b/pkg/daprrp/processors/secretstores/processor_test.go @@ -398,6 +398,6 @@ func Test_Process(t *testing.T) { err = processor.Process(context.Background(), resource, options) require.Error(t, err) assert.IsType(t, &processors.ValidationError{}, err) - assert.Equal(t, "the Dapr component name '\"test-component\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again", err.Error()) + assert.Equal(t, "the Dapr component name '\"test-component\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again.", err.Error()) }) } diff --git a/pkg/daprrp/processors/statestores/processor_test.go b/pkg/daprrp/processors/statestores/processor_test.go index 88afaea263..884330cf2a 100644 --- a/pkg/daprrp/processors/statestores/processor_test.go +++ b/pkg/daprrp/processors/statestores/processor_test.go @@ -490,6 +490,6 @@ func Test_Process(t *testing.T) { err = processor.Process(context.Background(), resource, options) require.Error(t, err) assert.IsType(t, &processors.ValidationError{}, err) - assert.Equal(t, "the Dapr component name '\"test-component\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again", err.Error()) + assert.Equal(t, "the Dapr component name '\"test-component\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again.", err.Error()) }) } diff --git a/test/functional-portable/daprrp/noncloud/resources/dapr_component_name_conflict_test.go b/test/functional-portable/daprrp/noncloud/resources/dapr_component_name_conflict_test.go index 6de35d10cd..5ef4f852cd 100644 --- a/test/functional-portable/daprrp/noncloud/resources/dapr_component_name_conflict_test.go +++ b/test/functional-portable/daprrp/noncloud/resources/dapr_component_name_conflict_test.go @@ -34,7 +34,7 @@ func Test_DaprComponentNameConflict(t *testing.T) { Details: []step.DeploymentErrorDetail{ { Code: v1.CodeInternal, - MessageContains: "the Dapr component name '\"dapr-component\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again", + MessageContains: "the Dapr component name '\"dapr-component\"' is already in use by another resource. Dapr component and resource names must be unique across all Dapr types (e.g., StateStores, PubSubBrokers, SecretStores, ConfigurationStores, etc.). Please select a new name and try again.", }, }, })