diff --git a/hack/bicep-types-radius/generated/applications/applications.core/2023-10-01-preview/types.json b/hack/bicep-types-radius/generated/applications/applications.core/2023-10-01-preview/types.json index c815c02d90..de7e165ebc 100644 --- a/hack/bicep-types-radius/generated/applications/applications.core/2023-10-01-preview/types.json +++ b/hack/bicep-types-radius/generated/applications/applications.core/2023-10-01-preview/types.json @@ -51,7 +51,7 @@ }, "tags": { "type": { - "$ref": "#/41" + "$ref": "#/42" }, "flags": 0, "description": "Resource tags." @@ -65,7 +65,7 @@ }, "systemData": { "type": { - "$ref": "#/42" + "$ref": "#/43" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -78,7 +78,7 @@ "properties": { "provisioningState": { "type": { - "$ref": "#/12" + "$ref": "#/13" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" @@ -92,14 +92,14 @@ }, "extensions": { "type": { - "$ref": "#/28" + "$ref": "#/29" }, "flags": 0, "description": "The application extension." }, "status": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 2, "description": "Status of a resource." @@ -108,15 +108,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -124,15 +128,15 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", @@ -157,6 +161,9 @@ }, { "$ref": "#/11" + }, + { + "$ref": "#/12" } ] }, @@ -167,16 +174,16 @@ "baseProperties": {}, "elements": { "daprSidecar": { - "$ref": "#/14" + "$ref": "#/15" }, "kubernetesMetadata": { - "$ref": "#/20" + "$ref": "#/21" }, "kubernetesNamespace": { - "$ref": "#/24" + "$ref": "#/25" }, "manualScaling": { - "$ref": "#/26" + "$ref": "#/27" } } }, @@ -186,7 +193,7 @@ "properties": { "appPort": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 0, "description": "The Dapr appPort. Specifies the internal listening port for the application to handle requests from the Dapr sidecar." @@ -207,14 +214,14 @@ }, "protocol": { "type": { - "$ref": "#/18" + "$ref": "#/19" }, "flags": 0, "description": "The Dapr sidecar extension protocol" }, "kind": { "type": { - "$ref": "#/19" + "$ref": "#/20" }, "flags": 1, "description": "Discriminator property for Extension." @@ -236,10 +243,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/16" + "$ref": "#/17" }, { - "$ref": "#/17" + "$ref": "#/18" } ] }, @@ -253,21 +260,21 @@ "properties": { "annotations": { "type": { - "$ref": "#/21" + "$ref": "#/22" }, "flags": 0, "description": "Annotations to be applied to the Kubernetes resources output by the resource" }, "labels": { "type": { - "$ref": "#/22" + "$ref": "#/23" }, "flags": 0, "description": "Labels to be applied to the Kubernetes resources output by the resource" }, "kind": { "type": { - "$ref": "#/23" + "$ref": "#/24" }, "flags": 1, "description": "Discriminator property for Extension." @@ -307,7 +314,7 @@ }, "kind": { "type": { - "$ref": "#/25" + "$ref": "#/26" }, "flags": 1, "description": "Discriminator property for Extension." @@ -324,14 +331,14 @@ "properties": { "replicas": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 1, "description": "Replica count." }, "kind": { "type": { - "$ref": "#/27" + "$ref": "#/28" }, "flags": 1, "description": "Discriminator property for Extension." @@ -345,7 +352,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/13" + "$ref": "#/14" } }, { @@ -354,21 +361,21 @@ "properties": { "compute": { "type": { - "$ref": "#/30" + "$ref": "#/31" }, "flags": 0, "description": "Represents backing compute resource" }, "recipe": { "type": { - "$ref": "#/37" + "$ref": "#/38" }, "flags": 2, "description": "Recipe status at deployment time for a resource." }, "outputResources": { "type": { - "$ref": "#/40" + "$ref": "#/41" }, "flags": 0, "description": "Properties of an output resource" @@ -389,7 +396,7 @@ }, "identity": { "type": { - "$ref": "#/31" + "$ref": "#/32" }, "flags": 0, "description": "IdentitySettings is the external identity setting." @@ -397,7 +404,7 @@ }, "elements": { "kubernetes": { - "$ref": "#/35" + "$ref": "#/36" } } }, @@ -407,7 +414,7 @@ "properties": { "kind": { "type": { - "$ref": "#/34" + "$ref": "#/35" }, "flags": 1, "description": "IdentitySettingKind is the kind of supported external identity setting" @@ -440,10 +447,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/32" + "$ref": "#/33" }, { - "$ref": "#/33" + "$ref": "#/34" } ] }, @@ -460,7 +467,7 @@ }, "kind": { "type": { - "$ref": "#/36" + "$ref": "#/37" }, "flags": 1, "description": "Discriminator property for EnvironmentCompute." @@ -518,7 +525,7 @@ }, "radiusManaged": { "type": { - "$ref": "#/39" + "$ref": "#/40" }, "flags": 0, "description": "Determines whether Radius manages the lifecycle of the underlying resource." @@ -531,7 +538,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/38" + "$ref": "#/39" } }, { @@ -555,7 +562,7 @@ }, "createdByType": { "type": { - "$ref": "#/47" + "$ref": "#/48" }, "flags": 0, "description": "The type of identity that created the resource." @@ -576,7 +583,7 @@ }, "lastModifiedByType": { "type": { - "$ref": "#/52" + "$ref": "#/53" }, "flags": 0, "description": "The type of identity that created the resource." @@ -609,9 +616,6 @@ { "$type": "UnionType", "elements": [ - { - "$ref": "#/43" - }, { "$ref": "#/44" }, @@ -620,6 +624,9 @@ }, { "$ref": "#/46" + }, + { + "$ref": "#/47" } ] }, @@ -642,9 +649,6 @@ { "$type": "UnionType", "elements": [ - { - "$ref": "#/48" - }, { "$ref": "#/49" }, @@ -653,6 +657,9 @@ }, { "$ref": "#/51" + }, + { + "$ref": "#/52" } ] }, @@ -694,28 +701,28 @@ }, "type": { "type": { - "$ref": "#/54" + "$ref": "#/55" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/55" + "$ref": "#/56" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/57" + "$ref": "#/58" }, "flags": 1, "description": "Container properties" }, "tags": { "type": { - "$ref": "#/121" + "$ref": "#/125" }, "flags": 0, "description": "Resource tags." @@ -729,7 +736,7 @@ }, "systemData": { "type": { - "$ref": "#/42" + "$ref": "#/43" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -756,70 +763,70 @@ }, "provisioningState": { "type": { - "$ref": "#/65" + "$ref": "#/67" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 2, "description": "Status of a resource." }, "container": { "type": { - "$ref": "#/66" + "$ref": "#/68" }, "flags": 1, "description": "Definition of a container" }, "connections": { "type": { - "$ref": "#/106" + "$ref": "#/110" }, "flags": 0, "description": "Specifies a connection to another resource." }, "identity": { "type": { - "$ref": "#/31" + "$ref": "#/32" }, "flags": 0, "description": "IdentitySettings is the external identity setting." }, "extensions": { "type": { - "$ref": "#/107" + "$ref": "#/111" }, "flags": 0, "description": "Extensions spec of the resource" }, "resourceProvisioning": { "type": { - "$ref": "#/110" + "$ref": "#/114" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'internal', where Radius manages the lifecycle of the resource internally, and 'manual', where a user manages the resource." }, "resources": { "type": { - "$ref": "#/112" + "$ref": "#/116" }, "flags": 0, "description": "A collection of references to resources associated with the container" }, "restartPolicy": { "type": { - "$ref": "#/116" + "$ref": "#/120" }, "flags": 0, "description": "Restart policy for the container" }, "runtimes": { "type": { - "$ref": "#/117" + "$ref": "#/121" }, "flags": 0, "description": "The properties for runtime configuration" @@ -828,15 +835,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -844,22 +855,19 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ - { - "$ref": "#/58" - }, { "$ref": "#/59" }, @@ -877,6 +885,12 @@ }, { "$ref": "#/64" + }, + { + "$ref": "#/65" + }, + { + "$ref": "#/66" } ] }, @@ -893,56 +907,56 @@ }, "imagePullPolicy": { "type": { - "$ref": "#/70" + "$ref": "#/72" }, "flags": 0, "description": "The image pull policy for the container" }, "env": { "type": { - "$ref": "#/74" + "$ref": "#/76" }, "flags": 0, "description": "environment" }, "ports": { "type": { - "$ref": "#/79" + "$ref": "#/81" }, "flags": 0, "description": "container ports" }, "readinessProbe": { "type": { - "$ref": "#/80" + "$ref": "#/82" }, "flags": 0, "description": "Properties for readiness/liveness probe" }, "livenessProbe": { "type": { - "$ref": "#/80" + "$ref": "#/82" }, "flags": 0, "description": "Properties for readiness/liveness probe" }, "volumes": { "type": { - "$ref": "#/99" + "$ref": "#/101" }, "flags": 0, "description": "container volumes" }, "command": { "type": { - "$ref": "#/100" + "$ref": "#/102" }, "flags": 0, "description": "Entrypoint array. Overrides the container image's ENTRYPOINT" }, "args": { "type": { - "$ref": "#/101" + "$ref": "#/103" }, "flags": 0, "description": "Arguments to the entrypoint. Overrides the container image's CMD" @@ -972,13 +986,13 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/67" + "$ref": "#/69" }, { - "$ref": "#/68" + "$ref": "#/70" }, { - "$ref": "#/69" + "$ref": "#/71" } ] }, @@ -995,7 +1009,7 @@ }, "valueFrom": { "type": { - "$ref": "#/72" + "$ref": "#/74" }, "flags": 0, "description": "The reference to the variable" @@ -1008,7 +1022,7 @@ "properties": { "secretRef": { "type": { - "$ref": "#/73" + "$ref": "#/75" }, "flags": 1, "description": "This secret is used within a recipe. Secrets are encrypted, often have fine-grained access control, auditing and are recommended to be used to hold sensitive data." @@ -1040,7 +1054,7 @@ "name": "ContainerEnv", "properties": {}, "additionalProperties": { - "$ref": "#/71" + "$ref": "#/73" } }, { @@ -1049,14 +1063,14 @@ "properties": { "containerPort": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 1, "description": "The listening port number" }, "protocol": { "type": { - "$ref": "#/78" + "$ref": "#/80" }, "flags": 0, "description": "The protocol in use by the port" @@ -1070,7 +1084,7 @@ }, "port": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 0, "description": "Specifies the port that will be exposed by this container. Must be set when value different from containerPort is desired" @@ -1089,10 +1103,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/76" + "$ref": "#/78" }, { - "$ref": "#/77" + "$ref": "#/79" } ] }, @@ -1101,7 +1115,7 @@ "name": "ContainerPorts", "properties": {}, "additionalProperties": { - "$ref": "#/75" + "$ref": "#/77" } }, { @@ -1111,28 +1125,28 @@ "baseProperties": { "initialDelaySeconds": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 0, "description": "Initial delay in seconds before probing for readiness/liveness" }, "failureThreshold": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 0, "description": "Threshold number of times the probe fails after which a failure would be reported" }, "periodSeconds": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 0, "description": "Interval for the readiness/liveness probe in seconds" }, "timeoutSeconds": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 0, "description": "Number of seconds after which the readiness/liveness probe times out. Defaults to 5 seconds" @@ -1140,13 +1154,13 @@ }, "elements": { "exec": { - "$ref": "#/81" + "$ref": "#/83" }, "httpGet": { - "$ref": "#/83" + "$ref": "#/85" }, "tcp": { - "$ref": "#/86" + "$ref": "#/88" } } }, @@ -1163,7 +1177,7 @@ }, "kind": { "type": { - "$ref": "#/82" + "$ref": "#/84" }, "flags": 1, "description": "Discriminator property for HealthProbeProperties." @@ -1180,7 +1194,7 @@ "properties": { "containerPort": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 1, "description": "The listening port number" @@ -1194,14 +1208,14 @@ }, "headers": { "type": { - "$ref": "#/84" + "$ref": "#/86" }, "flags": 0, "description": "Custom HTTP headers to add to the get request" }, "kind": { "type": { - "$ref": "#/85" + "$ref": "#/87" }, "flags": 1, "description": "Discriminator property for HealthProbeProperties." @@ -1226,14 +1240,14 @@ "properties": { "containerPort": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 1, "description": "The listening port number" }, "kind": { "type": { - "$ref": "#/87" + "$ref": "#/89" }, "flags": 1, "description": "Discriminator property for HealthProbeProperties." @@ -1259,10 +1273,10 @@ }, "elements": { "ephemeral": { - "$ref": "#/89" + "$ref": "#/91" }, "persistent": { - "$ref": "#/94" + "$ref": "#/96" } } }, @@ -1272,14 +1286,14 @@ "properties": { "managedStore": { "type": { - "$ref": "#/92" + "$ref": "#/94" }, "flags": 1, "description": "The managed store for the ephemeral volume" }, "kind": { "type": { - "$ref": "#/93" + "$ref": "#/95" }, "flags": 1, "description": "Discriminator property for Volume." @@ -1298,10 +1312,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/90" + "$ref": "#/92" }, { - "$ref": "#/91" + "$ref": "#/93" } ] }, @@ -1315,7 +1329,7 @@ "properties": { "permission": { "type": { - "$ref": "#/97" + "$ref": "#/99" }, "flags": 0, "description": "The persistent volume permission" @@ -1329,7 +1343,7 @@ }, "kind": { "type": { - "$ref": "#/98" + "$ref": "#/100" }, "flags": 1, "description": "Discriminator property for Volume." @@ -1348,10 +1362,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/95" + "$ref": "#/97" }, { - "$ref": "#/96" + "$ref": "#/98" } ] }, @@ -1364,7 +1378,7 @@ "name": "ContainerVolumes", "properties": {}, "additionalProperties": { - "$ref": "#/88" + "$ref": "#/90" } }, { @@ -1392,14 +1406,14 @@ }, "disableDefaultEnvVars": { "type": { - "$ref": "#/39" + "$ref": "#/40" }, "flags": 0, "description": "default environment variable override" }, "iam": { "type": { - "$ref": "#/103" + "$ref": "#/105" }, "flags": 0, "description": "IAM properties" @@ -1412,14 +1426,14 @@ "properties": { "kind": { "type": { - "$ref": "#/104" + "$ref": "#/108" }, "flags": 1, "description": "The kind of IAM provider to configure" }, "roles": { "type": { - "$ref": "#/105" + "$ref": "#/109" }, "flags": 0, "description": "RBAC permissions to be assigned on the source resource" @@ -1430,6 +1444,21 @@ "$type": "StringLiteralType", "value": "azure" }, + { + "$type": "StringLiteralType", + "value": "string" + }, + { + "$type": "UnionType", + "elements": [ + { + "$ref": "#/106" + }, + { + "$ref": "#/107" + } + ] + }, { "$type": "ArrayType", "itemType": { @@ -1441,13 +1470,13 @@ "name": "ContainerPropertiesConnections", "properties": {}, "additionalProperties": { - "$ref": "#/102" + "$ref": "#/104" } }, { "$type": "ArrayType", "itemType": { - "$ref": "#/13" + "$ref": "#/14" } }, { @@ -1462,10 +1491,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/108" + "$ref": "#/112" }, { - "$ref": "#/109" + "$ref": "#/113" } ] }, @@ -1485,7 +1514,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/111" + "$ref": "#/115" } }, { @@ -1504,13 +1533,13 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/113" + "$ref": "#/117" }, { - "$ref": "#/114" + "$ref": "#/118" }, { - "$ref": "#/115" + "$ref": "#/119" } ] }, @@ -1520,7 +1549,7 @@ "properties": { "kubernetes": { "type": { - "$ref": "#/118" + "$ref": "#/122" }, "flags": 0, "description": "The runtime configuration properties for Kubernetes" @@ -1540,7 +1569,7 @@ }, "pod": { "type": { - "$ref": "#/120" + "$ref": "#/124" }, "flags": 0, "description": "A strategic merge patch that will be applied to the PodSpec object when this container is being deployed." @@ -1555,7 +1584,7 @@ "name": "KubernetesPodSpec", "properties": {}, "additionalProperties": { - "$ref": "#/119" + "$ref": "#/123" } }, { @@ -1571,7 +1600,7 @@ "name": "Applications.Core/containers@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/56" + "$ref": "#/57" }, "flags": 0, "functions": {} @@ -1604,28 +1633,28 @@ }, "type": { "type": { - "$ref": "#/123" + "$ref": "#/127" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/124" + "$ref": "#/128" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/126" + "$ref": "#/130" }, "flags": 1, "description": "Environment properties" }, "tags": { "type": { - "$ref": "#/161" + "$ref": "#/166" }, "flags": 0, "description": "Resource tags." @@ -1639,7 +1668,7 @@ }, "systemData": { "type": { - "$ref": "#/42" + "$ref": "#/43" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -1652,49 +1681,49 @@ "properties": { "provisioningState": { "type": { - "$ref": "#/134" + "$ref": "#/139" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "compute": { "type": { - "$ref": "#/30" + "$ref": "#/31" }, "flags": 1, "description": "Represents backing compute resource" }, "providers": { "type": { - "$ref": "#/135" + "$ref": "#/140" }, "flags": 0, "description": "The Cloud providers configuration." }, "simulated": { "type": { - "$ref": "#/39" + "$ref": "#/40" }, "flags": 0, "description": "Simulated environment." }, "recipes": { "type": { - "$ref": "#/144" + "$ref": "#/149" }, "flags": 0, "description": "Specifies Recipes linked to the Environment." }, "recipeConfig": { "type": { - "$ref": "#/145" + "$ref": "#/150" }, "flags": 0, "description": "Configuration for Recipes. Defines how each type of Recipe should be configured and run." }, "extensions": { "type": { - "$ref": "#/160" + "$ref": "#/165" }, "flags": 0, "description": "The environment extension." @@ -1703,15 +1732,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -1719,39 +1752,42 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ { - "$ref": "#/127" + "$ref": "#/131" }, { - "$ref": "#/128" + "$ref": "#/132" }, { - "$ref": "#/129" + "$ref": "#/133" }, { - "$ref": "#/130" + "$ref": "#/134" }, { - "$ref": "#/131" + "$ref": "#/135" }, { - "$ref": "#/132" + "$ref": "#/136" }, { - "$ref": "#/133" + "$ref": "#/137" + }, + { + "$ref": "#/138" } ] }, @@ -1761,14 +1797,14 @@ "properties": { "azure": { "type": { - "$ref": "#/136" + "$ref": "#/141" }, "flags": 0, "description": "The Azure cloud provider definition." }, "aws": { "type": { - "$ref": "#/137" + "$ref": "#/142" }, "flags": 0, "description": "The AWS cloud provider definition." @@ -1815,7 +1851,7 @@ }, "parameters": { "type": { - "$ref": "#/119" + "$ref": "#/123" }, "flags": 0, "description": "Any object" @@ -1823,10 +1859,10 @@ }, "elements": { "bicep": { - "$ref": "#/139" + "$ref": "#/144" }, "terraform": { - "$ref": "#/141" + "$ref": "#/146" } } }, @@ -1836,14 +1872,14 @@ "properties": { "plainHttp": { "type": { - "$ref": "#/39" + "$ref": "#/40" }, "flags": 0, "description": "Connect to the Bicep registry using HTTP (not-HTTPS). This should be used when the registry is known not to support HTTPS, for example in a locally-hosted registry. Defaults to false (use HTTPS/TLS)." }, "templateKind": { "type": { - "$ref": "#/140" + "$ref": "#/145" }, "flags": 1, "description": "Discriminator property for RecipeProperties." @@ -1867,7 +1903,7 @@ }, "templateKind": { "type": { - "$ref": "#/142" + "$ref": "#/147" }, "flags": 1, "description": "Discriminator property for RecipeProperties." @@ -1883,7 +1919,7 @@ "name": "DictionaryOfRecipeProperties", "properties": {}, "additionalProperties": { - "$ref": "#/138" + "$ref": "#/143" } }, { @@ -1891,7 +1927,7 @@ "name": "EnvironmentPropertiesRecipes", "properties": {}, "additionalProperties": { - "$ref": "#/143" + "$ref": "#/148" } }, { @@ -1900,28 +1936,28 @@ "properties": { "terraform": { "type": { - "$ref": "#/146" + "$ref": "#/151" }, "flags": 0, "description": "Configuration for Terraform Recipes. Controls how Terraform plans and applies templates as part of Recipe deployment." }, "bicep": { "type": { - "$ref": "#/155" + "$ref": "#/160" }, "flags": 0, "description": "Configuration for Bicep Recipes. Controls how Bicep plans and applies templates as part of Recipe deployment." }, "env": { "type": { - "$ref": "#/158" + "$ref": "#/163" }, "flags": 0, "description": "The environment variables injected during Terraform Recipe execution for the recipes in the environment." }, "envSecrets": { "type": { - "$ref": "#/159" + "$ref": "#/164" }, "flags": 0, "description": "Environment variables containing sensitive information can be stored as secrets. The secrets are stored in Applications.Core/SecretStores resource." @@ -1934,14 +1970,14 @@ "properties": { "authentication": { "type": { - "$ref": "#/147" + "$ref": "#/152" }, "flags": 0, "description": "Authentication information used to access private Terraform module sources. Supported module sources: Git." }, "providers": { "type": { - "$ref": "#/154" + "$ref": "#/159" }, "flags": 0, "description": "Configuration for Terraform Recipe Providers. Controls how Terraform interacts with cloud providers, SaaS providers, and other APIs. For more information, please see: https://developer.hashicorp.com/terraform/language/providers/configuration." @@ -1954,7 +1990,7 @@ "properties": { "git": { "type": { - "$ref": "#/148" + "$ref": "#/153" }, "flags": 0, "description": "Authentication information used to access private Terraform modules from Git repository sources." @@ -1967,7 +2003,7 @@ "properties": { "pat": { "type": { - "$ref": "#/150" + "$ref": "#/155" }, "flags": 0, "description": "Personal Access Token (PAT) configuration used to authenticate to Git platforms." @@ -1992,7 +2028,7 @@ "name": "GitAuthConfigPat", "properties": {}, "additionalProperties": { - "$ref": "#/149" + "$ref": "#/154" } }, { @@ -2001,14 +2037,14 @@ "properties": { "secrets": { "type": { - "$ref": "#/152" + "$ref": "#/157" }, "flags": 0, "description": "Sensitive data in provider configuration can be stored as secrets. The secrets are stored in Applications.Core/SecretStores resource." } }, "additionalProperties": { - "$ref": "#/119" + "$ref": "#/123" } }, { @@ -2016,13 +2052,13 @@ "name": "ProviderConfigPropertiesSecrets", "properties": {}, "additionalProperties": { - "$ref": "#/73" + "$ref": "#/75" } }, { "$type": "ArrayType", "itemType": { - "$ref": "#/151" + "$ref": "#/156" } }, { @@ -2030,7 +2066,7 @@ "name": "TerraformConfigPropertiesProviders", "properties": {}, "additionalProperties": { - "$ref": "#/153" + "$ref": "#/158" } }, { @@ -2039,7 +2075,7 @@ "properties": { "authentication": { "type": { - "$ref": "#/157" + "$ref": "#/162" }, "flags": 0, "description": "Authentication information used to access private bicep registries, which is a map of registry hostname to secret config that contains credential information." @@ -2064,7 +2100,7 @@ "name": "BicepConfigPropertiesAuthentication", "properties": {}, "additionalProperties": { - "$ref": "#/156" + "$ref": "#/161" } }, { @@ -2080,13 +2116,13 @@ "name": "RecipeConfigPropertiesEnvSecrets", "properties": {}, "additionalProperties": { - "$ref": "#/73" + "$ref": "#/75" } }, { "$type": "ArrayType", "itemType": { - "$ref": "#/13" + "$ref": "#/14" } }, { @@ -2102,7 +2138,7 @@ "name": "Applications.Core/environments@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/125" + "$ref": "#/129" }, "flags": 0, "functions": {} @@ -2135,28 +2171,28 @@ }, "type": { "type": { - "$ref": "#/163" + "$ref": "#/168" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/164" + "$ref": "#/169" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/166" + "$ref": "#/171" }, "flags": 1, "description": "ExtenderResource portable resource properties" }, "tags": { "type": { - "$ref": "#/179" + "$ref": "#/185" }, "flags": 0, "description": "Resource tags." @@ -2170,7 +2206,7 @@ }, "systemData": { "type": { - "$ref": "#/42" + "$ref": "#/43" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -2197,55 +2233,59 @@ }, "provisioningState": { "type": { - "$ref": "#/174" + "$ref": "#/180" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 2, "description": "Status of a resource." }, "secrets": { "type": { - "$ref": "#/119" + "$ref": "#/123" }, "flags": 0, "description": "Any object" }, "recipe": { "type": { - "$ref": "#/175" + "$ref": "#/181" }, "flags": 0, "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource" }, "resourceProvisioning": { "type": { - "$ref": "#/178" + "$ref": "#/184" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values." } }, "additionalProperties": { - "$ref": "#/119" + "$ref": "#/123" } }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -2253,39 +2293,42 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ { - "$ref": "#/167" + "$ref": "#/172" }, { - "$ref": "#/168" + "$ref": "#/173" }, { - "$ref": "#/169" + "$ref": "#/174" }, { - "$ref": "#/170" + "$ref": "#/175" }, { - "$ref": "#/171" + "$ref": "#/176" }, { - "$ref": "#/172" + "$ref": "#/177" }, { - "$ref": "#/173" + "$ref": "#/178" + }, + { + "$ref": "#/179" } ] }, @@ -2302,7 +2345,7 @@ }, "parameters": { "type": { - "$ref": "#/119" + "$ref": "#/123" }, "flags": 0, "description": "Any object" @@ -2321,10 +2364,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/176" + "$ref": "#/182" }, { - "$ref": "#/177" + "$ref": "#/183" } ] }, @@ -2336,11 +2379,19 @@ "$ref": "#/0" } }, + { + "$type": "ObjectType", + "name": "ExtenderListSecretResponse", + "properties": {}, + "additionalProperties": { + "$ref": "#/123" + } + }, { "$type": "FunctionType", "parameters": [], "output": { - "$ref": "#/119" + "$ref": "#/186" } }, { @@ -2348,13 +2399,13 @@ "name": "Applications.Core/extenders@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/165" + "$ref": "#/170" }, "flags": 0, "functions": { "listSecrets": { "type": { - "$ref": "#/180" + "$ref": "#/187" }, "description": "listSecrets" } @@ -2388,28 +2439,28 @@ }, "type": { "type": { - "$ref": "#/182" + "$ref": "#/189" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/183" + "$ref": "#/190" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/185" + "$ref": "#/192" }, "flags": 1, "description": "Gateway properties" }, "tags": { "type": { - "$ref": "#/201" + "$ref": "#/209" }, "flags": 0, "description": "Resource tags." @@ -2423,7 +2474,7 @@ }, "systemData": { "type": { - "$ref": "#/42" + "$ref": "#/43" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -2450,42 +2501,42 @@ }, "provisioningState": { "type": { - "$ref": "#/193" + "$ref": "#/201" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 2, "description": "Status of a resource." }, "internal": { "type": { - "$ref": "#/39" + "$ref": "#/40" }, "flags": 0, "description": "Sets Gateway to not be exposed externally (no public IP address associated). Defaults to false (exposed to internet)." }, "hostname": { "type": { - "$ref": "#/194" + "$ref": "#/202" }, "flags": 0, "description": "Declare hostname information for the Gateway. Leaving the hostname empty auto-assigns one: mygateway.myapp.PUBLICHOSTNAMEORIP.nip.io." }, "routes": { "type": { - "$ref": "#/196" + "$ref": "#/204" }, "flags": 1, "description": "Routes attached to this Gateway" }, "tls": { "type": { - "$ref": "#/197" + "$ref": "#/205" }, "flags": 0, "description": "TLS configuration definition for Gateway resource." @@ -2501,15 +2552,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -2517,39 +2572,42 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ { - "$ref": "#/186" + "$ref": "#/193" + }, + { + "$ref": "#/194" }, { - "$ref": "#/187" + "$ref": "#/195" }, { - "$ref": "#/188" + "$ref": "#/196" }, { - "$ref": "#/189" + "$ref": "#/197" }, { - "$ref": "#/190" + "$ref": "#/198" }, { - "$ref": "#/191" + "$ref": "#/199" }, { - "$ref": "#/192" + "$ref": "#/200" } ] }, @@ -2600,7 +2658,7 @@ }, "enableWebsockets": { "type": { - "$ref": "#/39" + "$ref": "#/40" }, "flags": 0, "description": "Enables websocket support for the route. Defaults to false." @@ -2610,7 +2668,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/195" + "$ref": "#/203" } }, { @@ -2619,17 +2677,17 @@ "properties": { "sslPassthrough": { "type": { - "$ref": "#/39" + "$ref": "#/40" }, "flags": 0, "description": "If true, gateway lets the https traffic sslPassthrough to the backend servers for decryption." }, "minimumProtocolVersion": { "type": { - "$ref": "#/200" + "$ref": "#/208" }, "flags": 0, - "description": "Tls Minimum versions for Gateway resource." + "description": "TLS minimum protocol version (defaults to 1.2)." }, "certificateFrom": { "type": { @@ -2652,10 +2710,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/198" + "$ref": "#/206" }, { - "$ref": "#/199" + "$ref": "#/207" } ] }, @@ -2672,7 +2730,7 @@ "name": "Applications.Core/gateways@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/184" + "$ref": "#/191" }, "flags": 0, "functions": {} @@ -2705,28 +2763,28 @@ }, "type": { "type": { - "$ref": "#/203" + "$ref": "#/211" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/204" + "$ref": "#/212" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/206" + "$ref": "#/214" }, "flags": 1, "description": "The properties of SecretStore" }, "tags": { "type": { - "$ref": "#/227" + "$ref": "#/236" }, "flags": 0, "description": "Resource tags." @@ -2740,7 +2798,7 @@ }, "systemData": { "type": { - "$ref": "#/42" + "$ref": "#/43" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -2767,28 +2825,28 @@ }, "provisioningState": { "type": { - "$ref": "#/214" + "$ref": "#/223" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 2, "description": "Status of a resource." }, "type": { "type": { - "$ref": "#/220" + "$ref": "#/229" }, "flags": 0, "description": "The type of SecretStore data" }, "data": { "type": { - "$ref": "#/226" + "$ref": "#/235" }, "flags": 1, "description": "An object to represent key-value type secrets" @@ -2804,15 +2862,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -2820,39 +2882,42 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ { - "$ref": "#/207" + "$ref": "#/215" }, { - "$ref": "#/208" + "$ref": "#/216" }, { - "$ref": "#/209" + "$ref": "#/217" }, { - "$ref": "#/210" + "$ref": "#/218" }, { - "$ref": "#/211" + "$ref": "#/219" }, { - "$ref": "#/212" + "$ref": "#/220" }, { - "$ref": "#/213" + "$ref": "#/221" + }, + { + "$ref": "#/222" } ] }, @@ -2880,19 +2945,19 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/215" + "$ref": "#/224" }, { - "$ref": "#/216" + "$ref": "#/225" }, { - "$ref": "#/217" + "$ref": "#/226" }, { - "$ref": "#/218" + "$ref": "#/227" }, { - "$ref": "#/219" + "$ref": "#/228" } ] }, @@ -2902,7 +2967,7 @@ "properties": { "encoding": { "type": { - "$ref": "#/224" + "$ref": "#/233" }, "flags": 0, "description": "The type of SecretValue Encoding" @@ -2916,7 +2981,7 @@ }, "valueFrom": { "type": { - "$ref": "#/225" + "$ref": "#/234" }, "flags": 0, "description": "The Secret value source properties" @@ -2935,10 +3000,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/222" + "$ref": "#/231" }, { - "$ref": "#/223" + "$ref": "#/232" } ] }, @@ -2967,7 +3032,7 @@ "name": "SecretStorePropertiesData", "properties": {}, "additionalProperties": { - "$ref": "#/221" + "$ref": "#/230" } }, { @@ -2984,14 +3049,14 @@ "properties": { "type": { "type": { - "$ref": "#/234" + "$ref": "#/243" }, "flags": 2, "description": "The type of SecretStore data" }, "data": { "type": { - "$ref": "#/235" + "$ref": "#/244" }, "flags": 2, "description": "An object to represent key-value type secrets" @@ -3022,19 +3087,19 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/229" + "$ref": "#/238" }, { - "$ref": "#/230" + "$ref": "#/239" }, { - "$ref": "#/231" + "$ref": "#/240" }, { - "$ref": "#/232" + "$ref": "#/241" }, { - "$ref": "#/233" + "$ref": "#/242" } ] }, @@ -3043,14 +3108,14 @@ "name": "SecretStoreListSecretsResultData", "properties": {}, "additionalProperties": { - "$ref": "#/221" + "$ref": "#/230" } }, { "$type": "FunctionType", "parameters": [], "output": { - "$ref": "#/228" + "$ref": "#/237" } }, { @@ -3058,13 +3123,13 @@ "name": "Applications.Core/secretStores@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/205" + "$ref": "#/213" }, "flags": 0, "functions": { "listSecrets": { "type": { - "$ref": "#/236" + "$ref": "#/245" }, "description": "listSecrets" } @@ -3098,28 +3163,28 @@ }, "type": { "type": { - "$ref": "#/238" + "$ref": "#/247" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/239" + "$ref": "#/248" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/241" + "$ref": "#/250" }, "flags": 1, "description": "Volume properties" }, "tags": { "type": { - "$ref": "#/273" + "$ref": "#/283" }, "flags": 0, "description": "Resource tags." @@ -3133,7 +3198,7 @@ }, "systemData": { "type": { - "$ref": "#/42" + "$ref": "#/43" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -3161,14 +3226,14 @@ }, "provisioningState": { "type": { - "$ref": "#/249" + "$ref": "#/259" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 2, "description": "Status of a resource." @@ -3176,21 +3241,25 @@ }, "elements": { "azure.com.keyvault": { - "$ref": "#/250" + "$ref": "#/260" } } }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -3198,39 +3267,42 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ { - "$ref": "#/242" + "$ref": "#/251" }, { - "$ref": "#/243" + "$ref": "#/252" }, { - "$ref": "#/244" + "$ref": "#/253" }, { - "$ref": "#/245" + "$ref": "#/254" }, { - "$ref": "#/246" + "$ref": "#/255" }, { - "$ref": "#/247" + "$ref": "#/256" }, { - "$ref": "#/248" + "$ref": "#/257" + }, + { + "$ref": "#/258" } ] }, @@ -3240,14 +3312,14 @@ "properties": { "certificates": { "type": { - "$ref": "#/263" + "$ref": "#/273" }, "flags": 0, "description": "The KeyVault certificates that this volume exposes" }, "keys": { "type": { - "$ref": "#/265" + "$ref": "#/275" }, "flags": 0, "description": "The KeyVault keys that this volume exposes" @@ -3261,14 +3333,14 @@ }, "secrets": { "type": { - "$ref": "#/271" + "$ref": "#/281" }, "flags": 0, "description": "The KeyVault secrets that this volume exposes" }, "kind": { "type": { - "$ref": "#/272" + "$ref": "#/282" }, "flags": 1, "description": "Discriminator property for VolumeProperties." @@ -3288,14 +3360,14 @@ }, "encoding": { "type": { - "$ref": "#/255" + "$ref": "#/265" }, "flags": 0, - "description": "Represents secret encodings" + "description": "Encoding format. Default utf-8" }, "format": { "type": { - "$ref": "#/258" + "$ref": "#/268" }, "flags": 0, "description": "Represents certificate formats" @@ -3309,7 +3381,7 @@ }, "certType": { "type": { - "$ref": "#/262" + "$ref": "#/272" }, "flags": 0, "description": "Represents certificate types" @@ -3339,13 +3411,13 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/252" + "$ref": "#/262" }, { - "$ref": "#/253" + "$ref": "#/263" }, { - "$ref": "#/254" + "$ref": "#/264" } ] }, @@ -3361,10 +3433,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/256" + "$ref": "#/266" }, { - "$ref": "#/257" + "$ref": "#/267" } ] }, @@ -3384,13 +3456,13 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/259" + "$ref": "#/269" }, { - "$ref": "#/260" + "$ref": "#/270" }, { - "$ref": "#/261" + "$ref": "#/271" } ] }, @@ -3399,7 +3471,7 @@ "name": "AzureKeyVaultVolumePropertiesCertificates", "properties": {}, "additionalProperties": { - "$ref": "#/251" + "$ref": "#/261" } }, { @@ -3434,7 +3506,7 @@ "name": "AzureKeyVaultVolumePropertiesKeys", "properties": {}, "additionalProperties": { - "$ref": "#/264" + "$ref": "#/274" } }, { @@ -3450,10 +3522,10 @@ }, "encoding": { "type": { - "$ref": "#/270" + "$ref": "#/280" }, "flags": 0, - "description": "Represents secret encodings" + "description": "Encoding format. Default utf-8" }, "name": { "type": { @@ -3487,13 +3559,13 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/267" + "$ref": "#/277" }, { - "$ref": "#/268" + "$ref": "#/278" }, { - "$ref": "#/269" + "$ref": "#/279" } ] }, @@ -3502,7 +3574,7 @@ "name": "AzureKeyVaultVolumePropertiesSecrets", "properties": {}, "additionalProperties": { - "$ref": "#/266" + "$ref": "#/276" } }, { @@ -3522,7 +3594,7 @@ "name": "Applications.Core/volumes@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/240" + "$ref": "#/249" }, "flags": 0, "functions": {} diff --git a/hack/bicep-types-radius/generated/applications/applications.dapr/2023-10-01-preview/types.json b/hack/bicep-types-radius/generated/applications/applications.dapr/2023-10-01-preview/types.json index 646af0908f..1f75fe7024 100644 --- a/hack/bicep-types-radius/generated/applications/applications.dapr/2023-10-01-preview/types.json +++ b/hack/bicep-types-radius/generated/applications/applications.dapr/2023-10-01-preview/types.json @@ -51,7 +51,7 @@ }, "tags": { "type": { - "$ref": "#/36" + "$ref": "#/37" }, "flags": 0, "description": "Resource tags." @@ -65,7 +65,7 @@ }, "systemData": { "type": { - "$ref": "#/37" + "$ref": "#/38" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -92,14 +92,14 @@ }, "provisioningState": { "type": { - "$ref": "#/12" + "$ref": "#/13" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/13" + "$ref": "#/14" }, "flags": 2, "description": "Status of a resource." @@ -113,7 +113,7 @@ }, "metadata": { "type": { - "$ref": "#/27" + "$ref": "#/28" }, "flags": 0, "description": "The metadata for Dapr resource which must match the values specified in Dapr component spec" @@ -134,28 +134,28 @@ }, "auth": { "type": { - "$ref": "#/28" + "$ref": "#/29" }, "flags": 0, "description": "Authentication properties for a Dapr component object" }, "resources": { "type": { - "$ref": "#/30" + "$ref": "#/31" }, "flags": 0, "description": "A collection of references to resources associated with the configuration store" }, "recipe": { "type": { - "$ref": "#/31" + "$ref": "#/32" }, "flags": 0, "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource" }, "resourceProvisioning": { "type": { - "$ref": "#/35" + "$ref": "#/36" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values." @@ -164,15 +164,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -180,15 +184,15 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", @@ -213,6 +217,9 @@ }, { "$ref": "#/11" + }, + { + "$ref": "#/12" } ] }, @@ -222,21 +229,21 @@ "properties": { "compute": { "type": { - "$ref": "#/14" + "$ref": "#/15" }, "flags": 0, "description": "Represents backing compute resource" }, "recipe": { "type": { - "$ref": "#/21" + "$ref": "#/22" }, "flags": 2, "description": "Recipe status at deployment time for a resource." }, "outputResources": { "type": { - "$ref": "#/24" + "$ref": "#/25" }, "flags": 0, "description": "Properties of an output resource" @@ -257,7 +264,7 @@ }, "identity": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 0, "description": "IdentitySettings is the external identity setting." @@ -265,7 +272,7 @@ }, "elements": { "kubernetes": { - "$ref": "#/19" + "$ref": "#/20" } } }, @@ -275,7 +282,7 @@ "properties": { "kind": { "type": { - "$ref": "#/18" + "$ref": "#/19" }, "flags": 1, "description": "IdentitySettingKind is the kind of supported external identity setting" @@ -308,10 +315,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/16" + "$ref": "#/17" }, { - "$ref": "#/17" + "$ref": "#/18" } ] }, @@ -328,7 +335,7 @@ }, "kind": { "type": { - "$ref": "#/20" + "$ref": "#/21" }, "flags": 1, "description": "Discriminator property for EnvironmentCompute." @@ -386,7 +393,7 @@ }, "radiusManaged": { "type": { - "$ref": "#/23" + "$ref": "#/24" }, "flags": 0, "description": "Determines whether Radius manages the lifecycle of the underlying resource." @@ -399,7 +406,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/22" + "$ref": "#/23" } }, { @@ -415,7 +422,7 @@ }, "secretKeyRef": { "type": { - "$ref": "#/26" + "$ref": "#/27" }, "flags": 0, "description": "A reference of a value in a secret store component." @@ -447,7 +454,7 @@ "name": "DaprConfigurationStorePropertiesMetadata", "properties": {}, "additionalProperties": { - "$ref": "#/25" + "$ref": "#/26" } }, { @@ -479,7 +486,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/29" + "$ref": "#/30" } }, { @@ -495,7 +502,7 @@ }, "parameters": { "type": { - "$ref": "#/32" + "$ref": "#/33" }, "flags": 0, "description": "Any object" @@ -517,10 +524,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/33" + "$ref": "#/34" }, { - "$ref": "#/34" + "$ref": "#/35" } ] }, @@ -545,7 +552,7 @@ }, "createdByType": { "type": { - "$ref": "#/42" + "$ref": "#/43" }, "flags": 0, "description": "The type of identity that created the resource." @@ -566,7 +573,7 @@ }, "lastModifiedByType": { "type": { - "$ref": "#/47" + "$ref": "#/48" }, "flags": 0, "description": "The type of identity that created the resource." @@ -599,9 +606,6 @@ { "$type": "UnionType", "elements": [ - { - "$ref": "#/38" - }, { "$ref": "#/39" }, @@ -610,6 +614,9 @@ }, { "$ref": "#/41" + }, + { + "$ref": "#/42" } ] }, @@ -632,9 +639,6 @@ { "$type": "UnionType", "elements": [ - { - "$ref": "#/43" - }, { "$ref": "#/44" }, @@ -643,6 +647,9 @@ }, { "$ref": "#/46" + }, + { + "$ref": "#/47" } ] }, @@ -684,28 +691,28 @@ }, "type": { "type": { - "$ref": "#/49" + "$ref": "#/50" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/50" + "$ref": "#/51" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/52" + "$ref": "#/53" }, "flags": 1, "description": "Dapr PubSubBroker portable resource properties" }, "tags": { "type": { - "$ref": "#/66" + "$ref": "#/68" }, "flags": 0, "description": "Resource tags." @@ -719,7 +726,7 @@ }, "systemData": { "type": { - "$ref": "#/37" + "$ref": "#/38" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -746,14 +753,14 @@ }, "provisioningState": { "type": { - "$ref": "#/60" + "$ref": "#/62" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/13" + "$ref": "#/14" }, "flags": 2, "description": "Status of a resource." @@ -767,7 +774,7 @@ }, "metadata": { "type": { - "$ref": "#/61" + "$ref": "#/63" }, "flags": 0, "description": "The metadata for Dapr resource which must match the values specified in Dapr component spec" @@ -788,28 +795,28 @@ }, "auth": { "type": { - "$ref": "#/28" + "$ref": "#/29" }, "flags": 0, "description": "Authentication properties for a Dapr component object" }, "resources": { "type": { - "$ref": "#/62" + "$ref": "#/64" }, "flags": 0, "description": "A collection of references to resources associated with the pubSubBroker" }, "recipe": { "type": { - "$ref": "#/31" + "$ref": "#/32" }, "flags": 0, "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource" }, "resourceProvisioning": { "type": { - "$ref": "#/65" + "$ref": "#/67" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values." @@ -818,15 +825,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -834,22 +845,19 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ - { - "$ref": "#/53" - }, { "$ref": "#/54" }, @@ -867,6 +875,12 @@ }, { "$ref": "#/59" + }, + { + "$ref": "#/60" + }, + { + "$ref": "#/61" } ] }, @@ -875,13 +889,13 @@ "name": "DaprPubSubBrokerPropertiesMetadata", "properties": {}, "additionalProperties": { - "$ref": "#/25" + "$ref": "#/26" } }, { "$type": "ArrayType", "itemType": { - "$ref": "#/29" + "$ref": "#/30" } }, { @@ -896,10 +910,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/63" + "$ref": "#/65" }, { - "$ref": "#/64" + "$ref": "#/66" } ] }, @@ -916,7 +930,7 @@ "name": "Applications.Dapr/pubSubBrokers@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/51" + "$ref": "#/52" }, "flags": 0, "functions": {} @@ -949,28 +963,28 @@ }, "type": { "type": { - "$ref": "#/68" + "$ref": "#/70" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/69" + "$ref": "#/71" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/71" + "$ref": "#/73" }, "flags": 1, "description": "Dapr SecretStore portable resource properties" }, "tags": { "type": { - "$ref": "#/84" + "$ref": "#/87" }, "flags": 0, "description": "Resource tags." @@ -984,7 +998,7 @@ }, "systemData": { "type": { - "$ref": "#/37" + "$ref": "#/38" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -1011,14 +1025,14 @@ }, "provisioningState": { "type": { - "$ref": "#/79" + "$ref": "#/82" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/13" + "$ref": "#/14" }, "flags": 2, "description": "Status of a resource." @@ -1032,7 +1046,7 @@ }, "metadata": { "type": { - "$ref": "#/80" + "$ref": "#/83" }, "flags": 0, "description": "The metadata for Dapr resource which must match the values specified in Dapr component spec" @@ -1053,14 +1067,14 @@ }, "recipe": { "type": { - "$ref": "#/31" + "$ref": "#/32" }, "flags": 0, "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource" }, "resourceProvisioning": { "type": { - "$ref": "#/83" + "$ref": "#/86" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values." @@ -1069,15 +1083,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -1085,25 +1103,19 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ - { - "$ref": "#/72" - }, - { - "$ref": "#/73" - }, { "$ref": "#/74" }, @@ -1118,6 +1130,15 @@ }, { "$ref": "#/78" + }, + { + "$ref": "#/79" + }, + { + "$ref": "#/80" + }, + { + "$ref": "#/81" } ] }, @@ -1126,7 +1147,7 @@ "name": "DaprSecretStorePropertiesMetadata", "properties": {}, "additionalProperties": { - "$ref": "#/25" + "$ref": "#/26" } }, { @@ -1141,10 +1162,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/81" + "$ref": "#/84" }, { - "$ref": "#/82" + "$ref": "#/85" } ] }, @@ -1161,7 +1182,7 @@ "name": "Applications.Dapr/secretStores@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/70" + "$ref": "#/72" }, "flags": 0, "functions": {} @@ -1194,28 +1215,28 @@ }, "type": { "type": { - "$ref": "#/86" + "$ref": "#/89" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/87" + "$ref": "#/90" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/89" + "$ref": "#/92" }, "flags": 1, "description": "Dapr StateStore portable resource properties" }, "tags": { "type": { - "$ref": "#/103" + "$ref": "#/107" }, "flags": 0, "description": "Resource tags." @@ -1229,7 +1250,7 @@ }, "systemData": { "type": { - "$ref": "#/37" + "$ref": "#/38" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -1256,14 +1277,14 @@ }, "provisioningState": { "type": { - "$ref": "#/97" + "$ref": "#/101" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/13" + "$ref": "#/14" }, "flags": 2, "description": "Status of a resource." @@ -1277,7 +1298,7 @@ }, "metadata": { "type": { - "$ref": "#/98" + "$ref": "#/102" }, "flags": 0, "description": "The metadata for Dapr resource which must match the values specified in Dapr component spec" @@ -1298,28 +1319,28 @@ }, "auth": { "type": { - "$ref": "#/28" + "$ref": "#/29" }, "flags": 0, "description": "Authentication properties for a Dapr component object" }, "resources": { "type": { - "$ref": "#/99" + "$ref": "#/103" }, "flags": 0, "description": "A collection of references to resources associated with the state store" }, "recipe": { "type": { - "$ref": "#/31" + "$ref": "#/32" }, "flags": 0, "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource" }, "resourceProvisioning": { "type": { - "$ref": "#/102" + "$ref": "#/106" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values." @@ -1328,15 +1349,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -1344,39 +1369,42 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ { - "$ref": "#/90" + "$ref": "#/93" + }, + { + "$ref": "#/94" }, { - "$ref": "#/91" + "$ref": "#/95" }, { - "$ref": "#/92" + "$ref": "#/96" }, { - "$ref": "#/93" + "$ref": "#/97" }, { - "$ref": "#/94" + "$ref": "#/98" }, { - "$ref": "#/95" + "$ref": "#/99" }, { - "$ref": "#/96" + "$ref": "#/100" } ] }, @@ -1385,13 +1413,13 @@ "name": "DaprStateStorePropertiesMetadata", "properties": {}, "additionalProperties": { - "$ref": "#/25" + "$ref": "#/26" } }, { "$type": "ArrayType", "itemType": { - "$ref": "#/29" + "$ref": "#/30" } }, { @@ -1406,10 +1434,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/100" + "$ref": "#/104" }, { - "$ref": "#/101" + "$ref": "#/105" } ] }, @@ -1426,7 +1454,7 @@ "name": "Applications.Dapr/stateStores@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/88" + "$ref": "#/91" }, "flags": 0, "functions": {} diff --git a/hack/bicep-types-radius/generated/applications/applications.datastores/2023-10-01-preview/types.json b/hack/bicep-types-radius/generated/applications/applications.datastores/2023-10-01-preview/types.json index a081e5e272..f3cb0b87b1 100644 --- a/hack/bicep-types-radius/generated/applications/applications.datastores/2023-10-01-preview/types.json +++ b/hack/bicep-types-radius/generated/applications/applications.datastores/2023-10-01-preview/types.json @@ -51,7 +51,7 @@ }, "tags": { "type": { - "$ref": "#/34" + "$ref": "#/35" }, "flags": 0, "description": "Resource tags." @@ -65,7 +65,7 @@ }, "systemData": { "type": { - "$ref": "#/35" + "$ref": "#/36" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -92,21 +92,21 @@ }, "provisioningState": { "type": { - "$ref": "#/12" + "$ref": "#/13" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/13" + "$ref": "#/14" }, "flags": 2, "description": "Status of a resource." }, "secrets": { "type": { - "$ref": "#/25" + "$ref": "#/26" }, "flags": 0, "description": "The secret values for the given MongoDatabase resource" @@ -120,7 +120,7 @@ }, "port": { "type": { - "$ref": "#/26" + "$ref": "#/27" }, "flags": 0, "description": "Port value of the target Mongo database" @@ -134,7 +134,7 @@ }, "resources": { "type": { - "$ref": "#/28" + "$ref": "#/29" }, "flags": 0, "description": "List of the resource IDs that support the MongoDB resource" @@ -148,14 +148,14 @@ }, "recipe": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 0, "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource" }, "resourceProvisioning": { "type": { - "$ref": "#/33" + "$ref": "#/34" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values." @@ -164,15 +164,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -180,15 +184,15 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", @@ -213,6 +217,9 @@ }, { "$ref": "#/11" + }, + { + "$ref": "#/12" } ] }, @@ -222,21 +229,21 @@ "properties": { "compute": { "type": { - "$ref": "#/14" + "$ref": "#/15" }, "flags": 0, "description": "Represents backing compute resource" }, "recipe": { "type": { - "$ref": "#/21" + "$ref": "#/22" }, "flags": 2, "description": "Recipe status at deployment time for a resource." }, "outputResources": { "type": { - "$ref": "#/24" + "$ref": "#/25" }, "flags": 0, "description": "Properties of an output resource" @@ -257,7 +264,7 @@ }, "identity": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 0, "description": "IdentitySettings is the external identity setting." @@ -265,7 +272,7 @@ }, "elements": { "kubernetes": { - "$ref": "#/19" + "$ref": "#/20" } } }, @@ -275,7 +282,7 @@ "properties": { "kind": { "type": { - "$ref": "#/18" + "$ref": "#/19" }, "flags": 1, "description": "IdentitySettingKind is the kind of supported external identity setting" @@ -308,10 +315,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/16" + "$ref": "#/17" }, { - "$ref": "#/17" + "$ref": "#/18" } ] }, @@ -328,7 +335,7 @@ }, "kind": { "type": { - "$ref": "#/20" + "$ref": "#/21" }, "flags": 1, "description": "Discriminator property for EnvironmentCompute." @@ -386,7 +393,7 @@ }, "radiusManaged": { "type": { - "$ref": "#/23" + "$ref": "#/24" }, "flags": 0, "description": "Determines whether Radius manages the lifecycle of the underlying resource." @@ -399,7 +406,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/22" + "$ref": "#/23" } }, { @@ -441,7 +448,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/27" + "$ref": "#/28" } }, { @@ -457,7 +464,7 @@ }, "parameters": { "type": { - "$ref": "#/30" + "$ref": "#/31" }, "flags": 0, "description": "Any object" @@ -479,10 +486,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/31" + "$ref": "#/32" }, { - "$ref": "#/32" + "$ref": "#/33" } ] }, @@ -507,7 +514,7 @@ }, "createdByType": { "type": { - "$ref": "#/40" + "$ref": "#/41" }, "flags": 0, "description": "The type of identity that created the resource." @@ -528,7 +535,7 @@ }, "lastModifiedByType": { "type": { - "$ref": "#/45" + "$ref": "#/46" }, "flags": 0, "description": "The type of identity that created the resource." @@ -561,9 +568,6 @@ { "$type": "UnionType", "elements": [ - { - "$ref": "#/36" - }, { "$ref": "#/37" }, @@ -572,6 +576,9 @@ }, { "$ref": "#/39" + }, + { + "$ref": "#/40" } ] }, @@ -594,9 +601,6 @@ { "$type": "UnionType", "elements": [ - { - "$ref": "#/41" - }, { "$ref": "#/42" }, @@ -605,6 +609,9 @@ }, { "$ref": "#/44" + }, + { + "$ref": "#/45" } ] }, @@ -632,7 +639,7 @@ "$type": "FunctionType", "parameters": [], "output": { - "$ref": "#/46" + "$ref": "#/47" } }, { @@ -646,7 +653,7 @@ "functions": { "listSecrets": { "type": { - "$ref": "#/47" + "$ref": "#/48" }, "description": "listSecrets" } @@ -680,28 +687,28 @@ }, "type": { "type": { - "$ref": "#/49" + "$ref": "#/50" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/50" + "$ref": "#/51" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/52" + "$ref": "#/53" }, "flags": 1, "description": "RedisCache portable resource properties" }, "tags": { "type": { - "$ref": "#/66" + "$ref": "#/68" }, "flags": 0, "description": "Resource tags." @@ -715,7 +722,7 @@ }, "systemData": { "type": { - "$ref": "#/35" + "$ref": "#/36" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -742,21 +749,21 @@ }, "provisioningState": { "type": { - "$ref": "#/60" + "$ref": "#/62" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/13" + "$ref": "#/14" }, "flags": 2, "description": "Status of a resource." }, "secrets": { "type": { - "$ref": "#/61" + "$ref": "#/63" }, "flags": 0, "description": "The secret values for the given RedisCache resource" @@ -770,7 +777,7 @@ }, "port": { "type": { - "$ref": "#/26" + "$ref": "#/27" }, "flags": 0, "description": "The port value of the target Redis cache" @@ -784,28 +791,28 @@ }, "tls": { "type": { - "$ref": "#/23" + "$ref": "#/24" }, "flags": 0, "description": "Specifies whether to enable SSL connections to the Redis cache" }, "resources": { "type": { - "$ref": "#/62" + "$ref": "#/64" }, "flags": 0, "description": "List of the resource IDs that support the Redis resource" }, "recipe": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 0, "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource" }, "resourceProvisioning": { "type": { - "$ref": "#/65" + "$ref": "#/67" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values." @@ -814,15 +821,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -830,22 +841,19 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ - { - "$ref": "#/53" - }, { "$ref": "#/54" }, @@ -863,6 +871,12 @@ }, { "$ref": "#/59" + }, + { + "$ref": "#/60" + }, + { + "$ref": "#/61" } ] }, @@ -896,7 +910,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/27" + "$ref": "#/28" } }, { @@ -911,10 +925,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/63" + "$ref": "#/65" }, { - "$ref": "#/64" + "$ref": "#/66" } ] }, @@ -957,7 +971,7 @@ "$type": "FunctionType", "parameters": [], "output": { - "$ref": "#/67" + "$ref": "#/69" } }, { @@ -965,13 +979,13 @@ "name": "Applications.Datastores/redisCaches@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/51" + "$ref": "#/52" }, "flags": 0, "functions": { "listSecrets": { "type": { - "$ref": "#/68" + "$ref": "#/70" }, "description": "listSecrets" } @@ -1005,28 +1019,28 @@ }, "type": { "type": { - "$ref": "#/70" + "$ref": "#/72" }, "flags": 10, "description": "The resource type" }, "apiVersion": { "type": { - "$ref": "#/71" + "$ref": "#/73" }, "flags": 10, "description": "The resource api version" }, "properties": { "type": { - "$ref": "#/73" + "$ref": "#/75" }, "flags": 1, "description": "SqlDatabase properties" }, "tags": { "type": { - "$ref": "#/87" + "$ref": "#/90" }, "flags": 0, "description": "Resource tags." @@ -1040,7 +1054,7 @@ }, "systemData": { "type": { - "$ref": "#/35" + "$ref": "#/36" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -1067,14 +1081,14 @@ }, "provisioningState": { "type": { - "$ref": "#/81" + "$ref": "#/84" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/13" + "$ref": "#/14" }, "flags": 2, "description": "Status of a resource." @@ -1095,7 +1109,7 @@ }, "port": { "type": { - "$ref": "#/26" + "$ref": "#/27" }, "flags": 0, "description": "Port value of the target Sql database" @@ -1109,28 +1123,28 @@ }, "resources": { "type": { - "$ref": "#/82" + "$ref": "#/85" }, "flags": 0, "description": "List of the resource IDs that support the SqlDatabase resource" }, "secrets": { "type": { - "$ref": "#/83" + "$ref": "#/86" }, "flags": 0, "description": "The secret values for the given SqlDatabase resource" }, "recipe": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 0, "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource" }, "resourceProvisioning": { "type": { - "$ref": "#/86" + "$ref": "#/89" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values." @@ -1139,15 +1153,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -1155,25 +1173,19 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", "elements": [ - { - "$ref": "#/74" - }, - { - "$ref": "#/75" - }, { "$ref": "#/76" }, @@ -1188,13 +1200,22 @@ }, { "$ref": "#/80" + }, + { + "$ref": "#/81" + }, + { + "$ref": "#/82" + }, + { + "$ref": "#/83" } ] }, { "$type": "ArrayType", "itemType": { - "$ref": "#/27" + "$ref": "#/28" } }, { @@ -1229,10 +1250,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/84" + "$ref": "#/87" }, { - "$ref": "#/85" + "$ref": "#/88" } ] }, @@ -1268,7 +1289,7 @@ "$type": "FunctionType", "parameters": [], "output": { - "$ref": "#/88" + "$ref": "#/91" } }, { @@ -1276,13 +1297,13 @@ "name": "Applications.Datastores/sqlDatabases@2023-10-01-preview", "scopeType": 0, "body": { - "$ref": "#/72" + "$ref": "#/74" }, "flags": 0, "functions": { "listSecrets": { "type": { - "$ref": "#/89" + "$ref": "#/92" }, "description": "listSecrets" } diff --git a/hack/bicep-types-radius/generated/applications/applications.messaging/2023-10-01-preview/types.json b/hack/bicep-types-radius/generated/applications/applications.messaging/2023-10-01-preview/types.json index ce641a8398..69c8eec3fc 100644 --- a/hack/bicep-types-radius/generated/applications/applications.messaging/2023-10-01-preview/types.json +++ b/hack/bicep-types-radius/generated/applications/applications.messaging/2023-10-01-preview/types.json @@ -51,7 +51,7 @@ }, "tags": { "type": { - "$ref": "#/34" + "$ref": "#/35" }, "flags": 0, "description": "Resource tags." @@ -65,7 +65,7 @@ }, "systemData": { "type": { - "$ref": "#/35" + "$ref": "#/36" }, "flags": 2, "description": "Metadata pertaining to creation and last modification of the resource." @@ -92,21 +92,21 @@ }, "provisioningState": { "type": { - "$ref": "#/12" + "$ref": "#/13" }, "flags": 2, "description": "Provisioning state of the resource at the time the operation was called" }, "status": { "type": { - "$ref": "#/13" + "$ref": "#/14" }, "flags": 2, "description": "Status of a resource." }, "secrets": { "type": { - "$ref": "#/25" + "$ref": "#/26" }, "flags": 0, "description": "The connection secrets properties to the RabbitMQ instance" @@ -127,7 +127,7 @@ }, "port": { "type": { - "$ref": "#/26" + "$ref": "#/27" }, "flags": 0, "description": "The port of the RabbitMQ instance. Defaults to 5672" @@ -148,28 +148,28 @@ }, "resources": { "type": { - "$ref": "#/28" + "$ref": "#/29" }, "flags": 0, "description": "List of the resource IDs that support the rabbitMQ resource" }, "tls": { "type": { - "$ref": "#/23" + "$ref": "#/24" }, "flags": 0, "description": "Specifies whether to use SSL when connecting to the RabbitMQ instance" }, "recipe": { "type": { - "$ref": "#/29" + "$ref": "#/30" }, "flags": 0, "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource" }, "resourceProvisioning": { "type": { - "$ref": "#/33" + "$ref": "#/34" }, "flags": 0, "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values." @@ -178,15 +178,19 @@ }, { "$type": "StringLiteralType", - "value": "Succeeded" + "value": "Creating" }, { "$type": "StringLiteralType", - "value": "Failed" + "value": "Updating" }, { "$type": "StringLiteralType", - "value": "Canceled" + "value": "Deleting" + }, + { + "$type": "StringLiteralType", + "value": "Accepted" }, { "$type": "StringLiteralType", @@ -194,15 +198,15 @@ }, { "$type": "StringLiteralType", - "value": "Updating" + "value": "Succeeded" }, { "$type": "StringLiteralType", - "value": "Deleting" + "value": "Failed" }, { "$type": "StringLiteralType", - "value": "Accepted" + "value": "Canceled" }, { "$type": "UnionType", @@ -227,6 +231,9 @@ }, { "$ref": "#/11" + }, + { + "$ref": "#/12" } ] }, @@ -236,21 +243,21 @@ "properties": { "compute": { "type": { - "$ref": "#/14" + "$ref": "#/15" }, "flags": 0, "description": "Represents backing compute resource" }, "recipe": { "type": { - "$ref": "#/21" + "$ref": "#/22" }, "flags": 2, "description": "Recipe status at deployment time for a resource." }, "outputResources": { "type": { - "$ref": "#/24" + "$ref": "#/25" }, "flags": 0, "description": "Properties of an output resource" @@ -271,7 +278,7 @@ }, "identity": { "type": { - "$ref": "#/15" + "$ref": "#/16" }, "flags": 0, "description": "IdentitySettings is the external identity setting." @@ -279,7 +286,7 @@ }, "elements": { "kubernetes": { - "$ref": "#/19" + "$ref": "#/20" } } }, @@ -289,7 +296,7 @@ "properties": { "kind": { "type": { - "$ref": "#/18" + "$ref": "#/19" }, "flags": 1, "description": "IdentitySettingKind is the kind of supported external identity setting" @@ -322,10 +329,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/16" + "$ref": "#/17" }, { - "$ref": "#/17" + "$ref": "#/18" } ] }, @@ -342,7 +349,7 @@ }, "kind": { "type": { - "$ref": "#/20" + "$ref": "#/21" }, "flags": 1, "description": "Discriminator property for EnvironmentCompute." @@ -400,7 +407,7 @@ }, "radiusManaged": { "type": { - "$ref": "#/23" + "$ref": "#/24" }, "flags": 0, "description": "Determines whether Radius manages the lifecycle of the underlying resource." @@ -413,7 +420,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/22" + "$ref": "#/23" } }, { @@ -455,7 +462,7 @@ { "$type": "ArrayType", "itemType": { - "$ref": "#/27" + "$ref": "#/28" } }, { @@ -471,7 +478,7 @@ }, "parameters": { "type": { - "$ref": "#/30" + "$ref": "#/31" }, "flags": 0, "description": "Any object" @@ -493,10 +500,10 @@ "$type": "UnionType", "elements": [ { - "$ref": "#/31" + "$ref": "#/32" }, { - "$ref": "#/32" + "$ref": "#/33" } ] }, @@ -521,7 +528,7 @@ }, "createdByType": { "type": { - "$ref": "#/40" + "$ref": "#/41" }, "flags": 0, "description": "The type of identity that created the resource." @@ -542,7 +549,7 @@ }, "lastModifiedByType": { "type": { - "$ref": "#/45" + "$ref": "#/46" }, "flags": 0, "description": "The type of identity that created the resource." @@ -575,9 +582,6 @@ { "$type": "UnionType", "elements": [ - { - "$ref": "#/36" - }, { "$ref": "#/37" }, @@ -586,6 +590,9 @@ }, { "$ref": "#/39" + }, + { + "$ref": "#/40" } ] }, @@ -608,9 +615,6 @@ { "$type": "UnionType", "elements": [ - { - "$ref": "#/41" - }, { "$ref": "#/42" }, @@ -619,6 +623,9 @@ }, { "$ref": "#/44" + }, + { + "$ref": "#/45" } ] }, @@ -646,7 +653,7 @@ "$type": "FunctionType", "parameters": [], "output": { - "$ref": "#/46" + "$ref": "#/47" } }, { @@ -660,7 +667,7 @@ "functions": { "listSecrets": { "type": { - "$ref": "#/47" + "$ref": "#/48" }, "description": "listSecrets" } diff --git a/hack/bicep-types-radius/generated/index.json b/hack/bicep-types-radius/generated/index.json index 162505ee64..68a264cd11 100644 --- a/hack/bicep-types-radius/generated/index.json +++ b/hack/bicep-types-radius/generated/index.json @@ -1,49 +1,49 @@ { "resources": { "Applications.Core/applications@2023-10-01-preview": { - "$ref": "applications/applications.core/2023-10-01-preview/types.json#/53" + "$ref": "applications/applications.core/2023-10-01-preview/types.json#/54" }, "Applications.Core/containers@2023-10-01-preview": { - "$ref": "applications/applications.core/2023-10-01-preview/types.json#/122" + "$ref": "applications/applications.core/2023-10-01-preview/types.json#/126" }, "Applications.Core/environments@2023-10-01-preview": { - "$ref": "applications/applications.core/2023-10-01-preview/types.json#/162" + "$ref": "applications/applications.core/2023-10-01-preview/types.json#/167" }, "Applications.Core/extenders@2023-10-01-preview": { - "$ref": "applications/applications.core/2023-10-01-preview/types.json#/181" + "$ref": "applications/applications.core/2023-10-01-preview/types.json#/188" }, "Applications.Core/gateways@2023-10-01-preview": { - "$ref": "applications/applications.core/2023-10-01-preview/types.json#/202" + "$ref": "applications/applications.core/2023-10-01-preview/types.json#/210" }, "Applications.Core/secretStores@2023-10-01-preview": { - "$ref": "applications/applications.core/2023-10-01-preview/types.json#/237" + "$ref": "applications/applications.core/2023-10-01-preview/types.json#/246" }, "Applications.Core/volumes@2023-10-01-preview": { - "$ref": "applications/applications.core/2023-10-01-preview/types.json#/274" + "$ref": "applications/applications.core/2023-10-01-preview/types.json#/284" }, "Applications.Dapr/configurationStores@2023-10-01-preview": { - "$ref": "applications/applications.dapr/2023-10-01-preview/types.json#/48" + "$ref": "applications/applications.dapr/2023-10-01-preview/types.json#/49" }, "Applications.Dapr/pubSubBrokers@2023-10-01-preview": { - "$ref": "applications/applications.dapr/2023-10-01-preview/types.json#/67" + "$ref": "applications/applications.dapr/2023-10-01-preview/types.json#/69" }, "Applications.Dapr/secretStores@2023-10-01-preview": { - "$ref": "applications/applications.dapr/2023-10-01-preview/types.json#/85" + "$ref": "applications/applications.dapr/2023-10-01-preview/types.json#/88" }, "Applications.Dapr/stateStores@2023-10-01-preview": { - "$ref": "applications/applications.dapr/2023-10-01-preview/types.json#/104" + "$ref": "applications/applications.dapr/2023-10-01-preview/types.json#/108" }, "Applications.Datastores/mongoDatabases@2023-10-01-preview": { - "$ref": "applications/applications.datastores/2023-10-01-preview/types.json#/48" + "$ref": "applications/applications.datastores/2023-10-01-preview/types.json#/49" }, "Applications.Datastores/redisCaches@2023-10-01-preview": { - "$ref": "applications/applications.datastores/2023-10-01-preview/types.json#/69" + "$ref": "applications/applications.datastores/2023-10-01-preview/types.json#/71" }, "Applications.Datastores/sqlDatabases@2023-10-01-preview": { - "$ref": "applications/applications.datastores/2023-10-01-preview/types.json#/90" + "$ref": "applications/applications.datastores/2023-10-01-preview/types.json#/93" }, "Applications.Messaging/rabbitMQQueues@2023-10-01-preview": { - "$ref": "applications/applications.messaging/2023-10-01-preview/types.json#/48" + "$ref": "applications/applications.messaging/2023-10-01-preview/types.json#/49" } }, "resourceFunctions": {}, diff --git a/hack/bicep-types-radius/src/autorest.bicep/package-lock.json b/hack/bicep-types-radius/src/autorest.bicep/package-lock.json index dda6c2fa45..195c4fa06e 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/package-lock.json +++ b/hack/bicep-types-radius/src/autorest.bicep/package-lock.json @@ -2762,7 +2762,11 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, - "license": "Apache-2.0", + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, diff --git a/hack/bicep-types-radius/src/generator/package-lock.json b/hack/bicep-types-radius/src/generator/package-lock.json index 570f81ef19..f024924758 100644 --- a/hack/bicep-types-radius/src/generator/package-lock.json +++ b/hack/bicep-types-radius/src/generator/package-lock.json @@ -1681,6 +1681,30 @@ "node": ">=10.13.0" } }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/globals": { "version": "14.0.0", "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", diff --git a/pkg/corerp/api/v20231001preview/zz_generated_constants.go b/pkg/corerp/api/v20231001preview/zz_generated_constants.go index ba115de74b..585fce3e5b 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_constants.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_constants.go @@ -148,12 +148,14 @@ type IAMKind string const ( // IAMKindAzure - Azure Active Directory IAMKindAzure IAMKind = "azure" + IAMKindString IAMKind = "string" ) // PossibleIAMKindValues returns the possible values for the IAMKind const type. func PossibleIAMKindValues() []IAMKind { return []IAMKind{ IAMKindAzure, + IAMKindString, } } @@ -257,17 +259,19 @@ type ProvisioningState string const ( // ProvisioningStateAccepted - The resource create request has been accepted ProvisioningStateAccepted ProvisioningState = "Accepted" - // ProvisioningStateCanceled - Resource creation was canceled. + // ProvisioningStateCanceled - The resource provisioning has been canceled ProvisioningStateCanceled ProvisioningState = "Canceled" + // ProvisioningStateCreating - The resource is being created + ProvisioningStateCreating ProvisioningState = "Creating" // ProvisioningStateDeleting - The resource is being deleted ProvisioningStateDeleting ProvisioningState = "Deleting" - // ProvisioningStateFailed - Resource creation failed. + // ProvisioningStateFailed - The resource provisioning has failed ProvisioningStateFailed ProvisioningState = "Failed" // ProvisioningStateProvisioning - The resource is being provisioned ProvisioningStateProvisioning ProvisioningState = "Provisioning" - // ProvisioningStateSucceeded - Resource has been created. + // ProvisioningStateSucceeded - The resource has been successfully provisioned ProvisioningStateSucceeded ProvisioningState = "Succeeded" - // ProvisioningStateUpdating - The resource is updating + // ProvisioningStateUpdating - The resource is being updated ProvisioningStateUpdating ProvisioningState = "Updating" ) @@ -276,6 +280,7 @@ func PossibleProvisioningStateValues() []ProvisioningState { return []ProvisioningState{ ProvisioningStateAccepted, ProvisioningStateCanceled, + ProvisioningStateCreating, ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateProvisioning, @@ -373,7 +378,7 @@ func PossibleSecretValueEncodingValues() []SecretValueEncoding { } } -// TLSMinVersion - Tls Minimum versions for Gateway resource. +// TLSMinVersion - TLS minimum protocol version (defaults to 1.2). type TLSMinVersion string const ( @@ -391,21 +396,6 @@ func PossibleTLSMinVersionValues() []TLSMinVersion { } } -// Versions - Supported API versions for the Applications.Core resource provider. -type Versions string - -const ( - // VersionsV20231001Preview - 2023-10-01-preview - VersionsV20231001Preview Versions = "2023-10-01-preview" -) - -// PossibleVersionsValues returns the possible values for the Versions const type. -func PossibleVersionsValues() []Versions { - return []Versions{ - VersionsV20231001Preview, - } -} - // VolumePermission - The persistent volume permission type VolumePermission string @@ -424,7 +414,7 @@ func PossibleVolumePermissionValues() []VolumePermission { } } -// VolumeSecretEncodings - Represents secret encodings +// VolumeSecretEncodings - Encoding format. Default utf-8 type VolumeSecretEncodings string const ( diff --git a/pkg/corerp/api/v20231001preview/zz_generated_containers_client.go b/pkg/corerp/api/v20231001preview/zz_generated_containers_client.go index a31e1f316b..fa59c000c5 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_containers_client.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_containers_client.go @@ -145,7 +145,7 @@ func (client *ContainersClient) deleteOperation(ctx context.Context, containerNa if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/corerp/api/v20231001preview/zz_generated_extenders_client.go b/pkg/corerp/api/v20231001preview/zz_generated_extenders_client.go index 2ce262bee5..eefd86b561 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_extenders_client.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_extenders_client.go @@ -145,7 +145,7 @@ func (client *ExtendersClient) deleteOperation(ctx context.Context, extenderName if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } @@ -330,7 +330,7 @@ func (client *ExtendersClient) listSecretsCreateRequest(ctx context.Context, ext // listSecretsHandleResponse handles the ListSecrets response. func (client *ExtendersClient) listSecretsHandleResponse(resp *http.Response) (ExtendersClientListSecretsResponse, error) { result := ExtendersClientListSecretsResponse{} - if err := runtime.UnmarshalAsJSON(resp, &result.Object); err != nil { + if err := runtime.UnmarshalAsJSON(resp, &result.Value); err != nil { return ExtendersClientListSecretsResponse{}, err } return result, nil diff --git a/pkg/corerp/api/v20231001preview/zz_generated_gateways_client.go b/pkg/corerp/api/v20231001preview/zz_generated_gateways_client.go index 3db7e727b6..05e3175058 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_gateways_client.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_gateways_client.go @@ -210,7 +210,7 @@ func (client *GatewaysClient) deleteOperation(ctx context.Context, gatewayName s if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/corerp/api/v20231001preview/zz_generated_interfaces.go b/pkg/corerp/api/v20231001preview/zz_generated_interfaces.go index 6c2db3e710..9bbe9c0ef3 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_interfaces.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_interfaces.go @@ -16,15 +16,6 @@ type EnvironmentComputeClassification interface { GetEnvironmentCompute() *EnvironmentCompute } -// EnvironmentComputeUpdateClassification provides polymorphic access to related types. -// Call the interface's GetEnvironmentComputeUpdate() method to access the common type. -// Use a type switch to determine the concrete type. The possible types are: -// - *EnvironmentComputeUpdate, *KubernetesComputeUpdate -type EnvironmentComputeUpdateClassification interface { - // GetEnvironmentComputeUpdate returns the EnvironmentComputeUpdate content of the underlying type. - GetEnvironmentComputeUpdate() *EnvironmentComputeUpdate -} - // ExtensionClassification provides polymorphic access to related types. // Call the interface's GetExtension() method to access the common type. // Use a type switch to determine the concrete type. The possible types are: @@ -52,15 +43,6 @@ type RecipePropertiesClassification interface { GetRecipeProperties() *RecipeProperties } -// RecipePropertiesUpdateClassification provides polymorphic access to related types. -// Call the interface's GetRecipePropertiesUpdate() method to access the common type. -// Use a type switch to determine the concrete type. The possible types are: -// - *BicepRecipePropertiesUpdate, *RecipePropertiesUpdate, *TerraformRecipePropertiesUpdate -type RecipePropertiesUpdateClassification interface { - // GetRecipePropertiesUpdate returns the RecipePropertiesUpdate content of the underlying type. - GetRecipePropertiesUpdate() *RecipePropertiesUpdate -} - // VolumeClassification provides polymorphic access to related types. // Call the interface's GetVolume() method to access the common type. // Use a type switch to determine the concrete type. The possible types are: diff --git a/pkg/corerp/api/v20231001preview/zz_generated_models.go b/pkg/corerp/api/v20231001preview/zz_generated_models.go index eb6837df67..00a1ad5695 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_models.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_models.go @@ -106,22 +106,22 @@ type ApplicationResourceListResult struct { NextLink *string } -// ApplicationResourceUpdate - The type used for update operations of the ApplicationResource. +// ApplicationResourceUpdate - Radius Application resource type ApplicationResourceUpdate struct { - // The updatable properties of the ApplicationResource. - Properties *ApplicationResourceUpdateProperties - // Resource tags. Tags map[string]*string -} -// ApplicationResourceUpdateProperties - The updatable properties of the ApplicationResource. -type ApplicationResourceUpdateProperties struct { - // Fully qualified resource ID for the environment that the application is linked to - Environment *string + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // The application extension. - Extensions []ExtensionClassification + // READ-ONLY; The name of the resource + Name *string + + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData + + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // AuthConfig - Authentication information used to access private Terraform module sources. Supported module sources: Git. @@ -171,6 +171,25 @@ func (a *AzureKeyVaultVolumeProperties) GetVolumeProperties() *VolumeProperties } } +// AzureResourceManagerCommonTypesTrackedResourceUpdate - The resource model definition for an Azure Resource Manager tracked +// top level resource which has 'tags' and a 'location' +type AzureResourceManagerCommonTypesTrackedResourceUpdate struct { + // Resource tags. + Tags map[string]*string + + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string + + // READ-ONLY; The name of the resource + Name *string + + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData + + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string +} + // BicepConfigProperties - Configuration for Bicep Recipes. Controls how Bicep plans and applies templates as part of Recipe // deployment. type BicepConfigProperties struct { @@ -204,31 +223,6 @@ func (b *BicepRecipeProperties) GetRecipeProperties() *RecipeProperties { } } -// BicepRecipePropertiesUpdate - Represents Bicep recipe properties. -type BicepRecipePropertiesUpdate struct { - // REQUIRED; Discriminator property for RecipeProperties. - TemplateKind *string - - // Key/value parameters to pass to the recipe template at deployment. - Parameters map[string]any - - // Connect to the Bicep registry using HTTP (not-HTTPS). This should be used when the registry is known not to support HTTPS, -// for example in a locally-hosted registry. Defaults to false (use HTTPS/TLS). - PlainHTTP *bool - - // Path to the template provided by the recipe. Currently only link to Azure Container Registry is supported. - TemplatePath *string -} - -// GetRecipePropertiesUpdate implements the RecipePropertiesUpdateClassification interface for type BicepRecipePropertiesUpdate. -func (b *BicepRecipePropertiesUpdate) GetRecipePropertiesUpdate() *RecipePropertiesUpdate { - return &RecipePropertiesUpdate{ - Parameters: b.Parameters, - TemplateKind: b.TemplateKind, - TemplatePath: b.TemplatePath, - } -} - // CertificateObjectProperties - Represents certificate object properties type CertificateObjectProperties struct { // REQUIRED; The name of the certificate @@ -262,18 +256,6 @@ type ConnectionProperties struct { Iam *IamProperties } -// ConnectionPropertiesUpdate - Connection Properties -type ConnectionPropertiesUpdate struct { - // default environment variable override - DisableDefaultEnvVars *bool - - // iam properties - Iam *IamPropertiesUpdate - - // The source of the connection - Source *string -} - // Container - Definition of a container type Container struct { // REQUIRED; The registry and image to download and run in your container @@ -323,22 +305,6 @@ type ContainerPortProperties struct { Scheme *string } -// ContainerPortPropertiesUpdate - Specifies a listening port for the container -type ContainerPortPropertiesUpdate struct { - // The listening port number - ContainerPort *int32 - - // Specifies the port that will be exposed by this container. Must be set when value different from containerPort is desired - Port *int32 - - // Protocol in use by the port - Protocol *PortProtocol - - // Specifies the URL scheme of the communication protocol. Consumers can use the scheme to construct a URL. The value defaults -// to 'http' or 'https' depending on the port value - Scheme *string -} - // ContainerProperties - Container properties type ContainerProperties struct { // REQUIRED; Fully qualified resource ID for the application @@ -411,79 +377,23 @@ type ContainerResourceListResult struct { NextLink *string } -// ContainerResourceUpdate - The type used for update operations of the ContainerResource. +// ContainerResourceUpdate - Concrete tracked resource types can be created by aliasing this type using a specific property +// type. type ContainerResourceUpdate struct { - // The updatable properties of the ContainerResource. - Properties *ContainerResourceUpdateProperties - // Resource tags. Tags map[string]*string -} - -// ContainerResourceUpdateProperties - The updatable properties of the ContainerResource. -type ContainerResourceUpdateProperties struct { - // Fully qualified resource ID for the application - Application *string - - // Specifies a connection to another resource. - Connections map[string]*ConnectionPropertiesUpdate - - // Definition of a container. - Container *ContainerUpdate - - // Fully qualified resource ID for the environment that the application is linked to - Environment *string - // Extensions spec of the resource - Extensions []ExtensionClassification - - // Configuration for supported external identity providers - Identity *IdentitySettingsUpdate - - // Specifies how the underlying container resource is provisioned and managed. - ResourceProvisioning *ContainerResourceProvisioning - - // A collection of references to resources associated with the container - Resources []*ResourceReference - - // The restart policy for the underlying container - RestartPolicy *RestartPolicy - - // Specifies Runtime-specific functionality - Runtimes *RuntimesProperties -} - -// ContainerUpdate - Definition of a container -type ContainerUpdate struct { - // Arguments to the entrypoint. Overrides the container image's CMD - Args []*string - - // Entrypoint array. Overrides the container image's ENTRYPOINT - Command []*string - - // environment - Env map[string]*EnvironmentVariableUpdate - - // The registry and image to download and run in your container - Image *string - - // The pull policy for the container image - ImagePullPolicy *ImagePullPolicy - - // liveness probe properties - LivenessProbe HealthProbePropertiesClassification - - // container ports - Ports map[string]*ContainerPortPropertiesUpdate + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // readiness probe properties - ReadinessProbe HealthProbePropertiesClassification + // READ-ONLY; The name of the resource + Name *string - // container volumes - Volumes map[string]VolumeClassification + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // Working directory for the container - WorkingDir *string + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // DaprSidecarExtension - Specifies the resource should have a Dapr sidecar injected @@ -526,21 +436,6 @@ type EnvironmentCompute struct { // GetEnvironmentCompute implements the EnvironmentComputeClassification interface for type EnvironmentCompute. func (e *EnvironmentCompute) GetEnvironmentCompute() *EnvironmentCompute { return e } -// EnvironmentComputeUpdate - Represents backing compute resource -type EnvironmentComputeUpdate struct { - // REQUIRED; Discriminator property for EnvironmentCompute. - Kind *string - - // Configuration for supported external identity providers - Identity *IdentitySettingsUpdate - - // The resource id of the compute resource for application environment. - ResourceID *string -} - -// GetEnvironmentComputeUpdate implements the EnvironmentComputeUpdateClassification interface for type EnvironmentComputeUpdate. -func (e *EnvironmentComputeUpdate) GetEnvironmentComputeUpdate() *EnvironmentComputeUpdate { return e } - // EnvironmentProperties - Environment properties type EnvironmentProperties struct { // REQUIRED; The compute resource used by application environment. @@ -598,34 +493,22 @@ type EnvironmentResourceListResult struct { NextLink *string } -// EnvironmentResourceUpdate - The type used for update operations of the EnvironmentResource. +// EnvironmentResourceUpdate - The environment resource type EnvironmentResourceUpdate struct { - // The updatable properties of the EnvironmentResource. - Properties *EnvironmentResourceUpdateProperties - // Resource tags. Tags map[string]*string -} -// EnvironmentResourceUpdateProperties - The updatable properties of the EnvironmentResource. -type EnvironmentResourceUpdateProperties struct { - // The compute resource used by application environment. - Compute EnvironmentComputeUpdateClassification - - // The environment extension. - Extensions []ExtensionClassification - - // Cloud providers configuration for the environment. - Providers *ProvidersUpdate + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Configuration for Recipes. Defines how each type of Recipe should be configured and run. - RecipeConfig *RecipeConfigProperties + // READ-ONLY; The name of the resource + Name *string - // Specifies Recipes linked to the Environment. - Recipes map[string]map[string]RecipePropertiesUpdateClassification + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // Simulated environment. - Simulated *bool + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // EnvironmentVariable - Environment variables type @@ -643,21 +526,6 @@ type EnvironmentVariableReference struct { SecretRef *SecretReference } -// EnvironmentVariableReferenceUpdate - The reference to the variable -type EnvironmentVariableReferenceUpdate struct { - // The secret reference - SecretRef *SecretReferenceUpdate -} - -// EnvironmentVariableUpdate - Environment variables type -type EnvironmentVariableUpdate struct { - // The value of the environment variable - Value *string - - // The reference to the variable - ValueFrom *EnvironmentVariableReferenceUpdate -} - // EphemeralVolume - Specifies an ephemeral volume for a container type EphemeralVolume struct { // REQUIRED; Discriminator property for Volume. @@ -804,31 +672,22 @@ type ExtenderResourceListResult struct { NextLink *string } -// ExtenderResourceUpdate - The type used for update operations of the ExtenderResource. +// ExtenderResourceUpdate - ExtenderResource portable resource type ExtenderResourceUpdate struct { - // The updatable properties of the ExtenderResource. - Properties *ExtenderResourceUpdateProperties - // Resource tags. Tags map[string]*string -} -// ExtenderResourceUpdateProperties - The updatable properties of the ExtenderResource. -type ExtenderResourceUpdateProperties struct { - // Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) - Application *string - - // Fully qualified resource ID for the environment that the portable resource is linked to - Environment *string + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // The recipe used to automatically deploy underlying infrastructure for the extender portable resource - Recipe *RecipeUpdate + // READ-ONLY; The name of the resource + Name *string - // Specifies how the underlying service/resource is provisioned and managed. - ResourceProvisioning *ResourceProvisioning + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // The secrets for referenced resource - Secrets map[string]any + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // Extension of a environment/application resource. @@ -914,34 +773,23 @@ type GatewayResourceListResult struct { NextLink *string } -// GatewayResourceUpdate - The type used for update operations of the GatewayResource. +// GatewayResourceUpdate - Concrete tracked resource types can be created by aliasing this type using a specific property +// type. type GatewayResourceUpdate struct { - // The updatable properties of the GatewayResource. - Properties *GatewayResourceUpdateProperties - // Resource tags. Tags map[string]*string -} -// GatewayResourceUpdateProperties - The updatable properties of the GatewayResource. -type GatewayResourceUpdateProperties struct { - // Fully qualified resource ID for the application - Application *string - - // Fully qualified resource ID for the environment that the application is linked to - Environment *string - - // Declare hostname information for the Gateway. Leaving the hostname empty auto-assigns one: mygateway.myapp.PUBLICHOSTNAMEORIP.nip.io. - Hostname *GatewayHostname + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Sets Gateway to not be exposed externally (no public IP address associated). Defaults to false (exposed to internet). - Internal *bool + // READ-ONLY; The name of the resource + Name *string - // Routes attached to this Gateway - Routes []*GatewayRoute + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // TLS configuration for the Gateway. - TLS *GatewayTLS + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // GatewayRoute - Route attached to Gateway @@ -1046,15 +894,6 @@ type IamProperties struct { Roles []*string } -// IamPropertiesUpdate - IAM properties -type IamPropertiesUpdate struct { - // The kind of IAM provider to configure - Kind *IAMKind - - // RBAC permissions to be assigned on the source resource - Roles []*string -} - // IdentitySettings is the external identity setting. type IdentitySettings struct { // REQUIRED; kind of identity setting @@ -1067,18 +906,6 @@ type IdentitySettings struct { Resource *string } -// IdentitySettingsUpdate - IdentitySettings is the external identity setting. -type IdentitySettingsUpdate struct { - // kind of identity setting - Kind *IdentitySettingKind - - // The URI for your compute platform's OIDC issuer - OidcIssuer *string - - // The resource ID of the provisioned identity - Resource *string -} - // KeyObjectProperties - Represents key object properties type KeyObjectProperties struct { // REQUIRED; The name of the key @@ -1115,30 +942,6 @@ func (k *KubernetesCompute) GetEnvironmentCompute() *EnvironmentCompute { } } -// KubernetesComputeUpdate - The Kubernetes compute configuration -type KubernetesComputeUpdate struct { - // REQUIRED; Discriminator property for EnvironmentCompute. - Kind *string - - // Configuration for supported external identity providers - Identity *IdentitySettingsUpdate - - // The namespace to use for the environment. - Namespace *string - - // The resource id of the compute resource for application environment. - ResourceID *string -} - -// GetEnvironmentComputeUpdate implements the EnvironmentComputeUpdateClassification interface for type KubernetesComputeUpdate. -func (k *KubernetesComputeUpdate) GetEnvironmentComputeUpdate() *EnvironmentComputeUpdate { - return &EnvironmentComputeUpdate{ - Identity: k.Identity, - Kind: k.Kind, - ResourceID: k.ResourceID, - } -} - // KubernetesMetadataExtension - Kubernetes metadata extension of a environment/application resource. type KubernetesMetadataExtension struct { // REQUIRED; Discriminator property for Extension. @@ -1312,33 +1115,12 @@ type ProvidersAws struct { Scope *string } -// ProvidersAwsUpdate - The AWS cloud provider definition. -type ProvidersAwsUpdate struct { - // Target scope for AWS resources to be deployed into. For example: '/planes/aws/aws/accounts/000000000000/regions/us-west-2'. - Scope *string -} - // ProvidersAzure - The Azure cloud provider definition. type ProvidersAzure struct { // REQUIRED; Target scope for Azure resources to be deployed into. For example: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup'. Scope *string } -// ProvidersAzureUpdate - The Azure cloud provider definition. -type ProvidersAzureUpdate struct { - // Target scope for Azure resources to be deployed into. For example: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup'. - Scope *string -} - -// ProvidersUpdate - The Cloud providers configuration. -type ProvidersUpdate struct { - // The AWS cloud provider configuration. - Aws *ProvidersAwsUpdate - - // The Azure cloud provider configuration. - Azure *ProvidersAzureUpdate -} - // Recipe - The recipe used to automatically deploy underlying infrastructure for a portable resource type Recipe struct { // REQUIRED; The name of the recipe within the environment to use @@ -1409,21 +1191,6 @@ type RecipeProperties struct { // GetRecipeProperties implements the RecipePropertiesClassification interface for type RecipeProperties. func (r *RecipeProperties) GetRecipeProperties() *RecipeProperties { return r } -// RecipePropertiesUpdate - Format of the template provided by the recipe. Allowed values: bicep, terraform. -type RecipePropertiesUpdate struct { - // REQUIRED; Discriminator property for RecipeProperties. - TemplateKind *string - - // Key/value parameters to pass to the recipe template at deployment. - Parameters map[string]any - - // Path to the template provided by the recipe. Currently only link to Azure Container Registry is supported. - TemplatePath *string -} - -// GetRecipePropertiesUpdate implements the RecipePropertiesUpdateClassification interface for type RecipePropertiesUpdate. -func (r *RecipePropertiesUpdate) GetRecipePropertiesUpdate() *RecipePropertiesUpdate { return r } - // RecipeStatus - Recipe status at deployment time for a resource. type RecipeStatus struct { // REQUIRED; TemplateKind is the kind of the recipe template used by the portable resource upon deployment. @@ -1436,15 +1203,6 @@ type RecipeStatus struct { TemplateVersion *string } -// RecipeUpdate - The recipe used to automatically deploy underlying infrastructure for a portable resource -type RecipeUpdate struct { - // The name of the recipe within the environment to use - Name *string - - // Key/value parameters to pass into the recipe at deployment - Parameters map[string]any -} - // RegistrySecretConfig - Registry Secret Configuration used to authenticate to private bicep registries. type RegistrySecretConfig struct { // The ID of an Applications.Core/SecretStore resource containing credential information used to authenticate private container @@ -1524,16 +1282,6 @@ type SecretReference struct { Source *string } -// SecretReferenceUpdate - This secret is used within a recipe. Secrets are encrypted, often have fine-grained access control, -// auditing and are recommended to be used to hold sensitive data. -type SecretReferenceUpdate struct { - // The key for the secret in the secret store. - Key *string - - // The ID of an Applications.Core/SecretStore resource containing sensitive data required for recipe execution. - Source *string -} - // SecretStoreListSecretsResult - The list of secrets type SecretStoreListSecretsResult struct { // REQUIRED; An object to represent key-value type secrets @@ -1600,31 +1348,23 @@ type SecretStoreResourceListResult struct { NextLink *string } -// SecretStoreResourceUpdate - The type used for update operations of the SecretStoreResource. +// SecretStoreResourceUpdate - Concrete tracked resource types can be created by aliasing this type using a specific property +// type. type SecretStoreResourceUpdate struct { - // The updatable properties of the SecretStoreResource. - Properties *SecretStoreResourceUpdateProperties - // Resource tags. Tags map[string]*string -} - -// SecretStoreResourceUpdateProperties - The updatable properties of the SecretStoreResource. -type SecretStoreResourceUpdateProperties struct { - // Fully qualified resource ID for the application - Application *string - // An object to represent key-value type secrets - Data map[string]*SecretValueProperties + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Fully qualified resource ID for the environment that the application is linked to - Environment *string + // READ-ONLY; The name of the resource + Name *string - // The resource id of external secret store. - Resource *string + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // The type of secret store data - Type *SecretStoreDataType + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // SecretValueProperties - The properties of SecretValue @@ -1729,31 +1469,6 @@ func (t *TerraformRecipeProperties) GetRecipeProperties() *RecipeProperties { } } -// TerraformRecipePropertiesUpdate - Represents Terraform recipe properties. -type TerraformRecipePropertiesUpdate struct { - // REQUIRED; Discriminator property for RecipeProperties. - TemplateKind *string - - // Key/value parameters to pass to the recipe template at deployment. - Parameters map[string]any - - // Path to the template provided by the recipe. Currently only link to Azure Container Registry is supported. - TemplatePath *string - - // Version of the template to deploy. For Terraform recipes using a module registry this is required, but must be omitted -// for other module sources. - TemplateVersion *string -} - -// GetRecipePropertiesUpdate implements the RecipePropertiesUpdateClassification interface for type TerraformRecipePropertiesUpdate. -func (t *TerraformRecipePropertiesUpdate) GetRecipePropertiesUpdate() *RecipePropertiesUpdate { - return &RecipePropertiesUpdate{ - Parameters: t.Parameters, - TemplateKind: t.TemplateKind, - TemplatePath: t.TemplatePath, - } -} - // TrackedResource - The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' // and a 'location' type TrackedResource struct { @@ -1851,21 +1566,21 @@ type VolumeResourceListResult struct { NextLink *string } -// VolumeResourceUpdate - The type used for update operations of the VolumeResource. +// VolumeResourceUpdate - Radius Volume resource. type VolumeResourceUpdate struct { - // The updatable properties of the VolumeResource. - Properties *VolumeResourceUpdateProperties - // Resource tags. Tags map[string]*string -} -// VolumeResourceUpdateProperties - The updatable properties of the VolumeResource. -type VolumeResourceUpdateProperties struct { - // Fully qualified resource ID for the application - Application *string + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Fully qualified resource ID for the environment that the application is linked to - Environment *string + // READ-ONLY; The name of the resource + Name *string + + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData + + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } diff --git a/pkg/corerp/api/v20231001preview/zz_generated_models_serde.go b/pkg/corerp/api/v20231001preview/zz_generated_models_serde.go index 87f3ce04da..d02daf69d5 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_models_serde.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_models_serde.go @@ -278,8 +278,11 @@ func (a *ApplicationResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type ApplicationResourceUpdate. func (a ApplicationResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", a.Properties) + populate(objectMap, "id", a.ID) + populate(objectMap, "name", a.Name) + populate(objectMap, "systemData", a.SystemData) populate(objectMap, "tags", a.Tags) + populate(objectMap, "type", a.Type) return json.Marshal(objectMap) } @@ -292,42 +295,20 @@ func (a *ApplicationResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &a.Properties) + case "id": + err = unpopulate(val, "ID", &a.ID) + delete(rawMsg, key) + case "name": + err = unpopulate(val, "Name", &a.Name) + delete(rawMsg, key) + case "systemData": + err = unpopulate(val, "SystemData", &a.SystemData) delete(rawMsg, key) case "tags": err = unpopulate(val, "Tags", &a.Tags) delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", a, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type ApplicationResourceUpdateProperties. -func (a ApplicationResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "environment", a.Environment) - populate(objectMap, "extensions", a.Extensions) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type ApplicationResourceUpdateProperties. -func (a *ApplicationResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", a, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "environment": - err = unpopulate(val, "Environment", &a.Environment) - delete(rawMsg, key) - case "extensions": - a.Extensions, err = unmarshalExtensionClassificationArray(val) + case "type": + err = unpopulate(val, "Type", &a.Type) delete(rawMsg, key) } if err != nil { @@ -423,45 +404,58 @@ func (a *AzureKeyVaultVolumeProperties) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type BicepConfigProperties. -func (b BicepConfigProperties) MarshalJSON() ([]byte, error) { +// MarshalJSON implements the json.Marshaller interface for type AzureResourceManagerCommonTypesTrackedResourceUpdate. +func (a AzureResourceManagerCommonTypesTrackedResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "authentication", b.Authentication) + populate(objectMap, "id", a.ID) + populate(objectMap, "name", a.Name) + populate(objectMap, "systemData", a.SystemData) + populate(objectMap, "tags", a.Tags) + populate(objectMap, "type", a.Type) return json.Marshal(objectMap) } -// UnmarshalJSON implements the json.Unmarshaller interface for type BicepConfigProperties. -func (b *BicepConfigProperties) UnmarshalJSON(data []byte) error { +// UnmarshalJSON implements the json.Unmarshaller interface for type AzureResourceManagerCommonTypesTrackedResourceUpdate. +func (a *AzureResourceManagerCommonTypesTrackedResourceUpdate) UnmarshalJSON(data []byte) error { var rawMsg map[string]json.RawMessage if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", b, err) + return fmt.Errorf("unmarshalling type %T: %v", a, err) } for key, val := range rawMsg { var err error switch key { - case "authentication": - err = unpopulate(val, "Authentication", &b.Authentication) + case "id": + err = unpopulate(val, "ID", &a.ID) + delete(rawMsg, key) + case "name": + err = unpopulate(val, "Name", &a.Name) + delete(rawMsg, key) + case "systemData": + err = unpopulate(val, "SystemData", &a.SystemData) + delete(rawMsg, key) + case "tags": + err = unpopulate(val, "Tags", &a.Tags) + delete(rawMsg, key) + case "type": + err = unpopulate(val, "Type", &a.Type) delete(rawMsg, key) } if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", b, err) + return fmt.Errorf("unmarshalling type %T: %v", a, err) } } return nil } -// MarshalJSON implements the json.Marshaller interface for type BicepRecipeProperties. -func (b BicepRecipeProperties) MarshalJSON() ([]byte, error) { +// MarshalJSON implements the json.Marshaller interface for type BicepConfigProperties. +func (b BicepConfigProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "parameters", b.Parameters) - populate(objectMap, "plainHttp", b.PlainHTTP) - objectMap["templateKind"] = "bicep" - populate(objectMap, "templatePath", b.TemplatePath) + populate(objectMap, "authentication", b.Authentication) return json.Marshal(objectMap) } -// UnmarshalJSON implements the json.Unmarshaller interface for type BicepRecipeProperties. -func (b *BicepRecipeProperties) UnmarshalJSON(data []byte) error { +// UnmarshalJSON implements the json.Unmarshaller interface for type BicepConfigProperties. +func (b *BicepConfigProperties) UnmarshalJSON(data []byte) error { var rawMsg map[string]json.RawMessage if err := json.Unmarshal(data, &rawMsg); err != nil { return fmt.Errorf("unmarshalling type %T: %v", b, err) @@ -469,17 +463,8 @@ func (b *BicepRecipeProperties) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "parameters": - err = unpopulate(val, "Parameters", &b.Parameters) - delete(rawMsg, key) - case "plainHttp": - err = unpopulate(val, "PlainHTTP", &b.PlainHTTP) - delete(rawMsg, key) - case "templateKind": - err = unpopulate(val, "TemplateKind", &b.TemplateKind) - delete(rawMsg, key) - case "templatePath": - err = unpopulate(val, "TemplatePath", &b.TemplatePath) + case "authentication": + err = unpopulate(val, "Authentication", &b.Authentication) delete(rawMsg, key) } if err != nil { @@ -489,8 +474,8 @@ func (b *BicepRecipeProperties) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type BicepRecipePropertiesUpdate. -func (b BicepRecipePropertiesUpdate) MarshalJSON() ([]byte, error) { +// MarshalJSON implements the json.Marshaller interface for type BicepRecipeProperties. +func (b BicepRecipeProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) populate(objectMap, "parameters", b.Parameters) populate(objectMap, "plainHttp", b.PlainHTTP) @@ -499,8 +484,8 @@ func (b BicepRecipePropertiesUpdate) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// UnmarshalJSON implements the json.Unmarshaller interface for type BicepRecipePropertiesUpdate. -func (b *BicepRecipePropertiesUpdate) UnmarshalJSON(data []byte) error { +// UnmarshalJSON implements the json.Unmarshaller interface for type BicepRecipeProperties. +func (b *BicepRecipeProperties) UnmarshalJSON(data []byte) error { var rawMsg map[string]json.RawMessage if err := json.Unmarshal(data, &rawMsg); err != nil { return fmt.Errorf("unmarshalling type %T: %v", b, err) @@ -610,41 +595,6 @@ func (c *ConnectionProperties) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type ConnectionPropertiesUpdate. -func (c ConnectionPropertiesUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "disableDefaultEnvVars", c.DisableDefaultEnvVars) - populate(objectMap, "iam", c.Iam) - populate(objectMap, "source", c.Source) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type ConnectionPropertiesUpdate. -func (c *ConnectionPropertiesUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "disableDefaultEnvVars": - err = unpopulate(val, "DisableDefaultEnvVars", &c.DisableDefaultEnvVars) - delete(rawMsg, key) - case "iam": - err = unpopulate(val, "Iam", &c.Iam) - delete(rawMsg, key) - case "source": - err = unpopulate(val, "Source", &c.Source) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type Container. func (c Container) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -747,45 +697,6 @@ func (c *ContainerPortProperties) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type ContainerPortPropertiesUpdate. -func (c ContainerPortPropertiesUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "containerPort", c.ContainerPort) - populate(objectMap, "port", c.Port) - populate(objectMap, "protocol", c.Protocol) - populate(objectMap, "scheme", c.Scheme) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type ContainerPortPropertiesUpdate. -func (c *ContainerPortPropertiesUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "containerPort": - err = unpopulate(val, "ContainerPort", &c.ContainerPort) - delete(rawMsg, key) - case "port": - err = unpopulate(val, "Port", &c.Port) - delete(rawMsg, key) - case "protocol": - err = unpopulate(val, "Protocol", &c.Protocol) - delete(rawMsg, key) - case "scheme": - err = unpopulate(val, "Scheme", &c.Scheme) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type ContainerProperties. func (c ContainerProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -942,8 +853,11 @@ func (c *ContainerResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type ContainerResourceUpdate. func (c ContainerResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", c.Properties) + populate(objectMap, "id", c.ID) + populate(objectMap, "name", c.Name) + populate(objectMap, "systemData", c.SystemData) populate(objectMap, "tags", c.Tags) + populate(objectMap, "type", c.Type) return json.Marshal(objectMap) } @@ -956,137 +870,20 @@ func (c *ContainerResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &c.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &c.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type ContainerResourceUpdateProperties. -func (c ContainerResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", c.Application) - populate(objectMap, "connections", c.Connections) - populate(objectMap, "container", c.Container) - populate(objectMap, "environment", c.Environment) - populate(objectMap, "extensions", c.Extensions) - populate(objectMap, "identity", c.Identity) - populate(objectMap, "resourceProvisioning", c.ResourceProvisioning) - populate(objectMap, "resources", c.Resources) - populate(objectMap, "restartPolicy", c.RestartPolicy) - populate(objectMap, "runtimes", c.Runtimes) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type ContainerResourceUpdateProperties. -func (c *ContainerResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &c.Application) - delete(rawMsg, key) - case "connections": - err = unpopulate(val, "Connections", &c.Connections) - delete(rawMsg, key) - case "container": - err = unpopulate(val, "Container", &c.Container) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &c.Environment) - delete(rawMsg, key) - case "extensions": - c.Extensions, err = unmarshalExtensionClassificationArray(val) - delete(rawMsg, key) - case "identity": - err = unpopulate(val, "Identity", &c.Identity) - delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &c.ResourceProvisioning) - delete(rawMsg, key) - case "resources": - err = unpopulate(val, "Resources", &c.Resources) - delete(rawMsg, key) - case "restartPolicy": - err = unpopulate(val, "RestartPolicy", &c.RestartPolicy) - delete(rawMsg, key) - case "runtimes": - err = unpopulate(val, "Runtimes", &c.Runtimes) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type ContainerUpdate. -func (c ContainerUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "args", c.Args) - populate(objectMap, "command", c.Command) - populate(objectMap, "env", c.Env) - populate(objectMap, "image", c.Image) - populate(objectMap, "imagePullPolicy", c.ImagePullPolicy) - populate(objectMap, "livenessProbe", c.LivenessProbe) - populate(objectMap, "ports", c.Ports) - populate(objectMap, "readinessProbe", c.ReadinessProbe) - populate(objectMap, "volumes", c.Volumes) - populate(objectMap, "workingDir", c.WorkingDir) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type ContainerUpdate. -func (c *ContainerUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "args": - err = unpopulate(val, "Args", &c.Args) - delete(rawMsg, key) - case "command": - err = unpopulate(val, "Command", &c.Command) - delete(rawMsg, key) - case "env": - err = unpopulate(val, "Env", &c.Env) - delete(rawMsg, key) - case "image": - err = unpopulate(val, "Image", &c.Image) - delete(rawMsg, key) - case "imagePullPolicy": - err = unpopulate(val, "ImagePullPolicy", &c.ImagePullPolicy) - delete(rawMsg, key) - case "livenessProbe": - c.LivenessProbe, err = unmarshalHealthProbePropertiesClassification(val) + case "id": + err = unpopulate(val, "ID", &c.ID) delete(rawMsg, key) - case "ports": - err = unpopulate(val, "Ports", &c.Ports) + case "name": + err = unpopulate(val, "Name", &c.Name) delete(rawMsg, key) - case "readinessProbe": - c.ReadinessProbe, err = unmarshalHealthProbePropertiesClassification(val) + case "systemData": + err = unpopulate(val, "SystemData", &c.SystemData) delete(rawMsg, key) - case "volumes": - c.Volumes, err = unmarshalVolumeClassificationMap(val) + case "tags": + err = unpopulate(val, "Tags", &c.Tags) delete(rawMsg, key) - case "workingDir": - err = unpopulate(val, "WorkingDir", &c.WorkingDir) + case "type": + err = unpopulate(val, "Type", &c.Type) delete(rawMsg, key) } if err != nil { @@ -1174,41 +971,6 @@ func (e *EnvironmentCompute) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type EnvironmentComputeUpdate. -func (e EnvironmentComputeUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "identity", e.Identity) - objectMap["kind"] = e.Kind - populate(objectMap, "resourceId", e.ResourceID) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type EnvironmentComputeUpdate. -func (e *EnvironmentComputeUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "identity": - err = unpopulate(val, "Identity", &e.Identity) - delete(rawMsg, key) - case "kind": - err = unpopulate(val, "Kind", &e.Kind) - delete(rawMsg, key) - case "resourceId": - err = unpopulate(val, "ResourceID", &e.ResourceID) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type EnvironmentProperties. func (e EnvironmentProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -1356,8 +1118,11 @@ func (e *EnvironmentResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type EnvironmentResourceUpdate. func (e EnvironmentResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", e.Properties) + populate(objectMap, "id", e.ID) + populate(objectMap, "name", e.Name) + populate(objectMap, "systemData", e.SystemData) populate(objectMap, "tags", e.Tags) + populate(objectMap, "type", e.Type) return json.Marshal(objectMap) } @@ -1370,69 +1135,20 @@ func (e *EnvironmentResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &e.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &e.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type EnvironmentResourceUpdateProperties. -func (e EnvironmentResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "compute", e.Compute) - populate(objectMap, "extensions", e.Extensions) - populate(objectMap, "providers", e.Providers) - populate(objectMap, "recipeConfig", e.RecipeConfig) - populate(objectMap, "recipes", e.Recipes) - populate(objectMap, "simulated", e.Simulated) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type EnvironmentResourceUpdateProperties. -func (e *EnvironmentResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "compute": - e.Compute, err = unmarshalEnvironmentComputeUpdateClassification(val) - delete(rawMsg, key) - case "extensions": - e.Extensions, err = unmarshalExtensionClassificationArray(val) + case "id": + err = unpopulate(val, "ID", &e.ID) delete(rawMsg, key) - case "providers": - err = unpopulate(val, "Providers", &e.Providers) + case "name": + err = unpopulate(val, "Name", &e.Name) delete(rawMsg, key) - case "recipeConfig": - err = unpopulate(val, "RecipeConfig", &e.RecipeConfig) + case "systemData": + err = unpopulate(val, "SystemData", &e.SystemData) delete(rawMsg, key) - case "recipes": - var recipesRaw map[string]json.RawMessage - if err = json.Unmarshal(val, &recipesRaw); err != nil { - return err - } - recipes := map[string]map[string]RecipePropertiesUpdateClassification{} - for k1, v1 := range recipesRaw { - recipes[k1], err = unmarshalRecipePropertiesUpdateClassificationMap(v1) - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - } - e.Recipes = recipes + case "tags": + err = unpopulate(val, "Tags", &e.Tags) delete(rawMsg, key) - case "simulated": - err = unpopulate(val, "Simulated", &e.Simulated) + case "type": + err = unpopulate(val, "Type", &e.Type) delete(rawMsg, key) } if err != nil { @@ -1500,64 +1216,6 @@ func (e *EnvironmentVariableReference) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type EnvironmentVariableReferenceUpdate. -func (e EnvironmentVariableReferenceUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "secretRef", e.SecretRef) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type EnvironmentVariableReferenceUpdate. -func (e *EnvironmentVariableReferenceUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "secretRef": - err = unpopulate(val, "SecretRef", &e.SecretRef) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type EnvironmentVariableUpdate. -func (e EnvironmentVariableUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "value", e.Value) - populate(objectMap, "valueFrom", e.ValueFrom) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type EnvironmentVariableUpdate. -func (e *EnvironmentVariableUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "value": - err = unpopulate(val, "Value", &e.Value) - delete(rawMsg, key) - case "valueFrom": - err = unpopulate(val, "ValueFrom", &e.ValueFrom) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type EphemeralVolume. func (e EphemeralVolume) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -1892,8 +1550,11 @@ func (e *ExtenderResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type ExtenderResourceUpdate. func (e ExtenderResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", e.Properties) + populate(objectMap, "id", e.ID) + populate(objectMap, "name", e.Name) + populate(objectMap, "systemData", e.SystemData) populate(objectMap, "tags", e.Tags) + populate(objectMap, "type", e.Type) return json.Marshal(objectMap) } @@ -1906,54 +1567,20 @@ func (e *ExtenderResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &e.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &e.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type ExtenderResourceUpdateProperties. -func (e ExtenderResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", e.Application) - populate(objectMap, "environment", e.Environment) - populate(objectMap, "recipe", e.Recipe) - populate(objectMap, "resourceProvisioning", e.ResourceProvisioning) - populate(objectMap, "secrets", e.Secrets) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type ExtenderResourceUpdateProperties. -func (e *ExtenderResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", e, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &e.Application) + case "id": + err = unpopulate(val, "ID", &e.ID) delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &e.Environment) + case "name": + err = unpopulate(val, "Name", &e.Name) delete(rawMsg, key) - case "recipe": - err = unpopulate(val, "Recipe", &e.Recipe) + case "systemData": + err = unpopulate(val, "SystemData", &e.SystemData) delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &e.ResourceProvisioning) + case "tags": + err = unpopulate(val, "Tags", &e.Tags) delete(rawMsg, key) - case "secrets": - err = unpopulate(val, "Secrets", &e.Secrets) + case "type": + err = unpopulate(val, "Type", &e.Type) delete(rawMsg, key) } if err != nil { @@ -2165,8 +1792,11 @@ func (g *GatewayResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type GatewayResourceUpdate. func (g GatewayResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", g.Properties) + populate(objectMap, "id", g.ID) + populate(objectMap, "name", g.Name) + populate(objectMap, "systemData", g.SystemData) populate(objectMap, "tags", g.Tags) + populate(objectMap, "type", g.Type) return json.Marshal(objectMap) } @@ -2179,58 +1809,20 @@ func (g *GatewayResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &g.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &g.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", g, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type GatewayResourceUpdateProperties. -func (g GatewayResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", g.Application) - populate(objectMap, "environment", g.Environment) - populate(objectMap, "hostname", g.Hostname) - populate(objectMap, "internal", g.Internal) - populate(objectMap, "routes", g.Routes) - populate(objectMap, "tls", g.TLS) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type GatewayResourceUpdateProperties. -func (g *GatewayResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", g, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &g.Application) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &g.Environment) + case "id": + err = unpopulate(val, "ID", &g.ID) delete(rawMsg, key) - case "hostname": - err = unpopulate(val, "Hostname", &g.Hostname) + case "name": + err = unpopulate(val, "Name", &g.Name) delete(rawMsg, key) - case "internal": - err = unpopulate(val, "Internal", &g.Internal) + case "systemData": + err = unpopulate(val, "SystemData", &g.SystemData) delete(rawMsg, key) - case "routes": - err = unpopulate(val, "Routes", &g.Routes) + case "tags": + err = unpopulate(val, "Tags", &g.Tags) delete(rawMsg, key) - case "tls": - err = unpopulate(val, "TLS", &g.TLS) + case "type": + err = unpopulate(val, "Type", &g.Type) delete(rawMsg, key) } if err != nil { @@ -2470,37 +2062,6 @@ func (i *IamProperties) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type IamPropertiesUpdate. -func (i IamPropertiesUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "kind", i.Kind) - populate(objectMap, "roles", i.Roles) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type IamPropertiesUpdate. -func (i *IamPropertiesUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", i, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "kind": - err = unpopulate(val, "Kind", &i.Kind) - delete(rawMsg, key) - case "roles": - err = unpopulate(val, "Roles", &i.Roles) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", i, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type IdentitySettings. func (i IdentitySettings) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -2536,41 +2097,6 @@ func (i *IdentitySettings) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type IdentitySettingsUpdate. -func (i IdentitySettingsUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "kind", i.Kind) - populate(objectMap, "oidcIssuer", i.OidcIssuer) - populate(objectMap, "resource", i.Resource) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type IdentitySettingsUpdate. -func (i *IdentitySettingsUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", i, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "kind": - err = unpopulate(val, "Kind", &i.Kind) - delete(rawMsg, key) - case "oidcIssuer": - err = unpopulate(val, "OidcIssuer", &i.OidcIssuer) - delete(rawMsg, key) - case "resource": - err = unpopulate(val, "Resource", &i.Resource) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", i, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type KeyObjectProperties. func (k KeyObjectProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -2645,45 +2171,6 @@ func (k *KubernetesCompute) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type KubernetesComputeUpdate. -func (k KubernetesComputeUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "identity", k.Identity) - objectMap["kind"] = "kubernetes" - populate(objectMap, "namespace", k.Namespace) - populate(objectMap, "resourceId", k.ResourceID) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type KubernetesComputeUpdate. -func (k *KubernetesComputeUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", k, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "identity": - err = unpopulate(val, "Identity", &k.Identity) - delete(rawMsg, key) - case "kind": - err = unpopulate(val, "Kind", &k.Kind) - delete(rawMsg, key) - case "namespace": - err = unpopulate(val, "Namespace", &k.Namespace) - delete(rawMsg, key) - case "resourceId": - err = unpopulate(val, "ResourceID", &k.ResourceID) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", k, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type KubernetesMetadataExtension. func (k KubernetesMetadataExtension) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -3025,98 +2512,13 @@ func (p *ProviderConfigProperties) UnmarshalJSON(data []byte) error { delete(rawMsg, key) default: if p.AdditionalProperties == nil { - p.AdditionalProperties = map[string]any{} - } - if val != nil { - var aux any - err = json.Unmarshal(val, &aux) - p.AdditionalProperties[key] = aux - } - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", p, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type Providers. -func (p Providers) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "aws", p.Aws) - populate(objectMap, "azure", p.Azure) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type Providers. -func (p *Providers) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", p, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "aws": - err = unpopulate(val, "Aws", &p.Aws) - delete(rawMsg, key) - case "azure": - err = unpopulate(val, "Azure", &p.Azure) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", p, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type ProvidersAws. -func (p ProvidersAws) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "scope", p.Scope) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type ProvidersAws. -func (p *ProvidersAws) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", p, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "scope": - err = unpopulate(val, "Scope", &p.Scope) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", p, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type ProvidersAwsUpdate. -func (p ProvidersAwsUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "scope", p.Scope) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type ProvidersAwsUpdate. -func (p *ProvidersAwsUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", p, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "scope": - err = unpopulate(val, "Scope", &p.Scope) + p.AdditionalProperties = map[string]any{} + } + if val != nil { + var aux any + err = json.Unmarshal(val, &aux) + p.AdditionalProperties[key] = aux + } delete(rawMsg, key) } if err != nil { @@ -3126,15 +2528,16 @@ func (p *ProvidersAwsUpdate) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type ProvidersAzure. -func (p ProvidersAzure) MarshalJSON() ([]byte, error) { +// MarshalJSON implements the json.Marshaller interface for type Providers. +func (p Providers) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "scope", p.Scope) + populate(objectMap, "aws", p.Aws) + populate(objectMap, "azure", p.Azure) return json.Marshal(objectMap) } -// UnmarshalJSON implements the json.Unmarshaller interface for type ProvidersAzure. -func (p *ProvidersAzure) UnmarshalJSON(data []byte) error { +// UnmarshalJSON implements the json.Unmarshaller interface for type Providers. +func (p *Providers) UnmarshalJSON(data []byte) error { var rawMsg map[string]json.RawMessage if err := json.Unmarshal(data, &rawMsg); err != nil { return fmt.Errorf("unmarshalling type %T: %v", p, err) @@ -3142,8 +2545,11 @@ func (p *ProvidersAzure) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "scope": - err = unpopulate(val, "Scope", &p.Scope) + case "aws": + err = unpopulate(val, "Aws", &p.Aws) + delete(rawMsg, key) + case "azure": + err = unpopulate(val, "Azure", &p.Azure) delete(rawMsg, key) } if err != nil { @@ -3153,15 +2559,15 @@ func (p *ProvidersAzure) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type ProvidersAzureUpdate. -func (p ProvidersAzureUpdate) MarshalJSON() ([]byte, error) { +// MarshalJSON implements the json.Marshaller interface for type ProvidersAws. +func (p ProvidersAws) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) populate(objectMap, "scope", p.Scope) return json.Marshal(objectMap) } -// UnmarshalJSON implements the json.Unmarshaller interface for type ProvidersAzureUpdate. -func (p *ProvidersAzureUpdate) UnmarshalJSON(data []byte) error { +// UnmarshalJSON implements the json.Unmarshaller interface for type ProvidersAws. +func (p *ProvidersAws) UnmarshalJSON(data []byte) error { var rawMsg map[string]json.RawMessage if err := json.Unmarshal(data, &rawMsg); err != nil { return fmt.Errorf("unmarshalling type %T: %v", p, err) @@ -3180,16 +2586,15 @@ func (p *ProvidersAzureUpdate) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type ProvidersUpdate. -func (p ProvidersUpdate) MarshalJSON() ([]byte, error) { +// MarshalJSON implements the json.Marshaller interface for type ProvidersAzure. +func (p ProvidersAzure) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "aws", p.Aws) - populate(objectMap, "azure", p.Azure) + populate(objectMap, "scope", p.Scope) return json.Marshal(objectMap) } -// UnmarshalJSON implements the json.Unmarshaller interface for type ProvidersUpdate. -func (p *ProvidersUpdate) UnmarshalJSON(data []byte) error { +// UnmarshalJSON implements the json.Unmarshaller interface for type ProvidersAzure. +func (p *ProvidersAzure) UnmarshalJSON(data []byte) error { var rawMsg map[string]json.RawMessage if err := json.Unmarshal(data, &rawMsg); err != nil { return fmt.Errorf("unmarshalling type %T: %v", p, err) @@ -3197,11 +2602,8 @@ func (p *ProvidersUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "aws": - err = unpopulate(val, "Aws", &p.Aws) - delete(rawMsg, key) - case "azure": - err = unpopulate(val, "Azure", &p.Azure) + case "scope": + err = unpopulate(val, "Scope", &p.Scope) delete(rawMsg, key) } if err != nil { @@ -3390,41 +2792,6 @@ func (r *RecipeProperties) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type RecipePropertiesUpdate. -func (r RecipePropertiesUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "parameters", r.Parameters) - objectMap["templateKind"] = r.TemplateKind - populate(objectMap, "templatePath", r.TemplatePath) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type RecipePropertiesUpdate. -func (r *RecipePropertiesUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "parameters": - err = unpopulate(val, "Parameters", &r.Parameters) - delete(rawMsg, key) - case "templateKind": - err = unpopulate(val, "TemplateKind", &r.TemplateKind) - delete(rawMsg, key) - case "templatePath": - err = unpopulate(val, "TemplatePath", &r.TemplatePath) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type RecipeStatus. func (r RecipeStatus) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -3460,37 +2827,6 @@ func (r *RecipeStatus) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type RecipeUpdate. -func (r RecipeUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "name", r.Name) - populate(objectMap, "parameters", r.Parameters) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type RecipeUpdate. -func (r *RecipeUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "name": - err = unpopulate(val, "Name", &r.Name) - delete(rawMsg, key) - case "parameters": - err = unpopulate(val, "Parameters", &r.Parameters) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type RegistrySecretConfig. func (r RegistrySecretConfig) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -3743,37 +3079,6 @@ func (s *SecretReference) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type SecretReferenceUpdate. -func (s SecretReferenceUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "key", s.Key) - populate(objectMap, "source", s.Source) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type SecretReferenceUpdate. -func (s *SecretReferenceUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", s, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "key": - err = unpopulate(val, "Key", &s.Key) - delete(rawMsg, key) - case "source": - err = unpopulate(val, "Source", &s.Source) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", s, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type SecretStoreListSecretsResult. func (s SecretStoreListSecretsResult) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -3941,8 +3246,11 @@ func (s *SecretStoreResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type SecretStoreResourceUpdate. func (s SecretStoreResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", s.Properties) + populate(objectMap, "id", s.ID) + populate(objectMap, "name", s.Name) + populate(objectMap, "systemData", s.SystemData) populate(objectMap, "tags", s.Tags) + populate(objectMap, "type", s.Type) return json.Marshal(objectMap) } @@ -3955,51 +3263,17 @@ func (s *SecretStoreResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &s.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &s.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", s, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type SecretStoreResourceUpdateProperties. -func (s SecretStoreResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", s.Application) - populate(objectMap, "data", s.Data) - populate(objectMap, "environment", s.Environment) - populate(objectMap, "resource", s.Resource) - populate(objectMap, "type", s.Type) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type SecretStoreResourceUpdateProperties. -func (s *SecretStoreResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", s, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &s.Application) + case "id": + err = unpopulate(val, "ID", &s.ID) delete(rawMsg, key) - case "data": - err = unpopulate(val, "Data", &s.Data) + case "name": + err = unpopulate(val, "Name", &s.Name) delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &s.Environment) + case "systemData": + err = unpopulate(val, "SystemData", &s.SystemData) delete(rawMsg, key) - case "resource": - err = unpopulate(val, "Resource", &s.Resource) + case "tags": + err = unpopulate(val, "Tags", &s.Tags) delete(rawMsg, key) case "type": err = unpopulate(val, "Type", &s.Type) @@ -4211,45 +3485,6 @@ func (t *TerraformRecipeProperties) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type TerraformRecipePropertiesUpdate. -func (t TerraformRecipePropertiesUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "parameters", t.Parameters) - objectMap["templateKind"] = "terraform" - populate(objectMap, "templatePath", t.TemplatePath) - populate(objectMap, "templateVersion", t.TemplateVersion) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type TerraformRecipePropertiesUpdate. -func (t *TerraformRecipePropertiesUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", t, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "parameters": - err = unpopulate(val, "Parameters", &t.Parameters) - delete(rawMsg, key) - case "templateKind": - err = unpopulate(val, "TemplateKind", &t.TemplateKind) - delete(rawMsg, key) - case "templatePath": - err = unpopulate(val, "TemplatePath", &t.TemplatePath) - delete(rawMsg, key) - case "templateVersion": - err = unpopulate(val, "TemplateVersion", &t.TemplateVersion) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", t, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type TrackedResource. func (t TrackedResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -4487,8 +3722,11 @@ func (v *VolumeResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type VolumeResourceUpdate. func (v VolumeResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", v.Properties) + populate(objectMap, "id", v.ID) + populate(objectMap, "name", v.Name) + populate(objectMap, "systemData", v.SystemData) populate(objectMap, "tags", v.Tags) + populate(objectMap, "type", v.Type) return json.Marshal(objectMap) } @@ -4501,42 +3739,20 @@ func (v *VolumeResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &v.Properties) + case "id": + err = unpopulate(val, "ID", &v.ID) + delete(rawMsg, key) + case "name": + err = unpopulate(val, "Name", &v.Name) + delete(rawMsg, key) + case "systemData": + err = unpopulate(val, "SystemData", &v.SystemData) delete(rawMsg, key) case "tags": err = unpopulate(val, "Tags", &v.Tags) delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", v, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type VolumeResourceUpdateProperties. -func (v VolumeResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", v.Application) - populate(objectMap, "environment", v.Environment) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type VolumeResourceUpdateProperties. -func (v *VolumeResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", v, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &v.Application) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &v.Environment) + case "type": + err = unpopulate(val, "Type", &v.Type) delete(rawMsg, key) } if err != nil { diff --git a/pkg/corerp/api/v20231001preview/zz_generated_polymorphic_helpers.go b/pkg/corerp/api/v20231001preview/zz_generated_polymorphic_helpers.go index 543b2e01c9..176251b27b 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_polymorphic_helpers.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_polymorphic_helpers.go @@ -30,27 +30,6 @@ func unmarshalEnvironmentComputeClassification(rawMsg json.RawMessage) (Environm return b, nil } -func unmarshalEnvironmentComputeUpdateClassification(rawMsg json.RawMessage) (EnvironmentComputeUpdateClassification, error) { - if rawMsg == nil { - return nil, nil - } - var m map[string]any - if err := json.Unmarshal(rawMsg, &m); err != nil { - return nil, err - } - var b EnvironmentComputeUpdateClassification - switch m["kind"] { - case "kubernetes": - b = &KubernetesComputeUpdate{} - default: - b = &EnvironmentComputeUpdate{} - } - if err := json.Unmarshal(rawMsg, b); err != nil { - return nil, err - } - return b, nil -} - func unmarshalExtensionClassification(rawMsg json.RawMessage) (ExtensionClassification, error) { if rawMsg == nil { return nil, nil @@ -164,48 +143,6 @@ func unmarshalRecipePropertiesClassificationMap(rawMsg json.RawMessage) (map[str return fMap, nil } -func unmarshalRecipePropertiesUpdateClassification(rawMsg json.RawMessage) (RecipePropertiesUpdateClassification, error) { - if rawMsg == nil { - return nil, nil - } - var m map[string]any - if err := json.Unmarshal(rawMsg, &m); err != nil { - return nil, err - } - var b RecipePropertiesUpdateClassification - switch m["templateKind"] { - case "bicep": - b = &BicepRecipePropertiesUpdate{} - case "terraform": - b = &TerraformRecipePropertiesUpdate{} - default: - b = &RecipePropertiesUpdate{} - } - if err := json.Unmarshal(rawMsg, b); err != nil { - return nil, err - } - return b, nil -} - -func unmarshalRecipePropertiesUpdateClassificationMap(rawMsg json.RawMessage) (map[string]RecipePropertiesUpdateClassification, error) { - if rawMsg == nil { - return nil, nil - } - var rawMessages map[string]json.RawMessage - if err := json.Unmarshal(rawMsg, &rawMessages); err != nil { - return nil, err - } - fMap := make(map[string]RecipePropertiesUpdateClassification, len(rawMessages)) - for key, rawMessage := range rawMessages { - f, err := unmarshalRecipePropertiesUpdateClassification(rawMessage) - if err != nil { - return nil, err - } - fMap[key] = f - } - return fMap, nil -} - func unmarshalVolumeClassification(rawMsg json.RawMessage) (VolumeClassification, error) { if rawMsg == nil { return nil, nil diff --git a/pkg/corerp/api/v20231001preview/zz_generated_response_types.go b/pkg/corerp/api/v20231001preview/zz_generated_response_types.go index d00c2577bf..8322ebd40c 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_response_types.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_response_types.go @@ -131,8 +131,8 @@ type ExtendersClientListByScopeResponse struct { // ExtendersClientListSecretsResponse contains the response from method ExtendersClient.ListSecrets. type ExtendersClientListSecretsResponse struct { - // Any object - Object map[string]any + // Response for list secrets API call + Value map[string]any } // ExtendersClientUpdateResponse contains the response from method ExtendersClient.BeginUpdate. diff --git a/pkg/corerp/api/v20231001preview/zz_generated_secretstores_client.go b/pkg/corerp/api/v20231001preview/zz_generated_secretstores_client.go index 2486c3dc7c..760cfa2260 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_secretstores_client.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_secretstores_client.go @@ -146,7 +146,7 @@ func (client *SecretStoresClient) deleteOperation(ctx context.Context, secretSto if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/corerp/api/v20231001preview/zz_generated_volumes_client.go b/pkg/corerp/api/v20231001preview/zz_generated_volumes_client.go index 5b6a16773e..a371b7191a 100644 --- a/pkg/corerp/api/v20231001preview/zz_generated_volumes_client.go +++ b/pkg/corerp/api/v20231001preview/zz_generated_volumes_client.go @@ -145,7 +145,7 @@ func (client *VolumesClient) deleteOperation(ctx context.Context, volumeName str if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/daprrp/api/v20231001preview/zz_generated_configurationstores_client.go b/pkg/daprrp/api/v20231001preview/zz_generated_configurationstores_client.go index 56cafd78e9..105be3a538 100644 --- a/pkg/daprrp/api/v20231001preview/zz_generated_configurationstores_client.go +++ b/pkg/daprrp/api/v20231001preview/zz_generated_configurationstores_client.go @@ -146,7 +146,7 @@ func (client *ConfigurationStoresClient) deleteOperation(ctx context.Context, co if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/daprrp/api/v20231001preview/zz_generated_constants.go b/pkg/daprrp/api/v20231001preview/zz_generated_constants.go index bf40cc2d3c..dee57fba78 100644 --- a/pkg/daprrp/api/v20231001preview/zz_generated_constants.go +++ b/pkg/daprrp/api/v20231001preview/zz_generated_constants.go @@ -89,17 +89,19 @@ type ProvisioningState string const ( // ProvisioningStateAccepted - The resource create request has been accepted ProvisioningStateAccepted ProvisioningState = "Accepted" - // ProvisioningStateCanceled - Resource creation was canceled. + // ProvisioningStateCanceled - The resource provisioning has been canceled ProvisioningStateCanceled ProvisioningState = "Canceled" + // ProvisioningStateCreating - The resource is being created + ProvisioningStateCreating ProvisioningState = "Creating" // ProvisioningStateDeleting - The resource is being deleted ProvisioningStateDeleting ProvisioningState = "Deleting" - // ProvisioningStateFailed - Resource creation failed. + // ProvisioningStateFailed - The resource provisioning has failed ProvisioningStateFailed ProvisioningState = "Failed" // ProvisioningStateProvisioning - The resource is being provisioned ProvisioningStateProvisioning ProvisioningState = "Provisioning" - // ProvisioningStateSucceeded - Resource has been created. + // ProvisioningStateSucceeded - The resource has been successfully provisioned ProvisioningStateSucceeded ProvisioningState = "Succeeded" - // ProvisioningStateUpdating - The resource is updating + // ProvisioningStateUpdating - The resource is being updated ProvisioningStateUpdating ProvisioningState = "Updating" ) @@ -108,6 +110,7 @@ func PossibleProvisioningStateValues() []ProvisioningState { return []ProvisioningState{ ProvisioningStateAccepted, ProvisioningStateCanceled, + ProvisioningStateCreating, ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateProvisioning, @@ -136,18 +139,3 @@ func PossibleResourceProvisioningValues() []ResourceProvisioning { } } -// Versions - Supported API versions for the Applications.Dapr resource provider. -type Versions string - -const ( - // VersionsV20231001Preview - 2023-10-01-preview - VersionsV20231001Preview Versions = "2023-10-01-preview" -) - -// PossibleVersionsValues returns the possible values for the Versions const type. -func PossibleVersionsValues() []Versions { - return []Versions{ - VersionsV20231001Preview, - } -} - diff --git a/pkg/daprrp/api/v20231001preview/zz_generated_models.go b/pkg/daprrp/api/v20231001preview/zz_generated_models.go index 70e58c301a..e6c350c4a7 100644 --- a/pkg/daprrp/api/v20231001preview/zz_generated_models.go +++ b/pkg/daprrp/api/v20231001preview/zz_generated_models.go @@ -9,6 +9,25 @@ package v20231001preview import "time" +// AzureResourceManagerCommonTypesTrackedResourceUpdate - The resource model definition for an Azure Resource Manager tracked +// top level resource which has 'tags' and a 'location' +type AzureResourceManagerCommonTypesTrackedResourceUpdate struct { + // Resource tags. + Tags map[string]*string + + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string + + // READ-ONLY; The name of the resource + Name *string + + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData + + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string +} + // DaprConfigurationStoreProperties - Dapr configuration store portable resource properties type DaprConfigurationStoreProperties struct { // REQUIRED; Fully qualified resource ID for the environment that the portable resource is linked to @@ -82,43 +101,22 @@ type DaprConfigurationStoreResourceListResult struct { NextLink *string } -// DaprConfigurationStoreResourceUpdate - The type used for update operations of the DaprConfigurationStoreResource. +// DaprConfigurationStoreResourceUpdate - Dapr configuration store portable resource type DaprConfigurationStoreResourceUpdate struct { - // The updatable properties of the DaprConfigurationStoreResource. - Properties *DaprConfigurationStoreResourceUpdateProperties - // Resource tags. Tags map[string]*string -} -// DaprConfigurationStoreResourceUpdateProperties - The updatable properties of the DaprConfigurationStoreResource. -type DaprConfigurationStoreResourceUpdateProperties struct { - // Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) - Application *string - - // The name of the Dapr component to be used as a secret store - Auth *DaprResourceAuth - - // Fully qualified resource ID for the environment that the portable resource is linked to - Environment *string - - // The metadata for Dapr resource which must match the values specified in Dapr component spec - Metadata map[string]*MetadataValueUpdate - - // The recipe used to automatically deploy underlying infrastructure for the resource - Recipe *RecipeUpdate + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Specifies how the underlying service/resource is provisioned and managed. - ResourceProvisioning *ResourceProvisioning + // READ-ONLY; The name of the resource + Name *string - // A collection of references to resources associated with the configuration store - Resources []*ResourceReference + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // Dapr component type which must matches the format used by Dapr Kubernetes configuration format + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" Type *string - - // Dapr component version - Version *string } // DaprPubSubBrokerProperties - Dapr PubSubBroker portable resource properties @@ -194,43 +192,22 @@ type DaprPubSubBrokerResourceListResult struct { NextLink *string } -// DaprPubSubBrokerResourceUpdate - The type used for update operations of the DaprPubSubBrokerResource. +// DaprPubSubBrokerResourceUpdate - Dapr PubSubBroker portable resource type DaprPubSubBrokerResourceUpdate struct { - // The updatable properties of the DaprPubSubBrokerResource. - Properties *DaprPubSubBrokerResourceUpdateProperties - // Resource tags. Tags map[string]*string -} - -// DaprPubSubBrokerResourceUpdateProperties - The updatable properties of the DaprPubSubBrokerResource. -type DaprPubSubBrokerResourceUpdateProperties struct { - // Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) - Application *string - // The name of the Dapr component to be used as a secret store - Auth *DaprResourceAuth - - // Fully qualified resource ID for the environment that the portable resource is linked to - Environment *string - - // The metadata for Dapr resource which must match the values specified in Dapr component spec - Metadata map[string]*MetadataValueUpdate - - // The recipe used to automatically deploy underlying infrastructure for the resource - Recipe *RecipeUpdate + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Specifies how the underlying service/resource is provisioned and managed. - ResourceProvisioning *ResourceProvisioning + // READ-ONLY; The name of the resource + Name *string - // A collection of references to resources associated with the pubSubBroker - Resources []*ResourceReference + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // Dapr component type which must matches the format used by Dapr Kubernetes configuration format + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" Type *string - - // Dapr component version - Version *string } // DaprResourceAuth - Authentication properties for a Dapr component object @@ -306,37 +283,22 @@ type DaprSecretStoreResourceListResult struct { NextLink *string } -// DaprSecretStoreResourceUpdate - The type used for update operations of the DaprSecretStoreResource. +// DaprSecretStoreResourceUpdate - Dapr SecretStore portable resource type DaprSecretStoreResourceUpdate struct { - // The updatable properties of the DaprSecretStoreResource. - Properties *DaprSecretStoreResourceUpdateProperties - // Resource tags. Tags map[string]*string -} - -// DaprSecretStoreResourceUpdateProperties - The updatable properties of the DaprSecretStoreResource. -type DaprSecretStoreResourceUpdateProperties struct { - // Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) - Application *string - - // Fully qualified resource ID for the environment that the portable resource is linked to - Environment *string - // The metadata for Dapr resource which must match the values specified in Dapr component spec - Metadata map[string]*MetadataValueUpdate + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // The recipe used to automatically deploy underlying infrastructure for the resource - Recipe *RecipeUpdate + // READ-ONLY; The name of the resource + Name *string - // Specifies how the underlying service/resource is provisioned and managed. - ResourceProvisioning *ResourceProvisioning + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // Dapr component type which must matches the format used by Dapr Kubernetes configuration format + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" Type *string - - // Dapr component version - Version *string } // DaprStateStoreProperties - Dapr StateStore portable resource properties @@ -412,43 +374,22 @@ type DaprStateStoreResourceListResult struct { NextLink *string } -// DaprStateStoreResourceUpdate - The type used for update operations of the DaprStateStoreResource. +// DaprStateStoreResourceUpdate - Dapr StateStore portable resource type DaprStateStoreResourceUpdate struct { - // The updatable properties of the DaprStateStoreResource. - Properties *DaprStateStoreResourceUpdateProperties - // Resource tags. Tags map[string]*string -} -// DaprStateStoreResourceUpdateProperties - The updatable properties of the DaprStateStoreResource. -type DaprStateStoreResourceUpdateProperties struct { - // Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) - Application *string - - // The name of the Dapr component to be used as a secret store - Auth *DaprResourceAuth - - // Fully qualified resource ID for the environment that the portable resource is linked to - Environment *string - - // The metadata for Dapr resource which must match the values specified in Dapr component spec - Metadata map[string]*MetadataValueUpdate - - // The recipe used to automatically deploy underlying infrastructure for the resource - Recipe *RecipeUpdate + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Specifies how the underlying service/resource is provisioned and managed. - ResourceProvisioning *ResourceProvisioning + // READ-ONLY; The name of the resource + Name *string - // A collection of references to resources associated with the state store - Resources []*ResourceReference + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // Dapr component type which must matches the format used by Dapr Kubernetes configuration format + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" Type *string - - // Dapr component version - Version *string } // EnvironmentCompute - Represents backing compute resource @@ -554,24 +495,6 @@ type MetadataValueFromSecret struct { Name *string } -// MetadataValueFromSecretUpdate - A reference of a value in a secret store component. -type MetadataValueFromSecretUpdate struct { - // The field to select in the secret value. If the secret value is a string, it should be equal to the secret name - Key *string - - // Secret name in the secret store component - Name *string -} - -// MetadataValueUpdate - A single metadata for a Dapr component object -type MetadataValueUpdate struct { - // A reference of a value in a secret store component - SecretKeyRef *MetadataValueFromSecretUpdate - - // The plain text value of the metadata - Value *string -} - // NonRedundantDaprResourceProperties - The base properties of a Dapr component object. type NonRedundantDaprResourceProperties struct { // The metadata for Dapr resource which must match the values specified in Dapr component spec @@ -672,15 +595,6 @@ type RecipeStatus struct { TemplateVersion *string } -// RecipeUpdate - The recipe used to automatically deploy underlying infrastructure for a portable resource -type RecipeUpdate struct { - // The name of the recipe within the environment to use - Name *string - - // Key/value parameters to pass into the recipe at deployment - Parameters map[string]any -} - // Resource - Common fields that are returned in the response for all Azure Resource Manager resources type Resource struct { // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} diff --git a/pkg/daprrp/api/v20231001preview/zz_generated_models_serde.go b/pkg/daprrp/api/v20231001preview/zz_generated_models_serde.go index e6d48377f3..2db8519854 100644 --- a/pkg/daprrp/api/v20231001preview/zz_generated_models_serde.go +++ b/pkg/daprrp/api/v20231001preview/zz_generated_models_serde.go @@ -14,6 +14,49 @@ import ( "reflect" ) +// MarshalJSON implements the json.Marshaller interface for type AzureResourceManagerCommonTypesTrackedResourceUpdate. +func (a AzureResourceManagerCommonTypesTrackedResourceUpdate) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]any) + populate(objectMap, "id", a.ID) + populate(objectMap, "name", a.Name) + populate(objectMap, "systemData", a.SystemData) + populate(objectMap, "tags", a.Tags) + populate(objectMap, "type", a.Type) + return json.Marshal(objectMap) +} + +// UnmarshalJSON implements the json.Unmarshaller interface for type AzureResourceManagerCommonTypesTrackedResourceUpdate. +func (a *AzureResourceManagerCommonTypesTrackedResourceUpdate) UnmarshalJSON(data []byte) error { + var rawMsg map[string]json.RawMessage + if err := json.Unmarshal(data, &rawMsg); err != nil { + return fmt.Errorf("unmarshalling type %T: %v", a, err) + } + for key, val := range rawMsg { + var err error + switch key { + case "id": + err = unpopulate(val, "ID", &a.ID) + delete(rawMsg, key) + case "name": + err = unpopulate(val, "Name", &a.Name) + delete(rawMsg, key) + case "systemData": + err = unpopulate(val, "SystemData", &a.SystemData) + delete(rawMsg, key) + case "tags": + err = unpopulate(val, "Tags", &a.Tags) + delete(rawMsg, key) + case "type": + err = unpopulate(val, "Type", &a.Type) + delete(rawMsg, key) + } + if err != nil { + return fmt.Errorf("unmarshalling type %T: %v", a, err) + } + } + return nil +} + // MarshalJSON implements the json.Marshaller interface for type DaprConfigurationStoreProperties. func (d DaprConfigurationStoreProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -170,8 +213,11 @@ func (d *DaprConfigurationStoreResourceListResult) UnmarshalJSON(data []byte) er // MarshalJSON implements the json.Marshaller interface for type DaprConfigurationStoreResourceUpdate. func (d DaprConfigurationStoreResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", d.Properties) + populate(objectMap, "id", d.ID) + populate(objectMap, "name", d.Name) + populate(objectMap, "systemData", d.SystemData) populate(objectMap, "tags", d.Tags) + populate(objectMap, "type", d.Type) return json.Marshal(objectMap) } @@ -184,71 +230,21 @@ func (d *DaprConfigurationStoreResourceUpdate) UnmarshalJSON(data []byte) error for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &d.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &d.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", d, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type DaprConfigurationStoreResourceUpdateProperties. -func (d DaprConfigurationStoreResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", d.Application) - populate(objectMap, "auth", d.Auth) - populate(objectMap, "environment", d.Environment) - populate(objectMap, "metadata", d.Metadata) - populate(objectMap, "recipe", d.Recipe) - populate(objectMap, "resourceProvisioning", d.ResourceProvisioning) - populate(objectMap, "resources", d.Resources) - populate(objectMap, "type", d.Type) - populate(objectMap, "version", d.Version) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type DaprConfigurationStoreResourceUpdateProperties. -func (d *DaprConfigurationStoreResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", d, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &d.Application) - delete(rawMsg, key) - case "auth": - err = unpopulate(val, "Auth", &d.Auth) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &d.Environment) - delete(rawMsg, key) - case "metadata": - err = unpopulate(val, "Metadata", &d.Metadata) + case "id": + err = unpopulate(val, "ID", &d.ID) delete(rawMsg, key) - case "recipe": - err = unpopulate(val, "Recipe", &d.Recipe) + case "name": + err = unpopulate(val, "Name", &d.Name) delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &d.ResourceProvisioning) + case "systemData": + err = unpopulate(val, "SystemData", &d.SystemData) delete(rawMsg, key) - case "resources": - err = unpopulate(val, "Resources", &d.Resources) + case "tags": + err = unpopulate(val, "Tags", &d.Tags) delete(rawMsg, key) case "type": err = unpopulate(val, "Type", &d.Type) delete(rawMsg, key) - case "version": - err = unpopulate(val, "Version", &d.Version) - delete(rawMsg, key) } if err != nil { return fmt.Errorf("unmarshalling type %T: %v", d, err) @@ -413,8 +409,11 @@ func (d *DaprPubSubBrokerResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type DaprPubSubBrokerResourceUpdate. func (d DaprPubSubBrokerResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", d.Properties) + populate(objectMap, "id", d.ID) + populate(objectMap, "name", d.Name) + populate(objectMap, "systemData", d.SystemData) populate(objectMap, "tags", d.Tags) + populate(objectMap, "type", d.Type) return json.Marshal(objectMap) } @@ -427,71 +426,21 @@ func (d *DaprPubSubBrokerResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &d.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &d.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", d, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type DaprPubSubBrokerResourceUpdateProperties. -func (d DaprPubSubBrokerResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", d.Application) - populate(objectMap, "auth", d.Auth) - populate(objectMap, "environment", d.Environment) - populate(objectMap, "metadata", d.Metadata) - populate(objectMap, "recipe", d.Recipe) - populate(objectMap, "resourceProvisioning", d.ResourceProvisioning) - populate(objectMap, "resources", d.Resources) - populate(objectMap, "type", d.Type) - populate(objectMap, "version", d.Version) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type DaprPubSubBrokerResourceUpdateProperties. -func (d *DaprPubSubBrokerResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", d, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &d.Application) - delete(rawMsg, key) - case "auth": - err = unpopulate(val, "Auth", &d.Auth) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &d.Environment) - delete(rawMsg, key) - case "metadata": - err = unpopulate(val, "Metadata", &d.Metadata) + case "id": + err = unpopulate(val, "ID", &d.ID) delete(rawMsg, key) - case "recipe": - err = unpopulate(val, "Recipe", &d.Recipe) + case "name": + err = unpopulate(val, "Name", &d.Name) delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &d.ResourceProvisioning) + case "systemData": + err = unpopulate(val, "SystemData", &d.SystemData) delete(rawMsg, key) - case "resources": - err = unpopulate(val, "Resources", &d.Resources) + case "tags": + err = unpopulate(val, "Tags", &d.Tags) delete(rawMsg, key) case "type": err = unpopulate(val, "Type", &d.Type) delete(rawMsg, key) - case "version": - err = unpopulate(val, "Version", &d.Version) - delete(rawMsg, key) } if err != nil { return fmt.Errorf("unmarshalling type %T: %v", d, err) @@ -675,8 +624,11 @@ func (d *DaprSecretStoreResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type DaprSecretStoreResourceUpdate. func (d DaprSecretStoreResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", d.Properties) + populate(objectMap, "id", d.ID) + populate(objectMap, "name", d.Name) + populate(objectMap, "systemData", d.SystemData) populate(objectMap, "tags", d.Tags) + populate(objectMap, "type", d.Type) return json.Marshal(objectMap) } @@ -689,63 +641,21 @@ func (d *DaprSecretStoreResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &d.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &d.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", d, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type DaprSecretStoreResourceUpdateProperties. -func (d DaprSecretStoreResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", d.Application) - populate(objectMap, "environment", d.Environment) - populate(objectMap, "metadata", d.Metadata) - populate(objectMap, "recipe", d.Recipe) - populate(objectMap, "resourceProvisioning", d.ResourceProvisioning) - populate(objectMap, "type", d.Type) - populate(objectMap, "version", d.Version) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type DaprSecretStoreResourceUpdateProperties. -func (d *DaprSecretStoreResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", d, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &d.Application) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &d.Environment) + case "id": + err = unpopulate(val, "ID", &d.ID) delete(rawMsg, key) - case "metadata": - err = unpopulate(val, "Metadata", &d.Metadata) + case "name": + err = unpopulate(val, "Name", &d.Name) delete(rawMsg, key) - case "recipe": - err = unpopulate(val, "Recipe", &d.Recipe) + case "systemData": + err = unpopulate(val, "SystemData", &d.SystemData) delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &d.ResourceProvisioning) + case "tags": + err = unpopulate(val, "Tags", &d.Tags) delete(rawMsg, key) case "type": err = unpopulate(val, "Type", &d.Type) delete(rawMsg, key) - case "version": - err = unpopulate(val, "Version", &d.Version) - delete(rawMsg, key) } if err != nil { return fmt.Errorf("unmarshalling type %T: %v", d, err) @@ -910,8 +820,11 @@ func (d *DaprStateStoreResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type DaprStateStoreResourceUpdate. func (d DaprStateStoreResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", d.Properties) + populate(objectMap, "id", d.ID) + populate(objectMap, "name", d.Name) + populate(objectMap, "systemData", d.SystemData) populate(objectMap, "tags", d.Tags) + populate(objectMap, "type", d.Type) return json.Marshal(objectMap) } @@ -924,71 +837,21 @@ func (d *DaprStateStoreResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &d.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &d.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", d, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type DaprStateStoreResourceUpdateProperties. -func (d DaprStateStoreResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", d.Application) - populate(objectMap, "auth", d.Auth) - populate(objectMap, "environment", d.Environment) - populate(objectMap, "metadata", d.Metadata) - populate(objectMap, "recipe", d.Recipe) - populate(objectMap, "resourceProvisioning", d.ResourceProvisioning) - populate(objectMap, "resources", d.Resources) - populate(objectMap, "type", d.Type) - populate(objectMap, "version", d.Version) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type DaprStateStoreResourceUpdateProperties. -func (d *DaprStateStoreResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", d, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &d.Application) - delete(rawMsg, key) - case "auth": - err = unpopulate(val, "Auth", &d.Auth) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &d.Environment) - delete(rawMsg, key) - case "metadata": - err = unpopulate(val, "Metadata", &d.Metadata) + case "id": + err = unpopulate(val, "ID", &d.ID) delete(rawMsg, key) - case "recipe": - err = unpopulate(val, "Recipe", &d.Recipe) + case "name": + err = unpopulate(val, "Name", &d.Name) delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &d.ResourceProvisioning) + case "systemData": + err = unpopulate(val, "SystemData", &d.SystemData) delete(rawMsg, key) - case "resources": - err = unpopulate(val, "Resources", &d.Resources) + case "tags": + err = unpopulate(val, "Tags", &d.Tags) delete(rawMsg, key) case "type": err = unpopulate(val, "Type", &d.Type) delete(rawMsg, key) - case "version": - err = unpopulate(val, "Version", &d.Version) - delete(rawMsg, key) } if err != nil { return fmt.Errorf("unmarshalling type %T: %v", d, err) @@ -1269,68 +1132,6 @@ func (m *MetadataValueFromSecret) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type MetadataValueFromSecretUpdate. -func (m MetadataValueFromSecretUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "key", m.Key) - populate(objectMap, "name", m.Name) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type MetadataValueFromSecretUpdate. -func (m *MetadataValueFromSecretUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", m, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "key": - err = unpopulate(val, "Key", &m.Key) - delete(rawMsg, key) - case "name": - err = unpopulate(val, "Name", &m.Name) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", m, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type MetadataValueUpdate. -func (m MetadataValueUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "secretKeyRef", m.SecretKeyRef) - populate(objectMap, "value", m.Value) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type MetadataValueUpdate. -func (m *MetadataValueUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", m, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "secretKeyRef": - err = unpopulate(val, "SecretKeyRef", &m.SecretKeyRef) - delete(rawMsg, key) - case "value": - err = unpopulate(val, "Value", &m.Value) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", m, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type NonRedundantDaprResourceProperties. func (n NonRedundantDaprResourceProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -1584,37 +1385,6 @@ func (r *RecipeStatus) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type RecipeUpdate. -func (r RecipeUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "name", r.Name) - populate(objectMap, "parameters", r.Parameters) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type RecipeUpdate. -func (r *RecipeUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "name": - err = unpopulate(val, "Name", &r.Name) - delete(rawMsg, key) - case "parameters": - err = unpopulate(val, "Parameters", &r.Parameters) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type Resource. func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) diff --git a/pkg/daprrp/api/v20231001preview/zz_generated_pubsubbrokers_client.go b/pkg/daprrp/api/v20231001preview/zz_generated_pubsubbrokers_client.go index ab58312815..89946c0f4b 100644 --- a/pkg/daprrp/api/v20231001preview/zz_generated_pubsubbrokers_client.go +++ b/pkg/daprrp/api/v20231001preview/zz_generated_pubsubbrokers_client.go @@ -146,7 +146,7 @@ func (client *PubSubBrokersClient) deleteOperation(ctx context.Context, pubSubBr if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/daprrp/api/v20231001preview/zz_generated_secretstores_client.go b/pkg/daprrp/api/v20231001preview/zz_generated_secretstores_client.go index 7c2f044762..c25f5df8af 100644 --- a/pkg/daprrp/api/v20231001preview/zz_generated_secretstores_client.go +++ b/pkg/daprrp/api/v20231001preview/zz_generated_secretstores_client.go @@ -146,7 +146,7 @@ func (client *SecretStoresClient) deleteOperation(ctx context.Context, secretSto if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/daprrp/api/v20231001preview/zz_generated_statestores_client.go b/pkg/daprrp/api/v20231001preview/zz_generated_statestores_client.go index f65e8d208a..b456bdc177 100644 --- a/pkg/daprrp/api/v20231001preview/zz_generated_statestores_client.go +++ b/pkg/daprrp/api/v20231001preview/zz_generated_statestores_client.go @@ -145,7 +145,7 @@ func (client *StateStoresClient) deleteOperation(ctx context.Context, stateStore if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/datastoresrp/api/v20231001preview/zz_generated_constants.go b/pkg/datastoresrp/api/v20231001preview/zz_generated_constants.go index 95659ef2fd..dee57fba78 100644 --- a/pkg/datastoresrp/api/v20231001preview/zz_generated_constants.go +++ b/pkg/datastoresrp/api/v20231001preview/zz_generated_constants.go @@ -89,17 +89,19 @@ type ProvisioningState string const ( // ProvisioningStateAccepted - The resource create request has been accepted ProvisioningStateAccepted ProvisioningState = "Accepted" - // ProvisioningStateCanceled - Resource creation was canceled. + // ProvisioningStateCanceled - The resource provisioning has been canceled ProvisioningStateCanceled ProvisioningState = "Canceled" + // ProvisioningStateCreating - The resource is being created + ProvisioningStateCreating ProvisioningState = "Creating" // ProvisioningStateDeleting - The resource is being deleted ProvisioningStateDeleting ProvisioningState = "Deleting" - // ProvisioningStateFailed - Resource creation failed. + // ProvisioningStateFailed - The resource provisioning has failed ProvisioningStateFailed ProvisioningState = "Failed" // ProvisioningStateProvisioning - The resource is being provisioned ProvisioningStateProvisioning ProvisioningState = "Provisioning" - // ProvisioningStateSucceeded - Resource has been created. + // ProvisioningStateSucceeded - The resource has been successfully provisioned ProvisioningStateSucceeded ProvisioningState = "Succeeded" - // ProvisioningStateUpdating - The resource is updating + // ProvisioningStateUpdating - The resource is being updated ProvisioningStateUpdating ProvisioningState = "Updating" ) @@ -108,6 +110,7 @@ func PossibleProvisioningStateValues() []ProvisioningState { return []ProvisioningState{ ProvisioningStateAccepted, ProvisioningStateCanceled, + ProvisioningStateCreating, ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateProvisioning, @@ -136,18 +139,3 @@ func PossibleResourceProvisioningValues() []ResourceProvisioning { } } -// Versions - Supported API versions for the Applications.Databases resource provider. -type Versions string - -const ( - // VersionsV20231001Preview - 2023-10-01-preview - VersionsV20231001Preview Versions = "2023-10-01-preview" -) - -// PossibleVersionsValues returns the possible values for the Versions const type. -func PossibleVersionsValues() []Versions { - return []Versions{ - VersionsV20231001Preview, - } -} - diff --git a/pkg/datastoresrp/api/v20231001preview/zz_generated_models.go b/pkg/datastoresrp/api/v20231001preview/zz_generated_models.go index c6df37003c..824d753f90 100644 --- a/pkg/datastoresrp/api/v20231001preview/zz_generated_models.go +++ b/pkg/datastoresrp/api/v20231001preview/zz_generated_models.go @@ -9,6 +9,25 @@ package v20231001preview import "time" +// AzureResourceManagerCommonTypesTrackedResourceUpdate - The resource model definition for an Azure Resource Manager tracked +// top level resource which has 'tags' and a 'location' +type AzureResourceManagerCommonTypesTrackedResourceUpdate struct { + // Resource tags. + Tags map[string]*string + + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string + + // READ-ONLY; The name of the resource + Name *string + + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData + + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string +} + // EnvironmentCompute - Represents backing compute resource type EnvironmentCompute struct { // REQUIRED; Discriminator property for EnvironmentCompute. @@ -175,46 +194,22 @@ type MongoDatabaseResourceListResult struct { NextLink *string } -// MongoDatabaseResourceUpdate - The type used for update operations of the MongoDatabaseResource. +// MongoDatabaseResourceUpdate - MongoDatabase portable resource type MongoDatabaseResourceUpdate struct { - // The updatable properties of the MongoDatabaseResource. - Properties *MongoDatabaseResourceUpdateProperties - // Resource tags. Tags map[string]*string -} - -// MongoDatabaseResourceUpdateProperties - The updatable properties of the MongoDatabaseResource. -type MongoDatabaseResourceUpdateProperties struct { - // Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) - Application *string - - // Database name of the target Mongo database - Database *string - - // Fully qualified resource ID for the environment that the portable resource is linked to - Environment *string - - // Host name of the target Mongo database - Host *string - - // Port value of the target Mongo database - Port *int32 - - // The recipe used to automatically deploy underlying infrastructure for the resource - Recipe *RecipeUpdate - // Specifies how the underlying service/resource is provisioned and managed. - ResourceProvisioning *ResourceProvisioning + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // List of the resource IDs that support the MongoDB resource - Resources []*ResourceReference + // READ-ONLY; The name of the resource + Name *string - // Secret values provided for the resource - Secrets *MongoDatabaseSecrets + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // Username to use when connecting to the target Mongo database - Username *string + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // MongoDatabaseSecrets - The secret values for the given MongoDatabase resource @@ -310,15 +305,6 @@ type RecipeStatus struct { TemplateVersion *string } -// RecipeUpdate - The recipe used to automatically deploy underlying infrastructure for a portable resource -type RecipeUpdate struct { - // The name of the recipe within the environment to use - Name *string - - // Key/value parameters to pass into the recipe at deployment - Parameters map[string]any -} - // RedisCacheListSecretsResult - The secret values for the given RedisCache resource type RedisCacheListSecretsResult struct { // The connection string used to connect to the Redis cache @@ -403,46 +389,22 @@ type RedisCacheResourceListResult struct { NextLink *string } -// RedisCacheResourceUpdate - The type used for update operations of the RedisCacheResource. +// RedisCacheResourceUpdate - RedisCache portable resource type RedisCacheResourceUpdate struct { - // The updatable properties of the RedisCacheResource. - Properties *RedisCacheResourceUpdateProperties - // Resource tags. Tags map[string]*string -} - -// RedisCacheResourceUpdateProperties - The updatable properties of the RedisCacheResource. -type RedisCacheResourceUpdateProperties struct { - // Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) - Application *string - - // Fully qualified resource ID for the environment that the portable resource is linked to - Environment *string - - // The host name of the target Redis cache - Host *string - - // The port value of the target Redis cache - Port *int32 - - // The recipe used to automatically deploy underlying infrastructure for the resource - Recipe *RecipeUpdate - - // Specifies how the underlying service/resource is provisioned and managed. - ResourceProvisioning *ResourceProvisioning - // List of the resource IDs that support the Redis resource - Resources []*ResourceReference + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Secrets provided by resource - Secrets *RedisCacheSecrets + // READ-ONLY; The name of the resource + Name *string - // Specifies whether to enable SSL connections to the Redis cache - TLS *bool + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // The username for Redis cache - Username *string + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // RedisCacheSecrets - The secret values for the given RedisCache resource @@ -571,46 +533,22 @@ type SQLDatabaseResourceListResult struct { NextLink *string } -// SQLDatabaseResourceUpdate - The type used for update operations of the SqlDatabaseResource. +// SQLDatabaseResourceUpdate - SqlDatabase portable resource type SQLDatabaseResourceUpdate struct { - // The updatable properties of the SqlDatabaseResource. - Properties *SQLDatabaseResourceUpdateProperties - // Resource tags. Tags map[string]*string -} - -// SQLDatabaseResourceUpdateProperties - The updatable properties of the SqlDatabaseResource. -type SQLDatabaseResourceUpdateProperties struct { - // Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) - Application *string - - // The name of the Sql database. - Database *string - - // Fully qualified resource ID for the environment that the portable resource is linked to - Environment *string - - // Port value of the target Sql database - Port *int32 - - // The recipe used to automatically deploy underlying infrastructure for the resource - Recipe *RecipeUpdate - // Specifies how the underlying service/resource is provisioned and managed. - ResourceProvisioning *ResourceProvisioning - - // List of the resource IDs that support the SqlDatabase resource - Resources []*ResourceReference + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Secret values provided for the resource - Secrets *SQLDatabaseSecrets + // READ-ONLY; The name of the resource + Name *string - // The fully qualified domain name of the Sql database. - Server *string + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // Username to use when connecting to the target Sql database - Username *string + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // SQLDatabaseSecrets - The secret values for the given SqlDatabase resource diff --git a/pkg/datastoresrp/api/v20231001preview/zz_generated_models_serde.go b/pkg/datastoresrp/api/v20231001preview/zz_generated_models_serde.go index 9085583ba0..0c7f4f9cc8 100644 --- a/pkg/datastoresrp/api/v20231001preview/zz_generated_models_serde.go +++ b/pkg/datastoresrp/api/v20231001preview/zz_generated_models_serde.go @@ -14,6 +14,49 @@ import ( "reflect" ) +// MarshalJSON implements the json.Marshaller interface for type AzureResourceManagerCommonTypesTrackedResourceUpdate. +func (a AzureResourceManagerCommonTypesTrackedResourceUpdate) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]any) + populate(objectMap, "id", a.ID) + populate(objectMap, "name", a.Name) + populate(objectMap, "systemData", a.SystemData) + populate(objectMap, "tags", a.Tags) + populate(objectMap, "type", a.Type) + return json.Marshal(objectMap) +} + +// UnmarshalJSON implements the json.Unmarshaller interface for type AzureResourceManagerCommonTypesTrackedResourceUpdate. +func (a *AzureResourceManagerCommonTypesTrackedResourceUpdate) UnmarshalJSON(data []byte) error { + var rawMsg map[string]json.RawMessage + if err := json.Unmarshal(data, &rawMsg); err != nil { + return fmt.Errorf("unmarshalling type %T: %v", a, err) + } + for key, val := range rawMsg { + var err error + switch key { + case "id": + err = unpopulate(val, "ID", &a.ID) + delete(rawMsg, key) + case "name": + err = unpopulate(val, "Name", &a.Name) + delete(rawMsg, key) + case "systemData": + err = unpopulate(val, "SystemData", &a.SystemData) + delete(rawMsg, key) + case "tags": + err = unpopulate(val, "Tags", &a.Tags) + delete(rawMsg, key) + case "type": + err = unpopulate(val, "Type", &a.Type) + delete(rawMsg, key) + } + if err != nil { + return fmt.Errorf("unmarshalling type %T: %v", a, err) + } + } + return nil +} + // MarshalJSON implements the json.Marshaller interface for type EnvironmentCompute. func (e EnvironmentCompute) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -411,8 +454,11 @@ func (m *MongoDatabaseResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type MongoDatabaseResourceUpdate. func (m MongoDatabaseResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", m.Properties) + populate(objectMap, "id", m.ID) + populate(objectMap, "name", m.Name) + populate(objectMap, "systemData", m.SystemData) populate(objectMap, "tags", m.Tags) + populate(objectMap, "type", m.Type) return json.Marshal(objectMap) } @@ -425,74 +471,20 @@ func (m *MongoDatabaseResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &m.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &m.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", m, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type MongoDatabaseResourceUpdateProperties. -func (m MongoDatabaseResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", m.Application) - populate(objectMap, "database", m.Database) - populate(objectMap, "environment", m.Environment) - populate(objectMap, "host", m.Host) - populate(objectMap, "port", m.Port) - populate(objectMap, "recipe", m.Recipe) - populate(objectMap, "resourceProvisioning", m.ResourceProvisioning) - populate(objectMap, "resources", m.Resources) - populate(objectMap, "secrets", m.Secrets) - populate(objectMap, "username", m.Username) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type MongoDatabaseResourceUpdateProperties. -func (m *MongoDatabaseResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", m, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &m.Application) - delete(rawMsg, key) - case "database": - err = unpopulate(val, "Database", &m.Database) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &m.Environment) - delete(rawMsg, key) - case "host": - err = unpopulate(val, "Host", &m.Host) - delete(rawMsg, key) - case "port": - err = unpopulate(val, "Port", &m.Port) - delete(rawMsg, key) - case "recipe": - err = unpopulate(val, "Recipe", &m.Recipe) + case "id": + err = unpopulate(val, "ID", &m.ID) delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &m.ResourceProvisioning) + case "name": + err = unpopulate(val, "Name", &m.Name) delete(rawMsg, key) - case "resources": - err = unpopulate(val, "Resources", &m.Resources) + case "systemData": + err = unpopulate(val, "SystemData", &m.SystemData) delete(rawMsg, key) - case "secrets": - err = unpopulate(val, "Secrets", &m.Secrets) + case "tags": + err = unpopulate(val, "Tags", &m.Tags) delete(rawMsg, key) - case "username": - err = unpopulate(val, "Username", &m.Username) + case "type": + err = unpopulate(val, "Type", &m.Type) delete(rawMsg, key) } if err != nil { @@ -747,37 +739,6 @@ func (r *RecipeStatus) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type RecipeUpdate. -func (r RecipeUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "name", r.Name) - populate(objectMap, "parameters", r.Parameters) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type RecipeUpdate. -func (r *RecipeUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "name": - err = unpopulate(val, "Name", &r.Name) - delete(rawMsg, key) - case "parameters": - err = unpopulate(val, "Parameters", &r.Parameters) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type RedisCacheListSecretsResult. func (r RedisCacheListSecretsResult) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -969,8 +930,11 @@ func (r *RedisCacheResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type RedisCacheResourceUpdate. func (r RedisCacheResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", r.Properties) + populate(objectMap, "id", r.ID) + populate(objectMap, "name", r.Name) + populate(objectMap, "systemData", r.SystemData) populate(objectMap, "tags", r.Tags) + populate(objectMap, "type", r.Type) return json.Marshal(objectMap) } @@ -983,74 +947,20 @@ func (r *RedisCacheResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &r.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &r.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type RedisCacheResourceUpdateProperties. -func (r RedisCacheResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", r.Application) - populate(objectMap, "environment", r.Environment) - populate(objectMap, "host", r.Host) - populate(objectMap, "port", r.Port) - populate(objectMap, "recipe", r.Recipe) - populate(objectMap, "resourceProvisioning", r.ResourceProvisioning) - populate(objectMap, "resources", r.Resources) - populate(objectMap, "secrets", r.Secrets) - populate(objectMap, "tls", r.TLS) - populate(objectMap, "username", r.Username) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type RedisCacheResourceUpdateProperties. -func (r *RedisCacheResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &r.Application) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &r.Environment) - delete(rawMsg, key) - case "host": - err = unpopulate(val, "Host", &r.Host) - delete(rawMsg, key) - case "port": - err = unpopulate(val, "Port", &r.Port) - delete(rawMsg, key) - case "recipe": - err = unpopulate(val, "Recipe", &r.Recipe) - delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &r.ResourceProvisioning) + case "id": + err = unpopulate(val, "ID", &r.ID) delete(rawMsg, key) - case "resources": - err = unpopulate(val, "Resources", &r.Resources) + case "name": + err = unpopulate(val, "Name", &r.Name) delete(rawMsg, key) - case "secrets": - err = unpopulate(val, "Secrets", &r.Secrets) + case "systemData": + err = unpopulate(val, "SystemData", &r.SystemData) delete(rawMsg, key) - case "tls": - err = unpopulate(val, "TLS", &r.TLS) + case "tags": + err = unpopulate(val, "Tags", &r.Tags) delete(rawMsg, key) - case "username": - err = unpopulate(val, "Username", &r.Username) + case "type": + err = unpopulate(val, "Type", &r.Type) delete(rawMsg, key) } if err != nil { @@ -1383,8 +1293,11 @@ func (s *SQLDatabaseResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type SQLDatabaseResourceUpdate. func (s SQLDatabaseResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", s.Properties) + populate(objectMap, "id", s.ID) + populate(objectMap, "name", s.Name) + populate(objectMap, "systemData", s.SystemData) populate(objectMap, "tags", s.Tags) + populate(objectMap, "type", s.Type) return json.Marshal(objectMap) } @@ -1397,74 +1310,20 @@ func (s *SQLDatabaseResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &s.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &s.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", s, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type SQLDatabaseResourceUpdateProperties. -func (s SQLDatabaseResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", s.Application) - populate(objectMap, "database", s.Database) - populate(objectMap, "environment", s.Environment) - populate(objectMap, "port", s.Port) - populate(objectMap, "recipe", s.Recipe) - populate(objectMap, "resourceProvisioning", s.ResourceProvisioning) - populate(objectMap, "resources", s.Resources) - populate(objectMap, "secrets", s.Secrets) - populate(objectMap, "server", s.Server) - populate(objectMap, "username", s.Username) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type SQLDatabaseResourceUpdateProperties. -func (s *SQLDatabaseResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", s, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &s.Application) - delete(rawMsg, key) - case "database": - err = unpopulate(val, "Database", &s.Database) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &s.Environment) - delete(rawMsg, key) - case "port": - err = unpopulate(val, "Port", &s.Port) - delete(rawMsg, key) - case "recipe": - err = unpopulate(val, "Recipe", &s.Recipe) - delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &s.ResourceProvisioning) + case "id": + err = unpopulate(val, "ID", &s.ID) delete(rawMsg, key) - case "resources": - err = unpopulate(val, "Resources", &s.Resources) + case "name": + err = unpopulate(val, "Name", &s.Name) delete(rawMsg, key) - case "secrets": - err = unpopulate(val, "Secrets", &s.Secrets) + case "systemData": + err = unpopulate(val, "SystemData", &s.SystemData) delete(rawMsg, key) - case "server": - err = unpopulate(val, "Server", &s.Server) + case "tags": + err = unpopulate(val, "Tags", &s.Tags) delete(rawMsg, key) - case "username": - err = unpopulate(val, "Username", &s.Username) + case "type": + err = unpopulate(val, "Type", &s.Type) delete(rawMsg, key) } if err != nil { diff --git a/pkg/datastoresrp/api/v20231001preview/zz_generated_mongodatabases_client.go b/pkg/datastoresrp/api/v20231001preview/zz_generated_mongodatabases_client.go index 004b1e6306..e6f6bd0a75 100644 --- a/pkg/datastoresrp/api/v20231001preview/zz_generated_mongodatabases_client.go +++ b/pkg/datastoresrp/api/v20231001preview/zz_generated_mongodatabases_client.go @@ -146,7 +146,7 @@ func (client *MongoDatabasesClient) deleteOperation(ctx context.Context, mongoDa if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/datastoresrp/api/v20231001preview/zz_generated_rediscaches_client.go b/pkg/datastoresrp/api/v20231001preview/zz_generated_rediscaches_client.go index 8873ad3514..a2d154735a 100644 --- a/pkg/datastoresrp/api/v20231001preview/zz_generated_rediscaches_client.go +++ b/pkg/datastoresrp/api/v20231001preview/zz_generated_rediscaches_client.go @@ -145,7 +145,7 @@ func (client *RedisCachesClient) deleteOperation(ctx context.Context, redisCache if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/datastoresrp/api/v20231001preview/zz_generated_sqldatabases_client.go b/pkg/datastoresrp/api/v20231001preview/zz_generated_sqldatabases_client.go index 0c22579545..471ab9c017 100644 --- a/pkg/datastoresrp/api/v20231001preview/zz_generated_sqldatabases_client.go +++ b/pkg/datastoresrp/api/v20231001preview/zz_generated_sqldatabases_client.go @@ -146,7 +146,7 @@ func (client *SQLDatabasesClient) deleteOperation(ctx context.Context, sqlDataba if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/messagingrp/api/v20231001preview/zz_generated_constants.go b/pkg/messagingrp/api/v20231001preview/zz_generated_constants.go index 8343a502c5..dee57fba78 100644 --- a/pkg/messagingrp/api/v20231001preview/zz_generated_constants.go +++ b/pkg/messagingrp/api/v20231001preview/zz_generated_constants.go @@ -89,17 +89,19 @@ type ProvisioningState string const ( // ProvisioningStateAccepted - The resource create request has been accepted ProvisioningStateAccepted ProvisioningState = "Accepted" - // ProvisioningStateCanceled - Resource creation was canceled. + // ProvisioningStateCanceled - The resource provisioning has been canceled ProvisioningStateCanceled ProvisioningState = "Canceled" + // ProvisioningStateCreating - The resource is being created + ProvisioningStateCreating ProvisioningState = "Creating" // ProvisioningStateDeleting - The resource is being deleted ProvisioningStateDeleting ProvisioningState = "Deleting" - // ProvisioningStateFailed - Resource creation failed. + // ProvisioningStateFailed - The resource provisioning has failed ProvisioningStateFailed ProvisioningState = "Failed" // ProvisioningStateProvisioning - The resource is being provisioned ProvisioningStateProvisioning ProvisioningState = "Provisioning" - // ProvisioningStateSucceeded - Resource has been created. + // ProvisioningStateSucceeded - The resource has been successfully provisioned ProvisioningStateSucceeded ProvisioningState = "Succeeded" - // ProvisioningStateUpdating - The resource is updating + // ProvisioningStateUpdating - The resource is being updated ProvisioningStateUpdating ProvisioningState = "Updating" ) @@ -108,6 +110,7 @@ func PossibleProvisioningStateValues() []ProvisioningState { return []ProvisioningState{ ProvisioningStateAccepted, ProvisioningStateCanceled, + ProvisioningStateCreating, ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateProvisioning, @@ -136,18 +139,3 @@ func PossibleResourceProvisioningValues() []ResourceProvisioning { } } -// Versions - Supported API versions for the Applications.Messaging resource provider. -type Versions string - -const ( - // VersionsV20231001Preview - 2023-10-01-preview - VersionsV20231001Preview Versions = "2023-10-01-preview" -) - -// PossibleVersionsValues returns the possible values for the Versions const type. -func PossibleVersionsValues() []Versions { - return []Versions{ - VersionsV20231001Preview, - } -} - diff --git a/pkg/messagingrp/api/v20231001preview/zz_generated_models.go b/pkg/messagingrp/api/v20231001preview/zz_generated_models.go index 143e6aa905..a01b5879a5 100644 --- a/pkg/messagingrp/api/v20231001preview/zz_generated_models.go +++ b/pkg/messagingrp/api/v20231001preview/zz_generated_models.go @@ -9,6 +9,25 @@ package v20231001preview import "time" +// AzureResourceManagerCommonTypesTrackedResourceUpdate - The resource model definition for an Azure Resource Manager tracked +// top level resource which has 'tags' and a 'location' +type AzureResourceManagerCommonTypesTrackedResourceUpdate struct { + // Resource tags. + Tags map[string]*string + + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string + + // READ-ONLY; The name of the resource + Name *string + + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData + + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string +} + // EnvironmentCompute - Represents backing compute resource type EnvironmentCompute struct { // REQUIRED; Discriminator property for EnvironmentCompute. @@ -245,52 +264,22 @@ type RabbitMQQueueResourceListResult struct { NextLink *string } -// RabbitMQQueueResourceUpdate - The type used for update operations of the RabbitMQQueueResource. +// RabbitMQQueueResourceUpdate - RabbitMQQueue portable resource type RabbitMQQueueResourceUpdate struct { - // The updatable properties of the RabbitMQQueueResource. - Properties *RabbitMQQueueResourceUpdateProperties - // Resource tags. Tags map[string]*string -} - -// RabbitMQQueueResourceUpdateProperties - The updatable properties of the RabbitMQQueueResource. -type RabbitMQQueueResourceUpdateProperties struct { - // Fully qualified resource ID for the application that the portable resource is consumed by (if applicable) - Application *string - - // Fully qualified resource ID for the environment that the portable resource is linked to - Environment *string - - // The hostname of the RabbitMQ instance - Host *string - - // The port of the RabbitMQ instance. Defaults to 5672 - Port *int32 - - // The name of the queue - Queue *string - - // The recipe used to automatically deploy underlying infrastructure for the resource - Recipe *RecipeUpdate - - // Specifies how the underlying service/resource is provisioned and managed. - ResourceProvisioning *ResourceProvisioning - - // List of the resource IDs that support the rabbitMQ resource - Resources []*ResourceReference - // The secrets to connect to the RabbitMQ instance - Secrets *RabbitMQSecrets + // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} + ID *string - // Specifies whether to use SSL when connecting to the RabbitMQ instance - TLS *bool + // READ-ONLY; The name of the resource + Name *string - // The username to use when connecting to the RabbitMQ instance - Username *string + // READ-ONLY; Azure Resource Manager metadata containing createdBy and modifiedBy information. + SystemData *SystemData - // The RabbitMQ virtual host (vHost) the client will connect to. Defaults to no vHost. - VHost *string + // READ-ONLY; The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts" + Type *string } // RabbitMQSecrets - The connection secrets properties to the RabbitMQ instance @@ -324,15 +313,6 @@ type RecipeStatus struct { TemplateVersion *string } -// RecipeUpdate - The recipe used to automatically deploy underlying infrastructure for a portable resource -type RecipeUpdate struct { - // The name of the recipe within the environment to use - Name *string - - // Key/value parameters to pass into the recipe at deployment - Parameters map[string]any -} - // Resource - Common fields that are returned in the response for all Azure Resource Manager resources type Resource struct { // READ-ONLY; Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} diff --git a/pkg/messagingrp/api/v20231001preview/zz_generated_models_serde.go b/pkg/messagingrp/api/v20231001preview/zz_generated_models_serde.go index da3b6a3927..d5be270882 100644 --- a/pkg/messagingrp/api/v20231001preview/zz_generated_models_serde.go +++ b/pkg/messagingrp/api/v20231001preview/zz_generated_models_serde.go @@ -14,6 +14,49 @@ import ( "reflect" ) +// MarshalJSON implements the json.Marshaller interface for type AzureResourceManagerCommonTypesTrackedResourceUpdate. +func (a AzureResourceManagerCommonTypesTrackedResourceUpdate) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]any) + populate(objectMap, "id", a.ID) + populate(objectMap, "name", a.Name) + populate(objectMap, "systemData", a.SystemData) + populate(objectMap, "tags", a.Tags) + populate(objectMap, "type", a.Type) + return json.Marshal(objectMap) +} + +// UnmarshalJSON implements the json.Unmarshaller interface for type AzureResourceManagerCommonTypesTrackedResourceUpdate. +func (a *AzureResourceManagerCommonTypesTrackedResourceUpdate) UnmarshalJSON(data []byte) error { + var rawMsg map[string]json.RawMessage + if err := json.Unmarshal(data, &rawMsg); err != nil { + return fmt.Errorf("unmarshalling type %T: %v", a, err) + } + for key, val := range rawMsg { + var err error + switch key { + case "id": + err = unpopulate(val, "ID", &a.ID) + delete(rawMsg, key) + case "name": + err = unpopulate(val, "Name", &a.Name) + delete(rawMsg, key) + case "systemData": + err = unpopulate(val, "SystemData", &a.SystemData) + delete(rawMsg, key) + case "tags": + err = unpopulate(val, "Tags", &a.Tags) + delete(rawMsg, key) + case "type": + err = unpopulate(val, "Type", &a.Type) + delete(rawMsg, key) + } + if err != nil { + return fmt.Errorf("unmarshalling type %T: %v", a, err) + } + } + return nil +} + // MarshalJSON implements the json.Marshaller interface for type EnvironmentCompute. func (e EnvironmentCompute) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -567,8 +610,11 @@ func (r *RabbitMQQueueResourceListResult) UnmarshalJSON(data []byte) error { // MarshalJSON implements the json.Marshaller interface for type RabbitMQQueueResourceUpdate. func (r RabbitMQQueueResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "properties", r.Properties) + populate(objectMap, "id", r.ID) + populate(objectMap, "name", r.Name) + populate(objectMap, "systemData", r.SystemData) populate(objectMap, "tags", r.Tags) + populate(objectMap, "type", r.Type) return json.Marshal(objectMap) } @@ -581,82 +627,20 @@ func (r *RabbitMQQueueResourceUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "properties": - err = unpopulate(val, "Properties", &r.Properties) - delete(rawMsg, key) - case "tags": - err = unpopulate(val, "Tags", &r.Tags) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - } - return nil -} - -// MarshalJSON implements the json.Marshaller interface for type RabbitMQQueueResourceUpdateProperties. -func (r RabbitMQQueueResourceUpdateProperties) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "application", r.Application) - populate(objectMap, "environment", r.Environment) - populate(objectMap, "host", r.Host) - populate(objectMap, "port", r.Port) - populate(objectMap, "queue", r.Queue) - populate(objectMap, "recipe", r.Recipe) - populate(objectMap, "resourceProvisioning", r.ResourceProvisioning) - populate(objectMap, "resources", r.Resources) - populate(objectMap, "secrets", r.Secrets) - populate(objectMap, "tls", r.TLS) - populate(objectMap, "username", r.Username) - populate(objectMap, "vHost", r.VHost) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type RabbitMQQueueResourceUpdateProperties. -func (r *RabbitMQQueueResourceUpdateProperties) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "application": - err = unpopulate(val, "Application", &r.Application) - delete(rawMsg, key) - case "environment": - err = unpopulate(val, "Environment", &r.Environment) - delete(rawMsg, key) - case "host": - err = unpopulate(val, "Host", &r.Host) - delete(rawMsg, key) - case "port": - err = unpopulate(val, "Port", &r.Port) - delete(rawMsg, key) - case "queue": - err = unpopulate(val, "Queue", &r.Queue) - delete(rawMsg, key) - case "recipe": - err = unpopulate(val, "Recipe", &r.Recipe) - delete(rawMsg, key) - case "resourceProvisioning": - err = unpopulate(val, "ResourceProvisioning", &r.ResourceProvisioning) - delete(rawMsg, key) - case "resources": - err = unpopulate(val, "Resources", &r.Resources) + case "id": + err = unpopulate(val, "ID", &r.ID) delete(rawMsg, key) - case "secrets": - err = unpopulate(val, "Secrets", &r.Secrets) + case "name": + err = unpopulate(val, "Name", &r.Name) delete(rawMsg, key) - case "tls": - err = unpopulate(val, "TLS", &r.TLS) + case "systemData": + err = unpopulate(val, "SystemData", &r.SystemData) delete(rawMsg, key) - case "username": - err = unpopulate(val, "Username", &r.Username) + case "tags": + err = unpopulate(val, "Tags", &r.Tags) delete(rawMsg, key) - case "vHost": - err = unpopulate(val, "VHost", &r.VHost) + case "type": + err = unpopulate(val, "Type", &r.Type) delete(rawMsg, key) } if err != nil { @@ -763,37 +747,6 @@ func (r *RecipeStatus) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type RecipeUpdate. -func (r RecipeUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populate(objectMap, "name", r.Name) - populate(objectMap, "parameters", r.Parameters) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type RecipeUpdate. -func (r *RecipeUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "name": - err = unpopulate(val, "Name", &r.Name) - delete(rawMsg, key) - case "parameters": - err = unpopulate(val, "Parameters", &r.Parameters) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", r, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type Resource. func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) diff --git a/pkg/messagingrp/api/v20231001preview/zz_generated_rabbitmqqueues_client.go b/pkg/messagingrp/api/v20231001preview/zz_generated_rabbitmqqueues_client.go index 7869cb52d5..bb5f152795 100644 --- a/pkg/messagingrp/api/v20231001preview/zz_generated_rabbitmqqueues_client.go +++ b/pkg/messagingrp/api/v20231001preview/zz_generated_rabbitmqqueues_client.go @@ -146,7 +146,7 @@ func (client *RabbitMqQueuesClient) deleteOperation(ctx context.Context, rabbitM if err != nil { return nil, err } - if !runtime.HasStatusCode(httpResp, http.StatusOK, http.StatusAccepted, http.StatusNoContent) { + if !runtime.HasStatusCode(httpResp, http.StatusAccepted, http.StatusNoContent) { err = runtime.NewResponseError(httpResp) return nil, err } diff --git a/pkg/ucp/api/v20231001preview/zz_generated_constants.go b/pkg/ucp/api/v20231001preview/zz_generated_constants.go index a9dbbd3098..58588d91ac 100644 --- a/pkg/ucp/api/v20231001preview/zz_generated_constants.go +++ b/pkg/ucp/api/v20231001preview/zz_generated_constants.go @@ -74,12 +74,14 @@ type CredentialStorageKind string const ( // CredentialStorageKindInternal - Internal credential storage CredentialStorageKindInternal CredentialStorageKind = "Internal" + CredentialStorageKindString CredentialStorageKind = "string" ) // PossibleCredentialStorageKindValues returns the possible values for the CredentialStorageKind const type. func PossibleCredentialStorageKindValues() []CredentialStorageKind { return []CredentialStorageKind{ CredentialStorageKindInternal, + CredentialStorageKindString, } } @@ -89,17 +91,19 @@ type ProvisioningState string const ( // ProvisioningStateAccepted - The resource create request has been accepted ProvisioningStateAccepted ProvisioningState = "Accepted" - // ProvisioningStateCanceled - Resource creation was canceled. + // ProvisioningStateCanceled - The resource provisioning has been canceled ProvisioningStateCanceled ProvisioningState = "Canceled" + // ProvisioningStateCreating - The resource is being created + ProvisioningStateCreating ProvisioningState = "Creating" // ProvisioningStateDeleting - The resource is being deleted ProvisioningStateDeleting ProvisioningState = "Deleting" - // ProvisioningStateFailed - Resource creation failed. + // ProvisioningStateFailed - The resource provisioning has failed ProvisioningStateFailed ProvisioningState = "Failed" // ProvisioningStateProvisioning - The resource is being provisioned ProvisioningStateProvisioning ProvisioningState = "Provisioning" - // ProvisioningStateSucceeded - Resource has been created. + // ProvisioningStateSucceeded - The resource has been successfully provisioned ProvisioningStateSucceeded ProvisioningState = "Succeeded" - // ProvisioningStateUpdating - The resource is updating + // ProvisioningStateUpdating - The resource is being updated ProvisioningStateUpdating ProvisioningState = "Updating" ) @@ -108,6 +112,7 @@ func PossibleProvisioningStateValues() []ProvisioningState { return []ProvisioningState{ ProvisioningStateAccepted, ProvisioningStateCanceled, + ProvisioningStateCreating, ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateProvisioning, @@ -116,18 +121,3 @@ func PossibleProvisioningStateValues() []ProvisioningState { } } -// Versions - Supported API versions for Universal Control Plane resource provider. -type Versions string - -const ( - // VersionsV20231001Preview - 2023-10-01-preview - VersionsV20231001Preview Versions = "2023-10-01-preview" -) - -// PossibleVersionsValues returns the possible values for the Versions const type. -func PossibleVersionsValues() []Versions { - return []Versions{ - VersionsV20231001Preview, - } -} - diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/openapi.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/openapi.json index 75ab34aa4b..60382a7b05 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/openapi.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/openapi.json @@ -82,7 +82,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ApplicationResourceListResult" } @@ -133,7 +133,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ApplicationResource" } @@ -243,7 +243,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ApplicationResource" } @@ -289,7 +289,7 @@ "description": "Resource deleted successfully." }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -334,14 +334,13 @@ "description": "The content of the action request", "required": true, "schema": { - "type": "object", - "properties": {} + "type": "object" } } ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ApplicationGraphResponse" } @@ -372,7 +371,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ContainerResourceListResult" } @@ -423,7 +422,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ContainerResource" } @@ -486,6 +485,10 @@ "$ref": "#/definitions/ContainerResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -547,7 +550,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ContainerResource" } @@ -555,14 +558,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -602,25 +605,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -657,7 +657,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/EnvironmentResourceListResult" } @@ -708,7 +708,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/EnvironmentResource" } @@ -818,7 +818,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/EnvironmentResource" } @@ -864,7 +864,7 @@ "description": "Resource deleted successfully." }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -915,7 +915,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RecipeGetMetadataResponse" } @@ -951,7 +951,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ExtenderResourceListResult" } @@ -1002,7 +1002,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ExtenderResource" } @@ -1065,6 +1065,10 @@ "$ref": "#/definitions/ExtenderResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -1126,7 +1130,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ExtenderResource" } @@ -1134,14 +1138,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -1186,25 +1190,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -1253,14 +1254,13 @@ "description": "The content of the action request", "required": true, "schema": { - "type": "object", - "properties": {} + "type": "object" } } ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ExtenderListSecretResponse" } @@ -1296,7 +1296,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/GatewayResourceListResult" } @@ -1347,7 +1347,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/GatewayResource" } @@ -1410,6 +1410,10 @@ "$ref": "#/definitions/GatewayResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -1463,7 +1467,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/GatewayResource" } @@ -1471,14 +1475,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -1523,25 +1527,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -1578,7 +1579,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/SecretStoreResourceListResult" } @@ -1626,7 +1627,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/SecretStoreResource" } @@ -1692,6 +1693,10 @@ "$ref": "#/definitions/SecretStoreResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -1710,11 +1715,11 @@ "Create or Update a secret store resource with azure keyvault": { "$ref": "./examples/SecretStores_CreateOrUpdate.json" }, - "Create or Update a secret store resource with valueFrom": { - "$ref": "./examples/SecretStores_CreateOrUpdateValueFrom.json" - }, "Create or Update a secret store resource with global scope": { "$ref": "./examples/SecretStores_CreateOrUpdate_GlobalScope.json" + }, + "Create or Update a secret store resource with valueFrom": { + "$ref": "./examples/SecretStores_CreateOrUpdateValueFrom.json" } }, "x-ms-long-running-operation-options": { @@ -1756,7 +1761,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/SecretStoreResource" } @@ -1764,14 +1769,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -1783,11 +1788,11 @@ } }, "x-ms-examples": { - "Update a secret store resource": { - "$ref": "./examples/SecretStores_Delete.json" - }, "Update a secret store": { "$ref": "./examples/SecretStores_Update.json" + }, + "Update a secret store resource": { + "$ref": "./examples/SecretStores_Delete.json" } }, "x-ms-long-running-operation-options": { @@ -1819,25 +1824,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -1881,14 +1883,13 @@ "description": "The content of the action request", "required": true, "schema": { - "type": "object", - "properties": {} + "type": "object" } } ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/SecretStoreListSecretsResult" } @@ -1924,7 +1925,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/VolumeResourceListResult" } @@ -1975,7 +1976,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/VolumeResource" } @@ -2038,6 +2039,10 @@ "$ref": "#/definitions/VolumeResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -2096,7 +2101,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/VolumeResource" } @@ -2104,14 +2109,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -2156,25 +2161,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -2208,7 +2210,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/OperationListResult" } @@ -2417,38 +2419,12 @@ }, "ApplicationResourceUpdate": { "type": "object", - "description": "The type used for update operations of the ApplicationResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/ApplicationResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "ApplicationResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the ApplicationResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the application is linked to" - }, - "extensions": { - "type": "array", - "description": "The application extension.", - "items": { - "$ref": "#/definitions/Extension" - }, - "x-ms-identifiers": [] + "description": "Radius Application resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "AuthConfig": { "type": "object", @@ -2460,6 +2436,24 @@ } } }, + "Azure.ResourceManager.CommonTypes.TrackedResourceUpdate": { + "type": "object", + "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", + "properties": { + "tags": { + "type": "object", + "description": "Resource tags.", + "additionalProperties": { + "type": "string" + } + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/Resource" + } + ] + }, "AzureKeyVaultVolumeProperties": { "type": "object", "description": "Represents Azure Key Vault Volume properties", @@ -2529,22 +2523,6 @@ ], "x-ms-discriminator-value": "bicep" }, - "BicepRecipePropertiesUpdate": { - "type": "object", - "description": "Represents Bicep recipe properties.", - "properties": { - "plainHttp": { - "type": "boolean", - "description": "Connect to the Bicep registry using HTTP (not-HTTPS). This should be used when the registry is known not to support HTTPS, for example in a locally-hosted registry. Defaults to false (use HTTPS/TLS)." - } - }, - "allOf": [ - { - "$ref": "#/definitions/RecipePropertiesUpdate" - } - ], - "x-ms-discriminator-value": "bicep" - }, "CertificateFormats": { "type": "string", "description": "Represents certificate formats", @@ -2554,7 +2532,7 @@ ], "x-ms-enum": { "name": "CertificateFormats", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "pem", @@ -2578,14 +2556,60 @@ "description": "File name when written to disk" }, "encoding": { - "$ref": "#/definitions/VolumeSecretEncodings", + "type": "string", "description": "Encoding format. Default utf-8", - "default": "utf-8" + "default": "utf-8", + "enum": [ + "utf-8", + "hex", + "base64" + ], + "x-ms-enum": { + "name": "VolumeSecretEncodings", + "modelAsString": false, + "values": [ + { + "name": "utf8", + "value": "utf-8", + "description": "UTF-8 encoding" + }, + { + "name": "hex", + "value": "hex", + "description": "Hex encoding" + }, + { + "name": "base64", + "value": "base64", + "description": "Base64 encoding" + } + ] + } }, "format": { - "$ref": "#/definitions/CertificateFormats", + "type": "string", "description": "Certificate format. Default pem", - "default": "pem" + "default": "pem", + "enum": [ + "pem", + "pfx" + ], + "x-ms-enum": { + "name": "CertificateFormats", + "modelAsString": false, + "values": [ + { + "name": "pem", + "value": "pem", + "description": "PEM Certificate format" + }, + { + "name": "pfx", + "value": "pfx", + "description": "PFX Certificate format" + } + ] + } }, "name": { "type": "string", @@ -2614,7 +2638,7 @@ ], "x-ms-enum": { "name": "CertificateTypes", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "certificate", @@ -2655,24 +2679,6 @@ "source" ] }, - "ConnectionPropertiesUpdate": { - "type": "object", - "description": "Connection Properties", - "properties": { - "source": { - "type": "string", - "description": "The source of the connection" - }, - "disableDefaultEnvVars": { - "type": "boolean", - "description": "default environment variable override" - }, - "iam": { - "$ref": "#/definitions/IamPropertiesUpdate", - "description": "iam properties" - } - } - }, "Container": { "type": "object", "description": "Definition of a container", @@ -2764,30 +2770,6 @@ "containerPort" ] }, - "ContainerPortPropertiesUpdate": { - "type": "object", - "description": "Specifies a listening port for the container", - "properties": { - "containerPort": { - "type": "integer", - "format": "int32", - "description": "The listening port number" - }, - "protocol": { - "$ref": "#/definitions/PortProtocol", - "description": "Protocol in use by the port" - }, - "scheme": { - "type": "string", - "description": "Specifies the URL scheme of the communication protocol. Consumers can use the scheme to construct a URL. The value defaults to 'http' or 'https' depending on the port value" - }, - "port": { - "type": "integer", - "format": "int32", - "description": "Specifies the port that will be exposed by this container. Must be set when value different from containerPort is desired" - } - } - }, "ContainerProperties": { "type": "object", "description": "Container properties", @@ -2911,7 +2893,7 @@ ], "x-ms-enum": { "name": "ContainerResourceProvisioning", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "internal", @@ -2928,148 +2910,23 @@ }, "ContainerResourceUpdate": { "type": "object", - "description": "The type used for update operations of the ContainerResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/ContainerResourceUpdateProperties", - "x-ms-client-flatten": true + "description": "Concrete tracked resource types can be created by aliasing this type using a specific property type.", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, - "ContainerResourceUpdateProperties": { + "DaprSidecarExtension": { "type": "object", - "description": "The updatable properties of the ContainerResource.", + "description": "Specifies the resource should have a Dapr sidecar injected", "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the application is linked to" + "appPort": { + "type": "integer", + "format": "int32", + "description": "The Dapr appPort. Specifies the internal listening port for the application to handle requests from the Dapr sidecar. " }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application" - }, - "container": { - "$ref": "#/definitions/ContainerUpdate", - "description": "Definition of a container." - }, - "connections": { - "type": "object", - "description": "Specifies a connection to another resource.", - "additionalProperties": { - "$ref": "#/definitions/ConnectionPropertiesUpdate" - } - }, - "identity": { - "$ref": "#/definitions/IdentitySettingsUpdate", - "description": "Configuration for supported external identity providers" - }, - "extensions": { - "type": "array", - "description": "Extensions spec of the resource", - "items": { - "$ref": "#/definitions/Extension" - }, - "x-ms-identifiers": [] - }, - "resourceProvisioning": { - "$ref": "#/definitions/ContainerResourceProvisioning", - "description": "Specifies how the underlying container resource is provisioned and managed." - }, - "resources": { - "type": "array", - "description": "A collection of references to resources associated with the container", - "items": { - "$ref": "#/definitions/ResourceReference" - } - }, - "restartPolicy": { - "$ref": "#/definitions/RestartPolicy", - "description": "The restart policy for the underlying container" - }, - "runtimes": { - "$ref": "#/definitions/RuntimesProperties", - "description": "Specifies Runtime-specific functionality" - } - } - }, - "ContainerUpdate": { - "type": "object", - "description": "Definition of a container", - "properties": { - "image": { - "type": "string", - "description": "The registry and image to download and run in your container" - }, - "imagePullPolicy": { - "$ref": "#/definitions/ImagePullPolicy", - "description": "The pull policy for the container image" - }, - "env": { - "type": "object", - "description": "environment", - "additionalProperties": { - "$ref": "#/definitions/EnvironmentVariableUpdate" - } - }, - "ports": { - "type": "object", - "description": "container ports", - "additionalProperties": { - "$ref": "#/definitions/ContainerPortPropertiesUpdate" - } - }, - "readinessProbe": { - "$ref": "#/definitions/HealthProbeProperties", - "description": "readiness probe properties" - }, - "livenessProbe": { - "$ref": "#/definitions/HealthProbeProperties", - "description": "liveness probe properties" - }, - "volumes": { - "type": "object", - "description": "container volumes", - "additionalProperties": { - "$ref": "#/definitions/Volume" - } - }, - "command": { - "type": "array", - "description": "Entrypoint array. Overrides the container image's ENTRYPOINT", - "items": { - "type": "string" - } - }, - "args": { - "type": "array", - "description": "Arguments to the entrypoint. Overrides the container image's CMD", - "items": { - "type": "string" - } - }, - "workingDir": { - "type": "string", - "description": "Working directory for the container" - } - } - }, - "DaprSidecarExtension": { - "type": "object", - "description": "Specifies the resource should have a Dapr sidecar injected", - "properties": { - "appPort": { - "type": "integer", - "format": "int32", - "description": "The Dapr appPort. Specifies the internal listening port for the application to handle requests from the Dapr sidecar. " - }, - "appId": { + "appId": { "type": "string", "description": "The Dapr appId. Specifies the identifier used by Dapr for service invocation." }, @@ -3101,7 +2958,7 @@ ], "x-ms-enum": { "name": "DaprSidecarExtensionProtocol", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "http", @@ -3125,7 +2982,7 @@ ], "x-ms-enum": { "name": "Direction", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "Outbound", @@ -3162,28 +3019,6 @@ "kind" ] }, - "EnvironmentComputeUpdate": { - "type": "object", - "description": "Represents backing compute resource", - "properties": { - "kind": { - "type": "string", - "description": "Discriminator property for EnvironmentCompute." - }, - "resourceId": { - "type": "string", - "description": "The resource id of the compute resource for application environment." - }, - "identity": { - "$ref": "#/definitions/IdentitySettingsUpdate", - "description": "Configuration for supported external identity providers" - } - }, - "discriminator": "kind", - "required": [ - "kind" - ] - }, "EnvironmentProperties": { "type": "object", "description": "Environment properties", @@ -3278,60 +3113,12 @@ }, "EnvironmentResourceUpdate": { "type": "object", - "description": "The type used for update operations of the EnvironmentResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/EnvironmentResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "EnvironmentResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the EnvironmentResource.", - "properties": { - "compute": { - "$ref": "#/definitions/EnvironmentComputeUpdate", - "description": "The compute resource used by application environment." - }, - "providers": { - "$ref": "#/definitions/ProvidersUpdate", - "description": "Cloud providers configuration for the environment." - }, - "simulated": { - "type": "boolean", - "description": "Simulated environment." - }, - "recipes": { - "type": "object", - "description": "Specifies Recipes linked to the Environment.", - "additionalProperties": { - "additionalProperties": { - "$ref": "#/definitions/RecipePropertiesUpdate" - }, - "type": "object" - } - }, - "recipeConfig": { - "$ref": "#/definitions/RecipeConfigProperties", - "description": "Configuration for Recipes. Defines how each type of Recipe should be configured and run." - }, - "extensions": { - "type": "array", - "description": "The environment extension.", - "items": { - "$ref": "#/definitions/Extension" - }, - "x-ms-identifiers": [] + "description": "The environment resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "EnvironmentVariable": { "type": "object", @@ -3360,30 +3147,6 @@ "secretRef" ] }, - "EnvironmentVariableReferenceUpdate": { - "type": "object", - "description": "The reference to the variable", - "properties": { - "secretRef": { - "$ref": "#/definitions/SecretReferenceUpdate", - "description": "The secret reference" - } - } - }, - "EnvironmentVariableUpdate": { - "type": "object", - "description": "Environment variables type", - "properties": { - "value": { - "type": "string", - "description": "The value of the environment variable" - }, - "valueFrom": { - "$ref": "#/definitions/EnvironmentVariableReferenceUpdate", - "description": "The reference to the variable" - } - } - }, "EnvironmentVariables": { "type": "object", "description": "The environment variables injected during Terraform Recipe execution for the recipes in the environment.", @@ -3432,7 +3195,7 @@ "ExtenderListSecretResponse": { "type": "object", "description": "Response for list secrets API call", - "properties": {} + "additionalProperties": {} }, "ExtenderProperties": { "type": "object", @@ -3458,8 +3221,7 @@ }, "secrets": { "type": "object", - "description": "The secrets for referenced resource", - "properties": {} + "description": "The secrets for referenced resource" }, "recipe": { "$ref": "#/definitions/Recipe", @@ -3473,11 +3235,10 @@ "required": [ "environment" ], - "additionalProperties": true, "allOf": [ { "type": "object", - "additionalProperties": true + "additionalProperties": {} } ] }, @@ -3527,47 +3288,12 @@ }, "ExtenderResourceUpdate": { "type": "object", - "description": "The type used for update operations of the ExtenderResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/ExtenderResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "ExtenderResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the ExtenderResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the portable resource is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application that the portable resource is consumed by (if applicable)" - }, - "secrets": { - "type": "object", - "description": "The secrets for referenced resource", - "properties": {} - }, - "recipe": { - "$ref": "#/definitions/RecipeUpdate", - "description": "The recipe used to automatically deploy underlying infrastructure for the extender portable resource" - }, - "resourceProvisioning": { - "$ref": "#/definitions/ResourceProvisioning", - "description": "Specifies how the underlying service/resource is provisioned and managed." + "description": "ExtenderResource portable resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "Extension": { "type": "object", @@ -3696,54 +3422,12 @@ }, "GatewayResourceUpdate": { "type": "object", - "description": "The type used for update operations of the GatewayResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/GatewayResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "GatewayResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the GatewayResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the application is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application" - }, - "internal": { - "type": "boolean", - "description": "Sets Gateway to not be exposed externally (no public IP address associated). Defaults to false (exposed to internet)." - }, - "hostname": { - "$ref": "#/definitions/GatewayHostname", - "description": "Declare hostname information for the Gateway. Leaving the hostname empty auto-assigns one: mygateway.myapp.PUBLICHOSTNAMEORIP.nip.io." - }, - "routes": { - "type": "array", - "description": "Routes attached to this Gateway", - "items": { - "$ref": "#/definitions/GatewayRoute" - }, - "x-ms-identifiers": [] - }, - "tls": { - "$ref": "#/definitions/GatewayTls", - "description": "TLS configuration for the Gateway." + "description": "Concrete tracked resource types can be created by aliasing this type using a specific property type.", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "GatewayRoute": { "type": "object", @@ -3776,9 +3460,29 @@ "description": "If true, gateway lets the https traffic sslPassthrough to the backend servers for decryption." }, "minimumProtocolVersion": { - "$ref": "#/definitions/TlsMinVersion", + "type": "string", "description": "TLS minimum protocol version (defaults to 1.2).", - "default": "1.2" + "default": "1.2", + "enum": [ + "1.2", + "1.3" + ], + "x-ms-enum": { + "name": "TlsMinVersion", + "modelAsString": false, + "values": [ + { + "name": "tls12", + "value": "1.2", + "description": "TLS Version 1.2" + }, + { + "name": "tls13", + "value": "1.3", + "description": "TLS Version 1.3" + } + ] + } }, "certificateFrom": { "type": "string", @@ -3870,41 +3574,26 @@ "type": "string", "description": "The kind of IAM provider to configure", "enum": [ - "azure" + "azure", + "string" ], "x-ms-enum": { "name": "IAMKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "azure", "value": "azure", "description": "Azure Active Directory" + }, + { + "name": "string", + "value": "string" } - ] - } - }, - "IamProperties": { - "type": "object", - "description": "IAM properties", - "properties": { - "kind": { - "$ref": "#/definitions/IAMKind", - "description": "The kind of IAM provider to configure" - }, - "roles": { - "type": "array", - "description": "RBAC permissions to be assigned on the source resource", - "items": { - "type": "string" - } - } - }, - "required": [ - "kind" - ] + ] + } }, - "IamPropertiesUpdate": { + "IamProperties": { "type": "object", "description": "IAM properties", "properties": { @@ -3919,7 +3608,10 @@ "type": "string" } } - } + }, + "required": [ + "kind" + ] }, "IdentitySettingKind": { "type": "string", @@ -3930,7 +3622,7 @@ ], "x-ms-enum": { "name": "IdentitySettingKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "undefined", @@ -3966,24 +3658,6 @@ "kind" ] }, - "IdentitySettingsUpdate": { - "type": "object", - "description": "IdentitySettings is the external identity setting.", - "properties": { - "kind": { - "$ref": "#/definitions/IdentitySettingKind", - "description": "kind of identity setting" - }, - "oidcIssuer": { - "type": "string", - "description": "The URI for your compute platform's OIDC issuer" - }, - "resource": { - "type": "string", - "description": "The resource ID of the provisioned identity" - } - } - }, "ImagePullPolicy": { "type": "string", "description": "The image pull policy for the container", @@ -3994,7 +3668,7 @@ ], "x-ms-enum": { "name": "ImagePullPolicy", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "Always", @@ -4054,22 +3728,6 @@ ], "x-ms-discriminator-value": "kubernetes" }, - "KubernetesComputeUpdate": { - "type": "object", - "description": "The Kubernetes compute configuration", - "properties": { - "namespace": { - "type": "string", - "description": "The namespace to use for the environment." - } - }, - "allOf": [ - { - "$ref": "#/definitions/EnvironmentComputeUpdate" - } - ], - "x-ms-discriminator-value": "kubernetes" - }, "KubernetesMetadataExtension": { "type": "object", "description": "Kubernetes metadata extension of a environment/application resource.", @@ -4118,7 +3776,7 @@ "KubernetesPodSpec": { "type": "object", "description": "A strategic merge patch that will be applied to the PodSpec object when this container is being deployed.", - "additionalProperties": true + "additionalProperties": {} }, "KubernetesRuntimeProperties": { "type": "object", @@ -4143,7 +3801,7 @@ ], "x-ms-enum": { "name": "ManagedStore", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "memory", @@ -4228,7 +3886,7 @@ ], "x-ms-enum": { "name": "PortProtocol", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "TCP", @@ -4255,11 +3913,10 @@ } } }, - "additionalProperties": true, "allOf": [ { "type": "object", - "additionalProperties": true + "additionalProperties": {} } ] }, @@ -4290,16 +3947,6 @@ "scope" ] }, - "ProvidersAwsUpdate": { - "type": "object", - "description": "The AWS cloud provider definition.", - "properties": { - "scope": { - "type": "string", - "description": "Target scope for AWS resources to be deployed into. For example: '/planes/aws/aws/accounts/000000000000/regions/us-west-2'." - } - } - }, "ProvidersAzure": { "type": "object", "description": "The Azure cloud provider definition.", @@ -4313,60 +3960,42 @@ "scope" ] }, - "ProvidersAzureUpdate": { - "type": "object", - "description": "The Azure cloud provider definition.", - "properties": { - "scope": { - "type": "string", - "description": "Target scope for Azure resources to be deployed into. For example: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup'." - } - } - }, - "ProvidersUpdate": { - "type": "object", - "description": "The Cloud providers configuration.", - "properties": { - "azure": { - "$ref": "#/definitions/ProvidersAzureUpdate", - "description": "The Azure cloud provider configuration." - }, - "aws": { - "$ref": "#/definitions/ProvidersAwsUpdate", - "description": "The AWS cloud provider configuration." - } - } - }, "ProvisioningState": { "type": "string", "description": "Provisioning state of the resource at the time the operation was called", "enum": [ - "Succeeded", - "Failed", - "Canceled", - "Provisioning", + "Creating", "Updating", "Deleting", - "Accepted" + "Accepted", + "Provisioning", + "Succeeded", + "Failed", + "Canceled" ], "x-ms-enum": { "name": "ProvisioningState", - "modelAsString": true, + "modelAsString": false, "values": [ { - "name": "Succeeded", - "value": "Succeeded", - "description": "Resource has been created." + "name": "Creating", + "value": "Creating", + "description": "The resource is being created" }, { - "name": "Failed", - "value": "Failed", - "description": "Resource creation failed." + "name": "Updating", + "value": "Updating", + "description": "The resource is being updated" }, { - "name": "Canceled", - "value": "Canceled", - "description": "Resource creation was canceled." + "name": "Deleting", + "value": "Deleting", + "description": "The resource is being deleted" + }, + { + "name": "Accepted", + "value": "Accepted", + "description": "The resource create request has been accepted" }, { "name": "Provisioning", @@ -4374,19 +4003,19 @@ "description": "The resource is being provisioned" }, { - "name": "Updating", - "value": "Updating", - "description": "The resource is updating" + "name": "Succeeded", + "value": "Succeeded", + "description": "The resource has been successfully provisioned" }, { - "name": "Deleting", - "value": "Deleting", - "description": "The resource is being deleted" + "name": "Failed", + "value": "Failed", + "description": "The resource provisioning has failed" }, { - "name": "Accepted", - "value": "Accepted", - "description": "The resource create request has been accepted" + "name": "Canceled", + "value": "Canceled", + "description": "The resource provisioning has been canceled" } ] }, @@ -4402,8 +4031,7 @@ }, "parameters": { "type": "object", - "description": "Key/value parameters to pass into the recipe at deployment", - "properties": {} + "description": "Key/value parameters to pass into the recipe at deployment" } }, "required": [ @@ -4471,8 +4099,7 @@ }, "parameters": { "type": "object", - "description": "The key/value parameters to pass to the recipe template at deployment.", - "properties": {} + "description": "The key/value parameters to pass to the recipe template at deployment." }, "plainHttp": { "type": "boolean", @@ -4499,8 +4126,7 @@ }, "parameters": { "type": "object", - "description": "Key/value parameters to pass to the recipe template at deployment.", - "properties": {} + "description": "Key/value parameters to pass to the recipe template at deployment." } }, "discriminator": "templateKind", @@ -4509,29 +4135,6 @@ "templatePath" ] }, - "RecipePropertiesUpdate": { - "type": "object", - "description": "Format of the template provided by the recipe. Allowed values: bicep, terraform.", - "properties": { - "templateKind": { - "type": "string", - "description": "Discriminator property for RecipeProperties." - }, - "templatePath": { - "type": "string", - "description": "Path to the template provided by the recipe. Currently only link to Azure Container Registry is supported." - }, - "parameters": { - "type": "object", - "description": "Key/value parameters to pass to the recipe template at deployment.", - "properties": {} - } - }, - "discriminator": "templateKind", - "required": [ - "templateKind" - ] - }, "RecipeStatus": { "type": "object", "description": "Recipe status at deployment time for a resource.", @@ -4554,21 +4157,6 @@ "templatePath" ] }, - "RecipeUpdate": { - "type": "object", - "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource", - "properties": { - "name": { - "type": "string", - "description": "The name of the recipe within the environment to use" - }, - "parameters": { - "type": "object", - "description": "Key/value parameters to pass into the recipe at deployment", - "properties": {} - } - } - }, "RegistrySecretConfig": { "type": "object", "description": "Registry Secret Configuration used to authenticate to private bicep registries.", @@ -4588,7 +4176,7 @@ ], "x-ms-enum": { "name": "ResourceProvisioning", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "recipe", @@ -4649,7 +4237,7 @@ ], "x-ms-enum": { "name": "RestartPolicy", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "Always", @@ -4698,9 +4286,35 @@ "description": "File name when written to disk" }, "encoding": { - "$ref": "#/definitions/VolumeSecretEncodings", + "type": "string", "description": "Encoding format. Default utf-8", - "default": "utf-8" + "default": "utf-8", + "enum": [ + "utf-8", + "hex", + "base64" + ], + "x-ms-enum": { + "name": "VolumeSecretEncodings", + "modelAsString": false, + "values": [ + { + "name": "utf8", + "value": "utf-8", + "description": "UTF-8 encoding" + }, + { + "name": "hex", + "value": "hex", + "description": "Hex encoding" + }, + { + "name": "base64", + "value": "base64", + "description": "Base64 encoding" + } + ] + } }, "name": { "type": "string", @@ -4733,20 +4347,6 @@ "key" ] }, - "SecretReferenceUpdate": { - "type": "object", - "description": "This secret is used within a recipe. Secrets are encrypted, often have fine-grained access control, auditing and are recommended to be used to hold sensitive data.", - "properties": { - "source": { - "type": "string", - "description": "The ID of an Applications.Core/SecretStore resource containing sensitive data required for recipe execution." - }, - "key": { - "type": "string", - "description": "The key for the secret in the secret store." - } - } - }, "SecretStoreDataType": { "type": "string", "description": "The type of SecretStore data", @@ -4759,7 +4359,7 @@ ], "x-ms-enum": { "name": "SecretStoreDataType", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "generic", @@ -4833,9 +4433,47 @@ "readOnly": true }, "type": { - "$ref": "#/definitions/SecretStoreDataType", + "type": "string", "description": "The type of secret store data", - "default": "generic" + "default": "generic", + "enum": [ + "generic", + "certificate", + "basicAuthentication", + "azureWorkloadIdentity", + "awsIRSA" + ], + "x-ms-enum": { + "name": "SecretStoreDataType", + "modelAsString": false, + "values": [ + { + "name": "generic", + "value": "generic", + "description": "Generic secret data type" + }, + { + "name": "certificate", + "value": "certificate", + "description": "Certificate secret data type" + }, + { + "name": "basicAuthentication", + "value": "basicAuthentication", + "description": "basicAuthentication type is used to represent username and password based authentication and the secretstore resource is expected to have the keys 'username' and 'password'." + }, + { + "name": "azureWorkloadIdentity", + "value": "azureWorkloadIdentity", + "description": "azureWorkloadIdentity type is used to represent authentication using azure federated identity and the secretstore resource is expected to have the keys 'clientId' and 'tenantId'." + }, + { + "name": "awsIRSA", + "value": "awsIRSA", + "description": "awsIRSA type is used to represent authentication using AWS IRSA (IAM Roles for Service accounts) and the secretstore resource is expected to have the key 'roleARN'." + } + ] + } }, "data": { "type": "object", @@ -4899,50 +4537,12 @@ }, "SecretStoreResourceUpdate": { "type": "object", - "description": "The type used for update operations of the SecretStoreResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/SecretStoreResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "SecretStoreResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the SecretStoreResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the application is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application" - }, - "type": { - "$ref": "#/definitions/SecretStoreDataType", - "description": "The type of secret store data", - "default": "generic" - }, - "data": { - "type": "object", - "description": "An object to represent key-value type secrets", - "additionalProperties": { - "$ref": "#/definitions/SecretValueProperties" - } - }, - "resource": { - "type": "string", - "description": "The resource id of external secret store." + "description": "Concrete tracked resource types can be created by aliasing this type using a specific property type.", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "SecretValueEncoding": { "type": "string", @@ -4953,7 +4553,7 @@ ], "x-ms-enum": { "name": "SecretValueEncoding", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "raw", @@ -4973,9 +4573,29 @@ "description": "The properties of SecretValue", "properties": { "encoding": { - "$ref": "#/definitions/SecretValueEncoding", + "type": "string", "description": "The encoding of value", - "default": "raw" + "default": "raw", + "enum": [ + "raw", + "base64" + ], + "x-ms-enum": { + "name": "SecretValueEncoding", + "modelAsString": false, + "values": [ + { + "name": "raw", + "value": "raw", + "description": "The raw secret value" + }, + { + "name": "base64", + "value": "base64", + "description": "The base64-encoded secret value" + } + ] + } }, "value": { "type": "string", @@ -5046,22 +4666,6 @@ ], "x-ms-discriminator-value": "terraform" }, - "TerraformRecipePropertiesUpdate": { - "type": "object", - "description": "Represents Terraform recipe properties.", - "properties": { - "templateVersion": { - "type": "string", - "description": "Version of the template to deploy. For Terraform recipes using a module registry this is required, but must be omitted for other module sources." - } - }, - "allOf": [ - { - "$ref": "#/definitions/RecipePropertiesUpdate" - } - ], - "x-ms-discriminator-value": "terraform" - }, "TlsMinVersion": { "type": "string", "description": "Tls Minimum versions for Gateway resource.", @@ -5071,7 +4675,7 @@ ], "x-ms-enum": { "name": "TlsMinVersion", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "tls12", @@ -5103,24 +4707,6 @@ "name" ] }, - "Versions": { - "type": "string", - "description": "Supported API versions for the Applications.Core resource provider.", - "enum": [ - "2023-10-01-preview" - ], - "x-ms-enum": { - "name": "Versions", - "modelAsString": true, - "values": [ - { - "name": "v2023_10_01_preview", - "value": "2023-10-01-preview", - "description": "2023-10-01-preview" - } - ] - } - }, "Volume": { "type": "object", "description": "Specifies a volume for a container", @@ -5148,7 +4734,7 @@ ], "x-ms-enum": { "name": "VolumePermission", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "read", @@ -5242,34 +4828,12 @@ }, "VolumeResourceUpdate": { "type": "object", - "description": "The type used for update operations of the VolumeResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/VolumeResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "VolumeResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the VolumeResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the application is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application" + "description": "Radius Volume resource.", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "VolumeSecretEncodings": { "type": "string", @@ -5281,7 +4845,7 @@ ], "x-ms-enum": { "name": "VolumeSecretEncodings", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "utf8", diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/openapi.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/openapi.json index 2456969ab3..ab4a6ff8b4 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/openapi.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/openapi.json @@ -73,7 +73,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprConfigurationStoreResourceListResult" } @@ -124,7 +124,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprConfigurationStoreResource" } @@ -187,6 +187,10 @@ "$ref": "#/definitions/DaprConfigurationStoreResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -248,7 +252,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprConfigurationStoreResource" } @@ -256,14 +260,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -308,25 +312,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -363,7 +364,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprPubSubBrokerResourceListResult" } @@ -414,7 +415,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprPubSubBrokerResource" } @@ -477,6 +478,10 @@ "$ref": "#/definitions/DaprPubSubBrokerResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -538,7 +543,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprPubSubBrokerResource" } @@ -546,14 +551,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -598,25 +603,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -653,7 +655,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprSecretStoreResourceListResult" } @@ -704,7 +706,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprSecretStoreResource" } @@ -767,6 +769,10 @@ "$ref": "#/definitions/DaprSecretStoreResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -825,7 +831,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprSecretStoreResource" } @@ -833,14 +839,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -885,25 +891,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -940,7 +943,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprStateStoreResourceListResult" } @@ -991,7 +994,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprStateStoreResource" } @@ -1054,6 +1057,10 @@ "$ref": "#/definitions/DaprStateStoreResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -1115,7 +1122,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/DaprStateStoreResource" } @@ -1123,14 +1130,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -1175,25 +1182,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -1227,7 +1231,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/OperationListResult" } @@ -1246,6 +1250,24 @@ } }, "definitions": { + "Azure.ResourceManager.CommonTypes.TrackedResourceUpdate": { + "type": "object", + "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", + "properties": { + "tags": { + "type": "object", + "description": "Resource tags.", + "additionalProperties": { + "type": "string" + } + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/Resource" + } + ] + }, "DaprConfigurationStoreProperties": { "type": "object", "description": "Dapr configuration store portable resource properties", @@ -1358,68 +1380,12 @@ }, "DaprConfigurationStoreResourceUpdate": { "type": "object", - "description": "The type used for update operations of the DaprConfigurationStoreResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/DaprConfigurationStoreResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "DaprConfigurationStoreResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the DaprConfigurationStoreResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the portable resource is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application that the portable resource is consumed by (if applicable)" - }, - "metadata": { - "type": "object", - "description": "The metadata for Dapr resource which must match the values specified in Dapr component spec", - "additionalProperties": { - "$ref": "#/definitions/MetadataValueUpdate" - } - }, - "type": { - "type": "string", - "description": "Dapr component type which must matches the format used by Dapr Kubernetes configuration format" - }, - "version": { - "type": "string", - "description": "Dapr component version" - }, - "auth": { - "$ref": "#/definitions/DaprResourceAuth", - "description": "The name of the Dapr component to be used as a secret store" - }, - "resources": { - "type": "array", - "description": "A collection of references to resources associated with the configuration store", - "items": { - "$ref": "#/definitions/ResourceReference" - } - }, - "recipe": { - "$ref": "#/definitions/RecipeUpdate", - "description": "The recipe used to automatically deploy underlying infrastructure for the resource" - }, - "resourceProvisioning": { - "$ref": "#/definitions/ResourceProvisioning", - "description": "Specifies how the underlying service/resource is provisioned and managed." + "description": "Dapr configuration store portable resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "DaprPubSubBrokerProperties": { "type": "object", @@ -1533,68 +1499,12 @@ }, "DaprPubSubBrokerResourceUpdate": { "type": "object", - "description": "The type used for update operations of the DaprPubSubBrokerResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/DaprPubSubBrokerResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "DaprPubSubBrokerResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the DaprPubSubBrokerResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the portable resource is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application that the portable resource is consumed by (if applicable)" - }, - "metadata": { - "type": "object", - "description": "The metadata for Dapr resource which must match the values specified in Dapr component spec", - "additionalProperties": { - "$ref": "#/definitions/MetadataValueUpdate" - } - }, - "type": { - "type": "string", - "description": "Dapr component type which must matches the format used by Dapr Kubernetes configuration format" - }, - "version": { - "type": "string", - "description": "Dapr component version" - }, - "auth": { - "$ref": "#/definitions/DaprResourceAuth", - "description": "The name of the Dapr component to be used as a secret store" - }, - "resources": { - "type": "array", - "description": "A collection of references to resources associated with the pubSubBroker", - "items": { - "$ref": "#/definitions/ResourceReference" - } - }, - "recipe": { - "$ref": "#/definitions/RecipeUpdate", - "description": "The recipe used to automatically deploy underlying infrastructure for the resource" - }, - "resourceProvisioning": { - "$ref": "#/definitions/ResourceProvisioning", - "description": "Specifies how the underlying service/resource is provisioned and managed." + "description": "Dapr PubSubBroker portable resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "DaprResourceAuth": { "type": "object", @@ -1707,57 +1617,12 @@ }, "DaprSecretStoreResourceUpdate": { "type": "object", - "description": "The type used for update operations of the DaprSecretStoreResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/DaprSecretStoreResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "DaprSecretStoreResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the DaprSecretStoreResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the portable resource is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application that the portable resource is consumed by (if applicable)" - }, - "metadata": { - "type": "object", - "description": "The metadata for Dapr resource which must match the values specified in Dapr component spec", - "additionalProperties": { - "$ref": "#/definitions/MetadataValueUpdate" - } - }, - "type": { - "type": "string", - "description": "Dapr component type which must matches the format used by Dapr Kubernetes configuration format" - }, - "version": { - "type": "string", - "description": "Dapr component version" - }, - "recipe": { - "$ref": "#/definitions/RecipeUpdate", - "description": "The recipe used to automatically deploy underlying infrastructure for the resource" - }, - "resourceProvisioning": { - "$ref": "#/definitions/ResourceProvisioning", - "description": "Specifies how the underlying service/resource is provisioned and managed." + "description": "Dapr SecretStore portable resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "DaprStateStoreProperties": { "type": "object", @@ -1871,68 +1736,12 @@ }, "DaprStateStoreResourceUpdate": { "type": "object", - "description": "The type used for update operations of the DaprStateStoreResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/DaprStateStoreResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "DaprStateStoreResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the DaprStateStoreResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the portable resource is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application that the portable resource is consumed by (if applicable)" - }, - "metadata": { - "type": "object", - "description": "The metadata for Dapr resource which must match the values specified in Dapr component spec", - "additionalProperties": { - "$ref": "#/definitions/MetadataValueUpdate" - } - }, - "type": { - "type": "string", - "description": "Dapr component type which must matches the format used by Dapr Kubernetes configuration format" - }, - "version": { - "type": "string", - "description": "Dapr component version" - }, - "auth": { - "$ref": "#/definitions/DaprResourceAuth", - "description": "The name of the Dapr component to be used as a secret store" - }, - "resources": { - "type": "array", - "description": "A collection of references to resources associated with the state store", - "items": { - "$ref": "#/definitions/ResourceReference" - } - }, - "recipe": { - "$ref": "#/definitions/RecipeUpdate", - "description": "The recipe used to automatically deploy underlying infrastructure for the resource" - }, - "resourceProvisioning": { - "$ref": "#/definitions/ResourceProvisioning", - "description": "Specifies how the underlying service/resource is provisioned and managed." + "description": "Dapr StateStore portable resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "EnvironmentCompute": { "type": "object", @@ -1965,7 +1774,7 @@ ], "x-ms-enum": { "name": "IdentitySettingKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "undefined", @@ -2052,34 +1861,6 @@ "key" ] }, - "MetadataValueFromSecretUpdate": { - "type": "object", - "description": "A reference of a value in a secret store component.", - "properties": { - "name": { - "type": "string", - "description": "Secret name in the secret store component" - }, - "key": { - "type": "string", - "description": "The field to select in the secret value. If the secret value is a string, it should be equal to the secret name" - } - } - }, - "MetadataValueUpdate": { - "type": "object", - "description": "A single metadata for a Dapr component object", - "properties": { - "value": { - "type": "string", - "description": "The plain text value of the metadata" - }, - "secretKeyRef": { - "$ref": "#/definitions/MetadataValueFromSecretUpdate", - "description": "A reference of a value in a secret store component" - } - } - }, "NonRedundantDaprResourceProperties": { "type": "object", "description": "The base properties of a Dapr component object.", @@ -2128,32 +1909,38 @@ "type": "string", "description": "Provisioning state of the resource at the time the operation was called", "enum": [ - "Succeeded", - "Failed", - "Canceled", - "Provisioning", + "Creating", "Updating", "Deleting", - "Accepted" + "Accepted", + "Provisioning", + "Succeeded", + "Failed", + "Canceled" ], "x-ms-enum": { "name": "ProvisioningState", - "modelAsString": true, + "modelAsString": false, "values": [ { - "name": "Succeeded", - "value": "Succeeded", - "description": "Resource has been created." + "name": "Creating", + "value": "Creating", + "description": "The resource is being created" }, { - "name": "Failed", - "value": "Failed", - "description": "Resource creation failed." + "name": "Updating", + "value": "Updating", + "description": "The resource is being updated" }, { - "name": "Canceled", - "value": "Canceled", - "description": "Resource creation was canceled." + "name": "Deleting", + "value": "Deleting", + "description": "The resource is being deleted" + }, + { + "name": "Accepted", + "value": "Accepted", + "description": "The resource create request has been accepted" }, { "name": "Provisioning", @@ -2161,19 +1948,19 @@ "description": "The resource is being provisioned" }, { - "name": "Updating", - "value": "Updating", - "description": "The resource is updating" + "name": "Succeeded", + "value": "Succeeded", + "description": "The resource has been successfully provisioned" }, { - "name": "Deleting", - "value": "Deleting", - "description": "The resource is being deleted" + "name": "Failed", + "value": "Failed", + "description": "The resource provisioning has failed" }, { - "name": "Accepted", - "value": "Accepted", - "description": "The resource create request has been accepted" + "name": "Canceled", + "value": "Canceled", + "description": "The resource provisioning has been canceled" } ] }, @@ -2189,8 +1976,7 @@ }, "parameters": { "type": "object", - "description": "Key/value parameters to pass into the recipe at deployment", - "properties": {} + "description": "Key/value parameters to pass into the recipe at deployment" } }, "required": [ @@ -2219,21 +2005,6 @@ "templatePath" ] }, - "RecipeUpdate": { - "type": "object", - "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource", - "properties": { - "name": { - "type": "string", - "description": "The name of the recipe within the environment to use" - }, - "parameters": { - "type": "object", - "description": "Key/value parameters to pass into the recipe at deployment", - "properties": {} - } - } - }, "ResourceProvisioning": { "type": "string", "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values.", @@ -2243,7 +2014,7 @@ ], "x-ms-enum": { "name": "ResourceProvisioning", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "recipe", @@ -2293,24 +2064,6 @@ "x-ms-identifiers": [] } } - }, - "Versions": { - "type": "string", - "description": "Supported API versions for the Applications.Dapr resource provider.", - "enum": [ - "2023-10-01-preview" - ], - "x-ms-enum": { - "name": "Versions", - "modelAsString": true, - "values": [ - { - "name": "v2023_10_01_preview", - "value": "2023-10-01-preview", - "description": "2023-10-01-preview" - } - ] - } } }, "parameters": { diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/openapi.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/openapi.json index a2ec862922..081b031b65 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/openapi.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/openapi.json @@ -70,7 +70,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/MongoDatabaseResourceListResult" } @@ -121,7 +121,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/MongoDatabaseResource" } @@ -184,6 +184,10 @@ "$ref": "#/definitions/MongoDatabaseResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -199,11 +203,11 @@ } }, "x-ms-examples": { - "Create or update a MongoDatabase resource with recipe": { - "$ref": "./examples/MongoDatabases_CreateOrUpdateRecipe.json" - }, "Create or update a MongoDatabase resource": { "$ref": "./examples/MongoDatabases_CreateOrUpdateValues.json" + }, + "Create or update a MongoDatabase resource with recipe": { + "$ref": "./examples/MongoDatabases_CreateOrUpdateRecipe.json" } }, "x-ms-long-running-operation-options": { @@ -245,7 +249,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/MongoDatabaseResource" } @@ -253,14 +257,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -300,25 +304,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -367,14 +368,13 @@ "description": "The content of the action request", "required": true, "schema": { - "type": "object", - "properties": {} + "type": "object" } } ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/MongoDatabaseListSecretsResult" } @@ -410,7 +410,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RedisCacheResourceListResult" } @@ -461,7 +461,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RedisCacheResource" } @@ -524,6 +524,10 @@ "$ref": "#/definitions/RedisCacheResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -588,7 +592,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RedisCacheResource" } @@ -596,14 +600,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -648,25 +652,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -715,14 +716,13 @@ "description": "The content of the action request", "required": true, "schema": { - "type": "object", - "properties": {} + "type": "object" } } ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RedisCacheListSecretsResult" } @@ -758,7 +758,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/SqlDatabaseResourceListResult" } @@ -809,7 +809,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/SqlDatabaseResource" } @@ -872,6 +872,10 @@ "$ref": "#/definitions/SqlDatabaseResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -930,7 +934,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/SqlDatabaseResource" } @@ -938,14 +942,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -990,25 +994,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -1057,14 +1058,13 @@ "description": "The content of the action request", "required": true, "schema": { - "type": "object", - "properties": {} + "type": "object" } } ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/SqlDatabaseListSecretsResult" } @@ -1092,7 +1092,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/OperationListResult" } @@ -1111,6 +1111,24 @@ } }, "definitions": { + "Azure.ResourceManager.CommonTypes.TrackedResourceUpdate": { + "type": "object", + "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", + "properties": { + "tags": { + "type": "object", + "description": "Resource tags.", + "additionalProperties": { + "type": "string" + } + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/Resource" + } + ] + }, "EnvironmentCompute": { "type": "object", "description": "Represents backing compute resource", @@ -1142,7 +1160,7 @@ ], "x-ms-enum": { "name": "IdentitySettingKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "undefined", @@ -1320,70 +1338,12 @@ }, "MongoDatabaseResourceUpdate": { "type": "object", - "description": "The type used for update operations of the MongoDatabaseResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/MongoDatabaseResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "MongoDatabaseResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the MongoDatabaseResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the portable resource is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application that the portable resource is consumed by (if applicable)" - }, - "secrets": { - "$ref": "#/definitions/MongoDatabaseSecrets", - "description": "Secret values provided for the resource" - }, - "host": { - "type": "string", - "description": "Host name of the target Mongo database" - }, - "port": { - "type": "integer", - "format": "int32", - "description": "Port value of the target Mongo database" - }, - "database": { - "type": "string", - "description": "Database name of the target Mongo database" - }, - "resources": { - "type": "array", - "description": "List of the resource IDs that support the MongoDB resource", - "items": { - "$ref": "#/definitions/ResourceReference" - } - }, - "username": { - "type": "string", - "description": "Username to use when connecting to the target Mongo database" - }, - "recipe": { - "$ref": "#/definitions/RecipeUpdate", - "description": "The recipe used to automatically deploy underlying infrastructure for the resource" - }, - "resourceProvisioning": { - "$ref": "#/definitions/ResourceProvisioning", - "description": "Specifies how the underlying service/resource is provisioned and managed." + "description": "MongoDatabase portable resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "MongoDatabaseSecrets": { "type": "object", @@ -1421,32 +1381,38 @@ "type": "string", "description": "Provisioning state of the resource at the time the operation was called", "enum": [ - "Succeeded", - "Failed", - "Canceled", - "Provisioning", + "Creating", "Updating", "Deleting", - "Accepted" + "Accepted", + "Provisioning", + "Succeeded", + "Failed", + "Canceled" ], "x-ms-enum": { "name": "ProvisioningState", - "modelAsString": true, + "modelAsString": false, "values": [ { - "name": "Succeeded", - "value": "Succeeded", - "description": "Resource has been created." + "name": "Creating", + "value": "Creating", + "description": "The resource is being created" }, { - "name": "Failed", - "value": "Failed", - "description": "Resource creation failed." + "name": "Updating", + "value": "Updating", + "description": "The resource is being updated" }, { - "name": "Canceled", - "value": "Canceled", - "description": "Resource creation was canceled." + "name": "Deleting", + "value": "Deleting", + "description": "The resource is being deleted" + }, + { + "name": "Accepted", + "value": "Accepted", + "description": "The resource create request has been accepted" }, { "name": "Provisioning", @@ -1454,19 +1420,19 @@ "description": "The resource is being provisioned" }, { - "name": "Updating", - "value": "Updating", - "description": "The resource is updating" + "name": "Succeeded", + "value": "Succeeded", + "description": "The resource has been successfully provisioned" }, { - "name": "Deleting", - "value": "Deleting", - "description": "The resource is being deleted" + "name": "Failed", + "value": "Failed", + "description": "The resource provisioning has failed" }, { - "name": "Accepted", - "value": "Accepted", - "description": "The resource create request has been accepted" + "name": "Canceled", + "value": "Canceled", + "description": "The resource provisioning has been canceled" } ] }, @@ -1482,8 +1448,7 @@ }, "parameters": { "type": "object", - "description": "Key/value parameters to pass into the recipe at deployment", - "properties": {} + "description": "Key/value parameters to pass into the recipe at deployment" } }, "required": [ @@ -1512,21 +1477,6 @@ "templatePath" ] }, - "RecipeUpdate": { - "type": "object", - "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource", - "properties": { - "name": { - "type": "string", - "description": "The name of the recipe within the environment to use" - }, - "parameters": { - "type": "object", - "description": "Key/value parameters to pass into the recipe at deployment", - "properties": {} - } - } - }, "RedisCacheListSecretsResult": { "type": "object", "description": "The secret values for the given RedisCache resource", @@ -1654,70 +1604,12 @@ }, "RedisCacheResourceUpdate": { "type": "object", - "description": "The type used for update operations of the RedisCacheResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/RedisCacheResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "RedisCacheResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the RedisCacheResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the portable resource is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application that the portable resource is consumed by (if applicable)" - }, - "secrets": { - "$ref": "#/definitions/RedisCacheSecrets", - "description": "Secrets provided by resource" - }, - "host": { - "type": "string", - "description": "The host name of the target Redis cache" - }, - "port": { - "type": "integer", - "format": "int32", - "description": "The port value of the target Redis cache" - }, - "username": { - "type": "string", - "description": "The username for Redis cache" - }, - "tls": { - "type": "boolean", - "description": "Specifies whether to enable SSL connections to the Redis cache" - }, - "resources": { - "type": "array", - "description": "List of the resource IDs that support the Redis resource", - "items": { - "$ref": "#/definitions/ResourceReference" - } - }, - "recipe": { - "$ref": "#/definitions/RecipeUpdate", - "description": "The recipe used to automatically deploy underlying infrastructure for the resource" - }, - "resourceProvisioning": { - "$ref": "#/definitions/ResourceProvisioning", - "description": "Specifies how the underlying service/resource is provisioned and managed." + "description": "RedisCache portable resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "RedisCacheSecrets": { "type": "object", @@ -1746,7 +1638,7 @@ ], "x-ms-enum": { "name": "ResourceProvisioning", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "recipe", @@ -1920,70 +1812,12 @@ }, "SqlDatabaseResourceUpdate": { "type": "object", - "description": "The type used for update operations of the SqlDatabaseResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/SqlDatabaseResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "SqlDatabaseResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the SqlDatabaseResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the portable resource is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application that the portable resource is consumed by (if applicable)" - }, - "database": { - "type": "string", - "description": "The name of the Sql database." - }, - "server": { - "type": "string", - "description": "The fully qualified domain name of the Sql database." - }, - "port": { - "type": "integer", - "format": "int32", - "description": "Port value of the target Sql database" - }, - "username": { - "type": "string", - "description": "Username to use when connecting to the target Sql database" - }, - "resources": { - "type": "array", - "description": "List of the resource IDs that support the SqlDatabase resource", - "items": { - "$ref": "#/definitions/ResourceReference" - } - }, - "secrets": { - "$ref": "#/definitions/SqlDatabaseSecrets", - "description": "Secret values provided for the resource" - }, - "recipe": { - "$ref": "#/definitions/RecipeUpdate", - "description": "The recipe used to automatically deploy underlying infrastructure for the resource" - }, - "resourceProvisioning": { - "$ref": "#/definitions/ResourceProvisioning", - "description": "Specifies how the underlying service/resource is provisioned and managed." + "description": "SqlDatabase portable resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "SqlDatabaseSecrets": { "type": "object", @@ -1998,24 +1832,6 @@ "description": "Connection string used to connect to the target Sql database" } } - }, - "Versions": { - "type": "string", - "description": "Supported API versions for the Applications.Databases resource provider.", - "enum": [ - "2023-10-01-preview" - ], - "x-ms-enum": { - "name": "Versions", - "modelAsString": true, - "values": [ - { - "name": "v2023_10_01_preview", - "value": "2023-10-01-preview", - "description": "2023-10-01-preview" - } - ] - } } }, "parameters": { diff --git a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/openapi.json b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/openapi.json index 5cf3284966..3e46fa56fb 100644 --- a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/openapi.json +++ b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/openapi.json @@ -64,7 +64,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RabbitMQQueueResourceListResult" } @@ -115,7 +115,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RabbitMQQueueResource" } @@ -178,6 +178,10 @@ "$ref": "#/definitions/RabbitMQQueueResource" }, "headers": { + "Azure-AsyncOperation": { + "type": "string", + "description": "A link to the status monitor" + }, "Retry-After": { "type": "integer", "format": "int32", @@ -236,7 +240,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RabbitMQQueueResource" } @@ -244,14 +248,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -296,25 +300,22 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -363,14 +364,13 @@ "description": "The content of the action request", "required": true, "schema": { - "type": "object", - "properties": {} + "type": "object" } } ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RabbitMQListSecretsResult" } @@ -403,7 +403,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/OperationListResult" } @@ -422,6 +422,24 @@ } }, "definitions": { + "Azure.ResourceManager.CommonTypes.TrackedResourceUpdate": { + "type": "object", + "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", + "properties": { + "tags": { + "type": "object", + "description": "Resource tags.", + "additionalProperties": { + "type": "string" + } + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/Resource" + } + ] + }, "EnvironmentCompute": { "type": "object", "description": "Represents backing compute resource", @@ -453,7 +471,7 @@ ], "x-ms-enum": { "name": "IdentitySettingKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "undefined", @@ -530,32 +548,38 @@ "type": "string", "description": "Provisioning state of the resource at the time the operation was called", "enum": [ - "Succeeded", - "Failed", - "Canceled", - "Provisioning", + "Creating", "Updating", "Deleting", - "Accepted" + "Accepted", + "Provisioning", + "Succeeded", + "Failed", + "Canceled" ], "x-ms-enum": { "name": "ProvisioningState", - "modelAsString": true, + "modelAsString": false, "values": [ { - "name": "Succeeded", - "value": "Succeeded", - "description": "Resource has been created." + "name": "Creating", + "value": "Creating", + "description": "The resource is being created" }, { - "name": "Failed", - "value": "Failed", - "description": "Resource creation failed." + "name": "Updating", + "value": "Updating", + "description": "The resource is being updated" }, { - "name": "Canceled", - "value": "Canceled", - "description": "Resource creation was canceled." + "name": "Deleting", + "value": "Deleting", + "description": "The resource is being deleted" + }, + { + "name": "Accepted", + "value": "Accepted", + "description": "The resource create request has been accepted" }, { "name": "Provisioning", @@ -563,19 +587,19 @@ "description": "The resource is being provisioned" }, { - "name": "Updating", - "value": "Updating", - "description": "The resource is updating" + "name": "Succeeded", + "value": "Succeeded", + "description": "The resource has been successfully provisioned" }, { - "name": "Deleting", - "value": "Deleting", - "description": "The resource is being deleted" + "name": "Failed", + "value": "Failed", + "description": "The resource provisioning has failed" }, { - "name": "Accepted", - "value": "Accepted", - "description": "The resource create request has been accepted" + "name": "Canceled", + "value": "Canceled", + "description": "The resource provisioning has been canceled" } ] }, @@ -712,78 +736,12 @@ }, "RabbitMQQueueResourceUpdate": { "type": "object", - "description": "The type used for update operations of the RabbitMQQueueResource.", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - }, - "properties": { - "$ref": "#/definitions/RabbitMQQueueResourceUpdateProperties", - "x-ms-client-flatten": true - } - } - }, - "RabbitMQQueueResourceUpdateProperties": { - "type": "object", - "description": "The updatable properties of the RabbitMQQueueResource.", - "properties": { - "environment": { - "type": "string", - "description": "Fully qualified resource ID for the environment that the portable resource is linked to" - }, - "application": { - "type": "string", - "description": "Fully qualified resource ID for the application that the portable resource is consumed by (if applicable)" - }, - "secrets": { - "$ref": "#/definitions/RabbitMQSecrets", - "description": "The secrets to connect to the RabbitMQ instance" - }, - "queue": { - "type": "string", - "description": "The name of the queue" - }, - "host": { - "type": "string", - "description": "The hostname of the RabbitMQ instance" - }, - "port": { - "type": "integer", - "format": "int32", - "description": "The port of the RabbitMQ instance. Defaults to 5672" - }, - "vHost": { - "type": "string", - "description": "The RabbitMQ virtual host (vHost) the client will connect to. Defaults to no vHost." - }, - "username": { - "type": "string", - "description": "The username to use when connecting to the RabbitMQ instance" - }, - "resources": { - "type": "array", - "description": "List of the resource IDs that support the rabbitMQ resource", - "items": { - "$ref": "#/definitions/ResourceReference" - } - }, - "tls": { - "type": "boolean", - "description": "Specifies whether to use SSL when connecting to the RabbitMQ instance" - }, - "recipe": { - "$ref": "#/definitions/RecipeUpdate", - "description": "The recipe used to automatically deploy underlying infrastructure for the resource" - }, - "resourceProvisioning": { - "$ref": "#/definitions/ResourceProvisioning", - "description": "Specifies how the underlying service/resource is provisioned and managed." + "description": "RabbitMQQueue portable resource", + "allOf": [ + { + "$ref": "#/definitions/Azure.ResourceManager.CommonTypes.TrackedResourceUpdate" } - } + ] }, "RabbitMQSecrets": { "type": "object", @@ -809,8 +767,7 @@ }, "parameters": { "type": "object", - "description": "Key/value parameters to pass into the recipe at deployment", - "properties": {} + "description": "Key/value parameters to pass into the recipe at deployment" } }, "required": [ @@ -839,21 +796,6 @@ "templatePath" ] }, - "RecipeUpdate": { - "type": "object", - "description": "The recipe used to automatically deploy underlying infrastructure for a portable resource", - "properties": { - "name": { - "type": "string", - "description": "The name of the recipe within the environment to use" - }, - "parameters": { - "type": "object", - "description": "Key/value parameters to pass into the recipe at deployment", - "properties": {} - } - } - }, "ResourceProvisioning": { "type": "string", "description": "Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values.", @@ -863,7 +805,7 @@ ], "x-ms-enum": { "name": "ResourceProvisioning", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "recipe", @@ -913,24 +855,6 @@ "x-ms-identifiers": [] } } - }, - "Versions": { - "type": "string", - "description": "Supported API versions for the Applications.Messaging resource provider.", - "enum": [ - "2023-10-01-preview" - ], - "x-ms-enum": { - "name": "Versions", - "modelAsString": true, - "values": [ - { - "name": "v2023_10_01_preview", - "value": "2023-10-01-preview", - "description": "2023-10-01-preview" - } - ] - } } }, "parameters": { diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/openapi.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/openapi.json index b6c146bf74..15d421726d 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/openapi.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/openapi.json @@ -91,7 +91,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/GenericPlaneResourceListResult" } @@ -127,7 +127,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AwsPlaneResourceListResult" } @@ -167,7 +167,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AwsPlaneResource" } @@ -272,7 +272,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AwsPlaneResource" } @@ -280,14 +280,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -330,19 +330,19 @@ "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -374,7 +374,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AwsCredentialResourceListResult" } @@ -425,7 +425,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AwsCredentialResource" } @@ -541,7 +541,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AwsCredentialResource" } @@ -590,7 +590,7 @@ "description": "Resource deleted successfully." }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -623,7 +623,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AzurePlaneResourceListResult" } @@ -663,7 +663,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AzurePlaneResource" } @@ -768,7 +768,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AzurePlaneResource" } @@ -776,14 +776,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -826,19 +826,19 @@ "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -870,7 +870,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AzureCredentialResourceListResult" } @@ -921,7 +921,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AzureCredentialResource" } @@ -1037,7 +1037,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/AzureCredentialResource" } @@ -1086,7 +1086,7 @@ "description": "Resource deleted successfully." }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -1119,7 +1119,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RadiusPlaneResourceListResult" } @@ -1159,7 +1159,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RadiusPlaneResource" } @@ -1264,7 +1264,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/RadiusPlaneResource" } @@ -1272,14 +1272,14 @@ "202": { "description": "Resource update request accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, @@ -1322,19 +1322,19 @@ "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -1426,7 +1426,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ResourceProviderSummary" } @@ -1468,7 +1468,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ResourceProviderResourceListResult" } @@ -1522,7 +1522,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ResourceProviderResource" } @@ -1651,19 +1651,19 @@ "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -1715,7 +1715,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/LocationResourceListResult" } @@ -1778,7 +1778,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/LocationResource" } @@ -1925,19 +1925,19 @@ "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -1989,7 +1989,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ResourceTypeResourceListResult" } @@ -2052,7 +2052,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ResourceTypeResource" } @@ -2199,19 +2199,19 @@ "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -2272,7 +2272,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ApiVersionResourceListResult" } @@ -2344,7 +2344,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ApiVersionResource" } @@ -2509,19 +2509,19 @@ "202": { "description": "Resource deletion accepted.", "headers": { + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + }, "Retry-After": { "type": "integer", "format": "int32", "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." - }, - "Location": { - "type": "string", - "description": "The Location header contains the URL where the status of the long running operation can be checked." } } }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -2564,7 +2564,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ResourceGroupResourceListResult" } @@ -2618,7 +2618,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ResourceGroupResource" } @@ -2740,7 +2740,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/ResourceGroupResource" } @@ -2792,7 +2792,7 @@ "description": "Resource deleted successfully." }, "204": { - "description": "Resource deleted successfully." + "description": "Resource does not exist." }, "default": { "description": "An unexpected error response.", @@ -2840,7 +2840,7 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Azure operation completed successfully.", "schema": { "$ref": "#/definitions/GenericResourceListResult" } @@ -2873,7 +2873,7 @@ ], "x-ms-enum": { "name": "AWSCredentialKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "AccessKey", @@ -2911,12 +2911,7 @@ "properties": { "properties": { "$ref": "#/definitions/ApiVersionProperties", - "description": "The resource-specific properties for this resource.", - "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "description": "The resource-specific properties for this resource." } }, "allOf": [ @@ -3156,7 +3151,7 @@ ], "x-ms-enum": { "name": "AzureCredentialKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "ServicePrincipal", @@ -3390,16 +3385,21 @@ "type": "string", "description": "Credential store kinds supported.", "enum": [ - "Internal" + "Internal", + "string" ], "x-ms-enum": { "name": "CredentialStorageKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "name": "Internal", "value": "Internal", "description": "Internal credential storage" + }, + { + "name": "string", + "value": "string" } ] } @@ -3493,12 +3493,7 @@ "properties": { "properties": { "$ref": "#/definitions/ResourceProperties", - "description": "The resource-specific properties for this resource.", - "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "description": "The resource-specific properties for this resource." } }, "allOf": [ @@ -3584,12 +3579,7 @@ "properties": { "properties": { "$ref": "#/definitions/LocationProperties", - "description": "The resource-specific properties for this resource.", - "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "description": "The resource-specific properties for this resource." } }, "allOf": [ @@ -3634,8 +3624,7 @@ }, "LocationResourceTypeApiVersion": { "type": "object", - "description": "The configuration for an API version of an resource type.", - "properties": {} + "description": "The configuration for an API version of an resource type." }, "PagedResourceProviderSummary": { "type": "object", @@ -3678,32 +3667,38 @@ "type": "string", "description": "Provisioning state of the resource at the time the operation was called", "enum": [ - "Succeeded", - "Failed", - "Canceled", - "Provisioning", + "Creating", "Updating", "Deleting", - "Accepted" + "Accepted", + "Provisioning", + "Succeeded", + "Failed", + "Canceled" ], "x-ms-enum": { "name": "ProvisioningState", - "modelAsString": true, + "modelAsString": false, "values": [ { - "name": "Succeeded", - "value": "Succeeded", - "description": "Resource has been created." + "name": "Creating", + "value": "Creating", + "description": "The resource is being created" }, { - "name": "Failed", - "value": "Failed", - "description": "Resource creation failed." + "name": "Updating", + "value": "Updating", + "description": "The resource is being updated" }, { - "name": "Canceled", - "value": "Canceled", - "description": "Resource creation was canceled." + "name": "Deleting", + "value": "Deleting", + "description": "The resource is being deleted" + }, + { + "name": "Accepted", + "value": "Accepted", + "description": "The resource create request has been accepted" }, { "name": "Provisioning", @@ -3711,19 +3706,19 @@ "description": "The resource is being provisioned" }, { - "name": "Updating", - "value": "Updating", - "description": "The resource is updating" + "name": "Succeeded", + "value": "Succeeded", + "description": "The resource has been successfully provisioned" }, { - "name": "Deleting", - "value": "Deleting", - "description": "The resource is being deleted" + "name": "Failed", + "value": "Failed", + "description": "The resource provisioning has failed" }, { - "name": "Accepted", - "value": "Accepted", - "description": "The resource create request has been accepted" + "name": "Canceled", + "value": "Canceled", + "description": "The resource provisioning has been canceled" } ] }, @@ -3824,12 +3819,7 @@ "properties": { "properties": { "$ref": "#/definitions/ResourceGroupProperties", - "description": "The resource-specific properties for this resource.", - "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "description": "The resource-specific properties for this resource." } }, "allOf": [ @@ -3880,8 +3870,7 @@ }, "ResourceProperties": { "type": "object", - "description": "The resource properties", - "properties": {} + "description": "The resource properties" }, "ResourceProviderNamespaceString": { "type": "string", @@ -3906,12 +3895,7 @@ "properties": { "properties": { "$ref": "#/definitions/ResourceProviderProperties", - "description": "The resource-specific properties for this resource.", - "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "description": "The resource-specific properties for this resource." } }, "allOf": [ @@ -3972,8 +3956,7 @@ }, "ResourceProviderSummaryLocation": { "type": "object", - "description": "The configuration of a resource provider in a specific location.", - "properties": {} + "description": "The configuration of a resource provider in a specific location." }, "ResourceProviderSummaryResourceType": { "type": "object", @@ -4026,12 +4009,7 @@ "properties": { "properties": { "$ref": "#/definitions/ResourceTypeProperties", - "description": "The resource-specific properties for this resource.", - "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "description": "The resource-specific properties for this resource." } }, "allOf": [ @@ -4063,26 +4041,7 @@ }, "ResourceTypeSummaryResultApiVersion": { "type": "object", - "description": "The configuration of a resource type API version.", - "properties": {} - }, - "Versions": { - "type": "string", - "description": "Supported API versions for Universal Control Plane resource provider.", - "enum": [ - "2023-10-01-preview" - ], - "x-ms-enum": { - "name": "Versions", - "modelAsString": true, - "values": [ - { - "name": "v2023_10_01_preview", - "value": "2023-10-01-preview", - "description": "2023-10-01-preview" - } - ] - } + "description": "The configuration of a resource type API version." } }, "parameters": { diff --git a/typespec/Applications.Core/containers.tsp b/typespec/Applications.Core/containers.tsp index c9b02cf90d..001b229429 100644 --- a/typespec/Applications.Core/containers.tsp +++ b/typespec/Applications.Core/containers.tsp @@ -322,6 +322,10 @@ enum VolumePermission { enum IAMKind { @doc("Azure Active Directory") azure, + + // This was added because typespec doesn't generate necessary functions and other variables for single value enums. + // This can be deleted if we add more values to the enum. + string, } @armResourceOperations @@ -342,7 +346,7 @@ interface Containers { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< ContainerResource, UCPBaseParameters >; diff --git a/typespec/Applications.Core/extenders.tsp b/typespec/Applications.Core/extenders.tsp index 0ab8b288a0..576d0ac061 100644 --- a/typespec/Applications.Core/extenders.tsp +++ b/typespec/Applications.Core/extenders.tsp @@ -37,7 +37,7 @@ using OpenAPI; namespace Applications.Core; @doc("Response for list secrets API call") -model ExtenderListSecretResponse {} +model ExtenderListSecretResponse extends Record {} @doc("ExtenderResource portable resource") model ExtenderResource @@ -82,7 +82,7 @@ interface Extenders { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< ExtenderResource, UCPBaseParameters >; diff --git a/typespec/Applications.Core/gateways.tsp b/typespec/Applications.Core/gateways.tsp index 03cf2509fd..12f4bced5f 100644 --- a/typespec/Applications.Core/gateways.tsp +++ b/typespec/Applications.Core/gateways.tsp @@ -128,7 +128,7 @@ interface Gateways { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< GatewayResource, UCPBaseParameters >; diff --git a/typespec/Applications.Core/main.tsp b/typespec/Applications.Core/main.tsp index 22ffeb685f..2c39c8be69 100644 --- a/typespec/Applications.Core/main.tsp +++ b/typespec/Applications.Core/main.tsp @@ -21,7 +21,7 @@ import "./environments.tsp"; import "./applications.tsp"; import "./containers.tsp"; import "./gateways.tsp"; -import "./secretstores.tsp"; +import "./secretStores.tsp"; import "./volumes.tsp"; import "./extenders.tsp"; diff --git a/typespec/Applications.Core/secretstores.tsp b/typespec/Applications.Core/secretStores.tsp similarity index 98% rename from typespec/Applications.Core/secretstores.tsp rename to typespec/Applications.Core/secretStores.tsp index 3a3663f0ac..af153f6eaa 100644 --- a/typespec/Applications.Core/secretstores.tsp +++ b/typespec/Applications.Core/secretStores.tsp @@ -137,7 +137,7 @@ interface SecretStores { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< SecretStoreResource, UCPBaseParameters >; diff --git a/typespec/Applications.Core/tspconfig.yaml b/typespec/Applications.Core/tspconfig.yaml index 36ae5ddecf..5364ba5e70 100644 --- a/typespec/Applications.Core/tspconfig.yaml +++ b/typespec/Applications.Core/tspconfig.yaml @@ -4,7 +4,7 @@ options: "@azure-tools/typespec-autorest": use-read-only-status-schema: true azure-resource-provider-folder: "resource-manager" - examples-directory: "{project-root}/examples" + examples-dir: "{project-root}/examples" emitter-output-dir: "{project-root}/../../swagger/specification/applications" arm-types-dir: "{project-root}/../../swagger/specification/common-types/resource-management" output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json" diff --git a/typespec/Applications.Core/volumes.tsp b/typespec/Applications.Core/volumes.tsp index d6bbe65831..6d29491c26 100644 --- a/typespec/Applications.Core/volumes.tsp +++ b/typespec/Applications.Core/volumes.tsp @@ -166,7 +166,7 @@ interface Volumes { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< VolumeResource, UCPBaseParameters >; diff --git a/typespec/Applications.Dapr/configurationStores.tsp b/typespec/Applications.Dapr/configurationStores.tsp index 01ece3f5ec..afbbe66de7 100644 --- a/typespec/Applications.Dapr/configurationStores.tsp +++ b/typespec/Applications.Dapr/configurationStores.tsp @@ -79,7 +79,7 @@ interface ConfigurationStores { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< DaprConfigurationStoreResource, UCPBaseParameters >; diff --git a/typespec/Applications.Dapr/pubSubBrokers.tsp b/typespec/Applications.Dapr/pubSubBrokers.tsp index d3e9cbbe17..186be4c7e3 100644 --- a/typespec/Applications.Dapr/pubSubBrokers.tsp +++ b/typespec/Applications.Dapr/pubSubBrokers.tsp @@ -76,7 +76,7 @@ interface PubSubBrokers { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< DaprPubSubBrokerResource, UCPBaseParameters >; diff --git a/typespec/Applications.Dapr/secretStores.tsp b/typespec/Applications.Dapr/secretStores.tsp index b446143538..ea9856d386 100644 --- a/typespec/Applications.Dapr/secretStores.tsp +++ b/typespec/Applications.Dapr/secretStores.tsp @@ -75,7 +75,7 @@ interface SecretStores { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< DaprSecretStoreResource, UCPBaseParameters >; diff --git a/typespec/Applications.Dapr/stateStores.tsp b/typespec/Applications.Dapr/stateStores.tsp index cab6737ea4..3c8750914c 100644 --- a/typespec/Applications.Dapr/stateStores.tsp +++ b/typespec/Applications.Dapr/stateStores.tsp @@ -74,7 +74,7 @@ interface StateStores { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< DaprStateStoreResource, UCPBaseParameters >; diff --git a/typespec/Applications.Dapr/tspconfig.yaml b/typespec/Applications.Dapr/tspconfig.yaml index 38f0dc630d..5364ba5e70 100644 --- a/typespec/Applications.Dapr/tspconfig.yaml +++ b/typespec/Applications.Dapr/tspconfig.yaml @@ -4,7 +4,7 @@ options: "@azure-tools/typespec-autorest": use-read-only-status-schema: true azure-resource-provider-folder: "resource-manager" - examples-directory: "examples" + examples-dir: "{project-root}/examples" emitter-output-dir: "{project-root}/../../swagger/specification/applications" arm-types-dir: "{project-root}/../../swagger/specification/common-types/resource-management" output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json" diff --git a/typespec/Applications.Datastores/mongoDatabases.tsp b/typespec/Applications.Datastores/mongoDatabases.tsp index 7e92e4f66d..634bd9f340 100644 --- a/typespec/Applications.Datastores/mongoDatabases.tsp +++ b/typespec/Applications.Datastores/mongoDatabases.tsp @@ -103,7 +103,7 @@ interface MongoDatabases { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< MongoDatabaseResource, UCPBaseParameters >; diff --git a/typespec/Applications.Datastores/redisCaches.tsp b/typespec/Applications.Datastores/redisCaches.tsp index 35072608b8..3950cfbdb6 100644 --- a/typespec/Applications.Datastores/redisCaches.tsp +++ b/typespec/Applications.Datastores/redisCaches.tsp @@ -104,7 +104,7 @@ interface RedisCaches { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< RedisCacheResource, UCPBaseParameters >; diff --git a/typespec/Applications.Datastores/sqlDatabases.tsp b/typespec/Applications.Datastores/sqlDatabases.tsp index 31c9861a32..1c44c0f3c0 100644 --- a/typespec/Applications.Datastores/sqlDatabases.tsp +++ b/typespec/Applications.Datastores/sqlDatabases.tsp @@ -102,7 +102,7 @@ interface SqlDatabases { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< SqlDatabaseResource, UCPBaseParameters >; diff --git a/typespec/Applications.Datastores/tspconfig.yaml b/typespec/Applications.Datastores/tspconfig.yaml index 38f0dc630d..5364ba5e70 100644 --- a/typespec/Applications.Datastores/tspconfig.yaml +++ b/typespec/Applications.Datastores/tspconfig.yaml @@ -4,7 +4,7 @@ options: "@azure-tools/typespec-autorest": use-read-only-status-schema: true azure-resource-provider-folder: "resource-manager" - examples-directory: "examples" + examples-dir: "{project-root}/examples" emitter-output-dir: "{project-root}/../../swagger/specification/applications" arm-types-dir: "{project-root}/../../swagger/specification/common-types/resource-management" output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json" diff --git a/typespec/Applications.Messaging/rabbitMQQueues.tsp b/typespec/Applications.Messaging/rabbitMQQueues.tsp index b27808963f..eceb11e293 100644 --- a/typespec/Applications.Messaging/rabbitMQQueues.tsp +++ b/typespec/Applications.Messaging/rabbitMQQueues.tsp @@ -112,7 +112,7 @@ interface RabbitMQQueues { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< RabbitMQQueueResource, UCPBaseParameters >; diff --git a/typespec/Applications.Messaging/tspconfig.yaml b/typespec/Applications.Messaging/tspconfig.yaml index 38f0dc630d..5364ba5e70 100644 --- a/typespec/Applications.Messaging/tspconfig.yaml +++ b/typespec/Applications.Messaging/tspconfig.yaml @@ -4,7 +4,7 @@ options: "@azure-tools/typespec-autorest": use-read-only-status-schema: true azure-resource-provider-folder: "resource-manager" - examples-directory: "examples" + examples-dir: "{project-root}/examples" emitter-output-dir: "{project-root}/../../swagger/specification/applications" arm-types-dir: "{project-root}/../../swagger/specification/common-types/resource-management" output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json" diff --git a/typespec/Test.Resource/testasyncresources.tsp b/typespec/Test.Resource/testasyncresources.tsp index daa3bdd423..d9687554d6 100644 --- a/typespec/Test.Resource/testasyncresources.tsp +++ b/typespec/Test.Resource/testasyncresources.tsp @@ -71,7 +71,7 @@ interface TestAsyncResources { UCPBaseParameters >; - delete is ArmResourceDeleteAsync< + delete is ArmResourceDeleteWithoutOkAsync< TestAsyncResource, UCPBaseParameters >; diff --git a/typespec/Test.Resource/tspconfig.yaml b/typespec/Test.Resource/tspconfig.yaml index 36ae5ddecf..5364ba5e70 100644 --- a/typespec/Test.Resource/tspconfig.yaml +++ b/typespec/Test.Resource/tspconfig.yaml @@ -4,7 +4,7 @@ options: "@azure-tools/typespec-autorest": use-read-only-status-schema: true azure-resource-provider-folder: "resource-manager" - examples-directory: "{project-root}/examples" + examples-dir: "{project-root}/examples" emitter-output-dir: "{project-root}/../../swagger/specification/applications" arm-types-dir: "{project-root}/../../swagger/specification/common-types/resource-management" output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json" diff --git a/typespec/UCP/common.tsp b/typespec/UCP/common.tsp index 5387ba08df..6e26894eee 100644 --- a/typespec/UCP/common.tsp +++ b/typespec/UCP/common.tsp @@ -46,6 +46,10 @@ model CredentialBaseParameters { enum CredentialStorageKind { @doc("Internal credential storage") Internal, + + // This was added because typespec doesn't generate necessary functions and other variables for single value enums. + // This can be deleted if we add more values to the enum. + string, } @doc("The base credential storage properties") diff --git a/typespec/UCP/resourceproviders.tsp b/typespec/UCP/resourceproviders.tsp index 9fbd68a36f..b673eab19b 100644 --- a/typespec/UCP/resourceproviders.tsp +++ b/typespec/UCP/resourceproviders.tsp @@ -60,7 +60,8 @@ scalar LocationNameString extends string; #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-path-segment-invalid-chars" @doc("The resource type for defining a resource provider.") -model ResourceProviderResource is TrackedResource { +model ResourceProviderResource + is Azure.ResourceManager.TrackedResource { @key("resourceProviderName") @doc("The resource provider name. This is also the resource provider namespace. Example: 'Applications.Datastores'.") @path @@ -76,7 +77,8 @@ model ResourceProviderProperties { } @doc("The resource type for defining a resource type supported by the containing resource provider.") -model ResourceTypeResource is ProxyResource { +model ResourceTypeResource + is Azure.ResourceManager.ProxyResource { @key("resourceTypeName") @doc("The resource type name.") @path @@ -95,7 +97,8 @@ model ResourceTypeProperties { } @doc("The resource type for defining an API version of a resource type supported by the containing resource provider.") -model ApiVersionResource is ProxyResource { +model ApiVersionResource + is Azure.ResourceManager.ProxyResource { @key("apiVersionName") @doc("The API version name.") @path @@ -111,7 +114,8 @@ model ApiVersionProperties { } @doc("The resource type for defining a location of the containing resource provider. The location resource represents a logical location where the resource provider operates.") -model LocationResource is ProxyResource { +model LocationResource + is Azure.ResourceManager.ProxyResource { @key("locationName") @doc("The location name.") @path diff --git a/typespec/UCP/tspconfig.yaml b/typespec/UCP/tspconfig.yaml index 7bd4805bb3..f2d1d8e912 100644 --- a/typespec/UCP/tspconfig.yaml +++ b/typespec/UCP/tspconfig.yaml @@ -4,7 +4,7 @@ options: "@azure-tools/typespec-autorest": use-read-only-status-schema: true azure-resource-provider-folder: "resource-manager" - examples-directory: "{project-root}/examples" + examples-dir: "{project-root}/examples" emitter-output-dir: "{project-root}/../../swagger/specification/ucp" arm-types-dir: "{project-root}/../../swagger/specification/common-types/resource-management" output-file: "{azure-resource-provider-folder}/UCP/{version-status}/{version}/openapi.json" diff --git a/typespec/UCP/ucp-operations.tsp b/typespec/UCP/ucp-operations.tsp index 7cdb7f6165..e2fa14abc7 100644 --- a/typespec/UCP/ucp-operations.tsp +++ b/typespec/UCP/ucp-operations.tsp @@ -35,7 +35,7 @@ using OpenAPI; @doc("List {name}", TResource) @segmentOf(TResource) @armResourceList(TResource) -op UcpResourceList( +op UcpResourceList( ...TBaseParameters, ...ParentKeysOf, ): ArmResponse> | ErrorResponse; @@ -45,7 +45,7 @@ op UcpResourceList( @doc("Get a {name}", TResource) @get @armResourceRead(TResource) -op UcpResourceRead( +op UcpResourceRead( ...TBaseParameters, ): ArmResponse | ErrorResponse; @@ -62,7 +62,7 @@ op UcpResourceRead( @armResourceCreateOrUpdate(TResource) @put op UcpResourceCreateOrUpdateAsync< - TResource extends ArmResource, + TResource extends Foundations.Resource, TBaseParameters >( ...TBaseParameters, @@ -85,7 +85,7 @@ op UcpResourceCreateOrUpdateAsync< @armResourceUpdate(TResource) @patch op UcpCustomPatchAsync< - TResource extends ArmResource, + TResource extends Foundations.Resource, TBaseParameters, TPatchModel extends TypeSpec.Reflection.Model = TagsUpdateModel >( @@ -108,9 +108,10 @@ op UcpCustomPatchAsync< ) @armResourceDelete(TResource) @delete -op UcpResourceDeleteAsync( - ...TBaseParameters, -): +op UcpResourceDeleteAsync< + TResource extends Foundations.Resource, + TBaseParameters +>(...TBaseParameters): | ArmDeletedResponse | ArmDeleteAcceptedLroResponse | ArmDeletedNoContentResponse @@ -122,7 +123,7 @@ op UcpResourceDeleteAsync( @armResourceCreateOrUpdate(TResource) @put op UcpResourceCreateOrUpdateSync< - TResource extends ArmResource, + TResource extends Foundations.Resource, TBaseParameters >( ...TBaseParameters, @@ -138,7 +139,7 @@ op UcpResourceCreateOrUpdateSync< @armResourceUpdate(TResource) @patch op UcpCustomPatchSync< - TResource extends ArmResource, + TResource extends Foundations.Resource, TBaseParameters, TPatchModel extends TypeSpec.Reflection.Model = TagsUpdateModel >( @@ -154,6 +155,9 @@ op UcpCustomPatchSync< @doc("Delete a {name}", TResource) @armResourceDelete(TResource) @delete -op UcpResourceDeleteSync( +op UcpResourceDeleteSync< + TResource extends Foundations.Resource, + TBaseParameters +>( ...TBaseParameters, ): ArmDeletedResponse | ArmDeletedNoContentResponse | ErrorResponse; diff --git a/typespec/package-lock.json b/typespec/package-lock.json index 4c519678ec..846fca58d7 100644 --- a/typespec/package-lock.json +++ b/typespec/package-lock.json @@ -9,115 +9,134 @@ "version": "0.1.0", "license": "Apache-2.0", "dependencies": { - "@azure-tools/typespec-autorest": "*", - "@azure-tools/typespec-azure-core": "*", - "@azure-tools/typespec-azure-resource-manager": "*", - "@azure-tools/typespec-providerhub": "*", - "@typespec/compiler": "*", - "@typespec/http": "*", - "@typespec/openapi": "*", - "@typespec/rest": "*", - "@typespec/versioning": "*" + "@azure-tools/typespec-autorest": "latest", + "@azure-tools/typespec-azure-core": "latest", + "@azure-tools/typespec-azure-resource-manager": "latest", + "@azure-tools/typespec-providerhub": "latest", + "@typespec/compiler": "latest", + "@typespec/http": "latest", + "@typespec/openapi": "latest", + "@typespec/rest": "latest", + "@typespec/versioning": "latest" } }, "node_modules/@azure-tools/typespec-autorest": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.33.0.tgz", - "integrity": "sha512-xA29JJt6Dnb8402xYJrR1dAwzEuhen/gcYeUk4KZrfn/3FsLpfiGQCwTAfcCd6iyLDRx7yQ34ysJmLt5ebcOdw==", + "version": "0.46.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.46.0.tgz", + "integrity": "sha512-LCIvxQgjczWUq/wi6fzKBqYHWJYD0hRLA8wBPzFasriHdBDHjpZ6vgTPmApzt0H5ArZX92Ar53Q5+ZXD9ktMUg==", + "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "~0.33.0", - "@typespec/compiler": "~0.47.0", - "@typespec/http": "~0.47.0", - "@typespec/openapi": "~0.47.0", - "@typespec/rest": "~0.47.0", - "@typespec/versioning": "~0.47.0" + "@azure-tools/typespec-azure-core": "~0.46.0", + "@azure-tools/typespec-azure-resource-manager": "~0.46.0", + "@azure-tools/typespec-client-generator-core": "~0.46.0", + "@typespec/compiler": "~0.60.0", + "@typespec/http": "~0.60.0", + "@typespec/openapi": "~0.60.0", + "@typespec/rest": "~0.60.0", + "@typespec/versioning": "~0.60.0" } }, "node_modules/@azure-tools/typespec-azure-core": { - "version": "0.33.1", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.33.1.tgz", - "integrity": "sha512-g2MbyofjGo5GrPu/L0D3dXRcYXJOIA+abLWS6CRwwGN0RT0W+tnV8SFvGWRbBFsU0gWEZapfJKBwpVVwau6pVQ==", - "dependencies": { - "@typespec/lint": "~0.47.0" - }, + "version": "0.46.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.46.0.tgz", + "integrity": "sha512-BNE31enSHWtWlrdIKShBS6CNFGk3OYmHSBnWqobcFJkTGXC090EoV2u6otn4BMI99fZRSR4gpwp/kYU9KLE9Jw==", + "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.47.0", - "@typespec/http": "~0.47.0", - "@typespec/rest": "~0.47.0" + "@typespec/compiler": "~0.60.0", + "@typespec/http": "~0.60.0", + "@typespec/rest": "~0.60.0" } }, "node_modules/@azure-tools/typespec-azure-resource-manager": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.33.0.tgz", - "integrity": "sha512-8jkOae2Yf5fsYVh7ZgdC+a06Ghlfnk6DvLIQPouwOIftsmnUXScJdDIPodqxjdHuR5AWr053+OiKtVrJDWYgjw==", + "version": "0.46.1", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.46.1.tgz", + "integrity": "sha512-8md8AwnxoYVkDBavQL5dbToUTS10PTSkcF+emd9BKEdnF9MKuA542vZudzaQOz2BzFbArMVUE/PLm2mhuwRkLw==", + "license": "MIT", "dependencies": { - "@typespec/lint": "~0.47.0" + "change-case": "~5.4.4", + "pluralize": "^8.0.0" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": "~0.33.0", - "@azure-tools/typespec-azure-core": "~0.33.0", - "@typespec/compiler": "~0.47.0", - "@typespec/http": "~0.47.0", - "@typespec/openapi": "~0.47.0", - "@typespec/rest": "~0.47.0", - "@typespec/versioning": "~0.47.0" + "@azure-tools/typespec-azure-core": "~0.46.0", + "@typespec/compiler": "~0.60.0", + "@typespec/http": "~0.60.0", + "@typespec/openapi": "~0.60.0", + "@typespec/rest": "~0.60.0", + "@typespec/versioning": "~0.60.0" } }, - "node_modules/@azure-tools/typespec-providerhub": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-providerhub/-/typespec-providerhub-0.33.0.tgz", - "integrity": "sha512-18HRdQUwSrzcyDxP95REu4qIOL8SMjUhifZAJjGThwhkqczTxoeqPI3ek3ISFj9C7SsSvvlLAsL09kiy+GKYZA==", + "node_modules/@azure-tools/typespec-client-generator-core": { + "version": "0.46.2", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.46.2.tgz", + "integrity": "sha512-/HKeehCNDeylouOHMe7IwpcDcGJHRAuEy3a5FBnSY51m4EpMq4VMQzW9tka/8brFO2m5LLj7tyhOL/xnzi2fLg==", + "license": "MIT", + "peer": true, + "dependencies": { + "change-case": "~5.4.4", + "pluralize": "^8.0.0" + }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": "~0.33.0", - "@azure-tools/typespec-azure-core": "~0.33.0", - "@azure-tools/typespec-azure-resource-manager": "~0.33.0", - "@typespec/compiler": "~0.47.0", - "@typespec/http": "~0.47.0", - "@typespec/openapi": "~0.47.0", - "@typespec/rest": "~0.47.0", - "@typespec/versioning": "~0.47.0" + "@azure-tools/typespec-azure-core": "~0.46.0", + "@typespec/compiler": "~0.60.0", + "@typespec/http": "~0.60.0", + "@typespec/openapi": "~0.60.0", + "@typespec/rest": "~0.60.0", + "@typespec/versioning": "~0.60.0" + } + }, + "node_modules/@azure-tools/typespec-providerhub": { + "version": "0.46.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-providerhub/-/typespec-providerhub-0.46.0.tgz", + "integrity": "sha512-N+lp8wHDJJTbt0vVijELfjEcukz19YvS6nMhR5Um13nIWveCcYBXaCGwkVJMfFL8Dm6yZS0B9q+FLkQ043xpzg==", + "license": "MIT", + "engines": { + "node": ">=18.0.0" } }, "node_modules/@babel/code-frame": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", - "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "license": "MIT", "dependencies": { - "@babel/highlight": "^7.22.10", - "chalk": "^2.4.2" + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", + "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", - "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz", + "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==", + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.25.7", "chalk": "^2.4.2", - "js-tokens": "^4.0.0" + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" @@ -127,6 +146,7 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -139,6 +159,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", "engines": { "node": ">= 8" } @@ -147,6 +168,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -155,99 +177,107 @@ "node": ">= 8" } }, + "node_modules/@sindresorhus/merge-streams": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", + "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@typespec/compiler": { - "version": "0.47.1", - "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.47.1.tgz", - "integrity": "sha512-EBTweucgrUiFLVbBLYJobgV1emoGzM50iPrOz/Fr3dwFFnISpZJ8wzapq+z0okrvx75+W5q12bms8DjsUWapTA==", - "dependencies": { - "@babel/code-frame": "~7.22.5", - "ajv": "~8.12.0", - "change-case": "~4.1.2", - "globby": "~13.1.1", - "js-yaml": "~4.1.0", + "version": "0.60.1", + "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.60.1.tgz", + "integrity": "sha512-I6Vcpvd7mBP7SI5vCBh9rZGXAtVy95BKhAd33Enw32psswiSzRpA7zdyZhOMekTOGVXNS/+E5l2PGGCzQddB4w==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "~7.24.7", + "ajv": "~8.17.1", + "change-case": "~5.4.4", + "globby": "~14.0.2", "mustache": "~4.2.0", - "picocolors": "~1.0.0", - "prettier": "~3.0.1", - "prompts": "~2.4.1", - "semver": "^7.3.8", - "vscode-languageserver": "~8.1.0", - "vscode-languageserver-textdocument": "~1.0.1", - "yargs": "~17.7.1" + "picocolors": "~1.0.1", + "prettier": "~3.3.3", + "prompts": "~2.4.2", + "semver": "^7.6.3", + "temporal-polyfill": "^0.2.5", + "vscode-languageserver": "~9.0.1", + "vscode-languageserver-textdocument": "~1.0.11", + "yaml": "~2.4.5", + "yargs": "~17.7.2" }, "bin": { "tsp": "cmd/tsp.js", "tsp-server": "cmd/tsp-server.js" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@typespec/http": { - "version": "0.47.0", - "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.47.0.tgz", - "integrity": "sha512-HrVu5mGV+p3KGPtcNFHB5gXm9pU4rYRG3hJWZdLcN8fy+OuwbhmOgjOGN4AB7HLllnISmcFn6LtlqGnr0LpyfA==", + "version": "0.60.0", + "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.60.0.tgz", + "integrity": "sha512-ktfS9vpHfltyeAaQLNAZdqrn6Per3vmB/HDH/iyudYLA5wWblT1siKvpFCMWq53CJorRO7yeOKv+Q/M26zwEtg==", + "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.47.0" - } - }, - "node_modules/@typespec/lint": { - "version": "0.47.0", - "resolved": "https://registry.npmjs.org/@typespec/lint/-/lint-0.47.0.tgz", - "integrity": "sha512-+CZ8OC8ABHU+HljjWvkVfLDZzyj2kc8VqEOHoXYdomt7PTo2GdVubyOXZMAYFiXWJr/k4YWHD2moPcvu+e2yTQ==", - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@typespec/compiler": "~0.47.0" + "@typespec/compiler": "~0.60.0" } }, "node_modules/@typespec/openapi": { - "version": "0.47.0", - "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.47.0.tgz", - "integrity": "sha512-p10NA5MQ1/z/yltTmK9g/RHgRQa+UPJg7ntcix8I9DIwX6u3yJReYwWBrKLeRNExd8ylNHNqjXTwiHJfptmR3w==", + "version": "0.60.0", + "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.60.0.tgz", + "integrity": "sha512-YVwLppgHY8r/MudHNSLSUXzdw+CIpjmb31gI2a0KDGnI6sWDwY7LSWfjGU4TY/ubt0+X0Tjoy330mTvw71YBTg==", + "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.47.0", - "@typespec/http": "~0.47.0", - "@typespec/rest": "~0.47.0" + "@typespec/compiler": "~0.60.0", + "@typespec/http": "~0.60.0" } }, "node_modules/@typespec/rest": { - "version": "0.47.0", - "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.47.0.tgz", - "integrity": "sha512-sjxCY2dQ6Wc51W7NYDLgcZdeTI35vFJR0aK+tuYHMTwjhZJK20ezwb/c+RZQ8xyGIyX+vUj9yhTc7lBZGw4n1A==", + "version": "0.60.0", + "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.60.0.tgz", + "integrity": "sha512-mHYubyuBvwdV2xkHrJfPwV7b/Ksyb9lA1Q/AQwpVFa7Qu1X075TBVALmH+hK3V0EdUG1CGJZ5Sw4BWgl8ZS0BA==", + "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.47.0" + "@typespec/compiler": "~0.60.0", + "@typespec/http": "~0.60.0" } }, "node_modules/@typespec/versioning": { - "version": "0.47.0", - "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.47.0.tgz", - "integrity": "sha512-j3NUBm61k40ZI5aljgqfVFvduoR+q7ijLpwt+lzXw/DecOgNWZX7R/GGzwCmUVyfJUZpMA/8zhuxmx4fB36P7g==", + "version": "0.60.1", + "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.60.1.tgz", + "integrity": "sha512-HogYL7P9uOPoSvkLLDjF22S6E9td6EY3c6TcIHhCzDTAQoi54csikD0gNrtcCkFG0UeQk29HgQymV397j+vp4g==", + "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.47.0" + "@typespec/compiler": "~0.60.0" } }, "node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.1", + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -258,6 +288,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -266,6 +297,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -273,15 +305,11 @@ "node": ">=4" } }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, "node_modules/braces": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -289,29 +317,11 @@ "node": ">=8" } }, - "node_modules/camel-case": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", - "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", - "dependencies": { - "pascal-case": "^3.1.2", - "tslib": "^2.0.3" - } - }, - "node_modules/capital-case": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz", - "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==", - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3", - "upper-case-first": "^2.0.2" - } - }, "node_modules/chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -322,28 +332,16 @@ } }, "node_modules/change-case": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz", - "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==", - "dependencies": { - "camel-case": "^4.1.2", - "capital-case": "^1.0.4", - "constant-case": "^3.0.4", - "dot-case": "^3.0.4", - "header-case": "^2.0.4", - "no-case": "^3.0.4", - "param-case": "^3.0.4", - "pascal-case": "^3.1.2", - "path-case": "^3.0.4", - "sentence-case": "^3.0.4", - "snake-case": "^3.0.4", - "tslib": "^2.0.3" - } + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz", + "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==", + "license": "MIT" }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -357,6 +355,7 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", "dependencies": { "color-name": "1.1.3" } @@ -364,47 +363,20 @@ "node_modules/color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" - }, - "node_modules/constant-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz", - "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==", - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3", - "upper-case": "^2.0.2" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dot-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "license": "MIT" }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", "engines": { "node": ">=6" } @@ -413,6 +385,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -420,12 +393,14 @@ "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "license": "MIT" }, "node_modules/fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -437,10 +412,17 @@ "node": ">=8.6.0" } }, + "node_modules/fast-uri": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz", + "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==", + "license": "MIT" + }, "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } @@ -449,6 +431,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -460,6 +443,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -468,6 +452,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -476,18 +461,20 @@ } }, "node_modules/globby": { - "version": "13.1.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.4.tgz", - "integrity": "sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", + "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", + "license": "MIT", "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" + "@sindresorhus/merge-streams": "^2.1.0", + "fast-glob": "^3.3.2", + "ignore": "^5.2.4", + "path-type": "^5.0.0", + "slash": "^5.1.0", + "unicorn-magic": "^0.1.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -497,23 +484,16 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "license": "MIT", "engines": { "node": ">=4" } }, - "node_modules/header-case": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", - "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==", - "dependencies": { - "capital-case": "^1.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", "engines": { "node": ">= 4" } @@ -522,6 +502,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -530,6 +511,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", "engines": { "node": ">=8" } @@ -538,6 +520,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -549,6 +532,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -556,55 +540,29 @@ "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "license": "MIT" }, "node_modules/kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "license": "MIT", "engines": { "node": ">=6" } }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dependencies": { - "tslib": "^2.0.3" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "license": "MIT", "engines": { "node": ">= 8" } @@ -613,6 +571,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -625,63 +584,34 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", + "license": "MIT", "bin": { "mustache": "bin/mustache" } }, - "node_modules/no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dependencies": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, - "node_modules/param-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", - "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", - "dependencies": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/path-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz", - "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==", - "dependencies": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", + "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -689,10 +619,20 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pluralize": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", + "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/prettier": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.2.tgz", - "integrity": "sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -707,6 +647,7 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "license": "MIT", "dependencies": { "kleur": "^3.0.3", "sisteransi": "^1.0.5" @@ -715,14 +656,6 @@ "node": ">= 6" } }, - "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "engines": { - "node": ">=6" - } - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -740,12 +673,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -754,6 +689,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -762,6 +698,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -785,17 +722,16 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dependencies": { - "lru-cache": "^6.0.0" - }, + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -803,45 +739,29 @@ "node": ">=10" } }, - "node_modules/sentence-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz", - "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==", - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3", - "upper-case-first": "^2.0.2" - } - }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "license": "MIT" }, "node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", + "license": "MIT", "engines": { - "node": ">=12" + "node": ">=14.16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/snake-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", - "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", - "dependencies": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -855,6 +775,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -866,6 +787,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -873,10 +795,26 @@ "node": ">=4" } }, + "node_modules/temporal-polyfill": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.2.5.tgz", + "integrity": "sha512-ye47xp8Cb0nDguAhrrDS1JT1SzwEV9e26sSsrWzVu+yPZ7LzceEcH0i2gci9jWfOfSCCgM3Qv5nOYShVUUFUXA==", + "license": "MIT", + "dependencies": { + "temporal-spec": "^0.2.4" + } + }, + "node_modules/temporal-spec": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.2.4.tgz", + "integrity": "sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ==", + "license": "ISC" + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -884,77 +822,66 @@ "node": ">=8.0" } }, - "node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==" - }, - "node_modules/upper-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz", - "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==", - "dependencies": { - "tslib": "^2.0.3" - } - }, - "node_modules/upper-case-first": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz", - "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==", - "dependencies": { - "tslib": "^2.0.3" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dependencies": { - "punycode": "^2.1.0" + "node_modules/unicorn-magic": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", + "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/vscode-jsonrpc": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz", - "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "license": "MIT", "engines": { "node": ">=14.0.0" } }, "node_modules/vscode-languageserver": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz", - "integrity": "sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", + "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==", + "license": "MIT", "dependencies": { - "vscode-languageserver-protocol": "3.17.3" + "vscode-languageserver-protocol": "3.17.5" }, "bin": { "installServerIntoExtension": "bin/installServerIntoExtension" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz", - "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==", + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", + "license": "MIT", "dependencies": { - "vscode-jsonrpc": "8.1.0", - "vscode-languageserver-types": "3.17.3" + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" } }, "node_modules/vscode-languageserver-textdocument": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz", - "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==" + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", + "license": "MIT" }, "node_modules/vscode-languageserver-types": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz", - "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==" + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", + "license": "MIT" }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -971,6 +898,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -985,6 +913,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -995,25 +924,35 @@ "node_modules/wrap-ansi/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", "engines": { "node": ">=10" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "node_modules/yaml": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz", + "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==", + "license": "ISC", + "bin": { + "yaml": "bin.mjs" + }, + "engines": { + "node": ">= 14" + } }, "node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -1031,6 +970,7 @@ "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", "engines": { "node": ">=12" } diff --git a/typespec/radius/v1/resources.tsp b/typespec/radius/v1/resources.tsp index 505eaa7cdb..48632603eb 100644 --- a/typespec/radius/v1/resources.tsp +++ b/typespec/radius/v1/resources.tsp @@ -166,12 +166,10 @@ model ResourceReference { @doc("Provisioning state of the resource at the time the operation was called") @lroStatus enum ProvisioningState { - ...ResourceProvisioningState, + @doc("The resource is being created") + Creating, - @doc("The resource is being provisioned") - Provisioning, - - @doc("The resource is updating") + @doc("The resource is being updated") Updating, @doc("The resource is being deleted") @@ -179,6 +177,18 @@ enum ProvisioningState { @doc("The resource create request has been accepted") Accepted, + + @doc("The resource is being provisioned") + Provisioning, + + @doc("The resource has been successfully provisioned") + Succeeded, + + @doc("The resource provisioning has failed") + Failed, + + @doc("The resource provisioning has been canceled") + Canceled, } @doc("The base properties of Recipe") diff --git a/typespec/radius/v1/trackedresource.tsp b/typespec/radius/v1/trackedresource.tsp index 9105227b54..56657b8b8a 100644 --- a/typespec/radius/v1/trackedresource.tsp +++ b/typespec/radius/v1/trackedresource.tsp @@ -32,7 +32,7 @@ model TrackedResourceRequired< TProperties extends {}, TResourceType extends valueof string, TResourceFriendlyName extends valueof string = TResourceType -> extends Azure.ResourceManager.Foundations.TrackedResourceBase { +> extends Azure.ResourceManager.Foundations.TrackedResource { #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "template" #suppress "@azure-tools/typespec-azure-core/bad-record-type" @doc("The resource-specific properties for this resource.") diff --git a/typespec/radius/v1/ucprootscope.tsp b/typespec/radius/v1/ucprootscope.tsp index 15efa22483..34862aea3a 100644 --- a/typespec/radius/v1/ucprootscope.tsp +++ b/typespec/radius/v1/ucprootscope.tsp @@ -35,7 +35,7 @@ model RootScopeParameter { } @doc("The UCP HTTP request base parameters.") -model UCPBaseParameters { +model UCPBaseParameters { ...ApiVersionParameter; ...RootScopeParameter; }