Skip to content

Commit

Permalink
Merge branch 'main' into ross/v2-APIM-SKU
Browse files Browse the repository at this point in the history
  • Loading branch information
@ross-p-smith
ross-p-smith committed Jan 4, 2024
2 parents b7ae9b8 + 5bac6d1 commit e8da2d7
Show file tree
Hide file tree
Showing 39 changed files with 6,201 additions and 1,054 deletions.
1 change: 1 addition & 0 deletions .github/pull_request_template.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Closes #[issue number]
**If applicable**:
- [ ] this PR contains documentation
- [ ] this PR contains tests
- [ ] this PR contains YAML Samples
24 changes: 13 additions & 11 deletions docs/hugo/content/reference/_index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,19 @@ To install the CRDs for these resources, your ASO configuration must include `ap

Development of these new resources is complete and they will be available in the next release of ASO.

| Resource | ARM Version | CRD Version | Supported From | Sample |
|----------------|--------------------|----------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
| Api | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_api.yaml) |
| ApiVersionSet | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_apiversionset.yaml) |
| Backend | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_backend.yaml) |
| NamedValue | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_namedvalue.yaml) |
| Policy | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_policy.yaml) |
| PolicyFragment | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_policyfragment.yaml) |
| Product | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_product.yaml) |
| Service | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_service.yaml) |
| Subscription | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_subscription.yaml) |
| Resource | ARM Version | CRD Version | Supported From | Sample |
|------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|----------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
| Api | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_api.yaml) |
| ApiVersionSet | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_apiversionset.yaml) |
| Backend | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_backend.yaml) |
| NamedValue | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_namedvalue.yaml) |
| Policy | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_policy.yaml) |
| PolicyFragment | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_policyfragment.yaml) |
| Product | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_product.yaml) |
| [ProductApi](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.ProductApi) | 2022-08-01 | v1api20220801 | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_productapi.yaml) |
| [ProductPolicy](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.ProductPolicy) | 2022-08-01 | v1api20220801 | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_productpolicy.yaml) |
| Service | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_service.yaml) |
| Subscription | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_subscription.yaml) |

### Released

Expand Down
24 changes: 13 additions & 11 deletions docs/hugo/content/reference/apimanagement/_index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ To install the CRDs for these resources, your ASO configuration must include `ap

Development of these new resources is complete and they will be available in the next release of ASO.

| Resource | ARM Version | CRD Version | Supported From | Sample |
|----------------|--------------------|----------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
| Api | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_api.yaml) |
| ApiVersionSet | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_apiversionset.yaml) |
| Backend | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_backend.yaml) |
| NamedValue | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_namedvalue.yaml) |
| Policy | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_policy.yaml) |
| PolicyFragment | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_policyfragment.yaml) |
| Product | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_product.yaml) |
| Service | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_service.yaml) |
| Subscription | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_subscription.yaml) |
| Resource | ARM Version | CRD Version | Supported From | Sample |
|------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|----------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
| Api | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_api.yaml) |
| ApiVersionSet | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_apiversionset.yaml) |
| Backend | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_backend.yaml) |
| NamedValue | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_namedvalue.yaml) |
| Policy | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_policy.yaml) |
| PolicyFragment | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_policyfragment.yaml) |
| Product | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_product.yaml) |
| [ProductApi](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.ProductApi) | 2022-08-01 | v1api20220801 | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_productapi.yaml) |
| [ProductPolicy](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.ProductPolicy) | 2022-08-01 | v1api20220801 | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_productpolicy.yaml) |
| Service | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_service.yaml) |
| Subscription | 2023-05-01-preview | v1api20230501preview | v2.6.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20230501preview/v1api20230501preview_subscription.yaml) |

### Released

Expand Down
2 changes: 1 addition & 1 deletion scripts/v2/build_version.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def to_semver(git_version: str):
# Failure may be because there are no tags, give the user some hints
print(f"git describe failed ({git_describe.returncode}): {git_describe.stderr}", file=sys.stderr)
print("(Do you have a shallow clone of ASO? try `git fetch --unshallow`)", file=sys.stderr)
print("(See https://azure.github.io/azure-service-operator/contributing/ )", file=sys.stderr)
print("(See https://azure.github.io/azure-service-operator/contributing/ and https://azure.github.io/azure-service-operator/contributing/developer-setup/#troubleshooting-repo-health )", file=sys.stderr)
sys.exit(1)

git_version = git_describe.stdout.strip()
Expand Down
20 changes: 20 additions & 0 deletions v2/api/apimanagement/customizations/product_api_extension_types_gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions v2/api/apimanagement/customizations/product_policy_extension_types_gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions v2/api/apimanagement/customizations/structure.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ github.com/Azure/azure-service-operator/v2/api/apimanagement/customizations
├── NamedValueExtension: Object (0 properties)
├── PolicyExtension: Object (0 properties)
├── PolicyFragmentExtension: Object (0 properties)
├── ProductApiExtension: Object (0 properties)
├── ProductExtension: Object (0 properties)
├── ProductPolicyExtension: Object (0 properties)
├── ServiceExtension: Object (0 properties)
└── SubscriptionExtension: Object (0 properties)
Loading

0 comments on commit e8da2d7

Please sign in to comment.