Merge pull request #9 from nginxinc/newline-between-key-and-cert

pleshakov · pleshakov · commit 00391a25f0b3 · 2016-03-16T21:44:13.000-07:00
Added a newline for a generated pem file btw key and crt
diff --git a/nginx-controller/nginx/nginx.go b/nginx-controller/nginx/nginx.go
@@ -109,11 +109,17 @@ func (nginx *NGINXController) AddOrUpdateCertAndKey(name string, cert string, ke
 		}
 		defer pem.Close()
 
-		_, err = pem.WriteString(string(key))
+		_, err = pem.WriteString(key)
 		if err != nil {
 			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
 		}
-		_, err = pem.WriteString(string(cert))
+
+		_, err = pem.WriteString("\n")
+		if err != nil {
+			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
+		}
+
+		_, err = pem.WriteString(cert)
 		if err != nil {
 			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
 		}
diff --git a/nginx-plus-controller/nginx/nginx.go b/nginx-plus-controller/nginx/nginx.go
@@ -149,11 +149,16 @@ func (nginx *NGINXController) AddOrUpdateCertAndKey(name string, cert string, ke
 		}
 		defer pem.Close()
 
-		_, err = pem.WriteString(string(key))
+		_, err = pem.WriteString(key)
 		if err != nil {
 			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
 		}
-		_, err = pem.WriteString(string(cert))
+
+		_, err = pem.WriteString("\n")
+		if err != nil {
+			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
+		}
+		_, err = pem.WriteString(cert)
 		if err != nil {
 			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,17 @@ func (nginx *NGINXController) AddOrUpdateCertAndKey(name string, cert string, ke`
`109`	`109`	`}`
`110`	`110`	`defer pem.Close()`
`111`	`111`
`112`		`- _, err = pem.WriteString(string(key))`
	`112`	`+ _, err = pem.WriteString(key)`
`113`	`113`	`if err != nil {`
`114`	`114`	`glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)`
`115`	`115`	`}`
`116`		`- _, err = pem.WriteString(string(cert))`
	`116`	`+`
	`117`	`+ _, err = pem.WriteString("\n")`
	`118`	`+ if err != nil {`
	`119`	`+ glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)`
	`120`	`+ }`
	`121`	`+`
	`122`	`+ _, err = pem.WriteString(cert)`
`117`	`123`	`if err != nil {`
`118`	`124`	`glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)`
`119`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,11 +149,16 @@ func (nginx *NGINXController) AddOrUpdateCertAndKey(name string, cert string, ke`
`149`	`149`	`}`
`150`	`150`	`defer pem.Close()`
`151`	`151`
`152`		`- _, err = pem.WriteString(string(key))`
	`152`	`+ _, err = pem.WriteString(key)`
`153`	`153`	`if err != nil {`
`154`	`154`	`glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)`
`155`	`155`	`}`
`156`		`- _, err = pem.WriteString(string(cert))`
	`156`	`+`
	`157`	`+ _, err = pem.WriteString("\n")`
	`158`	`+ if err != nil {`
	`159`	`+ glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)`
	`160`	`+ }`
	`161`	`+ _, err = pem.WriteString(cert)`
`157`	`162`	`if err != nil {`
`158`	`163`	`glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)`
`159`	`164`	`}`