@@ -11,22 +11,14 @@ import (
1111
1212// GetSecretData retrieves the data from a secret in a given namespace
1313func (r * WorkspaceHelper ) GetSecretData (namespace string , name string ) (map [string ][]byte , error ) {
14- // If no secretName defined, return empty map
15- if name == "" {
16- return make (map [string ][]byte ), nil
17- }
18-
1914 r .reqLogger .Info ("Getting Secret" , "Namespace" , namespace , "Name" , name )
2015
2116 secret := & corev1.Secret {}
2217 err := r .client .Get (context .TODO (), types.NamespacedName {Name : name , Namespace : namespace }, secret )
23-
2418 if err != nil {
2519 r .reqLogger .Error (err , "Failed to get Secret" , "Namespace" , namespace , "Name" , name )
26-
2720 return nil , err
2821 }
29-
3022 return secret .Data , nil
3123}
3224
@@ -38,9 +30,7 @@ func (r *WorkspaceHelper) GetSecretForVariable(namespace string, variable *v1alp
3830
3931 if variable .ValueFrom .SecretKeyRef == nil {
4032 err := errors .New ("Include Secret in ValueFrom" )
41-
4233 r .reqLogger .Error (err , "No Secret specified" , "Namespace" , namespace , "Variable" , variable .Key )
43-
4434 return err
4535 }
4636
@@ -57,13 +47,10 @@ func (r *WorkspaceHelper) GetSecretForVariable(namespace string, variable *v1alp
5747 value , ok := data [key ]
5848 if ! ok {
5949 err := errors .New ("Include Secret key reference in ValueFrom" )
60-
6150 r .reqLogger .Error (err , "No Secret key specified" , "Namespace" , namespace , "Name" , name , "Key" , key )
62-
6351 return err
6452 }
6553
6654 variable .Value = string (value )
67-
6855 return nil
6956}
0 commit comments