Skip to content

Commit

Permalink
Merge branch 'main' into willdavsmith/dapr-retry
Browse files Browse the repository at this point in the history
  • Loading branch information
willdavsmith authored Sep 22, 2023
2 parents a222265 + 1e2fc8a commit a4f48db
Show file tree
Hide file tree
Showing 937 changed files with 4,629 additions and 2,360 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# All of the people (and only those people) from the matching rule will be notified

# Default rule: anything that doesn't match a more specific rule goes here
* @radius-project/Radius-Eng
* @radius-project/maintainers-radius @radius-project/approvers-radius
2 changes: 1 addition & 1 deletion .github/workflows/functional-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.FUNCTEST_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.FUNCTEST_AWS_SECRET_ACCESS_KEY }}
AWS_REGION: ${{ env.AWS_REGION }}
RADIUS_SAMPLES_REPO_ROOT: ${{ github.workspace }}/samples
# RADIUS_SAMPLES_REPO_ROOT: ${{ github.workspace }}/samples
# Test_MongoDB_Recipe_Parameters is using the following environment variable.
INTEGRATION_TEST_RESOURCE_GROUP_NAME: ${{ env.AZURE_TEST_RESOURCE_GROUP }}
BICEP_RECIPE_REGISTRY: ${{ env.BICEP_RECIPE_REGISTRY }}
Expand Down
2 changes: 0 additions & 2 deletions CODEOWNERS

This file was deleted.

12 changes: 6 additions & 6 deletions build/generate.mk
Original file line number Diff line number Diff line change
Expand Up @@ -67,32 +67,32 @@ generate-ucp-crd: generate-controller-gen-installed
.PHONY: generate-genericcliclient
generate-genericcliclient: generate-node-installed generate-autorest-installed
@echo "$(AUTOREST_MODULE_VERSION) is module version"
autorest pkg/cli/clients_new/README.md --tag=2022-03-15-privatepreview
autorest pkg/cli/clients_new/README.md --tag=2023-10-01-preview

.PHONY: generate-rad-corerp-client
generate-rad-corerp-client: generate-node-installed generate-autorest-installed generate-tsp-installed generate-openapi-spec ## Generates the corerp client SDK (Autorest).
@echo "$(AUTOREST_MODULE_VERSION) is module version"
autorest pkg/corerp/api/README.md --tag=core-2022-03-15-privatepreview
autorest pkg/corerp/api/README.md --tag=core-2023-10-01-preview

.PHONY: generate-rad-datastoresrp-client
generate-rad-datastoresrp-client: generate-node-installed generate-autorest-installed generate-tsp-installed generate-openapi-spec ## Generates the datastoresrp client SDK (Autorest).
@echo "$(AUTOREST_MODULE_VERSION) is module version"
autorest pkg/datastoresrp/api/README.md --tag=datastores-2022-03-15-privatepreview
autorest pkg/datastoresrp/api/README.md --tag=datastores-2023-10-01-preview

.PHONY: generate-rad-messagingrp-client
generate-rad-messagingrp-client: generate-node-installed generate-autorest-installed generate-tsp-installed generate-openapi-spec ## Generates the messagingrp client SDK (Autorest).
@echo "$(AUTOREST_MODULE_VERSION) is module version"
autorest pkg/messagingrp/api/README.md --tag=messaging-2022-03-15-privatepreview
autorest pkg/messagingrp/api/README.md --tag=messaging-2023-10-01-preview

.PHONY: generate-rad-daprrp-client
generate-rad-daprrp-client: generate-node-installed generate-autorest-installed generate-tsp-installed generate-openapi-spec ## Generates the daprrp client SDK (Autorest).
@echo "$(AUTOREST_MODULE_VERSION) is module version"
autorest pkg/daprrp/api/README.md --tag=dapr-2022-03-15-privatepreview
autorest pkg/daprrp/api/README.md --tag=dapr-2023-10-01-preview

.PHONY: generate-rad-ucp-client
generate-rad-ucp-client: generate-node-installed generate-autorest-installed test-ucp-spec-examples ## Generates the UCP client SDK (Autorest).
@echo "$(AUTOREST_MODULE_VERSION) is module version"
autorest pkg/ucp/api/README.md --tag=ucp-2022-09-01-privatepreview
autorest pkg/ucp/api/README.md --tag=ucp-2023-10-01-preview

.PHONY: generate-mockgen-installed
generate-mockgen-installed:
Expand Down
2 changes: 1 addition & 1 deletion build/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@ oav-installed:
.PHONY: test-ucp-spec-examples
test-ucp-spec-examples: oav-installed ## Validates UCP examples conform to UCP OpenAPI Spec
# @echo "$(ARROW) Testing x-ms-examples conform to ucp spec..."
# oav validate-example swagger/specification/ucp/resource-manager/UCP/preview/2022-09-01-privatepreview/openapi.json
# oav validate-example swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/openapi.json


Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ In order to update or create a new schema follow these steps:

For example, to generate the `Applications.Core` resources run:
```bash
autorest pkg/corerp/api/README.md --tag=link-2022-03-15-privatepreview
autorest pkg/corerp/api/README.md --tag=link-2023-10-01-preview
```
The autotrest configuration file (_i.e README.md_) is generally found in `pkg/<NAMESPACE>/api/` directory and has details on which tag to use.
</details>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ Today, the [functional tests](https://github.com/radius-project/radius/tree/main
In any new test, the resources should be prefixed with the test type:
#### corerp-resources-gateway.bicep
```bicep
resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' = {
resource gateway 'Applications.Core/gateways@2023-10-01-preview' = {
name: 'gtwy-gtwy'
...
}
resource frontendRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' = {
resource frontendRoute 'Applications.Core/httpRoutes@2023-10-01-preview' = {
name: 'gtwy-front-rte'
...
}
Expand All @@ -43,7 +43,7 @@ This specifies `gtwy` as the test type and the suffix declares the type of resou
Many of the tests use the `magpiego` image as a testing container. These should be named with the test type as the prefix and `app-ctnr` as the suffix:
#### corerp-resources-mongodb.bicep
```bicep
resource webapp 'Applications.Core/containers@2022-03-15-privatepreview' = {
resource webapp 'Applications.Core/containers@2023-10-01-preview' = {
name: 'mdb-app-ctnr'
...
}
Expand Down
2 changes: 1 addition & 1 deletion docs/ucp/code_walkthrough.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ For proxying requests to the AWS plane, UCP needs to perform request translation
<br/><br/>

## UCP Resource Definitions
The swagger defintions for UCP resources are defined in swagger/specification/ucp/resource-manager/UCP/preview/2022-09-01-privatepreview/ucp.json.
The swagger defintions for UCP resources are defined in swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/ucp.json.

<br/><br/>

Expand Down
2 changes: 1 addition & 1 deletion docs/ucp/developer_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ kubectl logs {ucp pod name} -n radius-system -f
* You can directly send requests to UCP instead of going via the CLI to isolate issues while testing. For this, you could use any REST client like Postman with the URL such as:-
```
URL:-
PUT http://127.0.0.1:9000/apis/api.ucp.dev/v1alpha3/planes/radius/local/resourceGroups/{rg}/providers/Applications.Core/environments/{name}?api-version=2022-03-15-privatepreview
PUT http://127.0.0.1:9000/apis/api.ucp.dev/v1alpha3/planes/radius/local/resourceGroups/{rg}/providers/Applications.Core/environments/{name}?api-version=2023-10-01-preview
Body:-
{
Expand Down

This file was deleted.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Applications.Core @ 2022-03-15-privatepreview
# Applications.Core @ 2023-10-01-preview

## Resource Applications.Core/applications@2022-03-15-privatepreview
## Resource Applications.Core/applications@2023-10-01-preview
* **Valid Scope(s)**: Unknown
### Properties
* **apiVersion**: '2022-03-15-privatepreview' (ReadOnly, DeployTimeConstant): The resource api version
* **apiVersion**: '2023-10-01-preview' (ReadOnly, DeployTimeConstant): The resource api version
* **id**: string (ReadOnly, DeployTimeConstant): The resource id
* **location**: string (Required): The geo-location where the resource lives
* **name**: string (Required, DeployTimeConstant): The resource name
Expand All @@ -12,10 +12,10 @@
* **tags**: [TrackedResourceTags](#trackedresourcetags): Resource tags.
* **type**: 'Applications.Core/applications' (ReadOnly, DeployTimeConstant): The resource type

## Resource Applications.Core/containers@2022-03-15-privatepreview
## Resource Applications.Core/containers@2023-10-01-preview
* **Valid Scope(s)**: Unknown
### Properties
* **apiVersion**: '2022-03-15-privatepreview' (ReadOnly, DeployTimeConstant): The resource api version
* **apiVersion**: '2023-10-01-preview' (ReadOnly, DeployTimeConstant): The resource api version
* **id**: string (ReadOnly, DeployTimeConstant): The resource id
* **location**: string (Required): The geo-location where the resource lives
* **name**: string (Required, DeployTimeConstant): The resource name
Expand All @@ -24,10 +24,10 @@
* **tags**: [TrackedResourceTags](#trackedresourcetags): Resource tags.
* **type**: 'Applications.Core/containers' (ReadOnly, DeployTimeConstant): The resource type

## Resource Applications.Core/environments@2022-03-15-privatepreview
## Resource Applications.Core/environments@2023-10-01-preview
* **Valid Scope(s)**: Unknown
### Properties
* **apiVersion**: '2022-03-15-privatepreview' (ReadOnly, DeployTimeConstant): The resource api version
* **apiVersion**: '2023-10-01-preview' (ReadOnly, DeployTimeConstant): The resource api version
* **id**: string (ReadOnly, DeployTimeConstant): The resource id
* **location**: string (Required): The geo-location where the resource lives
* **name**: string (Required, DeployTimeConstant): The resource name
Expand All @@ -36,10 +36,10 @@
* **tags**: [TrackedResourceTags](#trackedresourcetags): Resource tags.
* **type**: 'Applications.Core/environments' (ReadOnly, DeployTimeConstant): The resource type

## Resource Applications.Core/extenders@2022-03-15-privatepreview
## Resource Applications.Core/extenders@2023-10-01-preview
* **Valid Scope(s)**: Unknown
### Properties
* **apiVersion**: '2022-03-15-privatepreview' (ReadOnly, DeployTimeConstant): The resource api version
* **apiVersion**: '2023-10-01-preview' (ReadOnly, DeployTimeConstant): The resource api version
* **id**: string (ReadOnly, DeployTimeConstant): The resource id
* **location**: string (Required): The geo-location where the resource lives
* **name**: string (Required, DeployTimeConstant): The resource name
Expand All @@ -48,10 +48,10 @@
* **tags**: [TrackedResourceTags](#trackedresourcetags): Resource tags.
* **type**: 'Applications.Core/extenders' (ReadOnly, DeployTimeConstant): The resource type

## Resource Applications.Core/gateways@2022-03-15-privatepreview
## Resource Applications.Core/gateways@2023-10-01-preview
* **Valid Scope(s)**: Unknown
### Properties
* **apiVersion**: '2022-03-15-privatepreview' (ReadOnly, DeployTimeConstant): The resource api version
* **apiVersion**: '2023-10-01-preview' (ReadOnly, DeployTimeConstant): The resource api version
* **id**: string (ReadOnly, DeployTimeConstant): The resource id
* **location**: string (Required): The geo-location where the resource lives
* **name**: string (Required, DeployTimeConstant): The resource name
Expand All @@ -60,10 +60,10 @@
* **tags**: [TrackedResourceTags](#trackedresourcetags): Resource tags.
* **type**: 'Applications.Core/gateways' (ReadOnly, DeployTimeConstant): The resource type

## Resource Applications.Core/httpRoutes@2022-03-15-privatepreview
## Resource Applications.Core/httpRoutes@2023-10-01-preview
* **Valid Scope(s)**: Unknown
### Properties
* **apiVersion**: '2022-03-15-privatepreview' (ReadOnly, DeployTimeConstant): The resource api version
* **apiVersion**: '2023-10-01-preview' (ReadOnly, DeployTimeConstant): The resource api version
* **id**: string (ReadOnly, DeployTimeConstant): The resource id
* **location**: string (Required): The geo-location where the resource lives
* **name**: string (Required, DeployTimeConstant): The resource name
Expand All @@ -72,10 +72,10 @@
* **tags**: [TrackedResourceTags](#trackedresourcetags): Resource tags.
* **type**: 'Applications.Core/httpRoutes' (ReadOnly, DeployTimeConstant): The resource type

## Resource Applications.Core/secretStores@2022-03-15-privatepreview
## Resource Applications.Core/secretStores@2023-10-01-preview
* **Valid Scope(s)**: Unknown
### Properties
* **apiVersion**: '2022-03-15-privatepreview' (ReadOnly, DeployTimeConstant): The resource api version
* **apiVersion**: '2023-10-01-preview' (ReadOnly, DeployTimeConstant): The resource api version
* **id**: string (ReadOnly, DeployTimeConstant): The resource id
* **location**: string (Required): The geo-location where the resource lives
* **name**: string (Required, DeployTimeConstant): The resource name
Expand All @@ -84,10 +84,10 @@
* **tags**: [TrackedResourceTags](#trackedresourcetags): Resource tags.
* **type**: 'Applications.Core/secretStores' (ReadOnly, DeployTimeConstant): The resource type

## Resource Applications.Core/volumes@2022-03-15-privatepreview
## Resource Applications.Core/volumes@2023-10-01-preview
* **Valid Scope(s)**: Unknown
### Properties
* **apiVersion**: '2022-03-15-privatepreview' (ReadOnly, DeployTimeConstant): The resource api version
* **apiVersion**: '2023-10-01-preview' (ReadOnly, DeployTimeConstant): The resource api version
* **id**: string (ReadOnly, DeployTimeConstant): The resource id
* **location**: string (Required): The geo-location where the resource lives
* **name**: string (Required, DeployTimeConstant): The resource name
Expand All @@ -96,15 +96,15 @@
* **tags**: [TrackedResourceTags](#trackedresourcetags): Resource tags.
* **type**: 'Applications.Core/volumes' (ReadOnly, DeployTimeConstant): The resource type

## Function listSecrets (Applications.Core/extenders@2022-03-15-privatepreview)
## Function listSecrets (Applications.Core/extenders@2023-10-01-preview)
* **Resource**: Applications.Core/extenders
* **ApiVersion**: 2022-03-15-privatepreview
* **ApiVersion**: 2023-10-01-preview
* **Input**: any
* **Output**: any

## Function listSecrets (Applications.Core/secretStores@2022-03-15-privatepreview)
## Function listSecrets (Applications.Core/secretStores@2023-10-01-preview)
* **Resource**: Applications.Core/secretStores
* **ApiVersion**: 2022-03-15-privatepreview
* **ApiVersion**: 2023-10-01-preview
* **Input**: any
* **Output**: [SecretStoreListSecretsResult](#secretstorelistsecretsresult)

Expand Down
Loading

0 comments on commit a4f48db

Please sign in to comment.