fix: remove unresolved merge conflict markers from rebase (#33)

* fix: remove unresolved merge conflict markers from rebase

* fix: restore partial-failure warning banner, rename duplicate test suite, restore changelog dropped in rebase for 2.1.0 features

Author: DevonL

CHANGELOG.md

@@ -1,3 +1,24 @@
+## 2.1.0 - March 2026
+### Terraform Export
+
+#### Export Repository as Terraform
+- "Export as Terraform" context menu command on repository nodes generates a complete Cloudsmith Terraform provider configuration.
+- Exports `cloudsmith_repository` with all base non-default settings
+- Exports all configured upstreams as `cloudsmith_repository_upstream` resources with format type, URL, mode, priority, and active state.
+- Supports all upstream formats.
+- Exports `cloudsmith_repository_retention_rule` when retention is configured.
+- Uses Terraform resource references (`data.cloudsmith_namespace`, `cloudsmith_repository.slug_perm`) for portable, import-ready configurations.
+- Auth secrets are never exported as plaintext. Upstream credentials use Terraform variable placeholders with `sensitive = true`.
+- Generated HCL opens in a new editor tab for review before saving.
+
+#### Upstream Reliability
+- Consolidated all upstream data fetching into a single shared helper across inline indicators, WebView, and Terraform export.
+- Hardened upstream cache validation: malformed entries are evicted, expired entries force refetch, and cache write failures are non-fatal.
+- Inline upstream count now reflects all configured formats, not just formats inferred from loaded packages.
+
+#### License Resolution Reliability
+- Fixed an issue causing licenses to not properly display in certain situations
+
 ## 2.0.0 - March 2026
 ### Package Intelligence Platform
 

extension.js

@@ -18,15 +18,9 @@ const { UpstreamDetailProvider } = require("./views/upstreamDetailProvider");
 const { PromotionProvider } = require("./views/promotionProvider");
 const { SearchQueryBuilder } = require("./util/searchQueryBuilder");
 const { formatApiError } = require("./util/errorFormatter");
-<<<<<<< HEAD
 const { LicenseClassifier } = require("./util/licenseClassifier");
-=======
 const { fetchRepositoryUpstreams, generateTerraformConfig } = require("./util/terraformExporter");
-<<<<<<< HEAD
->>>>>>> 52ddc2b (feat: export repository as Terraform)
-=======
 const { SUPPORTED_UPSTREAM_FORMATS } = require("./util/upstreamFormats");
->>>>>>> 50c8bac (fix: consolidate upstream fetch and fix WebView/Terraform export consumers)
 const recentPackages = require("./util/recentPackages");
 
 let exportTerraformAbortController = null;

test/upstreamChecker.test.js

@@ -1,14 +1,16 @@
 const assert = require("assert");
-<<<<<<< HEAD
-<<<<<<< HEAD
 const { CloudsmithAPI } = require("../util/cloudsmithAPI");
 const { CredentialManager } = require("../util/credentialManager");
 const {
-  UpstreamChecker,
+  isBenignUpstreamFormatError,
   SUPPORTED_UPSTREAM_FORMATS,
+  UpstreamChecker,
 } = require("../util/upstreamChecker");
+const {
+  SUPPORTED_UPSTREAM_FORMATS: SHARED_SUPPORTED_UPSTREAM_FORMATS,
+} = require("../util/upstreamFormats");
 
-suite("UpstreamChecker Test Suite", () => {
+suite("UpstreamChecker repository upstream cache", () => {
   let originalMakeRequest;
   let originalGetApiKey;
   let formatResponses;
@@ -237,20 +239,10 @@ suite("UpstreamChecker Test Suite", () => {
     } finally {
       context.globalState.update = originalUpdate;
     }
-=======
-const { SUPPORTED_UPSTREAM_FORMATS, UpstreamChecker } = require("../util/upstreamChecker");
-=======
-const {
-  isBenignUpstreamFormatError,
-  SUPPORTED_UPSTREAM_FORMATS,
-  UpstreamChecker,
-} = require("../util/upstreamChecker");
-const {
-  SUPPORTED_UPSTREAM_FORMATS: SHARED_SUPPORTED_UPSTREAM_FORMATS,
-} = require("../util/upstreamFormats");
->>>>>>> 50c8bac (fix: consolidate upstream fetch and fix WebView/Terraform export consumers)
+  });
+});
 
-suite("UpstreamChecker Test Suite", () => {
+suite("UpstreamChecker shared helper and format handling", () => {
   function createContext() {
     const store = new Map();
     const updates = [];
@@ -546,7 +538,6 @@ suite("UpstreamChecker Test Suite", () => {
 
     assert.strictEqual(result.data.length, 0);
     assert.ok(result.error.includes("python"));
->>>>>>> 52ddc2b (feat: export repository as Terraform)
   });
 
   test("does not cache non-benign empty upstream results", async () => {

util/upstreamChecker.js

@@ -4,52 +4,13 @@
 const { CloudsmithAPI } = require("./cloudsmithAPI");
 const { CredentialManager } = require("./credentialManager");
 const { SearchQueryBuilder } = require("./searchQueryBuilder");
-<<<<<<< HEAD
-
-const SUPPORTED_UPSTREAM_FORMATS = [
-<<<<<<< HEAD
-  "deb", "docker", "maven", "npm", "python",
-  "ruby", "dart", "helm", "nuget", "cargo",
-  "rpm", "cran", "swift", "go", "hex",
-  "composer", "conda", "conan", "p2", "terraform",
-  "raw",
-];
-const UPSTREAM_FETCH_BATCH_SIZE = 5;
-const UPSTREAM_CACHE_TTL_MS = 10 * 60 * 1000; // 10 minutes
-const REPOSITORY_UPSTREAM_CACHE_KEY_PREFIX = "cloudsmith-upstreams:v2";
-=======
-  "alpine",
-  "cargo",
-  "cocoapods",
-  "composer",
-  "conda",
-  "cran",
-  "dart",
-  "deb",
-  "docker",
-  "generic",
-  "go",
-  "helm",
-  "hex",
-  "huggingface",
-  "luarocks",
-  "maven",
-  "npm",
-  "nuget",
-  "python",
-  "rpm",
-  "ruby",
-  "swift",
-  "vagrant",
-];
-=======
 const {
   getSupportedUpstreamFormats,
   SUPPORTED_UPSTREAM_FORMATS,
 } = require("./upstreamFormats");
->>>>>>> 50c8bac (fix: consolidate upstream fetch and fix WebView/Terraform export consumers)
 const UPSTREAM_CACHE_TTL_MS = 10 * 60 * 1000;
 const UPSTREAM_FETCH_BATCH_SIZE = 5;
+const REPOSITORY_UPSTREAM_CACHE_KEY_PREFIX = "cloudsmith-upstreams:v2";
 const BENIGN_UPSTREAM_FORMAT_STATUS_CODES = new Set([400, 404, 405, 422]);
 
 function isCacheObjectRecord(value) {
@@ -283,7 +244,6 @@ async function fetchFormatUpstreams(api, workspace, repo, format, apiKey, signal
     return { format, status: "failed", error: message, upstreams: [] };
   }
 }
->>>>>>> 52ddc2b (feat: export repository as Terraform)
 
 class UpstreamChecker {
   constructor(context) {
@@ -905,13 +865,6 @@ class UpstreamChecker {
   }
 }
 
-<<<<<<< HEAD
-module.exports = {
-  UpstreamChecker,
-  SUPPORTED_UPSTREAM_FORMATS,
-  UPSTREAM_FETCH_BATCH_SIZE,
-  UPSTREAM_CACHE_TTL_MS,
-=======
 async function getAllUpstreamData(context, workspace, repo, options = {}) {
   const checker = new UpstreamChecker(context);
   return checker.getAllUpstreamData(workspace, repo, options);
@@ -928,5 +881,6 @@ module.exports = {
   isBenignUpstreamFormatError,
   SUPPORTED_UPSTREAM_FORMATS,
   UpstreamChecker,
->>>>>>> 52ddc2b (feat: export repository as Terraform)
+  UPSTREAM_FETCH_BATCH_SIZE,
+  UPSTREAM_CACHE_TTL_MS,
 };

views/upstreamDetailProvider.js

@@ -1,24 +1,12 @@
 const vscode = require("vscode");
-<<<<<<< HEAD
-<<<<<<< HEAD
-const {
-  UpstreamChecker,
-  SUPPORTED_UPSTREAM_FORMATS,
-} = require("../util/upstreamChecker");
-=======
-const { SUPPORTED_UPSTREAM_FORMATS, getAllUpstreamData } = require("../util/upstreamChecker");
-=======
 const { getAllUpstreamData } = require("../util/upstreamChecker");
 const { SUPPORTED_UPSTREAM_FORMATS } = require("../util/upstreamFormats");
->>>>>>> 50c8bac (fix: consolidate upstream fetch and fix WebView/Terraform export consumers)
 
 const SUPPORTED_FORMATS = SUPPORTED_UPSTREAM_FORMATS;
->>>>>>> 52ddc2b (feat: export repository as Terraform)
 
 class UpstreamDetailProvider {
   constructor(context) {
     this.context = context;
-    this.upstreamChecker = new UpstreamChecker(context);
     this._panel = null;
     this._abortController = null;
     this._requestId = 0;
@@ -44,19 +32,11 @@ class UpstreamDetailProvider {
       panel.title = `Upstreams: ${repoName}`;
       panel.webview.html = this._getLoadingHtml(workspace, repoSlug, repoName);
 
-<<<<<<< HEAD
-      const fetchState = await this.upstreamChecker.getRepositoryUpstreamState(
-        workspace,
-        repoSlug,
-        { signal: abortController.signal }
-      );
-=======
       const fetchState = await this._fetchGroupedUpstreams(workspace, repoSlug, abortController.signal);
 
       if (!fetchState) {
         return;
       }
->>>>>>> 52ddc2b (feat: export repository as Terraform)
 
       if (!this._canRender(panel, requestId) || abortController.signal.aborted) {
         return;
@@ -98,8 +78,6 @@ class UpstreamDetailProvider {
     return panel;
   }
 
-<<<<<<< HEAD
-=======
   async _fetchGroupedUpstreams(workspace, repoSlug, signal) {
     const upstreamData = await getAllUpstreamData(this.context, workspace, repoSlug, { signal });
     if (upstreamData === null || signal.aborted) {
@@ -138,10 +116,8 @@ class UpstreamDetailProvider {
       successfulFormats: typeof upstreamData.successfulFormats === "number"
         ? upstreamData.successfulFormats
         : 0,
-    };
+      };
   }
-
->>>>>>> 52ddc2b (feat: export repository as Terraform)
   _abortInFlightRequest() {
     if (this._abortController) {
       this._abortController.abort();
@@ -219,13 +195,9 @@ class UpstreamDetailProvider {
     const contentHtml = hasLoadedUpstreams
       ? formatSections.join("\n")
       : this._getEmptyOrErrorState(hasFailures, successfulFormats);
-<<<<<<< HEAD
-    const warningHtml = hasFailures && hasLoadedUpstreams
+    const warningHtml = failedFormats.length > 0 && hasLoadedUpstreams
       ? `<div class="warning-banner">Some upstream data could not be loaded.</div>`
       : "";
-=======
-    const warningHtml = "";
->>>>>>> 52ddc2b (feat: export repository as Terraform)
 
     return `<!DOCTYPE html>
 <html lang="en">