From 06e3cfa54900a9e7f234ccd3ddf8e0d2f2c4ca55 Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 19:05:55 -0700 Subject: [PATCH 01/12] Add Dapr Component Resiliency Policies APIs to ContainerApps 2023-08-01-preview Signed-off-by: Bernd Verst --- .../2023-08-01-preview/CommonDefinitions.json | 107 +++++++ ...nmentsDaprComponentResiliencyPolicies.json | 288 ++++++++++++++++++ ...aprComponentResiliencyPolicies_Delete.json | 14 + .../DaprComponentResiliencyPolicies_Get.json | 45 +++ .../DaprComponentResiliencyPolicies_List.json | 48 +++ ...iencyPolicy_CreateOrUpdate_AllOptions.json | 59 ++++ ...ncyPolicy_CreateOrUpdate_OutboundOnly.json | 61 ++++ ...cyPolicy_CreateOrUpdate_SparseOptions.json | 45 +++ 8 files changed, 667 insertions(+) create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Get.json create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_List.json create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json index 2ff567d14e3f..4d451f6ba0d6 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json @@ -900,6 +900,113 @@ } } }, + "DaprComponentResiliencyPoliciesCollection": { + "description": "Dapr Component Resiliency Policies ARM resource.", + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "description": "Collection of resources.", + "type": "array", + "items": { + "$ref": "#/definitions/DaprComponentResiliencyPolicy" + } + }, + "nextLink": { + "description": "Link to next page of resources.", + "type": "string", + "readOnly": true + } + } + }, + "DaprComponentResiliencyPolicy": { + "description": "Dapr Component Resiliency Policy.", + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "description": "Dapr Component Resiliency Policy resource specific properties", + "type": "object", + "properties": { + "inboundPolicy": { + "description": "The optional inbound component resiliency policy configuration", + "$ref": "#/definitions/DaprComponentResiliencyPolicyConfiguration" + }, + "outboundPolicy": { + "description": "The optional outbound component resiliency policy configuration", + "$ref": "#/definitions/DaprComponentResiliencyPolicyConfiguration" + } + }, + "x-ms-client-flatten": true + } + } + }, + "DaprComponentResiliencyPolicyConfiguration": { + "description": "Dapr Component Resiliency Policy Configuration.", + "type": "object", + "properties": { + "httpRetryPolicy": { + "description": "The optional HTTP retry policy configuration", + "$ref": "#/definitions/DaprComponentResiliencyPolicyHttpRetryPolicyConfiguration" + }, + "timeoutPolicy": { + "description": "The optional timeout policy configuration", + "$ref": "#/definitions/DaprComponentResiliencyPolicyTimeoutPolicyConfiguration" + } + }, + "additionalProperties": false + }, + "DaprComponentResiliencyPolicyHttpRetryPolicyConfiguration": { + "description": "Dapr Component Resiliency Policy HTTP Retry Policy Configuration.", + "type": "object", + "properties": { + "maxRetries": { + "description": "The optional maximum number of retries", + "type": "integer", + "format": "int32" + }, + "retryBackOff": { + "description": "The optional retry backoff configuration", + "$ref": "#/definitions/DaprComponentResiliencyPolicyHttpRetryBackOffConfiguration" + } + }, + "additionalProperties": false + }, + "DaprComponentResiliencyPolicyHttpRetryBackOffConfiguration": { + "description": "Dapr Component Resiliency Policy HTTP Retry Backoff Configuration.", + "type": "object", + "properties": { + "initialDelayInMilliseconds": { + "description": "The optional initial delay in milliseconds before an operation is retried", + "type": "integer", + "format": "int32" + }, + "maxIntervalInMilliseconds": { + "description": "The optional maximum time interval in milliseconds between retry attempts", + "type": "integer", + "format": "int32" + } + }, + "additionalProperties": false + }, + "DaprComponentResiliencyPolicyTimeoutPolicyConfiguration": { + "description": "Dapr Component Resiliency Policy Timeout Policy Configuration.", + "type": "object", + "properties": { + "responseTimeoutInSeconds": { + "description": "The optional response timeout in seconds", + "type": "integer", + "format": "int32" + } + }, + "additionalProperties": false + }, "DaprSubscriptionsCollection": { "description": "Dapr Subscriptions ARM resource.", "required": [ diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json new file mode 100644 index 000000000000..8258d81c8fd8 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json @@ -0,0 +1,288 @@ +{ + "swagger": "2.0", + "info": { + "version": "2023-08-01-preview", + "title": "ContainerApps API Client" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}/resiliencyPolicies": { + "get": { + "tags": [ + "DaprComponentResiliencyPolicies" + ], + "summary": "Get the resiliency policies for a Dapr component.", + "operationId": "DaprComponentResiliencyPolicies_List", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "environmentName", + "in": "path", + "description": "Name of the Managed Environment.", + "required": true, + "type": "string" + }, + { + "name": "componentName", + "in": "path", + "description": "Name of the Dapr Component.", + "required": true, + "type": "string" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DaprComponentResiliencyPoliciesCollection" + } + }, + "default": { + "description": "Common error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "List Dapr component resiliency policies": { + "$ref": "./examples/DaprComponentResiliencyPolicies_List.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}/resiliencyPolicies/{name}": { + "get": { + "tags": [ + "DaprComponentResiliencyPolicies" + ], + "summary": "Get a Dapr component resiliency policy.", + "operationId": "DaprComponentResiliencyPolicies_Get", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "environmentName", + "in": "path", + "description": "Name of the Managed Environment.", + "required": true, + "type": "string" + }, + { + "name": "componentName", + "in": "path", + "description": "Name of the Dapr Component.", + "required": true, + "type": "string" + }, + { + "name": "name", + "in": "path", + "description": "Name of the Dapr Component Resiliency Policy.", + "required": true, + "type": "string" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DaprComponentResiliencyPolicy" + } + }, + "default": { + "description": "Common error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Dapr component resiliency policy": { + "$ref": "./examples/DaprComponentResiliencyPolicies_Get.json" + } + } + }, + "put": { + "tags": [ + "DaprComponentResiliencyPolicies" + ], + "summary": "Creates or updates a Dapr component resiliency policy.", + "description": "Creates or updates a resiliency policy for a Dapr component.", + "operationId": "DaprComponentResiliencyPolicies_CreateOrUpdate", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "environmentName", + "in": "path", + "description": "Name of the Managed Environment.", + "required": true, + "type": "string" + }, + { + "name": "componentName", + "in": "path", + "description": "Name of the Dapr Component.", + "required": true, + "type": "string" + }, + { + "name": "name", + "in": "path", + "description": "Name of the Dapr Component Resiliency Policy.", + "required": true, + "type": "string" + }, + { + "name": "daprComponentResiliencyPolicyEnvelope", + "in": "body", + "description": "Configuration details of the Dapr Component Resiliency Policy.", + "required": true, + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DaprComponentResiliencyPolicy" + } + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DaprComponentResiliencyPolicy" + } + }, + "default": { + "description": "Common error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-long-running-operation": false, + "x-ms-examples": { + "Create or update dapr component resiliency policy with all options": { + "$ref": "./examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json" + }, + "Create or update dapr component resiliency policy with outbound policy only": { + "$ref": "./examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json" + }, + "Create or update dapr component resiliency policy with sparse options": { + "$ref": "./examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json" + } + } + }, + "delete": { + "tags": [ + "DaprComponentResiliencyPolicies" + ], + "summary": "Delete a Dapr component resiliency policy.", + "description": "Delete a resiliency policy for a Dapr component.", + "operationId": "DaprComponentResiliencyPolicies_Delete", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "environmentName", + "in": "path", + "description": "Name of the Managed Environment.", + "required": true, + "type": "string" + }, + { + "name": "componentName", + "in": "path", + "description": "Name of the Dapr Component.", + "required": true, + "type": "string" + }, + { + "name": "name", + "in": "path", + "description": "Name of the Dapr Component Resiliency Policy.", + "required": true, + "type": "string" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Delete operation completed" + }, + "204": { + "description": "Component does not exist" + }, + "default": { + "description": "Common error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Delete dapr component resiliency policy": { + "$ref": "./examples/DaprComponentResiliencyPolicies_Delete.json" + } + }, + "x-ms-long-running-operation": false + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "description": "Azure Active Directory OAuth2 Flow", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json new file mode 100644 index 000000000000..595dafbded11 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "examplerg", + "environmentName": "myenvironment", + "componentName": "mydaprcomponent", + "name": "myresiliencypolicy", + "api-version": "2023-08-01-preview" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Get.json new file mode 100644 index 000000000000..4b0675300a1d --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Get.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "examplerg", + "environmentName": "myenvironment", + "componentName": "mydaprcomponent", + "name": "myresiliencypolicy", + "api-version": "2023-08-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprComponents/mydaprcomponent/resiliencyPolicies/myresiliencypolicy", + "name": "myresiliencypolicy", + "type": "Microsoft.App/managedEnvironments/daprComponents/resiliencyPolicies", + "properties": { + "inboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 15, + "retryBackOff": { + "initialDelayInMilliseconds": 2000, + "maxIntervalInMilliseconds": 5500 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 30 + } + }, + "outboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 5, + "retryBackOff": { + "initialDelayInMilliseconds": 100, + "maxIntervalInMilliseconds": 30000 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 12 + } + } + } + } + } + } +} diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_List.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_List.json new file mode 100644 index 000000000000..a4a93a01d33a --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_List.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "examplerg", + "environmentName": "myenvironment", + "componentName": "mydaprcomponent", + "api-version": "2023-08-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprComponents/mydaprcomponent/resiliencyPolicies/myresiliencypolicy", + "name": "something", + "type": "Microsoft.App/managedEnvironments/daprComponents/resiliencyPolicies", + "properties": { + "inboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 15, + "retryBackOff": { + "initialDelayInMilliseconds": 2000, + "maxIntervalInMilliseconds": 5500 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 30 + } + }, + "outboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 5, + "retryBackOff": { + "initialDelayInMilliseconds": 100, + "maxIntervalInMilliseconds": 30000 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 12 + } + } + } + } + ] + } + } + } +} diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json new file mode 100644 index 000000000000..83fb14109078 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "examplerg", + "environmentName": "myenvironment", + "componentName": "mydaprcomponent", + "name": "myresiliencypolicy", + "api-version": "2023-08-01-preview", + "daprComponentEnvelope": { + "properties": { + "inboundPolicy": { + "httpRetryPolicy": { + "maxRetries": "5" + } + }, + "outboundPolicy": { + "timeoutPolicy": { + "responseTimeoutInSeconds": "12" + } + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprComponents/mydaprcomponent/resiliencyPolicies/myresiliencypolicy", + "name": "myresiliencypolicy", + "type": "Microsoft.App/managedEnvironments/daprComponents/resiliencyPolicies", + "properties": { + "inboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 15, + "retryBackOff": { + "initialDelayInMilliseconds": 2000, + "maxIntervalInMilliseconds": 5500 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 30 + } + }, + "outboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 5, + "retryBackOff": { + "initialDelayInMilliseconds": 100, + "maxIntervalInMilliseconds": 30000 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 12 + } + } + } + } + } + } +} diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json new file mode 100644 index 000000000000..6367022efee7 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json @@ -0,0 +1,61 @@ +{ + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "examplerg", + "environmentName": "myenvironment", + "componentName": "mydaprcomponent", + "name": "myresiliencypolicy", + "api-version": "2023-08-01-preview", + "daprComponentEnvelope": { + "properties": { + "inboundPolicy": { + "httpRetryPolicy": { + "maxRetries": "15", + "retryBackOff": { + "initialDelayInMilliseconds": 2000, + "maxIntervalInMilliseconds": 5500 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": "30" + } + }, + "outboundPolicy": { + "httpRetryPolicy": { + "maxRetries": "5", + "retryBackOff": { + "initialDelayInMilliseconds": 100, + "maxIntervalInMilliseconds": 30000 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": "12" + } + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprComponents/mydaprcomponent/resiliencyPolicies/myresiliencypolicy", + "name": "myresiliencypolicy", + "type": "Microsoft.App/managedEnvironments/daprComponents/resiliencyPolicies", + "properties": { + "outboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 5, + "retryBackOff": { + "initialDelayInMilliseconds": 100, + "maxIntervalInMilliseconds": 30000 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 12 + } + } + } + } + } + } +} diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json new file mode 100644 index 000000000000..51887d0fef5c --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "examplerg", + "environmentName": "myenvironment", + "componentName": "mydaprcomponent", + "name": "myresiliencypolicy", + "api-version": "2023-08-01-preview", + "daprComponentEnvelope": { + "properties": { + "inboundPolicy": { + "httpRetryPolicy": { + "maxRetries": "5" + } + }, + "outboundPolicy": { + "timeoutPolicy": { + "responseTimeoutInSeconds": "12" + } + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprComponents/mydaprcomponent/resiliencyPolicies/myresiliencypolicy", + "name": "myresiliencypolicy", + "type": "Microsoft.App/managedEnvironments/daprComponents/resiliencyPolicies", + "properties": { + "inboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 5 + } + }, + "outboundPolicy": { + "timeoutPolicy": { + "responseTimeoutInSeconds": 12 + } + } + } + } + } + } +} From a9775e30d40302b9cc544114d5ab5a8a52209845 Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 19:19:14 -0700 Subject: [PATCH 02/12] Update deletion return code --- .../ManagedEnvironmentsDaprComponentResiliencyPolicies.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json index 8258d81c8fd8..1154f85e7166 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json @@ -245,11 +245,8 @@ } ], "responses": { - "200": { - "description": "Delete operation completed" - }, "204": { - "description": "Component does not exist" + "description": "Delete operation completed" }, "default": { "description": "Common error response.", From 8346723225ef30d68224bd8967018c2af46c2955 Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 19:36:19 -0700 Subject: [PATCH 03/12] Fix variable name --- ...DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json | 2 +- ...prComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json | 2 +- ...rComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json index 83fb14109078..bcfa03933de1 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json @@ -6,7 +6,7 @@ "componentName": "mydaprcomponent", "name": "myresiliencypolicy", "api-version": "2023-08-01-preview", - "daprComponentEnvelope": { + "daprComponentResiliencyPolicyEnvelope": { "properties": { "inboundPolicy": { "httpRetryPolicy": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json index 6367022efee7..ee1502a43001 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json @@ -6,7 +6,7 @@ "componentName": "mydaprcomponent", "name": "myresiliencypolicy", "api-version": "2023-08-01-preview", - "daprComponentEnvelope": { + "daprComponentResiliencyPolicyEnvelope": { "properties": { "inboundPolicy": { "httpRetryPolicy": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json index 51887d0fef5c..8c7029e2cb36 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json @@ -6,7 +6,7 @@ "componentName": "mydaprcomponent", "name": "myresiliencypolicy", "api-version": "2023-08-01-preview", - "daprComponentEnvelope": { + "daprComponentResiliencyPolicyEnvelope": { "properties": { "inboundPolicy": { "httpRetryPolicy": { From 66f7f4c2ccad5c9714e90184b6f7859f319f70cf Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 19:37:15 -0700 Subject: [PATCH 04/12] Remove invalid status code from example --- .../examples/DaprComponentResiliencyPolicies_Delete.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json index 595dafbded11..a79c99f06447 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json @@ -8,7 +8,6 @@ "api-version": "2023-08-01-preview" }, "responses": { - "200": {}, "204": {} } } From 12600eeae76cf8157be1f0f0363dfdced6d63179 Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 19:38:32 -0700 Subject: [PATCH 05/12] prettify --- .../examples/DaprComponentResiliencyPolicies_List.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_List.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_List.json index a4a93a01d33a..47fcbaabefc8 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_List.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_List.json @@ -39,7 +39,7 @@ "responseTimeoutInSeconds": 12 } } - } + } } ] } From 7ee405c08b3a9356064e33e98692741b328bae85 Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 19:41:35 -0700 Subject: [PATCH 06/12] Register new resource in readme --- specification/app/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/app/resource-manager/readme.md b/specification/app/resource-manager/readme.md index 6552dc0cf4e1..83fb68712925 100644 --- a/specification/app/resource-manager/readme.md +++ b/specification/app/resource-manager/readme.md @@ -53,6 +53,7 @@ input-file: - Microsoft.App/preview/2023-08-01-preview/Jobs.json - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironments.json - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponents.json + - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolices.json - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprSubscriptions.json - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsStorages.json - Microsoft.App/preview/2023-08-01-preview/Patches.json From 8ce1a74f9d12b333c43c324f1b2250a64a0f1add Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 19:45:32 -0700 Subject: [PATCH 07/12] Remove existing import cycle --- .../preview/2023-08-01-preview/CommonDefinitions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json index 4d451f6ba0d6..78b1e407cb17 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json @@ -757,7 +757,7 @@ "description": "Collection of secrets used by a Dapr component", "type": "array", "items": { - "$ref": "./CommonDefinitions.json#/definitions/Secret" + "$ref": "#/definitions/Secret" }, "x-ms-identifiers": [ "name" @@ -861,7 +861,7 @@ "description": "Collection of secrets used by a Dapr component", "type": "array", "items": { - "$ref": "./CommonDefinitions.json#/definitions/DaprSecret" + "$ref": "#/definitions/DaprSecret" }, "x-ms-identifiers": [ "name" From ff2407bf0c3ef96b976abf193a4248da0fab12ea Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 19:50:53 -0700 Subject: [PATCH 08/12] Use integers not integer strings --- ...mponentResiliencyPolicy_CreateOrUpdate_AllOptions.json | 4 ++-- ...onentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json | 8 ++++---- ...nentResiliencyPolicy_CreateOrUpdate_SparseOptions.json | 4 ++-- specification/app/resource-manager/readme.md | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json index bcfa03933de1..936e392b6609 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json @@ -10,12 +10,12 @@ "properties": { "inboundPolicy": { "httpRetryPolicy": { - "maxRetries": "5" + "maxRetries": 5 } }, "outboundPolicy": { "timeoutPolicy": { - "responseTimeoutInSeconds": "12" + "responseTimeoutInSeconds": 12 } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json index ee1502a43001..4737bceffc78 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json @@ -10,26 +10,26 @@ "properties": { "inboundPolicy": { "httpRetryPolicy": { - "maxRetries": "15", + "maxRetries": 15, "retryBackOff": { "initialDelayInMilliseconds": 2000, "maxIntervalInMilliseconds": 5500 } }, "timeoutPolicy": { - "responseTimeoutInSeconds": "30" + "responseTimeoutInSeconds": 30 } }, "outboundPolicy": { "httpRetryPolicy": { - "maxRetries": "5", + "maxRetries": 5, "retryBackOff": { "initialDelayInMilliseconds": 100, "maxIntervalInMilliseconds": 30000 } }, "timeoutPolicy": { - "responseTimeoutInSeconds": "12" + "responseTimeoutInSeconds": 12 } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json index 8c7029e2cb36..4ec12a68d836 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json @@ -10,12 +10,12 @@ "properties": { "inboundPolicy": { "httpRetryPolicy": { - "maxRetries": "5" + "maxRetries": 5 } }, "outboundPolicy": { "timeoutPolicy": { - "responseTimeoutInSeconds": "12" + "responseTimeoutInSeconds": 12 } } } diff --git a/specification/app/resource-manager/readme.md b/specification/app/resource-manager/readme.md index 83fb68712925..dab7acc70367 100644 --- a/specification/app/resource-manager/readme.md +++ b/specification/app/resource-manager/readme.md @@ -53,7 +53,7 @@ input-file: - Microsoft.App/preview/2023-08-01-preview/Jobs.json - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironments.json - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponents.json - - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolices.json + - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprSubscriptions.json - Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsStorages.json - Microsoft.App/preview/2023-08-01-preview/Patches.json From ccf1d0cfb2ff307ec9384b0233b7ea85e217a813 Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 21:19:30 -0700 Subject: [PATCH 09/12] Fix delete status codes --- ...nmentsDaprComponentResiliencyPolicies.json | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json index 1154f85e7166..fec5ec096055 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json @@ -34,14 +34,16 @@ "in": "path", "description": "Name of the Managed Environment.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "componentName", "in": "path", "description": "Name of the Dapr Component.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -90,14 +92,16 @@ "in": "path", "description": "Name of the Managed Environment.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "componentName", "in": "path", "description": "Name of the Dapr Component.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "name", @@ -149,14 +153,16 @@ "in": "path", "description": "Name of the Managed Environment.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "componentName", "in": "path", "description": "Name of the Dapr Component.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "name", @@ -224,14 +230,16 @@ "in": "path", "description": "Name of the Managed Environment.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "componentName", "in": "path", "description": "Name of the Dapr Component.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "name", @@ -245,9 +253,12 @@ } ], "responses": { - "204": { + "200": { "description": "Delete operation completed" }, + "204": { + "description": "Dapr component does not exist" + }, "default": { "description": "Common error response.", "schema": { From fa7c5e5f7869c9e7d1905514b8403138e6cb7afc Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 21:52:21 -0700 Subject: [PATCH 10/12] More changes --- .../ManagedEnvironmentsDaprComponentResiliencyPolicies.json | 6 ++++++ .../examples/DaprComponentResiliencyPolicies_Delete.json | 1 + 2 files changed, 7 insertions(+) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json index fec5ec096055..7a150ac27f55 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprComponentResiliencyPolicies.json @@ -191,6 +191,12 @@ "$ref": "./CommonDefinitions.json#/definitions/DaprComponentResiliencyPolicy" } }, + "201": { + "description": "Created", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DaprComponentResiliencyPolicy" + } + }, "default": { "description": "Common error response.", "schema": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json index a79c99f06447..0a796a6db712 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json @@ -8,6 +8,7 @@ "api-version": "2023-08-01-preview" }, "responses": { + "201": {}, "204": {} } } From 14ec42f5c90ee31d32e8034608a749a39a9a1fd2 Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 22:13:15 -0700 Subject: [PATCH 11/12] Update examples --- ...aprComponentResiliencyPolicies_Delete.json | 2 +- ...iencyPolicy_CreateOrUpdate_AllOptions.json | 33 +++++++++++++++++++ ...ncyPolicy_CreateOrUpdate_OutboundOnly.json | 21 ++++++++++++ ...cyPolicy_CreateOrUpdate_SparseOptions.json | 19 +++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json index 0a796a6db712..595dafbded11 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicies_Delete.json @@ -8,7 +8,7 @@ "api-version": "2023-08-01-preview" }, "responses": { - "201": {}, + "200": {}, "204": {} } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json index 936e392b6609..ae51978485ce 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_AllOptions.json @@ -54,6 +54,39 @@ } } } + }, + "201": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprComponents/mydaprcomponent/resiliencyPolicies/myresiliencypolicy", + "name": "myresiliencypolicy", + "type": "Microsoft.App/managedEnvironments/daprComponents/resiliencyPolicies", + "properties": { + "inboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 15, + "retryBackOff": { + "initialDelayInMilliseconds": 2000, + "maxIntervalInMilliseconds": 5500 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 30 + } + }, + "outboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 5, + "retryBackOff": { + "initialDelayInMilliseconds": 100, + "maxIntervalInMilliseconds": 30000 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 12 + } + } + } + } } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json index 4737bceffc78..9800feabcee4 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_OutboundOnly.json @@ -56,6 +56,27 @@ } } } + }, + "201": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprComponents/mydaprcomponent/resiliencyPolicies/myresiliencypolicy", + "name": "myresiliencypolicy", + "type": "Microsoft.App/managedEnvironments/daprComponents/resiliencyPolicies", + "properties": { + "outboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 5, + "retryBackOff": { + "initialDelayInMilliseconds": 100, + "maxIntervalInMilliseconds": 30000 + } + }, + "timeoutPolicy": { + "responseTimeoutInSeconds": 12 + } + } + } + } } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json index 4ec12a68d836..e961e02d08f4 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprComponentResiliencyPolicy_CreateOrUpdate_SparseOptions.json @@ -40,6 +40,25 @@ } } } + }, + "201": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprComponents/mydaprcomponent/resiliencyPolicies/myresiliencypolicy", + "name": "myresiliencypolicy", + "type": "Microsoft.App/managedEnvironments/daprComponents/resiliencyPolicies", + "properties": { + "inboundPolicy": { + "httpRetryPolicy": { + "maxRetries": 5 + } + }, + "outboundPolicy": { + "timeoutPolicy": { + "responseTimeoutInSeconds": 12 + } + } + } + } } } } From 30324ef48cfa8fa8a14470ecbb4992cfdc8a77ab Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Thu, 5 Oct 2023 22:16:30 -0700 Subject: [PATCH 12/12] Revert "Remove existing import cycle" which causes unrelated failures This reverts commit 8ce1a74f9d12b333c43c324f1b2250a64a0f1add. --- .../preview/2023-08-01-preview/CommonDefinitions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json index 78b1e407cb17..4d451f6ba0d6 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json @@ -757,7 +757,7 @@ "description": "Collection of secrets used by a Dapr component", "type": "array", "items": { - "$ref": "#/definitions/Secret" + "$ref": "./CommonDefinitions.json#/definitions/Secret" }, "x-ms-identifiers": [ "name" @@ -861,7 +861,7 @@ "description": "Collection of secrets used by a Dapr component", "type": "array", "items": { - "$ref": "#/definitions/DaprSecret" + "$ref": "./CommonDefinitions.json#/definitions/DaprSecret" }, "x-ms-identifiers": [ "name"