fix: minor details found by code review

Signed-off-by: Ales Raszka <araszka@redhat.com>

Author: Allda

controllers/backupcronjob/rbac.go

@@ -98,7 +98,7 @@ func (r *BackupCronJobReconciler) ensureImagePushRoleBinding(ctx context.Context
 			},
 		},
 		RoleRef: rbacv1.RoleRef{
-			Kind:     constants.ClusterRole,
+			Kind:     constants.RbacClusterRoleKind,
 			Name:     common.RegistryImagePullerRoleName(),
 			APIGroup: "rbac.authorization.k8s.io",
 		},

pkg/constants/constants.go

@@ -110,10 +110,10 @@ const (
 	// RegistryAuthVolumeName is the name of the volume where registry auth secrets are mounted
 	RegistryAuthVolumeName = "registry-auth-secret"
 
-	//Role kinds
-	Role = "Role"
+	//Role kind
+	RbacRoleKind = "Role"
 	// ClusterRole kind
-	ClusterRole = "ClusterRole"
+	RbacClusterRoleKind = "ClusterRole"
 )
 
 const (

pkg/provision/workspace/rbac/rolebinding.go

@@ -32,14 +32,14 @@ func syncRolebindings(workspace *common.DevWorkspaceWithConfig, api sync.Cluster
 	saName := common.ServiceAccountName(workspace)
 	defaultRoleName := common.WorkspaceRoleName()
 	defaultRolebindingName := common.WorkspaceRolebindingName()
-	if err := addServiceAccountToRolebinding(saName, workspace.Namespace, defaultRoleName, defaultRolebindingName, constants.Role, api); err != nil {
+	if err := addServiceAccountToRolebinding(saName, workspace.Namespace, defaultRoleName, defaultRolebindingName, constants.RbacRoleKind, api); err != nil {
 		return err
 	}
 	if workspace.Spec.Template.Attributes.Exists(constants.WorkspaceSCCAttribute) {
 		sccName := workspace.Spec.Template.Attributes.GetString(constants.WorkspaceSCCAttribute, nil)
 		sccRoleName := common.WorkspaceSCCRoleName(sccName)
 		sccRolebindingName := common.WorkspaceSCCRolebindingName(sccName)
-		if err := addServiceAccountToRolebinding(saName, workspace.Namespace, sccRoleName, sccRolebindingName, constants.Role, api); err != nil {
+		if err := addServiceAccountToRolebinding(saName, workspace.Namespace, sccRoleName, sccRolebindingName, constants.RbacRoleKind, api); err != nil {
 			return err
 		}
 	}
@@ -53,7 +53,7 @@ func syncRolebindings(workspace *common.DevWorkspaceWithConfig, api sync.Cluster
 			workspace.Namespace,
 			registryRoleName,
 			registryRolebindingName,
-			constants.ClusterRole,
+			constants.RbacClusterRoleKind,
 			api); err != nil {
 			return err
 		}

pkg/secrets/backup.go

@@ -17,6 +17,7 @@ package secrets
 
 import (
 	"context"
+	"fmt"
 
 	dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
@@ -42,6 +43,11 @@ func GetNamespaceRegistryAuthSecret(ctx context.Context, c client.Client, worksp
 func HandleRegistryAuthSecret(ctx context.Context, c client.Client, workspace *dw.DevWorkspace,
 	dwOperatorConfig *controllerv1alpha1.OperatorConfiguration, operatorConfigNamespace string, scheme *runtime.Scheme, log logr.Logger,
 ) (*corev1.Secret, error) {
+	if dwOperatorConfig.Workspace == nil ||
+		dwOperatorConfig.Workspace.BackupCronJob == nil ||
+		dwOperatorConfig.Workspace.BackupCronJob.Registry == nil {
+		return nil, fmt.Errorf("backup/restore configuration not properly set in DevWorkspaceOperatorConfig")
+	}
 	secretName := dwOperatorConfig.Workspace.BackupCronJob.Registry.AuthSecret
 	if secretName == "" {
 		// No auth secret configured - anonymous access to registry
@@ -86,7 +92,6 @@ func CopySecret(ctx context.Context, c client.Client, workspace *dw.DevWorkspace
 			Name:      constants.DevWorkspaceBackupAuthSecretName,
 			Namespace: workspace.Namespace,
 			Labels: map[string]string{
-				constants.DevWorkspaceIDLabel:          workspace.Status.DevWorkspaceId,
 				constants.DevWorkspaceWatchSecretLabel: "true",
 			},
 		},