fix(doctor): fix ignite doctor tool (#4575)

Author: julienrbrt

ignite/cmd/doctor.go

@@ -25,6 +25,10 @@ func NewDoctor() *cobra.Command {
 				return err
 			}
 
+			if err := doc.MigrateToolsGo(appPath); err != nil {
+				return err
+			}
+
 			configPath, err := chainconfig.LocateDefault(appPath)
 			if err != nil {
 				return err
@@ -38,10 +42,6 @@ func NewDoctor() *cobra.Command {
 				return err
 			}
 
-			if err := doc.MigrateToolsGo(appPath); err != nil {
-				return err
-			}
-
 			if err := doc.MigratePluginsConfig(); err != nil {
 				return err
 			}

ignite/pkg/cosmosbuf/buf.go

@@ -169,19 +169,15 @@ func (b Buf) Update(ctx context.Context, modDir string) error {
 
 // Migrate runs the buf Migrate command for the files in the app directory.
 func (b Buf) Migrate(ctx context.Context, protoDir string) error {
-	yamlFiles, err := xos.FindFiles(protoDir, xos.WithExtension(xos.YAMLFile), xos.WithPrefix(bufGenPrefix))
+	yamlFiles, err := xos.FindFiles(protoDir, xos.WithExtension(xos.YMLFile), xos.WithExtension(xos.YAMLFile), xos.WithPrefix(bufGenPrefix))
 	if err != nil {
 		return err
 	}
-	ymlfiles, err := xos.FindFiles(protoDir, xos.WithExtension(xos.YMLFile), xos.WithPrefix(bufGenPrefix))
-	if err != nil {
-		return err
-	}
-	yamlFiles = append(yamlFiles, ymlfiles...)
 
 	flags := map[string]string{
 		flagWorkspace: ".",
 	}
+
 	if len(yamlFiles) > 0 {
 		flags[flagBufGenYaml] = strings.Join(yamlFiles, ",")
 	}
@@ -190,6 +186,7 @@ func (b Buf) Migrate(ctx context.Context, protoDir string) error {
 	if err != nil {
 		return err
 	}
+
 	return b.runCommand(ctx, cmd...)
 }
 

ignite/pkg/xos/files.go

@@ -15,15 +15,17 @@ const (
 )
 
 type findFileOptions struct {
-	extension string
+	extension []string
 	prefix    string
 }
 
 type FindFileOptions func(o *findFileOptions)
 
+// WithExtension adds a file extension to the search options.
+// It can be called multiple times to add multiple extensions.
 func WithExtension(extension string) FindFileOptions {
 	return func(o *findFileOptions) {
-		o.extension = extension
+		o.extension = append(o.extension, extension)
 	}
 }
 
@@ -48,7 +50,15 @@ func FindFiles(directory string, options ...FindFileOptions) ([]string, error) {
 		}
 
 		// Filter by file extension if provided
-		if opts.extension != "" && filepath.Ext(path) != fmt.Sprintf(".%s", opts.extension) {
+		var matched bool
+		for _, ext := range opts.extension {
+			if filepath.Ext(path) == fmt.Sprintf(".%s", ext) {
+				matched = true
+				break
+			}
+		}
+
+		if len(opts.extension) > 0 && !matched {
 			return nil // Skip files that don't match the extension
 		}
 

ignite/pkg/xos/files_test.go

@@ -15,7 +15,7 @@ func TestFindFiles(t *testing.T) {
 	tests := []struct {
 		name      string
 		files     []string
-		extension string
+		extension []string
 		prefix    string
 		want      []string
 		err       error
@@ -62,46 +62,53 @@ func TestFindFiles(t *testing.T) {
 		{
 			name:      "test 3 extension json files",
 			files:     []string{"file1.json", "file2.txt", "file3.json", "file4.json"},
-			extension: "json",
+			extension: []string{"json"},
 			want:      []string{"file1.json", "file3.json", "file4.json"},
 			err:       nil,
 		},
 		{
 			name:      "test 3 extension json files with subfolder",
 			files:     []string{"testdata/file1.json", "file2.txt", "foo/file3.json", "file4.json"},
-			extension: "json",
+			extension: []string{"json"},
 			want:      []string{"testdata/file1.json", "foo/file3.json", "file4.json"},
 			err:       nil,
 		},
 		{
 			name:      "test 1 extension txt files",
 			files:     []string{"file1.json", "file2.txt", "file3.json", "file4.json"},
-			extension: "txt",
+			extension: []string{"txt"},
 			want:      []string{"file2.txt"},
 			err:       nil,
 		},
 		{
 			name:      "test 1 extension json files",
 			files:     []string{"file1.json"},
-			extension: "json",
+			extension: []string{"json"},
 			want:      []string{"file1.json"},
 			err:       nil,
 		},
 		{
 			name:      "test invalid files extension",
 			files:     []string{"file1.json", "file2.json", "file3.json", "file4.json"},
-			extension: "txt",
+			extension: []string{"txt"},
 			want:      []string{},
 			err:       nil,
 		},
 		{
 			name:      "test file prefix and extension",
 			files:     []string{"test.file1.json", "test.file2.txt", "test.file3.json"},
 			prefix:    "test.file",
-			extension: "json",
+			extension: []string{"json"},
 			want:      []string{"test.file1.json", "test.file3.json"},
 			err:       nil,
 		},
+		{
+			name:      "test 2 different extensions",
+			files:     []string{"file1.json", "file2.txt", "file3.json", "file4.json", "file.yaml"},
+			extension: []string{"txt", "yaml"},
+			want:      []string{"file2.txt", "file.yaml"},
+			err:       nil,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -124,8 +131,9 @@ func TestFindFiles(t *testing.T) {
 			if tt.prefix != "" {
 				opts = append(opts, xos.WithPrefix(tt.prefix))
 			}
-			if tt.extension != "" {
-				opts = append(opts, xos.WithExtension(tt.extension))
+
+			for _, ext := range tt.extension {
+				opts = append(opts, xos.WithExtension(ext))
 			}
 
 			gotFiles, err := xos.FindFiles(tempDir, opts...)

ignite/services/doctor/doctor.go

@@ -82,6 +82,12 @@ func (d *Doctor) MigrateBufConfig(ctx context.Context, cacheStorage cache.Storag
 		return errf(err)
 	}
 
+	d.ev.Send(
+		"Important: Update the local field of buf files to use `go tool`",
+		events.Icon(icons.Announcement),
+		events.Indent(1),
+	)
+
 	d.ev.Send(
 		"buf config files migrated",
 		events.Icon(icons.OK),