newrelic-lambda-cli 0.9.12__tar.gz → 0.9.13__tar.gz

{newrelic_lambda_cli-0.9.12 → newrelic_lambda_cli-0.9.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.12
+Version: 0.9.13
 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.12 → newrelic_lambda_cli-0.9.13}/newrelic_lambda_cli/layers.py

@@ -47,7 +47,18 @@ def index(region, runtime, architecture):
     ]
 
 
-def layer_selection(available_layers, runtime, architecture):
+def layer_selection(
+    available_layers, runtime, architecture, upgrade=False, existing_layer_arn=None
+):
+    if upgrade and existing_layer_arn:
+        base_arn = existing_layer_arn.rsplit(":", 1)[0]
+
+        for i, layer in enumerate(available_layers):
+            candidate_arn = layer["LatestMatchingVersion"]["LayerVersionArn"]
+            candidate_base_arn = candidate_arn.rsplit(":", 1)[0]
+            if candidate_base_arn == base_arn:
+                return candidate_arn
+
     if len(available_layers) == 1:
         return available_layers[0]["LatestMatchingVersion"]["LayerVersionArn"]
 
@@ -147,8 +158,16 @@ def _add_new_relic(input, config, nr_license_key):
                 % (config["Configuration"]["FunctionArn"], runtime, architecture)
             )
             return False
-
-        new_relic_layer = layer_selection(available_layers, runtime, architecture)
+        existing_layer_arn = (
+            existing_newrelic_layer[0] if existing_newrelic_layer else None
+        )
+        new_relic_layer = layer_selection(
+            available_layers,
+            runtime,
+            architecture,
+            upgrade=input.upgrade,
+            existing_layer_arn=existing_layer_arn,
+        )
 
     update_kwargs = {
         "FunctionName": config["Configuration"]["FunctionArn"],

{newrelic_lambda_cli-0.9.12 → newrelic_lambda_cli-0.9.13}/newrelic_lambda_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.12
+Version: 0.9.13
 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.12 → newrelic_lambda_cli-0.9.13}/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.12",
+    version="0.9.13",
     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.12 → newrelic_lambda_cli-0.9.13}/tests/test_layers.py

@@ -143,7 +143,11 @@ def test_add_new_relic(aws_credentials, mock_function_config):
             )
 
             layer_selection_mock.assert_called_with(
-                mock_index.return_value, "java11", "x86_64"
+                mock_index.return_value,
+                "java11",
+                "x86_64",
+                upgrade=None,
+                existing_layer_arn=None,
             )
             assert "original_handler" in config["Configuration"]["Handler"]
 
@@ -417,7 +421,6 @@ def test_add_new_relic_nodejs(aws_credentials, mock_function_config):
 
     runtime = "nodejs20.x"
 
-    # --- Scenario 1: Standard Node.js Handler (ESM disabled) ---
     print(f"\nTesting Node.js ({runtime}) Standard Handler...")
     original_std_handler = "original_handler"
     config_std = mock_function_config(runtime)
@@ -430,11 +433,16 @@ def test_add_new_relic_nodejs(aws_credentials, mock_function_config):
         enable_extension_function_logs=True,
     )
 
-    update_kwargs_std = _add_new_relic(
-        install_opts_std,
-        config_std,
-        nr_license_key=nr_license_key,
-    )
+    with patch("sys.stdout.isatty") as mock_isatty, patch(
+        "newrelic_lambda_cli.layers.click.prompt"
+    ) as mock_prompt:
+        mock_isatty.return_value = True
+        mock_prompt.return_value = 0
+        update_kwargs_std = _add_new_relic(
+            install_opts_std,
+            config_std,
+            nr_license_key=nr_license_key,
+        )
 
     assert update_kwargs_std is not False, "Expected update_kwargs, not False"
     assert (
@@ -479,11 +487,16 @@ def test_add_new_relic_nodejs(aws_credentials, mock_function_config):
         esm=True,
     )
 
-    update_kwargs_esm = _add_new_relic(
-        install_opts_esm,
-        config_esm,
-        nr_license_key=nr_license_key,
-    )
+    with patch("sys.stdout.isatty") as mock_isatty, patch(
+        "newrelic_lambda_cli.layers.click.prompt"
+    ) as mock_prompt:
+        mock_isatty.return_value = True
+        mock_prompt.return_value = 0
+        update_kwargs_esm = _add_new_relic(
+            install_opts_esm,
+            config_esm,
+            nr_license_key=nr_license_key,
+        )
 
     assert update_kwargs_esm is not False, "Expected update_kwargs, not False"
     assert (