Show recipe template kind and path in the status #6450

vinayada1 · 2023-10-10T22:03:54Z

Description

Add template kind and path to resource status. Then store these values and return in rad resource show

Type of change

This pull request adds or changes features of Radius and has an approved issue (issue link required).

Fixes: #6440

Auto-generated summary

`🤖 Generated by Copilot at e1cbaec`

Summary

📝🚀🎁

This pull request adds support for template-based resource deployment in the v20231001preview API version of the radius project. It introduces the RecipeData type and the Recipe field in various resource status types, and adds custom JSON serialization and deserialization logic for them. It also updates the ConvertFrom functions and the test cases for the affected resource types to handle the new Recipe field.

Recipe field added
To support template deployment
A new feature blooms

Walkthrough

Add RecipeData type to represent the recipe data for a resource deployment using templates (link, link, link)
Add Recipe field to ResourceStatus type to hold the recipe data for a resource deployment (link, link, link, link)
Populate Recipe field in ConvertFrom functions of Extender, DaprPubSubBroker, DaprSecretStore, DaprStateStore, MongoDatabase, and RedisCache types (link, link, link, link, link, link)
Update test cases for ConvertFrom functions of Extender, DaprPubSubBroker, DaprSecretStore, DaprStateStore, MongoDatabase, and RedisCache types to reflect the Recipe field (link, link, link, link, link, link, link)
Add sample data models for testing ConvertFrom functions of Extender, DaprPubSubBroker, DaprSecretStore, and DaprStateStore types with the Recipe field (link, link, link, link)
Simplify test case for ConvertFrom function of DaprStateStore type by removing redundant assignment of Status field (link)

hack/bicep-types-radius/generated/applications/applications.core/2023-10-01-preview/types.md

ytimocin

We need templateVersion for the Terraform recipes.

pkg/portableresources/types.go

pkg/recipes/driver/bicep.go

pkg/recipes/types.go

pkg/rp/v1/recipe.go

...tion/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/openapi.json

...tion/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/openapi.json

...pplications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/openapi.json

typespec/radius/v1/resources.tsp

pkg/corerp/api/v20231001preview/extender_conversion.go

pkg/datastoresrp/api/v20231001preview/rediscache_conversion_test.go

pkg/portableresources/backend/controller/createorupdateresource.go

pkg/recipes/types.go

pkg/rp/v1/recipe.go

pkg/rp/v1/types.go

hack/bicep-types-radius/generated/applications/applications.core/2023-10-01-preview/types.md

hack/bicep-types-radius/generated/applications/applications.dapr/2023-10-01-preview/types.md

...icep-types-radius/generated/applications/applications.datastores/2023-10-01-preview/types.md

pkg/corerp/api/v20231001preview/extender_conversion.go

pkg/rp/v1/recipe.go

pkg/recipes/types.go

pkg/recipes/driver/terraform.go

test/functional/datastoresrp/resources/redis_test.go

kachawla · 2023-10-12T17:14:21Z

hack/bicep-types-radius/generated/applications/applications.dapr/2023-10-01-preview/types.md

+### Properties
+* **templateKind**: string (Required): Template kind is the kind of template
+* **templatePath**: string (Required): TemplatePath is the path specified in the recipe
+* **templateVersion**: string: TemplateVersion is the version number of the template


This is supported only for a certain types of sources. Can you get @AaronCrawfis's eyes on this to convey complete information?

kachawla

Can we please build clarity on re-deployment scenario before merging this PR? #6450 (comment)

pkg/corerp/api/v20231001preview/extender_conversion.go

pkg/recipes/driver/bicep.go

pkg/recipes/types.go

github-actions · 2023-10-12T19:02:54Z

You are editing files which require a docs update. Please ensure you've made the appropriate changes to the docs and submitted a PR.

Swagger changes require reference edge docs to be updated here
Make sure to create a branch and submit a PR into the edge branch instead of the default latest branch, as the swagger changes will not be available until the next release.

For more information on contributing to docs please visit https://docs.radapp.dev/contributing/docs/.

github-actions · 2023-10-12T19:18:58Z

Test Results

2 980 tests +5 2 968 ✔️ +5 2m 44s ⏱️ -3s
  256 suites ±0     12 💤 ±0
      1 files ±0       0 ❌ ±0

Results for commit 2c920c4. ± Comparison against base commit f942ab2.

This pull request removes 2 and adds 7 tests. Note that renamed tests count towards both.

github.com/radius-project/radius/pkg/armrpc/frontend/controller ‑ TestValidateEtag_IfMatch/7893932e-2fbb-4f6f-9968-4820f510d09a
github.com/radius-project/radius/pkg/armrpc/frontend/controller ‑ TestValidateEtag_IfMatch/7893932e-2fbb-4f6f-9968-4820f510d09a#01

github.com/radius-project/radius/pkg/armrpc/frontend/controller ‑ TestValidateEtag_IfMatch/e2b6a57b-c06b-4108-a64d-2ffb6b72bf8c
github.com/radius-project/radius/pkg/armrpc/frontend/controller ‑ TestValidateEtag_IfMatch/e2b6a57b-c06b-4108-a64d-2ffb6b72bf8c#01
github.com/radius-project/radius/pkg/daprrp/api/v20231001preview ‑ Test_fromRecipeStatus
github.com/radius-project/radius/pkg/datastoresrp/api/v20231001preview ‑ Test_fromRecipeStatus
github.com/radius-project/radius/pkg/messagingrp/api/v20231001preview ‑ Test_fromRecipeStatus
github.com/radius-project/radius/pkg/portableresources/processors ‑ Test_Validator_SetAndValidate_Status
github.com/radius-project/radius/pkg/portableresources/processors ‑ Test_Validator_SetAndValidate_Status/status

♻️ This comment has been updated with latest results.

github-actions · 2023-10-12T20:46:34Z

⌛ Building Radius and pushing container images for functional tests...

✅ Container images build succeeded
⌛ Publishing Bicep Recipes for functional tests...
✅ Recipe publishing succeeded
⌛ Starting daprrp functional tests...
⌛ Starting samples functional tests...
⌛ Starting ucp functional tests...
⌛ Starting shared functional tests...
⌛ Starting msgrp functional tests...
✅ samples functional tests succeeded
✅ ucp functional tests succeeded
❌ msgrp functional test failed. Please check the logs for more details

github-actions · 2023-10-12T21:42:58Z

You are editing files which require a docs update. Please ensure you've made the appropriate changes to the docs and submitted a PR.

Swagger changes require reference edge docs to be updated here
Make sure to create a branch and submit a PR into the edge branch instead of the default latest branch, as the swagger changes will not be available until the next release.

For more information on contributing to docs please visit https://docs.radapp.dev/contributing/docs/.

github-actions · 2023-10-12T21:43:22Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	radius-project/radius
Commit ref	refs/pull/6450/merge
Unique ID	231aa79838
Image tag	pr-231aa79838

Click here to see the list of tools in the current test run

gotestsum 1.10.0
KinD: v0.20.0
Dapr: 1.11.0
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.1.0
Bicep recipe location radiusdev.azurecr.io/test/functional/shared/recipes/<name>:pr-231aa79838
Terraform recipe location http://tf-module-server.radius-test-tf-module-server.svc.cluster.local/<name>.zip (in cluster)
applications-rp test image location: ghcr.io/radius-project/dev/applications-rp:pr-231aa79838
controller test image location: ghcr.io/radius-project/dev/controller:pr-231aa79838
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-231aa79838
deployment-engine test image location: radius.azurecr.io/deployment-engine:latest

Test Status

⌛ Building Radius and pushing container images for functional tests...
✅ Container images build succeeded
⌛ Publishing Bicep Recipes for functional tests...
✅ Recipe publishing succeeded
⌛ Starting shared functional tests...
⌛ Starting ucp functional tests...
⌛ Starting datastoresrp functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting samples functional tests...
✅ samples functional tests succeeded
✅ ucp functional tests succeeded
❌ msgrp functional test failed. Please check the logs for more details

github-actions · 2023-10-12T22:34:55Z

You are editing files which require a docs update. Please ensure you've made the appropriate changes to the docs and submitted a PR.

Swagger changes require reference edge docs to be updated here
Make sure to create a branch and submit a PR into the edge branch instead of the default latest branch, as the swagger changes will not be available until the next release.

For more information on contributing to docs please visit https://docs.radapp.dev/contributing/docs/.

github-actions · 2023-10-12T22:35:19Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	radius-project/radius
Commit ref	refs/pull/6450/merge
Unique ID	799447ff6b
Image tag	pr-799447ff6b

Click here to see the list of tools in the current test run

gotestsum 1.10.0
KinD: v0.20.0
Dapr: 1.11.0
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.1.0
Bicep recipe location radiusdev.azurecr.io/test/functional/shared/recipes/<name>:pr-799447ff6b
Terraform recipe location http://tf-module-server.radius-test-tf-module-server.svc.cluster.local/<name>.zip (in cluster)
applications-rp test image location: ghcr.io/radius-project/dev/applications-rp:pr-799447ff6b
controller test image location: ghcr.io/radius-project/dev/controller:pr-799447ff6b
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-799447ff6b
deployment-engine test image location: radius.azurecr.io/deployment-engine:latest

Test Status

⌛ Building Radius and pushing container images for functional tests...
✅ Container images build succeeded
⌛ Publishing Bicep Recipes for functional tests...
✅ Recipe publishing succeeded
⌛ Starting ucp functional tests...
⌛ Starting samples functional tests...
⌛ Starting shared functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting datastoresrp functional tests...
✅ samples functional tests succeeded
❌ datastoresrp functional test failed. Please check the logs for more details

github-actions · 2023-10-12T22:54:21Z

For the detailed report, please go to Checks tab, click Build and Test, and then download unit_test_coverage artifact at the bottom of build page.

Your PR branch coverage: 66.5 %
main branch coverage: 66.5 %
diff coverage: 0 %

The coverage result does not include the functional test coverage.

github-actions · 2023-10-12T23:01:19Z

You are editing files which require a docs update. Please ensure you've made the appropriate changes to the docs and submitted a PR.

Swagger changes require reference edge docs to be updated here
Make sure to create a branch and submit a PR into the edge branch instead of the default latest branch, as the swagger changes will not be available until the next release.

For more information on contributing to docs please visit https://docs.radapp.dev/contributing/docs/.

Signed-off-by: vinayada1 <[email protected]>

github-actions · 2023-11-02T23:14:38Z

For the detailed report, please go to Checks tab, click Build and Test, and then download unit_test_coverage artifact at the bottom of build page.

Your PR branch coverage: 65.1 %
main branch coverage: 65.1 %
diff coverage: 0 %

The coverage result does not include the functional test coverage.

test/functional/testUtil.go

typespec/radius/v1/resources.tsp

Co-authored-by: Shalabh Mohan Shrivastava <[email protected]> Signed-off-by: vinayada1 <[email protected]>

Signed-off-by: vinayada1 <[email protected]>

github-actions · 2023-11-03T18:38:25Z

For the detailed report, please go to Checks tab, click Build and Test, and then download unit_test_coverage artifact at the bottom of build page.

Your PR branch coverage: 64.9 %
main branch coverage: 64.9 %
diff coverage: 0 %

The coverage result does not include the functional test coverage.

Signed-off-by: vinayada1 <[email protected]>

github-actions · 2023-11-03T19:30:26Z

For the detailed report, please go to Checks tab, click Build and Test, and then download unit_test_coverage artifact at the bottom of build page.

Your PR branch coverage: 64.9 %
main branch coverage: 64.9 %
diff coverage: 0 %

The coverage result does not include the functional test coverage.

github-actions · 2023-11-03T20:38:13Z

For the detailed report, please go to Checks tab, click Build and Test, and then download unit_test_coverage artifact at the bottom of build page.

Your PR branch coverage: 64.9 %
main branch coverage: 64.9 %
diff coverage: 0 %

The coverage result does not include the functional test coverage.

github-actions · 2023-11-03T21:30:52Z

For the detailed report, please go to Checks tab, click Build and Test, and then download unit_test_coverage artifact at the bottom of build page.

Your PR branch coverage: 65.0 %
main branch coverage: 64.9 %
diff coverage: .1 %

The coverage result does not include the functional test coverage.

kachawla

@vinayada1 Can you merge the bicep changes as well radius-project/bicep#684?

vinayada1 requested review from a team as code owners October 10, 2023 22:03

ytimocin reviewed Oct 10, 2023

View reviewed changes

hack/bicep-types-radius/generated/applications/applications.core/2023-10-01-preview/types.md Outdated Show resolved Hide resolved

ytimocin reviewed Oct 10, 2023

View reviewed changes

rynowak reviewed Oct 10, 2023

View reviewed changes

typespec/radius/v1/resources.tsp Outdated Show resolved Hide resolved

rynowak reviewed Oct 10, 2023

View reviewed changes

typespec/radius/v1/resources.tsp Show resolved Hide resolved

rynowak reviewed Oct 11, 2023

View reviewed changes

pkg/corerp/api/v20231001preview/extender_conversion.go Outdated Show resolved Hide resolved

rynowak reviewed Oct 11, 2023

View reviewed changes

pkg/datastoresrp/api/v20231001preview/rediscache_conversion_test.go Outdated Show resolved Hide resolved

rynowak reviewed Oct 11, 2023

View reviewed changes

pkg/portableresources/backend/controller/createorupdateresource.go Outdated Show resolved Hide resolved

rynowak reviewed Oct 11, 2023

View reviewed changes

pkg/recipes/types.go Outdated Show resolved Hide resolved

rynowak reviewed Oct 11, 2023

View reviewed changes

pkg/rp/v1/recipe.go Outdated Show resolved Hide resolved

rynowak reviewed Oct 11, 2023

View reviewed changes

pkg/rp/v1/types.go Outdated Show resolved Hide resolved

kachawla reviewed Oct 11, 2023

View reviewed changes

kachawla reviewed Oct 12, 2023

View reviewed changes

kachawla requested changes Oct 12, 2023

View reviewed changes

pkg/corerp/api/v20231001preview/extender_conversion.go Outdated Show resolved Hide resolved

pkg/recipes/driver/bicep.go Outdated Show resolved Hide resolved

kachawla reviewed Oct 12, 2023

View reviewed changes

pkg/recipes/types.go Outdated Show resolved Hide resolved

vinayada1 force-pushed the templatekindpath branch from 07466d2 to 6008376 Compare October 12, 2023 19:02

This comment has been minimized.

Sign in to view

ytimocin mentioned this pull request Oct 12, 2023

Store and return the Recipe that was used as part of portable resources #6440

Closed

vinayada1 force-pushed the templatekindpath branch from 6008376 to c7ae148 Compare October 12, 2023 21:42

vinayada1 force-pushed the templatekindpath branch from c7ae148 to 21d5420 Compare October 12, 2023 22:34

vinayada1 added 3 commits November 2, 2023 15:58

Show recipe template kind and path in the status

aca7b4b

Signed-off-by: vinayada1 <[email protected]>

fix comments

883ef7a

Signed-off-by: vinayada1 <[email protected]>

add comments

2f6d7a7

Signed-off-by: vinayada1 <[email protected]>

vinayada1 force-pushed the templatekindpath branch from a4dda09 to 2f6d7a7 Compare November 2, 2023 22:58

kachawla previously approved these changes Nov 3, 2023

View reviewed changes

test/functional/testUtil.go Outdated Show resolved Hide resolved

shalabhms reviewed Nov 3, 2023

View reviewed changes

typespec/radius/v1/resources.tsp Outdated Show resolved Hide resolved

shalabhms previously approved these changes Nov 3, 2023

View reviewed changes

Merge branch 'main' into templatekindpath

ab4ced4

shalabhms assigned vinayada1 Nov 3, 2023

Update typespec/radius/v1/resources.tsp

4c8b128

Co-authored-by: Shalabh Mohan Shrivastava <[email protected]> Signed-off-by: vinayada1 <[email protected]>

vinayada1 dismissed stale reviews from shalabhms and kachawla via 4c8b128 November 3, 2023 18:15

remove unwanted change

fa73804

Signed-off-by: vinayada1 <[email protected]>

vinayada1 force-pushed the templatekindpath branch from bd74757 to fa73804 Compare November 3, 2023 18:18

kachawla previously approved these changes Nov 3, 2023

View reviewed changes

vinayada1 dismissed kachawla’s stale review via 2263f58 November 3, 2023 18:47

Run make generate

54760a2

Signed-off-by: vinayada1 <[email protected]>

vinayada1 force-pushed the templatekindpath branch from 2263f58 to 54760a2 Compare November 3, 2023 19:21

Merge branch 'main' into templatekindpath

20cfcc4

Merge branch 'main' into templatekindpath

2c920c4

shalabhms self-requested a review November 3, 2023 21:14

shalabhms approved these changes Nov 3, 2023

View reviewed changes

vinayada1 merged commit deffd81 into main Nov 3, 2023
17 checks passed

vinayada1 deleted the templatekindpath branch November 3, 2023 21:35

kachawla reviewed Nov 6, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Show recipe template kind and path in the status #6450

Show recipe template kind and path in the status #6450

vinayada1 commented Oct 10, 2023 •

edited by ghost

Loading

ytimocin left a comment

kachawla Oct 12, 2023

kachawla left a comment

github-actions bot commented Oct 12, 2023

This comment has been minimized.

github-actions bot commented Oct 12, 2023 •

edited

Loading

github-actions bot commented Oct 12, 2023 •

edited

Loading

github-actions bot commented Oct 12, 2023

github-actions bot commented Oct 12, 2023 •

edited

Loading

github-actions bot commented Oct 12, 2023

github-actions bot commented Oct 12, 2023 •

edited

Loading

github-actions bot commented Oct 12, 2023

github-actions bot commented Oct 12, 2023

github-actions bot commented Nov 2, 2023

github-actions bot commented Nov 3, 2023

github-actions bot commented Nov 3, 2023

github-actions bot commented Nov 3, 2023

github-actions bot commented Nov 3, 2023

kachawla left a comment

Show recipe template kind and path in the status #6450

Show recipe template kind and path in the status #6450

Conversation

vinayada1 commented Oct 10, 2023 • edited by ghost Loading

Description

Type of change

Auto-generated summary

🤖 Generated by Copilot at e1cbaec

Summary

Walkthrough

ytimocin left a comment

Choose a reason for hiding this comment

kachawla Oct 12, 2023

Choose a reason for hiding this comment

kachawla left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 12, 2023

This comment has been minimized.

github-actions bot commented Oct 12, 2023 • edited Loading

Test Results

github-actions bot commented Oct 12, 2023 • edited Loading

github-actions bot commented Oct 12, 2023

github-actions bot commented Oct 12, 2023 • edited Loading

Radius functional test overview

Test Status

github-actions bot commented Oct 12, 2023

github-actions bot commented Oct 12, 2023 • edited Loading

Radius functional test overview

Test Status

github-actions bot commented Oct 12, 2023

github-actions bot commented Oct 12, 2023

github-actions bot commented Nov 2, 2023

github-actions bot commented Nov 3, 2023

github-actions bot commented Nov 3, 2023

github-actions bot commented Nov 3, 2023

github-actions bot commented Nov 3, 2023

kachawla left a comment

Choose a reason for hiding this comment

vinayada1 commented Oct 10, 2023 •

edited by ghost

Loading

`🤖 Generated by Copilot at e1cbaec`

github-actions bot commented Oct 12, 2023 •

edited

Loading

github-actions bot commented Oct 12, 2023 •

edited

Loading

github-actions bot commented Oct 12, 2023 •

edited

Loading

github-actions bot commented Oct 12, 2023 •

edited

Loading