Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add required_providers block to main.tf.config, functional test for Terraform Provider #7364

Merged
merged 19 commits into from
May 21, 2024
Merged

Add required_providers block to main.tf.config, functional test for Terraform Provider #7364

merged 19 commits into from
May 21, 2024

Conversation

lakshmimsft
Copy link
Contributor

@lakshmimsft lakshmimsft commented Mar 21, 2024 •
edited
Loading

Description

PR includes updates to Terraform Providers functionality including:

  1. Added required_providers block to main.tf.config file, (reading data from the loaded recipe module).
  2. Updated Save to include a json encoder to not escape HTML characters so data can be saved into config file as authored.
  3. Added a 'providers' block to module section if providers include 'alias', in main.tf.config in UpdateModuleWithProviderAliases()
  4. Updated unit tests and added functional test.

Type of change

Fixes: #7311

@radius-functional-tests

This comment was marked as outdated.

Sign in to view
@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch 2 times, most recently from 06a2e83 to dea0923 Compare March 22, 2024 18:19
@radius-functional-tests

This comment was marked as outdated.

Sign in to view
@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch from dea0923 to 060afba Compare March 22, 2024 21:06
@radius-functional-tests

This comment was marked as outdated.

Sign in to view
@radius-functional-tests

This comment was marked as outdated.

Sign in to view
@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch from b3f0891 to 99e84a0 Compare March 25, 2024 16:35
@radius-functional-tests

This comment was marked as outdated.

Sign in to view
@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch from 99e84a0 to 07583d2 Compare March 25, 2024 17:23
@radius-functional-tests

This comment was marked as outdated.

Sign in to view
@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch from 07583d2 to 1e2d857 Compare March 25, 2024 18:01
@radius-functional-tests

This comment was marked as outdated.

Sign in to view
@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch from 1e2d857 to e02f8b3 Compare March 25, 2024 18:27
@radius-functional-tests

This comment was marked as outdated.

Sign in to view
@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch 2 times, most recently from 4e884bf to d764663 Compare March 25, 2024 23:21
@radius-functional-tests

This comment was marked as outdated.

Sign in to view
@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch from 7175e25 to 9bc6038 Compare March 28, 2024 02:30
@radius-functional-tests

This comment was marked as outdated.

Sign in to view
kachawla
kachawla reviewed May 20, 2024
View reviewed changes
Copy link
Contributor

@kachawla kachawla left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One question about recent update in config.go: #7364 (comment). Looks good apart from that.

@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch from 8dae847 to 07a4aca Compare May 21, 2024 19:03
@lakshmimsft lakshmimsft temporarily deployed to functional-tests May 21, 2024 19:05 — with GitHub Actions Inactive
@radius-functional-tests
Copy link

radius-functional-tests bot commented May 21, 2024 •
edited
Loading

Radius functional test overview

🔍 Go to test action run

Name Value
Repository lakshmimsft/radius-mainfork
Commit ref 07a4aca
Unique ID func70cccbb40a
Image tag pr-func70cccbb40a
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/testrecipes/test-bicep-recipes/<name>:pr-func70cccbb40a
  • 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-func70cccbb40a
  • controller test image location: ghcr.io/radius-project/dev/controller:pr-func70cccbb40a
  • ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-func70cccbb40a
  • 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 msgrp functional tests...
⌛ Starting shared functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting cli functional tests...
⌛ Starting datastoresrp functional tests...
⌛ Starting samples functional tests...
⌛ Starting kubernetes functional tests...
⌛ Starting ucp functional tests...
✅ msgrp functional tests succeeded
✅ samples functional tests succeeded
✅ kubernetes functional tests succeeded
✅ daprrp functional tests succeeded
✅ ucp functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ cli functional tests succeeded
✅ shared functional tests succeeded

kachawla
kachawla previously approved these changes May 21, 2024
View reviewed changes
pkg/recipes/terraform/config/config.go
Comment on lines +259 to +261
// The function returns a map where the keys are provider names and the values are slices of maps.
// Each map in the slice represents a specific configuration for the corresponding provider.
// This structure allows for multiple configurations per provider.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a helpful comment, thanks for updating.

@lakshmimsft lakshmimsft force-pushed the lakshmimsft/terraformproviderfunctest branch from 07a4aca to 95781a5 Compare May 21, 2024 22:53
@lakshmimsft lakshmimsft temporarily deployed to functional-tests May 21, 2024 22:54 — with GitHub Actions Inactive
@radius-functional-tests
Copy link

radius-functional-tests bot commented May 21, 2024 •
edited
Loading

Radius functional test overview

🔍 Go to test action run

Name Value
Repository lakshmimsft/radius-mainfork
Commit ref 95781a5
Unique ID funcdd7101c2b2
Image tag pr-funcdd7101c2b2
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/testrecipes/test-bicep-recipes/<name>:pr-funcdd7101c2b2
  • 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-funcdd7101c2b2
  • controller test image location: ghcr.io/radius-project/dev/controller:pr-funcdd7101c2b2
  • ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-funcdd7101c2b2
  • 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 ucp functional tests...
⌛ Starting cli functional tests...
⌛ Starting daprrp functional tests...
⌛ Starting msgrp functional tests...
⌛ Starting kubernetes functional tests...
✅ samples functional tests succeeded
✅ msgrp functional tests succeeded
✅ ucp functional tests succeeded
✅ kubernetes functional tests succeeded
✅ datastoresrp functional tests succeeded
✅ daprrp functional tests succeeded
✅ cli functional tests succeeded
✅ shared functional tests succeeded

@lakshmimsft lakshmimsft merged commit 66aad2c into radius-project:main May 21, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kachawla kachawla kachawla approved these changes

@ytimocin ytimocin ytimocin left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@lakshmimsft @ytimocin @kachawla