Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into jduan/fix-merge-3
Browse files Browse the repository at this point in the history
# Conflicts:
#	specification/chaos/resource-manager/readme.md
  • Loading branch information
James Duan authored and MasterRyd3l committed Oct 26, 2023
1 parent 65b95a7 commit 1a2d03c
Showing 1 changed file with 90 additions and 0 deletions.
90 changes: 90 additions & 0 deletions specification/chaos/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 1a2d03c

Please sign in to comment.