update: Added Longhorn installation process and updated memory allocation for VMs
update: Added 'git' and 'vagrant' to required tools in pre-flight checks fix: configured k3s install to use internal nic for flanel network update: Added Longhorn installation process and updated memory allocation for VMs update: Added 'git' and 'vagrant' to required tools in pre-flight checks fix: configured k3s install to use internal nic for flanel network fix: corrected JSON formatting for config json update: reduce VM memory allocation to 2GB, add Longhorn installation scripts and prerequisites, and implement checks for existing pods fix: merge issues fix: merge issues update: Added Longhorn installation process and updated memory allocation for VMs update: Added 'git' and 'vagrant' to required tools in pre-flight checks fix: configured k3s install to use internal nic for flanel network update: Added Longhorn installation process and updated memory allocation for VMs update: Added 'git' and 'vagrant' to required tools in pre-flight checks fix: configured k3s install to use internal nic for flanel network fix: corrected JSON formatting for config json update: reduce VM memory allocation to 2GB, add Longhorn installation scripts and prerequisites, and implement checks for existing pods update: improve error logging in RunJsonDeployment and RunCommand functions update: add jq installation to provision script update: add version flag bump version fix: improve error messages for config file reading feat: add Windows gitbash installation support and improve binary download process clean up tmp code fix: increase timeout for some slower windows clients feat: add Ingress and Service configurations for nginx deployment, and implement MetalLB and Traeik installation scripts refactor: remove obsolete Traefik installation script feat: add environment checks and configurations for Vagrant setup, including dnsmasq MetalLB and ingress feat: add deployment and installation scripts for infmon-cli, including Kubernetes configurations feat: refactor customer project creation and add success/failure job scripts refactor: rename customer references to project in configuration and application logic feat: enhance JSON deployment handling with retry logic and command execution improvements feat: enhance RunJsonDeployment with error handling and retry logic; add tests for configuration reading feat: add automatic creation of base and config JSON files from examples if they do not exist refactor: remove database package and related functionality; update app state initialization and error handling refactor: update deployment handling to use ProjectConfig; improve error messages and logging feat: enhance RunJsonDeployment retry logic with configurable delay; improve logging for retries feat: implement LoadConfigs function for improved configuration loading; add logger setup refactor: remove unused fields from BaseConfig and ProjectConfig structs for cleaner configuration management refactor: clean up tests by removing obsolete functions and simplifying test cases chore: update version to v0.0.5 in install script feat: implement default configuration creation for BaseConfig and ProjectConfig; enhance validation logic fix: enhance configuration parsing and loading; streamline flag handling and error reporting refactor: remove obsolete configuration download logic from installation script
This commit is contained in:
jon brookes
parent
d839fd5687
commit
11b1f1b637
61 changed files with 1573 additions and 761 deletions
106
main.go
106
main.go
|
|
@ -14,101 +14,61 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
|
||||
"fmt"
|
||||
"log"
|
||||
"log/slog"
|
||||
"os"
|
||||
|
||||
"headshed/infctl-cli/app"
|
||||
"headshed/infctl-cli/config"
|
||||
"headshed/infctl-cli/logger"
|
||||
)
|
||||
|
||||
type customMessageOnlyHandler struct {
|
||||
output *os.File
|
||||
}
|
||||
|
||||
func (h *customMessageOnlyHandler) Enabled(_ context.Context, _ slog.Level) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (h *customMessageOnlyHandler) Handle(_ context.Context, r slog.Record) error {
|
||||
// Directly retrieve the message from the record
|
||||
msg := r.Message
|
||||
if msg != "" {
|
||||
_, err := fmt.Fprintln(h.output, msg)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (h *customMessageOnlyHandler) WithAttrs(_ []slog.Attr) slog.Handler {
|
||||
return h
|
||||
}
|
||||
|
||||
func (h *customMessageOnlyHandler) WithGroup(_ string) slog.Handler {
|
||||
return h
|
||||
}
|
||||
|
||||
func main() {
|
||||
|
||||
var levelVar slog.LevelVar
|
||||
levelVar.Set(slog.LevelDebug)
|
||||
|
||||
var logger *slog.Logger
|
||||
if os.Getenv("LOG_FORMAT") == "basic" {
|
||||
logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
|
||||
ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
|
||||
if a.Key == slog.TimeKey {
|
||||
return slog.Attr{}
|
||||
}
|
||||
return a
|
||||
},
|
||||
}))
|
||||
|
||||
} else if os.Getenv("LOG_FORMAT") == "none" {
|
||||
logger = slog.New(&customMessageOnlyHandler{output: os.Stdout})
|
||||
|
||||
} else {
|
||||
logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: &levelVar}))
|
||||
config.ParseFlags()
|
||||
baseConfig, projectConfig, err := config.LoadConfigs()
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Config error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
logFormat := projectConfig.LogFormat
|
||||
if os.Getenv("LOG_FORMAT") != "" {
|
||||
logFormat = os.Getenv("LOG_FORMAT")
|
||||
}
|
||||
logFilePath := os.Getenv("LOG_FILE")
|
||||
|
||||
logger := logger.SetupLogger(logFormat, logFilePath, slog.LevelDebug)
|
||||
slog.SetDefault(logger)
|
||||
|
||||
if err := run(); err != nil {
|
||||
log.Fatalf("Application error: %v", err)
|
||||
if err := run(projectConfig, baseConfig); err != nil {
|
||||
slog.Error("❌ 💥 Pipeline error: " + err.Error())
|
||||
os.Exit(1)
|
||||
} else {
|
||||
slog.Info("✅ 🚀 Pipeline completed successfully")
|
||||
}
|
||||
}
|
||||
|
||||
func run() error {
|
||||
func run(projectConfig config.ProjectConfig, baseConfig config.BaseConfig) error {
|
||||
|
||||
wd, err := os.Getwd()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get current directory: %w", err)
|
||||
}
|
||||
baseConfigPath := wd + string(os.PathSeparator) + "base.json"
|
||||
configPath := wd + string(os.PathSeparator) + "config.json"
|
||||
|
||||
baseConfig, err := config.ReadBaseConfig(baseConfigPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("error reading base config file: %w", err)
|
||||
}
|
||||
customerConfig, err := config.ReadCustomerConfig(configPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("error reading customer config file: %w", err)
|
||||
}
|
||||
appState, err := app.NewAppState(customerConfig, baseConfig, "app.db")
|
||||
appState, err := app.NewAppState(projectConfig, baseConfig)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to initialize app state: %w", err)
|
||||
}
|
||||
defer func() {
|
||||
if err := appState.DB.Close(); err != nil {
|
||||
log.Printf("Error closing database: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
if err := appState.CreatePipeline(); err != nil {
|
||||
return fmt.Errorf("failed to create customer project: %w", err)
|
||||
// Pretty-print appState as JSON
|
||||
if os.Getenv("DEBUG") == "1" {
|
||||
if jsonBytes, err := json.MarshalIndent(appState, "", " "); err == nil {
|
||||
fmt.Printf(">>DEBUG>> appState:\n%s\n", string(jsonBytes))
|
||||
} else {
|
||||
fmt.Printf(">>DEBUG>> appState: %+v\n", appState)
|
||||
}
|
||||
}
|
||||
|
||||
if err := appState.CreateProjectAndRunPipeline(); err != nil {
|
||||
return fmt.Errorf("pipeline error: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue