From f475a34f073c3a4fe8792a585206d89ac0daa539 Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Wed, 8 Jan 2025 09:40:18 +0100 Subject: [PATCH] Minor refactor --- hack/runtime-migrator/cmd/restore/restore.go | 8 ++++---- hack/runtime-migrator/internal/backup/backup.go | 6 +++--- hack/runtime-migrator/internal/backup/output.go | 2 +- .../restore/{restorer.go => backupreader.go} | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) rename hack/runtime-migrator/internal/restore/{restorer.go => backupreader.go} (82%) diff --git a/hack/runtime-migrator/cmd/restore/restore.go b/hack/runtime-migrator/cmd/restore/restore.go index 2ab69e82..d2f11347 100644 --- a/hack/runtime-migrator/cmd/restore/restore.go +++ b/hack/runtime-migrator/cmd/restore/restore.go @@ -60,7 +60,7 @@ func (r Restore) Do(ctx context.Context, runtimeIDs []string) error { return err } - restorer := restore.NewRestorer(r.cfg.BackupDir, r.cfg.RestoreCRB, r.cfg.RestoreOIDC) + restorer := restore.NewBackupReader(r.cfg.BackupDir, r.cfg.RestoreCRB, r.cfg.RestoreOIDC) for _, runtimeID := range runtimeIDs { currentShoot, err := shoot.Fetch(ctx, shootList, r.shootClient, runtimeID) @@ -82,7 +82,7 @@ func (r Restore) Do(ctx context.Context, runtimeIDs []string) error { objectsToRestore, err := restorer.Do(runtimeID, currentShoot.Name) if err != nil { - errMsg := fmt.Sprintf("Failed to restore runtime: %v", err) + errMsg := fmt.Sprintf("Failed to read runtime from backup directory: %v", err) r.results.ErrorOccurred(runtimeID, currentShoot.Name, errMsg) slog.Error(errMsg, "runtimeID", runtimeID) @@ -105,7 +105,7 @@ func (r Restore) Do(ctx context.Context, runtimeIDs []string) error { appliedCRBs, appliedOIDC, err := r.applyResources(ctx, objectsToRestore, runtimeID) if err != nil { - errMsg := fmt.Sprintf("Failed to restore runtime: %v", err) + errMsg := fmt.Sprintf("Failed to apply resources: %v", err) r.results.ErrorOccurred(runtimeID, currentShoot.Name, errMsg) slog.Error(errMsg, "runtimeID", runtimeID) @@ -128,7 +128,7 @@ func (r Restore) Do(ctx context.Context, runtimeIDs []string) error { } func (r Restore) applyResources(ctx context.Context, objectsToRestore backup.RuntimeBackup, runtimeID string) ([]v12.ClusterRoleBinding, []authenticationv1alpha1.OpenIDConnect, error) { - err := r.applyShoot(ctx, objectsToRestore.ShootToRestore) + err := r.applyShoot(ctx, objectsToRestore.ShootForPatch) if err != nil { return nil, nil, err } diff --git a/hack/runtime-migrator/internal/backup/backup.go b/hack/runtime-migrator/internal/backup/backup.go index 8bcad612..5d4fdafe 100644 --- a/hack/runtime-migrator/internal/backup/backup.go +++ b/hack/runtime-migrator/internal/backup/backup.go @@ -32,7 +32,7 @@ func NewBackuper(isDryRun bool, kcpClient client.Client, timeoutK8sOperation tim type RuntimeBackup struct { OriginalShoot v1beta1.Shoot - ShootToRestore v1beta1.Shoot + ShootForPatch v1beta1.Shoot ClusterRoleBindings []rbacv1.ClusterRoleBinding OIDCConfig []authenticationv1alpha1.OpenIDConnect } @@ -54,14 +54,14 @@ func (b Backuper) Do(ctx context.Context, shoot v1beta1.Shoot, runtimeID string) } return RuntimeBackup{ - ShootToRestore: b.getShootToRestore(shoot), + ShootForPatch: b.getShootForPatch(shoot), OriginalShoot: shoot, ClusterRoleBindings: crbs, OIDCConfig: oidcConfig, }, nil } -func (b Backuper) getShootToRestore(shootFromGardener v1beta1.Shoot) v1beta1.Shoot { +func (b Backuper) getShootForPatch(shootFromGardener v1beta1.Shoot) v1beta1.Shoot { return v1beta1.Shoot{ TypeMeta: v1.TypeMeta{ Kind: "Shoot", diff --git a/hack/runtime-migrator/internal/backup/output.go b/hack/runtime-migrator/internal/backup/output.go index cfe6dd45..54084a1d 100644 --- a/hack/runtime-migrator/internal/backup/output.go +++ b/hack/runtime-migrator/internal/backup/output.go @@ -46,7 +46,7 @@ func (ow OutputWriter) Save(runtimeID string, runtimeBackup RuntimeBackup) error return err } - err = saveYaml(runtimeBackup.ShootToRestore, fmt.Sprintf("%s/%s-to-restore.yaml", runtimeDir, runtimeBackup.ShootToRestore.Name)) + err = saveYaml(runtimeBackup.ShootForPatch, fmt.Sprintf("%s/%s-to-restore.yaml", runtimeDir, runtimeBackup.ShootForPatch.Name)) if err != nil { return err } diff --git a/hack/runtime-migrator/internal/restore/restorer.go b/hack/runtime-migrator/internal/restore/backupreader.go similarity index 82% rename from hack/runtime-migrator/internal/restore/restorer.go rename to hack/runtime-migrator/internal/restore/backupreader.go index 05625649..a72e772e 100644 --- a/hack/runtime-migrator/internal/restore/restorer.go +++ b/hack/runtime-migrator/internal/restore/backupreader.go @@ -11,27 +11,27 @@ import ( "sigs.k8s.io/yaml" ) -type Restorer struct { +type BackupReader struct { backupDir string restoreCRB bool restoreOIDC bool } -func NewRestorer(backupDir string, restoreCRB, restoreOIDC bool) Restorer { - return Restorer{ +func NewBackupReader(backupDir string, restoreCRB, restoreOIDC bool) BackupReader { + return BackupReader{ backupDir: backupDir, restoreCRB: restoreCRB, restoreOIDC: restoreOIDC, } } -func (r Restorer) Do(runtimeID string, shootName string) (backup.RuntimeBackup, error) { - shootToRestore, err := r.getShootToRestore(runtimeID, fmt.Sprintf("%s-to-restore", shootName)) +func (r BackupReader) Do(runtimeID string, shootName string) (backup.RuntimeBackup, error) { + shootForPatch, err := r.getShoot(runtimeID, fmt.Sprintf("%s-to-restore", shootName)) if err != nil { return backup.RuntimeBackup{}, err } - originalShoot, err := r.getShootToRestore(runtimeID, fmt.Sprintf("%s-original", shootName)) + originalShoot, err := r.getShoot(runtimeID, fmt.Sprintf("%s-original", shootName)) if err != nil { return backup.RuntimeBackup{}, err } @@ -67,14 +67,14 @@ func (r Restorer) Do(runtimeID string, shootName string) (backup.RuntimeBackup, } return backup.RuntimeBackup{ - ShootToRestore: shootToRestore, + ShootForPatch: shootForPatch, OriginalShoot: originalShoot, ClusterRoleBindings: crbs, OIDCConfig: oidcConfig, }, nil } -func (r Restorer) getShootToRestore(runtimeID string, shootName string) (v1beta1.Shoot, error) { +func (r BackupReader) getShoot(runtimeID string, shootName string) (v1beta1.Shoot, error) { shootFilePath := path.Join(r.backupDir, fmt.Sprintf("backup/%s/%s.yaml", runtimeID, shootName)) shoot, err := readFromFile[v1beta1.Shoot](shootFilePath)