repackaged

.circleci/config.yml

@@ -73,7 +73,7 @@ jobs:
           command: |
             trap "go-junit-report <${TEST_RESULTS}/go-test.out > ${TEST_RESULTS}/go-test-report.xml" EXIT
             touch /tmp/coverage.out
-            go test -cover -coverprofile=/tmp/coverage.out -v ./auth | tee ${TEST_RESULTS}/go-test.out
+            go test -cover -coverprofile=/tmp/coverage.out -v ./services/auth | tee ${TEST_RESULTS}/go-test.out
             goveralls -coverprofile=/tmp/coverage.out -service=circle-ci -repotoken=$COVERALLS_TOKEN
 
       - run: make build

Makefile

@@ -1,3 +1,5 @@
+SERVICES_DIR = ./services
+
 .PHONY: all
 all:
 	@$(MAKE) build
@@ -25,15 +27,15 @@ build:
 
 .PHONY: build-auth
 build-auth:
-	go build -o ./bin/alpaca-auth ./auth
+	go build -o ./bin/alpaca-auth $(SERVICES_DIR)/auth
 
 .PHONY: build-password-reset
 build-password-reset:
-	go build -o ./bin/alpaca-password-reset ./password-reset
+	go build -o ./bin/alpaca-password-reset $(SERVICES_DIR)/password-reset
 
 .PHONY: build-mfa
 build-mfa:
-	go build -o ./bin/alpaca-mfa ./mfa
+	go build -o ./bin/alpaca-mfa $(SERVICES_DIR)/mfa
 
 .PHONY: run-auth
 run-auth:
@@ -61,7 +63,7 @@ run-mfa:
 
 .PHONY: test
 test:
-	go test -v ./auth
+	go test -v $(SERVICES_DIR)/auth
 
 .PHONY: convey
 convey:

docs/differences.md

@@ -18,7 +18,7 @@
 
 #### Insanely fast build times!
 ```bash
-$ time go build -o ./bin/alpaca-auth ./auth
+$ time go build -o ./bin/alpaca-auth ./services/auth
 1.52s user 0.59s system 130% cpu 1.618 total
 ```
 

docs/roadmap.md

@@ -1,2 +1,14 @@
 - [ ] vgo #17
-- [ ] set jwt cookie on successful response
+- [ ] set jwt cookie on successful response
+
+### better packaging
+right now, we they're ~16mb
+```bash
+ls -la bin
+total 91928
+-rwxr-xr-x   1 kevinchen  staff    16M Jul  2 10:18 alpaca-auth*
+-rwxr-xr-x   1 kevinchen  staff    13M Jul  2 10:18 alpaca-mfa*
+-rwxr-xr-x   1 kevinchen  staff    16M Jul  2 10:18 alpaca-password-reset*
+```
+
+if we package smarter, we might be able to reduce this size

makefiles/code-quality.mk

@@ -1,14 +1,14 @@
 .PHONY: lint
 lint:
-	golint ./auth
-	golint ./password-reset
-	golint ./mfa
+	golint $(SERVICES_DIR)/auth
+	golint $(SERVICES_DIR)/password-reset
+	golint $(SERVICES_DIR)/mfa
 
 .PHONY: fmt
 fmt:
-	go fmt ./auth
-	go fmt ./password-reset
-	go fmt ./mfa
+	go fmt $(SERVICES_DIR)/auth
+	go fmt $(SERVICES_DIR)/password-reset
+	go fmt $(SERVICES_DIR)/mfa
 
 .PHONY: vet
 vet:

makefiles/protobuf.mk

@@ -1,7 +1,7 @@
 .PHONY: protoc
 protoc:
-	protoc -I auth auth/pb/auth.proto --go_out=plugins=grpc:auth
-	protoc -I mfa mfa/pb/mfa.proto --go_out=plugins=grpc:mfa
+	protoc -I auth $(SERVICES_DIR)/auth/pb/auth.proto --go_out=plugins=grpc:auth
+	protoc -I mfa $(SERVICES_DIR)/mfa/pb/mfa.proto --go_out=plugins=grpc:mfa
 
 .PHONY: install-proto
 install-proto:

auth/Dockerfile → services/auth/Dockerfile

@@ -1,6 +1,6 @@
 FROM golang:1.10 as builder
 ADD . /go/src/github.com/hanakoa/alpaca
-WORKDIR /go/src/github.com/hanakoa/alpaca/auth
+WORKDIR /go/src/github.com/hanakoa/alpaca/services/auth
 RUN go get ./... && \
     CGO_ENABLED=0 GOOS=linux go build -a -o ./bin/alpaca-auth .
 
@@ -14,6 +14,6 @@ RUN apk --no-cache add ca-certificates
 #    addgroup -S -g $ALPACA_GID $ALPACA_GROUP && \
 #    adduser -S -u $ALPACA_UID -G $ALPACA_GROUP $ALPACA_USER
 WORKDIR /root/
-COPY --from=builder /go/src/github.com/hanakoa/alpaca/auth/bin/alpaca-auth .
+COPY --from=builder /go/src/github.com/hanakoa/alpaca/services/auth/bin/alpaca-auth .
 #USER $ALPACA_USER
 CMD ["./alpaca-auth"]

auth/app.go → services/auth/app.go

@@ -5,8 +5,8 @@ import (
 	"github.com/bwmarrin/snowflake"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
-	"github.com/hanakoa/alpaca/auth/services"
-	mfaGRPC "github.com/hanakoa/alpaca/mfa/grpc"
+	"github.com/hanakoa/alpaca/services/auth/services"
+	mfaGRPC "github.com/hanakoa/alpaca/services/mfa/grpc"
 	"github.com/kevinmichaelchen/my-go-utils/rabbitmq"
 	_ "github.com/lib/pq"
 	"log"

auth/grpc/grpc_client.go → services/auth/grpc/grpc_client.go

@@ -2,7 +2,7 @@ package grpc
 
 import (
 	"golang.org/x/net/context"
-	pb "github.com/hanakoa/alpaca/auth/pb"
+	pb "github.com/hanakoa/alpaca/services/auth/pb"
 	"fmt"
 	grpcUtils "github.com/kevinmichaelchen/my-go-utils/grpc"
 	"time"

auth/grpc/grpc_server.go → services/auth/grpc/grpc_server.go

@@ -3,14 +3,14 @@ package grpc
 import (
 	"fmt"
 	"log"
-	pb "github.com/hanakoa/alpaca/auth/pb"
+	pb "github.com/hanakoa/alpaca/services/auth/pb"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 	"net"
 	"database/sql"
-	"github.com/hanakoa/alpaca/auth/models"
-	"github.com/hanakoa/alpaca/auth/services"
+	"github.com/hanakoa/alpaca/services/auth/models"
+	"github.com/hanakoa/alpaca/services/auth/services"
 	"gopkg.in/guregu/null.v3"
 )
 

auth/main.go → services/auth/main.go

@@ -4,9 +4,9 @@ import (
 	"database/sql"
 	"fmt"
 	"github.com/TeslaGov/envy"
-	"github.com/hanakoa/alpaca/auth/grpc"
-	"github.com/hanakoa/alpaca/auth/models"
-	mfaGRPC "github.com/hanakoa/alpaca/mfa/grpc"
+	"github.com/hanakoa/alpaca/services/auth/grpc"
+	"github.com/hanakoa/alpaca/services/auth/models"
+	mfaGRPC "github.com/hanakoa/alpaca/services/mfa/grpc"
 	snowflakeUtils "github.com/kevinmichaelchen/my-go-utils/snowflake"
 	sqlUtils "github.com/kevinmichaelchen/my-go-utils/sql"
 	"log"

auth/main_test.go → services/auth/main_test.go

@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/TeslaGov/envy"
-	"github.com/hanakoa/alpaca/auth/models"
-	"github.com/hanakoa/alpaca/auth/services"
+	"github.com/hanakoa/alpaca/services/auth/models"
+	"github.com/hanakoa/alpaca/services/auth/services"
 	snowflakeUtils "github.com/kevinmichaelchen/my-go-utils/snowflake"
 	stringUtils "github.com/kevinmichaelchen/my-go-utils/string"
 	. "github.com/smartystreets/goconvey/convey"

auth/services/email_address.go → services/auth/services/email_address.go

@@ -7,7 +7,7 @@ import (
 	sqlUtils "github.com/kevinmichaelchen/my-go-utils/sql"
 	snowflakeUtils "github.com/kevinmichaelchen/my-go-utils/snowflake"
 	"github.com/gorilla/mux"
-	"github.com/hanakoa/alpaca/auth/models"
+	"github.com/hanakoa/alpaca/services/auth/models"
 	"gopkg.in/guregu/null.v3"
 	"time"
 	"strconv"

auth/services/mfa.go → services/auth/services/mfa.go

@@ -5,7 +5,7 @@ import (
 	"github.com/google/uuid"
 	"log"
 	requestUtils "github.com/kevinmichaelchen/my-go-utils/request"
-	"github.com/hanakoa/alpaca/auth/models"
+	"github.com/hanakoa/alpaca/services/auth/models"
 )
 
 type LoginResponse struct {

auth/services/password.go → services/auth/services/password.go

@@ -5,7 +5,7 @@ import (
 	"github.com/bwmarrin/snowflake"
 	"net/http"
 	"github.com/gorilla/mux"
-	"github.com/hanakoa/alpaca/auth/models"
+	"github.com/hanakoa/alpaca/services/auth/models"
 	"encoding/json"
 	requestUtils "github.com/kevinmichaelchen/my-go-utils/request"
 	snowflakeUtils "github.com/kevinmichaelchen/my-go-utils/snowflake"

auth/services/person.go → services/auth/services/person.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"github.com/gorilla/mux"
 	"strconv"
-	"github.com/hanakoa/alpaca/auth/models"
+	"github.com/hanakoa/alpaca/services/auth/models"
 	"encoding/json"
 	"github.com/bwmarrin/snowflake"
 	"time"

auth/services/token.go → services/auth/services/token.go

@@ -6,12 +6,12 @@ import (
 	"net/http"
 	requestUtils "github.com/kevinmichaelchen/my-go-utils/request"
 	snowflakeUtils "github.com/kevinmichaelchen/my-go-utils/snowflake"
-	mfaGRPC "github.com/hanakoa/alpaca/mfa/grpc"
+	mfaGRPC "github.com/hanakoa/alpaca/services/mfa/grpc"
 	"encoding/json"
 	"gopkg.in/guregu/null.v3"
 	"strings"
 	"time"
-	"github.com/hanakoa/alpaca/auth/models"
+	"github.com/hanakoa/alpaca/services/auth/models"
 	"log"
 	"github.com/badoux/checkmail"
 	"fmt"

email/Dockerfile → services/email/Dockerfile

@@ -1,6 +1,6 @@
 FROM golang:1.10 as builder
 ADD . /go/src/github.com/hanakoa/alpaca
-WORKDIR /go/src/github.com/hanakoa/alpaca/email
+WORKDIR /go/src/github.com/hanakoa/alpaca/services/email
 RUN go get ./... && \
     CGO_ENABLED=0 GOOS=linux go build -a -o ./bin/alpaca-email .
 
@@ -14,6 +14,6 @@ RUN apk --no-cache add ca-certificates
 #    addgroup -S -g $ALPACA_GID $ALPACA_GROUP && \
 #    adduser -S -u $ALPACA_UID -G $ALPACA_GROUP $ALPACA_USER
 WORKDIR /root/
-COPY --from=builder /go/src/github.com/hanakoa/alpaca/email/bin/alpaca-email .
+COPY --from=builder /go/src/github.com/hanakoa/alpaca/services/email/bin/alpaca-email .
 #USER $ALPACA_USER
 CMD ["./alpaca-email"]

mfa/Dockerfile → services/mfa/Dockerfile

@@ -1,6 +1,6 @@
 FROM golang:1.10 as builder
 ADD . /go/src/github.com/hanakoa/alpaca
-WORKDIR /go/src/github.com/hanakoa/alpaca/mfa
+WORKDIR /go/src/github.com/hanakoa/alpaca/services/mfa
 RUN go get ./... && \
     CGO_ENABLED=0 GOOS=linux go build -a -o ./bin/alpaca-mfa .
 
@@ -14,6 +14,6 @@ RUN apk --no-cache add ca-certificates
 #    addgroup -S -g $ALPACA_GID $ALPACA_GROUP && \
 #    adduser -S -u $ALPACA_UID -G $ALPACA_GROUP $ALPACA_USER
 WORKDIR /root/
-COPY --from=builder /go/src/github.com/hanakoa/alpaca/mfa/bin/alpaca-mfa .
+COPY --from=builder /go/src/github.com/hanakoa/alpaca/services/mfa/bin/alpaca-mfa .
 #USER $ALPACA_USER
 CMD ["./alpaca-mfa"]

mfa/app.go → services/mfa/app.go

@@ -5,7 +5,7 @@ import (
 	"github.com/bwmarrin/snowflake"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
-	"github.com/hanakoa/alpaca/mfa/services"
+	"github.com/hanakoa/alpaca/services/mfa/services"
 	"github.com/kevinmichaelchen/my-go-utils/rabbitmq"
 	snowflakeUtils "github.com/kevinmichaelchen/my-go-utils/snowflake"
 	_ "github.com/lib/pq"

mfa/grpc/grpc_client.go → services/mfa/grpc/grpc_client.go

@@ -2,7 +2,7 @@ package grpc
 
 import (
 	"golang.org/x/net/context"
-	pb "github.com/hanakoa/alpaca/mfa/pb"
+	pb "github.com/hanakoa/alpaca/services/mfa/pb"
 	"fmt"
 	grpcUtils "github.com/kevinmichaelchen/my-go-utils/grpc"
 	"time"

mfa/grpc/grpc_server.go → services/mfa/grpc/grpc_server.go

@@ -7,13 +7,13 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 	"golang.org/x/net/context"
-	pb "github.com/hanakoa/alpaca/mfa/pb"
-	"github.com/hanakoa/alpaca/mfa/models"
+	pb "github.com/hanakoa/alpaca/services/mfa/pb"
+	"github.com/hanakoa/alpaca/services/mfa/models"
 	"database/sql"
 	"github.com/google/uuid"
 	"time"
 	"math/rand"
-	"github.com/hanakoa/alpaca/mfa/services"
+	"github.com/hanakoa/alpaca/services/mfa/services"
 )
 
 type GrpcServer struct {

mfa/main.go → services/mfa/main.go

@@ -4,8 +4,8 @@ import (
 	"database/sql"
 	"fmt"
 	"github.com/TeslaGov/envy"
-	"github.com/hanakoa/alpaca/mfa/grpc"
-	"github.com/hanakoa/alpaca/mfa/services"
+	"github.com/hanakoa/alpaca/services/mfa/grpc"
+	"github.com/hanakoa/alpaca/services/mfa/services"
 	sqlUtils "github.com/kevinmichaelchen/my-go-utils/sql"
 	"github.com/sfreiberg/gotwilio"
 	"log"

password-reset/Dockerfile → services/password-reset/Dockerfile

@@ -1,6 +1,6 @@
 FROM golang:1.10 as builder
 ADD . /go/src/github.com/hanakoa/alpaca
-WORKDIR /go/src/github.com/hanakoa/alpaca/password-reset
+WORKDIR /go/src/github.com/hanakoa/alpaca/services/password-reset
 RUN go get ./... && \
     CGO_ENABLED=0 GOOS=linux go build -a -o ./bin/alpaca-password-reset .
 
@@ -14,6 +14,6 @@ RUN apk --no-cache add ca-certificates
 #    addgroup -S -g $ALPACA_GID $ALPACA_GROUP && \
 #    adduser -S -u $ALPACA_UID -G $ALPACA_GROUP $ALPACA_USER
 WORKDIR /root/
-COPY --from=builder /go/src/github.com/hanakoa/alpaca/password-reset/bin/alpaca-password-reset .
+COPY --from=builder /go/src/github.com/hanakoa/alpaca/services/password-reset/bin/alpaca-password-reset .
 #USER $ALPACA_USER
 CMD ["./alpaca-password-reset"]

password-reset/app.go → services/password-reset/app.go

@@ -5,8 +5,8 @@ import (
 	"github.com/bwmarrin/snowflake"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
-	authGRPC "github.com/hanakoa/alpaca/auth/grpc"
-	"github.com/hanakoa/alpaca/password-reset/services"
+	authGRPC "github.com/hanakoa/alpaca/services/auth/grpc"
+	"github.com/hanakoa/alpaca/services/password-reset/services"
 	"github.com/kevinmichaelchen/my-go-utils/rabbitmq"
 	snowflakeUtils "github.com/kevinmichaelchen/my-go-utils/snowflake"
 	_ "github.com/lib/pq"

password-reset/main.go → services/password-reset/main.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"github.com/TeslaGov/envy"
-	authGRPC "github.com/hanakoa/alpaca/auth/grpc"
+	authGRPC "github.com/hanakoa/alpaca/services/auth/grpc"
 	sqlUtils "github.com/kevinmichaelchen/my-go-utils/sql"
 	"log"
 	"sync"

password-reset/main_test.go → services/password-reset/main_test.go

@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"encoding/json"
 	"github.com/TeslaGov/envy"
-	"github.com/hanakoa/alpaca/password-reset/services"
+	"github.com/hanakoa/alpaca/services/password-reset/services"
 	. "github.com/smartystreets/goconvey/convey"
 	"net/http"
 	"net/http/httptest"

password-reset/services/options.go → services/password-reset/services/options.go

@@ -11,7 +11,7 @@ import (
 	"time"
 	"encoding/json"
 	"net/http"
-	"github.com/hanakoa/alpaca/password-reset/models"
+	"github.com/hanakoa/alpaca/services/password-reset/models"
 	"github.com/ttacon/libphonenumber"
 )
 

password-reset/services/reset.go → services/password-reset/services/reset.go

@@ -11,8 +11,8 @@ import (
 	"github.com/badoux/checkmail"
 	"fmt"
 	"github.com/google/uuid"
-	authGRPC "github.com/hanakoa/alpaca/auth/grpc"
-	"github.com/hanakoa/alpaca/password-reset/models"
+	authGRPC "github.com/hanakoa/alpaca/services/auth/grpc"
+	"github.com/hanakoa/alpaca/services/password-reset/models"
 )
 
 type PasswordResetSvc struct {

password-reset/services/verify.go → services/password-reset/services/verify.go

@@ -6,7 +6,7 @@ import (
 	requestUtils "github.com/kevinmichaelchen/my-go-utils/request"
 	"fmt"
 	"net/http"
-	"github.com/hanakoa/alpaca/password-reset/models"
+	"github.com/hanakoa/alpaca/services/password-reset/models"
 	"github.com/google/uuid"
 )