Fix vpn profile import cli (#1295)

* Change working directory in command

* Fix typo in command name in skipCommand array

* Fix casing for script name

Author: joe-fol

packages/cli/commands/importVpn.ts

@@ -7,10 +7,12 @@ export function importVpn(): Command {
 
   command.description("Import VPN profiles into OpenVPN").action(() => {
     const scriptPath = path.resolve(__dirname, "../../../../scripts/import-openvpn-profiles.sh")
+    const scriptDir = path.dirname(scriptPath)
 
     const child = spawn("bash", [scriptPath], {
       stdio: "inherit", // Allow input/output to flow through the terminal
-      shell: true // Use the shell for better compatibility
+      shell: true, // Use the shell for better compatibility
+      cwd: scriptDir
     })
 
     child.on("close", (code) => {

packages/cli/index.ts

@@ -40,7 +40,7 @@ const cli = new Command()
   .addCommand(conductor())
   .addCommand(cloudwatch())
 
-const skipCommands = ["wiki", "fetch-image", "dev-sgs", "cloudwatch", "import-vpn"]
+const skipCommands = ["wiki", "fetch-image", "dev-sgs", "cloudwatch", "import-vpn-profiles"]
 if (!skipCommands.some((c) => process.argv.includes(c))) {
   applyEnvironmentOptionHooks(cli)
 }

scripts/import-openvpn-profiles.sh

@@ -2,18 +2,18 @@
 
 OPENVPN_CLIENT="/Applications/OpenVPN Connect/OpenVPN Connect.app/contents/MacOS/OpenVPN Connect"
 
-WORKSPACE=production aws-vault exec qsolution-production -- ./scripts/get_vpn_config.sh
+WORKSPACE=production aws-vault exec qsolution-production -- ./get-vpn-config.sh
 "$OPENVPN_CLIENT" --remove-profile="B7 Production"
 "$OPENVPN_CLIENT" --import-profile="~/cjse-production-config.ovpn" --name="B7 Production"
 
-WORKSPACE=preprod aws-vault exec qsolution-pre-prod -- ./scripts/get_vpn_config.sh
+WORKSPACE=preprod aws-vault exec qsolution-pre-prod -- ./get-vpn-config.sh
 "$OPENVPN_CLIENT" --remove-profile="B7 Preprod"
 "$OPENVPN_CLIENT" --import-profile="~/cjse-preprod-config.ovpn" --name="B7 Preprod"
 
-WORKSPACE=uat aws-vault exec bichard7-shared-uat -- ./scripts/get_vpn_config.sh
+WORKSPACE=uat aws-vault exec bichard7-shared-uat -- ./get-vpn-config.sh
 "$OPENVPN_CLIENT" --remove-profile="B7 UAT"
 "$OPENVPN_CLIENT" --import-profile="~/cjse-uat-config.ovpn" --name="B7 UAT"
 
-WORKSPACE=e2e-test aws-vault exec bichard7-shared-e2e-test -- ./scripts/get_vpn_config.sh
+WORKSPACE=e2e-test aws-vault exec bichard7-shared-e2e-test -- ./get-vpn-config.sh
 "$OPENVPN_CLIENT" --remove-profile="B7 e2e test"
 "$OPENVPN_CLIENT" --import-profile="~/cjse-e2e-test-config.ovpn" --name="B7 e2e test"