Merge pull request #9 from xmidt-org/feature/go-module

Feature/go module
xmidt-org · Aug 28, 2019 · 3be2537 · 3be2537
2 parents 89752d8 + 2aa9653
commit 3be2537
Show file tree

Hide file tree

Showing 114 changed files with 308 additions and 247 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,8 @@
-vendor
-pkg
-
 # Ignore build product.
-# TODO: We should not be producing build products in this directory
-src/themis/themis
+themis
 
 bin/
+pkg/
 lib/
 *.out
 *.swp

diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,6 @@ branches:
     - master
 
 install:
-  - go get -v github.com/Masterminds/glide
 
 script:
   - make build style test codecov

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Time-based claims can be disabled
 - Both the issue and claims servers can be disabled
 - Integrated health via InvisionApp/go-health
+- Converted to a go module: github.com/xmidt-org/themis
 
 
 [Unreleased]: https://github.com/xmidt-org/themis/compare/v0.0.0...HEAD
diff --git a/src/themis/client.go → client.go b/src/themis/client.go → client.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"xhttp/xhttpclient"
-	"xmetrics"
-	"xmetrics/xmetricshttp"
+	"github.com/xmidt-org/themis/xhttp/xhttpclient"
+	"github.com/xmidt-org/themis/xmetrics"
+	"github.com/xmidt-org/themis/xmetrics/xmetricshttp"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/fx"

diff --git a/src/config/bootstrap.go → config/bootstrap.go b/src/config/bootstrap.go → config/bootstrap.go
diff --git a/src/config/configtest/unmarshaller.go → config/configtest/unmarshaller.go b/src/config/configtest/unmarshaller.go → config/configtest/unmarshaller.go
@@ -1,7 +1,7 @@
 package configtest
 
 import (
-	"config"
+	"github.com/xmidt-org/themis/config"
 
 	"github.com/stretchr/testify/mock"
 )

diff --git a/src/config/configtest/viper.go → config/configtest/viper.go b/src/config/configtest/viper.go → config/configtest/viper.go
diff --git a/src/config/initializer.go → config/initializer.go b/src/config/initializer.go → config/initializer.go
diff --git a/src/config/optioner.go → config/optioner.go b/src/config/optioner.go → config/optioner.go
diff --git a/src/config/provide.go → config/provide.go b/src/config/provide.go → config/provide.go
diff --git a/src/config/unmarshaller.go → config/unmarshaller.go b/src/config/unmarshaller.go → config/unmarshaller.go
diff --git a/src/themis/devMode.go → devMode.go b/src/themis/devMode.go → devMode.go
diff --git a/go.mod b/go.mod
@@ -0,0 +1,22 @@
+module github.com/xmidt-org/themis
+
+go 1.12
+
+require (
+	github.com/InVisionApp/go-health v2.1.0+incompatible
+	github.com/InVisionApp/go-logger v1.0.1
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/go-kit/kit v0.9.0
+	github.com/gorilla/mux v1.7.3
+	github.com/justinas/alice v0.0.0-20171023064455-03f45bd4b7da
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/prometheus/client_golang v1.1.0
+	github.com/spf13/pflag v1.0.3
+	github.com/spf13/viper v1.4.0
+	github.com/stretchr/objx v0.2.0 // indirect
+	github.com/stretchr/testify v1.4.0
+	go.uber.org/dig v1.7.0 // indirect
+	go.uber.org/fx v1.9.0
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0
+)
diff --git a/go.sum b/go.sum
diff --git a/src/key/endpoint.go → key/endpoint.go b/src/key/endpoint.go → key/endpoint.go
diff --git a/src/key/endpoint_test.go → key/endpoint_test.go b/src/key/endpoint_test.go → key/endpoint_test.go
diff --git a/src/key/handler.go → key/handler.go b/src/key/handler.go → key/handler.go
@@ -4,7 +4,8 @@ import (
 	"context"
 	"errors"
 	"net/http"
-	"xlog"
+
+	"github.com/xmidt-org/themis/xlog"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/log/level"

diff --git a/src/key/handler_test.go → key/handler_test.go b/src/key/handler_test.go → key/handler_test.go
@@ -7,8 +7,9 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
-	"xlog"
-	"xlog/xlogtest"
+
+	"github.com/xmidt-org/themis/xlog"
+	"github.com/xmidt-org/themis/xlog/xlogtest"
 
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"

diff --git a/src/key/pair.go → key/pair.go b/src/key/pair.go → key/pair.go
diff --git a/src/key/pair_test.go → key/pair_test.go b/src/key/pair_test.go → key/pair_test.go
diff --git a/src/key/provide.go → key/provide.go b/src/key/provide.go → key/provide.go
diff --git a/src/key/provide_test.go → key/provide_test.go b/src/key/provide_test.go → key/provide_test.go
@@ -1,10 +1,10 @@
 package key
 
 import (
-	"random"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/xmidt-org/themis/random"
 	"go.uber.org/fx"
 	"go.uber.org/fx/fxtest"
 )

diff --git a/src/key/registry.go → key/registry.go b/src/key/registry.go → key/registry.go
diff --git a/src/key/registry_test.go → key/registry_test.go b/src/key/registry_test.go → key/registry_test.go
diff --git a/src/key/test.pkcs1.pem → key/test.pkcs1.pem b/src/key/test.pkcs1.pem → key/test.pkcs1.pem
diff --git a/src/key/test.pkcs8.pem → key/test.pkcs8.pem b/src/key/test.pkcs8.pem → key/test.pkcs8.pem
diff --git a/src/themis/main.go → main.go b/src/themis/main.go → main.go
@@ -15,22 +15,22 @@
 package main
 
 import (
-	"config"
 	"fmt"
-	"key"
 	"os"
-	"random"
 	"strings"
-	"token"
-	"xhealth"
-	"xhttp/xhttpclient"
-	"xhttp/xhttpserver"
-	"xlog"
-	"xlog/xloghttp"
-	"xmetrics/xmetricshttp"
 
 	"github.com/go-kit/kit/log"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/xmidt-org/themis/config"
+	"github.com/xmidt-org/themis/key"
+	"github.com/xmidt-org/themis/random"
+	"github.com/xmidt-org/themis/token"
+	"github.com/xmidt-org/themis/xhealth"
+	"github.com/xmidt-org/themis/xhttp/xhttpclient"
+	"github.com/xmidt-org/themis/xhttp/xhttpserver"
+	"github.com/xmidt-org/themis/xlog"
+	"github.com/xmidt-org/themis/xlog/xloghttp"
+	"github.com/xmidt-org/themis/xmetrics/xmetricshttp"
 
 	"github.com/spf13/pflag"
 	"go.uber.org/fx"

diff --git a/src/themis/metrics.go → metrics.go b/src/themis/metrics.go → metrics.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"xmetrics"
-	"xmetrics/xmetricshttp"
+	"github.com/xmidt-org/themis/xmetrics"
+	"github.com/xmidt-org/themis/xmetrics/xmetricshttp"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/fx"

diff --git a/src/random/noncer.go → random/noncer.go b/src/random/noncer.go → random/noncer.go
diff --git a/src/random/noncer_test.go → random/noncer_test.go b/src/random/noncer_test.go → random/noncer_test.go
diff --git a/src/random/provide.go → random/provide.go b/src/random/provide.go → random/provide.go
diff --git a/src/random/provide_test.go → random/provide_test.go b/src/random/provide_test.go → random/provide_test.go
diff --git a/src/random/randomtest/noncer.go → random/randomtest/noncer.go b/src/random/randomtest/noncer.go → random/randomtest/noncer.go
diff --git a/src/themis/routes.go → routes.go b/src/themis/routes.go → routes.go
@@ -1,12 +1,12 @@
 package main
 
 import (
-	"key"
-	"token"
-	"xhealth"
-	"xhttp/xhttpserver"
-	"xmetrics"
-	"xmetrics/xmetricshttp"
+	"github.com/xmidt-org/themis/key"
+	"github.com/xmidt-org/themis/token"
+	"github.com/xmidt-org/themis/xhealth"
+	"github.com/xmidt-org/themis/xhttp/xhttpserver"
+	"github.com/xmidt-org/themis/xmetrics"
+	"github.com/xmidt-org/themis/xmetrics/xmetricshttp"
 
 	"github.com/gorilla/mux"
 	"github.com/justinas/alice"

diff --git a/src/glide.lock b/src/glide.lock
diff --git a/src/glide.yaml b/src/glide.yaml
diff --git a/src/token/claimBuilder.go → token/claimBuilder.go b/src/token/claimBuilder.go → token/claimBuilder.go
@@ -6,9 +6,10 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"random"
 	"time"
-	"xhttp/xhttpclient"
+
+	"github.com/xmidt-org/themis/random"
+	"github.com/xmidt-org/themis/xhttp/xhttpclient"
 
 	"github.com/go-kit/kit/endpoint"
 	kithttp "github.com/go-kit/kit/transport/http"

diff --git a/src/token/claimBuilder_test.go → token/claimBuilder_test.go b/src/token/claimBuilder_test.go → token/claimBuilder_test.go
@@ -7,11 +7,12 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
-	"random/randomtest"
 	"strconv"
 	"testing"
 	"time"
-	"xhttp/xhttpclient"
+
+	"github.com/xmidt-org/themis/random/randomtest"
+	"github.com/xmidt-org/themis/xhttp/xhttpclient"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/src/token/endpoint.go → token/endpoint.go b/src/token/endpoint.go → token/endpoint.go
diff --git a/src/token/endpoint_test.go → token/endpoint_test.go b/src/token/endpoint_test.go → token/endpoint_test.go
diff --git a/src/token/factory.go → token/factory.go b/src/token/factory.go → token/factory.go
@@ -3,9 +3,10 @@ package token
 import (
 	"context"
 	"fmt"
-	"key"
 	"sync/atomic"
 
+	"github.com/xmidt-org/themis/key"
+
 	jwt "github.com/dgrijalva/jwt-go"
 )
 

diff --git a/src/token/factory_test.go → token/factory_test.go b/src/token/factory_test.go → token/factory_test.go
@@ -3,10 +3,11 @@ package token
 import (
 	"context"
 	"crypto/rand"
-	"key"
-	"random"
 	"testing"
 
+	"github.com/xmidt-org/themis/key"
+	"github.com/xmidt-org/themis/random"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/src/token/handler.go → token/handler.go b/src/token/handler.go → token/handler.go
diff --git a/src/token/handler_test.go → token/handler_test.go b/src/token/handler_test.go → token/handler_test.go
diff --git a/src/token/mocks_test.go → token/mocks_test.go b/src/token/mocks_test.go → token/mocks_test.go