Refactored migration code

kyma-project · Dec 17, 2024 · 1249724 · 1249724
1 parent 7bcbc0e
commit 1249724
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/hack/runtime-migrator/cmd/migration/migration.go b/hack/runtime-migrator/cmd/migration/migration.go
@@ -12,7 +12,6 @@ import (
 	runtimev1 "github.com/kyma-project/infrastructure-manager/api/v1"
 	config2 "github.com/kyma-project/infrastructure-manager/hack/runtime-migrator-app/internal/config"
 	"github.com/kyma-project/infrastructure-manager/hack/runtime-migrator-app/internal/migration"
-	"github.com/kyma-project/infrastructure-manager/hack/runtime-migrator-app/internal/runtime"
 	"github.com/kyma-project/infrastructure-manager/pkg/config"
 	"github.com/kyma-project/infrastructure-manager/pkg/gardener/kubeconfig"
 	"github.com/kyma-project/infrastructure-manager/pkg/gardener/shoot/extender/auditlogs"
@@ -21,8 +20,8 @@ import (
 )
 
 type Migration struct {
-	runtimeMigrator runtime.Migrator
-	runtimeVerifier runtime.Verifier
+	runtimeMigrator migration.Migrator
+	runtimeVerifier migration.Verifier
 	kcpClient       client.Client
 	shootClient     gardener_types.ShootInterface
 	outputWriter    migration.OutputWriter
@@ -37,8 +36,8 @@ func NewMigration(migratorConfig config2.Config, converterConfig config.Converte
 	}
 
 	return Migration{
-		runtimeMigrator: runtime.NewMigrator(migratorConfig, kubeconfigProvider, kcpClient),
-		runtimeVerifier: runtime.NewVerifier(converterConfig, auditLogConfig),
+		runtimeMigrator: migration.NewMigrator(migratorConfig, kubeconfigProvider, kcpClient),
+		runtimeVerifier: migration.NewVerifier(converterConfig, auditLogConfig),
 		kcpClient:       kcpClient,
 		shootClient:     shootClient,
 		outputWriter:    outputWriter,

diff --git a/...ime-migrator/internal/runtime/migrator.go → ...e-migrator/internal/migration/migrator.go b/...ime-migrator/internal/runtime/migrator.go → ...e-migrator/internal/migration/migrator.go
@@ -1,4 +1,4 @@
-package runtime
+package migration
 
 import (
 	"context"

diff --git a/...igrator/internal/runtime/migrator_test.go → ...rator/internal/migration/migrator_test.go b/...igrator/internal/runtime/migrator_test.go → ...rator/internal/migration/migrator_test.go
@@ -1,4 +1,4 @@
-package runtime
+package migration
 
 import (
 	"github.com/stretchr/testify/require"

diff --git a/hack/runtime-migrator/internal/migration/output.go b/hack/runtime-migrator/internal/migration/output.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	v1 "github.com/kyma-project/infrastructure-manager/api/v1"
-	"github.com/kyma-project/infrastructure-manager/hack/runtime-migrator-app/internal/runtime"
 	"sigs.k8s.io/yaml"
 )
 
@@ -67,7 +66,7 @@ func (ow OutputWriter) SaveRuntimeCR(runtime v1.Runtime) error {
 	return saveYaml(runtime, fmt.Sprintf("%s/%s.yaml", ow.RuntimeDir, runtime.Name))
 }
 
-func (ow OutputWriter) SaveComparisonResult(comparisonResult runtime.ShootComparisonResult) error {
+func (ow OutputWriter) SaveComparisonResult(comparisonResult ShootComparisonResult) error {
 	comparisonResultsForRuntimeDir := path.Join(ow.ComparisonResultsDir, comparisonResult.RuntimeID)
 	err := os.MkdirAll(comparisonResultsForRuntimeDir, os.ModePerm)
 	if err != nil {
@@ -89,7 +88,7 @@ func (ow OutputWriter) SaveComparisonResult(comparisonResult runtime.ShootCompar
 	return saveYaml(comparisonResult.ConvertedShoot, path.Join(comparisonResultsForRuntimeDir, "converted-shoot.yaml"))
 }
 
-func writeResultsToDiffFile(shootName string, difference *runtime.Difference, resultsDir string) error {
+func writeResultsToDiffFile(shootName string, difference *Difference, resultsDir string) error {
 	writeAndCloseFunc := func(filePath string, text string) error {
 		file, err := os.Create(filePath)
 		if err != nil {

diff --git a/...ime-migrator/internal/runtime/verifier.go → ...e-migrator/internal/migration/verifier.go b/...ime-migrator/internal/runtime/verifier.go → ...e-migrator/internal/migration/verifier.go
@@ -1,4 +1,4 @@
-package runtime
+package migration
 
 import (
 	"slices"