From 9e363b8d5f9d971108bce3cd6412042ac670794f Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Tue, 13 Jul 2021 11:40:52 -0400
Subject: [PATCH] Remove win-ca/pem before publish & catch inject error (#3362)

---
 .azure-pipelines.yml    | 38 +++++++++++++++++++-------------------
 Makefile                |  2 ++
 src/common/system-ca.ts |  6 +++++-
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index afec611177..223f85518d 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -24,12 +24,12 @@ jobs:
           Write-Output ("##vso[task.setvariable variable=CI_BUILD_TAG;]$CI_BUILD_TAG")
         condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
         displayName: Set the tag name as an environment variable
-      
+
       - task: NodeTool@0
         inputs:
           versionSpec: $(node_version)
         displayName: Install Node.js
-      
+
       - task: Cache@2
         inputs:
           key: 'yarn | "$(Agent.OS)"" | yarn.lock'
@@ -37,7 +37,7 @@ jobs:
             yarn | "$(Agent.OS)"
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
-      
+
       - bash: |
           set -e
           git clone "https://${GH_TOKEN}@github.com/lensapp/lens-ide.git" .lens-ide-overlay
@@ -47,13 +47,13 @@ jobs:
         env:
           GH_TOKEN: $(LENS_IDE_GH_TOKEN)
         displayName: Customize config
-      
+
       - script: make node_modules
         displayName: Install dependencies
-      
+
       - script: make build-npm
         displayName: Generate npm package
-      
+
       - script: make build
         condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
         env:
@@ -75,12 +75,12 @@ jobs:
       - script: CI_BUILD_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=CI_BUILD_TAG]$CI_BUILD_TAG"
         condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
         displayName: Set the tag name as an environment variable
-      
+
       - task: NodeTool@0
         inputs:
           versionSpec: $(node_version)
         displayName: Install Node.js
-      
+
       - task: Cache@2
         inputs:
           key: 'yarn | "$(Agent.OS)" | yarn.lock'
@@ -88,7 +88,7 @@ jobs:
             yarn | "$(Agent.OS)"
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
-      
+
       - bash: |
           set -e
           git clone "https://${GH_TOKEN}@github.com/lensapp/lens-ide.git" .lens-ide-overlay
@@ -98,13 +98,13 @@ jobs:
         env:
           GH_TOKEN: $(LENS_IDE_GH_TOKEN)
         displayName: Customize config
-      
+
       - script: make node_modules
         displayName: Install dependencies
-      
+
       - script: make build-npm
         displayName: Generate npm package
-      
+
       - script: make build
         condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
         env:
@@ -128,12 +128,12 @@ jobs:
       - script: CI_BUILD_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=CI_BUILD_TAG]$CI_BUILD_TAG"
         condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
         displayName: Set the tag name as an environment variable
-      
+
       - task: NodeTool@0
         inputs:
           versionSpec: $(node_version)
         displayName: Install Node.js
-      
+
       - task: Cache@2
         inputs:
           key: 'yarn | "$(Agent.OS)" | yarn.lock'
@@ -141,7 +141,7 @@ jobs:
             yarn | "$(Agent.OS)"
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
-      
+
       - bash: |
           set -e
           git clone "https://${GH_TOKEN}@github.com/lensapp/lens-ide.git" .lens-ide-overlay
@@ -151,13 +151,13 @@ jobs:
         env:
           GH_TOKEN: $(LENS_IDE_GH_TOKEN)
         displayName: Customize config
-      
+
       - script: make node_modules
         displayName: Install dependencies
-      
+
       - script: make build-npm
         displayName: Generate npm package
-      
+
       - bash: |
           sudo chown root:root /
           sudo apt-get update && sudo apt-get install -y snapd
@@ -168,7 +168,7 @@ jobs:
         env:
           SNAP_LOGIN: $(SNAP_LOGIN)
         displayName: Setup snapcraft
-      
+
       - script: make build
         condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
         env:
diff --git a/Makefile b/Makefile
index 8b2558e7f7..1a8baf0d37 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,8 @@ build: node_modules binaries/client
 	$(MAKE) build-extensions -B
 	yarn run compile
 ifeq "$(DETECTED_OS)" "Windows"
+# https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish
+	rm -rf node_modules/win-ca/pem
 	yarn run electron-builder --publish onTag --x64 --ia32
 else
 	yarn run electron-builder --publish onTag
diff --git a/src/common/system-ca.ts b/src/common/system-ca.ts
index a12e55cd02..7ed0120569 100644
--- a/src/common/system-ca.ts
+++ b/src/common/system-ca.ts
@@ -33,5 +33,9 @@ if (isMac) {
 }
 
 if (isWindows) {
-  winca.inject("+"); // see: https://github.com/ukoloff/win-ca#caveats
+  try {
+    winca.inject("+"); // see: https://github.com/ukoloff/win-ca#caveats
+  } catch (error) {
+    logger.error(`[CA]: failed to force load: ${error}`);
+  }
 }