upd(all): refactor

- moved rbac store and config to internal pkg,
- split auth authenticators to internal pkg,
- add rbac config object to internal/config,
- update package imports and references for auth,
- clean up main with pkg aliases

cmd/auth/main.go

@@ -4,22 +4,24 @@ import (
 	"log"
 	"os"
 
-	"github.com/crusttech/crust/auth"
-	"github.com/crusttech/crust/rbac"
+	service "github.com/crusttech/crust/auth"
+
+	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/rbac"
 )
 
 func main() {
-	config := flags("auth", rbac.Flags, auth.FullFlags)
+	config := flags("auth", service.Flags, auth.Flags, rbac.Flags)
 
 	// log to stdout not stderr
 	log.SetOutput(os.Stdout)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 	go NewMonitor(config.monitorInterval)
 
-	if err := auth.Init(); err != nil {
+	if err := service.Init(); err != nil {
 		log.Fatalf("Error initializing auth: %+v", err)
 	}
-	if err := auth.Start(); err != nil {
+	if err := service.Start(); err != nil {
 		log.Fatalf("Error starting/running auth: %+v", err)
 	}
 }

cmd/crm/main.go

@@ -4,23 +4,24 @@ import (
 	"log"
 	"os"
 
-	"github.com/crusttech/crust/auth"
-	"github.com/crusttech/crust/crm"
-	"github.com/crusttech/crust/rbac"
+	service "github.com/crusttech/crust/crm"
+
+	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/rbac"
 )
 
 func main() {
-	config := flags("crm", crm.Flags, rbac.Flags, auth.Flags)
+	config := flags("crm", service.Flags, auth.Flags, rbac.Flags)
 
 	// log to stdout not stderr
 	log.SetOutput(os.Stdout)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 	go NewMonitor(config.monitorInterval)
 
-	if err := crm.Init(); err != nil {
+	if err := service.Init(); err != nil {
 		log.Fatalf("Error initializing crm: %+v", err)
 	}
-	if err := crm.Start(); err != nil {
+	if err := service.Start(); err != nil {
 		log.Fatalf("Error starting/running crm: %+v", err)
 	}
 }

cmd/sam/main.go

@@ -1,36 +1,27 @@
 package main
 
 import (
-	"github.com/crusttech/crust/auth"
-	"github.com/crusttech/crust/rbac"
-
-	"github.com/crusttech/crust/sam"
-
 	"log"
 	"os"
+
+	service "github.com/crusttech/crust/sam"
+
+	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/rbac"
 )
 
-func handleError(err error, message string) {
-	if message == "" {
-		message = "Error making API call"
-	}
-	if err != nil {
-		log.Fatalf(message+": %v", err.Error())
-	}
-}
-
 func main() {
-	config := flags("sam", sam.Flags, auth.Flags, rbac.Flags)
+	config := flags("sam", service.Flags, auth.Flags, rbac.Flags)
 
 	// log to stdout not stderr
 	log.SetOutput(os.Stdout)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 	go NewMonitor(config.monitorInterval)
 
-	if err := sam.Init(); err != nil {
+	if err := service.Init(); err != nil {
 		log.Fatalf("Error initializing sam: %+v", err)
 	}
-	if err := sam.Start(); err != nil {
+	if err := service.Start(); err != nil {
 		log.Fatalf("Error starting/running sam: %+v", err)
 	}
 }