Merge branch 'master' into add-swagger

varsharaju · Jun 13, 2018 · 514124f · 514124f
2 parents 6e036ba + 3fbbe94
commit 514124f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/server/application/application.go b/server/application/application.go
@@ -3,6 +3,7 @@ package application
 import (
 	"bufio"
 	"encoding/json"
+	"fmt"
 	"path"
 	"reflect"
 	"strings"
@@ -69,7 +70,7 @@ func NewServer(
 
 // appRBACName formats fully qualified application name for RBAC check
 func appRBACName(app appv1.Application) string {
-	return path.Join(git.NormalizeGitURL(app.Spec.Source.RepoURL), app.Name)
+	return fmt.Sprintf("%s/%s", git.NormalizeGitURL(app.Spec.Source.RepoURL), app.Name)
 }
 
 // List returns list of applications

diff --git a/util/argo/argo.go b/util/argo/argo.go
@@ -21,6 +21,11 @@ func RefreshApp(appIf v1alpha1.ApplicationInterface, name string) (*argoappv1.Ap
 				common.AnnotationKeyRefresh: refreshString,
 			},
 		},
+		"status": map[string]interface{}{
+			"comparisonResult": map[string]interface{}{
+				"comparedAt": nil,
+			},
+		},
 	}
 	var err error
 	patch, err := json.Marshal(metadata)