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

Provide RuntimeConfiguration to processor #5505

Merged
merged 1 commit into from
May 1, 2023
Merged

Provide RuntimeConfiguration to processor #5505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions pkg/linkrp/backend/controller/createorupdateresource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/project-radius/radius/pkg/linkrp/datamodel"
"github.com/project-radius/radius/pkg/linkrp/processors"
"github.com/project-radius/radius/pkg/recipes"
"github.com/project-radius/radius/pkg/recipes/configloader"
"github.com/project-radius/radius/pkg/recipes/engine"
"github.com/project-radius/radius/pkg/resourcemodel"
rpv1 "github.com/project-radius/radius/pkg/rp/v1"
Expand All @@ -27,9 +28,10 @@ type CreateOrUpdateResource[P interface {
rpv1.RadiusResourceModel
}, T any] struct {
ctrl.BaseController
processor processors.ResourceProcessor[P, T]
engine engine.Engine
client processors.ResourceClient
processor processors.ResourceProcessor[P, T]
engine engine.Engine
client processors.ResourceClient
configurationLoader configloader.ConfigurationLoader
}

// NewCreateOrUpdateResource creates the CreateOrUpdateResource controller instance.
Expand All @@ -38,8 +40,8 @@ type CreateOrUpdateResource[P interface {
func NewCreateOrUpdateResource[P interface {
*T
rpv1.RadiusResourceModel
}, T any](processor processors.ResourceProcessor[P, T], eng engine.Engine, client processors.ResourceClient, opts ctrl.Options) (ctrl.Controller, error) {
return &CreateOrUpdateResource[P, T]{ctrl.NewBaseAsyncController(opts), processor, eng, client}, nil
}, T any](processor processors.ResourceProcessor[P, T], eng engine.Engine, client processors.ResourceClient, configurationLoader configloader.ConfigurationLoader, opts ctrl.Options) (ctrl.Controller, error) {
return &CreateOrUpdateResource[P, T]{ctrl.NewBaseAsyncController(opts), processor, eng, client, configurationLoader}, nil
}

func (c *CreateOrUpdateResource[P, T]) Run(ctx context.Context, req *ctrl.Request) (ctrl.Result, error) {
Expand All @@ -64,8 +66,14 @@ func (c *CreateOrUpdateResource[P, T]) Run(ctx context.Context, req *ctrl.Reques
return ctrl.Result{}, err
}

// Load details about the runtime for the processor to access.
runtimeConfiguration, err := c.loadRuntimeConfiguration(ctx, data.ResourceMetadata().Environment, data.ResourceMetadata().Application, data.GetBaseResource().ID)
if err != nil {
return ctrl.Result{}, err
}

// Now we're ready to process the resource. This will handle the updates to any user-visible state.
err = c.processor.Process(ctx, data, recipeOutput)
err = c.processor.Process(ctx, data, processors.Options{RecipeOutput: recipeOutput, RuntimeConfiguration: *runtimeConfiguration})
if err != nil {
return ctrl.Result{}, err
}
Expand Down Expand Up @@ -105,6 +113,9 @@ func (c *CreateOrUpdateResource[P, T]) executeRecipeIfNeeded(ctx context.Context
}

input := recipeDataModel.Recipe()
if input == nil {
return nil, nil
}
request := recipes.Metadata{
Name: input.Name,
Parameters: input.Parameters,
Expand All @@ -116,6 +127,16 @@ func (c *CreateOrUpdateResource[P, T]) executeRecipeIfNeeded(ctx context.Context
return c.engine.Execute(ctx, request)
}

func (c *CreateOrUpdateResource[P, T]) loadRuntimeConfiguration(ctx context.Context, environmentID string, applicationID string, resourceID string) (*recipes.RuntimeConfiguration, error) {
metadata := recipes.Metadata{EnvironmentID: environmentID, ApplicationID: applicationID, ResourceID: resourceID}
config, err := c.configurationLoader.LoadConfiguration(ctx, metadata)
if err != nil {
return nil, err
}

return &config.Runtime, nil
}

func (c *CreateOrUpdateResource[P, T]) garbageCollectResources(ctx context.Context, id string, diff []rpv1.OutputResource) error {
logger := ucplog.FromContextOrDiscard(ctx)
for _, resource := range diff {
Expand Down
Loading