From 690249b7da51248444ca52396a129b1d871fd4bb Mon Sep 17 00:00:00 2001
From: Donny Xia <donnyxia@google.com>
Date: Mon, 3 May 2021 11:58:00 -0700
Subject: [PATCH] remove extra new lines before error messages (#1875)

---
 .../fn-render/success-stdout/.expected/diff.patch   | 13 ++++++-------
 internal/errors/resolver/git.go                     |  2 +-
 main.go                                             |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/e2e/testdata/fn-render/success-stdout/.expected/diff.patch b/e2e/testdata/fn-render/success-stdout/.expected/diff.patch
index c1d49f5921..9997352594 100644
--- a/e2e/testdata/fn-render/success-stdout/.expected/diff.patch
+++ b/e2e/testdata/fn-render/success-stdout/.expected/diff.patch
@@ -1,15 +1,14 @@
 diff --git a/resources.yaml b/resources.yaml
-index 7a494c9..c77c357 100644
+index 7a494c9..a9dd224 100644
 --- a/resources.yaml
 +++ b/resources.yaml
-@@ -14,13 +14,26 @@
- apiVersion: apps/v1
+@@ -15,12 +15,25 @@ apiVersion: apps/v1
  kind: Deployment
  metadata:
-+  labels:
-+    tier: backend
    name: nginx-deployment
 +  namespace: staging
++  labels:
++    tier: backend
  spec:
    replicas: 3
 +  selector:
@@ -23,9 +22,9 @@ index 7a494c9..c77c357 100644
  apiVersion: custom.io/v1
  kind: Custom
  metadata:
-+  labels:
-+    tier: backend
    name: custom
 +  namespace: staging
++  labels:
++    tier: backend
  spec:
    image: nginx:1.2.3
diff --git a/internal/errors/resolver/git.go b/internal/errors/resolver/git.go
index a44c48e534..49f0b04d9b 100644
--- a/internal/errors/resolver/git.go
+++ b/internal/errors/resolver/git.go
@@ -117,7 +117,7 @@ func (*fnExecErrorResolver) Resolve(err error) (ResolvedResult, bool) {
 	// TODO: write complete details to a file
 
 	return ResolvedResult{
-		Message: fnErr.String(),
+		Message:  fnErr.String(),
 		ExitCode: 1,
 	}, true
 }
diff --git a/main.go b/main.go
index 22b4bc06e0..9c02a751a2 100644
--- a/main.go
+++ b/main.go
@@ -77,7 +77,7 @@ func handleErr(cmd *cobra.Command, err error) int {
 	// error message.
 	re, resolved := resolver.ResolveError(err)
 	if resolved {
-		fmt.Fprintf(cmd.ErrOrStderr(), "\n%s \n", re.Message)
+		fmt.Fprintf(cmd.ErrOrStderr(), "%s \n", re.Message)
 		return re.ExitCode
 	}