Skip to content

Commit

Permalink
Lint
Browse files Browse the repository at this point in the history
  • Loading branch information
payamQorbanpour committed Apr 4, 2024
1 parent d779897 commit 5c4b742
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 7 deletions.
1 change: 0 additions & 1 deletion internal/controller/backup_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ func (r *BackupReconciler) SetupWithManager(mgr ctrl.Manager) error {
Complete(r)
}

// nolint
// createBackupJob creates a job to run the 'gobackup perform'
func (r *BackupReconciler) createBackupJob(ctx context.Context, namespace string) (*batchv1.Job, error) {
_ = log.FromContext(ctx)
Expand Down
11 changes: 8 additions & 3 deletions pkg/k8sutil/crd.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,15 @@ import (
"k8s.io/client-go/dynamic"
)

// nolint
// GetCRD fetches a CRD instance.
func GetCRD(ctx context.Context, dynamicClient dynamic.Interface, group, version, resource, namespace, name string) (*unstructured.Unstructured, error) {
gvr := schema.GroupVersionResource{Group: group, Version: version, Resource: resource}
func GetCRD(ctx context.Context, dynamicClient dynamic.Interface,
group, version, resource, namespace, name string) (*unstructured.Unstructured, error) {

gvr := schema.GroupVersionResource{
Group: group,
Version: version,
Resource: resource,
}

// Fetch the instance
crdObj, err := dynamicClient.Resource(gvr).Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
Expand Down
19 changes: 16 additions & 3 deletions pkg/k8sutil/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package k8sutil

import (
"context"
"fmt"
"strings"

"gopkg.in/yaml.v2"
Expand Down Expand Up @@ -43,7 +44,9 @@ type Storages struct {
}

// CreateSecret creates secret from config.
func CreateSecret(ctx context.Context, model backupv1.Model, clientset *kubernetes.Clientset, dynamicClient *dynamic.DynamicClient, namespace string) error {
func CreateSecret(ctx context.Context, model backupv1.Model, clientset *kubernetes.Clientset,
dynamicClient *dynamic.DynamicClient, namespace string) error {

var postgreSQLSpec backupv1.PostgreSQLSpec
var s3Spec backupv1.S3Spec

Expand All @@ -55,7 +58,12 @@ func CreateSecret(ctx context.Context, model backupv1.Model, clientset *kubernet
return err
}

if err := runtime.DefaultUnstructuredConverter.FromUnstructured(databaseCRD.Object["spec"].(map[string]interface{}), &postgreSQLSpec); err != nil {
specMap, ok := databaseCRD.Object["spec"].(map[string]interface{})
if !ok {
return fmt.Errorf("spec is not a valid map[string]interface{}")
}

if err := runtime.DefaultUnstructuredConverter.FromUnstructured(specMap, &postgreSQLSpec); err != nil {
return err
}

Expand All @@ -70,7 +78,12 @@ func CreateSecret(ctx context.Context, model backupv1.Model, clientset *kubernet
return err
}

if err := runtime.DefaultUnstructuredConverter.FromUnstructured(storageCRD.Object["spec"].(map[string]interface{}), &s3Spec); err != nil {
specMap, ok := storageCRD.Object["spec"].(map[string]interface{})
if !ok {
return fmt.Errorf("spec is not a valid map[string]interface{}")
}

if err := runtime.DefaultUnstructuredConverter.FromUnstructured(specMap, &s3Spec); err != nil {
return err
}

Expand Down

0 comments on commit 5c4b742

Please sign in to comment.