Merge pull request #45 from xco-sk/44-fix-code-scanning-alert-disable…

…d-tls-certificate-check #44 Fix code scanning alert - Disabled TLS certificate check
xco-sk · Oct 27, 2022 · 8b8ee1e · 8b8ee1e
2 parents a348faa + f009180
commit 8b8ee1e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/charts/eck-custom-resources-operator/Chart.yaml b/charts/eck-custom-resources-operator/Chart.yaml
@@ -9,5 +9,5 @@ maintainers:
     email: [email protected]
     url: https://github.com/xco-sk
 type: application
-version: 0.4.3
-appVersion: 0.4.0
+version: 0.4.4
+appVersion: 0.4.1
diff --git a/charts/eck-custom-resources-operator/README.md b/charts/eck-custom-resources-operator/README.md
@@ -1,6 +1,6 @@
 # Helm chart for eck-custom-resources
 
-![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.0](https://img.shields.io/badge/AppVersion-0.4.0-informational?style=flat-square)
+![Version: 0.4.4](https://img.shields.io/badge/Version-0.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.1](https://img.shields.io/badge/AppVersion-0.4.1-informational?style=flat-square)
 
 Helm chart for eck-custom-resources operator
 

diff --git a/controllers/kibana.eck/visualization_controller.go b/controllers/kibana.eck/visualization_controller.go
@@ -75,7 +75,7 @@ func (r *VisualizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 			return utils.GetRequeueResult(), err
 		}
 
-		logger.Info("Creating/Updating saved search", "id", req.Name)
+		logger.Info("Creating/Updating visualization", "id", req.Name)
 		res, err := kibanaUtils.UpsertSavedObject(kibanaClient, savedObjectType, visualization.ObjectMeta, visualization.Spec.GetSavedObject())
 
 		if err == nil {

diff --git a/utils/kibana/kibana_client.go b/utils/kibana/kibana_client.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"net/http"
 	"strings"
 
@@ -75,7 +76,7 @@ func (kClient Client) getHttpClient() (*http.Client, error) {
 			InsecureSkipVerify: false,
 		}
 	} else if strings.HasPrefix(kClient.KibanaSpec.Url, "https://") {
-		tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+		return nil, errors.New("Failed to configure http client, certificate not configured (kibana.certificate)")
 	}
 
 	httpClient := &http.Client{