diff --git a/docs/content/concepts/environments-concept/index.md b/docs/content/concepts/environments-concept/index.md index b0c0fa2f7..29121ee60 100644 --- a/docs/content/concepts/environments-concept/index.md +++ b/docs/content/concepts/environments-concept/index.md @@ -56,10 +56,10 @@ In this example there are two teams within an organization: a central operations A typical workflow for this team structure would look like: 1. The ops team initializes a new environment, configured with a compute runtime setup with networking, identity, diagnostics, and other configuration that matches their org's requirements. -1. The developer authors a Radius application template, including containers for their services, links for their infrastructure, and routes/gateways for their networking. +1. The developer authors a Radius application template, including containers for their services, portable resources for their infrastructure, and routes/gateways for their networking. 1. The developer deploys the app template to the Radius environment - The app's containers automatically run on the container runtime - - The link automatically configures security best practices and injects connection information into the consuming container + - The resource automatically configures security best practices and injects connection information into the consuming container When the developer deploys their application, these org-level concerns are automatically wired up based on the environment. Developers don't have to think about credentials or how networking is configured, enabling them to focus on their applications instead. diff --git a/docs/content/concepts/overview/index.md b/docs/content/concepts/overview/index.md index 2d3b45a22..94adc6103 100644 --- a/docs/content/concepts/overview/index.md +++ b/docs/content/concepts/overview/index.md @@ -78,7 +78,7 @@ Radius aims to support all hosting platform types - from hyperscale cloud, to se ### Application portability -The Radius app model is designed to be portable across all Radius-supported platforms. Combined with links and other frameworks such as [Dapr](https://dapr.io/), teams can write their apps once and deploy to any Radius-enabled platform in minutes. +The Radius app model is designed to be portable across all Radius-supported platforms. Combined with portable resources and other frameworks such as [Dapr](https://dapr.io/), teams can write their apps once and deploy to any Radius-enabled platform in minutes. ### Consistent tooling diff --git a/docs/content/getting-started/snippets/app-with-redis-snippets.bicep b/docs/content/getting-started/snippets/app-with-redis-snippets.bicep index dd9b42817..5b2c1c324 100644 --- a/docs/content/getting-started/snippets/app-with-redis-snippets.bicep +++ b/docs/content/getting-started/snippets/app-with-redis-snippets.bicep @@ -30,7 +30,7 @@ resource demo 'Applications.Core/containers@2022-03-15-privatepreview' = { @description('The environment ID of your Radius application. Set automatically by the rad CLI.') param environment string -resource db 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { name: 'db' properties: { application: application diff --git a/docs/content/getting-started/snippets/app-with-redis.bicep b/docs/content/getting-started/snippets/app-with-redis.bicep index b0034e961..ea7fb7e1e 100644 --- a/docs/content/getting-started/snippets/app-with-redis.bicep +++ b/docs/content/getting-started/snippets/app-with-redis.bicep @@ -25,7 +25,7 @@ resource demo 'Applications.Core/containers@2022-03-15-privatepreview' = { } param environment string -resource db 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { name: 'db' properties: { application: application diff --git a/docs/content/guides/author-apps/containers/howto-environment-variables/index.md b/docs/content/guides/author-apps/containers/howto-environment-variables/index.md index a2bf26d8d..03a06ce9b 100644 --- a/docs/content/guides/author-apps/containers/howto-environment-variables/index.md +++ b/docs/content/guides/author-apps/containers/howto-environment-variables/index.md @@ -51,15 +51,15 @@ Add an `env` property which will contain a list of environment variables to set. Here you can see the environment variables `FOO` and `BAZ`, with their accompanying values. -## Step 4: Add a Mongo Link +## Step 4: Add a Mongo database -Next, add to `app.bicep` a [Mongo link]({{< ref portable-resources >}}), leveraging the default "dev" Recipe: +Next, add to `app.bicep` a [Mongo database]({{< ref portable-resources >}}), leveraging the default "dev" Recipe: {{< rad file="snippets/3-app.bicep" embed=true marker="//LINK" >}} -## Step 5: Connect to the Mongo Link +## Step 5: Connect to the Mongo database -Connections from a container to a link result in environment variables for connection information automatically being set on the container. Update your container definition to add a connection to the new Mongo link: +Connections from a container to a resource result in environment variables for connection information automatically being set on the container. Update your container definition to add a connection to the new Mongo database: {{< rad file="snippets/3-app.bicep" embed=true marker="//CONTAINER" >}} diff --git a/docs/content/guides/author-apps/containers/howto-environment-variables/snippets/3-app.bicep b/docs/content/guides/author-apps/containers/howto-environment-variables/snippets/3-app.bicep index 415e3eae3..634c002ac 100644 --- a/docs/content/guides/author-apps/containers/howto-environment-variables/snippets/3-app.bicep +++ b/docs/content/guides/author-apps/containers/howto-environment-variables/snippets/3-app.bicep @@ -23,7 +23,7 @@ resource container 'Applications.Core/containers@2022-03-15-privatepreview' = { } connections: { myconnection: { - source: mongoLink.id + source: mongoDatabase.id } } } @@ -31,8 +31,8 @@ resource container 'Applications.Core/containers@2022-03-15-privatepreview' = { //CONTAINER //LINK -resource mongoLink 'Applications.Link/mongoDatabases@2022-03-15-privatepreview' = { - name: 'mongo-link' +resource mongoDatabase 'Applications.Datastores/mongoDatabases@2022-03-15-privatepreview' = { + name: 'mongo-db' properties: { environment: environment application: app.id diff --git a/docs/content/guides/author-apps/containers/overview/snippets/container.bicep b/docs/content/guides/author-apps/containers/overview/snippets/container.bicep index 206065347..918baf97c 100644 --- a/docs/content/guides/author-apps/containers/overview/snippets/container.bicep +++ b/docs/content/guides/author-apps/containers/overview/snippets/container.bicep @@ -26,7 +26,7 @@ resource container 'Applications.Core/containers@2022-03-15-privatepreview' = { } //CONTAINER -resource statestore 'Applications.Link/daprStateStores@2022-03-15-privatepreview' = { +resource statestore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { name: 'inventory' properties: { environment: environment diff --git a/docs/content/guides/author-apps/dapr/index.md b/docs/content/guides/author-apps/dapr/index.md index ec64e4dc7..5ce0cbff8 100644 --- a/docs/content/guides/author-apps/dapr/index.md +++ b/docs/content/guides/author-apps/dapr/index.md @@ -55,13 +55,13 @@ Model your building blocks as resources: To interact with a Dapr building block, you need to know the name of the [Dapr component](https://docs.dapr.io/concepts/components-concept/). This name is the same as the name of the building block resource. -For example, if you have a `Applications.Link/daprStateStores` resource named `mystatestore` the Dapr component name will be `mystatestore`. Your code will then interact with this component via `http://localhost:3500/v1.0/state/mystatestore`, or via the Dapr SDKs through the `mystatestore` component name. +For example, if you have a `Applications.Dapr/stateStores` resource named `mystatestore` the Dapr component name will be `mystatestore`. Your code will then interact with this component via `http://localhost:3500/v1.0/state/mystatestore`, or via the Dapr SDKs through the `mystatestore` component name. ### Connecting to Dapr building blocks You can connect to a Dapr building block by manually referencing the resource name or by adding a connection. Connections automatically inject environment variables into your container with the resource name prefixed. -{{< rad file="snippets/dapr-componentname.bicep" embed=true marker="//MARKER" replace-key-ss="//STATESTORE" replace-value-ss="resource statestore 'Applications.Link/daprStateStores@2022-03-15-privatepreview' = {...}" >}} +{{< rad file="snippets/dapr-componentname.bicep" embed=true marker="//MARKER" replace-key-ss="//STATESTORE" replace-value-ss="resource statestore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = {...}" >}} ### Service invocation diff --git a/docs/content/guides/author-apps/dapr/snippets/dapr-componentname.bicep b/docs/content/guides/author-apps/dapr/snippets/dapr-componentname.bicep index 5c2268831..7e9e92742 100644 --- a/docs/content/guides/author-apps/dapr/snippets/dapr-componentname.bicep +++ b/docs/content/guides/author-apps/dapr/snippets/dapr-componentname.bicep @@ -43,7 +43,7 @@ resource container 'Applications.Core/containers@2022-03-15-privatepreview' = { } //STATESTORE -resource statestore 'Applications.Link/daprStateStores@2022-03-15-privatepreview' = { +resource statestore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { name: 'mystatestore' properties: { environment: environment diff --git a/docs/content/guides/author-apps/dapr/snippets/statestore.bicep b/docs/content/guides/author-apps/dapr/snippets/statestore.bicep index dc778d8f8..71aee6ecb 100644 --- a/docs/content/guides/author-apps/dapr/snippets/statestore.bicep +++ b/docs/content/guides/author-apps/dapr/snippets/statestore.bicep @@ -24,7 +24,7 @@ resource account 'Microsoft.Storage/storageAccounts@2019-06-01' existing = { } // The accompanying Dapr component resource is automatically created for you -resource stateStore 'Applications.Link/daprStateStores@2022-03-15-privatepreview' = { +resource stateStore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { name: 'mystatestore' properties: { environment: environment diff --git a/docs/content/guides/author-apps/portable-resources/_index.md b/docs/content/guides/author-apps/portable-resources/_index.md index 3cab3e652..0b08da29a 100644 --- a/docs/content/guides/author-apps/portable-resources/_index.md +++ b/docs/content/guides/author-apps/portable-resources/_index.md @@ -1,8 +1,8 @@ --- type: docs title: "Radius portable resources" -linkTitle: "Links" -description: "Learn how to make your applications portable with Links" +linkTitle: "Portable Resources" +description: "Learn how to make your applications portable" weight: 400 tags: ["portability"] --- diff --git a/docs/content/guides/author-apps/portable-resources/overview/index.md b/docs/content/guides/author-apps/portable-resources/overview/index.md index 414923181..65f7f881e 100644 --- a/docs/content/guides/author-apps/portable-resources/overview/index.md +++ b/docs/content/guides/author-apps/portable-resources/overview/index.md @@ -1,22 +1,22 @@ --- type: docs -title: "Overview: Radius Links" +title: "Overview: Portable Resources" linkTitle: "Overview" -description: "Add links to your Radius application for infrastructure portability" +description: "Add portable resources to your Radius application for infrastructure portability" weight: 600 categories: "Overview" -tags: ["links","portability"] +tags: ["portability"] --- ## Overview -Links provide **abstraction** and **portability** to Radius applications. This allows development teams to depend on high level resource types and APIs, and let infra teams swap out the underlying resource and configuration. +Portable resources provide **abstraction** and **portability** to Radius applications. This allows development teams to depend on high level resource types and APIs, and let infra teams swap out the underlying resource and configuration. -Diagram of a link connecting from a container to either an Azure Redis Cache or a Kubernetes Deployment +Diagram of a resource connecting from a container to either an Azure Redis Cache or a Kubernetes Deployment ### Example -The following examples show how a [container]({{< ref "guides/author-apps/containers" >}}) can connect to a Redis link, which in turn binds to an Azure Cache for Redis or a Kubernetes Pod. +The following examples show how a [container]({{< ref "guides/author-apps/containers" >}}) can connect to a Redis cache, which in turn binds to an Azure Cache for Redis or a Kubernetes Pod. {{< tabs Kubernetes Azure >}} @@ -27,11 +27,11 @@ In this example Redis is provided by a Kubernetes Pod: {{< rad file="snippets/redis-container.bicep" embed=true marker="//RESOURCE" >}} -

Link

+

Portable Resource

-A Redis link can be configured with properties from the Kubernetes Pod: +A Redis cache can be configured with properties from the Kubernetes Pod: -{{< rad file="snippets/redis-container.bicep" embed=true marker="//LINK" >}} +{{< rad file="snippets/redis-container.bicep" embed=true marker="//Portable Resource" >}} {{< /codetab >}} @@ -42,11 +42,11 @@ In this example Redis is provided by an Azure Cache for Redis: {{< rad file="snippets/redis-azure.bicep" embed=true marker="//RESOURCE" >}} -

Link

+

Portable Resource

-A Redis link can be configured with an Azure resource: +A Redis cache can be configured with an Azure resource: -{{< rad file="snippets/redis-azure.bicep" embed=true marker="//LINK" >}} +{{< rad file="snippets/redis-azure.bicep" embed=true marker="//Portable Resource" >}} {{< /codetab >}} @@ -54,12 +54,6 @@ A Redis link can be configured with an Azure resource:

Container

-A container can connect to the Redis link without any configuration or knowledge of the underlying resource: +A container can connect to the Redis cache without any configuration or knowledge of the underlying resource: -{{< rad file="snippets/redis-azure.bicep" embed=true marker="//CONTAINER" >}} - -## Link categories - -Check out the Radius link resource schema docs to learn how to leverage links in your application: - -{{< button text="Link resources" page="link-schema" >}} +{{< rad file="snippets/redis-azure.bicep" embed=true marker="//CONTAINER" >}} \ No newline at end of file diff --git a/docs/content/guides/author-apps/portable-resources/overview/snippets/redis-azure.bicep b/docs/content/guides/author-apps/portable-resources/overview/snippets/redis-azure.bicep index 32fc20099..2634f4b30 100644 --- a/docs/content/guides/author-apps/portable-resources/overview/snippets/redis-azure.bicep +++ b/docs/content/guides/author-apps/portable-resources/overview/snippets/redis-azure.bicep @@ -23,9 +23,9 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' existing name: 'myapp' } -//LINK -resource redis 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { - name: 'myredis-link' +//PORTABLE RESOURCE +resource redis 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { + name: 'myrediscache' properties: { environment: environment application: app.id @@ -40,7 +40,7 @@ resource redis 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { } } } -//LINK +//PORTABLE RESOURCE //CONTAINER resource container 'Applications.Core/containers@2022-03-15-privatepreview' = { name: 'mycontainer' diff --git a/docs/content/guides/author-apps/portable-resources/overview/snippets/redis-container.bicep b/docs/content/guides/author-apps/portable-resources/overview/snippets/redis-container.bicep index 86389153e..db81675ca 100644 --- a/docs/content/guides/author-apps/portable-resources/overview/snippets/redis-container.bicep +++ b/docs/content/guides/author-apps/portable-resources/overview/snippets/redis-container.bicep @@ -30,9 +30,9 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' existing name: 'myapp' } -//LINK -resource redis 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { - name: 'myredis-link' +//PORTABLE RESOURCE +resource redis 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { + name: 'myrediscache' properties: { environment: environment application: app.id @@ -45,7 +45,7 @@ resource redis 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { } } } -//LINK +//PORTABLE RESOURCE //CONTAINER resource container 'Applications.Core/containers@2022-03-15-privatepreview' = { name: 'mycontainer' diff --git a/docs/content/guides/deploy-apps/environments/howto-environment/index.md b/docs/content/guides/deploy-apps/environments/howto-environment/index.md index d5a9f8f7b..124529bb4 100644 --- a/docs/content/guides/deploy-apps/environments/howto-environment/index.md +++ b/docs/content/guides/deploy-apps/environments/howto-environment/index.md @@ -65,8 +65,8 @@ Radius environments can be setup with the rad CLI via two paths: interactive or ``` ``` NAME TYPE TEMPLATE KIND TEMPLATE - default Applications.Link/mongoDatabases bicep radius.azurecr.io/recipes/dev/mongodatabases:latest - default Applications.Link/redisCaches bicep radius.azurecr.io/recipes/dev/rediscaches:latest + default Applications.Datastores/mongoDatabases bicep radius.azurecr.io/recipes/dev/mongodatabases:latest + default Applications.Datastores/redisCaches bicep radius.azurecr.io/recipes/dev/rediscaches:latest ``` You can follow the [recipes]({{< ref "/guides/recipes/overview" >}}) documentation to learn more about the recipes and how to use them in your application. @@ -163,7 +163,7 @@ Radius can also be installed and an environment created with manual rad CLI comm 1. Create a new Radius resource group: - [Radius resource groups]({{< ref groups >}}) are used to organize Radius resources such as applications, environments, links, and routes. Run [`rad group create`]({{< ref rad_group_create >}}) to create a new resource group: + [Radius resource groups]({{< ref groups >}}) are used to organize Radius resources such as applications, environments, portable resources, and routes. Run [`rad group create`]({{< ref rad_group_create >}}) to create a new resource group: ```bash rad group create myGroup diff --git a/docs/content/guides/operations/control-plane/groups/index.md b/docs/content/guides/operations/control-plane/groups/index.md index fc128da85..452be5f59 100644 --- a/docs/content/guides/operations/control-plane/groups/index.md +++ b/docs/content/guides/operations/control-plane/groups/index.md @@ -11,7 +11,7 @@ Resource groups are collections of resources that you can manage as a single uni Diagram showing Radius resources inside of a Radius resource group {{% alert title="Radius vs. Azure Resource Groups" color="primary" %}} -Note that resource groups in Radius are not the same as [Azure resource groups](https://learn.microsoft.com/azure/azure-resource-manager/management/manage-resource-groups-portal). Azure resource groups are used to organize Azure resources, while Radius resource groups are used to organize Radius resources, such as applications, environments, links, and routes. When you deploy a template that contains both, Radius resources route to the Radius resource group defined in your workspace, and Azure resources route to the Azure resource group defined in your [cloud provider]({{< ref providers >}}). +Note that resource groups in Radius are not the same as [Azure resource groups](https://learn.microsoft.com/azure/azure-resource-manager/management/manage-resource-groups-portal). Azure resource groups are used to organize Azure resources, while Radius resource groups are used to organize Radius resources, such as applications, environments, portable resources, and routes. When you deploy a template that contains both, Radius resources route to the Radius resource group defined in your workspace, and Azure resources route to the Azure resource group defined in your [cloud provider]({{< ref providers >}}). {{% /alert %}} ## Initialization diff --git a/docs/content/guides/operations/kubernetes/kubernetes-mapping/index.md b/docs/content/guides/operations/kubernetes/kubernetes-mapping/index.md index 2ccc1990f..77989016f 100644 --- a/docs/content/guides/operations/kubernetes/kubernetes-mapping/index.md +++ b/docs/content/guides/operations/kubernetes/kubernetes-mapping/index.md @@ -30,9 +30,9 @@ The following resources map to Kubernetes objects: | [`Applications.Core/containers`]({{< ref container-schema >}}) | `apps/Deployment@v1` | | [`Applications.Core/httpRoutes`]({{< ref httproute >}}) | `core/Service@v1` | | [`Applications.Core/gateways`]({{< ref gateway >}}) | `projectcontour.io/HTTPProxy@v1` | -| [`Applications.Link/daprPubSubBrokers`]({{< ref dapr-pubsub >}}) | `dapr.io/Component@v1alpha1` | -| [`Applications.Link/daprSecretStores`]({{< ref dapr-secretstore >}}) | `dapr.io/Component@v1alpha1` | -| [`Applications.Link/daprStateStores`]({{< ref dapr-statestore >}}) | `dapr.io/Component@v1alpha1` | +| [`Applications.Dapr/pubSubBrokers`]({{< ref dapr-pubsub >}}) | `dapr.io/Component@v1alpha1` | +| [`Applications.Dapr/secretStores`]({{< ref dapr-secretstore >}}) | `dapr.io/Component@v1alpha1` | +| [`Applications.Dapr/stateStores`]({{< ref dapr-statestore >}}) | `dapr.io/Component@v1alpha1` | ## Resource naming diff --git a/docs/content/guides/recipes/howto-author-recipes/index.md b/docs/content/guides/recipes/howto-author-recipes/index.md index 6ba17eeb5..fd4c32eee 100644 --- a/docs/content/guides/recipes/howto-author-recipes/index.md +++ b/docs/content/guides/recipes/howto-author-recipes/index.md @@ -52,7 +52,7 @@ When you output a `values` object, all of the individual properties will be dire #### Properties -Simply define an object that matches the schema of the resource calling the Recipe. For example, for an `Application.Link/redisCaches` resource, a Recipe would output: +Simply define an object that matches the schema of the resource calling the Recipe. For example, for an `Application.Datastores/redisCaches` resource, a Recipe would output: {{< rad file="snippets/recipe.bicep" embed=true marker="//OUTVALUES" >}} @@ -94,7 +94,7 @@ Recipes can be added via the rad CLI or an environment Bicep definition: {{% codetab %}} ```bash -rad recipe register myrecipe --environment myenv --template-kind bicep --template-path myregistry.azurecr.io/recipes/myrecipe:v1 --link-type Applications.Link/redisCaches +rad recipe register myrecipe --environment myenv --template-kind bicep --template-path myregistry.azurecr.io/recipes/myrecipe:v1 --link-type Applications.Datastores/redisCaches ``` {{% /codetab %}} {{% codetab %}} @@ -110,7 +110,7 @@ You can now use your custom recipe in its accompanying resource. Visit the [Reci ## `context` parameter properties -In the following tables, "resource" refers to the resource "calling" the Recipe. For example, if you were to create a Recipe for an `Applications.Link/redisCaches` resource, the "resource" would be the instance of the redisCaches that is calling the Recipe. +In the following tables, "resource" refers to the resource "calling" the Recipe. For example, if you were to create a Recipe for an `Applications.Datastores/redisCaches` resource, the "resource" would be the instance of the redisCaches that is calling the Recipe. | Key | Type | Description | |-----|------|-------------| @@ -124,8 +124,8 @@ In the following tables, "resource" refers to the resource "calling" the Recipe. | Key | Type | Description | Example | |-----|------|-------------|---------| | `name` | string | The resource name of the application | `myredis` -| `id` | string | The ID of the resource | `/planes/radius/resourceGroups/myrg/Applications.Link/redisCaches/myredis` -| `type` | string | The type of the resource calling this recipe | `Applications.Link/redisCaches` +| `id` | string | The ID of the resource | `/planes/radius/resourceGroups/myrg/Applications.Datastores/redisCaches/myredis` +| `type` | string | The type of the resource calling this recipe | `Applications.Datastores/redisCaches` ### application diff --git a/docs/content/guides/recipes/howto-author-recipes/snippets/environment.bicep b/docs/content/guides/recipes/howto-author-recipes/snippets/environment.bicep index ea4bd0575..c0a495e61 100644 --- a/docs/content/guides/recipes/howto-author-recipes/snippets/environment.bicep +++ b/docs/content/guides/recipes/howto-author-recipes/snippets/environment.bicep @@ -9,7 +9,7 @@ resource env 'Applications.Core/environments@2022-03-15-privatepreview' = { namespace: 'default' } recipes: { - 'Applications.Link/redisCaches':{ + 'Applications.Datastores/redisCaches':{ myrecipe: { templateKind: 'bicep' templatePath: 'https://myregistry.azurecr.io/recipes/myrecipe:v1' diff --git a/docs/content/guides/recipes/overview/index.md b/docs/content/guides/recipes/overview/index.md index a60717574..8cd163262 100644 --- a/docs/content/guides/recipes/overview/index.md +++ b/docs/content/guides/recipes/overview/index.md @@ -48,14 +48,14 @@ Recipes currently support the following resources. Support for additional resour | Supported resources | |---------------------| -| [`Applications.Link/redisCaches`]({{< ref redis >}}) | -| [`Applications.Link/mongoDatabases`]({{< ref mongodb >}}) | -| [`Applications.Link/sqlDatabase`]({{< ref microsoft-sql >}}) | -| [`Applications.Link/rabbitmqMessageQueues`]({{< ref rabbitmq >}}) | -| [`Applications.Link/daprStateStores`]({{< ref dapr-statestore >}}) | -| [`Applications.Link/daprPubSubBrokers`]({{< ref dapr-pubsub >}}) | -| [`Applications.Link/daprSecretStore`]({{< ref dapr-secretstore >}}) | -| [`Applications.Link/extenders`]({{< ref extender >}}) | +| [`Applications.Datastores/redisCaches`]({{< ref redis >}}) | +| [`Applications.Datastores/mongoDatabases`]({{< ref mongodb >}}) | +| [`Applications.Datastores/sqlDatabases]({{< ref microsoft-sql >}}) | +| [`Applications.Messaging/rabbitmqQueues`]({{< ref rabbitmq >}}) | +| [`Applications.Dapr/stateStores`]({{< ref dapr-statestore >}}) | +| [`Applications.Dapr/pubSubBrokers`]({{< ref dapr-pubsub >}}) | +| [`Applications.Dapr/secretStores`]({{< ref dapr-secretstore >}}) | +| [`Applications.Core/extenders`]({{< ref extender >}}) | ## Infrastructure linking diff --git a/docs/content/guides/recipes/overview/snippets/recipe-link-example.bicep b/docs/content/guides/recipes/overview/snippets/recipe-link-example.bicep index 3b88a680e..5adff50b1 100644 --- a/docs/content/guides/recipes/overview/snippets/recipe-link-example.bicep +++ b/docs/content/guides/recipes/overview/snippets/recipe-link-example.bicep @@ -3,7 +3,7 @@ param environment string param application string //BASIC -resource redis 'Applications.Link/redisCaches@2022-03-15-privatepreview'= { +resource redis 'Applications.Datastores/redisCaches@2022-03-15-privatepreview'= { name: 'mylink' properties: { environment: environment @@ -17,7 +17,7 @@ resource redis 'Applications.Link/redisCaches@2022-03-15-privatepreview'= { //PARAMETERS -resource redisParam 'Applications.Link/redisCaches@2022-03-15-privatepreview'= { +resource redisParam 'Applications.Datastores/redisCaches@2022-03-15-privatepreview'= { name: 'mylink' properties: { environment: environment @@ -33,7 +33,7 @@ resource redisParam 'Applications.Link/redisCaches@2022-03-15-privatepreview'= { //PARAMETERS //DEFAULT -resource redisDefault 'Applications.Link/redisCaches@2022-03-15-privatepreview'= { +resource redisDefault 'Applications.Datastores/redisCaches@2022-03-15-privatepreview'= { name: 'mylink' properties: { environment: environment diff --git a/docs/content/reference/api/applications.core/api-extenders.md b/docs/content/reference/api/applications.core/api-extenders.md new file mode 100644 index 000000000..0e956a2f0 --- /dev/null +++ b/docs/content/reference/api/applications.core/api-extenders.md @@ -0,0 +1,9 @@ +--- +type: api +title: "Applications.Core/extenders API reference" +linkTitle: "extenders" +description: "Detailed reference documentation on the Applications.Core/extenders API" +slug: "extenders" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Core/preview/2022-03-15-privatepreview/extenders.json" >}} diff --git a/docs/content/reference/api/applications.link/_index.md b/docs/content/reference/api/applications.dapr/_index.md similarity index 50% rename from docs/content/reference/api/applications.link/_index.md rename to docs/content/reference/api/applications.dapr/_index.md index 5a4f552fb..a459a4580 100644 --- a/docs/content/reference/api/applications.link/_index.md +++ b/docs/content/reference/api/applications.dapr/_index.md @@ -1,8 +1,8 @@ --- type: docs -title: "Applications.Link API reference" -linkTitle: "Applications.Link" -description: "Detailed reference documentation on the Applications.Link API" +title: "Applications.Dapr API reference" +linkTitle: "Applications.Dapr" +description: "Detailed reference documentation on the Applications.Dapr API" --- -{{< redoc "swagger/specification/applications/resource-manager/Applications.Link/preview/2022-03-15-privatepreview/openapi.json" >}} +{{< redoc "swagger/specification/applications/resource-manager/Applications.Dapr/preview/2022-03-15-privatepreview/openapi.json" >}} diff --git a/docs/content/reference/api/applications.dapr/api-pubsubbrokers.md b/docs/content/reference/api/applications.dapr/api-pubsubbrokers.md new file mode 100644 index 000000000..9596d4f4f --- /dev/null +++ b/docs/content/reference/api/applications.dapr/api-pubsubbrokers.md @@ -0,0 +1,9 @@ +--- +type: api +title: "Applications.Dapr/pubSubBrokers API reference" +linkTitle: "pubSubBrokers" +description: "Detailed reference documentation on the Applications.Dapr/mongoDatabases API" +slug: "pubSubBrokers" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Dapr/preview/2022-03-15-privatepreview/pubSubBrokers.json" >}} \ No newline at end of file diff --git a/docs/content/reference/api/applications.dapr/api-secretStores.md b/docs/content/reference/api/applications.dapr/api-secretStores.md new file mode 100644 index 000000000..12e17fddd --- /dev/null +++ b/docs/content/reference/api/applications.dapr/api-secretStores.md @@ -0,0 +1,9 @@ +--- +type: api +title: "Applications.Dapr/secretStores API reference" +linkTitle: "secretStores" +description: "Detailed reference documentation on the Applications.Dapr/secretStores API" +slug: "secretStores" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Dapr/preview/2022-03-15-privatepreview/secretStores.json" >}} \ No newline at end of file diff --git a/docs/content/reference/api/applications.dapr/api-stateStores.md b/docs/content/reference/api/applications.dapr/api-stateStores.md new file mode 100644 index 000000000..dce323bc7 --- /dev/null +++ b/docs/content/reference/api/applications.dapr/api-stateStores.md @@ -0,0 +1,9 @@ +--- +type: api +title: "Applications.Dapr/stateStores API reference" +linkTitle: "stateStores" +description: "Detailed reference documentation on the Applications.Dapr/stateStores API" +slug: "stateStores" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Dapr/preview/2022-03-15-privatepreview/stateStores.json" >}} \ No newline at end of file diff --git a/docs/content/reference/api/applications.datastores/_index.md b/docs/content/reference/api/applications.datastores/_index.md new file mode 100644 index 000000000..0b55c56a7 --- /dev/null +++ b/docs/content/reference/api/applications.datastores/_index.md @@ -0,0 +1,8 @@ +--- +type: docs +title: "Applications.Datastores API reference" +linkTitle: "Applications.Datastores" +description: "Detailed reference documentation on the Applications.Datastores API" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Datastores/preview/2022-03-15-privatepreview/openapi.json" >}} diff --git a/docs/content/reference/api/applications.datastores/api-mongodatabases.md b/docs/content/reference/api/applications.datastores/api-mongodatabases.md new file mode 100644 index 000000000..3034fc6e6 --- /dev/null +++ b/docs/content/reference/api/applications.datastores/api-mongodatabases.md @@ -0,0 +1,9 @@ +--- +type: api +title: "Applications.Datastores/mongoDatabases API reference" +linkTitle: "mongoDatabases" +description: "Detailed reference documentation on the Applications.Datastores/mongoDatabases API" +slug: "mongoDatabases" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Datastores/preview/2022-03-15-privatepreview/mongoDatabases.json" >}} \ No newline at end of file diff --git a/docs/content/reference/api/applications.datastores/api-rediscaches.md b/docs/content/reference/api/applications.datastores/api-rediscaches.md new file mode 100644 index 000000000..0e510d959 --- /dev/null +++ b/docs/content/reference/api/applications.datastores/api-rediscaches.md @@ -0,0 +1,9 @@ +--- +type: api +title: "Applications.Datastores/redisCaches API reference" +linkTitle: "redisCaches" +description: "Detailed reference documentation on the Applications.Datastores/redisCaches API" +slug: "redisCaches" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Datastores/preview/2022-03-15-privatepreview/redisCaches.json" >}} \ No newline at end of file diff --git a/docs/content/reference/api/applications.datastores/api-sqldatabases.md b/docs/content/reference/api/applications.datastores/api-sqldatabases.md new file mode 100644 index 000000000..3d41e985b --- /dev/null +++ b/docs/content/reference/api/applications.datastores/api-sqldatabases.md @@ -0,0 +1,9 @@ +--- +type: api +title: "Applications.Datastores/sqlDatabases API reference" +linkTitle: "sqlDatabases" +description: "Detailed reference documentation on the Applications.Datastores/sqlDatabases API" +slug: "sqlDatabases" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Datastores/preview/2022-03-15-privatepreview/sqlDatabases.json" >}} \ No newline at end of file diff --git a/docs/content/reference/api/applications.messaging/_index.md b/docs/content/reference/api/applications.messaging/_index.md new file mode 100644 index 000000000..645c789ed --- /dev/null +++ b/docs/content/reference/api/applications.messaging/_index.md @@ -0,0 +1,8 @@ +--- +type: docs +title: "Applications.Messaging API reference" +linkTitle: "Applications.Messaging" +description: "Detailed reference documentation on the Applications.Messaging API" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Messaging/preview/2022-03-15-privatepreview/openapi.json" >}} diff --git a/docs/content/reference/api/applications.messaging/api-rabbitmqqueues.md b/docs/content/reference/api/applications.messaging/api-rabbitmqqueues.md new file mode 100644 index 000000000..98a06a066 --- /dev/null +++ b/docs/content/reference/api/applications.messaging/api-rabbitmqqueues.md @@ -0,0 +1,9 @@ +--- +type: api +title: "Applications.Messaging/rabbitmqQueues API reference" +linkTitle: "rabbitmqQueues" +description: "Detailed reference documentation on the Applications.Messaging/rabbitmqQueues API" +slug: "rabbitmqQueues" +--- + +{{< redoc "swagger/specification/applications/resource-manager/Applications.Messaging/preview/2022-03-15-privatepreview/rabbitmqQueues.json" >}} \ No newline at end of file diff --git a/docs/content/reference/api/resource-policies/_index.md b/docs/content/reference/api/resource-policies/_index.md index b6ccfe515..df2a08aab 100644 --- a/docs/content/reference/api/resource-policies/_index.md +++ b/docs/content/reference/api/resource-policies/_index.md @@ -47,24 +47,30 @@ Each resource type controller decides whether it will retry to process the opera | Applications.Core/gateways | PUT/PATCH/DELETE | Asynchronous | default | default | | Applications.Core/httpRoutes | LIST/GET | Synchronous | default | | | Applications.Core/httpRoutes | PUT/PATCH/DELETE | Asynchronous | default | default | +| Applications.Core/extenders | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | +| Applications.Core/extenders | POST ListSecret | Synchronous | default | | -#### Applications.Link resource provider +#### Applications.Dapr resource providers | Resource Type | Operation | API Type | Server Timeout (Seconds) | Async Operation retry condition| |------|:--------:|-------------|---------|------------| -| Applications.Link/daprPubSubBrokers | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | -| Applications.Link/daprPubSubBrokers | POST ListSecret | Synchronous | default | | -| Applications.Link/daprSecretStores | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | -| Applications.Link/daprSecretStores | POST ListSecret | Synchronous | default | | -| Applications.Link/daprStateStores | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | -| Applications.Link/daprStateStores | POST ListSecret | Synchronous | default | | -| Applications.Link/extenders | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | -| Applications.Link/extenders | POST ListSecret | Synchronous | default | | -| Applications.Link/mongoDatabases | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | -| Applications.Link/mongoDatabases | POST ListSecret | Synchronous | default | | -| Applications.Link/rabbitMQMessageQueues | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | -| Applications.Link/rabbitMQMessageQueues | POST ListSecret | Synchronous | default | | -| Applications.Link/redisCaches | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | -| Applications.Link/redisCaches | POST ListSecret | Synchronous | default | | -| Applications.Link/sqlDatabases | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | -| Applications.Link/sqlDatabases | POST ListSecret | Synchronous | default | | +| Applications.Dapr/pubSubBrokers | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | +| Applications.Dapr/pubSubBrokers | POST ListSecret | Synchronous | default | | +| Applications.Dapr/secretStores | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | +| Applications.Dapr/secretStores | POST ListSecret | Synchronous | default | | +| Applications.Dapr/stateStores | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | +| Applications.Dapr/stateStores | POST ListSecret | Synchronous | default | | + + +#### Applications.Datastores resource providers + +| Resource Type | Operation | API Type | Server Timeout (Seconds) | Async Operation retry condition| +|------|:--------:|-------------|---------|------------| +| Applications.Datastores/mongoDatabases | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | +| Applications.Datastores/mongoDatabases | POST ListSecret | Synchronous | default | | +| Applications.Datastores/rabbitMQMessageQueues | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | +| Applications.Datastores/rabbitMQMessageQueues | POST ListSecret | Synchronous | default | | +| Applications.Datastores/redisCaches | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | +| Applications.Datastores/redisCaches | POST ListSecret | Synchronous | default | | +| Applications.Datastores/sqlDatabases | LIST/GET/PUT/PATCH/DELETE | Synchronous | default | | +| Applications.Datastores/sqlDatabases | POST ListSecret | Synchronous | default | | diff --git a/docs/content/reference/cli/rad_credential_register_azure.md b/docs/content/reference/cli/rad_credential_register_azure.md index 964b9608e..7e476fa6b 100644 --- a/docs/content/reference/cli/rad_credential_register_azure.md +++ b/docs/content/reference/cli/rad_credential_register_azure.md @@ -18,7 +18,7 @@ This command is intended for scripting or advanced use-cases. See 'rad init' for to configure these settings. Radius will use the provided service principal for all interactions with Azure, including Bicep deployment, -Radius environments, and Radius links. +Radius environments, and Radius portable resources. Radius will use the provided subscription and resource group as the default target scope for Bicep deployment. The provided service principal must have the Contributor or Owner role assigned for the provided resource group diff --git a/docs/content/reference/cli/rad_recipe.md b/docs/content/reference/cli/rad_recipe.md index 3973b63c4..ccc00d5da 100644 --- a/docs/content/reference/cli/rad_recipe.md +++ b/docs/content/reference/cli/rad_recipe.md @@ -12,8 +12,8 @@ Manage link recipes ### Synopsis -Manage link recipes - Link recipes automate the deployment of infrastructure and configuration of links. +Manage recipes + Recipes automate the deployment of infrastructure and configuration of portable resources. ### Options diff --git a/docs/content/reference/cli/rad_recipe_register.md b/docs/content/reference/cli/rad_recipe_register.md index 37541a81c..d8d2f563b 100644 --- a/docs/content/reference/cli/rad_recipe_register.md +++ b/docs/content/reference/cli/rad_recipe_register.md @@ -28,13 +28,13 @@ rad recipe register [recipe-name] [flags] ``` # Add a recipe to an environment -rad recipe register cosmosdb -e env_name -w workspace --template-kind bicep --template-path template_path --link-type Applications.Link/mongoDatabases +rad recipe register cosmosdb -e env_name -w workspace --template-kind bicep --template-path template_path --link-type Applications.Datastores/mongoDatabases # Specify a parameter -rad recipe register cosmosdb -e env_name -w workspace --template-kind bicep --template-path template_path --link-type Applications.Link/mongoDatabases --parameters throughput=400 +rad recipe register cosmosdb -e env_name -w workspace --template-kind bicep --template-path template_path --link-type Applications.Datastores/mongoDatabases --parameters throughput=400 # specify multiple parameters using a JSON parameter file -rad recipe register cosmosdb -e env_name -w workspace --template-kind bicep --template-path template_path --link-type Applications.Link/mongoDatabases --parameters @myfile.json +rad recipe register cosmosdb -e env_name -w workspace --template-kind bicep --template-path template_path --link-type Applications.Datastores/mongoDatabases --parameters @myfile.json ``` @@ -44,7 +44,7 @@ rad recipe register cosmosdb -e env_name -w workspace --template-kind bicep --te -e, --environment string The environment name -g, --group string The resource group name -h, --help help for register - --link-type string specify the type of the link this recipe can be consumed by + --link-type string specify the type of the resource this recipe can be consumed by -o, --output string output format (supported formats are json, table) (default "table") -p, --parameters stringArray Specify parameters for the deployment --template-kind string specify the kind for the template provided by the recipe. @@ -61,5 +61,5 @@ rad recipe register cosmosdb -e env_name -w workspace --template-kind bicep --te ### SEE ALSO -* [rad recipe]({{< ref rad_recipe.md >}}) - Manage link recipes +* [rad recipe]({{< ref rad_recipe.md >}}) - Manage recipes diff --git a/docs/content/reference/cli/rad_recipe_show.md b/docs/content/reference/cli/rad_recipe_show.md index 157c965e4..e4082a261 100644 --- a/docs/content/reference/cli/rad_recipe_show.md +++ b/docs/content/reference/cli/rad_recipe_show.md @@ -44,7 +44,7 @@ rad recipe show redis-dev --group dev --environment dev -e, --environment string The environment name -g, --group string The resource group name -h, --help help for show - --link-type string Specify the type of the link this recipe can be consumed by + --link-type string Specify the type of the resource this recipe can be consumed by -o, --output string output format (supported formats are json, table) (default "table") -w, --workspace string The workspace name ``` @@ -57,5 +57,5 @@ rad recipe show redis-dev --group dev --environment dev ### SEE ALSO -* [rad recipe]({{< ref rad_recipe.md >}}) - Manage link recipes +* [rad recipe]({{< ref rad_recipe.md >}}) - Manage recipes diff --git a/docs/content/reference/cli/rad_recipe_unregister.md b/docs/content/reference/cli/rad_recipe_unregister.md index c4a813575..1dd078d5b 100644 --- a/docs/content/reference/cli/rad_recipe_unregister.md +++ b/docs/content/reference/cli/rad_recipe_unregister.md @@ -30,7 +30,7 @@ rad recipe unregister cosmosdb -e, --environment string The environment name -g, --group string The resource group name -h, --help help for unregister - --link-type string Specify the type of the link this recipe can be consumed by + --link-type string Specify the type of the resource this recipe can be consumed by -o, --output string output format (supported formats are json, table) (default "table") -w, --workspace string The workspace name ``` @@ -43,5 +43,5 @@ rad recipe unregister cosmosdb ### SEE ALSO -* [rad recipe]({{< ref rad_recipe.md >}}) - Manage link recipes +* [rad recipe]({{< ref rad_recipe.md >}}) - Manage recipes diff --git a/docs/content/reference/resource-schema/link-schema/cache/_index.md b/docs/content/reference/resource-schema/cache/_index.md similarity index 100% rename from docs/content/reference/resource-schema/link-schema/cache/_index.md rename to docs/content/reference/resource-schema/cache/_index.md diff --git a/docs/content/reference/resource-schema/link-schema/cache/redis/index.md b/docs/content/reference/resource-schema/cache/redis/index.md similarity index 91% rename from docs/content/reference/resource-schema/link-schema/cache/redis/index.md rename to docs/content/reference/resource-schema/cache/redis/index.md index 6c09ee5f7..ac8860096 100644 --- a/docs/content/reference/resource-schema/link-schema/cache/redis/index.md +++ b/docs/content/reference/resource-schema/cache/redis/index.md @@ -1,14 +1,14 @@ --- type: docs -title: "Redis cache link" +title: "Redis cache" linkTitle: "Redis" -description: "Learn how to use a Redis link in your application" +description: "Learn how to use a Redis cache in your application" categories: "Schema" --- ## Overview -The `redislabs.com/Redis` link is a [portable link]({{< ref portable-resources >}}) which can be deployed to any platform Radius supports. +The `redislabs.com/Redis` is a [resource]({{< ref portable-resources >}}) which can be deployed to any platform Radius supports. ## Resource format @@ -46,9 +46,9 @@ The `redislabs.com/Redis` link is a [portable link]({{< ref portable-resources > | port | n | The Redis port value. | `6379` | [resourceProvisioning](#resource-provisioning) | n | Specifies how the underlying service/resource is provisioned and managed. Options are to provision automatically via 'recipe' or provision manually via 'manual'. Selection determines which set of fields to additionally require. Defaults to 'recipe'. | `manual` | [recipe](#recipe) | n | Configuration for the Recipe which will deploy the backing infrastructure. | [See below](#recipe) -| [resources](#resources) | n | An array of IDs of the underlying resources for the link. | [See below](#resources) +| [resources](#resources) | n | An array of IDs of the underlying resources. | [See below](#resources) | username | n | The username for Redis cache. | `myusername` -| [secrets](#secrets) | n | Secrets used when building the link from values. | [See below](#secrets) +| [secrets](#secrets) | n | Secrets used when building the resource from values. | [See below](#secrets) | tls | n | Indicates if the Redis cache is configured with SSL connections. If the `port` value is set to 6380 this defaults to `true`. Otherwise it is defaulted to false. If your Redis cache offers SSL connections on ports other than 6380, explicitly set this value to `true` to override the default behavior. | `true` #### Recipe @@ -74,7 +74,7 @@ The `redislabs.com/Redis` link is a [portable link]({{< ref portable-resources > ### Methods -The following methods are available on the Redis link: +The following methods are available on the Redis cache: | Method | Description | |--------|-------------| diff --git a/docs/content/reference/resource-schema/link-schema/cache/redis/snippets/redis-manual.bicep b/docs/content/reference/resource-schema/cache/redis/snippets/redis-manual.bicep similarity index 89% rename from docs/content/reference/resource-schema/link-schema/cache/redis/snippets/redis-manual.bicep rename to docs/content/reference/resource-schema/cache/redis/snippets/redis-manual.bicep index 0bd1cb016..d0853fa41 100644 --- a/docs/content/reference/resource-schema/link-schema/cache/redis/snippets/redis-manual.bicep +++ b/docs/content/reference/resource-schema/cache/redis/snippets/redis-manual.bicep @@ -15,7 +15,7 @@ resource azureRedis 'Microsoft.Cache/redis@2022-06-01' existing = { } //REDIS -resource redis 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { +resource redis 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { name: 'redis' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/cache/redis/snippets/redis-recipe.bicep b/docs/content/reference/resource-schema/cache/redis/snippets/redis-recipe.bicep similarity index 87% rename from docs/content/reference/resource-schema/link-schema/cache/redis/snippets/redis-recipe.bicep rename to docs/content/reference/resource-schema/cache/redis/snippets/redis-recipe.bicep index 15b23a228..9f7379de9 100644 --- a/docs/content/reference/resource-schema/link-schema/cache/redis/snippets/redis-recipe.bicep +++ b/docs/content/reference/resource-schema/cache/redis/snippets/redis-recipe.bicep @@ -11,7 +11,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } //REDIS -resource redis 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { +resource redis 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { name: 'redis' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/core-schema/container-schema/_index.md b/docs/content/reference/resource-schema/core-schema/container-schema/_index.md index c0a1fab11..3891ba2b1 100644 --- a/docs/content/reference/resource-schema/core-schema/container-schema/_index.md +++ b/docs/content/reference/resource-schema/core-schema/container-schema/_index.md @@ -94,7 +94,7 @@ The ports offered by the container are defined in the `ports` section. | Key | Required | Description | Example | |------|:--------:|-------------|---------| | name | y | A name key for the port. | `inventory` -| source | y | The id of the link or resource the container is connecting to. | `db.id` +| source | y | The id of the resource the container is connecting to. | `db.id` | [iam](#iam) | n | Identity and access management (IAM) roles to set on the target resource. | [See below](#iam) #### IAM diff --git a/docs/content/reference/resource-schema/core-schema/container-schema/snippets/container.bicep b/docs/content/reference/resource-schema/core-schema/container-schema/snippets/container.bicep index d26bb04f4..c8f998a42 100644 --- a/docs/content/reference/resource-schema/core-schema/container-schema/snippets/container.bicep +++ b/docs/content/reference/resource-schema/core-schema/container-schema/snippets/container.bicep @@ -106,7 +106,7 @@ resource http 'Applications.Core/httpRoutes@2022-03-15-privatepreview' = { } } -resource db 'Applications.Link/mongoDatabases@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/mongoDatabases@2022-03-15-privatepreview' = { name: 'database' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/core-schema/environment-schema/index.md b/docs/content/reference/resource-schema/core-schema/environment-schema/index.md index d75e15f21..924ef1333 100644 --- a/docs/content/reference/resource-schema/core-schema/environment-schema/index.md +++ b/docs/content/reference/resource-schema/core-schema/environment-schema/index.md @@ -47,7 +47,7 @@ Details on what to run and how to run it are defined in the `container` property | Key | Required | Description | Example | |------|:--------:|-------------|---------| -| \ | y | The type of resource to register Recipes for. | `'Applications.Link/redisCaches'` +| \ | y | The type of resource to register Recipes for. | `'Applications.Datastores/redisCaches'` | recipes | y | The list of Recipes registered to a given resource type | [See below](#recipe-properties) #### recipe properties diff --git a/docs/content/reference/resource-schema/link-schema/extender/_index.md b/docs/content/reference/resource-schema/core-schema/extender/_index.md similarity index 90% rename from docs/content/reference/resource-schema/link-schema/extender/_index.md rename to docs/content/reference/resource-schema/core-schema/extender/_index.md index 41399ae7f..996b9a61c 100644 --- a/docs/content/reference/resource-schema/link-schema/extender/_index.md +++ b/docs/content/reference/resource-schema/core-schema/extender/_index.md @@ -43,7 +43,7 @@ An extender resource could be used to bring in a custom resource into Radius for |------|:--------:|-------------|---------| | \ | n | User-defined properties of the extender. Can accept any key name except 'secrets'. | `fromNumber: '222-222-2222'` | secrets | n | Secrets in the form of key-value pairs | `password: '******'` -| resourceProvisioning | n | Specifies how to build the Link resource. Options are to build automatically via 'recipe' or build manually via 'manual'. Selection determines which set of fields to additionally require. | `manual` +| resourceProvisioning | n | Specifies how to build the resource. Options are to build automatically via 'recipe' or build manually via 'manual'. Selection determines which set of fields to additionally require. | `manual` | [recipe](#recipe) | n | The recipe to deploy. | [See below](#recipe) #### Recipe @@ -55,7 +55,7 @@ An extender resource could be used to bring in a custom resource into Radius for ## Methods -The following methods are available on the Extender link: +The following methods are available on the Extender resource: | Method | Description | |--------|-------------| diff --git a/docs/content/reference/resource-schema/link-schema/extender/snippets/extender-manual.bicep b/docs/content/reference/resource-schema/core-schema/extender/snippets/extender-manual.bicep similarity index 92% rename from docs/content/reference/resource-schema/link-schema/extender/snippets/extender-manual.bicep rename to docs/content/reference/resource-schema/core-schema/extender/snippets/extender-manual.bicep index 64f662c45..0f2550da3 100644 --- a/docs/content/reference/resource-schema/link-schema/extender/snippets/extender-manual.bicep +++ b/docs/content/reference/resource-schema/core-schema/extender/snippets/extender-manual.bicep @@ -10,7 +10,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } //EXTENDER -resource twilio 'Applications.Link/extenders@2022-03-15-privatepreview' = { +resource twilio 'Applications.Core/extenders@2022-03-15-privatepreview' = { name: 'twilio' properties: { application: app.id diff --git a/docs/content/reference/resource-schema/link-schema/extender/snippets/extender-recipe.bicep b/docs/content/reference/resource-schema/core-schema/extender/snippets/extender-recipe.bicep similarity index 91% rename from docs/content/reference/resource-schema/link-schema/extender/snippets/extender-recipe.bicep rename to docs/content/reference/resource-schema/core-schema/extender/snippets/extender-recipe.bicep index a9e523791..a6f68c6e0 100644 --- a/docs/content/reference/resource-schema/link-schema/extender/snippets/extender-recipe.bicep +++ b/docs/content/reference/resource-schema/core-schema/extender/snippets/extender-recipe.bicep @@ -4,7 +4,7 @@ param application string param environment string // EXTENDER -resource twilio 'Applications.Link/extenders@2022-03-15-privatepreview' = { +resource twilio 'Applications.Core/extenders@2022-03-15-privatepreview' = { name: 'twilio' properties: { application: application diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/_index.md b/docs/content/reference/resource-schema/dapr-schema/_index.md similarity index 52% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/_index.md rename to docs/content/reference/resource-schema/dapr-schema/_index.md index f5b91108c..48933a544 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/_index.md +++ b/docs/content/reference/resource-schema/dapr-schema/_index.md @@ -2,7 +2,7 @@ type: docs title: "Dapr links" linkTitle: "Dapr" -description: "Learn what Dapr links are available in your application" +description: "Learn what Dapr resources are available in your application" weight: 600 slug: "dapr" --- diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-extension/index.md b/docs/content/reference/resource-schema/dapr-schema/dapr-extension/index.md similarity index 100% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-extension/index.md rename to docs/content/reference/resource-schema/dapr-schema/dapr-extension/index.md diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-extension/snippets/dapr.bicep b/docs/content/reference/resource-schema/dapr-schema/dapr-extension/snippets/dapr.bicep similarity index 100% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-extension/snippets/dapr.bicep rename to docs/content/reference/resource-schema/dapr-schema/dapr-extension/snippets/dapr.bicep diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-pubsub/_index.md b/docs/content/reference/resource-schema/dapr-schema/dapr-pubsub/_index.md similarity index 96% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-pubsub/_index.md rename to docs/content/reference/resource-schema/dapr-schema/dapr-pubsub/_index.md index c5aa2f5ea..6dbc681e9 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-pubsub/_index.md +++ b/docs/content/reference/resource-schema/dapr-schema/dapr-pubsub/_index.md @@ -9,7 +9,7 @@ slug: "pubsub" ## Overview -An `Applications.Link/daprPubSubBrokers` resource represents a [Dapr pub/sub](https://docs.dapr.io/developing-applications/building-blocks/pubsub/pubsub-overview/) message broker. +An `Applications.Dapr/pubSubBrokers` resource represents a [Dapr pub/sub](https://docs.dapr.io/developing-applications/building-blocks/pubsub/pubsub-overview/) message broker. ## Resource format diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-manual.bicep b/docs/content/reference/resource-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-manual.bicep similarity index 92% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-manual.bicep rename to docs/content/reference/resource-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-manual.bicep index b1963ac80..1d4599d8e 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-manual.bicep +++ b/docs/content/reference/resource-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-manual.bicep @@ -30,7 +30,7 @@ resource kafkaRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' exi } //SAMPLE -resource pubsub 'Applications.Link/daprPubSubBrokers@2022-03-15-privatepreview' = { +resource pubsub 'Applications.Dapr/pubSubBrokers@2022-03-15-privatepreview' = { name: 'pubsub' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-recipe.bicep b/docs/content/reference/resource-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-recipe.bicep similarity index 87% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-recipe.bicep rename to docs/content/reference/resource-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-recipe.bicep index 697aa3c0c..d9db05c45 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-recipe.bicep +++ b/docs/content/reference/resource-schema/dapr-schema/dapr-pubsub/snippets/dapr-pubsub-recipe.bicep @@ -11,7 +11,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } //SAMPLE -resource pubsub 'Applications.Link/daprPubSubBrokers@2022-03-15-privatepreview' = { +resource pubsub 'Applications.Dapr/pubSubBrokers@2022-03-15-privatepreview' = { name: 'pubsub' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-secretstore/_index.md b/docs/content/reference/resource-schema/dapr-schema/dapr-secretstore/_index.md similarity index 98% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-secretstore/_index.md rename to docs/content/reference/resource-schema/dapr-schema/dapr-secretstore/_index.md index 06434f8b1..a9a15567b 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-secretstore/_index.md +++ b/docs/content/reference/resource-schema/dapr-schema/dapr-secretstore/_index.md @@ -46,7 +46,7 @@ This resource will automatically create and deploy the Dapr component spec for t |------|:--------:|-------------|---------| | [resourceProvisioning](#resource-provisioning) | n | Specifies how the underlying service/resource is provisioned and managed. Options are to provision automatically via 'recipe' or provision manually via 'manual'. Selection determines which set of fields to additionally require. Defaults to 'recipe'. | `manual` | [recipe](#recipe) | n | Configuration for the Recipe which will deploy the backing infrastructure. | [See below](#recipe) -| [resources](#resources) | n | An array of IDs of the underlying resources for the link. | [See below](#resources) +| [resources](#resources) | n | An array of IDs of the underlying resources. | [See below](#resources) | type | n | The Dapr component type. Used when resourceProvisioning is `manual`. | `secretstores.azure.keyvault` | metadata | n | Metadata for the Dapr component. Schema must match [Dapr component](https://docs.dapr.io/reference/components-reference/supported-secret-stores/) | `vaultName: 'test'` | | version | n | The version of the Dapr component. See [Dapr components](https://docs.dapr.io/reference/components-reference/supported-secret-stores/) for available versions. | `v1` | diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-manual.bicep b/docs/content/reference/resource-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-manual.bicep similarity index 88% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-manual.bicep rename to docs/content/reference/resource-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-manual.bicep index 264a7cf1b..38cae4425 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-manual.bicep +++ b/docs/content/reference/resource-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-manual.bicep @@ -11,7 +11,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } //SAMPLE -resource secretstore 'Applications.Link/daprSecretStores@2022-03-15-privatepreview' = { +resource secretstore 'Applications.Dapr/secretStores@2022-03-15-privatepreview' = { name: 'secretstore-generic' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-recipe.bicep b/docs/content/reference/resource-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-recipe.bicep similarity index 87% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-recipe.bicep rename to docs/content/reference/resource-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-recipe.bicep index cf655a96b..4998b96a7 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-recipe.bicep +++ b/docs/content/reference/resource-schema/dapr-schema/dapr-secretstore/snippets/dapr-secretstore-recipe.bicep @@ -11,7 +11,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } //SAMPLE -resource secretstore 'Applications.Link/daprSecretStores@2022-03-15-privatepreview' = { +resource secretstore 'Applications.Dapr/secretStores@2022-03-15-privatepreview' = { name: 'secretstore-generic' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-statestore/_index.md b/docs/content/reference/resource-schema/dapr-schema/dapr-statestore/_index.md similarity index 95% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-statestore/_index.md rename to docs/content/reference/resource-schema/dapr-schema/dapr-statestore/_index.md index 62d6c9dd7..543efe033 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-statestore/_index.md +++ b/docs/content/reference/resource-schema/dapr-schema/dapr-statestore/_index.md @@ -10,7 +10,7 @@ categories: "Schema" ## Overview -A `Applications.Link/daprStateStores` resource represents a [Dapr state store](https://docs.dapr.io/developing-applications/building-blocks/state-management/) topic. +A `Applications.Dapr/stateStores` resource represents a [Dapr state store](https://docs.dapr.io/developing-applications/building-blocks/state-management/) topic. This resource will automatically create and deploy the Dapr component spec for the state store. @@ -48,7 +48,7 @@ This resource will automatically create and deploy the Dapr component spec for t | environment | y | The ID of the environment resource this resource belongs to. | `env.id` | [resourceProvisioning](#resource-provisioning) | n | Specifies how the underlying service/resource is provisioned and managed. Options are to provision automatically via 'recipe' or provision manually via 'manual'. Selection determines which set of fields to additionally require. Defaults to 'recipe'. | `manual` | [recipe](#recipe) | n | Configuration for the Recipe which will deploy the backing infrastructure. | [See below](#recipe) -| [resources](#resources) | n | An array of IDs of the underlying resources for the link. | [See below](#resources) +| [resources](#resources) | n | An array of IDs of the underlying resources. | [See below](#resources) | type | n | The Dapr component type. Used when `resourceProvisioning` is set to `manual`. | `state.couchbase` | metadata | n | Metadata for the Dapr component. Schema must match [Dapr component](https://docs.dapr.io/reference/components-reference/supported-state-stores/). Used when `resourceProvisioning` is set to `manual`. | `couchbaseURL: https://*****` | | version | n | The version of the Dapr component. See [Dapr components](https://docs.dapr.io/reference/components-reference/supported-state-stores/) for available versions. Used when `resourceProvisioning` is set to `manual`. | `v1` | diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-manual.bicep b/docs/content/reference/resource-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-manual.bicep similarity index 91% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-manual.bicep rename to docs/content/reference/resource-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-manual.bicep index 4ca76c6d6..032e90d20 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-manual.bicep +++ b/docs/content/reference/resource-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-manual.bicep @@ -7,7 +7,7 @@ param application string param environment string //SAMPLE -resource statestore 'Applications.Link/daprStateStores@2022-03-15-privatepreview' = { +resource statestore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { name: 'statestore' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-recipe.bicep b/docs/content/reference/resource-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-recipe.bicep similarity index 91% rename from docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-recipe.bicep rename to docs/content/reference/resource-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-recipe.bicep index a999e1000..6cfdc8f8c 100644 --- a/docs/content/reference/resource-schema/link-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-recipe.bicep +++ b/docs/content/reference/resource-schema/dapr-schema/dapr-statestore/snippets/dapr-statestore-recipe.bicep @@ -28,7 +28,7 @@ resource myapp 'Applications.Core/containers@2022-03-15-privatepreview' = { } //SAMPLE -resource statestore 'Applications.Link/daprStateStores@2022-03-15-privatepreview' = { +resource statestore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { name: 'statestore' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/databases/_index.md b/docs/content/reference/resource-schema/databases/_index.md new file mode 100644 index 000000000..b78dfcb05 --- /dev/null +++ b/docs/content/reference/resource-schema/databases/_index.md @@ -0,0 +1,7 @@ +--- +type: docs +title: "Database links" +linkTitle: "Databases" +description: "Learn what database resources are available in your application" +weight: 200 +--- diff --git a/docs/content/reference/resource-schema/link-schema/databases/microsoft-sql/index.md b/docs/content/reference/resource-schema/databases/microsoft-sql/index.md similarity index 95% rename from docs/content/reference/resource-schema/link-schema/databases/microsoft-sql/index.md rename to docs/content/reference/resource-schema/databases/microsoft-sql/index.md index 844f4fdeb..13fbb5551 100644 --- a/docs/content/reference/resource-schema/link-schema/databases/microsoft-sql/index.md +++ b/docs/content/reference/resource-schema/databases/microsoft-sql/index.md @@ -8,7 +8,7 @@ categories: "Schema" --- ## Overview -This application showcases how Radius can use a user-manged Azure SQL Database. +This application showcases how Radius can use a user-managed Azure SQL Database. ## Resource format @@ -44,12 +44,12 @@ This application showcases how Radius can use a user-manged Azure SQL Database. | environment | y | The ID of the environment resource this resource belongs to. | `env.id` | [resourceProvisioning](#resource-provisioning) | n | Specifies how the underlying service/resource is provisioned and managed. Options are to provision automatically via 'recipe' or provision manually via 'manual'. Selection determines which set of fields to additionally require. Defaults to 'recipe'. | `manual` | [recipe](#recipe) | n | Configuration for the Recipe which will deploy the backing infrastructure. | [See below](#recipe) -| [resources](#resources) | n | An array of IDs of the underlying resources for the link. | [See below](#resources) +| [resources](#resources) | n | An array of IDs of the underlying resources. | [See below](#resources) | server | n | The fully qualified domain name of the SQL server. | `mydatabase.database.windows.net` | database | n | The name of the SQL database. | `mydatabase` | port | n | The SQL database port. | `1433` | username | n | The username for the SQL database. | `'myusername'` -| [secrets](#secrets) | n | Secrets used when building the link from values. | [See below](#secrets) +| [secrets](#secrets) | n | Secrets used when building the resource from values. | [See below](#secrets) ### Secrets diff --git a/docs/content/reference/resource-schema/link-schema/databases/microsoft-sql/snippets/sql-manual.bicep b/docs/content/reference/resource-schema/databases/microsoft-sql/snippets/sql-manual.bicep similarity index 93% rename from docs/content/reference/resource-schema/link-schema/databases/microsoft-sql/snippets/sql-manual.bicep rename to docs/content/reference/resource-schema/databases/microsoft-sql/snippets/sql-manual.bicep index c6fc7ea8d..cceece40f 100644 --- a/docs/content/reference/resource-schema/link-schema/databases/microsoft-sql/snippets/sql-manual.bicep +++ b/docs/content/reference/resource-schema/databases/microsoft-sql/snippets/sql-manual.bicep @@ -23,7 +23,7 @@ resource sqldb 'Microsoft.Sql/servers@2021-02-01-preview' existing = { } //SQL -resource db 'Applications.Link/sqlDatabases@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { name: 'db' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/databases/microsoft-sql/snippets/sql-recipe.bicep b/docs/content/reference/resource-schema/databases/microsoft-sql/snippets/sql-recipe.bicep similarity index 88% rename from docs/content/reference/resource-schema/link-schema/databases/microsoft-sql/snippets/sql-recipe.bicep rename to docs/content/reference/resource-schema/databases/microsoft-sql/snippets/sql-recipe.bicep index dea3c1be9..1141af8dc 100644 --- a/docs/content/reference/resource-schema/link-schema/databases/microsoft-sql/snippets/sql-recipe.bicep +++ b/docs/content/reference/resource-schema/databases/microsoft-sql/snippets/sql-recipe.bicep @@ -11,7 +11,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } //SQL -resource db 'Applications.Link/sqlDatabases@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { name: 'db' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/databases/mongodb/index.md b/docs/content/reference/resource-schema/databases/mongodb/index.md similarity index 92% rename from docs/content/reference/resource-schema/link-schema/databases/mongodb/index.md rename to docs/content/reference/resource-schema/databases/mongodb/index.md index d108b9282..76a44e7bc 100644 --- a/docs/content/reference/resource-schema/link-schema/databases/mongodb/index.md +++ b/docs/content/reference/resource-schema/databases/mongodb/index.md @@ -1,13 +1,13 @@ --- type: docs -title: "MongoDB database link" +title: "MongoDB database" linkTitle: "MongoDB" -description: "Learn how to use a MongoDB link in your application" +description: "Learn how to use a Mongo database in your application" --- ## Overview -The `mongodb.com/MongoDatabase` link is a [portable link]({{< ref portable-resources >}}) which represents a Mongo Database. +The `mongodb.com/MongoDatabase` [resource]({{< ref portable-resources >}}) represents a Mongo database. ## Resource format @@ -48,7 +48,7 @@ The `mongodb.com/MongoDatabase` link is a [portable link]({{< ref portable-resou | host | n | The MongoDB host name. | `mongodb0.example.com` | port | n | The MongoDB port. | `4242` | username | n | The username for the MongoDB. | `'myusername'` -| [secrets](#secrets) | n | Secrets used when building the link from values. | [See below](#secrets) +| [secrets](#secrets) | n | Secrets used when building the resource from values. | [See below](#secrets) #### Recipe @@ -72,7 +72,7 @@ The `mongodb.com/MongoDatabase` link is a [portable link]({{< ref portable-resou ### Methods -The following methods are available on the MongoDB link: +The following methods are available on the Mongo database resource: | Method | Description | |--------|-------------| diff --git a/docs/content/reference/resource-schema/link-schema/databases/mongodb/snippets/mongo-manual.bicep b/docs/content/reference/resource-schema/databases/mongodb/snippets/mongo-manual.bicep similarity index 93% rename from docs/content/reference/resource-schema/link-schema/databases/mongodb/snippets/mongo-manual.bicep rename to docs/content/reference/resource-schema/databases/mongodb/snippets/mongo-manual.bicep index ffdb1d359..3d7c65c6f 100644 --- a/docs/content/reference/resource-schema/link-schema/databases/mongodb/snippets/mongo-manual.bicep +++ b/docs/content/reference/resource-schema/databases/mongodb/snippets/mongo-manual.bicep @@ -20,7 +20,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } //MONGO -resource db 'Applications.Link/mongoDatabases@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/mongoDatabases@2022-03-15-privatepreview' = { name: 'db' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/databases/mongodb/snippets/mongo-recipe.bicep b/docs/content/reference/resource-schema/databases/mongodb/snippets/mongo-recipe.bicep similarity index 87% rename from docs/content/reference/resource-schema/link-schema/databases/mongodb/snippets/mongo-recipe.bicep rename to docs/content/reference/resource-schema/databases/mongodb/snippets/mongo-recipe.bicep index 89eb310c7..9171be17e 100644 --- a/docs/content/reference/resource-schema/link-schema/databases/mongodb/snippets/mongo-recipe.bicep +++ b/docs/content/reference/resource-schema/databases/mongodb/snippets/mongo-recipe.bicep @@ -11,7 +11,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } //MONGO -resource db 'Applications.Link/mongoDatabases@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/mongoDatabases@2022-03-15-privatepreview' = { name: 'db' properties: { environment: environment @@ -26,4 +26,4 @@ resource db 'Applications.Link/mongoDatabases@2022-03-15-privatepreview' = { } } } -//MONGO \ No newline at end of file +//MONGO diff --git a/docs/content/reference/resource-schema/link-schema/_index.md b/docs/content/reference/resource-schema/link-schema/_index.md deleted file mode 100644 index b864eb3b2..000000000 --- a/docs/content/reference/resource-schema/link-schema/_index.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -type: docs -title: "Link resource schemas" -linkTitle: "Links" -description: "Reference the schemas of the Radius link resources" -weight: 200 ---- - -## Link resource types diff --git a/docs/content/reference/resource-schema/link-schema/databases/_index.md b/docs/content/reference/resource-schema/link-schema/databases/_index.md deleted file mode 100644 index b9a0aa41d..000000000 --- a/docs/content/reference/resource-schema/link-schema/databases/_index.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -type: docs -title: "Database links" -linkTitle: "Databases" -description: "Learn what database links are available in your application" -weight: 200 ---- diff --git a/docs/content/reference/resource-schema/link-schema/messaging/_index.md b/docs/content/reference/resource-schema/link-schema/messaging/_index.md deleted file mode 100644 index 2ceda91ce..000000000 --- a/docs/content/reference/resource-schema/link-schema/messaging/_index.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -type: docs -title: "Messaging links" -linkTitle: "Messaging" -description: "Learn what messaging links are available in your application" -weight: 400 ---- diff --git a/docs/content/reference/resource-schema/messaging/_index.md b/docs/content/reference/resource-schema/messaging/_index.md new file mode 100644 index 000000000..7a75d04bf --- /dev/null +++ b/docs/content/reference/resource-schema/messaging/_index.md @@ -0,0 +1,7 @@ +--- +type: docs +title: "Messaging" +linkTitle: "Messaging" +description: "Learn what messaging resources are available in your application" +weight: 400 +--- diff --git a/docs/content/reference/resource-schema/link-schema/messaging/rabbitmq/index.md b/docs/content/reference/resource-schema/messaging/rabbitmq/index.md similarity index 93% rename from docs/content/reference/resource-schema/link-schema/messaging/rabbitmq/index.md rename to docs/content/reference/resource-schema/messaging/rabbitmq/index.md index 6d8454bff..fb2516153 100644 --- a/docs/content/reference/resource-schema/link-schema/messaging/rabbitmq/index.md +++ b/docs/content/reference/resource-schema/messaging/rabbitmq/index.md @@ -1,14 +1,14 @@ --- type: docs -title: "RabbitMQ message broker link" +title: "RabbitMQ message broker" linkTitle: "RabbitMQ" -description: "Learn how to use a RabbitMQ link in your application" +description: "Learn how to use a RabbitMQ resource in your application" categories: "Schema" --- ## Overview -The `rabbitmq.com/MessageQueue` link offers a [RabbitMQ message broker](https://www.rabbitmq.com/). +The `rabbitmq.com/MessageQueue` resource offers a [RabbitMQ message broker](https://www.rabbitmq.com/). ## Resource format @@ -49,7 +49,7 @@ The `rabbitmq.com/MessageQueue` link offers a [RabbitMQ message broker](https:// | tls | n | Specifies whether to use SSL when connecting to the RabbitMQ instance. | `tls` | username | n | Username to use when connecting to the target rabbitMQ. | `'myusername'` | [recipe](#recipe) | n | Configuration for the Recipe which will deploy the backing infrastructure. | [See below](#recipe) -| [resources](#resources) | n | An array of IDs of the underlying resources for the link. | [See below](#resources) +| [resources](#resources) | n | An array of IDs of the underlying resources. | [See below](#resources) | queue | y | The name of the queue. | `'orders'` | | [secrets](#secrets) | y | Configuration used to manually specify a RabbitMQ container or other service providing a RabbitMQ Queue. | See [secrets](#secrets) below. @@ -68,7 +68,7 @@ The `rabbitmq.com/MessageQueue` link offers a [RabbitMQ message broker](https:// #### Secrets -Secrets are used when defining a RabbitMQ link with a container or external service. +Secrets are used when defining a RabbitMQ resource with a container or external service. | Property | Description | Example | |----------|-------------|---------| diff --git a/docs/content/reference/resource-schema/link-schema/messaging/rabbitmq/snippets/rabbitmq-manual.bicep b/docs/content/reference/resource-schema/messaging/rabbitmq/snippets/rabbitmq-manual.bicep similarity index 88% rename from docs/content/reference/resource-schema/link-schema/messaging/rabbitmq/snippets/rabbitmq-manual.bicep rename to docs/content/reference/resource-schema/messaging/rabbitmq/snippets/rabbitmq-manual.bicep index dc060fd5b..2a596d8cb 100644 --- a/docs/content/reference/resource-schema/link-schema/messaging/rabbitmq/snippets/rabbitmq-manual.bicep +++ b/docs/content/reference/resource-schema/messaging/rabbitmq/snippets/rabbitmq-manual.bicep @@ -18,7 +18,7 @@ param rmqHost string param rmqPort int param vHost string -resource rabbitmq 'Applications.Link/rabbitmqMessageQueues@2022-03-15-privatepreview' = { +resource rabbitmq 'Applications.Messaging/rabbitmqQueues@2022-03-15-privatepreview' = { name: 'rabbitmq' properties: { environment: environment diff --git a/docs/content/reference/resource-schema/link-schema/messaging/rabbitmq/snippets/rabbitmq-recipe.bicep b/docs/content/reference/resource-schema/messaging/rabbitmq/snippets/rabbitmq-recipe.bicep similarity index 87% rename from docs/content/reference/resource-schema/link-schema/messaging/rabbitmq/snippets/rabbitmq-recipe.bicep rename to docs/content/reference/resource-schema/messaging/rabbitmq/snippets/rabbitmq-recipe.bicep index a2005f85c..bf7ed0103 100644 --- a/docs/content/reference/resource-schema/link-schema/messaging/rabbitmq/snippets/rabbitmq-recipe.bicep +++ b/docs/content/reference/resource-schema/messaging/rabbitmq/snippets/rabbitmq-recipe.bicep @@ -11,7 +11,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } //SAMPLE -resource rabbitmq 'Applications.Link/rabbitmqMessageQueues@2022-03-15-privatepreview' = { +resource rabbitmq 'Applications.Messaging/rabbitmqQueues@2022-03-15-privatepreview' = { name: 'rabbitmq' properties: { environment: environment diff --git a/docs/content/tutorials/tutorial-dapr/index.md b/docs/content/tutorials/tutorial-dapr/index.md index a41d815c5..50c625b51 100644 --- a/docs/content/tutorials/tutorial-dapr/index.md +++ b/docs/content/tutorials/tutorial-dapr/index.md @@ -47,7 +47,7 @@ Begin by creating a new file named `dapr.bicep` with a Radius application that c Resources: dapr Applications.Core/applications backend Applications.Core/containers - statestore Applications.Link/daprStateStores + statestore Applications.Dapr/stateStores ``` 1. The `rad run` command automatically sets up port forwarding. Visit the the URL [http://localhost:3000/order](http://localhost:3000/order) in your browser. You should see the following message, which confirms the container is able to communicate with the state store: @@ -94,7 +94,7 @@ Add a `frontend` [container]({{< ref "guides/author-apps/containers" >}}) which dapr Applications.Core/applications backend Applications.Core/containers frontend Applications.Core/containers - statestore Applications.Link/daprStateStores + statestore Applications.Dapr/stateStores ``` ## Step 5. Test your application diff --git a/docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep b/docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep index 0b8f77cda..f970dcc1c 100644 --- a/docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep +++ b/docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep @@ -41,7 +41,7 @@ resource backend 'Applications.Core/containers@2022-03-15-privatepreview' = { } // The Dapr state store that is connected to the backend container -resource stateStore 'Applications.Link/daprStateStores@2022-03-15-privatepreview' = { +resource stateStore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { name: 'statestore' properties: { // Provision Redis Dapr state store automatically via the default Radius Recipe diff --git a/docs/content/tutorials/tutorial-recipe/index.md b/docs/content/tutorials/tutorial-recipe/index.md index 34cab973a..1c3e274cc 100644 --- a/docs/content/tutorials/tutorial-recipe/index.md +++ b/docs/content/tutorials/tutorial-recipe/index.md @@ -61,7 +61,7 @@ Developers don't need to specify what cloud resources they're using in their app ``` NAME TYPE TEMPLATE - default Applications.Link/redisCaches radius.azurecr.io/recipes/dev/rediscaches:v0.21 + default Applications.Datastores/redisCaches radius.azurecr.io/recipes/dev/rediscaches:v0.21 ``` {{< alert title="💡 Dev Recipes" color="info" >}} @@ -95,7 +95,7 @@ Note that no Recipe name is specified with 'db', so it will be using the default Deployment In Progress... - Completed db Applications.Link/redisCaches + Completed db Applications.Datastores/redisCaches Completed webapp Applications.Core/applications Completed frontend Applications.Core/containers @@ -104,7 +104,7 @@ Note that no Recipe name is specified with 'db', so it will be using the default Resources: webapp Applications.Core/applications frontend Applications.Core/containers - db Applications.Link/redisCaches + db Applications.Datastores/redisCaches ``` Your application is now deployed and running in your Kubernetes cluster. @@ -153,7 +153,7 @@ This step requires an Azure subscription to deploy cloud resources, which will i 2. Register the Recipe to your Radius Environment: ```bash - rad recipe register azure --environment default --template-kind bicep --template-path radius.azurecr.io/recipes/azure/rediscaches:{{< param tag_version >}} --link-type Applications.Link/redisCaches + rad recipe register azure --environment default --template-kind bicep --template-path radius.azurecr.io/recipes/azure/rediscaches:{{< param tag_version >}} --link-type Applications.Datastores/redisCaches ``` 3. Update your db resource to use the `azure` Recipe, instead of the default Recipe: @@ -175,7 +175,7 @@ This step requires an Azure subscription to deploy cloud resources, which will i Deployment In Progress... Completed webapp Applications.Core/applications - Completed db Applications.Link/redisCaches + Completed db Applications.Datastores/redisCaches Completed frontend Applications.Core/containers Deployment Complete @@ -183,7 +183,7 @@ This step requires an Azure subscription to deploy cloud resources, which will i Resources: webapp Applications.Core/applications frontend Applications.Core/containers - db Applications.Link/redisCaches + db Applications.Datastores/redisCaches ``` {{% /codetab %}} diff --git a/docs/content/tutorials/tutorial-recipe/snippets/app-azure.bicep b/docs/content/tutorials/tutorial-recipe/snippets/app-azure.bicep index c82197dc4..64aa17028 100644 --- a/docs/content/tutorials/tutorial-recipe/snippets/app-azure.bicep +++ b/docs/content/tutorials/tutorial-recipe/snippets/app-azure.bicep @@ -7,7 +7,7 @@ param environment string param application string //DB -resource db 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { name: 'db' properties: { environment: environment diff --git a/docs/content/tutorials/tutorial-recipe/snippets/app.bicep b/docs/content/tutorials/tutorial-recipe/snippets/app.bicep index 44e476e5f..1b74d8aa1 100644 --- a/docs/content/tutorials/tutorial-recipe/snippets/app.bicep +++ b/docs/content/tutorials/tutorial-recipe/snippets/app.bicep @@ -23,7 +23,7 @@ resource frontend 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource db 'Applications.Link/redisCaches@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { name: 'db' properties: { environment: environment diff --git a/holding-pen/reference-apps/eshop-dapr/_index.md b/holding-pen/reference-apps/eshop-dapr/_index.md index 17e0564ce..8010f6e10 100644 --- a/holding-pen/reference-apps/eshop-dapr/_index.md +++ b/holding-pen/reference-apps/eshop-dapr/_index.md @@ -38,7 +38,7 @@ Radius allows the eShop on Dapr application to: - Define the entire collection of microservices, backing infrastructure, and connections as a single application in a single language. No more separate templating languages and scripts to glue it all together. - Easily manage configuration and credentials between infrastructure and services, all within the app model. No more manually copying/pasting connection strings or secrets. - Simplify deployment with Bicep and Azure Resource Manager (ARM). No more custom deployment scripts or workflows. -- Automatically generate and apply the backing Dapr component configurations from the resources or values provided within the Dapr building block link definitions. +- Automatically generate and apply the backing Dapr component configurations from the resources or values provided within the Dapr building block resource definitions. {{< button text="View eShop reference app in samples" githubRepo="samples" githubPath="reference-apps/eshop-dapr" color="success" size="btn-lg" >}}