From 9f8605a4c12cd71fc72ecb82eb8f98e723366220 Mon Sep 17 00:00:00 2001 From: Bharadwajshivam28 Date: Tue, 15 Oct 2024 18:40:24 +0530 Subject: [PATCH] feat: Added InsecureSkipTlsVerify flag --- .../providers/prometheus/common_test.go | 52 +++---------------- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/metrics-operator/controllers/common/providers/prometheus/common_test.go b/metrics-operator/controllers/common/providers/prometheus/common_test.go index b7bf55c1a13..92b27bd11a0 100644 --- a/metrics-operator/controllers/common/providers/prometheus/common_test.go +++ b/metrics-operator/controllers/common/providers/prometheus/common_test.go @@ -116,21 +116,19 @@ func Test_GetRoundtripper(t *testing.T) { }, } tests := []struct { - name string - provider metricsapi.KeptnMetricsProvider - k8sClient client.Client - want http.RoundTripper - wantErr bool - errorStr string - insecureSkipTlsVerify bool + name string + provider metricsapi.KeptnMetricsProvider + k8sClient client.Client + want http.RoundTripper + wantErr bool + errorStr string }{ { name: "TestSuccess", provider: metricsapi.KeptnMetricsProvider{ ObjectMeta: metav1.ObjectMeta{Namespace: "default"}, Spec: metricsapi.KeptnMetricsProviderSpec{ - Type: "", - TargetServer: "", + TargetServer: "someTargetServer", SecretKeyRef: v1.SecretKeySelector{ LocalObjectReference: v1.LocalObjectReference{ Name: "test", @@ -145,34 +143,6 @@ func Test_GetRoundtripper(t *testing.T) { want: config.NewBasicAuthRoundTripper("myuser", "mytoken", "", "", promapi.DefaultRoundTripper), wantErr: false, }, - { - name: "TestSecretNotDefined", - provider: metricsapi.KeptnMetricsProvider{}, - k8sClient: fake.NewClient(), - want: promapi.DefaultRoundTripper, - wantErr: false, - }, - { - name: "TestErrorFromGetPrometheusSecretNotExists", - provider: metricsapi.KeptnMetricsProvider{ - ObjectMeta: metav1.ObjectMeta{Namespace: "default"}, - Spec: metricsapi.KeptnMetricsProviderSpec{ - Type: "", - TargetServer: "", - SecretKeyRef: v1.SecretKeySelector{ - LocalObjectReference: v1.LocalObjectReference{ - Name: "test", - }, - Key: "", - Optional: nil, - }, - }, - }, - k8sClient: fake.NewClient(), - want: nil, - wantErr: true, - errorStr: "not found", - }, { name: "TestInsecureSkipTlsVerifyEnabled", provider: metricsapi.KeptnMetricsProvider{ @@ -209,14 +179,6 @@ func Test_GetRoundtripper(t *testing.T) { if !reflect.DeepEqual(got, tt.want) { t.Errorf("getRoundtripper() got = %v, want %v", got, tt.want) } - - if transport, ok := got.(*config.BasicAuthRoundTripper); ok { - if transport.Transport != nil { - if httpTransport, ok := transport.Transport.(*http.Transport); ok { - require.Equal(t, tt.provider.Spec.InsecureSkipTlsVerify, httpTransport.TLSClientConfig.InsecureSkipVerify, "Expected InsecureSkipTlsVerify to be set") - } - } - } }) } }