From 4c02cbf801c7cf3aea717f228b547504a34d9369 Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jordan.jensen@rstudio.com>
Date: Tue, 1 Oct 2024 16:11:44 -0700
Subject: [PATCH 1/5] Add environment and duplicates refs to home store

---
 .../webviews/homeView/src/stores/home.ts      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/extensions/vscode/webviews/homeView/src/stores/home.ts b/extensions/vscode/webviews/homeView/src/stores/home.ts
index d20886886..5e50179ae 100644
--- a/extensions/vscode/webviews/homeView/src/stores/home.ts
+++ b/extensions/vscode/webviews/homeView/src/stores/home.ts
@@ -31,6 +31,33 @@ export const useHomeStore = defineStore("home", () => {
 
   const secrets = ref(new Map<string, string | undefined>());
 
+  const environment = computed((): Map<string, string> => {
+    const result = new Map<string, string>();
+    const config = selectedConfiguration.value;
+
+    if (config === undefined || isConfigurationError(config)) {
+      return result;
+    }
+
+    Object.entries(config.configuration.environment || {}).forEach(
+      ([name, value]) => {
+        result.set(name, value);
+      },
+    );
+
+    return result;
+  });
+
+  const duplicatedEnvironmentVariables = computed((): string[] => {
+    const result: string[] = [];
+    secrets.value.forEach((_, name) => {
+      if (environment.value.has(name)) {
+        result.push(name);
+      }
+    });
+    return result;
+  });
+
   const showDisabledOverlay = ref(false);
 
   const selectedContentRecord = ref<ContentRecord | PreContentRecord>();
@@ -375,6 +402,8 @@ export const useHomeStore = defineStore("home", () => {
     credentials,
     sortedCredentials,
     secrets,
+    environment,
+    duplicatedEnvironmentVariables,
     selectedContentRecord,
     selectedConfiguration,
     serverCredential,

From f1e95f2015009015057e62d519b3ea14d87df4f0 Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jordan.jensen@rstudio.com>
Date: Tue, 1 Oct 2024 16:11:59 -0700
Subject: [PATCH 2/5] Disable deployment if env vars have duplicates

---
 .../webviews/homeView/src/components/DeployButton.vue      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extensions/vscode/webviews/homeView/src/components/DeployButton.vue b/extensions/vscode/webviews/homeView/src/components/DeployButton.vue
index cf74b6475..cd4f9fd3b 100644
--- a/extensions/vscode/webviews/homeView/src/components/DeployButton.vue
+++ b/extensions/vscode/webviews/homeView/src/components/DeployButton.vue
@@ -1,7 +1,12 @@
 <template>
   <vscode-button
     :data-automation="`deploy-button`"
-    :disabled="!haveResources || isConfigInError || home.publishInProgress"
+    :disabled="
+      !haveResources ||
+      isConfigInError ||
+      home.publishInProgress ||
+      home.duplicatedEnvironmentVariables.length
+    "
     @click="deploy"
   >
     Deploy Your Project

From f72e8a542817618e9f3910e4f43bb4165efe73b0 Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jordan.jensen@rstudio.com>
Date: Tue, 1 Oct 2024 16:12:17 -0700
Subject: [PATCH 3/5] Show error when env vars / secrets have duplicates

---
 .../src/components/EvenEasierDeploy.vue       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/extensions/vscode/webviews/homeView/src/components/EvenEasierDeploy.vue b/extensions/vscode/webviews/homeView/src/components/EvenEasierDeploy.vue
index c4e8a8089..9e5ca9dd9 100644
--- a/extensions/vscode/webviews/homeView/src/components/EvenEasierDeploy.vue
+++ b/extensions/vscode/webviews/homeView/src/components/EvenEasierDeploy.vue
@@ -28,6 +28,28 @@
         />
       </div>
 
+      <template v-if="home.duplicatedEnvironmentVariables.length">
+        <p>
+          <template v-if="home.duplicatedEnvironmentVariables.length === 1">
+            A duplicate name was
+          </template>
+          <template v-if="home.duplicatedEnvironmentVariables.length > 1">
+            Duplicate names were
+          </template>
+          found in Secrets and Environment.
+          <a
+            class="webview-link"
+            role="button"
+            @click="
+              onEditConfiguration(home.selectedConfiguration!.configurationPath)
+            "
+            >Edit the Configuration</a
+          >.
+        </p>
+        <p>{{ home.duplicatedEnvironmentVariables.join(", ") }}</p>
+        <p></p>
+      </template>
+
       <p v-if="home.config.active.isEntryMissing">
         No Config Entry in Deployment record -
         {{ home.selectedContentRecord?.saveName }}.

From 70040cf512713d007eee6ae4c6db718fb54adadf Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jordan.jensen@rstudio.com>
Date: Wed, 2 Oct 2024 11:14:40 -0700
Subject: [PATCH 4/5] Improve secret envvar overlap error message

---
 .../webviews/homeView/src/components/EvenEasierDeploy.vue  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode/webviews/homeView/src/components/EvenEasierDeploy.vue b/extensions/vscode/webviews/homeView/src/components/EvenEasierDeploy.vue
index 9e5ca9dd9..22014ed52 100644
--- a/extensions/vscode/webviews/homeView/src/components/EvenEasierDeploy.vue
+++ b/extensions/vscode/webviews/homeView/src/components/EvenEasierDeploy.vue
@@ -31,12 +31,13 @@
       <template v-if="home.duplicatedEnvironmentVariables.length">
         <p>
           <template v-if="home.duplicatedEnvironmentVariables.length === 1">
-            A duplicate name was
+            A variable was set as both a secret and environment variable. It
+            must only be set as one or the other.
           </template>
           <template v-if="home.duplicatedEnvironmentVariables.length > 1">
-            Duplicate names were
+            Variables were set as both secrets and environment variables. They
+            must only be set as one or the other.
           </template>
-          found in Secrets and Environment.
           <a
             class="webview-link"
             role="button"

From e58aefe3b78114f15056588c6969891f234f891b Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jordan.jensen@rstudio.com>
Date: Thu, 3 Oct 2024 11:42:36 -0700
Subject: [PATCH 5/5] Do not disable deploy with env vars overlap

---
 .../webviews/homeView/src/components/DeployButton.vue      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/extensions/vscode/webviews/homeView/src/components/DeployButton.vue b/extensions/vscode/webviews/homeView/src/components/DeployButton.vue
index cd4f9fd3b..cf74b6475 100644
--- a/extensions/vscode/webviews/homeView/src/components/DeployButton.vue
+++ b/extensions/vscode/webviews/homeView/src/components/DeployButton.vue
@@ -1,12 +1,7 @@
 <template>
   <vscode-button
     :data-automation="`deploy-button`"
-    :disabled="
-      !haveResources ||
-      isConfigInError ||
-      home.publishInProgress ||
-      home.duplicatedEnvironmentVariables.length
-    "
+    :disabled="!haveResources || isConfigInError || home.publishInProgress"
     @click="deploy"
   >
     Deploy Your Project