chore(deps): update hack/common digest to 80bfca5

.golangci.yaml

@@ -1,8 +1,24 @@
+version: "2"
 run:
   concurrency: 4
-  timeout: 10m
-
-issues:
-  exclude-files:
-  - "zz_generated.*\\.go$"
-  - "tmp/.*"
+linters:
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - zz_generated.*\.go$
+      - tmp/.*
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

internal/controller/core/common.go

@@ -71,19 +71,19 @@ func (r *CommonReconciler) handleRemainingContentBeforeDelete(ctx context.Contex
 	if isProject {
 		namespace = project.Status.Namespace
 
-		if len(r.ProjectWorkspaceConfig.Project.ResourcesBlockingDeletion) == 0 {
+		if len(r.Project.ResourcesBlockingDeletion) == 0 {
 			return false, nil
 		}
 
-		resourcesBlockingDeletion = r.ProjectWorkspaceConfig.Project.ResourcesBlockingDeletion
+		resourcesBlockingDeletion = r.Project.ResourcesBlockingDeletion
 	} else {
 		namespace = workspace.Status.Namespace
 
-		if len(r.ProjectWorkspaceConfig.Workspace.ResourcesBlockingDeletion) == 0 {
+		if len(r.Workspace.ResourcesBlockingDeletion) == 0 {
 			return false, nil
 		}
 
-		resourcesBlockingDeletion = r.ProjectWorkspaceConfig.Workspace.ResourcesBlockingDeletion
+		resourcesBlockingDeletion = r.Workspace.ResourcesBlockingDeletion
 	}
 
 	remainingResources := make([]unstructured.Unstructured, 0)
@@ -95,7 +95,7 @@ func (r *CommonReconciler) handleRemainingContentBeforeDelete(ctx context.Contex
 		resList := &unstructured.UnstructuredList{}
 		resList.SetGroupVersionKind(gvk.ToSchemaGVK())
 
-		if err := r.Client.List(ctx, resList, client.InNamespace(namespace)); err != nil {
+		if err := r.List(ctx, resList, client.InNamespace(namespace)); err != nil {
 			log.Error(err, "failed to list resources")
 			return false, err
 		}

internal/controller/core/project_controller.go

@@ -36,7 +36,7 @@ func (r *ProjectReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	log := log.FromContext(ctx)
 
 	project := &v1alpha1.Project{}
-	if err := r.Client.Get(ctx, req.NamespacedName, project); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, project); err != nil {
 		if apierrors.IsNotFound(err) {
 			log.Info("Project not found")
 			return ctrl.Result{}, nil
@@ -159,7 +159,7 @@ func getSubjectsForProjectRole(project *v1alpha1.Project, role v1alpha1.ProjectM
 
 	for _, member := range project.Spec.Members {
 		if hasProjectRole(member, role) {
-			subjects = append(subjects, member.Subject.RbacV1())
+			subjects = append(subjects, member.RbacV1())
 		}
 	}
 

internal/controller/core/workspace_controller.go

@@ -41,7 +41,7 @@ func (r *WorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	log := log.FromContext(ctx)
 
 	workspace := &v1alpha1.Workspace{}
-	if err := r.Client.Get(ctx, req.NamespacedName, workspace); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, workspace); err != nil {
 		if apierrors.IsNotFound(err) {
 			log.Info("Workspace not found")
 			return ctrl.Result{}, nil
@@ -139,7 +139,7 @@ func (r *WorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 
 func (r *WorkspaceReconciler) getProjectByNamespace(ctx context.Context, namespaceName string) (*v1alpha1.Project, error) {
 	namespace := &corev1.Namespace{}
-	if err := r.Client.Get(ctx, types.NamespacedName{Name: namespaceName}, namespace); err != nil {
+	if err := r.Get(ctx, types.NamespacedName{Name: namespaceName}, namespace); err != nil {
 		return nil, err
 	}
 
@@ -153,7 +153,7 @@ func (r *WorkspaceReconciler) getProjectByNamespace(ctx context.Context, namespa
 	}
 
 	project := &v1alpha1.Project{}
-	if err := r.Client.Get(ctx, types.NamespacedName{Name: projectName}, project); err != nil {
+	if err := r.Get(ctx, types.NamespacedName{Name: projectName}, project); err != nil {
 		return nil, err
 	}
 
@@ -300,7 +300,7 @@ func getSubjectsForWorkspaceRole(workspace *v1alpha1.Workspace, role v1alpha1.Wo
 
 	for _, member := range workspace.Spec.Members {
 		if hasWorkspaceRole(member, role) {
-			subjects = append(subjects, member.Subject.RbacV1())
+			subjects = append(subjects, member.RbacV1())
 		}
 	}