Merge pull request #791 from arithx/bump_go_mod_vers

*: bump import path
coreos · Apr 10, 2019 · 32c77e3 · 32c77e3
2 parents 4f1a372 + bb6182a
commit 32c77e3
Show file tree

Hide file tree

Showing 162 changed files with 467 additions and 467 deletions.
diff --git a/build b/build
@@ -6,7 +6,7 @@ export GO111MODULE=on
 
 NAME="ignition"
 ORG_PATH="github.com/coreos"
-REPO_PATH="${ORG_PATH}/${NAME}"
+REPO_PATH="${ORG_PATH}/${NAME}/v2"
 GLDFLAGS=${GLDFLAGS:-}
 GOFLAGS=-mod=vendor
 
@@ -15,7 +15,7 @@ if [ -z ${VERSION+a} ]; then
 	VERSION=$(git describe --dirty)
 fi
 
-GLDFLAGS+="-X github.com/coreos/ignition/internal/version.Raw=${VERSION}"
+GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/version.Raw=${VERSION}"
 
 eval $(go env)
 

diff --git a/build_blackbox_tests b/build_blackbox_tests
@@ -6,9 +6,9 @@ set -eu
 # tests will be run and where the stubs will be located, rely on the bb test caller setting up
 # their PATH to include them. We don't need to include `id` because it gets copied into the
 # system
-GLDFLAGS="-X github.com/coreos/ignition/internal/distro.useraddCmd=useradd-stub "
-GLDFLAGS+="-X github.com/coreos/ignition/internal/distro.usermodCmd=usermod-stub "
-GLDFLAGS+="-X github.com/coreos/ignition/internal/distro.blackboxTesting=true "
+GLDFLAGS="-X github.com/coreos/ignition/v2/internal/distro.useraddCmd=useradd-stub "
+GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/distro.usermodCmd=usermod-stub "
+GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/distro.blackboxTesting=true "
 
 . build
 

diff --git a/build_releases b/build_releases
@@ -12,7 +12,7 @@ if [ -z ${VERSION+a} ]; then
 	VERSION=$(git describe --dirty)
 fi
 
-GLDFLAGS+="-X github.com/coreos/ignition/internal/version.Raw=${VERSION}"
+GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/version.Raw=${VERSION}"
 
 if [[ -n "$(git status -s)" ]]; then
     echo "git repo not clean"

diff --git a/config/config.go b/config/config.go
@@ -15,14 +15,14 @@
 package config
 
 import (
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/v3_0"
-	types_3_0 "github.com/coreos/ignition/config/v3_0/types"
-	"github.com/coreos/ignition/config/v3_1_experimental"
-	trans_exp "github.com/coreos/ignition/config/v3_1_experimental/translate"
-	types_exp "github.com/coreos/ignition/config/v3_1_experimental/types"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/util"
+	"github.com/coreos/ignition/v2/config/v3_0"
+	types_3_0 "github.com/coreos/ignition/v2/config/v3_0/types"
+	"github.com/coreos/ignition/v2/config/v3_1_experimental"
+	trans_exp "github.com/coreos/ignition/v2/config/v3_1_experimental/translate"
+	types_exp "github.com/coreos/ignition/v2/config/v3_1_experimental/types"
+	"github.com/coreos/ignition/v2/config/validate/report"
 
 	"github.com/coreos/go-semver/semver"
 )

diff --git a/config/config_test.go b/config/config_test.go
@@ -19,8 +19,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/ignition/config/util"
-	v3_0 "github.com/coreos/ignition/config/v3_0/types"
+	"github.com/coreos/ignition/v2/config/util"
+	v3_0 "github.com/coreos/ignition/v2/config/v3_0/types"
 )
 
 func testConfigType(t reflect.Type) error {

diff --git a/config/merge/merge.go b/config/merge/merge.go
@@ -17,7 +17,7 @@ package merge
 import (
 	"reflect"
 
-	"github.com/coreos/ignition/config/util"
+	"github.com/coreos/ignition/v2/config/util"
 )
 
 // Rules of Config Merging:

diff --git a/config/merge/merge_test.go b/config/merge/merge_test.go
@@ -18,8 +18,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/v3_0/types"
+	"github.com/coreos/ignition/v2/config/util"
+	"github.com/coreos/ignition/v2/config/v3_0/types"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/config/shared/validations/unit.go b/config/shared/validations/unit.go
@@ -18,8 +18,8 @@ package validations
 
 import (
 	"github.com/coreos/go-systemd/unit"
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 // ValidateInstallSection is a helper to validate a given unit

diff --git a/config/translate/translate.go b/config/translate/translate.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/coreos/ignition/config/util"
+	"github.com/coreos/ignition/v2/config/util"
 )
 
 /*

diff --git a/config/translate/translate_test.go b/config/translate/translate_test.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/ignition/config/translate/tests/pkga"
-	"github.com/coreos/ignition/config/translate/tests/pkgb"
+	"github.com/coreos/ignition/v2/config/translate/tests/pkga"
+	"github.com/coreos/ignition/v2/config/translate/tests/pkgb"
 )
 
 // Note: we need different input and output types which unfortunately means a lot of tests

diff --git a/config/util/parsingErrors.go b/config/util/parsingErrors.go
@@ -15,9 +15,9 @@
 package util
 
 import (
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
-	"github.com/coreos/ignition/config/validate/util"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
+	"github.com/coreos/ignition/v2/config/validate/util"
 
 	json "github.com/ajeddeloh/go-json"
 )

diff --git a/config/v3_0/config.go b/config/v3_0/config.go
@@ -17,12 +17,12 @@ package v3_0
 import (
 	"reflect"
 
-	"github.com/coreos/ignition/config/merge"
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/v3_0/types"
-	"github.com/coreos/ignition/config/validate"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/merge"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/util"
+	"github.com/coreos/ignition/v2/config/v3_0/types"
+	"github.com/coreos/ignition/v2/config/validate"
+	"github.com/coreos/ignition/v2/config/validate/report"
 
 	"github.com/coreos/go-semver/semver"
 )

diff --git a/config/v3_0/config_test.go b/config/v3_0/config_test.go
@@ -17,8 +17,8 @@ package v3_0
 import (
 	"testing"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/v3_0/types"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/v3_0/types"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/config/v3_0/types/ca.go b/config/v3_0/types/ca.go
@@ -15,7 +15,7 @@
 package types
 
 import (
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (c CaReference) Key() string {

diff --git a/config/v3_0/types/config.go b/config/v3_0/types/config.go
@@ -17,7 +17,7 @@ package types
 import (
 	"github.com/coreos/go-semver/semver"
 
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 var (

diff --git a/config/v3_0/types/directory.go b/config/v3_0/types/directory.go
@@ -15,8 +15,8 @@
 package types
 
 import (
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (d Directory) ValidateMode() (r report.Report) {

diff --git a/config/v3_0/types/disk.go b/config/v3_0/types/disk.go
@@ -15,8 +15,8 @@
 package types
 
 import (
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (d Disk) Key() string {

diff --git a/config/v3_0/types/file.go b/config/v3_0/types/file.go
@@ -17,8 +17,8 @@ package types
 import (
 	"fmt"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (f File) ValidateMode() (r report.Report) {

diff --git a/config/v3_0/types/file_test.go b/config/v3_0/types/file_test.go
@@ -18,9 +18,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/util"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func TestFileValidateOverwrite(t *testing.T) {

diff --git a/config/v3_0/types/filesystem.go b/config/v3_0/types/filesystem.go
@@ -15,8 +15,8 @@
 package types
 
 import (
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (f Filesystem) Key() string {

diff --git a/config/v3_0/types/filesystem_test.go b/config/v3_0/types/filesystem_test.go
@@ -18,9 +18,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/util"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func TestFilesystemValidateFormat(t *testing.T) {

diff --git a/config/v3_0/types/ignition.go b/config/v3_0/types/ignition.go
@@ -17,8 +17,8 @@ package types
 import (
 	"github.com/coreos/go-semver/semver"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (c ConfigReference) Key() string {

diff --git a/config/v3_0/types/mode.go b/config/v3_0/types/mode.go
@@ -15,7 +15,7 @@
 package types
 
 import (
-	"github.com/coreos/ignition/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/shared/errors"
 )
 
 func validateMode(m *int) error {

diff --git a/config/v3_0/types/mode_test.go b/config/v3_0/types/mode_test.go
@@ -18,8 +18,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/util"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/util"
 )
 
 func TestModeValidate(t *testing.T) {

diff --git a/config/v3_0/types/node.go b/config/v3_0/types/node.go
@@ -17,8 +17,8 @@ package types
 import (
 	"path/filepath"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (n Node) Key() string {

diff --git a/config/v3_0/types/node_test.go b/config/v3_0/types/node_test.go
@@ -18,9 +18,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/util"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func TestNodeValidatePath(t *testing.T) {

diff --git a/config/v3_0/types/partition.go b/config/v3_0/types/partition.go
@@ -19,8 +19,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 const (

diff --git a/config/v3_0/types/partition_test.go b/config/v3_0/types/partition_test.go
@@ -18,9 +18,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/util"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func TestValidateLabel(t *testing.T) {

diff --git a/config/v3_0/types/path.go b/config/v3_0/types/path.go
@@ -17,7 +17,7 @@ package types
 import (
 	"path"
 
-	"github.com/coreos/ignition/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/shared/errors"
 )
 
 func validatePath(p string) error {

diff --git a/config/v3_0/types/path_test.go b/config/v3_0/types/path_test.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/ignition/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/shared/errors"
 )
 
 func TestPathValidate(t *testing.T) {

diff --git a/config/v3_0/types/raid.go b/config/v3_0/types/raid.go
@@ -15,8 +15,8 @@
 package types
 
 import (
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (r Raid) Key() string {

diff --git a/config/v3_0/types/storage.go b/config/v3_0/types/storage.go
@@ -17,8 +17,8 @@ package types
 import (
 	"strings"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (s Storage) MergedKeys() map[string]string {

diff --git a/config/v3_0/types/storage_test.go b/config/v3_0/types/storage_test.go
@@ -18,8 +18,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func TestStorageValidate(t *testing.T) {

diff --git a/config/v3_0/types/unit.go b/config/v3_0/types/unit.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/coreos/go-systemd/unit"
 
-	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/shared/validations"
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/coreos/ignition/v2/config/shared/errors"
+	"github.com/coreos/ignition/v2/config/shared/validations"
+	"github.com/coreos/ignition/v2/config/validate/report"
 )
 
 func (u Unit) Key() string {
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ import ( @@
     	"fmt"
     	"reflect"
-    	"github.com/coreos/ignition/config/util"
+    	"github.com/coreos/ignition/v2/config/util"
     )
     /*
@@ Expand Down @@