From cfd550fdd7923c0221eee4d350ee2d61fb89aae4 Mon Sep 17 00:00:00 2001 From: nxtcoder36 Date: Thu, 21 Dec 2023 11:34:09 +0530 Subject: [PATCH] Changed err to errors.NewE(err) in infra. --- .../internal/app/adapter-accounts-svc.go | 3 +- .../internal/app/adapter-resource-apply.go | 16 +-- .../internal/app/graph/buildrun.resolvers.go | 2 +- .../app/graph/byoccluster.resolvers.go | 4 +- .../internal/app/graph/cluster.resolvers.go | 2 +- .../app/graph/common-types.resolvers.go | 10 +- .../internal/app/graph/node.resolvers.go | 2 +- .../internal/app/graph/nodepool.resolvers.go | 2 +- .../graph/persistentvolumeclaim.resolvers.go | 4 +- .../internal/app/graph/schema.resolvers.go | 106 +++++++++--------- .../internal/app/graph/vpndevice.resolvers.go | 4 +- apps/infra/internal/app/grpc-server.go | 4 +- .../internal/app/process-error-on-apply.go | 2 +- .../internal/app/process-status-updates.go | 13 ++- apps/infra/internal/domain/build-run.go | 6 +- apps/infra/internal/domain/byoc-clusters.go | 46 ++++---- apps/infra/internal/domain/clusters.go | 52 ++++----- apps/infra/internal/domain/domain-entries.go | 20 ++-- apps/infra/internal/domain/domain.go | 14 +-- apps/infra/internal/domain/iam-checks.go | 3 +- apps/infra/internal/domain/names.go | 12 +- apps/infra/internal/domain/nodepool.go | 54 ++++----- apps/infra/internal/domain/nodes.go | 6 +- .../infra/internal/domain/provider-secrets.go | 56 ++++----- apps/infra/internal/domain/pvc.go | 6 +- apps/infra/internal/domain/vpn-device.go | 34 +++--- apps/infra/internal/env/env.go | 7 +- apps/infra/internal/framework/framework.go | 5 +- apps/infra/main.go | 3 +- 29 files changed, 253 insertions(+), 245 deletions(-) diff --git a/apps/infra/internal/app/adapter-accounts-svc.go b/apps/infra/internal/app/adapter-accounts-svc.go index 068143d31..3f6d4e66b 100644 --- a/apps/infra/internal/app/adapter-accounts-svc.go +++ b/apps/infra/internal/app/adapter-accounts-svc.go @@ -3,6 +3,7 @@ package app import ( "context" "errors" + errors2 "github.com/kloudlite/operator/pkg/errors" "time" "github.com/kloudlite/api/apps/infra/internal/domain" @@ -25,7 +26,7 @@ func (as *accountsSvc) GetAccount(ctx context.Context, userId string, accountNam if errors.Is(err, context.DeadlineExceeded) { return nil, domain.ErrGRPCCall{Err: err} } - return nil, err + return nil, errors2.NewE(err) } return out, nil diff --git a/apps/infra/internal/app/adapter-resource-apply.go b/apps/infra/internal/app/adapter-resource-apply.go index e173c9d1e..9e2d883ab 100644 --- a/apps/infra/internal/app/adapter-resource-apply.go +++ b/apps/infra/internal/app/adapter-resource-apply.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/kloudlite/api/apps/infra/internal/domain" "github.com/kloudlite/api/common" + "github.com/kloudlite/api/pkg/errors" fn "github.com/kloudlite/api/pkg/functions" "github.com/kloudlite/api/pkg/messaging" msgTypes "github.com/kloudlite/api/pkg/messaging/types" @@ -19,7 +20,7 @@ type resourceDispatcherImpl struct { producer messaging.Producer } -func NewResourceDispatcher(producer SendTargetClusterMessagesProducer) domain.ResourceDispatcher{ +func NewResourceDispatcher(producer SendTargetClusterMessagesProducer) domain.ResourceDispatcher { return &resourceDispatcherImpl{ producer, } @@ -35,7 +36,7 @@ func (a *resourceDispatcherImpl) ApplyToTargetCluster(ctx domain.InfraContext, c m, err := fn.K8sObjToMap(obj) if err != nil { - return err + return errors.NewE(err) } b, err := json.Marshal(t.AgentMessage{ @@ -45,7 +46,7 @@ func (a *resourceDispatcherImpl) ApplyToTargetCluster(ctx domain.InfraContext, c Object: m, }) if err != nil { - return err + return errors.NewE(err) } err = a.producer.Produce(ctx, msgTypes.ProduceMsg{ @@ -53,14 +54,13 @@ func (a *resourceDispatcherImpl) ApplyToTargetCluster(ctx domain.InfraContext, c Payload: b, }) - return err + return errors.NewE(err) } - func (d *resourceDispatcherImpl) DeleteFromTargetCluster(ctx domain.InfraContext, clusterName string, obj client.Object) error { m, err := fn.K8sObjToMap(obj) if err != nil { - return err + return errors.NewE(err) } b, err := json.Marshal(t.AgentMessage{ @@ -70,7 +70,7 @@ func (d *resourceDispatcherImpl) DeleteFromTargetCluster(ctx domain.InfraContext Object: m, }) if err != nil { - return err + return errors.NewE(err) } err = d.producer.Produce(ctx, msgTypes.ProduceMsg{ @@ -78,5 +78,5 @@ func (d *resourceDispatcherImpl) DeleteFromTargetCluster(ctx domain.InfraContext Payload: b, }) - return err + return errors.NewE(err) } diff --git a/apps/infra/internal/app/graph/buildrun.resolvers.go b/apps/infra/internal/app/graph/buildrun.resolvers.go index 2a4e8f3b6..f103dd820 100644 --- a/apps/infra/internal/app/graph/buildrun.resolvers.go +++ b/apps/infra/internal/app/graph/buildrun.resolvers.go @@ -35,7 +35,7 @@ func (r *buildRunResolver) ID(ctx context.Context, obj *entities.BuildRun) (stri func (r *buildRunResolver) Spec(ctx context.Context, obj *entities.BuildRun) (*model.GithubComKloudliteOperatorApisDistributionV1BuildRunSpec, error) { var m model.GithubComKloudliteOperatorApisDistributionV1BuildRunSpec if err := fn.JsonConversion(obj.Spec, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return &m, nil } diff --git a/apps/infra/internal/app/graph/byoccluster.resolvers.go b/apps/infra/internal/app/graph/byoccluster.resolvers.go index 122685a6b..e87129fb3 100644 --- a/apps/infra/internal/app/graph/byoccluster.resolvers.go +++ b/apps/infra/internal/app/graph/byoccluster.resolvers.go @@ -31,7 +31,7 @@ func (r *bYOCClusterResolver) HelmStatus(ctx context.Context, obj *entities.BYOC } var m map[string]any if err := fn.JsonConversion(obj.HelmStatus, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return m, nil } @@ -48,7 +48,7 @@ func (r *bYOCClusterResolver) ID(ctx context.Context, obj *entities.BYOCCluster) func (r *bYOCClusterResolver) Spec(ctx context.Context, obj *entities.BYOCCluster) (*model.GithubComKloudliteOperatorApisClustersV1BYOCSpec, error) { var m model.GithubComKloudliteOperatorApisClustersV1BYOCSpec if err := fn.JsonConversion(obj.Spec, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return &m, nil } diff --git a/apps/infra/internal/app/graph/cluster.resolvers.go b/apps/infra/internal/app/graph/cluster.resolvers.go index 98172979f..631071396 100644 --- a/apps/infra/internal/app/graph/cluster.resolvers.go +++ b/apps/infra/internal/app/graph/cluster.resolvers.go @@ -40,7 +40,7 @@ func (r *clusterResolver) Spec(ctx context.Context, obj *entities.Cluster) (*mod var spec model.GithubComKloudliteOperatorApisClustersV1ClusterSpec if err := fn.JsonConversion(&obj.Spec, &spec); err != nil { - return nil, err + return nil, errors.NewE(err) } return &spec, nil } diff --git a/apps/infra/internal/app/graph/common-types.resolvers.go b/apps/infra/internal/app/graph/common-types.resolvers.go index e7648e5ae..b14745565 100644 --- a/apps/infra/internal/app/graph/common-types.resolvers.go +++ b/apps/infra/internal/app/graph/common-types.resolvers.go @@ -22,7 +22,7 @@ import ( func (r *github__com___kloudlite___operator___pkg___operator__StatusResolver) Checks(ctx context.Context, obj *operator.Status) (map[string]interface{}, error) { var m map[string]any if err := fn.JsonConversion(obj.Checks, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return m, nil } @@ -79,7 +79,7 @@ func (r *kloudlite__io___pkg___types__SyncStatusResolver) SyncScheduledAt(ctx co func (r *metadataResolver) Annotations(ctx context.Context, obj *v1.ObjectMeta) (map[string]interface{}, error) { var m map[string]any if err := fn.JsonConversion(obj.Annotations, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return m, nil } @@ -109,7 +109,7 @@ func (r *metadataResolver) DeletionTimestamp(ctx context.Context, obj *v1.Object func (r *metadataResolver) Labels(ctx context.Context, obj *v1.ObjectMeta) (map[string]interface{}, error) { var m map[string]any if err := fn.JsonConversion(obj.Labels, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return m, nil } @@ -118,7 +118,7 @@ func (r *metadataResolver) Labels(ctx context.Context, obj *v1.ObjectMeta) (map[ func (r *metadataInResolver) Annotations(ctx context.Context, obj *v1.ObjectMeta, data map[string]interface{}) error { var m map[string]string if err := fn.JsonConversion(data, &m); err != nil { - return err + return errors.NewE(err) } obj.SetAnnotations(m) return nil @@ -128,7 +128,7 @@ func (r *metadataInResolver) Annotations(ctx context.Context, obj *v1.ObjectMeta func (r *metadataInResolver) Labels(ctx context.Context, obj *v1.ObjectMeta, data map[string]interface{}) error { var m map[string]string if err := fn.JsonConversion(data, &m); err != nil { - return err + return errors.NewE(err) } obj.SetLabels(m) return nil diff --git a/apps/infra/internal/app/graph/node.resolvers.go b/apps/infra/internal/app/graph/node.resolvers.go index faef975bc..c9500b133 100644 --- a/apps/infra/internal/app/graph/node.resolvers.go +++ b/apps/infra/internal/app/graph/node.resolvers.go @@ -35,7 +35,7 @@ func (r *nodeResolver) ID(ctx context.Context, obj *entities.Node) (string, erro func (r *nodeResolver) Spec(ctx context.Context, obj *entities.Node) (*model.GithubComKloudliteOperatorApisClustersV1NodeSpec, error) { var m model.GithubComKloudliteOperatorApisClustersV1NodeSpec if err := fn.JsonConversion(obj.Spec, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return &m, nil } diff --git a/apps/infra/internal/app/graph/nodepool.resolvers.go b/apps/infra/internal/app/graph/nodepool.resolvers.go index 5dedf09a3..a3e478c76 100644 --- a/apps/infra/internal/app/graph/nodepool.resolvers.go +++ b/apps/infra/internal/app/graph/nodepool.resolvers.go @@ -36,7 +36,7 @@ func (r *nodePoolResolver) ID(ctx context.Context, obj *entities.NodePool) (stri func (r *nodePoolResolver) Spec(ctx context.Context, obj *entities.NodePool) (*model.GithubComKloudliteOperatorApisClustersV1NodePoolSpec, error) { var m model.GithubComKloudliteOperatorApisClustersV1NodePoolSpec if err := fn.JsonConversion(obj.Spec, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return &m, nil } diff --git a/apps/infra/internal/app/graph/persistentvolumeclaim.resolvers.go b/apps/infra/internal/app/graph/persistentvolumeclaim.resolvers.go index ebac946a3..dc2aa68d9 100644 --- a/apps/infra/internal/app/graph/persistentvolumeclaim.resolvers.go +++ b/apps/infra/internal/app/graph/persistentvolumeclaim.resolvers.go @@ -35,7 +35,7 @@ func (r *persistentVolumeClaimResolver) ID(ctx context.Context, obj *entities.Pe func (r *persistentVolumeClaimResolver) Spec(ctx context.Context, obj *entities.PersistentVolumeClaim) (*model.K8sIoAPICoreV1PersistentVolumeClaimSpec, error) { var m model.K8sIoAPICoreV1PersistentVolumeClaimSpec if err := fn.JsonConversion(obj.Spec, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return &m, nil } @@ -44,7 +44,7 @@ func (r *persistentVolumeClaimResolver) Spec(ctx context.Context, obj *entities. func (r *persistentVolumeClaimResolver) Status(ctx context.Context, obj *entities.PersistentVolumeClaim) (*model.K8sIoAPICoreV1PersistentVolumeClaimStatus, error) { var m model.K8sIoAPICoreV1PersistentVolumeClaimStatus if err := fn.JsonConversion(obj.Status, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return &m, nil } diff --git a/apps/infra/internal/app/graph/schema.resolvers.go b/apps/infra/internal/app/graph/schema.resolvers.go index 002f8696f..a45158550 100644 --- a/apps/infra/internal/app/graph/schema.resolvers.go +++ b/apps/infra/internal/app/graph/schema.resolvers.go @@ -21,11 +21,11 @@ import ( func (r *clusterResolver) AdminKubeconfig(ctx context.Context, obj *entities.Cluster) (*model.EncodedValue, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } s, err := r.Domain.GetClusterAdminKubeconfig(ictx, obj.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } if s == nil { @@ -42,7 +42,7 @@ func (r *clusterResolver) AdminKubeconfig(ctx context.Context, obj *entities.Clu func (r *mutationResolver) InfraCreateCluster(ctx context.Context, cluster entities.Cluster) (*entities.Cluster, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.CreateCluster(ictx, cluster) } @@ -51,7 +51,7 @@ func (r *mutationResolver) InfraCreateCluster(ctx context.Context, cluster entit func (r *mutationResolver) InfraUpdateCluster(ctx context.Context, cluster entities.Cluster) (*entities.Cluster, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.UpdateCluster(ictx, cluster) @@ -61,10 +61,10 @@ func (r *mutationResolver) InfraUpdateCluster(ctx context.Context, cluster entit func (r *mutationResolver) InfraDeleteCluster(ctx context.Context, name string) (bool, error) { ictx, err := toInfraContext(ctx) if err != nil { - return false, err + return false, errors.NewE(err) } if err := r.Domain.DeleteCluster(ictx, name); err != nil { - return false, err + return false, errors.NewE(err) } return true, nil } @@ -73,7 +73,7 @@ func (r *mutationResolver) InfraDeleteCluster(ctx context.Context, name string) func (r *mutationResolver) InfraCreateBYOCCluster(ctx context.Context, byocCluster entities.BYOCCluster) (*entities.BYOCCluster, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.CreateBYOCCluster(ictx, byocCluster) @@ -83,7 +83,7 @@ func (r *mutationResolver) InfraCreateBYOCCluster(ctx context.Context, byocClust func (r *mutationResolver) InfraUpdateBYOCCluster(ctx context.Context, byocCluster entities.BYOCCluster) (*entities.BYOCCluster, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.UpdateBYOCCluster(ictx, byocCluster) @@ -93,11 +93,11 @@ func (r *mutationResolver) InfraUpdateBYOCCluster(ctx context.Context, byocClust func (r *mutationResolver) InfraDeleteBYOCCluster(ctx context.Context, name string) (bool, error) { ictx, err := toInfraContext(ctx) if err != nil { - return false, err + return false, errors.NewE(err) } if err := r.Domain.DeleteBYOCCluster(ictx, name); err != nil { - return false, err + return false, errors.NewE(err) } return true, nil } @@ -106,7 +106,7 @@ func (r *mutationResolver) InfraDeleteBYOCCluster(ctx context.Context, name stri func (r *mutationResolver) InfraCreateProviderSecret(ctx context.Context, secret entities.CloudProviderSecret) (*entities.CloudProviderSecret, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.CreateProviderSecret(ictx, secret) @@ -116,7 +116,7 @@ func (r *mutationResolver) InfraCreateProviderSecret(ctx context.Context, secret func (r *mutationResolver) InfraUpdateProviderSecret(ctx context.Context, secret entities.CloudProviderSecret) (*entities.CloudProviderSecret, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.UpdateProviderSecret(ictx, secret) @@ -126,11 +126,11 @@ func (r *mutationResolver) InfraUpdateProviderSecret(ctx context.Context, secret func (r *mutationResolver) InfraDeleteProviderSecret(ctx context.Context, secretName string) (bool, error) { ictx, err := toInfraContext(ctx) if err != nil { - return false, err + return false, errors.NewE(err) } if err := r.Domain.DeleteProviderSecret(ictx, secretName); err != nil { - return false, err + return false, errors.NewE(err) } return true, nil } @@ -139,7 +139,7 @@ func (r *mutationResolver) InfraDeleteProviderSecret(ctx context.Context, secret func (r *mutationResolver) InfraCreateDomainEntry(ctx context.Context, domainEntry entities.DomainEntry) (*entities.DomainEntry, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.CreateDomainEntry(ictx, domainEntry) } @@ -148,7 +148,7 @@ func (r *mutationResolver) InfraCreateDomainEntry(ctx context.Context, domainEnt func (r *mutationResolver) InfraUpdateDomainEntry(ctx context.Context, domainEntry entities.DomainEntry) (*entities.DomainEntry, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.UpdateDomainEntry(ictx, domainEntry) } @@ -157,10 +157,10 @@ func (r *mutationResolver) InfraUpdateDomainEntry(ctx context.Context, domainEnt func (r *mutationResolver) InfraDeleteDomainEntry(ctx context.Context, domainName string) (bool, error) { ictx, err := toInfraContext(ctx) if err != nil { - return false, err + return false, errors.NewE(err) } if err := r.Domain.DeleteDomainEntry(ictx, domainName); err != nil { - return false, err + return false, errors.NewE(err) } return true, nil } @@ -169,7 +169,7 @@ func (r *mutationResolver) InfraDeleteDomainEntry(ctx context.Context, domainNam func (r *mutationResolver) InfraCreateNodePool(ctx context.Context, clusterName string, pool entities.NodePool) (*entities.NodePool, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.CreateNodePool(ictx, clusterName, pool) @@ -179,7 +179,7 @@ func (r *mutationResolver) InfraCreateNodePool(ctx context.Context, clusterName func (r *mutationResolver) InfraUpdateNodePool(ctx context.Context, clusterName string, pool entities.NodePool) (*entities.NodePool, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.UpdateNodePool(ictx, clusterName, pool) @@ -189,11 +189,11 @@ func (r *mutationResolver) InfraUpdateNodePool(ctx context.Context, clusterName func (r *mutationResolver) InfraDeleteNodePool(ctx context.Context, clusterName string, poolName string) (bool, error) { ictx, err := toInfraContext(ctx) if err != nil { - return false, err + return false, errors.NewE(err) } if err := r.Domain.DeleteNodePool(ictx, clusterName, poolName); err != nil { - return false, err + return false, errors.NewE(err) } return true, nil } @@ -202,7 +202,7 @@ func (r *mutationResolver) InfraDeleteNodePool(ctx context.Context, clusterName func (r *mutationResolver) InfraCreateVPNDevice(ctx context.Context, clusterName string, vpnDevice entities.VPNDevice) (*entities.VPNDevice, error) { cc, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.CreateVPNDevice(cc, clusterName, vpnDevice) @@ -212,7 +212,7 @@ func (r *mutationResolver) InfraCreateVPNDevice(ctx context.Context, clusterName func (r *mutationResolver) InfraUpdateVPNDevice(ctx context.Context, clusterName string, vpnDevice entities.VPNDevice) (*entities.VPNDevice, error) { cc, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.UpdateVPNDevice(cc, clusterName, vpnDevice) } @@ -221,10 +221,10 @@ func (r *mutationResolver) InfraUpdateVPNDevice(ctx context.Context, clusterName func (r *mutationResolver) InfraDeleteVPNDevice(ctx context.Context, clusterName string, deviceName string) (bool, error) { cc, err := toInfraContext(ctx) if err != nil { - return false, err + return false, errors.NewE(err) } if err := r.Domain.DeleteVPNDevice(cc, clusterName, deviceName); err != nil { - return false, err + return false, errors.NewE(err) } return true, nil } @@ -233,7 +233,7 @@ func (r *mutationResolver) InfraDeleteVPNDevice(ctx context.Context, clusterName func (r *queryResolver) InfraCheckNameAvailability(ctx context.Context, resType domain.ResType, clusterName *string, name string) (*domain.CheckNameAvailabilityOutput, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.CheckNameAvailability(ictx, resType, clusterName, name) @@ -243,7 +243,7 @@ func (r *queryResolver) InfraCheckNameAvailability(ctx context.Context, resType func (r *queryResolver) InfraListClusters(ctx context.Context, search *model.SearchCluster, pagination *repos.CursorPagination) (*model.ClusterPaginatedRecords, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } if pagination == nil { @@ -272,7 +272,7 @@ func (r *queryResolver) InfraListClusters(ctx context.Context, search *model.Sea pClusters, err := r.Domain.ListClusters(ictx, filter, *pagination) if err != nil { - return nil, err + return nil, errors.NewE(err) } ce := make([]*model.ClusterEdge, len(pClusters.Edges)) @@ -301,7 +301,7 @@ func (r *queryResolver) InfraListClusters(ctx context.Context, search *model.Sea func (r *queryResolver) InfraGetCluster(ctx context.Context, name string) (*entities.Cluster, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.GetCluster(ictx, name) @@ -311,7 +311,7 @@ func (r *queryResolver) InfraGetCluster(ctx context.Context, name string) (*enti func (r *queryResolver) InfraListBYOCClusters(ctx context.Context, search *model.SearchCluster, pagination *repos.CursorPagination) (*model.BYOCClusterPaginatedRecords, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } if pagination == nil { @@ -339,7 +339,7 @@ func (r *queryResolver) InfraListBYOCClusters(ctx context.Context, search *model pClusters, err := r.Domain.ListBYOCClusters(ictx, filter, *pagination) if err != nil { - return nil, err + return nil, errors.NewE(err) } bce := make([]*model.BYOCClusterEdge, len(pClusters.Edges)) @@ -368,7 +368,7 @@ func (r *queryResolver) InfraListBYOCClusters(ctx context.Context, search *model func (r *queryResolver) InfraGetBYOCCluster(ctx context.Context, name string) (*entities.BYOCCluster, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.GetBYOCCluster(ictx, name) @@ -378,7 +378,7 @@ func (r *queryResolver) InfraGetBYOCCluster(ctx context.Context, name string) (* func (r *queryResolver) InfraListNodePools(ctx context.Context, clusterName string, search *model.SearchNodepool, pagination *repos.CursorPagination) (*model.NodePoolPaginatedRecords, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } if pagination == nil { @@ -395,7 +395,7 @@ func (r *queryResolver) InfraListNodePools(ctx context.Context, clusterName stri pNodePools, err := r.Domain.ListNodePools(ictx, clusterName, filter, *pagination) if err != nil { - return nil, err + return nil, errors.NewE(err) } pe := make([]*model.NodePoolEdge, len(pNodePools.Edges)) @@ -424,7 +424,7 @@ func (r *queryResolver) InfraListNodePools(ctx context.Context, clusterName stri func (r *queryResolver) InfraGetNodePool(ctx context.Context, clusterName string, poolName string) (*entities.NodePool, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.GetNodePool(ictx, clusterName, poolName) @@ -434,7 +434,7 @@ func (r *queryResolver) InfraGetNodePool(ctx context.Context, clusterName string func (r *queryResolver) InfraListProviderSecrets(ctx context.Context, search *model.SearchProviderSecret, pagination *repos.CursorPagination) (*model.CloudProviderSecretPaginatedRecords, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } if pagination == nil { @@ -455,7 +455,7 @@ func (r *queryResolver) InfraListProviderSecrets(ctx context.Context, search *mo pSecrets, err := r.Domain.ListProviderSecrets(ictx, filter, *pagination) if err != nil { - return nil, err + return nil, errors.NewE(err) } pe := make([]*model.CloudProviderSecretEdge, len(pSecrets.Edges)) @@ -484,7 +484,7 @@ func (r *queryResolver) InfraListProviderSecrets(ctx context.Context, search *mo func (r *queryResolver) InfraGetProviderSecret(ctx context.Context, name string) (*entities.CloudProviderSecret, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.GetProviderSecret(ictx, name) @@ -494,7 +494,7 @@ func (r *queryResolver) InfraGetProviderSecret(ctx context.Context, name string) func (r *queryResolver) InfraListDomainEntries(ctx context.Context, search *model.SearchDomainEntry, pagination *repos.CursorPagination) (*model.DomainEntryPaginatedRecords, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } filter := map[string]repos.MatchFilter{} @@ -511,7 +511,7 @@ func (r *queryResolver) InfraListDomainEntries(ctx context.Context, search *mode dEntries, err := r.Domain.ListDomainEntries(ictx, filter, fn.DefaultIfNil(pagination, repos.DefaultCursorPagination)) if err != nil { - return nil, err + return nil, errors.NewE(err) } edges := make([]*model.DomainEntryEdge, len(dEntries.Edges)) @@ -540,7 +540,7 @@ func (r *queryResolver) InfraListDomainEntries(ctx context.Context, search *mode func (r *queryResolver) InfraGetDomainEntry(ctx context.Context, domainName string) (*entities.DomainEntry, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.GetDomainEntry(ictx, domainName) @@ -550,12 +550,12 @@ func (r *queryResolver) InfraGetDomainEntry(ctx context.Context, domainName stri func (r *queryResolver) InfraCheckAwsAccess(ctx context.Context, cloudproviderName string) (*model.CheckAwsAccessOutput, error) { ictx, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } output, err := r.Domain.ValidateProviderSecretAWSAccess(ictx, cloudproviderName) if err != nil { - return nil, err + return nil, errors.NewE(err) } return &model.CheckAwsAccessOutput{ @@ -582,13 +582,13 @@ func (r *queryResolver) InfraListVPNDevices(ctx context.Context, clusterName *st cc, err := toInfraContext(ctx) if err != nil { if cc.AccountName == "" { - return nil, err + return nil, errors.NewE(err) } } devices, err := r.Domain.ListVPNDevices(cc, cc.AccountName, clusterName, filter, fn.DefaultIfNil(pq, repos.DefaultCursorPagination)) if err != nil { - return nil, err + return nil, errors.NewE(err) } ve := make([]*model.VPNDeviceEdge, len(devices.Edges)) @@ -617,7 +617,7 @@ func (r *queryResolver) InfraListVPNDevices(ctx context.Context, clusterName *st func (r *queryResolver) InfraGetVPNDevice(ctx context.Context, clusterName string, name string) (*entities.VPNDevice, error) { cc, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.GetVPNDevice(cc, clusterName, name) } @@ -633,12 +633,12 @@ func (r *queryResolver) InfraListBuildRuns(ctx context.Context, repoName string, cc, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } buildRuns, err := r.Domain.ListBuildRuns(cc, repoName, filter, fn.DefaultIfNil(pq, repos.DefaultCursorPagination)) if err != nil { - return nil, err + return nil, errors.NewE(err) } ve := make([]*model.BuildRunEdge, len(buildRuns.Edges)) @@ -667,7 +667,7 @@ func (r *queryResolver) InfraListBuildRuns(ctx context.Context, repoName string, func (r *queryResolver) InfraGetBuildRun(ctx context.Context, repoName string, buildRunName string) (*entities.BuildRun, error) { cc, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.GetBuildRun(cc, repoName, buildRunName) @@ -684,12 +684,12 @@ func (r *queryResolver) InfraListPVCs(ctx context.Context, clusterName string, s cc, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } pvcs, err := r.Domain.ListPVCs(cc, clusterName, filter, fn.DefaultIfNil(pq, repos.DefaultCursorPagination)) if err != nil { - return nil, err + return nil, errors.NewE(err) } ve := make([]*model.PersistentVolumeClaimEdge, len(pvcs.Edges)) @@ -718,7 +718,7 @@ func (r *queryResolver) InfraListPVCs(ctx context.Context, clusterName string, s func (r *queryResolver) InfraGetPvc(ctx context.Context, clusterName string, name string) (*entities.PersistentVolumeClaim, error) { cc, err := toInfraContext(ctx) if err != nil { - return nil, err + return nil, errors.NewE(err) } return r.Domain.GetPVC(cc, clusterName, name) diff --git a/apps/infra/internal/app/graph/vpndevice.resolvers.go b/apps/infra/internal/app/graph/vpndevice.resolvers.go index 4713e756a..757d30e34 100644 --- a/apps/infra/internal/app/graph/vpndevice.resolvers.go +++ b/apps/infra/internal/app/graph/vpndevice.resolvers.go @@ -39,7 +39,7 @@ func (r *vPNDeviceResolver) Spec(ctx context.Context, obj *entities.VPNDevice) ( } var m model.GithubComKloudliteOperatorApisWireguardV1DeviceSpec if err := fn.JsonConversion(obj.Spec, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return &m, nil } @@ -56,7 +56,7 @@ func (r *vPNDeviceResolver) UpdateTime(ctx context.Context, obj *entities.VPNDev func (r *vPNDeviceResolver) WireguardConfig(ctx context.Context, obj *entities.VPNDevice) (*model.KloudliteIoPkgTypesEncodedString, error) { var m model.KloudliteIoPkgTypesEncodedString if err := fn.JsonConversion(obj.WireguardConfig, &m); err != nil { - return nil, err + return nil, errors.NewE(err) } return &m, nil } diff --git a/apps/infra/internal/app/grpc-server.go b/apps/infra/internal/app/grpc-server.go index 064153c1f..c20ec8c24 100644 --- a/apps/infra/internal/app/grpc-server.go +++ b/apps/infra/internal/app/grpc-server.go @@ -24,7 +24,7 @@ func (g *grpcServer) GetCluster(ctx context.Context, in *infra.GetClusterIn) (*i } c, err := g.d.GetCluster(infraCtx, in.ClusterName) if err != nil { - return nil, err + return nil, errors.NewE(err) } if c == nil { @@ -61,7 +61,7 @@ func (g *grpcServer) GetNodepool(ctx context.Context, in *infra.GetNodepoolIn) ( } np, err := g.d.GetNodePool(infraCtx, in.ClusterName, in.NodepoolName) if err != nil { - return nil, err + return nil, errors.NewE(err) } if np == nil { diff --git a/apps/infra/internal/app/process-error-on-apply.go b/apps/infra/internal/app/process-error-on-apply.go index 4c55a3723..a14233fe2 100644 --- a/apps/infra/internal/app/process-error-on-apply.go +++ b/apps/infra/internal/app/process-error-on-apply.go @@ -21,7 +21,7 @@ func ProcessErrorOnApply(consumer ErrorOnApplyConsumer, logger logging.Logger, d var errMsg t.AgentErrMessage if err := json.Unmarshal(msg.Payload, &errMsg); err != nil { - return err + return errors.NewE(err) } obj := unstructured.Unstructured{Object: errMsg.Object} diff --git a/apps/infra/internal/app/process-status-updates.go b/apps/infra/internal/app/process-status-updates.go index 3db2a5b84..ef23e6059 100644 --- a/apps/infra/internal/app/process-status-updates.go +++ b/apps/infra/internal/app/process-status-updates.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/kloudlite/api/pkg/errors" "strings" "time" @@ -86,7 +87,7 @@ func processInfraUpdates(consumer ReceiveInfraUpdatesConsumer, d domain.Domain, { var np entities.NodePool if err := fn.JsonConversion(su.Object, &np); err != nil { - return err + return errors.NewE(err) } if obj.GetDeletionTimestamp() != nil { return d.OnDeleteNodePoolMessage(dctx, su.ClusterName, np) @@ -97,16 +98,16 @@ func processInfraUpdates(consumer ReceiveInfraUpdatesConsumer, d domain.Domain, { var device entities.VPNDevice if err := fn.JsonConversion(su.Object, &device); err != nil { - return err + return errors.NewE(err) } if v, ok := su.Object["resource-watcher-wireguard-config"]; ok { b, err := json.Marshal(v) if err != nil { - return err + return errors.NewE(err) } var encodedStr t.EncodedString if err := json.Unmarshal(b, &encodedStr); err != nil { - return err + return errors.NewE(err) } device.WireguardConfig = encodedStr } @@ -119,7 +120,7 @@ func processInfraUpdates(consumer ReceiveInfraUpdatesConsumer, d domain.Domain, { var pvc entities.PersistentVolumeClaim if err := fn.JsonConversion(su.Object, &pvc); err != nil { - return err + return errors.NewE(err) } if obj.GetDeletionTimestamp() != nil { return d.OnPVCDeleteMessage(dctx, su.ClusterName, pvc) @@ -130,7 +131,7 @@ func processInfraUpdates(consumer ReceiveInfraUpdatesConsumer, d domain.Domain, { var buildRun entities.BuildRun if err := fn.JsonConversion(su.Object, &buildRun); err != nil { - return err + return errors.NewE(err) } if obj.GetDeletionTimestamp() != nil { return d.OnBuildRunDeleteMessage(dctx, su.ClusterName, buildRun) diff --git a/apps/infra/internal/domain/build-run.go b/apps/infra/internal/domain/build-run.go index 4e695c67a..2446c00bd 100644 --- a/apps/infra/internal/domain/build-run.go +++ b/apps/infra/internal/domain/build-run.go @@ -21,7 +21,7 @@ func (d *domain) GetBuildRun(ctx InfraContext, repoName string, buildRunName str "spec.registry.repo.name": repoName, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } if brun == nil { @@ -37,7 +37,7 @@ func (d *domain) OnBuildRunUpdateMessage(ctx InfraContext, clusterName string, b "accountName": ctx.AccountName, "clusterName": clusterName, }, &buildRun); err != nil { - return err + return errors.NewE(err) } return nil } @@ -49,7 +49,7 @@ func (d *domain) OnBuildRunDeleteMessage(ctx InfraContext, clusterName string, b "accountName": ctx.AccountName, "clusterName": clusterName, }); err != nil { - return err + return errors.NewE(err) } return nil } diff --git a/apps/infra/internal/domain/byoc-clusters.go b/apps/infra/internal/domain/byoc-clusters.go index 6701800f1..a82a78032 100644 --- a/apps/infra/internal/domain/byoc-clusters.go +++ b/apps/infra/internal/domain/byoc-clusters.go @@ -16,7 +16,7 @@ import ( func (d *domain) findBYOCCluster(ctx InfraContext, clusterName string) (*entities.BYOCCluster, error) { accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return nil, err + return nil, errors.NewE(err) } cluster, err := d.byocClusterRepo.FindOne(ctx, repos.Filter{ @@ -25,7 +25,7 @@ func (d *domain) findBYOCCluster(ctx InfraContext, clusterName string) (*entitie "metadata.namespace": accNs, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } if cluster == nil { return nil, errors.Newf("BYOC cluster with name %q not found", clusterName) @@ -35,14 +35,14 @@ func (d *domain) findBYOCCluster(ctx InfraContext, clusterName string) (*entitie func (d *domain) CreateBYOCCluster(ctx InfraContext, cluster entities.BYOCCluster) (*entities.BYOCCluster, error) { if err := d.canPerformActionInAccount(ctx, iamT.CreateCluster); err != nil { - return nil, err + return nil, errors.NewE(err) } cluster.EnsureGVK() cluster.IncomingKafkaTopicName = common.GetKafkaTopicName(ctx.AccountName, cluster.Name) if err := d.k8sClient.ValidateObject(ctx, &cluster.BYOC); err != nil { - return nil, err + return nil, errors.NewE(err) } cluster.IncrementRecordVersion() @@ -60,12 +60,12 @@ func (d *domain) CreateBYOCCluster(ctx InfraContext, cluster entities.BYOCCluste nCluster, err := d.byocClusterRepo.Create(ctx, &cluster) if err != nil { if d.clusterRepo.ErrAlreadyExists(err) { - return nil, err + return nil, errors.NewE(err) } } if err := d.applyK8sResource(ctx, &nCluster.BYOC, nCluster.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } redpandaTopic := redpandaMsvcv1.Topic{ @@ -76,7 +76,7 @@ func (d *domain) CreateBYOCCluster(ctx InfraContext, cluster entities.BYOCCluste redpandaTopic.EnsureGVK() if err := d.applyK8sResource(ctx, &redpandaTopic, nCluster.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } return nCluster, nil @@ -84,12 +84,12 @@ func (d *domain) CreateBYOCCluster(ctx InfraContext, cluster entities.BYOCCluste func (d *domain) ListBYOCClusters(ctx InfraContext, filters map[string]repos.MatchFilter, pagination repos.CursorPagination) (*repos.PaginatedRecord[*entities.BYOCCluster], error) { if err := d.canPerformActionInAccount(ctx, iamT.ListClusters); err != nil { - return nil, err + return nil, errors.NewE(err) } accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return nil, err + return nil, errors.NewE(err) } f := repos.Filter{ @@ -101,24 +101,24 @@ func (d *domain) ListBYOCClusters(ctx InfraContext, filters map[string]repos.Mat func (d *domain) GetBYOCCluster(ctx InfraContext, name string) (*entities.BYOCCluster, error) { if err := d.canPerformActionInAccount(ctx, iamT.GetCluster); err != nil { - return nil, err + return nil, errors.NewE(err) } return d.findBYOCCluster(ctx, name) } func (d *domain) UpdateBYOCCluster(ctx InfraContext, cluster entities.BYOCCluster) (*entities.BYOCCluster, error) { if err := d.canPerformActionInAccount(ctx, iamT.UpdateCluster); err != nil { - return nil, err + return nil, errors.NewE(err) } cluster.EnsureGVK() if err := d.k8sClient.ValidateObject(ctx, &cluster.BYOC); err != nil { - return nil, err + return nil, errors.NewE(err) } c, err := d.findBYOCCluster(ctx, cluster.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } c.IncrementRecordVersion() @@ -133,11 +133,11 @@ func (d *domain) UpdateBYOCCluster(ctx InfraContext, cluster entities.BYOCCluste uCluster, err := d.byocClusterRepo.UpdateById(ctx, c.Id, c) if err != nil { - return nil, err + return nil, errors.NewE(err) } if err := d.applyK8sResource(ctx, &uCluster.BYOC, uCluster.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } return uCluster, nil @@ -145,12 +145,12 @@ func (d *domain) UpdateBYOCCluster(ctx InfraContext, cluster entities.BYOCCluste func (d *domain) DeleteBYOCCluster(ctx InfraContext, name string) error { if err := d.canPerformActionInAccount(ctx, iamT.DeleteCluster); err != nil { - return err + return errors.NewE(err) } clus, err := d.findBYOCCluster(ctx, name) if err != nil { - return err + return errors.NewE(err) } if clus.IsMarkedForDeletion() { @@ -161,7 +161,7 @@ func (d *domain) DeleteBYOCCluster(ctx InfraContext, name string) error { clus.SyncStatus = t.GetSyncStatusForDeletion(clus.Generation) upC, err := d.byocClusterRepo.UpdateById(ctx, clus.Id, clus) if err != nil { - return err + return errors.NewE(err) } return d.deleteK8sResource(ctx, &upC.BYOC) } @@ -169,11 +169,11 @@ func (d *domain) DeleteBYOCCluster(ctx InfraContext, name string) error { func (d *domain) ResyncBYOCCluster(ctx InfraContext, name string) error { clus, err := d.findBYOCCluster(ctx, name) if err != nil { - return err + return errors.NewE(err) } if err := d.applyK8sResource(ctx, &clus.BYOC, clus.RecordVersion); err != nil { - return err + return errors.NewE(err) } redpandaTopic := redpandaMsvcv1.Topic{ @@ -191,7 +191,7 @@ func (d *domain) ResyncBYOCCluster(ctx InfraContext, name string) error { func (d *domain) OnDeleteBYOCClusterMessage(ctx InfraContext, cluster entities.BYOCCluster) error { accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return err + return errors.NewE(err) } return d.clusterRepo.DeleteOne(ctx, repos.Filter{ @@ -204,14 +204,14 @@ func (d *domain) OnDeleteBYOCClusterMessage(ctx InfraContext, cluster entities.B func (d *domain) OnUpdateBYOCClusterMessage(ctx InfraContext, cluster entities.BYOCCluster) error { c, err := d.findBYOCCluster(ctx, cluster.Name) if err != nil { - return err + return errors.NewE(err) } c.SyncStatus.State = t.SyncStateReceivedUpdateFromAgent _, err = d.byocClusterRepo.UpdateById(ctx, c.Id, &cluster) if err != nil { - return err + return errors.NewE(err) } return nil } diff --git a/apps/infra/internal/domain/clusters.go b/apps/infra/internal/domain/clusters.go index 778d2105b..29dcb1f6b 100644 --- a/apps/infra/internal/domain/clusters.go +++ b/apps/infra/internal/domain/clusters.go @@ -52,7 +52,7 @@ func (d *domain) createTokenSecret(ctx InfraContext, ps *entities.CloudProviderS ClusterName: clusterName, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } secret.StringData = map[string]string{ @@ -65,7 +65,7 @@ func (d *domain) createTokenSecret(ctx InfraContext, ps *entities.CloudProviderS func (d *domain) GetClusterAdminKubeconfig(ctx InfraContext, clusterName string) (*string, error) { cluster, err := d.findCluster(ctx, clusterName) if err != nil { - return nil, err + return nil, errors.NewE(err) } if cluster.Spec.Output == nil { @@ -74,7 +74,7 @@ func (d *domain) GetClusterAdminKubeconfig(ctx InfraContext, clusterName string) kscrt := corev1.Secret{} if err := d.k8sClient.Get(ctx.Context, fn.NN(cluster.Namespace, cluster.Spec.Output.SecretName), &kscrt); err != nil { - return nil, err + return nil, errors.NewE(err) } kubeconfig, ok := kscrt.Data[cluster.Spec.Output.KeyKubeconfig] @@ -241,7 +241,7 @@ func (d *domain) CreateCluster(ctx InfraContext, cluster entities.Cluster) (*ent } if err := d.applyK8sResource(ctx, &nCluster.Cluster, nCluster.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } return nCluster, nil @@ -249,12 +249,12 @@ func (d *domain) CreateCluster(ctx InfraContext, cluster entities.Cluster) (*ent func (d *domain) ListClusters(ctx InfraContext, mf map[string]repos.MatchFilter, pagination repos.CursorPagination) (*repos.PaginatedRecord[*entities.Cluster], error) { if err := d.canPerformActionInAccount(ctx, iamT.ListClusters); err != nil { - return nil, err + return nil, errors.NewE(err) } accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return nil, err + return nil, errors.NewE(err) } f := repos.Filter{ @@ -264,7 +264,7 @@ func (d *domain) ListClusters(ctx InfraContext, mf map[string]repos.MatchFilter, pr, err := d.clusterRepo.FindPaginated(ctx, d.secretRepo.MergeMatchFilters(f, mf), pagination) if err != nil { - return nil, err + return nil, errors.NewE(err) } edges := make([]repos.RecordEdge[*entities.Cluster], 0, len(pr.Edges)) @@ -272,7 +272,7 @@ func (d *domain) ListClusters(ctx InfraContext, mf map[string]repos.MatchFilter, for i := range pr.Edges { c, found, err := d.readClusterK8sResource(ctx, pr.Edges[i].Node.Namespace, pr.Edges[i].Node.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } if found { @@ -281,7 +281,7 @@ func (d *domain) ListClusters(ctx InfraContext, mf map[string]repos.MatchFilter, if !found && pr.Edges[i].Node.MarkedForDeletion != nil && *pr.Edges[i].Node.MarkedForDeletion { if err := d.clusterRepo.DeleteById(ctx, pr.Edges[i].Node.Id); err != nil { - return nil, err + return nil, errors.NewE(err) } continue } @@ -294,17 +294,17 @@ func (d *domain) ListClusters(ctx InfraContext, mf map[string]repos.MatchFilter, func (d *domain) GetCluster(ctx InfraContext, name string) (*entities.Cluster, error) { if err := d.canPerformActionInAccount(ctx, iamT.GetCluster); err != nil { - return nil, err + return nil, errors.NewE(err) } c, err := d.findCluster(ctx, name) if err != nil { - return nil, err + return nil, errors.NewE(err) } clus, found, err := d.readClusterK8sResource(ctx, c.Namespace, c.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } if found { @@ -313,7 +313,7 @@ func (d *domain) GetCluster(ctx InfraContext, name string) (*entities.Cluster, e if !found && c.MarkedForDeletion != nil && *c.MarkedForDeletion { if err := d.clusterRepo.DeleteById(ctx, c.Id); err != nil { - return nil, err + return nil, errors.NewE(err) } return nil, nil } @@ -323,12 +323,12 @@ func (d *domain) GetCluster(ctx InfraContext, name string) (*entities.Cluster, e func (d *domain) UpdateCluster(ctx InfraContext, cluster entities.Cluster) (*entities.Cluster, error) { if err := d.canPerformActionInAccount(ctx, iamT.UpdateCluster); err != nil { - return nil, err + return nil, errors.NewE(err) } cluster.EnsureGVK() clus, err := d.findCluster(ctx, cluster.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } if clus.IsMarkedForDeletion() { @@ -337,7 +337,7 @@ func (d *domain) UpdateCluster(ctx InfraContext, cluster entities.Cluster) (*ent cps, err := d.findProviderSecret(ctx, cluster.Spec.CredentialsRef.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } if cps.IsMarkedForDeletion() { @@ -360,11 +360,11 @@ func (d *domain) UpdateCluster(ctx InfraContext, cluster entities.Cluster) (*ent uCluster, err := d.clusterRepo.UpdateById(ctx, clus.Id, clus) if err != nil { - return nil, err + return nil, errors.NewE(err) } if err := d.applyK8sResource(ctx, &uCluster.Cluster, uCluster.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } return uCluster, nil @@ -383,11 +383,11 @@ func (d *domain) readClusterK8sResource(ctx InfraContext, namespace string, name func (d *domain) DeleteCluster(ctx InfraContext, name string) error { if err := d.canPerformActionInAccount(ctx, iamT.DeleteCluster); err != nil { - return err + return errors.NewE(err) } c, err := d.findCluster(ctx, name) if err != nil { - return err + return errors.NewE(err) } if c.MarkedForDeletion == nil || *c.MarkedForDeletion { @@ -395,7 +395,7 @@ func (d *domain) DeleteCluster(ctx InfraContext, name string) error { c.SyncStatus = t.GetSyncStatusForDeletion(c.Generation) upC, err := d.clusterRepo.UpdateById(ctx, c.Id, c) if err != nil { - return err + return errors.NewE(err) } return d.deleteK8sResource(ctx, &upC.Cluster) @@ -407,7 +407,7 @@ func (d *domain) DeleteCluster(ctx InfraContext, name string) error { func (d *domain) OnDeleteClusterMessage(ctx InfraContext, cluster entities.Cluster) error { accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return err + return errors.NewE(err) } return d.clusterRepo.DeleteOne(ctx, repos.Filter{ @@ -420,7 +420,7 @@ func (d *domain) OnDeleteClusterMessage(ctx InfraContext, cluster entities.Clust func (d *domain) OnUpdateClusterMessage(ctx InfraContext, cluster entities.Cluster) error { c, err := d.findCluster(ctx, cluster.Name) if err != nil { - return err + return errors.NewE(err) } if err := d.matchRecordVersion(cluster.Annotations, c.RecordVersion); err != nil { @@ -439,13 +439,13 @@ func (d *domain) OnUpdateClusterMessage(ctx InfraContext, cluster entities.Clust c.Status = cluster.Status _, err = d.clusterRepo.UpdateById(ctx, c.Id, c) - return err + return errors.NewE(err) } func (d *domain) findCluster(ctx InfraContext, clusterName string) (*entities.Cluster, error) { accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return nil, err + return nil, errors.NewE(err) } cluster, err := d.clusterRepo.FindOne(ctx, repos.Filter{ @@ -454,7 +454,7 @@ func (d *domain) findCluster(ctx InfraContext, clusterName string) (*entities.Cl "metadata.namespace": accNs, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } if cluster == nil { diff --git a/apps/infra/internal/domain/domain-entries.go b/apps/infra/internal/domain/domain-entries.go index a67781e35..9ad47f61d 100644 --- a/apps/infra/internal/domain/domain-entries.go +++ b/apps/infra/internal/domain/domain-entries.go @@ -11,7 +11,7 @@ import ( func (d *domain) ListDomainEntries(ctx InfraContext, search map[string]repos.MatchFilter, pagination repos.CursorPagination) (*repos.PaginatedRecord[*entities.DomainEntry], error) { if err := d.canPerformActionInAccount(ctx, iamT.ListDomainEntries); err != nil { - return nil, err + return nil, errors.NewE(err) } filters := map[string]any{ @@ -22,14 +22,14 @@ func (d *domain) ListDomainEntries(ctx InfraContext, search map[string]repos.Mat func (d *domain) GetDomainEntry(ctx InfraContext, domainName string) (*entities.DomainEntry, error) { if err := d.canPerformActionInAccount(ctx, iamT.GetDomainEntry); err != nil { - return nil, err + return nil, errors.NewE(err) } return d.findDomainEntry(ctx, ctx.AccountName, domainName) } func (d *domain) CreateDomainEntry(ctx InfraContext, de entities.DomainEntry) (*entities.DomainEntry, error) { if err := d.canPerformActionInAccount(ctx, iamT.CreateDomainEntry); err != nil { - return nil, err + return nil, errors.NewE(err) } de.AccountName = ctx.AccountName de.CreatedBy = common.CreatedOrUpdatedBy{ @@ -41,7 +41,7 @@ func (d *domain) CreateDomainEntry(ctx InfraContext, de entities.DomainEntry) (* nde, err := d.domainEntryRepo.Create(ctx, &de) if err != nil { - return nil, err + return nil, errors.NewE(err) } return nde, nil @@ -49,12 +49,12 @@ func (d *domain) CreateDomainEntry(ctx InfraContext, de entities.DomainEntry) (* func (d *domain) UpdateDomainEntry(ctx InfraContext, de entities.DomainEntry) (*entities.DomainEntry, error) { if err := d.canPerformActionInAccount(ctx, iamT.UpdateDomainEntry); err != nil { - return nil, err + return nil, errors.NewE(err) } existing, err := d.findDomainEntry(ctx, ctx.AccountName, de.DomainName) if err != nil { - return nil, err + return nil, errors.NewE(err) } existing.DisplayName = de.DisplayName @@ -66,18 +66,18 @@ func (d *domain) UpdateDomainEntry(ctx InfraContext, de entities.DomainEntry) (* newDe, err := d.domainEntryRepo.UpdateById(ctx, existing.Id, existing) if err != nil { - return nil, err + return nil, errors.NewE(err) } return newDe, nil } func (d *domain) DeleteDomainEntry(ctx InfraContext, domainName string) error { if err := d.canPerformActionInAccount(ctx, iamT.DeleteDomainEntry); err != nil { - return err + return errors.NewE(err) } entry, err := d.findDomainEntry(ctx, ctx.AccountName, domainName) if err != nil { - return err + return errors.NewE(err) } return d.domainEntryRepo.DeleteById(ctx, entry.Id) @@ -90,7 +90,7 @@ func (d *domain) findDomainEntry(ctx context.Context, accountName string, domain } one, err := d.domainEntryRepo.FindOne(ctx, filters) if err != nil { - return nil, err + return nil, errors.NewE(err) } if one == nil { diff --git a/apps/infra/internal/domain/domain.go b/apps/infra/internal/domain/domain.go index b60d124f1..5808c02a6 100644 --- a/apps/infra/internal/domain/domain.go +++ b/apps/infra/internal/domain/domain.go @@ -69,11 +69,11 @@ func (d *domain) applyK8sResource(ctx InfraContext, obj client.Object, recordVer b, err := fn.K8sObjToYAML(obj) if err != nil { - return err + return errors.NewE(err) } if err := d.k8sClient.ApplyYAML(ctx, b); err != nil { - return err + return errors.NewE(err) } return nil } @@ -81,11 +81,11 @@ func (d *domain) applyK8sResource(ctx InfraContext, obj client.Object, recordVer func (d *domain) deleteK8sResource(ctx InfraContext, obj client.Object) error { b, err := fn.K8sObjToYAML(obj) if err != nil { - return err + return errors.NewE(err) } if err := d.k8sClient.DeleteYAML(ctx, b); err != nil { - return err + return errors.NewE(err) } return nil } @@ -98,7 +98,7 @@ func (d *domain) parseRecordVersionFromAnnotations(annotations map[string]string annVersion, err := strconv.ParseInt(annotatedVersion, 10, 32) if err != nil { - return 0, err + return 0, errors.NewE(err) } return int(annVersion), nil @@ -107,7 +107,7 @@ func (d *domain) parseRecordVersionFromAnnotations(annotations map[string]string func (d *domain) matchRecordVersion(annotations map[string]string, rv int) error { annVersion, err := d.parseRecordVersionFromAnnotations(annotations) if err != nil { - return err + return errors.NewE(err) } if annVersion != rv { @@ -120,7 +120,7 @@ func (d *domain) matchRecordVersion(annotations map[string]string, rv int) error func (d *domain) getAccNamespace(ctx InfraContext, name string) (string, error) { acc, err := d.accountsSvc.GetAccount(ctx, string(ctx.UserId), ctx.AccountName) if err != nil { - return "", err + return "", errors.NewE(err) } if !acc.IsActive { return "", errors.Newf("account %q is not active", ctx.AccountName) diff --git a/apps/infra/internal/domain/iam-checks.go b/apps/infra/internal/domain/iam-checks.go index 12cf253bf..14d84a94a 100644 --- a/apps/infra/internal/domain/iam-checks.go +++ b/apps/infra/internal/domain/iam-checks.go @@ -2,6 +2,7 @@ package domain import ( "fmt" + "github.com/kloudlite/api/pkg/errors" iamT "github.com/kloudlite/api/apps/iam/types" "github.com/kloudlite/api/grpc-interfaces/kloudlite.io/rpc/iam" @@ -22,7 +23,7 @@ type ErrGRPCCall struct { } func (e ErrGRPCCall) Error() string { - return fmt.Sprintf("grpc call failed with error: %v", e.Err) + return fmt.Sprintf("grpc call failed with error: %v", errors.NewE(e.Err)) } func (d *domain) canPerformActionInAccount(ctx InfraContext, action iamT.Action) error { diff --git a/apps/infra/internal/domain/names.go b/apps/infra/internal/domain/names.go index 1feede60b..e5cc40310 100644 --- a/apps/infra/internal/domain/names.go +++ b/apps/infra/internal/domain/names.go @@ -28,7 +28,7 @@ type CheckNameAvailabilityOutput struct { func (d *domain) CheckNameAvailability(ctx InfraContext, typeArg ResType, clusterName *string, name string) (*CheckNameAvailabilityOutput, error) { accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return nil, err + return nil, errors.NewE(err) } if !fn.IsValidK8sResourceName(name) { @@ -37,7 +37,7 @@ func (d *domain) CheckNameAvailability(ctx InfraContext, typeArg ResType, cluste fromFindOneResult := func(data any, err error) (*CheckNameAvailabilityOutput, error) { if err != nil { - return &CheckNameAvailabilityOutput{Result: false}, err + return &CheckNameAvailabilityOutput{Result: false}, errors.NewE(err) } if data == nil { @@ -56,7 +56,7 @@ func (d *domain) CheckNameAvailability(ctx InfraContext, typeArg ResType, cluste "metadata.namespace": accNs, }) - return fromFindOneResult(cp, err) + return fromFindOneResult(cp, errors.NewE(err)) } case ResTypeProviderSecret: { @@ -66,7 +66,7 @@ func (d *domain) CheckNameAvailability(ctx InfraContext, typeArg ResType, cluste "metadata.namespace": accNs, }) - return fromFindOneResult(cp, err) + return fromFindOneResult(cp, errors.NewE(err)) } case ResTypeNodePool: { @@ -80,7 +80,7 @@ func (d *domain) CheckNameAvailability(ctx InfraContext, typeArg ResType, cluste "metadata.name": name, }) - return fromFindOneResult(cp, err) + return fromFindOneResult(cp, errors.NewE(err)) } case ResTypeVPNDevice: { @@ -94,7 +94,7 @@ func (d *domain) CheckNameAvailability(ctx InfraContext, typeArg ResType, cluste "metadata.name": name, }) - return fromFindOneResult(cp, err) + return fromFindOneResult(cp, errors.NewE(err)) } default: { diff --git a/apps/infra/internal/domain/nodepool.go b/apps/infra/internal/domain/nodepool.go index 9843e52ba..b746db2cc 100644 --- a/apps/infra/internal/domain/nodepool.go +++ b/apps/infra/internal/domain/nodepool.go @@ -22,7 +22,7 @@ const tenantControllerNamespace = "kloudlite" func (d *domain) CreateNodePool(ctx InfraContext, clusterName string, nodepool entities.NodePool) (*entities.NodePool, error) { if err := d.canPerformActionInAccount(ctx, iamT.CreateNodepool); err != nil { - return nil, err + return nil, errors.NewE(err) } nodepool.IncrementRecordVersion() @@ -35,18 +35,18 @@ func (d *domain) CreateNodePool(ctx InfraContext, clusterName string, nodepool e out, err := d.accountsSvc.GetAccount(ctx, string(ctx.UserId), ctx.AccountName) if err != nil { - return nil, err + return nil, errors.NewE(err) } cluster, err := d.findCluster(ctx, clusterName) if err != nil { - return nil, err + return nil, errors.NewE(err) } // fetch cloud provider credentials, access key, and ps key credsSecret := &corev1.Secret{} if err := d.k8sClient.Get(ctx, fn.NN(cluster.Spec.CredentialsRef.Namespace, cluster.Spec.CredentialsRef.Name), credsSecret); err != nil { - return nil, err + return nil, errors.NewE(err) } providerSecret := &corev1.Secret{ @@ -65,7 +65,7 @@ func (d *domain) CreateNodePool(ctx InfraContext, clusterName string, nodepool e } if err := d.resDispatcher.ApplyToTargetCluster(ctx, clusterName, providerSecret, 1); err != nil { - return nil, err + return nil, errors.NewE(err) } nodepool.Spec.IAC = clustersv1.InfrastuctureAsCode{ @@ -86,7 +86,7 @@ func (d *domain) CreateNodePool(ctx InfraContext, clusterName string, nodepool e ps, err := d.findProviderSecret(ctx, cluster.Spec.CredentialsRef.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } switch nodepool.Spec.CloudProvider { @@ -128,7 +128,7 @@ func (d *domain) CreateNodePool(ctx InfraContext, clusterName string, nodepool e nodepool.EnsureGVK() if err := d.k8sClient.ValidateObject(ctx, &nodepool.NodePool); err != nil { - return nil, err + return nil, errors.NewE(err) } nodepool.IncrementRecordVersion() @@ -137,11 +137,11 @@ func (d *domain) CreateNodePool(ctx InfraContext, clusterName string, nodepool e if d.nodePoolRepo.ErrAlreadyExists(err) { return nil, errors.Newf("nodepool with name %q already exists", nodepool.Name) } - return nil, err + return nil, errors.NewE(err) } if err := d.resDispatcher.ApplyToTargetCluster(ctx, clusterName, &np.NodePool, np.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } return np, nil @@ -149,16 +149,16 @@ func (d *domain) CreateNodePool(ctx InfraContext, clusterName string, nodepool e func (d *domain) UpdateNodePool(ctx InfraContext, clusterName string, nodePool entities.NodePool) (*entities.NodePool, error) { if err := d.canPerformActionInAccount(ctx, iamT.UpdateNodepool); err != nil { - return nil, err + return nil, errors.NewE(err) } nodePool.EnsureGVK() if err := d.k8sClient.ValidateObject(ctx, &nodePool.NodePool); err != nil { - return nil, err + return nil, errors.NewE(err) } np, err := d.findNodePool(ctx, clusterName, nodePool.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } if np.IsMarkedForDeletion() { @@ -180,11 +180,11 @@ func (d *domain) UpdateNodePool(ctx InfraContext, clusterName string, nodePool e unp, err := d.nodePoolRepo.UpdateById(ctx, np.Id, np) if err != nil { - return nil, err + return nil, errors.NewE(err) } if err := d.resDispatcher.ApplyToTargetCluster(ctx, clusterName, &unp.NodePool, unp.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } return unp, nil @@ -192,11 +192,11 @@ func (d *domain) UpdateNodePool(ctx InfraContext, clusterName string, nodePool e func (d *domain) DeleteNodePool(ctx InfraContext, clusterName string, poolName string) error { if err := d.canPerformActionInAccount(ctx, iamT.DeleteNodepool); err != nil { - return err + return errors.NewE(err) } np, err := d.findNodePool(ctx, clusterName, poolName) if err != nil { - return err + return errors.NewE(err) } if np.IsMarkedForDeletion() { @@ -207,25 +207,25 @@ func (d *domain) DeleteNodePool(ctx InfraContext, clusterName string, poolName s np.SyncStatus = t.GetSyncStatusForDeletion(np.Generation) upC, err := d.nodePoolRepo.UpdateById(ctx, np.Id, np) if err != nil { - return err + return errors.NewE(err) } return d.resDispatcher.DeleteFromTargetCluster(ctx, clusterName, &upC.NodePool) } func (d *domain) GetNodePool(ctx InfraContext, clusterName string, poolName string) (*entities.NodePool, error) { if err := d.canPerformActionInAccount(ctx, iamT.GetNodepool); err != nil { - return nil, err + return nil, errors.NewE(err) } np, err := d.findNodePool(ctx, clusterName, poolName) if err != nil { - return nil, err + return nil, errors.NewE(err) } return np, nil } func (d *domain) ListNodePools(ctx InfraContext, clusterName string, matchFilters map[string]repos.MatchFilter, pagination repos.CursorPagination) (*repos.PaginatedRecord[*entities.NodePool], error) { if err := d.canPerformActionInAccount(ctx, iamT.ListNodepools); err != nil { - return nil, err + return nil, errors.NewE(err) } filter := repos.Filter{ "accountName": ctx.AccountName, @@ -241,7 +241,7 @@ func (d *domain) findNodePool(ctx InfraContext, clusterName string, poolName str "metadata.name": poolName, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } if np == nil { return nil, errors.Newf("nodepool with name %q not found", clusterName) @@ -256,11 +256,11 @@ func (d *domain) ResyncNodePool(ctx InfraContext, clusterName string, poolName s } return nil }(); err != nil { - return err + return errors.NewE(err) } np, err := d.findNodePool(ctx, clusterName, poolName) if err != nil { - return err + return errors.NewE(err) } return d.resyncToTargetCluster(ctx, np.SyncStatus.Action, clusterName, &np.NodePool, np.RecordVersion) @@ -285,7 +285,7 @@ func (d *domain) OnDeleteNodePoolMessage(ctx InfraContext, clusterName string, n func (d *domain) OnUpdateNodePoolMessage(ctx InfraContext, clusterName string, nodePool entities.NodePool) error { np, err := d.findNodePool(ctx, clusterName, nodePool.Name) if err != nil { - return err + return errors.NewE(err) } if err := d.matchRecordVersion(nodePool.Annotations, np.RecordVersion); err != nil { @@ -300,7 +300,7 @@ func (d *domain) OnUpdateNodePoolMessage(ctx InfraContext, clusterName string, n np.SyncStatus.RecordVersion = np.RecordVersion if _, err := d.nodePoolRepo.UpdateById(ctx, np.Id, np); err != nil { - return err + return errors.NewE(err) } return nil } @@ -309,7 +309,7 @@ func (d *domain) OnUpdateNodePoolMessage(ctx InfraContext, clusterName string, n func (d *domain) OnNodepoolApplyError(ctx InfraContext, clusterName string, name string, errMsg string) error { np, err := d.findNodePool(ctx, clusterName, name) if err != nil { - return err + return errors.NewE(err) } np.SyncStatus.State = t.SyncStateErroredAtAgent @@ -317,5 +317,5 @@ func (d *domain) OnNodepoolApplyError(ctx InfraContext, clusterName string, name np.SyncStatus.Error = &errMsg _, err = d.nodePoolRepo.UpdateById(ctx, np.Id, np) - return err + return errors.NewE(err) } diff --git a/apps/infra/internal/domain/nodes.go b/apps/infra/internal/domain/nodes.go index 1269834f9..b197e5944 100644 --- a/apps/infra/internal/domain/nodes.go +++ b/apps/infra/internal/domain/nodes.go @@ -28,7 +28,7 @@ func (d *domain) findNode(ctx InfraContext, clusterName string, nodeName string) "metadata.name": nodeName, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } if node == nil { @@ -44,7 +44,7 @@ func (d *domain) OnNodeUpdateMessage(ctx InfraContext, clusterName string, node "clusterName": clusterName, "metadata.name": node.Name, }, &node); err != nil { - return err + return errors.NewE(err) } return nil } @@ -52,7 +52,7 @@ func (d *domain) OnNodeUpdateMessage(ctx InfraContext, clusterName string, node func (d *domain) OnNodeDeleteMessage(ctx InfraContext, clusterName string, node entities.Node) error { n, err := d.findNode(ctx, clusterName, node.Name) if err != nil { - return err + return errors.NewE(err) } return d.nodeRepo.DeleteById(ctx, n.Id) diff --git a/apps/infra/internal/domain/provider-secrets.go b/apps/infra/internal/domain/provider-secrets.go index 85fdb81a4..bb4e0f74e 100644 --- a/apps/infra/internal/domain/provider-secrets.go +++ b/apps/infra/internal/domain/provider-secrets.go @@ -45,7 +45,7 @@ func (d *domain) validateAWSAssumeRole(ctx context.Context, awsAccountId string, sess, err := session.NewSession() if err != nil { d.logger.Errorf(err, "while creating new session") - return err + return errors.NewE(err) } svc := sts.New(sess) @@ -57,7 +57,7 @@ func (d *domain) validateAWSAssumeRole(ctx context.Context, awsAccountId string, }) if err != nil { d.logger.Errorf(err, "while assuming role, and getting caller identity") - return err + return errors.NewE(err) } if resp.AssumedRoleUser.Arn != nil { @@ -74,22 +74,22 @@ type AWSAccessValidationOutput struct { func (d *domain) ValidateProviderSecretAWSAccess(ctx InfraContext, name string) (*AWSAccessValidationOutput, error) { if err := d.canPerformActionInAccount(ctx, iamT.CreateCloudProviderSecret); err != nil { - return nil, err + return nil, errors.NewE(err) } psecret, err := d.findProviderSecret(ctx, name) if err != nil { - return nil, err + return nil, errors.NewE(err) } if err := psecret.Validate(); err != nil { - return nil, err + return nil, errors.NewE(err) } if err := d.validateAWSAssumeRole(ctx, *psecret.AWS.AWSAccountId, psecret.AWS.CfParamExternalID, psecret.AWS.GetAssumeRoleRoleARN()); err != nil { installationURL, err := generateAWSCloudformationTemplateUrl(*psecret.AWS, d.env) if err != nil { - return nil, err + return nil, errors.NewE(err) } return &AWSAccessValidationOutput{ Result: false, @@ -100,7 +100,7 @@ func (d *domain) ValidateProviderSecretAWSAccess(ctx InfraContext, name string) return &AWSAccessValidationOutput{ Result: true, InstallationURL: nil, - }, err + }, errors.NewE(err) } func corev1SecretFromProviderSecret(ps *entities.CloudProviderSecret) *corev1.Secret { @@ -140,19 +140,19 @@ func corev1SecretFromProviderSecret(ps *entities.CloudProviderSecret) *corev1.Se func (d *domain) CreateProviderSecret(ctx InfraContext, psecret entities.CloudProviderSecret) (*entities.CloudProviderSecret, error) { if err := d.canPerformActionInAccount(ctx, iamT.CreateCloudProviderSecret); err != nil { - return nil, err + return nil, errors.NewE(err) } accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return nil, err + return nil, errors.NewE(err) } psecret.AccountName = ctx.AccountName psecret.Namespace = accNs if err := psecret.Validate(); err != nil { - return nil, err + return nil, errors.NewE(err) } psecret.IncrementRecordVersion() @@ -180,7 +180,7 @@ func (d *domain) CreateProviderSecret(ctx InfraContext, psecret entities.CloudPr } if err := psecret.AWS.Validate(); err != nil { - return nil, err + return nil, errors.NewE(err) } } default: @@ -188,14 +188,14 @@ func (d *domain) CreateProviderSecret(ctx InfraContext, psecret entities.CloudPr } secret := corev1SecretFromProviderSecret(&psecret) if err != nil { - return nil, err + return nil, errors.NewE(err) } if err := d.applyK8sResource(ctx, secret, psecret.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } nSecret, err := d.secretRepo.Create(ctx, &psecret) if err != nil { - return nil, err + return nil, errors.NewE(err) } return nSecret, nil @@ -203,16 +203,16 @@ func (d *domain) CreateProviderSecret(ctx InfraContext, psecret entities.CloudPr func (d *domain) UpdateProviderSecret(ctx InfraContext, ups entities.CloudProviderSecret) (*entities.CloudProviderSecret, error) { if err := d.canPerformActionInAccount(ctx, iamT.UpdateCloudProviderSecret); err != nil { - return nil, err + return nil, errors.NewE(err) } if err := ups.Validate(); err != nil { - return nil, err + return nil, errors.NewE(err) } currScrt, err := d.findProviderSecret(ctx, ups.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } currScrt.IncrementRecordVersion() @@ -235,11 +235,11 @@ func (d *domain) UpdateProviderSecret(ctx InfraContext, ups entities.CloudProvid uScrt, err := d.secretRepo.UpdateById(ctx, currScrt.Id, currScrt) if err != nil { - return nil, err + return nil, errors.NewE(err) } if err := d.applyK8sResource(ctx, corev1SecretFromProviderSecret(currScrt), uScrt.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } return uScrt, nil @@ -247,11 +247,11 @@ func (d *domain) UpdateProviderSecret(ctx InfraContext, ups entities.CloudProvid func (d *domain) DeleteProviderSecret(ctx InfraContext, secretName string) error { if err := d.canPerformActionInAccount(ctx, iamT.DeleteCloudProviderSecret); err != nil { - return err + return errors.NewE(err) } cps, err := d.findProviderSecret(ctx, secretName) if err != nil { - return err + return errors.NewE(err) } clusters, err := d.clusterRepo.Find(ctx, repos.Query{ @@ -261,7 +261,7 @@ func (d *domain) DeleteProviderSecret(ctx InfraContext, secretName string) error }, }) if err != nil { - return err + return errors.NewE(err) } if len(clusters) > 0 { @@ -269,19 +269,19 @@ func (d *domain) DeleteProviderSecret(ctx InfraContext, secretName string) error } if err := d.deleteK8sResource(ctx, corev1SecretFromProviderSecret(cps)); err != nil { - return err + return errors.NewE(err) } return d.secretRepo.DeleteById(ctx, cps.Id) } func (d *domain) ListProviderSecrets(ctx InfraContext, matchFilters map[string]repos.MatchFilter, pagination repos.CursorPagination) (*repos.PaginatedRecord[*entities.CloudProviderSecret], error) { if err := d.canPerformActionInAccount(ctx, iamT.ListCloudProviderSecrets); err != nil { - return nil, err + return nil, errors.NewE(err) } accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return nil, err + return nil, errors.NewE(err) } filter := repos.Filter{ @@ -293,7 +293,7 @@ func (d *domain) ListProviderSecrets(ctx InfraContext, matchFilters map[string]r func (d *domain) GetProviderSecret(ctx InfraContext, name string) (*entities.CloudProviderSecret, error) { if err := d.canPerformActionInAccount(ctx, iamT.GetCloudProviderSecret); err != nil { - return nil, err + return nil, errors.NewE(err) } return d.findProviderSecret(ctx, name) } @@ -301,7 +301,7 @@ func (d *domain) GetProviderSecret(ctx InfraContext, name string) (*entities.Clo func (d *domain) findProviderSecret(ctx InfraContext, name string) (*entities.CloudProviderSecret, error) { accNs, err := d.getAccNamespace(ctx, ctx.AccountName) if err != nil { - return nil, err + return nil, errors.NewE(err) } scrt, err := d.secretRepo.FindOne(ctx, repos.Filter{ @@ -310,7 +310,7 @@ func (d *domain) findProviderSecret(ctx InfraContext, name string) (*entities.Cl "metadata.name": name, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } if scrt == nil { diff --git a/apps/infra/internal/domain/pvc.go b/apps/infra/internal/domain/pvc.go index 81fa6bf96..7bac06372 100644 --- a/apps/infra/internal/domain/pvc.go +++ b/apps/infra/internal/domain/pvc.go @@ -21,7 +21,7 @@ func (d *domain) GetPVC(ctx InfraContext, clusterName string, buildRunName strin "metadata.name": buildRunName, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } if pvc == nil { @@ -37,7 +37,7 @@ func (d *domain) OnPVCUpdateMessage(ctx InfraContext, clusterName string, pvc en "accountName": ctx.AccountName, "clusterName": clusterName, }, &pvc); err != nil { - return err + return errors.NewE(err) } return nil } @@ -49,7 +49,7 @@ func (d *domain) OnPVCDeleteMessage(ctx InfraContext, clusterName string, pvc en "accountName": ctx.AccountName, "clusterName": clusterName, }); err != nil { - return err + return errors.NewE(err) } return nil } diff --git a/apps/infra/internal/domain/vpn-device.go b/apps/infra/internal/domain/vpn-device.go index 2c141c566..2d777e049 100644 --- a/apps/infra/internal/domain/vpn-device.go +++ b/apps/infra/internal/domain/vpn-device.go @@ -27,7 +27,7 @@ func (d *domain) GetVPNDevice(ctx InfraContext, clusterName string, deviceName s func (d *domain) CreateVPNDevice(ctx InfraContext, clusterName string, device entities.VPNDevice) (*entities.VPNDevice, error) { device.EnsureGVK() if err := d.k8sClient.ValidateObject(ctx, &device.Device); err != nil { - return nil, err + return nil, errors.NewE(err) } device.IncrementRecordVersion() @@ -46,13 +46,13 @@ func (d *domain) CreateVPNDevice(ctx InfraContext, clusterName string, device en if err != nil { if d.vpnDeviceRepo.ErrAlreadyExists(err) { // TODO: better insights into error, when it is being caused by duplicated indexes - return nil, err + return nil, errors.NewE(err) } - return nil, err + return nil, errors.NewE(err) } if err := d.resDispatcher.ApplyToTargetCluster(ctx, clusterName, &nDevice.Device, nDevice.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } return nDevice, nil } @@ -60,12 +60,12 @@ func (d *domain) CreateVPNDevice(ctx InfraContext, clusterName string, device en func (d *domain) UpdateVPNDevice(ctx InfraContext, clusterName string, device entities.VPNDevice) (*entities.VPNDevice, error) { device.EnsureGVK() if err := d.k8sClient.ValidateObject(ctx, &device.Device); err != nil { - return nil, err + return nil, errors.NewE(err) } currDevice, err := d.findVPNDevice(ctx, clusterName, device.Name) if err != nil { - return nil, err + return nil, errors.NewE(err) } currDevice.IncrementRecordVersion() @@ -85,11 +85,11 @@ func (d *domain) UpdateVPNDevice(ctx InfraContext, clusterName string, device en nDevice, err := d.vpnDeviceRepo.UpdateById(ctx, device.Id, &device) if err != nil { - return nil, err + return nil, errors.NewE(err) } if err := d.resDispatcher.ApplyToTargetCluster(ctx, clusterName, &nDevice.Device, nDevice.RecordVersion); err != nil { - return nil, err + return nil, errors.NewE(err) } return nDevice, nil } @@ -101,7 +101,7 @@ func (d *domain) findVPNDevice(ctx InfraContext, clusterName string, name string "metadata.name": name, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } if device == nil { @@ -119,12 +119,12 @@ func (d *domain) GetWgConfigForDevice(ctx InfraContext, clusterName string, devi func (d *domain) DeleteVPNDevice(ctx InfraContext, clusterName string, name string) error { device, err := d.findVPNDevice(ctx, clusterName, name) if err != nil { - return err + return errors.NewE(err) } device.SyncStatus = t.GenSyncStatus(t.SyncActionDelete, device.RecordVersion) if _, err := d.vpnDeviceRepo.UpdateById(ctx, device.Id, device); err != nil { - return err + return errors.NewE(err) } return d.resDispatcher.DeleteFromTargetCluster(ctx, clusterName, &device.Device) } @@ -132,7 +132,7 @@ func (d *domain) DeleteVPNDevice(ctx InfraContext, clusterName string, name stri func (d *domain) OnVPNDeviceApplyError(ctx InfraContext, clusterName string, name string, errMsg string) error { currDevice, err := d.findVPNDevice(ctx, clusterName, name) if err != nil { - return err + return errors.NewE(err) } currDevice.SyncStatus.State = t.SyncStateErroredAtAgent @@ -140,13 +140,13 @@ func (d *domain) OnVPNDeviceApplyError(ctx InfraContext, clusterName string, nam currDevice.SyncStatus.Error = &errMsg _, err = d.vpnDeviceRepo.UpdateById(ctx, currDevice.Id, currDevice) - return err + return errors.NewE(err) } func (d *domain) OnVPNDeviceUpdateMessage(ctx InfraContext, clusterName string, device entities.VPNDevice) error { currDevice, err := d.findVPNDevice(ctx, clusterName, device.Name) if err != nil { - return err + return errors.NewE(err) } if err := d.matchRecordVersion(device.Annotations, currDevice.RecordVersion); err != nil { @@ -168,17 +168,17 @@ func (d *domain) OnVPNDeviceUpdateMessage(ctx InfraContext, clusterName string, currDevice.SyncStatus.LastSyncedAt = time.Now() _, err = d.vpnDeviceRepo.UpdateById(ctx, currDevice.Id, currDevice) - return err + return errors.NewE(err) } func (d *domain) OnVPNDeviceDeleteMessage(ctx InfraContext, clusterName string, device entities.VPNDevice) error { currDevice, err := d.findVPNDevice(ctx, clusterName, device.Name) if err != nil { - return err + return errors.NewE(err) } if err := d.matchRecordVersion(device.Annotations, currDevice.RecordVersion); err != nil { - return err + return errors.NewE(err) } return d.vpnDeviceRepo.DeleteById(ctx, currDevice.Id) diff --git a/apps/infra/internal/env/env.go b/apps/infra/internal/env/env.go index 4ee667c1b..d6d851422 100644 --- a/apps/infra/internal/env/env.go +++ b/apps/infra/internal/env/env.go @@ -1,6 +1,9 @@ package env -import "github.com/codingconcepts/env" +import ( + "github.com/codingconcepts/env" + "github.com/kloudlite/api/pkg/errors" +) type Env struct { InfraDbUri string `env:"MONGO_DB_URI" required:"true"` @@ -39,7 +42,7 @@ type Env struct { func LoadEnv() (*Env, error) { var ev Env if err := env.Set(&ev); err != nil { - return nil, err + return nil, errors.NewE(err) } return &ev, nil } diff --git a/apps/infra/internal/framework/framework.go b/apps/infra/internal/framework/framework.go index 4fef70613..9ee4f98e7 100644 --- a/apps/infra/internal/framework/framework.go +++ b/apps/infra/internal/framework/framework.go @@ -7,6 +7,7 @@ import ( "github.com/kloudlite/api/apps/infra/internal/env" "github.com/kloudlite/api/common" "github.com/kloudlite/api/pkg/cache" + "github.com/kloudlite/api/pkg/errors" "github.com/kloudlite/api/pkg/grpc" httpServer "github.com/kloudlite/api/pkg/http-server" "github.com/kloudlite/api/pkg/logging" @@ -44,7 +45,7 @@ var Module = fx.Module("framework", Logger: logger, }) if err != nil { - return nil, err + return nil, errors.NewE(err) } return nats.NewJetstreamClient(c) }), @@ -72,7 +73,7 @@ var Module = fx.Module("framework", lf.Append(fx.Hook{ OnStop: func(context.Context) error { if err := c1.Close(); err != nil { - return err + return errors.NewE(err) } return nil }, diff --git a/apps/infra/main.go b/apps/infra/main.go index 5ad6a9704..7754de3de 100644 --- a/apps/infra/main.go +++ b/apps/infra/main.go @@ -3,6 +3,7 @@ package main import ( "context" "flag" + "github.com/kloudlite/api/pkg/errors" clustersv1 "github.com/kloudlite/operator/apis/clusters/v1" "os" "time" @@ -40,7 +41,7 @@ func main() { fx.Provide(func() (*env.Env, error) { if e, err := env.LoadEnv(); err != nil { - return nil, err + return nil, errors.NewE(err) } else { e.IsDev = isDev return e, nil