Bugfix: fixing invalidation error introduced in gimletd-dash merging

Author: laszlocph

pkg/dashboard/worker/gitops.go

@@ -424,7 +424,7 @@ func processRollbackEvent(
 		logrus.Errorf("could not push to git with native command: %s", err)
 		return nil, fmt.Errorf("could not push to git. Check server logs")
 	}
-	gitopsRepoCache.Invalidate(repoName)
+	gitopsRepoCache.InvalidateNow(repoName)
 
 	rollbackResults := []model.Result{}
 
@@ -612,14 +612,15 @@ func cloneTemplateWriteAndPush(
 
 	if sha != "" || kustomizationSha != "" { // if there is a change to push
 		operation := func() error {
-			return nativeGit.PushWithToken(repo, githubChartAccessToken)
+			head, _ := repo.Head()
+			return nativeGit.NativePushWithToken(repoTmpPath, repoName, githubChartAccessToken, head.Name().Short())
 		}
 		backoffStrategy := backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 5)
 		err := backoff.Retry(operation, backoffStrategy)
 		if err != nil {
 			return "", err
 		}
-		gitopsRepoCache.Invalidate(repoName)
+		gitopsRepoCache.InvalidateNow(repoName)
 	}
 
 	perf.WithLabelValues("gitops_cloneTemplateWriteAndPush").Observe(float64(time.Since(t0).Seconds()))
@@ -669,11 +670,12 @@ func cloneTemplateDeleteAndPush(
 	sha, err := nativeGit.Commit(repo, gitMessage)
 
 	if sha != "" { // if there is a change to push
-		err = nativeGit.PushWithToken(repo, nonImpersonatedToken)
+		head, _ := repo.Head()
+		err = nativeGit.NativePushWithToken(repoTmpPath, repoName, nonImpersonatedToken, head.Name().Short())
 		if err != nil {
 			return "", err
 		}
-		gitopsRepoCache.Invalidate(repoName)
+		gitopsRepoCache.InvalidateNow(repoName)
 	}
 
 	return sha, nil

pkg/git/nativeGit/repoCache.go

@@ -205,7 +205,7 @@ func (r *RepoCache) InstanceForWrite(repoName string) (*git.Repository, string,
 		_, err = r.clone(repoName)
 		go r.registerWebhook(repoName)
 	}
-	r.lock.Unlock()
+	defer r.lock.Unlock()
 	if err != nil {
 		return nil, "", err
 	}
@@ -232,6 +232,11 @@ func (r *RepoCache) Invalidate(repoName string) {
 	r.invalidateCh <- repoName
 }
 
+func (r *RepoCache) InvalidateNow(repoName string) {
+	logrus.Infof("invalidating repocace now for %s", repoName)
+	r.syncGitRepo(repoName)
+}
+
 func (r *RepoCache) clone(repoName string) (*git.Repository, error) {
 	if repoName == "" {
 		return nil, fmt.Errorf("repo name is mandatory")