Rename flag

Author: fpacifici

cmd/topicctl/subcmd/apply.go

@@ -36,7 +36,7 @@ type applyCmdConfig struct {
 	retentionDropStepDurationStr string
 	skipConfirm                  bool
 	ignoreFewerPartitionsError   bool
-	allowSettingsDeletion        bool
+	destructive                  bool
 	sleepLoopDuration            time.Duration
 	failFast                     bool
 
@@ -109,8 +109,8 @@ func init() {
 		"Don't return error when topic's config specifies fewer partitions than it currently has",
 	)
 	applyCmd.Flags().BoolVar(
-		&applyConfig.allowSettingsDeletion,
-		"allow-settings-deletion",
+		&applyConfig.destructive,
+		"destructive",
 		false,
 		"Deletes topic settings from the broker if the setting is set on the broker but not in config",
 	)
@@ -266,8 +266,7 @@ func applyTopic(
 			RetentionDropStepDuration:  applyConfig.retentionDropStepDuration,
 			SkipConfirm:                applyConfig.skipConfirm,
 			IgnoreFewerPartitionsError: applyConfig.ignoreFewerPartitionsError,
-			AllowSettingsDeletion:      applyConfig.allowSettingsDeletion,
-			SleepLoopDuration:          applyConfig.sleepLoopDuration,
+			Destructive:                applyConfig.destructive,
 			TopicConfig:                topicConfig,
 		}
 

cmd/topicctl/subcmd/rebalance.go

@@ -307,7 +307,7 @@ func rebalanceApplyTopic(
 		AutoContinueRebalance:      true,                      // to continue without prompts
 		RetentionDropStepDuration:  retentionDropStepDuration, // not needed for rebalance
 		SkipConfirm:                true,                      // to enforce action: rebalance
-		AllowSettingsDeletion:      false,                     // Irrelevant here
+		Destructive:                false,                     // Irrelevant here
 		SleepLoopDuration:          rebalanceConfig.sleepLoopDuration,
 		TopicConfig:                topicConfig,
 	}

pkg/apply/apply.go

@@ -37,7 +37,7 @@ type TopicApplierConfig struct {
 	RetentionDropStepDuration  time.Duration
 	SkipConfirm                bool
 	IgnoreFewerPartitionsError bool
-	AllowSettingsDeletion      bool
+	Destructive                bool
 	SleepLoopDuration          time.Duration
 	TopicConfig                config.TopicConfig
 }
@@ -425,7 +425,7 @@ func (t *TopicApplier) updateSettings(
 		}
 	}
 
-	if len(missingKeys) > 0 && t.config.AllowSettingsDeletion {
+	if len(missingKeys) > 0 && t.config.Destructive {
 		log.Infof(
 			"Found %d key(s) set in cluster but missing from config for deletion:\n%s",
 			len(missingKeys),
@@ -461,7 +461,7 @@ func (t *TopicApplier) updateSettings(
 		}
 	}
 
-	if len(missingKeys) > 0 && !t.config.AllowSettingsDeletion {
+	if len(missingKeys) > 0 && !t.config.Destructive {
 		log.Warnf(
 			"Found %d key(s) set in cluster but missing from config:\n%s\nThese will be left as-is.",
 			len(missingKeys),

pkg/apply/apply_test.go

@@ -82,7 +82,7 @@ func TestApplyBasicUpdates(t *testing.T) {
 	require.NotNil(t, err)
 	applier.topicConfig.Spec.ReplicationFactor = 2
 
-	// Settings are not deleted if AllowSettingsDeletion is false. They are
+	// Settings are not deleted if Destructive is false. They are
 	// if it is true
 	delete(applier.topicConfig.Spec.Settings, "cleanup.policy")
 	err = applier.Apply(ctx)
@@ -92,7 +92,7 @@ func TestApplyBasicUpdates(t *testing.T) {
 
 	assert.Equal(t, "delete", topicInfo.Config["cleanup.policy"])
 
-	applier.config.AllowSettingsDeletion = true
+	applier.config.Destructive = true
 	err = applier.Apply(ctx)
 	require.NoError(t, err)
 	topicInfo, err = applier.adminClient.GetTopic(ctx, topicName, true)