api,config,sign: Organize bootcfg packages together

bootcfg/api/cloud.go

@@ -51,7 +51,7 @@ func cloudHandler(store Store) ContextHandler {
 
 		config := buf.String()
 		if !cloudinit.IsCloudConfig(config) && !cloudinit.IsScript(config) {
-			log.Errorf("error parsing user-data")
+			log.Error("error parsing user-data")
 			http.NotFound(w, req)
 			return
 		}

bootcfg/api/server.go

@@ -3,7 +3,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/coreos/coreos-baremetal/sign"
+	"github.com/coreos/coreos-baremetal/bootcfg/sign"
 	"github.com/coreos/pkg/capnslog"
 )
 
@@ -12,7 +12,7 @@ const (
 	APIVersion = "v1alpha1"
 )
 
-var log = capnslog.NewPackageLogger("github.com/coreos/coreos-baremetal", "api")
+var log = capnslog.NewPackageLogger("github.com/coreos/coreos-baremetal/bootcfg", "api")
 
 // Config configures the api Server.
 type Config struct {

bootcfg/config/config.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/coreos/coreos-baremetal/api"
+	"github.com/coreos/coreos-baremetal/bootcfg/api"
 	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
 	"github.com/satori/go.uuid"
 	"gopkg.in/yaml.v2"

bootcfg/config/config_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/coreos-baremetal/api"
+	"github.com/coreos/coreos-baremetal/bootcfg/api"
 	"github.com/stretchr/testify/assert"
 )
 

cmd/bootcfg-rpc/main.go

@@ -11,10 +11,10 @@ import (
 	"github.com/coreos/pkg/flagutil"
 	"google.golang.org/grpc"
 
+	"github.com/coreos/coreos-baremetal/bootcfg/config"
 	bootcfg "github.com/coreos/coreos-baremetal/bootcfg/server"
 	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
 	"github.com/coreos/coreos-baremetal/bootcfg/storage"
-	"github.com/coreos/coreos-baremetal/config"
 )
 
 var (

cmd/bootcfg/main.go

@@ -11,9 +11,9 @@ import (
 	"github.com/coreos/pkg/capnslog"
 	"github.com/coreos/pkg/flagutil"
 
-	"github.com/coreos/coreos-baremetal/api"
-	"github.com/coreos/coreos-baremetal/config"
-	"github.com/coreos/coreos-baremetal/sign"
+	"github.com/coreos/coreos-baremetal/bootcfg/api"
+	"github.com/coreos/coreos-baremetal/bootcfg/config"
+	"github.com/coreos/coreos-baremetal/bootcfg/sign"
 )
 
 var (
@@ -79,7 +79,7 @@ func main() {
 	// logging setup
 	lvl, err := capnslog.ParseLevel(strings.ToUpper(flags.logLevel))
 	if err != nil {
-		log.Fatalf("Invalid log-level: %v", err.Error())
+		log.Fatalf("invalid log-level: %v", err)
 	}
 	capnslog.SetGlobalLogLevel(lvl)
 	capnslog.SetFormatter(capnslog.NewPrettyFormatter(os.Stdout, false))