Revert "Propagate inputs to outputs during preview. (pulumi#3245)" (pulumi#3324)

This reverts commit 80504bf.

Author: pgavlin

CHANGELOG.md

@@ -3,6 +3,9 @@ CHANGELOG
 
 ## HEAD (Unreleased)
 
+- Revert "propagate resource inputs to resource state during preview". These changes had a critical issue that needs
+  further investigation.
+
 ## 1.3.0 (2019-10-09)
 
 - Propagate resource inputs to resource state during preview, including first-class unknown values. This allows the

pkg/engine/lifecycle_test.go

@@ -4563,69 +4563,3 @@ func updateSpecificTargets(t *testing.T, targets []string) {
 
 	p.Run(t, old)
 }
-
-func TestPreviewInputPropagation(t *testing.T) {
-	loaders := []*deploytest.ProviderLoader{
-		deploytest.NewProviderLoader("pkgA", semver.MustParse("1.0.0"), func() (plugin.Provider, error) {
-			return &deploytest.Provider{
-				CreateF: func(urn resource.URN,
-					news resource.PropertyMap, timeout float64) (resource.ID, resource.PropertyMap, resource.Status, error) {
-
-					return "created-id", news, resource.StatusOK, nil
-				},
-			}, nil
-		}),
-	}
-
-	preview := true
-	program := deploytest.NewLanguageRuntime(func(_ plugin.RunInfo, monitor *deploytest.ResourceMonitor) error {
-		computed := interface{}(resource.Computed{Element: resource.NewStringProperty("")})
-		if !preview {
-			computed = "alpha"
-		}
-
-		ins := resource.NewPropertyMapFromMap(map[string]interface{}{
-			"foo": "bar",
-			"baz": map[string]interface{}{
-				"a": 42,
-				"b": computed,
-			},
-			"qux": []interface{}{
-				computed,
-				24,
-			},
-			"zed": computed,
-		})
-
-		_, _, state, err := monitor.RegisterResource("pkgA:m:typA", "resA", true, deploytest.ResourceOptions{
-			Inputs: ins,
-		})
-		assert.NoError(t, err)
-
-		assert.True(t, state.DeepEquals(ins))
-
-		return nil
-	})
-	host := deploytest.NewPluginHost(nil, nil, program, loaders...)
-
-	p := &TestPlan{
-		Options: UpdateOptions{host: host},
-	}
-
-	project := p.GetProject()
-
-	// Run a preview. The inputs should be propagated to the outputs during the create.
-	preview = true
-	_, res := TestOp(Update).Run(project, p.GetTarget(nil), p.Options, preview, p.BackendClient, nil)
-	assert.Nil(t, res)
-
-	// Run an update.
-	preview = false
-	snap, res := TestOp(Update).Run(project, p.GetTarget(nil), p.Options, preview, p.BackendClient, nil)
-	assert.Nil(t, res)
-
-	// Run another preview. The inputs should be propagated to the outputs during the update.
-	preview = true
-	_, res = TestOp(Update).Run(project, p.GetTarget(snap), p.Options, preview, p.BackendClient, nil)
-	assert.Nil(t, res)
-}

pkg/resource/deploy/deploytest/resourcemonitor.go

@@ -29,19 +29,18 @@ type ResourceMonitor struct {
 }
 
 type ResourceOptions struct {
-	Parent                resource.URN
-	Protect               bool
-	Dependencies          []resource.URN
-	Provider              string
-	Inputs                resource.PropertyMap
-	PropertyDeps          map[resource.PropertyKey][]resource.URN
-	DeleteBeforeReplace   *bool
-	Version               string
-	IgnoreChanges         []string
-	Aliases               []resource.URN
-	ImportID              resource.ID
-	CustomTimeouts        *resource.CustomTimeouts
-	SupportsPartialValues *bool
+	Parent              resource.URN
+	Protect             bool
+	Dependencies        []resource.URN
+	Provider            string
+	Inputs              resource.PropertyMap
+	PropertyDeps        map[resource.PropertyKey][]resource.URN
+	DeleteBeforeReplace *bool
+	Version             string
+	IgnoreChanges       []string
+	Aliases             []resource.URN
+	ImportID            resource.ID
+	CustomTimeouts      *resource.CustomTimeouts
 }
 
 func (rm *ResourceMonitor) RegisterResource(t tokens.Type, name string, custom bool,
@@ -95,10 +94,6 @@ func (rm *ResourceMonitor) RegisterResource(t tokens.Type, name string, custom b
 	if opts.DeleteBeforeReplace != nil {
 		deleteBeforeReplace = *opts.DeleteBeforeReplace
 	}
-	supportsPartialValues := true
-	if opts.SupportsPartialValues != nil {
-		supportsPartialValues = *opts.SupportsPartialValues
-	}
 	requestInput := &pulumirpc.RegisterResourceRequest{
 		Type:                       string(t),
 		Name:                       name,
@@ -116,7 +111,6 @@ func (rm *ResourceMonitor) RegisterResource(t tokens.Type, name string, custom b
 		Aliases:                    aliasStrings,
 		ImportId:                   string(opts.ImportID),
 		CustomTimeouts:             &timeouts,
-		SupportsPartialValues:      supportsPartialValues,
 	}
 
 	// submit request

pkg/resource/deploy/source.go

@@ -88,7 +88,9 @@ type RegisterResourceEvent interface {
 
 // RegisterResult is the state of the resource after it has been registered.
 type RegisterResult struct {
-	State *resource.State // the resource state.
+	State   *resource.State        // the resource state.
+	Stable  bool                   // if true, the resource state is stable and may be trusted.
+	Stables []resource.PropertyKey // an optional list of specific resource properties that are stable.
 }
 
 // RegisterResourceOutputsEvent is an event that asks the engine to complete the provisioning of a resource.

pkg/resource/deploy/source_eval.go

@@ -810,26 +810,19 @@ func (rm *resmon) RegisterResource(ctx context.Context,
 		return nil, rpcerror.New(codes.Unavailable, "resource monitor shut down while waiting on step's done channel")
 	}
 
-	// Filter out partially-known values if the requestor does not support them.
-	state, outputs := result.State, result.State.Outputs
-	if !req.GetSupportsPartialValues() {
-		logging.V(5).Infof("stripping unknowns from RegisterResource response for urn %v", state.URN)
-		filtered := resource.PropertyMap{}
-		for k, v := range outputs {
-			if !v.ContainsUnknowns() {
-				filtered[k] = v
-			}
-		}
-		outputs = filtered
+	state := result.State
+	stable := result.Stable
+	var stables []string
+	for _, sta := range result.Stables {
+		stables = append(stables, string(sta))
 	}
-
 	logging.V(5).Infof(
-		"ResourceMonitor.RegisterResource operation finished: t=%v, urn=%v, #outs=%v",
-		state.Type, state.URN, len(outputs))
+		"ResourceMonitor.RegisterResource operation finished: t=%v, urn=%v, stable=%v, #stables=%v #outs=%v",
+		state.Type, state.URN, stable, len(stables), len(state.Outputs))
 
 	// Finally, unpack the response into properties that we can return to the language runtime.  This mostly includes
 	// an ID, URN, and defaults and output properties that will all be blitted back onto the runtime object.
-	obj, err := plugin.MarshalProperties(outputs, plugin.MarshalOptions{
+	obj, err := plugin.MarshalProperties(state.Outputs, plugin.MarshalOptions{
 		Label:        label,
 		KeepUnknowns: true,
 		KeepSecrets:  req.GetAcceptSecrets(),
@@ -838,9 +831,11 @@ func (rm *resmon) RegisterResource(ctx context.Context,
 		return nil, err
 	}
 	return &pulumirpc.RegisterResourceResponse{
-		Urn:    string(state.URN),
-		Id:     string(state.ID),
-		Object: obj,
+		Urn:     string(state.URN),
+		Id:      string(state.ID),
+		Object:  obj,
+		Stable:  stable,
+		Stables: stables,
 	}, nil
 }
 

pkg/resource/deploy/step.go

@@ -98,7 +98,7 @@ func (s *SameStep) Apply(preview bool) (resource.Status, StepCompleteFunc, error
 	// Retain the ID, and outputs:
 	s.new.ID = s.old.ID
 	s.new.Outputs = s.old.Outputs
-	complete := func() { s.reg.Done(&RegisterResult{State: s.new}) }
+	complete := func() { s.reg.Done(&RegisterResult{State: s.new, Stable: true}) }
 	return resource.StatusOK, complete, nil
 }
 
@@ -208,8 +208,6 @@ func (s *CreateStep) Apply(preview bool) (resource.Status, StepCompleteFunc, err
 			s.new.ID = id
 			s.new.Outputs = outs
 		}
-	} else {
-		s.new.Outputs = s.new.Inputs
 	}
 
 	// Mark the old resource as pending deletion if necessary.
@@ -435,12 +433,10 @@ func (s *UpdateStep) Apply(preview bool) (resource.Status, StepCompleteFunc, err
 			// Now copy any output state back in case the update triggered cascading updates to other properties.
 			s.new.Outputs = outs
 		}
-	} else {
-		s.new.Outputs = s.new.Inputs
 	}
 
 	// Finally, mark this operation as complete.
-	complete := func() { s.reg.Done(&RegisterResult{State: s.new}) }
+	complete := func() { s.reg.Done(&RegisterResult{State: s.new, Stables: s.stables}) }
 	if resourceError == nil {
 		return resourceStatus, complete, nil
 	}