Move inc to cmd/inc

.github/workflows/tests.yml

@@ -261,11 +261,11 @@ jobs:
         run: |
             mkdir bin
 
-      - name: Build static incc
+      - name: Build static inc
         env:
           CGO_ENABLED: 0
         run: |
-          go build -o bin ./inc
+          go build -o bin ./cmd/inc
 
       - name: Build static incus-migrate
         if: runner.os == 'Linux'
@@ -282,7 +282,7 @@ jobs:
       - name: Unit tests (inc)
         env:
           CGO_ENABLED: 0
-        run: go test -v ./inc/...
+        run: go test -v ./cmd/inc/...
 
       - name: Unit tests (shared)
         env:

Makefile

@@ -37,7 +37,7 @@ endif
 
 .PHONY: client
 client:
-	go install -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./inc
+	go install -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./cmd/inc
 	@echo "Incus client built successfully"
 
 .PHONY: incus-agent
@@ -245,7 +245,7 @@ update-pot:
 ifeq "$(INCUS_OFFLINE)" ""
 	(cd / ; go install -v -x github.com/snapcore/snapd/i18n/[email protected])
 endif
-	xgettext-go -o po/$(DOMAIN).pot --add-comments-tag=TRANSLATORS: --sort-output --package-name=$(DOMAIN) [email protected] --keyword=i18n.G --keyword-plural=i18n.NG inc/*.go inc/*/*.go
+	xgettext-go -o po/$(DOMAIN).pot --add-comments-tag=TRANSLATORS: --sort-output --package-name=$(DOMAIN) [email protected] --keyword=i18n.G --keyword-plural=i18n.NG cmd/inc/*.go internal/cliconfig/*.go
 
 .PHONY: build-mo
 build-mo: $(MOFILES)
@@ -273,5 +273,5 @@ endif
 	run-parts --exit-on-error --regex '.sh' test/lint
 
 .PHONY: tags
-tags: *.go incus/*.go shared/*.go inc/*.go
+tags: *.go incus/*.go shared/*.go cmd/inc/*.go
 	find . -type f -name '*.go' | xargs gotags > tags

inc/action.go → cmd/inc/action.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	"github.com/cyphar/incus/shared/api"
 	cli "github.com/cyphar/incus/shared/cmd"

inc/copy.go → cmd/inc/copy.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/cyphar/incus/client"
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	"github.com/cyphar/incus/shared/api"
 	cli "github.com/cyphar/incus/shared/cmd"

inc/info.go → cmd/inc/info.go

@@ -10,7 +10,7 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/cyphar/incus/client"
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	"github.com/cyphar/incus/shared/api"
 	cli "github.com/cyphar/incus/shared/cmd"

inc/init.go → cmd/inc/init.go

@@ -10,7 +10,7 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/cyphar/incus/client"
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared/api"
 	cli "github.com/cyphar/incus/shared/cmd"
 	"github.com/cyphar/incus/shared/i18n"

inc/list.go → cmd/inc/list.go

@@ -12,8 +12,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/cyphar/incus/client"
-	"github.com/cyphar/incus/inc/config"
 	"github.com/cyphar/incus/incus/instance/instancetype"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	"github.com/cyphar/incus/shared/api"
 	cli "github.com/cyphar/incus/shared/cmd"

inc/main.go → cmd/inc/main.go

@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/cyphar/incus/client"
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	cli "github.com/cyphar/incus/shared/cmd"
 	"github.com/cyphar/incus/shared/i18n"

inc/main_aliases.go → cmd/inc/main_aliases.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	"github.com/cyphar/incus/shared/i18n"
 )

inc/main_test.go → cmd/inc/main_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 )
 
 type aliasTestcase struct {

inc/move.go → cmd/inc/move.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	"github.com/cyphar/incus/shared/api"
 	cli "github.com/cyphar/incus/shared/cmd"

inc/rebuild.go → cmd/inc/rebuild.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	"github.com/cyphar/incus/shared/api"
 	cli "github.com/cyphar/incus/shared/cmd"

inc/remote.go → cmd/inc/remote.go

@@ -15,7 +15,7 @@ import (
 	"golang.org/x/term"
 
 	"github.com/cyphar/incus/client"
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	"github.com/cyphar/incus/shared/api"
 	cli "github.com/cyphar/incus/shared/cmd"

inc/utils.go → cmd/inc/utils.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/cyphar/incus/client"
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared"
 	"github.com/cyphar/incus/shared/api"
 	"github.com/cyphar/incus/shared/i18n"

cmd/incus-benchmark/benchmark.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/cyphar/incus/client"
-	"github.com/cyphar/incus/inc/config"
+	config "github.com/cyphar/incus/internal/cliconfig"
 	"github.com/cyphar/incus/shared/api"
 	"github.com/cyphar/incus/shared/version"
 )

inc/config/cert.go → internal/cliconfig/cert.go

@@ -1,4 +1,4 @@
-package config
+package cliconfig
 
 import (
 	"fmt"

inc/config/config.go → internal/cliconfig/config.go

@@ -1,4 +1,4 @@
-package config
+package cliconfig
 
 import (
 	"encoding/json"

inc/config/default.go → internal/cliconfig/default.go

@@ -1,4 +1,4 @@
-package config
+package cliconfig
 
 // LocalRemote is the default local remote (over the LXD unix socket).
 var LocalRemote = Remote{

inc/config/errors.go → internal/cliconfig/errors.go

@@ -1,4 +1,4 @@
-package config
+package cliconfig
 
 import (
 	"fmt"

inc/config/file.go → internal/cliconfig/file.go

@@ -1,4 +1,4 @@
-package config
+package cliconfig
 
 import (
 	"fmt"

inc/config/remote.go → internal/cliconfig/remote.go

@@ -1,4 +1,4 @@
-package config
+package cliconfig
 
 import (
 	"crypto/x509"

test/lint/client-imports.sh

@@ -2,7 +2,7 @@
 
 echo "Checking for imports that have been added to client or shared..."
 
-OUT=$(go list -f '{{ join .Imports "\n" }}' ./client ./shared/api ./inc/config | grep -F . | sort -u | diff -u test/godeps.list - || true)
+OUT=$(go list -f '{{ join .Imports "\n" }}' ./client ./shared/api ./internal/cliconfig | grep -F . | sort -u | diff -u test/godeps.list - || true)
 if [ -n "${OUT}" ]; then
   echo "ERROR: you added a new dependency to the client or shared; please make sure this is what you want"
   echo "${OUT}"