Updating the api versions for clients #5018
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,18 +12,18 @@ import ( | |
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" | ||
| v1 "github.com/project-radius/radius/pkg/armrpc/api/v1" | ||
| "github.com/project-radius/radius/pkg/azure/azresources" | ||
| "github.com/project-radius/radius/pkg/azure/clientv2" | ||
| "github.com/project-radius/radius/pkg/corerp/datamodel" | ||
| "github.com/project-radius/radius/pkg/corerp/handlers" | ||
| "github.com/project-radius/radius/pkg/corerp/model" | ||
| "github.com/project-radius/radius/pkg/corerp/renderers" | ||
| "github.com/project-radius/radius/pkg/corerp/renderers/container" | ||
| radiustesting "github.com/project-radius/radius/pkg/corerp/testing" | ||
| linkrp_dm "github.com/project-radius/radius/pkg/linkrp/datamodel" | ||
|
Comment on lines
-24
to
25
|
||
| linkrp_renderers "github.com/project-radius/radius/pkg/linkrp/renderers" | ||
| "github.com/project-radius/radius/pkg/linkrp/renderers/mongodatabases" | ||
| "github.com/project-radius/radius/pkg/resourcekinds" | ||
| "github.com/project-radius/radius/pkg/resourcemodel" | ||
|
|
@@ -34,8 +34,6 @@ import ( | |
| "github.com/project-radius/radius/pkg/ucp/store" | ||
| "github.com/project-radius/radius/pkg/ucp/ucplog" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| "github.com/golang/mock/gomock" | ||
| "github.com/stretchr/testify/require" | ||
|
|
@@ -181,7 +179,7 @@ func buildMongoDBLinkWithRecipe() linkrp_dm.MongoDatabase { | |
| Application: "/subscriptions/test-sub/resourceGroups/test-group/providers/Applications.Core/applications/testApplication", | ||
| Environment: "/subscriptions/test-subscription/resourceGroups/test-resource-group/providers/Applications.Core/environments/env0", | ||
| }, | ||
| Mode: linkrp_dm.LinkModeRecipe, | ||
| }, | ||
| LinkMetadata: linkrp_dm.LinkMetadata{ | ||
| RecipeData: linkrp_dm.RecipeData{ | ||
|
|
@@ -195,7 +193,7 @@ func buildMongoDBLinkWithRecipe() linkrp_dm.MongoDatabase { | |
| }, | ||
| TemplatePath: "testpublicrecipe.azurecr.io/bicep/modules/mongodatabases:v1", | ||
| }, | ||
| APIVersion: clientv2.DocumentDBManagementClientAPIVersion, | ||
| Resources: []string{"/subscriptions/test-sub/resourceGroups/test-group/providers/Microsoft.DocumentDB/databaseAccounts/test-account", | ||
| "/subscriptions/test-sub/resourceGroups/test-group/providers/Microsoft.DocumentDB/databaseAccounts/test-account/mongodbDatabases/test-database"}, | ||
| }, | ||
|
|
@@ -207,7 +205,7 @@ func buildMongoDBResourceDataWithRecipeAndSecrets() ResourceData { | |
| testResource := buildMongoDBLinkWithRecipe() | ||
|
|
||
| secretValues := map[string]rp.SecretValueReference{} | ||
| secretValues[linkrp_renderers.ConnectionStringValue] = rp.SecretValueReference{ | ||
| LocalID: outputresource.LocalIDAzureCosmosAccount, | ||
| Action: "listConnectionStrings", | ||
| ValueSelector: "/connectionStrings/0/connectionString", | ||
|
|
@@ -218,7 +216,7 @@ func buildMongoDBResourceDataWithRecipeAndSecrets() ResourceData { | |
| } | ||
|
|
||
| computedValues := map[string]any{ | ||
| linkrp_renderers.DatabaseNameValue: "db", | ||
| } | ||
|
|
||
| testResource.ComputedValues = computedValues | ||
|
|
@@ -241,10 +239,10 @@ func buildMongoDBResourceDataWithRecipeAndSecrets() ResourceData { | |
| ResourceType: &accountResourceType, | ||
| Data: resourcemodel.ARMIdentity{ | ||
| ID: "/subscriptions/test-sub/resourceGroups/test-group/providers/Microsoft.DocumentDB/databaseAccounts/test-account", | ||
| APIVersion: clientv2.DocumentDBManagementClientAPIVersion, | ||
| }, | ||
| }, | ||
| RadiusManaged: to.Ptr(true), | ||
| }, | ||
| { | ||
| LocalID: outputresource.LocalIDAzureCosmosDBMongo, | ||
|
|
@@ -254,7 +252,7 @@ func buildMongoDBResourceDataWithRecipeAndSecrets() ResourceData { | |
| ResourceType: &dbResourceType, | ||
| Data: resourcemodel.ARMIdentity{ | ||
| ID: "/subscriptions/test-sub/resourceGroups/test-group/providers/Microsoft.DocumentDB/databaseAccounts/test-account/mongodbDatabases/test-database", | ||
| APIVersion: clientv2.DocumentDBManagementClientAPIVersion, | ||
| }, | ||
| }, | ||
| Resource: map[string]any{ | ||
|
|
@@ -264,7 +262,7 @@ func buildMongoDBResourceDataWithRecipeAndSecrets() ResourceData { | |
| }, | ||
| }, | ||
| }, | ||
| RadiusManaged: to.Ptr(true), | ||
| Dependencies: []outputresource.Dependency{{LocalID: outputresource.LocalIDAzureCosmosAccount}}, | ||
| }, | ||
| } | ||
|
|
@@ -386,7 +384,7 @@ func Test_Render(t *testing.T) { | |
| BasicResourceProperties: rp.BasicResourceProperties{ | ||
| Environment: "/subscriptions/test-subscription/resourceGroups/test-resource-group/providers/Applications.Core/environments/env0", | ||
| }, | ||
| Mode: linkrp_dm.LinkModeValues, | ||
| }, | ||
| } | ||
| mr := store.Object{ | ||
|
|
@@ -1092,10 +1090,10 @@ func Test_fetchSecrets(t *testing.T) { | |
| t.Run("Get secrets from recipe data when resource has associated recipe", func(t *testing.T) { | ||
| mongoResource := buildMongoDBResourceDataWithRecipeAndSecrets() | ||
| secret := "mongodb://testUser:[email protected]:10255/db?ssl=true" | ||
| mocks.secretsValueClient.EXPECT().FetchSecret(ctx, gomock.Any(), mongoResource.SecretValues[linkrp_renderers.ConnectionStringValue].Action, mongoResource.SecretValues[linkrp_renderers.ConnectionStringValue].ValueSelector).Times(1).Return(secret, nil) | ||
| secretValues, err := dp.FetchSecrets(ctx, mongoResource) | ||
| require.NoError(t, err) | ||
| require.Equal(t, 1, len(secretValues)) | ||
| require.Equal(t, secret, secretValues[linkrp_renderers.ConnectionStringValue]) | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I got the most recent stable API versions of these clients to hard-code them per the discussion here: #4864 (comment). Do you think this looks right @rynowak?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM