fix: raw config to be parsed, improve local up and service new [fixes D…

…XJ-564] (#649) * fix: raw config to be parsed, improve local up and service new [fixes DXJ-564] * Apply automatic changes * fix? * improve * remove restart * remove wrapper * Apply automatic changes * fix * rename * use homedir --------- Co-authored-by: shamsartem <[email protected]>
fluencelabs · Dec 13, 2023 · ca308df · ca308df
1 parent 97a0b9a
commit ca308df
Show file tree

Hide file tree

Showing 10 changed files with 151 additions and 162 deletions.
diff --git a/docs/commands/README.md b/docs/commands/README.md
@@ -25,7 +25,6 @@
 * [`fluence local init`](#fluence-local-init)
 * [`fluence local logs`](#fluence-local-logs)
 * [`fluence local ps`](#fluence-local-ps)
-* [`fluence local restart`](#fluence-local-restart)
 * [`fluence local up`](#fluence-local-up)
 * [`fluence module add [PATH | URL]`](#fluence-module-add-path--url)
 * [`fluence module new [NAME]`](#fluence-module-new-name)
@@ -720,26 +719,6 @@ EXAMPLES
 
 _See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/v0.13.0/src/commands/local/ps.ts)_
 
-## `fluence local restart`
-
-Restart docker-compose.yaml using docker compose
-
-```
-USAGE
-  $ fluence local restart [--no-input]
-
-FLAGS
-  --no-input  Don't interactively ask for any input from the user
-
-DESCRIPTION
-  Restart docker-compose.yaml using docker compose
-
-EXAMPLES
-  $ fluence local restart
-```
-
-_See code: [src/commands/local/restart.ts](https://github.com/fluencelabs/cli/blob/v0.13.0/src/commands/local/restart.ts)_
-
 ## `fluence local up`
 
 Run docker-compose.yaml using docker compose

diff --git a/docs/configs/provider.md b/docs/configs/provider.md
@@ -43,7 +43,7 @@ Configuration to pass to the nox compute peer. Config.toml files are generated f
 |------------------|---------------------------|----------|-------------------------------------------------------------------------------------------------------------------|
 | `aquavmPoolSize` | number                    | No       | Number of aquavm instances to run. Default: 2                                                                     |
 | `httpPort`       | number                    | No       | Both host and container HTTP port to use. Default: for each nox a unique port is assigned starting from 18080     |
-| `rawConfig`      | string                    | No       | Raw TOML config string to append to the generated config. Default: empty string                                   |
+| `rawConfig`      | string                    | No       | Raw TOML config string to parse and merge with the rest of the config. Has the highest priority                   |
 | `systemServices` | [object](#systemservices) | No       | System services to run by default. aquaIpfs and decider are enabled by default                                    |
 | `tcpPort`        | number                    | No       | Both host and container TCP port to use. Default: for each nox a unique port is assigned starting from 7771       |
 | `websocketPort`  | number                    | No       | Both host and container WebSocket port to use. Default: for each nox a unique port is assigned starting from 9991 |
@@ -97,7 +97,7 @@ Configuration to pass to the nox compute peer. Config.toml files are generated f
 |------------------|---------------------------|----------|-------------------------------------------------------------------------------------------------------------------|
 | `aquavmPoolSize` | number                    | No       | Number of aquavm instances to run. Default: 2                                                                     |
 | `httpPort`       | number                    | No       | Both host and container HTTP port to use. Default: for each nox a unique port is assigned starting from 18080     |
-| `rawConfig`      | string                    | No       | Raw TOML config string to append to the generated config. Default: empty string                                   |
+| `rawConfig`      | string                    | No       | Raw TOML config string to parse and merge with the rest of the config. Has the highest priority                   |
 | `systemServices` | [object](#systemservices) | No       | System services to run by default. aquaIpfs and decider are enabled by default                                    |
 | `tcpPort`        | number                    | No       | Both host and container TCP port to use. Default: for each nox a unique port is assigned starting from 7771       |
 | `websocketPort`  | number                    | No       | Both host and container WebSocket port to use. Default: for each nox a unique port is assigned starting from 9991 |

diff --git a/src/commands/local/init.ts b/src/commands/local/init.ts
@@ -62,7 +62,6 @@ export default class Init extends BaseCommand<typeof Init> {
     }
 
     const dockerCompose = await initNewReadonlyDockerComposeConfig({
-      env: "local",
       noxes: flags.noxes,
     });
 

diff --git a/src/commands/local/restart.ts b/src/commands/local/restart.ts
diff --git a/src/commands/local/up.ts b/src/commands/local/up.ts
@@ -49,17 +49,33 @@ export default class Up extends BaseCommand<typeof Up> {
     const { flags } = await initCli(this, await this.parse(Up));
 
     const dockerComposeConfig = await initNewReadonlyDockerComposeConfig({
-      env: "local",
       noxes: flags.noxes,
     });
 
-    await dockerCompose({
-      args: ["up", "-d"],
-      printOutput: true,
-      options: {
-        cwd: dockerComposeConfig.$getDirPath(),
-      },
-    });
+    try {
+      const res = await dockerCompose({
+        args: ["restart"],
+        printOutput: true,
+        options: {
+          cwd: dockerComposeConfig.$getDirPath(),
+        },
+      });
+
+      if (res.trim() === "") {
+        throw new Error("docker-compose restart failed");
+      }
+    } catch {
+      await dockerCompose({
+        args: ["up", "-d"],
+        flags: {
+          "quiet-pull": true,
+        },
+        printOutput: true,
+        options: {
+          cwd: dockerComposeConfig.$getDirPath(),
+        },
+      });
+    }
 
     const env = "local";
     const privKey = flags["priv-key"] ?? LOCAL_NET_DEFAULT_WALLET_KEY;

diff --git a/src/environment.d.ts b/src/environment.d.ts
@@ -30,6 +30,7 @@ declare global {
       [DEBUG_COUNTLY]: "true" | "false";
       [FLUENCE_USER_DIR]?: string;
       [CI]: "true" | "false";
+      PATH: string;
     }
   }
 }
diff --git a/src/lib/addService.ts b/src/lib/addService.ts
@@ -105,13 +105,6 @@ export const addService = async ({
     );
   }
 
-  await resolveSingleServiceModuleConfigsAndBuild(
-    serviceConfig,
-    fluenceConfig,
-    marineCli,
-    marineBuildArgs,
-  );
-
   const facadeModuleConfig = await initReadonlyModuleConfig(
     serviceConfig.modules[FACADE_MODULE_NAME].get,
     serviceConfig.$getDirPath(),
@@ -122,14 +115,6 @@ export const addService = async ({
     "Unreachable. Facade module is always present in service config",
   );
 
-  await updateAquaServiceInterfaceFile(
-    {
-      [serviceName]: getModuleWasmPath(facadeModuleConfig),
-    },
-    fluenceConfig.services,
-    marineCli,
-  );
-
   await fluenceConfig.$commit();
 
   if (interactive) {
@@ -141,41 +126,52 @@ export const addService = async ({
   }
 
   if (
-    !(
-      isInteractive &&
-      fluenceConfig.deals !== undefined &&
-      DEFAULT_DEAL_NAME in fluenceConfig.deals &&
-      !(fluenceConfig.deals[DEFAULT_DEAL_NAME].services ?? []).includes(
-        serviceName,
-      ) &&
-      (interactive
-        ? await confirm({
-            message: `Do you want to add service ${color.yellow(
-              serviceName,
-            )} to a default deal ${color.yellow(DEFAULT_DEAL_NAME)}`,
-          })
-        : true)
-    )
+    isInteractive &&
+    fluenceConfig.deals !== undefined &&
+    DEFAULT_DEAL_NAME in fluenceConfig.deals &&
+    !(fluenceConfig.deals[DEFAULT_DEAL_NAME].services ?? []).includes(
+      serviceName,
+    ) &&
+    (interactive
+      ? await confirm({
+          message: `Do you want to add service ${color.yellow(
+            serviceName,
+          )} to a default deal ${color.yellow(DEFAULT_DEAL_NAME)}`,
+        })
+      : true)
   ) {
-    return serviceName;
-  }
+    const defaultDeal = fluenceConfig.deals[DEFAULT_DEAL_NAME];
 
-  const defaultDeal = fluenceConfig.deals[DEFAULT_DEAL_NAME];
+    fluenceConfig.deals[DEFAULT_DEAL_NAME] = {
+      ...defaultDeal,
+      services: [...(defaultDeal.services ?? []), serviceName],
+    };
 
-  fluenceConfig.deals[DEFAULT_DEAL_NAME] = {
-    ...defaultDeal,
-    services: [...(defaultDeal.services ?? []), serviceName],
-  };
+    await fluenceConfig.$commit();
 
-  await fluenceConfig.$commit();
-
-  if (interactive) {
-    commandObj.log(
-      `Added ${color.yellow(serviceName)} to ${color.yellow(
-        DEFAULT_DEAL_NAME,
-      )}`,
-    );
+    if (interactive) {
+      commandObj.log(
+        `Added ${color.yellow(serviceName)} to ${color.yellow(
+          DEFAULT_DEAL_NAME,
+        )}`,
+      );
+    }
   }
 
+  await resolveSingleServiceModuleConfigsAndBuild(
+    serviceConfig,
+    fluenceConfig,
+    marineCli,
+    marineBuildArgs,
+  );
+
+  await updateAquaServiceInterfaceFile(
+    {
+      [serviceName]: getModuleWasmPath(facadeModuleConfig),
+    },
+    fluenceConfig.services,
+    marineCli,
+  );
+
   return serviceName;
 };
diff --git a/src/lib/configs/project/dockerCompose.ts b/src/lib/configs/project/dockerCompose.ts
@@ -308,9 +308,13 @@ export async function initNewDockerComposeConfig(args: ProviderConfigArgs) {
 }
 
 export async function initNewReadonlyDockerComposeConfig(
-  args: ProviderConfigArgs,
+  args: Omit<ProviderConfigArgs, "env">,
 ) {
-  const providerConfig = await initNewReadonlyProviderConfig(args);
+  const providerConfig = await initNewReadonlyProviderConfig({
+    ...args,
+    env: "local",
+  });
+
   await ensureConfigToml(providerConfig);
   return getReadonlyConfigInitFunction(
     initConfigOptions,