Move parameters listing from GenerateManifests to GetAppDetails (argo…

…proj#1221)

* Move parameters listing from GenerateManifests to GetAppDetails
* Fix logging to use standard logger to honor CLI loglevel

assets/swagger.json

@@ -1199,6 +1199,14 @@
             "type": "string",
             "name": "revision",
             "in": "query"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "name": "helm.valueFiles",
+            "in": "query"
           }
         ],
         "responses": {
@@ -1588,13 +1596,30 @@
       "type": "object",
       "title": "DirectoryAppSpec contains directory"
     },
+    "repositoryHelmAppDetailsQuery": {
+      "type": "object",
+      "properties": {
+        "valueFiles": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "repositoryHelmAppSpec": {
       "type": "object",
       "title": "HelmAppSpec contains helm app name and path in source repo",
       "properties": {
         "name": {
           "type": "string"
         },
+        "parameters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/v1alpha1HelmParameter"
+          }
+        },
         "path": {
           "type": "string"
         },
@@ -1619,6 +1644,12 @@
         "name": {
           "type": "string"
         },
+        "parameters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/v1alpha1KsonnetParameter"
+          }
+        },
         "path": {
           "type": "string"
         }
@@ -1661,6 +1692,12 @@
       "type": "object",
       "title": "KustomizeAppSpec contains kustomize app name and path in source repo",
       "properties": {
+        "imageTags": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/v1alpha1KustomizeImageTag"
+          }
+        },
         "path": {
           "type": "string"
         }
@@ -1678,12 +1715,6 @@
         "namespace": {
           "type": "string"
         },
-        "params": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/v1alpha1ComponentParameter"
-          }
-        },
         "revision": {
           "type": "string"
         },

cmd/argocd-application-controller/main.go

@@ -65,7 +65,7 @@ func newCommand() *cobra.Command {
 			errors.CheckError(err)
 
 			resyncDuration := time.Duration(appResyncPeriod) * time.Second
-			repoClientset := reposerver.NewRepositoryServerClientset(repoServerAddress)
+			repoClientset := reposerver.NewRepoServerClientset(repoServerAddress)
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 

cmd/argocd-server/commands/root.go

@@ -57,7 +57,7 @@ func NewCommand() *cobra.Command {
 
 			kubeclientset := kubernetes.NewForConfigOrDie(config)
 			appclientset := appclientset.NewForConfigOrDie(config)
-			repoclientset := reposerver.NewRepositoryServerClientset(repoServerAddress)
+			repoclientset := reposerver.NewRepoServerClientset(repoServerAddress)
 
 			argoCDOpts := server.ArgoCDServerOpts{
 				Insecure:            insecure,

cmd/argocd/commands/app.go

@@ -1379,22 +1379,13 @@ func NewApplicationHistoryCommand(clientOpts *argocdclient.ClientOptions) *cobra
 			app, err := appIf.Get(context.Background(), &application.ApplicationQuery{Name: &appName})
 			errors.CheckError(err)
 			w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-			switch output {
-			case "wide":
-				fmt.Fprintf(w, "ID\tDATE\tCOMMIT\tPARAMETERS\n")
-			default:
-				fmt.Fprintf(w, "ID\tDATE\tCOMMIT\n")
-			}
+			fmt.Fprintf(w, "ID\tDATE\tREVISION\n")
 			for _, depInfo := range app.Status.History {
-				switch output {
-				case "wide":
-					manifest, err := appIf.GetManifests(context.Background(), &application.ApplicationManifestQuery{Name: &appName, Revision: depInfo.Revision})
-					errors.CheckError(err)
-					paramStr := paramString(manifest.GetParams())
-					fmt.Fprintf(w, "%d\t%s\t%s\t%s\n", depInfo.ID, depInfo.DeployedAt, depInfo.Revision, paramStr)
-				default:
-					fmt.Fprintf(w, "%d\t%s\t%s\n", depInfo.ID, depInfo.DeployedAt, depInfo.Revision)
+				rev := depInfo.Source.TargetRevision
+				if len(depInfo.Revision) >= 7 {
+					rev = fmt.Sprintf("%s (%s)", rev, depInfo.Revision[0:7])
 				}
+				fmt.Fprintf(w, "%d\t%s\t%s\n", depInfo.ID, depInfo.DeployedAt, rev)
 			}
 			_ = w.Flush()
 		},
@@ -1403,17 +1394,6 @@ func NewApplicationHistoryCommand(clientOpts *argocdclient.ClientOptions) *cobra
 	return command
 }
 
-func paramString(params []*argoappv1.ComponentParameter) string {
-	if len(params) == 0 {
-		return ""
-	}
-	paramNames := []string{}
-	for _, param := range params {
-		paramNames = append(paramNames, fmt.Sprintf("%s=%s=%s", param.Component, param.Name, param.Value))
-	}
-	return strings.Join(paramNames, ",")
-}
-
 // NewApplicationRollbackCommand returns a new instance of an `argocd app rollback` command
 func NewApplicationRollbackCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
 	var (

controller/appcontroller_test.go

@@ -42,10 +42,10 @@ func newFakeController(data *fakeData) *ApplicationController {
 	}
 
 	// Mock out call to GenerateManifest
-	mockRepoClient := mockrepoclient.RepositoryServiceClient{}
+	mockRepoClient := mockrepoclient.RepoServerServiceClient{}
 	mockRepoClient.On("GenerateManifest", mock.Anything, mock.Anything).Return(data.manifestResponse, nil)
 	mockRepoClientset := mockreposerver.Clientset{}
-	mockRepoClientset.On("NewRepositoryClient").Return(&fakeCloser{}, &mockRepoClient, nil)
+	mockRepoClientset.On("NewRepoServerClient").Return(&fakeCloser{}, &mockRepoClient, nil)
 
 	secret := corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{

controller/state.go

@@ -85,7 +85,7 @@ func (m *appStateManager) getRepoObjs(app *v1alpha1.Application, source v1alpha1
 		return nil, nil, nil, err
 	}
 	repo := m.getRepo(source.RepoURL)
-	conn, repoClient, err := m.repoClientset.NewRepositoryClient()
+	conn, repoClient, err := m.repoClientset.NewRepoServerClient()
 	if err != nil {
 		return nil, nil, nil, err
 	}

hack/format-code.sh

@@ -1,7 +1,12 @@
 #! /bin/sh
 set -eu
 
-CHANGED_GO_FILES=$(git diff --name-only | grep ".go$" || true)
+CHANGED_GO_FILES=""
+for file in $(git diff --name-only | grep ".go$" || true); do
+    if [[ -f ${file} ]] ; then
+        CHANGED_GO_FILES="${CHANGED_GO_FILES} ${file}"
+    fi
+done
 
 if [[ "${CHANGED_GO_FILES}" != "" ]]; then
     echo "Formatting imports"

hack/generate-proto.sh

@@ -117,7 +117,7 @@ clean_swagger() {
     /usr/bin/find "${SWAGGER_ROOT}" -name '*.swagger.json' -delete
 }
 
-collect_swagger server 21
+collect_swagger server 24
 clean_swagger server
 clean_swagger reposerver
 clean_swagger controller

reposerver/clientset.go

@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 	"time"
 
-	"github.com/grpc-ecosystem/go-grpc-middleware/retry"
+	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
 
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
@@ -16,14 +16,14 @@ import (
 
 // Clientset represets repository server api clients
 type Clientset interface {
-	NewRepositoryClient() (util.Closer, repository.RepositoryServiceClient, error)
+	NewRepoServerClient() (util.Closer, repository.RepoServerServiceClient, error)
 }
 
 type clientSet struct {
 	address string
 }
 
-func (c *clientSet) NewRepositoryClient() (util.Closer, repository.RepositoryServiceClient, error) {
+func (c *clientSet) NewRepoServerClient() (util.Closer, repository.RepoServerServiceClient, error) {
 	retryOpts := []grpc_retry.CallOption{
 		grpc_retry.WithMax(3),
 		grpc_retry.WithBackoff(grpc_retry.BackoffLinear(1000 * time.Millisecond)),
@@ -36,10 +36,10 @@ func (c *clientSet) NewRepositoryClient() (util.Closer, repository.RepositorySer
 		log.Errorf("Unable to connect to repository service with address %s", c.address)
 		return nil, nil, err
 	}
-	return conn, repository.NewRepositoryServiceClient(conn), nil
+	return conn, repository.NewRepoServerServiceClient(conn), nil
 }
 
-// NewRepositoryServerClientset creates new instance of repo server Clientset
-func NewRepositoryServerClientset(address string) Clientset {
+// NewRepoServerClientset creates new instance of repo server Clientset
+func NewRepoServerClientset(address string) Clientset {
 	return &clientSet{address: address}
 }