Merge pull request #1652 from stgraber/main

Move generators to the cmd package
lxc · Feb 12, 2025 · d1cd220 · d1cd220
2 parents 2c48e53 + 45d911a
commit d1cd220
Show file tree

Hide file tree

Showing 27 changed files with 16 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -127,7 +127,7 @@ update-protobuf:
 
 .PHONY: update-schema
 update-schema:
-	cd internal/server/db/generate && $(GO) build -o $(GOPATH)/bin/incus-generate -tags "$(TAG_SQLITE3)" $(DEBUG) && cd -
+	cd cmd/generate-database && $(GO) build -o $(GOPATH)/bin/incus-generate -tags "$(TAG_SQLITE3)" $(DEBUG) && cd -
 	$(GO) generate ./...
 	gofmt -s -w ./internal/server/db/
 	goimports -w ./internal/server/db/
@@ -143,7 +143,7 @@ endif
 .PHONY: update-metadata
 update-metadata: build
 	@echo "Generating golang documentation metadata"
-	cd internal/server/config/generate && CGO_ENABLED=0 $(GO) build -o $(GOPATH)/bin/incus-doc
+	cd cmd/generate-config && CGO_ENABLED=0 $(GO) build -o $(GOPATH)/bin/incus-doc
 	$(GOPATH)/bin/incus-doc . --json ./internal/server/metadata/configuration.json --txt ./doc/config_options.txt
 
 .PHONY: doc-setup

diff --git a/internal/server/config/generate/README.md → cmd/generate-config/README.md b/internal/server/config/generate/README.md → cmd/generate-config/README.md
diff --git a/internal/server/config/generate/incus_doc.go → cmd/generate-config/incus_doc.go b/internal/server/config/generate/incus_doc.go → cmd/generate-config/incus_doc.go
diff --git a/.../server/config/generate/incus_doc_test.go → cmd/generate-config/incus_doc_test.go b/.../server/config/generate/incus_doc_test.go → cmd/generate-config/incus_doc_test.go
diff --git a/internal/server/config/generate/main.go → cmd/generate-config/main.go b/internal/server/config/generate/main.go → cmd/generate-config/main.go
diff --git a/internal/server/db/generate/README.md → cmd/generate-database/README.md b/internal/server/db/generate/README.md → cmd/generate-database/README.md
diff --git a/internal/server/db/generate/db.go → cmd/generate-database/db.go b/internal/server/db/generate/db.go → cmd/generate-database/db.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/lxc/incus/v6/internal/server/db/generate/db"
-	"github.com/lxc/incus/v6/internal/server/db/generate/file"
-	"github.com/lxc/incus/v6/internal/server/db/generate/lex"
+	"github.com/lxc/incus/v6/cmd/generate-database/db"
+	"github.com/lxc/incus/v6/cmd/generate-database/file"
+	"github.com/lxc/incus/v6/cmd/generate-database/lex"
 )
 
 // Return a new db command.

diff --git a/internal/server/db/generate/db/constants.go → cmd/generate-database/db/constants.go b/internal/server/db/generate/db/constants.go → cmd/generate-database/db/constants.go
diff --git a/internal/server/db/generate/db/lex.go → cmd/generate-database/db/lex.go b/internal/server/db/generate/db/lex.go → cmd/generate-database/db/lex.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/lxc/incus/v6/internal/server/db/generate/lex"
+	"github.com/lxc/incus/v6/cmd/generate-database/lex"
 	"github.com/lxc/incus/v6/shared/util"
 )
 

diff --git a/internal/server/db/generate/db/mapping.go → cmd/generate-database/db/mapping.go b/internal/server/db/generate/db/mapping.go → cmd/generate-database/db/mapping.go
@@ -7,7 +7,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/lxc/incus/v6/internal/server/db/generate/lex"
+	"github.com/lxc/incus/v6/cmd/generate-database/lex"
 	"github.com/lxc/incus/v6/shared/util"
 )
 

diff --git a/internal/server/db/generate/db/method.go → cmd/generate-database/db/method.go b/internal/server/db/generate/db/method.go → cmd/generate-database/db/method.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lxc/incus/v6/internal/server/db/generate/file"
-	"github.com/lxc/incus/v6/internal/server/db/generate/lex"
+	"github.com/lxc/incus/v6/cmd/generate-database/file"
+	"github.com/lxc/incus/v6/cmd/generate-database/lex"
 	"github.com/lxc/incus/v6/shared/util"
 )
 

diff --git a/internal/server/db/generate/db/parse.go → cmd/generate-database/db/parse.go b/internal/server/db/generate/db/parse.go → cmd/generate-database/db/parse.go
@@ -13,7 +13,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/lxc/incus/v6/internal/server/db/generate/lex"
+	"github.com/lxc/incus/v6/cmd/generate-database/lex"
 )
 
 // Packages returns the AST packages in which to search for structs.
@@ -25,7 +25,7 @@ func Packages() (map[string]*ast.Package, error) {
 	_, filename, _, _ := runtime.Caller(0)
 
 	for _, name := range defaultPackages {
-		pkg, err := lex.Parse(filepath.Join(filepath.Dir(filename), "..", "..", "..", "..", "..", name))
+		pkg, err := lex.Parse(filepath.Join(filepath.Dir(filename), "..", "..", "..", name))
 		if err != nil {
 			return nil, fmt.Errorf("Parse %q: %w", name, err)
 		}

diff --git a/internal/server/db/generate/db/parse_test.go → cmd/generate-database/db/parse_test.go b/internal/server/db/generate/db/parse_test.go → cmd/generate-database/db/parse_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/incus/v6/internal/server/db/generate/db"
+	"github.com/lxc/incus/v6/cmd/generate-database/db"
 )
 
 func TestPackages(t *testing.T) {

diff --git a/internal/server/db/generate/db/schema.go → cmd/generate-database/db/schema.go b/internal/server/db/generate/db/schema.go → cmd/generate-database/db/schema.go
diff --git a/internal/server/db/generate/db/stmt.go → cmd/generate-database/db/stmt.go b/internal/server/db/generate/db/stmt.go → cmd/generate-database/db/stmt.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lxc/incus/v6/internal/server/db/generate/file"
-	"github.com/lxc/incus/v6/internal/server/db/generate/lex"
+	"github.com/lxc/incus/v6/cmd/generate-database/file"
+	"github.com/lxc/incus/v6/cmd/generate-database/lex"
 )
 
 // Stmt generates a particular database query statement.

diff --git a/internal/server/db/generate/file/buffer.go → cmd/generate-database/file/buffer.go b/internal/server/db/generate/file/buffer.go → cmd/generate-database/file/buffer.go
diff --git a/internal/server/db/generate/file/doc.go → cmd/generate-database/file/doc.go b/internal/server/db/generate/file/doc.go → cmd/generate-database/file/doc.go
diff --git a/internal/server/db/generate/file/snippet.go → cmd/generate-database/file/snippet.go b/internal/server/db/generate/file/snippet.go → cmd/generate-database/file/snippet.go
diff --git a/internal/server/db/generate/file/write.go → cmd/generate-database/file/write.go b/internal/server/db/generate/file/write.go → cmd/generate-database/file/write.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/lxc/incus/v6/internal/server/db/generate/lex"
+	"github.com/lxc/incus/v6/cmd/generate-database/lex"
 )
 
 // Reset an auto-generated source file, writing a new empty file header.

diff --git a/internal/server/db/generate/lex/case.go → cmd/generate-database/lex/case.go b/internal/server/db/generate/lex/case.go → cmd/generate-database/lex/case.go
diff --git a/internal/server/db/generate/lex/config.go → cmd/generate-database/lex/config.go b/internal/server/db/generate/lex/config.go → cmd/generate-database/lex/config.go
diff --git a/internal/server/db/generate/lex/form.go → cmd/generate-database/lex/form.go b/internal/server/db/generate/lex/form.go → cmd/generate-database/lex/form.go
diff --git a/internal/server/db/generate/lex/lang.go → cmd/generate-database/lex/lang.go b/internal/server/db/generate/lex/lang.go → cmd/generate-database/lex/lang.go
diff --git a/internal/server/db/generate/lex/parse.go → cmd/generate-database/lex/parse.go b/internal/server/db/generate/lex/parse.go → cmd/generate-database/lex/parse.go
diff --git a/...rnal/server/db/generate/lex/parse_test.go → cmd/generate-database/lex/parse_test.go b/...rnal/server/db/generate/lex/parse_test.go → cmd/generate-database/lex/parse_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/lxc/incus/v6/internal/server/db/generate/lex"
+	"github.com/lxc/incus/v6/cmd/generate-database/lex"
 )
 
 func TestParse(t *testing.T) {

diff --git a/internal/server/db/generate/main.go → cmd/generate-database/main.go b/internal/server/db/generate/main.go → cmd/generate-database/main.go
diff --git a/internal/server/db/generate/root.go → cmd/generate-database/root.go b/internal/server/db/generate/root.go → cmd/generate-database/root.go