Remove Recipe prefix from RecipeDefinition in Radius.Core/recipePacks

eng/design-notes/recipes/2025-08-recipe-packs.md

@@ -102,8 +102,8 @@ version: 1.0.0
 description: "Recipe Pack for deploying to ACI in production."
 recipes:
   - resourceType: "Radius.Compute/containers@2025-05-01-preview"   
-    recipeKind: "bicep"
-    recipeLocation: "oci://ghcr.io/my-org/recipes/core/aci-container:1.2.0"
+    kind: "bicep"
+    location: "oci://ghcr.io/my-org/recipes/core/aci-container:1.2.0"
     parameters:
       cpu: "1.0"
       memoryInGB: "2.0"
@@ -112,13 +112,13 @@ recipes:
       # Optional: allow platform-specific options like containerGroupProfile for ACI
       allowPlatformOptions: true
   - resourceType: "Radius.Compute/gateways@2025-05-01-preview"
-    recipeKind: "bicep"
-    recipeLocation: "oci://ghcr.io/my-org/recipes/core/aci-gateway:1.1.0"
+    kind: "bicep"
+    location: "oci://ghcr.io/my-org/recipes/core/aci-gateway:1.1.0"
     parameters:
       sku: "Standard_v2"
   - resourceType: "Radius.Security/secrets@2025-05-01-preview"
-    recipeKind: "bicep"
-    recipeLocation: "oci://ghcr.io/my-org/recipes/azure/keyvault-secretstore:1.0.0"
+    kind: "bicep"
+    location: "oci://ghcr.io/my-org/recipes/azure/keyvault-secretstore:1.0.0"
     parameters:
       skuName: "premium"
 ```
@@ -197,13 +197,13 @@ recipes: Record<RecipeDefinition>;
 @doc("Recipe definition for a specific resource type") 
 model RecipeDefinition { 
 @doc("The type of recipe (e.g., terraform, bicep)") 
-recipeKind: RecipeKind; 
+kind: RecipeKind; 
 
 @doc("Connect to the location using HTTP (not HTTPS). This should be used when the location is known not to support HTTPS, for example in a locally hosted registry for Bicep recipes. Defaults to false (use HTTPS/TLS)")
 plainHttp?: boolean;
 
 @doc("URL or path to the recipe source") 
-recipeLocation: string; 
+location: string; 
 
 @doc("recipe digest in the format algorithm:digest_value") 
 recipeDigest?: string; 
@@ -278,21 +278,21 @@ resource computeRecipePack 'Radius.Core/recipePacks@2026-01-01-preview' = {
   properties: {
     recipes: { 
       'Radius.Compute/containers': {
-        recipeKind: 'terraform'
-        recipeLocation: 'https://github.com/project-radius/resource-types-contrib.git//recipes/compute/containers/kubernetes?ref=v0.48'
+        kind: 'terraform'
+        location: 'https://github.com/project-radius/resource-types-contrib.git//recipes/compute/containers/kubernetes?ref=v0.48'
         recipeDigest: 'sha256:4g5h6i7j8k9l0m1n2o3p4q5r6s7t8u9v0w1x2y3z4a5b6c7d8e9f0g1h2i3j4k5'
         parameters: {
           allowPlatformOptions: true
           anIntegerParam: 1
         }
       }
       'Radius.Security/secrets': {
-        recipeKind: 'terraform'
-        recipeLocation: 'https://github.com/project-radius/resource-types-contrib.git//recipes/security/secrets/kubernetes?ref=v0.48'
+        kind: 'terraform'
+        location: 'https://github.com/project-radius/resource-types-contrib.git//recipes/security/secrets/kubernetes?ref=v0.48'
       }
       'Radius.Storage/volumes': {
-        recipeKind: 'terraform'
-        recipeLocation: 'https://github.com/project-radius/resource-types-contrib.git//recipes/storage/volumes/kubernetes?ref=v0.48'
+        kind: 'terraform'
+        location: 'https://github.com/project-radius/resource-types-contrib.git//recipes/storage/volumes/kubernetes?ref=v0.48'
       }
     }
   }
@@ -325,16 +325,16 @@ curl -X PUT \
         "description": "Test recipe pack with sample recipes",
         "recipes": {
           "Applications.Datastores/sqlDatabases": {
-            "recipeKind": "terraform",
-            "recipeLocation": "https://github.com/example/recipes/sql-database",
+            "kind": "terraform",
+            "location": "https://github.com/example/recipes/sql-database",
             "parameters": {
               "size": "small",
               "backup": false
             }
           },
           "Applications.Datastores/redisCaches": {
-            "recipeKind": "bicep",
-            "recipeLocation": "https://github.com/example/recipes/redis-cache.bicep",
+            "kind": "bicep",
+            "location": "https://github.com/example/recipes/redis-cache.bicep",
             "parameters": {
               "tier": "basic"
             }
@@ -359,16 +359,16 @@ CREATE response:
         "parameters": {
           "tier": "basic"
         },
-        "recipeKind": "bicep",
-        "recipeLocation": "https://github.com/example/recipes/redis-cache.bicep"
+        "kind": "bicep",
+        "location": "https://github.com/example/recipes/redis-cache.bicep"
       },
       "Applications.Datastores/sqlDatabases": {
         "parameters": {
           "backup": false,
           "size": "small"
         },
-        "recipeKind": "terraform",
-        "recipeLocation": "https://github.com/example/recipes/sql-database"
+        "kind": "terraform",
+        "location": "https://github.com/example/recipes/sql-database"
       }
     }
   },
@@ -408,16 +408,16 @@ READ response:
         "parameters": {
           "tier": "basic"
         },
-        "recipeKind": "bicep",
-        "recipeLocation": "https://github.com/example/recipes/redis-cache.bicep"
+        "kind": "bicep",
+        "location": "https://github.com/example/recipes/redis-cache.bicep"
       },
       "Applications.Datastores/sqlDatabases": {
         "parameters": {
           "backup": false,
           "size": "small"
         },
-        "recipeKind": "terraform",
-        "recipeLocation": "https://github.com/example/recipes/sql-database"
+        "kind": "terraform",
+        "location": "https://github.com/example/recipes/sql-database"
       }
     }
   },
@@ -524,19 +524,19 @@ resource computeRecipePack 'Radius.Core/recipePacks@2025-05-01-preview' = {
   properties: {
     recipes: {
       'Radius.Compute/containers': {
-        recipeKind: 'terraform'
-        recipeLocation: 'https://github.com/project-radius/resource-types-contrib.git//recipes/compute/containers/kubernetes?ref=v0.48'
+        kind: 'terraform'
+        location: 'https://github.com/project-radius/resource-types-contrib.git//recipes/compute/containers/kubernetes?ref=v0.48'
         parameters: {
           allowPlatformOptions: true
         }
       }
       'Radius.Security/secrets': {
-        recipeKind: 'terraform'
-        recipeLocation: 'https://github.com/project-radius/resource-types-contrib.git//recipes/security/secrets/kubernetes?ref=v0.48'
+        kind: 'terraform'
+        location: 'https://github.com/project-radius/resource-types-contrib.git//recipes/security/secrets/kubernetes?ref=v0.48'
       }
       'Radius.Storage/volumes': {
-        recipeKind: 'terraform'
-        recipeLocation: 'https://github.com/project-radius/resource-types-contrib.git//recipes/storage/volumes/kubernetes?ref=v0.48'
+        kind: 'terraform'
+        location: 'https://github.com/project-radius/resource-types-contrib.git//recipes/storage/volumes/kubernetes?ref=v0.48'
       }
     }
   }

hack/bicep-types-radius/generated/radius/radius.core/2025-08-01-preview/types.json

@@ -1278,7 +1278,7 @@
     "$type": "ObjectType",
     "name": "RecipeDefinition",
     "properties": {
-      "recipeKind": {
+      "kind": {
         "type": {
           "$ref": "#/107"
         },
@@ -1292,7 +1292,7 @@
         "flags": 0,
         "description": "Connect to the location using HTTP (not HTTPS). This should be used when the location is known not to support HTTPS, for example in a locally hosted registry for Bicep recipes. Defaults to false (use HTTPS/TLS)"
       },
-      "recipeLocation": {
+      "location": {
         "type": {
           "$ref": "#/0"
         },

pkg/cli/cmd/env/show/preview/show.go

@@ -68,10 +68,10 @@ rad env show my-env --group my-env
 }
 
 type EnvRecipes struct {
-	RecipePack     string
-	ResourceType   string
-	RecipeKind     string
-	RecipeLocation string
+	RecipePack   string
+	ResourceType string
+	Kind         string
+	Location     string
 }
 
 // Runner is the runner implementation for the `rad env show` preview command.
@@ -189,10 +189,10 @@ func (r *Runner) Run(ctx context.Context) error {
 
 		for resourceType, recipe := range pack.RecipePackResource.Properties.Recipes {
 			envRecipes = append(envRecipes, EnvRecipes{
-				RecipePack:     ID.Name(),
-				ResourceType:   resourceType,
-				RecipeKind:     string(*recipe.RecipeKind),
-				RecipeLocation: *recipe.RecipeLocation,
+				RecipePack:   ID.Name(),
+				ResourceType: resourceType,
+				Kind:         string(*recipe.Kind),
+				Location:     *recipe.Location,
 			})
 		}
 	}

pkg/cli/cmd/env/show/preview/show_test.go

@@ -165,16 +165,16 @@ func Test_Run(t *testing.T) {
 					Format: "table",
 					Obj: []EnvRecipes{
 						{
-							RecipePack:     "test-recipe-pack",
-							ResourceType:   "test-recipe1",
-							RecipeKind:     string(corerpv20250801.RecipeKindTerraform),
-							RecipeLocation: "https://example.com/recipe1?ref=v0.1",
+							RecipePack:   "test-recipe-pack",
+							ResourceType: "test-recipe1",
+							Kind:         string(corerpv20250801.RecipeKindTerraform),
+							Location:     "https://example.com/recipe1?ref=v0.1",
 						},
 						{
-							RecipePack:     "test-recipe-pack",
-							ResourceType:   "test-recipe2",
-							RecipeKind:     string(corerpv20250801.RecipeKindTerraform),
-							RecipeLocation: "https://example.com/recipe2?ref=v0.1",
+							RecipePack:   "test-recipe-pack",
+							ResourceType: "test-recipe2",
+							Kind:         string(corerpv20250801.RecipeKindTerraform),
+							Location:     "https://example.com/recipe2?ref=v0.1",
 						},
 					},
 					Options: objectformats.GetRecipesForEnvironmentTableFormat(),
@@ -243,23 +243,23 @@ func Test_Run_RecipeSortOrder(t *testing.T) {
 				if recipePackName == "pack-a" {
 					recipes = map[string]*corerpv20250801.RecipeDefinition{
 						"Applications.Datastores/sqlDatabases": {
-							RecipeLocation: new("ghcr.io/radius-project/recipes/sql"),
-							RecipeKind:     to.Ptr(corerpv20250801.RecipeKindTerraform),
+							Location: new("ghcr.io/radius-project/recipes/sql"),
+							Kind:     to.Ptr(corerpv20250801.RecipeKindTerraform),
 						},
 						"Applications.Datastores/redisCaches": {
-							RecipeLocation: new("ghcr.io/radius-project/recipes/redis"),
-							RecipeKind:     to.Ptr(corerpv20250801.RecipeKindTerraform),
+							Location: new("ghcr.io/radius-project/recipes/redis"),
+							Kind:     to.Ptr(corerpv20250801.RecipeKindTerraform),
 						},
 					}
 				} else {
 					recipes = map[string]*corerpv20250801.RecipeDefinition{
 						"Applications.Messaging/rabbitMQQueues": {
-							RecipeLocation: new("ghcr.io/radius-project/recipes/rabbitmq"),
-							RecipeKind:     to.Ptr(corerpv20250801.RecipeKindBicep),
+							Location: new("ghcr.io/radius-project/recipes/rabbitmq"),
+							Kind:     to.Ptr(corerpv20250801.RecipeKindBicep),
 						},
 						"Applications.Dapr/stateStores": {
-							RecipeLocation: new("ghcr.io/radius-project/recipes/dapr-state"),
-							RecipeKind:     to.Ptr(corerpv20250801.RecipeKindBicep),
+							Location: new("ghcr.io/radius-project/recipes/dapr-state"),
+							Kind:     to.Ptr(corerpv20250801.RecipeKindBicep),
 						},
 					}
 				}
@@ -294,10 +294,10 @@ func Test_Run_RecipeSortOrder(t *testing.T) {
 
 	// Verify the recipes are sorted by RecipePack first, then by ResourceType
 	expectedRecipes := []EnvRecipes{
-		{RecipePack: "pack-a", ResourceType: "Applications.Datastores/redisCaches", RecipeKind: "terraform", RecipeLocation: "ghcr.io/radius-project/recipes/redis"},
-		{RecipePack: "pack-a", ResourceType: "Applications.Datastores/sqlDatabases", RecipeKind: "terraform", RecipeLocation: "ghcr.io/radius-project/recipes/sql"},
-		{RecipePack: "pack-b", ResourceType: "Applications.Dapr/stateStores", RecipeKind: "bicep", RecipeLocation: "ghcr.io/radius-project/recipes/dapr-state"},
-		{RecipePack: "pack-b", ResourceType: "Applications.Messaging/rabbitMQQueues", RecipeKind: "bicep", RecipeLocation: "ghcr.io/radius-project/recipes/rabbitmq"},
+		{RecipePack: "pack-a", ResourceType: "Applications.Datastores/redisCaches", Kind: "terraform", Location: "ghcr.io/radius-project/recipes/redis"},
+		{RecipePack: "pack-a", ResourceType: "Applications.Datastores/sqlDatabases", Kind: "terraform", Location: "ghcr.io/radius-project/recipes/sql"},
+		{RecipePack: "pack-b", ResourceType: "Applications.Dapr/stateStores", Kind: "bicep", Location: "ghcr.io/radius-project/recipes/dapr-state"},
+		{RecipePack: "pack-b", ResourceType: "Applications.Messaging/rabbitMQQueues", Kind: "bicep", Location: "ghcr.io/radius-project/recipes/rabbitmq"},
 	}
 
 	// The third output should be the recipes table

pkg/cli/cmd/recipepack/show/display.go

@@ -47,13 +47,13 @@ func (r *Runner) display(recipePack v20250801preview.RecipePackResource) error {
 		}
 
 		kind := "unknown"
-		if definition.RecipeKind != nil {
-			kind = string(*definition.RecipeKind)
+		if definition.Kind != nil {
+			kind = string(*definition.Kind)
 		}
 
 		location := ""
-		if definition.RecipeLocation != nil {
-			location = *definition.RecipeLocation
+		if definition.Location != nil {
+			location = *definition.Location
 		}
 
 		r.Output.LogInfo("%s", resourceType)

pkg/cli/cmd/recipepack/show/show_test.go

@@ -88,8 +88,8 @@ func Test_Run(t *testing.T) {
 		Properties: &corerpv20250801preview.RecipePackProperties{
 			Recipes: map[string]*corerpv20250801preview.RecipeDefinition{
 				"Radius.Core/example": {
-					RecipeKind:     to.Ptr(corerpv20250801preview.RecipeKindTerraform),
-					RecipeLocation: new("https://github.com/radius-project/example"),
+					Kind:     to.Ptr(corerpv20250801preview.RecipeKindTerraform),
+					Location: new("https://github.com/radius-project/example"),
 					Parameters: map[string]any{
 						"foo": "bar",
 					},

pkg/cli/objectformats/objectformats.go

@@ -70,12 +70,12 @@ func GetRecipeFormat() output.FormatterOptions {
 				JSONPath: "{ .ResourceType }",
 			},
 			{
-				Heading:  "RECIPE KIND",
-				JSONPath: "{ .RecipeKind }",
+				Heading:  "KIND",
+				JSONPath: "{ .Kind }",
 			},
 			{
-				Heading:  "RECIPE LOCATION",
-				JSONPath: "{ .RecipeLocation }",
+				Heading:  "LOCATION",
+				JSONPath: "{ .Location }",
 			},
 		},
 	}
@@ -90,11 +90,11 @@ func GetRecipeFormatWithoutHeadings() output.FormatterOptions {
 			},
 			{
 				Heading:  "",
-				JSONPath: "{ .RecipeKind }",
+				JSONPath: "{ .Kind }",
 			},
 			{
 				Heading:  "",
-				JSONPath: "{ .RecipeLocation }",
+				JSONPath: "{ .Location }",
 			},
 		},
 	}
@@ -140,12 +140,12 @@ func GetRecipesForEnvironmentTableFormat() output.FormatterOptions {
 				JSONPath: "{ .ResourceType }",
 			},
 			{
-				Heading:  "RECIPE KIND",
-				JSONPath: "{ .RecipeKind }",
+				Heading:  "KIND",
+				JSONPath: "{ .Kind }",
 			},
 			{
-				Heading:  "RECIPE LOCATION",
-				JSONPath: "{ .RecipeLocation }",
+				Heading:  "LOCATION",
+				JSONPath: "{ .Location }",
 			},
 		},
 	}