Merge pull request #155 from cdr/config-git-host

Use git host from config and fix tests

Author: Nathan Potter

globalflags.go

@@ -43,7 +43,7 @@ func requireRepo(conf config, prefs schemaPrefs, fl *flag.FlagSet) repo {
 		flog.Fatal("Argument <repo> must be provided.")
 	}
 
-	r, err := parseRepo(defaultSchema(conf, prefs), repoURI)
+	r, err := parseRepo(defaultSchema(conf, prefs), conf.DefaultHost, repoURI)
 	if err != nil {
 		flog.Fatal("failed to parse repo %q: %v", repoURI, err)
 	}

hat-examples/net/Dockerfile

@@ -1,3 +1,3 @@
 FROM codercom/ubuntu-dev
 
-RUN sudo apt-get install -y nmap iperf netcat
+RUN sudo apt-get update && sudo apt-get install -y nmap iperf netcat

project_test.go

@@ -51,7 +51,7 @@ func Test_project(t *testing.T) {
 			rb := newRollback()
 			defer rb.run()
 
-			repo, err := parseRepo(test.schema, test.repo)
+			repo, err := parseRepo(test.schema, "github.com", test.repo)
 			require.NoError(t, err)
 
 			p := &project{

repo.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"net/url"
 	"path"
@@ -18,7 +19,11 @@ type repo struct {
 }
 
 func (r repo) CloneURI() string {
-	return r.String()
+	uri := r.String()
+	if !strings.HasSuffix(uri, ".git") {
+		return fmt.Sprintf("%s.git", uri)
+	}
+	return uri
 }
 
 func (r repo) DockerName() string {
@@ -38,9 +43,8 @@ func (r repo) BaseName() string {
 // parseRepo parses a reponame into a repo.
 // It can be a full url like https://github.com/cdr/sail or ssh://[email protected]/cdr/sail,
 // or just the path like cdr/sail and the host + schema will be inferred.
-// By default the host will always be inferred as github.com and the schema
-// will be the provided defaultSchema.
-func parseRepo(defaultSchema, name string) (repo, error) {
+// By default the host and the schema will be the provided defaultSchema.
+func parseRepo(defaultSchema, defaultHost, name string) (repo, error) {
 	u, err := url.Parse(name)
 	if err != nil {
 		return repo{}, xerrors.Errorf("failed to parse repo path: %w", err)
@@ -60,14 +64,16 @@ func parseRepo(defaultSchema, name string) (repo, error) {
 			r.Host = parts[0]
 			r.Path = strings.Join(parts[1:], "/")
 		} else {
-			// as a default case we assume github
-			r.Host = "github.com"
+			r.Host = defaultHost
 		}
 	}
 
 	// make sure path doesn't have a leading forward slash
 	r.Path = strings.TrimPrefix(r.Path, "/")
 
+	// make sure the path doesn't have a trailing .git
+	r.Path = strings.TrimSuffix(r.Path, ".git")
+
 	// non-existent or invalid path
 	if r.Path == "" || len(strings.Split(r.Path, "/")) != 2 {
 		return repo{}, xerrors.Errorf("invalid repo: %s", r.Path)

repo_test.go

@@ -10,6 +10,7 @@ import (
 func TestParseRepo(t *testing.T) {
 	var tests = []struct {
 		defSchema string
+		defHost   string
 		fullPath  string
 
 		expPath     string
@@ -21,48 +22,53 @@ func TestParseRepo(t *testing.T) {
 		// ensure default schema works as expected
 		{
 			"ssh",
+			"github.com",
 			"cdr/sail",
 			"cdr/sail",
 			"github.com",
 			"git",
 			"ssh",
-			"ssh://[email protected]/cdr/sail",
+			"ssh://[email protected]/cdr/sail.git",
 		},
 		// ensure default schemas works as expected
 		{
 			"http",
+			"github.com",
 			"cdr/sail",
 			"cdr/sail",
 			"github.com",
 			"",
 			"http",
-			"http://github.com/cdr/sail",
+			"http://github.com/cdr/sail.git",
 		},
 		// ensure default schemas works as expected
 		{
 			"https",
+			"github.com",
 			"cdr/sail",
 			"cdr/sail",
 			"github.com",
 			"",
 			"https",
-			"https://github.com/cdr/sail",
+			"https://github.com/cdr/sail.git",
 		},
 		// http url parses correctly
 		{
 			"https",
+			"github.com",
 			"https://github.com/cdr/sail",
 			"cdr/sail",
 			"github.com",
 			"",
 			"https",
-			"https://github.com/cdr/sail",
+			"https://github.com/cdr/sail.git",
 		},
 		// git url with username and without schema parses correctly
 		{
 			"ssh",
+			"github.com",
 			"[email protected]/cdr/sail.git",
-			"cdr/sail.git",
+			"cdr/sail",
 			"github.com",
 			"git",
 			"ssh",
@@ -71,17 +77,29 @@ func TestParseRepo(t *testing.T) {
 		// different default schema doesn't override given schema
 		{
 			"http",
+			"github.com",
 			"ssh://[email protected]/cdr/sail",
 			"cdr/sail",
 			"github.com",
 			"git",
 			"ssh",
-			"ssh://[email protected]/cdr/sail",
+			"ssh://[email protected]/cdr/sail.git",
+		},
+		// ensure custom host works
+		{
+			"https",
+			"my.private-git.com",
+			"private/repo",
+			"private/repo",
+			"my.private-git.com",
+			"",
+			"https",
+			"https://my.private-git.com/private/repo.git",
 		},
 	}
 
 	for _, test := range tests {
-		repo, err := parseRepo(test.defSchema, test.fullPath)
+		repo, err := parseRepo(test.defSchema, test.defHost, test.fullPath)
 		require.NoError(t, err)
 
 		assert.Equal(t, test.expPath, repo.Path, "expected path to be the same")

runner_test.go

@@ -8,7 +8,9 @@ import (
 )
 
 func Test_runner(t *testing.T) {
-	requireNoRunningSailContainers(t)
+	// Ensure that the testing environment won't conflict with any running sail projects.
+	requireProjectsNotRunning(t, "cdr/nbin", "cdr/flog", "cdr/bigdur", "cdr/sshcode")
+	requireUbuntuDevImage(t)
 
 	// labelChecker asserts that all of the correct labels
 	// are present on the image and container.
@@ -39,6 +41,15 @@ func Test_runner(t *testing.T) {
 		})
 	}
 
+	// codeServerStarts ensures that the code server process
+	// starts up inside the container.
+	codeServerStarts := func(t *testing.T, p *params) {
+		t.Run("CodeServerStarts", func(t *testing.T) {
+			err := p.proj.waitOnline()
+			require.NoError(t, err)
+		})
+	}
+
 	// loadFromContainer ensures that our state is properly stored
 	// on the container and can rebuild our in memory structures
 	// correctly.
@@ -62,36 +73,27 @@ func Test_runner(t *testing.T) {
 		})
 	}
 
-	// codeServerStarts ensures that the code server process
-	// starts up inside the container.
-	codeServerStarts := func(t *testing.T, p *params) {
-		t.Run("CodeServerStarts", func(t *testing.T) {
-			err := p.proj.waitOnline()
-			require.NoError(t, err)
-		})
-	}
-
-	run(t, "BaseImageNoHat", "codercom/retry", "",
+	run(t, "BaseImageNoHat", "https://github.com/cdr/nbin", "",
 		labelChecker,
-		loadFromContainer,
 		codeServerStarts,
+		loadFromContainer,
 	)
 
-	run(t, "BaseImageHat", "codercom/docs", "./hat-examples/fish",
+	run(t, "BaseImageHat", "https://github.com/cdr/flog", "./hat-examples/fish",
 		labelChecker,
-		loadFromContainer,
 		codeServerStarts,
+		loadFromContainer,
 	)
 
-	run(t, "ProjImageNoHat", "codercom/bigdur", "",
+	run(t, "ProjImageNoHat", "https://github.com/cdr/bigdur", "",
 		labelChecker,
-		loadFromContainer,
 		codeServerStarts,
+		loadFromContainer,
 	)
 
-	run(t, "ProjImageHat", "codercom/extip", "./hat-examples/net",
+	run(t, "ProjImageHat", "https://github.com/cdr/sshcode", "./hat-examples/net",
 		labelChecker,
-		loadFromContainer,
 		codeServerStarts,
+		loadFromContainer,
 	)
 }

sail_helpers_test.go

@@ -43,7 +43,7 @@ func run(t *testing.T, name, repo, hatPath string, fns ...func(t *testing.T, p *
 
 		conf := mustReadConfig(filepath.Join(metaRoot(), ".sail.toml"))
 
-		repo, err := parseRepo("ssh", repo)
+		repo, err := parseRepo("ssh", "github.com", repo)
 		require.NoError(t, err)
 
 		p.proj = &project{
@@ -115,11 +115,17 @@ func run(t *testing.T, name, repo, hatPath string, fns ...func(t *testing.T, p *
 	})
 }
 
-func requireNoRunningSailContainers(t *testing.T) {
-	cnts, err := listContainers()
+func requireProjectsNotRunning(t *testing.T, projects ...string) {
+	runningProjects, err := listProjects()
 	require.NoError(t, err)
-	if len(cnts) > 0 {
-		t.Fatal("Unable to run tests, Sail containers currently running")
+
+	for _, proj := range projects {
+		for _, runningProj := range runningProjects {
+			require.NotEqual(t,
+				proj, runningProj.name,
+				"Unable to run tests, %s currently running and needed for tests", proj,
+			)
+		}
 	}
 }
 
@@ -179,6 +185,10 @@ func requireContainerRemove(t *testing.T, cntName string) {
 	require.NoError(t, err)
 }
 
+func requireUbuntuDevImage(t *testing.T) {
+	require.NoError(t, ensureImage("codercom/ubuntu-dev"))
+}
+
 type rollback struct {
 	fns []func()
 }