Microsoft.Chaos Fix follow-up for TypeSpec migration

specification/chaos/Chaos.Management/capability.models.tsp

@@ -31,6 +31,7 @@ alias CapabilityParentResourceParameters = BaseParameters<Capability> &
 /**
  * Model that represents the Capability properties model.
  */
+#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-provisioning-state" "Unused for this resource."
 model CapabilityProperties {
   /**
    * String of the Publisher that this Capability extends.
@@ -63,12 +64,6 @@ model CapabilityProperties {
   @visibility("read")
   @maxLength(2048)
   urn?: string;
-
-  /**
-   * Resource provisioning state. Not currently in use because resource is created synchronously.
-   */
-  @visibility("read")
-  provisioningState?: ProvisioningState;
 }
 
 /**

specification/chaos/Chaos.Management/capabilityType.models.tsp

@@ -8,21 +8,36 @@ using TypeSpec.Http;
 using Azure.ResourceManager;
 using Azure.ResourceManager.Foundations;
 using TypeSpec.OpenAPI;
+using Azure.Core;
 
 namespace Microsoft.Chaos;
 
 /**
  * Model that represents a Capability Type resource.
  */
+#suppress "@azure-tools/typespec-azure-core/no-private-usage" "Required implementation to avoid breaking .NET SDK changes"
+#suppress "@azure-tools/typespec-azure-core/composition-over-inheritance" "Required implementation to avoid breaking .NET SDK changes"
 @parentResource(TargetType)
-model CapabilityType
-  is Azure.ResourceManager.ProxyResource<CapabilityTypeProperties> {
+@includeInapplicableMetadataInPayload(false)
+model CapabilityType extends Azure.ResourceManager.Foundations.ProxyResource {
   ...ResourceNameParameter<
     Resource = CapabilityType,
     KeyName = "capabilityTypeName",
     SegmentName = "capabilityTypes",
     NamePattern = "^[a-zA-Z0-9\\-\\.]+-\\d\\.\\d$"
   >;
+
+  /**
+   * Azure resource location.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "Required to avoid SDK breaking change."
+  location?: azureLocation;
+
+  /**
+   * Capability type properties.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "Required to avoid SDK breaking change."
+  properties?: CapabilityTypeProperties;
 }
 
 /**

specification/chaos/Chaos.Management/experiment.models.tsp

@@ -227,8 +227,8 @@ model CustomerDataStorageProperties {
  * Describes an experiment update.
  */
 model ExperimentUpdate {
-  ...Azure.ResourceManager.Foundations.TagsUpdateModel<Experiment>;
   ...Azure.ResourceManager.ManagedServiceIdentityProperty;
+  ...Azure.ResourceManager.Foundations.TagsUpdateModel<Experiment>;
 }
 
 /**

specification/chaos/Chaos.Management/experimentExecution.models.tsp

@@ -29,6 +29,7 @@ model ExperimentExecution
 /**
  * Model that represents the execution properties of an Experiment.
  */
+#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-provisioning-state" "Unused for this resource."
 model ExperimentExecutionProperties {
   /**
    * The status of the execution.
@@ -47,12 +48,6 @@ model ExperimentExecutionProperties {
    */
   @visibility("read")
   stoppedAt?: utcDateTime;
-
-  /**
-   * Resource provisioning state. Not currently in use for executions.
-   */
-  @visibility("read")
-  provisioningState?: ProvisioningState;
 }
 
 /**
@@ -107,12 +102,6 @@ model ExperimentExecutionDetailsProperties {
   @visibility("read")
   stoppedAt?: utcDateTime;
 
-  /**
-   * Resource provisioning state. Not currently in use for executions.
-   */
-  @visibility("read")
-  provisioningState?: ProvisioningState;
-
   /**
    * The reason why the execution failed.
    */

specification/chaos/Chaos.Management/targetType.models.tsp

@@ -9,22 +9,38 @@ using TypeSpec.Http;
 using Azure.ResourceManager;
 using Azure.ResourceManager.Foundations;
 using TypeSpec.OpenAPI;
+using Azure.Core;
 
 namespace Microsoft.Chaos;
 
 /**
  * Model that represents a Target Type resource.
  */
+#suppress "@azure-tools/typespec-azure-core/no-private-usage" "Required implementation to avoid breaking .NET SDK changes"
+#suppress "@azure-tools/typespec-azure-core/composition-over-inheritance" "Required implementation to avoid breaking .NET SDK changes"
 @subscriptionResource
 @parentResource(SubscriptionLocationResource)
-model TargetType
-  is Azure.ResourceManager.ProxyResource<TargetTypeProperties, false> {
+@Azure.ResourceManager.Private.armResourceInternal(TargetTypeProperties)
+@includeInapplicableMetadataInPayload(false)
+model TargetType extends Azure.ResourceManager.Foundations.ProxyResource {
   ...ResourceNameParameter<
     Resource = TargetType,
     KeyName = "targetTypeName",
     SegmentName = "targetTypes",
     NamePattern = "^[a-zA-Z0-9_\\-\\.]+$"
   >;
+
+  /**
+   * Azure resource location.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "Required to avoid SDK breaking change."
+  location?: azureLocation;
+
+  /**
+   * Target type properties.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "Required to avoid SDK breaking change."
+  properties: TargetTypeProperties;
 }
 
 /**

specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-11-01-preview/openapi.json

@@ -2390,18 +2390,17 @@
           "description": "String of the URN for this Capability Type.",
           "maxLength": 2048,
           "readOnly": true
-        },
-        "provisioningState": {
-          "$ref": "#/definitions/ProvisioningState",
-          "description": "Resource provisioning state. Not currently in use because resource is created synchronously.",
-          "readOnly": true
         }
       }
     },
     "CapabilityType": {
       "type": "object",
       "description": "Model that represents a Capability Type resource.",
       "properties": {
+        "location": {
+          "$ref": "#/definitions/Azure.Core.azureLocation",
+          "description": "Azure resource location."
+        },
         "properties": {
           "$ref": "#/definitions/CapabilityTypeProperties",
           "description": "The properties of the capability type resource.",
@@ -2946,7 +2945,8 @@
         "properties": {
           "$ref": "#/definitions/ExperimentExecutionDetailsProperties",
           "description": "The properties of the experiment execution details.",
-          "readOnly": true
+          "readOnly": true,
+          "x-ms-client-flatten": true
         }
       }
     },
@@ -2971,11 +2971,6 @@
           "description": "String that represents the stop date time.",
           "readOnly": true
         },
-        "provisioningState": {
-          "$ref": "#/definitions/ProvisioningState",
-          "description": "Resource provisioning state. Not currently in use for executions.",
-          "readOnly": true
-        },
         "failureReason": {
           "type": "string",
           "description": "The reason why the execution failed.",
@@ -3052,11 +3047,6 @@
           "format": "date-time",
           "description": "String that represents the stop date time.",
           "readOnly": true
-        },
-        "provisioningState": {
-          "$ref": "#/definitions/ProvisioningState",
-          "description": "Resource provisioning state. Not currently in use for executions.",
-          "readOnly": true
         }
       }
     },
@@ -3121,16 +3111,16 @@
       "type": "object",
       "description": "Describes an experiment update.",
       "properties": {
+        "identity": {
+          "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity",
+          "description": "The managed service identities assigned to this resource."
+        },
         "tags": {
           "type": "object",
           "description": "Resource tags.",
           "additionalProperties": {
             "type": "string"
           }
-        },
-        "identity": {
-          "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity",
-          "description": "The managed service identities assigned to this resource."
         }
       }
     },
@@ -3657,6 +3647,10 @@
       "type": "object",
       "description": "Model that represents a Target Type resource.",
       "properties": {
+        "location": {
+          "$ref": "#/definitions/Azure.Core.azureLocation",
+          "description": "Azure resource location."
+        },
         "properties": {
           "$ref": "#/definitions/TargetTypeProperties",
           "description": "The properties of the target type resource.",

specification/chaos/resource-manager/readme.md

@@ -39,6 +39,38 @@ These settings apply only when `--tag=package-preview-2024-11` is specified on t
 input-file:
   - Microsoft.Chaos/preview/2024-11-01-preview/openapi.json
 suppressions:
+  - code: PathForTrackedResourceTypes
+    from: openapi.json
+    where: $.paths["/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{location}/targetTypes/{targetTypeName}"]
+    reason: Not actually a tracked resource, but location property is required to avoid breaking changes
+  - code: PathForTrackedResourceTypes
+    from: openapi.json
+    where: $.paths["/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{location}/targetTypes/{targetTypeName}/capabilityTypes/{capabilityTypeName}"]
+    reason: Not actually a tracked resource, but location property is required to avoid breaking changes
+  - code: AllTrackedResourcesMustHaveDelete
+    from: openapi.json
+    where: $.definitions.TargetType
+    reason: Not actually a tracked resource, but location property is required to avoid breaking changes    
+  - code: AllTrackedResourcesMustHaveDelete
+    from: openapi.json
+    where: $.definitions.CapabilityType
+    reason: Not actually a tracked resource, but location property is required to avoid breaking changes 
+  - code: TrackedResourcePatchOperation
+    from: openapi.json
+    where: $.definitions.TargetType
+    reason: Not actually a tracked resource, but location property is required to avoid breaking changes
+  - code: TrackedResourcePatchOperation
+    from: openapi.json
+    where: $.definitions.CapabilityType
+    reason: Not actually a tracked resource, but location property is required to avoid breaking changes
+  - code: TrackedResourcesMustHavePut
+    from: openapi.json
+    where: $.definitions.TargetType
+    reason: Not actually a tracked resource, but location property is required to avoid breaking changes
+  - code: TrackedResourcesMustHavePut
+    from: openapi.json
+    where: $.definitions.CapabilityType
+    reason: Not actually a tracked resource, but location property is required to avoid breaking changes         
   - code: TrackedExtensionResourcesAreNotAllowed
     from: openapi.json
     where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}"].get