From 9757f7caf93602ca5f2edd93b0f6f8ce4a4b660c Mon Sep 17 00:00:00 2001 From: qianwens Date: Mon, 9 Jan 2023 14:26:49 +0800 Subject: [PATCH 1/3] add default value for enums --- .../2022-11-01-preview/servicelinker.json | 71 ++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json index 968a0ca10bfc..12b30e187cbf 100644 --- a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json +++ b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json @@ -1526,7 +1526,8 @@ "django", "nodejs", "springBoot", - "kafka-springBoot" + "kafka-springBoot", + "dapr" ], "x-ms-enum": { "name": "clientType", @@ -2030,6 +2031,10 @@ "$ref": "#/definitions/AuthType", "description": "The auth type." }, + "daprProperties": { + "description": "Indicates some additional properties for dapr client type", + "$ref": "#/definitions/DaprProperties" + }, "names": { "type": "array", "description": "The configuration names to be set in compute service environment.", @@ -2049,6 +2054,10 @@ "description": { "type": "string", "description": "Description for the configuration name." + }, + "required": { + "type": "boolean", + "description": "Represent the configuration is required or not" } } }, @@ -2282,6 +2291,10 @@ "type": "string" } }, + "daprProperties": { + "description": "Indicates some additional properties for dapr client type", + "$ref": "#/definitions/DaprProperties" + }, "additionalConfigurations": { "description": "A dictionary of additional configurations to be added. Service will auto generate a set of basic configurations and this property is to full fill more customized configurations", "type": "object", @@ -2291,6 +2304,62 @@ } } }, + "DaprProperties": { + "type": "object", + "description": "Indicates some additional properties for dapr client type", + "properties": { + "version": { + "x-nullable": true, + "type": "string", + "description": "The dapr component version" + }, + "componentType": { + "x-nullable": true, + "type": "string", + "description": "The dapr component type" + }, + "secretStoreComponent": { + "x-nullable": true, + "type": "string", + "description": "The name of a secret store dapr to retrieve secret" + }, + "metadata": { + "description": "Additional dapr metadata", + "type": "array", + "items": { + "$ref": "#/definitions/DaprMetadata" + }, + "x-ms-identifiers": [ + "name" + ] + }, + "scopes": { + "description": "The dapr component scopes", + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "DaprMetadata": { + "description": "The dapr component metadata.", + "type": "object", + "properties": { + "name": { + "description": "Metadata property name.", + "type": "string" + }, + "value": { + "description": "Metadata property value.", + "type": "string" + }, + "secretRef": { + "description": "The secret name where dapr could get value", + "type": "string" + } + } + }, "SecretStore": { "type": "object", "description": "An option to store secret value in secure place", From db344b90443878bfde341dc6b5c90da6508e484c Mon Sep 17 00:00:00 2001 From: qianwens Date: Mon, 9 Jan 2023 14:40:41 +0800 Subject: [PATCH 2/3] add default value for enum --- .../2022-11-01-preview/servicelinker.json | 76 ++----------------- 1 file changed, 7 insertions(+), 69 deletions(-) diff --git a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json index 12b30e187cbf..43c973896d2b 100644 --- a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json +++ b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json @@ -1510,7 +1510,8 @@ "x-ms-enum": { "name": "DeleteOrUpdateBehavior", "modelAsString": true - } + }, + "default": "Default" }, "ClientType": { "description": "The application client type", @@ -1526,8 +1527,7 @@ "django", "nodejs", "springBoot", - "kafka-springBoot", - "dapr" + "kafka-springBoot" ], "x-ms-enum": { "name": "clientType", @@ -2031,10 +2031,6 @@ "$ref": "#/definitions/AuthType", "description": "The auth type." }, - "daprProperties": { - "description": "Indicates some additional properties for dapr client type", - "$ref": "#/definitions/DaprProperties" - }, "names": { "type": "array", "description": "The configuration names to be set in compute service environment.", @@ -2291,10 +2287,6 @@ "type": "string" } }, - "daprProperties": { - "description": "Indicates some additional properties for dapr client type", - "$ref": "#/definitions/DaprProperties" - }, "additionalConfigurations": { "description": "A dictionary of additional configurations to be added. Service will auto generate a set of basic configurations and this property is to full fill more customized configurations", "type": "object", @@ -2304,62 +2296,6 @@ } } }, - "DaprProperties": { - "type": "object", - "description": "Indicates some additional properties for dapr client type", - "properties": { - "version": { - "x-nullable": true, - "type": "string", - "description": "The dapr component version" - }, - "componentType": { - "x-nullable": true, - "type": "string", - "description": "The dapr component type" - }, - "secretStoreComponent": { - "x-nullable": true, - "type": "string", - "description": "The name of a secret store dapr to retrieve secret" - }, - "metadata": { - "description": "Additional dapr metadata", - "type": "array", - "items": { - "$ref": "#/definitions/DaprMetadata" - }, - "x-ms-identifiers": [ - "name" - ] - }, - "scopes": { - "description": "The dapr component scopes", - "type": "array", - "items": { - "type": "string" - } - } - } - }, - "DaprMetadata": { - "description": "The dapr component metadata.", - "type": "object", - "properties": { - "name": { - "description": "Metadata property name.", - "type": "string" - }, - "value": { - "description": "Metadata property value.", - "type": "string" - }, - "secretRef": { - "description": "The secret name where dapr could get value", - "type": "string" - } - } - }, "SecretStore": { "type": "object", "description": "An option to store secret value in secure place", @@ -2609,7 +2545,8 @@ "x-ms-enum": { "name": "actionType", "modelAsString": true - } + }, + "default": "enable" }, "AllowType": { "description": "Whether to allow firewall rules.", @@ -2621,7 +2558,8 @@ "x-ms-enum": { "name": "allowType", "modelAsString": true - } + }, + "default": "false" } }, "parameters": { From 1f09b0dd258b09ffe43800c42e1dc9d1f503b534 Mon Sep 17 00:00:00 2001 From: qianwens Date: Mon, 9 Jan 2023 14:41:48 +0800 Subject: [PATCH 3/3] remove --- .../preview/2022-11-01-preview/servicelinker.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json index 43c973896d2b..418030c19693 100644 --- a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json +++ b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/preview/2022-11-01-preview/servicelinker.json @@ -2050,10 +2050,6 @@ "description": { "type": "string", "description": "Description for the configuration name." - }, - "required": { - "type": "boolean", - "description": "Represent the configuration is required or not" } } },