Merge remote-tracking branch 'origin/master' into ctpp

pkg/engine/lifeycletest/pulumi_test.go

@@ -160,7 +160,7 @@ func TestSingleResourceDiffUnavailable(t *testing.T) {
 			for _, e := range events {
 				if e.Type == DiagEvent {
 					p := e.Payload().(DiagEventPayload)
-					if p.URN == resURN && p.Severity == diag.Warning && p.Message == "diff unavailable" {
+					if p.URN == resURN && p.Severity == diag.Warning && p.Message == "<{%reset%}>diff unavailable<{%reset%}>\n" {
 						found = true
 						break
 					}

pkg/engine/lifeycletest/test_plan.go

@@ -238,8 +238,15 @@ func (p *TestPlan) Run(t *testing.T, snapshot *deploy.Snapshot) *deploy.Snapshot
 	snap := snapshot
 	for _, step := range p.Steps {
 		if !step.SkipPreview {
+<<<<<<< HEAD
 			previewTarget := p.GetTarget(t, snap)
 			_, res := step.Op.Run(project, previewTarget, p.Options, true, p.BackendClient, step.Validate)
+=======
+			previewSnap := CloneSnapshot(t, snap)
+			previewTarget := p.GetTarget(previewSnap)
+			// Don't run validate on the preview step
+			_, res := step.Op.Run(project, previewTarget, p.Options, true, p.BackendClient, nil)
+>>>>>>> origin/master
 			if step.ExpectFailure {
 				assertIsErrorOrBailResult(t, res)
 				continue

sdk/go/common/resource/resource_goal.go

@@ -32,7 +32,7 @@ type Goal struct {
 	InitErrors              []string              // errors encountered as we attempted to initialize the resource.
 	PropertyDependencies    map[PropertyKey][]URN // the set of dependencies that affect each property.
 	DeleteBeforeReplace     *bool                 // true if this resource should be deleted prior to replacement.
-	IgnoreChanges           []string              // a list of property names to ignore during changes.
+	IgnoreChanges           []string              // a list of property paths to ignore when diffing.
 	AdditionalSecretOutputs []PropertyKey         // outputs that should always be treated as secrets.
 	Aliases                 []URN                 // additional URNs that should be aliased to this resource.
 	ID                      ID                    // the expected ID of the resource, if any.

sdk/go/common/util/result/result.go

@@ -57,7 +57,7 @@ func (r *simpleResult) String() string {
 	if r.err == nil {
 		return "Bail"
 	}
-	return fmt.Sprintf("Error: %w", r.err)
+	return fmt.Sprintf("Error: %s", r.err)
 }
 func (r *simpleResult) GoString() string {
 	if r.err == nil {