go.mod: Append /v2 to module URL

Since crc uses v2.x version numbers, its module URL must end in /v2,
otherwise its code can't be reused in other modules. I got bitten by
this when I wanted to use some of the extraction code in vfkit tests.
go 1.20 either wants to use crc v1.x as this is what an unversioned
module URL refers to, and if I try to force the use of crc v2.x, it
errors out because the module URL is not what it expects:

$ go mod init example.com/crc-user
$ cat main.go
package main

import (
	"github.com/crc-org/crc/pkg/extract"
)

func main() {
	_ = extract.Uncompress("", "")
}

$ go mod tidy
go: finding module for package github.com/crc-org/crc/pkg/extract
go: found github.com/crc-org/crc/pkg/extract in github.com/crc-org/crc v1.99.4
go: example.com/crc-user imports
	github.com/crc-org/crc/pkg/extract: github.com/crc-org/[email protected]: parsing go.mod:
	module declares its path as: github.com/code-ready/crc
	        but was required as: github.com/crc-org/crc

$ go get github.com/crc-org/[email protected]
go: github.com/crc-org/[email protected]: invalid version: module contains a go.mod file, so module path must match major version ("github.com/crc-org/crc/v2")

I could not find other go code importing crc as a module, so this change
should not have a big impact.

Makefile

@@ -32,7 +32,7 @@ GOARCH ?= $(shell go env GOARCH)
 HOST_BUILD_DIR=$(BUILD_DIR)/$(GOOS)-$(GOARCH)
 GOPATH ?= $(shell go env GOPATH)
 ORG := github.com/crc-org
-REPOPATH ?= $(ORG)/crc
+MODULEPATH ?= $(ORG)/crc/v2
 PACKAGE_DIR := packaging/$(GOOS)
 
 SOURCES := $(shell git ls-files  *.go ":^vendor")
@@ -56,13 +56,13 @@ __check_defined = \
       $(error Undefined $1$(if $2, ($2))))
 
 # Linker flags
-VERSION_VARIABLES := -X $(REPOPATH)/pkg/crc/version.crcVersion=$(CRC_VERSION) \
-	-X $(REPOPATH)/pkg/crc/version.ocpVersion=$(OPENSHIFT_VERSION) \
-	-X $(REPOPATH)/pkg/crc/version.okdVersion=$(OKD_VERSION) \
-	-X $(REPOPATH)/pkg/crc/version.podmanVersion=$(PODMAN_VERSION) \
-	-X $(REPOPATH)/pkg/crc/version.microshiftVersion=$(MICROSHIFT_VERSION) \
-	-X $(REPOPATH)/pkg/crc/version.commitSha=$(COMMIT_SHA)
-RELEASE_VERSION_VARIABLES := -X $(REPOPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp
+VERSION_VARIABLES := -X $(MODULEPATH)/pkg/crc/version.crcVersion=$(CRC_VERSION) \
+	-X $(MODULEPATH)/pkg/crc/version.ocpVersion=$(OPENSHIFT_VERSION) \
+	-X $(MODULEPATH)/pkg/crc/version.okdVersion=$(OKD_VERSION) \
+	-X $(MODULEPATH)/pkg/crc/version.podmanVersion=$(PODMAN_VERSION) \
+	-X $(MODULEPATH)/pkg/crc/version.microshiftVersion=$(MICROSHIFT_VERSION) \
+	-X $(MODULEPATH)/pkg/crc/version.commitSha=$(COMMIT_SHA)
+RELEASE_VERSION_VARIABLES := -X $(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp
 
 # https://golang.org/cmd/link/
 LDFLAGS := $(VERSION_VARIABLES) ${GO_EXTRA_LDFLAGS}
@@ -183,9 +183,9 @@ build_e2e: $(SOURCES)
 .PHONY: build_integration
 build_integration: $(SOURCES)
 	GOARCH=amd64 GOOS=linux   go test ./test/integration/ -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -c -o $(BUILD_DIR)/linux-amd64/integration.test
-	GOARCH=amd64 GOOS=windows go test -tags "$(BUILDTAGS)" --ldflags="-X $(REPOPATH)/pkg/crc/version.installerBuild=true $(VERSION_VARIABLES)" ./test/integration/ -c -o $(BUILD_DIR)/windows-amd64/integration.test.exe
-	GOARCH=amd64 GOOS=darwin  go test -tags "$(BUILDTAGS)" --ldflags="-X $(REPOPATH)/pkg/crc/version.installerBuild=true $(VERSION_VARIABLES)" ./test/integration/ -c -o $(BUILD_DIR)/macos-amd64/integration.test
-	GOARCH=arm64 GOOS=darwin  go test -tags "$(BUILDTAGS)" --ldflags="-X $(REPOPATH)/pkg/crc/version.installerBuild=true $(VERSION_VARIABLES)" ./test/integration/ -c -o $(BUILD_DIR)/macos-arm64/integration.test
+	GOARCH=amd64 GOOS=windows go test -tags "$(BUILDTAGS)" --ldflags="-X $(MODULEPATH)/pkg/crc/version.installerBuild=true $(VERSION_VARIABLES)" ./test/integration/ -c -o $(BUILD_DIR)/windows-amd64/integration.test.exe
+	GOARCH=amd64 GOOS=darwin  go test -tags "$(BUILDTAGS)" --ldflags="-X $(MODULEPATH)/pkg/crc/version.installerBuild=true $(VERSION_VARIABLES)" ./test/integration/ -c -o $(BUILD_DIR)/macos-amd64/integration.test
+	GOARCH=arm64 GOOS=darwin  go test -tags "$(BUILDTAGS)" --ldflags="-X $(MODULEPATH)/pkg/crc/version.installerBuild=true $(VERSION_VARIABLES)" ./test/integration/ -c -o $(BUILD_DIR)/macos-arm64/integration.test
 
 #  Build the container image for e2e
 .PHONY: containerized_e2e
@@ -220,7 +220,7 @@ export BUNDLE_PATH = $(HOME)/Downloads/crc_libvirt_$(OPENSHIFT_VERSION)_$(GOARCH
 endif
 
 integration:
-	@go test -timeout=60m -tags "$(BUILDTAGS)" $(REPOPATH)/test/integration -v $(GINKGO_OPTS)
+	@go test -timeout=60m -tags "$(BUILDTAGS)" $(MODULEPATH)/test/integration -v $(GINKGO_OPTS)
 
 .PHONY: e2e ## Run e2e tests
 e2e:
@@ -238,20 +238,20 @@ ifndef VERSION_TO_TEST
 	VERSION_TO_TEST = --crc-version=$(CRC_VERSION)+$(COMMIT_SHA)
 endif
 e2e:
-	@go test --timeout=180m $(REPOPATH)/test/e2e -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -v $(PULL_SECRET_FILE) $(BUNDLE_LOCATION) $(CRC_BINARY) $(GODOG_OPTS) $(CLEANUP_HOME) $(VERSION_TO_TEST) $(INSTALLER_PATH) $(USER_PASSWORD)
+	@go test --timeout=180m $(MODULEPATH)/test/e2e -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -v $(PULL_SECRET_FILE) $(BUNDLE_LOCATION) $(CRC_BINARY) $(GODOG_OPTS) $(CLEANUP_HOME) $(VERSION_TO_TEST) $(INSTALLER_PATH) $(USER_PASSWORD)
 
 .PHONY: e2e-stories e2e-story-health e2e-story-marketplace e2e-story-registry
 # cluster must already be running, crc must be in the path
 e2e-stories: install e2e-story-health e2e-story-marketplace e2e-story-registry
 
 e2e-story-health: install
-	@go test $(REPOPATH)/test/e2e --ldflags="$(VERSION_VARIABLES)" -v $(CRC_BINARY) --godog.tags="$(GOOS) && ~@startstop && @story_health" --cleanup-home=false
+	@go test $(MODULEPATH)/test/e2e --ldflags="$(VERSION_VARIABLES)" -v $(CRC_BINARY) --godog.tags="$(GOOS) && ~@startstop && @story_health" --cleanup-home=false
 e2e-story-marketplace: install
-	@go test $(REPOPATH)/test/e2e --ldflags="$(VERSION_VARIABLES)" -v $(CRC_BINARY) --godog.tags="$(GOOS) && ~@startstop && @story_marketplace" --cleanup-home=false
+	@go test $(MODULEPATH)/test/e2e --ldflags="$(VERSION_VARIABLES)" -v $(CRC_BINARY) --godog.tags="$(GOOS) && ~@startstop && @story_marketplace" --cleanup-home=false
 e2e-story-registry: install
-	@go test $(REPOPATH)/test/e2e --ldflags="$(VERSION_VARIABLES)" -v $(CRC_BINARY) --godog.tags="$(GOOS) && ~@startstop && @story_registry" --cleanup-home=false
+	@go test $(MODULEPATH)/test/e2e --ldflags="$(VERSION_VARIABLES)" -v $(CRC_BINARY) --godog.tags="$(GOOS) && ~@startstop && @story_registry" --cleanup-home=false
 e2e-story-microshift: install
-	@go test $(REPOPATH)/test/e2e -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -v $(PULL_SECRET_FILE) $(BUNDLE_LOCATION) $(CRC_BINARY) --godog.tags="$(GOOS) && @microshift" --cleanup-home=false
+	@go test $(MODULEPATH)/test/e2e -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -v $(PULL_SECRET_FILE) $(BUNDLE_LOCATION) $(CRC_BINARY) --godog.tags="$(GOOS) && @microshift" --cleanup-home=false
 
 .PHONY: fmt
 fmt: $(TOOLS_BINDIR)/goimports
@@ -279,10 +279,10 @@ gen_release_info:
 linux-release-binary: LDFLAGS+= $(RELEASE_VERSION_VARIABLES)
 linux-release-binary: $(BUILD_DIR)/linux-amd64/crc
 
-macos-release-binary: LDFLAGS+= -X '$(REPOPATH)/pkg/crc/version.installerBuild=true' $(RELEASE_VERSION_VARIABLES)
+macos-release-binary: LDFLAGS+= -X '$(MODULEPATH)/pkg/crc/version.installerBuild=true' $(RELEASE_VERSION_VARIABLES)
 macos-release-binary: $(BUILD_DIR)/macos-universal/crc
 
-windows-release-binary: LDFLAGS+= -X '$(REPOPATH)/pkg/crc/version.installerBuild=true' $(RELEASE_VERSION_VARIABLES)
+windows-release-binary: LDFLAGS+= -X '$(MODULEPATH)/pkg/crc/version.installerBuild=true' $(RELEASE_VERSION_VARIABLES)
 windows-release-binary: $(BUILD_DIR)/windows-amd64/crc.exe
 
 .PHONY: release linux-release

cmd/crc-embedder/cmd/embed.go

@@ -8,12 +8,12 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/crc/logging"
-	"github.com/crc-org/crc/pkg/download"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/download"
 
-	"github.com/crc-org/crc/pkg/crc/machine/libvirt"
-	"github.com/crc-org/crc/pkg/crc/machine/vfkit"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/libvirt"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/vfkit"
 
 	"github.com/YourFin/binappend"
 	"github.com/spf13/cobra"

cmd/crc-embedder/cmd/extract.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/crc-org/crc/pkg/crc/logging"
-	"github.com/crc-org/crc/pkg/embed"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/embed"
 	"github.com/spf13/cobra"
 )
 

cmd/crc-embedder/cmd/list.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/YourFin/binappend"
-	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
 	"github.com/spf13/cobra"
 )
 

cmd/crc-embedder/cmd/root.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
 	"github.com/spf13/cobra"
 )
 

cmd/crc-embedder/crc-embedder.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/crc-org/crc/cmd/crc-embedder/cmd"
+	"github.com/crc-org/crc/v2/cmd/crc-embedder/cmd"
 )
 
 func main() {

cmd/crc/cmd/bundle/bundle.go

@@ -1,7 +1,7 @@
 package bundle
 
 import (
-	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/v2/pkg/crc/config"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/bundle/generate.go

@@ -1,10 +1,10 @@
 package bundle
 
 import (
-	"github.com/crc-org/crc/pkg/crc/config"
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/crc/logging"
-	"github.com/crc-org/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/v2/pkg/crc/config"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/crc/machine"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/cleanup.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"os"
 
-	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
-	"github.com/crc-org/crc/pkg/crc/preflight"
+	crcErrors "github.com/crc-org/crc/v2/pkg/crc/errors"
+	"github.com/crc-org/crc/v2/pkg/crc/preflight"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/config/config.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/v2/pkg/crc/config"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/config/get.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/crc-org/crc/pkg/crc/config"
-	"github.com/crc-org/crc/pkg/crc/telemetry"
+	"github.com/crc-org/crc/v2/pkg/crc/config"
+	"github.com/crc-org/crc/v2/pkg/crc/telemetry"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/config/set.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/crc-org/crc/pkg/crc/config"
-	"github.com/crc-org/crc/pkg/crc/telemetry"
+	"github.com/crc-org/crc/v2/pkg/crc/config"
+	"github.com/crc-org/crc/v2/pkg/crc/telemetry"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/config/unset.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/crc-org/crc/pkg/crc/config"
-	"github.com/crc-org/crc/pkg/crc/telemetry"
+	"github.com/crc-org/crc/v2/pkg/crc/config"
+	"github.com/crc-org/crc/v2/pkg/crc/telemetry"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/config/view.go

@@ -8,7 +8,7 @@ import (
 	"sort"
 	"text/template"
 
-	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/v2/pkg/crc/config"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/console.go

@@ -6,10 +6,10 @@ import (
 	"io"
 	"os"
 
-	"github.com/crc-org/crc/pkg/crc/api/client"
-	"github.com/crc-org/crc/pkg/crc/daemonclient"
-	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
-	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/v2/pkg/crc/api/client"
+	"github.com/crc-org/crc/v2/pkg/crc/daemonclient"
+	crcErrors "github.com/crc-org/crc/v2/pkg/crc/errors"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/state"
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
 )

cmd/crc/cmd/console_test.go

@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"testing"
 
-	apiTypes "github.com/crc-org/crc/pkg/crc/api/client"
-	"github.com/crc-org/crc/pkg/crc/daemonclient"
-	"github.com/crc-org/crc/pkg/crc/machine/fakemachine"
-	"github.com/crc-org/crc/pkg/crc/machine/state"
-	"github.com/crc-org/crc/pkg/crc/machine/types"
-	mocks "github.com/crc-org/crc/test/mocks/api"
+	apiTypes "github.com/crc-org/crc/v2/pkg/crc/api/client"
+	"github.com/crc-org/crc/v2/pkg/crc/daemonclient"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/fakemachine"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/state"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/types"
+	mocks "github.com/crc-org/crc/v2/test/mocks/api"
 	"github.com/stretchr/testify/assert"
 )
 

cmd/crc/cmd/daemon.go

@@ -14,13 +14,13 @@ import (
 
 	"github.com/containers/gvisor-tap-vsock/pkg/types"
 	"github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork"
-	"github.com/crc-org/crc/pkg/crc/adminhelper"
-	"github.com/crc-org/crc/pkg/crc/api"
-	"github.com/crc-org/crc/pkg/crc/api/events"
-	crcConfig "github.com/crc-org/crc/pkg/crc/config"
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/crc/daemonclient"
-	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/crc/adminhelper"
+	"github.com/crc-org/crc/v2/pkg/crc/api"
+	"github.com/crc-org/crc/v2/pkg/crc/api/events"
+	crcConfig "github.com/crc-org/crc/v2/pkg/crc/config"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/daemonclient"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
 	"github.com/docker/go-units"
 	"github.com/gorilla/handlers"
 	"github.com/pkg/errors"

cmd/crc/cmd/daemon_darwin.go

@@ -4,8 +4,8 @@ import (
 	"net"
 	"os"
 
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
 )
 
 func vsockListener() (net.Listener, error) {

cmd/crc/cmd/daemon_linux.go

@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/containers/gvisor-tap-vsock/pkg/transport"
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
 
 	"github.com/coreos/go-systemd/v22/activation"
 	"github.com/coreos/go-systemd/v22/daemon"

cmd/crc/cmd/daemon_windows.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/Microsoft/go-winio"
 	"github.com/containers/gvisor-tap-vsock/pkg/transport"
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
 )
 
 func vsockListener() (net.Listener, error) {

cmd/crc/cmd/delete.go

@@ -7,12 +7,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/crc-org/crc/pkg/crc/constants"
-	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
-	"github.com/crc-org/crc/pkg/crc/input"
-	"github.com/crc-org/crc/pkg/crc/logging"
-	"github.com/crc-org/crc/pkg/crc/machine"
-	crcos "github.com/crc-org/crc/pkg/os"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	crcErrors "github.com/crc-org/crc/v2/pkg/crc/errors"
+	"github.com/crc-org/crc/v2/pkg/crc/input"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
+	"github.com/crc-org/crc/v2/pkg/crc/machine"
+	crcos "github.com/crc-org/crc/v2/pkg/os"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/delete_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/crc-org/crc/pkg/crc/machine/fakemachine"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/fakemachine"
 	"github.com/stretchr/testify/assert"
 )
 

cmd/crc/cmd/oc_env.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/os/shell"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/os/shell"
 	"github.com/spf13/cobra"
 )
 

cmd/crc/cmd/podman_env.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/os/shell"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/os/shell"
 	"github.com/spf13/cobra"
 )