Merge branch 'master' of github.com:pulumi/pulumi into test.go

.github/workflows/ci-dev-release.yml

@@ -102,7 +102,7 @@ jobs:
 
  sign:
  name: sign
- needs: [build-release]
+ needs: [build-release, build-sdks]
  uses: ./.github/workflows/sign.yml
  with:
  ref: ${{ inputs.ref }}

changelog/pending/20240320--engine--add-a-continue-on-error-flag-to-pulumi-up.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: feat
+ scope: engine
+ description: Add a --continue-on-error flag to pulumi up

changelog/pending/20240416--auto-go-nodejs-python--add-support-for-the-continue-on-error-parameter-of-the-up-command-to-the-automation-api.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: feat
+ scope: auto/go,nodejs,python
+ description: Add support for the continue-on-error parameter of the up command to the Automation API

changelog/pending/20240419--sdk-nodejs--fix-a-race-condition-that-could-cause-the-nodejs-runtime-to-terminate-before-finishing-all-work.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: fix
+ scope: sdk/nodejs
+ description: Fix a race condition that could cause the NodeJS runtime to terminate before finishing all work

changelog/pending/20240422--sdk-python--fix-an-exception-when-setting-providers-resource-option-with-a-dict.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: fix
+ scope: sdk/python
+ description: Fix an exception when setting providers resource option with a dict

changelog/pending/20240423--sdk-python--fixes-event-loop-tracking-in-the-python-sdk-when-using-remote-transforms.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: fix
+ scope: sdk/python
+ description: Fix event loop tracking in the python SDK when using remote transforms

changelog/pending/20240423--sdk-python--workaround-lazy-module-loading-regression.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: fix
+ scope: sdk/python
+ description: Workaround lazy module loading regression

cmd/pulumi-test-language/interface.go

@@ -23,6 +23,7 @@ import (
  "os"
  "path/filepath"
  "regexp"
+ "slices"
  "strconv"
  "strings"
 
@@ -283,7 +284,11 @@ func (h *testHost) EnsurePlugins(plugins []workspace.PluginSpec, kinds plugin.Fl
  // Symmetric difference, we want to know if there are any unexpected plugins, or any missing plugins.
  diff := expected.SymmetricDifference(actual)
  if !diff.IsEmpty() {
- return fmt.Errorf("unexpected required plugins: actual %v, expected %v", actual, expected)
+ expectedSlice := expected.ToSlice()
+ slices.Sort(expectedSlice)
+ actualSlice := actual.ToSlice()
+ slices.Sort(actualSlice)
+ return fmt.Errorf("unexpected required plugins: actual %v, expected %v", actualSlice, expectedSlice)
  }
 
  return nil
@@ -925,6 +930,13 @@ func (eng *languageTestServer) RunLanguageTest(
  if err != nil {
  return nil, fmt.Errorf("snapshot: %w", err)
  }
+ } else {
+ // We still want to try to get a snapshot, but won't error out
+ // if we can't.
+ s, err = testBackend.GetStack(ctx, stackReference)
+ if err == nil {
+ snap, _ = s.Snapshot(ctx, b64secrets.Base64SecretsProvider)
+ }
  }
 
  result = WithL(func(l *L) {

cmd/pulumi-test-language/l2continue_on_error_test.go

@@ -0,0 +1,305 @@
+// Copyright 2016-2024, Pulumi Corporation.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+ "context"
+ "errors"
+ "fmt"
+ "os"
+ "path/filepath"
+ "testing"
+
+ "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
+ "github.com/pulumi/pulumi/sdk/v3/go/common/util/rpcutil"
+ "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
+ pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
+ testingrpc "github.com/pulumi/pulumi/sdk/v3/proto/go/testing"
+ "github.com/segmentio/encoding/json"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "google.golang.org/grpc"
+ "google.golang.org/grpc/credentials/insecure"
+ "google.golang.org/protobuf/types/known/structpb"
+ "gopkg.in/yaml.v2"
+)
+
+type L2ContinueOnErrorHost struct {
+ pulumirpc.UnimplementedLanguageRuntimeServer
+
+ tempDir string
+}
+
+func (h *L2ContinueOnErrorHost) Pack(
+ ctx context.Context, req *pulumirpc.PackRequest,
+) (*pulumirpc.PackResponse, error) {
+ if req.DestinationDirectory != filepath.Join(h.tempDir, "artifacts") {
+ return nil, fmt.Errorf("unexpected destination directory %s", req.DestinationDirectory)
+ }
+
+ if req.PackageDirectory == filepath.Join(h.tempDir, "sdks", "simple-2.0.0") {
+ return &pulumirpc.PackResponse{
+ ArtifactPath: filepath.Join(req.DestinationDirectory, "simple-2.0.0.sdk"),
+ }, nil
+ } else if req.PackageDirectory == filepath.Join(h.tempDir, "sdks", "fail_on_create-4.0.0") {
+ return &pulumirpc.PackResponse{
+ ArtifactPath: filepath.Join(req.DestinationDirectory, "fail_on_create-4.0.0.sdk"),
+ }, nil
+ } else if req.PackageDirectory != filepath.Join(h.tempDir, "sdks", "core") {
+ return &pulumirpc.PackResponse{
+ ArtifactPath: filepath.Join(req.DestinationDirectory, "core.sdk"),
+ }, nil
+ }
+
+ return nil, fmt.Errorf("unexpected package directory %s", req.PackageDirectory)
+}
+
+func (h *L2ContinueOnErrorHost) GenerateProject(
+ ctx context.Context, req *pulumirpc.GenerateProjectRequest,
+) (*pulumirpc.GenerateProjectResponse, error) {
+ if req.LocalDependencies["pulumi"] != filepath.Join(h.tempDir, "artifacts", "core.sdk") {
+ return nil, fmt.Errorf("unexpected core sdk %s", req.LocalDependencies["pulumi"])
+ }
+ if req.LocalDependencies["simple"] != filepath.Join(h.tempDir, "artifacts", "simple-2.0.0.sdk") {
+ return nil, fmt.Errorf("unexpected simple sdk %s", req.LocalDependencies["simple"])
+ }
+ if req.LocalDependencies["fail_on_create"] != filepath.Join(h.tempDir, "artifacts", "fail_on_create-4.0.0.sdk") {
+ return nil, fmt.Errorf("unexpected fail_on_create sdk %s", req.LocalDependencies["fail_on_create"])
+ }
+ if !req.Strict {
+ return nil, errors.New("expected strict to be true")
+ }
+ if req.TargetDirectory != filepath.Join(h.tempDir, "projects", "l2-failed-create-continue-on-error") {
+ return nil, fmt.Errorf("unexpected target directory %s", req.TargetDirectory)
+ }
+ var project workspace.Project
+ if err := json.Unmarshal([]byte(req.Project), &project); err != nil {
+ return nil, err
+ }
+ if project.Name != "l2-failed-create-continue-on-error" {
+ return nil, fmt.Errorf("unexpected project name %s", project.Name)
+ }
+ project.Runtime = workspace.NewProjectRuntimeInfo("mock", nil)
+ projectYaml, err := yaml.Marshal(project)
+ if err != nil {
+ return nil, fmt.Errorf("could not marshal project: %w", err)
+ }
+
+ // Write the minimal project file.
+ if err := os.WriteFile(filepath.Join(req.TargetDirectory, "Pulumi.yaml"), projectYaml, 0o600); err != nil {
+ return nil, err
+ }
+
+ return &pulumirpc.GenerateProjectResponse{}, nil
+}
+
+func (h *L2ContinueOnErrorHost) GeneratePackage(
+ ctx context.Context, req *pulumirpc.GeneratePackageRequest,
+) (*pulumirpc.GeneratePackageResponse, error) {
+ if req.Directory != filepath.Join(h.tempDir, "sdks", "simple-2.0.0") &&
+ req.Directory != filepath.Join(h.tempDir, "sdks", "fail_on_create-4.0.0") {
+ return nil, fmt.Errorf("unexpected directory %s", req.Directory)
+ }
+
+ // Write the minimal package code.
+ if err := os.WriteFile(filepath.Join(req.Directory, "test.txt"), []byte("testing"), 0o600); err != nil {
+ return nil, err
+ }
+
+ return &pulumirpc.GeneratePackageResponse{}, nil
+}
+
+func (h *L2ContinueOnErrorHost) GetRequiredPlugins(
+ ctx context.Context, req *pulumirpc.GetRequiredPluginsRequest,
+) (*pulumirpc.GetRequiredPluginsResponse, error) {
+ if req.Info.ProgramDirectory != filepath.Join(h.tempDir, "projects", "l2-failed-create-continue-on-error") {
+ return nil, fmt.Errorf("unexpected directory to get required plugins %s", req.Info.ProgramDirectory)
+ }
+
+ return &pulumirpc.GetRequiredPluginsResponse{
+ Plugins: []*pulumirpc.PluginDependency{
+ {
+ Name: "simple",
+ Kind: string(workspace.ResourcePlugin),
+ Version: "2.0.0",
+ },
+ {
+ Name: "fail_on_create",
+ Kind: string(workspace.ResourcePlugin),
+ Version: "4.0.0",
+ },
+ },
+ }, nil
+}
+
+func (h *L2ContinueOnErrorHost) GetProgramDependencies(
+ ctx context.Context, req *pulumirpc.GetProgramDependenciesRequest,
+) (*pulumirpc.GetProgramDependenciesResponse, error) {
+ if req.Info.ProgramDirectory != filepath.Join(h.tempDir, "projects", "l2-failed-create-continue-on-error") {
+ return nil, fmt.Errorf("unexpected directory to get program dependencies %s", req.Info.ProgramDirectory)
+ }
+
+ return &pulumirpc.GetProgramDependenciesResponse{
+ Dependencies: []*pulumirpc.DependencyInfo{
+ {
+ Name: "pulumi_pulumi",
+ Version: "1.0.1",
+ },
+ {
+ Name: "pulumi_simple",
+ Version: "2.0.0",
+ },
+ {
+ Name: "pulumi_fail_on_create",
+ Version: "4.0.0",
+ },
+ },
+ }, nil
+}
+
+func (h *L2ContinueOnErrorHost) InstallDependencies(
+ req *pulumirpc.InstallDependenciesRequest, server pulumirpc.LanguageRuntime_InstallDependenciesServer,
+) error {
+ if req.Info.RootDirectory != filepath.Join(h.tempDir, "projects", "l2-failed-create-continue-on-error") {
+ return fmt.Errorf("unexpected root directory to install dependencies %s", req.Info.RootDirectory)
+ }
+ if req.Info.ProgramDirectory != req.Info.RootDirectory {
+ return fmt.Errorf("unexpected program directory to install dependencies %s", req.Info.ProgramDirectory)
+ }
+ if req.Info.EntryPoint != "." {
+ return fmt.Errorf("unexpected entry point to install dependencies %s", req.Info.EntryPoint)
+ }
+ return nil
+}
+
+func (h *L2ContinueOnErrorHost) Run(
+ ctx context.Context, req *pulumirpc.RunRequest,
+) (*pulumirpc.RunResponse, error) {
+ if req.Info.RootDirectory != filepath.Join(h.tempDir, "projects", "l2-failed-create-continue-on-error") {
+ return nil, fmt.Errorf("unexpected root directory to run %s", req.Info.RootDirectory)
+ }
+ if req.Info.ProgramDirectory != req.Info.RootDirectory {
+ return nil, fmt.Errorf("unexpected program directory to run %s", req.Info.ProgramDirectory)
+ }
+ if req.Info.EntryPoint != "." {
+ return nil, fmt.Errorf("unexpected entry point to run %s", req.Info.EntryPoint)
+ }
+
+ conn, err := grpc.Dial(
+ req.MonitorAddress,
+ grpc.WithTransportCredentials(insecure.NewCredentials()),
+ rpcutil.GrpcChannelOptions(),
+ )
+ if err != nil {
+ return nil, fmt.Errorf("could not connect to resource monitor: %w", err)
+ }
+ defer conn.Close()
+
+ monitor := pulumirpc.NewResourceMonitorClient(conn)
+
+ _, err = monitor.RegisterResource(ctx, &pulumirpc.RegisterResourceRequest{
+ Type: string(resource.RootStackType),
+ Name: req.Stack,
+ SupportsResultReporting: true,
+ })
+ if err != nil {
+ return nil, fmt.Errorf("could not register stack: %w", err)
+ }
+
+ failing, err := monitor.RegisterResource(ctx, &pulumirpc.RegisterResourceRequest{
+ Type: "fail_on_create:index:Resource",
+ Custom: true,
+ Name: "failing",
+ Object: &structpb.Struct{
+ Fields: map[string]*structpb.Value{
+ "value": structpb.NewBoolValue(true),
+ },
+ },
+ SupportsResultReporting: true,
+ })
+ if err != nil {
+ return nil, fmt.Errorf("could not register resource: %w", err)
+ }
+ _, err = monitor.RegisterResource(ctx, &pulumirpc.RegisterResourceRequest{
+ Type: "simple:index:Resource",
+ Custom: true,
+ Name: "dependent",
+ Object: &structpb.Struct{
+ Fields: map[string]*structpb.Value{
+ "value": structpb.NewBoolValue(true),
+ },
+ },
+ Dependencies: []string{failing.Urn},
+ SupportsResultReporting: true,
+ })
+ if err != nil {
+ return nil, fmt.Errorf("could not register resource: %w", err)
+ }
+ _, err = monitor.RegisterResource(ctx, &pulumirpc.RegisterResourceRequest{
+ Type: "simple:index:Resource",
+ Custom: true,
+ Name: "independent",
+ Object: &structpb.Struct{
+ Fields: map[string]*structpb.Value{
+ "value": structpb.NewBoolValue(true),
+ },
+ },
+ SupportsResultReporting: true,
+ })
+ if err != nil {
+ return nil, fmt.Errorf("could not register resource: %w", err)
+ }
+
+ return &pulumirpc.RunResponse{}, nil
+}
+
+// Run a simple successful test with a mocked runtime.
+//
+// TODO(https://github.com/pulumi/pulumi/issues/13945): enable parallel tests
+//
+//nolint:paralleltest // These aren't yet safe to run in parallel
+func TestL2ContinueOnError(t *testing.T) {
+ ctx := context.Background()
+ tempDir := t.TempDir()
+ engine := &languageTestServer{}
+ runtime := &L2ContinueOnErrorHost{tempDir: tempDir}
+ handle, err := rpcutil.ServeWithOptions(rpcutil.ServeOptions{
+ Init: func(srv *grpc.Server) error {
+ pulumirpc.RegisterLanguageRuntimeServer(srv, runtime)
+ return nil
+ },
+ })
+ require.NoError(t, err)
+
+ prepareResponse, err := engine.PrepareLanguageTests(ctx, &testingrpc.PrepareLanguageTestsRequest{
+ LanguagePluginName: "mock",
+ LanguagePluginTarget: fmt.Sprintf("127.0.0.1:%d", handle.Port),
+ TemporaryDirectory: tempDir,
+ SnapshotDirectory: "./testdata/snapshots",
+ CoreSdkDirectory: "sdk/l2-failed-create-continue-on-error",
+ })
+ require.NoError(t, err)
+ assert.NotEmpty(t, prepareResponse.Token)
+
+ runResponse, err := engine.RunLanguageTest(ctx, &testingrpc.RunLanguageTestRequest{
+ Token: prepareResponse.Token,
+ Test: "l2-failed-create-continue-on-error",
+ })
+ require.NoError(t, err)
+ t.Logf("stdout: %s", runResponse.Stdout)
+ t.Logf("stderr: %s", runResponse.Stderr)
+ assert.Empty(t, runResponse.Messages)
+ assert.True(t, runResponse.Success)
+}

cmd/pulumi-test-language/l2resourcesimple_test.go

@@ -401,7 +401,7 @@ func TestL2SimpleResource_MissingRequiredPlugins(t *testing.T) {
  failureMessage := runResponse.Messages[0]
  assert.Contains(t, failureMessage,
  "expected no error, got Error: unexpected required plugins: "+
- "actual Set{language-mock@<nil>}, expected Set{language-mock@<nil>, [email protected]}")
+ "actual [language-mock@<nil>], expected [language-mock@<nil> [email protected]]")
 }
 
 // Run a simple successful test with a mocked runtime that edits the snapshot files.