diff --git a/acceptanceTests/extensions_test.go b/acceptanceTests/extensions_test.go index 73f9a030f..a5d9efc9c 100644 --- a/acceptanceTests/extensions_test.go +++ b/acceptanceTests/extensions_test.go @@ -40,7 +40,7 @@ func TestRedis(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) @@ -55,7 +55,7 @@ func TestRedis(t *testing.T) { return } - redisExternalIp, err := kubernetesProvider.GetServiceExternalIp(ctx, defaultNamespaceName, "redis") + redisExternalIp, err := kubernetesProvider.GetServiceExternalIp(ctx, DefaultNamespaceName, "redis") if err != nil { t.Errorf("failed to get redis external ip, err: %v", err) return @@ -65,7 +65,7 @@ func TestRedis(t *testing.T) { Addr: fmt.Sprintf("%v:6379", redisExternalIp), }) - for i := 0; i < defaultEntriesCount/5; i++ { + for i := 0; i < DefaultEntriesCount/5; i++ { requestErr := rdb.Ping(ctx).Err() if requestErr != nil { t.Errorf("failed to send redis request, err: %v", requestErr) @@ -73,7 +73,7 @@ func TestRedis(t *testing.T) { } } - for i := 0; i < defaultEntriesCount/5; i++ { + for i := 0; i < DefaultEntriesCount/5; i++ { requestErr := rdb.Set(ctx, "key", "value", -1).Err() if requestErr != nil { t.Errorf("failed to send redis request, err: %v", requestErr) @@ -81,7 +81,7 @@ func TestRedis(t *testing.T) { } } - for i := 0; i < defaultEntriesCount/5; i++ { + for i := 0; i < DefaultEntriesCount/5; i++ { requestErr := rdb.Exists(ctx, "key").Err() if requestErr != nil { t.Errorf("failed to send redis request, err: %v", requestErr) @@ -89,7 +89,7 @@ func TestRedis(t *testing.T) { } } - for i := 0; i < defaultEntriesCount/5; i++ { + for i := 0; i < DefaultEntriesCount/5; i++ { requestErr := rdb.Get(ctx, "key").Err() if requestErr != nil { t.Errorf("failed to send redis request, err: %v", requestErr) @@ -97,7 +97,7 @@ func TestRedis(t *testing.T) { } } - for i := 0; i < defaultEntriesCount/5; i++ { + for i := 0; i < DefaultEntriesCount/5; i++ { requestErr := rdb.Del(ctx, "key").Err() if requestErr != nil { t.Errorf("failed to send redis request, err: %v", requestErr) @@ -138,7 +138,7 @@ func TestAmqp(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) @@ -153,7 +153,7 @@ func TestAmqp(t *testing.T) { return } - rabbitmqExternalIp, err := kubernetesProvider.GetServiceExternalIp(ctx, defaultNamespaceName, "rabbitmq") + rabbitmqExternalIp, err := kubernetesProvider.GetServiceExternalIp(ctx, DefaultNamespaceName, "rabbitmq") if err != nil { t.Errorf("failed to get RabbitMQ external ip, err: %v", err) return @@ -169,7 +169,7 @@ func TestAmqp(t *testing.T) { // Temporary fix for missing amqp entries time.Sleep(10 * time.Second) - for i := 0; i < defaultEntriesCount/5; i++ { + for i := 0; i < DefaultEntriesCount/5; i++ { ch, err := conn.Channel() if err != nil { t.Errorf("failed to open a channel, err: %v", err) diff --git a/acceptanceTests/logs_test.go b/acceptanceTests/logs_test.go index 990899707..a20e31b75 100644 --- a/acceptanceTests/logs_test.go +++ b/acceptanceTests/logs_test.go @@ -36,7 +36,7 @@ func TestLogs(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) @@ -137,7 +137,7 @@ func TestLogsPath(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) diff --git a/acceptanceTests/tap_test.go b/acceptanceTests/tap_test.go index 020b0d877..251f3245a 100644 --- a/acceptanceTests/tap_test.go +++ b/acceptanceTests/tap_test.go @@ -53,14 +53,14 @@ func basicTapTest(t *testing.T, shouldCheckSrcAndDest bool, extraArgs... string) return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) return } - proxyUrl := GetProxyUrl(defaultNamespaceName, defaultServiceName) + proxyUrl := GetProxyUrl(DefaultNamespaceName, DefaultServiceName) for i := 0; i < entriesCount; i++ { if _, requestErr := ExecuteHttpGetRequest(fmt.Sprintf("%v/get", proxyUrl)); requestErr != nil { t.Errorf("failed to send proxy request, err: %v", requestErr) @@ -127,8 +127,8 @@ func TestTapGuiPort(t *testing.T) { return } - proxyUrl := GetProxyUrl(defaultNamespaceName, defaultServiceName) - for i := 0; i < defaultEntriesCount; i++ { + proxyUrl := GetProxyUrl(DefaultNamespaceName, DefaultServiceName) + for i := 0; i < DefaultEntriesCount; i++ { if _, requestErr := ExecuteHttpGetRequest(fmt.Sprintf("%v/get", proxyUrl)); requestErr != nil { t.Errorf("failed to send proxy request, err: %v", requestErr) return @@ -175,7 +175,7 @@ func TestTapAllNamespaces(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) @@ -224,7 +224,7 @@ func TestTapMultipleNamespaces(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) @@ -270,7 +270,7 @@ func TestTapRegex(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) @@ -318,7 +318,7 @@ func TestTapDryRun(t *testing.T) { }() go func() { - time.Sleep(shortRetriesCount * time.Second) + time.Sleep(ShortRetriesCount * time.Second) resultChannel <- "fail" }() @@ -358,17 +358,17 @@ func TestTapRedact(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) return } - proxyUrl := GetProxyUrl(defaultNamespaceName, defaultServiceName) + proxyUrl := GetProxyUrl(DefaultNamespaceName, DefaultServiceName) requestHeaders := map[string]string{"User-Header": "Mizu"} requestBody := map[string]string{"User": "Mizu"} - for i := 0; i < defaultEntriesCount; i++ { + for i := 0; i < DefaultEntriesCount; i++ { if _, requestErr := ExecuteHttpPostRequestWithHeaders(fmt.Sprintf("%v/post", proxyUrl), requestHeaders, requestBody); requestErr != nil { t.Errorf("failed to send proxy request, err: %v", requestErr) return @@ -410,17 +410,17 @@ func TestTapNoRedact(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) return } - proxyUrl := GetProxyUrl(defaultNamespaceName, defaultServiceName) + proxyUrl := GetProxyUrl(DefaultNamespaceName, DefaultServiceName) requestHeaders := map[string]string{"User-Header": "Mizu"} requestBody := map[string]string{"User": "Mizu"} - for i := 0; i < defaultEntriesCount; i++ { + for i := 0; i < DefaultEntriesCount; i++ { if _, requestErr := ExecuteHttpPostRequestWithHeaders(fmt.Sprintf("%v/post", proxyUrl), requestHeaders, requestBody); requestErr != nil { t.Errorf("failed to send proxy request, err: %v", requestErr) return @@ -462,15 +462,15 @@ func TestTapRegexMasking(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) return } - proxyUrl := GetProxyUrl(defaultNamespaceName, defaultServiceName) - for i := 0; i < defaultEntriesCount; i++ { + proxyUrl := GetProxyUrl(DefaultNamespaceName, DefaultServiceName) + for i := 0; i < DefaultEntriesCount; i++ { response, requestErr := http.Post(fmt.Sprintf("%v/post", proxyUrl), "text/plain", bytes.NewBufferString("Mizu")) if _, requestErr = ExecuteHttpRequest(response, requestErr); requestErr != nil { t.Errorf("failed to send proxy request, err: %v", requestErr) @@ -515,25 +515,25 @@ func TestTapIgnoredUserAgents(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) return } - proxyUrl := GetProxyUrl(defaultNamespaceName, defaultServiceName) + proxyUrl := GetProxyUrl(DefaultNamespaceName, DefaultServiceName) ignoredUserAgentCustomHeader := "Ignored-User-Agent" headers := map[string]string{"User-Agent": ignoredUserAgentValue, ignoredUserAgentCustomHeader: ""} - for i := 0; i < defaultEntriesCount; i++ { + for i := 0; i < DefaultEntriesCount; i++ { if _, requestErr := ExecuteHttpGetRequestWithHeaders(fmt.Sprintf("%v/get", proxyUrl), headers); requestErr != nil { t.Errorf("failed to send proxy request, err: %v", requestErr) return } } - for i := 0; i < defaultEntriesCount; i++ { + for i := 0; i < DefaultEntriesCount; i++ { if _, requestErr := ExecuteHttpGetRequest(fmt.Sprintf("%v/get", proxyUrl)); requestErr != nil { t.Errorf("failed to send proxy request, err: %v", requestErr) return @@ -569,7 +569,7 @@ func TestTapDumpLogs(t *testing.T) { return } - apiServerUrl := GetApiServerUrl(defaultApiServerPort) + apiServerUrl := GetApiServerUrl(DefaultApiServerPort) if err := WaitTapPodsReady(apiServerUrl); err != nil { t.Errorf("failed to start tap pods on time, err: %v", err) @@ -651,7 +651,7 @@ func TestTapDumpLogs(t *testing.T) { } func TestIpResolving(t *testing.T) { - namespace := allNamespaces + namespace := AllNamespaces t.Log("add permissions for ip-resolution for current user") if err := ApplyKubeFilesForTest( diff --git a/acceptanceTests/testsUtils.go b/acceptanceTests/testsUtils.go index 3f1d119c2..4f7e5d2be 100644 --- a/acceptanceTests/testsUtils.go +++ b/acceptanceTests/testsUtils.go @@ -24,14 +24,14 @@ import ( ) const ( - longRetriesCount = 100 - shortRetriesCount = 10 - defaultApiServerPort = shared.DefaultApiServerPort - defaultNamespaceName = "mizu-tests" - defaultServiceName = "httpbin" - defaultEntriesCount = 50 - waitAfterTapPodsReady = 3 * time.Second - allNamespaces = "" + LongRetriesCount = 100 + ShortRetriesCount = 10 + DefaultApiServerPort = shared.DefaultApiServerPort + DefaultNamespaceName = "mizu-tests" + DefaultServiceName = "httpbin" + DefaultEntriesCount = 50 + WaitAfterTapPodsReady = 3 * time.Second + AllNamespaces = "" ) type PodDescriptor struct { @@ -181,7 +181,7 @@ func ApplyKubeFile(kubeContext string, namespace string, filename string) (error "--context", kubeContext, "-f", filename, } - if namespace != allNamespaces { + if namespace != AllNamespaces { cmdArgs = append(cmdArgs, "-n", namespace) } cmd := exec.Command("kubectl", cmdArgs...) @@ -199,7 +199,7 @@ func DeleteKubeFile(kubeContext string, namespace string, filename string) error "--context", kubeContext, "-f", filename, } - if namespace != allNamespaces { + if namespace != AllNamespaces { cmdArgs = append(cmdArgs, "-n", namespace) } cmd := exec.Command("kubectl", cmdArgs...) @@ -304,11 +304,11 @@ func WaitTapPodsReady(apiServerUrl string) error { if connectedTappersCount == 0 { return fmt.Errorf("no connected tappers running") } - time.Sleep(waitAfterTapPodsReady) + time.Sleep(WaitAfterTapPodsReady) return nil } - return retriesExecute(longRetriesCount, tapPodsReadyFunc) + return retriesExecute(LongRetriesCount, tapPodsReadyFunc) } func jsonBytesToInterface(jsonBytes []byte) (interface{}, error) {