[Blueprints] Parameter value model update and add managedResources pr…

…operty (#7971) * Update how we're modeling parameter value * Add managedResources property * Update description
Azure · Dec 16, 2019 · 831573b · 831573b
1 parent fcab4b7
commit 831573b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 77 deletions.
diff --git a/.../resource-manager/Microsoft.Blueprint/preview/2018-11-01-preview/blueprintAssignment.json b/.../resource-manager/Microsoft.Blueprint/preview/2018-11-01-preview/blueprintAssignment.json
@@ -306,7 +306,16 @@
     "AssignmentStatus": {
       "description": "The status of a blueprint assignment. This field is readonly.",
       "type": "object",
-      "properties": {},
+      "properties": {
+        "managedResources": {
+          "type": "array",
+          "description": "List of resources that were created by the blueprint assignment.",
+          "readOnly": true,
+          "items": {
+            "type": "string"
+          }
+        }
+      },
       "allOf": [
         {
           "$ref": "#/definitions/BlueprintResourceStatusBase"
@@ -402,53 +411,21 @@
       "properties": {},
       "additionalProperties": {
         "description": "Key/Value pair of parameter fulfillment.",
-        "$ref": "#/definitions/ParameterValueBase"
-      }
-    },
-    "ParameterValueBase": {
-      "description": "Base class for ParameterValue.",
-      "type": "object",
-      "properties": {
-        "description": {
-          "description": "Optional property. Establishes ParameterValueBase as a BaseClass.",
-          "type": "string"
-        }
+        "$ref": "#/definitions/ParameterValue"
       }
     },
     "ParameterValue": {
-      "description": "Value for the specified parameter.",
+      "description": "Value for the specified parameter. Can be either 'value' or 'reference' but not both.",
       "type": "object",
       "properties": {
         "value": {
-          "description": "Actual value."
-        }
-      },
-      "required": [
-        "value"
-      ],
-      "allOf": [
-        {
-          "$ref": "#/definitions/ParameterValueBase"
-        }
-      ]
-    },
-    "SecretReferenceParameterValue": {
-      "description": "The reference to a secret, if the parameter should be protected.",
-      "type": "object",
-      "properties": {
+          "description": "Parameter value as value type."
+        },
         "reference": {
-          "description": "Specifies the reference.",
+          "description": "Parameter value as reference type.",
           "$ref": "#/definitions/SecretValueReference"
         }
-      },
-      "required": [
-        "reference"
-      ],
-      "allOf": [
-        {
-          "$ref": "#/definitions/ParameterValueBase"
-        }
-      ]
+      }
     },
     "SecretValueReference": {
       "description": "Reference to a Key Vault secret.",

diff --git a/.../resource-manager/Microsoft.Blueprint/preview/2018-11-01-preview/blueprintDefinition.json b/.../resource-manager/Microsoft.Blueprint/preview/2018-11-01-preview/blueprintDefinition.json
@@ -1073,53 +1073,21 @@
       "properties": {},
       "additionalProperties": {
         "description": "Key/Value pair of parameter fulfillment.",
-        "$ref": "#/definitions/ParameterValueBase"
-      }
-    },
-    "ParameterValueBase": {
-      "description": "Base class for ParameterValue.",
-      "type": "object",
-      "properties": {
-        "description": {
-          "description": "Optional property. Establishes ParameterValueBase as a BaseClass.",
-          "type": "string"
-        }
+        "$ref": "#/definitions/ParameterValue"
       }
     },
     "ParameterValue": {
-      "description": "Value for the specified parameter.",
+      "description": "Value for the specified parameter. Can be either 'value' or 'reference' but not both.",
       "type": "object",
       "properties": {
         "value": {
-          "description": "Actual value."
-        }
-      },
-      "required": [
-        "value"
-      ],
-      "allOf": [
-        {
-          "$ref": "#/definitions/ParameterValueBase"
-        }
-      ]
-    },
-    "SecretReferenceParameterValue": {
-      "description": "The reference to a secret, if the parameter should be protected.",
-      "type": "object",
-      "properties": {
+          "description": "Parameter value as value type."
+        },
         "reference": {
-          "description": "Specifies the reference.",
+          "description": "Parameter value as reference type.",
           "$ref": "#/definitions/SecretValueReference"
         }
-      },
-      "required": [
-        "reference"
-      ],
-      "allOf": [
-        {
-          "$ref": "#/definitions/ParameterValueBase"
-        }
-      ]
+      }
     },
     "SecretValueReference": {
       "description": "Reference to a Key Vault secret.",