Use import paths without `.git` suffix

Summary:
Now that our Phabricator instance handles `go get` requests, we can use
a path without the `.git` suffix as the canonical import path.

Test Plan: Run `go test ./...` and `go build`.

Reviewers: thcipriani, #release-engineering-team

Reviewed By: thcipriani, #release-engineering-team

Tags: #release-engineering-team

Differential Revision: https://phabricator.wikimedia.org/D780

20 files changed, 31 insertions, 30 deletions

diff --git a/Makefile b/Makefile
index b482cb3..bfd7ab8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 export GOPATH=$(CURDIR)/.build
-PACKAGE := phabricator.wikimedia.org/source/blubber.git
+PACKAGE := phabricator.wikimedia.org/source/blubber
 export BUILD_DIR=$(GOPATH)/src/$(PACKAGE)
 BINARY :=$(CURDIR)/bin/blubber
 
@@ -14,7 +14,7 @@ bin/blubber:
 	ln -s $(CURDIR) $(BUILD_DIR)
 	cd $(BUILD_DIR) && go get ./...
 	cd $(BUILD_DIR) && go build -v -i
-	mkdir -p $(CURDIR)/bin && mv $(BUILD_DIR)/blubber.git $(BINARY)
+	mkdir -p $(CURDIR)/bin && mv $(BUILD_DIR)/blubber $(BINARY)
 
 
 .PHONY: all clean
diff --git a/build/instructions_test.go b/build/instructions_test.go
index 04ebdfb..3b276a4 100644
--- a/build/instructions_test.go
+++ b/build/instructions_test.go
@@ -5,7 +5,7 @@ import (
 
 	"gopkg.in/stretchr/testify.v1/assert"
 
-	"phabricator.wikimedia.org/source/blubber.git/build"
+	"phabricator.wikimedia.org/source/blubber/build"
 )
 
 func TestRun(t *testing.T) {
diff --git a/config/apt.go b/config/apt.go
index 37a5c3e..e1f8f53 100644
--- a/config/apt.go
+++ b/config/apt.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"phabricator.wikimedia.org/source/blubber.git/build"
+	"phabricator.wikimedia.org/source/blubber/build"
 )
 
 type AptConfig struct {
diff --git a/config/apt_test.go b/config/apt_test.go
index 9e0e08c..e73a5c7 100644
--- a/config/apt_test.go
+++ b/config/apt_test.go
@@ -5,8 +5,8 @@ import (
 
 	"gopkg.in/stretchr/testify.v1/assert"
 
-	"phabricator.wikimedia.org/source/blubber.git/build"
-	"phabricator.wikimedia.org/source/blubber.git/config"
+	"phabricator.wikimedia.org/source/blubber/build"
+	"phabricator.wikimedia.org/source/blubber/config"
 )
 
 func TestAptConfig(t *testing.T) {
diff --git a/config/artifacts.go b/config/artifacts.go
index c3fad69..654f10f 100644
--- a/config/artifacts.go
+++ b/config/artifacts.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"phabricator.wikimedia.org/source/blubber.git/build"
+	"phabricator.wikimedia.org/source/blubber/build"
 )
 
 type ArtifactsConfig struct {
diff --git a/config/artifacts_test.go b/config/artifacts_test.go
index 9198d96..03fd684 100644
--- a/config/artifacts_test.go
+++ b/config/artifacts_test.go
@@ -5,8 +5,8 @@ import (
 
 	"gopkg.in/stretchr/testify.v1/assert"
 
-	"phabricator.wikimedia.org/source/blubber.git/build"
-	"phabricator.wikimedia.org/source/blubber.git/config"
+	"phabricator.wikimedia.org/source/blubber/build"
+	"phabricator.wikimedia.org/source/blubber/config"
 )
 
 func TestArtifactsConfig(t *testing.T) {
diff --git a/config/common.go b/config/common.go
index 454ae2e..dae0013 100644
--- a/config/common.go
+++ b/config/common.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"phabricator.wikimedia.org/source/blubber.git/build"
+	"phabricator.wikimedia.org/source/blubber/build"
 )
 
 type CommonConfig struct {
diff --git a/config/common_test.go b/config/common_test.go
index 69fb02d..673142f 100644
--- a/config/common_test.go
+++ b/config/common_test.go
@@ -5,7 +5,7 @@ import (
 
 	"gopkg.in/stretchr/testify.v1/assert"
 
-	"phabricator.wikimedia.org/source/blubber.git/config"
+	"phabricator.wikimedia.org/source/blubber/config"
 )
 
 func TestCommonConfig(t *testing.T) {
diff --git a/config/flag_test.go b/config/flag_test.go
index fb22647..3100d24 100644
--- a/config/flag_test.go
+++ b/config/flag_test.go
@@ -5,7 +5,7 @@ import (
 
 	"gopkg.in/stretchr/testify.v1/assert"
 
-	"phabricator.wikimedia.org/source/blubber.git/config"
+	"phabricator.wikimedia.org/source/blubber/config"
 )
 
 func TestFlagOverwrite(t *testing.T) {
diff --git a/config/node.go b/config/node.go
index e5cf763..90859e8 100644
--- a/config/node.go
+++ b/config/node.go
@@ -2,7 +2,7 @@ package config
 
 import (
 	"path"
-	"phabricator.wikimedia.org/source/blubber.git/build"
+	"phabricator.wikimedia.org/source/blubber/build"
 )
 
 type NodeConfig struct {
diff --git a/config/node_test.go b/config/node_test.go
index 13949de..cba6db8 100644
--- a/config/node_test.go
+++ b/config/node_test.go
@@ -5,8 +5,8 @@ import (
 
 	"gopkg.in/stretchr/testify.v1/assert"
 
-	"phabricator.wikimedia.org/source/blubber.git/build"
-	"phabricator.wikimedia.org/source/blubber.git/config"
+	"phabricator.wikimedia.org/source/blubber/build"
+	"phabricator.wikimedia.org/source/blubber/config"
 )
 
 func TestNodeConfig(t *testing.T) {
diff --git a/config/runs.go b/config/runs.go
index b8bf6af..6a176c3 100644
--- a/config/runs.go
+++ b/config/runs.go
@@ -3,7 +3,7 @@ package config
 import (
 	"strconv"
 
-	"phabricator.wikimedia.org/source/blubber.git/build"
+	"phabricator.wikimedia.org/source/blubber/build"
 )
 
 const LocalLibPrefix = "/opt/lib"
diff --git a/config/runs_test.go b/config/runs_test.go
index 457c09b..2d63b16 100644
--- a/config/runs_test.go
+++ b/config/runs_test.go
@@ -5,8 +5,8 @@ import (
 
 	"gopkg.in/stretchr/testify.v1/assert"
 
-	"phabricator.wikimedia.org/source/blubber.git/build"
-	"phabricator.wikimedia.org/source/blubber.git/config"
+	"phabricator.wikimedia.org/source/blubber/build"
+	"phabricator.wikimedia.org/source/blubber/config"
 )
 
 func TestRunsConfig(t *testing.T) {
diff --git a/config/variant.go b/config/variant.go
index dea45af..8e53b70 100644
--- a/config/variant.go
+++ b/config/variant.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"phabricator.wikimedia.org/source/blubber.git/build"
+	"phabricator.wikimedia.org/source/blubber/build"
 )
 
 type VariantConfig struct {
diff --git a/config/variant_test.go b/config/variant_test.go
index 1cf143f..982fa65 100644
--- a/config/variant_test.go
+++ b/config/variant_test.go
@@ -5,8 +5,8 @@ import (
 
 	"gopkg.in/stretchr/testify.v1/assert"
 
-	"phabricator.wikimedia.org/source/blubber.git/build"
-	"phabricator.wikimedia.org/source/blubber.git/config"
+	"phabricator.wikimedia.org/source/blubber/build"
+	"phabricator.wikimedia.org/source/blubber/config"
 )
 
 func TestVariantConfig(t *testing.T) {
diff --git a/docker/compiler.go b/docker/compiler.go
index d7043a0..e23731c 100644
--- a/docker/compiler.go
+++ b/docker/compiler.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"strings"
 
-	"phabricator.wikimedia.org/source/blubber.git/build"
-	"phabricator.wikimedia.org/source/blubber.git/config"
+	"phabricator.wikimedia.org/source/blubber/build"
+	"phabricator.wikimedia.org/source/blubber/config"
 )
 
 func Compile(cfg *config.Config, variant string) *bytes.Buffer {
diff --git a/docker/compiler_test.go b/docker/compiler_test.go
index 0d327cb..da2fe17 100644
--- a/docker/compiler_test.go
+++ b/docker/compiler_test.go
@@ -6,8 +6,8 @@ import (
 
 	"gopkg.in/stretchr/testify.v1/assert"
 
-	"phabricator.wikimedia.org/source/blubber.git/config"
-	"phabricator.wikimedia.org/source/blubber.git/docker"
+	"phabricator.wikimedia.org/source/blubber/config"
+	"phabricator.wikimedia.org/source/blubber/docker"
 )
 
 func TestSingleStageHasNoName(t *testing.T) {
diff --git a/docker/instructions.go b/docker/instructions.go
index 4edcb23..fa566cb 100644
--- a/docker/instructions.go
+++ b/docker/instructions.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"phabricator.wikimedia.org/source/blubber.git/build"
+	"phabricator.wikimedia.org/source/blubber/build"
 )
 
 func NewDockerInstruction(instruction build.Instruction) (DockerInstruction, error) {
diff --git a/docker/instructions_test.go b/docker/instructions_test.go
index 10cc1ab..4325cbd 100644
--- a/docker/instructions_test.go
+++ b/docker/instructions_test.go
@@ -4,8 +4,9 @@ import (
 	"testing"
 
 	"gopkg.in/stretchr/testify.v1/assert"
-	"phabricator.wikimedia.org/source/blubber.git/build"
-	"phabricator.wikimedia.org/source/blubber.git/docker"
+
+	"phabricator.wikimedia.org/source/blubber/build"
+	"phabricator.wikimedia.org/source/blubber/docker"
 )
 
 func TestRun(t *testing.T) {
diff --git a/main.go b/main.go
index 61eec13..68897c8 100644
--- a/main.go
+++ b/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 	"os"
-	"phabricator.wikimedia.org/source/blubber.git/config"
-	"phabricator.wikimedia.org/source/blubber.git/docker"
+	"phabricator.wikimedia.org/source/blubber/config"
+	"phabricator.wikimedia.org/source/blubber/docker"
 )
 
 func main() {