From 301a4fb9a5752f51670dba36a69500c14e07946d Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Fri, 8 Mar 2019 17:01:08 -0500 Subject: [PATCH] extract common logic into a helper --- internal/net/ssl/ssl.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/net/ssl/ssl.go b/internal/net/ssl/ssl.go index cdcf6f4f0..b16cfa325 100644 --- a/internal/net/ssl/ssl.go +++ b/internal/net/ssl/ssl.go @@ -46,12 +46,17 @@ var ( oidExtensionSubjectAltName = asn1.ObjectIdentifier{2, 5, 29, 17} ) +// getPemFileName returns absolute file path and file name of pem cert related to given fullSecretName +func getPemFileName(fullSecretName string) (string, string) { + pemName := fmt.Sprintf("%v.pem", fullSecretName) + return fmt.Sprintf("%v/%v", file.DefaultSSLDirectory, pemName), pemName +} + // AddOrUpdateCertAndKey creates a .pem file with the cert and the key with the specified name func AddOrUpdateCertAndKey(name string, cert, key, ca []byte, fs file.Filesystem) (*ingress.SSLCert, error) { - pemName := fmt.Sprintf("%v.pem", name) - pemFileName := fmt.Sprintf("%v/%v", file.DefaultSSLDirectory, pemName) + pemFileName, pemName := getPemFileName(name) tempPemFile, err := fs.TempFile(file.DefaultSSLDirectory, pemName) if err != nil { @@ -378,8 +383,7 @@ func AddCertAuth(name string, ca []byte, fs file.Filesystem) (*ingress.SSLCert, // AddOrUpdateDHParam creates a dh parameters file with the specified name func AddOrUpdateDHParam(name string, dh []byte, fs file.Filesystem) (string, error) { - pemName := fmt.Sprintf("%v.pem", name) - pemFileName := fmt.Sprintf("%v/%v", file.DefaultSSLDirectory, pemName) + pemFileName, pemName := getPemFileName(name) tempPemFile, err := fs.TempFile(file.DefaultSSLDirectory, pemName)