revert some

Author: shreyas-goenka

bundle/deploy/terraform/check_dashboards_modified_remotely.go

@@ -16,19 +16,9 @@ type dashboardState struct {
 }
 
 func collectDashboardsFromState(ctx context.Context, b *bundle.Bundle) ([]dashboardState, error) {
-	var state ExportedResourcesMap
-	var err error
-	if b.DirectDeployment {
-		err := b.OpenStateFile(ctx)
-		if err != nil {
-			return nil, err
-		}
-		state = b.DeploymentBundle.StateDB.ExportState(ctx)
-	} else {
-		state, err = ParseResourcesState(ctx, b)
-		if err != nil && state == nil {
-			return nil, err
-		}
+	state, err := ParseResourcesState(ctx, b)
+	if err != nil && state == nil {
+		return nil, err
 	}
 
 	var dashboards []dashboardState
@@ -57,6 +47,11 @@ func (l *checkDashboardsModifiedRemotely) Apply(ctx context.Context, b *bundle.B
 		return nil
 	}
 
+	if b.DirectDeployment {
+		// TODO: not implemented yet
+		return nil
+	}
+
 	// If the user has forced the deployment, skip this check.
 	if b.Config.Bundle.Force {
 		return nil

bundle/phases/deploy.go

@@ -153,7 +153,7 @@ func Deploy(ctx context.Context, b *bundle.Bundle, outputHandler sync.OutputHand
 		bundle.ApplyContext(ctx, b, lock.Release(lock.GoalDeploy))
 	}()
 
-	libs := deployPrepare(ctx, b)
+	libs := deployPrepare(ctx, b, false)
 	if logdiag.HasError(ctx) {
 		return
 	}
@@ -243,7 +243,7 @@ func planWithoutPrepare(ctx context.Context, b *bundle.Bundle) *deployplan.Plan
 }
 
 func Plan(ctx context.Context, b *bundle.Bundle) *deployplan.Plan {
-	deployPrepare(ctx, b)
+	deployPrepare(ctx, b, true)
 	if logdiag.HasError(ctx) {
 		return nil
 	}

bundle/phases/plan.go

@@ -19,10 +19,10 @@ import (
 
 // deployPrepare is common set of mutators between "bundle plan" and "bundle deploy".
 // This function does not make any mutations in the workspace remotely, only in-memory bundle config mutations
-func deployPrepare(ctx context.Context, b *bundle.Bundle) map[string][]libraries.LocationToUpdate {
+func deployPrepare(ctx context.Context, b *bundle.Bundle, isPlan bool) map[string][]libraries.LocationToUpdate {
 	bundle.ApplySeqContext(ctx, b,
 		statemgmt.StatePull(),
-		terraform.CheckDashboardsModifiedRemotely(),
+		terraform.CheckDashboardsModifiedRemotely(isPlan),
 		deploy.StatePull(),
 		mutator.ValidateGitDetails(),
 		terraform.CheckRunningResource(),