Release v1.0.2

.github/workflows/gateway-container.yml

@@ -1,6 +1,11 @@
 name: build-gateway-image
 
 on:
+  workflow_run:
+    workflows: ["build-docker-images"]
+    types:
+      - completed
+
   repository_dispatch:
     types:
       - webhook

.tools/nvim/__http__/infra/cloud-provider-secrets.graphql.yml

@@ -4,7 +4,7 @@ global:
   clusterName: sample-cluster
 
   providerNamespace: kl-account-kloudlite-dev
-  providerName: aws-creds
+  providerName: aws-creds2
 
 ---
 

apps/console/internal/app/adapter-resource-update-publish.go

@@ -14,13 +14,18 @@ type ResourceEventPublisherImpl struct {
 	logger logging.Logger
 }
 
+func (r *ResourceEventPublisherImpl) PublishProjectResourceEvent(ctx domain.ConsoleContext, projectName string, resourceType entities.ResourceType, name string, update domain.PublishMsg) {
+	subject := fmt.Sprintf("res-updates.account.%s.project.%s.%s.%s", ctx.AccountName, projectName, resourceType, name)
+	r.publish(subject, update)
+}
+
 func (r *ResourceEventPublisherImpl) PublishConsoleEvent(ctx domain.ConsoleContext, resourceType entities.ResourceType, name string, update domain.PublishMsg) {
 	subject := fmt.Sprintf("res-updates.account.%s.resourceType.%s.%s", ctx.AccountName, resourceType, name)
 	r.publish(subject, update)
 }
 
 func (r *ResourceEventPublisherImpl) PublishResourceEvent(ctx domain.ResourceContext, resourceType entities.ResourceType, name string, update domain.PublishMsg) {
-	subject := fmt.Sprintf("res-updates.account.%s.project.%s.%s.%s", ctx.AccountName, ctx.ProjectName, resourceType, name)
+	subject := fmt.Sprintf("res-updates.account.%s.project.%s.environment.%s.%s.%s", ctx.AccountName, ctx.ProjectName, ctx.EnvironmentName, resourceType, name)
 	r.publish(subject, update)
 }
 

apps/console/internal/domain/api.go

@@ -271,5 +271,6 @@ const (
 
 type ResourceEventPublisher interface {
 	PublishConsoleEvent(ctx ConsoleContext, resourceType entities.ResourceType, name string, update PublishMsg)
+	PublishProjectResourceEvent(ctx ConsoleContext, projectName string, resourceType entities.ResourceType, name string, update PublishMsg)
 	PublishResourceEvent(ctx ResourceContext, resourceType entities.ResourceType, name string, update PublishMsg)
 }

apps/console/internal/domain/environment.go

@@ -150,7 +150,7 @@ func (d *domain) CreateEnvironment(ctx ConsoleContext, projectName string, env e
 		return nil, errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeEnvironment, nenv.Name, PublishAdd)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, nenv.ProjectName, entities.ResourceTypeEnvironment, nenv.Name, PublishAdd)
 
 	if _, err := d.iamClient.AddMembership(ctx, &iam.AddMembershipIn{
 		UserId:       string(ctx.UserId),
@@ -448,7 +448,7 @@ func (d *domain) UpdateEnvironment(ctx ConsoleContext, projectName string, env e
 	if err != nil {
 		return nil, errors.NewE(err)
 	}
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeEnvironment, upEnv.Name, PublishUpdate)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, upEnv.ProjectName, entities.ResourceTypeEnvironment, upEnv.Name, PublishUpdate)
 
 	if err := d.applyK8sResource(ctx, upEnv.ProjectName, &upEnv.Environment, upEnv.RecordVersion); err != nil {
 		return nil, errors.NewE(err)
@@ -474,7 +474,7 @@ func (d *domain) DeleteEnvironment(ctx ConsoleContext, projectName string, name
 		return errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeEnvironment, uenv.Name, PublishUpdate)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, uenv.ProjectName, entities.ResourceTypeEnvironment, uenv.Name, PublishUpdate)
 
 	if err := d.deleteK8sResource(ctx, uenv.ProjectName, &uenv.Environment); err != nil {
 		if errors.Is(err, ErrNoClusterAttached) {
@@ -504,7 +504,7 @@ func (d *domain) OnEnvironmentApplyError(ctx ConsoleContext, errMsg, namespace,
 		return errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeEnvironment, uenv.Name, PublishDelete)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, uenv.ProjectName, entities.ResourceTypeEnvironment, uenv.Name, PublishDelete)
 
 	return errors.NewE(err)
 }
@@ -527,7 +527,7 @@ func (d *domain) OnEnvironmentDeleteMessage(ctx ConsoleContext, env entities.Env
 		return errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeEnvironment, env.Name, PublishDelete)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, env.ProjectName, entities.ResourceTypeEnvironment, env.Name, PublishDelete)
 	return nil
 }
 
@@ -560,7 +560,7 @@ func (d *domain) OnEnvironmentUpdateMessage(ctx ConsoleContext, env entities.Env
 		return err
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeEnvironment, uenv.Name, PublishUpdate)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, uenv.ProjectName, entities.ResourceTypeEnvironment, uenv.Name, PublishUpdate)
 	return nil
 }
 

apps/console/internal/domain/project-managed-service.go

@@ -124,7 +124,7 @@ func (d *domain) CreateProjectManagedService(ctx ConsoleContext, projectName str
 		return nil, errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeProjectManagedService, pms.Name, PublishAdd)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, pms.ProjectName, entities.ResourceTypeProjectManagedService, pms.Name, PublishAdd)
 
 	return pms, nil
 }
@@ -180,7 +180,7 @@ func (d *domain) UpdateProjectManagedService(ctx ConsoleContext, projectName str
 		return nil, errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeProjectManagedService, service.Name, PublishUpdate)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, upmsvc.ProjectName, entities.ResourceTypeProjectManagedService, service.Name, PublishUpdate)
 
 	if err := d.applyProjectManagedService(ctx, upmsvc); err != nil {
 		return nil, errors.NewE(err)
@@ -206,7 +206,7 @@ func (d *domain) DeleteProjectManagedService(ctx ConsoleContext, projectName str
 		return errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeProjectManagedService, name, PublishUpdate)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, upmsvc.ProjectName, entities.ResourceTypeProjectManagedService, name, PublishUpdate)
 
 	return d.deleteK8sResource(ctx, projectName, &upmsvc.ProjectManagedService)
 }
@@ -247,7 +247,7 @@ func (d *domain) OnProjectManagedServiceApplyError(ctx ConsoleContext, projectNa
 		return errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeProjectManagedService, upmsvc.Name, PublishDelete)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, upmsvc.ProjectName, entities.ResourceTypeProjectManagedService, upmsvc.Name, PublishDelete)
 
 	return errors.NewE(err)
 }
@@ -263,7 +263,7 @@ func (d *domain) OnProjectManagedServiceDeleteMessage(ctx ConsoleContext, projec
 	if err != nil {
 		return errors.NewE(err)
 	}
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeProjectManagedService, service.Name, PublishDelete)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, projectName, entities.ResourceTypeProjectManagedService, service.Name, PublishDelete)
 	return nil
 }
 
@@ -299,7 +299,7 @@ func (d *domain) OnProjectManagedServiceUpdateMessage(ctx ConsoleContext, projec
 		return errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeProjectManagedService, upmsvc.Name, PublishUpdate)
+	d.resourceEventPublisher.PublishProjectResourceEvent(ctx, upmsvc.ProjectName, entities.ResourceTypeProjectManagedService, upmsvc.Name, PublishUpdate)
 
 	return nil
 }

apps/console/internal/domain/project.go

@@ -5,6 +5,7 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
+	"github.com/kloudlite/api/grpc-interfaces/kloudlite.io/rpc/infra"
 
 	"github.com/kloudlite/api/common/fields"
 	"github.com/kloudlite/api/pkg/errors"
@@ -59,6 +60,26 @@ func (d *domain) getClusterAttachedToProject(ctx K8sContext, projectName string)
 	return fn.New(string(clusterName)), nil
 }
 
+func (d *domain) clusterStatus(ctx ConsoleContext, projectName string) (*infra.ClusterExistsOut, error) {
+	prj, err := d.findProject(ctx, projectName)
+	if err != nil {
+		return nil, errors.NewE(err)
+	}
+
+	clusterExistStatus, err := d.infraClient.ClusterExists(ctx, &infra.ClusterExistsIn{
+		UserId:      string(ctx.UserId),
+		UserName:    ctx.UserName,
+		UserEmail:   ctx.UserEmail,
+		AccountName: ctx.AccountName,
+		ClusterName: *prj.ClusterName,
+	})
+	if err != nil {
+		return nil, errors.NewE(err)
+	}
+
+	return clusterExistStatus, nil
+}
+
 func (d *domain) ListProjects(ctx context.Context, userId repos.ID, accountName string, search map[string]repos.MatchFilter, pagination repos.CursorPagination) (*repos.PaginatedRecord[*entities.Project], error) {
 	co, err := d.iamClient.Can(ctx, &iam.CanIn{
 		UserId: string(userId),
@@ -223,6 +244,26 @@ func (d *domain) DeleteProject(ctx ConsoleContext, name string) error {
 		return errors.Newf("unauthorized to delete project")
 	}
 
+	cluster, err := d.clusterStatus(ctx, name)
+	if err != nil {
+		return errors.NewE(err)
+	}
+
+	if !cluster.Exists {
+		err := d.projectRepo.DeleteOne(
+			ctx,
+			repos.Filter{
+				fields.AccountName:  ctx.AccountName,
+				fields.MetadataName: name,
+			},
+		)
+		if err != nil {
+			return errors.NewE(err)
+		}
+		d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeProject, name, PublishDelete)
+		return nil
+	}
+
 	uproj, err := d.projectRepo.Patch(
 		ctx,
 		repos.Filter{
@@ -302,7 +343,7 @@ func (d *domain) OnProjectDeleteMessage(ctx ConsoleContext, project entities.Pro
 	if err != nil {
 		return errors.NewE(err)
 	}
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeApp, project.Name, PublishDelete)
+	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeProject, project.Name, PublishDelete)
 	return nil
 }
 
@@ -358,7 +399,7 @@ func (d *domain) OnProjectApplyError(ctx ConsoleContext, errMsg string, name str
 		return errors.NewE(err)
 	}
 
-	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeApp, uproject.Name, PublishDelete)
+	d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeProject, uproject.Name, PublishDelete)
 
 	return errors.NewE(err)
 }

apps/iam/internal/app/grpc-server.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"github.com/kloudlite/api/apps/iam/internal/entities"
@@ -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) == "" {
+					return nil, fmt.Errorf("accountName must be provided")
+				}
+
 				nf := s.rbRepo.MergeMatchFilters(repos.Filter{}, map[string]repos.MatchFilter{
 					"resource_ref": {
 						MatchType: repos.MatchTypeRegex,

apps/infra/internal/app/grpc-server.go

@@ -86,6 +86,29 @@ func (g *grpcServer) GetNodepool(ctx context.Context, in *infra.GetNodepoolIn) (
 	}, nil
 }
 
+func (g *grpcServer) ClusterExists(ctx context.Context, in *infra.ClusterExistsIn) (*infra.ClusterExistsOut, error) {
+	infraCtx := domain.InfraContext{
+		Context:     ctx,
+		UserId:      repos.ID(in.UserId),
+		UserEmail:   in.UserEmail,
+		UserName:    in.UserName,
+		AccountName: in.AccountName,
+	}
+	cluster, err := g.d.GetCluster(infraCtx, in.ClusterName)
+	if err != nil {
+		if errors.Is(err, domain.ErrClusterNotFound) {
+			return &infra.ClusterExistsOut{Exists: false}, nil
+		}
+		return nil, errors.NewE(err)
+	}
+
+	if cluster == nil {
+		return &infra.ClusterExistsOut{Exists: false}, nil
+	}
+
+	return &infra.ClusterExistsOut{Exists: true}, nil
+}
+
 func newGrpcServer(d domain.Domain) infra.InfraServer {
 	return &grpcServer{
 		d: d,

apps/infra/internal/domain/clusters.go

@@ -35,6 +35,8 @@ type ErrClusterAlreadyExists struct {
 	AccountName string
 }
 
+var ErrClusterNotFound error = fmt.Errorf("cluster not found")
+
 func (e ErrClusterAlreadyExists) Error() string {
 	return fmt.Sprintf("cluster with name %q already exists for account: %s", e.ClusterName, e.AccountName)
 }
@@ -504,7 +506,7 @@ func (d *domain) findCluster(ctx InfraContext, clusterName string) (*entities.Cl
 	}
 
 	if cluster == nil {
-		return nil, errors.Newf("cluster with name %q not found", clusterName)
+		return nil, ErrClusterNotFound
 	}
 	return cluster, nil
 }

apps/infra/internal/domain/domain-entries.go

@@ -45,7 +45,7 @@ func (d *domain) CreateDomainEntry(ctx InfraContext, de entities.DomainEntry) (*
 	if err != nil {
 		return nil, errors.NewE(err)
 	}
-	d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeDomainEntries, nde.DomainName, PublishAdd)
+	d.resourceEventPublisher.PublishResourceEvent(ctx, nde.ClusterName, ResourceTypeDomainEntries, nde.DomainName, PublishAdd)
 
 	return nde, nil
 }
@@ -71,15 +71,21 @@ func (d *domain) UpdateDomainEntry(ctx InfraContext, de entities.DomainEntry) (*
 	if err != nil {
 		return nil, errors.NewE(err)
 	}
-	d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeDomainEntries, newDe.DomainName, PublishUpdate)
+	d.resourceEventPublisher.PublishResourceEvent(ctx, newDe.ClusterName, ResourceTypeDomainEntries, newDe.DomainName, PublishUpdate)
 	return newDe, nil
 }
 
 func (d *domain) DeleteDomainEntry(ctx InfraContext, domainName string) error {
 	if err := d.canPerformActionInAccount(ctx, iamT.DeleteDomainEntry); err != nil {
 		return errors.NewE(err)
 	}
-	err := d.domainEntryRepo.DeleteOne(
+
+	existing, err := d.findDomainEntry(ctx, ctx.AccountName, domainName)
+	if err != nil {
+		return errors.NewE(err)
+	}
+
+	err = d.domainEntryRepo.DeleteOne(
 		ctx,
 		repos.Filter{
 			fields.AccountName:  ctx.AccountName,
@@ -89,7 +95,7 @@ func (d *domain) DeleteDomainEntry(ctx InfraContext, domainName string) error {
 	if err != nil {
 		return errors.NewE(err)
 	}
-	d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeDomainEntries, domainName, PublishDelete)
+	d.resourceEventPublisher.PublishResourceEvent(ctx, existing.ClusterName, ResourceTypeDomainEntries, domainName, PublishDelete)
 	return nil
 }