reenable skipped recipe test

Signed-off-by: sk593 <shruthikumar@microsoft.com>

test/functional/shared/cli/cli_test.go

@@ -66,31 +66,37 @@ func verifyRecipeCLI(ctx context.Context, t *testing.T, test shared.RPTest) {
 	// for AWS test and has the AWS scope which the environment created in this does not.
 	envName := test.Steps[0].RPResources.Resources[0].Name
 	recipeName := "recipeName"
-	recipeTemplate := "ghcr.io/testpublicrecipe/bicep/modules/testTemplate:v1"
-	templateKind := "bicep"
-	resourceType := "Applications.Datastores/mongoDatabases"
-	file := "testdata/corerp-redis-recipe.bicep"
+	recipe1 := "recipe1"
+	recipe2 := "recipe2"
+	registry := strings.TrimPrefix(functional.GetBicepRecipeRegistry(), "registry=")
+	version := strings.TrimPrefix(functional.GetBicepRecipeVersion(), "version=")
+	recipeTemplate := fmt.Sprintf("%s/recipes/local-dev/rediscaches:%s", registry, version)
+	envRecipeTemplateBicep := fmt.Sprintf("%s/test/functional/shared/recipes/corerp-redis-recipe:%s", registry, version)
+	envRecipeTemplateTerraform := "Azure/cosmosdb/azurerm"
+	templateKindBicep := "bicep"
+	templateKindTerraform := "terraform"
+	resourceType := "Applications.Datastores/redisCaches"
+	file := "./test/functional/shared/resources/testdata/recipes/test-bicep-recipes/corerp-redis-recipe.bicep"
 	target := fmt.Sprintf("br:ghcr.io/radius-project/dev/test-bicep-recipes/redis-recipe:%s", generateUniqueTag())
 
 	t.Run("Validate rad recipe register", func(t *testing.T) {
-		output, err := cli.RecipeRegister(ctx, envName, recipeName, templateKind, recipeTemplate, resourceType, false)
-		require.NoError(t, err)
-		require.Contains(t, output, "Successfully linked recipe")
-	})
-
-	t.Run("Validate rad recipe register with insecure registry", func(t *testing.T) {
-		output, err := cli.RecipeRegister(ctx, envName, recipeName, templateKind, recipeTemplate, resourceType, true)
+		output, err := cli.RecipeRegister(ctx, envName, recipeName, templateKindBicep, recipeTemplate, resourceType, false)
 		require.NoError(t, err)
 		require.Contains(t, output, "Successfully linked recipe")
 	})
 
 	t.Run("Validate rad recipe list", func(t *testing.T) {
 		output, err := cli.RecipeList(ctx, envName)
 		require.NoError(t, err)
+		require.Regexp(t, recipe1, output)
+		require.Regexp(t, recipe2, output)
 		require.Regexp(t, recipeName, output)
 		require.Regexp(t, resourceType, output)
+		require.Regexp(t, envRecipeTemplateBicep, output)
+		require.Regexp(t, envRecipeTemplateTerraform, output)
 		require.Regexp(t, recipeTemplate, output)
-		require.Regexp(t, "true", output)
+		require.Regexp(t, templateKindBicep, output)
+		require.Regexp(t, templateKindTerraform, output)
 	})
 
 	t.Run("Validate rad recipe unregister", func(t *testing.T) {
@@ -100,30 +106,18 @@ func verifyRecipeCLI(ctx context.Context, t *testing.T, test shared.RPTest) {
 	})
 
 	t.Run("Validate rad recipe show", func(t *testing.T) {
-		showRecipeName := "mongodbtest"
-		showRecipeTemplate := "ghcr.io/radius-project/dev/recipes/functionaltest/parameters/mongodatabases/azure:1.0"
-		showRecipeResourceType := "Applications.Datastores/mongoDatabases"
-		output, err := cli.RecipeRegister(ctx, envName, showRecipeName, templateKind, showRecipeTemplate, showRecipeResourceType, false)
-		require.NoError(t, err)
-		require.Contains(t, output, "Successfully linked recipe")
-		output, err = cli.RecipeShow(ctx, envName, showRecipeName, resourceType)
+		output, err := cli.RecipeShow(ctx, envName, recipe1, resourceType)
 		require.NoError(t, err)
-		require.Contains(t, output, showRecipeName)
-		require.Contains(t, output, showRecipeTemplate)
-		require.Contains(t, output, showRecipeResourceType)
-		require.Contains(t, output, "mongodbName")
-		require.Contains(t, output, "documentdbName")
-		require.Contains(t, output, "location")
+		require.Contains(t, output, recipeName)
+		require.Contains(t, output, recipeTemplate)
+		require.Contains(t, output, resourceType)
+		require.Contains(t, output, "redisName")
 		require.Contains(t, output, "string")
-		require.Contains(t, output, "resourceGroup().location]")
 	})
 
 	t.Run("Validate rad recipe show - terraform recipe", func(t *testing.T) {
 		showRecipeName := "redistesttf"
-		moduleServer := os.Getenv("TF_RECIPE_MODULE_SERVER_URL")
-		if moduleServer == "" {
-			moduleServer = "http://localhost:8999"
-		}
+		moduleServer := strings.TrimPrefix(functional.GetTerraformRecipeModuleServerURL(), "moduleServer=")
 		showRecipeTemplate := fmt.Sprintf("%s/kubernetes-redis.zip", moduleServer)
 		showRecipeResourceType := "Applications.Datastores/redisCaches"
 		output, err := cli.RecipeRegister(ctx, envName, showRecipeName, "terraform", showRecipeTemplate, showRecipeResourceType, false)
@@ -145,7 +139,7 @@ func verifyRecipeCLI(ctx context.Context, t *testing.T, test shared.RPTest) {
 	})
 
 	t.Run("Validate rad recipe register with recipe name conflicting with dev recipe", func(t *testing.T) {
-		output, err := cli.RecipeRegister(ctx, envName, "mongo-azure", templateKind, recipeTemplate, resourceType, false)
+		output, err := cli.RecipeRegister(ctx, envName, recipe1, templateKindBicep, recipeTemplate, resourceType, false)
 		require.Contains(t, output, "Successfully linked recipe")
 		require.NoError(t, err)
 		output, err = cli.RecipeList(ctx, envName)
@@ -692,13 +686,12 @@ func Test_CLI_Only_version(t *testing.T) {
 }
 
 func Test_RecipeCommands(t *testing.T) {
-	t.Skip("TODO: disabling this test temporarily while we determine which recipes it should pull")
 	template := "testdata/corerp-resources-recipe-env.bicep"
 	name := "corerp-resources-recipe-env"
 
 	test := shared.NewRPTest(t, name, []shared.TestStep{
 		{
-			Executor: step.NewDeployExecutor(template),
+			Executor: step.NewDeployExecutor(template, functional.GetBicepRecipeRegistry(), functional.GetBicepRecipeVersion()),
 			RPResources: &validation.RPResourceSet{
 				Resources: []validation.RPResource{
 					{

test/functional/shared/cli/testdata/corerp-resources-recipe-env.bicep

@@ -2,6 +2,10 @@ import radius as radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
+@description('The OCI registry for test Bicep recipes.')
+param registry string
+@description('The OCI tag for test Bicep recipes.')
+param version string
 
 resource env 'Applications.Core/environments@2023-10-01-preview' = {
   name: 'corerp-resources-recipe-env'
@@ -13,10 +17,10 @@ resource env 'Applications.Core/environments@2023-10-01-preview' = {
       namespace: 'corerp-resources-recipe-env'
     }
     recipes: {
-      'Applications.Datastores/mongoDatabases':{
+      'Applications.Datastores/redisCaches':{
         recipe1: {
           templateKind: 'bicep'
-          templatePath: 'ghcr.io/testpublicrecipe/bicep/modules/mongodatabases:v1' 
+          templatePath: '${registry}/test/functional/shared/recipes/corerp-redis-recipe:${version}'
         }
         recipe2: {
           templateKind: 'terraform'

test/functional/shared/resources/testdata/corerp-resources-extender-recipe.bicep

@@ -1,7 +1,8 @@
 import radius as radius
 
-param registry string 
-
+@description('The OCI registry for test Bicep recipes.')
+param registry string
+@description('The OCI tag for test Bicep recipes.')
 param version string
 
 resource env 'Applications.Core/environments@2023-10-01-preview' = {

test/functional/shared/cli/testdata/corerp-redis-recipe.bicep → test/functional/shared/resources/testdata/recipes/test-bicep-recipes/corerp-redis-recipe.bicep

@@ -1,5 +1,7 @@
+param redisName string
+
 resource redis 'Microsoft.Cache/redis@2022-06-01' = {
-  name: 'rds-${uniqueString(resourceGroup().id, deployment().name)}'
+  name: 'rds-${uniqueString(resourceGroup().id, redisName, deployment().name)}'
   location: 'global'
   properties: {
     enableNonSslPort: false