Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions apps/console/internal/app/graph/generated/generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions apps/console/internal/app/graph/matchfilter.resolvers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions apps/console/internal/app/graph/model/models_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,13 @@ enum Github__com___kloudlite___api___apps___console___internal___entities__PullS
params
}

enum Github__com___kloudlite___api___pkg___repos__MatchType {
array
exact
not_in_array
regex
}

enum Github__com___kloudlite___api___pkg___types__SyncAction {
APPLY
DELETE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
type MatchFilter @shareable {
array: [Any!]
exact: Any
matchType: String!
matchType: Github__com___kloudlite___api___pkg___repos__MatchType!
notInArray: [Any!]
regex: String
}

input MatchFilterIn {
array: [Any!]
exact: Any
matchType: String!
matchType: Github__com___kloudlite___api___pkg___repos__MatchType!
notInArray: [Any!]
regex: String
}
Expand Down
29 changes: 18 additions & 11 deletions apps/console/internal/app/process-error-on-apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/kloudlite/api/apps/console/internal/domain"
"github.com/kloudlite/api/apps/console/internal/entities"
msgOfficeT "github.com/kloudlite/api/apps/message-office/types"
fn "github.com/kloudlite/api/pkg/functions"
"github.com/kloudlite/api/pkg/logging"
"github.com/kloudlite/api/pkg/messaging"
Expand All @@ -36,25 +37,31 @@ func ProcessErrorOnApply(consumer ErrorOnApplyConsumer, d domain.Domain, logger
msgReader := func(msg *msgTypes.ConsumeMsg) error {
counter += 1
logger.Debugf("received message [%d]", counter)

em, err := msgOfficeT.UnmarshalErrMessage(msg.Payload)
if err != nil {
return errors.NewE(err)
}

var errObj t.AgentErrMessage
if err := json.Unmarshal(msg.Payload, &errObj); err != nil {
if err := json.Unmarshal(em.Error, &errObj); err != nil {
return errors.NewE(err)
}

obj := unstructured.Unstructured{Object: errObj.Object}

mLogger := logger.WithKV(
"gvk", obj.GroupVersionKind(),
"accountName", errObj.AccountName,
"clusterName", errObj.ClusterName,
"accountName", em.AccountName,
"clusterName", em.ClusterName,
)

mLogger.Infof("received message")
defer func() {
mLogger.Infof("processed message")
}()

dctx := domain.NewConsoleContext(context.TODO(), "sys-user:apply-on-error-worker", errObj.AccountName)
dctx := domain.NewConsoleContext(context.TODO(), "sys-user:apply-on-error-worker", em.AccountName)

opts := domain.UpdateAndDeleteOpts{MessageTimestamp: msg.Timestamp}

Expand Down Expand Up @@ -103,7 +110,7 @@ func ProcessErrorOnApply(consumer ErrorOnApplyConsumer, d domain.Domain, logger
}
//case projectManagedServiceGVK.String():
// {
// mapping, err := d.GetProjectResourceMapping(dctx, entities.ResourceTypeProjectManagedService, errObj.ClusterName, obj.GetNamespace(), obj.GetName())
// mapping, err := d.GetProjectResourceMapping(dctx, entities.ResourceTypeProjectManagedService, em.ClusterName, obj.GetNamespace(), obj.GetName())
// if err != nil {
// return err
// }
Expand All @@ -125,7 +132,7 @@ func ProcessErrorOnApply(consumer ErrorOnApplyConsumer, d domain.Domain, logger

case appsGVK.String():
{
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeApp, errObj.ClusterName, obj)
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeApp, em.ClusterName, obj)
if err != nil {
return errors.NewE(err)
}
Expand All @@ -143,7 +150,7 @@ func ProcessErrorOnApply(consumer ErrorOnApplyConsumer, d domain.Domain, logger
}
case externalAppsGVK.String():
{
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeExternalApp, errObj.ClusterName, obj)
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeExternalApp, em.ClusterName, obj)
if err != nil {
return errors.NewE(err)
}
Expand All @@ -161,7 +168,7 @@ func ProcessErrorOnApply(consumer ErrorOnApplyConsumer, d domain.Domain, logger
}
case configGVK.String():
{
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeConfig, errObj.ClusterName, obj)
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeConfig, em.ClusterName, obj)
if err != nil {
return errors.NewE(err)
}
Expand All @@ -178,7 +185,7 @@ func ProcessErrorOnApply(consumer ErrorOnApplyConsumer, d domain.Domain, logger
}
case secretGVK.String():
{
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeSecret, errObj.ClusterName, obj)
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeSecret, em.ClusterName, obj)
if err != nil {
return errors.NewE(err)
}
Expand All @@ -195,7 +202,7 @@ func ProcessErrorOnApply(consumer ErrorOnApplyConsumer, d domain.Domain, logger
}
case routerGVK.String():
{
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeRouter, errObj.ClusterName, obj)
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeRouter, em.ClusterName, obj)
if err != nil {
return errors.NewE(err)
}
Expand All @@ -212,7 +219,7 @@ func ProcessErrorOnApply(consumer ErrorOnApplyConsumer, d domain.Domain, logger
}
case managedResourceGVK.String():
{
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeManagedResource, errObj.ClusterName, obj)
rctx, err := getEnvironmentResourceContext(dctx, entities.ResourceTypeManagedResource, em.ClusterName, obj)
if err != nil {
return errors.NewE(err)
}
Expand Down
Loading