chore: Updated license header to 2019; command/client.go: Separated l…

…ogic for creating new Consul client into its own file; .drone.yml: Deleted since no longer using drone
morningconsult · Jan 9, 2019 · 08a272c · 08a272c
1 parent 86ab09b
commit 08a272c
Show file tree

Hide file tree

Showing 35 changed files with 45 additions and 85 deletions.
diff --git a/.drone.yml b/.drone.yml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+# Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You may
 # not use this file except in compliance with the License. A copy of the

diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
-
-# Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+# Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You may
 # not use this file except in compliance with the License. A copy of the

diff --git a/ci/build-release.sh b/ci/build-release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+# Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You may
 # not use this file except in compliance with the License. A copy of the

diff --git a/ci/run-tests.sh b/ci/run-tests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+# Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You may
 # not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/alert.go b/command/alert/alert.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/alert_test.go b/command/alert/alert_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the
@@ -14,12 +14,13 @@
 package alert
 
 import (
+ "bytes"
  "context"
  "fmt"
  "io"
- // "io/ioutil"
  "os"
  "path/filepath"
+ "strings"
  "sync"
  "testing"
  "time"
@@ -177,8 +178,12 @@ func TestRunError(t *testing.T) {
 
  ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 
+ buf := new(bytes.Buffer)
+ logger := hclog.New(&hclog.LoggerOptions{
+ Output: buf,
+ })
  ah := NewAlertHandler(&AlertHandlerConfig{
- Logger: hclog.Default(),
+ Logger: logger,
  })
 
  em := &errorAlertMethod{}
@@ -223,6 +228,10 @@ func TestRunError(t *testing.T) {
  time.Sleep(10 * time.Second)
 
  // Should attempt to execute Write() 3 times (see logs)
+ expected := `[ERROR] [Alert Handler] error returned by alert function: error="test error" remaining_retries=0`
+ if !strings.Contains(buf.String(), expected) {
+ t.Fatalf("Expected errors to contain:\n\t%s\nGot:\n\t%s", expected, buf.String())
+ }
 }
 
 func randomUUID(t *testing.T) string {

diff --git a/command/alert/email/email.go b/command/alert/email/email.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/email/email_test.go b/command/alert/email/email_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/file/file.go b/command/alert/file/file.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/file/file_test.go b/command/alert/file/file_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/inventory.go b/command/alert/inventory.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/inventory_test.go b/command/alert/inventory_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/slack/attachment.go b/command/alert/slack/attachment.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/slack/slack.go b/command/alert/slack/slack.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/alert/slack/slack_test.go b/command/alert/slack/slack_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/command.go b/command/command.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the
@@ -18,10 +18,8 @@ import (
  "fmt"
  "os"
  "os/signal"
- "strings"
  "syscall"
 
- "github.com/hashicorp/consul/api"
  "github.com/hashicorp/go-hclog"
  "github.com/morningconsult/go-elasticsearch-alerts/command/alert"
  "github.com/morningconsult/go-elasticsearch-alerts/config"
@@ -204,29 +202,3 @@ func makeReloadCh(ctx context.Context) chan struct{} {
  }()
  return resultCh
 }
-
-func newConsulClient(config map[string]string) (*api.Client, error) {
- consulEnvVars := []string{
- api.HTTPAddrEnvName,
- api.HTTPTokenEnvName,
- api.HTTPSSLEnvName,
- api.HTTPCAFile,
- api.HTTPCAPath,
- api.HTTPClientCert,
- api.HTTPClientKey,
- api.HTTPTLSServerName,
- api.HTTPSSLVerifyEnvName,
- }
-
- for _, env := range consulEnvVars {
- v, ok := config[env]
- if !ok {
- v, ok = config[strings.ToLower(env)]
- }
- if ok && v != "" && os.Getenv(env) == "" {
- os.Setenv(env, v)
- defer os.Unsetenv(env)
- }
- }
- return api.NewClient(&api.Config{})
-}
diff --git a/command/controller.go b/command/controller.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/handlers.go b/command/handlers.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/query/job.go b/command/query/job.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/query/job_test.go b/command/query/job_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/query/transform.go b/command/query/transform.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/command/query/transform_test.go b/command/query/transform_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/config/client.go b/config/client.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/config/client_test.go b/config/client_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/config/parse.go b/config/parse.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/config/parse_test.go b/config/parse_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/main.go b/main.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/scripts/build-binary.sh b/scripts/build-binary.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+# Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You may
 # not use this file except in compliance with the License. A copy of the

diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+# Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You may
 # not use this file except in compliance with the License. A copy of the

diff --git a/scripts/update-deps.sh b/scripts/update-deps.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+# Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You may
 # not use this file except in compliance with the License. A copy of the

diff --git a/utils/lock/lock.go b/utils/lock/lock.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/utils/traverse.go b/utils/traverse.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/utils/traverse_test.go b/utils/traverse_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the

diff --git a/version/version.go b/version/version.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Morning Consult, LLC or its affiliates. All Rights Reserved.
+// Copyright 2019 The Morning Consult, LLC or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
 // not use this file except in compliance with the License. A copy of the