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

newrelic_lambda_cli/api.py

@@ -362,6 +362,9 @@ 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
     assert isinstance(gql, NewRelicGQL)

newrelic_lambda_cli/cli/layers.py

@@ -42,6 +42,13 @@ def register(group):
     metavar="<key>",
     required=False,
 )
+@click.option(
+    "--nr-ingest-key",
+    envvar="NEW_RELIC_INGEST_KEY",
+    help="New Relic License/Ingest Key (alternative to --nr-api-key)",
+    metavar="<key>",
+    required=False,
+)
 @click.option(
     "--nr-region",
     default="us",
@@ -148,6 +155,12 @@ 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

@@ -258,14 +258,19 @@ def _add_new_relic(input, config, nr_license_key):
                 "NEW_RELIC_LOG_ENDPOINT"
             ] = "https://staging-log-api.newrelic.com/log/v1"
 
-        if nr_license_key:
+        if input.nr_ingest_key:
+            update_kwargs["Environment"]["Variables"][
+                "NEW_RELIC_LICENSE_KEY"
+            ] = input.nr_ingest_key
+            success("Using New Relic ingest key for layer configuration")
+        elif 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"
@@ -291,6 +296,14 @@ def _add_new_relic(input, config, nr_license_key):
 
 @catch_boto_errors
 def install(input, function_arn):
+    if input.nr_api_key and input.nr_ingest_key:
+        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")
@@ -342,6 +355,8 @@ 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/types.py

@@ -96,6 +96,7 @@ LAYER_INSTALL_KEYS = [
     "verbose",
     "nr_account_id",
     "nr_api_key",
+    "nr_ingest_key",
     "nr_region",
     "aws_profile",
     "aws_region",

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

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

@@ -1,27 +1,27 @@
 newrelic_lambda_cli/__init__.py,sha256=u4cy7hwbrNjK3xtldGQD_51aoNgSqGQ3IzFYsuvaIM4,149
-newrelic_lambda_cli/api.py,sha256=U3fqFs_fSSlVJ3CSF2SmY-Sm-rwJDusY0usK1iMjxx4,15132
+newrelic_lambda_cli/api.py,sha256=EwsuxIKHCjrB7knksn8Z4DRT-LLDFeUhMiA2R-7uNpI,15240
 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=F21P8JZJy-R56rf9hTLvTvxMHw2zDuJyoUnZDgQryeA,19062
+newrelic_lambda_cli/layers.py,sha256=kW5baQ71kd8nMu3nrHLzaI3xGsku1N5n2bl_oIP5Xe8,19760
 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
-newrelic_lambda_cli/types.py,sha256=OVu8Ybls5XZdzb9wsuLbkCrf4q2wkLIEgiOlkGODLWY,3505
+newrelic_lambda_cli/types.py,sha256=_nqOh4VU55CEu5EzUvPVtNeofIuOmF3_DIV1RcT6doA,3526
 newrelic_lambda_cli/utils.py,sha256=_XU5tFx9SxEzvp_brFFQtspBz_qoUZ2H_HDxhB_Qr1U,5902
 newrelic_lambda_cli/cli/__init__.py,sha256=FciF2RVqQbpMKqEiN8qjO6qmdLB6Yv8LyyyPYcfJNrc,622
 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=xIbunW2p03sAzcgfiD_OSBAvBWkqys9iDwMl4IezY1k,7397
+newrelic_lambda_cli/cli/layers.py,sha256=dMc_r42uz26Jf3ePC9r4MYIPb7B6MlS7zALtr5_b6IQ,7734
 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.10.dist-info/licenses/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
-newrelic_lambda_cli-0.9.10.dist-info/METADATA,sha256=25IfnT2AFWRLZxRARmDhM7zgUV2QzusEWZUG75QIL8s,28715
-newrelic_lambda_cli-0.9.10.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-newrelic_lambda_cli-0.9.10.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
-newrelic_lambda_cli-0.9.10.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
-newrelic_lambda_cli-0.9.10.dist-info/RECORD,,
+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,,