fix(cli): cfn submit updated to use Windows CLI when run on Windows (#77)

* Use powershell if /bin/bash doesn't exist

* Fixed windows path typo

* fix windows path for SAM command

* use command.exe instead of powershell

* explicit change directory to module

* Use windows environment variable

* Switched to os.path.join and python subprocess shell command

* Add windows test for codegen. fix tests on windows

* fix zipfile namelist on windows

* Marked the windows only part of codegen._build to not be included in coverage report, since it will never run on non windows

Author: mmaeng

python/rpdk/typescript/codegen.py

@@ -1,4 +1,5 @@
 import logging
+import os
 import shutil
 import sys
 from subprocess import PIPE, CalledProcessError, run as subprocess_run  # nosec
@@ -235,7 +236,7 @@ def _remove_build_artifacts(deps_path):
     def _make_build_command(base_path, build_command=None):
         command = (
             "npm install --optional "
-            + f"&& sam build --debug --build-dir {base_path}/build"
+            + f"&& sam build --debug --build-dir {os.path.join(base_path, 'build')}"
         )
         if build_command is not None:
             command = build_command
@@ -255,13 +256,30 @@ def _build(self, base_path):
 
         LOG.warning("Starting build.")
         try:
-            completed_proc = subprocess_run(  # nosec
-                ["/bin/bash", "-c", command],
-                stdout=PIPE,
-                stderr=PIPE,
-                cwd=base_path,
-                check=True,
-            )
+            # On windows get the default CLI in environment variable comspec
+            # run 1 command and exit. Building shell command manually, subprocess.run
+            # with shell=True behavior is inconsistent on windows
+            if sys.platform == "win32":  # pragma: no cover
+                shell = os.environ.get("comspec")
+                shell_arg = "/C"
+                completed_proc = subprocess_run(  # nosec
+                    [shell, shell_arg, command],
+                    stdout=PIPE,
+                    stderr=PIPE,
+                    cwd=base_path,
+                    check=True,
+                )
+            else:  # pragma: no cover
+                # On all other OS use default shell in subprocess to run build command
+                completed_proc = subprocess_run(  # nosec
+                    [command],
+                    stdout=PIPE,
+                    stderr=PIPE,
+                    cwd=base_path,
+                    check=True,
+                    shell=True,
+                )
+
         except (FileNotFoundError, CalledProcessError) as e:
             raise DownstreamError("local build failed") from e
 

tests/plugin/codegen_test.py

@@ -101,15 +101,15 @@ def test_initialize(project: Project):
         ".rpdk-config",
         "foo-bar-baz.json",
         "example_inputs",
-        "example_inputs/inputs_1_create.json",
-        "example_inputs/inputs_1_invalid.json",
-        "example_inputs/inputs_1_update.json",
+        f"{os.path.join('example_inputs', 'inputs_1_create.json')}",
+        f"{os.path.join('example_inputs', 'inputs_1_invalid.json')}",
+        f"{os.path.join('example_inputs', 'inputs_1_update.json')}",
         "package.json",
         "README.md",
         "sam-tests",
-        "sam-tests/create.json",
+        f"{os.path.join('sam-tests', 'create.json')}",
         "src",
-        "src/handlers.ts",
+        f"{os.path.join('src', 'handlers.ts')}",
         "template.yml",
         "tsconfig.json",
     }
@@ -135,7 +135,7 @@ def test_generate(project: Project):
     after = get_files_in_project(project)
     files = after.keys() - before.keys() - {"resource-role.yaml"}
 
-    assert files == {"src/models.ts"}
+    assert files == {f"{os.path.join('src', 'models.ts')}"}
 
 
 def test_package_local(project: Project):
@@ -190,10 +190,20 @@ def test__build_docker(plugin: TypescriptLanguagePlugin):
         plugin._build(sentinel.base_path)
 
     mock_cmd.assert_called_once_with(sentinel.base_path, None)
-    mock_subprocess_run.assert_called_once_with(
-        ["/bin/bash", "-c", " --use-container TypeFunction"],
-        check=True,
-        cwd=sentinel.base_path,
-        stderr=-1,
-        stdout=-1,
-    )
+    if sys.platform == "win32":
+        mock_subprocess_run.assert_called_once_with(
+            [os.environ.get("comspec"), "/C", " --use-container TypeFunction"],
+            check=True,
+            cwd=sentinel.base_path,
+            stderr=-1,
+            stdout=-1,
+        )
+    else:
+        mock_subprocess_run.assert_called_once_with(
+            [" --use-container TypeFunction"],
+            check=True,
+            cwd=sentinel.base_path,
+            stderr=-1,
+            stdout=-1,
+            shell=True,
+        )