Adding support for terraform private module source for git #7167
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"Resources":{"Applications.Core/applications@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":58},"Applications.Core/containers@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":123},"Applications.Core/environments@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":154},"Applications.Core/extenders@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":172},"Applications.Core/gateways@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":193},"Applications.Core/httpRoutes@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":207},"Applications.Core/secretStores@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":230},"Applications.Core/volumes@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":267},"Applications.Dapr/pubSubBrokers@2023-10-01-preview":{"RelativePath":"applications/applications.dapr/2023-10-01-preview/types.json","Index":49},"Applications.Dapr/secretStores@2023-10-01-preview":{"RelativePath":"applications/applications.dapr/2023-10-01-preview/types.json","Index":66},"Applications.Dapr/stateStores@2023-10-01-preview":{"RelativePath":"applications/applications.dapr/2023-10-01-preview/types.json","Index":84},"Applications.Datastores/mongoDatabases@2023-10-01-preview":{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":50},"Applications.Datastores/redisCaches@2023-10-01-preview":{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":69},"Applications.Datastores/sqlDatabases@2023-10-01-preview":{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":88},"Applications.Messaging/rabbitMQQueues@2023-10-01-preview":{"RelativePath":"applications/applications.messaging/2023-10-01-preview/types.json","Index":50}},"Functions":{"applications.core/extenders":{"2023-10-01-preview":[{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":268}]},"applications.core/secretstores":{"2023-10-01-preview":[{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":274}]},"applications.datastores/mongodatabases":{"2023-10-01-preview":[{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":90}]},"applications.datastores/rediscaches":{"2023-10-01-preview":[{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":92}]},"applications.datastores/sqldatabases":{"2023-10-01-preview":[{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":94}]},"applications.messaging/rabbitmqqueues":{"2023-10-01-preview":[{"RelativePath":"applications/applications.messaging/2023-10-01-preview/types.json","Index":52}]}}} |
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 |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ package v20231001preview | |
|
|
||
| import ( | ||
| "fmt" | ||
| "reflect" | ||
| "strings" | ||
|
|
||
| v1 "github.com/radius-project/radius/pkg/armrpc/api/v1" | ||
|
|
@@ -63,6 +64,24 @@ func (src *EnvironmentResource) ConvertTo() (v1.DataModelInterface, error) { | |
| } | ||
| converted.Properties.Compute = *envCompute | ||
|
|
||
| recipeConfig := src.Properties.RecipeConfig | ||
| if recipeConfig != nil { | ||
| if recipeConfig.Terraform != nil { | ||
| if recipeConfig.Terraform.Authentication != nil { | ||
|
There was a problem hiding this comment. Can these conditions be collapsed? Or do we expect that there may be future logic that's unique to each config level? There was a problem hiding this comment. In any case i think we still need to check nil at every level to avoid null pointer. Let me know if you think otherwise |
||
| gitConfig := recipeConfig.Terraform.Authentication.Git | ||
| if gitConfig != nil { | ||
| pat := gitConfig.Pat | ||
| p := map[string]datamodel.Secret{} | ||
| for k, v := range pat { | ||
| p[k] = datamodel.Secret{ | ||
| SecretStore: to.String(v.SecretStore), | ||
| } | ||
| } | ||
| converted.Properties.RecipeConfig.Terraform.Authentication.Git.PAT = p | ||
| } | ||
| } | ||
| } | ||
| } | ||
| if src.Properties.Recipes != nil { | ||
| envRecipes := make(map[string]map[string]datamodel.EnvironmentRecipeProperties) | ||
| for resourceType, recipes := range src.Properties.Recipes { | ||
|
|
@@ -151,6 +170,27 @@ func (dst *EnvironmentResource) ConvertFrom(src v1.DataModelInterface) error { | |
| dst.Properties.Recipes = recipes | ||
| } | ||
|
|
||
| if !reflect.DeepEqual(env.Properties.RecipeConfig, datamodel.RecipeConfigProperties{}) { | ||
| recipeConfig := &RecipeConfigProperties{} | ||
| if !reflect.DeepEqual(env.Properties.RecipeConfig.Terraform, datamodel.TerraformConfigProperties{}) { | ||
|
There was a problem hiding this comment. Same as above, since this logic is specific to Terraform, maybe we can move it to a helper function There was a problem hiding this comment. We can apply the same thing as I mentioned above but this time in reverse. This function -> RecipeConfig conversion function -> Terraform related conversion function In future, it would be very easy to add new types of provider conversions. There was a problem hiding this comment. created a separate func There was a problem hiding this comment. I agree with the suggestion of creating a Terraform related conversion function. @vishwahiremat I know you have updated it to recipe config specific conversion, have you considered adding Terraform specific function to make it easy to extend the recipe config function in the future? There was a problem hiding this comment. Vishwa and I discussed offline, we will abstract it out into Terraform specific function once we add support for other types. |
||
| recipeConfig.Terraform = &TerraformConfigProperties{} | ||
| if !reflect.DeepEqual(env.Properties.RecipeConfig.Terraform.Authentication, datamodel.AuthConfig{}) { | ||
| recipeConfig.Terraform.Authentication = &AuthConfig{} | ||
| if !reflect.DeepEqual(env.Properties.RecipeConfig.Terraform.Authentication.Git, datamodel.GitAuthConfig{}) { | ||
| recipeConfig.Terraform.Authentication.Git = &GitAuthConfig{} | ||
| if env.Properties.RecipeConfig.Terraform.Authentication.Git.PAT != nil { | ||
| recipeConfig.Terraform.Authentication.Git.Pat = map[string]*Secret{} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| for k, v := range env.Properties.RecipeConfig.Terraform.Authentication.Git.PAT { | ||
| recipeConfig.Terraform.Authentication.Git.Pat[k] = &Secret{ | ||
| SecretStore: to.Ptr(v.SecretStore), | ||
| } | ||
| } | ||
| dst.Properties.RecipeConfig = recipeConfig | ||
| } | ||
| if env.Properties.Providers != (datamodel.Providers{}) { | ||
| dst.Properties.Providers = &Providers{} | ||
| if env.Properties.Providers.Azure != (datamodel.ProvidersAzure{}) { | ||
|
|
||
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.
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.
Since these lines are specific to Terraform, maybe we should move this logic to a helper function?
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 agree with @sk593. We can have a function that takes care of the recipeConfig conversion and that function can make a call to another function which takes care of terraform related stuff conversion. With this approach we could keep things simple. It would be more readable, easier to debug and write unit tests.
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.
done