fix pr automation not found bug (#2898)

Author: michaeljguarino

charts/console-rapid/charts/controller-0.0.156.tgz

@@ -19,8 +19,8 @@ import (
 	console "github.com/pluralsh/console/go/client"
 	"github.com/pluralsh/console/go/controller/api/v1alpha1"
 	consoleclient "github.com/pluralsh/console/go/controller/internal/client"
-	"github.com/pluralsh/console/go/controller/internal/errors"
 	"github.com/pluralsh/console/go/controller/internal/utils"
+	"k8s.io/apimachinery/pkg/api/errors"
 )
 
 // PrAutomationReconciler reconciles a v1alpha1.PrAutomation object.

charts/console-rapid/charts/kas-0.3.0.tgz

@@ -6,7 +6,6 @@ import (
 	console "github.com/pluralsh/console/go/client"
 	consoleclient "github.com/pluralsh/console/go/controller/internal/client"
 	"github.com/pluralsh/console/go/controller/internal/common"
-	internalerror "github.com/pluralsh/console/go/controller/internal/errors"
 	"github.com/pluralsh/console/go/controller/internal/utils"
 	"github.com/samber/lo"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -68,8 +67,7 @@ func (r *ServiceContextReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 		return *result, reterr
 	}
 
-	exists, err := r.handleExisting(serviceContext)
-	if !exists && err == nil && !serviceContext.DriftDetect() {
+	if !r.handleExisting(serviceContext) && !serviceContext.DriftDetect() {
 		utils.MarkCondition(serviceContext.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionTrue, v1alpha1.SynchronizedConditionReason, "")
 		utils.MarkCondition(serviceContext.SetCondition, v1alpha1.ReadonlyConditionType, v1.ConditionTrue, v1alpha1.ReadyConditionReason, v1alpha1.ReadonlyTrueConditionMessage.String())
 		return serviceContext.Spec.Reconciliation.Requeue(), err
@@ -119,24 +117,21 @@ func (r *ServiceContextReconciler) sync(sc *v1alpha1.ServiceContext, project *v1
 	return r.ConsoleClient.SaveServiceContext(sc.ConsoleName(), attributes)
 }
 
-func (r *ServiceContextReconciler) handleExisting(sc *v1alpha1.ServiceContext) (bool, error) {
-	apiServiceContext, err := r.ConsoleClient.GetServiceContext(sc.ConsoleName())
-	if err != nil || apiServiceContext == nil {
+func (r *ServiceContextReconciler) handleExisting(sc *v1alpha1.ServiceContext) bool {
+	apiServiceContext, _ := r.ConsoleClient.GetServiceContext(sc.ConsoleName())
+	if apiServiceContext == nil {
 		utils.MarkCondition(sc.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonNotFound, v1alpha1.SynchronizedNotFoundConditionMessage.String())
 		utils.MarkCondition(sc.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "")
-		if internalerror.IsNotFound(err) || err == nil {
-			sc.Status.ID = nil
-			return false, nil
-		}
-		return false, err
+		sc.Status.ID = nil
+		return false
 	}
 
 	sc.Status.ID = &apiServiceContext.ID
 
 	utils.MarkCondition(sc.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionTrue, v1alpha1.SynchronizedConditionReason, "")
 	utils.MarkCondition(sc.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionTrue, v1alpha1.ReadyConditionReason, "")
 
-	return true, nil
+	return true
 }
 
 func (r *ServiceContextReconciler) addOrRemoveFinalizer(serviceContext *v1alpha1.ServiceContext) *ctrl.Result {

charts/console/charts/controller-0.0.156.tgz

@@ -2,6 +2,7 @@ package errors
 
 import (
 	"errors"
+	"strings"
 
 	client "github.com/Yamashou/gqlgenc/clientv2"
 	"github.com/vektah/gqlparser/v2/gqlerror"
@@ -19,6 +20,7 @@ func (k KnownError) Error() string {
 
 const (
 	ErrorNotFound             KnownError = "could not find resource"
+	ErrorNotFound2            KnownError = "not found"
 	ErrorNotFoundOIDCProvider KnownError = "the resource you requested was not found"
 	ErrDeleteRepository                  = "could not delete repository"
 )
@@ -43,8 +45,9 @@ func (er *wrappedErrorResponse) Has(err KnownError) bool {
 		return false
 	}
 
+	expected := string(err)
 	for _, g := range *er.err.GqlErrors {
-		if g.Message == string(err) {
+		if strings.Contains(g.Message, expected) {
 			return true
 		}
 	}
@@ -69,7 +72,9 @@ func IsNotFound(err error) bool {
 		return false
 	}
 
-	return newAPIError(errorResponse).Has(ErrorNotFound) || newAPIError(errorResponse).Has(ErrorNotFoundOIDCProvider)
+	return (newAPIError(errorResponse).Has(ErrorNotFound) ||
+		newAPIError(errorResponse).Has(ErrorNotFoundOIDCProvider) ||
+		newAPIError(errorResponse).Has(ErrorNotFound2))
 }
 
 func IgnoreNotFound(err error) error {