remove hardcoded list of resource types from cli. #8286

nithyatsu · 2025-01-23T21:22:54Z

Description

Since we now register resource provider manifests at startup and are in process of enabling UDT end to end, we should not use static resource type lists.

This PR removes static resource type lists in cli code.

Type of change

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

Part of #6688

Contributor checklist

Please verify that the PR meets the following requirements, where applicable:

An overview of proposed schema changes is included in a linked GitHub issue.
- Yes
- [X ] Not applicable
A design document PR is created in the design-notes repository, if new APIs are being introduced.
- Yes
- [X ] Not applicable
The design document has been reviewed and approved by Radius maintainers/approvers.
- Yes
- [ X] Not applicable
A PR for the samples repository is created, if existing samples are affected by the changes in this PR.
- Yes
- [X ] Not applicable
A PR for the documentation repository is created, if the changes in this PR affect the documentation or any user facing updates are made.
- Yes
- [X ] Not applicable
A PR for the recipes repository is created, if existing recipes are affected by the changes in this PR.
- Yes
- [ X] Not applicable

codecov · 2025-01-24T00:42:55Z

Codecov Report

Attention: Patch coverage is 62.50000% with 30 lines in your changes missing coverage. Please review.

Project coverage is 59.80%. Comparing base (4c769e9) to head (afa6423).
Report is 10 commits behind head on main.

Files with missing lines	Patch %	Lines
pkg/cli/clients/management.go	55.55%	16 Missing and 8 partials ⚠️
pkg/cli/cmd/resource/list/list.go	60.00%	4 Missing and 2 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8286      +/-   ##
==========================================
- Coverage   59.84%   59.80%   -0.04%     
==========================================
  Files         590      590              
  Lines       39513    39535      +22     
==========================================
- Hits        23645    23643       -2     
- Misses      14110    14126      +16     
- Partials     1758     1766       +8

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

radius-functional-tests · 2025-01-24T21:15:31Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	nithyatsu/radius
Commit ref	`303cf36`
Unique ID	func172c46f57a
Image tag	pr-func172c46f57a

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

gotestsum 1.12.0
KinD: v0.20.0
Dapr:
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.3.0
Bicep recipe location ghcr.io/radius-project/dev/test/testrecipes/test-bicep-recipes/<name>:pr-func172c46f57a
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-func172c46f57a
dynamic-rp test image location: ghcr.io/radius-project/dev/dynamic-rp:pr-func172c46f57a
controller test image location: ghcr.io/radius-project/dev/controller:pr-func172c46f57a
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-func172c46f57a
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 corerp-cloud functional tests...
⌛ Starting ucp-cloud functional tests...
✅ ucp-cloud functional tests succeeded
✅ corerp-cloud functional tests succeeded

radius-functional-tests · 2025-01-24T22:16:12Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	nithyatsu/radius
Commit ref	`2434061`
Unique ID	funcbbf2770f0e
Image tag	pr-funcbbf2770f0e

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

gotestsum 1.12.0
KinD: v0.20.0
Dapr:
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.3.0
Bicep recipe location ghcr.io/radius-project/dev/test/testrecipes/test-bicep-recipes/<name>:pr-funcbbf2770f0e
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-funcbbf2770f0e
dynamic-rp test image location: ghcr.io/radius-project/dev/dynamic-rp:pr-funcbbf2770f0e
controller test image location: ghcr.io/radius-project/dev/controller:pr-funcbbf2770f0e
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-funcbbf2770f0e
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 ucp-cloud functional tests...
✅ ucp-cloud functional tests succeeded
✅ corerp-cloud functional tests succeeded

radius-functional-tests · 2025-01-24T23:09:58Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	nithyatsu/radius
Commit ref	`f21c211`
Unique ID	func5b15493f3d
Image tag	pr-func5b15493f3d

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

gotestsum 1.12.0
KinD: v0.20.0
Dapr:
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.3.0
Bicep recipe location ghcr.io/radius-project/dev/test/testrecipes/test-bicep-recipes/<name>:pr-func5b15493f3d
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-func5b15493f3d
dynamic-rp test image location: ghcr.io/radius-project/dev/dynamic-rp:pr-func5b15493f3d
controller test image location: ghcr.io/radius-project/dev/controller:pr-func5b15493f3d
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-func5b15493f3d
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 ucp-cloud functional tests...
⌛ Starting corerp-cloud functional tests...
✅ ucp-cloud functional tests succeeded
✅ corerp-cloud functional tests succeeded

radius-functional-tests · 2025-01-24T23:56:25Z

Radius functional test overview

🔍 Go to test action run

Name	Value
Repository	nithyatsu/radius
Commit ref	`afa6423`
Unique ID	func9145f55183
Image tag	pr-func9145f55183

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

gotestsum 1.12.0
KinD: v0.20.0
Dapr:
Azure KeyVault CSI driver: 1.4.2
Azure Workload identity webhook: 1.3.0
Bicep recipe location ghcr.io/radius-project/dev/test/testrecipes/test-bicep-recipes/<name>:pr-func9145f55183
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-func9145f55183
dynamic-rp test image location: ghcr.io/radius-project/dev/dynamic-rp:pr-func9145f55183
controller test image location: ghcr.io/radius-project/dev/controller:pr-func9145f55183
ucp test image location: ghcr.io/radius-project/dev/ucpd:pr-func9145f55183
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 ucp-cloud functional tests...
⌛ Starting corerp-cloud functional tests...
✅ ucp-cloud functional tests succeeded
✅ corerp-cloud functional tests succeeded

pkg/cli/clients/management.go

ytimocin · 2025-01-25T00:49:44Z

pkg/cli/clients/management.go

+	}
+
+	resourceTypeNames := []string{}
+	for _, summary := range resourceProviderSummaries {


Renaming summary to resourceProvider would make things clearer in the code below.

ytimocin · 2025-01-25T00:50:47Z

pkg/cli/clients/management.go

+		return nil, err
+	}
+
+	ResourceTypesList, err := amc.ListAllResourceTypesNames(ctx, "local")


Suggested change

ResourceTypesList, err := amc.ListAllResourceTypesNames(ctx, "local")

resourceTypesList, err := amc.ListAllResourceTypesNames(ctx, "local")

variables should start with lower case letters

pkg/cli/clients/management_test.go

ytimocin · 2025-01-25T00:59:07Z

pkg/cli/clivalidation.go

-	} else if len(foundTypes) > 1 {
-		return "", fmt.Errorf("multiple resource types match '%s'. Please specify the full resource type and try again:\n\n%s\n",
-			resourceTypeName, strings.Join(foundTypes, "\n"))
+	if !strings.Contains(resourceTypeName, "/") {


Is this the only check for the resource type?

ytimocin · 2025-01-25T01:00:04Z

pkg/cli/cmd/resource/create/create.go

-rad resource create 'Applications.Core/containers' mycontainer -f /path/to/input.json`,
+rad resource create 'applications.core/containers' mycontainer -f /path/to/input.json`,


Do we only support the lower case now? Why not both?

No, the types are stored normalized. I was just trying keep it consistent in docs. we soecify only the type name for creation so I have updated this text.

nithya@MacBook-Pro radius % rad resource-provider show applications.core RESOURCE TYPE STATE Applications.Core

pkg/cli/cmd/resource/list/list.go

pkg/cli/clients/management.go

pkg/cli/clients/management_test.go

pkg/cli/cmd/resource/delete/delete.go

kachawla · 2025-01-29T03:01:22Z

pkg/cli/cmd/resource/delete/delete_test.go

@@ -44,7 +44,7 @@ func Test_Validate(t *testing.T) {
 	testcases := []radcli.ValidateInput{
 		{
 			Name:          "Valid Delete Command",


Can we add a test for delete with unsupported resource type?

looks like all the rad resource commands will need a test for resource type and provider's existence before processing the request. Is it OK to create a ticket to address this as another task?

kachawla · 2025-01-29T03:03:43Z

pkg/cli/cmd/resource/list/list.go

+	parts := strings.Split(r.ResourceType, "/")
+	if len(parts) != 2 {
+		return clierrors.Message("Invalid resource type %q. Expected format: '<provider>/<type>'", r.ResourceType)
+	}
+	resourceProviderNamespace := parts[0]
+	resourceTypeSuffix := parts[1]
+	_, err = common.GetResourceTypeDetails(ctx, resourceProviderNamespace, resourceTypeSuffix, client)
+	if err != nil {
+		return err
+	}


Why is this needed in addtion to RequireResourceType?

the user enters a fully qualified name, liek applications.core/container, which is checked for correctness. But a lot of api calls need one of the provider or type. So we are having to split it again. Mostly this call is used in rad resource commands and I would like to talk a bit more about it, to discuss introducing another function RequireFullyQualifiedResourceType which can return in desired format.

kachawla · 2025-01-29T03:04:41Z

pkg/cli/cmd/resource/list/list_test.go

-			Name:          "List Command with ambiguous args",
-			Input:         []string{"secretStores"},
-			ExpectedValid: false,
-			ConfigHolder: framework.ConfigHolder{
-				ConfigFilePath: "",
-				Config:         configWithWorkspace,
-			},


What did we change to remove this scenario?

kachawla · 2025-01-29T03:07:44Z

test/functional-portable/datastoresrp/noncloud/resources/simulated_environment_test.go

+				if strings.EqualFold(*resources[0].Type, "Applications.Datastores/mongoDatabases") {
+					require.Equal(t, mongoDBName, *resources[0].Name)
+					require.Equal(t, "Applications.Core/containers", *resources[1].Type)
+					require.Equal(t, containerName, *resources[1].Name)
+				} else {
+					require.Equal(t, "Applications.Core/containers", *resources[0].Type)
+					require.Equal(t, containerName, *resources[0].Name)
+					require.Equal(t, mongoDBName, *resources[1].Name)
+					require.Equal(t, "Applications.Datastores/mongoDatabases", *resources[1].Type)
+				}


This is interesting.. how was the order guaranteed before?

I am not sure .. but when I debuged I noticed only the order was different when it failed.

nithyatsu temporarily deployed to publish-bicep January 23, 2025 21:23 — with GitHub Actions Inactive

nithyatsu temporarily deployed to publish-bicep January 23, 2025 23:42 — with GitHub Actions Inactive

nithyatsu temporarily deployed to publish-bicep January 24, 2025 00:15 — with GitHub Actions Inactive

nithyatsu temporarily deployed to publish-bicep January 24, 2025 00:29 — with GitHub Actions Inactive

nithyatsu force-pushed the cleanup_cli branch from 4ec7b77 to 3c5e6e0 Compare January 24, 2025 16:47

nithyatsu temporarily deployed to publish-bicep January 24, 2025 16:47 — with GitHub Actions Inactive

nithyatsu temporarily deployed to publish-bicep January 24, 2025 18:03 — with GitHub Actions Inactive

nithyatsu temporarily deployed to publish-bicep January 24, 2025 19:36 — with GitHub Actions Inactive

nithyatsu temporarily deployed to publish-bicep January 24, 2025 19:54 — with GitHub Actions Inactive

nithyatsu temporarily deployed to functional-tests January 24, 2025 21:14 — with GitHub Actions Inactive

nithyatsu added 11 commits January 24, 2025 13:17

cleanup #1

1a0edb0

wip

1a04f7a

cleanup tests

cbf2905

fix tests

079aac5

fix mocks

fea929d

fix show tests

23628d8

fix test to not depend on order of list of resources

ac25b29

wip

83940c2

wip

816150f

wip

ac1821a

refactor

d18246c

nithyatsu force-pushed the cleanup_cli branch from 303cf36 to d18246c Compare January 24, 2025 21:55

nithyatsu temporarily deployed to publish-bicep January 24, 2025 21:55 — with GitHub Actions Inactive

wip

2434061

nithyatsu temporarily deployed to publish-bicep January 24, 2025 22:11 — with GitHub Actions Inactive

nithyatsu temporarily deployed to functional-tests January 24, 2025 22:15 — with GitHub Actions Inactive

lint fix

6e1300c

nithyatsu temporarily deployed to publish-bicep January 24, 2025 22:26 — with GitHub Actions Inactive

edit UI texts to show fully qualified resource names

b6384b7

nithyatsu had a problem deploying to publish-bicep January 24, 2025 22:53 — with GitHub Actions Error

revert launch.json

f21c211

nithyatsu marked this pull request as ready for review January 24, 2025 22:54

nithyatsu requested review from a team as code owners January 24, 2025 22:54

nithyatsu temporarily deployed to publish-bicep January 24, 2025 22:54 — with GitHub Actions Inactive

nithyatsu temporarily deployed to functional-tests January 24, 2025 23:09 — with GitHub Actions Inactive

wip

5bad52e

nithyatsu temporarily deployed to publish-bicep January 24, 2025 23:33 — with GitHub Actions Inactive

nit

afa6423

nithyatsu temporarily deployed to publish-bicep January 24, 2025 23:46 — with GitHub Actions Inactive

nithyatsu temporarily deployed to functional-tests January 24, 2025 23:55 — with GitHub Actions Inactive

ytimocin requested changes Jan 25, 2025

View reviewed changes

kachawla reviewed Jan 29, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove hardcoded list of resource types from cli. #8286

remove hardcoded list of resource types from cli. #8286

nithyatsu commented Jan 23, 2025 •

edited by kachawla

Loading

codecov bot commented Jan 24, 2025 •

edited

Loading

radius-functional-tests bot commented Jan 24, 2025 •

edited

Loading

radius-functional-tests bot commented Jan 24, 2025 •

edited

Loading

radius-functional-tests bot commented Jan 24, 2025 •

edited

Loading

radius-functional-tests bot commented Jan 24, 2025 •

edited

Loading

ytimocin Jan 25, 2025

ytimocin Jan 25, 2025

ytimocin Jan 25, 2025

ytimocin Jan 25, 2025

nithyatsu Jan 29, 2025

kachawla Jan 29, 2025

nithyatsu Jan 29, 2025

kachawla Jan 29, 2025

nithyatsu Jan 29, 2025

kachawla Jan 29, 2025

kachawla Jan 29, 2025

nithyatsu Jan 29, 2025

	ResourceTypesList, err := amc.ListAllResourceTypesNames(ctx, "local")
	resourceTypesList, err := amc.ListAllResourceTypesNames(ctx, "local")

		rad resource create 'Applications.Core/containers' mycontainer -f /path/to/input.json`,
		rad resource create 'applications.core/containers' mycontainer -f /path/to/input.json`,

remove hardcoded list of resource types from cli. #8286

Are you sure you want to change the base?

remove hardcoded list of resource types from cli. #8286

Conversation

nithyatsu commented Jan 23, 2025 • edited by kachawla Loading

Description

Type of change

Contributor checklist

codecov bot commented Jan 24, 2025 • edited Loading

Codecov Report

radius-functional-tests bot commented Jan 24, 2025 • edited Loading

Radius functional test overview

Test Status

radius-functional-tests bot commented Jan 24, 2025 • edited Loading

Radius functional test overview

Test Status

radius-functional-tests bot commented Jan 24, 2025 • edited Loading

Radius functional test overview

Test Status

radius-functional-tests bot commented Jan 24, 2025 • edited Loading

Radius functional test overview

Test Status

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nithyatsu commented Jan 23, 2025 •

edited by kachawla

Loading

codecov bot commented Jan 24, 2025 •

edited

Loading

radius-functional-tests bot commented Jan 24, 2025 •

edited

Loading

radius-functional-tests bot commented Jan 24, 2025 •

edited

Loading

radius-functional-tests bot commented Jan 24, 2025 •

edited

Loading

radius-functional-tests bot commented Jan 24, 2025 •

edited

Loading