add ability to include double-underscore topics in bootstrap

cmd/topicctl/subcmd/bootstrap.go

@@ -21,6 +21,8 @@ type bootstrapCmdConfig struct {
 	outputDir     string
 	overwrite     bool
 
+	allowDoubleUnderscoreTopics bool
+
 	shared sharedOptions
 }
 
@@ -52,6 +54,12 @@ func init() {
 		false,
 		"Overwrite existing configs in output directory",
 	)
+	// allow topics containing double underscores
+	bootstrapCmd.Flags().BoolVar(
+		&bootstrapConfig.allowDoubleUnderscoreTopics,
+		"allow-double-underscore-topics",
+		false,
+		"Include topics that start with __ (typically these are internal topics)")
 
 	addSharedConfigOnlyFlags(bootstrapCmd, &bootstrapConfig.shared)
 	bootstrapCmd.MarkFlagRequired("cluster-config")
@@ -92,5 +100,6 @@ func bootstrapRun(cmd *cobra.Command, args []string) error {
 		bootstrapConfig.excludeRegexp,
 		bootstrapConfig.outputDir,
 		bootstrapConfig.overwrite,
+		bootstrapConfig.allowDoubleUnderscoreTopics,
 	)
 }

pkg/cli/cli.go

@@ -200,15 +200,7 @@ func (c *CLIRunner) DeleteACL(
 
 // BootstrapTopics creates configs for one or more topics based on their current state in the
 // cluster.
-func (c *CLIRunner) BootstrapTopics(
-	ctx context.Context,
-	topics []string,
-	clusterConfig config.ClusterConfig,
-	matchRegexpStr string,
-	excludeRegexpStr string,
-	outputDir string,
-	overwrite bool,
-) error {
+func (c *CLIRunner) BootstrapTopics(ctx context.Context, topics []string, clusterConfig config.ClusterConfig, matchRegexpStr string, excludeRegexpStr string, outputDir string, overwrite bool, allowUnderscoreTopics bool) error {
 	topicInfoObjs, err := c.adminClient.GetTopics(ctx, topics, false)
 	if err != nil {
 		return err
@@ -226,7 +218,7 @@ func (c *CLIRunner) BootstrapTopics(
 	topicConfigs := []config.TopicConfig{}
 
 	for _, topicInfo := range topicInfoObjs {
-		if strings.HasPrefix(topicInfo.Name, "__") {
+		if !allowUnderscoreTopics && strings.HasPrefix(topicInfo.Name, "__") {
 			// Never include underscore topics
 			continue
 		} else if !matchRegexp.MatchString(topicInfo.Name) {