From 64a8a977dd4afd27725ff324b1c4e8a2a9d725b9 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Fri, 16 Apr 2021 08:18:06 +0300
Subject: [PATCH] don't bundle extension with eula on default build

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 .azure-pipelines.yml            | 21 +++++++++++++++++++++
 .bundled-extensions.json        |  8 ++++++++
 package.json                    | 11 -----------
 src/common/utils/app-version.ts |  3 ++-
 4 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 .bundled-extensions.json

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index a4108e6762..34c7cb876a 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -2,6 +2,9 @@ variables:
   YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn
 pr: none
 trigger:
+  branches:
+    include:
+    - fix/dont-bundle-extensions-with-eula-by-default
   tags:
     include:
     - "*"
@@ -35,6 +38,12 @@ jobs:
             yarn | "$(Agent.OS)"
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
+      - bash: |
+          echo $(BUNDLED_EXTENSIONS) > .bundled-extensions.json
+          cat .bundled-extensions.json
+        displayName: Override bundled modules
+        env:
+          BUNDLED_EXTENSIONS: $(BUNDLED_EXTENSIONS)
       - script: make node_modules
         displayName: Install dependencies
       - script: make build-npm
@@ -76,6 +85,12 @@ jobs:
             yarn | "$(Agent.OS)"
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
+      - bash: |
+          echo $(BUNDLED_EXTENSIONS) > .bundled-extensions.json
+          cat .bundled-extensions.json
+        displayName: Override bundled modules
+        env:
+          BUNDLED_EXTENSIONS: $(BUNDLED_EXTENSIONS)
       - script: make node_modules
         displayName: Install dependencies
       - script: make build-npm
@@ -119,6 +134,12 @@ jobs:
             yarn | "$(Agent.OS)"
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
+      - bash: |
+          echo $(BUNDLED_EXTENSIONS) > .bundled-extensions.json
+          cat .bundled-extensions.json
+        displayName: Override bundled modules
+        env:
+          BUNDLED_EXTENSIONS: $(BUNDLED_EXTENSIONS)
       - script: make node_modules
         displayName: Install dependencies
       - script: make build-npm
diff --git a/.bundled-extensions.json b/.bundled-extensions.json
new file mode 100644
index 0000000000..f521c01dfd
--- /dev/null
+++ b/.bundled-extensions.json
@@ -0,0 +1,8 @@
+{
+  "extensions": [
+    "pod-menu",
+    "node-menu",
+    "metrics-cluster-feature",
+    "kube-object-event-status"
+  ]
+}
diff --git a/package.json b/package.json
index ba3e965f77..b4a633da26 100644
--- a/package.json
+++ b/package.json
@@ -179,17 +179,6 @@
       "role": "Viewer"
     }
   },
-  "lens": {
-    "extensions": [
-      "telemetry",
-      "pod-menu",
-      "node-menu",
-      "metrics-cluster-feature",
-      "license-menu-item",
-      "kube-object-event-status",
-      "survey"
-    ]
-  },
   "dependencies": {
     "@hapi/call": "^8.0.0",
     "@hapi/subtext": "^7.0.3",
diff --git a/src/common/utils/app-version.ts b/src/common/utils/app-version.ts
index d625f44cd7..5d7c31467c 100644
--- a/src/common/utils/app-version.ts
+++ b/src/common/utils/app-version.ts
@@ -1,5 +1,6 @@
 import requestPromise from "request-promise-native";
 import packageInfo from "../../../package.json";
+import extensionInfo from "../../../.bundled-extensions.json";
 
 export function getAppVersion(): string {
   return packageInfo.version;
@@ -10,7 +11,7 @@ export function getBundledKubectlVersion(): string {
 }
 
 export function getBundledExtensions(): string[] {
-  return packageInfo.lens?.extensions || [];
+  return extensionInfo.extensions || [];
 }
 
 export async function getAppVersionFromProxyServer(proxyPort: number): Promise<string> {