Merge with main

allenjzhang · Jun 13, 2024 · 233f3dd · 233f3dd
2 parents e2e30ab + 70ffbbc
commit 233f3dd
Show file tree

Hide file tree

Showing 93 changed files with 4,048 additions and 606 deletions.
diff --git a/.chronus/changes/addV4LegacyManagedIdentity-2024-5-12-18-14-55.md b/.chronus/changes/addV4LegacyManagedIdentity-2024-5-12-18-14-55.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+Adding legacy v4 ManagedServiceIdentity model to avoid breaking changes in specs with mixed v3 and v4 common type reference
diff --git a/.chronus/changes/arm-lro-opt-2024-5-5-15-31-47.md b/.chronus/changes/arm-lro-opt-2024-5-5-15-31-47.md
@@ -0,0 +1,7 @@
+---
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-azure-core"
+---
+
+Add override decorator @useFinalStateVia for lro resolution when multiple resolution pathways exist
diff --git a/.chronus/changes/arm-lro-opt-2024-5-5-15-33-29.md b/.chronus/changes/arm-lro-opt-2024-5-5-15-33-29.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+Remove OpenAPI dependencies from ARM LRO templates and test LRO overrides
diff --git a/.chronus/changes/arm-lro-opt-2024-5-5-19-32-9.md b/.chronus/changes/arm-lro-opt-2024-5-5-19-32-9.md
@@ -0,0 +1,7 @@
+---
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-autorest"
+---
+
+Add suppress-lro-options emitter option to control emission of x-ms-long-running-operation-options
diff --git a/.chronus/changes/arm-lro-opt-2024-5-5-2-57-50.md b/.chronus/changes/arm-lro-opt-2024-5-5-2-57-50.md
@@ -0,0 +1,9 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-autorest"
+
+---
+
+- Add support for displaying lro options in typespec-autorest based on lro metadata
diff --git a/.chronus/changes/azhang_addNameTypeToResourceNameParam-2024-4-28-12-18-25.md b/.chronus/changes/azhang_addNameTypeToResourceNameParam-2024-4-28-12-18-25.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+Adding an overload parameter to ResourceNameParameter that allows `name` type to be set to string union type. 
diff --git a/.chronus/changes/res-vis-2024-5-12-4-34-46.md b/.chronus/changes/res-vis-2024-5-12-4-34-46.md
@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+Make Resource Properties Bag Updatable
diff --git a/.chronus/changes/update_canonical_swagger_folder_name-2024-6-6-11-44-3.md b/.chronus/changes/update_canonical_swagger_folder_name-2024-6-6-11-44-3.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-autorest-canonical"
+---
+
+update the canonical swagger file folder name
diff --git a/docs/emitters/typespec-autorest-canonical/reference/emitter.md b/docs/emitters/typespec-autorest-canonical/reference/emitter.md
@@ -33,7 +33,7 @@ Output file will interpolate the following values:
 - service-name: Name of the service if multiple
 - azure-resource-provider-folder: Value of the azure-resource-provider-folder option
 
-Default: `{azure-resource-provider-folder}/{service-name}/{version}/openapi.json`
+Default: `{azure-resource-provider-folder}/{service-name}/canonical/openapi.json`
 
 Example: Single service
 

diff --git a/docs/emitters/typespec-autorest/reference/emitter.md b/docs/emitters/typespec-autorest/reference/emitter.md
@@ -119,3 +119,9 @@ This extension is meant for debugging and should not be depended on.
 **Type:** `boolean`
 
 Create read-only property schema for lro status
+
+### `emit-lro-options`
+
+**Type:** `"none" | "final-state-only" | "all"`
+
+Determine whether and how to emit x-ms-long-running-operation-options for lro resolution
diff --git a/docs/libraries/azure-core/reference/data-types.md b/docs/libraries/azure-core/reference/data-types.md
@@ -348,12 +348,12 @@ model Azure.Core.ResourceOperationStatus<Resource, StatusResult, StatusError>
 
 #### Properties
 
-| Name    | Type                                                                      | Description                                                    |
-| ------- | ------------------------------------------------------------------------- | -------------------------------------------------------------- |
-| id      | `string`                                                                  | The unique ID of the operation.                                |
-| status  | [`OperationState`](./data-types.md#Azure.Core.Foundations.OperationState) | The status of the operation                                    |
-| error?  | `StatusError`                                                             | Error object that describes the error when status is "Failed". |
-| result? | `StatusResult`                                                            | The result of the operation.                                   |
+| Name    | Type                                                                      | Description |
+| ------- | ------------------------------------------------------------------------- | ----------- |
+| id      | `string`                                                                  |             |
+| status  | [`OperationState`](./data-types.md#Azure.Core.Foundations.OperationState) |             |
+| error?  | `StatusError`                                                             |             |
+| result? | `StatusResult`                                                            |             |
 
 ### `ResponseProperty` {#Azure.Core.ResponseProperty}
 

diff --git a/docs/libraries/azure-core/reference/decorators.md b/docs/libraries/azure-core/reference/decorators.md
@@ -309,6 +309,24 @@ Used to define how to call custom polling operations for long-running operations
 | --------------- | ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | targetParameter | `ModelProperty \| string` | A reference to the polling operation parameter this parameter<br />provides a value for, or the name of that parameter. The default value is the name of<br />the decorated parameter or property. |
 
+### `@useFinalStateVia` {#@Azure.Core.useFinalStateVia}
+
+Overrides the final state value for an operation
+
+```typespec
+@Azure.Core.useFinalStateVia(finalState: valueof "original-uri" | "operation-location" | "location" | "azure-async-operation")
+```
+
+#### Target
+
+`Operation`
+
+#### Parameters
+
+| Name       | Type                                                                                      | Description                   |
+| ---------- | ----------------------------------------------------------------------------------------- | ----------------------------- |
+| finalState | `valueof "original-uri" \| "operation-location" \| "location" \| "azure-async-operation"` | The desired final state value |
+
 ## Azure.Core.Foundations
 
 ### `@omitKeyProperties` {#@Azure.Core.Foundations.omitKeyProperties}

diff --git a/docs/libraries/azure-core/reference/index.mdx b/docs/libraries/azure-core/reference/index.mdx
@@ -54,6 +54,7 @@ npm install --save-peer @azure-tools/typespec-azure-core
 - [`@pollingLocation`](./decorators.md#@Azure.Core.pollingLocation)
 - [`@pollingOperation`](./decorators.md#@Azure.Core.pollingOperation)
 - [`@pollingOperationParameter`](./decorators.md#@Azure.Core.pollingOperationParameter)
+- [`@useFinalStateVia`](./decorators.md#@Azure.Core.useFinalStateVia)
 
 ### Interfaces
 

diff --git a/docs/libraries/azure-core/reference/interfaces.md b/docs/libraries/azure-core/reference/interfaces.md
@@ -263,7 +263,7 @@ op Azure.Core.ResourceOperations.LongRunningResourceCollectionAction(apiVersion:
 Resource operation status operation template.
 
 ```typespec
-op Azure.Core.ResourceOperations.GetResourceOperationStatus(apiVersion: string, operationId: string): Azure.Core.ResourceOperationStatus<Resource, StatusResult, StatusError> | ErrorResponse
+op Azure.Core.ResourceOperations.GetResourceOperationStatus(apiVersion: string): Azure.Core.ResourceOperationStatus<Resource, StatusResult, StatusError> | ErrorResponse
 ```
 
 ##### Template Parameters
@@ -280,7 +280,7 @@ op Azure.Core.ResourceOperations.GetResourceOperationStatus(apiVersion: string,
 Operation signature to retrieve a resource operation status.
 
 ```typespec
-op Azure.Core.GetResourceOperationStatus(apiVersion: string, operationId: string): Azure.Core.ResourceOperationStatus<Resource, StatusResult, StatusError> | Azure.Core.Foundations.ErrorResponse
+op Azure.Core.GetResourceOperationStatus(apiVersion: string): Azure.Core.ResourceOperationStatus<Resource, StatusResult, StatusError> | Azure.Core.Foundations.ErrorResponse
 ```
 
 #### Template Parameters