From 9b893aa4e027e9ca7c65e4944b7965e635c7057e Mon Sep 17 00:00:00 2001
From: TwinProduction <twin@twinnation.org>
Date: Fri, 19 Feb 2021 20:34:35 -0500
Subject: [PATCH] Minor improvements

---
 alerting/provider/custom/custom_test.go | 4 ++--
 core/service.go                         | 3 ++-
 k8s/client.go                           | 8 ++++----
 k8s/k8s.go                              | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/alerting/provider/custom/custom_test.go b/alerting/provider/custom/custom_test.go
index 79750454..815a0ee0 100644
--- a/alerting/provider/custom/custom_test.go
+++ b/alerting/provider/custom/custom_test.go
@@ -64,8 +64,8 @@ func TestAlertProvider_ToCustomAlertProvider(t *testing.T) {
 	if customAlertProvider == nil {
 		t.Fatal("customAlertProvider shouldn't have been nil")
 	}
-	if customAlertProvider != customAlertProvider {
-		t.Error("customAlertProvider should've been equal to customAlertProvider")
+	if customAlertProvider.URL != "http://example.com" {
+		t.Error("expected URL to be http://example.com, got", customAlertProvider.URL)
 	}
 }
 
diff --git a/core/service.go b/core/service.go
index 7880f6ff..12f47381 100644
--- a/core/service.go
+++ b/core/service.go
@@ -213,9 +213,10 @@ func (service *Service) call(result *Result) {
 			result.Errors = append(result.Errors, err.Error())
 			return
 		}
+		defer response.Body.Close()
 		if response.TLS != nil && len(response.TLS.PeerCertificates) > 0 {
 			certificate := response.TLS.PeerCertificates[0]
-			result.CertificateExpiration = certificate.NotAfter.Sub(time.Now())
+			result.CertificateExpiration = time.Until(certificate.NotAfter)
 		}
 		result.HTTPStatus = response.StatusCode
 		result.Connected = response.StatusCode > 0
diff --git a/k8s/client.go b/k8s/client.go
index f25fd496..1b199618 100644
--- a/k8s/client.go
+++ b/k8s/client.go
@@ -16,13 +16,13 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 )
 
-// KubernetesClientApi is a minimal interface for interacting with Kubernetes
+// KubernetesClientAPI is a minimal interface for interacting with Kubernetes
 // Created mostly to make mocking the Kubernetes client easier
-type KubernetesClientApi interface {
+type KubernetesClientAPI interface {
 	GetServices(namespace string) ([]v1.Service, error)
 }
 
-// KubernetesClient is a working implementation of KubernetesClientApi
+// KubernetesClient is a working implementation of KubernetesClientAPI
 type KubernetesClient struct {
 	client *kubernetes.Clientset
 }
@@ -44,7 +44,7 @@ func NewKubernetesClient(client *kubernetes.Clientset) *KubernetesClient {
 }
 
 // NewClient creates a Kubernetes client for the given ClusterMode
-func NewClient(clusterMode ClusterMode) (KubernetesClientApi, error) {
+func NewClient(clusterMode ClusterMode) (KubernetesClientAPI, error) {
 	var kubeConfig *rest.Config
 	var err error
 	switch clusterMode {
diff --git a/k8s/k8s.go b/k8s/k8s.go
index 8322a813..e5dcbe1d 100644
--- a/k8s/k8s.go
+++ b/k8s/k8s.go
@@ -5,6 +5,6 @@ import (
 )
 
 // GetKubernetesServices return a list of Services from the given namespace
-func GetKubernetesServices(client KubernetesClientApi, namespace string) ([]v1.Service, error) {
+func GetKubernetesServices(client KubernetesClientAPI, namespace string) ([]v1.Service, error) {
 	return client.GetServices(namespace)
 }