fix nil reference and key mismatch bugs; add more logs (#6)

* fix nil reference and key mismatch bugs; add more logs * remove temporary comment * addressed the lint failure and added chart to RefTargeRevisionMapping * normalize git repo (#7) * do not leak lock releases * prevent deadlock * allow spec update * move settings fetch outside loop * cache busing * return err instead of logging it * no caching in test * fix cache key marshaling Signed-off-by: Michael Crenshaw <[email protected]> Rebase with master Signed-off-by: ishitasequeira <[email protected]>
crenshaw-dev · Dec 14, 2022 · da1b020 · da1b020
1 parent 62ced60
commit da1b020
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 36 deletions.
diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go
diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go
@@ -282,10 +282,6 @@ func (a *ApplicationSource) GetRefVariableName(namespace, appName string) string
 	return fmt.Sprintf("$%s_%s_%s", namespace, appName, a.Ref)
 }
 
-func (a *ApplicationSource) GetRefVariableName(namespace, appName string) string {
-	return fmt.Sprintf("$%s_%s_%s", namespace, appName, a.Ref)
-}
-
 // ApplicationSourceHelm holds helm specific options
 type ApplicationSourceHelm struct {
 	// ValuesFiles is a list of Helm value files to use when generating a template

diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
@@ -436,7 +436,7 @@ func (s *Service) GenerateManifest(ctx context.Context, q *apiclient.ManifestReq
 	var res *apiclient.ManifestResponse
 	var err error
 	cacheFn := func(cacheKey string, firstInvocation bool) (bool, error) {
-		ok, resp, err := s.getManifestCacheEntry(cacheKey, q, q.ApplicationSource, firstInvocation)
+		ok, resp, err := s.getManifestCacheEntry(cacheKey, q, firstInvocation)
 		res = resp
 		return ok, err
 	}
@@ -609,8 +609,6 @@ func (s *Service) runManifestGenAsync(ctx context.Context, repoRoot, commitSHA,
 	// key. Overrides will break the cache anyway, because changes to overrides will change the revision.
 	appSourceCopy := q.ApplicationSource.DeepCopy()
 
-	repoLocks := make(map[string]goio.Closer)
-
 	var manifestGenResult *apiclient.ManifestResponse
 	opContext, err := opContextSrc()
 	if err == nil {

diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto
@@ -16,12 +16,12 @@ message ManifestRequest {
     // Name of the application for which the request is triggered
     string appName = 5;
     string namespace = 8;
-    jackfan.us.kg.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSource applicationSource = 11;
-    repeated jackfan.us.kg.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repos = 12;
-    repeated jackfan.us.kg.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ConfigManagementPlugin plugins = 13;
-    jackfan.us.kg.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.KustomizeOptions kustomizeOptions = 14;
-    string kubeVersion = 15;
-    repeated string apiVersions = 16;
+    jackfan.us.kg.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSource applicationSource = 10;
+    repeated jackfan.us.kg.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repos = 11;
+    repeated jackfan.us.kg.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ConfigManagementPlugin plugins = 12;
+    jackfan.us.kg.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.KustomizeOptions kustomizeOptions = 13;
+    string kubeVersion = 14;
+    repeated string apiVersions = 15;
     // Request to verify the signature when generating the manifests (only for Git repositories)
     bool verifySignature = 16;
     repeated jackfan.us.kg.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepoCreds helmRepoCreds = 17;