feat(builder): fmt code and add create_bucket script

Author: duanhongyi

boot.go

@@ -14,11 +14,11 @@ import (
 	"github.com/drycc/builder/pkg/conf"
 	"github.com/drycc/builder/pkg/gitreceive"
 	"github.com/drycc/builder/pkg/healthsrv"
+	"github.com/drycc/builder/pkg/k8s"
 	"github.com/drycc/builder/pkg/sshd"
 	"github.com/drycc/builder/pkg/sys"
 	pkglog "github.com/drycc/pkg/log"
 	"github.com/kelseyhightower/envconfig"
-	"github.com/drycc/builder/pkg/k8s"
 )
 
 const (

pkg/cleaner/cleaner.go

@@ -3,13 +3,13 @@
 package cleaner
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"time"
-	"context"
 
 	//"github.com/docker/distribution/context"
 	storagedriver "github.com/docker/distribution/registry/storage/driver"

pkg/gitreceive/build.go

@@ -2,15 +2,16 @@ package gitreceive
 
 import (
 	"bytes"
+	ctx "context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strings"
-	ctx "context"
 
 	"github.com/docker/distribution/context"
 	storagedriver "github.com/docker/distribution/registry/storage/driver"
@@ -23,9 +24,10 @@ import (
 	"github.com/drycc/controller-sdk-go/hooks"
 	"github.com/drycc/pkg/log"
 	"gopkg.in/yaml.v2"
-	"k8s.io/client-go/kubernetes"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/kubernetes/scheme"
 )
 
 // repoCmd returns exec.Command(first, others...) with its current working directory repoDir
@@ -57,6 +59,9 @@ func build(
 	builderKey,
 	rawGitSha string) error {
 
+	// Rewrite regular expression, compatible with slug type
+	storagedriver.PathRegexp = regexp.MustCompile(`^([A-Za-z0-9._:-]*(/[A-Za-z0-9._:-]+)*)+$`)
+
 	dockerBuilderImagePullPolicy, err := k8s.PullPolicyFromString(conf.DockerBuilderImagePullPolicy)
 	if err != nil {
 		return err
@@ -222,6 +227,7 @@ func build(
 	}
 
 	log.Info("Starting build... but first, coffee!")
+	log.Debug("Use image %s: %s", stack["name"], stack["image"])
 	log.Debug("Starting pod %s", buildPodName)
 	json, err := prettyPrintJSON(pod)
 	if err == nil {
@@ -249,7 +255,7 @@ func build(
 	req := kubeClient.CoreV1().RESTClient().Get().Namespace(newPod.Namespace).Name(newPod.Name).Resource("pods").SubResource("log").VersionedParams(
 		&corev1.PodLogOptions{
 			Follow: true,
-		}, metav1.ParameterCodec)
+		}, scheme.ParameterCodec)
 
 	rc, err := req.Stream(ctx.TODO())
 	if err != nil {

pkg/gitreceive/build_test.go

@@ -2,15 +2,15 @@ package gitreceive
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
+	"github.com/arschles/assert"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"testing"
-	"context"
-	"github.com/arschles/assert"
 	//"github.com/docker/distribution/context"
 	"github.com/docker/distribution/registry/storage/driver/factory"
 	_ "github.com/docker/distribution/registry/storage/driver/inmemory"

pkg/gitreceive/build_type.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/drycc/controller-sdk-go/api"
+	"github.com/drycc/pkg/log"
 	"io/ioutil"
 	"os"
 	"strings"
@@ -60,6 +61,8 @@ func getStack(dirName string, config api.Config) map[string]string {
 	if len(Stacks) == 0 {
 		initStack()
 	}
+	log.Debug("Stacks: %s", Stacks)
+	log.Debug("Config values %s", config.Values)
 	if stackInterface, ok := config.Values["DRYCC_STACK"]; ok {
 		if strStack, ok := stackInterface.(string); ok {
 			for _, stack := range Stacks {

pkg/gitreceive/k8s_util.go

@@ -8,11 +8,11 @@ import (
 
 	"github.com/drycc/builder/pkg/k8s"
 	"github.com/pborman/uuid"
-	"k8s.io/apimachinery/pkg/util/wait"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/util/wait"
 	typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 )
 
@@ -66,7 +66,7 @@ func dockerBuilderPod(
 	registryEnv map[string]string,
 	pullPolicy corev1.PullPolicy,
 	nodeSelector map[string]string,
-//) *api.Pod {
+	//) *api.Pod {
 ) *corev1.Pod {
 
 	pod := buildPod(debug, name, namespace, pullPolicy, nodeSelector, env)

pkg/gitreceive/registry.go

@@ -1,11 +1,11 @@
 package gitreceive
 
 import (
-	"strings"
 	"context"
+	"strings"
 
-	typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 )
 
 const (

pkg/healthsrv/healthz_handler_test.go

@@ -2,14 +2,14 @@ package healthsrv
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
-	"context"
 	//"github.com/docker/distribution/context"
 
 	"github.com/arschles/assert"

pkg/healthsrv/namespace_lister.go

@@ -14,7 +14,7 @@ import (
 // for unit tests.
 type NamespaceLister interface {
 	// List lists all namespaces that are selected by the given label and field selectors.
-    List(ctx context.Context, opts metav1.ListOptions) (*corev1.NamespaceList, error)
+	List(ctx context.Context, opts metav1.ListOptions) (*corev1.NamespaceList, error)
 }
 
 type emptyNamespaceLister struct{}
@@ -31,7 +31,6 @@ func (e errNamespaceLister) List(ctx context.Context, opts metav1.ListOptions) (
 	return nil, e.err
 }
 
-
 // listNamespaces calls nl.List(...) and sends the results back on the various given channels.
 // This func is intended to be run in a goroutine and communicates via the channels it's passed.
 //

pkg/k8s/client.go

@@ -17,4 +17,4 @@ func NewInCluster() (*kubernetes.Clientset, error) {
 		panic(err.Error())
 	}
 	return clientset, nil
-}
+}