Merge pull request #248 from projectsyn/fix/do-not-adpot

Stop adopting existing git repositories by default
projectsyn · Sep 28, 2022 · f208f57 · f208f57
2 parents b90a90a + a161eac
commit f208f57
Show file tree

Hide file tree

Showing 3 changed files with 365 additions and 6 deletions.
diff --git a/api/v1alpha1/gitrepo_types.go b/api/v1alpha1/gitrepo_types.go
@@ -25,6 +25,7 @@ const (
 // GitPhase enum values
 const (
 	Created       GitPhase       = "created"
+	Creating      GitPhase       = "creating"
 	Failed        GitPhase       = "failed"
 	PhaseUnknown  GitPhase       = ""
 	ArchivePolicy DeletionPolicy = "Archive"

diff --git a/controllers/gitrepo/steps.go b/controllers/gitrepo/steps.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/go-logr/logr"
 	synv1alpha1 "github.com/projectsyn/lieutenant-operator/api/v1alpha1"
 
 	// Register Gitrepo implementation - DONOT REMOVE
@@ -14,6 +15,12 @@ import (
 )
 
 func Steps(obj pipeline.Object, data *pipeline.Context) pipeline.Result {
+	return steps(obj, data, manager.GetGitClient)
+}
+
+type gitClientFactory func(ctx context.Context, instance *synv1alpha1.GitRepoTemplate, namespace string, reqLogger logr.Logger, client client.Client) (manager.Repo, string, error)
+
+func steps(obj pipeline.Object, data *pipeline.Context, getGitClient gitClientFactory) pipeline.Result {
 	instance, ok := obj.(*synv1alpha1.GitRepo)
 	if !ok {
 		return pipeline.Result{Err: fmt.Errorf("object '%s/%s' is not of kind GitRepository", obj.GetNamespace(), obj.GetName())}
@@ -29,7 +36,7 @@ func Steps(obj pipeline.Object, data *pipeline.Context) pipeline.Result {
 		return pipeline.Result{}
 	}
 
-	repo, hostKeys, err := manager.GetGitClient(data.Context, &instance.Spec.GitRepoTemplate, instance.GetNamespace(), data.Log, data.Client)
+	repo, hostKeys, err := getGitClient(data.Context, &instance.Spec.GitRepoTemplate, instance.GetNamespace(), data.Log, data.Client)
 	if err != nil {
 		return pipeline.Result{Err: fmt.Errorf("get Git client: %w", err)}
 	}
@@ -38,14 +45,31 @@ func Steps(obj pipeline.Object, data *pipeline.Context) pipeline.Result {
 
 	if !repoExists(repo) {
 		data.Log.Info("creating git repo", manager.SecretEndpointName, repo.FullURL())
+		instance.Status.URL = repo.FullURL().String()
+		phase := synv1alpha1.Creating
+		instance.Status.Phase = &phase
+		if err := data.Client.Status().Update(data.Context, instance); err != nil {
+			return pipeline.Result{Err: fmt.Errorf("could not set status while creating repository: %w", err)}
+		}
 		err := repo.Create()
 		if err != nil {
+			instance.Status.URL = "" // Revert status to reduce race condition likelihood
 			return pipeline.Result{Err: handleRepoError(data.Context, err, instance, data.Client)}
 
 		}
 		data.Log.Info("successfully created the repository")
 	}
 
+	if instance.Status.URL != repo.FullURL().String() {
+		var err error
+		if !data.Deleted {
+			phase := synv1alpha1.Failed
+			instance.Status.Phase = &phase
+			err = handleRepoError(data.Context, fmt.Errorf("Failed to adopt repository. Repository %q already exists and is not managed by %s ", repo.FullURL().String(), instance.Name), instance, data.Client)
+		}
+		return pipeline.Result{Err: err}
+	}
+
 	if data.Deleted {
 		err := repo.Remove()
 		if err != nil {
@@ -61,7 +85,7 @@ func Steps(obj pipeline.Object, data *pipeline.Context) pipeline.Result {
 
 	changed, err := repo.Update()
 	if err != nil {
-		return pipeline.Result{Err: fmt.Errorf("update repo: %w", err)}
+		return pipeline.Result{Err: handleRepoError(data.Context, fmt.Errorf("update repo: %w", err), instance, data.Client)}
 	}
 
 	if changed {
@@ -77,11 +101,9 @@ func Steps(obj pipeline.Object, data *pipeline.Context) pipeline.Result {
 }
 
 func repoExists(repo manager.Repo) bool {
-	if err := repo.Read(); err == nil {
-		return true
-	}
+	err := repo.Read()
+	return err == nil
 
-	return false
 }
 
 func handleRepoError(ctx context.Context, err error, instance *synv1alpha1.GitRepo, client client.Client) error {