fix(desktop): reconfigure provider options when changing suboptions

loft-sh · Jun 12, 2024 · 4d68996 · 4d68996
1 parent bb2f25d
commit 4d68996
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/desktop/src/client/constants.ts b/desktop/src/client/constants.ts
@@ -48,6 +48,7 @@ export const DEVPOD_FLAG_USE = "--use"
 export const DEVPOD_FLAG_NAME = "--name"
 export const DEVPOD_FLAG_SINGLE_MACHINE = "--single-machine"
 export const DEVPOD_FLAG_DRY = "--dry"
+export const DEVPOD_FLAG_RECONFIGURE = "--reconfigure"
 export const DEVPOD_FLAG_SKIP_REQUIRED = "--skip-required"
 export const DEVPOD_FLAG_TIMEOUT = "--timeout"
 export const DEVPOD_FLAG_DEVCONTAINER_PATH = "--devcontainer-path"

diff --git a/desktop/src/client/providers/client.ts b/desktop/src/client/providers/client.ts
@@ -67,9 +67,9 @@ export class ProvidersClient implements TDebuggable {
 
   public async setOptionsDry(
     id: TProviderID,
-    { options }: TConfigureProviderConfig
+    { options, reconfigure }: TConfigureProviderConfig
   ): Promise<Result<TProviderOptions | undefined>> {
-    return ProviderCommands.SetProviderOptions(id, options, false, true)
+    return ProviderCommands.SetProviderOptions(id, options, false, true, reconfigure)
   }
 
   public async configure(

diff --git a/desktop/src/client/providers/providerCommands.ts b/desktop/src/client/providers/providerCommands.ts
@@ -23,6 +23,7 @@ import {
   DEVPOD_FLAG_JSON_LOG_OUTPUT,
   DEVPOD_FLAG_JSON_OUTPUT,
   DEVPOD_FLAG_NAME,
+  DEVPOD_FLAG_RECONFIGURE,
   DEVPOD_FLAG_SINGLE_MACHINE,
   DEVPOD_FLAG_USE,
 } from "../constants"
@@ -153,11 +154,13 @@ export class ProviderCommands {
     id: TProviderID,
     rawOptions: Record<string, unknown>,
     reuseMachine: boolean,
-    dry?: boolean
+    dry?: boolean,
+    reconfigure?: boolean
   ) {
     const optionsFlag = serializeRawOptions(rawOptions)
     const maybeResuseMachineFlag = reuseMachine ? [DEVPOD_FLAG_SINGLE_MACHINE] : []
     const maybeDry = dry ? [DEVPOD_FLAG_DRY] : []
+    const maybeReconfigure = reconfigure ? [DEVPOD_FLAG_RECONFIGURE] : []
 
     const result = await ProviderCommands.newCommand([
       DEVPOD_COMMAND_PROVIDER,
@@ -166,6 +169,7 @@ export class ProviderCommands {
       ...optionsFlag,
       ...maybeResuseMachineFlag,
       ...maybeDry,
+      ...maybeReconfigure,
       DEVPOD_FLAG_JSON_LOG_OUTPUT,
     ]).run()
     if (result.err) {

diff --git a/desktop/src/types.ts b/desktop/src/types.ts
@@ -115,6 +115,7 @@ export type TConfigureProviderConfig = Readonly<{
   options: Record<string, string>
   useAsDefaultProvider?: boolean
   reuseMachine?: boolean
+  reconfigure?: boolean
 }>
 export type TProviderManager = Readonly<{
   remove: TRunnable<TWithProviderID> &

diff --git a/desktop/src/views/Providers/AddProvider/ConfigureProviderOptionsForm.tsx b/desktop/src/views/Providers/AddProvider/ConfigureProviderOptionsForm.tsx
@@ -393,24 +393,24 @@ function ConfigureOptionsForm({
 }
 
 function stripOptionChildren(
-  configuredOptions: { [key: string]: string },
-  optionsProp: TProviderOptions | undefined,
+  configuredOptions: Record<string, string>,
+  allOptions: TProviderOptions | undefined,
   id: string
 ) {
   // filter children
-  optionsProp?.[id]?.children?.forEach((child) => {
+  allOptions?.[id]?.children?.forEach((child) => {
     delete configuredOptions[child]
-    stripOptionChildren(configuredOptions, optionsProp, child)
+    stripOptionChildren(configuredOptions, allOptions, child)
   })
 }
 
 function filterOptions(
   configuredOptions: TFieldValues,
-  optionsProp: TProviderOptions | undefined
+  allOptions: TProviderOptions | undefined
 ): Record<string, string> {
   const newOptions: Record<string, string> = {}
   Object.keys(configuredOptions).forEach((option) => {
-    if (exists(configuredOptions[option]) && exists(optionsProp?.[option])) {
+    if (exists(configuredOptions[option]) && exists(allOptions?.[option])) {
       newOptions[option] = configuredOptions[option] + ""
     }
   })
@@ -429,7 +429,9 @@ function useOptions(
   const { data: queryOptions, error: queryError } = useQuery<TProviderOptions | undefined, Error>({
     queryKey: QueryKeys.providerSetOptions(providerID),
     queryFn: async () => {
-      return (await client.providers.setOptionsDry(providerID, { options: {} })).unwrap()
+      return (
+        await client.providers.setOptionsDry(providerID, { options: {}, reconfigure: false })
+      ).unwrap()
     },
   })
 
@@ -450,7 +452,10 @@ function useOptions(
       }
 
       return (
-        await client.providers.setOptionsDry(providerID, { options: filteredOptions })
+        await client.providers.setOptionsDry(providerID, {
+          options: filteredOptions,
+          reconfigure: true,
+        })
       ).unwrap()
     },
     onSuccess(data) {

diff --git a/pkg/options/resolve.go b/pkg/options/resolve.go
@@ -177,7 +177,7 @@ func ResolveOptions(
 	// loop and resolve options, as soon as we encounter a new dynamic option it will get filled
 	resolvedOptionValues, dynamicOptionDefinitions, err := resolve.Resolve(
 		ctx,
-		devConfig.DynamicProviderOptionDefinitions(provider.Name),
+		nil,
 		provider.Options,
 		devConfig.ProviderOptions(provider.Name),
 	)