From 486646b1d59f17b7c1a6f169043b375ff8dbaa5b Mon Sep 17 00:00:00 2001 From: James Duan Date: Thu, 26 Oct 2023 00:31:26 -0700 Subject: [PATCH 1/2] Revert "resolve merge conflict with main (#26393)" This reverts commit 3d7e4a185c4b26bd75631d234acd080c01378d22. --- .../chaos/resource-manager/readme.md | 89 +------------------ 1 file changed, 1 insertion(+), 88 deletions(-) diff --git a/specification/chaos/resource-manager/readme.md b/specification/chaos/resource-manager/readme.md index de8f22a3eed1..9d15f4eccc1f 100644 --- a/specification/chaos/resource-manager/readme.md +++ b/specification/chaos/resource-manager/readme.md @@ -31,6 +31,7 @@ openapi-type: arm tag: package-2023-11 ``` + ### Tag: package-2023-11 These settings apply only when `--tag=package-2023-11` is specified on the command line. @@ -44,94 +45,6 @@ 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 From be37badbe1f159ed1487ece948262eadec2e793d Mon Sep 17 00:00:00 2001 From: James Duan Date: Thu, 26 Oct 2023 00:35:02 -0700 Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/main' into jduan/fix-merge-2 # Conflicts: # specification/chaos/resource-manager/readme.md --- .../chaos/resource-manager/readme.md | 91 ++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/specification/chaos/resource-manager/readme.md b/specification/chaos/resource-manager/readme.md index 9d15f4eccc1f..9287637ba42d 100644 --- a/specification/chaos/resource-manager/readme.md +++ b/specification/chaos/resource-manager/readme.md @@ -31,7 +31,6 @@ openapi-type: arm tag: package-2023-11 ``` - ### Tag: package-2023-11 These settings apply only when `--tag=package-2023-11` is specified on the command line. @@ -45,7 +44,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.