Add Warning For Lambda Extension With Unsupported Runtimes (#160)

* Add Warning For Lambda Extension With Unsupported Runtimes

* Add test for warning code path

* Bump to v0.5.5

* Add function name to warning message

* Fix runtime / function name order

Author: kolanos

README.md

@@ -38,6 +38,7 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 * java11
 * nodejs10.x
 * nodejs12.x
+* nodejs14.x
 * provided
 * provided.al2
 * python2.7

newrelic_lambda_cli/layers.py

@@ -6,7 +6,7 @@
 import requests
 
 from newrelic_lambda_cli import api, subscriptions, utils
-from newrelic_lambda_cli.cliutils import failure, success
+from newrelic_lambda_cli.cliutils import failure, success, warning
 from newrelic_lambda_cli.functions import get_function
 from newrelic_lambda_cli.integrations import _get_license_key_policy_arn
 from newrelic_lambda_cli.types import LayerInstall, LayerUninstall
@@ -125,7 +125,16 @@ def _add_new_relic(input, config, nr_license_key):
     if runtime_handler and handler != runtime_handler:
         update_kwargs["Environment"]["Variables"]["NEW_RELIC_LAMBDA_HANDLER"] = handler
 
-    if input.enable_extension:
+    if input.enable_extension and not utils.supports_lambda_extension(runtime):
+        warning(
+            "The %s runtime for %s does not support Lambda Extensions, reverting to a "
+            "CloudWatch Logs based ingestion. Make sure you run `newrelic-lambda "
+            "integrations install` command to install the New Relic log ingestion "
+            "function and `newrelic-lambda subscriptions install` to create the log "
+            "subscription filter." % (runtime, config["Configuration"]["FunctionName"])
+        )
+
+    if input.enable_extension and utils.supports_lambda_extension(runtime):
         update_kwargs["Environment"]["Variables"][
             "NEW_RELIC_LAMBDA_EXTENSION_ENABLED"
         ] = "true"

newrelic_lambda_cli/utils.py

@@ -7,17 +7,39 @@
 
 NEW_RELIC_ARN_PREFIX_TEMPLATE = "arn:aws:lambda:%s:451483290750"
 RUNTIME_CONFIG = {
-    "dotnetcore3.1": {},
-    "java11": {},
-    "java8.al2": {},
-    "nodejs10.x": {"Handler": "newrelic-lambda-wrapper.handler"},
-    "nodejs12.x": {"Handler": "newrelic-lambda-wrapper.handler"},
-    "provided": {},
-    "provided.al2": {},
-    "python2.7": {"Handler": "newrelic_lambda_wrapper.handler"},
-    "python3.6": {"Handler": "newrelic_lambda_wrapper.handler"},
-    "python3.7": {"Handler": "newrelic_lambda_wrapper.handler"},
-    "python3.8": {"Handler": "newrelic_lambda_wrapper.handler"},
+    "dotnetcore3.1": {"LambdaExtension": True},
+    "java11": {"LambdaExtension": True},
+    "java8.al2": {"LambdaExtension": True},
+    "nodejs10.x": {
+        "Handler": "newrelic-lambda-wrapper.handler",
+        "LambdaExtension": True,
+    },
+    "nodejs12.x": {
+        "Handler": "newrelic-lambda-wrapper.handler",
+        "LambdaExtension": True,
+    },
+    "nodejs14.x": {
+        "Handler": "newrelic-lambda-wrapper.handler",
+        "LambdaExtension": True,
+    },
+    "provided": {"LambdaExtension": True},
+    "provided.al2": {"LambdaExtension": True},
+    "python2.7": {
+        "Handler": "newrelic_lambda_wrapper.handler",
+        "LambdaExtension": False,
+    },
+    "python3.6": {
+        "Handler": "newrelic_lambda_wrapper.handler",
+        "LambdaExtension": False,
+    },
+    "python3.7": {
+        "Handler": "newrelic_lambda_wrapper.handler",
+        "LambdaExtension": True,
+    },
+    "python3.8": {
+        "Handler": "newrelic_lambda_wrapper.handler",
+        "LambdaExtension": True,
+    },
 }
 
 
@@ -115,3 +137,7 @@ def parse_arn(arn):
     else:
         result["resourcetype"], result["resource"] = elements[5].split("/")
     return result
+
+
+def supports_lambda_extension(runtime):
+    return RUNTIME_CONFIG.get(runtime, {}).get("LambdaExtension", False)

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="newrelic-lambda-cli",
-    version="0.5.4",
+    version="0.5.5",
     python_requires=">=3.3",
     description="A CLI to install the New Relic AWS Lambda integration and layers.",
     long_description=README,

tests/test_layers.py

@@ -71,7 +71,7 @@ def test_add_new_relic(aws_credentials, mock_function_config):
         is True
     )
 
-    config = mock_function_config("python3.6")
+    config = mock_function_config("python3.7")
     config["Configuration"]["Layers"] = [{"Arn": get_arn_prefix("us-east-1")}]
     assert (
         _add_new_relic(
@@ -90,7 +90,7 @@ def test_add_new_relic(aws_credentials, mock_function_config):
 
     with patch("newrelic_lambda_cli.layers.index") as mock_index:
         mock_index.return_value = []
-        config = mock_function_config("python3.6")
+        config = mock_function_config("python3.7")
         assert (
             _add_new_relic(
                 layer_install(
@@ -120,7 +120,7 @@ def test_add_new_relic(aws_credentials, mock_function_config):
                 }
             },
         ]
-        config = mock_function_config("python3.6")
+        config = mock_function_config("python3.7")
         with pytest.raises(UsageError):
             _add_new_relic(
                 layer_install(
@@ -134,7 +134,7 @@ def test_add_new_relic(aws_credentials, mock_function_config):
                 nr_license_key=None,
             )
 
-    config = mock_function_config("python3.6")
+    config = mock_function_config("python3.7")
     _add_new_relic(
         layer_install(
             session=session,
@@ -152,7 +152,7 @@ def test_add_new_relic(aws_credentials, mock_function_config):
         in config["Configuration"]["Environment"]["Variables"]
     )
 
-    config = mock_function_config("python3.6")
+    config = mock_function_config("python3.7")
     config["Configuration"]["Environment"]["Variables"]["NEW_RELIC_FOO"] = "bar"
     config["Configuration"]["Layers"] = [{"Arn": get_arn_prefix("us-east-1")}]
     update_kwargs = _add_new_relic(
@@ -170,6 +170,24 @@ def test_add_new_relic(aws_credentials, mock_function_config):
     assert "NEW_RELIC_FOO" in update_kwargs["Environment"]["Variables"]
     assert update_kwargs["Layers"][0] != get_arn_prefix("us-east-1")
 
+    config = mock_function_config("python3.6")
+    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,
+            upgrade=True,
+        ),
+        config,
+        "foobarbaz",
+    )
+    assert (
+        update_kwargs["Environment"]["Variables"]["NEW_RELIC_LAMBDA_EXTENSION_ENABLED"]
+        == "false"
+    )
+
 
 @mock_lambda
 def test_remove_new_relic(aws_credentials, mock_function_config):
@@ -205,7 +223,7 @@ def test_remove_new_relic(aws_credentials, mock_function_config):
         is True
     )
 
-    config = mock_function_config("python3.6")
+    config = mock_function_config("python3.7")
     config["Configuration"]["Handler"] = "what is this?"
     assert (
         _remove_new_relic(
@@ -262,7 +280,7 @@ def test_install(aws_credentials, mock_function_config):
     assert install(layer_install(session=mock_session), "foobarbaz") is True
 
     mock_client.get_function.reset_mock(return_value=True)
-    config = mock_function_config("python3.6")
+    config = mock_function_config("python3.7")
     mock_client.get_function.return_value = config
     assert (
         install(
@@ -304,7 +322,7 @@ def test_uninstall(aws_credentials, mock_function_config):
     assert uninstall(layer_uninstall(session=mock_session), "foobarbaz") is True
 
     mock_client.get_function.reset_mock(return_value=True)
-    config = mock_function_config("python3.6")
+    config = mock_function_config("python3.7")
     mock_client.get_function.return_value = config
     assert uninstall(layer_uninstall(session=mock_session), "foobarbaz") is False
 

tests/test_utils.py

@@ -9,6 +9,7 @@
     parse_arn,
     validate_aws_profile,
     catch_boto_errors,
+    supports_lambda_extension,
 )
 
 
@@ -69,3 +70,24 @@ def _no_region_error():
 
     with pytest.raises(Exit):
         _no_region_error()
+
+
+def test_supports_lambda_extension():
+    assert all(
+        supports_lambda_extension(runtime)
+        for runtime in (
+            "dotnetcore3.1",
+            "java11",
+            "java8.al2",
+            "nodejs10.x",
+            "nodejs12.x",
+            "nodejs14.x",
+            "provided",
+            "provided.al2",
+            "python3.7",
+            "python3.8",
+        )
+    )
+    assert not any(
+        supports_lambda_extension(runtime) for runtime in ("python2.7", "python3.6")
+    )