Merge pull request #35 from davidharrigan/provide-ssl-config

Provide ssl config
jelmersnoeck · Jan 18, 2019 · 1778538 · 1778538
2 parents 12edec6 + af935cb
commit 1778538
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 24 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -33,10 +33,12 @@ required = [
   name = "github.com/dchest/blake2b"
   version = "1.0.0"
 
+[[constraint]]
+  name = "github.com/prometheus/client_golang"
+  version = "0.8.0"
+
 [[constraint]]
   branch = "master"
   name = "github.com/DreamItGetIT/statuscake"
+  source = "github.com/manifoldco/statuscake"
 
-[[constraint]]
-  name = "github.com/prometheus/client_golang"
-  version = "0.8.0"
diff --git a/internal/provider/statuscake/statuscake.go b/internal/provider/statuscake/statuscake.go
@@ -193,6 +193,7 @@ func (c *Client) translateSpec(spec v1alpha1.MonitorTemplateSpec) (*statuscake.T
 		scTest.WebsiteURL = http.URL
 		scTest.FollowRedirect = http.FollowRedirects
 		scTest.FindString = spec.HTTP.ShouldContain
+		scTest.EnableSSLAlert = spec.HTTP.VerifyCertificate
 
 		if spec.HTTP.ShouldNotContain != "" {
 			scTest.FindString = spec.HTTP.ShouldNotContain

diff --git a/internal/provider/statuscake/statuscake_test.go b/internal/provider/statuscake/statuscake_test.go
@@ -139,18 +139,20 @@ func TestTranslateSpec(t *testing.T) {
 				UserAgent:      "(Test User Agent)",
 				WebsiteURL:     "http://fully-qualified-url.com",
 				FollowRedirect: true,
+				EnableSSLAlert: false,
 			},
 		},
 		{
 			"HTTP config should contain",
 			v1alpha1.MonitorTemplateSpec{
 				Type: "HTTP",
 				HTTP: &v1alpha1.HTTPTemplate{
-					CustomHeader:    "Test-Header",
-					UserAgent:       "(Test User Agent)",
-					URL:             "http://fully-qualified-url.com",
-					FollowRedirects: true,
-					ShouldContain:   "this string",
+					CustomHeader:      "Test-Header",
+					UserAgent:         "(Test User Agent)",
+					URL:               "http://fully-qualified-url.com",
+					FollowRedirects:   true,
+					ShouldContain:     "this string",
+					VerifyCertificate: true,
 				},
 			},
 			nil,
@@ -162,18 +164,20 @@ func TestTranslateSpec(t *testing.T) {
 				FollowRedirect: true,
 				FindString:     "this string",
 				DoNotFind:      false,
+				EnableSSLAlert: true,
 			},
 		},
 		{
 			"HTTP config should not contain",
 			v1alpha1.MonitorTemplateSpec{
 				Type: "HTTP",
 				HTTP: &v1alpha1.HTTPTemplate{
-					CustomHeader:     "Test-Header",
-					UserAgent:        "(Test User Agent)",
-					URL:              "http://fully-qualified-url.com",
-					FollowRedirects:  true,
-					ShouldNotContain: "this string",
+					CustomHeader:      "Test-Header",
+					UserAgent:         "(Test User Agent)",
+					URL:               "http://fully-qualified-url.com",
+					FollowRedirects:   true,
+					ShouldNotContain:  "this string",
+					VerifyCertificate: true,
 				},
 			},
 			nil,
@@ -185,17 +189,19 @@ func TestTranslateSpec(t *testing.T) {
 				FollowRedirect: true,
 				FindString:     "this string",
 				DoNotFind:      true,
+				EnableSSLAlert: true,
 			},
 		},
 		{
 			"HTTP config with contact groups",
 			v1alpha1.MonitorTemplateSpec{
 				Type: "HTTP",
 				HTTP: &v1alpha1.HTTPTemplate{
-					CustomHeader:    "Test-Header",
-					UserAgent:       "(Test User Agent)",
-					URL:             "http://fully-qualified-url.com",
-					FollowRedirects: true,
+					CustomHeader:      "Test-Header",
+					UserAgent:         "(Test User Agent)",
+					URL:               "http://fully-qualified-url.com",
+					FollowRedirects:   true,
+					VerifyCertificate: true,
 				},
 			},
 			[]string{"12345"},
@@ -206,6 +212,7 @@ func TestTranslateSpec(t *testing.T) {
 				WebsiteURL:     "http://fully-qualified-url.com",
 				FollowRedirect: true,
 				ContactGroup:   []string{"12345"},
+				EnableSSLAlert: true,
 			},
 		},
 	}
@@ -387,7 +394,8 @@ func TestClient_Update(t *testing.T) {
 			HTTP: &v1alpha1.HTTPTemplate{
 				CustomHeader: "Test-Header",
 				UserAgent:    "(Test User Agent)", URL: "http://fully-qualified-url.com",
-				FollowRedirects: true,
+				FollowRedirects:   true,
+				VerifyCertificate: true,
 			},
 		}
 
@@ -416,7 +424,8 @@ func TestClient_Update(t *testing.T) {
 			HTTP: &v1alpha1.HTTPTemplate{
 				CustomHeader: "Test-Header",
 				UserAgent:    "(Test User Agent)", URL: "http://fully-qualified-url.com",
-				FollowRedirects: true,
+				FollowRedirects:   true,
+				VerifyCertificate: true,
 			},
 		}
 
@@ -437,7 +446,8 @@ func TestClient_Update(t *testing.T) {
 			HTTP: &v1alpha1.HTTPTemplate{
 				CustomHeader: "Test-Header",
 				UserAgent:    "(Test User Agent)", URL: "http://fully-qualified-url.com",
-				FollowRedirects: true,
+				FollowRedirects:   true,
+				VerifyCertificate: true,
 			},
 		}
 
@@ -463,7 +473,8 @@ func TestClient_Update(t *testing.T) {
 			HTTP: &v1alpha1.HTTPTemplate{
 				CustomHeader: "Test-Header",
 				UserAgent:    "(Test User Agent)", URL: "http://fully-qualified-url.com",
-				FollowRedirects: true,
+				FollowRedirects:   true,
+				VerifyCertificate: true,
 			},
 		}