chore: move pkg to internal (#655)

Makefile

@@ -13,7 +13,7 @@ generate: model mocks deepcopy-gen
 deepcopy-gen: tb.controller-gen
 	@mkdir -p ./tmp
 	@touch ./tmp/deepcopy-gen-boilerplate.go.txt
-	$(TB_CONTROLLER_GEN) paths=./pkg/types object
+	$(TB_CONTROLLER_GEN) paths=./internal/types object
 
 .PHONY: docs
 docs:
@@ -23,7 +23,7 @@ docs:
 test: generate lint test-ci
 
 fuzz:
-	 go test -fuzz=FuzzMask -v ./pkg/types/ -fuzztime=60s
+	 go test -fuzz=FuzzMask -v ./internal/types/ -fuzztime=60s
 
 # Run ci tests
 test-ci: mocks tidy tb.ginkgo
@@ -32,8 +32,8 @@ test-ci: mocks tidy tb.ginkgo
 	go tool cover -func=coverage.out
 
 mocks: tb.mockgen
-	$(TB_MOCKGEN) -package client -destination pkg/mocks/client/mock.go github.com/bakito/adguardhome-sync/pkg/client Client
-	$(TB_MOCKGEN) -package client -destination pkg/mocks/flags/mock.go github.com/bakito/adguardhome-sync/pkg/config Flags
+	$(TB_MOCKGEN) -package client -destination internal/mocks/client/mock.go github.com/bakito/adguardhome-sync/internal/client Client
+	$(TB_MOCKGEN) -package client -destination internal/mocks/flags/mock.go github.com/bakito/adguardhome-sync/internal/config Flags
 
 release: tb.semver tb.goreleaser
 	@version=$$($(TB_SEMVER)); \
@@ -80,7 +80,7 @@ ADGUARD_HOME_VERSION ?= v0.107.65
 model: tb.oapi-codegen
 	@mkdir -p tmp
 	go run openapi/main.go $(ADGUARD_HOME_VERSION)
-	$(TB_OAPI_CODEGEN) -package model -generate types,client -config .oapi-codegen.yaml tmp/schema.yaml > pkg/client/model/model_generated.go
+	$(TB_OAPI_CODEGEN) -package model -generate types,client -config .oapi-codegen.yaml tmp/schema.yaml > internal/client/model/model_generated.go
 
 model-diff:
 	go run openapi/main.go $(ADGUARD_HOME_VERSION)

cmd/root.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/bakito/adguardhome-sync/pkg/log"
+	"github.com/bakito/adguardhome-sync/internal/log"
 	"github.com/bakito/adguardhome-sync/version"
 )
 

cmd/run.go

@@ -3,9 +3,9 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/bakito/adguardhome-sync/pkg/config"
-	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/pkg/sync"
+	"github.com/bakito/adguardhome-sync/internal/config"
+	"github.com/bakito/adguardhome-sync/internal/log"
+	"github.com/bakito/adguardhome-sync/internal/sync"
 )
 
 // runCmd represents the run command.

docs/main.go

@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 func main() {

internal/client/client.go

@@ -14,10 +14,10 @@ import (
 	"github.com/go-resty/resty/v2"
 	"go.uber.org/zap"
 
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
-	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/pkg/types"
-	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
+	"github.com/bakito/adguardhome-sync/internal/log"
+	"github.com/bakito/adguardhome-sync/internal/types"
+	"github.com/bakito/adguardhome-sync/internal/utils"
 )
 
 const envRedirectPolicyNoOfRedirects = "REDIRECT_POLICY_NO_OF_REDIRECTS"

internal/client/client_test.go

@@ -12,10 +12,10 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/bakito/adguardhome-sync/pkg/client"
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
-	"github.com/bakito/adguardhome-sync/pkg/types"
-	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/bakito/adguardhome-sync/internal/client"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
+	"github.com/bakito/adguardhome-sync/internal/types"
+	"github.com/bakito/adguardhome-sync/internal/utils"
 )
 
 var (

internal/client/model/client/client.go

@@ -13,9 +13,9 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
-	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
+	"github.com/bakito/adguardhome-sync/internal/log"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 var l = log.GetLogger("client")

internal/client/model/client/interface.go

@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
 )
 
 type Client interface {

internal/client/model/client/resty.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
 )
 
 var _ model.HttpRequestDoer = &adapter{}

internal/client/model/model-functions.go

@@ -9,7 +9,7 @@ import (
 	"go.uber.org/zap"
 	"k8s.io/utils/ptr"
 
-	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/bakito/adguardhome-sync/internal/utils"
 )
 
 // Clone the config.

internal/client/model/model_private_test.go

@@ -5,8 +5,8 @@ import (
 	"github.com/onsi/gomega"
 	"go.uber.org/zap"
 
-	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/bakito/adguardhome-sync/internal/log"
+	"github.com/bakito/adguardhome-sync/internal/utils"
 )
 
 var _ = Describe("Types", func() {

internal/client/model/model_test.go

@@ -8,9 +8,9 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
-	"github.com/bakito/adguardhome-sync/pkg/types"
-	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
+	"github.com/bakito/adguardhome-sync/internal/types"
+	"github.com/bakito/adguardhome-sync/internal/utils"
 )
 
 var _ = Describe("Types", func() {

internal/config/config.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/caarlos0/env/v11"
 
-	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/log"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 var (

internal/config/config_test.go

@@ -7,8 +7,8 @@ import (
 	. "github.com/onsi/gomega"
 	gm "go.uber.org/mock/gomock"
 
-	"github.com/bakito/adguardhome-sync/pkg/config"
-	flagsmock "github.com/bakito/adguardhome-sync/pkg/mocks/flags"
+	"github.com/bakito/adguardhome-sync/internal/config"
+	flagsmock "github.com/bakito/adguardhome-sync/internal/mocks/flags"
 )
 
 var _ = Describe("Config", func() {

internal/config/env.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/caarlos0/env/v11"
 
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 // Manually collect replicas from env.

internal/config/file.go

@@ -6,7 +6,7 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 func readFile(cfg *types.Config, path string) (string, error) {

internal/config/flags.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 func readFlags(cfg *types.Config, flags Flags) error {

internal/config/flags_test.go

@@ -7,8 +7,8 @@ import (
 	. "github.com/onsi/gomega"
 	gm "go.uber.org/mock/gomock"
 
-	flagsmock "github.com/bakito/adguardhome-sync/pkg/mocks/flags"
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	flagsmock "github.com/bakito/adguardhome-sync/internal/mocks/flags"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 var _ = Describe("Config", func() {

internal/config/print-config.go

@@ -11,8 +11,8 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	"github.com/bakito/adguardhome-sync/pkg/client"
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/client"
+	"github.com/bakito/adguardhome-sync/internal/types"
 	"github.com/bakito/adguardhome-sync/version"
 )
 

internal/config/print-config_test.go

@@ -10,8 +10,8 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/bakito/adguardhome-sync/pkg/test/matchers"
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/test/matchers"
+	"github.com/bakito/adguardhome-sync/internal/types"
 	"github.com/bakito/adguardhome-sync/version"
 )
 

internal/config/validate_test.go

@@ -6,7 +6,7 @@ import (
 	. "github.com/onsi/gomega"
 	"gopkg.in/yaml.v3"
 
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 var _ = Describe("Config", func() {

internal/metrics/metrics.go

@@ -3,8 +3,8 @@ package metrics
 import (
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
-	"github.com/bakito/adguardhome-sync/pkg/log"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
+	"github.com/bakito/adguardhome-sync/internal/log"
 )
 
 const StatsTotal = "total"

internal/metrics/metrics_test.go

@@ -6,7 +6,7 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/utils/ptr"
 
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
 )
 
 var _ = Describe("Metrics", func() {

internal/metrics/stats.go

@@ -4,7 +4,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
 )
 
 const labelTotal = "Total"

internal/mocks/client/mock.go

@@ -1,9 +1,9 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/bakito/adguardhome-sync/pkg/client (interfaces: Client)
+// Source: github.com/bakito/adguardhome-sync/internal/client (interfaces: Client)
 //
 // Generated by this command:
 //
-//	mockgen -package client -destination pkg/mocks/client/mock.go github.com/bakito/adguardhome-sync/pkg/client Client
+//	mockgen -package client -destination internal/mocks/client/mock.go github.com/bakito/adguardhome-sync/internal/client Client
 //
 
 // Package client is a generated GoMock package.
@@ -12,7 +12,7 @@ package client
 import (
 	reflect "reflect"
 
-	model "github.com/bakito/adguardhome-sync/pkg/client/model"
+	model "github.com/bakito/adguardhome-sync/internal/client/model"
 	gomock "go.uber.org/mock/gomock"
 )
 

internal/mocks/flags/mock.go

@@ -1,9 +1,9 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/bakito/adguardhome-sync/pkg/config (interfaces: Flags)
+// Source: github.com/bakito/adguardhome-sync/internal/config (interfaces: Flags)
 //
 // Generated by this command:
 //
-//	mockgen -package client -destination pkg/mocks/flags/mock.go github.com/bakito/adguardhome-sync/pkg/config Flags
+//	mockgen -package client -destination internal/mocks/flags/mock.go github.com/bakito/adguardhome-sync/internal/config Flags
 //
 
 // Package client is a generated GoMock package.

internal/sync/action-general.go

@@ -3,9 +3,9 @@ package sync
 import (
 	"go.uber.org/zap"
 
-	"github.com/bakito/adguardhome-sync/pkg/client"
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
-	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/bakito/adguardhome-sync/internal/client"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
+	"github.com/bakito/adguardhome-sync/internal/utils"
 )
 
 var (

internal/sync/action.go

@@ -3,9 +3,9 @@ package sync
 import (
 	"go.uber.org/zap"
 
-	"github.com/bakito/adguardhome-sync/pkg/client"
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/client"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 func setupActions(cfg *types.Config) (actions []syncAction) {

internal/sync/http.go

@@ -16,8 +16,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/pkg/metrics"
+	"github.com/bakito/adguardhome-sync/internal/log"
+	"github.com/bakito/adguardhome-sync/internal/metrics"
 	"github.com/bakito/adguardhome-sync/version"
 )
 

internal/sync/scrape.go

@@ -3,8 +3,8 @@ package sync
 import (
 	"time"
 
-	"github.com/bakito/adguardhome-sync/pkg/metrics"
-	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/internal/metrics"
+	"github.com/bakito/adguardhome-sync/internal/types"
 )
 
 func (w *worker) startScraping() {

internal/sync/sync.go

@@ -11,13 +11,13 @@ import (
 	"github.com/robfig/cron/v3"
 	"go.uber.org/zap"
 
-	"github.com/bakito/adguardhome-sync/pkg/client"
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
-	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/pkg/metrics"
-	"github.com/bakito/adguardhome-sync/pkg/types"
-	"github.com/bakito/adguardhome-sync/pkg/utils"
-	"github.com/bakito/adguardhome-sync/pkg/versions"
+	"github.com/bakito/adguardhome-sync/internal/client"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
+	"github.com/bakito/adguardhome-sync/internal/log"
+	"github.com/bakito/adguardhome-sync/internal/metrics"
+	"github.com/bakito/adguardhome-sync/internal/types"
+	"github.com/bakito/adguardhome-sync/internal/utils"
+	"github.com/bakito/adguardhome-sync/internal/versions"
 	"github.com/bakito/adguardhome-sync/version"
 )
 

internal/sync/sync_test.go

@@ -8,12 +8,12 @@ import (
 	. "github.com/onsi/gomega"
 	gm "go.uber.org/mock/gomock"
 
-	"github.com/bakito/adguardhome-sync/pkg/client"
-	"github.com/bakito/adguardhome-sync/pkg/client/model"
-	clientmock "github.com/bakito/adguardhome-sync/pkg/mocks/client"
-	"github.com/bakito/adguardhome-sync/pkg/types"
-	"github.com/bakito/adguardhome-sync/pkg/utils"
-	"github.com/bakito/adguardhome-sync/pkg/versions"
+	"github.com/bakito/adguardhome-sync/internal/client"
+	"github.com/bakito/adguardhome-sync/internal/client/model"
+	clientmock "github.com/bakito/adguardhome-sync/internal/mocks/client"
+	"github.com/bakito/adguardhome-sync/internal/types"
+	"github.com/bakito/adguardhome-sync/internal/utils"
+	"github.com/bakito/adguardhome-sync/internal/versions"
 )
 
 var _ = Describe("Sync", func() {

internal/versions/versions_test.go

@@ -4,7 +4,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/bakito/adguardhome-sync/pkg/versions"
+	"github.com/bakito/adguardhome-sync/internal/versions"
 )
 
 var _ = Describe("Versions", func() {