cocalc-api: fix the CI test

haraldschilly · haraldschilly · commit 200810a3437b · 2025-09-30T19:32:18.000+02:00
diff --git a/.github/workflows/make-and-test.yml b/.github/workflows/make-and-test.yml
@@ -128,28 +128,13 @@ jobs:
           name: "test-results-node-${{ matrix.node-version }}-pg-${{ matrix.pg-version }}"
           path: 'src/packages/*/junit.xml'
 
-      - name: Create CI admin user and API key
-        run: |
-          cd src/packages/hub
-          node run/test-create-admin.js > ../../api_key.txt
-          # Validate API key was created
-          if [ ! -s ../../api_key.txt ]; then
-            echo "Error: API key file is empty or missing"
-            exit 1
-          fi
-          API_KEY=$(cat ../../api_key.txt)
-          if ! echo "$API_KEY" | grep -qE '^sk-[A-Za-z0-9]+$'; then
-            echo "Error: Invalid API key format: $API_KEY"
-            exit 1
-          fi
-          echo "API key created successfully"
-        env:
-          PGDATABASE: smc
-          PGUSER: smc
-          PGHOST: localhost
-
       - name: Start CoCalc Hub
         run: |
+          # Create conat password for hub internal authentication
+          mkdir -p src/data/secrets
+          echo "test-conat-password-$(date +%s)" > src/data/secrets/conat-password
+          chmod 600 src/data/secrets/conat-password
+
           cd src/packages/hub
           pnpm run hub-project-dev-nobuild > hub.log 2>&1 &
           HUB_PID=$!
@@ -168,13 +153,15 @@ jobs:
           PGUSER: smc
           PGHOST: localhost
           COCALC_MODE: single-user
+          COCALC_TEST_MODE: yes
+          DEBUG: 'cocalc:*,-cocalc:silly:*,hub:*,project:*'
 
       - name: Wait for hub readiness
         run: |
           MAX_ATTEMPTS=30
           READY=false
           for i in $(seq 1 $MAX_ATTEMPTS); do
-            if curl -f --max-time 3 http://localhost:5000/healthcheck; then
+            if curl -sf --max-time 3 http://localhost:5000/healthcheck > /dev/null; then
               echo "Hub is ready"
               READY=true
               break
@@ -189,14 +176,34 @@ jobs:
             exit 1
           fi
 
+      - name: Create CI admin user and API key
+        run: |
+          cd src/packages/hub
+          node dist/run/test-create-admin.js > ../../api_key.txt
+          # Validate API key was created
+          if [ ! -s ../../api_key.txt ]; then
+            echo "Error: API key file is empty or missing"
+            exit 1
+          fi
+          API_KEY=$(cat ../../api_key.txt)
+          if ! echo "$API_KEY" | grep -qE '^sk-[A-Za-z0-9]+$'; then
+            echo "Error: Invalid API key format: $API_KEY"
+            exit 1
+          fi
+          echo "API key created successfully"
+        env:
+          PGDATABASE: smc
+          PGUSER: smc
+          PGHOST: localhost
+
       - name: Install uv for cocalc-api tests
         run: curl -LsSf https://astral.sh/uv/install.sh | sh && echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Run cocalc-api tests
         run: |
           export COCALC_API_KEY=$(cat src/api_key.txt)
           export COCALC_HOST=http://localhost:5000
-          cd src/python/cocalc-api && uv run pytest --junitxml=test-results.xml
+          cd src/python/cocalc-api && make ci
 
       - name: Stop CoCalc Hub
         if: always()
diff --git a/src/packages/hub/package.json b/src/packages/hub/package.json
@@ -96,7 +96,6 @@
     "cocalc-hub-maintenance-expired": "./run/maintenance-expired.js",
     "cocalc-hub-maintenance-syncstrings": "./run/maintenance-syncstrings.js",
     "cocalc-hub-maintenance-blobs": "./run/maintenance-blobs.js",
-    "cocalc-hub-stripe-sync": "./run/stripe-sync.js",
-    "cocalc-hub-test-create-admin": "./run/test-create-admin.js"
+    "cocalc-hub-stripe-sync": "./run/stripe-sync.js"
   }
 }
diff --git a/src/packages/hub/run/test-create-admin.ts b/src/packages/hub/run/test-create-admin.ts
@@ -6,6 +6,7 @@
  */
 
 import { v4 as uuidv4 } from "uuid";
+
 import createAccount from "@cocalc/server/accounts/create-account";
 import manageApiKeys from "@cocalc/server/api/manage";
 import getPool from "@cocalc/database/pool";
@@ -17,7 +18,7 @@ async function main() {
   const firstName = "CI";
   const lastName = "Admin";
 
-  console.log(`Creating admin account ${account_id}...`);
+  console.error(`Creating admin account ${account_id}...`);
 
   // Create the account
   await createAccount({
@@ -38,7 +39,7 @@ async function main() {
     account_id,
   ]);
 
-  console.log("Creating API key...");
+  console.error("Creating API key...");
 
   // Create API key
   const keys = await manageApiKeys({
@@ -52,7 +53,11 @@ async function main() {
   }
 
   const apiKey = keys[0];
-  console.log(`API key created: ${apiKey.secret}`);
+  if (!apiKey.secret) {
+    throw new Error("API key secret is missing");
+  }
+  console.error(`API key created with id=${apiKey.id}: ${apiKey.secret}`);
+  console.error(`Last 6 chars: ${apiKey.secret.slice(-6)}`);
 
   // Output the key for CI
   process.stdout.write(apiKey.secret);
@@ -61,4 +66,4 @@ async function main() {
 main().catch((err) => {
   console.error("Error:", err);
   process.exit(1);
-});
+});
diff --git a/src/python/cocalc-api/Makefile b/src/python/cocalc-api/Makefile
@@ -7,6 +7,7 @@ help:
 	@echo "  check            - Run linting and type checking"
 	@echo "  test             - Run tests"
 	@echo "  test-verbose     - Run tests with verbose output"
+	@echo "  ci               - Run tests with coverage and JUnit XML for CI"
 	@echo "  coverage         - Run tests with coverage reporting (HTML + terminal)"
 	@echo "  coverage-report  - Show coverage report in terminal"
 	@echo "  coverage-html    - Generate HTML coverage report only"
@@ -34,6 +35,9 @@ test:
 test-verbose:
 	uv run pytest -v
 
+ci:
+	uv run pytest --junitxml=test-results.xml --cov=src --cov-report=term-missing --cov-report=html
+
 coverage:
 	uv run pytest --cov=src --cov-report=term-missing --cov-report=html
 
