Merge pull request #37 from derektamsen/change-pkg-structure

restructure luks2crypt package to fit in cmd/, internal/, pkg/, tools/
square · Jun 27, 2019 · 231d1af · 231d1af
2 parents 9ac1594 + b1622df
commit 231d1af
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ jobs:
   include:
   - stage: build
     go: 1.12.x
-    script: go build -v -ldflags "-X main.VERSION=${TRAVIS_TAG}"
+    script: go build -v -ldflags "-X main.VERSION=${TRAVIS_TAG}" ./cmd/...
     deploy:
       provider: releases
       file: luks2crypt-${TRAVIS_TAG}-${GIMME_OS}-${GIMME_ARCH}.tar.gz

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ ARG LUKS2CRYPT_VER='7213ec6894a6f368375a290de81c17f56190c20e'
 
 # golang variables
 ARG GO111MODULE='on'
-ARG GOLANGVER='1.11.5'
+ARG GOLANGVER='1.12.6'
 ARG GOPATH='/go'
 ENV PATH=${PATH}:/usr/local/go/bin:/go/bin
 
@@ -48,7 +48,7 @@ WORKDIR /go/src/github.com/square/luks2crypt
 COPY . .
 
 # go build and install luks2crypt
-RUN go install -ldflags "-X main.VERSION=${LUKS2CRYPT_VER}" -v ./...
+RUN go install -ldflags "-X main.VERSION=${LUKS2CRYPT_VER}" -v ./cmd/...
 
 # run and print the version of luks2crypt
 ENTRYPOINT [ "luks2crypt" ]

diff --git a/README.md b/README.md
@@ -58,12 +58,12 @@ through cgo to manage the encrypted devices. On debian/ubuntu you can run:
 
 - Standard go tools can be used to build luks2crypt:
 
-      go build
+      go build ./cmd/...
 
 - If you would like to use a mock crypt server to test client changes on is
   included in this project:
 
-      go build tools/cryptservermock/cryptservermock.go
+      go build ./tools/...
 
 - If you need a test enviornment, the provided `Vagrantfile` creates an ubuntu
   vm. The vagrantfile has a provision script that creates a luks disk image at

diff --git a/main.go → cmd/luks2crypt/main.go b/main.go → cmd/luks2crypt/main.go
@@ -11,7 +11,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/square/luks2crypt/postimaging"
+	"github.com/square/luks2crypt/pkg/postimaging"
 
 	cli "gopkg.in/urfave/cli.v1"
 )

diff --git a/main_test.go → cmd/luks2crypt/main_test.go b/main_test.go → cmd/luks2crypt/main_test.go
diff --git a/escrow/escrow.go → internal/escrow/escrow.go b/escrow/escrow.go → internal/escrow/escrow.go
diff --git a/escrow/escrow_test.go → internal/escrow/escrow_test.go b/escrow/escrow_test.go → internal/escrow/escrow_test.go
diff --git a/hwinfo/hwinfo.go → internal/hwinfo/hwinfo.go b/hwinfo/hwinfo.go → internal/hwinfo/hwinfo.go
diff --git a/hwinfo/hwinfo_test.go → internal/hwinfo/hwinfo_test.go b/hwinfo/hwinfo_test.go → internal/hwinfo/hwinfo_test.go
diff --git a/localcache/localcache.go → internal/localcache/localcache.go b/localcache/localcache.go → internal/localcache/localcache.go
diff --git a/localcache/localcache_test.go → internal/localcache/localcache_test.go b/localcache/localcache_test.go → internal/localcache/localcache_test.go
diff --git a/luks/luks.go → internal/luks/luks.go b/luks/luks.go → internal/luks/luks.go
diff --git a/luks/luks_test.go → internal/luks/luks_test.go b/luks/luks_test.go → internal/luks/luks_test.go
diff --git a/password/password.go → internal/password/password.go b/password/password.go → internal/password/password.go
diff --git a/password/password_test.go → internal/password/password_test.go b/password/password_test.go → internal/password/password_test.go
diff --git a/postimaging/postimaging.go → pkg/postimaging/postimaging.go b/postimaging/postimaging.go → pkg/postimaging/postimaging.go
@@ -11,11 +11,11 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/square/luks2crypt/escrow"
-	"github.com/square/luks2crypt/hwinfo"
-	"github.com/square/luks2crypt/localcache"
-	"github.com/square/luks2crypt/luks"
-	"github.com/square/luks2crypt/password"
+	"github.com/square/luks2crypt/internal/escrow"
+	"github.com/square/luks2crypt/internal/hwinfo"
+	"github.com/square/luks2crypt/internal/localcache"
+	"github.com/square/luks2crypt/internal/luks"
+	"github.com/square/luks2crypt/internal/password"
 )
 
 // Opts is used to store the options needed for postimaging functions
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ import ( @@
     	"log"
     	"os"
-    	"github.com/square/luks2crypt/postimaging"
+    	"github.com/square/luks2crypt/pkg/postimaging"
     	cli "gopkg.in/urfave/cli.v1"
     )
@@ Expand Down @@