@testream/dotnet-reporter 1.0.0 → 1.1.0

package/README.md

@@ -23,4 +23,4 @@ Run .NET tests and send the results from your codebase to Jira via Testream.
 
 This installs the reporter, runs your .NET tests, and uploads results to Testream.
 
-For CLI options and CI examples, see https://testream.github.io/docs/reporters/dotnet.
+For CLI options and CI examples, see https://docs.testream.app/reporters/dotnet.

package/dist/index.js

@@ -2164,79 +2164,131 @@ module.exports = toNumber;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.detectCIContext = detectCIContext;
-/**
- * Detect CI context from environment variables
- * Supports: GitHub Actions, GitLab CI, Azure Pipelines, CircleCI, Jenkins, Bitbucket Pipelines
- */
-function detectCIContext() {
-    const env = process.env;
-    // GitHub Actions
-    if (env.GITHUB_ACTIONS === 'true') {
-        return {
-            branch: env.GITHUB_HEAD_REF || env.GITHUB_REF_NAME || env.GITHUB_REF?.replace('refs/heads/', ''),
-            commitSha: env.GITHUB_SHA,
-            repositoryUrl: env.GITHUB_SERVER_URL && env.GITHUB_REPOSITORY
-                ? `${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}`
-                : undefined,
-            buildNumber: env.GITHUB_RUN_NUMBER,
-            buildUrl: env.GITHUB_SERVER_URL && env.GITHUB_REPOSITORY && env.GITHUB_RUN_ID
-                ? `${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}`
-                : undefined,
-        };
+function removePrefix(value, prefix) {
+    if (!value) {
+        return undefined;
     }
-    // GitLab CI
-    if (env.GITLAB_CI === 'true') {
-        return {
-            branch: env.CI_COMMIT_BRANCH || env.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME,
-            commitSha: env.CI_COMMIT_SHA,
-            repositoryUrl: env.CI_PROJECT_URL,
-            buildNumber: env.CI_PIPELINE_IID,
-            buildUrl: env.CI_PIPELINE_URL,
-        };
+    return value.startsWith(prefix) ? value.slice(prefix.length) : value;
+}
+function readEnvironment() {
+    const runtime = globalThis;
+    return runtime.process?.env ?? {};
+}
+function buildGithubRepositoryUrl(env) {
+    if (!env.GITHUB_SERVER_URL || !env.GITHUB_REPOSITORY) {
+        return undefined;
     }
-    // Azure Pipelines
-    if (env.TF_BUILD === 'True') {
-        return {
-            branch: env.BUILD_SOURCEBRANCH?.replace('refs/heads/', ''),
-            commitSha: env.BUILD_SOURCEVERSION,
-            repositoryUrl: env.BUILD_REPOSITORY_URI,
-            buildNumber: env.BUILD_BUILDNUMBER,
-            buildUrl: env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI && env.SYSTEM_TEAMPROJECT && env.BUILD_BUILDID
-                ? `${env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${env.SYSTEM_TEAMPROJECT}/_build/results?buildId=${env.BUILD_BUILDID}`
-                : undefined,
-        };
+    return `${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}`;
+}
+function buildGithubBuildUrl(env) {
+    if (!env.GITHUB_SERVER_URL || !env.GITHUB_REPOSITORY || !env.GITHUB_RUN_ID) {
+        return undefined;
     }
-    // CircleCI
-    if (env.CIRCLECI === 'true') {
-        return {
-            branch: env.CIRCLE_BRANCH,
-            commitSha: env.CIRCLE_SHA1,
-            repositoryUrl: env.CIRCLE_REPOSITORY_URL,
-            buildNumber: env.CIRCLE_BUILD_NUM,
-            buildUrl: env.CIRCLE_BUILD_URL,
-        };
+    return `${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}`;
+}
+function detectGitHubBranch(env) {
+    if (env.GITHUB_HEAD_REF) {
+        return env.GITHUB_HEAD_REF;
     }
-    // Jenkins
-    if (env.JENKINS_URL) {
-        return {
-            branch: env.GIT_BRANCH?.replace('origin/', ''),
-            commitSha: env.GIT_COMMIT,
-            repositoryUrl: env.GIT_URL,
-            buildNumber: env.BUILD_NUMBER,
-            buildUrl: env.BUILD_URL,
-        };
+    if (env.GITHUB_REF?.startsWith('refs/heads/')) {
+        return env.GITHUB_REF_NAME ?? removePrefix(env.GITHUB_REF, 'refs/heads/');
     }
-    // Bitbucket Pipelines
-    if (env.BITBUCKET_BUILD_NUMBER) {
-        return {
-            branch: env.BITBUCKET_BRANCH,
-            commitSha: env.BITBUCKET_COMMIT,
-            repositoryUrl: env.BITBUCKET_GIT_HTTP_ORIGIN,
-            buildNumber: env.BITBUCKET_BUILD_NUMBER,
-            buildUrl: env.BITBUCKET_REPO_FULL_NAME && env.BITBUCKET_BUILD_NUMBER
-                ? `https://bitbucket.org/${env.BITBUCKET_REPO_FULL_NAME}/pipelines/results/${env.BITBUCKET_BUILD_NUMBER}`
-                : undefined,
-        };
+    return undefined;
+}
+function detectGitHubActionsContext(env) {
+    return {
+        branch: detectGitHubBranch(env),
+        commitSha: env.GITHUB_SHA,
+        repositoryUrl: buildGithubRepositoryUrl(env),
+        buildNumber: env.GITHUB_RUN_NUMBER,
+        buildUrl: buildGithubBuildUrl(env),
+    };
+}
+function detectGitLabContext(env) {
+    return {
+        branch: env.CI_COMMIT_BRANCH || env.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME,
+        commitSha: env.CI_COMMIT_SHA,
+        repositoryUrl: env.CI_PROJECT_URL,
+        buildNumber: env.CI_PIPELINE_IID,
+        buildUrl: env.CI_PIPELINE_URL,
+    };
+}
+function detectAzurePipelinesContext(env) {
+    return {
+        branch: removePrefix(env.BUILD_SOURCEBRANCH, 'refs/heads/'),
+        commitSha: env.BUILD_SOURCEVERSION,
+        repositoryUrl: env.BUILD_REPOSITORY_URI,
+        buildNumber: env.BUILD_BUILDNUMBER,
+        buildUrl: env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI && env.SYSTEM_TEAMPROJECT && env.BUILD_BUILDID
+            ? `${env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${env.SYSTEM_TEAMPROJECT}/_build/results?buildId=${env.BUILD_BUILDID}`
+            : undefined,
+    };
+}
+function detectCircleCIContext(env) {
+    return {
+        branch: env.CIRCLE_BRANCH,
+        commitSha: env.CIRCLE_SHA1,
+        repositoryUrl: env.CIRCLE_REPOSITORY_URL,
+        buildNumber: env.CIRCLE_BUILD_NUM,
+        buildUrl: env.CIRCLE_BUILD_URL,
+    };
+}
+function detectJenkinsContext(env) {
+    return {
+        branch: removePrefix(env.GIT_BRANCH, 'origin/'),
+        commitSha: env.GIT_COMMIT,
+        repositoryUrl: env.GIT_URL,
+        buildNumber: env.BUILD_NUMBER,
+        buildUrl: env.BUILD_URL,
+    };
+}
+function detectBitbucketContext(env) {
+    return {
+        branch: env.BITBUCKET_BRANCH,
+        commitSha: env.BITBUCKET_COMMIT,
+        repositoryUrl: env.BITBUCKET_GIT_HTTP_ORIGIN,
+        buildNumber: env.BITBUCKET_BUILD_NUMBER,
+        buildUrl: env.BITBUCKET_REPO_FULL_NAME && env.BITBUCKET_BUILD_NUMBER
+            ? `https://bitbucket.org/${env.BITBUCKET_REPO_FULL_NAME}/pipelines/results/${env.BITBUCKET_BUILD_NUMBER}`
+            : undefined,
+    };
+}
+const CI_PROVIDER_DETECTORS = [
+    {
+        isMatch: (env) => env.GITHUB_ACTIONS === 'true',
+        detect: detectGitHubActionsContext,
+    },
+    {
+        isMatch: (env) => env.GITLAB_CI === 'true',
+        detect: detectGitLabContext,
+    },
+    {
+        isMatch: (env) => env.TF_BUILD === 'True',
+        detect: detectAzurePipelinesContext,
+    },
+    {
+        isMatch: (env) => env.CIRCLECI === 'true',
+        detect: detectCircleCIContext,
+    },
+    {
+        isMatch: (env) => Boolean(env.JENKINS_URL),
+        detect: detectJenkinsContext,
+    },
+    {
+        isMatch: (env) => Boolean(env.BITBUCKET_BUILD_NUMBER),
+        detect: detectBitbucketContext,
+    },
+];
+/**
+ * Detect CI context from environment variables
+ * Supports: GitHub Actions, GitLab CI, Azure Pipelines, CircleCI, Jenkins, Bitbucket Pipelines
+ */
+function detectCIContext() {
+    const env = readEnvironment();
+    for (const provider of CI_PROVIDER_DETECTORS) {
+        if (provider.isMatch(env)) {
+            return provider.detect(env);
+        }
     }
     return {};
 }
@@ -2299,6 +2351,7 @@ exports.ensureReportId = ensureReportId;
 exports.uploadTestRun = uploadTestRun;
 exports.mapAttachmentsToTestResults = mapAttachmentsToTestResults;
 exports.uploadArtifacts = uploadArtifacts;
+const ci_detection_1 = __nccwpck_require__(406);
 const DEFAULT_API_URL = 'https://test-manager-backend.fly.dev';
 function ensureReportId(report) {
     if (typeof report.reportId === 'string' && report.reportId.trim().length > 0) {
@@ -2335,6 +2388,52 @@ function normalizeApiUrl(value) {
     }
     return trimmed.replace(/\/+$/, '');
 }
+function isReportAlreadyExistsConflict(error) {
+    return error.errorCode === 'report_already_exists';
+}
+function formatUploadError(error) {
+    const detail = error.detail || error.title || error.rawBody || 'Unknown error';
+    const codeLabel = error.errorCode ? `, code=${error.errorCode}` : '';
+    return `Upload failed (HTTP ${error.statusCode}${codeLabel}): ${detail}`;
+}
+async function parseHttpError(response) {
+    const rawBody = await response.text();
+    const contentType = response.headers.get('content-type') || '';
+    if (contentType.toLowerCase().includes('json') && rawBody.trim().length > 0) {
+        try {
+            const parsed = JSON.parse(rawBody);
+            return {
+                statusCode: response.status,
+                title: parsed.title,
+                detail: parsed.detail || parsed.details || parsed.error,
+                errorCode: parsed.errorCode,
+                rawBody,
+            };
+        }
+        catch {
+            // Fall through to raw body handling
+        }
+    }
+    return {
+        statusCode: response.status,
+        rawBody,
+    };
+}
+function resolveUploadContext(options) {
+    const ciContext = (0, ci_detection_1.detectCIContext)();
+    return {
+        commitSha: options.commitSha ?? ciContext.commitSha,
+        branch: options.branch ?? ciContext.branch,
+        repositoryUrl: options.repositoryUrl ?? ciContext.repositoryUrl,
+        buildName: options.buildName,
+        buildNumber: options.buildNumber ?? ciContext.buildNumber,
+        buildUrl: options.buildUrl ?? ciContext.buildUrl,
+        testEnvironment: options.testEnvironment,
+        appName: options.appName,
+        appVersion: options.appVersion,
+        testType: options.testType,
+    };
+}
 /**
  * Upload test run to Testream backend API
  */
@@ -2342,20 +2441,12 @@ async function uploadTestRun(options) {
     const { report, apiKey } = options;
     const apiUrl = resolveApiUrl(options.apiUrl);
     const reportId = ensureReportId(report);
+    const uploadContext = resolveUploadContext(options);
     // Build type-safe IngestRequest payload
     const ingestPayload = {
         report,
         reportId,
-        commitSha: options.commitSha,
-        branch: options.branch,
-        repositoryUrl: options.repositoryUrl,
-        buildName: options.buildName,
-        buildNumber: options.buildNumber,
-        buildUrl: options.buildUrl,
-        testEnvironment: options.testEnvironment,
-        appName: options.appName,
-        appVersion: options.appVersion,
-        testType: options.testType,
+        ...uploadContext,
     };
     // Professional logging
     console.log('Uploading test results...');
@@ -2372,34 +2463,41 @@ async function uploadTestRun(options) {
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
+        const connectionError = `Connection failed: ${errorMessage}`;
+        console.error(connectionError);
         return {
             success: false,
             reportId,
-            error: `Connection failed: ${errorMessage}`,
+            error: connectionError,
         };
     }
-    // Handle 409 (report already exists) - idempotent
-    if (response.status === 409) {
-        console.warn('Report already exists (workflow may have been re-run)');
-        return {
-            success: true,
-            reportId,
-            summary: {
-                passed: report.results.summary.passed,
-                failed: report.results.summary.failed,
-                skipped: report.results.summary.skipped,
-                total: report.results.summary.tests,
-            },
-            alreadyExists: true,
-        };
-    }
-    // Handle other errors
     if (!response.ok) {
-        const errorText = await response.text();
+        const parsedError = await parseHttpError(response);
+        if (response.status === 409 && isReportAlreadyExistsConflict(parsedError)) {
+            console.warn('Report already exists (workflow may have been re-run)');
+            return {
+                success: true,
+                reportId,
+                summary: {
+                    passed: report.results.summary.passed,
+                    failed: report.results.summary.failed,
+                    skipped: report.results.summary.skipped,
+                    total: report.results.summary.tests,
+                },
+                alreadyExists: true,
+                statusCode: parsedError.statusCode,
+                errorCode: parsedError.errorCode,
+            };
+        }
+        const formattedError = formatUploadError(parsedError);
+        console.error(formattedError);
         return {
             success: false,
             reportId,
-            error: `Upload failed (HTTP ${response.status}): ${errorText}`,
+            error: formattedError,
+            statusCode: parsedError.statusCode,
+            errorCode: parsedError.errorCode,
+            errorDetail: parsedError.detail || parsedError.rawBody,
         };
     }
     // Success
@@ -2958,26 +3056,18 @@ async function main() {
             logger.info('='.repeat(60));
             return;
         }
-        // Detect CI context from environment
-        const ciContext = (0, uploader_1.detectGitContext)();
-        // Merge CLI options with auto-detected CI context (CLI takes precedence)
-        const branch = options.branch || ciContext.branch;
-        const commitSha = options.commitSha || ciContext.commitSha;
-        const repositoryUrl = options.repositoryUrl || ciContext.repositoryUrl;
-        const buildNumber = options.buildNumber || ciContext.buildNumber;
-        const buildUrl = options.buildUrl || ciContext.buildUrl;
         // Upload to API
         const result = await (0, uploader_1.uploadToApi)({
             report,
             apiKey: options.apiKey,
             // Git context
-            branch,
-            commitSha,
-            repositoryUrl,
+            branch: options.branch,
+            commitSha: options.commitSha,
+            repositoryUrl: options.repositoryUrl,
             // Build metadata
             buildName: options.buildName,
-            buildNumber,
-            buildUrl,
+            buildNumber: options.buildNumber,
+            buildUrl: options.buildUrl,
             // Environment metadata
             testEnvironment: options.testEnvironment,
             appName: options.appName,