From 1a2d03c96dda8ba27e21ac14c6e3707820bb421a Mon Sep 17 00:00:00 2001
From: James Duan <jduan@microsoft.com>
Date: Thu, 26 Oct 2023 00:46:00 -0700
Subject: [PATCH] Merge remote-tracking branch 'origin/main' into
 jduan/fix-merge-3

# Conflicts:
#	specification/chaos/resource-manager/readme.md
---
 .../chaos/resource-manager/readme.md          | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/specification/chaos/resource-manager/readme.md b/specification/chaos/resource-manager/readme.md
index 9d15f4eccc1f..d957b7c96056 100644
--- a/specification/chaos/resource-manager/readme.md
+++ b/specification/chaos/resource-manager/readme.md
@@ -45,7 +45,97 @@ input-file:
   - Microsoft.Chaos/stable/2023-11-01/operations.json
   - Microsoft.Chaos/stable/2023-11-01/targetTypes.json
   - Microsoft.Chaos/stable/2023-11-01/targets.json
+directive:
+  - from: swagger-document
+    where: "$.definitions.action"
+    transform: >
+      $["x-ms-client-name"] = "ChaosExperimentAction";
+  - from: swagger-document
+    where: "$.definitions.branch"
+    transform: >
+      $["x-ms-client-name"] = "ChaosExperimentBranch";
+  - from: swagger-document
+    where: "$.definitions.step"
+    transform: >
+      $["x-ms-client-name"] = "ChaosExperimentStep";
+  - from: swagger-document
+    where: "$.definitions.filter"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetFilter";
+  - from: swagger-document
+    where: "$.definitions.simpleFilter"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetSimpleFilter";
+  - from: swagger-document
+    where: "$.definitions.simpleFilterParameters"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetSimpleFilterParameters";
+  - from: swagger-document
+    where: "$.definitions.selector"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetSelector";
+  - from: swagger-document
+    where: "$.definitions.listSelector"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetListSelector";
+  - from: swagger-document
+    where: "$.definitions.querySelector"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetQuerySelector";
+```
+
+### Tag: package-preview-2023-10
+
+These settings apply only when `--tag=package-preview-2023-10` is specified on the command line.
+
+```yaml $(tag) == 'package-preview-2023-10'
+input-file:
+  - Microsoft.Chaos/preview/2023-10-27-preview/capabilities.json
+  - Microsoft.Chaos/preview/2023-10-27-preview/capabilityTypes.json
+  - Microsoft.Chaos/preview/2023-10-27-preview/experiments.json
+  - Microsoft.Chaos/preview/2023-10-27-preview/operationStatuses.json
+  - Microsoft.Chaos/preview/2023-10-27-preview/operations.json
+  - Microsoft.Chaos/preview/2023-10-27-preview/targetTypes.json
+  - Microsoft.Chaos/preview/2023-10-27-preview/targets.json
+directive:
+  - from: swagger-document
+    where: "$.definitions.action"
+    transform: >
+      $["x-ms-client-name"] = "ChaosExperimentAction";
+  - from: swagger-document
+    where: "$.definitions.branch"
+    transform: >
+      $["x-ms-client-name"] = "ChaosExperimentBranch";
+  - from: swagger-document
+    where: "$.definitions.step"
+    transform: >
+      $["x-ms-client-name"] = "ChaosExperimentStep";
+  - from: swagger-document
+    where: "$.definitions.filter"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetFilter";
+  - from: swagger-document
+    where: "$.definitions.simpleFilter"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetSimpleFilter";
+  - from: swagger-document
+    where: "$.definitions.simpleFilterParameters"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetSimpleFilterParameters";
+  - from: swagger-document
+    where: "$.definitions.selector"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetSelector";
+  - from: swagger-document
+    where: "$.definitions.listSelector"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetListSelector";
+  - from: swagger-document
+    where: "$.definitions.querySelector"
+    transform: >
+      $["x-ms-client-name"] = "ChaosTargetQuerySelector";
 ```
+
 ### Tag: package-preview-2023-09
 
 These settings apply only when `--tag=package-preview-2023-09` is specified on the command line.