change naming since passwords can be any password determined by passwords.yml key value (we are using pkcs12: key in this case, more container types can be added later

Author: muhammadn

internal/certificate.go

@@ -70,7 +70,7 @@ type certificateRef struct {
 	kubeSecret    v1.Secret
 	kubeConfigMap v1.ConfigMap
 	kubeSecretKey string
-	p12Password   string
+	password   string
 
 }
 
@@ -108,7 +108,7 @@ func (cert *certificateRef) parse() error {
 	case certificateFormatKubeConfigMap:
 		cert.certificates, err = readAndParseKubeConfigMap(&cert.kubeConfigMap, cert.kubeSecretKey)
 	case certificateFormatP12:
-		cert.certificates, err = readAndParsePasswordPkcsFile(cert.path, cert.p12Password)
+		cert.certificates, err = readAndParsePasswordPkcsFile(cert.path, cert.password)
 	}
 	return err
 }

internal/exporter.go

@@ -259,10 +259,10 @@ func (exporter *Exporter) collectMatchingPaths(pattern string, format certificat
 					continue
 				}
 
-                                var p12Password string
+                                var password string
                                 if strings.HasSuffix(file.Name(), ".p12") || strings.HasSuffix(file.Name(), ".jks") {
                                         format = certificateFormatP12
-                                        p12Password, err = exporter.obtainP12Passwords(path.Clean(path.Join(dir, file.Name())))
+                                        password, err = exporter.obtainP12Passwords(path.Clean(path.Join(dir, file.Name())))
                                         if err != nil {
                                                 outputErrors = append(outputErrors, err)
                                                 continue
@@ -274,7 +274,7 @@ func (exporter *Exporter) collectMatchingPaths(pattern string, format certificat
 				output = append(output, &certificateRef{
                                         path:        path.Clean(path.Join(dir, file.Name())),
                                         format:      format,
-                                        p12Password: p12Password,
+                                        password:    password,
 				})
 			}
 		} else {