fix zsh issue

oracle-devrel · Jun 11, 2024 · c0b30e2 · c0b30e2
1 parent 81cfe96
commit c0b30e2
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 108 deletions.
diff --git a/scripts/build.mjs b/scripts/build.mjs
@@ -4,8 +4,6 @@ import { getNamespace, getRegionByName } from "./lib/oci.mjs";
 import { checkPodmanMachineRunning, buildImage } from "./lib/container.mjs";
 import { getVersionGradle } from "./lib/gradle.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 checkPodmanMachineRunning();

diff --git a/scripts/bump.mjs b/scripts/bump.mjs
@@ -8,8 +8,6 @@ import {
 import { bump } from "./lib/npm.mjs";
 import { bumpGradle, getVersionGradle } from "./lib/gradle.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 let properties = await readEnvJson();

diff --git a/scripts/ci.mjs b/scripts/ci.mjs
@@ -4,8 +4,6 @@ import {
 } from "./lib/oci.mjs";
 import { readEnvJson } from "./lib/utils.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 let properties = await readEnvJson();

diff --git a/scripts/containerInstances.mjs b/scripts/containerInstances.mjs
@@ -1,41 +1,15 @@
 #!/usr/bin/env zx
-import {
-    getNamespace,
-    setVariableFromEnvOrPrompt,
-    writeEnvJson,
-    generateRandomString,
-    readEnvJson,
-  } from "./lib/utils.mjs";
-  import {
-    getRegions,
-    getTenancyId,
-  } from "./lib/oci.mjs";
-  import {
-    containerLogin,
-    whichContainerEngine,
-    checkPodmanMachineRunning,
-  } from "./lib/container.mjs";
+import { readEnvJson } from "./lib/utils.mjs";
 
-  const shell = process.env.SHELL | "/bin/zsh";
-  $.shell = shell;
-  $.verbose = true;
-
-  const {
-    containerRegistryURL,
-    containerRegistryUser,
-    containerRegistryToken,
-    namespace,
-    regionKey,
-    adbCompartmentId,
-    adbName,
-    adbPassword,
-  } = await readEnvJson();
+$.verbose = true;
+
+const { containerRegistryURL, containerRegistryUser, containerRegistryToken } =
+  await readEnvJson();
 
 // const region = env.REGION || await setVariableFromEnvOrPrompt("REGION", "Enter the region: ", getRegions);
 
 const createContainerInstances = async (attributes) => {
-
-    const output = await $`oci container-instances container-instance create \
+  const output = await $`oci container-instances container-instance create \
     --display-name "${attributes.displayName}" \
     --availability-domain "${attributes.ad_ocid}" \
     --compartment-id "${attributes.compartment_ocid}" \
@@ -45,62 +19,60 @@ const createContainerInstances = async (attributes) => {
     --containers ${JSON.stringify(containersArgs)} \
     --image-pull-secrets ${JSON.stringify(secretsArgs)} \
     --vnics ${JSON.stringify(vnicsArgs)} --debug`;
-        return output;
-  };
+  return output;
+};
 
-  const attributes = {
-    "displayName": "autoDeploTest",
-    "compartment_ocid": "xxx",
-    "ad_ocid": "xxx",
-    "subnet_ocid": "xxx",
-    "containerRegistryURL": containerRegistryURL,
-    "containerRegistryUser": containerRegistryUser,
-    "region": "xxx",
-    "servercontainerURL": "xxx.ocir.io/xxx/save-the-wildlife/server:0.0.8",
-    "webcontainerURL": "xxx.ocir.io/xxx/save-the-wildlife/web:0.0.8",
-  };
+const attributes = {
+  displayName: "autoDeploTest",
+  compartment_ocid: "xxx",
+  ad_ocid: "xxx",
+  subnet_ocid: "xxx",
+  containerRegistryURL: containerRegistryURL,
+  containerRegistryUser: containerRegistryUser,
+  region: "xxx",
+  servercontainerURL: "xxx.ocir.io/xxx/save-the-wildlife/server:0.0.8",
+  webcontainerURL: "xxx.ocir.io/xxx/save-the-wildlife/web:0.0.8",
+};
 
-  const vnicsArgs = [
-    { displayName: "multiplayer vcn", subnetId: `${attributes.subnet_ocid}` },
-  ];
+const vnicsArgs = [
+  { displayName: "multiplayer vcn", subnetId: `${attributes.subnet_ocid}` },
+];
 
-  const secretsArgs = [
-      {
-          password:btoa(containerRegistryToken),
-          registryEndpoint:containerRegistryURL,
-          secretType:"BASIC",
-          username:btoa(containerRegistryUser)
-        }
-    ];
+const secretsArgs = [
+  {
+    password: btoa(containerRegistryToken),
+    registryEndpoint: containerRegistryURL,
+    secretType: "BASIC",
+    username: btoa(containerRegistryUser),
+  },
+];
 
 const containersArgs = [
-    {
-      displayName: "ServerContainer2",
-      imageUrl: `${attributes.servercontainerURL}`,
-      resourceConfig: {
-        memoryLimitInGBs: 8,
-        vcpusLimit: 1.5,
-      },
+  {
+    displayName: "ServerContainer2",
+    imageUrl: `${attributes.servercontainerURL}`,
+    resourceConfig: {
+      memoryLimitInGBs: 8,
+      vcpusLimit: 1.5,
     },
-    {
-      displayName: "WebContainer2",
-      imageUrl: `${attributes.webcontainerURL}`,
-      resourceConfig: {
-        memoryLimitInGBs: 8,
-        vcpusLimit: 1.5,
-      },
+  },
+  {
+    displayName: "WebContainer2",
+    imageUrl: `${attributes.webcontainerURL}`,
+    resourceConfig: {
+      memoryLimitInGBs: 8,
+      vcpusLimit: 1.5,
     },
-  ];
+  },
+];
+
+const output = await createContainerInstances(attributes);
 
-
-  const output = await createContainerInstances(attributes);
-
-  console.log(output);
-
+console.log(output);
 
-    const display_name = "test";
-    const compartment_ocid = "xx";
-    const ad_ocid = "xxx";
-    // const subnet_ocid = await setVariableFromEnvOrPrompt("SUBNET_OCID", "Enter the OCID of the subnet: ");
+const display_name = "test";
+const compartment_ocid = "xx";
+const ad_ocid = "xxx";
+// const subnet_ocid = await setVariableFromEnvOrPrompt("SUBNET_OCID", "Enter the OCID of the subnet: ");
 
 createContainerInstances();
diff --git a/scripts/deploy.mjs b/scripts/deploy.mjs
@@ -4,8 +4,6 @@ import { exitWithError, getVersion, readEnvJson } from "./lib/utils.mjs";
 import { getVersionGradle } from "./lib/gradle.mjs";
 import { downloadAdbWallet, listAdbDatabases } from "./lib/oci.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 const {

diff --git a/scripts/kustom.mjs b/scripts/kustom.mjs
@@ -4,8 +4,6 @@ import { getNpmVersion } from "./lib/npm.mjs";
 import { getNamespace } from "./lib/oci.mjs";
 import { exitWithError } from "./lib/utils.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 const { _ } = argv;

diff --git a/scripts/release.mjs b/scripts/release.mjs
@@ -8,8 +8,6 @@ import {
   getVersionGradle,
 } from "./lib/gradle.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 let properties = await readEnvJson();

diff --git a/scripts/setenv.mjs b/scripts/setenv.mjs
@@ -23,8 +23,6 @@ import {
 } from "./lib/container.mjs";
 import { getVersionGradle } from "./lib/gradle.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 const ce = await whichContainerEngine();
@@ -141,8 +139,10 @@ async function adbDetails() {
     "Autonomous Database password"
   );
 
-  const adbDisplayName = await listAdbDatabasesbyname(adbName, adbCompartmentId);
-
+  const adbDisplayName = await listAdbDatabasesbyname(
+    adbName,
+    adbCompartmentId
+  );
 
   properties = {
     ...properties,
@@ -152,8 +152,7 @@ async function adbDetails() {
     adbPassword,
     adbDisplayName,
   };
-//   console.log("Properties:", properties);
-
+  //   console.log("Properties:", properties);
 }
 
 async function printRegionNames(regions) {

diff --git a/scripts/start_coherence.mjs b/scripts/start_coherence.mjs
@@ -3,8 +3,6 @@
 import { exitWithError } from "./lib/utils.mjs";
 import { whichContainerEngine } from "./lib/container.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 const containerName = "coherence_multiplayer";

diff --git a/scripts/start_redis.mjs b/scripts/start_redis.mjs
@@ -3,8 +3,6 @@
 import { exitWithError } from "./lib/utils.mjs";
 import { whichContainerEngine } from "./lib/container.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 const containerName = "redis_multiplayer";

diff --git a/scripts/stop_coherence.mjs b/scripts/stop_coherence.mjs
@@ -2,8 +2,6 @@
 import { whichContainerEngine } from "./lib/container.mjs";
 import { exitWithError } from "./lib/utils.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 const containerName = "coherence_multiplayer";

diff --git a/scripts/stop_redis.mjs b/scripts/stop_redis.mjs
@@ -2,8 +2,6 @@
 import { whichContainerEngine } from "./lib/container.mjs";
 import { exitWithError } from "./lib/utils.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 const containerName = "redis_multiplayer";

diff --git a/scripts/tfvars.mjs b/scripts/tfvars.mjs
@@ -9,8 +9,6 @@ import {
 } from "./lib/oci.mjs";
 import { setVariableFromEnvOrPrompt, exitWithError } from "./lib/utils.mjs";
 
-const shell = process.env.SHELL | "/bin/zsh";
-$.shell = shell;
 $.verbose = false;
 
 const { _ } = argv;