Skip to content

Commit

Permalink
Merge branch 'main' into vishwahiremat/moving_get_output_resources_to…
Browse files Browse the repository at this point in the history
…_driver
  • Loading branch information
vishwahiremat committed Sep 18, 2023
2 parents 2984d12 + dc1a49d commit 6b8d8bb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docs/contributing/contributing-releases/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The `versions.yaml` file is a declarative version tracking file that the Radius
1. Push these changes to a remote branch and create a pull request against `main`.
1. After maintainer approval, merge the pull request to `main`.
1. Verify that [GitHub actions triggers a build](https://github.com/project-radius/radius/actions), and that the build completes. This will build and push Radius assets.
1. In the project-radius/radius repo, run the [Release verification](https://github.com/project-radius/samples/actions/workflows/release-verification.yaml) workflow.
1. In the project-radius/radius repo, run the [Release verification](https://github.com/radius-project/radius/actions/workflows/release-verification.yaml) workflow.

### Test tutorials and samples

Expand Down Expand Up @@ -53,7 +53,7 @@ If sample validation passes, we can start the process of creating the final rele

1. In the project-radius/docs repository, run the [Release samples](https://github.com/project-radius/samples/actions/workflows/release.yaml) workflow.

1. In the project-radius/radius repo, run the [Release verification](https://github.com/project-radius/samples/actions/workflows/release-verification.yaml) workflow.
1. In the project-radius/radius repo, run the [Release verification](https://github.com/radius-project/radius/actions/workflows/release-verification.yaml) workflow.

## How releases work

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package controller
import (
"context"
"errors"
"fmt"

ctrl "github.com/radius-project/radius/pkg/armrpc/asyncoperation/controller"
"github.com/radius-project/radius/pkg/portableresources/datamodel"
Expand All @@ -29,6 +30,7 @@ import (
"github.com/radius-project/radius/pkg/recipes/util"
rpv1 "github.com/radius-project/radius/pkg/rp/v1"
"github.com/radius-project/radius/pkg/ucp/store"
"github.com/radius-project/radius/pkg/ucp/ucplog"
)

// CreateOrUpdateResource is the async operation controller to create or update portable resources.
Expand Down Expand Up @@ -81,6 +83,8 @@ func (c *CreateOrUpdateResource[P, T]) Run(ctx context.Context, req *ctrl.Reques
recipeOutput, err := c.executeRecipeIfNeeded(ctx, data, previousOutputResources)
if err != nil {
if recipeError, ok := err.(*recipes.RecipeError); ok {
logger := ucplog.FromContextOrDiscard(ctx)
logger.Error(err, fmt.Sprintf("failed to execute recipe. Encountered error while processing %s ", recipeError.ErrorDetails.Target))
// Set the deployment status to the recipe error code.
recipeDataModel.Recipe().DeploymentStatus = util.RecipeDeploymentStatus(recipeError.DeploymentStatus)
update := &store.Object{
Expand Down

0 comments on commit 6b8d8bb

Please sign in to comment.