The app push minor fixes (#2640)

Author: pPrecel

internal/cmd/app/push.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/kyma-project/cli.v3/internal/clierror"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon"
-	"github.com/kyma-project/cli.v3/internal/cmdcommon/env"
+	"github.com/kyma-project/cli.v3/internal/cmdcommon/envs"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon/types"
 	"github.com/kyma-project/cli.v3/internal/dockerfile"
 	"github.com/kyma-project/cli.v3/internal/flags"
@@ -124,7 +124,8 @@ func NewAppPushCMD(kymaConfig *cmdcommon.KymaConfig) *cobra.Command {
 	// k8s flags
 	cmd.Flags().StringVarP(&config.namespace, "namespace", "n", "default", "Namespace where the app is deployed")
 	cmd.Flags().Var(&config.containerPort, "container-port", "Port on which the application is exposed")
-	cmd.Flags().Var(&config.istioInject, "istio-inject", "Enables Istio for the app")
+	istioInjectFlag := cmd.Flags().VarPF(&config.istioInject, "istio-inject", "", "Enables Istio for the app")
+	istioInjectFlag.NoOptDefVal = "true" // default value when flag is provided without value
 	cmd.Flags().BoolVar(&config.expose, "expose", false, "Creates an APIRule for the app")
 	cmd.Flags().StringArrayVar(&config.mountSecrets, "mount-secret", []string{}, "Mounts Secret content to the "+resources.SecretMountPathPrefix+"<SECRET_NAME> path")
 	cmd.Flags().StringArrayVar(&config.mountConfigmaps, "mount-config", []string{}, "Mounts ConfigMap content to the "+resources.ConfigmapMountPathPrefix+"<CONFIGMAP_NAME> path")
@@ -250,23 +251,29 @@ func runAppPush(cfg *appPushConfig) clierror.Error {
 }
 
 func createDeployment(cfg *appPushConfig, client kube.Client, image, imagePullSecret string) clierror.Error {
-	fileEnvs, err := env.BuildEnvsFromFile(cfg.fileEnvs)
+	configmapEnvs, err := envs.BuildFromConfigmap(cfg.Ctx, client, cfg.namespace, cfg.configmapEnvs)
 	if err != nil {
-		return clierror.Wrap(err, clierror.New("failed to build envs from file"))
+		return clierror.Wrap(err, clierror.New("failed to build envs from configmap"))
 	}
 
-	secretEnvs, err := env.BuildEnvsFromSecret(cfg.Ctx, client, cfg.namespace, cfg.secretEnvs)
+	secretEnvs, err := envs.BuildFromSecret(cfg.Ctx, client, cfg.namespace, cfg.secretEnvs)
 	if err != nil {
 		return clierror.Wrap(err, clierror.New("failed to build envs from secret"))
 	}
 
-	configmapEnvs, err := env.BuildEnvsFromConfigmap(cfg.Ctx, client, cfg.namespace, cfg.configmapEnvs)
+	fileEnvs, err := envs.BuildFromFile(cfg.fileEnvs)
 	if err != nil {
-		return clierror.Wrap(err, clierror.New("failed to build envs from configmap"))
+		return clierror.Wrap(err, clierror.New("failed to build envs from file"))
 	}
 
-	envs := append(fileEnvs, secretEnvs...)
-	envs = append(envs, configmapEnvs...)
+	plainEnvs := envs.Build(cfg.envs)
+
+	// append envs in order to have correct precedence
+	// plain envs > file envs > secret envs > configmap envs
+	envs := configmapEnvs
+	envs = append(envs, secretEnvs...)
+	envs = append(envs, fileEnvs...)
+	envs = append(envs, plainEnvs...)
 
 	err = resources.CreateDeployment(cfg.Ctx, client, resources.CreateDeploymentOpts{
 		Name:            cfg.name,

internal/cmdcommon/env/configmap.go internal/cmdcommon/envs/configmap.gointernal/cmdcommon/env/configmap.go renamed to internal/cmdcommon/envs/configmap.go

@@ -1,4 +1,4 @@
-package env
+package envs
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func BuildEnvsFromConfigmap(ctx context.Context, client kube.Client, namespace string, envs types.SourcedEnvArray) ([]corev1.EnvVar, error) {
+func BuildFromConfigmap(ctx context.Context, client kube.Client, namespace string, envs types.SourcedEnvArray) ([]corev1.EnvVar, error) {
 	var result []corev1.EnvVar
 	for _, e := range envs.Values {
 		if e.Location == "" {

internal/cmdcommon/env/configmap_test.go internal/cmdcommon/envs/configmap_test.gointernal/cmdcommon/env/configmap_test.go renamed to internal/cmdcommon/envs/configmap_test.go

@@ -1,10 +1,9 @@
-package env_test
+package envs
 
 import (
 	"context"
 	"testing"
 
-	"github.com/kyma-project/cli.v3/internal/cmdcommon/env"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon/types"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon/types/sourced"
 	"github.com/kyma-project/cli.v3/internal/kube"
@@ -198,7 +197,7 @@ func TestBuildEnvsFromConfigmap(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, gotErr := env.BuildEnvsFromConfigmap(context.Background(), tt.client, tt.namespace, tt.envs)
+			got, gotErr := BuildFromConfigmap(context.Background(), tt.client, tt.namespace, tt.envs)
 			if tt.wantErr != "" {
 				require.ErrorContains(t, gotErr, tt.wantErr)
 			}

internal/cmdcommon/envs/env.go

@@ -0,0 +1,20 @@
+package envs
+
+import (
+	"fmt"
+
+	"github.com/kyma-project/cli.v3/internal/cmdcommon/types"
+	corev1 "k8s.io/api/core/v1"
+)
+
+func Build(envs types.Map) []corev1.EnvVar {
+	var result []corev1.EnvVar
+	for k, v := range envs.Values {
+		result = append(result, corev1.EnvVar{
+			Name:  k,
+			Value: fmt.Sprintf("%v", v),
+		})
+	}
+
+	return result
+}

internal/cmdcommon/env/file.go internal/cmdcommon/envs/file.gointernal/cmdcommon/env/file.go renamed to internal/cmdcommon/envs/file.go

@@ -1,4 +1,4 @@
-package env
+package envs
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-func BuildEnvsFromFile(envs types.SourcedEnvArray) ([]corev1.EnvVar, error) {
+func BuildFromFile(envs types.SourcedEnvArray) ([]corev1.EnvVar, error) {
 	var result []corev1.EnvVar
 	for _, e := range envs.Values {
 		if e.Location == "" {

internal/cmdcommon/env/file_test.go internal/cmdcommon/envs/file_test.gointernal/cmdcommon/env/file_test.go renamed to internal/cmdcommon/envs/file_test.go

@@ -1,12 +1,11 @@
-package env_test
+package envs
 
 import (
 	"errors"
 	"os"
 	"syscall"
 	"testing"
 
-	"github.com/kyma-project/cli.v3/internal/cmdcommon/env"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon/types"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon/types/sourced"
 	"github.com/stretchr/testify/require"
@@ -131,7 +130,7 @@ func TestBuildEnvsFromFile(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, gotErr := env.BuildEnvsFromFile(tt.envs)
+			got, gotErr := BuildFromFile(tt.envs)
 			require.Equal(t, tt.wantErr, gotErr)
 			require.ElementsMatch(t, tt.want, got)
 		})

internal/cmdcommon/env/secret.go internal/cmdcommon/envs/secret.gointernal/cmdcommon/env/secret.go renamed to internal/cmdcommon/envs/secret.go

@@ -1,4 +1,4 @@
-package env
+package envs
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func BuildEnvsFromSecret(ctx context.Context, client kube.Client, namespace string, envs types.SourcedEnvArray) ([]corev1.EnvVar, error) {
+func BuildFromSecret(ctx context.Context, client kube.Client, namespace string, envs types.SourcedEnvArray) ([]corev1.EnvVar, error) {
 	var result []corev1.EnvVar
 	for _, e := range envs.Values {
 		if e.Location == "" {

internal/cmdcommon/env/secret_test.go internal/cmdcommon/envs/secret_test.gointernal/cmdcommon/env/secret_test.go renamed to internal/cmdcommon/envs/secret_test.go

@@ -1,10 +1,9 @@
-package env_test
+package envs
 
 import (
 	"context"
 	"testing"
 
-	"github.com/kyma-project/cli.v3/internal/cmdcommon/env"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon/types"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon/types/sourced"
 	"github.com/kyma-project/cli.v3/internal/kube"
@@ -197,7 +196,7 @@ func TestBuildEnvsFromSecret(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, gotErr := env.BuildEnvsFromSecret(context.Background(), tt.client, tt.namespace, tt.envs)
+			got, gotErr := BuildFromSecret(context.Background(), tt.client, tt.namespace, tt.envs)
 			if tt.wantErr != "" {
 				require.ErrorContains(t, gotErr, tt.wantErr)
 			}