From 2ad41f522127680c37fbaea93d0360fa989e4c40 Mon Sep 17 00:00:00 2001 From: Alexandre Garand Date: Thu, 27 Jun 2019 12:00:53 +0200 Subject: update vendor/github.com/DreamItGetIT/statuscake/ to manage ssl tests --- .../github.com/DreamItGetIT/statuscake/Gopkg.lock | 13 +- .../github.com/DreamItGetIT/statuscake/Gopkg.toml | 4 + .../DreamItGetIT/statuscake/client_test.go | 236 ++++++++++++ .../DreamItGetIT/statuscake/cmd/statuscake/main.go | 246 ++++++++++++ .../statuscake/fixtures/auth_error.json | 4 + .../statuscake/fixtures/sslCreateOk.json | 14 + .../statuscake/fixtures/sslDeleteOk.json | 4 + .../statuscake/fixtures/sslListAllOk.json | 100 +++++ .../statuscake/fixtures/sslUpdateOk.json | 4 + .../statuscake/fixtures/ssls_all_ok.json | 70 ++++ .../statuscake/fixtures/ssls_create_ok.json | 13 + .../statuscake/fixtures/ssls_update_error.json | 13 + .../statuscake/fixtures/ssls_update_ok.json | 4 + .../statuscake/fixtures/tests_all_ok.json | 23 ++ .../statuscake/fixtures/tests_delete_error.json | 5 + .../statuscake/fixtures/tests_delete_ok.json | 6 + .../statuscake/fixtures/tests_detail_ok.json | 39 ++ .../statuscake/fixtures/tests_update_error.json | 9 + .../tests_update_error_slice_of_issues.json | 5 + .../statuscake/fixtures/tests_update_ok.json | 6 + vendor/github.com/DreamItGetIT/statuscake/ssl.go | 273 +++++++++++++ .../github.com/DreamItGetIT/statuscake/ssl_test.go | 343 +++++++++++++++++ .../DreamItGetIT/statuscake/tests_test.go | 422 +++++++++++++++++++++ 23 files changed, 1854 insertions(+), 2 deletions(-) create mode 100644 vendor/github.com/DreamItGetIT/statuscake/client_test.go create mode 100644 vendor/github.com/DreamItGetIT/statuscake/cmd/statuscake/main.go create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/auth_error.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/sslCreateOk.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/sslDeleteOk.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/sslListAllOk.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/sslUpdateOk.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_all_ok.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_create_ok.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_update_error.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_update_ok.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_all_ok.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_delete_error.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_delete_ok.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_detail_ok.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_error.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_error_slice_of_issues.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_ok.json create mode 100644 vendor/github.com/DreamItGetIT/statuscake/ssl.go create mode 100644 vendor/github.com/DreamItGetIT/statuscake/ssl_test.go create mode 100644 vendor/github.com/DreamItGetIT/statuscake/tests_test.go (limited to 'vendor') diff --git a/vendor/github.com/DreamItGetIT/statuscake/Gopkg.lock b/vendor/github.com/DreamItGetIT/statuscake/Gopkg.lock index c5b189e..b433daf 100644 --- a/vendor/github.com/DreamItGetIT/statuscake/Gopkg.lock +++ b/vendor/github.com/DreamItGetIT/statuscake/Gopkg.lock @@ -17,6 +17,14 @@ revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" version = "v1.1.1" +[[projects]] + digest = "1:a63cff6b5d8b95638bfe300385d93b2a6d9d687734b863da8e09dc834510a690" + name = "github.com/google/go-querystring" + packages = ["query"] + pruneopts = "UT" + revision = "44c6ddd0a2342c386950e880b658017258da92fc" + version = "v1.0.0" + [[projects]] digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" name = "github.com/pmezard/go-difflib" @@ -30,7 +38,7 @@ name = "github.com/stretchr/testify" packages = [ "assert", - "require", + "require" ] pruneopts = "UT" revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" @@ -41,8 +49,9 @@ analyzer-version = 1 input-imports = [ "github.com/DreamItGetIT/statuscake", + "github.com/google/go-querystring/query", "github.com/stretchr/testify/assert", - "github.com/stretchr/testify/require", + "github.com/stretchr/testify/require" ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/vendor/github.com/DreamItGetIT/statuscake/Gopkg.toml b/vendor/github.com/DreamItGetIT/statuscake/Gopkg.toml index b0c1687..e02ee65 100644 --- a/vendor/github.com/DreamItGetIT/statuscake/Gopkg.toml +++ b/vendor/github.com/DreamItGetIT/statuscake/Gopkg.toml @@ -36,3 +36,7 @@ [prune] go-tests = true unused-packages = true + +[[constraint]] + name = "github.com/google/go-querystring" + version = "1.0.0" diff --git a/vendor/github.com/DreamItGetIT/statuscake/client_test.go b/vendor/github.com/DreamItGetIT/statuscake/client_test.go new file mode 100644 index 0000000..7c40c81 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/client_test.go @@ -0,0 +1,236 @@ +package statuscake + +import ( + "bytes" + "io" + "io/ioutil" + "log" + "net/http" + "net/url" + "os" + "path/filepath" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestAuth_validate(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + auth := &Auth{} + err := auth.validate() + + require.NotNil(err) + assert.Contains(err.Error(), "Username is required") + assert.Contains(err.Error(), "Apikey is required") + + auth.Username = "foo" + err = auth.validate() + + require.NotNil(err) + assert.Equal("Apikey is required", err.Error()) + + auth.Apikey = "bar" + err = auth.validate() + assert.Nil(err) +} + +func TestClient(t *testing.T) { + require := require.New(t) + assert := assert.New(t) + + c, err := New(Auth{Username: "random-user", Apikey: "my-pass"}) + require.Nil(err) + + assert.Equal("random-user", c.username) + assert.Equal("my-pass", c.apiKey) +} + +func TestClient_newRequest(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c, err := New(Auth{Username: "random-user", Apikey: "my-pass"}) + require.Nil(err) + + r, err := c.newRequest("GET", "/hello", nil, nil) + + require.Nil(err) + assert.Equal("GET", r.Method) + assert.Equal("https://app.statuscake.com/API/hello", r.URL.String()) + assert.Equal("random-user", r.Header.Get("Username")) + assert.Equal("my-pass", r.Header.Get("API")) +} + +func TestClient_doRequest(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c, err := New(Auth{Username: "random-user", Apikey: "my-pass"}) + require.Nil(err) + + hc := &fakeHTTPClient{StatusCode: 200} + c.c = hc + + req, err := http.NewRequest("GET", "http://example.com/test", nil) + require.Nil(err) + + _, err = c.doRequest(req) + require.Nil(err) + + assert.Len(hc.requests, 1) + assert.Equal("http://example.com/test", hc.requests[0].URL.String()) +} + +func TestClient_doRequest_WithHTTPErrors(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c, err := New(Auth{Username: "random-user", Apikey: "my-pass"}) + require.Nil(err) + + hc := &fakeHTTPClient{ + StatusCode: 500, + } + c.c = hc + + req, err := http.NewRequest("GET", "http://example.com/test", nil) + require.Nil(err) + + _, err = c.doRequest(req) + require.NotNil(err) + assert.IsType(&httpError{}, err) +} + +func TestClient_doRequest_HttpAuthenticationErrors(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c, err := New(Auth{Username: "random-user", Apikey: "my-pass"}) + require.Nil(err) + + hc := &fakeHTTPClient{ + StatusCode: 200, + Fixture: "auth_error.json", + } + c.c = hc + + req, err := http.NewRequest("GET", "http://example.com/test", nil) + require.Nil(err) + + _, err = c.doRequest(req) + require.NotNil(err) + assert.IsType(&AuthenticationError{}, err) +} + +func TestClient_get(t *testing.T) { + require := require.New(t) + assert := assert.New(t) + + c, err := New(Auth{Username: "random-user", Apikey: "my-pass"}) + require.Nil(err) + + hc := &fakeHTTPClient{} + c.c = hc + + c.get("/hello", nil) + assert.Len(hc.requests, 1) + assert.Equal("GET", hc.requests[0].Method) + assert.Equal("https://app.statuscake.com/API/hello", hc.requests[0].URL.String()) +} + +func TestClient_put(t *testing.T) { + require := require.New(t) + assert := assert.New(t) + + c, err := New(Auth{Username: "random-user", Apikey: "my-pass"}) + require.Nil(err) + + hc := &fakeHTTPClient{} + c.c = hc + + v := url.Values{"foo": {"bar"}} + c.put("/hello", v) + assert.Len(hc.requests, 1) + assert.Equal("PUT", hc.requests[0].Method) + assert.Equal("https://app.statuscake.com/API/hello", hc.requests[0].URL.String()) + + b, err := ioutil.ReadAll(hc.requests[0].Body) + require.Nil(err) + assert.Equal("foo=bar", string(b)) +} + +func TestClient_delete(t *testing.T) { + require := require.New(t) + assert := assert.New(t) + + c, err := New(Auth{Username: "random-user", Apikey: "my-pass"}) + require.Nil(err) + + hc := &fakeHTTPClient{} + c.c = hc + + v := url.Values{"foo": {"bar"}} + c.delete("/hello", v) + assert.Len(hc.requests, 1) + assert.Equal("DELETE", hc.requests[0].Method) + assert.Equal("https://app.statuscake.com/API/hello?foo=bar", hc.requests[0].URL.String()) +} + +func TestClient_Tests(t *testing.T) { + require := require.New(t) + assert := assert.New(t) + + c, err := New(Auth{Username: "random-user", Apikey: "my-pass"}) + require.Nil(err) + + expected := &tests{ + client: c, + } + + assert.Equal(expected, c.Tests()) +} + +type fakeBody struct { + io.Reader +} + +func (f *fakeBody) Close() error { + return nil +} + +type fakeHTTPClient struct { + StatusCode int + Fixture string + requests []*http.Request +} + +func (c *fakeHTTPClient) Do(r *http.Request) (*http.Response, error) { + c.requests = append(c.requests, r) + var body []byte + + if c.Fixture != "" { + p := filepath.Join("fixtures", c.Fixture) + f, err := os.Open(p) + if err != nil { + log.Fatal(err) + } + defer f.Close() + + b, err := ioutil.ReadAll(f) + if err != nil { + log.Fatal(err) + } + + body = b + } + + resp := &http.Response{ + StatusCode: c.StatusCode, + Body: &fakeBody{Reader: bytes.NewReader(body)}, + } + + return resp, nil +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/cmd/statuscake/main.go b/vendor/github.com/DreamItGetIT/statuscake/cmd/statuscake/main.go new file mode 100644 index 0000000..59f41a9 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/cmd/statuscake/main.go @@ -0,0 +1,246 @@ +package main + +import ( + "fmt" + logpkg "log" + "os" + "strconv" + + "github.com/DreamItGetIT/statuscake" + "strings" +) + +var log *logpkg.Logger + +type command func(*statuscake.Client, ...string) error + +var commands map[string]command + +func init() { + log = logpkg.New(os.Stderr, "", 0) + commands = map[string]command{ + "list": cmdList, + "detail": cmdDetail, + "delete": cmdDelete, + "create": cmdCreate, + "update": cmdUpdate, + } +} + +func colouredStatus(s string) string { + switch s { + case "Up": + return fmt.Sprintf("\033[0;32m%s\033[0m", s) + case "Down": + return fmt.Sprintf("\033[0;31m%s\033[0m", s) + default: + return s + } +} + +func getEnv(name string) string { + v := os.Getenv(name) + if v == "" { + log.Fatalf("`%s` env variable is required", name) + } + + return v +} + +func cmdList(c *statuscake.Client, args ...string) error { + tt := c.Tests() + tests, err := tt.All() + if err != nil { + return err + } + + for _, t := range tests { + var paused string + if t.Paused { + paused = "yes" + } else { + paused = "no" + } + + fmt.Printf("* %d: %s\n", t.TestID, colouredStatus(t.Status)) + fmt.Printf(" WebsiteName: %s\n", t.WebsiteName) + fmt.Printf(" TestType: %s\n", t.TestType) + fmt.Printf(" Paused: %s\n", paused) + fmt.Printf(" ContactGroup: %s\n", fmt.Sprint(t.ContactGroup)) + fmt.Printf(" Uptime: %f\n", t.Uptime) + } + + return nil +} + +func cmdDetail(c *statuscake.Client, args ...string) error { + if len(args) != 1 { + return fmt.Errorf("command `detail` requires a single argument `TestID`") + } + + id, err := strconv.Atoi(args[0]) + if err != nil { + return err + } + + tt := c.Tests() + t, err := tt.Detail(id) + if err != nil { + return err + } + + var paused string + if t.Paused { + paused = "yes" + } else { + paused = "no" + } + + fmt.Printf("* %d: %s\n", t.TestID, colouredStatus(t.Status)) + fmt.Printf(" WebsiteName: %s\n", t.WebsiteName) + fmt.Printf(" WebsiteURL: %s\n", t.WebsiteURL) + fmt.Printf(" PingURL: %s\n", t.PingURL) + fmt.Printf(" TestType: %s\n", t.TestType) + fmt.Printf(" Paused: %s\n", paused) + fmt.Printf(" ContactGroup: %s\n", fmt.Sprint(t.ContactGroup)) + fmt.Printf(" Uptime: %f\n", t.Uptime) + fmt.Printf(" NodeLocations: %s\n", fmt.Sprint(t.NodeLocations)) + + return nil +} + +func cmdDelete(c *statuscake.Client, args ...string) error { + if len(args) != 1 { + return fmt.Errorf("command `delete` requires a single argument `TestID`") + } + + id, err := strconv.Atoi(args[0]) + if err != nil { + return err + } + + return c.Tests().Delete(id) +} + +func askString(name string) string { + var v string + + fmt.Printf("%s: ", name) + _, err := fmt.Scanln(&v) + if err != nil { + log.Fatal(err) + } + + return v +} + +func askInt(name string) int { + v := askString(name) + i, err := strconv.Atoi(v) + if err != nil { + log.Fatalf("Invalid number `%s`", v) + } + + return i +} + +func cmdCreate(c *statuscake.Client, args ...string) error { + websiteName := askString("WebsiteName") + websiteURL := askString("WebsiteURL") + testType := askString("TestType") + checkRate := askInt("CheckRate") + contactGroupString := askString("ContactGroup (comma separated list)") + contactGroup := strings.Split(contactGroupString, ",") + nodeLocationsString := askString("NodeLocations (comma separated list)") + nodeLocations := strings.Split(nodeLocationsString, ",") + + t := &statuscake.Test{ + WebsiteName: websiteName, + WebsiteURL: websiteURL, + TestType: testType, + CheckRate: checkRate, + NodeLocations: nodeLocations, + ContactGroup: contactGroup, + } + + t2, err := c.Tests().Update(t) + if err != nil { + return err + } + + fmt.Printf("CREATED: \n%+v\n", t2) + + return nil +} + +func cmdUpdate(c *statuscake.Client, args ...string) error { + if len(args) != 1 { + return fmt.Errorf("command `update` requires a single argument `TestID`") + } + + id, err := strconv.Atoi(args[0]) + if err != nil { + return err + } + + tt := c.Tests() + t, err := tt.Detail(id) + if err != nil { + return err + } + + t.TestID = id + t.WebsiteName = askString(fmt.Sprintf("WebsiteName [%s]", t.WebsiteName)) + t.WebsiteURL = askString(fmt.Sprintf("WebsiteURL [%s]", t.WebsiteURL)) + t.TestType = askString(fmt.Sprintf("TestType [%s]", t.TestType)) + t.CheckRate = askInt(fmt.Sprintf("CheckRate [%d]", t.CheckRate)) + contactGroupString := askString("ContactGroup (comma separated list)") + t.ContactGroup = strings.Split(contactGroupString, ",") + nodeLocationsString := askString("NodeLocations (comma separated list)") + t.NodeLocations = strings.Split(nodeLocationsString, ",") + + t2, err := c.Tests().Update(t) + if err != nil { + return err + } + + fmt.Printf("UPDATED: \n%+v\n", t2) + + return nil +} + +func usage() { + fmt.Printf("Usage:\n") + fmt.Printf(" %s COMMAND\n", os.Args[0]) + fmt.Printf("Available commands:\n") + for k := range commands { + fmt.Printf(" %+v\n", k) + } +} + +func main() { + username := getEnv("STATUSCAKE_USERNAME") + apikey := getEnv("STATUSCAKE_APIKEY") + + if len(os.Args) < 2 { + usage() + os.Exit(1) + } + + var err error + + c, err := statuscake.New(statuscake.Auth{Username: username, Apikey: apikey}) + if err != nil { + log.Fatal(err) + } + + if cmd, ok := commands[os.Args[1]]; ok { + err = cmd(c, os.Args[2:]...) + } else { + err = fmt.Errorf("Unknown command `%s`", os.Args[1]) + } + + if err != nil { + log.Fatalf("Error running command `%s`: %s", os.Args[1], err.Error()) + } +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/auth_error.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/auth_error.json new file mode 100644 index 0000000..4f14be5 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/auth_error.json @@ -0,0 +1,4 @@ +{ + "ErrNo": 0, + "Error": "Can not access account. Was both Username and API Key provided?" +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslCreateOk.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslCreateOk.json new file mode 100644 index 0000000..615e2db --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslCreateOk.json @@ -0,0 +1,14 @@ +{ + "Success": true, + "Message": 143616, + "Input": { + "domain": "https://www.exemple.com", + "checkrate": "2073600", + "contact_groups": "", + "alert_reminder": true, + "alert_expiry": true, + "alert_broken": true, + "alert_mixed": true, + "alert_at": "7,18,2019" + } +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslDeleteOk.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslDeleteOk.json new file mode 100644 index 0000000..a394239 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslDeleteOk.json @@ -0,0 +1,4 @@ +{ + "Success": true, + "Message": "Deletion successful" +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslListAllOk.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslListAllOk.json new file mode 100644 index 0000000..15c428f --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslListAllOk.json @@ -0,0 +1,100 @@ +[ + { + "id": "143615", + "checkrate": 2073600, + "paused": false, + "domain": "https://www.exemple.com", + "issuer_cn": "Let's Encrypt Authority X3", + "cert_score": "95", + "cipher_score": "100", + "cert_status": "CERT_OK", + "cipher": "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + "valid_from_utc": "2019-05-28 01:22:00", + "valid_until_utc": "2019-08-26 01:22:00", + "mixed_content": [], + "flags": { + "is_extended": false, + "has_pfs": true, + "is_broken": false, + "is_expired": false, + "is_missing": false, + "is_revoked": false, + "has_mixed": false + }, + "contact_groups": [], + "alert_at": "7,18,2019", + "last_reminder": 2019, + "alert_reminder": true, + "alert_expiry": true, + "alert_broken": true, + "alert_mixed": true, + "last_updated_utc": "2019-06-20 10:11:03" + }, + { + "id": "143616", + "checkrate": 2073600, + "paused": false, + "domain": "https://www.exemple.com", + "issuer_cn": "Let's Encrypt Authority X3", + "cert_score": "95", + "cipher_score": "100", + "cert_status": "CERT_OK", + "cipher": "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + "valid_from_utc": "2019-05-28 01:22:00", + "valid_until_utc": "2019-08-26 01:22:00", + "mixed_content": [ + { + "type": "img", + "src": "http://example.com/image.gif" + } + ], + "flags": { + "is_extended": false, + "has_pfs": true, + "is_broken": false, + "is_expired": false, + "is_missing": false, + "is_revoked": false, + "has_mixed": false + }, + "contact_groups": ["12","13","34"], + "alert_at": "7,18,2019", + "last_reminder": 2019, + "alert_reminder": true, + "alert_expiry": true, + "alert_broken": true, + "alert_mixed": true, + "last_updated_utc": "2019-06-20 10:23:14" + }, + { + "id": "143617", + "checkrate": 2073600, + "paused": false, + "domain": "https://www.exemple.com", + "issuer_cn": "Let's Encrypt Authority X3", + "cert_score": "95", + "cipher_score": "100", + "cert_status": "CERT_OK", + "cipher": "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + "valid_from_utc": "2019-05-28 01:22:00", + "valid_until_utc": "2019-08-26 01:22:00", + "mixed_content": [], + "flags": { + "is_extended": false, + "has_pfs": true, + "is_broken": false, + "is_expired": false, + "is_missing": false, + "is_revoked": false, + "has_mixed": false + }, + "contact_groups": [], + "alert_at": "7,18,2019", + "last_reminder": 2019, + "alert_reminder": true, + "alert_expiry": true, + "alert_broken": true, + "alert_mixed": true, + "last_updated_utc": "2019-06-20 10:23:20" + } +] diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslUpdateOk.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslUpdateOk.json new file mode 100644 index 0000000..23b5932 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/sslUpdateOk.json @@ -0,0 +1,4 @@ +{ + "Success": true, + "Message": "SSL test has been updated successfully" +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_all_ok.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_all_ok.json new file mode 100644 index 0000000..4dd6b51 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_all_ok.json @@ -0,0 +1,70 @@ +[ + { + "id": "12345", + "paused": false, + "domain": "https://google.com", + "cert_score": "95", + "cipher_score": "100", + "cert_status": "CERT_OK", + "cipher": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", + "valid_from_utc": "2017-10-10 14:06:00", + "valid_until_utc": "2017-12-29 00:00:00", + "mixed_content": [ + { + "type": "img", + "src": "http://example.com/image.gif" + } + ], + "flags": { + "is_extended": false, + "has_pfs": true, + "is_broken": false, + "is_expired": false, + "is_missing": false, + "is_revoked": false, + "is_mixed": false + }, + "contact_groups": [12, 13, 14], + "alert_at": "1,7,30", + "last_reminder": 0, + "alert_reminder": false, + "alert_expiry": false, + "alert_broken": false, + "alert_mixed": false, + "last_updated_utc": "2017-10-24 09:02:25" + }, + { + "id": "12346", + "paused": false, + "domain": "https://google2.com", + "cert_score": "95", + "cipher_score": "100", + "cert_status": "CERT_OK", + "cipher": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", + "valid_from_utc": "2017-10-10 14:06:00", + "valid_until_utc": "2017-12-29 00:00:00", + "mixed_content": [ + { + "type": "img", + "src": "http://example.com/image.gif" + } + ], + "flags": { + "is_extended": false, + "has_pfs": true, + "is_broken": false, + "is_expired": false, + "is_missing": false, + "is_revoked": false, + "is_mixed": false + }, + "contact_groups": [12, 13, 14], + "alert_at": "1,7,30", + "last_reminder": 0, + "alert_reminder": false, + "alert_expiry": false, + "alert_broken": false, + "alert_mixed": false, + "last_updated_utc": "2017-10-24 09:02:25" + } +] diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_create_ok.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_create_ok.json new file mode 100644 index 0000000..c7734e0 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_create_ok.json @@ -0,0 +1,13 @@ +{ + "Success": true, + "Message": 12345, + "Input": { + "domain": "https://example.com", + "checkrate": 86400, + "contact_groups": "1000,2000", + "alert_reminder": false, + "alert_expiry": false, + "alert_broken": false, + "alert_at": "59,60,61" + } +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_update_error.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_update_error.json new file mode 100644 index 0000000..5f0f4d5 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_update_error.json @@ -0,0 +1,13 @@ +{ + "Success": false, + "Message": "Error creating test", + "Input": { + "domain": "https://example.com", + "checkrate": 86400, + "contact_groups": "1000,2000", + "alert_reminder": false, + "alert_expiry": false, + "alert_broken": false, + "alert_at": "59,60,61" + } +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_update_ok.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_update_ok.json new file mode 100644 index 0000000..f77f4f3 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/ssls_update_ok.json @@ -0,0 +1,4 @@ +{ + "Success": true, + "Message": "SSL test has been updated successfully" +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_all_ok.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_all_ok.json new file mode 100644 index 0000000..dee80d4 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_all_ok.json @@ -0,0 +1,23 @@ +[ + { + "TestID": 100, + "Paused": false, + "TestType": "HTTP", + "WebsiteName": "www 1", + "ContactGroup": ["1"], + "Status": "Up", + "Uptime": 100, + "NodeLocations": ["foo", "bar"] + }, + { + "TestID": 101, + "Paused": true, + "TestType": "HTTP", + "WebsiteName": "www 2", + "ContactGroup": ["2"], + "Status": "Down", + "Uptime": 0, + "NodeLocations": ["foo"], + "TestTags": ["test1", "test2"] + } +] diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_delete_error.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_delete_error.json new file mode 100644 index 0000000..6fad58e --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_delete_error.json @@ -0,0 +1,5 @@ +{ + "Success": false, + "Error": "this is an error" +} + diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_delete_ok.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_delete_ok.json new file mode 100644 index 0000000..0dd279b --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_delete_ok.json @@ -0,0 +1,6 @@ +{ + "TestID": 6735, + "Affected": 1, + "Success": true, + "Message": "This Check Has Been Deleted. It can not be recovered." +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_detail_ok.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_detail_ok.json new file mode 100644 index 0000000..a64989b --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_detail_ok.json @@ -0,0 +1,39 @@ +{ + "TestID": 6735, + "TestType": "HTTP", + "Paused": false, + "WebsiteName": "NL", + "CustomHeader": "{\"some\":{\"json\": [\"value\"]}}", + "UserAgent": "product/version (comment)", + "ContactGroups": [ + { + "ID": 536, + "Name": "Dummy ContactGroup", + "Email": "github-dreamitgetit-statuscake@maildrop.cc" + } + ], + "ContactID": 536, + "Status": "Up", + "Uptime": 0, + "CheckRate": 60, + "Timeout": 40, + "LogoImage": "", + "WebsiteHost": "Various", + "NodeLocations": [ + "foo", + "bar" + ], + "FindString": "", + "DoNotFind": false, + "LastTested": "2013-01-20 14:38:18", + "NextLocation": "USNY", + "Processing": false, + "ProcessingState": "Pretest", + "ProcessingOn": "dalas.localdomain", + "DownTimes": "0", + "UseJar": 0, + "PostRaw": "", + "FinalEndpoint": "", + "EnableSSLWarning": false, + "FollowRedirect": false +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_error.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_error.json new file mode 100644 index 0000000..a76c5eb --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_error.json @@ -0,0 +1,9 @@ +{ + "Issues": { + "WebsiteName": "issue a", + "WebsiteURL": "issue b", + "CheckRate": "issue c" + }, + "Success": false, + "Message": "Required Data is Missing." +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_error_slice_of_issues.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_error_slice_of_issues.json new file mode 100644 index 0000000..02e98eb --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_error_slice_of_issues.json @@ -0,0 +1,5 @@ +{ + "Issues": ["hello", "world"], + "Success": false, + "Message": "Required Data is Missing." +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_ok.json b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_ok.json new file mode 100644 index 0000000..7c2dee2 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/fixtures/tests_update_ok.json @@ -0,0 +1,6 @@ +{ + "Issues": {}, + "Success": true, + "Message": "", + "InsertID": 1234 +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/ssl.go b/vendor/github.com/DreamItGetIT/statuscake/ssl.go new file mode 100644 index 0000000..3f73d8d --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/ssl.go @@ -0,0 +1,273 @@ +package statuscake + +import ( + "encoding/json" + "fmt" + "net/url" + "strings" + "strconv" + + "github.com/google/go-querystring/query" +) + +//Ssl represent the data received by the API with GET +type Ssl struct { + ID string `json:"id" url:"id,omitempty"` + Domain string `json:"domain" url:"domain,omitempty"` + Checkrate int `json:"checkrate" url:"checkrate,omitempty"` + ContactGroupsC string ` url:"contact_groups,omitempty"` + AlertAt string `json:"alert_at" url:"alert_at,omitempty"` + AlertReminder bool `json:"alert_reminder" url:"alert_expiry,omitempty"` + AlertExpiry bool `json:"alert_expiry" url:"alert_reminder,omitempty"` + AlertBroken bool `json:"alert_broken" url:"alert_broken,omitempty"` + AlertMixed bool `json:"alert_mixed" url:"alert_mixed,omitempty"` + Paused bool `json:"paused"` + IssuerCn string `json:"issuer_cn"` + CertScore string `json:"cert_score"` + CipherScore string `json:"cipher_score"` + CertStatus string `json:"cert_status"` + Cipher string `json:"cipher"` + ValidFromUtc string `json:"valid_from_utc"` + ValidUntilUtc string `json:"valid_until_utc"` + MixedContent []map[string]string `json:"mixed_content"` + Flags map[string]bool `json:"flags"` + ContactGroups []string `json:"contact_groups"` + LastReminder int `json:"last_reminder"` + LastUpdatedUtc string `json:"last_updated_utc"` +} + +//PartialSsl represent a ssl test creation or modification +type PartialSsl struct { + ID int + Domain string + Checkrate string + ContactGroupsC string + AlertAt string + AlertExpiry bool + AlertReminder bool + AlertBroken bool + AlertMixed bool +} + +type createSsl struct { + ID int `url:"id,omitempty"` + Domain string `url:"domain" json:"domain"` + Checkrate string `url:"checkrate" json:"checkrate"` + ContactGroupsC string `url:"contact_groups" json:"contact_groups"` + AlertAt string `url:"alert_at" json:"alert_at"` + AlertExpiry bool `url:"alert_expiry" json:"alert_expiry"` + AlertReminder bool `url:"alert_reminder" json:"alert_reminder"` + AlertBroken bool `url:"alert_broken" json:"alert_broken"` + AlertMixed bool `url:"alert_mixed" json:"alert_mixed"` +} + +type updateSsl struct { + ID int `url:"id"` + Domain string `url:"domain" json:"domain"` + Checkrate string `url:"checkrate" json:"checkrate"` + ContactGroupsC string `url:"contact_groups" json:"contact_groups"` + AlertAt string `url:"alert_at" json:"alert_at"` + AlertExpiry bool `url:"alert_expiry" json:"alert_expiry"` + AlertReminder bool `url:"alert_reminder" json:"alert_reminder"` + AlertBroken bool `url:"alert_broken" json:"alert_broken"` + AlertMixed bool `url:"alert_mixed" json:"alert_mixed"` +} + + +type sslUpdateResponse struct { + Success bool `json:"Success"` + Message interface{} `json:"Message"` +} + +type sslCreateResponse struct { + Success bool `json:"Success"` + Message interface{} `json:"Message"` + Input createSsl `json:"Input"` +} + +//Ssls represent the actions done wit the API +type Ssls interface { + All() ([]*Ssl, error) + completeSsl(*PartialSsl) (*Ssl, error) + Detail(string) (*Ssl, error) + Update(*PartialSsl) (*Ssl, error) + UpdatePartial(*PartialSsl) (*PartialSsl, error) + Delete(ID string) error + CreatePartial(*PartialSsl) (*PartialSsl, error) + Create(*PartialSsl) (*Ssl, error) +} + +func consolidateSsl(s *Ssl) { + (*s).ContactGroupsC = strings.Trim(strings.Join(strings.Fields(fmt.Sprint((*s).ContactGroups)), ","), "[]") +} + +func findSsl(responses []*Ssl, id string) (*Ssl, error) { + var response *Ssl + for _, elem := range responses { + if (*elem).ID == id { + return elem, nil + } + } + return response, fmt.Errorf("%s Not found", id) +} + +func (tt *ssls) completeSsl(s *PartialSsl) (*Ssl, error) { + full, err := tt.Detail(strconv.Itoa((*s).ID)) + if err != nil { + return nil, err + } + (*full).ContactGroups = strings.Split((*s).ContactGroupsC,",") + return full, nil +} + +//Partial return a PartialSsl corresponding to the Ssl +func Partial(s *Ssl) (*PartialSsl,error) { + if s==nil { + return nil,fmt.Errorf("s is nil") + } + id,err:=strconv.Atoi(s.ID) + if(err!=nil){ + return nil,err + } + return &PartialSsl{ + ID: id, + Domain: s.Domain, + Checkrate: strconv.Itoa(s.Checkrate), + ContactGroupsC: s.ContactGroupsC, + AlertReminder: s.AlertReminder, + AlertExpiry: s.AlertExpiry, + AlertBroken: s.AlertBroken, + AlertMixed: s.AlertMixed, + AlertAt: s.AlertAt, + },nil + +} + +type ssls struct { + client apiClient +} + +//NewSsls return a new ssls +func NewSsls(c apiClient) Ssls { + return &ssls{ + client: c, + } +} + +//All return a list of all the ssl from the API +func (tt *ssls) All() ([]*Ssl, error) { + rawResponse, err := tt.client.get("/SSL", nil) + if err != nil { + return nil, fmt.Errorf("Error getting StatusCake Ssl: %s", err.Error()) + } + var getResponse []*Ssl + err = json.NewDecoder(rawResponse.Body).Decode(&getResponse) + if err != nil { + return nil, err + } + + for ssl := range getResponse { + consolidateSsl(getResponse[ssl]) + } + + return getResponse, err +} + +//Detail return the ssl corresponding to the id +func (tt *ssls) Detail(id string) (*Ssl, error) { + responses, err := tt.All() + if err != nil { + return nil, err + } + mySsl, errF := findSsl(responses, id) + if errF != nil { + return nil, errF + } + return mySsl, nil +} + +//Update update the API with s and create one if s.ID=0 then return the corresponding Ssl +func (tt *ssls) Update(s *PartialSsl) (*Ssl, error) { + var err error + s, err = tt.UpdatePartial(s) + if err!= nil { + return nil, err + } + return tt.completeSsl(s) +} + +//UpdatePartial update the API with s and create one if s.ID=0 then return the corresponding PartialSsl +func (tt *ssls) UpdatePartial(s *PartialSsl) (*PartialSsl, error) { + + if((*s).ID == 0){ + return tt.CreatePartial(s) + } + var v url.Values + + v, _ = query.Values(updateSsl(*s)) + + rawResponse, err := tt.client.put("/SSL/Update", v) + if err != nil { + return nil, fmt.Errorf("Error creating StatusCake Ssl: %s", err.Error()) + } + + var updateResponse sslUpdateResponse + err = json.NewDecoder(rawResponse.Body).Decode(&updateResponse) + if err != nil { + return nil, err + } + + if !updateResponse.Success { + return nil, fmt.Errorf("%s", updateResponse.Message.(string)) + } + + + return s, nil +} + +//Delete delete the ssl which ID is id +func (tt *ssls) Delete(id string) error { + _, err := tt.client.delete("/SSL/Update", url.Values{"id": {fmt.Sprint(id)}}) + if err != nil { + return err + } + + return nil +} + +//Create create the ssl whith the data in s and return the Ssl created +func (tt *ssls) Create(s *PartialSsl) (*Ssl, error) { + var err error + s, err = tt.CreatePartial(s) + if err!= nil { + return nil, err + } + return tt.completeSsl(s) +} + +//CreatePartial create the ssl whith the data in s and return the PartialSsl created +func (tt *ssls) CreatePartial(s *PartialSsl) (*PartialSsl, error) { + (*s).ID=0 + var v url.Values + v, _ = query.Values(createSsl(*s)) + + rawResponse, err := tt.client.put("/SSL/Update", v) + if err != nil { + return nil, fmt.Errorf("Error creating StatusCake Ssl: %s", err.Error()) + } + + var createResponse sslCreateResponse + err = json.NewDecoder(rawResponse.Body).Decode(&createResponse) + if err != nil { + return nil, err + } + + if !createResponse.Success { + return nil, fmt.Errorf("%s", createResponse.Message.(string)) + } + *s = PartialSsl(createResponse.Input) + (*s).ID = int(createResponse.Message.(float64)) + + return s,nil +} + diff --git a/vendor/github.com/DreamItGetIT/statuscake/ssl_test.go b/vendor/github.com/DreamItGetIT/statuscake/ssl_test.go new file mode 100644 index 0000000..48a961c --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/ssl_test.go @@ -0,0 +1,343 @@ +package statuscake + +import ( + "testing" + //"fmt" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "net/url" +) + +func TestSsl_All(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "sslListAllOk.json", + } + tt := NewSsls(c) + ssls, err := tt.All() + require.Nil(err) + + assert.Equal("/SSL", c.sentRequestPath) + assert.Equal("GET", c.sentRequestMethod) + assert.Nil(c.sentRequestValues) + assert.Len(ssls, 3) + mixed := make(map[string]string) + flags := make(map[string]bool) + flags["is_extended"] = false + flags["has_pfs"] = true + flags["is_broken"] = false + flags["is_expired"] = false + flags["is_missing"] = false + flags["is_revoked"] = false + flags["has_mixed"] = false + expectedTest := &Ssl{ + ID: "143615", + Checkrate: 2073600, + Paused: false, + Domain: "https://www.exemple.com", + IssuerCn: "Let's Encrypt Authority X3", + CertScore: "95", + CipherScore: "100", + CertStatus: "CERT_OK", + Cipher: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + ValidFromUtc: "2019-05-28 01:22:00", + ValidUntilUtc: "2019-08-26 01:22:00", + MixedContent: []map[string]string{}, + Flags: flags, + ContactGroups: []string{}, + ContactGroupsC: "", + AlertAt: "7,18,2019", + LastReminder: 2019, + AlertReminder: true, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + LastUpdatedUtc: "2019-06-20 10:11:03", + } + assert.Equal(expectedTest, ssls[0]) + + expectedTest.ID="143617" + expectedTest.LastUpdatedUtc="2019-06-20 10:23:20" + assert.Equal(expectedTest, ssls[2]) + + expectedTest.ID="143616" + expectedTest.LastUpdatedUtc="2019-06-20 10:23:14" + mixed["type"]="img" + mixed["src"]="http://example.com/image.gif" + expectedTest.MixedContent=[]map[string]string{mixed} + expectedTest.ContactGroupsC="12,13,34" + expectedTest.ContactGroups=[]string{"12","13","34"} + assert.Equal(expectedTest, ssls[1]) +} + +func TestSsls_Detail_OK(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "sslListAllOk.json", + } + tt := NewSsls(c) + + ssl, err := tt.Detail("143616") + require.Nil(err) + assert.Equal("/SSL", c.sentRequestPath) + assert.Equal("GET", c.sentRequestMethod) + assert.Nil(c.sentRequestValues) + + mixed := make(map[string]string) + flags := make(map[string]bool) + + mixed["type"]="img" + mixed["src"]="http://example.com/image.gif" + + flags["is_extended"] = false + flags["has_pfs"] = true + flags["is_broken"] = false + flags["is_expired"] = false + flags["is_missing"] = false + flags["is_revoked"] = false + flags["has_mixed"] = false + expectedTest := &Ssl{ + ID: "143616", + Checkrate: 2073600, + Paused: false, + Domain: "https://www.exemple.com", + IssuerCn: "Let's Encrypt Authority X3", + CertScore: "95", + CipherScore: "100", + CertStatus: "CERT_OK", + Cipher: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + ValidFromUtc: "2019-05-28 01:22:00", + ValidUntilUtc: "2019-08-26 01:22:00", + MixedContent: []map[string]string{mixed}, + Flags: flags, + ContactGroups: []string{"12","13","34"}, + ContactGroupsC: "12,13,34", + AlertAt: "7,18,2019", + LastReminder: 2019, + AlertReminder: true, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + LastUpdatedUtc: "2019-06-20 10:23:14", + } + + assert.Equal(expectedTest, ssl) +} + +func TestSsls_CreatePartial_OK(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "sslCreateOk.json", + } + tt := NewSsls(c) + partial := &PartialSsl{ + Domain: "https://www.exemple.com", + Checkrate: "2073600", + ContactGroupsC: "", + AlertReminder: true, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + AlertAt: "7,18,2019", + } + expectedRes := &PartialSsl { + ID: 143616, + Domain: "https://www.exemple.com", + Checkrate: "2073600", + ContactGroupsC: "", + AlertReminder: true, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + AlertAt: "7,18,2019", + } + res, err := tt.CreatePartial(partial) + require.Nil(err) + assert.Equal("/SSL/Update", c.sentRequestPath) + assert.Equal("PUT", c.sentRequestMethod) + assert.Equal(c.sentRequestValues,url.Values(url.Values{"domain":[]string{"https://www.exemple.com"}, "checkrate":[]string{"2073600"}, "contact_groups":[]string{""}, "alert_at":[]string{"7,18,2019"}, "alert_expiry":[]string{"true"}, "alert_reminder":[]string{"true"}, "alert_broken":[]string{"true"}, "alert_mixed":[]string{"true"}})) + + assert.Equal(expectedRes, res) +} + +func TestSsls_UpdatePartial_OK(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "sslUpdateOk.json", + } + tt := NewSsls(c) + partial := &PartialSsl{ + ID: 143616, + Domain: "https://www.exemple.com", + Checkrate: "2073600", + ContactGroupsC: "", + AlertReminder: false, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + AlertAt: "7,18,2019", + } + expectedRes := &PartialSsl { + ID: 143616, + Domain: "https://www.exemple.com", + Checkrate: "2073600", + ContactGroupsC: "", + AlertReminder: false, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + AlertAt: "7,18,2019", + } + res, err := tt.UpdatePartial(partial) + require.Nil(err) + assert.Equal(expectedRes, res) + assert.Equal("/SSL/Update", c.sentRequestPath) + assert.Equal("PUT", c.sentRequestMethod) + assert.Equal(c.sentRequestValues,url.Values(url.Values{"id":[]string{"143616"},"domain":[]string{"https://www.exemple.com"}, "checkrate":[]string{"2073600"}, "contact_groups":[]string{""}, "alert_at":[]string{"7,18,2019"}, "alert_expiry":[]string{"true"}, "alert_reminder":[]string{"false"}, "alert_broken":[]string{"true"}, "alert_mixed":[]string{"true"}})) +} + +func TestSsl_complete_OK(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "sslListAllOk.json", + } + tt := NewSsls(c) + + partial := &PartialSsl { + ID: 143616, + Domain: "https://www.exemple.com", + Checkrate: "2073600", + ContactGroupsC: "12,13,34", + AlertReminder: true, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + AlertAt: "7,18,2019", + } + full, err := tt.completeSsl(partial) + require.Nil(err) + mixed := make(map[string]string) + flags := make(map[string]bool) + + mixed["type"]="img" + mixed["src"]="http://example.com/image.gif" + + flags["is_extended"] = false + flags["has_pfs"] = true + flags["is_broken"] = false + flags["is_expired"] = false + flags["is_missing"] = false + flags["is_revoked"] = false + flags["has_mixed"] = false + expectedTest := &Ssl{ + ID: "143616", + Checkrate: 2073600, + Paused: false, + Domain: "https://www.exemple.com", + IssuerCn: "Let's Encrypt Authority X3", + CertScore: "95", + CipherScore: "100", + CertStatus: "CERT_OK", + Cipher: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + ValidFromUtc: "2019-05-28 01:22:00", + ValidUntilUtc: "2019-08-26 01:22:00", + MixedContent: []map[string]string{mixed}, + Flags: flags, + ContactGroups: []string{"12","13","34"}, + ContactGroupsC: "12,13,34", + AlertAt: "7,18,2019", + LastReminder: 2019, + AlertReminder: true, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + LastUpdatedUtc: "2019-06-20 10:23:14", + } + + assert.Equal(expectedTest, full) + +} + +func TestSsl_partial_OK(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + mixed := make(map[string]string) + flags := make(map[string]bool) + + mixed["type"]="img" + mixed["src"]="http://example.com/image.gif" + + flags["is_extended"] = false + flags["has_pfs"] = true + flags["is_broken"] = false + flags["is_expired"] = false + flags["is_missing"] = false + flags["is_revoked"] = false + flags["has_mixed"] = false + full := &Ssl{ + ID: "143616", + Checkrate: 2073600, + Paused: false, + Domain: "https://www.exemple.com", + IssuerCn: "Let's Encrypt Authority X3", + CertScore: "95", + CipherScore: "100", + CertStatus: "CERT_OK", + Cipher: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + ValidFromUtc: "2019-05-28 01:22:00", + ValidUntilUtc: "2019-08-26 01:22:00", + MixedContent: []map[string]string{mixed}, + Flags: flags, + ContactGroups: []string{"12","13","34"}, + ContactGroupsC: "12,13,34", + AlertAt: "7,18,2019", + LastReminder: 2019, + AlertReminder: true, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + LastUpdatedUtc: "2019-06-20 10:23:14", + } + expectedTest:=&PartialSsl { + ID: 143616, + Domain: "https://www.exemple.com", + Checkrate: "2073600", + ContactGroupsC: "12,13,34", + AlertReminder: true, + AlertExpiry: true, + AlertBroken: true, + AlertMixed: true, + AlertAt: "7,18,2019", + } + partial,err:=Partial(full) + require.Nil(err) + assert.Equal(expectedTest, partial) + +} + +func TestSsls_Delete_OK(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "sslDeleteOk.json", + } + tt := NewSsls(c) + + err := tt.Delete("143616") + require.Nil(err) + assert.Equal("/SSL/Update", c.sentRequestPath) + assert.Equal("DELETE", c.sentRequestMethod) + assert.Equal(c.sentRequestValues,url.Values(url.Values{"id":[]string{"143616"},},)) +} diff --git a/vendor/github.com/DreamItGetIT/statuscake/tests_test.go b/vendor/github.com/DreamItGetIT/statuscake/tests_test.go new file mode 100644 index 0000000..efeb720 --- /dev/null +++ b/vendor/github.com/DreamItGetIT/statuscake/tests_test.go @@ -0,0 +1,422 @@ +package statuscake + +import ( + "bytes" + "encoding/json" + "io/ioutil" + "log" + "net/http" + "net/url" + "os" + "path/filepath" + "strings" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestTest_Validate(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + test := &Test{ + Timeout: 200, + Confirmation: 100, + Public: 200, + Virus: 200, + TestType: "FTP", + RealBrowser: 100, + TriggerRate: 100, + CheckRate: 100000, + CustomHeader: "here be dragons", + WebsiteName: "", + WebsiteURL: "", + } + + err := test.Validate() + require.NotNil(err) + + message := err.Error() + assert.Contains(message, "WebsiteName is required") + assert.Contains(message, "WebsiteURL is required") + assert.Contains(message, "Timeout must be 0 or between 6 and 99") + assert.Contains(message, "Confirmation must be between 0 and 9") + assert.Contains(message, "CheckRate must be between 0 and 23999") + assert.Contains(message, "Public must be 0 or 1") + assert.Contains(message, "Virus must be 0 or 1") + assert.Contains(message, "TestType must be HTTP, TCP, or PING") + assert.Contains(message, "RealBrowser must be 0 or 1") + assert.Contains(message, "TriggerRate must be between 0 and 59") + assert.Contains(message, "CustomHeader must be provided as json string") + + test.Timeout = 10 + test.Confirmation = 2 + test.Public = 1 + test.Virus = 1 + test.TestType = "HTTP" + test.RealBrowser = 1 + test.TriggerRate = 50 + test.CheckRate = 10 + test.WebsiteName = "Foo" + test.WebsiteURL = "http://example.com" + test.CustomHeader = `{"test": 15}` + test.NodeLocations = []string{"foo", "bar"} + + err = test.Validate() + assert.Nil(err) +} + +func TestTest_ToURLValues(t *testing.T) { + assert := assert.New(t) + + test := &Test{ + TestID: 123, + Paused: true, + WebsiteName: "Foo Bar", + CustomHeader: `{"some":{"json": ["value"]}}`, + WebsiteURL: "http://example.com", + Port: 3000, + NodeLocations: []string{"foo", "bar"}, + Timeout: 11, + PingURL: "http://example.com/ping", + Confirmation: 1, + CheckRate: 500, + BasicUser: "myuser", + BasicPass: "mypass", + Public: 1, + LogoImage: "http://example.com/logo.jpg", + Branding: 1, + WebsiteHost: "hoster", + Virus: 1, + FindString: "hello", + DoNotFind: true, + TestType: "HTTP", + RealBrowser: 1, + TriggerRate: 50, + TestTags: []string{"tag1", "tag2"}, + StatusCodes: "500", + EnableSSLAlert: false, + FollowRedirect: false, + } + + expected := url.Values{ + "TestID": {"123"}, + "Paused": {"1"}, + "WebsiteName": {"Foo Bar"}, + "WebsiteURL": {"http://example.com"}, + "CustomHeader": {`{"some":{"json": ["value"]}}`}, + "Port": {"3000"}, + "NodeLocations": {"foo,bar"}, + "Timeout": {"11"}, + "PingURL": {"http://example.com/ping"}, + "ContactGroup": {""}, + "Confirmation": {"1"}, + "CheckRate": {"500"}, + "BasicUser": {"myuser"}, + "BasicPass": {"mypass"}, + "Public": {"1"}, + "LogoImage": {"http://example.com/logo.jpg"}, + "Branding": {"1"}, + "WebsiteHost": {"hoster"}, + "Virus": {"1"}, + "FindString": {"hello"}, + "DoNotFind": {"1"}, + "TestType": {"HTTP"}, + "RealBrowser": {"1"}, + "TriggerRate": {"50"}, + "TestTags": {"tag1,tag2"}, + "StatusCodes": {"500"}, + "UseJar": {"0"}, + "PostRaw": {""}, + "FinalEndpoint": {""}, + "EnableSSLAlert": {"0"}, + "FollowRedirect": {"0"}, + } + + assert.Equal(expected, test.ToURLValues()) + + test.TestID = 0 + delete(expected, "TestID") + + assert.Equal(expected.Encode(), test.ToURLValues().Encode()) +} + +func TestTests_All(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "tests_all_ok.json", + } + tt := newTests(c) + tests, err := tt.All() + require.Nil(err) + + assert.Equal("/Tests", c.sentRequestPath) + assert.Equal("GET", c.sentRequestMethod) + assert.Nil(c.sentRequestValues) + assert.Len(tests, 2) + + expectedTest := &Test{ + TestID: 100, + Paused: false, + TestType: "HTTP", + WebsiteName: "www 1", + ContactGroup: []string{"1"}, + Status: "Up", + Uptime: 100, + NodeLocations: []string{"foo", "bar"}, + } + assert.Equal(expectedTest, tests[0]) + + expectedTest = &Test{ + TestID: 101, + Paused: true, + TestType: "HTTP", + WebsiteName: "www 2", + ContactGroup: []string{"2"}, + Status: "Down", + Uptime: 0, + NodeLocations: []string{"foo"}, + TestTags: []string{"test1", "test2"}, + } + assert.Equal(expectedTest, tests[1]) +} + +func TestTests_AllWithFilter(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "tests_all_ok.json", + } + + v := url.Values{} + v.Set("tags", "test1,test2") + tt := newTests(c) + tests, err := tt.AllWithFilter(v) + require.Nil(err) + + assert.Equal("/Tests", c.sentRequestPath) + assert.Equal("GET", c.sentRequestMethod) + assert.NotNil(c.sentRequestValues) + assert.Len(tests, 1) + + expectedTest := &Test{ + TestID: 101, + Paused: true, + TestType: "HTTP", + WebsiteName: "www 2", + ContactGroup: []string{"2"}, + Status: "Down", + Uptime: 0, + NodeLocations: []string{"foo"}, + TestTags: []string{"test1", "test2"}, + } + assert.Equal(expectedTest, tests[0]) +} + +func TestTests_Update_OK(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "tests_update_ok.json", + } + tt := newTests(c) + + test1 := &Test{ + WebsiteName: "foo", + } + + test2, err := tt.Update(test1) + require.Nil(err) + + assert.Equal("/Tests/Update", c.sentRequestPath) + assert.Equal("PUT", c.sentRequestMethod) + assert.NotNil(c.sentRequestValues) + assert.NotNil(test2) + + assert.Equal(1234, test2.TestID) +} + +func TestTests_Update_Error(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "tests_update_error.json", + } + tt := newTests(c) + + test1 := &Test{ + WebsiteName: "foo", + } + + test2, err := tt.Update(test1) + assert.Nil(test2) + + require.NotNil(err) + assert.IsType(&updateError{}, err) + assert.Contains(err.Error(), "issue a") +} + +func TestTests_Update_ErrorWithSliceOfIssues(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "tests_update_error_slice_of_issues.json", + } + tt := newTests(c) + + test1 := &Test{ + WebsiteName: "foo", + } + + test2, err := tt.Update(test1) + assert.Nil(test2) + + require.NotNil(err) + assert.IsType(&updateError{}, err) + assert.Equal("Required Data is Missing., hello, world", err.Error()) +} + +func TestTests_Delete_OK(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "tests_delete_ok.json", + } + tt := newTests(c) + + err := tt.Delete(1234) + require.Nil(err) + + assert.Equal("/Tests/Details", c.sentRequestPath) + assert.Equal("DELETE", c.sentRequestMethod) + assert.Equal(url.Values{"TestID": {"1234"}}, c.sentRequestValues) +} + +func TestTests_Delete_Error(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "tests_delete_error.json", + } + tt := newTests(c) + + err := tt.Delete(1234) + require.NotNil(err) + assert.Equal("this is an error", err.Error()) +} + +func TestTests_Detail_OK(t *testing.T) { + assert := assert.New(t) + require := require.New(t) + + c := &fakeAPIClient{ + fixture: "tests_detail_ok.json", + } + tt := newTests(c) + + test, err := tt.Detail(1234) + require.Nil(err) + + assert.Equal("/Tests/Details", c.sentRequestPath) + assert.Equal("GET", c.sentRequestMethod) + assert.Equal(url.Values{"TestID": {"1234"}}, c.sentRequestValues) + + assert.Equal(test.TestID, 6735) + assert.Equal(test.TestType, "HTTP") + assert.Equal(test.Paused, false) + assert.Equal(test.WebsiteName, "NL") + assert.Equal(test.CustomHeader, `{"some":{"json": ["value"]}}`) + assert.Equal(test.UserAgent, "product/version (comment)") + assert.Equal(test.ContactGroup, []string{"536"}) + assert.Equal(test.Status, "Up") + assert.Equal(test.Uptime, 0.0) + assert.Equal(test.CheckRate, 60) + assert.Equal(test.Timeout, 40) + assert.Equal(test.LogoImage, "") + assert.Equal(test.WebsiteHost, "Various") + assert.Equal(test.FindString, "") + assert.Equal(test.DoNotFind, false) + assert.Equal(test.NodeLocations, []string{"foo", "bar"}) +} + +type fakeAPIClient struct { + sentRequestPath string + sentRequestMethod string + sentRequestValues url.Values + fixture string +} + +func (c *fakeAPIClient) put(path string, v url.Values) (*http.Response, error) { + return c.all("PUT", path, v) +} + +func (c *fakeAPIClient) delete(path string, v url.Values) (*http.Response, error) { + return c.all("DELETE", path, v) +} + +func (c *fakeAPIClient) get(path string, v url.Values) (*http.Response, error) { + return c.all("GET", path, v) +} + +func (c *fakeAPIClient) all(method string, path string, v url.Values) (*http.Response, error) { + c.sentRequestMethod = method + c.sentRequestPath = path + c.sentRequestValues = v + + p := filepath.Join("fixtures", c.fixture) + f, err := os.Open(p) + if err != nil { + log.Fatal(err) + } + + var resp *http.Response + if len(c.sentRequestValues.Get("tags")) > 0 { + var storedResponses []Test + var returnResponses []Test + byteValue, _ := ioutil.ReadAll(f) + json.Unmarshal(byteValue, &storedResponses) + requestedTags := strings.Split(c.sentRequestValues.Get("tags"), ",") + + for _, storedResponse := range storedResponses { + if len(requestedTags) > len(storedResponse.TestTags) { // if we are requesting more tags than whats stored then there are no matches + continue + } + + match := true + for i, tag := range requestedTags { + if tag != storedResponse.TestTags[i] { + match = false + } + } + + if match { // we can add it to the response now + returnResponses = append(returnResponses, storedResponse) + } + } + + if len(returnResponses) == 0 { + return nil, nil + } + + newByteValue, _ := json.Marshal(&returnResponses) + resp = &http.Response{ + Body: ioutil.NopCloser(bytes.NewBuffer(newByteValue)), + } + + } else { + resp = &http.Response{ + Body: f, + } + } + + return resp, nil +} -- cgit v1.2.3 From 1a77fed162947c5e49268edc216e080a35ef42a5 Mon Sep 17 00:00:00 2001 From: Alexandre Garand Date: Thu, 27 Jun 2019 14:25:03 +0200 Subject: add go-querystring --- vendor/github.com/google/go-querystring/.gitignore | 1 + .../github.com/google/go-querystring/.travis.yml | 5 + .../google/go-querystring/CONTRIBUTING.md | 67 +++++ vendor/github.com/google/go-querystring/LICENSE | 27 ++ vendor/github.com/google/go-querystring/README.md | 37 +++ vendor/github.com/google/go-querystring/go.mod | 1 + .../google/go-querystring/query/encode.go | 320 ++++++++++++++++++++ .../google/go-querystring/query/encode_test.go | 328 +++++++++++++++++++++ 8 files changed, 786 insertions(+) create mode 100644 vendor/github.com/google/go-querystring/.gitignore create mode 100644 vendor/github.com/google/go-querystring/.travis.yml create mode 100644 vendor/github.com/google/go-querystring/CONTRIBUTING.md create mode 100644 vendor/github.com/google/go-querystring/LICENSE create mode 100644 vendor/github.com/google/go-querystring/README.md create mode 100644 vendor/github.com/google/go-querystring/go.mod create mode 100644 vendor/github.com/google/go-querystring/query/encode.go create mode 100644 vendor/github.com/google/go-querystring/query/encode_test.go (limited to 'vendor') diff --git a/vendor/github.com/google/go-querystring/.gitignore b/vendor/github.com/google/go-querystring/.gitignore new file mode 100644 index 0000000..9ed3b07 --- /dev/null +++ b/vendor/github.com/google/go-querystring/.gitignore @@ -0,0 +1 @@ +*.test diff --git a/vendor/github.com/google/go-querystring/.travis.yml b/vendor/github.com/google/go-querystring/.travis.yml new file mode 100644 index 0000000..881d087 --- /dev/null +++ b/vendor/github.com/google/go-querystring/.travis.yml @@ -0,0 +1,5 @@ +language: go + +go: + - 1.x + - 1.11.x diff --git a/vendor/github.com/google/go-querystring/CONTRIBUTING.md b/vendor/github.com/google/go-querystring/CONTRIBUTING.md new file mode 100644 index 0000000..51cf5cd --- /dev/null +++ b/vendor/github.com/google/go-querystring/CONTRIBUTING.md @@ -0,0 +1,67 @@ +# How to contribute # + +We'd love to accept your patches and contributions to this project. There are +a just a few small guidelines you need to follow. + + +## Contributor License Agreement ## + +Contributions to any Google project must be accompanied by a Contributor +License Agreement. This is not a copyright **assignment**, it simply gives +Google permission to use and redistribute your contributions as part of the +project. + + * If you are an individual writing original source code and you're sure you + own the intellectual property, then you'll need to sign an [individual + CLA][]. + + * If you work for a company that wants to allow you to contribute your work, + then you'll need to sign a [corporate CLA][]. + +You generally only need to submit a CLA once, so if you've already submitted +one (even if it was for a different project), you probably don't need to do it +again. + +[individual CLA]: https://developers.google.com/open-source/cla/individual +[corporate CLA]: https://developers.google.com/open-source/cla/corporate + + +## Submitting a patch ## + + 1. It's generally best to start by opening a new issue describing the bug or + feature you're intending to fix. Even if you think it's relatively minor, + it's helpful to know what people are working on. Mention in the initial + issue that you are planning to work on that bug or feature so that it can + be assigned to you. + + 1. Follow the normal process of [forking][] the project, and setup a new + branch to work in. It's important that each group of changes be done in + separate branches in order to ensure that a pull request only includes the + commits related to that bug or feature. + + 1. Go makes it very simple to ensure properly formatted code, so always run + `go fmt` on your code before committing it. You should also run + [golint][] over your code. As noted in the [golint readme][], it's not + strictly necessary that your code be completely "lint-free", but this will + help you find common style issues. + + 1. Any significant changes should almost always be accompanied by tests. The + project already has good test coverage, so look at some of the existing + tests if you're unsure how to go about it. [gocov][] and [gocov-html][] + are invaluable tools for seeing which parts of your code aren't being + exercised by your tests. + + 1. Do your best to have [well-formed commit messages][] for each change. + This provides consistency throughout the project, and ensures that commit + messages are able to be formatted properly by various git tools. + + 1. Finally, push the commits to your fork and submit a [pull request][]. + +[forking]: https://help.github.com/articles/fork-a-repo +[golint]: https://github.com/golang/lint +[golint readme]: https://github.com/golang/lint/blob/master/README +[gocov]: https://github.com/axw/gocov +[gocov-html]: https://github.com/matm/gocov-html +[well-formed commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html +[squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits +[pull request]: https://help.github.com/articles/creating-a-pull-request diff --git a/vendor/github.com/google/go-querystring/LICENSE b/vendor/github.com/google/go-querystring/LICENSE new file mode 100644 index 0000000..ae121a1 --- /dev/null +++ b/vendor/github.com/google/go-querystring/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2013 Google. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/google/go-querystring/README.md b/vendor/github.com/google/go-querystring/README.md new file mode 100644 index 0000000..0e600be --- /dev/null +++ b/vendor/github.com/google/go-querystring/README.md @@ -0,0 +1,37 @@ +# go-querystring # + +[![GoDoc](https://godoc.org/github.com/google/go-querystring/query?status.svg)](https://godoc.org/github.com/google/go-querystring/query) [![Build Status](https://travis-ci.org/google/go-querystring.svg?branch=master)](https://travis-ci.org/google/go-querystring) + +go-querystring is Go library for encoding structs into URL query parameters. + +## Usage ## + +```go +import "github.com/google/go-querystring/query" +``` + +go-querystring is designed to assist in scenarios where you want to construct a +URL using a struct that represents the URL query parameters. You might do this +to enforce the type safety of your parameters, for example, as is done in the +[go-github][] library. + +The query package exports a single `Values()` function. A simple example: + +```go +type Options struct { + Query string `url:"q"` + ShowAll bool `url:"all"` + Page int `url:"page"` +} + +opt := Options{ "foo", true, 2 } +v, _ := query.Values(opt) +fmt.Print(v.Encode()) // will output: "q=foo&all=true&page=2" +``` + +[go-github]: https://github.com/google/go-github/commit/994f6f8405f052a117d2d0b500054341048fbb08 + +## License ## + +This library is distributed under the BSD-style license found in the [LICENSE](./LICENSE) +file. diff --git a/vendor/github.com/google/go-querystring/go.mod b/vendor/github.com/google/go-querystring/go.mod new file mode 100644 index 0000000..45dca2d --- /dev/null +++ b/vendor/github.com/google/go-querystring/go.mod @@ -0,0 +1 @@ +module github.com/google/go-querystring diff --git a/vendor/github.com/google/go-querystring/query/encode.go b/vendor/github.com/google/go-querystring/query/encode.go new file mode 100644 index 0000000..37080b1 --- /dev/null +++ b/vendor/github.com/google/go-querystring/query/encode.go @@ -0,0 +1,320 @@ +// Copyright 2013 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package query implements encoding of structs into URL query parameters. +// +// As a simple example: +// +// type Options struct { +// Query string `url:"q"` +// ShowAll bool `url:"all"` +// Page int `url:"page"` +// } +// +// opt := Options{ "foo", true, 2 } +// v, _ := query.Values(opt) +// fmt.Print(v.Encode()) // will output: "q=foo&all=true&page=2" +// +// The exact mapping between Go values and url.Values is described in the +// documentation for the Values() function. +package query + +import ( + "bytes" + "fmt" + "net/url" + "reflect" + "strconv" + "strings" + "time" +) + +var timeType = reflect.TypeOf(time.Time{}) + +var encoderType = reflect.TypeOf(new(Encoder)).Elem() + +// Encoder is an interface implemented by any type that wishes to encode +// itself into URL values in a non-standard way. +type Encoder interface { + EncodeValues(key string, v *url.Values) error +} + +// Values returns the url.Values encoding of v. +// +// Values expects to be passed a struct, and traverses it recursively using the +// following encoding rules. +// +// Each exported struct field is encoded as a URL parameter unless +// +// - the field's tag is "-", or +// - the field is empty and its tag specifies the "omitempty" option +// +// The empty values are false, 0, any nil pointer or interface value, any array +// slice, map, or string of length zero, and any time.Time that returns true +// for IsZero(). +// +// The URL parameter name defaults to the struct field name but can be +// specified in the struct field's tag value. The "url" key in the struct +// field's tag value is the key name, followed by an optional comma and +// options. For example: +// +// // Field is ignored by this package. +// Field int `url:"-"` +// +// // Field appears as URL parameter "myName". +// Field int `url:"myName"` +// +// // Field appears as URL parameter "myName" and the field is omitted if +// // its value is empty +// Field int `url:"myName,omitempty"` +// +// // Field appears as URL parameter "Field" (the default), but the field +// // is skipped if empty. Note the leading comma. +// Field int `url:",omitempty"` +// +// For encoding individual field values, the following type-dependent rules +// apply: +// +// Boolean values default to encoding as the strings "true" or "false". +// Including the "int" option signals that the field should be encoded as the +// strings "1" or "0". +// +// time.Time values default to encoding as RFC3339 timestamps. Including the +// "unix" option signals that the field should be encoded as a Unix time (see +// time.Unix()) +// +// Slice and Array values default to encoding as multiple URL values of the +// same name. Including the "comma" option signals that the field should be +// encoded as a single comma-delimited value. Including the "space" option +// similarly encodes the value as a single space-delimited string. Including +// the "semicolon" option will encode the value as a semicolon-delimited string. +// Including the "brackets" option signals that the multiple URL values should +// have "[]" appended to the value name. "numbered" will append a number to +// the end of each incidence of the value name, example: +// name0=value0&name1=value1, etc. +// +// Anonymous struct fields are usually encoded as if their inner exported +// fields were fields in the outer struct, subject to the standard Go +// visibility rules. An anonymous struct field with a name given in its URL +// tag is treated as having that name, rather than being anonymous. +// +// Non-nil pointer values are encoded as the value pointed to. +// +// Nested structs are encoded including parent fields in value names for +// scoping. e.g: +// +// "user[name]=acme&user[addr][postcode]=1234&user[addr][city]=SFO" +// +// All other values are encoded using their default string representation. +// +// Multiple fields that encode to the same URL parameter name will be included +// as multiple URL values of the same name. +func Values(v interface{}) (url.Values, error) { + values := make(url.Values) + val := reflect.ValueOf(v) + for val.Kind() == reflect.Ptr { + if val.IsNil() { + return values, nil + } + val = val.Elem() + } + + if v == nil { + return values, nil + } + + if val.Kind() != reflect.Struct { + return nil, fmt.Errorf("query: Values() expects struct input. Got %v", val.Kind()) + } + + err := reflectValue(values, val, "") + return values, err +} + +// reflectValue populates the values parameter from the struct fields in val. +// Embedded structs are followed recursively (using the rules defined in the +// Values function documentation) breadth-first. +func reflectValue(values url.Values, val reflect.Value, scope string) error { + var embedded []reflect.Value + + typ := val.Type() + for i := 0; i < typ.NumField(); i++ { + sf := typ.Field(i) + if sf.PkgPath != "" && !sf.Anonymous { // unexported + continue + } + + sv := val.Field(i) + tag := sf.Tag.Get("url") + if tag == "-" { + continue + } + name, opts := parseTag(tag) + if name == "" { + if sf.Anonymous && sv.Kind() == reflect.Struct { + // save embedded struct for later processing + embedded = append(embedded, sv) + continue + } + + name = sf.Name + } + + if scope != "" { + name = scope + "[" + name + "]" + } + + if opts.Contains("omitempty") && isEmptyValue(sv) { + continue + } + + if sv.Type().Implements(encoderType) { + if !reflect.Indirect(sv).IsValid() { + sv = reflect.New(sv.Type().Elem()) + } + + m := sv.Interface().(Encoder) + if err := m.EncodeValues(name, &values); err != nil { + return err + } + continue + } + + if sv.Kind() == reflect.Slice || sv.Kind() == reflect.Array { + var del byte + if opts.Contains("comma") { + del = ',' + } else if opts.Contains("space") { + del = ' ' + } else if opts.Contains("semicolon") { + del = ';' + } else if opts.Contains("brackets") { + name = name + "[]" + } + + if del != 0 { + s := new(bytes.Buffer) + first := true + for i := 0; i < sv.Len(); i++ { + if first { + first = false + } else { + s.WriteByte(del) + } + s.WriteString(valueString(sv.Index(i), opts)) + } + values.Add(name, s.String()) + } else { + for i := 0; i < sv.Len(); i++ { + k := name + if opts.Contains("numbered") { + k = fmt.Sprintf("%s%d", name, i) + } + values.Add(k, valueString(sv.Index(i), opts)) + } + } + continue + } + + for sv.Kind() == reflect.Ptr { + if sv.IsNil() { + break + } + sv = sv.Elem() + } + + if sv.Type() == timeType { + values.Add(name, valueString(sv, opts)) + continue + } + + if sv.Kind() == reflect.Struct { + reflectValue(values, sv, name) + continue + } + + values.Add(name, valueString(sv, opts)) + } + + for _, f := range embedded { + if err := reflectValue(values, f, scope); err != nil { + return err + } + } + + return nil +} + +// valueString returns the string representation of a value. +func valueString(v reflect.Value, opts tagOptions) string { + for v.Kind() == reflect.Ptr { + if v.IsNil() { + return "" + } + v = v.Elem() + } + + if v.Kind() == reflect.Bool && opts.Contains("int") { + if v.Bool() { + return "1" + } + return "0" + } + + if v.Type() == timeType { + t := v.Interface().(time.Time) + if opts.Contains("unix") { + return strconv.FormatInt(t.Unix(), 10) + } + return t.Format(time.RFC3339) + } + + return fmt.Sprint(v.Interface()) +} + +// isEmptyValue checks if a value should be considered empty for the purposes +// of omitting fields with the "omitempty" option. +func isEmptyValue(v reflect.Value) bool { + switch v.Kind() { + case reflect.Array, reflect.Map, reflect.Slice, reflect.String: + return v.Len() == 0 + case reflect.Bool: + return !v.Bool() + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + return v.Int() == 0 + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + return v.Uint() == 0 + case reflect.Float32, reflect.Float64: + return v.Float() == 0 + case reflect.Interface, reflect.Ptr: + return v.IsNil() + } + + if v.Type() == timeType { + return v.Interface().(time.Time).IsZero() + } + + return false +} + +// tagOptions is the string following a comma in a struct field's "url" tag, or +// the empty string. It does not include the leading comma. +type tagOptions []string + +// parseTag splits a struct field's url tag into its name and comma-separated +// options. +func parseTag(tag string) (string, tagOptions) { + s := strings.Split(tag, ",") + return s[0], s[1:] +} + +// Contains checks whether the tagOptions contains the specified option. +func (o tagOptions) Contains(option string) bool { + for _, s := range o { + if s == option { + return true + } + } + return false +} diff --git a/vendor/github.com/google/go-querystring/query/encode_test.go b/vendor/github.com/google/go-querystring/query/encode_test.go new file mode 100644 index 0000000..77bea5a --- /dev/null +++ b/vendor/github.com/google/go-querystring/query/encode_test.go @@ -0,0 +1,328 @@ +// Copyright 2013 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package query + +import ( + "fmt" + "net/url" + "reflect" + "testing" + "time" +) + +type Nested struct { + A SubNested `url:"a"` + B *SubNested `url:"b"` + Ptr *SubNested `url:"ptr,omitempty"` +} + +type SubNested struct { + Value string `url:"value"` +} + +func TestValues_types(t *testing.T) { + str := "string" + strPtr := &str + timeVal := time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC) + + tests := []struct { + in interface{} + want url.Values + }{ + { + // basic primitives + struct { + A string + B int + C uint + D float32 + E bool + }{}, + url.Values{ + "A": {""}, + "B": {"0"}, + "C": {"0"}, + "D": {"0"}, + "E": {"false"}, + }, + }, + { + // pointers + struct { + A *string + B *int + C **string + D *time.Time + }{ + A: strPtr, + C: &strPtr, + D: &timeVal, + }, + url.Values{ + "A": {str}, + "B": {""}, + "C": {str}, + "D": {"2000-01-01T12:34:56Z"}, + }, + }, + { + // slices and arrays + struct { + A []string + B []string `url:",comma"` + C []string `url:",space"` + D [2]string + E [2]string `url:",comma"` + F [2]string `url:",space"` + G []*string `url:",space"` + H []bool `url:",int,space"` + I []string `url:",brackets"` + J []string `url:",semicolon"` + K []string `url:",numbered"` + }{ + A: []string{"a", "b"}, + B: []string{"a", "b"}, + C: []string{"a", "b"}, + D: [2]string{"a", "b"}, + E: [2]string{"a", "b"}, + F: [2]string{"a", "b"}, + G: []*string{&str, &str}, + H: []bool{true, false}, + I: []string{"a", "b"}, + J: []string{"a", "b"}, + K: []string{"a", "b"}, + }, + url.Values{ + "A": {"a", "b"}, + "B": {"a,b"}, + "C": {"a b"}, + "D": {"a", "b"}, + "E": {"a,b"}, + "F": {"a b"}, + "G": {"string string"}, + "H": {"1 0"}, + "I[]": {"a", "b"}, + "J": {"a;b"}, + "K0": {"a"}, + "K1": {"b"}, + }, + }, + { + // other types + struct { + A time.Time + B time.Time `url:",unix"` + C bool `url:",int"` + D bool `url:",int"` + }{ + A: time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC), + B: time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC), + C: true, + D: false, + }, + url.Values{ + "A": {"2000-01-01T12:34:56Z"}, + "B": {"946730096"}, + "C": {"1"}, + "D": {"0"}, + }, + }, + { + struct { + Nest Nested `url:"nest"` + }{ + Nested{ + A: SubNested{ + Value: "that", + }, + }, + }, + url.Values{ + "nest[a][value]": {"that"}, + "nest[b]": {""}, + }, + }, + { + struct { + Nest Nested `url:"nest"` + }{ + Nested{ + Ptr: &SubNested{ + Value: "that", + }, + }, + }, + url.Values{ + "nest[a][value]": {""}, + "nest[b]": {""}, + "nest[ptr][value]": {"that"}, + }, + }, + { + nil, + url.Values{}, + }, + } + + for i, tt := range tests { + v, err := Values(tt.in) + if err != nil { + t.Errorf("%d. Values(%q) returned error: %v", i, tt.in, err) + } + + if !reflect.DeepEqual(tt.want, v) { + t.Errorf("%d. Values(%q) returned %v, want %v", i, tt.in, v, tt.want) + } + } +} + +func TestValues_omitEmpty(t *testing.T) { + str := "" + s := struct { + a string + A string + B string `url:",omitempty"` + C string `url:"-"` + D string `url:"omitempty"` // actually named omitempty, not an option + E *string `url:",omitempty"` + }{E: &str} + + v, err := Values(s) + if err != nil { + t.Errorf("Values(%v) returned error: %v", s, err) + } + + want := url.Values{ + "A": {""}, + "omitempty": {""}, + "E": {""}, // E is included because the pointer is not empty, even though the string being pointed to is + } + if !reflect.DeepEqual(want, v) { + t.Errorf("Values(%v) returned %v, want %v", s, v, want) + } +} + +type A struct { + B +} + +type B struct { + C string +} + +type D struct { + B + C string +} + +type e struct { + B + C string +} + +type F struct { + e +} + +func TestValues_embeddedStructs(t *testing.T) { + tests := []struct { + in interface{} + want url.Values + }{ + { + A{B{C: "foo"}}, + url.Values{"C": {"foo"}}, + }, + { + D{B: B{C: "bar"}, C: "foo"}, + url.Values{"C": {"foo", "bar"}}, + }, + { + F{e{B: B{C: "bar"}, C: "foo"}}, // With unexported embed + url.Values{"C": {"foo", "bar"}}, + }, + } + + for i, tt := range tests { + v, err := Values(tt.in) + if err != nil { + t.Errorf("%d. Values(%q) returned error: %v", i, tt.in, err) + } + + if !reflect.DeepEqual(tt.want, v) { + t.Errorf("%d. Values(%q) returned %v, want %v", i, tt.in, v, tt.want) + } + } +} + +func TestValues_invalidInput(t *testing.T) { + _, err := Values("") + if err == nil { + t.Errorf("expected Values() to return an error on invalid input") + } +} + +type EncodedArgs []string + +func (m EncodedArgs) EncodeValues(key string, v *url.Values) error { + for i, arg := range m { + v.Set(fmt.Sprintf("%s.%d", key, i), arg) + } + return nil +} + +func TestValues_Marshaler(t *testing.T) { + s := struct { + Args EncodedArgs `url:"arg"` + }{[]string{"a", "b", "c"}} + v, err := Values(s) + if err != nil { + t.Errorf("Values(%q) returned error: %v", s, err) + } + + want := url.Values{ + "arg.0": {"a"}, + "arg.1": {"b"}, + "arg.2": {"c"}, + } + if !reflect.DeepEqual(want, v) { + t.Errorf("Values(%q) returned %v, want %v", s, v, want) + } +} + +func TestValues_MarshalerWithNilPointer(t *testing.T) { + s := struct { + Args *EncodedArgs `url:"arg"` + }{} + v, err := Values(s) + if err != nil { + t.Errorf("Values(%v) returned error: %v", s, err) + } + + want := url.Values{} + if !reflect.DeepEqual(want, v) { + t.Errorf("Values(%v) returned %v, want %v", s, v, want) + } +} + +func TestTagParsing(t *testing.T) { + name, opts := parseTag("field,foobar,foo") + if name != "field" { + t.Fatalf("name = %q, want field", name) + } + for _, tt := range []struct { + opt string + want bool + }{ + {"foobar", true}, + {"foo", true}, + {"bar", false}, + {"field", false}, + } { + if opts.Contains(tt.opt) != tt.want { + t.Errorf("Contains(%q) = %v", tt.opt, !tt.want) + } + } +} -- cgit v1.2.3 From 7899b1039403821c5d03eff95e0e58fdbafe1f0a Mon Sep 17 00:00:00 2001 From: Alexandre Garand Date: Thu, 27 Jun 2019 15:32:22 +0200 Subject: Update go modules dependencies --- vendor/modules.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'vendor') diff --git a/vendor/modules.txt b/vendor/modules.txt index b1009a7..d93cd37 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -6,7 +6,7 @@ cloud.google.com/go/internal/optional cloud.google.com/go/internal/trace cloud.google.com/go/internal/version cloud.google.com/go/compute/metadata -# github.com/DreamItGetIT/statuscake v0.0.0-20190218105717-471b24d8edfb +# github.com/DreamItGetIT/statuscake v0.0.0-20190625125909-fc745efe187b github.com/DreamItGetIT/statuscake # github.com/agext/levenshtein v1.2.2 github.com/agext/levenshtein @@ -73,6 +73,8 @@ github.com/google/go-cmp/cmp github.com/google/go-cmp/cmp/internal/diff github.com/google/go-cmp/cmp/internal/function github.com/google/go-cmp/cmp/internal/value +# github.com/google/go-querystring v1.0.0 +github.com/google/go-querystring/query # github.com/googleapis/gax-go/v2 v2.0.3 github.com/googleapis/gax-go/v2 # github.com/hashicorp/errwrap v1.0.0 -- cgit v1.2.3