rename handle err, remove unessacarry value test

Signed-off-by: hungran <26101787+hungran@users.noreply.github.com>
pipe-cd · Jul 23, 2023 · 0ed97c5 · 0ed97c5
1 parent cb04b9b
commit 0ed97c5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/pkg/app/piped/platformprovider/kubernetes/applier.go b/pkg/app/piped/platformprovider/kubernetes/applier.go
@@ -70,7 +70,7 @@ func (a *applier) ApplyManifest(ctx context.Context, manifest Manifest) error {
 			a.platformProvider.KubeConfigPath,
 			a.getNamespaceToRun(manifest.Key),
 		)
-		if err != nil && !errors.Is(err, errReplaceAlreadyExists) {
+		if err != nil && !errors.Is(err, errResourceAlreadyExists) {
 			return err
 		}
 	}
@@ -98,7 +98,7 @@ func (a *applier) CreateManifest(ctx context.Context, manifest Manifest) error {
 			a.platformProvider.KubeConfigPath,
 			a.getNamespaceToRun(manifest.Key),
 		)
-		if err != nil && !errors.Is(err, errReplaceAlreadyExists) {
+		if err != nil && !errors.Is(err, errResourceAlreadyExists) {
 			return err
 		}
 	}

diff --git a/pkg/app/piped/platformprovider/kubernetes/kubectl.go b/pkg/app/piped/platformprovider/kubernetes/kubectl.go
@@ -28,10 +28,10 @@ import (
 )
 
 var (
-	errorReplaceNotFound    = errors.New("specified resource is not found")
-	errorNotFoundLiteral    = "Error from server (NotFound)"
-	errReplaceAlreadyExists = errors.New("resource already exists")
-	errAlreadyExistsLiteral = "Error from server (AlreadyExists)"
+	errorReplaceNotFound     = errors.New("specified resource is not found")
+	errorNotFoundLiteral     = "Error from server (NotFound)"
+	errResourceAlreadyExists = errors.New("resource already exists")
+	errAlreadyExistsLiteral  = "Error from server (AlreadyExists)"
 )
 
 type Kubectl struct {
@@ -237,7 +237,7 @@ func (c *Kubectl) CreateNamespace(ctx context.Context, kubeconfig, namespace str
 	out, err := cmd.CombinedOutput()
 
 	if strings.Contains(string(out), errAlreadyExistsLiteral) {
-		return errReplaceAlreadyExists
+		return errResourceAlreadyExists
 	}
 	if err != nil {
 		return fmt.Errorf("failed to create namespace: %s, %v", string(out), err)

diff --git a/pkg/config/application_kubernetes_test.go b/pkg/config/application_kubernetes_test.go
@@ -97,8 +97,7 @@ func TestKubernetesApplicationConfig(t *testing.T) {
 					},
 				},
 				Input: KubernetesDeploymentInput{
-					AutoRollback:        newBoolPointer(true),
-					AutoCreateNamespace: false,
+					AutoRollback: newBoolPointer(true),
 				},
 				TrafficRouting: &KubernetesTrafficRouting{
 					Method: KubernetesTrafficRoutingMethodPodSelector,
@@ -136,8 +135,7 @@ func TestKubernetesApplicationConfig(t *testing.T) {
 					},
 				},
 				Input: KubernetesDeploymentInput{
-					AutoRollback:        newBoolPointer(true),
-					AutoCreateNamespace: false,
+					AutoRollback: newBoolPointer(true),
 				},
 				VariantLabel: KubernetesVariantLabel{
 					Key:           "pipecd.dev/variant",

diff --git a/pkg/config/application_test.go b/pkg/config/application_test.go
@@ -315,8 +315,7 @@ func TestGenericTriggerConfiguration(t *testing.T) {
 					},
 				},
 				Input: KubernetesDeploymentInput{
-					AutoRollback:        newBoolPointer(true),
-					AutoCreateNamespace: false,
+					AutoRollback: newBoolPointer(true),
 				},
 				VariantLabel: KubernetesVariantLabel{
 					Key:           "pipecd.dev/variant",
@@ -367,8 +366,7 @@ func TestTrueByDefaultBoolConfiguration(t *testing.T) {
 					},
 				},
 				Input: KubernetesDeploymentInput{
-					AutoRollback:        newBoolPointer(true),
-					AutoCreateNamespace: false,
+					AutoRollback: newBoolPointer(true),
 				},
 				VariantLabel: KubernetesVariantLabel{
 					Key:           "pipecd.dev/variant",
@@ -397,8 +395,7 @@ func TestTrueByDefaultBoolConfiguration(t *testing.T) {
 					},
 				},
 				Input: KubernetesDeploymentInput{
-					AutoRollback:        newBoolPointer(false),
-					AutoCreateNamespace: false,
+					AutoRollback: newBoolPointer(false),
 				},
 				VariantLabel: KubernetesVariantLabel{
 					Key:           "pipecd.dev/variant",
@@ -497,8 +494,7 @@ func TestGenericPostSyncConfiguration(t *testing.T) {
 					},
 				},
 				Input: KubernetesDeploymentInput{
-					AutoRollback:        newBoolPointer(true),
-					AutoCreateNamespace: false,
+					AutoRollback: newBoolPointer(true),
 				},
 				VariantLabel: KubernetesVariantLabel{
 					Key:           "pipecd.dev/variant",
@@ -618,8 +614,7 @@ func TestGenericAnalysisConfiguration(t *testing.T) {
 					},
 				},
 				Input: KubernetesDeploymentInput{
-					AutoRollback:        newBoolPointer(true),
-					AutoCreateNamespace: false,
+					AutoRollback: newBoolPointer(true),
 				},
 				VariantLabel: KubernetesVariantLabel{
 					Key:           "pipecd.dev/variant",