From a238e2f01cf5ea2b43d153e7f5c4f366f30d57c1 Mon Sep 17 00:00:00 2001 From: Augustin Husson Date: Mon, 11 Dec 2023 15:34:06 +0100 Subject: [PATCH] [IGNORE] move again the config into the pkg model (#1639) Signed-off-by: Augustin Husson --- cmd/perses/main.go | 2 +- internal/api/core/core.go | 2 +- internal/api/core/server.go | 2 +- internal/api/e2e/api/rbac_test.go | 6 +-- internal/api/e2e/framework/server.go | 42 +++++++++---------- internal/api/impl/config/config.go | 2 +- internal/api/shared/crypto/crypto.go | 2 +- internal/api/shared/database/database.go | 2 +- internal/api/shared/database/file/file.go | 2 +- .../api/shared/database/file/file_test.go | 2 +- .../shared/dependency/persistence_manager.go | 2 +- .../api/shared/dependency/service_manager.go | 2 +- internal/api/shared/migrate/migrate.go | 2 +- internal/api/shared/migrate/migrate_test.go | 2 +- internal/api/shared/rbac/rbac.go | 2 +- internal/api/shared/schemas/schemas.go | 2 +- internal/api/shared/schemas/schemas_test.go | 2 +- internal/api/shared/validate/validate_test.go | 2 +- internal/cli/cmd/lint/lint.go | 2 +- internal/cli/cmd/migrate/migrate.go | 2 +- pkg/{ => model}/api/config/authorization.go | 0 pkg/{ => model}/api/config/config.go | 0 pkg/{ => model}/api/config/config_test.go | 0 pkg/{ => model}/api/config/database.go | 0 pkg/{ => model}/api/config/provisioning.go | 0 pkg/{ => model}/api/config/schemas.go | 0 pkg/{ => model}/api/config/security.go | 0 scripts/cue-test/cue-test.go | 2 +- 28 files changed, 43 insertions(+), 43 deletions(-) rename pkg/{ => model}/api/config/authorization.go (100%) rename pkg/{ => model}/api/config/config.go (100%) rename pkg/{ => model}/api/config/config_test.go (100%) rename pkg/{ => model}/api/config/database.go (100%) rename pkg/{ => model}/api/config/provisioning.go (100%) rename pkg/{ => model}/api/config/schemas.go (100%) rename pkg/{ => model}/api/config/security.go (100%) diff --git a/cmd/perses/main.go b/cmd/perses/main.go index 922b93bc01..e3e3ac3edf 100644 --- a/cmd/perses/main.go +++ b/cmd/perses/main.go @@ -17,7 +17,7 @@ import ( "flag" "github.com/perses/perses/internal/api/core" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" "github.com/sirupsen/logrus" ) diff --git a/internal/api/core/core.go b/internal/api/core/core.go index 7ca7efdd2d..2a20e4cacc 100644 --- a/internal/api/core/core.go +++ b/internal/api/core/core.go @@ -24,7 +24,7 @@ import ( "github.com/perses/perses/internal/api/shared/migrate" "github.com/perses/perses/internal/api/shared/rbac" "github.com/perses/perses/internal/api/shared/schemas" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" "github.com/perses/perses/ui" "github.com/sirupsen/logrus" ) diff --git a/internal/api/core/server.go b/internal/api/core/server.go index 3aafc3657c..90711d3cf0 100644 --- a/internal/api/core/server.go +++ b/internal/api/core/server.go @@ -38,7 +38,7 @@ import ( "github.com/perses/perses/internal/api/shared" "github.com/perses/perses/internal/api/shared/dependency" "github.com/perses/perses/internal/api/shared/utils" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" ) type endpoint interface { diff --git a/internal/api/e2e/api/rbac_test.go b/internal/api/e2e/api/rbac_test.go index 21c5dabda6..c540790693 100644 --- a/internal/api/e2e/api/rbac_test.go +++ b/internal/api/e2e/api/rbac_test.go @@ -25,16 +25,16 @@ import ( databaseModel "github.com/perses/perses/internal/api/shared/database/model" "github.com/perses/perses/internal/api/shared/dependency" "github.com/perses/perses/internal/api/shared/utils" - "github.com/perses/perses/pkg/api/config" modelAPI "github.com/perses/perses/pkg/model/api" + apiConfig "github.com/perses/perses/pkg/model/api/config" "github.com/perses/perses/pkg/model/api/v1/role" "github.com/stretchr/testify/assert" ) -func serverAuthConfig() config.Config { +func serverAuthConfig() apiConfig.Config { conf := e2eframework.DefaultConfig() conf.Security.EnableAuth = true - conf.Security.Authorization = config.AuthorizationConfig{GuestPermissions: []*role.Permission{ + conf.Security.Authorization = apiConfig.AuthorizationConfig{GuestPermissions: []*role.Permission{ { Actions: []role.Action{role.ReadAction}, Scopes: []role.Scope{role.WildcardScope}, diff --git a/internal/api/e2e/framework/server.go b/internal/api/e2e/framework/server.go index c27fd69265..af6b4c8d63 100644 --- a/internal/api/e2e/framework/server.go +++ b/internal/api/e2e/framework/server.go @@ -27,8 +27,8 @@ import ( databaseModel "github.com/perses/perses/internal/api/shared/database/model" "github.com/perses/perses/internal/api/shared/dependency" "github.com/perses/perses/internal/test" - "github.com/perses/perses/pkg/api/config" modelAPI "github.com/perses/perses/pkg/model/api" + apiConfig "github.com/perses/perses/pkg/model/api/config" modelV1 "github.com/perses/perses/pkg/model/api/v1" "github.com/prometheus/client_golang/prometheus" promConfig "github.com/prometheus/common/config" @@ -36,24 +36,24 @@ import ( var useSQL = os.Getenv("PERSES_TEST_USE_SQL") -func DefaultConfig() config.Config { +func DefaultConfig() apiConfig.Config { projectPath := test.GetRepositoryPath() - return config.Config{ - Security: config.Security{ + return apiConfig.Config{ + Security: apiConfig.Security{ Readonly: false, EnableAuth: false, - Authorization: config.AuthorizationConfig{}, - Authentication: config.AuthenticationConfig{ - AccessTokenTTL: config.DefaultAccessTokenTTL, - RefreshTokenTTL: config.DefaultRefreshTokenTTL, + Authorization: apiConfig.AuthorizationConfig{}, + Authentication: apiConfig.AuthenticationConfig{ + AccessTokenTTL: apiConfig.DefaultAccessTokenTTL, + RefreshTokenTTL: apiConfig.DefaultRefreshTokenTTL, }, EncryptionKey: promConfig.Secret(hex.EncodeToString([]byte("=tW$56zytgB&3jN2E%7-+qrGZE?v6LCc"))), }, - Schemas: config.Schemas{ - PanelsPath: filepath.Join(projectPath, config.DefaultPanelsPath), - QueriesPath: filepath.Join(projectPath, config.DefaultQueriesPath), - DatasourcesPath: filepath.Join(projectPath, config.DefaultDatasourcesPath), - VariablesPath: filepath.Join(projectPath, config.DefaultVariablesPath), + Schemas: apiConfig.Schemas{ + PanelsPath: filepath.Join(projectPath, apiConfig.DefaultPanelsPath), + QueriesPath: filepath.Join(projectPath, apiConfig.DefaultQueriesPath), + DatasourcesPath: filepath.Join(projectPath, apiConfig.DefaultDatasourcesPath), + VariablesPath: filepath.Join(projectPath, apiConfig.DefaultVariablesPath), Interval: 0, }, } @@ -68,17 +68,17 @@ func ClearAllKeys(t *testing.T, dao databaseModel.DAO, entities ...modelAPI.Enti } } -func defaultFileConfig() *config.File { - return &config.File{ +func defaultFileConfig() *apiConfig.File { + return &apiConfig.File{ Folder: "./test", - Extension: config.JSONExtension, + Extension: apiConfig.JSONExtension, } } -func CreateServer(t *testing.T, conf config.Config) (*httptest.Server, *httpexpect.Expect, dependency.PersistenceManager) { +func CreateServer(t *testing.T, conf apiConfig.Config) (*httptest.Server, *httpexpect.Expect, dependency.PersistenceManager) { if useSQL == "true" { - conf.Database = config.Database{ - SQL: &config.SQL{ + conf.Database = apiConfig.Database{ + SQL: &apiConfig.SQL{ User: "user", Password: "password", Net: "tcp", @@ -88,7 +88,7 @@ func CreateServer(t *testing.T, conf config.Config) (*httptest.Server, *httpexpe }, } } else { - conf.Database = config.Database{ + conf.Database = apiConfig.Database{ File: defaultFileConfig(), } } @@ -116,7 +116,7 @@ func WithServer(t *testing.T, testFunc func(*httpexpect.Expect, dependency.Persi ClearAllKeys(t, persistenceManager.GetPersesDAO(), entities...) } -func WithServerConfig(t *testing.T, config config.Config, testFunc func(*httpexpect.Expect, dependency.PersistenceManager) []modelAPI.Entity) { +func WithServerConfig(t *testing.T, config apiConfig.Config, testFunc func(*httpexpect.Expect, dependency.PersistenceManager) []modelAPI.Entity) { server, expect, persistenceManager := CreateServer(t, config) defer persistenceManager.GetPersesDAO().Close() defer server.Close() diff --git a/internal/api/impl/config/config.go b/internal/api/impl/config/config.go index 161a40c38a..257f96ccfe 100644 --- a/internal/api/impl/config/config.go +++ b/internal/api/impl/config/config.go @@ -18,7 +18,7 @@ import ( "github.com/labstack/echo/v4" "github.com/perses/perses/internal/api/shared" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" ) type Endpoint struct { diff --git a/internal/api/shared/crypto/crypto.go b/internal/api/shared/crypto/crypto.go index 59d9e859e4..89821c7b16 100644 --- a/internal/api/shared/crypto/crypto.go +++ b/internal/api/shared/crypto/crypto.go @@ -22,7 +22,7 @@ import ( "fmt" "io" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" modelV1 "github.com/perses/perses/pkg/model/api/v1" ) diff --git a/internal/api/shared/database/database.go b/internal/api/shared/database/database.go index 95a86144a7..907ee44ca6 100644 --- a/internal/api/shared/database/database.go +++ b/internal/api/shared/database/database.go @@ -21,7 +21,7 @@ import ( databaseFile "github.com/perses/perses/internal/api/shared/database/file" databaseModel "github.com/perses/perses/internal/api/shared/database/model" databaseSQL "github.com/perses/perses/internal/api/shared/database/sql" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" promConfig "github.com/prometheus/common/config" "github.com/sirupsen/logrus" ) diff --git a/internal/api/shared/database/file/file.go b/internal/api/shared/database/file/file.go index 8b93c5cb81..4820796088 100644 --- a/internal/api/shared/database/file/file.go +++ b/internal/api/shared/database/file/file.go @@ -24,8 +24,8 @@ import ( "strings" databaseModel "github.com/perses/perses/internal/api/shared/database/model" - "github.com/perses/perses/pkg/api/config" modelAPI "github.com/perses/perses/pkg/model/api" + "github.com/perses/perses/pkg/model/api/config" modelV1 "github.com/perses/perses/pkg/model/api/v1" "gopkg.in/yaml.v3" ) diff --git a/internal/api/shared/database/file/file_test.go b/internal/api/shared/database/file/file_test.go index bd017bc397..e67b722803 100644 --- a/internal/api/shared/database/file/file_test.go +++ b/internal/api/shared/database/file/file_test.go @@ -19,7 +19,7 @@ import ( "github.com/perses/perses/internal/api/interface/v1/project" databaseModel "github.com/perses/perses/internal/api/shared/database/model" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" modelV1 "github.com/perses/perses/pkg/model/api/v1" "github.com/stretchr/testify/assert" ) diff --git a/internal/api/shared/dependency/persistence_manager.go b/internal/api/shared/dependency/persistence_manager.go index f1d1cab18c..e14a099cc1 100644 --- a/internal/api/shared/dependency/persistence_manager.go +++ b/internal/api/shared/dependency/persistence_manager.go @@ -46,7 +46,7 @@ import ( "github.com/perses/perses/internal/api/interface/v1/variable" "github.com/perses/perses/internal/api/shared/database" databaseModel "github.com/perses/perses/internal/api/shared/database/model" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" ) type PersistenceManager interface { diff --git a/internal/api/shared/dependency/service_manager.go b/internal/api/shared/dependency/service_manager.go index 30e637b849..840f93f286 100644 --- a/internal/api/shared/dependency/service_manager.go +++ b/internal/api/shared/dependency/service_manager.go @@ -51,7 +51,7 @@ import ( "github.com/perses/perses/internal/api/shared/migrate" "github.com/perses/perses/internal/api/shared/rbac" "github.com/perses/perses/internal/api/shared/schemas" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" ) type ServiceManager interface { diff --git a/internal/api/shared/migrate/migrate.go b/internal/api/shared/migrate/migrate.go index 33026f6225..a2e3cfb868 100644 --- a/internal/api/shared/migrate/migrate.go +++ b/internal/api/shared/migrate/migrate.go @@ -25,7 +25,7 @@ import ( "cuelang.org/go/cue/cuecontext" "github.com/perses/perses/internal/api/shared" "github.com/perses/perses/internal/api/shared/schemas" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" v1 "github.com/perses/perses/pkg/model/api/v1" "github.com/sirupsen/logrus" ) diff --git a/internal/api/shared/migrate/migrate_test.go b/internal/api/shared/migrate/migrate_test.go index 23e174a048..981f1e2c73 100644 --- a/internal/api/shared/migrate/migrate_test.go +++ b/internal/api/shared/migrate/migrate_test.go @@ -19,7 +19,7 @@ import ( "testing" testUtils "github.com/perses/perses/internal/test" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/api/shared/rbac/rbac.go b/internal/api/shared/rbac/rbac.go index cecbc9bb90..ff394fa818 100644 --- a/internal/api/shared/rbac/rbac.go +++ b/internal/api/shared/rbac/rbac.go @@ -19,7 +19,7 @@ import ( "github.com/perses/perses/internal/api/interface/v1/role" "github.com/perses/perses/internal/api/interface/v1/rolebinding" "github.com/perses/perses/internal/api/interface/v1/user" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" v1Role "github.com/perses/perses/pkg/model/api/v1/role" ) diff --git a/internal/api/shared/schemas/schemas.go b/internal/api/shared/schemas/schemas.go index c8a1a5775e..e794fcd87c 100644 --- a/internal/api/shared/schemas/schemas.go +++ b/internal/api/shared/schemas/schemas.go @@ -22,7 +22,7 @@ import ( "cuelang.org/go/cue" "cuelang.org/go/cue/cuecontext" "cuelang.org/go/cue/errors" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" modelV1 "github.com/perses/perses/pkg/model/api/v1" "github.com/perses/perses/pkg/model/api/v1/common" "github.com/perses/perses/pkg/model/api/v1/dashboard" diff --git a/internal/api/shared/schemas/schemas_test.go b/internal/api/shared/schemas/schemas_test.go index 65392c0aa7..ab808184b8 100644 --- a/internal/api/shared/schemas/schemas_test.go +++ b/internal/api/shared/schemas/schemas_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" v1 "github.com/perses/perses/pkg/model/api/v1" "github.com/perses/perses/pkg/model/api/v1/common" "github.com/perses/perses/pkg/model/api/v1/dashboard" diff --git a/internal/api/shared/validate/validate_test.go b/internal/api/shared/validate/validate_test.go index 7baa3367f2..149ff66804 100644 --- a/internal/api/shared/validate/validate_test.go +++ b/internal/api/shared/validate/validate_test.go @@ -19,7 +19,7 @@ import ( "github.com/perses/perses/internal/api/shared/schemas" testUtils "github.com/perses/perses/internal/test" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" modelV1 "github.com/perses/perses/pkg/model/api/v1" "github.com/stretchr/testify/assert" ) diff --git a/internal/cli/cmd/lint/lint.go b/internal/cli/cmd/lint/lint.go index 9ec1cbcba3..d1765d5f2b 100644 --- a/internal/cli/cmd/lint/lint.go +++ b/internal/cli/cmd/lint/lint.go @@ -24,9 +24,9 @@ import ( "github.com/perses/perses/internal/cli/file" "github.com/perses/perses/internal/cli/opt" "github.com/perses/perses/internal/cli/output" - apiConfig "github.com/perses/perses/pkg/api/config" "github.com/perses/perses/pkg/client/api" modelAPI "github.com/perses/perses/pkg/model/api" + apiConfig "github.com/perses/perses/pkg/model/api/config" modelV1 "github.com/perses/perses/pkg/model/api/v1" "github.com/spf13/cobra" ) diff --git a/internal/cli/cmd/migrate/migrate.go b/internal/cli/cmd/migrate/migrate.go index 76f7c02f61..fa44c4a911 100644 --- a/internal/cli/cmd/migrate/migrate.go +++ b/internal/cli/cmd/migrate/migrate.go @@ -25,9 +25,9 @@ import ( "github.com/perses/perses/internal/cli/file" "github.com/perses/perses/internal/cli/opt" "github.com/perses/perses/internal/cli/output" - apiConfig "github.com/perses/perses/pkg/api/config" "github.com/perses/perses/pkg/client/api" modelAPI "github.com/perses/perses/pkg/model/api" + apiConfig "github.com/perses/perses/pkg/model/api/config" modelV1 "github.com/perses/perses/pkg/model/api/v1" "github.com/spf13/cobra" ) diff --git a/pkg/api/config/authorization.go b/pkg/model/api/config/authorization.go similarity index 100% rename from pkg/api/config/authorization.go rename to pkg/model/api/config/authorization.go diff --git a/pkg/api/config/config.go b/pkg/model/api/config/config.go similarity index 100% rename from pkg/api/config/config.go rename to pkg/model/api/config/config.go diff --git a/pkg/api/config/config_test.go b/pkg/model/api/config/config_test.go similarity index 100% rename from pkg/api/config/config_test.go rename to pkg/model/api/config/config_test.go diff --git a/pkg/api/config/database.go b/pkg/model/api/config/database.go similarity index 100% rename from pkg/api/config/database.go rename to pkg/model/api/config/database.go diff --git a/pkg/api/config/provisioning.go b/pkg/model/api/config/provisioning.go similarity index 100% rename from pkg/api/config/provisioning.go rename to pkg/model/api/config/provisioning.go diff --git a/pkg/api/config/schemas.go b/pkg/model/api/config/schemas.go similarity index 100% rename from pkg/api/config/schemas.go rename to pkg/model/api/config/schemas.go diff --git a/pkg/api/config/security.go b/pkg/model/api/config/security.go similarity index 100% rename from pkg/api/config/security.go rename to pkg/model/api/config/security.go diff --git a/scripts/cue-test/cue-test.go b/scripts/cue-test/cue-test.go index 4aef5c9cd8..cd3d9f6ac2 100644 --- a/scripts/cue-test/cue-test.go +++ b/scripts/cue-test/cue-test.go @@ -22,7 +22,7 @@ import ( "github.com/perses/perses/internal/api/shared/schemas" "github.com/perses/perses/internal/api/shared/validate" - "github.com/perses/perses/pkg/api/config" + "github.com/perses/perses/pkg/model/api/config" v1 "github.com/perses/perses/pkg/model/api/v1" "github.com/perses/perses/pkg/model/api/v1/common" "github.com/sirupsen/logrus"