dynamically add new stacks

Author: clangenb

swarmcd/init.go

@@ -44,17 +44,32 @@ func Init() (err error) {
 }
 
 func initRepos() error {
+	var newRepos = map[string]*stackRepo{}
+
 	for repoName, repoConfig := range config.RepoConfigs {
+		if repo, exists := repos[repoName]; exists {
+			newRepos[repoName] = repo
+			delete(repos, repoName)
+			continue
+		}
+
 		repoPath := path.Join(config.ReposPath, repoName)
 		auth, err := createHTTPBasicAuth(repoName)
 		if err != nil {
 			return err
 		}
-		repos[repoName], err = newStackRepo(repoName, repoPath, repoConfig.Url, auth)
+		newRepos[repoName], err = newStackRepo(repoName, repoPath, repoConfig.Url, auth)
 		if err != nil {
 			return err
 		}
 	}
+
+	if len(repos) != 0 {
+		logger.Info("Some repos were removed from the stack: %v", repos)
+	}
+
+	repos = newRepos
+
 	return nil
 }
 
@@ -92,17 +107,38 @@ func createHTTPBasicAuth(repoName string) (*http.BasicAuth, error) {
 }
 
 func initStacks() error {
+	var newStacks = map[string]*swarmStack{}
+	var newStackStatus = map[string]*StackStatus{}
+
 	for stack, stackConfig := range config.StackConfigs {
 		stackRepo, ok := repos[stackConfig.Repo]
 		if !ok {
 			return fmt.Errorf("error initializing %s stack, no such repo: %s", stack, stackConfig.Repo)
 		}
+
 		discoverSecrets := config.SopsSecretsDiscovery || stackConfig.SopsSecretsDiscovery
 		swarmStack := newSwarmStack(stack, stackRepo, stackConfig.Branch, stackConfig.ComposeFile, stackConfig.SopsFiles, stackConfig.ValuesFile, discoverSecrets)
-		stacks = append(stacks, swarmStack)
-		stackStatus[stack] = &StackStatus{}
-		stackStatus[stack].RepoURL = stackRepo.url
+
+		newStacks[stack] = swarmStack
+		if _, exists := stacks[stack]; exists {
+			delete(stacks, stack)
+		}
+
+		newStackStatus[stack] = &StackStatus{}
+		newStackStatus[stack].RepoURL = stackRepo.url
+		if _, exists := stackStatus[stack]; exists {
+			delete(stacks, stack)
+		}
 	}
+
+	if len(stacks) != 0 {
+		logger.Info("Some stacks were removed: %v", stacks)
+		// Todo: do we need to do something for this.
+	}
+
+	stacks = newStacks
+	stackStatus = newStackStatus
+
 	return nil
 }
 

swarmcd/swarmcd.go

@@ -2,25 +2,48 @@ package swarmcd
 
 import (
 	"fmt"
+	"github.com/m-adawi/swarm-cd/util"
 	"sync"
 	"time"
 )
 
-var stackStatus map[string]*StackStatus = map[string]*StackStatus{}
-var stacks []*swarmStack
+var stackStatus = map[string]*StackStatus{}
+var stacks = map[string]*swarmStack{}
 
 func Run() {
 	logger.Info("starting SwarmCD")
 	for {
 		var waitGroup sync.WaitGroup
 		logger.Info("updating stacks...")
 		for _, swarmStack := range stacks {
+			logger.Info("Starting go routine for %v", swarmStack.name)
+
 			waitGroup.Add(1)
 			go updateStackThread(swarmStack, &waitGroup)
 		}
 		waitGroup.Wait()
 		logger.Info("waiting for the update interval")
 		time.Sleep(time.Duration(config.UpdateInterval) * time.Second)
+
+		logger.Info("check if new repos or new stacks are available")
+		updateStackConfigs()
+	}
+}
+
+func updateStackConfigs() {
+	err := util.LoadConfigs()
+	if err != nil {
+		logger.Info("Error calling loadConfig again: %v", err)
+	}
+
+	err = initRepos()
+	if err != nil {
+		logger.Info("Error calling initRepos again: %v", err)
+	}
+
+	err = initStacks()
+	if err != nil {
+		logger.Info("Error calling initStacks again: %v", err)
 	}
 }
 

util/config.go

@@ -40,17 +40,15 @@ func LoadConfigs() (err error) {
 	if err != nil {
 		return fmt.Errorf("could not read configuration file: %w", err)
 	}
-	if Configs.RepoConfigs == nil {
-		err = readRepoConfigs()
-		if err != nil {
-			return fmt.Errorf("could not read repos file: %w", err)
-		}
+
+	err = readRepoConfigs()
+	if err != nil {
+		return fmt.Errorf("could not read repos file: %w", err)
 	}
-	if Configs.StackConfigs == nil {
-		err = readStackConfigs()
-		if err != nil {
-			return fmt.Errorf("could not load stacks file: %w", err)
-		}
+
+	err = readStackConfigs()
+	if err != nil {
+		return fmt.Errorf("could not load stacks file: %w", err)
 	}
 	return
 }