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.

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

Move ARM swagger to subfolder #3533

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions hack/build-client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function checksum() {
local API_VERSION=$1
local FOLDER=$2

sha256sum swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/"$FOLDER"/"$API_VERSION"/redhatopenshift.json >> .sha256sum
sha256sum swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/"$FOLDER"/"$API_VERSION"/redhatopenshift.json >> .sha256sum
}

function generate_golang() {
Expand All @@ -37,7 +37,7 @@ function generate_golang() {
--version=~2.0.4421 \
--license-header=MICROSOFT_APACHE_NO_VERSION \
--namespace=redhatopenshift \
--input-file=/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/"$FOLDER"/"$API_VERSION"/redhatopenshift.json \
--input-file=/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/"$FOLDER"/"$API_VERSION"/redhatopenshift.json \
--output-folder=/github.com/Azure/ARO-RP/pkg/client/services/redhatopenshift/mgmt/"$API_VERSION"/redhatopenshift

docker run \
Expand Down Expand Up @@ -73,7 +73,7 @@ function generate_python() {
--azure-arm \
--license-header=MICROSOFT_APACHE_NO_VERSION \
--namespace=azure.mgmt.redhatopenshift.v"${API_VERSION//-/_}" \
--input-file=/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/"$FOLDER"/"$API_VERSION"/redhatopenshift.json \
--input-file=/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/"$FOLDER"/"$API_VERSION"/redhatopenshift.json \
--output-folder=/python/client

rm -rf python/client/azure/mgmt/redhatopenshift/v"${API_VERSION//-/_}"/aio
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v20200430/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package v20200430
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20200430 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-04-30
//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20200430 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2020-04-30
2 changes: 1 addition & 1 deletion pkg/api/v20210901preview/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package v20210901preview
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20210901preview ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-09-01-preview
//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20210901preview ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/preview/2021-09-01-preview
2 changes: 1 addition & 1 deletion pkg/api/v20220401/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package v20220401
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20220401 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-04-01
//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20220401 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2022-04-01
2 changes: 1 addition & 1 deletion pkg/api/v20220904/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package v20220904
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20220904 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-09-04
//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20220904 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2022-09-04
2 changes: 1 addition & 1 deletion pkg/api/v20230401/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package v20230401
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20230401 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-04-01
//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20230401 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2023-04-01
2 changes: 1 addition & 1 deletion pkg/api/v20230701preview/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package v20230701preview
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20230701preview ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview
//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20230701preview ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/preview/2023-07-01-preview
2 changes: 1 addition & 1 deletion pkg/api/v20230904/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package v20230904
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20230904 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-09-04
//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20230904 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2023-09-04
2 changes: 1 addition & 1 deletion pkg/api/v20231122/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package v20231122
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20231122 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-11-22
//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20231122 ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2023-11-22
2 changes: 1 addition & 1 deletion pkg/api/v20240812preview/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package v20240812preview
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20240812preview ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2024-08-12-preview
//go:generate go run ../../../hack/swagger github.com/Azure/ARO-RP/pkg/api/v20240812preview ../../../swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/preview/2024-08-12-preview
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ These settings apply only when `--tag=package-2020-04-30` is specified on the co

``` yaml $(tag) == 'package-2020-04-30'
input-file:
- Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json
- stable/2020-04-30/redhatopenshift.json
```

### Tag: package-2021-09-01-preview
Expand All @@ -44,7 +44,7 @@ These settings apply only when `--tag=package-2021-09-01-preview` is specified o

``` yaml $(tag) == 'package-2021-09-01-preview'
input-file:
- Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json
- preview/2021-09-01-preview/redhatopenshift.json
```

### Tag: package-2023-07-01-preview
Expand All @@ -53,7 +53,7 @@ These settings apply only when `--tag=package-2023-07-01-preview` is specified o

``` yaml $(tag) == 'package-2023-07-01-preview'
input-file:
- Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json
- preview/2023-07-01-preview/redhatopenshift.json
```

### Tag: package-2022-04-01
Expand All @@ -62,7 +62,7 @@ These settings apply only when `--tag=package-2022-04-01` is specified on the co

``` yaml $(tag) == 'package-2022-04-01'
input-file:
- Microsoft.RedHatOpenShift/stable/2022-04-01/redhatopenshift.json
- stable/2022-04-01/redhatopenshift.json
```

### Tag: package-2022-09-04
Expand All @@ -71,7 +71,7 @@ These settings apply only when `--tag=package-2022-09-04` is specified on the co

``` yaml $(tag) == 'package-2022-09-04'
input-file:
- Microsoft.RedHatOpenShift/stable/2022-09-04/redhatopenshift.json
- stable/2022-09-04/redhatopenshift.json
```

### Tag: package-2023-04-01
Expand All @@ -80,7 +80,7 @@ These settings apply only when `--tag=package-2023-04-01` is specified on the co

``` yaml $(tag) == 'package-2023-04-01'
input-file:
- Microsoft.RedHatOpenShift/stable/2023-04-01/redhatopenshift.json
- stable/2023-04-01/redhatopenshift.json
```
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ These settings apply only when `--tag=package-2020-04-30` is specified on the co

``` yaml $(tag) == 'package-2020-04-30'
input-file:
- Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json
- stable/2020-04-30/redhatopenshift.json
```

### Tag: package-2021-09-01-preview
Expand All @@ -44,7 +44,7 @@ These settings apply only when `--tag=package-2021-09-01-preview` is specified o

```yaml $(tag) == 'package-2021-09-01-preview'
input-file:
- Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json
- preview/2021-09-01-preview/redhatopenshift.json
```

### Tag: package-2022-04-01
Expand All @@ -53,7 +53,7 @@ These settings apply only when `--tag=package-2022-04-01` is specified on the co

``` yaml $(tag) == 'package-2022-04-01'
input-file:
- Microsoft.RedHatOpenShift/stable/2022-04-01/redhatopenshift.json
- stable/2022-04-01/redhatopenshift.json
```

### Tag: package-2022-09-04
Expand All @@ -62,7 +62,7 @@ These settings apply only when `--tag=package-2022-09-04` is specified on the co

``` yaml $(tag) == 'package-2022-09-04'
input-file:
- Microsoft.RedHatOpenShift/stable/2022-09-04/redhatopenshift.json
- stable/2022-09-04/redhatopenshift.json
```

---
Expand Down
Loading