Update azure certs test for new pfx file password.

Signed-off-by: Genevieve LEsperance <glesperance@pivotal.io>

certs/validator_test.go

@@ -28,8 +28,9 @@ var _ = Describe("CertificateValidator", func() {
 	)
 
 	BeforeEach(func() {
-		var err error
 		certificateValidator = certs.NewValidator()
+
+		var err error
 		chainFilePath, err = testhelpers.WriteContentsToTempFile(testhelpers.BBL_CHAIN)
 		Expect(err).NotTo(HaveOccurred())
 
@@ -61,10 +62,9 @@ var _ = Describe("CertificateValidator", func() {
 		Context("when cert and password files exist and can be read", func() {
 			It("returns cert and password data", func() {
 				certData, err := certificateValidator.ReadPKCS12(certNonPEMFilePath, passwordFilePath)
-
 				Expect(err).NotTo(HaveOccurred())
 				Expect(string(certData.Cert)).To(Equal("not a cert"))
-				Expect(string(certData.Key)).To(Equal("SuperSecurePassword"))
+				Expect(string(certData.Key)).To(Equal("SuperSecretPassword"))
 			})
 		})
 
@@ -104,13 +104,13 @@ var _ = Describe("CertificateValidator", func() {
 		Context("if the password file ends with a newline character", func() {
 			It("Strips the newline from the password", func() {
 				passwordWithNewlineFilePath, err := testhelpers.WriteContentsToTempFile(fmt.Sprintf("%s\n", testhelpers.PFX_PASSWORD))
-
 				Expect(err).NotTo(HaveOccurred())
-				certData, err := certificateValidator.ReadPKCS12(certNonPEMFilePath, passwordWithNewlineFilePath)
 
+				certData, err := certificateValidator.ReadPKCS12(certNonPEMFilePath, passwordWithNewlineFilePath)
 				Expect(err).NotTo(HaveOccurred())
+
 				Expect(string(certData.Cert)).To(Equal("not a cert"))
-				Expect(string(certData.Key)).To(Equal("SuperSecurePassword"))
+				Expect(string(certData.Key)).To(Equal("SuperSecretPassword"))
 			})
 		})
 	})
@@ -136,7 +136,6 @@ var _ = Describe("CertificateValidator", func() {
 		BeforeEach(func() {
 			var err error
 			realCert, err = base64.StdEncoding.DecodeString(testhelpers.PFX_BASE64)
-
 			Expect(err).NotTo(HaveOccurred())
 			fakeCert = []byte("not a cert")
 			realPassword = []byte(testhelpers.PFX_PASSWORD)
@@ -146,7 +145,6 @@ var _ = Describe("CertificateValidator", func() {
 		Context("When the password is correct", func() {
 			It("validates successfully", func() {
 				err := certificateValidator.ValidatePKCS12(realCert, realPassword)
-
 				Expect(err).NotTo(HaveOccurred())
 			})
 		})
@@ -156,7 +154,6 @@ var _ = Describe("CertificateValidator", func() {
 				err := certificateValidator.ValidatePKCS12(realCert, fakePassword)
 				expectedErr := multierror.NewMultiError("")
 				expectedErr.Add(fmt.Errorf("failed to parse certificate: pkcs12: decryption password incorrect"))
-
 				Expect(err).To(Equal(expectedErr))
 			})
 		})
@@ -166,7 +163,6 @@ var _ = Describe("CertificateValidator", func() {
 				err := certificateValidator.ValidatePKCS12(fakeCert, realPassword)
 				expectedErr := multierror.NewMultiError("")
 				expectedErr.Add(fmt.Errorf("failed to parse certificate: pkcs12: error reading P12 data: asn1: structure error: tags don't match (16 vs {class:1 tag:14 length:111 isCompound:true}) {optional:false explicit:false application:false defaultValue:<nil> tag:<nil> stringType:0 timeType:0 set:false omitEmpty:false} pfxPdu @2"))
-
 				Expect(err).To(Equal(expectedErr))
 			})
 		})
@@ -177,15 +173,13 @@ var _ = Describe("CertificateValidator", func() {
 			Context("when cert and key are valid", func() {
 				It("does not return an error", func() {
 					_, err := certificateValidator.ReadAndValidate(certFilePath, keyFilePath, "")
-
 					Expect(err).NotTo(HaveOccurred())
 				})
 			})
 
 			Context("when cert, key, and chain are valid", func() {
 				It("does not return an error", func() {
 					_, err := certificateValidator.ReadAndValidate(certFilePath, keyFilePath, chainFilePath)
-
 					Expect(err).NotTo(HaveOccurred())
 				})
 			})

testhelpers/certificate_constants.go

@@ -227,5 +227,5 @@ e2rINGOsVkW6atdh+5XwGMLS8QDccwaPMpcqdVbdo4c0YcfGRWgB3w==
 
 	PFX_BASE64 = `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`
 
-	PFX_PASSWORD = `SuperSecurePassword`
+	PFX_PASSWORD = `SuperSecretPassword`
 )