Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.

[KLO-109] fix: IAM missing account name, infra missing cluster grpc error, and vpndevice message publishing #267

Merged
nxtcoder17 merged 1 commit into from
Feb 13, 2024
Merged

[KLO-109] fix: IAM missing account name, infra missing cluster grpc error, and vpndevice message publishing #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions apps/console/internal/domain/vpn-device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func (d *domain) CreateVPNDevice(ctx ConsoleContext, device entities.ConsoleVPND
return nil, errors.NewE(err)
}

d.resourceEventPublisher.PublishProjectResourceEvent(ctx, *nDevice.ProjectName, entities.ResourceTypeVPNDevice, nDevice.Name, PublishAdd)
d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeVPNDevice, nDevice.Name, PublishAdd)

if device.ProjectName == nil || device.EnvironmentName == nil {
return nDevice, nil
Expand Down Expand Up @@ -237,7 +237,7 @@ func (d *domain) ActivateVPNDeviceOnNamespace(ctx ConsoleContext, devName string
if err != nil {
return errors.NewE(err)
}
d.resourceEventPublisher.PublishProjectResourceEvent(ctx, *upDevice.ProjectName, entities.ResourceTypeVPNDevice, devName, PublishUpdate)
d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeVPNDevice, devName, PublishUpdate)

if err := d.applyVPNDevice(ctx, upDevice); err != nil {
return errors.NewE(err)
Expand Down Expand Up @@ -310,7 +310,7 @@ func (d *domain) updateVpnDevice(ctx ConsoleContext, device entities.ConsoleVPND
return nil, errors.NewE(err)
}

d.resourceEventPublisher.PublishProjectResourceEvent(ctx, *upDevice.ProjectName, entities.ResourceTypeVPNDevice, device.Name, PublishUpdate)
d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeVPNDevice, device.Name, PublishUpdate)

if err := d.updateVpnOnCluster(ctx, upDevice, xdevice); err != nil {
return nil, errors.NewE(err)
Expand Down Expand Up @@ -340,7 +340,7 @@ func (d *domain) DeleteVPNDevice(ctx ConsoleContext, name string) error {
return errors.NewE(err)
}

d.resourceEventPublisher.PublishProjectResourceEvent(ctx, *upDevice.ProjectName, entities.ResourceTypeVPNDevice, name, PublishUpdate)
d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeVPNDevice, name, PublishUpdate)

for _, v := range upDevice.LinkedClusters {
if err := d.deleteK8sResourceOfCluster(ctx, v, &upDevice.Device); err != nil {
Expand Down Expand Up @@ -387,7 +387,7 @@ func (d *domain) UpdateVpnDevicePorts(ctx ConsoleContext, devName string, ports
return errors.NewE(err)
}

d.resourceEventPublisher.PublishProjectResourceEvent(ctx, *upDevice.ProjectName, entities.ResourceTypeVPNDevice, devName, PublishUpdate)
d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeVPNDevice, devName, PublishUpdate)
return nil
}

Expand Down Expand Up @@ -458,7 +458,7 @@ func (d *domain) OnVPNDeviceUpdateMessage(ctx ConsoleContext, device entities.Co
return errors.NewE(err)
}

d.resourceEventPublisher.PublishProjectResourceEvent(ctx, *upDevice.ProjectName, entities.ResourceTypeVPNDevice, upDevice.Name, PublishUpdate)
d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeVPNDevice, upDevice.Name, PublishUpdate)

return nil
}
Expand Down Expand Up @@ -502,7 +502,7 @@ func (d *domain) OnVPNDeviceDeleteMessage(ctx ConsoleContext, device entities.Co
return errors.NewE(err)
}

d.resourceEventPublisher.PublishProjectResourceEvent(ctx, *device.ProjectName, entities.ResourceTypeVPNDevice, device.Name, PublishDelete)
d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeVPNDevice, device.Name, PublishDelete)
return nil
}

Expand Down Expand Up @@ -536,6 +536,6 @@ func (d *domain) OnVPNDeviceApplyError(ctx ConsoleContext, errMsg string, name s
if err != nil {
return errors.NewE(err)
}
d.resourceEventPublisher.PublishProjectResourceEvent(ctx, *udevice.ProjectName, entities.ResourceTypeVPNDevice, udevice.Name, PublishDelete)
d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeVPNDevice, udevice.Name, PublishDelete)
return errors.NewE(err)
}
6 changes: 6 additions & 0 deletions apps/iam/internal/app/grpc-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package app

import (
"context"
"fmt"
"strings"

"github.com/kloudlite/api/apps/iam/internal/entities"
Expand Down Expand Up @@ -138,6 +139,11 @@ func (s *GrpcService) Can(ctx context.Context, in *iam.CanIn) (*iam.CanOut, erro
if err != nil {
return nil, err
}

if strings.TrimSpace(accountName) == "" {
Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot Feb 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (llm): Adding validation for accountName is a good practice to ensure data integrity. However, consider if there are any edge cases where an empty accountName might be valid or if additional validation on the format or content of accountName is needed.

return nil, fmt.Errorf("accountName must be provided")
}

nf := s.rbRepo.MergeMatchFilters(repos.Filter{}, map[string]repos.MatchFilter{
"resource_ref": {
MatchType: repos.MatchTypeRegex,
Expand Down
2 changes: 1 addition & 1 deletion apps/infra/internal/app/grpc-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (g *grpcServer) ClusterExists(ctx context.Context, in *infra.ClusterExistsI
}
cluster, err := g.d.GetCluster(infraCtx, in.ClusterName)
if err != nil {
if !errors.Is(err, domain.ErrClusterNotFound) {
if errors.Is(err, domain.ErrClusterNotFound) {
return &infra.ClusterExistsOut{Exists: false}, nil
}
return nil, errors.NewE(err)
Expand Down