Merge branch 'main' of github.com:unkeyed/unkey

Author: chronark

cmd/dev/github/trigger_webhook.go

@@ -115,9 +115,20 @@ func triggerWebhook(ctx context.Context, cmd *cli.Command) error {
 	fmt.Printf("Repository: %s (id: %d)\n", repository, repositoryID)
 	fmt.Printf("Project: %s\n", projectID)
 
+	// Resolve the default app for this project
+	fmt.Println("Looking up default app for project...")
+	appRow, err := db.Query.FindAppByProjectAndSlug(ctx, database.RO(), db.FindAppByProjectAndSlugParams{
+		ProjectID: projectID,
+		Slug:      "default",
+	})
+	if err != nil {
+		return fmt.Errorf("failed to find default app for project %s: %w\n\nMake sure the project exists and has a 'default' app", projectID, err)
+	}
+	fmt.Printf("App: %s (id: %s)\n", appRow.App.Slug, appRow.App.ID)
+
 	// Ensure github_repo_connection exists
 	fmt.Println("Ensuring GitHub connection exists in database...")
-	if err := svc.ensureGithubConnection(ctx, projectID, installationID, repositoryID, repository); err != nil {
+	if err := svc.ensureGithubConnection(ctx, projectID, appRow.App.ID, installationID, repositoryID, repository); err != nil {
 		return fmt.Errorf("failed to create GitHub connection: %w", err)
 	}
 	fmt.Println("✔ GitHub connection ready")
@@ -217,11 +228,11 @@ func triggerWebhook(ctx context.Context, cmd *cli.Command) error {
 	}
 }
 
-func (s *Service) ensureGithubConnection(ctx context.Context, projectID string, installationID, repositoryID int64, repository string) error {
+func (s *Service) ensureGithubConnection(ctx context.Context, projectID, appID string, installationID, repositoryID int64, repository string) error {
 	// Try to insert, ignore if already exists
 	err := db.Query.InsertGithubRepoConnection(ctx, s.db.RW(), db.InsertGithubRepoConnectionParams{
 		ProjectID:          projectID,
-		AppID:              "",
+		AppID:              appID,
 		InstallationID:     installationID,
 		RepositoryID:       repositoryID,
 		RepositoryFullName: repository,

pkg/db/BUILD.bazel

@@ -30,6 +30,7 @@ go_library(
         "app_environment_variables_list_for_connections.sql_generated.go",
         "app_find_by_id.sql_generated.go",
         "app_find_by_project_and_slug.sql_generated.go",
+        "app_find_by_workspace_project_slug_app_slug.sql_generated.go",
         "app_find_with_settings.sql_generated.go",
         "app_insert.sql_generated.go",
         "app_list_by_project.sql_generated.go",

pkg/db/app_find_by_workspace_project_slug_app_slug.sql_generated.go

@@ -0,0 +1,7 @@
+-- name: FindAppByWorkspaceAndSlugs :one
+SELECT sqlc.embed(p), sqlc.embed(a)
+FROM apps a
+INNER JOIN projects p ON p.id = a.project_id
+WHERE p.workspace_id = sqlc.arg(workspace_id)
+  AND p.slug = sqlc.arg(project_slug)
+  AND a.slug = sqlc.arg(app_slug);

pkg/db/querier_generated.go

@@ -723,12 +723,10 @@ CREATE INDEX `bucket` ON `audit_log_target` (`bucket`);
 CREATE INDEX `id_idx` ON `audit_log_target` (`id`);
 CREATE INDEX `environments_project_idx` ON `environments` (`project_id`);
 CREATE INDEX `apps_workspace_idx` ON `apps` (`workspace_id`);
-CREATE INDEX `apps_project_idx` ON `apps` (`project_id`);
 CREATE INDEX `workspace_idx` ON `deployments` (`workspace_id`);
 CREATE INDEX `project_idx` ON `deployments` (`project_id`);
 CREATE INDEX `status_idx` ON `deployments` (`status`);
 CREATE INDEX `workspace_idx` ON `deployment_steps` (`workspace_id`);
-CREATE INDEX `deployment_idx` ON `deployment_steps` (`deployment_id`);
 CREATE INDEX `workspace_idx` ON `deployment_topology` (`workspace_id`);
 CREATE INDEX `status_idx` ON `deployment_topology` (`desired_status`);
 CREATE INDEX `domain_idx` ON `acme_users` (`workspace_id`);

pkg/db/queries/app_find_by_workspace_project_slug_app_slug.sql

@@ -236,8 +236,35 @@ func (s *Seeder) CreateEnvironment(ctx context.Context, req CreateEnvironmentReq
 	})
 	require.NoError(s.t, err)
 
-	// Environment settings are now app-scoped (app_runtime_settings / app_build_settings).
-	// Seed code should create an app and its settings separately.
+	// Insert default app build settings for this (app, environment) pair.
+	err = db.Query.UpsertAppBuildSettings(ctx, s.DB.RW(), db.UpsertAppBuildSettingsParams{
+		WorkspaceID:   req.WorkspaceID,
+		AppID:         req.AppID,
+		EnvironmentID: req.ID,
+		Dockerfile:    "Dockerfile",
+		DockerContext: ".",
+		CreatedAt:     now,
+		UpdatedAt:     sql.NullInt64{Valid: false},
+	})
+	require.NoError(s.t, err)
+
+	// Insert default app runtime settings for this (app, environment) pair.
+	err = db.Query.UpsertAppRuntimeSettings(ctx, s.DB.RW(), db.UpsertAppRuntimeSettingsParams{
+		WorkspaceID:    req.WorkspaceID,
+		AppID:          req.AppID,
+		EnvironmentID:  req.ID,
+		Port:           8080,
+		CpuMillicores:  100,
+		MemoryMib:      128,
+		Command:        nil,
+		Healthcheck:    dbtype.NullHealthcheck{Healthcheck: nil, Valid: false},
+		RegionConfig:   nil,
+		ShutdownSignal: db.AppRuntimeSettingsShutdownSignalSIGTERM,
+		SentinelConfig: []byte("{}"),
+		CreatedAt:      now,
+		UpdatedAt:      sql.NullInt64{Valid: false},
+	})
+	require.NoError(s.t, err)
 
 	environment, err := db.Query.FindEnvironmentById(ctx, s.DB.RO(), req.ID)
 	require.NoError(s.t, err)

pkg/db/schema.sql

@@ -344,22 +344,22 @@ components:
         V2DeployCreateDeploymentRequestBody:
             type: object
             required:
-                - projectId
+                - project
+                - app
                 - branch
                 - environmentSlug
                 - dockerImage
             properties:
-                projectId:
+                project:
                     type: string
                     minLength: 1
-                    description: Unkey project ID
-                    example: "proj_123abc"
-                    pattern: "^proj_[a-zA-Z0-9]+$"
-                appSlug:
+                    description: Project slug
+                    example: "my-project"
+                app:
                     type: string
-                    description: App slug within the project. Defaults to "default" if not specified.
+                    minLength: 1
+                    description: App slug within the project
                     example: "default"
-                    default: "default"
                 keyspaceId:
                     type: string
                     description: Optional keyspace ID for authentication context

svc/api/internal/testutil/seed/seed.go

@@ -1,21 +1,21 @@
 type: object
 required:
-  - projectId
+  - project
+  - app
   - branch
   - environmentSlug
   - dockerImage
 properties:
-  projectId:
+  project:
     type: string
     minLength: 1
-    description: Unkey project ID
-    example: "proj_123abc"
-    pattern: "^proj_[a-zA-Z0-9]+$"
-  appSlug:
+    description: Project slug
+    example: "my-project"
+  app:
     type: string
-    description: App slug within the project. Defaults to "default" if not specified.
+    minLength: 1
+    description: App slug within the project
     example: "default"
-    default: "default"
   keyspaceId:
     type: string
     description: Optional keyspace ID for authentication context