add ability to include internal topics in bootstrap

README.md

@@ -145,6 +145,10 @@ The `bootstrap` subcommand creates apply topic configs from the existing topics
 cluster. This can be used to "import" topics not created or previously managed by topicctl.
 The output can be sent to either a directory (if the `--output` flag is set) or `stdout`.
 
+By default, this does not include internal topics such as `__consumer_offsets`.
+If you would like to have these topics included,
+pass the `--allow-internal-topics` flag.
+
 #### check
 
 ```

cmd/topicctl/subcmd/bootstrap.go

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

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) {