Improve logging around deployments (#315)

Author: kegsay

internal/client/client.go

@@ -440,7 +440,7 @@ func (c *CSAPI) DoFunc(t *testing.T, method string, paths []string, opts ...Requ
 	}
 	// debug log the request
 	if c.Debug {
-		t.Logf("Making %s request to %s", method, req.URL)
+		t.Logf("Making %s request to %s (%s)", method, req.URL, c.AccessToken)
 		contentType := req.Header.Get("Content-Type")
 		if contentType == "application/json" || strings.HasPrefix(contentType, "text/") {
 			if req.Body != nil {

internal/config/config.go

@@ -38,7 +38,7 @@ type Complement struct {
 	CAPrivateKey  *rsa.PrivateKey
 }
 
-func NewConfigFromEnvVars() *Complement {
+func NewConfigFromEnvVars(pkgNamespace string) *Complement {
 	cfg := &Complement{}
 	cfg.BaseImageURI = os.Getenv("COMPLEMENT_BASE_IMAGE")
 	cfg.BaseImageArgs = strings.Split(os.Getenv("COMPLEMENT_BASE_IMAGE_ARGS"), " ")
@@ -62,12 +62,15 @@ func NewConfigFromEnvVars() *Complement {
 	if cfg.BaseImageURI == "" {
 		panic("COMPLEMENT_BASE_IMAGE must be set")
 	}
-	cfg.PackageNamespace = "pkg"
+	cfg.PackageNamespace = pkgNamespace
 
 	// create CA certs and keys
 	if err := cfg.GenerateCA(); err != nil {
 		panic("Failed to generate CA certificate/key: " + err.Error())
 	}
+	if cfg.PackageNamespace == "" {
+		panic("package namespace must be set")
+	}
 
 	return cfg
 }

internal/docker/builder.go

@@ -390,6 +390,9 @@ func createNetworkIfNotExists(docker *client.Client, pkgNamespace, blueprintName
 	}
 	// return the existing network
 	if len(nws) > 0 {
+		if len(nws) > 1 {
+			log.Printf("WARNING: createNetworkIfNotExists got %d networks for pkg=%s blueprint=%s", len(nws), pkgNamespace, blueprintName)
+		}
 		return nws[0].ID, nil
 	}
 	// make a user-defined network so we get DNS based on the container name

tests/csapi/main_test.go

@@ -27,8 +27,7 @@ var complementBuilder *docker.Builder
 // It will clean up any old containers/images/networks from the previous run, then run the tests, then clean up
 // again. No blueprints are made at this point as they are lazily made on demand.
 func TestMain(m *testing.M) {
-	cfg := config.NewConfigFromEnvVars()
-	cfg.PackageNamespace = "csapi"
+	cfg := config.NewConfigFromEnvVars("csapi")
 	log.Printf("config: %+v", cfg)
 	builder, err := docker.NewBuilder(cfg)
 	if err != nil {

tests/main_test.go

@@ -27,7 +27,7 @@ var complementBuilder *docker.Builder
 // It will clean up any old containers/images/networks from the previous run, then run the tests, then clean up
 // again. No blueprints are made at this point as they are lazily made on demand.
 func TestMain(m *testing.M) {
-	cfg := config.NewConfigFromEnvVars()
+	cfg := config.NewConfigFromEnvVars("fed")
 	log.Printf("config: %+v", cfg)
 	builder, err := docker.NewBuilder(cfg)
 	if err != nil {