Remove legacy publish and state paths

internal/publish/plan.go

@@ -15,18 +15,13 @@ import (
 type Action string
 
 const (
-	ActionPublishNew           Action = "publish_new"
-	ActionReplaceOlder         Action = "replace_older"
-	ActionReplaceConflict      Action = "replace_conflict"
-	ActionReplaceNewer         Action = "replace_newer"
-	ActionSkipSame             Action = "skip_same"
-	ActionSkipDestinationNewer Action = "skip_destination_newer"
-	ActionFailConflict         Action = "fail_conflict"
-	ActionFailUnmanaged        Action = "fail_unmanaged"
-	ActionForceReplace         Action = "force_replace"
-	ActionReplaceTakeover      Action = "replace_takeover"
-	ActionUpsertAdditive       Action = "upsert_additive"
-	ActionReplaceCatalog       Action = "replace_catalog"
+	ActionPublishNew     Action = "publish_new"
+	ActionSkipSame       Action = "skip_same"
+	ActionFailConflict   Action = "fail_conflict"
+	ActionFailUnmanaged  Action = "fail_unmanaged"
+	ActionForceReplace   Action = "force_replace"
+	ActionUpsertAdditive Action = "upsert_additive"
+	ActionReplaceCatalog Action = "replace_catalog"
 )
 
 type Request struct {
@@ -82,18 +77,6 @@ type Plan struct {
 	CatalogOutputsToRetain []state.CatalogOutputFile
 	CatalogOutputsToDelete []state.CatalogOutputFile
 	ClearDestinationRoot   bool
-
-	// Retained while the executor is migrated to catalog state.
-	StateMode             string
-	Reconciliation        config.ReconciliationPolicy
-	TakeoverMode          string
-	ExistingState         *state.DistributorState
-	ExistingSharedRoot    *state.SharedRootState
-	OtherOwnerOutputs     []state.SharedRootOutputFile
-	TakenOverOwnerOutputs []state.SharedRootOutputFile
-	RetainedOwnerOutputs  []state.SharedRootOutputFile
-	OwnerOutputsToDelete  []state.SharedRootOutputFile
-	OwnerOutputsToWrite   []Output
 }
 
 type catalogPlanDetails struct {
@@ -396,22 +379,3 @@ func catalogOutputPathSet(outputs []state.CatalogOutputFile) map[string]struct{}
 	}
 	return paths
 }
-
-func normalizeReconciliation(policy config.ReconciliationPolicy) config.ReconciliationPolicy {
-	if policy.Mode == "" {
-		policy.Mode = config.ReconciliationModeReplace
-	}
-	return policy
-}
-
-func isReconciliationReplacementAction(action Action) bool {
-	return action == ActionReplaceOlder || action == ActionReplaceNewer
-}
-
-func sharedRootOutputPathSet(outputs []state.SharedRootOutputFile) map[string]struct{} {
-	paths := make(map[string]struct{}, len(outputs))
-	for _, output := range outputs {
-		paths[output.Path] = struct{}{}
-	}
-	return paths
-}