Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

resolve merge conflict with main #26393

Merged
merged 1 commit into from
Oct 26, 2023
Merged

resolve merge conflict with main #26393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 88 additions & 1 deletion specification/chaos/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -45,6 +44,94 @@ 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

Expand Down