Refactoring and test fixes. (#70)

* Refactoring and test fixes. * Increased coverage in service provider.
gaia-pipeline · Aug 6, 2018 · 52d975c · 52d975c
1 parent 81d8f41
commit 52d975c
Show file tree

Hide file tree

Showing 16 changed files with 298 additions and 177 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ GO_LDFLAGS_STATIC=-ldflags "-s -w -extldflags -static"
 default: dev
 
 dev:
-	go run ./cmd/gaia/main.go -homepath=${PWD}/tmp -dev=true -poll=true
+	go run ./cmd/gaia/main.go -homepath=${PWD}/tmp -dev=true
 
 compile_frontend:
 	cd ./frontend && \

diff --git a/handlers/pipeline_test.go b/handlers/pipeline_test.go
@@ -32,14 +32,10 @@ func (ms *mockScheduleService) SchedulePipeline(p *gaia.Pipeline) (*gaia.Pipelin
 }
 
 func TestPipelineGitLSRemote(t *testing.T) {
-	dataDir, err := ioutil.TempDir("", "temp")
-	if err != nil {
-		t.Fatalf("error creating data dir %v", err.Error())
-	}
+	dataDir, _ := ioutil.TempDir("", "TestPipelineGitLSRemote")
 
 	defer func() {
 		gaia.Cfg = nil
-		os.RemoveAll(dataDir)
 	}()
 
 	gaia.Cfg = &gaia.Config{
@@ -84,7 +80,7 @@ func TestPipelineGitLSRemote(t *testing.T) {
 	})
 
 	t.Run("otherwise succeed", func(t *testing.T) {
-		repoURL := "https://github.com/gaia-pipeline/gaia"
+		repoURL := "https://github.com/gaia-pipeline/pipeline-test"
 		body := map[string]string{
 			"url":      repoURL,
 			"username": "admin",
@@ -105,19 +101,20 @@ func TestPipelineGitLSRemote(t *testing.T) {
 }
 
 func TestPipelineUpdate(t *testing.T) {
-	dataDir, err := ioutil.TempDir("", "temp")
-	if err != nil {
-		t.Fatalf("error creating data dir %v", err.Error())
-	}
-	defer os.RemoveAll(dataDir)
+	tmp, _ := ioutil.TempDir("", "TestPipelineUpdate")
+	dataDir := tmp
 
 	gaia.Cfg = &gaia.Config{
-		Logger:   hclog.NewNullLogger(),
-		DataPath: dataDir,
+		Logger:       hclog.NewNullLogger(),
+		DataPath:     dataDir,
+		HomePath:     dataDir,
+		PipelinePath: dataDir,
 	}
 
 	// Initialize store
 	dataStore, _ := services.StorageService()
+	dataStore.Init()
+	defer func() { services.MockStorageService(nil) }()
 	// Initialize global active pipelines
 	ap := pipeline.NewActivePipelines()
 	pipeline.GlobalActivePipelines = ap
@@ -141,7 +138,7 @@ func TestPipelineUpdate(t *testing.T) {
 	}
 
 	// Add to store
-	err = dataStore.PipelinePut(&pipeline1)
+	err := dataStore.PipelinePut(&pipeline1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -190,24 +187,20 @@ func TestPipelineUpdate(t *testing.T) {
 }
 
 func TestPipelineDelete(t *testing.T) {
-	dataDir, err := ioutil.TempDir("", "temp")
-	if err != nil {
-		t.Fatalf("error creating data dir %v", err.Error())
-	}
-	defer os.RemoveAll(dataDir)
+	tmp, _ := ioutil.TempDir("", "TestPipelineDelete")
+	dataDir := tmp
 
 	gaia.Cfg = &gaia.Config{
 		Logger:       hclog.NewNullLogger(),
+		HomePath:     dataDir,
 		DataPath:     dataDir,
 		PipelinePath: dataDir,
 	}
 
 	// Initialize store
 	dataStore, _ := services.StorageService()
-	err = dataStore.Init()
-	if err != nil {
-		t.Fatalf("cannot initialize store: %v", err.Error())
-	}
+	dataStore.Init()
+	defer func() { services.MockStorageService(nil) }()
 
 	// Initialize global active pipelines
 	ap := pipeline.NewActivePipelines()
@@ -225,7 +218,7 @@ func TestPipelineDelete(t *testing.T) {
 	}
 
 	// Add to store
-	err = dataStore.PipelinePut(&p)
+	err := dataStore.PipelinePut(&p)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -274,8 +267,12 @@ func TestPipelineDelete(t *testing.T) {
 }
 
 func TestPipelineStart(t *testing.T) {
+	tmp, _ := ioutil.TempDir("", "TestPipelineStart")
 	gaia.Cfg = &gaia.Config{
-		Logger: hclog.NewNullLogger(),
+		Logger:       hclog.NewNullLogger(),
+		HomePath:     tmp,
+		DataPath:     tmp,
+		PipelinePath: tmp,
 	}
 
 	// Initialize global active pipelines

diff --git a/handlers/user_test.go b/handlers/user_test.go
@@ -9,7 +9,6 @@ import (
 	"net/http/httptest"
 
 	"io/ioutil"
-	"os"
 
 	"crypto/rand"
 	"crypto/rsa"
@@ -21,15 +20,11 @@ import (
 )
 
 func TestUserLoginHMACKey(t *testing.T) {
-
-	dataDir, err := ioutil.TempDir("", "hmac")
-	if err != nil {
-		t.Fatalf("error creating data dir %v", err.Error())
-	}
+	tmp, _ := ioutil.TempDir("", "TestUserLoginHMACKey")
+	dataDir := tmp
 
 	defer func() {
 		gaia.Cfg = nil
-		os.RemoveAll(dataDir)
 	}()
 
 	gaia.Cfg = &gaia.Config{
@@ -77,14 +72,11 @@ func TestUserLoginHMACKey(t *testing.T) {
 }
 
 func TestUserLoginRSAKey(t *testing.T) {
-	dataDir, err := ioutil.TempDir("", "rsa")
-	if err != nil {
-		t.Fatalf("error creating data dir %v", err.Error())
-	}
+	tmp, _ := ioutil.TempDir("", "TestUserLoginRSAKey")
+	dataDir := tmp
 
 	defer func() {
 		gaia.Cfg = nil
-		os.RemoveAll(dataDir)
 	}()
 
 	key, _ := rsa.GenerateKey(rand.Reader, 2048)

diff --git a/handlers/vault_test.go b/handlers/vault_test.go
@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"testing"
 
 	"github.com/gaia-pipeline/gaia"
@@ -16,14 +15,10 @@ import (
 )
 
 func TestVaultWorkflowAddListDelete(t *testing.T) {
-	dataDir, err := ioutil.TempDir("", "temp")
-	if err != nil {
-		t.Fatalf("error creating data dir %v", err.Error())
-	}
+	dataDir, _ := ioutil.TempDir("", "TestVaultWorkflowAddListDelete")
 
 	defer func() {
 		gaia.Cfg = nil
-		os.RemoveAll(dataDir)
 	}()
 
 	gaia.Cfg = &gaia.Config{
@@ -33,17 +28,15 @@ func TestVaultWorkflowAddListDelete(t *testing.T) {
 		VaultPath: dataDir,
 	}
 
-	dataStore, _ := services.StorageService()
-	err = dataStore.Init()
-	if err != nil {
-		t.Fatalf("cannot initialize store: %v", err.Error())
-	}
-
-	_, err = services.CertificateService()
+	ce, err := services.CertificateService()
 	if err != nil {
 		t.Fatalf("cannot initialize certificate service: %v", err.Error())
 	}
 
+	// Make sure the cert exists because if the service was alreay
+	// created, Init won't be called again.
+	ce.CreateSignedCert()
+
 	e := echo.New()
 	InitHandlers(e)
 	t.Run("can add secret", func(t *testing.T) {

diff --git a/pipeline/build_golang_test.go b/pipeline/build_golang_test.go
@@ -29,7 +29,7 @@ func (m *mockStorer) PipelinePut(p *gaia.Pipeline) error {
 }
 
 func TestPrepareEnvironmentGo(t *testing.T) {
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestPrepareEnvironmentGo")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	b := new(BuildPipelineGolang)
@@ -60,7 +60,7 @@ func TestExecuteBuildGo(t *testing.T) {
 	defer func() {
 		execCommandContext = exec.CommandContext
 	}()
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestExecuteBuildGo")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	b := new(BuildPipelineGolang)
@@ -117,7 +117,7 @@ func TestExecuteBuildContextTimeoutGo(t *testing.T) {
 		execCommandContext = exec.CommandContext
 		buildKillContext = false
 	}()
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestExecuteBuildContextTimeoutGo")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	// Initialize shared logger
@@ -139,7 +139,7 @@ func TestExecuteBuildContextTimeoutGo(t *testing.T) {
 }
 
 func TestExecuteBuildBinaryNotFoundErrorGo(t *testing.T) {
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestExecuteBuildBinaryNotFoundErrorGo")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	// Initialize shared logger
@@ -164,7 +164,7 @@ func TestExecuteBuildBinaryNotFoundErrorGo(t *testing.T) {
 }
 
 func TestCopyBinaryGo(t *testing.T) {
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestCopyBinaryGo")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	// Initialize shared logger
@@ -199,7 +199,7 @@ func TestCopyBinaryGo(t *testing.T) {
 }
 
 func TestCopyBinarySrcDoesNotExistGo(t *testing.T) {
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestCopyBinarySrcDoesNotExistGo")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	// Initialize shared logger

diff --git a/pipeline/build_java_test.go b/pipeline/build_java_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 func TestPrepareEnvironmentJava(t *testing.T) {
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestPrepareEnvironmentJava")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	b := new(BuildPipelineJava)
@@ -48,7 +48,7 @@ func TestExecuteBuildJava(t *testing.T) {
 	defer func() {
 		execCommandContext = exec.CommandContext
 	}()
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestExecuteBuildJava")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	b := new(BuildPipelineJava)
@@ -73,7 +73,7 @@ func TestExecuteBuildContextTimeoutJava(t *testing.T) {
 		execCommandContext = exec.CommandContext
 		buildKillContext = false
 	}()
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestExecuteBuildContextTimeoutJava")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	// Initialize shared logger
@@ -97,7 +97,7 @@ func TestExecuteBuildContextTimeoutJava(t *testing.T) {
 }
 
 func TestCopyBinaryJava(t *testing.T) {
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestCopyBinaryJava")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	// Initialize shared logger
@@ -134,7 +134,7 @@ func TestCopyBinaryJava(t *testing.T) {
 }
 
 func TestCopyBinarySrcDoesNotExistJava(t *testing.T) {
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestCopyBinarySrcDoesNotExistJava")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	// Initialize shared logger
@@ -169,7 +169,7 @@ func (m *javaMockStorer) PipelinePut(p *gaia.Pipeline) error {
 }
 
 func TestSavePipelineJava(t *testing.T) {
-	tmp := os.TempDir()
+	tmp, _ := ioutil.TempDir("", "TestSavePipelineJava")
 	gaia.Cfg = new(gaia.Config)
 	gaia.Cfg.HomePath = tmp
 	m := new(javaMockStorer)