Update typespec to support all Terraform Recipe Providers and Env #7202

ytimocin · 2024-02-27T22:42:24Z

Description

Updated TypeSpec by adding Providers and EnvVariables to Environment resource (w/o Secrets)
Updated Data Models by adding Providers and EnvVariables to Environment resource (w/o Secrets)
Updated the Environment Conversion logic and its tests
Updated RecipeConfigProperties

Note: Secrets for both Providers and EnvSecrets will be added in another PR.

Design doc: radius-project/design-notes#39

Type of change

This pull request adds or changes features of Radius and has an approved issue (issue link required).
Fixes: part of Allow any Terraform provider to be configured and used in a Recipe #6539

lakshmimsft · 2024-02-27T23:25:24Z

pkg/corerp/datamodel/recipe_types.go

+// EnvironmentVariables represents the environment variables to be set for the recipe execution.
+type EnvironmentVariables struct {
+	// AdditionalProperties represents the non-sensitive environment variables to be set for the recipe execution.
+	// Environment variables that contain sensitive values are specified in the Secrets and are fetched from the `Applications.Core/secretStores` resource.


this comment is not applicable for now..otherwise LGTM

radius-functional-tests · 2024-02-27T23:36:49Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	ytimocin/radius
Commit ref	`b0e0822`
Unique ID	df0eca59ba
Image tag	pr-df0eca59ba

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

gotestsum 1.10.0
KinD: v0.20.0
Dapr: 1.12.0
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.1.0
Bicep recipe location ghcr.io/radius-project/dev/test/functional/shared/recipes/<name>:pr-df0eca59ba
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-df0eca59ba
controller test image location: ghcr.io/radius-project/dev/controller:pr-df0eca59ba
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-df0eca59ba
deployment-engine test image location: ghcr.io/radius-project/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 datastoresrp functional tests...
⌛ Starting samples functional tests...
⌛ Starting msgrp functional tests...
⌛ Starting kubernetes functional tests...
⌛ Starting ucp functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting shared functional tests...
✅ msgrp functional tests succeeded
✅ samples functional tests succeeded
✅ kubernetes functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ ucp functional tests succeeded
✅ daprrp functional tests succeeded
✅ shared functional tests succeeded

pkg/corerp/api/v20231001preview/environment_conversion_test.go

pkg/corerp/api/v20231001preview/testdata/environmentresource-with-workload-identity.json

...nager/Applications.Core/preview/2023-10-01-preview/examples/Environments_CreateOrUpdate.json

kachawla

Please make sure to merge the bicep PR after this is merged.

radius-functional-tests · 2024-02-28T00:18:44Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	ytimocin/radius
Commit ref	`3ef04be`
Unique ID	10e4c5730f
Image tag	pr-10e4c5730f

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

gotestsum 1.10.0
KinD: v0.20.0
Dapr: 1.12.0
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.1.0
Bicep recipe location ghcr.io/radius-project/dev/test/functional/shared/recipes/<name>:pr-10e4c5730f
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-10e4c5730f
controller test image location: ghcr.io/radius-project/dev/controller:pr-10e4c5730f
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-10e4c5730f
deployment-engine test image location: ghcr.io/radius-project/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 kubernetes functional tests...
⌛ Starting msgrp functional tests...
⌛ Starting samples functional tests...
⌛ Starting ucp functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting shared functional tests...
⌛ Starting datastoresrp functional tests...
✅ kubernetes functional tests succeeded
✅ msgrp functional tests succeeded
✅ samples functional tests succeeded
✅ ucp functional tests succeeded
✅ daprrp functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ shared functional tests succeeded

radius-functional-tests · 2024-02-28T00:21:21Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	ytimocin/radius
Commit ref	`65b6749`
Unique ID	13fd9e734e
Image tag	pr-13fd9e734e

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

gotestsum 1.10.0
KinD: v0.20.0
Dapr: 1.12.0
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.1.0
Bicep recipe location ghcr.io/radius-project/dev/test/functional/shared/recipes/<name>:pr-13fd9e734e
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-13fd9e734e
controller test image location: ghcr.io/radius-project/dev/controller:pr-13fd9e734e
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-13fd9e734e
deployment-engine test image location: ghcr.io/radius-project/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 kubernetes functional tests...
⌛ Starting shared functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting ucp functional tests...
⌛ Starting msgrp functional tests...
⌛ Starting datastoresrp functional tests...
⌛ Starting samples functional tests...
✅ kubernetes functional tests succeeded
✅ msgrp functional tests succeeded
✅ samples functional tests succeeded
✅ daprrp functional tests succeeded
✅ ucp functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ shared functional tests succeeded

pkg/corerp/api/v20231001preview/environment_conversion_test.go

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

radius-functional-tests · 2024-02-28T00:46:02Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	ytimocin/radius
Commit ref	`933682a`
Unique ID	8b511678c1
Image tag	pr-8b511678c1

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

gotestsum 1.10.0
KinD: v0.20.0
Dapr: 1.12.0
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.1.0
Bicep recipe location ghcr.io/radius-project/dev/test/functional/shared/recipes/<name>:pr-8b511678c1
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-8b511678c1
controller test image location: ghcr.io/radius-project/dev/controller:pr-8b511678c1
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-8b511678c1
deployment-engine test image location: ghcr.io/radius-project/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 samples functional tests...
⌛ Starting kubernetes functional tests...
⌛ Starting shared functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting ucp functional tests...
⌛ Starting msgrp functional tests...
⌛ Starting datastoresrp functional tests...
✅ kubernetes functional tests succeeded
✅ samples functional tests succeeded
✅ msgrp functional tests succeeded
✅ ucp functional tests succeeded
✅ daprrp functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ shared functional tests succeeded

kachawla

Should the original PR #7199 be closed now?

ytimocin · 2024-02-28T00:59:24Z

Should the original PR #7199 be closed now?

Yes, I will close that.

…dius-project#7202) # Description * Updated TypeSpec by adding Providers and EnvVariables to Environment resource (w/o Secrets) * Updated Data Models by adding Providers and EnvVariables to Environment resource (w/o Secrets) * Updated the Environment Conversion logic and its tests * Updated RecipeConfigProperties Note: **Secrets** for both **Providers** and **EnvSecrets** will be added in another PR. Design doc: radius-project/design-notes#39 ## Type of change - This pull request adds or changes features of Radius and has an approved issue (issue link required). Fixes: part of radius-project#6539 Signed-off-by: ytimocin <[email protected]>

ytimocin requested review from a team as code owners February 27, 2024 22:42

lakshmimsft reviewed Feb 27, 2024

View reviewed changes

ytimocin force-pushed the ytimocin/addProvidersAndEnv branch from 57eed01 to b0e0822 Compare February 27, 2024 23:35

ytimocin requested a review from lakshmimsft February 27, 2024 23:35

ytimocin temporarily deployed to functional-tests February 27, 2024 23:36 — with GitHub Actions Inactive

lakshmimsft previously approved these changes Feb 27, 2024

View reviewed changes

kachawla reviewed Feb 27, 2024

View reviewed changes

...nager/Applications.Core/preview/2023-10-01-preview/examples/Environments_CreateOrUpdate.json Show resolved Hide resolved

kachawla reviewed Feb 28, 2024

View reviewed changes

ytimocin dismissed lakshmimsft’s stale review via fbfb3c5 February 28, 2024 00:14

ytimocin force-pushed the ytimocin/addProvidersAndEnv branch 2 times, most recently from fbfb3c5 to 3ef04be Compare February 28, 2024 00:16

ytimocin requested review from kachawla and lakshmimsft February 28, 2024 00:17

ytimocin temporarily deployed to functional-tests February 28, 2024 00:17 — with GitHub Actions Inactive

ytimocin force-pushed the ytimocin/addProvidersAndEnv branch from 3ef04be to 65b6749 Compare February 28, 2024 00:18

ytimocin temporarily deployed to functional-tests February 28, 2024 00:20 — with GitHub Actions Inactive

kachawla reviewed Feb 28, 2024

View reviewed changes

pkg/corerp/api/v20231001preview/environment_conversion_test.go Show resolved Hide resolved

Update typespec to support all Terraform Recipe Providers and Env

933682a

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

ytimocin force-pushed the ytimocin/addProvidersAndEnv branch from 65b6749 to 933682a Compare February 28, 2024 00:44

ytimocin temporarily deployed to functional-tests February 28, 2024 00:45 — with GitHub Actions Inactive

ytimocin requested a review from kachawla February 28, 2024 00:45

kachawla approved these changes Feb 28, 2024

View reviewed changes

lakshmimsft approved these changes Feb 28, 2024

View reviewed changes

ytimocin merged commit 3cc1f92 into radius-project:main Feb 28, 2024
17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update typespec to support all Terraform Recipe Providers and Env #7202

Update typespec to support all Terraform Recipe Providers and Env #7202

ytimocin commented Feb 27, 2024 •

edited

Loading

lakshmimsft Feb 27, 2024 •

edited

Loading

radius-functional-tests bot commented Feb 27, 2024 •

edited

Loading

kachawla left a comment

radius-functional-tests bot commented Feb 28, 2024 •

edited

Loading

radius-functional-tests bot commented Feb 28, 2024 •

edited

Loading

radius-functional-tests bot commented Feb 28, 2024 •

edited

Loading

kachawla left a comment

ytimocin commented Feb 28, 2024

Update typespec to support all Terraform Recipe Providers and Env #7202

Update typespec to support all Terraform Recipe Providers and Env #7202

Conversation

ytimocin commented Feb 27, 2024 • edited Loading

Description

Type of change

lakshmimsft Feb 27, 2024 • edited Loading

Choose a reason for hiding this comment

radius-functional-tests bot commented Feb 27, 2024 • edited Loading

Radius functional test overview

Test Status

kachawla left a comment

Choose a reason for hiding this comment

radius-functional-tests bot commented Feb 28, 2024 • edited Loading

Radius functional test overview

Test Status

radius-functional-tests bot commented Feb 28, 2024 • edited Loading

Radius functional test overview

Test Status

radius-functional-tests bot commented Feb 28, 2024 • edited Loading

Radius functional test overview

Test Status

kachawla left a comment

Choose a reason for hiding this comment

ytimocin commented Feb 28, 2024

ytimocin commented Feb 27, 2024 •

edited

Loading

lakshmimsft Feb 27, 2024 •

edited

Loading

radius-functional-tests bot commented Feb 27, 2024 •

edited

Loading

radius-functional-tests bot commented Feb 28, 2024 •

edited

Loading

radius-functional-tests bot commented Feb 28, 2024 •

edited

Loading

radius-functional-tests bot commented Feb 28, 2024 •

edited

Loading