Skip to content

Commit 5069014

Browse files
getvictorgetvictor
authored
Moved common_mysql package to server/platform/mysql (#38017)
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #37244 # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. ## Testing - [x] QA'd all new/changed functionality manually <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Refactor** * Internal MySQL utility package reorganized and all internal imports updated to the new platform location; no changes to end-user functionality or behavior. * **Documentation** * Added platform package documentation describing infrastructure responsibilities and architectural boundaries to guide maintainers. <sub>✏️ Tip: You can customize this high-level summary in your review settings.</sub> <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent b191580 commit 5069014

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+89
-83
lines changed

‎changes/37244-refactor-common_mysql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Refactored common_mysql package to support bounded contexts inside Fleet codebase.
1+
Refactored common_mysql package to support bounded contexts inside Fleet codebase. Moved it to server/platform/mysql.

‎ee/server/service/certificate_authorities_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"github.com/fleetdm/fleet/v4/ee/server/service/est"
1616
"github.com/fleetdm/fleet/v4/server/authz"
1717
"github.com/fleetdm/fleet/v4/server/contexts/viewer"
18-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql"
1918
"github.com/fleetdm/fleet/v4/server/fleet"
2019
"github.com/fleetdm/fleet/v4/server/mock"
2120
scep_mock "github.com/fleetdm/fleet/v4/server/mock/scep"
21+
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
2222
"github.com/fleetdm/fleet/v4/server/ptr"
2323
"github.com/go-kit/log"
2424
"github.com/stretchr/testify/assert"

‎ee/server/service/condaccess/idp_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/crewjam/saml"
1111
"github.com/fleetdm/fleet/v4/server/config"
12-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql"
1312
"github.com/fleetdm/fleet/v4/server/fleet"
1413
"github.com/fleetdm/fleet/v4/server/mock"
14+
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
1515
kitlog "github.com/go-kit/log"
1616
"github.com/jmoiron/sqlx"
1717
"github.com/stretchr/testify/require"

‎ee/server/service/hostidentity/depot/depot.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"github.com/fleetdm/fleet/v4/pkg/certificate"
1616
"github.com/fleetdm/fleet/v4/server/config"
1717
"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
18-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql"
1918
"github.com/fleetdm/fleet/v4/server/fleet"
2019
"github.com/fleetdm/fleet/v4/server/mdm/assets"
2120
"github.com/fleetdm/fleet/v4/server/mdm/scep/depot"
21+
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
2222
"github.com/go-kit/log"
2323
"github.com/jmoiron/sqlx"
2424
)

‎ee/server/service/request_certificate_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"github.com/fleetdm/fleet/v4/server/authz"
1616
authz_ctx "github.com/fleetdm/fleet/v4/server/contexts/authz"
1717
"github.com/fleetdm/fleet/v4/server/contexts/viewer"
18-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql"
1918
"github.com/fleetdm/fleet/v4/server/fleet"
2019
"github.com/fleetdm/fleet/v4/server/mock"
20+
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
2121
"github.com/fleetdm/fleet/v4/server/ptr"
2222
"github.com/go-kit/log"
2323
"github.com/stretchr/testify/require"

‎ee/server/service/software_installers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
2424
hostctx "github.com/fleetdm/fleet/v4/server/contexts/host"
2525
"github.com/fleetdm/fleet/v4/server/contexts/viewer"
26-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql"
2726
"github.com/fleetdm/fleet/v4/server/fleet"
2827
"github.com/fleetdm/fleet/v4/server/mdm/apple/vpp"
2928
maintained_apps "github.com/fleetdm/fleet/v4/server/mdm/maintainedapps"
3029
"github.com/fleetdm/fleet/v4/server/mdm/nanomdm/mdm"
30+
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
3131
"github.com/fleetdm/fleet/v4/server/ptr"
3232
"github.com/go-kit/log"
3333
kitlog "github.com/go-kit/log"

‎server/datastore/mysql/android.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010

1111
"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
12-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql"
1312
"github.com/fleetdm/fleet/v4/server/fleet"
1413
"github.com/fleetdm/fleet/v4/server/mdm/android"
14+
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
1515
"github.com/fleetdm/fleet/v4/server/ptr"
1616
"github.com/go-kit/log/level"
1717
"github.com/google/uuid"

‎server/datastore/mysql/android_device_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"time"
99

1010
"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
11-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql"
12-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql/testing_utils"
1311
"github.com/fleetdm/fleet/v4/server/fleet"
1412
"github.com/fleetdm/fleet/v4/server/mdm/android"
13+
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
14+
"github.com/fleetdm/fleet/v4/server/platform/mysql/testing_utils"
1515
"github.com/fleetdm/fleet/v4/server/ptr"
1616
"github.com/jmoiron/sqlx"
1717
"github.com/stretchr/testify/assert"

‎server/datastore/mysql/android_enterprise_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package mysql
33
import (
44
"testing"
55

6-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql/testing_utils"
76
"github.com/fleetdm/fleet/v4/server/fleet"
87
"github.com/fleetdm/fleet/v4/server/mdm/android"
8+
"github.com/fleetdm/fleet/v4/server/platform/mysql/testing_utils"
99
"github.com/stretchr/testify/assert"
1010
"github.com/stretchr/testify/require"
1111
)

‎server/datastore/mysql/android_enterprises.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"errors"
77

88
"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
9-
"github.com/fleetdm/fleet/v4/server/datastore/mysql/common_mysql"
109
"github.com/fleetdm/fleet/v4/server/mdm/android"
10+
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
1111
"github.com/jmoiron/sqlx"
1212
)
1313

0 commit comments

Comments
 (0)