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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.6
+Version: 0.9.8
 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.8}/newrelic_lambda_cli/cli/layers.py

@@ -81,6 +81,11 @@ def register(group):
     help="Permit upgrade of function layers to new version.",
     is_flag=True,
 )
+@click.option(
+    "--apm",
+    help="Enable APM Lambda mode",
+    is_flag=True,
+)
 @click.option(
     "--enable-extension/--disable-extension",
     "-x",
@@ -105,8 +110,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.8}/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"
 
@@ -118,6 +118,7 @@ def _add_new_relic(input, config, nr_license_key):
         success(
             "Already installed on function '%s'. Pass --upgrade (or -u) to allow "
             "upgrade or reinstall to latest layer version."
+            "Additionally pass --apm to enable APM Lambda mode."
             % config["Configuration"]["FunctionArn"]
         )
         return True
@@ -172,7 +173,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(
@@ -221,6 +233,13 @@ def _add_new_relic(input, config, nr_license_key):
             "CORECLR_PROFILER_PATH"
         ] = "/opt/lib/newrelic-dotnet-agent/libNewRelicProfiler.so"
 
+    if input.apm:
+        success(
+            "Enabling APM Lambda mode for function '%s' "
+            % config["Configuration"]["FunctionArn"]
+        )
+        update_kwargs["Environment"]["Variables"]["NEW_RELIC_APM_LAMBDA_MODE"] = "True"
+
     return update_kwargs
 
 
@@ -302,7 +321,25 @@ def install(input, function_arn):
         if input.verbose:
             click.echo(json.dumps(res, indent=2))
 
-        success("Successfully installed layer on %s" % function_arn)
+        old_layers = config["Configuration"].get("Layers", [])
+        old_layer_arn = old_layers[0]["Arn"].rsplit(":", 1)[0] if old_layers else "None"
+        old_layer_version = (
+            old_layers[0]["Arn"].split(":")[-1] if old_layers else "None"
+        )
+        new_layer = update_kwargs["Layers"][0]
+        new_layer_arn = update_kwargs["Layers"][0].rsplit(":", 1)[0]
+        new_layer_version = update_kwargs["Layers"][0].split(":")[-1]
+
+        if old_layer_arn == "None":
+            success(
+                "Successfully installed Layer ARN %s for the function: %s"
+                % (new_layer, function_arn)
+            )
+        else:
+            success(
+                "Successfully upgraded Layer ARN %s from version: %s to version: %s for the function: %s"
+                % (new_layer_arn, old_layer_version, new_layer_version, function_arn)
+            )
         return True
 
 
@@ -401,7 +438,11 @@ def uninstall(input, function_arn):
         if input.verbose:
             click.echo(json.dumps(res, indent=2))
 
-        success("Successfully uninstalled layer on %s" % function_arn)
+        old_layers = config["Configuration"].get("Layers", [])
+        old_layer_arn = old_layers[0]["Arn"] if old_layers else "None"
+        success(
+            "Successfully uninstalled Layer %s from %s" % (old_layer_arn, function_arn)
+        )
         return True
 
 

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.8}/newrelic_lambda_cli/types.py

@@ -104,6 +104,7 @@ LAYER_INSTALL_KEYS = [
     "excludes",
     "layer_arn",
     "upgrade",
+    "apm",
     "enable_extension",
     "enable_extension_function_logs",
     "java_handler_method",

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.8}/newrelic_lambda_cli/utils.py

@@ -131,6 +131,12 @@ def all_lambda_regions():
 
 def is_valid_handler(runtime, handler):
     runtime_handler = RUNTIME_CONFIG.get(runtime, {}).get("Handler", None)
+    if (
+        "nodejs" in runtime
+        and handler
+        == "/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler"
+    ):
+        return True
     if isinstance(runtime_handler, dict):
         for _, valid_handler in runtime_handler.items():
             if handler == valid_handler:

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.8}/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.8
 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.8}/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.8",
     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.8}/tests/test_layers.py

@@ -235,6 +235,34 @@ def test_add_new_relic(aws_credentials, mock_function_config):
     assert update_kwargs["Layers"][0] != get_arn_prefix("us-east-1")
 
 
+@mock_aws
+def test_add_new_relic_apm_lambda_mode(aws_credentials, mock_function_config):
+    session = boto3.Session(region_name="us-east-1")
+
+    config = mock_function_config("python3.12")
+
+    assert config["Configuration"]["Handler"] == "original_handler"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=12345,
+            enable_extension=True,
+            enable_extension_function_logs=True,
+            apm=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert update_kwargs["FunctionName"] == config["Configuration"]["FunctionArn"]
+    assert update_kwargs["Handler"] == "newrelic_lambda_wrapper.handler"
+    assert (
+        update_kwargs["Environment"]["Variables"]["NEW_RELIC_APM_LAMBDA_MODE"] == "True"
+    )
+
+
 @mock_aws
 def test_add_new_relic_dotnet(aws_credentials, mock_function_config):
     session = boto3.Session(region_name="us-east-1")
@@ -333,7 +361,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
@@ -633,7 +661,44 @@ def test_uninstall(aws_credentials, mock_function_config):
             )
 
 
-def test_layers_index():
-    layers = index("ap-southeast-1", "nodejs20.x", "x86_64")
+@mock_aws
+def test_install_success_message_new_layer(aws_credentials, mock_function_config):
+    """Test that the correct success message is shown when installing a layer on a function with no existing layers"""
+
+    mock_session = MagicMock()
+    mock_session.region_name = "us-east-1"
+
+    with patch(
+        "newrelic_lambda_cli.layers._get_license_key_outputs"
+    ) as mock_get_license_key_outputs, patch(
+        "newrelic_lambda_cli.layers.success"
+    ) as mock_success:
+
+        mock_get_license_key_outputs.return_value = ("license_arn", "12345", "policy")
+        mock_client = mock_session.client.return_value
 
-    assert len(layers) == 1
+        config = mock_function_config("python3.12")
+        config["Configuration"]["Layers"] = []
+        mock_client.get_function.return_value = config
+
+        new_layer_arn = (
+            "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicPython39:35"
+        )
+
+        with patch("newrelic_lambda_cli.layers._add_new_relic") as mock_add_new_relic:
+            mock_add_new_relic.return_value = {
+                "FunctionName": "test-function-name",
+                "Layers": [new_layer_arn],
+            }
+
+            function_arn = "test-function-arn"
+            result = install(
+                layer_install(nr_account_id=12345, session=mock_session), function_arn
+            )
+
+            assert result is True
+
+            mock_success.assert_called_once_with(
+                "Successfully installed Layer ARN %s for the function: %s"
+                % (new_layer_arn, function_arn)
+            )

{newrelic_lambda_cli-0.9.6 → newrelic_lambda_cli-0.9.8}/tests/test_utils.py

@@ -21,6 +21,13 @@ def test_error():
 def test_is_valid_handler():
     assert is_valid_handler("fakeruntime", "not.a.valid.handler") is False
     assert is_valid_handler("python3.9", "newrelic_lambda_wrapper.handler") is True
+    assert (
+        is_valid_handler(
+            "nodejs22",
+            "/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler",
+        )
+        is True
+    )
 
 
 def test_parse_arn():