Merge pull request #59 from Dstack-TEE/fix-app-id-on-reset

teepod: Fix wrong app-id during reset secret
Dstack-TEE · Dec 16, 2024 · ef6ee07 · ef6ee07
2 parents ec4eeef + cfd9bf1
commit ef6ee07
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/teepod/src/console.html b/teepod/src/console.html
@@ -773,7 +773,13 @@ <h3>Update VM Config</h3>
                             Remove
                         </button>
                     </div>
-                    <button type="button" class="action-btn" @click="addEncryptedEnv">Add</button>
+                    <div style="display: flex; gap: 10px;">
+                        <button type="button" class="action-btn" @click="addEncryptedEnv">Add</button>
+                        <input type="file" ref="envFile" @change="loadEnvFile" style="display: none"
+                            accept=".env,.txt">
+                        <button type="button" class="action-btn" @click="$refs.envFile.click()">Load from
+                            file</button>
+                    </div>
                 </div>
 
                 <div class="vm-actions">
@@ -1000,9 +1006,11 @@ <h3>Derive VM</h3>
                     return Array.from(result).map(b => b.toString(16).padStart(2, '0')).join('');
                 };
 
-                const makeEncryptedEnv = async () => {
+                const makeEncryptedEnv = async (appId) => {
                     if ((!vmForm.value.features.kms) || vmForm.value.encrypted_envs.length === 0) return '';
-                    const appId = await appIdOf(vmForm.value.compose_file);
+                    if (!appId) {
+                        appId = await appIdOf(vmForm.value.compose_file);
+                    }
                     const response = await rpcCall('GetAppEnvEncryptPubKey', {
                         app_id: appId
                     });
@@ -1154,7 +1162,7 @@ <h3>Derive VM</h3>
                         }
 
                         if (upgradeDialog.value.resetSecrets) {
-                            body.encrypted_env = await makeEncryptedEnv();
+                            body.encrypted_env = await makeEncryptedEnv(upgradeDialog.value.vm.app_id);
                         }
 
                         const response = await rpcCall('UpgradeApp', body);