Fix bug in port validation regular expression

[#162082773] Co-authored-by: Danny Joyce <djoyce@pivotal.io>
cloudfoundry · Nov 20, 2018 · 98abf0d · 98abf0d
1 parent bdf02d6
commit 98abf0d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/nginx/supply/supply.go b/src/nginx/supply/supply.go
@@ -169,7 +169,7 @@ func (s *Supplier) validateNginxConfHasPort() error {
 		return err
 	}
 
-	if portFound, err := regexp.Match(`{{\s+port\s+}}`, conf); err != nil {
+	if portFound, err := regexp.Match(`{{\s*port\s*}}`, conf); err != nil {
 		return err
 	} else if !portFound {
 		s.Log.Error("nginx.conf file must be configured to respect the value of `{{port}}`")

diff --git a/src/nginx/supply/supply_test.go b/src/nginx/supply/supply_test.go
@@ -181,18 +181,32 @@ var _ = Describe("Supply", func() {
 	})
 
 	Describe("nginx.conf validation", func() {
-		It("parses the port and ignores white spaces", func() {
-			buildDir, err := ioutil.TempDir("", "")
-			Expect(err).NotTo(HaveOccurred())
-			defer os.RemoveAll(buildDir)
+		var (
+			buildDir string
+			err      error
+		)
 
-			ioutil.WriteFile(filepath.Join(buildDir, "nginx.conf"), []byte("{{    port   }}"), 0666)
+		BeforeEach(func() {
+			buildDir, err = ioutil.TempDir("", "")
+			Expect(err).NotTo(HaveOccurred())
 
 			mockStager.EXPECT().BuildDir().Return(buildDir).AnyTimes()
 
 			mockCommand.EXPECT().Run(gomock.Any()).AnyTimes()
 			mockCommand.EXPECT().Execute(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
+		})
 
+		AfterEach(func() {
+			os.RemoveAll(buildDir)
+		})
+
+		It("parses the port", func() {
+			ioutil.WriteFile(filepath.Join(buildDir, "nginx.conf"), []byte("{{port}}"), 0666)
+			Expect(supplier.ValidateNginxConf()).To(Succeed())
+		})
+
+		It("parses the port and ignores white spaces", func() {
+			ioutil.WriteFile(filepath.Join(buildDir, "nginx.conf"), []byte("{{  port  }}"), 0666)
 			Expect(supplier.ValidateNginxConf()).To(Succeed())
 		})
 	})