diff --git a/pkg/apiclient/account/account.pb.go b/pkg/apiclient/account/account.pb.go
index c3fa335418947..2f43e40d68f63 100644
--- a/pkg/apiclient/account/account.pb.go
+++ b/pkg/apiclient/account/account.pb.go
@@ -3,16 +3,23 @@
 
 package account // import "github.com/argoproj/argo-cd/pkg/apiclient/account"
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
 
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
+	proto "github.com/gogo/protobuf/proto"
 
-import io "io"
+	math "math"
+
+	_ "github.com/gogo/protobuf/gogoproto"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/pkg/apiclient/application/application.pb.go b/pkg/apiclient/application/application.pb.go
index 269712fb29b70..acc194d985833 100644
--- a/pkg/apiclient/application/application.pb.go
+++ b/pkg/apiclient/application/application.pb.go
@@ -9,22 +9,33 @@ package application // import "github.com/argoproj/argo-cd/pkg/apiclient/applica
 	Application Service API performs CRUD actions against application resources
 */
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-import apiclient "github.com/argoproj/argo-cd/reposerver/apiclient"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v11 "k8s.io/api/core/v1"
-import v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
-
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
-
-import io "io"
+import (
+	fmt "fmt"
+
+	proto "github.com/gogo/protobuf/proto"
+
+	math "math"
+
+	v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+
+	apiclient "github.com/argoproj/argo-cd/reposerver/apiclient"
+
+	_ "github.com/gogo/protobuf/gogoproto"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	v11 "k8s.io/api/core/v1"
+
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/pkg/apiclient/certificate/certificate.pb.go b/pkg/apiclient/certificate/certificate.pb.go
index ef7eaf043e748..8ab1ac10b93c1 100644
--- a/pkg/apiclient/certificate/certificate.pb.go
+++ b/pkg/apiclient/certificate/certificate.pb.go
@@ -10,17 +10,25 @@ package certificate // import "github.com/argoproj/argo-cd/pkg/apiclient/certifi
 	resources.
 */
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
 
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
+	proto "github.com/gogo/protobuf/proto"
 
-import io "io"
+	math "math"
+
+	v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+
+	_ "github.com/gogo/protobuf/gogoproto"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/pkg/apiclient/cluster/cluster.pb.go b/pkg/apiclient/cluster/cluster.pb.go
index b9ede75faf6bb..2bc61eb9ff59a 100644
--- a/pkg/apiclient/cluster/cluster.pb.go
+++ b/pkg/apiclient/cluster/cluster.pb.go
@@ -9,18 +9,27 @@ package cluster // import "github.com/argoproj/argo-cd/pkg/apiclient/cluster"
 	Cluster Service API performs CRUD actions against cluster resources
 */
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "k8s.io/api/core/v1"
-
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
-
-import io "io"
+import (
+	fmt "fmt"
+
+	proto "github.com/gogo/protobuf/proto"
+
+	math "math"
+
+	v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+
+	_ "github.com/gogo/protobuf/gogoproto"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	_ "k8s.io/api/core/v1"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/pkg/apiclient/project/project.pb.go b/pkg/apiclient/project/project.pb.go
index 38070846d15f7..5a095316cfdc9 100644
--- a/pkg/apiclient/project/project.pb.go
+++ b/pkg/apiclient/project/project.pb.go
@@ -9,19 +9,29 @@ package project // import "github.com/argoproj/argo-cd/pkg/apiclient/project"
 	Project Service API performs CRUD actions against project resources
 */
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import v1 "k8s.io/api/core/v1"
-import _ "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
-
-import io "io"
+import (
+	fmt "fmt"
+
+	proto "github.com/gogo/protobuf/proto"
+
+	math "math"
+
+	v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+
+	_ "github.com/gogo/protobuf/gogoproto"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	v1 "k8s.io/api/core/v1"
+
+	_ "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/pkg/apiclient/repository/repository.pb.go b/pkg/apiclient/repository/repository.pb.go
index 3ddcf6d942ce2..4a50593f74e58 100644
--- a/pkg/apiclient/repository/repository.pb.go
+++ b/pkg/apiclient/repository/repository.pb.go
@@ -9,19 +9,29 @@ package repository // import "github.com/argoproj/argo-cd/pkg/apiclient/reposito
 	Repository Service API performs CRUD actions against repository resources
 */
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-import apiclient "github.com/argoproj/argo-cd/reposerver/apiclient"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "k8s.io/api/core/v1"
-
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
-
-import io "io"
+import (
+	fmt "fmt"
+
+	proto "github.com/gogo/protobuf/proto"
+
+	math "math"
+
+	v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+
+	apiclient "github.com/argoproj/argo-cd/reposerver/apiclient"
+
+	_ "github.com/gogo/protobuf/gogoproto"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	_ "k8s.io/api/core/v1"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/pkg/apiclient/session/session.pb.go b/pkg/apiclient/session/session.pb.go
index 9d33f72f80453..14cc0f4b25cdf 100644
--- a/pkg/apiclient/session/session.pb.go
+++ b/pkg/apiclient/session/session.pb.go
@@ -9,18 +9,27 @@ package session // import "github.com/argoproj/argo-cd/pkg/apiclient/session"
 	Session Service API performs CRUD actions against session resources
 */
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "k8s.io/api/core/v1"
-
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
-
-import io "io"
+import (
+	fmt "fmt"
+
+	proto "github.com/gogo/protobuf/proto"
+
+	math "math"
+
+	_ "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+
+	_ "github.com/gogo/protobuf/gogoproto"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	_ "k8s.io/api/core/v1"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/pkg/apiclient/settings/settings.pb.go b/pkg/apiclient/settings/settings.pb.go
index dc84a6356039e..4a01bdc6ba48c 100644
--- a/pkg/apiclient/settings/settings.pb.go
+++ b/pkg/apiclient/settings/settings.pb.go
@@ -9,18 +9,27 @@ package settings // import "github.com/argoproj/argo-cd/pkg/apiclient/settings"
 	Settings Service API retrieves Argo CD settings
 */
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-import oidc "github.com/argoproj/argo-cd/server/settings/oidc"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
-
-import io "io"
+import (
+	fmt "fmt"
+
+	proto "github.com/gogo/protobuf/proto"
+
+	math "math"
+
+	v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+
+	oidc "github.com/argoproj/argo-cd/server/settings/oidc"
+
+	_ "github.com/gogo/protobuf/gogoproto"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/pkg/apiclient/version/version.pb.go b/pkg/apiclient/version/version.pb.go
index b3825af4c009a..509ba1a3bb157 100644
--- a/pkg/apiclient/version/version.pb.go
+++ b/pkg/apiclient/version/version.pb.go
@@ -9,16 +9,23 @@ package version // import "github.com/argoproj/argo-cd/pkg/apiclient/version"
 	Version Service API returns the version of the API server.
 */
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import empty "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
+import (
+	fmt "fmt"
 
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
+	proto "github.com/gogo/protobuf/proto"
 
-import io "io"
+	math "math"
+
+	empty "github.com/golang/protobuf/ptypes/empty"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go
index 09f30c17d87f6..7f37142259c0e 100644
--- a/pkg/apis/application/v1alpha1/generated.pb.go
+++ b/pkg/apis/application/v1alpha1/generated.pb.go
@@ -3,21 +3,27 @@
 
 package v1alpha1
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
 
-import v11 "k8s.io/api/core/v1"
-import v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	proto "github.com/gogo/protobuf/proto"
 
-import k8s_io_apimachinery_pkg_watch "k8s.io/apimachinery/pkg/watch"
+	math "math"
 
-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+	v11 "k8s.io/api/core/v1"
 
-import strings "strings"
-import reflect "reflect"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-import io "io"
+	k8s_io_apimachinery_pkg_watch "k8s.io/apimachinery/pkg/watch"
+
+	github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+	strings "strings"
+
+	reflect "reflect"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/reposerver/apiclient/repository.pb.go b/reposerver/apiclient/repository.pb.go
index d2431bf49bb31..4c99691bd9fba 100644
--- a/reposerver/apiclient/repository.pb.go
+++ b/reposerver/apiclient/repository.pb.go
@@ -3,18 +3,27 @@
 
 package apiclient // import "github.com/argoproj/argo-cd/reposerver/apiclient"
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "k8s.io/api/core/v1"
-
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
-
-import io "io"
+import (
+	fmt "fmt"
+
+	proto "github.com/gogo/protobuf/proto"
+
+	math "math"
+
+	v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+
+	_ "github.com/gogo/protobuf/gogoproto"
+
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+
+	_ "k8s.io/api/core/v1"
+
+	context "golang.org/x/net/context"
+
+	grpc "google.golang.org/grpc"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/server/settings/oidc/claims.pb.go b/server/settings/oidc/claims.pb.go
index fdd5ef2ca91cf..4173bbf321ec1 100644
--- a/server/settings/oidc/claims.pb.go
+++ b/server/settings/oidc/claims.pb.go
@@ -3,11 +3,15 @@
 
 package oidc // import "github.com/argoproj/argo-cd/server/settings/oidc"
 
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
 
-import io "io"
+	proto "github.com/gogo/protobuf/proto"
+
+	math "math"
+
+	io "io"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal