Skip to content

Commit 467bab4

Browse files
RealAnnaarttor
authored andcommitted
fix: reduced code complexity
1 parent 0a02275 commit 467bab4

File tree

1 file changed

+21
-14
lines changed

1 file changed

+21
-14
lines changed

pkg/processor/deployment/deployment.go

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -248,20 +248,9 @@ func processPodContainer(name string, appMeta helmify.AppMetadata, c corev1.Cont
248248
return c, errors.Wrap(err, "unable to set deployment value field")
249249
}
250250

251-
for i := 0; i < len(c.Env); i++ {
252-
if c.Env[i].ValueFrom != nil && c.Env[i].ValueFrom.SecretKeyRef != nil {
253-
c.Env[i].ValueFrom.SecretKeyRef.Name = appMeta.TemplatedName(c.Env[i].ValueFrom.SecretKeyRef.Name)
254-
} else if c.Env[i].ValueFrom != nil && c.Env[i].ValueFrom.ConfigMapKeyRef != nil {
255-
c.Env[i].ValueFrom.ConfigMapKeyRef.Name = appMeta.TemplatedName(c.Env[i].ValueFrom.ConfigMapKeyRef.Name)
256-
} else {
257-
258-
err = unstructured.SetNestedField(*values, c.Env[i].Value, name, containerName, "env", strcase.ToLowerCamel(strings.ToLower(c.Env[i].Name)))
259-
if err != nil {
260-
return c, errors.Wrap(err, "unable to set deployment value field")
261-
}
262-
263-
c.Env[i].Value = fmt.Sprintf(envValue, name, containerName, strcase.ToLowerCamel(strings.ToLower(c.Env[i].Name)))
264-
}
251+
c, err = processEnv(name, appMeta, c, values, containerName)
252+
if err != nil {
253+
return c, err
265254
}
266255

267256
for _, e := range c.EnvFrom {
@@ -291,6 +280,24 @@ func processPodContainer(name string, appMeta helmify.AppMetadata, c corev1.Cont
291280
return c, nil
292281
}
293282

283+
func processEnv(name string, appMeta helmify.AppMetadata, c corev1.Container, values *helmify.Values, containerName string) (corev1.Container, error) {
284+
for i := 0; i < len(c.Env); i++ {
285+
if c.Env[i].ValueFrom != nil && c.Env[i].ValueFrom.SecretKeyRef != nil {
286+
c.Env[i].ValueFrom.SecretKeyRef.Name = appMeta.TemplatedName(c.Env[i].ValueFrom.SecretKeyRef.Name)
287+
} else if c.Env[i].ValueFrom != nil && c.Env[i].ValueFrom.ConfigMapKeyRef != nil {
288+
c.Env[i].ValueFrom.ConfigMapKeyRef.Name = appMeta.TemplatedName(c.Env[i].ValueFrom.ConfigMapKeyRef.Name)
289+
} else {
290+
291+
err := unstructured.SetNestedField(*values, c.Env[i].Value, name, containerName, "env", strcase.ToLowerCamel(strings.ToLower(c.Env[i].Name)))
292+
if err != nil {
293+
return c, errors.Wrap(err, "unable to set deployment value field")
294+
}
295+
c.Env[i].Value = fmt.Sprintf(envValue, name, containerName, strcase.ToLowerCamel(strings.ToLower(c.Env[i].Name)))
296+
}
297+
}
298+
return c, nil
299+
}
300+
294301
type result struct {
295302
data struct {
296303
Meta string

0 commit comments

Comments
 (0)