Skip to content

Rename package to support go install command from module path #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hackallcode merged 1 commit into from
Jul 22, 2025
Merged

Rename package to support go install command from module path #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ linters-settings:
- fmt\.Errorf$
wrapcheck:
ignorePackageGlobs:
- sdvg/*
- github.com/tarantool/sdvg/*
depguard:
rules:
stderrors:
Expand Down
4 changes: 2 additions & 2 deletions cmd/sdvg/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package main

import (
"sdvg/internal/generator/app"
"github.com/tarantool/sdvg/internal/generator/app"
)

var (
version string
version = "dev"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module sdvg
module github.com/tarantool/sdvg

go 1.23.8

Expand Down
9 changes: 4 additions & 5 deletions internal/generator/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
"syscall"

"github.com/pkg/errors"

"sdvg/internal/generator/cli"
"sdvg/internal/generator/cli/options"
"sdvg/internal/generator/usecase"
"sdvg/internal/generator/usecase/general"
"github.com/tarantool/sdvg/internal/generator/cli"
"github.com/tarantool/sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/usecase"
"github.com/tarantool/sdvg/internal/generator/usecase/general"
)

type App struct {
Expand Down
17 changes: 8 additions & 9 deletions internal/generator/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"sdvg/internal/generator/cli/commands"
"sdvg/internal/generator/cli/commands/sdvg"
clierrors "sdvg/internal/generator/cli/errors"
openaiService "sdvg/internal/generator/cli/openai/general"
"sdvg/internal/generator/cli/options"
"sdvg/internal/generator/cli/render/prompt"
"sdvg/internal/generator/logger/handlers"
openaiAPI "sdvg/internal/openai/general"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
"github.com/tarantool/sdvg/internal/generator/cli/commands/sdvg"
clierrors "github.com/tarantool/sdvg/internal/generator/cli/errors"
openaiService "github.com/tarantool/sdvg/internal/generator/cli/openai/general"
"github.com/tarantool/sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/cli/render/prompt"
"github.com/tarantool/sdvg/internal/generator/logger/handlers"
openaiAPI "github.com/tarantool/sdvg/internal/openai/general"
)

// Cli type is used to describe SDVG CLI.
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/cli/commands/config/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import (
"time"

"github.com/pkg/errors"

"sdvg/internal/generator/cli/utils"
"sdvg/internal/generator/models"
"github.com/tarantool/sdvg/internal/generator/cli/utils"
"github.com/tarantool/sdvg/internal/generator/models"
)

// generationMode type is used to describe generation modes.
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/cli/commands/config/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

openaiMock "sdvg/internal/generator/cli/openai/mock"
rendererMock "sdvg/internal/generator/cli/render/mock"
openaiMock "github.com/tarantool/sdvg/internal/generator/cli/openai/mock"
rendererMock "github.com/tarantool/sdvg/internal/generator/cli/render/mock"
)

func TestGetPathToSaveGenerationConfig(t *testing.T) {
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/cli/commands/config/data_sample.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"sdvg/internal/generator/cli/commands"
"sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
"github.com/tarantool/sdvg/internal/generator/cli/options"
)

// NewDataSampleCommand creates 'data-sample' command for CLI.
Expand Down
9 changes: 4 additions & 5 deletions internal/generator/cli/commands/config/data_sample_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

openaiMock "sdvg/internal/generator/cli/openai/mock"
"sdvg/internal/generator/cli/options"
rendererMock "sdvg/internal/generator/cli/render/mock"
"sdvg/internal/generator/cli/streams"
openaiMock "github.com/tarantool/sdvg/internal/generator/cli/openai/mock"
"github.com/tarantool/sdvg/internal/generator/cli/options"
rendererMock "github.com/tarantool/sdvg/internal/generator/cli/render/mock"
"github.com/tarantool/sdvg/internal/generator/cli/streams"
)

func TestNewDataSampleCommand(t *testing.T) {
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/cli/commands/config/description.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ package config
import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"sdvg/internal/generator/cli/commands"
"sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
"github.com/tarantool/sdvg/internal/generator/cli/options"
)

// NewDescriptionCommand creates 'description' command for CLI.
Expand Down
9 changes: 4 additions & 5 deletions internal/generator/cli/commands/config/description_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

openaiMock "sdvg/internal/generator/cli/openai/mock"
"sdvg/internal/generator/cli/options"
rendererMock "sdvg/internal/generator/cli/render/mock"
"sdvg/internal/generator/cli/streams"
openaiMock "github.com/tarantool/sdvg/internal/generator/cli/openai/mock"
"github.com/tarantool/sdvg/internal/generator/cli/options"
rendererMock "github.com/tarantool/sdvg/internal/generator/cli/render/mock"
"github.com/tarantool/sdvg/internal/generator/cli/streams"
)

func TestNewDescriptionCommand(t *testing.T) {
Expand Down
11 changes: 5 additions & 6 deletions internal/generator/cli/commands/config/generate_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ package config
import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"sdvg/internal/generator/cli/commands"
"sdvg/internal/generator/cli/openai"
"sdvg/internal/generator/cli/options"
"sdvg/internal/generator/cli/render"
"sdvg/internal/generator/cli/utils"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
"github.com/tarantool/sdvg/internal/generator/cli/openai"
"github.com/tarantool/sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/cli/render"
"github.com/tarantool/sdvg/internal/generator/cli/utils"
)

// generateConfigOptions type is used to describe 'generate-config' options.
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/cli/commands/config/sql_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"sdvg/internal/generator/cli/commands"
"sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
"github.com/tarantool/sdvg/internal/generator/cli/options"
)

// NewSQLQueryCommand creates 'sql-query' command for CLI.
Expand Down
9 changes: 4 additions & 5 deletions internal/generator/cli/commands/config/sql_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

openaiMock "sdvg/internal/generator/cli/openai/mock"
"sdvg/internal/generator/cli/options"
rendererMock "sdvg/internal/generator/cli/render/mock"
"sdvg/internal/generator/cli/streams"
openaiMock "github.com/tarantool/sdvg/internal/generator/cli/openai/mock"
"github.com/tarantool/sdvg/internal/generator/cli/options"
rendererMock "github.com/tarantool/sdvg/internal/generator/cli/render/mock"
"github.com/tarantool/sdvg/internal/generator/cli/streams"
)

func TestNewSQLQueryCommand(t *testing.T) {
Expand Down
21 changes: 10 additions & 11 deletions internal/generator/cli/commands/generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"sdvg/internal/generator/cli/commands"
"sdvg/internal/generator/cli/options"
"sdvg/internal/generator/cli/progress"
"sdvg/internal/generator/cli/progress/bar"
"sdvg/internal/generator/cli/progress/log"
"sdvg/internal/generator/cli/render"
"sdvg/internal/generator/cli/utils"
"sdvg/internal/generator/models"
"sdvg/internal/generator/output/general"
"sdvg/internal/generator/usecase"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
"github.com/tarantool/sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/cli/progress"
"github.com/tarantool/sdvg/internal/generator/cli/progress/bar"
"github.com/tarantool/sdvg/internal/generator/cli/progress/log"
"github.com/tarantool/sdvg/internal/generator/cli/render"
"github.com/tarantool/sdvg/internal/generator/cli/utils"
"github.com/tarantool/sdvg/internal/generator/models"
"github.com/tarantool/sdvg/internal/generator/output/general"
"github.com/tarantool/sdvg/internal/generator/usecase"
)

// generateOptions type is used to describe 'generate' command options.
Expand Down
11 changes: 5 additions & 6 deletions internal/generator/cli/commands/generate/generate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

"sdvg/internal/generator/cli/options"
rendererMock "sdvg/internal/generator/cli/render/mock"
"sdvg/internal/generator/cli/streams"
"sdvg/internal/generator/usecase"
usecaseMock "sdvg/internal/generator/usecase/mock"
"github.com/tarantool/sdvg/internal/generator/cli/options"
rendererMock "github.com/tarantool/sdvg/internal/generator/cli/render/mock"
"github.com/tarantool/sdvg/internal/generator/cli/streams"
"github.com/tarantool/sdvg/internal/generator/usecase"
usecaseMock "github.com/tarantool/sdvg/internal/generator/usecase/mock"
)

func TestGetGenerationConfigFilePath(t *testing.T) {
Expand Down
19 changes: 9 additions & 10 deletions internal/generator/cli/commands/sdvg/sdvg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ package sdvg
import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"sdvg/internal/generator/cli/commands"
"sdvg/internal/generator/cli/commands/config"
"sdvg/internal/generator/cli/commands/generate"
"sdvg/internal/generator/cli/commands/serve"
"sdvg/internal/generator/cli/commands/validate"
"sdvg/internal/generator/cli/commands/version"
"sdvg/internal/generator/cli/options"
"sdvg/internal/generator/cli/streams"
"sdvg/internal/generator/cli/utils"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
"github.com/tarantool/sdvg/internal/generator/cli/commands/config"
"github.com/tarantool/sdvg/internal/generator/cli/commands/generate"
"github.com/tarantool/sdvg/internal/generator/cli/commands/serve"
"github.com/tarantool/sdvg/internal/generator/cli/commands/validate"
"github.com/tarantool/sdvg/internal/generator/cli/commands/version"
"github.com/tarantool/sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/cli/streams"
"github.com/tarantool/sdvg/internal/generator/cli/utils"
)

// NewSDVGCommand creates 'sdvg' command for CLI.
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/cli/commands/serve/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ import (

"github.com/labstack/echo/v4"
"github.com/pkg/errors"

"sdvg/internal/generator/cli/openai"
"sdvg/internal/generator/usecase"
"github.com/tarantool/sdvg/internal/generator/cli/openai"
"github.com/tarantool/sdvg/internal/generator/usecase"
)

type handlerOptions struct {
Expand Down
9 changes: 4 additions & 5 deletions internal/generator/cli/commands/serve/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (

"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"

"sdvg/internal/generator/cli/utils"
"sdvg/internal/generator/models"
"sdvg/internal/generator/output/general"
"sdvg/internal/generator/usecase"
"github.com/tarantool/sdvg/internal/generator/cli/utils"
"github.com/tarantool/sdvg/internal/generator/models"
"github.com/tarantool/sdvg/internal/generator/output/general"
"github.com/tarantool/sdvg/internal/generator/usecase"
)

func setupRoutes(opts handlerOptions, e *echo.Echo) {
Expand Down
7 changes: 3 additions & 4 deletions internal/generator/cli/commands/serve/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

openaiMock "sdvg/internal/generator/cli/openai/mock"
"sdvg/internal/generator/usecase"
usecaseMock "sdvg/internal/generator/usecase/mock"
openaiMock "github.com/tarantool/sdvg/internal/generator/cli/openai/mock"
"github.com/tarantool/sdvg/internal/generator/usecase"
usecaseMock "github.com/tarantool/sdvg/internal/generator/usecase/mock"
)

func TestHandleGenerate(t *testing.T) {
Expand Down
11 changes: 5 additions & 6 deletions internal/generator/cli/commands/serve/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"sdvg/internal/generator/cli/commands"
"sdvg/internal/generator/cli/openai"
"sdvg/internal/generator/cli/options"
"sdvg/internal/generator/models"
"sdvg/internal/generator/usecase"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
"github.com/tarantool/sdvg/internal/generator/cli/openai"
"github.com/tarantool/sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/models"
"github.com/tarantool/sdvg/internal/generator/usecase"
)

// serveOptions type is used to describe 'serve' command options.
Expand Down
13 changes: 6 additions & 7 deletions internal/generator/cli/commands/serve/serve_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ import (

"github.com/spf13/pflag"
"github.com/stretchr/testify/require"

"sdvg/internal/generator/cli/commands"
openaiMock "sdvg/internal/generator/cli/openai/mock"
"sdvg/internal/generator/cli/options"
"sdvg/internal/generator/cli/streams"
"sdvg/internal/generator/models"
usecaseMock "sdvg/internal/generator/usecase/mock"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
openaiMock "github.com/tarantool/sdvg/internal/generator/cli/openai/mock"
"github.com/tarantool/sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/cli/streams"
"github.com/tarantool/sdvg/internal/generator/models"
usecaseMock "github.com/tarantool/sdvg/internal/generator/usecase/mock"
)

func TestSetupFlags(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions internal/generator/cli/commands/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package commands
import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

clierrors "sdvg/internal/generator/cli/errors"
clierrors "github.com/tarantool/sdvg/internal/generator/cli/errors"
)

// NoArgs validates args and returns an error if there are any args.
Expand Down
11 changes: 5 additions & 6 deletions internal/generator/cli/commands/validate/validate_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ import (

"github.com/pkg/errors"
"github.com/spf13/cobra"

"sdvg/internal/generator/cli/commands"
"sdvg/internal/generator/cli/options"
"sdvg/internal/generator/cli/render"
"sdvg/internal/generator/cli/utils"
"sdvg/internal/generator/models"
"github.com/tarantool/sdvg/internal/generator/cli/commands"
"github.com/tarantool/sdvg/internal/generator/cli/options"
"github.com/tarantool/sdvg/internal/generator/cli/render"
"github.com/tarantool/sdvg/internal/generator/cli/utils"
"github.com/tarantool/sdvg/internal/generator/models"
)

// validateOptions type is used to describe 'validate-config' command options.
Expand Down
7 changes: 3 additions & 4 deletions internal/generator/cli/commands/validate/validate_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

"sdvg/internal/generator/cli/options"
rendererMock "sdvg/internal/generator/cli/render/mock"
"sdvg/internal/generator/cli/streams"
"github.com/tarantool/sdvg/internal/generator/cli/options"
rendererMock "github.com/tarantool/sdvg/internal/generator/cli/render/mock"
"github.com/tarantool/sdvg/internal/generator/cli/streams"
)

func TestGetGenerationConfigPath(t *testing.T) {
Expand Down
Loading