Merge pull request #183 from netlify/chore/remove-commons

Remove usage of netlify-commons

Author: mraerino

.travis.yml

@@ -2,7 +2,7 @@
 language: go
 
 go:
-  - "1.11"
+  - "1.13"
 
 env:
   global:
@@ -11,4 +11,4 @@ env:
 install: make deps
 script: make all
 notifications:
-    email: false
+  email: false

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.11
+FROM golang:1.13
 
 RUN useradd -m netlify
 

api/api.go

@@ -3,7 +3,11 @@ package api
 import (
 	"context"
 	"net/http"
+	"os"
+	"os/signal"
 	"regexp"
+	"syscall"
+	"time"
 
 	"github.com/jinzhu/gorm"
 	"github.com/sebest/xff"
@@ -15,7 +19,6 @@ import (
 	"github.com/go-chi/chi"
 	"github.com/netlify/gocommerce/conf"
 	gcontext "github.com/netlify/gocommerce/context"
-	"github.com/netlify/netlify-commons/graceful"
 )
 
 const (
@@ -38,13 +41,34 @@ type API struct {
 // ListenAndServe starts the REST API.
 func (a *API) ListenAndServe(hostAndPort string) {
 	log := logrus.WithField("component", "api")
-	server := graceful.NewGracefulServer(a.handler, log)
-	if err := server.Bind(hostAndPort); err != nil {
-		log.WithError(err).Fatal("http server bind failed")
+	server := &http.Server{
+		Addr:    hostAndPort,
+		Handler: a.handler,
 	}
 
-	if err := server.Listen(); err != nil {
-		log.WithError(err).Fatal("http server listen failed")
+	done := make(chan struct{})
+	defer close(done)
+	go func() {
+		waitForTermination(log, done)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+		defer cancel()
+		server.Shutdown(ctx)
+	}()
+
+	if err := server.ListenAndServe(); err != nil {
+		log.WithError(err).Fatal("API server failed")
+	}
+}
+
+// WaitForShutdown blocks until the system signals termination or done has a value
+func waitForTermination(log logrus.FieldLogger, done <-chan struct{}) {
+	signals := make(chan os.Signal, 1)
+	signal.Notify(signals, os.Interrupt, syscall.SIGTERM, syscall.SIGINT)
+	select {
+	case sig := <-signals:
+		log.Infof("Triggering shutdown from signal %s", sig)
+	case <-done:
+		log.Infof("Shutting down...")
 	}
 }
 

api/payments_test.go

@@ -427,7 +427,7 @@ func TestPaymentCreate(t *testing.T) {
 		callCount := 0
 		stripe.SetBackend(stripe.APIBackend, NewTrackingStripeBackend(func(method, path, key string, params stripe.ParamsContainer, v interface{}) {
 			switch path {
-			case "/charges":
+			case "/v1/charges":
 				payload := params.GetParams()
 				fmt.Println("meta:", payload.Metadata)
 				assert.Equal(t, test.Data.firstOrder.ID, payload.Metadata["order_id"])

conf/configuration.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/joho/godotenv"
 	"github.com/kelseyhightower/envconfig"
-	"github.com/netlify/netlify-commons/nconf"
 )
 
 // DBConfiguration holds all the database related configuration.
@@ -39,7 +38,7 @@ type GlobalConfiguration struct {
 		Endpoint string
 	}
 	DB                DBConfiguration
-	Logging           nconf.LoggingConfig `envconfig:"LOG"`
+	Logging           LoggingConfig `envconfig:"LOG"`
 	OperatorToken     string              `split_words:"true"`
 	MultiInstanceMode bool
 	SMTP              SMTPConfiguration `json:"smtp"`
@@ -126,7 +125,7 @@ func LoadGlobal(filename string) (*GlobalConfiguration, error) {
 	if err := envconfig.Process("gocommerce", config); err != nil {
 		return nil, err
 	}
-	if _, err := nconf.ConfigureLogging(&config.Logging); err != nil {
+	if _, err := ConfigureLogging(&config.Logging); err != nil {
 		return nil, err
 	}
 	return config, nil

conf/logging.go

@@ -0,0 +1,61 @@
+package conf
+
+import (
+	"os"
+	"time"
+
+	"github.com/sirupsen/logrus"
+)
+
+type LoggingConfig struct {
+	Level            string                 `mapstructure:"log_level" json:"log_level"`
+	File             string                 `mapstructure:"log_file" json:"log_file"`
+	DisableColors    bool                   `mapstructure:"disable_colors" split_words:"true" json:"disable_colors"`
+	QuoteEmptyFields bool                   `mapstructure:"quote_empty_fields" split_words:"true" json:"quote_empty_fields"`
+	TSFormat         string                 `mapstructure:"ts_format" json:"ts_format"`
+	Fields           map[string]interface{} `mapstructure:"fields" json:"fields"`
+	UseNewLogger     bool                   `mapstructure:"use_new_logger",split_words:"true"`
+}
+
+func ConfigureLogging(config *LoggingConfig) (*logrus.Entry, error) {
+	logger := logrus.New()
+
+	tsFormat := time.RFC3339Nano
+	if config.TSFormat != "" {
+		tsFormat = config.TSFormat
+	}
+	// always use the full timestamp
+	logger.SetFormatter(&logrus.TextFormatter{
+		FullTimestamp:    true,
+		DisableTimestamp: false,
+		TimestampFormat:  tsFormat,
+		DisableColors:    config.DisableColors,
+		QuoteEmptyFields: config.QuoteEmptyFields,
+	})
+
+	// use a file if you want
+	if config.File != "" {
+		f, errOpen := os.OpenFile(config.File, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0664)
+		if errOpen != nil {
+			return nil, errOpen
+		}
+		logger.SetOutput(f)
+		logger.Infof("Set output file to %s", config.File)
+	}
+
+	if config.Level != "" {
+		level, err := logrus.ParseLevel(config.Level)
+		if err != nil {
+			return nil, err
+		}
+		logger.SetLevel(level)
+		logger.Debug("Set log level to: " + logger.GetLevel().String())
+	}
+
+	f := logrus.Fields{}
+	for k, v := range config.Fields {
+		f[k] = v
+	}
+
+	return logger.WithFields(f), nil
+}

go.mod

@@ -1,64 +1,50 @@
 module github.com/netlify/gocommerce
 
 require (
-	cloud.google.com/go v0.0.0-20170822200954-98f5696b1026
+	cloud.google.com/go v0.0.0-20170822200954-98f5696b1026 // indirect
 	github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20170623214735-571947b0f240
 	github.com/PuerkitoBio/goquery v1.1.0
-	github.com/andybalholm/cascadia v0.0.0-20161224141413-349dd0209470
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/andybalholm/cascadia v0.0.0-20161224141413-349dd0209470 // indirect
+	github.com/denisenkom/go-mssqldb v0.0.0-20190906004059-62cf760a6c9e // indirect
 	github.com/dgrijalva/jwt-go v3.0.0+incompatible
-	github.com/fsnotify/fsnotify v0.0.0-20170329110642-4da3e2cfbabc
+	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
 	github.com/go-chi/chi v3.1.0+incompatible
 	github.com/go-sql-driver/mysql v1.3.0
-	github.com/golang/protobuf v0.0.0-20170816001514-ab9f9a6dab16
-	github.com/hashicorp/hcl v0.0.0-20170509225359-392dba7d905e
-	github.com/imdario/mergo v0.0.0-20160216103600-3e95a51e0639
-	github.com/inconshreveable/mousetrap v1.0.0
+	github.com/golang/protobuf v0.0.0-20170816001514-ab9f9a6dab16 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jinzhu/gorm v1.9.1
-	github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d
+	github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d // indirect
+	github.com/jinzhu/now v1.0.1 // indirect
 	github.com/joho/godotenv v0.0.0-20161216230537-726cc8b906e3
 	github.com/kelseyhightower/envconfig v1.3.0
-	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515
+	github.com/kr/pretty v0.1.0 // indirect
 	github.com/lib/pq v0.0.0-20170306183709-ca5bc43047f2
-	github.com/magiconair/properties v1.7.3
+	github.com/logpacker/PayPal-Go-SDK v2.0.5+incompatible // indirect
 	github.com/mattes/vat v0.0.0-20160607175015-805d21ad0739
 	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992
-	github.com/nats-io/nats v1.2.2
-	github.com/nats-io/nuid v0.0.0-20170303150224-3cf34f9fca4e
 	github.com/netlify/PayPal-Go-SDK v0.0.0-20180614154051-732c3d08bf8a
 	github.com/netlify/mailme v0.0.0-20170821082834-c4a76ce443c1
-	github.com/netlify/netlify-commons v0.4.5
 	github.com/pariz/gountries v0.0.0-20171019111738-adb00f6513a3
 	github.com/pborman/uuid v0.0.0-20160209185913-a97ce2ca70fa
-	github.com/pelletier/go-toml v0.0.0-20170628012637-69d355db5304
 	github.com/pkg/errors v0.8.0
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/plutov/paypal v2.0.5+incompatible // indirect
 	github.com/rs/cors v0.0.0-20170608165155-8dd4211afb5d
-	github.com/rybit/nats_logrus_hook v1.0.4
 	github.com/sebest/xff v0.0.0-20160910043805-6c115e0ffa35
-	github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20170330202426-93e507b42f43
-	github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083
-	github.com/signalfx/golib v1.0.0
-	github.com/sirupsen/logrus v0.0.0-20170713114250-a3f95b5c4235
-	github.com/spf13/afero v0.0.0-20170217164146-9be650865eab
-	github.com/spf13/cast v1.1.0
+	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.0-20170228191748-fcd0c5a1df88
-	github.com/spf13/jwalterweatherman v0.0.0-20170523133247-0efa5202c046
-	github.com/spf13/pflag v1.0.0
-	github.com/spf13/viper v0.0.0-20170217163817-7538d73b4eb9
-	github.com/streadway/amqp v0.0.0-20170707203015-2cbfe40c9341
+	github.com/spf13/pflag v1.0.0 // indirect
 	github.com/stretchr/testify v1.2.2
-	github.com/stripe/stripe-go v52.0.0+incompatible
-	golang.org/x/net v0.0.0-20170721033204-ab5485076ff3
-	golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95
-	golang.org/x/sys v0.0.0-20170721163517-c4489faa6e5a
-	golang.org/x/text v0.0.0-20170714085652-836efe42bb4a
-	google.golang.org/api v0.0.0-20170821230356-dd6bdadc5852
-	google.golang.org/appengine v0.0.0-20170814190942-d9a072cfa7b9
-	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc
-	gopkg.in/gomail.v2 v2.0.0-20150902115704-41f357289737
-	gopkg.in/logfmt.v0 v0.3.0
-	gopkg.in/stack.v1 v1.6.0
-	gopkg.in/yaml.v2 v2.0.0-20170721122051-25c4ec802a7d
+	github.com/stripe/stripe-go v62.9.0+incompatible
+	golang.org/x/net v0.0.0-20190620200207-3b0461eec859 // indirect
+	golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 // indirect
+	golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
+	google.golang.org/api v0.0.0-20170821230356-dd6bdadc5852 // indirect
+	google.golang.org/appengine v0.0.0-20170814190942-d9a072cfa7b9 // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/gomail.v2 v2.0.0-20150902115704-41f357289737 // indirect
+	gopkg.in/yaml.v2 v2.0.0-20170721122051-25c4ec802a7d // indirect
 )
+
+go 1.13