@hellopearl/dv-gitlab 0.1.0 → 0.2.1

package/ci/api-test.yml

@@ -0,0 +1,84 @@
+# Reusable CI template: build a service's Docker image, run it, and execute
+# pearl-test-automation API tests against it.
+#
+# Required from consumer:
+#   API_TEST_PROJECT  - playwright project name (e.g. VoiceApi)
+#
+# Usage:
+#   include:
+#     - project: 'hellopearl/pearl-agentic-mono'
+#       file: '/packages/dev/dv-gitlab/ci/api-test.yml'
+#
+#   api-tests:
+#     extends: .api-test
+#     variables:
+#       API_TEST_PROJECT: VoiceApi
+
+.api-test:
+  stage: test
+  image: docker:24
+  services:
+    - name: docker:24-dind
+      alias: docker
+  before_script: []
+  variables:
+    DOCKER_TLS_CERTDIR: ''
+    API_TEST_SCOPE: 'heartbeat'
+    API_TEST_ENVIRONMENT: 'dev'
+    TEST_AUTOMATION_REF: 'main'
+    SERVICE_PORT: '4002'
+    SERVICE_HEALTHCHECK_PATH: '/status'
+    DOCKER_BUILD_ARGS: '--build-arg PEARL_NPM_TOKEN=${PEARL_NPM_TOKEN}'
+  script:
+    # ── Build ──
+    - echo "==> Building service image..."
+    - docker build ${DOCKER_BUILD_ARGS} -t sut .
+
+    # ── Run ──
+    - echo "==> Starting service on port ${SERVICE_PORT}..."
+    - env | grep -v "^CI_\|^DOCKER_\|^FF_\|^GITLAB_" > /tmp/sut.env
+    - docker run -d --name sut -p ${SERVICE_PORT}:${SERVICE_PORT} --env-file /tmp/sut.env sut
+    - echo "    Container ID $(docker ps -q --filter name=sut)"
+
+    # ── Healthcheck ──
+    - echo "==> Waiting for healthcheck at docker:${SERVICE_PORT}${SERVICE_HEALTHCHECK_PATH}..."
+    - |
+      for i in $(seq 1 30); do
+        if wget -q --spider "http://docker:${SERVICE_PORT}${SERVICE_HEALTHCHECK_PATH}" 2>/dev/null; then
+          echo "    Ready (${i}s)"
+          break
+        fi
+        if [ $i -eq 30 ]; then
+          echo "ERROR: Service failed to start after 30s"
+          echo "--- Container status ---"
+          docker ps -a --filter name=sut --format "table {{.Status}}\t{{.Ports}}"
+          echo "--- Last 50 lines of logs ---"
+          docker logs --tail 50 sut
+          exit 1
+        fi
+        sleep 1
+      done
+    - echo "==> Startup logs:"
+    - docker logs sut 2>&1 | tail -10
+
+    # ── Test ──
+    - echo "==> Running ${API_TEST_PROJECT} tests (@${API_TEST_SCOPE}, env ${API_TEST_ENVIRONMENT}, ref ${TEST_AUTOMATION_REF})"
+    - |
+      docker run --rm --network host -e ENV=${API_TEST_ENVIRONMENT} node:22 sh -c "
+        git clone --depth 1 --branch ${TEST_AUTOMATION_REF} \
+          https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/hellopearl/eng/pearl-test-automation.git /app
+        cd /app
+        npm ci --ignore-scripts
+        npx playwright test --project=${API_TEST_PROJECT} --grep='@${API_TEST_SCOPE}' --reporter=list
+      "
+      TEST_EXIT=$?
+    - echo "==> Test exit code ${TEST_EXIT}"
+    - echo "==> Final service logs:"
+    - docker logs --tail 20 sut 2>&1
+    - exit ${TEST_EXIT}
+
+  after_script:
+    - docker rm -f sut 2>/dev/null || true
+    - rm -f /tmp/sut.env
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"

package/ci/cleanup-preview.yml

@@ -0,0 +1,16 @@
+.cleanup-preview:
+  stage: .post
+  image: node:22-alpine
+  before_script: []
+  script:
+    - npx @hellopearl/dv-gitlab cleanup-branch
+  variables:
+    AWS_APP_ID: $AMPLIFY_APP_ID
+    AWS_DEFAULT_REGION: us-east-1
+  rules:
+    - if: $CI_COMMIT_REF_NAME =~ /^(development|develop|main|master|prod|stage|sandbox)$/
+      when: never
+    - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
+      when: on_success
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_STATE == "merged"
+      when: on_success

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hellopearl/dv-gitlab",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Unified GitLab CI tooling -- MR comments, pipeline triggers, preview env management",
   "license": "UNLICENSED",
   "type": "module",
@@ -8,10 +8,13 @@
   "exports": {
     ".": "./src/index.mjs"
   },
-  "bin": "bin/dv-gitlab.mjs",
+  "bin": {
+    "dv-gitlab": "./bin/dv-gitlab.mjs"
+  },
   "files": [
     "bin",
-    "src"
+    "src",
+    "ci"
   ],
   "scripts": {
     "deps": "dv-deps-runner",
@@ -38,11 +41,13 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
+  "dependencies": {
+    "@aws-sdk/client-amplify": "^3.1078.0"
+  },
   "devDependencies": {
     "@hellopearl/dv-deps": "*",
     "@hellopearl/dv-lint": "*",
     "@hellopearl/dv-prettier": "*",
     "@hellopearl/dv-test": "*"
-  },
-  "gitHead": "2da7b9fc23900bbaf9c4fcf6042ecec76d538bc2"
+  }
 }

package/src/commands/cleanup-branch.mjs

@@ -26,11 +26,10 @@ export async function cleanupBranch(flags) {
 
   debug(`cleanup-branch branch=${branch} appId=${appId} region=${region}`);
 
-  const amplifyBranch = branch.toLowerCase().replace(/\//g, '-');
-  log(`[cleanup] Deleting Amplify branch: ${amplifyBranch} (app=${appId})`);
+  log(`[cleanup] Deleting Amplify branch: ${branch} (app=${appId})`);
 
   const client = new AmplifyClient({ appId, region });
-  const ok = await client.deleteBranch(amplifyBranch);
+  const ok = await client.deleteBranch(branch);
 
   if (ok) {
     log(`[cleanup] Branch ${amplifyBranch} removed successfully`);

package/src/commands/postbuild.mjs

@@ -197,11 +197,21 @@ export async function postbuild() {
     : '';
   const shortCommit = commitId.slice(0, 8);
 
-  const buildDir = process.env.CODEBUILD_SRC_DIR
-    ? `${process.env.CODEBUILD_SRC_DIR}/build`
-    : 'build';
+  const buildCandidates = [
+    process.env.CODEBUILD_SRC_DIR && `${process.env.CODEBUILD_SRC_DIR}/build`,
+    'build',
+    'dist',
+  ].filter(Boolean);
+
+  let buildExists = false;
+  for (const dir of buildCandidates) {
+    if (await dirExists(dir)) {
+      buildExists = true;
+      debug(`[postbuild] build dir found: ${dir}`);
+      break;
+    }
+  }
 
-  const buildExists = await dirExists(buildDir);
   const templateName = buildExists ? 'preview-ready' : 'preview-failed';
 
   const commentBody = renderTemplate(templateName, {
@@ -213,6 +223,15 @@ export async function postbuild() {
     region,
   });
 
+  const deleted = await client.deleteNotesByMarker(
+    projectId,
+    mr.iid,
+    '<!-- dv-gitlab:preview -->',
+  );
+  if (deleted) {
+    debug(`[postbuild] removed ${deleted} stale preview comment(s)`);
+  }
+
   const posted = await client.postNote(projectId, mr.iid, commentBody);
   if (posted) {
     log(`[postbuild] preview comment posted on MR !${mr.iid}`);
@@ -226,6 +245,12 @@ export async function postbuild() {
     return;
   }
 
+  await client.deleteNotesByMarker(
+    projectId,
+    mr.iid,
+    '<!-- dv-gitlab:pipeline -->',
+  );
+
   const triggerResult = await triggerPipelinePreview({
     appId,
     branch,

package/src/lib/gitlab-client.mjs

@@ -45,6 +45,41 @@ export class GitLabClient {
     return { description: mrs[0].description || '', iid: mrs[0].iid };
   }
 
+  /**
+   * Deletes all MR notes that contain a given marker string.
+   * Used to remove stale bot comments before posting an updated one.
+   * @param {string} projectId
+   * @param {number} mrIid
+   * @param {string} marker
+   * @returns {Promise<number>} count of deleted notes
+   */
+  async deleteNotesByMarker(projectId, mrIid, marker) {
+    const url = `${this.apiBase}/projects/${projectId}/merge_requests/${mrIid}/notes?per_page=100`;
+    debug(`deleteNotesByMarker GET ${url}`);
+
+    const res = await this._fetch(url);
+    if (!res.ok) {
+      debug(`deleteNotesByMarker list failed http=${res.status}`);
+      return 0;
+    }
+
+    const notes = await res.json();
+    let deleted = 0;
+
+    for (const note of notes) {
+      if (note.body && note.body.includes(marker)) {
+        const delUrl = `${this.apiBase}/projects/${projectId}/merge_requests/${mrIid}/notes/${note.id}`;
+        const delRes = await this._fetch(delUrl, { method: 'DELETE' });
+        if (delRes.ok || delRes.status === 204) {
+          deleted++;
+        }
+        debug(`deleteNotesByMarker id=${note.id} http=${delRes.status}`);
+      }
+    }
+
+    return deleted;
+  }
+
   /**
    * Posts a markdown note on an MR.
    * @param {string} projectId

package/src/templates/pipeline-triggered.md

@@ -1,11 +1,12 @@
+<!-- dv-gitlab:pipeline -->
 ## 🔄 Automation Pipeline Triggered
 
-| | |
-|---|---|
-| **Pipeline** | [#{{pipelineId}}]({{pipelineUrl}}) |
-| **Project** | `{{project}}` |
-| **Ref** | `{{ref}}` |
-| **Environment** | `{{environment}}` |
+|                 |                                    |
+| --------------- | ---------------------------------- |
+| **Pipeline**    | [#{{pipelineId}}]({{pipelineUrl}}) |
+| **Project**     | `{{project}}`                      |
+| **Ref**         | `{{ref}}`                          |
+| **Environment** | `{{environment}}`                  |
 
 ---
 

package/src/templates/preview-failed.md

@@ -1,8 +1,9 @@
+<!-- dv-gitlab:preview -->
 ## ❌ Preview Build Failed
 
-| | |
-|---|---|
-| **Branch** | `{{branch}}` |
+|            |                |
+| ---------- | -------------- |
+| **Branch** | `{{branch}}`   |
 | **Commit** | `{{commitId}}` |
 
 ---

package/src/templates/preview-ready.md

@@ -1,9 +1,10 @@
+<!-- dv-gitlab:preview -->
 ## 🚀 Preview Environment Ready
 
-| | |
-|---|---|
-| **Branch** | `{{branch}}` |
-| **Commit** | `{{commitId}}` |
+|                 |                                  |
+| --------------- | -------------------------------- |
+| **Branch**      | `{{branch}}`                     |
+| **Commit**      | `{{commitId}}`                   |
 | **Preview URL** | [{{previewUrl}}]({{previewUrl}}) |
 
 ---