fix: clean up inline structs, fix context types, return workspace error

Author: Flo4604

gen/proto/ctrl/v1/deployment.pb.go

@@ -14,8 +14,6 @@ enum DeploymentStatus {
   DEPLOYMENT_STATUS_FINALIZING = 8;
   DEPLOYMENT_STATUS_READY = 5;
   DEPLOYMENT_STATUS_FAILED = 6;
-  // 9 and 10 were AWAITING_APPROVAL and REJECTED, removed in no-table authorization refactor.
-  reserved 9, 10;
 }
 
 // Source type for deployment creation

gen/proto/hydra/v1/deploy.pb.go

@@ -130,32 +130,16 @@ func (r *githubStatusReporter) Report(ctx restate.ObjectSharedContext, state str
 	}, restate.WithName("github deployment status: "+state), restate.WithMaxRetryDuration(30*time.Second))
 }
 
-// statusReporterResult holds the status reporter and related context needed
-// by other GitHub integrations (e.g. PR comments).
-type statusReporterResult struct {
-	reporter       deploymentStatusReporter
-	repoConn       db.GithubRepoConnection
-	hasRepoConn    bool
-	environmentURL string
-}
-
 // createStatusReporter builds the appropriate deployment status reporter.
 // Returns a GitHub reporter if a repo connection exists, otherwise a noop.
-// Also returns the repo connection and environment URL for use by PR comments.
 func (w *Workflow) createStatusReporter(
 	ctx restate.ObjectContext,
 	deployment db.Deployment,
 	project db.Project,
 	app db.App,
 	environment db.Environment,
 	workspace db.Workspace,
-) statusReporterResult {
-	prefix := project.Slug
-	if app.Slug != "default" {
-		prefix = project.Slug + "-" + app.Slug
-	}
-	envURL := fmt.Sprintf("https://%s-%s-%s.%s", prefix, environment.Slug, workspace.Slug, w.defaultDomain)
-
+) deploymentStatusReporter {
 	repoConn, err := restate.Run(ctx, func(runCtx restate.RunContext) (db.GithubRepoConnection, error) {
 		return db.Query.FindGithubRepoConnectionByAppId(runCtx, w.db.RO(), deployment.AppID)
 	}, restate.WithName("find github repo connection"))
@@ -164,14 +148,19 @@ func (w *Workflow) createStatusReporter(
 			"app_id", deployment.AppID,
 			"error", err,
 		)
-		return statusReporterResult{reporter: NewNoopStatusReporter(), environmentURL: envURL}
+		return NewNoopStatusReporter()
 	}
 
 	envLabel := project.Slug + " - " + environment.Slug
 	if app.Slug != "default" {
 		envLabel = project.Slug + "/" + app.Slug + " - " + environment.Slug
 	}
 
+	prefix := project.Slug
+	if app.Slug != "default" {
+		prefix = project.Slug + "-" + app.Slug
+	}
+	envURL := fmt.Sprintf("https://%s-%s-%s.%s", prefix, environment.Slug, workspace.Slug, w.defaultDomain)
 	logURL := fmt.Sprintf("%s/%s/projects/%s/deployments/%s", w.dashboardURL, workspace.Slug, project.ID, deployment.ID)
 
 	reporter := newGithubStatusReporter(
@@ -181,10 +170,5 @@ func (w *Workflow) createStatusReporter(
 		deployment.ID, environment.Slug == "production",
 	)
 	reporter.Create(ctx)
-	return statusReporterResult{
-		reporter:       reporter,
-		repoConn:       repoConn,
-		hasRepoConn:    true,
-		environmentURL: envURL,
-	}
+	return reporter
 }

gen/proto/hydra/v1/deploy_restate.pb.go

@@ -10,7 +10,7 @@ import (
 // UpdateGitHubDeploymentStatus looks up a deployment's GitHub deployment ID and
 // repo connection, then reports the requested state to the GitHub Deployments API.
 // This runs on the worker which owns the GitHub App credentials.
-func (w *Workflow) UpdateGitHubDeploymentStatus(ctx restate.WorkflowSharedContext, req *hydrav1.UpdateGitHubDeploymentStatusRequest) (*hydrav1.UpdateGitHubDeploymentStatusResponse, error) {
+func (w *Workflow) UpdateGitHubDeploymentStatus(ctx restate.ObjectContext, req *hydrav1.UpdateGitHubDeploymentStatusRequest) (*hydrav1.UpdateGitHubDeploymentStatusResponse, error) {
 	deployment, err := restate.Run(ctx, func(ctx restate.RunContext) (*db.Deployment, error) {
 		d, findErr := db.Query.FindDeploymentById(ctx, w.db.RO(), req.DeploymentId)
 		if findErr != nil {

svc/ctrl/proto/ctrl/v1/deployment.proto

@@ -48,6 +48,22 @@ type ghDeploymentResponse struct {
 	ID int64 `json:"id"`
 }
 
+// ghCheckRunResponse is the subset of GitHub's check-run creation response.
+type ghCheckRunResponse struct {
+	ID int64 `json:"id"`
+}
+
+// ghCheckRun is a single check run entry from the list endpoint.
+type ghCheckRun struct {
+	ID   int64  `json:"id"`
+	Name string `json:"name"`
+}
+
+// ghCheckRunsResponse is the response from GitHub's list check-runs endpoint.
+type ghCheckRunsResponse struct {
+	CheckRuns []ghCheckRun `json:"check_runs"`
+}
+
 // ClientConfig holds configuration for creating a [Client] instance.
 type ClientConfig struct {
 	// AppID is the numeric ID assigned to the GitHub App during registration.
@@ -343,10 +359,6 @@ func (c *Client) CreateCheckRun(installationID int64, repo string, headSHA strin
 
 	apiURL := fmt.Sprintf("https://api.github.com/repos/%s/check-runs", repo)
 
-	type ghCheckRunResponse struct {
-		ID int64 `json:"id"`
-	}
-
 	payload := map[string]interface{}{
 		"name":       name,
 		"head_sha":   headSHA,
@@ -400,14 +412,6 @@ func (c *Client) ListCheckRunsForRef(installationID int64, repo string, ref stri
 		apiURL += "?check_name=" + url.QueryEscape(checkName)
 	}
 
-	type ghCheckRun struct {
-		ID   int64  `json:"id"`
-		Name string `json:"name"`
-	}
-	type ghCheckRunsResponse struct {
-		CheckRuns []ghCheckRun `json:"check_runs"`
-	}
-
 	result, err := httpclient.Request[ghCheckRunsResponse](c.httpClient, http.MethodGet, apiURL, headers, nil, http.StatusOK)
 	if err != nil {
 		return nil, err