Refactor/remove projects

.dockerignore

@@ -5,6 +5,7 @@
 !common
 !constants
 !*.go
+!flake.*
 !grpc-interfaces
 apps/**/.task
 apps/**/node_modules

.tools/nvim/__http__/console/apps.graphql.yml

@@ -5,8 +5,8 @@ global:
 
 label: List Apps
 query: |+ #graphql
-  query Core_listApps($projectName: String!, $envName: String!) {
-    core_listApps(projectName: $projectName, envName: $envName) {
+  query Core_listApps($envName: String!) {
+    core_listApps(envName: $envName) {
       edges {
         node {
           id
@@ -20,21 +20,13 @@ query: |+ #graphql
             name
             annotations
           }
-          build {
-            id
-            source {
-              repository
-              branch
-            }
-          }
           syncStatus {
             state
             action
             error
             syncScheduledAt
             recordVersion
           }
-          projectName
           recordVersion
           kind
           displayName
@@ -44,14 +36,13 @@ query: |+ #graphql
     }
   }
 variables:
-  projectName: "{{.projectName}}"
-  envName: "{{.environmentName}}"
+  envName: "{{.envName}}"
 ---
 
 label: Get App
 query: |+ #graphql
-  query Core_getApp($project: ProjectId!, $scope: WorkspaceOrEnvId!, $name: String!) {
-    core_getApp(project: $project, scope: $scope, name: $name) {
+  query Core_getApp($scope: WorkspaceOrEnvId!, $name: String!) {
+    core_getApp(scope: $scope, name: $name) {
       metadata {
         name
         deletionTimestamp
@@ -79,8 +70,8 @@ variables:
 
 label: Create App
 query: |+ #graphql
-  mutation Core_createApp($projectName: String!, $envName: String!, $app: AppIn!) {
-    core_createApp(projectName: $projectName, envName: $envName, app: $app) {
+  mutation Core_createApp($envName: String!, $app: AppIn!) {
+    core_createApp(envName: $envName, app: $app) {
       metadata {
         name
       }
@@ -99,13 +90,11 @@ query: |+ #graphql
     }
   }
 variables:
-  projectName: "{{.projectName}}"
   envName: "{{.envName}}"
   app:
     displayName: "sample app"
     metadata:
       name: "{{.name}}"
-      # name: "SAMPLE2"
     spec:
       services:
         - type: tcp
@@ -119,8 +108,8 @@ variables:
 
 label: Update App
 query: |+ #graphql
-  mutation Core_updateApp($projectName: String!, $envName: String!, $app: AppIn!) {
-    core_updateApp(projectName: $projectName, envName: $envName, app: $app) {
+  mutation Core_updateApp($envName: String!, $app: AppIn!) {
+    core_updateApp(envName: $envName, app: $app) {
       metadata {
         name
         generation
@@ -133,7 +122,6 @@ query: |+ #graphql
     }
   }
 variables:
-  projectName: "{{.projectName}}"
   envName: "{{.envName}}"
   app:
     displayName: "sample app"
@@ -153,23 +141,20 @@ variables:
 
 label: Delete App
 query: |+ #graphql
-  mutation Core_deleteApp($projectName: String!, $envName: String!, $appName: String!) {
-    core_deleteApp(projectName: $projectName, envName: $envName, appName: $appName)
+  mutation Core_deleteApp($envName: String!, $appName: String!) {
+    core_deleteApp(envName: $envName, appName: $appName)
   }
 variables:
-  projectName: "{{.projectName}}"
   envName: "{{.envName}}"
   appName: "{{.name}}"
----
 
 ---
 label: restart app
-query: |+
-  query Query($projectName: String!, $envName: String!, $appName: String!) {
-    core_restartApp(projectName: $projectName, envName: $envName, appName: $appName)
+query: |+ #graphql
+  query Query($envName: String!, $appName: String!) {
+    core_restartApp(envName: $envName, appName: $appName)
   }
 variables:
-  projectName: "{{.projectName}}"
   envName: "{{.envName}}"
-  appName: "nginx"
+  appName: "{{.name}}"
 ---

.tools/nvim/__http__/console/environments.graphql.yml

@@ -1,12 +1,13 @@
 ---
 global:
   envTargetNamespace: "nxtcoder17"
+  envName: "test-env"
 ---
 
 label: List Environments
 query: |+ #graphql
-  query Core_listEnvironments($projectName: String!) {
-    core_listEnvironments(projectName: $projectName) {
+  query Core_listEnvironments {
+    core_listEnvironments() {
       edges {
         cursor
         node {
@@ -51,19 +52,16 @@ query: |+ #graphql
       totalCount
     }
   }
-variables:
-  projectName: "{{.projectName}}"
 
 ---
 
 label: Create Environment
 query: |+ #graphql
-  mutation Core_createEnvironment($projectName: String!, $env: EnvironmentIn!) {
-    core_createEnvironment(projectName: $projectName, env: $env) {
+  mutation Core_createEnvironment($env: EnvironmentIn!) {
+    core_createEnvironment(env: $env) {
       apiVersion
       kind
       spec {
-        projectName
         targetNamespace
       }
       syncStatus {
@@ -76,13 +74,13 @@ query: |+ #graphql
     }
   }
 variables:
-  projectName: "{{.projectName}}"
   env:
     displayName: Display Name of a sample environment
+    clusterName: "{{.gcpClusterName}}"
     metadata:
       name: "{{.envName}}"
-    spec:
-      projectName: "{{.projectName}}"
+    # spec:
+    # projectName: "{{.projectName}}"
 ---
 
 label: resync environment

apps/comms/Taskfile.yml

@@ -27,5 +27,5 @@ tasks:
       - sh: '[[ -n "{{.Image}}" ]]'
         msg: "var Image must have a value, of format 'image_repository:image_tag'"
     cmds:
-      - task: build
+      - task build upx={{.upx}}
       - docker buildx build -f ./Containerfile -t {{.Image}} . --build-arg BINARY={{.app}} --push

apps/console/Taskfile.yml

@@ -17,7 +17,6 @@ tasks:
     cmds:
       - mkdir -p "./internal/app/_struct-to-graphql"
       - go run ../../cmd/struct-to-graphql
-        --struct github.com/kloudlite/api/apps/console/internal/entities.Project
         --struct github.com/kloudlite/api/apps/console/internal/entities.Environment
         --struct github.com/kloudlite/api/apps/console/internal/entities.App
         --struct github.com/kloudlite/api/apps/console/internal/entities.Secret
@@ -33,13 +32,12 @@ tasks:
         --struct github.com/kloudlite/api/apps/console/internal/entities.Router
         --struct github.com/kloudlite/api/apps/console/internal/entities.ManagedResource
         --struct github.com/kloudlite/api/apps/console/internal/entities.ImagePullSecret
-        --struct github.com/kloudlite/api/apps/console/internal/entities.ProjectManagedService
         --struct github.com/kloudlite/api/pkg/repos.MatchFilter
         --struct github.com/kloudlite/api/pkg/repos.CursorPagination
         > ./internal/app/_struct-to-graphql/main.go
       - |+
         pushd ./internal/app/_struct-to-graphql
-        go run main.go --dev --out-dir ../graph/struct-to-graphql --with-pagination Project,Environment,App,Secret,Config,Router,ManagedResource,ProjectManagedService,ImagePullSecret,ConsoleVPNDevice
+        go run main.go --dev --out-dir ../graph/struct-to-graphql --with-pagination Environment,App,Secret,Config,Router,ManagedResource,ImagePullSecret,ConsoleVPNDevice
         popd
       - rm -rf ./internal/app/_struct-to-graphql
 
@@ -58,8 +56,8 @@ tasks:
   build:
     cmds:
       - task: gen:constants
-      - task: go:build 
-        vars: 
+      - task: go:build
+        vars:
           Out: ./bin/{{.app}}
 
   local:build-and-push:

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

@@ -14,8 +14,8 @@ 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)
+func (r *ResourceEventPublisherImpl) PublishEnvironmentResourceEvent(ctx domain.ConsoleContext, envName string, resourceType entities.ResourceType, name string, update domain.PublishMsg) {
+	subject := fmt.Sprintf("res-updates.account.%s.environment.%s.%s.%s", ctx.AccountName, envName, resourceType, name)
 	r.publish(subject, update)
 }
 
@@ -25,7 +25,7 @@ func (r *ResourceEventPublisherImpl) PublishConsoleEvent(ctx domain.ConsoleConte
 }
 
 func (r *ResourceEventPublisherImpl) PublishResourceEvent(ctx domain.ResourceContext, resourceType entities.ResourceType, name string, update domain.PublishMsg) {
-	subject := fmt.Sprintf("res-updates.account.%s.project.%s.environment.%s.%s.%s", ctx.AccountName, ctx.ProjectName, ctx.EnvironmentName, resourceType, name)
+	subject := fmt.Sprintf("res-updates.account.%s.environment.%s.%s.%s", ctx.AccountName, ctx.EnvironmentName, resourceType, name)
 	r.publish(subject, update)
 }
 
@@ -36,8 +36,5 @@ func (r *ResourceEventPublisherImpl) publish(subject string, msg domain.PublishM
 }
 
 func NewResourceEventPublisher(cli *nats.Client, logger logging.Logger) domain.ResourceEventPublisher {
-	return &ResourceEventPublisherImpl{
-		cli,
-		logger,
-	}
+	return &ResourceEventPublisherImpl{cli, logger}
 }

apps/console/internal/app/app.go

@@ -47,8 +47,8 @@ func toConsoleContext(requestCtx context.Context, accountCookieName string) (dom
 }
 
 var Module = fx.Module("app",
-	repos.NewFxMongoRepo[*entities.Project]("projects", "prj", entities.ProjectIndexes),
-	repos.NewFxMongoRepo[*entities.ProjectManagedService]("project_managed_service", "pmsvc", entities.ProjectManagedServiceIndices),
+	// repos.NewFxMongoRepo[*entities.Project]("projects", "prj", entities.ProjectIndexes),
+	// repos.NewFxMongoRepo[*entities.ProjectManagedService]("project_managed_service", "pmsvc", entities.ProjectManagedServiceIndices),
 	repos.NewFxMongoRepo[*entities.Environment]("environments", "env", entities.EnvironmentIndexes),
 	repos.NewFxMongoRepo[*entities.App]("apps", "app", entities.AppIndexes),
 	repos.NewFxMongoRepo[*entities.Config]("configs", "cfg", entities.ConfigIndexes),