Skip to content

Commit 690249b

Browse files
remove extra new lines before error messages (#1875)
1 parent 8cce847 commit 690249b

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
diff --git a/resources.yaml b/resources.yaml
2-
index 7a494c9..c77c357 100644
2+
index 7a494c9..a9dd224 100644
33
--- a/resources.yaml
44
+++ b/resources.yaml
5-
@@ -14,13 +14,26 @@
6-
apiVersion: apps/v1
5+
@@ -15,12 +15,25 @@ apiVersion: apps/v1
76
kind: Deployment
87
metadata:
9-
+ labels:
10-
+ tier: backend
118
name: nginx-deployment
129
+ namespace: staging
10+
+ labels:
11+
+ tier: backend
1312
spec:
1413
replicas: 3
1514
+ selector:
@@ -23,9 +22,9 @@ index 7a494c9..c77c357 100644
2322
apiVersion: custom.io/v1
2423
kind: Custom
2524
metadata:
26-
+ labels:
27-
+ tier: backend
2825
name: custom
2926
+ namespace: staging
27+
+ labels:
28+
+ tier: backend
3029
spec:
3130
image: nginx:1.2.3

internal/errors/resolver/git.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (*fnExecErrorResolver) Resolve(err error) (ResolvedResult, bool) {
117117
// TODO: write complete details to a file
118118

119119
return ResolvedResult{
120-
Message: fnErr.String(),
120+
Message: fnErr.String(),
121121
ExitCode: 1,
122122
}, true
123123
}

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func handleErr(cmd *cobra.Command, err error) int {
7777
// error message.
7878
re, resolved := resolver.ResolveError(err)
7979
if resolved {
80-
fmt.Fprintf(cmd.ErrOrStderr(), "\n%s \n", re.Message)
80+
fmt.Fprintf(cmd.ErrOrStderr(), "%s \n", re.Message)
8181
return re.ExitCode
8282
}
8383

0 commit comments

Comments
 (0)