cicd fixes

Author: untra

.github/workflows/integration-tests.yml

@@ -209,10 +209,13 @@ jobs:
           OPERATOR_GITHUB_TOKEN: ${{ secrets.OPERATOR_GITHUB_TOKEN }}
           GH_TOKEN: ${{ secrets.OPERATOR_GITHUB_TOKEN }}
           GITLAB_TOKEN: ${{ secrets.OPERATOR_GITLAB_TOKEN }}
+          GITEA_TOKEN: ${{ secrets.OPERATOR_GITEA_TOKEN }}
           OPERATOR_GITPROVIDER_TEST_REPO_GITHUB: ${{ vars.OPERATOR_GITPROVIDER_TEST_REPO_GITHUB || '' }}
           OPERATOR_GITPROVIDER_TEST_PR_GITHUB: ${{ vars.OPERATOR_GITPROVIDER_TEST_PR_GITHUB || '' }}
           OPERATOR_GITPROVIDER_TEST_REPO_GITLAB: ${{ vars.OPERATOR_GITPROVIDER_TEST_REPO_GITLAB || '' }}
           OPERATOR_GITPROVIDER_TEST_PR_GITLAB: ${{ vars.OPERATOR_GITPROVIDER_TEST_PR_GITLAB || '' }}
+          OPERATOR_GITPROVIDER_TEST_REPO_GITEA: ${{ vars.OPERATOR_GITPROVIDER_TEST_REPO_GITEA || '' }}
+          OPERATOR_GITPROVIDER_TEST_PR_GITEA: ${{ vars.OPERATOR_GITPROVIDER_TEST_PR_GITEA || '' }}
         run: cargo test --locked --test gitprovider_integration -- --nocapture
 
       - name: Cleanup optest branches

bump-version.sh

@@ -40,7 +40,6 @@ TEXT_FILES=(
 # JSON files: update .version via jq
 JSON_FILES=(
   "vscode-extension/package.json"
-  "backstage-server/package.json"
   "agnt-plugin/package.json"
   "agnt-plugin/manifest.json"
 )

charts/operator/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: operator
 description: Run Operator as a single-writer agent orchestration service
 type: application
-version: 0.2.6
-appVersion: "0.2.6"
+version: 0.2.7
+appVersion: "0.2.7"
 kubeVersion: ">=1.25.0-0"
 home: https://operator.untra.io
 sources:

coder-module/main.tf

@@ -38,7 +38,7 @@ variable "slug" {
 variable "install_version" {
   type        = string
   description = "The version of operator to install (must match a GitHub release tag)."
-  default     = "0.2.6"
+  default     = "0.2.7"
 }
 
 variable "install_prefix" {

opr8r/src/api.rs

@@ -399,14 +399,16 @@ mod tests {
         // sending `Authorization: Bearer ` would be worse than sending nothing.
         for blank in ["", "   ", "\n"] {
             let client = ApiClient::with_token("http://localhost:7008", Some(blank.to_string()));
-            assert!(client.token.is_none(), "blank token {blank:?} should be dropped");
+            assert!(
+                client.token.is_none(),
+                "blank token {blank:?} should be dropped"
+            );
         }
     }
 
     #[test]
     fn test_token_is_retained_when_supplied() {
-        let client =
-            ApiClient::with_token("http://localhost:7008", Some("cb-token".to_string()));
+        let client = ApiClient::with_token("http://localhost:7008", Some("cb-token".to_string()));
         assert_eq!(client.token.as_deref(), Some("cb-token"));
     }
 

scripts/cicdprep.sh

@@ -173,23 +173,20 @@ needs_docs()       { has_changes '^(docs/|src/docs_gen/|src/taxonomy/taxonomy\.t
 needs_bun_root()       { has_changes '^(package\.json|bun\.lock)$'; }
 needs_bun_ui()         { has_changes '^ui/(package\.json|bun\.lock)$'; }
 needs_bun_webcomp()    { has_changes '^webcomponents/(package\.json|bun\.lock)$'; }
-needs_bun_backstage()  { has_changes '^backstage-server/(.*/)?(package\.json|bun\.lock)$'; }
 
 # --- 0. Bun lockfiles ---
 #
 # Run this first, cheaply, across every bun project so a stale lockfile fails
 # loudly and early instead of midway through a UI build. Mirrors CI's
 # `bun install --frozen-lockfile`, and additionally covers the root and
-# backstage-server lockfiles that CI does not currently enforce.
 
-if needs_bun_root || needs_bun_ui || needs_bun_webcomp || needs_bun_backstage; then
+if needs_bun_root || needs_bun_ui || needs_bun_webcomp ; then
   section "Bun lockfiles"
   require_tool bun "bun lockfile sync"
 
   if needs_bun_root;      then check_bun_lockfile ".";                else skip "Lockfile sync: . (no changes)"; fi
   if needs_bun_ui;        then check_bun_lockfile "ui";               else skip "Lockfile sync: ui (no changes)"; fi
   if needs_bun_webcomp;   then check_bun_lockfile "webcomponents";    else skip "Lockfile sync: webcomponents (no changes)"; fi
-  if needs_bun_backstage; then check_bun_lockfile "backstage-server"; else skip "Lockfile sync: backstage-server (no changes)"; fi
 else
   skip "Bun lockfiles"
 fi

tests/gitprovider_integration.rs

@@ -1,6 +1,6 @@
-//! Live integration tests for the `PrService` stack (GitHub, GitLab, ...)
+//! Live integration tests for the `PrService` stack (GitHub, GitLab, Gitea)
 //!
-//! These tests drive the real provider CLIs (`gh`, `glab`) through
+//! These tests drive the real provider CLIs (`gh`, `glab`, `tea`) through
 //! `pr_service_for`/`PrService` against designated, real, external test
 //! repositories. They are strictly read-only: no create/write operations
 //! against any provider are performed anywhere in this file.
@@ -17,20 +17,30 @@
 //!   test repo.
 //! - `OPERATOR_GITPROVIDER_TEST_PR_GITLAB`: Number of an open GitLab MR on
 //!   that repo with at least one comment.
+//! - `OPERATOR_GITPROVIDER_TEST_REPO_GITEA`: Full remote URL of a Gitea test
+//!   repo. Gitea is self-hosted, so its origin also registers the Gitea host.
+//! - `OPERATOR_GITPROVIDER_TEST_PR_GITEA`: Number of an open Gitea PR on that
+//!   repo with at least one comment.
 //!
-//! Each row additionally needs its CLI (`gh`, `glab`) installed and
+//! Each row additionally needs its CLI (`gh`, `glab`, `tea`) installed and
 //! authenticated. A row skips itself (with `eprintln!`) rather than failing
 //! the suite when its repo env var is unset or its CLI is unavailable.
 //!
+//! A row env var counts as unset when it is missing **or blank**: CI wires
+//! these from repository variables that export an empty string when
+//! undefined, and a blank value must skip the row rather than be parsed.
+//!
 //! ## Running Tests
 //!
 //! ```bash
-//! # Both rows
+//! # Every row
 //! OPERATOR_GITPROVIDER_TEST_ENABLED=true \
 //!     OPERATOR_GITPROVIDER_TEST_REPO_GITHUB=https://github.com/owner/repo \
 //!     OPERATOR_GITPROVIDER_TEST_PR_GITHUB=1 \
 //!     OPERATOR_GITPROVIDER_TEST_REPO_GITLAB=https://gitlab.com/owner/repo \
 //!     OPERATOR_GITPROVIDER_TEST_PR_GITLAB=1 \
+//!     OPERATOR_GITPROVIDER_TEST_REPO_GITEA=https://gitea.example/owner/repo \
+//!     OPERATOR_GITPROVIDER_TEST_PR_GITEA=1 \
 //!     cargo test --test gitprovider_integration -- --nocapture
 //!
 //! # Table-invariant unit test only (no env vars, no CLIs needed)
@@ -39,6 +49,7 @@
 
 use operator::api::pr_service::pr_service_for;
 use operator::api::PrService;
+use operator::config::GitConfig;
 use operator::types::pr::{GitProvider, PrState, RepoInfo};
 use std::collections::HashSet;
 use std::env;
@@ -53,6 +64,17 @@ fn gitprovider_tests_enabled() -> bool {
         .unwrap_or(false)
 }
 
+/// A set-but-blank value reads as unset -- see the blank-value note in the
+/// module docs.
+fn non_blank(value: String) -> Option<String> {
+    (!value.trim().is_empty()).then_some(value)
+}
+
+/// The value of `var`, or `None` when it is unset or blank.
+fn configured(var: &str) -> Option<String> {
+    env::var(var).ok().and_then(non_blank)
+}
+
 /// Macro to skip test if git-provider tests are not configured
 macro_rules! skip_if_not_configured {
     () => {
@@ -66,7 +88,7 @@ macro_rules! skip_if_not_configured {
 // ─── Provider Table ──────────────────────────────────────────────────────────
 
 /// One row of the live provider test table. Adding a new operational
-/// provider (bitbucket, azure, forgejo, gitea) is just adding a row here
+/// provider (bitbucket, azure, forgejo) is just adding a row here
 /// plus a `#[tokio::test]` that calls `run_provider_case` for it -- see the
 /// template comment below `PROVIDER_CASES`.
 struct ProviderCase {
@@ -78,8 +100,12 @@ struct ProviderCase {
     repo_env: &'static str,
     /// Env var holding the PR/MR number to exercise (must have >=1 comment).
     pr_env: &'static str,
+    /// Registers the test repo's origin as this provider's host. `None` for
+    /// providers resolved by well-known domain; `Some` for self-hosted ones,
+    /// which are unresolvable until their host is configured.
+    apply_host: Option<fn(&mut GitConfig, String)>,
     /// Builds the `PrService` under test for this row.
-    service: fn() -> Arc<dyn PrService>,
+    service: fn(&GitConfig) -> Arc<dyn PrService>,
 }
 
 const PROVIDER_CASES: &[ProviderCase] = &[
@@ -88,34 +114,24 @@ const PROVIDER_CASES: &[ProviderCase] = &[
         cli: "gh",
         repo_env: "OPERATOR_GITPROVIDER_TEST_REPO_GITHUB",
         pr_env: "OPERATOR_GITPROVIDER_TEST_PR_GITHUB",
-        service: || {
-            pr_service_for(GitProvider::GitHub, &operator::config::GitConfig::default())
-                .expect("github is operational")
-        },
+        apply_host: None,
+        service: |git| pr_service_for(GitProvider::GitHub, git).expect("github is operational"),
     },
     ProviderCase {
         slug: "gitlab",
         cli: "glab",
         repo_env: "OPERATOR_GITPROVIDER_TEST_REPO_GITLAB",
         pr_env: "OPERATOR_GITPROVIDER_TEST_PR_GITLAB",
-        service: || {
-            pr_service_for(GitProvider::GitLab, &operator::config::GitConfig::default())
-                .expect("gitlab is operational")
-        },
+        apply_host: None,
+        service: |git| pr_service_for(GitProvider::GitLab, git).expect("gitlab is operational"),
     },
     ProviderCase {
         slug: "gitea",
         cli: "tea",
         repo_env: "OPERATOR_GITPROVIDER_TEST_REPO_GITEA",
         pr_env: "OPERATOR_GITPROVIDER_TEST_PR_GITEA",
-        service: || {
-            let mut config = operator::config::GiteaConfig::default();
-            if let Ok(remote) = env::var("OPERATOR_GITPROVIDER_TEST_REPO_GITEA") {
-                let url = url::Url::parse(&remote).expect("Gitea test remote must be HTTPS");
-                config.host = Some(url.origin().ascii_serialization());
-            }
-            Arc::new(operator::api::gitea_service::GiteaService::new(config))
-        },
+        apply_host: Some(|git, origin| git.gitea.host = Some(origin)),
+        service: |git| pr_service_for(GitProvider::Gitea, git).expect("gitea is operational"),
     },
     // Template for a future row (documentation only, NOT dead code -- copy
     // this into a real `ProviderCase` once the provider gets an operational
@@ -126,12 +142,13 @@ const PROVIDER_CASES: &[ProviderCase] = &[
     //     cli: "bb" or whatever CLI backs BitbucketService,
     //     repo_env: "OPERATOR_GITPROVIDER_TEST_REPO_BITBUCKET",
     //     pr_env: "OPERATOR_GITPROVIDER_TEST_PR_BITBUCKET",
-    //     service: || pr_service_for(GitProvider::Bitbucket).expect("bitbucket is operational"),
+    //     apply_host: None,
+    //     service: |git| pr_service_for(GitProvider::Bitbucket, git).expect("operational"),
     // },
     //
-    // Azure DevOps, Forgejo, and Gitea rows follow the same shape with
-    // `GitProvider::AzureDevOps` / `Forgejo` / `Gitea` and their own
-    // `OPERATOR_GITPROVIDER_TEST_{REPO,PR}_{AZUREDEVOPS,FORGEJO,GITEA}` pair.
+    // Azure DevOps and Forgejo follow the same shape once `pr_service_for`
+    // stops returning `UnsupportedProviderError` for them. A self-hosted row
+    // also needs `apply_host`, as the `gitea` row above does.
 ];
 
 /// Look up a row by slug (stable against reordering `PROVIDER_CASES`).
@@ -144,19 +161,39 @@ fn case_by_slug(slug: &str) -> &'static ProviderCase {
 
 // ─── Shared Row Runner ────────────────────────────────────────────────────────
 
+/// The `GitConfig` a row's service and URL parsing both resolve against.
+/// Self-hosted rows register the live repo's own origin as their host.
+fn git_config_for(case: &ProviderCase, repo_url: &str) -> GitConfig {
+    let mut git = GitConfig::default();
+    if let Some(apply_host) = case.apply_host {
+        let origin = url::Url::parse(repo_url)
+            .unwrap_or_else(|e| {
+                panic!(
+                    "{}: {} must be an absolute URL: {e}",
+                    case.slug, case.repo_env
+                )
+            })
+            .origin()
+            .ascii_serialization();
+        apply_host(&mut git, origin);
+    }
+    git
+}
+
 /// Drive one row of `PROVIDER_CASES` through the live `PrService` stack.
 /// Skips (with `eprintln!`) rather than fails when the row isn't configured
 /// or its CLI isn't installed/authed -- a missing row must not fail the
 /// suite.
 async fn run_provider_case(case: &ProviderCase) {
     skip_if_not_configured!();
 
-    let Ok(repo_url) = env::var(case.repo_env) else {
+    let Some(repo_url) = configured(case.repo_env) else {
         eprintln!("Skipping {} row: {} not set", case.slug, case.repo_env);
         return;
     };
 
-    let service = (case.service)();
+    let git = git_config_for(case, &repo_url);
+    let service = (case.service)(&git);
 
     // 1. check_available
     match service.check_available().await {
@@ -187,15 +224,6 @@ async fn run_provider_case(case: &ProviderCase) {
     eprintln!("{}: authenticated as {user}", case.slug);
 
     // 3. RepoInfo::from_remote_url
-    let mut git = operator::config::GitConfig::default();
-    if case.slug == "gitea" {
-        git.gitea.host = Some(
-            url::Url::parse(&repo_url)
-                .unwrap()
-                .origin()
-                .ascii_serialization(),
-        );
-    }
     let hosts = operator::types::pr::ProviderHosts::from_config(&git).unwrap();
     let repo_info = RepoInfo::from_remote_url_with_hosts(&repo_url, &hosts)
         .unwrap_or_else(|e| panic!("{}: failed to parse repo url {repo_url}: {e}", case.slug));
@@ -206,7 +234,7 @@ async fn run_provider_case(case: &ProviderCase) {
         case.slug
     );
 
-    let Ok(pr_number_str) = env::var(case.pr_env) else {
+    let Some(pr_number_str) = configured(case.pr_env) else {
         eprintln!(
             "Skipping remaining {} assertions: {} not set",
             case.slug, case.pr_env
@@ -272,6 +300,11 @@ async fn test_gitlab_provider_live() {
     run_provider_case(case_by_slug("gitlab")).await;
 }
 
+#[tokio::test]
+async fn test_gitea_provider_live() {
+    run_provider_case(case_by_slug("gitea")).await;
+}
+
 // ─── CLI Flag Contract (no credentials, no network) ──────────────────────────
 
 /// Every long flag an argv builder emits must appear in the installed CLI's
@@ -344,6 +377,23 @@ fn provider_cli_flags_are_accepted_by_the_installed_binary() {
 
 // ─── Table Invariants (plain `cargo test`, no gating) ────────────────────────
 
+/// CI wires every row with `${{ vars.X || '' }}`, which exports an empty
+/// string when the variable is undefined -- a blank value must read as unset.
+#[test]
+fn blank_env_values_are_treated_as_unset() {
+    for blank in ["", "   ", "\n"] {
+        assert_eq!(
+            non_blank(blank.to_string()),
+            None,
+            "blank value {blank:?} should read as unset"
+        );
+    }
+    assert_eq!(
+        non_blank("https://github.com/owner/repo".to_string()).as_deref(),
+        Some("https://github.com/owner/repo")
+    );
+}
+
 #[test]
 fn provider_case_table_env_names_unique_and_slugs_match() {
     let mut repo_envs = HashSet::new();
@@ -367,7 +417,7 @@ fn provider_case_table_env_names_unique_and_slugs_match() {
             case.slug
         );
 
-        let service = (case.service)();
+        let service = (case.service)(&GitConfig::default());
         assert_eq!(
             service.provider_name(),
             case.slug,
@@ -376,8 +426,3 @@ fn provider_case_table_env_names_unique_and_slugs_match() {
         );
     }
 }
-
-#[tokio::test]
-async fn gitea_provider_live() {
-    run_provider_case(PROVIDER_CASES.iter().find(|c| c.slug == "gitea").unwrap()).await;
-}

vscode-extension/src/api-client.ts

@@ -648,11 +648,6 @@ export class OperatorApiClient {
     return this.request('/api/v1/queue/kanban');
   }
 
-  /** Kanban board columns — the API-backed source for the ticket trees. */
-  async getKanban(): Promise<KanbanBoardResponse> {
-    return this.getJson<KanbanBoardResponse>('/api/v1/queue/kanban');
-  }
-
   async listDelegators(): Promise<DelegatorsResponse> {
     return this.request('/api/v1/delegators');
   }