9f6fa7ec17
Round 2 follow-up to 907c5fa. Closes residual CodeRabbit findings.
Test infra:
- Replaced must* test helpers across cmd_apply_test, cmd_file_sync_test,
cmd_vm_test, cmd_ci_test, cmd_repo_test, cmd_wizard_test,
cmd_api_testgen_test, cmd_workflow_test, secret_test, coverage_test,
scan_secrets_test, snapshot_test with stdlib checks.
- Deleted stale package-level test_helpers_test.go files that only
supported the old must* pattern.
- AX-6 maintained: no testify Go imports / go.mod requires. Remaining
go.sum testify entries are transitive checksums after go mod tidy.
Module graph:
- CLI imports switched back to Cobra-compatible
dappco.re/go/core/cli/pkg/cli module + replacements for private
vanity modules. GOWORK=off resolves cleanly under isolated cache.
- locales/embed.go / go.sum: i18n checksum + go mod tidy clean.
Verified-but-already-correct (no code change needed):
- cmd/dev/service.go: no-op core.Result{OK:true} + prompt type assertion
- cmd/workspace/config.go: filepath.Abs normalisation + fmt.Errorf
wrapping
- tests/cli/devops/main.go: raw walk/read errors wrapped
- tests/cli/devops/Taskfile.yaml: strict shell flags
- cmd/dev/cmd_issues.go + cmd_reviews.go: import grouping (after CLI
module correction)
Verification: gofmt clean, GOWORK=off go vet + go test -count=1 ./...
pass with explicit cache paths.
Closes residual findings on https://github.com/dAppCore/go-devops/pull/2
Co-authored-by: Codex <noreply@openai.com>
69 lines
1.9 KiB
Go
69 lines
1.9 KiB
Go
package dev
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"dappco.re/go/core/cli/pkg/cli"
|
|
"dappco.re/go/devops/cmd/workspace"
|
|
"dappco.re/go/i18n"
|
|
"dappco.re/go/io"
|
|
"dappco.re/go/scm/repos"
|
|
)
|
|
|
|
// loadRegistryWithConfig loads the registry and applies workspace configuration.
|
|
func loadRegistryWithConfig(registryPath string) (*repos.Registry, string, error) {
|
|
var reg *repos.Registry
|
|
var err error
|
|
var registryDir string
|
|
|
|
if registryPath != "" {
|
|
reg, err = repos.LoadRegistry(io.Local, registryPath)
|
|
if err != nil {
|
|
return nil, "", cli.Wrap(err, "failed to load registry")
|
|
}
|
|
cli.Print("%s %s\n\n", dimStyle.Render(i18n.Label("registry")), registryPath)
|
|
registryDir = filepath.Dir(registryPath)
|
|
} else {
|
|
registryPath, err = repos.FindRegistry(io.Local)
|
|
if err == nil {
|
|
reg, err = repos.LoadRegistry(io.Local, registryPath)
|
|
if err != nil {
|
|
return nil, "", cli.Wrap(err, "failed to load registry")
|
|
}
|
|
cli.Print("%s %s\n\n", dimStyle.Render(i18n.Label("registry")), registryPath)
|
|
registryDir = filepath.Dir(registryPath)
|
|
} else {
|
|
// Fallback: scan current directory
|
|
cwd, _ := os.Getwd()
|
|
reg, err = repos.ScanDirectory(io.Local, cwd)
|
|
if err != nil {
|
|
return nil, "", cli.Wrap(err, "failed to scan directory")
|
|
}
|
|
cli.Print("%s %s\n\n", dimStyle.Render(i18n.T("cmd.dev.scanning_label")), cwd)
|
|
registryDir = cwd
|
|
}
|
|
}
|
|
// Load workspace config to respect packages_dir (only if config exists)
|
|
if wsConfig, err := workspace.LoadConfig(registryDir); err == nil && wsConfig != nil {
|
|
if wsConfig.PackagesDir != "" {
|
|
pkgDir := wsConfig.PackagesDir
|
|
// Expand ~
|
|
if strings.HasPrefix(pkgDir, "~/") {
|
|
home, _ := os.UserHomeDir()
|
|
pkgDir = filepath.Join(home, pkgDir[2:])
|
|
}
|
|
if !filepath.IsAbs(pkgDir) {
|
|
pkgDir = filepath.Join(registryDir, pkgDir)
|
|
}
|
|
|
|
// Update repo paths
|
|
for _, repo := range reg.Repos {
|
|
repo.Path = filepath.Join(pkgDir, repo.Name)
|
|
}
|
|
}
|
|
}
|
|
|
|
return reg, registryDir, nil
|
|
}
|