change build process

This commit is contained in:
Bartal Læarsson
2025-03-03 13:19:55 +00:00
parent 7ef296daee
commit f18e328bf2
13 changed files with 93 additions and 395 deletions
+13 -66
View File
@@ -4,82 +4,29 @@ import (
"fmt"
"os"
"path/filepath"
"sync"
)
var (
repoRootCache string
repoRootOnce sync.Once
repoRootErr error
)
// GetRepoRoot returns the repository root path, caching the result after the first call
// GetRepoRoot simply returns the current working directory
// Since we're assuming the binary runs from the project root
func GetRepoRoot() (string, error) {
repoRootOnce.Do(func() {
repoRootCache, repoRootErr = findRepoRoot()
})
return repoRootCache, repoRootErr
}
// findRepoRoot attempts to find the repository root by looking for marker files/directories
// Update this function in cli/cmd/provision/config/config.go
func findRepoRoot() (string, error) {
// Start from the current working directory
// Get current working directory
cwd, err := os.Getwd()
if err != nil {
return "", fmt.Errorf("failed to get current working directory: %w", err)
}
// Walk up the directory tree until we find a marker of the repository root
currentDir := cwd
for {
// Check for multiple repository root markers in a specific order
// First check for the most reliable markers
ansibleDir := filepath.Join(currentDir, "ansible")
ansibleDefaultsDir := filepath.Join(currentDir, "ansible", "defaults")
scriptsDir := filepath.Join(currentDir, "scripts")
// Add more specific file checks
kubernetesYml := filepath.Join(currentDir, "ansible", "defaults", "kubernetes.yml")
provisionScript := filepath.Join(currentDir, "scripts", "provision-kubernetes.sh")
// Check all variations
if dirExists(ansibleDir) && dirExists(ansibleDefaultsDir) {
return currentDir, nil
}
if dirExists(scriptsDir) && fileExists(provisionScript) {
return currentDir, nil
}
if fileExists(kubernetesYml) {
return currentDir, nil
}
// Check for .git directory as a fallback
gitDir := filepath.Join(currentDir, ".git")
if dirExists(gitDir) {
// Additional validation when using .git as marker
// Make sure this is actually our repository by checking for a known file
if fileExists(filepath.Join(currentDir, "README.md")) ||
dirExists(filepath.Join(currentDir, "ansible")) ||
dirExists(filepath.Join(currentDir, "scripts")) {
return currentDir, nil
}
}
// Move up one directory
parentDir := filepath.Dir(currentDir)
if parentDir == currentDir {
// We've reached the filesystem root without finding the repo root
break
}
currentDir = parentDir
// Basic validation - check if key directories exist
ansibleDir := filepath.Join(cwd, "ansible")
if !dirExists(ansibleDir) {
return "", fmt.Errorf("ansible directory not found in %s - please run from project root", cwd)
}
// More helpful error message
return "", fmt.Errorf("repository root not found: the CLI needs to be run within the kubernetes repository that contains ansible/defaults/kubernetes.yml file. Please verify your directory structure or run 'git clone' to ensure you have the complete repository")
scriptsDir := filepath.Join(cwd, "scripts")
if !dirExists(scriptsDir) {
return "", fmt.Errorf("scripts directory not found in %s - please run from project root", cwd)
}
return cwd, nil
}
// dirExists checks if a directory exists