feat: Add support for diroctories from buf v2 and easyp as well

Author: hound672

internal/adapters/module_config/read_buf_work.go

@@ -2,9 +2,7 @@ package moduleconfig
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"log/slog"
 	"strings"
 
 	"gopkg.in/yaml.v3"
@@ -13,28 +11,70 @@ import (
 	"github.com/easyp-tech/easyp/internal/core/models"
 )
 
-type bufWork struct {
+type bufV1Config struct {
 	Directories []string `yaml:"directories"`
 }
 
+type bufV2Config struct {
+	Modules []struct {
+		Path string `yaml:"path"`
+		Name string `yaml:"name"`
+		Lint struct {
+			IgnoreOnly struct {
+				PACKAGEVERSIONSUFFIX []string `yaml:"PACKAGE_VERSION_SUFFIX"`
+			} `yaml:"ignore_only"`
+		} `yaml:"lint"`
+	} `yaml:"modules"`
+}
+
 const (
-	bufWorkFile = "buf.work.yaml"
+	bufV1ConfigFile = "buf.work.yaml"
+	bufV2ConfigFile = "buf.yaml"
 )
 
-func readBufWork(ctx context.Context, repo repository.Repo, revision models.Revision) (bufWork, error) {
-	content, err := repo.ReadFile(ctx, revision, bufWorkFile)
+func readBufWork(ctx context.Context, repo repository.Repo, revision models.Revision) (models.ModuleConfig, error) {
+	bufV1, err := readBufV1(ctx, repo, revision)
+	if err == nil {
+		return bufV1, nil
+	}
+
+	bufV2, err := readBufV2(ctx, repo, revision)
+	return bufV2, err
+}
+
+func readBufV1(ctx context.Context, repo repository.Repo, revision models.Revision) (models.ModuleConfig, error) {
+	content, err := repo.ReadFile(ctx, revision, bufV1ConfigFile)
+	if err != nil {
+		return models.ModuleConfig{}, fmt.Errorf("repo.ReadFile: %w", err)
+	}
+
+	buf := bufV1Config{}
+	if err := yaml.NewDecoder(strings.NewReader(content)).Decode(&buf); err != nil {
+		return models.ModuleConfig{}, fmt.Errorf("yaml.NewDecoder: %w", err)
+	}
+
+	return models.ModuleConfig{
+		Directories: buf.Directories,
+	}, nil
+}
+
+func readBufV2(ctx context.Context, repo repository.Repo, revision models.Revision) (models.ModuleConfig, error) {
+	content, err := repo.ReadFile(ctx, revision, bufV2ConfigFile)
 	if err != nil {
-		if errors.Is(err, models.ErrFileNotFound) {
-			slog.Debug("buf config not found")
-			return bufWork{}, nil
-		}
-		return bufWork{}, fmt.Errorf("repo.ReadFile: %w", err)
+		return models.ModuleConfig{}, fmt.Errorf("repo.ReadFile: %w", err)
 	}
 
-	buf := bufWork{}
+	buf := bufV2Config{}
 	if err := yaml.NewDecoder(strings.NewReader(content)).Decode(&buf); err != nil {
-		return bufWork{}, fmt.Errorf("yaml.NewDecoder: %w", err)
+		return models.ModuleConfig{}, fmt.Errorf("yaml.NewDecoder: %w", err)
+	}
+
+	dirs := make([]string, 0, len(buf.Modules))
+	for _, module := range buf.Modules {
+		dirs = append(dirs, module.Path)
 	}
 
-	return buf, nil
+	return models.ModuleConfig{
+		Directories: dirs,
+	}, nil
 }

internal/adapters/module_config/read_easyp.go

@@ -2,37 +2,38 @@ package moduleconfig
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"log/slog"
 
 	"github.com/easyp-tech/easyp/internal/adapters/repository"
 	"github.com/easyp-tech/easyp/internal/config"
 	"github.com/easyp-tech/easyp/internal/core/models"
 )
 
 // readEasyp read easyp's config from repository
-func readEasyp(ctx context.Context, repo repository.Repo, revision models.Revision) ([]models.Module, error) {
+func readEasyp(ctx context.Context, repo repository.Repo, revision models.Revision) (models.ModuleConfig, error) {
 	content, err := repo.ReadFile(ctx, revision, config.DefaultFileName)
 	if err != nil {
-		if errors.Is(err, models.ErrFileNotFound) {
-			slog.Debug("easyp.yaml not found in dependency (this is normal)")
-			return nil, nil
-		}
-		return nil, fmt.Errorf("repo.ReadFile: %w", err)
+		return models.ModuleConfig{}, fmt.Errorf("repo.ReadFile: %w", err)
 	}
 
-	// Use unified parsing function with environment variable support
-	cfg, err := config.ParseConfig([]byte(content))
+	easyp, err := config.ParseConfig([]byte(content))
 	if err != nil {
-		return nil, fmt.Errorf("config.ParseConfig: %w", err)
+		return models.ModuleConfig{}, fmt.Errorf("config.ParseConfig: %w", err)
 	}
 
-	modules := make([]models.Module, 0, len(cfg.Deps))
-	for _, dep := range cfg.Deps {
+	modules := make([]models.Module, 0, len(easyp.Deps))
+	for _, dep := range easyp.Deps {
 		module := models.NewModule(dep)
 		modules = append(modules, module)
 	}
 
-	return modules, nil
+	dirs := make([]string, 0, len(easyp.Generate.Inputs))
+	for _, input := range easyp.Generate.Inputs {
+		dirs = append(dirs, input.InputFilesDir.Root)
+	}
+
+	return models.ModuleConfig{
+		Dependencies: modules,
+		Directories:  dirs,
+	}, nil
 }

internal/adapters/module_config/read_from_repo.go

@@ -2,7 +2,9 @@ package moduleconfig
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"log/slog"
 
 	"github.com/easyp-tech/easyp/internal/adapters/repository"
 	"github.com/easyp-tech/easyp/internal/core/models"
@@ -12,19 +14,27 @@ import (
 func (c *ModuleConfig) ReadFromRepo(
 	ctx context.Context, repo repository.Repo, revision models.Revision,
 ) (models.ModuleConfig, error) {
+	// buf
+	slog.Debug("Start read buf config")
+
 	buf, err := readBufWork(ctx, repo, revision)
-	if err != nil {
+	if err == nil {
+		return buf, nil
+	}
+	if !errors.Is(err, models.ErrFileNotFound) {
 		return models.ModuleConfig{}, fmt.Errorf("readBufWork: %w", err)
 	}
 
-	modules, err := readEasyp(ctx, repo, revision)
-	if err != nil {
+	// easyp
+	slog.Debug("Start read easyp config")
+
+	easyp, err := readEasyp(ctx, repo, revision)
+	if err == nil {
+		return easyp, nil
+	}
+	if !errors.Is(err, models.ErrFileNotFound) {
 		return models.ModuleConfig{}, fmt.Errorf("readEasyp: %w", err)
 	}
 
-	moduleConfig := models.ModuleConfig{
-		Directories:  buf.Directories,
-		Dependencies: modules,
-	}
-	return moduleConfig, nil
+	return models.ModuleConfig{}, nil
 }