Merge pull request #2338 from posit-dev/dotnomad/envvar-overlap-err

Show error and disable deployment when environment and secrets have duplicates

extensions/vscode/webviews/homeView/src/components/EvenEasierDeploy.vue

@@ -28,6 +28,29 @@
         />
       </div>
 
+      <template v-if="home.duplicatedEnvironmentVariables.length">
+        <p>
+          <template v-if="home.duplicatedEnvironmentVariables.length === 1">
+            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">
+            Variables were set as both secrets and environment variables. They
+            must only be set as one or the other.
+          </template>
+          <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 }}.

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,