newrelic-lambda-cli 0.9.6__tar.gz → 0.9.7__tar.gz

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.6
+Version: 0.9.7
 Summary: A CLI to install the New Relic AWS Lambda integration and layers.
 Home-page: https://github.com/newrelic/newrelic-lambda-cli
 Author: New Relic

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.7}/newrelic_lambda_cli/cli/layers.py

@@ -105,8 +105,7 @@ def register(group):
 )
 @click.option(
     "--esm",
-    default=False,
-    show_default=True,
+    is_flag=True,
     help="Nodejs runtimes only - nodejs implementation runtime handler to /opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler",
 )
 @click.pass_context

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.7}/newrelic_lambda_cli/layers.py

@@ -104,7 +104,7 @@ def _add_new_relic(input, config, nr_license_key):
         prefix = (
             "/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index"
             if input.esm
-            else "newrelic_lambda_wrapper"
+            else "newrelic-lambda-wrapper"
         )
         runtime_handler = prefix + ".handler"
 
@@ -172,7 +172,18 @@ def _add_new_relic(input, config, nr_license_key):
 
     # Update the NEW_RELIC_LAMBDA_HANDLER envvars only when it's a new install.
     if runtime_handler and handler != runtime_handler:
-        update_kwargs["Environment"]["Variables"]["NEW_RELIC_LAMBDA_HANDLER"] = handler
+        if "nodejs" in runtime:
+            if handler not in [
+                "newrelic-lambda-wrapper.handler",
+                "/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler",
+            ]:
+                update_kwargs["Environment"]["Variables"][
+                    "NEW_RELIC_LAMBDA_HANDLER"
+                ] = handler
+        else:
+            update_kwargs["Environment"]["Variables"][
+                "NEW_RELIC_LAMBDA_HANDLER"
+            ] = handler
 
     if input.enable_extension and not utils.supports_lambda_extension(runtime):
         warning(

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.7}/newrelic_lambda_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.6
+Version: 0.9.7
 Summary: A CLI to install the New Relic AWS Lambda integration and layers.
 Home-page: https://github.com/newrelic/newrelic-lambda-cli
 Author: New Relic

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.7}/setup.py

@@ -6,7 +6,7 @@ README = open(os.path.join(os.path.dirname(__file__), "README.md"), "r").read()
 
 setup(
     name="newrelic-lambda-cli",
-    version="0.9.6",
+    version="0.9.7",
     python_requires=">=3.3",
     description="A CLI to install the New Relic AWS Lambda integration and layers.",
     long_description=README,

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.7}/tests/test_layers.py

@@ -333,7 +333,7 @@ def test_add_new_relic_nodejs(aws_credentials, mock_function_config):
     assert (
         update_kwargs_std["FunctionName"] == config_std["Configuration"]["FunctionArn"]
     )
-    assert update_kwargs_std["Handler"] == "newrelic_lambda_wrapper.handler"
+    assert update_kwargs_std["Handler"] == "newrelic-lambda-wrapper.handler"
     assert (
         update_kwargs_std["Environment"]["Variables"]["NEW_RELIC_LAMBDA_HANDLER"]
         == original_std_handler