From 95c319d76cee2a2699c2bec12a9d043fbb0a9205 Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Wed, 20 Sep 2023 15:59:45 -0700 Subject: [PATCH 1/2] Update API version --- demo/app.bicep | 4 +- quickstarts/dapr/dapr-azure.bicep | 12 +++--- quickstarts/dapr/dapr.bicep | 12 +++--- quickstarts/environment-variables/app.bicep | 6 +-- quickstarts/recipes/app.bicep | 6 +-- quickstarts/volumes/app.bicep | 4 +- reference-apps/aws-sqs/sqs.bicep | 6 +-- reference-apps/aws/awss3.bicep | 4 +- .../container-app-store/iac/app.bicep | 12 +++--- .../container-app-store/iac/infra-azure.bicep | 2 +- .../iac/infra-selfhosted.bicep | 6 +-- .../eshop-dapr/infra/dapr-pub-sub.bicep | 2 +- .../eshop-dapr/infra/dapr-secret-store.bicep | 2 +- .../eshop-dapr/infra/dapr-state-store.bicep | 2 +- reference-apps/eshop-dapr/infra/gateway.bicep | 12 +++--- .../eshop-dapr/infra/http-routes.bicep | 20 ++++----- .../eshop-dapr/infra/sql-server.bicep | 6 +-- reference-apps/eshop-dapr/main.bicep | 4 +- .../eshop-dapr/services/basket-api.bicep | 14 +++---- .../eshop-dapr/services/blazor-client.bicep | 8 ++-- .../eshop-dapr/services/catalog-api.bicep | 12 +++--- .../eshop-dapr/services/identity-api.bicep | 12 +++--- .../eshop-dapr/services/ordering-api.bicep | 16 +++---- .../eshop-dapr/services/payment-api.bicep | 8 ++-- reference-apps/eshop-dapr/services/seq.bicep | 4 +- .../eshop-dapr/services/webshopping-agg.bicep | 10 ++--- .../eshop-dapr/services/webshopping-gw.bicep | 8 ++-- .../eshop-dapr/services/webstatus.bicep | 6 +-- reference-apps/eshop/iac/eshop.bicep | 2 +- reference-apps/eshop/iac/infra/aws.bicep | 18 ++++---- reference-apps/eshop/iac/infra/azure.bicep | 14 +++---- .../eshop/iac/infra/containers.bicep | 42 +++++++++---------- reference-apps/eshop/iac/infra/links.bicep | 14 +++---- .../eshop/iac/services/basket.bicep | 14 +++---- .../eshop/iac/services/catalog.bicep | 12 +++--- .../eshop/iac/services/identity.bicep | 22 +++++----- .../eshop/iac/services/networking.bicep | 40 +++++++++--------- .../eshop/iac/services/ordering.bicep | 28 ++++++------- .../eshop/iac/services/payment.bicep | 6 +-- reference-apps/eshop/iac/services/seq.bicep | 4 +- reference-apps/eshop/iac/services/web.bicep | 20 ++++----- .../eshop/iac/services/webhooks.bicep | 16 +++---- .../eshop/iac/services/webshopping.bicep | 30 ++++++------- .../eshop/iac/services/webstatus.bicep | 24 +++++------ samples.sln | 42 +++++++++++++++++++ 45 files changed, 305 insertions(+), 263 deletions(-) create mode 100644 samples.sln diff --git a/demo/app.bicep b/demo/app.bicep index 5b7389ed..6533225f 100644 --- a/demo/app.bicep +++ b/demo/app.bicep @@ -3,7 +3,7 @@ import radius as radius param application string param environment string -resource demo 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource demo 'Applications.Core/containers@2023-10-01-preview' = { name: 'demo' properties: { application: application @@ -29,7 +29,7 @@ resource demo 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource db 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/redisCaches@2023-10-01-preview' = { name: 'db' properties: { application: application diff --git a/quickstarts/dapr/dapr-azure.bicep b/quickstarts/dapr/dapr-azure.bicep index e521d764..01054810 100644 --- a/quickstarts/dapr/dapr-azure.bicep +++ b/quickstarts/dapr/dapr-azure.bicep @@ -3,14 +3,14 @@ import radius as radius param location string = resourceGroup().location param environment string -resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource app 'Applications.Core/applications@2023-10-01-preview' = { name: 'dapr-quickstart' properties: { environment: environment } } -resource backend 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource backend 'Applications.Core/containers@2023-10-01-preview' = { name: 'backend' properties: { application: app.id @@ -37,7 +37,7 @@ resource backend 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource frontend 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource frontend 'Applications.Core/containers@2023-10-01-preview' = { name: 'frontend' properties: { application: app.id @@ -62,14 +62,14 @@ resource frontend 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource frontendRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' = { +resource frontendRoute 'Applications.Core/httpRoutes@2023-10-01-preview' = { name: 'frontend-route' properties: { application: app.id } } -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' = { name: 'gateway' properties: { application: app.id @@ -102,7 +102,7 @@ resource account 'Microsoft.Storage/storageAccounts@2019-06-01' = { } } -resource stateStore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { +resource stateStore 'Applications.Dapr/stateStores@2023-10-01-preview' = { name: 'orders' properties: { environment: environment diff --git a/quickstarts/dapr/dapr.bicep b/quickstarts/dapr/dapr.bicep index 19a6646b..19d0f8d2 100644 --- a/quickstarts/dapr/dapr.bicep +++ b/quickstarts/dapr/dapr.bicep @@ -6,14 +6,14 @@ param environment string @description('Specifies Kubernetes namespace for redis.') param namespace string = 'default' -resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource app 'Applications.Core/applications@2023-10-01-preview' = { name: 'dapr-quickstart' properties: { environment: environment } } -resource backend 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource backend 'Applications.Core/containers@2023-10-01-preview' = { name: 'backend' properties: { application: app.id @@ -40,7 +40,7 @@ resource backend 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource frontend 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource frontend 'Applications.Core/containers@2023-10-01-preview' = { name: 'frontend' properties: { application: app.id @@ -65,14 +65,14 @@ resource frontend 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource frontendRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' = { +resource frontendRoute 'Applications.Core/httpRoutes@2023-10-01-preview' = { name: 'frontend-route' properties: { application: app.id } } -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' = { name: 'gateway' properties: { application: app.id @@ -85,7 +85,7 @@ resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' = { } } -resource stateStore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { +resource stateStore 'Applications.Dapr/stateStores@2023-10-01-preview' = { name: 'statestore' properties: { environment: environment diff --git a/quickstarts/environment-variables/app.bicep b/quickstarts/environment-variables/app.bicep index eb473155..44918c10 100644 --- a/quickstarts/environment-variables/app.bicep +++ b/quickstarts/environment-variables/app.bicep @@ -2,14 +2,14 @@ import radius as rad param environment string -resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource app 'Applications.Core/applications@2023-10-01-preview' = { name: 'myapp' properties: { environment: environment } } -resource container 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource container 'Applications.Core/containers@2023-10-01-preview' = { name: 'mycontainer' properties: { application: app.id @@ -28,7 +28,7 @@ resource container 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource mongoLink 'Applications.Datastores/mongoDatabases@2022-03-15-privatepreview' = { +resource mongoLink 'Applications.Datastores/mongoDatabases@2023-10-01-preview' = { name: 'mongo-link' properties: { environment: environment diff --git a/quickstarts/recipes/app.bicep b/quickstarts/recipes/app.bicep index 8ec55aa6..a36c708b 100644 --- a/quickstarts/recipes/app.bicep +++ b/quickstarts/recipes/app.bicep @@ -4,14 +4,14 @@ import radius as radius // The environment used by your resources for deployment. param environment string -resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource app 'Applications.Core/applications@2023-10-01-preview' = { name: 'webapp' properties: { environment: environment } } -resource frontend 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource frontend 'Applications.Core/containers@2023-10-01-preview' = { name: 'frontend' properties: { application: app.id @@ -27,7 +27,7 @@ resource frontend 'Applications.Core/containers@2022-03-15-privatepreview' = { } // Redis Cache portable resource -resource db 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { +resource db 'Applications.Datastores/redisCaches@2023-10-01-preview' = { name: 'db' properties: { environment: environment diff --git a/quickstarts/volumes/app.bicep b/quickstarts/volumes/app.bicep index 7a05bec6..2ef6aaad 100644 --- a/quickstarts/volumes/app.bicep +++ b/quickstarts/volumes/app.bicep @@ -2,14 +2,14 @@ import radius as rad param environment string -resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource app 'Applications.Core/applications@2023-10-01-preview' = { name: 'myapp' properties: { environment: environment } } -resource container 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource container 'Applications.Core/containers@2023-10-01-preview' = { name: 'mycontainer' properties: { application: app.id diff --git a/reference-apps/aws-sqs/sqs.bicep b/reference-apps/aws-sqs/sqs.bicep index 62dd6a0f..f588fd3b 100644 --- a/reference-apps/aws-sqs/sqs.bicep +++ b/reference-apps/aws-sqs/sqs.bicep @@ -17,7 +17,7 @@ var aws_credential = { } var app_name = 'sqs-sample-app' -resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource app 'Applications.Core/applications@2023-10-01-preview' = { name: app_name properties: { environment: environment @@ -32,7 +32,7 @@ resource queue 'AWS.SQS/Queue@default' = { } } -resource producer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource producer 'Applications.Core/containers@2023-10-01-preview' = { name: 'producer' properties: { application: app.id @@ -49,7 +49,7 @@ resource producer 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource consumer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource consumer 'Applications.Core/containers@2023-10-01-preview' = { name: 'consumer' properties: { application: app.id diff --git a/reference-apps/aws/awss3.bicep b/reference-apps/aws/awss3.bicep index 39bb8ad0..6b2d8195 100644 --- a/reference-apps/aws/awss3.bicep +++ b/reference-apps/aws/awss3.bicep @@ -21,14 +21,14 @@ resource s3 'AWS.S3/Bucket@default' = { } // get a radius container which uses the s3 bucket -resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource app 'Applications.Core/applications@2023-10-01-preview' = { name: 'webapp' properties: { environment: environment } } -resource frontend 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource frontend 'Applications.Core/containers@2023-10-01-preview' = { name: 'frontend' properties: { application: app.id diff --git a/reference-apps/container-app-store/iac/app.bicep b/reference-apps/container-app-store/iac/app.bicep index 2c6839de..d7c325bf 100644 --- a/reference-apps/container-app-store/iac/app.bicep +++ b/reference-apps/container-app-store/iac/app.bicep @@ -2,14 +2,14 @@ import radius as radius param environment string -resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource app 'Applications.Core/applications@2023-10-01-preview' = { name: 'store' properties: { environment: environment } } -resource go_app 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource go_app 'Applications.Core/containers@2023-10-01-preview' = { name: 'goapp' properties: { application: app.id @@ -31,14 +31,14 @@ resource go_app 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource node_app_route 'Applications.Core/httpRoutes@2022-03-15-privatepreview' = { +resource node_app_route 'Applications.Core/httpRoutes@2023-10-01-preview' = { name: 'node-app-route' properties: { application: app.id } } -resource node_app_gateway 'Applications.Core/gateways@2022-03-15-privatepreview' = { +resource node_app_gateway 'Applications.Core/gateways@2023-10-01-preview' = { name: 'node-app-gateway' properties: { application: app.id @@ -50,7 +50,7 @@ resource node_app_gateway 'Applications.Core/gateways@2022-03-15-privatepreview' ] } } -resource node_app 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource node_app 'Applications.Core/containers@2023-10-01-preview' = { name: 'nodeapp' properties: { application: app.id @@ -76,7 +76,7 @@ resource node_app 'Applications.Core/containers@2022-03-15-privatepreview' = { } } -resource python_app 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource python_app 'Applications.Core/containers@2023-10-01-preview' = { name: 'pythonapp' properties: { application: app.id diff --git a/reference-apps/container-app-store/iac/infra-azure.bicep b/reference-apps/container-app-store/iac/infra-azure.bicep index 0bb9e530..94d54ad7 100644 --- a/reference-apps/container-app-store/iac/infra-azure.bicep +++ b/reference-apps/container-app-store/iac/infra-azure.bicep @@ -23,7 +23,7 @@ resource account 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } -resource statestore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { +resource statestore 'Applications.Dapr/stateStores@2023-10-01-preview' = { name: 'orders' properties: { application: applicationId diff --git a/reference-apps/container-app-store/iac/infra-selfhosted.bicep b/reference-apps/container-app-store/iac/infra-selfhosted.bicep index b72ae6e8..0c8431ac 100644 --- a/reference-apps/container-app-store/iac/infra-selfhosted.bicep +++ b/reference-apps/container-app-store/iac/infra-selfhosted.bicep @@ -4,7 +4,7 @@ param applicationId string param environment string -resource redisContainer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource redisContainer 'Applications.Core/containers@2023-10-01-preview' = { name: 'redis' properties: { application: applicationId @@ -20,7 +20,7 @@ resource redisContainer 'Applications.Core/containers@2022-03-15-privatepreview' } } -resource redisRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' = { +resource redisRoute 'Applications.Core/httpRoutes@2023-10-01-preview' = { name: 'redis-route' properties: { application: applicationId @@ -28,7 +28,7 @@ resource redisRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' = { } } -resource statestore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { +resource statestore 'Applications.Dapr/stateStores@2023-10-01-preview' = { name: 'orders' properties: { resourceProvisioning: 'manual' diff --git a/reference-apps/eshop-dapr/infra/dapr-pub-sub.bicep b/reference-apps/eshop-dapr/infra/dapr-pub-sub.bicep index facebab1..f2ffaeab 100644 --- a/reference-apps/eshop-dapr/infra/dapr-pub-sub.bicep +++ b/reference-apps/eshop-dapr/infra/dapr-pub-sub.bicep @@ -40,7 +40,7 @@ resource serviceBus 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' = { // Create the Dapr pub sub component //----------------------------------------------------------------------------- -resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2022-03-15-privatepreview' = { +resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2023-10-01-preview' = { name: 'eshopondapr-pubsub' location: 'global' properties: { diff --git a/reference-apps/eshop-dapr/infra/dapr-secret-store.bicep b/reference-apps/eshop-dapr/infra/dapr-secret-store.bicep index 2c87fc82..0d1645d7 100644 --- a/reference-apps/eshop-dapr/infra/dapr-secret-store.bicep +++ b/reference-apps/eshop-dapr/infra/dapr-secret-store.bicep @@ -46,7 +46,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2021-11-01-preview' = { // Create the Dapr secret store component //----------------------------------------------------------------------------- -resource daprSecretStore 'Applications.Dapr/secretStores@2022-03-15-privatepreview' = { +resource daprSecretStore 'Applications.Dapr/secretStores@2023-10-01-preview' = { name: 'eshopondapr-secretstore' location: 'global' properties: { diff --git a/reference-apps/eshop-dapr/infra/dapr-state-store.bicep b/reference-apps/eshop-dapr/infra/dapr-state-store.bicep index f6c400b4..4d5fbb7a 100644 --- a/reference-apps/eshop-dapr/infra/dapr-state-store.bicep +++ b/reference-apps/eshop-dapr/infra/dapr-state-store.bicep @@ -77,7 +77,7 @@ resource cosmosCollection 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/co // Create the Dapr state store component //----------------------------------------------------------------------------- -resource daprStateStore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' = { +resource daprStateStore 'Applications.Dapr/stateStores@2023-10-01-preview' = { name: 'eshopondapr-statestore' location: 'global' dependsOn: [ diff --git a/reference-apps/eshop-dapr/infra/gateway.bicep b/reference-apps/eshop-dapr/infra/gateway.bicep index c42aa956..da23cb97 100644 --- a/reference-apps/eshop-dapr/infra/gateway.bicep +++ b/reference-apps/eshop-dapr/infra/gateway.bicep @@ -22,23 +22,23 @@ param webstatusRouteName string // Get references to existing resources //----------------------------------------------------------------------------- -resource blazorClientRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource blazorClientRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: blazorClientRouteName } -resource identityApiRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityApiRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityApiRouteName } -resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqRouteName } -resource webshoppingGwRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webshoppingGwRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webshoppingGwRouteName } -resource webstatusRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webstatusRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webstatusRouteName } @@ -46,7 +46,7 @@ resource webstatusRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' // Create the Radius gateway //----------------------------------------------------------------------------- -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' = { name: 'gateway' properties: { application: appId diff --git a/reference-apps/eshop-dapr/infra/http-routes.bicep b/reference-apps/eshop-dapr/infra/http-routes.bicep index b2578b03..f853f41e 100644 --- a/reference-apps/eshop-dapr/infra/http-routes.bicep +++ b/reference-apps/eshop-dapr/infra/http-routes.bicep @@ -7,70 +7,70 @@ param appId string // Create the HTTP routes for the application //----------------------------------------------------------------------------- -resource basketApiRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' = { +resource basketApiRoute 'Applications.Core/httpRoutes@2023-10-01-preview' = { name: 'basket-api-route' properties: { application: appId } } -resource blazorClientRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource blazorClientRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'blazor-client-route' properties: { application: appId } } -resource catalogApiRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource catalogApiRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'catalog-api-route' properties: { application: appId } } -resource identityApiRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource identityApiRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'identity-api-route' properties: { application: appId } } -resource orderingApiRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource orderingApiRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'ordering-api-route' properties: { application: appId } } -resource paymentApiRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource paymentApiRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'payment-api-route' properties: { application: appId } } -resource seqRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource seqRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'seq-route' properties: { application: appId } } -resource webshoppingAggRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webshoppingAggRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webshopping-agg-route' properties: { application: appId } } -resource webshoppingGwRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webshoppingGwRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'route-webshopping-gw' properties: { application: appId } } -resource webstatusRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webstatusRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webstatus-route' properties: { application: appId diff --git a/reference-apps/eshop-dapr/infra/sql-server.bicep b/reference-apps/eshop-dapr/infra/sql-server.bicep index 6bbf7080..64fc428b 100644 --- a/reference-apps/eshop-dapr/infra/sql-server.bicep +++ b/reference-apps/eshop-dapr/infra/sql-server.bicep @@ -112,7 +112,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2021-11-01-preview' existing = { // Create Radius portable resources to the databases //----------------------------------------------------------------------------- -resource catalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource catalogDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'catalog-db-link' properties: { application: appId @@ -129,7 +129,7 @@ resource catalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privateprevi } } -resource identityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource identityDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'identity-db-link' properties: { application: appId @@ -146,7 +146,7 @@ resource identityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privateprev } } -resource orderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource orderingDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'ordering-db-link' properties: { application: appId diff --git a/reference-apps/eshop-dapr/main.bicep b/reference-apps/eshop-dapr/main.bicep index 8290e49e..820893aa 100644 --- a/reference-apps/eshop-dapr/main.bicep +++ b/reference-apps/eshop-dapr/main.bicep @@ -16,7 +16,7 @@ param sqlAdministratorLoginPassword string = 'P@ssw0rd1' @description('Specifies the oidc issuer URL for Workload Identity.') param oidcIssuer string -resource environment 'Applications.Core/environments@2022-03-15-privatepreview' = { +resource environment 'Applications.Core/environments@2023-10-01-preview' = { name: 'eshopondapr' properties: { compute: { @@ -36,7 +36,7 @@ resource environment 'Applications.Core/environments@2022-03-15-privatepreview' } // The Radius application definition. -resource eShopOnDapr 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource eShopOnDapr 'Applications.Core/applications@2023-10-01-preview' = { name: 'eshopondapr' properties: { environment: environment.id diff --git a/reference-apps/eshop-dapr/services/basket-api.bicep b/reference-apps/eshop-dapr/services/basket-api.bicep index 1977a7bd..a5f61908 100644 --- a/reference-apps/eshop-dapr/services/basket-api.bicep +++ b/reference-apps/eshop-dapr/services/basket-api.bicep @@ -28,27 +28,27 @@ var daprAppId = 'basket-api' // Get references to existing resources //----------------------------------------------------------------------------- -resource basketApiRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource basketApiRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: basketApiRouteName } -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2022-03-15-privatepreview' existing = { +resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2023-10-01-preview' existing = { name: daprPubSubBrokerName } -resource daprStateStore 'Applications.Dapr/stateStores@2022-03-15-privatepreview' existing = { +resource daprStateStore 'Applications.Dapr/stateStores@2023-10-01-preview' existing = { name: daprStateStoreName } -resource identityApiRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityApiRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityApiRouteName } -resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqRouteName } @@ -56,7 +56,7 @@ resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' exist // Deploy Basket API container //----------------------------------------------------------------------------- -resource basketApi 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource basketApi 'Applications.Core/containers@2023-10-01-preview' = { name: 'basket-api' properties: { application: appId diff --git a/reference-apps/eshop-dapr/services/blazor-client.bicep b/reference-apps/eshop-dapr/services/blazor-client.bicep index 8f3615ae..d159db6c 100644 --- a/reference-apps/eshop-dapr/services/blazor-client.bicep +++ b/reference-apps/eshop-dapr/services/blazor-client.bicep @@ -16,15 +16,15 @@ param seqRouteName string // Get references to existing resources //----------------------------------------------------------------------------- -resource blazorClientRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' existing = { +resource blazorClientRoute 'Applications.Core/httproutes@2023-10-01-preview' existing = { name: blazorClientRouteName } -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqRouteName } @@ -32,7 +32,7 @@ resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' exist // Deploy Blazor client container //----------------------------------------------------------------------------- -resource blazorClient 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource blazorClient 'Applications.Core/containers@2023-10-01-preview' = { name: 'blazor-client' properties: { application: appId diff --git a/reference-apps/eshop-dapr/services/catalog-api.bicep b/reference-apps/eshop-dapr/services/catalog-api.bicep index 6f40b12e..eb7e0a73 100644 --- a/reference-apps/eshop-dapr/services/catalog-api.bicep +++ b/reference-apps/eshop-dapr/services/catalog-api.bicep @@ -29,19 +29,19 @@ var daprAppId = 'catalog-api' // Get references to existing resources //----------------------------------------------------------------------------- -resource catalogApiRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' existing = { +resource catalogApiRoute 'Applications.Core/httproutes@2023-10-01-preview' existing = { name: catalogApiRouteName } -resource catalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource catalogDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: catalogDbName } -resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2022-03-15-privatepreview' existing = { +resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2023-10-01-preview' existing = { name: daprPubSubBrokerName } -resource daprSecretStore 'Applications.Dapr/secretStores@2022-03-15-privatepreview' existing = { +resource daprSecretStore 'Applications.Dapr/secretStores@2023-10-01-preview' existing = { name: daprSecretStoreName } @@ -49,7 +49,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = { name: keyVaultName } -resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqRouteName } @@ -57,7 +57,7 @@ resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' exist // Deploy Catalog API container //----------------------------------------------------------------------------- -resource catalogApi 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource catalogApi 'Applications.Core/containers@2023-10-01-preview' = { name: 'catalog-api' properties: { application: appId diff --git a/reference-apps/eshop-dapr/services/identity-api.bicep b/reference-apps/eshop-dapr/services/identity-api.bicep index 805f5db5..294f00d0 100644 --- a/reference-apps/eshop-dapr/services/identity-api.bicep +++ b/reference-apps/eshop-dapr/services/identity-api.bicep @@ -28,19 +28,19 @@ var daprAppId = 'identity-api' // Get references to existing resources //----------------------------------------------------------------------------- -resource daprSecretStore 'Applications.Dapr/secretStores@2022-03-15-privatepreview' existing = { +resource daprSecretStore 'Applications.Dapr/secretStores@2023-10-01-preview' existing = { name: daprSecretStoreName } -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource identityApiRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' existing = { +resource identityApiRoute 'Applications.Core/httproutes@2023-10-01-preview' existing = { name: identityApiRouteName } -resource identityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource identityDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: identityDbName } @@ -48,7 +48,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = { name: keyVaultName } -resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqRouteName } @@ -56,7 +56,7 @@ resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' exist // Deploy Identity API container //----------------------------------------------------------------------------- -resource identityApi 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource identityApi 'Applications.Core/containers@2023-10-01-preview' = { name: 'identity-api' properties: { application: appId diff --git a/reference-apps/eshop-dapr/services/ordering-api.bicep b/reference-apps/eshop-dapr/services/ordering-api.bicep index 95708d81..219bc77e 100644 --- a/reference-apps/eshop-dapr/services/ordering-api.bicep +++ b/reference-apps/eshop-dapr/services/ordering-api.bicep @@ -35,27 +35,27 @@ var daprAppId = 'ordering-api' // Get references to existing resources //----------------------------------------------------------------------------- -resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2022-03-15-privatepreview' existing = { +resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2023-10-01-preview' existing = { name: daprPubSubBrokerName } -resource daprSecretStore 'Applications.Dapr/secretStores@2022-03-15-privatepreview' existing = { +resource daprSecretStore 'Applications.Dapr/secretStores@2023-10-01-preview' existing = { name: daprSecretStoreName } -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource identityApiRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityApiRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityApiRouteName } -resource orderingApiRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' existing = { +resource orderingApiRoute 'Applications.Core/httproutes@2023-10-01-preview' existing = { name: orderingApiRouteName } -resource orderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource orderingDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: orderingDbName } @@ -63,7 +63,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = { name: keyVaultName } -resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqRouteName } @@ -71,7 +71,7 @@ resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' exist // Deploy Ordering API container //----------------------------------------------------------------------------- -resource orderingApi 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource orderingApi 'Applications.Core/containers@2023-10-01-preview' = { name: 'ordering-api' properties: { application: appId diff --git a/reference-apps/eshop-dapr/services/payment-api.bicep b/reference-apps/eshop-dapr/services/payment-api.bicep index 03a14a46..3d1b4c8b 100644 --- a/reference-apps/eshop-dapr/services/payment-api.bicep +++ b/reference-apps/eshop-dapr/services/payment-api.bicep @@ -19,15 +19,15 @@ var daprAppId = 'payment-api' // Get references to existing resources //----------------------------------------------------------------------------- -resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2022-03-15-privatepreview' existing = { +resource daprPubSubBroker 'Applications.Dapr/pubSubBrokers@2023-10-01-preview' existing = { name: daprPubSubBrokerName } -resource paymentApiRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' existing = { +resource paymentApiRoute 'Applications.Core/httproutes@2023-10-01-preview' existing = { name: paymentApiRouteName } -resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqRouteName } @@ -35,7 +35,7 @@ resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' exist // Deploy Payment API container //----------------------------------------------------------------------------- -resource paymentApi 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource paymentApi 'Applications.Core/containers@2023-10-01-preview' = { name: 'payment-api' properties: { application: appId diff --git a/reference-apps/eshop-dapr/services/seq.bicep b/reference-apps/eshop-dapr/services/seq.bicep index 953f01e9..4a4593e1 100644 --- a/reference-apps/eshop-dapr/services/seq.bicep +++ b/reference-apps/eshop-dapr/services/seq.bicep @@ -10,7 +10,7 @@ param seqRouteName string // Get references to existing resources //----------------------------------------------------------------------------- -resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqRouteName } @@ -18,7 +18,7 @@ resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' exist // Deploy Seq container //----------------------------------------------------------------------------- -resource seq 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource seq 'Applications.Core/containers@2023-10-01-preview' = { name: 'seq' properties: { application: appId diff --git a/reference-apps/eshop-dapr/services/webshopping-agg.bicep b/reference-apps/eshop-dapr/services/webshopping-agg.bicep index fdbd2e1e..25369d3f 100644 --- a/reference-apps/eshop-dapr/services/webshopping-agg.bicep +++ b/reference-apps/eshop-dapr/services/webshopping-agg.bicep @@ -22,18 +22,18 @@ var daprAppId = 'webshoppingagg' // Get references to existing resources //----------------------------------------------------------------------------- -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource identityApiRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityApiRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityApiRouteName } -resource seqRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqRouteName } -resource webshoppingAggRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' existing = { +resource webshoppingAggRoute 'Applications.Core/httproutes@2023-10-01-preview' existing = { name: webshoppingAggRouteName } @@ -41,7 +41,7 @@ resource webshoppingAggRoute 'Applications.Core/httproutes@2022-03-15-privatepre // Deploy Aggregator container //----------------------------------------------------------------------------- -resource webshoppingAgg 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webshoppingAgg 'Applications.Core/containers@2023-10-01-preview' = { name: 'webshopping-agg' properties: { application: appId diff --git a/reference-apps/eshop-dapr/services/webshopping-gw.bicep b/reference-apps/eshop-dapr/services/webshopping-gw.bicep index fdc4e99d..f98a6061 100644 --- a/reference-apps/eshop-dapr/services/webshopping-gw.bicep +++ b/reference-apps/eshop-dapr/services/webshopping-gw.bicep @@ -8,19 +8,19 @@ param webshoppingGwRouteName string var daprAppId = 'webshoppingapigw' -resource catalogApiRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource catalogApiRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: catalogApiRouteName } -resource orderingApiRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingApiRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingApiRouteName } -resource webshoppingGwRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' existing = { +resource webshoppingGwRoute 'Applications.Core/httproutes@2023-10-01-preview' existing = { name: webshoppingGwRouteName } -resource webshoppingGw 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webshoppingGw 'Applications.Core/containers@2023-10-01-preview' = { name: 'webshopping-gw' properties: { application: appId diff --git a/reference-apps/eshop-dapr/services/webstatus.bicep b/reference-apps/eshop-dapr/services/webstatus.bicep index af56868a..77600d51 100644 --- a/reference-apps/eshop-dapr/services/webstatus.bicep +++ b/reference-apps/eshop-dapr/services/webstatus.bicep @@ -16,11 +16,11 @@ var daprAppId = 'webstatus' // Get references to existing resources //----------------------------------------------------------------------------- -resource blazorClientApiRoute 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource blazorClientApiRoute 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: blazorClientApiRouteName } -resource webstatusRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' existing = { +resource webstatusRoute 'Applications.Core/httproutes@2023-10-01-preview' existing = { name: webstatusRouteName } @@ -28,7 +28,7 @@ resource webstatusRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' // Deploy webstatus container //----------------------------------------------------------------------------- -resource webstatus 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webstatus 'Applications.Core/containers@2023-10-01-preview' = { name: 'webstatus' properties: { application: appId diff --git a/reference-apps/eshop/iac/eshop.bicep b/reference-apps/eshop/iac/eshop.bicep index 9aaa2ec9..fcac2d6b 100644 --- a/reference-apps/eshop/iac/eshop.bicep +++ b/reference-apps/eshop/iac/eshop.bicep @@ -56,7 +56,7 @@ param eksClusterName string = '' // Application -------------------------------------------------------- -resource eshop 'Applications.Core/applications@2022-03-15-privatepreview' = { +resource eshop 'Applications.Core/applications@2023-10-01-preview' = { name: appName properties: { environment: environment diff --git a/reference-apps/eshop/iac/infra/aws.bicep b/reference-apps/eshop/iac/infra/aws.bicep index 2464593c..8883310d 100644 --- a/reference-apps/eshop/iac/infra/aws.bicep +++ b/reference-apps/eshop/iac/infra/aws.bicep @@ -164,7 +164,7 @@ resource basketCache 'AWS.MemoryDB/Cluster@default' = { } // TEMP: Using containerized rabbitMQ instead of AWS SNS until AWS nonidempotency is resolved -resource rabbitmqContainer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource rabbitmqContainer 'Applications.Core/containers@2023-10-01-preview' = { name: 'rabbitmq-container-eshop-event-bus' properties: { application: application @@ -181,7 +181,7 @@ resource rabbitmqContainer 'Applications.Core/containers@2022-03-15-privateprevi } } -resource rabbitmqRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource rabbitmqRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'rabbitmq-route-eshop-event-bus' properties: { application: application @@ -192,7 +192,7 @@ resource rabbitmqRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' // Portable Resources ---------------------------------------------------------------------------- // TODO: Move the portable resource definitions into the application and use Recipes instead -resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'identitydb' properties: { application: application @@ -209,7 +209,7 @@ resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep } } -resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'catalogdb' properties: { application: application @@ -226,7 +226,7 @@ resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepr } } -resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'orderingdb' properties: { application: application @@ -243,7 +243,7 @@ resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep } } -resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'webhooksdb' properties: { application: application @@ -260,7 +260,7 @@ resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep } } -resource redisKeystore 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { +resource redisKeystore 'Applications.Datastores/redisCaches@2023-10-01-preview' = { name: 'keystore-data' properties: { application: application @@ -274,7 +274,7 @@ resource redisKeystore 'Applications.Datastores/redisCaches@2022-03-15-privatepr } } -resource redisBasket 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { +resource redisBasket 'Applications.Datastores/redisCaches@2023-10-01-preview' = { name: 'basket-data' properties: { application: application @@ -288,7 +288,7 @@ resource redisBasket 'Applications.Datastores/redisCaches@2022-03-15-privateprev } } -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' = { name: 'eshop-event-bus' properties: { application: application diff --git a/reference-apps/eshop/iac/infra/azure.bicep b/reference-apps/eshop/iac/infra/azure.bicep index 889a999f..e2817a0b 100644 --- a/reference-apps/eshop/iac/infra/azure.bicep +++ b/reference-apps/eshop/iac/infra/azure.bicep @@ -239,7 +239,7 @@ resource basketCache 'Microsoft.Cache/redis@2020-12-01' = { // TODO: Move the portable resource definitions into the application and use Recipes instead // Need to deploy a blank rabbitmq instance to let Bicep successfully deploy -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' = { name: 'eshop-event-bus' properties: { application: application @@ -254,7 +254,7 @@ resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privateprevi } } -resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'identitydb' properties: { application: application @@ -276,7 +276,7 @@ resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep } } -resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'catalogdb' properties: { application: application @@ -298,7 +298,7 @@ resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepr } } -resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'orderingdb' properties: { application: application @@ -320,7 +320,7 @@ resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep } } -resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'webhooksdb' properties: { application: application @@ -342,7 +342,7 @@ resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep } } -resource redisBasket 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { +resource redisBasket 'Applications.Datastores/redisCaches@2023-10-01-preview' = { name: 'basket-data' properties: { application: application @@ -357,7 +357,7 @@ resource redisBasket 'Applications.Datastores/redisCaches@2022-03-15-privateprev } } -resource redisKeystore 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { +resource redisKeystore 'Applications.Datastores/redisCaches@2023-10-01-preview' = { name: 'keystore-data' properties: { application: application diff --git a/reference-apps/eshop/iac/infra/containers.bicep b/reference-apps/eshop/iac/infra/containers.bicep index d94ac598..75d975c6 100644 --- a/reference-apps/eshop/iac/infra/containers.bicep +++ b/reference-apps/eshop/iac/infra/containers.bicep @@ -14,7 +14,7 @@ var adminUsername = 'sa' // Infrastructure ------------------------------------------------- -resource rabbitmqContainer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource rabbitmqContainer 'Applications.Core/containers@2023-10-01-preview' = { name: 'rabbitmq-container-eshop-event-bus' properties: { application: application @@ -31,7 +31,7 @@ resource rabbitmqContainer 'Applications.Core/containers@2022-03-15-privateprevi } } -resource rabbitmqRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource rabbitmqRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'rabbitmq-route-eshop-event-bus' properties: { application: application @@ -39,7 +39,7 @@ resource rabbitmqRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' } } -resource sqlIdentityContainer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource sqlIdentityContainer 'Applications.Core/containers@2023-10-01-preview' = { name: 'sql-server-identitydb' properties: { application: application @@ -60,7 +60,7 @@ resource sqlIdentityContainer 'Applications.Core/containers@2022-03-15-privatepr } } -resource sqlIdentityRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource sqlIdentityRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'sql-route-identitydb' properties: { application: application @@ -68,7 +68,7 @@ resource sqlIdentityRoute 'Applications.Core/httproutes@2022-03-15-privateprevie } } -resource sqlCatalogContainer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource sqlCatalogContainer 'Applications.Core/containers@2023-10-01-preview' = { name: 'sql-server-catalogdb' properties: { application: application @@ -89,7 +89,7 @@ resource sqlCatalogContainer 'Applications.Core/containers@2022-03-15-privatepre } } -resource sqlCatalogRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource sqlCatalogRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'sql-route-catalogdb' properties: { application: application @@ -97,7 +97,7 @@ resource sqlCatalogRoute 'Applications.Core/httproutes@2022-03-15-privatepreview } } -resource sqlOrderingContainer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource sqlOrderingContainer 'Applications.Core/containers@2023-10-01-preview' = { name: 'sql-server-orderingdb' properties: { application: application @@ -118,7 +118,7 @@ resource sqlOrderingContainer 'Applications.Core/containers@2022-03-15-privatepr } } -resource sqlOrderingRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource sqlOrderingRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'sql-route-orderingdb' properties: { application: application @@ -126,7 +126,7 @@ resource sqlOrderingRoute 'Applications.Core/httproutes@2022-03-15-privateprevie } } -resource sqlWebhooksContainer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource sqlWebhooksContainer 'Applications.Core/containers@2023-10-01-preview' = { name: 'sql-server-webhooksdb' properties: { application: application @@ -147,7 +147,7 @@ resource sqlWebhooksContainer 'Applications.Core/containers@2022-03-15-privatepr } } -resource sqlWebhooksRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource sqlWebhooksRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'sql-route-webhooksdb' properties: { application: application @@ -155,7 +155,7 @@ resource sqlWebhooksRoute 'Applications.Core/httproutes@2022-03-15-privateprevie } } -resource redisBasketContainer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource redisBasketContainer 'Applications.Core/containers@2023-10-01-preview' = { name: 'redis-container-basket-data' properties: { application: application @@ -172,7 +172,7 @@ resource redisBasketContainer 'Applications.Core/containers@2022-03-15-privatepr } } -resource redisBasketRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource redisBasketRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'redis-route-basket-data' properties: { application: application @@ -180,7 +180,7 @@ resource redisBasketRoute 'Applications.Core/httproutes@2022-03-15-privateprevie } } -resource redisKeystoreContainer 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource redisKeystoreContainer 'Applications.Core/containers@2023-10-01-preview' = { name: 'redis-container-keystore-data' properties: { application: application @@ -197,7 +197,7 @@ resource redisKeystoreContainer 'Applications.Core/containers@2022-03-15-private } } -resource redisKeystoreRoute 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource redisKeystoreRoute 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'redis-route-keystore-data' properties: { application: application @@ -207,7 +207,7 @@ resource redisKeystoreRoute 'Applications.Core/httproutes@2022-03-15-privateprev // Portable Resources --------------------------------------------------------------- -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' = { name: 'eshop-event-bus' properties: { application: application @@ -223,7 +223,7 @@ resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privateprevi } } -resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'identitydb' properties: { application: application @@ -240,7 +240,7 @@ resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep } } -resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'catalogdb' properties: { application: application @@ -257,7 +257,7 @@ resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepr } } -resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'orderingdb' properties: { application: application @@ -274,7 +274,7 @@ resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep } } -resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' = { +resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' = { name: 'webhooksdb' properties: { application: application @@ -291,7 +291,7 @@ resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep } } -resource redisBasket 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { +resource redisBasket 'Applications.Datastores/redisCaches@2023-10-01-preview' = { name: 'basket-data' properties: { application: application @@ -305,7 +305,7 @@ resource redisBasket 'Applications.Datastores/redisCaches@2022-03-15-privateprev } } -resource redisKeystore 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' = { +resource redisKeystore 'Applications.Datastores/redisCaches@2023-10-01-preview' = { name: 'keystore-data' properties: { application: application diff --git a/reference-apps/eshop/iac/infra/links.bicep b/reference-apps/eshop/iac/infra/links.bicep index 03646c43..a20c8bdd 100644 --- a/reference-apps/eshop/iac/infra/links.bicep +++ b/reference-apps/eshop/iac/infra/links.bicep @@ -1,30 +1,30 @@ import radius as rad -resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: 'identitydb' } -resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: 'catalogdb' } -resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: 'orderingdb' } -resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: 'webhooksdb' } -resource redisKeystore 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' existing = { +resource redisKeystore 'Applications.Datastores/redisCaches@2023-10-01-preview' existing = { name: 'keystore-data' } -resource redisBasket 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' existing = { +resource redisBasket 'Applications.Datastores/redisCaches@2023-10-01-preview' existing = { name: 'basket-data' } -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' existing = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' existing = { name: 'eshop-event-bus' } diff --git a/reference-apps/eshop/iac/services/basket.bicep b/reference-apps/eshop/iac/services/basket.bicep index 58aaeff8..d4023022 100644 --- a/reference-apps/eshop/iac/services/basket.bicep +++ b/reference-apps/eshop/iac/services/basket.bicep @@ -49,7 +49,7 @@ param serviceBusConnectionString string // Container ------------------------------------- // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/basket-api -resource basket 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource basket 'Applications.Core/containers@2023-10-01-preview' = { name: 'basket-api' properties: { application: application @@ -96,28 +96,28 @@ resource basket 'Applications.Core/containers@2022-03-15-privatepreview' = { // Networking ------------------------------------------- -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource identityHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityHttpName } -resource basketHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource basketHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: basketHttpName } -resource basketGrpc 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource basketGrpc 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: basketGrpcName } // Portable Resource ------------------------------------------ -resource redisBasket 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' existing = { +resource redisBasket 'Applications.Datastores/redisCaches@2023-10-01-preview' existing = { name: redisBasketName } -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' existing = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' existing = { name: rabbitmqName } diff --git a/reference-apps/eshop/iac/services/catalog.bicep b/reference-apps/eshop/iac/services/catalog.bicep index 0ae9712b..b63479e1 100644 --- a/reference-apps/eshop/iac/services/catalog.bicep +++ b/reference-apps/eshop/iac/services/catalog.bicep @@ -56,7 +56,7 @@ var PICBASEURL = '${gateway.properties.url}/webshoppingapigw/c/api/v1/catalog/it // CONTAINERS ------------------------------------------------------------------- // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/catalog-api -resource catalog 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource catalog 'Applications.Core/containers@2023-10-01-preview' = { name: 'catalog-api' properties: { application: application @@ -97,24 +97,24 @@ resource catalog 'Applications.Core/containers@2022-03-15-privatepreview' = { // NETWORKING ------------------------------------------------------ -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource catalogHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource catalogHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: catalogHttpName } -resource catalogGrpc 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource catalogGrpc 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: catalogGrpcName } // PORTABLE RESOURCES ----------------------------------------------------------- -resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: sqlCatalogDbName } -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' existing = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' existing = { name: rabbitmqName } diff --git a/reference-apps/eshop/iac/services/identity.bicep b/reference-apps/eshop/iac/services/identity.bicep index 58e515bb..4bcce43d 100644 --- a/reference-apps/eshop/iac/services/identity.bicep +++ b/reference-apps/eshop/iac/services/identity.bicep @@ -51,7 +51,7 @@ param redisKeystoreName string // CONTAINERS ------------------------------------------------------------------- // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/identity-api -resource identity 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource identity 'Applications.Core/containers@2023-10-01-preview' = { name: 'identity-api' properties: { application: application @@ -122,44 +122,44 @@ resource identity 'Applications.Core/containers@2022-03-15-privatepreview' = { // NETWORKING ------------------------------------------------------ -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource identityHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityHttpName } -resource basketHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource basketHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: basketHttpName } -resource orderingHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingHttpName } -resource webshoppingaggHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webshoppingaggHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webshoppingaggHttpName } -resource webhooksHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webhooksHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webhooksHttpName } -resource webhooksclientHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webhooksclientHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webhooksclientHttpName } -resource webmvcHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webmvcHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webmvcHttpName } // PORTABLE RESOURCES ----------------------------------------------------------- -resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: sqlIdentityDbName } -resource redisKeystore 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' existing = { +resource redisKeystore 'Applications.Datastores/redisCaches@2023-10-01-preview' existing = { name: redisKeystoreName } diff --git a/reference-apps/eshop/iac/services/networking.bicep b/reference-apps/eshop/iac/services/networking.bicep index 2ceb05d3..2330a23b 100644 --- a/reference-apps/eshop/iac/services/networking.bicep +++ b/reference-apps/eshop/iac/services/networking.bicep @@ -6,7 +6,7 @@ param application string // GATEWAY --------------------------------------------------------- -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' = { name: 'gateway' properties: { application: application @@ -58,7 +58,7 @@ resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' = { // ROUTES ---------------------------------------------------------- -resource basketHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource basketHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'basket-http' properties: { application: application @@ -66,7 +66,7 @@ resource basketHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { } } -resource basketGrpc 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource basketGrpc 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'basket-grpc' properties: { application: application @@ -74,7 +74,7 @@ resource basketGrpc 'Applications.Core/httproutes@2022-03-15-privatepreview' = { } } -resource catalogHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource catalogHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'catalog-http' properties: { application: application @@ -82,7 +82,7 @@ resource catalogHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = } } -resource catalogGrpc 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource catalogGrpc 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'catalog-grpc' properties: { application: application @@ -90,7 +90,7 @@ resource catalogGrpc 'Applications.Core/httproutes@2022-03-15-privatepreview' = } } -resource identityHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource identityHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'identity-http' properties: { application: application @@ -98,7 +98,7 @@ resource identityHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = } } -resource orderingHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource orderingHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'ordering-http' properties: { application: application @@ -106,7 +106,7 @@ resource orderingHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = } } -resource orderingGrpc 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource orderingGrpc 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'ordering-grpc' properties: { application: application @@ -114,7 +114,7 @@ resource orderingGrpc 'Applications.Core/httproutes@2022-03-15-privatepreview' = } } -resource orderingsignalrhubHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource orderingsignalrhubHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'orderingsignalrhub-http' properties: { application: application @@ -122,7 +122,7 @@ resource orderingsignalrhubHttp 'Applications.Core/httproutes@2022-03-15-private } } -resource orderbgtasksHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource orderbgtasksHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'orderbgtasks-http' properties: { application: application @@ -130,7 +130,7 @@ resource orderbgtasksHttp 'Applications.Core/httproutes@2022-03-15-privateprevie } } -resource paymentHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource paymentHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'payment-http' properties: { application: application @@ -138,7 +138,7 @@ resource paymentHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = } } -resource seqHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource seqHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'seq-http' properties: { application: application @@ -146,7 +146,7 @@ resource seqHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { } } -resource webspaHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webspaHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webspa-http' properties: { application: application @@ -154,7 +154,7 @@ resource webspaHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { } } -resource webmvcHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webmvcHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webmvc-http' properties: { application: application @@ -162,7 +162,7 @@ resource webmvcHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { } } -resource webhooksHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webhooksHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webhooks-http' properties: { application: application @@ -170,7 +170,7 @@ resource webhooksHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = } } -resource webhooksclientHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webhooksclientHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webhooksclient-http' properties: { application: application @@ -179,7 +179,7 @@ resource webhooksclientHttp 'Applications.Core/httproutes@2022-03-15-privateprev } } -resource webshoppingaggHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webshoppingaggHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webshoppingagg-http' properties: { application: application @@ -187,7 +187,7 @@ resource webshoppingaggHttp 'Applications.Core/httproutes@2022-03-15-privateprev } } -resource webshoppingapigwHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webshoppingapigwHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webshoppingapigw-http' properties: { application: application @@ -195,7 +195,7 @@ resource webshoppingapigwHttp 'Applications.Core/httproutes@2022-03-15-privatepr } } -resource webshoppingapigwHttp2 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webshoppingapigwHttp2 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webshoppingapigw-http-2' properties: { application: application @@ -203,7 +203,7 @@ resource webshoppingapigwHttp2 'Applications.Core/httproutes@2022-03-15-privatep } } -resource webstatusHttp 'Applications.Core/httproutes@2022-03-15-privatepreview' = { +resource webstatusHttp 'Applications.Core/httproutes@2023-10-01-preview' = { name: 'webstatus-http' properties: { application: application diff --git a/reference-apps/eshop/iac/services/ordering.bicep b/reference-apps/eshop/iac/services/ordering.bicep index 94a83720..fa5018c4 100644 --- a/reference-apps/eshop/iac/services/ordering.bicep +++ b/reference-apps/eshop/iac/services/ordering.bicep @@ -64,7 +64,7 @@ param serviceBusConnectionString string // CONTAINERS ------------------------------------------------------- // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/ordering-api -resource ordering 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource ordering 'Applications.Core/containers@2023-10-01-preview' = { name: 'ordering-api' properties: { application: application @@ -114,7 +114,7 @@ resource ordering 'Applications.Core/containers@2022-03-15-privatepreview' = { } // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/ordering-backgroundtasks -resource orderbgtasks 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource orderbgtasks 'Applications.Core/containers@2023-10-01-preview' = { name: 'ordering-backgroundtasks' properties: { application: application @@ -151,7 +151,7 @@ resource orderbgtasks 'Applications.Core/containers@2022-03-15-privatepreview' = } // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/ordering-signalrhub -resource orderingsignalrhub 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource orderingsignalrhub 'Applications.Core/containers@2023-10-01-preview' = { name: 'ordering-signalrhub' properties: { application: application @@ -204,48 +204,48 @@ resource orderingsignalrhub 'Applications.Core/containers@2022-03-15-privateprev // NETWORKING ------------------------------------------------------ -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource identityHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityHttpName } -resource basketHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource basketHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: basketHttpName } -resource catalogHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource catalogHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: catalogHttpName } -resource orderingHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingHttpName } -resource orderingGrpc 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingGrpc 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingGrpcName } -resource orderingsignalrhubHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingsignalrhubHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingsignalrhubHttpName } -resource orderbgtasksHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderbgtasksHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderbgtasksHttpName } // PORTABLE RESOURCES ----------------------------------------------------------- -resource redisKeystore 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' existing = { +resource redisKeystore 'Applications.Datastores/redisCaches@2023-10-01-preview' existing = { name: redisKeystoreName } -resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: sqlOrderingDbName } -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' existing = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' existing = { name: rabbitmqName } diff --git a/reference-apps/eshop/iac/services/payment.bicep b/reference-apps/eshop/iac/services/payment.bicep index 03448ea4..e0fa6f08 100644 --- a/reference-apps/eshop/iac/services/payment.bicep +++ b/reference-apps/eshop/iac/services/payment.bicep @@ -37,7 +37,7 @@ param serviceBusConnectionString string // CONTAINERS --------------------------------------------------------- // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/payment-api -resource payment 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource payment 'Applications.Core/containers@2023-10-01-preview' = { name: 'payment-api' properties: { application: application @@ -63,12 +63,12 @@ resource payment 'Applications.Core/containers@2022-03-15-privatepreview' = { // NETWORKING ------------------------------------------------------ -resource paymentHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource paymentHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: paymentHttpName } // PORTABLE RESOURCES ----------------------------------------------------------- -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' existing = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' existing = { name: rabbitmqName } diff --git a/reference-apps/eshop/iac/services/seq.bicep b/reference-apps/eshop/iac/services/seq.bicep index b8074b9f..eda4f9d8 100644 --- a/reference-apps/eshop/iac/services/seq.bicep +++ b/reference-apps/eshop/iac/services/seq.bicep @@ -10,7 +10,7 @@ param seqHttpName string // CONTAINERS ------------------------------------------------------------ -resource seq 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource seq 'Applications.Core/containers@2023-10-01-preview' = { name: 'seq' properties: { application: application @@ -31,6 +31,6 @@ resource seq 'Applications.Core/containers@2022-03-15-privatepreview' = { // NETWORKING --------------------------------------------------------------- -resource seqHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource seqHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: seqHttpName } diff --git a/reference-apps/eshop/iac/services/web.bicep b/reference-apps/eshop/iac/services/web.bicep index de1cb7e6..c075f186 100644 --- a/reference-apps/eshop/iac/services/web.bicep +++ b/reference-apps/eshop/iac/services/web.bicep @@ -44,7 +44,7 @@ param redisKeystoreName string // CONTAINER -------------------------------------------------------------------- // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/webspa -resource webspa 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webspa 'Applications.Core/containers@2023-10-01-preview' = { name: 'web-spa' properties: { application: application @@ -98,7 +98,7 @@ resource webspa 'Applications.Core/containers@2022-03-15-privatepreview' = { } // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/webmvc -resource webmvc 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webmvc 'Applications.Core/containers@2023-10-01-preview' = { name: 'webmvc' properties: { application: application @@ -155,36 +155,36 @@ resource webmvc 'Applications.Core/containers@2022-03-15-privatepreview' = { // NETWORKING ---------------------------------------------- -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource orderingsignalrhubHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingsignalrhubHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingsignalrhubHttpName } -resource identityHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityHttpName } -resource webmvcHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webmvcHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webmvcHttpName } -resource webspaHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webspaHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webspaHttpName } -resource webshoppingaggHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webshoppingaggHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webshoppingaggHttpName } -resource webshoppingapigwHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webshoppingapigwHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webshoppingapigwHttpName } // PORTABLE RESOURCES ------------------------------------------------------ -resource redisKeystore 'Applications.Datastores/redisCaches@2022-03-15-privatepreview' existing = { +resource redisKeystore 'Applications.Datastores/redisCaches@2023-10-01-preview' existing = { name: redisKeystoreName } diff --git a/reference-apps/eshop/iac/services/webhooks.bicep b/reference-apps/eshop/iac/services/webhooks.bicep index dd1fbdc3..90993388 100644 --- a/reference-apps/eshop/iac/services/webhooks.bicep +++ b/reference-apps/eshop/iac/services/webhooks.bicep @@ -46,7 +46,7 @@ param serviceBusConnectionString string // CONTAINERS ----------------------------------------------------------- // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/webhooks-api -resource webhooks 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webhooks 'Applications.Core/containers@2023-10-01-preview' = { name: 'webhooks-api' properties: { application: application @@ -85,7 +85,7 @@ resource webhooks 'Applications.Core/containers@2022-03-15-privatepreview' = { // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/webhooks-web -resource webhooksclient 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webhooksclient 'Applications.Core/containers@2023-10-01-preview' = { name: 'webhooks-client' properties: { application: application @@ -121,28 +121,28 @@ resource webhooksclient 'Applications.Core/containers@2022-03-15-privatepreview' // NETWORKING ---------------------------------------------- -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource identityHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityHttpName } -resource webhooksHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webhooksHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webhooksHttpName } -resource webhooksclientHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webhooksclientHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webhooksclientHttpName } // PORTABLE RESOURCES ----------------------------------------------------------- -resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepreview' existing = { +resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2023-10-01-preview' existing = { name: sqlWebhooksDbName } -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' existing = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' existing = { name: rabbitmqName } diff --git a/reference-apps/eshop/iac/services/webshopping.bicep b/reference-apps/eshop/iac/services/webshopping.bicep index 4571a273..09bda8fd 100644 --- a/reference-apps/eshop/iac/services/webshopping.bicep +++ b/reference-apps/eshop/iac/services/webshopping.bicep @@ -54,7 +54,7 @@ param webshoppingaggHttpName string param rabbitmqName string // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/webshoppingagg -resource webshoppingagg 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webshoppingagg 'Applications.Core/containers@2023-10-01-preview' = { name: 'webshoppingagg' properties: { application: application @@ -114,7 +114,7 @@ resource webshoppingagg 'Applications.Core/containers@2022-03-15-privatepreview' // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/apigwws -resource webshoppingapigw 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webshoppingapigw 'Applications.Core/containers@2023-10-01-preview' = { name: 'webshoppingapigw' properties: { application: application @@ -136,56 +136,56 @@ resource webshoppingapigw 'Applications.Core/containers@2022-03-15-privateprevie // NETWORKING ---------------------------------------------- -resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing = { +resource gateway 'Applications.Core/gateways@2023-10-01-preview' existing = { name: gatewayName } -resource basketGrpc 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource basketGrpc 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: basketGrpcName } -resource catalogGrpc 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource catalogGrpc 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: catalogGrpcName } -resource orderingGrpc 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingGrpc 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingGrpcName } -resource catalogHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource catalogHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: catalogHttpName } -resource basketHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource basketHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: basketHttpName } -resource orderingHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingHttpName } -resource identityHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityHttpName } -resource paymentHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource paymentHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: paymentHttpName } -resource webshoppingaggHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webshoppingaggHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webshoppingaggHttpName } -resource webshoppingapigwHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webshoppingapigwHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webshoppingapigwHttpName } -resource webshoppingapigwHttp2 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webshoppingapigwHttp2 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webshoppingapigwHttp2Name } // PORTABLE RESOURCES -------------------------------------------------------- -resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' existing = { +resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2023-10-01-preview' existing = { name: rabbitmqName } diff --git a/reference-apps/eshop/iac/services/webstatus.bicep b/reference-apps/eshop/iac/services/webstatus.bicep index 36877715..45292539 100644 --- a/reference-apps/eshop/iac/services/webstatus.bicep +++ b/reference-apps/eshop/iac/services/webstatus.bicep @@ -53,7 +53,7 @@ param webstatusHttpName string // CONTAINAERS --------------------------------------------------------- // Based on https://github.com/dotnet-architecture/eShopOnContainers/tree/dev/deploy/k8s/helm/webstatus -resource webstatus 'Applications.Core/containers@2022-03-15-privatepreview' = { +resource webstatus 'Applications.Core/containers@2023-10-01-preview' = { name: 'webstatus' properties: { application: application @@ -97,46 +97,46 @@ resource webstatus 'Applications.Core/containers@2022-03-15-privatepreview' = { // NETWORKING ---------------------------------------------- -resource catalogHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource catalogHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: catalogHttpName } -resource basketHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource basketHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: basketHttpName } -resource orderingHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingHttpName } -resource orderingsignalrhubHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderingsignalrhubHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderingsignalrhubHttpName } -resource orderbgtasksHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource orderbgtasksHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: orderbgtasksHttpName } -resource identityHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource identityHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: identityHttpName } -resource paymentHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource paymentHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: paymentHttpName } -resource webmvcHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webmvcHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webmvcHttpName } -resource webspaHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webspaHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webspaHttpName } -resource webshoppingaggHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webshoppingaggHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webshoppingaggHttpName } -resource webstatusHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = { +resource webstatusHttp 'Applications.Core/httpRoutes@2023-10-01-preview' existing = { name: webstatusHttpName } diff --git a/samples.sln b/samples.sln new file mode 100644 index 00000000..02ab6710 --- /dev/null +++ b/samples.sln @@ -0,0 +1,42 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "reference-apps", "reference-apps", "{47FEBBB0-6765-4A9C-9121-7DA4FC324E75}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aws", "reference-apps\aws\aws.csproj", "{2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "quickstarts", "quickstarts", "{CD3065DC-A0AB-429A-98E9-E69BACA532D2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dapr", "dapr", "{49E83F62-CCD0-4FC3-890A-04C485711E7D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ui", "quickstarts\dapr\ui\ui.csproj", "{2BF93A7B-6A94-400C-AABC-CF170600E60D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}.Release|Any CPU.Build.0 = Release|Any CPU + {2BF93A7B-6A94-400C-AABC-CF170600E60D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2BF93A7B-6A94-400C-AABC-CF170600E60D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2BF93A7B-6A94-400C-AABC-CF170600E60D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2BF93A7B-6A94-400C-AABC-CF170600E60D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6} = {47FEBBB0-6765-4A9C-9121-7DA4FC324E75} + {49E83F62-CCD0-4FC3-890A-04C485711E7D} = {CD3065DC-A0AB-429A-98E9-E69BACA532D2} + {2BF93A7B-6A94-400C-AABC-CF170600E60D} = {49E83F62-CCD0-4FC3-890A-04C485711E7D} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9CE14E25-6E41-4D1E-A178-9E78297D0E35} + EndGlobalSection +EndGlobal From 25b99cd9659bbb138380ba75e6bc8e5a048d73ea Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:09:20 -0700 Subject: [PATCH 2/2] fix workflow bug --- .github/workflows/test.yaml | 2 +- samples.sln | 42 ------------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 samples.sln diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index cbf3c7ba..456790f8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -146,7 +146,7 @@ jobs: if: steps.gen-id.outputs.RUN_TEST == 'true' run: | for attempt in 1 2 3 4 5; do - if [[ "${{ inputs.version }}" != "edge" && "${{ inputs.version }}" != *"rc"* ]]; then + if [[ -n "${{ inputs.version }}" && "${{ inputs.version }}" != "edge" && "${{ inputs.version }}" != *"rc"* ]]; then INPUT_CHANNEL=$(echo "${{ inputs.version }}" | cut -d '.' -f 1,2) echo "Downloading rad CLI version $INPUT_CHANNEL" wget -q "${{ env.RAD_CLI_URL }}" -O - | /bin/bash -s $INPUT_CHANNEL diff --git a/samples.sln b/samples.sln deleted file mode 100644 index 02ab6710..00000000 --- a/samples.sln +++ /dev/null @@ -1,42 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.002.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "reference-apps", "reference-apps", "{47FEBBB0-6765-4A9C-9121-7DA4FC324E75}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aws", "reference-apps\aws\aws.csproj", "{2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "quickstarts", "quickstarts", "{CD3065DC-A0AB-429A-98E9-E69BACA532D2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dapr", "dapr", "{49E83F62-CCD0-4FC3-890A-04C485711E7D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ui", "quickstarts\dapr\ui\ui.csproj", "{2BF93A7B-6A94-400C-AABC-CF170600E60D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6}.Release|Any CPU.Build.0 = Release|Any CPU - {2BF93A7B-6A94-400C-AABC-CF170600E60D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BF93A7B-6A94-400C-AABC-CF170600E60D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BF93A7B-6A94-400C-AABC-CF170600E60D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BF93A7B-6A94-400C-AABC-CF170600E60D}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2F4E8FBD-2AE2-4ADC-8015-4552D86ECEC6} = {47FEBBB0-6765-4A9C-9121-7DA4FC324E75} - {49E83F62-CCD0-4FC3-890A-04C485711E7D} = {CD3065DC-A0AB-429A-98E9-E69BACA532D2} - {2BF93A7B-6A94-400C-AABC-CF170600E60D} = {49E83F62-CCD0-4FC3-890A-04C485711E7D} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9CE14E25-6E41-4D1E-A178-9E78297D0E35} - EndGlobalSection -EndGlobal