From 167b17dfd29db87d2ade2648ae4c15be331388b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Mert=20Y=C4=B1ld=C4=B1ran?= <mehmet@up9.com>
Date: Sun, 17 Oct 2021 15:28:33 +0300
Subject: [PATCH] Move the `8899` integer and string literals into a `const`
 named `DefaultApiServerPort` in `shared` (#367)

---
 acceptanceTests/testsUtils.go | 4 +++-
 agent/pkg/utils/utils.go      | 4 +++-
 cli/kubernetes/provider.go    | 4 ++--
 shared/consts.go              | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/acceptanceTests/testsUtils.go b/acceptanceTests/testsUtils.go
index 45a2c0f8b..ddf49d982 100644
--- a/acceptanceTests/testsUtils.go
+++ b/acceptanceTests/testsUtils.go
@@ -12,12 +12,14 @@ import (
 	"strings"
 	"syscall"
 	"time"
+
+	"github.com/up9inc/mizu/shared"
 )
 
 const (
 	longRetriesCount     = 100
 	shortRetriesCount    = 10
-	defaultApiServerPort = 8899
+	defaultApiServerPort = shared.DefaultApiServerPort
 	defaultNamespaceName = "mizu-tests"
 	defaultServiceName   = "httpbin"
 	defaultEntriesCount  = 50
diff --git a/agent/pkg/utils/utils.go b/agent/pkg/utils/utils.go
index 9d8ff9af4..4838fe666 100644
--- a/agent/pkg/utils/utils.go
+++ b/agent/pkg/utils/utils.go
@@ -2,6 +2,7 @@ package utils
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"net/url"
 	"os"
@@ -11,6 +12,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/up9inc/mizu/shared"
 	"github.com/up9inc/mizu/shared/logger"
 )
 
@@ -37,7 +39,7 @@ func StartServer(app *gin.Engine) {
 
 	// Run server.
 	logger.Log.Infof("Starting the server...")
-	if err := app.Run(":8899"); err != nil {
+	if err := app.Run(fmt.Sprintf(":%d", shared.DefaultApiServerPort)); err != nil {
 		logger.Log.Errorf("Server is not running! Reason: %v", err)
 	}
 }
diff --git a/cli/kubernetes/provider.go b/cli/kubernetes/provider.go
index 90256ec4e..40882b54e 100644
--- a/cli/kubernetes/provider.go
+++ b/cli/kubernetes/provider.go
@@ -193,7 +193,7 @@ func (provider *Provider) CreateMizuApiServerPod(ctx context.Context, opts *ApiS
 		command = append(command, "--namespace", opts.Namespace)
 	}
 
-	port := intstr.FromInt(8899)
+	port := intstr.FromInt(shared.DefaultApiServerPort)
 
 	pod := &core.Pod{
 		ObjectMeta: metav1.ObjectMeta{
@@ -281,7 +281,7 @@ func (provider *Provider) CreateService(ctx context.Context, namespace string, s
 			Namespace: namespace,
 		},
 		Spec: core.ServiceSpec{
-			Ports:    []core.ServicePort{{TargetPort: intstr.FromInt(8899), Port: 80}},
+			Ports:    []core.ServicePort{{TargetPort: intstr.FromInt(shared.DefaultApiServerPort), Port: 80}},
 			Type:     core.ServiceTypeClusterIP,
 			Selector: map[string]string{"app": appLabelValue},
 		},
diff --git a/shared/consts.go b/shared/consts.go
index 42f1b5090..6de052da1 100644
--- a/shared/consts.go
+++ b/shared/consts.go
@@ -10,4 +10,5 @@ const (
 	RulePolicyPath                   = "/app/enforce-policy/"
 	RulePolicyFileName               = "enforce-policy.yaml"
 	GoGCEnvVar                       = "GOGC"
+	DefaultApiServerPort             = 8899
 )