fixing unit tests

radius-project · Sep 18, 2023 · 2984d12 · 2984d12
1 parent b8f9d40
commit 2984d12
Show file tree

Hide file tree

Showing 27 changed files with 144 additions and 117 deletions.
diff --git a/pkg/corerp/processors/extenders/processor.go b/pkg/corerp/processors/extenders/processor.go
@@ -53,7 +53,7 @@ func (p *Processor) Delete(ctx context.Context, resource *datamodel.Extender, op
 	return nil
 }
 
-func mergeOutputValues(properties map[string]any, recipeOutput *recipes.RecipeOutput, secret bool) map[string]any {
+func mergeOutputValues(properties map[string]any, recipeOutput *recipes.RecipeOutputResponse, secret bool) map[string]any {
 	values := make(map[string]any)
 	for k, val := range properties {
 		values[k] = val

diff --git a/pkg/corerp/processors/extenders/processor_test.go b/pkg/corerp/processors/extenders/processor_test.go
@@ -50,7 +50,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				Values: map[string]any{
 					"bucketName": "myBucket",
@@ -144,7 +144,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				// Values and secrets will be overridden by the resource.
 				Values: map[string]any{
@@ -190,7 +190,7 @@ func Test_Process(t *testing.T) {
 				},
 			},
 		}
-		options := processors.Options{RecipeOutput: &recipes.RecipeOutput{}}
+		options := processors.Options{RecipeOutput: &recipes.RecipeOutputResponse{}}
 
 		err := processor.Process(context.Background(), resource, options)
 		require.Error(t, err)
@@ -225,7 +225,7 @@ func Test_MergeOutputValues(t *testing.T) {
 		outputResources = append(outputResources, result)
 	}
 	options := processors.Options{
-		RecipeOutput: &recipes.RecipeOutput{
+		RecipeOutput: &recipes.RecipeOutputResponse{
 			OutputResources: outputResources,
 			Values: map[string]any{
 				"region": "westus",

diff --git a/pkg/daprrp/processors/pubsubbrokers/processor_test.go b/pkg/daprrp/processors/pubsubbrokers/processor_test.go
@@ -85,7 +85,7 @@ func Test_Process(t *testing.T) {
 					Namespace: "test-namespace",
 				},
 			},
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				Values:          map[string]any{}, // Component name will be computed for resource name.
 				Secrets:         map[string]any{},
@@ -246,7 +246,7 @@ func Test_Process(t *testing.T) {
 					Namespace: "test-namespace",
 				},
 			},
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 
 				// Values and secrets will be overridden by the resource.

diff --git a/pkg/daprrp/processors/secretstores/processor_test.go b/pkg/daprrp/processors/secretstores/processor_test.go
@@ -81,7 +81,7 @@ func Test_Process(t *testing.T) {
 					Namespace: "test-namespace",
 				},
 			},
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				Values:          map[string]any{}, // Component name will be computed for resource name.
 				Secrets:         map[string]any{},
@@ -231,7 +231,7 @@ func Test_Process(t *testing.T) {
 					Namespace: "test-namespace",
 				},
 			},
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 
 				// Values and secrets will be overridden by the resource.

diff --git a/pkg/daprrp/processors/statestores/processor_test.go b/pkg/daprrp/processors/statestores/processor_test.go
@@ -84,7 +84,7 @@ func Test_Process(t *testing.T) {
 					Namespace: "test-namespace",
 				},
 			},
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				Values:          map[string]any{}, // Component name will be computed for resource name.
 				Secrets:         map[string]any{},
@@ -238,7 +238,7 @@ func Test_Process(t *testing.T) {
 					Namespace: "test-namespace",
 				},
 			},
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 
 				// Values and secrets will be overridden by the resource.

diff --git a/pkg/datastoresrp/processors/mongodatabases/processor_test.go b/pkg/datastoresrp/processors/mongodatabases/processor_test.go
@@ -56,7 +56,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				Values: map[string]any{
 					"host":     host,
@@ -179,7 +179,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				// Values and secrets will be overridden by the resource.
 				Values: map[string]any{
@@ -241,7 +241,7 @@ func Test_Process(t *testing.T) {
 
 	t.Run("failure - missing required values", func(t *testing.T) {
 		resource := &datamodel.MongoDatabase{}
-		options := processors.Options{RecipeOutput: &recipes.RecipeOutput{}}
+		options := processors.Options{RecipeOutput: &recipes.RecipeOutputResponse{}}
 
 		err := processor.Process(context.Background(), resource, options)
 		require.Error(t, err)

diff --git a/pkg/datastoresrp/processors/rediscaches/processor_test.go b/pkg/datastoresrp/processors/rediscaches/processor_test.go
@@ -56,7 +56,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				Values: map[string]any{
 					"host":     host,
@@ -189,7 +189,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				// Values and secrets will be overridden by the resource.
 				Values: map[string]any{
@@ -254,7 +254,7 @@ func Test_Process(t *testing.T) {
 
 	t.Run("failure - missing required values", func(t *testing.T) {
 		resource := &datamodel.RedisCache{}
-		options := processors.Options{RecipeOutput: &recipes.RecipeOutput{}}
+		options := processors.Options{RecipeOutput: &recipes.RecipeOutputResponse{}}
 
 		err := processor.Process(context.Background(), resource, options)
 		require.Error(t, err)

diff --git a/pkg/datastoresrp/processors/sqldatabases/processor_test.go b/pkg/datastoresrp/processors/sqldatabases/processor_test.go
@@ -43,7 +43,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				Values: map[string]any{
 					"database": database,
@@ -166,7 +166,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				// Values and secrets will be overridden by the resource.
 				Values: map[string]any{
@@ -227,7 +227,7 @@ func Test_Process(t *testing.T) {
 
 	t.Run("failure - missing required values", func(t *testing.T) {
 		resource := &datamodel.SqlDatabase{}
-		options := processors.Options{RecipeOutput: &recipes.RecipeOutput{}}
+		options := processors.Options{RecipeOutput: &recipes.RecipeOutputResponse{}}
 
 		err := processor.Process(context.Background(), resource, options)
 		require.Error(t, err)

diff --git a/pkg/messagingrp/processors/rabbitmqqueues/processor_test.go b/pkg/messagingrp/processors/rabbitmqqueues/processor_test.go
@@ -55,7 +55,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				Values: map[string]any{
 					"queue":    queue,
@@ -148,7 +148,7 @@ func Test_Process(t *testing.T) {
 			outputResources = append(outputResources, result)
 		}
 		options := processors.Options{
-			RecipeOutput: &recipes.RecipeOutput{
+			RecipeOutput: &recipes.RecipeOutputResponse{
 				OutputResources: outputResources,
 				// Values and secrets will be overridden by the resource.
 				Values: map[string]any{
@@ -196,7 +196,7 @@ func Test_Process(t *testing.T) {
 
 	t.Run("failure - missing required values", func(t *testing.T) {
 		resource := &datamodel.RabbitMQQueue{}
-		options := processors.Options{RecipeOutput: &recipes.RecipeOutput{}}
+		options := processors.Options{RecipeOutput: &recipes.RecipeOutputResponse{}}
 
 		err := processor.Process(context.Background(), resource, options)
 		require.Error(t, err)

diff --git a/pkg/portableresources/backend/controller/createorupdateresource.go b/pkg/portableresources/backend/controller/createorupdateresource.go
@@ -136,7 +136,7 @@ func (c *CreateOrUpdateResource[P, T]) copyOutputResources(data P) []string {
 	return previousOutputResources
 }
 
-func (c *CreateOrUpdateResource[P, T]) executeRecipeIfNeeded(ctx context.Context, data P, prevState []string) (*recipes.RecipeOutput, error) {
+func (c *CreateOrUpdateResource[P, T]) executeRecipeIfNeeded(ctx context.Context, data P, prevState []string) (*recipes.RecipeOutputResponse, error) {
 	// 'any' is required here to convert to an interface type, only then can we use a type assertion.
 	recipeDataModel, supportsRecipes := any(data).(datamodel.RecipeDataModel)
 	if !supportsRecipes {

diff --git a/pkg/portableresources/backend/controller/createorupdateresource_test.go b/pkg/portableresources/backend/controller/createorupdateresource_test.go
@@ -350,7 +350,7 @@ func TestCreateOrUpdateResource_Run(t *testing.T) {
 						},
 						PreviousState: prevState,
 					}).
-					Return(&recipes.RecipeOutput{}, tt.recipeErr).
+					Return(&recipes.RecipeOutputResponse{}, tt.recipeErr).
 					Times(1)
 			} else if stillPassing {
 				eng.EXPECT().
@@ -360,7 +360,7 @@ func TestCreateOrUpdateResource_Run(t *testing.T) {
 						},
 						PreviousState: prevState,
 					}).
-					Return(&recipes.RecipeOutput{}, nil).
+					Return(&recipes.RecipeOutputResponse{}, nil).
 					Times(1)
 			}
 

diff --git a/pkg/portableresources/processors/types.go b/pkg/portableresources/processors/types.go
@@ -45,7 +45,7 @@ type Options struct {
 	RuntimeConfiguration recipes.RuntimeConfiguration
 
 	// RecipeOutput represents the output of executing a recipe (may be nil).
-	RecipeOutput *recipes.RecipeOutput
+	RecipeOutput *recipes.RecipeOutputResponse
 }
 
 // ValidationError represents a user-facing validation message reported by the processor.

diff --git a/pkg/portableresources/processors/validator.go b/pkg/portableresources/processors/validator.go
@@ -41,8 +41,8 @@ const (
 // - Apply values and secrets from the recipe output to the resource data model.
 type Validator struct {
 	resourcesField *[]*portableresources.ResourceReference
-	fields         []func(output *recipes.RecipeOutput) string
-	computedFields []func(output *recipes.RecipeOutput) string
+	fields         []func(output *recipes.RecipeOutputResponse) string
+	computedFields []func(output *recipes.RecipeOutputResponse) string
 
 	// ConnectionValues stores the connection values extracted from the data model and recipe output.
 	ConnectionValues map[string]any
@@ -150,7 +150,7 @@ func (v *Validator) AddComputedSecretField(name string, ref *string, compute fun
 // This function returns *ValidationError for validation failures.
 //
 // After calling SetAndValidate, the connection values/secrets and output resources will be populated.
-func (v *Validator) SetAndValidate(output *recipes.RecipeOutput) error {
+func (v *Validator) SetAndValidate(output *recipes.RecipeOutputResponse) error {
 	msgs := []string{}
 
 	if output != nil {
@@ -201,8 +201,8 @@ func (v *Validator) SetAndValidate(output *recipes.RecipeOutput) error {
 	return nil
 }
 
-func bind[T any](v *Validator, name string, ref *T, required bool, secret bool, typeName string, convert func(value any) (T, bool), compute func() (T, *ValidationError)) func(output *recipes.RecipeOutput) string {
-	return func(output *recipes.RecipeOutput) string {
+func bind[T any](v *Validator, name string, ref *T, required bool, secret bool, typeName string, convert func(value any) (T, bool), compute func() (T, *ValidationError)) func(output *recipes.RecipeOutputResponse) string {
+	return func(output *recipes.RecipeOutputResponse) string {
 		valueKind := kindConnectionValue
 		propertyPath := fmt.Sprintf(".properties.%v", name)
 		if secret {