DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extract common logic into a helper

Browse source
This commit is contained in:
Elvin Efendi 2019-03-08 17:01:08 -05:00
parent 3c83d22cb5
commit 301a4fb9a5
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/net/ssl/ssl.go
View file

@ -46,12 +46,17 @@ var (
oidExtensionSubjectAltName = asn1.ObjectIdentifier{2, 5, 29, 17} 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 // AddOrUpdateCertAndKey creates a .pem file with the cert and the key with the specified name
func AddOrUpdateCertAndKey(name string, cert, key, ca []byte, func AddOrUpdateCertAndKey(name string, cert, key, ca []byte,
fs file.Filesystem) (*ingress.SSLCert, error) { fs file.Filesystem) (*ingress.SSLCert, error) {
pemName := fmt.Sprintf("%v.pem", name) pemFileName, pemName := getPemFileName(name)
pemFileName := fmt.Sprintf("%v/%v", file.DefaultSSLDirectory, pemName)
tempPemFile, err := fs.TempFile(file.DefaultSSLDirectory, pemName) tempPemFile, err := fs.TempFile(file.DefaultSSLDirectory, pemName)
if err != nil { 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 // AddOrUpdateDHParam creates a dh parameters file with the specified name
func AddOrUpdateDHParam(name string, dh []byte, fs file.Filesystem) (string, error) { func AddOrUpdateDHParam(name string, dh []byte, fs file.Filesystem) (string, error) {
pemName := fmt.Sprintf("%v.pem", name) pemFileName, pemName := getPemFileName(name)
pemFileName := fmt.Sprintf("%v/%v", file.DefaultSSLDirectory, pemName)
tempPemFile, err := fs.TempFile(file.DefaultSSLDirectory, pemName) tempPemFile, err := fs.TempFile(file.DefaultSSLDirectory, pemName)