Revert "The --expect-no-changes flag checks for output diffs (#15903)"

This reverts commit b72399b.
pulumi · May 6, 2024 · 15a9ba6 · 15a9ba6
1 parent b072edb
commit 15a9ba6
Show file tree

Hide file tree

Showing 17 changed files with 98 additions and 306 deletions.
diff --git a/pkg/backend/display/progress.go b/pkg/backend/display/progress.go
@@ -1145,8 +1145,6 @@ func (display *ProgressDisplay) getStepDoneDescription(step engine.StepEventMeta
  opText = "discarding failed"
  case deploy.OpImport, deploy.OpImportReplacement:
  opText = "importing failed"
- case deploy.OpOutputChange:
- opText = "changing output failed"
  default:
  contract.Failf("Unrecognized resource step op: %v", op)
  return ""
@@ -1181,8 +1179,6 @@ func (display *ProgressDisplay) getStepDoneDescription(step engine.StepEventMeta
  opText = "imported"
  case deploy.OpImportReplacement:
  opText = "imported replacement"
- case deploy.OpOutputChange:
- opText = "output changed"
  default:
  contract.Failf("Unrecognized resource step op: %v", op)
  return ""

diff --git a/pkg/backend/httpstate/snapshot_test.go b/pkg/backend/httpstate/snapshot_test.go
@@ -37,7 +37,6 @@ import (
  "github.com/stretchr/testify/require"
 
  "github.com/pulumi/pulumi/pkg/v3/backend/httpstate/client"
- "github.com/pulumi/pulumi/pkg/v3/display"
  "github.com/pulumi/pulumi/pkg/v3/engine"
  "github.com/pulumi/pulumi/pkg/v3/engine/lifecycletest"
  "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
@@ -314,7 +313,6 @@ func generateSnapshots(t testing.TB, r *rand.Rand, resourceCount, resourcePayloa
  _ deploy.Target,
  entries engine.JournalEntries,
  _ []engine.Event,
- _ display.ResourceChanges,
  _ error,
  ) error {
  journalEntries = entries

diff --git a/pkg/cmd/pulumi/stack_history.go b/pkg/cmd/pulumi/stack_history.go
@@ -13,7 +13,6 @@ import (
 
  "github.com/pulumi/pulumi/pkg/v3/backend"
  "github.com/pulumi/pulumi/pkg/v3/backend/display"
- "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
  "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
  "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
  "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
@@ -163,11 +162,7 @@ func displayUpdatesJSON(updates []backend.UpdateInfo, decrypter config.Decrypter
  info.EndTime = makeStringRef(time.Unix(update.EndTime, 0).UTC().Format(timeFormat))
  resourceChanges := make(map[string]int)
  for k, v := range update.ResourceChanges {
- // Filter out the the OpOutputChange events because they are pseudo
- // events that shouldn't be included in the stack history
- if k != deploy.OpOutputChange {
- resourceChanges[string(k)] = v
- }
+ resourceChanges[string(k)] = v
  }
  info.ResourceChanges = &resourceChanges
  }

diff --git a/pkg/engine/lifecycletest/alias_test.go b/pkg/engine/lifecycletest/alias_test.go
@@ -189,7 +189,7 @@ func createUpdateProgramWithResourceFuncForAliasTests(
  Op: Update,
  ExpectFailure: expectFailure,
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- events []Event, changes display.ResourceChanges, err error,
+ events []Event, err error,
  ) error {
  for _, event := range events {
  if event.Type == ResourcePreEvent {
@@ -1595,7 +1595,7 @@ func TestParentAlias(t *testing.T) {
  firstRun = false
  snap, err = TestOp(Update).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
  func(project workspace.Project, target deploy.Target,
- entries JournalEntries, events []Event, changes display.ResourceChanges, err error,
+ entries JournalEntries, events []Event, err error,
  ) error {
  for _, entry := range entries {
  assert.Equal(t, deploy.OpSame, entry.Step.Op())
@@ -1669,7 +1669,7 @@ func TestEmptyParentAlias(t *testing.T) {
  firstRun = false
  snap, err = TestOp(Update).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
  func(project workspace.Project, target deploy.Target,
- entries JournalEntries, events []Event, changes display.ResourceChanges, err error,
+ entries JournalEntries, events []Event, err error,
  ) error {
  for _, entry := range entries {
  assert.Equal(t, deploy.OpSame, entry.Step.Op())

diff --git a/pkg/engine/lifecycletest/analyzer_test.go b/pkg/engine/lifecycletest/analyzer_test.go
@@ -7,7 +7,6 @@ import (
  "testing"
 
  "github.com/blang/semver"
- "github.com/pulumi/pulumi/pkg/v3/display"
  . "github.com/pulumi/pulumi/pkg/v3/engine" //nolint:revive
  "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
  "github.com/pulumi/pulumi/pkg/v3/resource/deploy/deploytest"
@@ -376,7 +375,7 @@ func TestSimpleAnalyzeResourceFailureRemediateDowngradedToMandatory(t *testing.T
  SkipPreview: true,
  ExpectFailure: true,
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- events []Event, changes display.ResourceChanges, err error,
+ events []Event, err error,
  ) error {
  violationEvents := []Event{}
  for _, e := range events {
@@ -440,7 +439,7 @@ func TestSimpleAnalyzeStackFailureRemediateDowngradedToMandatory(t *testing.T) {
  SkipPreview: true,
  ExpectFailure: true,
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- events []Event, changes display.ResourceChanges, err error,
+ events []Event, err error,
  ) error {
  violationEvents := []Event{}
  for _, e := range events {

diff --git a/pkg/engine/lifecycletest/delete_before_replace_test.go b/pkg/engine/lifecycletest/delete_before_replace_test.go
@@ -8,7 +8,6 @@ import (
  "github.com/stretchr/testify/require"
  "golang.org/x/exp/maps"
 
- "github.com/pulumi/pulumi/pkg/v3/display"
  . "github.com/pulumi/pulumi/pkg/v3/engine" //nolint:revive
  "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
  "github.com/pulumi/pulumi/pkg/v3/resource/deploy/deploytest"
@@ -177,7 +176,7 @@ func TestDeleteBeforeReplace(t *testing.T) {
  ExpectFailure: false,
  SkipPreview: true,
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
 
@@ -351,7 +350,7 @@ func TestExplicitDeleteBeforeReplace(t *testing.T) {
  Op: Update,
 
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
 
@@ -375,7 +374,7 @@ func TestExplicitDeleteBeforeReplace(t *testing.T) {
  Op: Update,
 
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
 
@@ -400,7 +399,7 @@ func TestExplicitDeleteBeforeReplace(t *testing.T) {
  Op: Update,
 
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
 
@@ -424,7 +423,7 @@ func TestExplicitDeleteBeforeReplace(t *testing.T) {
  Op: Update,
 
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
 
@@ -448,7 +447,7 @@ func TestExplicitDeleteBeforeReplace(t *testing.T) {
  Op: Update,
 
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
 
@@ -474,7 +473,7 @@ func TestExplicitDeleteBeforeReplace(t *testing.T) {
  Op: Update,
 
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
 
@@ -576,7 +575,7 @@ func TestDependencyChangeDBR(t *testing.T) {
  {
  Op: Update,
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
  assert.True(t, len(entries) > 0)

diff --git a/pkg/engine/lifecycletest/golang_sdk_test.go b/pkg/engine/lifecycletest/golang_sdk_test.go
@@ -160,7 +160,7 @@ func TestIgnoreChangesGolangLifecycle(t *testing.T) {
  {
  Op: Update,
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- events []Event, changes display.ResourceChanges, err error,
+ events []Event, err error,
  ) error {
  for _, event := range events {
  if event.Type == ResourcePreEvent {
@@ -262,7 +262,7 @@ func TestExplicitDeleteBeforeReplaceGoSDK(t *testing.T) {
  Op: Update,
 
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
 
@@ -286,7 +286,7 @@ func TestExplicitDeleteBeforeReplaceGoSDK(t *testing.T) {
  Op: Update,
 
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
  AssertSameSteps(t, []StepSummary{
@@ -349,7 +349,7 @@ func TestReadResourceGolangLifecycle(t *testing.T) {
  {
  Op: Update,
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- evts []Event, changes display.ResourceChanges, err error,
+ evts []Event, err error,
  ) error {
  assert.NoError(t, err)
 
@@ -598,7 +598,7 @@ func TestReplaceOnChangesGolangLifecycle(t *testing.T) {
  {
  Op: Update,
  Validate: func(project workspace.Project, target deploy.Target, entries JournalEntries,
- events []Event, changes display.ResourceChanges, err error,
+ events []Event, err error,
  ) error {
  collectedOps := make([]display.StepOp, 0)
  for _, event := range events {

diff --git a/pkg/engine/lifecycletest/import_test.go b/pkg/engine/lifecycletest/import_test.go
@@ -8,7 +8,6 @@ import (
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
 
- "github.com/pulumi/pulumi/pkg/v3/display"
  . "github.com/pulumi/pulumi/pkg/v3/engine" //nolint:revive
  "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
  "github.com/pulumi/pulumi/pkg/v3/resource/deploy/deploytest"
@@ -104,9 +103,7 @@ func TestImportOption(t *testing.T) {
  // Run a second update after fixing the inputs. The import should succeed.
  inputs["foo"] = resource.NewStringProperty("bar")
  snap, err := TestOp(Update).Run(project, p.GetTarget(t, nil), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN:
@@ -126,9 +123,7 @@ func TestImportOption(t *testing.T) {
 
  // Now, run another update. The update should succeed and there should be no diffs.
  snap, err = TestOp(Update).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN, resURN:
@@ -146,9 +141,7 @@ func TestImportOption(t *testing.T) {
  // Change a property value and run a third update. The update should succeed.
  inputs["foo"] = resource.NewStringProperty("rab")
  snap, err = TestOp(Update).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN:
@@ -173,9 +166,7 @@ func TestImportOption(t *testing.T) {
 
  // Finally, destroy the stack. The `Delete` function should be called.
  _, err = TestOp(Destroy).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN, resURN:
@@ -191,9 +182,7 @@ func TestImportOption(t *testing.T) {
  // Now clear the ID to import and run an initial update to create a resource that we will import-replace.
  importID, inputs["foo"] = "", resource.NewStringProperty("bar")
  snap, err = TestOp(Update).Run(project, p.GetTarget(t, nil), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN, resURN:
@@ -217,9 +206,7 @@ func TestImportOption(t *testing.T) {
  }
  }
  snap, err = TestOp(Update).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN, resURN:
@@ -239,9 +226,7 @@ func TestImportOption(t *testing.T) {
  // a delete-replaced.
  importID = "id"
  snap, err = TestOp(Update).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN:
@@ -267,9 +252,7 @@ func TestImportOption(t *testing.T) {
  readID = "id"
  expectedInputs, expectedState = inputs, inputs
  snap, err = TestOp(Update).Run(project, p.GetTarget(t, nil), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN:
@@ -291,9 +274,7 @@ func TestImportOption(t *testing.T) {
  readID, importID = "", readID
  expectedInputs, expectedState = nil, nil
  _, err = TestOp(Update).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN:
@@ -383,9 +364,7 @@ func TestImportWithDifferingImportIdentifierFormat(t *testing.T) {
  // Run the initial update. The import should succeed.
  project := p.GetProject()
  snap, err := TestOp(Update).Run(project, p.GetTarget(t, nil), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN:
@@ -403,9 +382,7 @@ func TestImportWithDifferingImportIdentifierFormat(t *testing.T) {
 
  // Now, run another update. The update should succeed and there should be no diffs.
  _, err = TestOp(Update).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, err error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, err error) error {
  for _, entry := range entries {
  switch urn := entry.Step.URN(); urn {
  case provURN, resURN:
@@ -740,9 +717,7 @@ func TestImportPlanExistingImport(t *testing.T) {
  Name: "resA",
  ID: "imported-id",
  }}).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient,
- func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event,
- _ display.ResourceChanges, _ error,
- ) error {
+ func(_ workspace.Project, _ deploy.Target, entries JournalEntries, _ []Event, _ error) error {
  for _, e := range entries {
  assert.Equal(t, deploy.OpSame, e.Step.Op())
  }

diff --git a/pkg/engine/lifecycletest/pending_delete_test.go b/pkg/engine/lifecycletest/pending_delete_test.go
@@ -6,7 +6,6 @@ import (
  "github.com/blang/semver"
  "github.com/stretchr/testify/assert"
 
- "github.com/pulumi/pulumi/pkg/v3/display"
  . "github.com/pulumi/pulumi/pkg/v3/engine" //nolint:revive
  "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
  "github.com/pulumi/pulumi/pkg/v3/resource/deploy/deploytest"
@@ -61,7 +60,7 @@ func TestDestroyWithPendingDelete(t *testing.T) {
  p.Steps = []TestStep{{
  Op: Update,
  Validate: func(_ workspace.Project, _ deploy.Target, entries JournalEntries,
- _ []Event, changes display.ResourceChanges, err error,
+ _ []Event, err error,
  ) error {
  // Verify that we see a DeleteReplacement for the resource with ID 0 and a Delete for the resource with
  // ID 1.
@@ -137,7 +136,7 @@ func TestUpdateWithPendingDelete(t *testing.T) {
  p.Steps = []TestStep{{
  Op: Destroy,
  Validate: func(_ workspace.Project, _ deploy.Target, entries JournalEntries,
- _ []Event, changes display.ResourceChanges, err error,
+ _ []Event, err error,
  ) error {
  // Verify that we see a DeleteReplacement for the resource with ID 0 and a Delete for the resource with
  // ID 1.