newrelic-lambda-cli 0.9.11__py2.py3-none-any.whl → 0.9.13__py2.py3-none-any.whl

newrelic_lambda_cli/api.py

@@ -362,8 +362,6 @@ def validate_gql_credentials(input):
 
 def retrieve_license_key(gql):
     global __cached_license_key
-    if gql is None and input and getattr(input, "nr_ingest_key", None):
-        return input.nr_ingest_key
 
     if __cached_license_key:
         return __cached_license_key

newrelic_lambda_cli/cli/layers.py

@@ -155,12 +155,6 @@ def register(group):
 @click.pass_context
 def install(ctx, **kwargs):
     """Install New Relic AWS Lambda Layers"""
-
-    if "nr_ingest_key" not in kwargs:
-        kwargs["nr_ingest_key"] = None
-    if "nr_api_key" not in kwargs:
-        kwargs["nr_api_key"] = None
-
     input = LayerInstall(session=None, verbose=ctx.obj["VERBOSE"], **kwargs)
     input = input._replace(
         session=boto3.Session(

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"],
@@ -267,10 +286,10 @@ def _add_new_relic(input, config, nr_license_key):
             update_kwargs["Environment"]["Variables"][
                 "NEW_RELIC_LICENSE_KEY"
             ] = nr_license_key
-        else:
-            update_kwargs["Environment"]["Variables"][
-                "NEW_RELIC_LAMBDA_EXTENSION_ENABLED"
-            ] = "false"
+    else:
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_LAMBDA_EXTENSION_ENABLED"
+        ] = "false"
 
     if "dotnet" in runtime:
         update_kwargs["Environment"]["Variables"]["CORECLR_ENABLE_PROFILING"] = "1"
@@ -300,10 +319,6 @@ def install(input, function_arn):
         raise click.UsageError(
             "Please provide either the --nr-api-key or the --nr-ingest-key flag, but not both."
         )
-    if not input.nr_api_key and not input.nr_ingest_key:
-        raise click.UsageError(
-            "Please provide either the --nr-api-key or the --nr-ingest-key flag."
-        )
     assert isinstance(input, LayerInstall)
 
     client = input.session.client("lambda")
@@ -323,6 +338,7 @@ def install(input, function_arn):
         and nr_account_id
         and nr_account_id != str(input.nr_account_id)
         and not input.nr_api_key
+        and not input.nr_ingest_key
     ):
         raise click.UsageError(
             "A managed secret already exists in this region for New Relic account {0}. "
@@ -335,7 +351,12 @@ def install(input, function_arn):
                 nr_account_id, input.nr_account_id, utils.NR_DOCS_ACT_LINKING_URL
             )
         )
-    if input.enable_extension and not policy_arn and not input.nr_api_key:
+    if (
+        input.enable_extension
+        and not policy_arn
+        and not input.nr_api_key
+        and not input.nr_ingest_key
+    ):
         raise click.UsageError(
             "In order to use `--enable-extension`, you must first run "
             "`newrelic-lambda integrations install` with the "
@@ -347,7 +368,9 @@ def install(input, function_arn):
         )
 
     nr_license_key = None
-    if (
+    if input.nr_ingest_key:
+        nr_license_key = input.nr_ingest_key
+    elif (
         not policy_arn
         or nr_account_id != str(input.nr_account_id)
         and input.nr_api_key
@@ -355,8 +378,6 @@ def install(input, function_arn):
     ):
         gql = api.validate_gql_credentials(input)
         nr_license_key = api.retrieve_license_key(gql)
-    elif input.nr_ingest_key:
-        nr_license_key = input.nr_ingest_key
 
     update_kwargs = _add_new_relic(input, config, nr_license_key)
     if isinstance(update_kwargs, bool):

{newrelic_lambda_cli-0.9.11.dist-info → newrelic_lambda_cli-0.9.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.11
+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.11.dist-info → newrelic_lambda_cli-0.9.13.dist-info}/RECORD

@@ -1,9 +1,9 @@
 newrelic_lambda_cli/__init__.py,sha256=u4cy7hwbrNjK3xtldGQD_51aoNgSqGQ3IzFYsuvaIM4,149
-newrelic_lambda_cli/api.py,sha256=EwsuxIKHCjrB7knksn8Z4DRT-LLDFeUhMiA2R-7uNpI,15240
+newrelic_lambda_cli/api.py,sha256=-lRsWBNO0YWV2yHp-zUbS2vs4AYJCn9yJngOrKAvmuo,15133
 newrelic_lambda_cli/cliutils.py,sha256=XDtvTlgbf2uVg01yCJrfJmmgxbF0nIL9x58ETyvefk8,685
 newrelic_lambda_cli/functions.py,sha256=p57ZUw424BaSUA_Gw8DrYsJOYKROEHEaXgARadqwcP0,2800
 newrelic_lambda_cli/integrations.py,sha256=r0gxfEqVHTGu3xbr4dOCDwm0-Yhoz3KntfeQRWvoWrQ,31266
-newrelic_lambda_cli/layers.py,sha256=kW5baQ71kd8nMu3nrHLzaI3xGsku1N5n2bl_oIP5Xe8,19760
+newrelic_lambda_cli/layers.py,sha256=pyTbSCwJ2A3KP6YZiN-bkzt210UEj3j6dVnIFgijxWo,20339
 newrelic_lambda_cli/otel_ingestions.py,sha256=vi1Mlfc9nRvRWV7STwK7fDXZGozG8ufKohmpHcaWGic,9250
 newrelic_lambda_cli/permissions.py,sha256=H7v5IMpKaJIWC4Dff2YcTis4BKAAFIJr9IHWUj1LnF4,9093
 newrelic_lambda_cli/subscriptions.py,sha256=-BYkltqiDLdmhUB_Ot4w-5vvrKcQC6aHcTBLl1mlUlI,9564
@@ -13,15 +13,15 @@ newrelic_lambda_cli/cli/__init__.py,sha256=FciF2RVqQbpMKqEiN8qjO6qmdLB6Yv8LyyyPY
 newrelic_lambda_cli/cli/decorators.py,sha256=a3agkVfy8omkUSL4aKblwSX95xtxYOGASULDYcJDPHk,1786
 newrelic_lambda_cli/cli/functions.py,sha256=RSh2Cowe1_oQup8q5YRidp03z-BITo2uzvDh4zvLr4I,2601
 newrelic_lambda_cli/cli/integrations.py,sha256=aQAWcCCU2kBmbF8fLKwKB9bzSY0uipvnojajjTkhqEs,10461
-newrelic_lambda_cli/cli/layers.py,sha256=dMc_r42uz26Jf3ePC9r4MYIPb7B6MlS7zALtr5_b6IQ,7734
+newrelic_lambda_cli/cli/layers.py,sha256=LM_vMHcfFAjSCtnaH34P0Jn1ixY07s93EzOBsEgRQK0,7584
 newrelic_lambda_cli/cli/otel_ingestions.py,sha256=4rTm9iYUo2qdMeqxJSrYLCA6ZXHy5bJnjDn9x54pCYc,6096
 newrelic_lambda_cli/cli/subscriptions.py,sha256=bUupv5iv3mUkC8t31nnI3BahoKxDnUJ8Rgq4QHJcFNU,5890
 newrelic_lambda_cli/templates/import-template.yaml,sha256=0r1yeoqpnqtEMggWomALkPG10NiANPWWBqz03rChch8,3771
 newrelic_lambda_cli/templates/license-key-secret.yaml,sha256=ZldQaLXsyF1K2I4X_AsLdH7kRmLkPUYI3talmhqQyHg,1849
 newrelic_lambda_cli/templates/nr-lambda-integration-role.yaml,sha256=s7T73B_k-mAwgzJrD2xn8YGUNgn2E1V7Exifrl81ViU,2874
-newrelic_lambda_cli-0.9.11.dist-info/licenses/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
-newrelic_lambda_cli-0.9.11.dist-info/METADATA,sha256=kDErJ6n2tOKpwmeC7z-Kz-pCFXMlSglw8LibRZdW7_I,28715
-newrelic_lambda_cli-0.9.11.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-newrelic_lambda_cli-0.9.11.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
-newrelic_lambda_cli-0.9.11.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
-newrelic_lambda_cli-0.9.11.dist-info/RECORD,,
+newrelic_lambda_cli-0.9.13.dist-info/licenses/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
+newrelic_lambda_cli-0.9.13.dist-info/METADATA,sha256=FgXCoP0n0coh0xQMDFh8h-QsY4ps6ZpjjfwGHDUsWTs,28715
+newrelic_lambda_cli-0.9.13.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+newrelic_lambda_cli-0.9.13.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
+newrelic_lambda_cli-0.9.13.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
+newrelic_lambda_cli-0.9.13.dist-info/RECORD,,