refactor

Signed-off-by: Sylwester Piskozub <[email protected]>

Author: Piskoo

app/controlplane/internal/service/attestation.go

@@ -174,41 +174,15 @@ func (s *AttestationService) Init(ctx context.Context, req *cpAPI.AttestationSer
 		return nil, errors.NotFound("not found", "contract not found")
 	}
 
-	// find the default CAS backend to associate the workflow
-	backend, err := s.casUC.FindDefaultBackend(context.Background(), robotAccount.OrgID)
-	if err != nil && !biz.IsNotFound(err) {
-		return nil, fmt.Errorf("failed to find default CAS backend: %w", err)
-	} else if err != nil {
-		return nil, errors.NotFound("not found", "default CAS backend not found")
-	}
-
-	// Check the status of the backend, try fallback if invalid
-	if backend.ValidationStatus != biz.CASBackendValidationOK {
-		s.log.Warnw("msg", "default CAS backend validation failed, attempting fallback",
-			"backend", backend.Name, "status", backend.ValidationStatus)
-
-		// Try to find fallback backend
-		fallbackBackend, err := s.casUC.FindFallbackBackend(context.Background(), robotAccount.OrgID)
-		if err != nil && !biz.IsNotFound(err) {
-			return nil, fmt.Errorf("failed to find fallback CAS backend: %w", err)
-		}
-
-		if fallbackBackend == nil {
-			// No fallback configured
-			return nil, cpAPI.ErrorCasBackendErrorReasonInvalid(
-				"default CAS backend is unreachable and no fallback backend is configured")
-		}
-
-		// Check fallback backend validation status
-		if fallbackBackend.ValidationStatus != biz.CASBackendValidationOK {
-			// Both backends are down
-			return nil, cpAPI.ErrorCasBackendErrorReasonInvalid(
-				"both default and fallback CAS backends are unreachable")
+	// Find the default or fallback CAS backend to associate the workflow
+	backend, err := s.casUC.FindDefaultOrFallbackBackend(context.Background(), robotAccount.OrgID)
+	if err != nil {
+		if biz.IsNotFound(err) {
+			return nil, errors.NotFound("not found", "default CAS backend not found")
+		} else if biz.IsErrValidation(err) {
+			return nil, cpAPI.ErrorCasBackendErrorReasonInvalid(err.Error())
 		}
-
-		// Use fallback backend
-		s.log.Infow("msg", "using fallback CAS backend", "backend", fallbackBackend.Name)
-		backend = fallbackBackend
+		return nil, fmt.Errorf("failed to find CAS backend: %w", err)
 	}
 
 	// Create workflowRun

app/controlplane/internal/usercontext/orgrequirements_middleware.go

@@ -102,26 +102,17 @@ func BlockIfCASBackendNotValid(uc biz.CASBackendReader) middleware.Middleware {
 				return nil, errors.New("organization not found")
 			}
 
-			// 1 - Figure out main repository for this organization
-			repo, err := uc.FindDefaultBackend(ctx, org.ID)
-			if err != nil && !biz.IsNotFound(err) {
-				return nil, fmt.Errorf("checking for CAS backends in the org: %w", err)
-			} else if repo == nil {
-				return nil, v1.ErrorCasBackendErrorReasonRequired("your organization does not have a CAS Backend configured yet")
-			}
-
-			// 2 - compare the status
-			if repo.ValidationStatus != biz.CASBackendValidationOK {
-				// 3 - Check if there's a fallback backend available
-				fallbackRepo, err := uc.FindFallbackBackend(ctx, org.ID)
-				if err != nil && !biz.IsNotFound(err) {
-					return nil, fmt.Errorf("checking for fallback CAS backend: %w", err)
-				}
-
-				if fallbackRepo == nil || fallbackRepo.ValidationStatus != biz.CASBackendValidationOK {
+			// Check if there's a valid CAS backend (default or fallback)
+			_, err := uc.FindDefaultOrFallbackBackend(ctx, org.ID)
+			if err != nil {
+				if biz.IsNotFound(err) {
+					return nil, v1.ErrorCasBackendErrorReasonRequired("your organization does not have a CAS Backend configured yet")
+				} else if biz.IsErrValidation(err) {
 					return nil, v1.ErrorCasBackendErrorReasonInvalid("your CAS backend can't be reached")
 				}
+				return nil, fmt.Errorf("checking for CAS backends in the org: %w", err)
 			}
+
 			return handler(ctx, req)
 		}
 	}

app/controlplane/pkg/biz/casbackend.go

@@ -122,6 +122,7 @@ type CASBackendRepo interface {
 type CASBackendReader interface {
 	FindDefaultBackend(ctx context.Context, orgID string) (*CASBackend, error)
 	FindFallbackBackend(ctx context.Context, orgID string) (*CASBackend, error)
+	FindDefaultOrFallbackBackend(ctx context.Context, orgID string) (*CASBackend, error)
 	FindByIDInOrg(ctx context.Context, OrgID, ID string) (*CASBackend, error)
 	PerformValidation(ctx context.Context, ID string) error
 }
@@ -235,6 +236,41 @@ func (uc *CASBackendUseCase) FindFallbackBackend(ctx context.Context, orgID stri
 	return backend, nil
 }
 
+// FindDefaultOrFallbackBackend finds a valid CAS backend for the organization.
+// Attempts to use the default backend first, if invalid it uses the fallback backend.
+func (uc *CASBackendUseCase) FindDefaultOrFallbackBackend(ctx context.Context, orgID string) (*CASBackend, error) {
+	// Find the default backend
+	defaultBackend, err := uc.FindDefaultBackend(ctx, orgID)
+	if err != nil {
+		return nil, err
+	}
+
+	// Check if default backend is valid
+	if defaultBackend.ValidationStatus == CASBackendValidationOK {
+		return defaultBackend, nil
+	}
+
+	// Default backend is invalid, try fallback
+	uc.logger.Infow("msg", "default CAS backend validation failed, attempting fallback",
+		"backend", defaultBackend.Name, "status", defaultBackend.ValidationStatus, "orgID", orgID)
+
+	fallbackBackend, err := uc.FindFallbackBackend(ctx, orgID)
+	if err != nil {
+		if IsNotFound(err) {
+			return nil, NewErrValidationStr("default CAS backend is unreachable and no fallback backend is configured")
+		}
+		return nil, err
+	}
+
+	// Check if fallback backend is valid
+	if fallbackBackend.ValidationStatus != CASBackendValidationOK {
+		return nil, NewErrValidationStr("both default and fallback CAS backends are unreachable")
+	}
+
+	uc.logger.Infow("msg", "using fallback CAS backend", "backend", fallbackBackend.Name, "orgID", orgID)
+	return fallbackBackend, nil
+}
+
 func (uc *CASBackendUseCase) CreateInlineBackend(ctx context.Context, orgID string) (*CASBackend, error) {
 	orgUUID, err := uuid.Parse(orgID)
 	if err != nil {