newrelic-lambda-cli 0.9.14__py2.py3-none-any.whl → 0.9.15__py2.py3-none-any.whl

newrelic_lambda_cli/api.py

@@ -96,24 +96,23 @@ class NewRelicGQL(object):
         """
         res = self.query(
             """
-            query ($accountId: Int!) {
-              requestContext {
-                apiKey
-              }
-              actor {
-                account(id: $accountId) {
-                  licenseKey
-                  id
-                  name
+                query ($accountId: Int!) {
+                    actor {
+                        apiAccess {
+                            keySearch(query: {types: INGEST, scope: {accountIds: [$accountId]}}) {
+                                keys {
+                                    key
+                                }
+                            }
+                        }
+                    }
                 }
-              }
-            }
             """,
             accountId=self.account_id,
         )
         try:
-            return res["actor"]["account"]["licenseKey"]
-        except KeyError:
+            return res["actor"]["apiAccess"]["keySearch"]["keys"][0]["key"]
+        except (KeyError, IndexError):
             return None
 
     def get_linked_account_by_id(self, id):

newrelic_lambda_cli/cli/layers.py

@@ -133,6 +133,12 @@ def register(group):
     is_flag=True,
     help="Enable sending Lambda function logs via the New Relic Lambda Extension",
 )
+@click.option(
+    "--slim",
+    is_flag=True,
+    default=False,
+    help="New Relic slim Layer without opentelemetry for Node.js",
+)
 @click.option(
     "--disable-function-logs",
     is_flag=True,

newrelic_lambda_cli/layers.py

@@ -48,7 +48,12 @@ def index(region, runtime, architecture):
 
 
 def layer_selection(
-    available_layers, runtime, architecture, upgrade=False, existing_layer_arn=None
+    available_layers,
+    runtime,
+    architecture,
+    upgrade=False,
+    existing_layer_arn=None,
+    slim=False,
 ):
     if upgrade and existing_layer_arn:
         base_arn = existing_layer_arn.rsplit(":", 1)[0]
@@ -65,7 +70,11 @@ def layer_selection(
     layer_options = [
         layer["LatestMatchingVersion"]["LayerVersionArn"] for layer in available_layers
     ]
-
+    if slim:
+        for arn in layer_options:
+            if "-slim:" in arn:
+                success("Layer %s selected (slim)" % arn)
+                return arn
     if sys.stdout.isatty():
         output = "\n".join(
             [
@@ -86,11 +95,14 @@ def layer_selection(
             except IndexError:
                 failure("Invalid layer selection")
     else:
-        raise click.UsageError(
+        click.echo(
             "Discovered multiple layers for runtime %s (%s):\n%s\n"
-            "Pass --layer-arn to specify a layer ARN"
+            "To add a particular Layer ARN use --layer-arn"
             % (runtime, architecture, "\n".join(layer_options))
         )
+        selected = layer_options[0]
+        success("Layer %s selected (auto)" % selected)
+        return selected
 
 
 def _add_new_relic(input, config, nr_license_key):
@@ -167,6 +179,7 @@ def _add_new_relic(input, config, nr_license_key):
             architecture,
             upgrade=input.upgrade,
             existing_layer_arn=existing_layer_arn,
+            slim=input.slim,
         )
 
     update_kwargs = {

newrelic_lambda_cli/types.py

@@ -117,6 +117,7 @@ LAYER_INSTALL_KEYS = [
     "disable_extension_logs",
     "java_handler_method",
     "esm",
+    "slim",
 ]
 
 LAYER_UNINSTALL_KEYS = [

{newrelic_lambda_cli-0.9.14.dist-info → newrelic_lambda_cli-0.9.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.14
+Version: 0.9.15
 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
@@ -64,11 +64,11 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 
 | Runtime     | Versions               |
 |-------------|------------------------|
-| Python      | `python3.7`, `python3.8`, `python3.9`, `python3.10`, `python3.11`, `python3.12`, `python3.13` |
+| Python      | `python3.8`, `python3.9`, `python3.10`, `python3.11`, `python3.12`, `python3.13` |
 | Node.js     | `nodejs16.x`, `nodejs18.x`, `nodejs20.x`, `nodejs22.x` |
-| .NET   | `dotnet3.1`, `dotnet6`, `dotnet8`              |
+| .NET   |  `dotnet6`, `dotnet8`              |
 | Java        | `java8.al2`, `java11`, `java17`, `java21`      |
-| Provided    | `provided`, `provided.al2`, `provided.al2023`         |
+| Provided    | `provided.al2`, `provided.al2023`         |
 | Ruby        | `ruby3.2`, `ruby3.3`, `ruby3.4`          |
 
 **Note:** Automatic handler wrapping is only supported for Node.js, Python, Java, and Ruby. For other runtimes,
@@ -78,6 +78,7 @@ manual function wrapping is required using the runtime specific New Relic agent.
 
 * Python >= 3.7 <= 3.13
 * Retrieve your [New relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) and [User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key)
+* Retrieve your [New Relic Ingest License Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#personal-api-key)
 
 ## Recommendations
 
@@ -199,6 +200,7 @@ newrelic-lambda layers install \
 | `--function` or `-f` | Yes | The AWS Lambda function name or ARN in which to add a layer. Can provide multiple `--function` arguments. Will also accept `all`, `installed` and `not-installed` similar to `newrelic-lambda functions list`. |
 | `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) this function should use. Can also use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
 | `--exclude` or `-e` | No | A function name to exclude while installing layers. Can provide multiple `--exclude` arguments. Only checked when `all`, `installed` and `not-installed` are used. See `newrelic-lambda functions list` for function names. |
+| `--slim` | No | The flag `--slim` adds the Node.js layer without OpenTelemetry dependencies, resulting in a lighter size. |
 | `--layer-arn` or `-l` | No | Specify a specific layer version ARN to use. This is auto detected by default. |
 | `--upgrade` or `-u` | No | Permit upgrade to the latest layer version for this region and runtime. |
 | `--disable-extension` | No | Disable the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). |
@@ -209,6 +211,7 @@ newrelic-lambda layers install \
 | `--aws-profile` or `-p` | No | The AWS profile to use for this command. Can also use `AWS_PROFILE`. Will also check `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables if not using AWS CLI. |
 | `--aws-region` or `-r` | No | The AWS region this function is located. Can use `AWS_DEFAULT_REGION` environment variable. Defaults to AWS session region. |
 | `--nr-api-key` or `-k` | No | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Can also use the `NEW_RELIC_API_KEY` environment variable. Only used if `--enable-extension` is set and there is no New Relic license key in AWS Secrets Manager. |
+| `--nr-ingest-key`| No | Your [New Relic Ingest License Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#personal-api-key). Can be used without `--enable-extension` configured or license key in AWS Secrets Manager. |
 | `--nr-region` | No | The New Relic region to use for the integration. Can use the `NEW_RELIC_REGION` environment variable. Can be either `eu` or `us`. Defaults to `us`. Only used if `--enable-extension` is set and there is no New Relic license key in AWS Secrets Manager. |
 | `--nr-env-delimite` | No | Set `NR_ENV_DELIMITER` environment variable for your Lambda Function |
 | `--nr-tags` | No | Set `NR_TAGS` environment variable for your Lambda Function |

{newrelic_lambda_cli-0.9.14.dist-info → newrelic_lambda_cli-0.9.15.dist-info}/RECORD

@@ -1,29 +1,29 @@
 newrelic_lambda_cli/__init__.py,sha256=u4cy7hwbrNjK3xtldGQD_51aoNgSqGQ3IzFYsuvaIM4,149
-newrelic_lambda_cli/api.py,sha256=-lRsWBNO0YWV2yHp-zUbS2vs4AYJCn9yJngOrKAvmuo,15133
+newrelic_lambda_cli/api.py,sha256=eBGq-IV73urdqhAA2xsIdf772q0npMiuRCCiCJgS10Q,15287
 newrelic_lambda_cli/apm.py,sha256=ZGEdmRW8jlJOl17TnTO716dwxpDSvEb5_28K6XadPDA,12475
 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=pyTbSCwJ2A3KP6YZiN-bkzt210UEj3j6dVnIFgijxWo,20339
+newrelic_lambda_cli/layers.py,sha256=BL7XPMw8zal0UL5nrgDJMknfnhwSkp_LKVkBThWx_do,20673
 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=ln3fpVpV9FyHtRvDd68xT72zWTwCV6SixXhANGMGY3Q,3803
+newrelic_lambda_cli/types.py,sha256=MC22Gw5u97qcpjLrmExST_2uXSH7qceDEmdMziOslh4,3815
 newrelic_lambda_cli/utils.py,sha256=_XU5tFx9SxEzvp_brFFQtspBz_qoUZ2H_HDxhB_Qr1U,5902
 newrelic_lambda_cli/cli/__init__.py,sha256=vY8EdoHeI5r8DY_zELWMb2hCkm_p6oae6JYPweOq1d4,655
 newrelic_lambda_cli/cli/apm.py,sha256=gISzrUQ7a_QqOmReRGaTdpW1INIpAjPauBbqNt1vuNM,3510
 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=LM_vMHcfFAjSCtnaH34P0Jn1ixY07s93EzOBsEgRQK0,7584
+newrelic_lambda_cli/cli/layers.py,sha256=iZ6FBvAXeo-WC48E-bgerMx3JAY_AUCI4BL5Raop6sU,7719
 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.14.dist-info/licenses/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
-newrelic_lambda_cli-0.9.14.dist-info/METADATA,sha256=tw0SCoEnLxLdkPJmQTgvXg32vR3BXxm7RdNB84O9BP8,28949
-newrelic_lambda_cli-0.9.14.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-newrelic_lambda_cli-0.9.14.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
-newrelic_lambda_cli-0.9.14.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
-newrelic_lambda_cli-0.9.14.dist-info/RECORD,,
+newrelic_lambda_cli-0.9.15.dist-info/licenses/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
+newrelic_lambda_cli-0.9.15.dist-info/METADATA,sha256=9Vv9rKLxLmmkFA3e_NaJROzu1oJ9lf_fquYcNLMIpXg,29411
+newrelic_lambda_cli-0.9.15.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+newrelic_lambda_cli-0.9.15.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
+newrelic_lambda_cli-0.9.15.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
+newrelic_lambda_cli-0.9.15.dist-info/RECORD,,