newrelic-lambda-cli 0.8.0__py2.py3-none-any.whl → 0.9.1__py2.py3-none-any.whl

newrelic_lambda_cli/cli/__init__.py

@@ -6,6 +6,7 @@ from newrelic_lambda_cli.cli import functions, integrations, layers, subscriptio
 
 
 @click.group()
+@click.version_option()
 @click.option("--verbose", "-v", help="Increase verbosity", is_flag=True)
 @click.pass_context
 def cli(ctx, verbose):

newrelic_lambda_cli/cli/integrations.py

@@ -39,6 +39,14 @@ def register(group):
     help="Determines if logs are forwarded to New Relic Logging",
     is_flag=True,
 )
+@click.option(
+    "--stackname",
+    default="NewRelicLogIngestion",
+    help="The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
 @click.option(
     "--memory-size",
     "-m",
@@ -195,6 +203,14 @@ def install(ctx, **kwargs):
     required=False,
     type=click.INT,
 )
+@click.option(
+    "--stackname",
+    default="NewRelicLogIngestion",
+    help="The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
 @click.option("--force", "-f", help="Force uninstall non-interactively", is_flag=True)
 def uninstall(**kwargs):
     """Uninstall New Relic AWS Lambda Integration"""
@@ -250,6 +266,14 @@ def uninstall(**kwargs):
     default=None,
     help="Determines if logs are forwarded to New Relic Logging",
 )
+@click.option(
+    "--stackname",
+    default="NewRelicLogIngestion",
+    help="The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
 @click.option(
     "--memory-size",
     "-m",
@@ -272,6 +296,14 @@ def uninstall(**kwargs):
     metavar="<role_name>",
     show_default=False,
 )
+@click.option(
+    "--stackname",
+    default="NewRelicLogIngestion",
+    help="The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
 @click.option(
     "--enable-license-key-secret/--disable-license-key-secret",
     default=True,

newrelic_lambda_cli/cli/layers.py

@@ -108,12 +108,6 @@ def install(ctx, **kwargs):
     """Install New Relic AWS Lambda Layers"""
     input = LayerInstall(session=None, verbose=ctx.obj["VERBOSE"], **kwargs)
 
-    input = input._replace(
-        session=boto3.Session(
-            profile_name=input.aws_profile, region_name=input.aws_region
-        )
-    )
-
     if input.aws_permissions_check:
         permissions.ensure_layer_install_permissions(input)
 
@@ -121,7 +115,16 @@ def install(ctx, **kwargs):
 
     with ThreadPoolExecutor() as executor:
         futures = [
-            executor.submit(layers.install, input, function) for function in functions
+            executor.submit(
+                layers.install,
+                input._replace(
+                    session=boto3.Session(
+                        profile_name=input.aws_profile, region_name=input.aws_region
+                    )
+                ),
+                function,
+            )
+            for function in functions
         ]
         install_success = all(future.result() for future in as_completed(futures))
 
@@ -179,12 +182,6 @@ def uninstall(ctx, **kwargs):
     """Uninstall New Relic AWS Lambda Layers"""
     input = LayerUninstall(session=None, verbose=ctx.obj["VERBOSE"], **kwargs)
 
-    input = input._replace(
-        session=boto3.Session(
-            profile_name=input.aws_profile, region_name=input.aws_region
-        )
-    )
-
     if input.aws_permissions_check:
         permissions.ensure_layer_uninstall_permissions(input)
 
@@ -192,7 +189,16 @@ def uninstall(ctx, **kwargs):
 
     with ThreadPoolExecutor() as executor:
         futures = [
-            executor.submit(layers.uninstall, input, function) for function in functions
+            executor.submit(
+                layers.uninstall,
+                input._replace(
+                    session=boto3.Session(
+                        profile_name=input.aws_profile, region_name=input.aws_region
+                    )
+                ),
+                function,
+            )
+            for function in functions
         ]
         uninstall_success = all(future.result() for future in as_completed(futures))
 

newrelic_lambda_cli/cli/subscriptions.py

@@ -37,6 +37,14 @@ def register(group):
     multiple=True,
     required=True,
 )
+@click.option(
+    "--stackname",
+    default="NewRelicLogIngestion",
+    help="The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
 @click.option(
     "excludes",
     "--exclude",
@@ -57,12 +65,6 @@ def install(**kwargs):
     """Install New Relic AWS Lambda Log Subscriptions"""
     input = SubscriptionInstall(session=None, **kwargs)
 
-    input = input._replace(
-        session=boto3.Session(
-            profile_name=input.aws_profile, region_name=input.aws_region
-        )
-    )
-
     if input.aws_permissions_check:
         permissions.ensure_subscription_install_permissions(input)
 
@@ -70,7 +72,15 @@ def install(**kwargs):
 
     with ThreadPoolExecutor() as executor:
         futures = [
-            executor.submit(subscriptions.create_log_subscription, input, function)
+            executor.submit(
+                subscriptions.create_log_subscription,
+                input._replace(
+                    session=boto3.Session(
+                        profile_name=input.aws_profile, region_name=input.aws_region
+                    )
+                ),
+                function,
+            )
             for function in functions
         ]
         install_success = all(future.result() for future in as_completed(futures))
@@ -92,6 +102,14 @@ def install(**kwargs):
     multiple=True,
     required=True,
 )
+@click.option(
+    "--stackname",
+    default="NewRelicLogIngestion",
+    help="The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
 @click.option(
     "excludes",
     "--exclude",
@@ -104,12 +122,6 @@ def uninstall(**kwargs):
     """Uninstall New Relic AWS Lambda Log Subscriptions"""
     input = SubscriptionUninstall(session=None, **kwargs)
 
-    input = input._replace(
-        session=boto3.Session(
-            profile_name=input.aws_profile, region_name=input.aws_region
-        )
-    )
-
     if input.aws_permissions_check:
         permissions.ensure_subscription_uninstall_permissions(input)
 
@@ -117,7 +129,15 @@ def uninstall(**kwargs):
 
     with ThreadPoolExecutor() as executor:
         futures = [
-            executor.submit(subscriptions.remove_log_subscription, input, function)
+            executor.submit(
+                subscriptions.remove_log_subscription,
+                input._replace(
+                    session=boto3.Session(
+                        profile_name=input.aws_profile, region_name=input.aws_region
+                    )
+                ),
+                function,
+            )
             for function in functions
         ]
         uninstall_success = all(future.result() for future in as_completed(futures))

newrelic_lambda_cli/functions.py

@@ -70,8 +70,8 @@ def get_aliased_functions(input):
     functions = [
         function
         for function in input.functions
-        if function.lower()
-        not in ("all", "installed", "not-installed", "newrelic-log-ingestion")
+        if function.lower() not in ("all", "installed", "not-installed")
+        and "newrelic-log-ingestion" not in function.lower()
         and function not in input.excludes
     ]
 

newrelic_lambda_cli/integrations.py

@@ -43,8 +43,8 @@ def _get_role(session, role_name):
         raise click.UsageError(str(e))
 
 
-def _check_for_ingest_stack(session):
-    return _get_cf_stack_status(session, INGEST_STACK_NAME)
+def _check_for_ingest_stack(session, stack_name):
+    return _get_cf_stack_status(session, stack_name)
 
 
 def _get_cf_stack_status(session, stack_name, nr_account_id=None):
@@ -86,6 +86,62 @@ def _get_cf_stack_status(session, stack_name, nr_account_id=None):
         return res["Stacks"][0]["StackStatus"]
 
 
+def get_unique_newrelic_log_ingestion_name(session, stackname=None):
+    if not stackname:
+        stackname = INGEST_STACK_NAME
+    stack_id = _get_cf_stack_id(session, stack_name=stackname)
+    if stack_id:
+        return "newrelic-log-ingestion-%s" % (stack_id.split("/")[2].split("-")[4])
+
+
+def get_newrelic_log_ingestion_function(session, stackname=None):
+    unique_log_ingestion_name = get_unique_newrelic_log_ingestion_name(
+        session, stackname
+    )
+    if unique_log_ingestion_name:
+        function = get_function(session, unique_log_ingestion_name)
+        return function
+
+
+def _get_cf_stack_id(session, stack_name, nr_account_id=None):
+    """Returns the StackId of the CloudFormation stack if it exists"""
+    try:
+        res = session.client("cloudformation").describe_stacks(StackName=stack_name)
+        if nr_account_id is not None:
+            stack_output_account_id = _get_stack_output_value(
+                session, ["NrAccountId"]
+            ).get("NrAccountId")
+            # Checking outputs here to protect against installs done
+            # with older CLI versions. We don't want to constantly warn users
+            # who installed on previous versions with no outputs.
+            if stack_output_account_id and stack_output_account_id != str(
+                nr_account_id
+            ):
+                warning(
+                    "WARNING: Managed secret already exists in this region for "
+                    "New Relic account {0}.\n"
+                    "Current CLI behavior limits the setup of one managed "
+                    "secret per region.\n"
+                    "To set up an additional secret for New Relic account {1} "
+                    "see our docs:\n{2}.\n"
+                    "Or run this command with --disable-license-key-secret to "
+                    "avoid attempting to create a new managed secret.".format(
+                        stack_output_account_id, nr_account_id, NR_DOCS_ACT_LINKING_URL
+                    )
+                )
+    except botocore.exceptions.ClientError as e:
+        if (
+            e.response
+            and "ResponseMetadata" in e.response
+            and "HTTPStatusCode" in e.response["ResponseMetadata"]
+            and e.response["ResponseMetadata"]["HTTPStatusCode"] in (400, 404)
+        ):
+            return None
+        raise click.UsageError(str(e))
+    else:
+        return res["Stacks"][0]["StackId"]
+
+
 # TODO: Merge this with create_integration_role?
 def _create_role(input):
     assert isinstance(input, IntegrationInstall)
@@ -200,29 +256,35 @@ def _import_log_ingestion_function(input, nr_license_key):
     )
 
     with open(template_path) as template:
-        change_set_name = "%s-IMPORT-%d" % (INGEST_STACK_NAME, int(time.time()))
-        click.echo("Creating change set: %s" % change_set_name)
-
-        change_set = client.create_change_set(
-            StackName=INGEST_STACK_NAME,
-            TemplateBody=template.read(),
-            Parameters=parameters,
-            Capabilities=capabilities,
-            Tags=[{"Key": key, "Value": value} for key, value in input.tags]
-            if input.tags
-            else [],
-            ChangeSetType="IMPORT",
-            ChangeSetName=change_set_name,
-            ResourcesToImport=[
-                {
-                    "ResourceType": "AWS::Lambda::Function",
-                    "LogicalResourceId": "NewRelicLogIngestionFunctionNoCap",
-                    "ResourceIdentifier": {"FunctionName": "newrelic-log-ingestion"},
-                }
-            ],
+        unique_log_ingestion_name = get_unique_newrelic_log_ingestion_name(
+            input.session
         )
+        if unique_log_ingestion_name:
+            change_set_name = "%s-IMPORT-%d" % (INGEST_STACK_NAME, int(time.time()))
+            click.echo("Creating change set: %s" % change_set_name)
+
+            change_set = client.create_change_set(
+                StackName=INGEST_STACK_NAME,
+                TemplateBody=template.read(),
+                Parameters=parameters,
+                Capabilities=capabilities,
+                Tags=[{"Key": key, "Value": value} for key, value in input.tags]
+                if input.tags
+                else [],
+                ChangeSetType="IMPORT",
+                ChangeSetName=change_set_name,
+                ResourcesToImport=[
+                    {
+                        "ResourceType": "AWS::Lambda::Function",
+                        "LogicalResourceId": "NewRelicLogIngestionFunctionNoCap",
+                        "ResourceIdentifier": {
+                            "FunctionName": unique_log_ingestion_name
+                        },
+                    }
+                ],
+            )
 
-        _exec_change_set(client, change_set, "IMPORT")
+            _exec_change_set(client, change_set, "IMPORT")
 
 
 def _create_log_ingestion_function(
@@ -241,11 +303,11 @@ def _create_log_ingestion_function(
     click.echo("Fetching new CloudFormation template url")
     template_url = _get_sar_template_url(input.session)
 
-    change_set_name = "%s-%s-%d" % (INGEST_STACK_NAME, mode, int(time.time()))
+    change_set_name = "%s-%s-%d" % (input.stackname, mode, int(time.time()))
     click.echo("Creating change set: %s" % change_set_name)
 
     change_set = client.create_change_set(
-        StackName=INGEST_STACK_NAME,
+        StackName=input.stackname,
         TemplateURL=template_url,
         Parameters=parameters,
         Capabilities=capabilities,
@@ -256,10 +318,10 @@ def _create_log_ingestion_function(
         ChangeSetName=change_set_name,
     )
 
-    _exec_change_set(client, change_set, mode)
+    _exec_change_set(client, change_set, mode, input.stackname)
 
 
-def _exec_change_set(client, change_set, mode, stack_name=INGEST_STACK_NAME):
+def _exec_change_set(client, change_set, mode, stack_name):
     click.echo(
         "Waiting for change set creation to complete, this may take a minute... ",
         nl=False,
@@ -324,7 +386,6 @@ def update_log_ingestion_function(input):
         len(stack_resources) > 0
         and stack_resources[0]["ResourceType"] == "AWS::CloudFormation::Stack"
     ):
-
         click.echo("Unwrapping nested stack... ", nl=False)
 
         # Set the ingest function itself to disallow deletes
@@ -342,9 +403,24 @@ def update_log_ingestion_function(input):
 
         # We can't change props during import, so let's set them to their current values
         lambda_client = input.session.client("lambda")
-        old_props = lambda_client.get_function_configuration(
-            FunctionName="newrelic-log-ingestion"
+        unique_log_ingestion_name = get_unique_newrelic_log_ingestion_name(
+            input.session
         )
+        old_props = {}
+        try:
+            old_props = lambda_client.get_function_configuration(
+                FunctionName=unique_log_ingestion_name
+            )
+        except lambda_client.exceptions.ResourceNotFoundException:
+            old_props = lambda_client.get_function_configuration(
+                FunctionName="newrelic-log-ingestion"
+            )
+            warning(
+                "It looks like an old log ingestion function is present in this region. "
+                "Consider manually deleting this as it is no longer used and "
+                "has been replaced by a log ingestion function specific to the stack."
+            )
+
         old_role_name = old_props["Role"].split("/")[-1]
         old_nr_license_key = old_props["Environment"]["Variables"]["LICENSE_KEY"]
         old_enable_logs = False
@@ -424,19 +500,19 @@ def remove_log_ingestion_function(input):
     assert isinstance(input, IntegrationUninstall)
 
     client = input.session.client("cloudformation")
-    stack_status = _check_for_ingest_stack(input.session)
+    stack_status = _check_for_ingest_stack(input.session, input.stackname)
     if stack_status is None:
         click.echo(
             "No New Relic AWS Lambda log ingestion found in region %s, skipping"
             % input.session.region_name
         )
         return
-    click.echo("Deleting New Relic log ingestion stack '%s'" % INGEST_STACK_NAME)
-    client.delete_stack(StackName=INGEST_STACK_NAME)
+    click.echo("Deleting New Relic log ingestion stack '%s'" % input.stackname)
+    client.delete_stack(StackName=input.stackname)
     click.echo(
         "Waiting for stack deletion to complete, this may take a minute... ", nl=False
     )
-    client.get_waiter("stack_delete_complete").wait(StackName=INGEST_STACK_NAME)
+    client.get_waiter("stack_delete_complete").wait(StackName=input.stackname)
     success("Done")
 
 
@@ -518,22 +594,35 @@ def install_log_ingestion(
     """
     assert isinstance(input, IntegrationInstall)
     function = get_function(input.session, "newrelic-log-ingestion")
-    if function is None:
-        stack_status = _check_for_ingest_stack(input.session)
-        if stack_status is None:
-            click.echo(
-                "Setting up 'newrelic-log-ingestion' function in region: %s"
-                % input.session.region_name
+    if function:
+        warning(
+            "It looks like an old log ingestion function is present in this region. "
+            "Consider manually deleting this as it is no longer used and "
+            "has been replaced by a log ingestion function specific to the stack."
+        )
+    stack_status = _check_for_ingest_stack(input.session, input.stackname)
+    if stack_status is None:
+        click.echo(
+            "Setting up CloudFormation Stack %s in region: %s"
+            % (input.stackname, input.session.region_name)
+        )
+        try:
+            _create_log_ingestion_function(
+                input,
+                nr_license_key,
             )
-            try:
-                _create_log_ingestion_function(
-                    input,
-                    nr_license_key,
-                )
-            except Exception as e:
-                failure("Failed to create 'newrelic-log-ingestion' function: %s" % e)
-                return False
-        else:
+            return True
+        except Exception as e:
+            failure(
+                "CloudFormation Stack NewRelicLogIngestion exists (status: %s).\n"
+                "Please manually delete the stack and re-run this command."
+                % stack_status
+            )
+            return False
+    else:
+        function = get_newrelic_log_ingestion_function(input.session)
+
+        if function is None:
             failure(
                 "CloudFormation Stack NewRelicLogIngestion exists (status: %s), but "
                 "newrelic-log-ingestion Lambda function does not.\n"
@@ -541,12 +630,13 @@ def install_log_ingestion(
                 % stack_status
             )
             return False
-    else:
-        success(
-            "The 'newrelic-log-ingestion' function already exists in region %s, "
-            "skipping" % input.session.region_name
-        )
-    return True
+        else:
+            success(
+                "The CloudFormation Stack NewRelicLogIngestion and "
+                "newrelic-log-ingestion function already exists in region %s, "
+                "skipping" % input.session.region_name
+            )
+            return True
 
 
 @catch_boto_errors
@@ -558,16 +648,7 @@ def update_log_ingestion(input):
     """
     assert isinstance(input, IntegrationUpdate)
 
-    function = get_function(input.session, "newrelic-log-ingestion")
-    if function is None:
-        failure(
-            "No 'newrelic-log-ingestion' function in region '%s'. "
-            "Run 'newrelic-lambda integrations install' to install it."
-            % input.session.region_name
-        )
-        return False
-
-    stack_status = _check_for_ingest_stack(input.session)
+    stack_status = _check_for_ingest_stack(input.session, input.stackname)
     if stack_status is None:
         failure(
             "No 'NewRelicLogIngestion' stack in region '%s'. "
@@ -578,10 +659,19 @@ def update_log_ingestion(input):
         )
         return False
 
+    function = get_newrelic_log_ingestion_function(input.session, input.stackname)
+    if function is None:
+        failure(
+            "No newrelic-log-ingestion function in region '%s'. "
+            "Run 'newrelic-lambda integrations install' to install it."
+            % input.session.region_name
+        )
+        return False
+
     try:
         update_log_ingestion_function(input)
     except Exception as e:
-        failure("Failed to update 'newrelic-log-ingestion' function: %s" % e)
+        failure("Failed to update newrelic-log-ingestion function: %s" % e)
         return False
     else:
         return True
@@ -592,7 +682,7 @@ def get_log_ingestion_license_key(session):
     """
     Fetches the license key value from the log ingestion function
     """
-    function = get_function(session, "newrelic-log-ingestion")
+    function = get_newrelic_log_ingestion_function(session)
     if function:
         return function["Configuration"]["Environment"]["Variables"]["LICENSE_KEY"]
     return None

newrelic_lambda_cli/layers.py

@@ -153,7 +153,7 @@ def _add_new_relic(input, config, nr_license_key):
     if any("NewRelicLambdaExtension" in s for s in new_relic_layer):
         runtime_handler = None
 
-    # Only used by Python, Node.js and Java runtimes not using the
+    # Only used by Python, Node.js, Ruby, and Java runtimes not using the
     # NewRelicLambdaExtension layer
     if runtime_handler:
         update_kwargs["Handler"] = runtime_handler

newrelic_lambda_cli/subscriptions.py

@@ -5,6 +5,8 @@ import click
 
 from newrelic_lambda_cli.cliutils import failure, success, warning
 from newrelic_lambda_cli.functions import get_function
+from newrelic_lambda_cli.integrations import get_unique_newrelic_log_ingestion_name
+from newrelic_lambda_cli.integrations import get_newrelic_log_ingestion_function
 from newrelic_lambda_cli.types import (
     LayerInstall,
     SubscriptionInstall,
@@ -83,10 +85,17 @@ def _remove_subscription_filter(session, function_name, filter_name):
 @catch_boto_errors
 def create_log_subscription(input, function_name):
     assert isinstance(input, SubscriptionInstall)
-    destination = get_function(input.session, "newrelic-log-ingestion")
+    function = get_function(input.session, "newrelic-log-ingestion")
+    if function:
+        warning(
+            "It looks like an old log ingestion function is present in this region. "
+            "Consider manually deleting this as it is no longer used and "
+            "has been replaced by a log ingestion function specific to the stack."
+        )
+    destination = get_newrelic_log_ingestion_function(input.session, input.stackname)
     if destination is None:
         failure(
-            "Could not find 'newrelic-log-ingestion' function. Is the New Relic AWS "
+            "Could not find newrelic-log-ingestion function. Is the New Relic AWS "
             "integration installed?"
         )
         return False

newrelic_lambda_cli/templates/import-template.yaml

@@ -62,7 +62,7 @@ Resources:
         Key: 466768951184/arn:aws:serverlessrepo:us-east-1:463657938898:applications-NewRelic-log-ingestion-versions-2.2.1/2dcb4087-186a-42c8-bc1f-cf93780786c0
       Description: Sends log data from CloudWatch Logs and S3 to New Relic Infrastructure (Cloud integrations) and New Relic Logging
       Handler: function.lambda_handler
-      FunctionName: newrelic-log-ingestion
+      FunctionName: !Join ['-', ['newrelic-log-ingestion', !Select [4, !Split ['-', !Select [2, !Split ['/', !Ref AWS::StackId]]]]]]
       MemorySize:
         Ref: MemorySize
       Runtime: python3.9
@@ -84,7 +84,7 @@ Resources:
         Key: 466768951184/arn:aws:serverlessrepo:us-east-1:463657938898:applications-NewRelic-log-ingestion-versions-2.2.1/2dcb4087-186a-42c8-bc1f-cf93780786c0
       Description: Sends log data from CloudWatch Logs and S3 to New Relic Infrastructure (Cloud integrations) and New Relic Logging
       Handler: function.lambda_handler
-      FunctionName: newrelic-log-ingestion
+      FunctionName: !Join ['-', ['newrelic-log-ingestion', !Select [4, !Split ['-', !Select [2, !Split ['/', !Ref AWS::StackId]]]]]]
       MemorySize:
         Ref: MemorySize
       Runtime: python3.9

newrelic_lambda_cli/types.py

@@ -8,6 +8,7 @@ INTEGRATION_INSTALL_KEYS = [
     "aws_permissions_check",
     "aws_role_policy",
     "enable_logs",
+    "stackname",
     "memory_size",
     "linked_account_name",
     "nr_account_id",
@@ -26,6 +27,7 @@ INTEGRATION_UNINSTALL_KEYS = [
     "aws_profile",
     "aws_region",
     "aws_permissions_check",
+    "stackname",
     "nr_account_id",
     "force",
 ]
@@ -36,6 +38,7 @@ INTEGRATION_UPDATE_KEYS = [
     "aws_region",
     "aws_permissions_check",
     "enable_logs",
+    "stackname",
     "memory_size",
     "nr_account_id",
     "nr_api_key",
@@ -80,6 +83,7 @@ SUBSCRIPTION_INSTALL_KEYS = [
     "aws_region",
     "aws_permissions_check",
     "functions",
+    "stackname",
     "excludes",
     "filter_pattern",
 ]
@@ -90,6 +94,7 @@ SUBSCRIPTION_UNINSTALL_KEYS = [
     "aws_region",
     "aws_permissions_check",
     "functions",
+    "stackname",
     "excludes",
 ]
 

newrelic_lambda_cli/utils.py

@@ -10,6 +10,10 @@ NR_DOCS_ACT_LINKING_URL = "https://docs.newrelic.com/docs/serverless-function-mo
 NEW_RELIC_ARN_PREFIX_TEMPLATE = "arn:aws:lambda:%s:451483290750"
 RUNTIME_CONFIG = {
     "dotnetcore3.1": {"LambdaExtension": True},
+    "java21": {
+        "Handler": "com.newrelic.java.HandlerWrapper::",
+        "LambdaExtension": True,
+    },
     "java17": {
         "Handler": "com.newrelic.java.HandlerWrapper::",
         "LambdaExtension": True,
@@ -36,6 +40,7 @@ RUNTIME_CONFIG = {
     },
     "provided": {"LambdaExtension": True},
     "provided.al2": {"LambdaExtension": True},
+    "provided.al2023": {"LambdaExtension": True},
     "python3.7": {
         "Handler": "newrelic_lambda_wrapper.handler",
         "LambdaExtension": True,
@@ -60,6 +65,14 @@ RUNTIME_CONFIG = {
         "Handler": "newrelic_lambda_wrapper.handler",
         "LambdaExtension": True,
     },
+    "ruby3.2": {
+        "Handler": "newrelic_lambda_wrapper.handler",
+        "LambdaExtension": True,
+    },
+    "ruby3.3": {
+        "Handler": "newrelic_lambda_wrapper.handler",
+        "LambdaExtension": True,
+    },
 }
 
 

{newrelic_lambda_cli-0.8.0.dist-info → newrelic_lambda_cli-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: newrelic-lambda-cli
-Version: 0.8.0
+Version: 0.9.1
 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
@@ -46,7 +46,7 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 * Installs and configures a New Relic AWS Lambda layer onto your AWS Lambda functions
 * Automatically selects the correct New Relic layer for your function's runtime and region
 * Wraps your AWS Lambda functions without requiring a code change
-* Supports Go, Java, .NET, Node.js and Python AWS Lambda runtimes
+* Supports Go, Java, .NET, Node.js, Python, and Ruby AWS Lambda runtimes
 * Easily uninstall the AWS Lambda layer with a single command
 
 ## Runtimes Supported
@@ -55,6 +55,7 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 * java8.al2
 * java11
 * java17
+* java21
 * nodejs16.x
 * nodejs18.x
 * nodejs20.x
@@ -66,8 +67,10 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 * python3.10
 * python3.11
 * python3.12
+* ruby3.2
+* ruby3.3
 
-**Note:** Automatic handler wrapping is only supported for Node.js, Python and Java. For other runtimes,
+**Note:** Automatic handler wrapping is only supported for Node.js, Python, Java, and Ruby. For other runtimes,
 manual function wrapping is required using the runtime specific New Relic agent.
 
 ## Requirements
@@ -132,6 +135,7 @@ newrelic-lambda integrations install \
 | `--aws-role-policy` | No | Specify an alternative IAM role policy ARN for this integration. |
 | `--disable-license-key-secret` | No | Don't create a managed secret for your account's New Relic License Key |
 | `--tag <key> <value>` | No | Sets tags on the CloudFormation Stacks this CLI creates. Can be used multiple times, example: `--tag key1 value1 --tag key2 value2`. |
+| `--stackname` | No | The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function. If no value is provided, the command searches for the NewRelicLogIngestion stack |
 
 #### Uninstall Integration
 
@@ -145,6 +149,7 @@ newrelic-lambda integrations uninstall
 | `--aws-region` or `-r` | No | The AWS region for the integration. Can use `AWS_DEFAULT_REGION` environment variable. Defaults to AWS session region. |
 | `--force` or `-f` | No | Forces uninstall non-interactively |
 | `--nr-account-id` or `-a` | No | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) for the integration. Only required if also uninstalling the New Relic AWS Lambda integration. Can also use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
+| `--stackname` | No | The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function. If no value is provided, the command searches for the NewRelicLogIngestion stack |
 
 #### Update Integration
 
@@ -172,6 +177,7 @@ newrelic-lambda integrations update \
 | `--aws-region` or `-r` | No | The AWS region for the integration. Can use `AWS_DEFAULT_REGION` environment variable. Defaults to AWS session region. |
 | `--disable-license-key-secret` | No | Disable automatic creation of the license key secret on update. The secret is not created if it exists. |
 | `--tag <key> <value>` | No | Sets tags on the CloudFormation Stacks this CLI creates. Can be used multiple times, example: `--tag key1 value1 --tag key2 value2`. |
+| `--stackname` | No | The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function. If no value is provided, the command searches for the NewRelicLogIngestion stack |
 
 ### AWS Lambda Layers
 
@@ -244,6 +250,7 @@ newrelic-lambda subscriptions install --function <name or arn>
 | Option | Required? | Description |
 |--------|-----------|-------------|
 | `--function` or `-f` | Yes | The AWS Lambda function name or ARN in which to add a log subscription. Can provide multiple `--function` arguments. Will also accept `all`, `installed` and `not-installed` similar to `newrelic-lambda functions list`. |
+| `--stackname` | No | The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function. If no value is provided, the command searches for the NewRelicLogIngestion stack |
 | `--exclude` or `-e` | No | A function name to exclude while installing subscriptions. Can provide multiple `--exclude` arguments. Only checked when `all`, `installed` and `not-installed` are used. See `newrelic-lambda functions list` for function names. |
 | `--filter-pattern` | No | Specify a custom log subscription filter pattern. To collect all logs use `--filter-pattern ""`. |
 | `--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. |
@@ -258,6 +265,7 @@ newrelic-lambda subscriptions uninstall --function <name or arn>
 | Option | Required? | Description |
 |--------|-----------|-------------|
 | `--function` or `-f` | Yes | The AWS Lambda function name or ARN in which to remove a log subscription. Can provide multiple `--function` arguments. Will also accept `all`, `installed` and `not-installed` similar to `newrelic-lambda functions list`. |
+| `--stackname` | No | The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function. If no value is provided, the command searches for the NewRelicLogIngestion stack |
 | `--exclude` or `-e` | No | A function name to exclude while uninstalling subscriptions. Can provide multiple `--exclude` arguments. Only checked when `all`, `installed` and `not-installed` are used. See `newrelic-lambda functions list` for function names. |
 | `--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. |

newrelic_lambda_cli-0.9.1.dist-info/RECORD

@@ -0,0 +1,25 @@
+newrelic_lambda_cli/__init__.py,sha256=u4cy7hwbrNjK3xtldGQD_51aoNgSqGQ3IzFYsuvaIM4,149
+newrelic_lambda_cli/api.py,sha256=tkjuR_qkD2uZgXfXPFR6YKnmRiNYkrEmqQEeUgDtNn8,14848
+newrelic_lambda_cli/cliutils.py,sha256=x2pWlL3DJ9t98QNElp_rhawNQoIZ0vd55R2jpo3_oI0,902
+newrelic_lambda_cli/functions.py,sha256=p57ZUw424BaSUA_Gw8DrYsJOYKROEHEaXgARadqwcP0,2800
+newrelic_lambda_cli/integrations.py,sha256=X9OuBK_sNfjb1cjbZ1dctd_YTVyEeCCGsPaJp0Bni1U,30864
+newrelic_lambda_cli/layers.py,sha256=Gnt9pdG1Tfh79Y8ZWWJyMVXEB6xnW2UaSuo5zoYLa3U,14270
+newrelic_lambda_cli/permissions.py,sha256=H7v5IMpKaJIWC4Dff2YcTis4BKAAFIJr9IHWUj1LnF4,9093
+newrelic_lambda_cli/subscriptions.py,sha256=wh6vroU8RfSEwqAMObjPNVPb0TbBxUYYPO_c3mY7miA,6166
+newrelic_lambda_cli/types.py,sha256=kzubT5cGiI-k6h_8b_iTaj3bnsNwolhjgSbpFJT9iBk,2304
+newrelic_lambda_cli/utils.py,sha256=cwYX_zG72EjGT92l43mEAJRygrClUNseKDyssQ6D_2Q,5240
+newrelic_lambda_cli/cli/__init__.py,sha256=n_QPd3oJqkFxryy-pJ-Y_AsqsmgbTb3dlQCjPJueaYQ,544
+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=dVlBB0rnhnWEXl9EygEjSiJknNnIQgPbF8L5hsdkMfU,5886
+newrelic_lambda_cli/cli/subscriptions.py,sha256=qwV4WUW9fbju0t4-aSfIrPdeEa4QvIJ8bfwTvMnm7zs,4251
+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.1.dist-info/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
+newrelic_lambda_cli-0.9.1.dist-info/METADATA,sha256=rKXVnaSVtnjbs_5xuj_CdvJh8fRMWEpB5_LAnrTACag,21703
+newrelic_lambda_cli-0.9.1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+newrelic_lambda_cli-0.9.1.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
+newrelic_lambda_cli-0.9.1.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
+newrelic_lambda_cli-0.9.1.dist-info/RECORD,,

{newrelic_lambda_cli-0.8.0.dist-info → newrelic_lambda_cli-0.9.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

newrelic_lambda_cli-0.8.0.dist-info/RECORD

@@ -1,25 +0,0 @@
-newrelic_lambda_cli/__init__.py,sha256=u4cy7hwbrNjK3xtldGQD_51aoNgSqGQ3IzFYsuvaIM4,149
-newrelic_lambda_cli/api.py,sha256=tkjuR_qkD2uZgXfXPFR6YKnmRiNYkrEmqQEeUgDtNn8,14848
-newrelic_lambda_cli/cliutils.py,sha256=x2pWlL3DJ9t98QNElp_rhawNQoIZ0vd55R2jpo3_oI0,902
-newrelic_lambda_cli/functions.py,sha256=ZdpzzxbItdbYoDB5t5Ljvkgfo9ZfbUCgOjfaii5KB_c,2773
-newrelic_lambda_cli/integrations.py,sha256=SU_r40vaNHAlq8C2PsCQKDNqyYWrvX3js-pnyDWu1Gc,26878
-newrelic_lambda_cli/layers.py,sha256=3PHELrt3UNXgEW-9QyzbU50D399CMOAsHnel4N-B84g,14263
-newrelic_lambda_cli/permissions.py,sha256=H7v5IMpKaJIWC4Dff2YcTis4BKAAFIJr9IHWUj1LnF4,9093
-newrelic_lambda_cli/subscriptions.py,sha256=2l56iK8OHatPlUqI3i1me_uu4jE40c_bK6M2sAlNSo0,5632
-newrelic_lambda_cli/types.py,sha256=Tmk32eJ50bwjUTVRVtfz2d3L87k0z2ofDhl5_qspxLY,2219
-newrelic_lambda_cli/utils.py,sha256=PeLM-RWqHasGacY84UI1Ut-A5yFRMgoVeFaIbIksrEg,4855
-newrelic_lambda_cli/cli/__init__.py,sha256=sQDvBeANz9yzgdsfvLnZN2QwvSOGmk8rEjcEBqU00dA,520
-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=I8RcFB090dKhFfCazXcNjTbggoLc7edFEcLoPnHMycI,9497
-newrelic_lambda_cli/cli/layers.py,sha256=R9vCMoUD9EYx-tJWoFMmWP-kJjoljg4ciWwgeiBLaXQ,5678
-newrelic_lambda_cli/cli/subscriptions.py,sha256=aFX4GFxMpYCYOT0-lziZ6yEJI0zk6qI-7j-gq24ereA,3585
-newrelic_lambda_cli/templates/import-template.yaml,sha256=eSqR8HZwQAE2tVMzIguhLY611iddMLYhkRZ_IcsXigw,3591
-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.8.0.dist-info/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
-newrelic_lambda_cli-0.8.0.dist-info/METADATA,sha256=qxOJusjXPSRhDeTBDZYowYWJVCCU5knmStJQGUL2pQI,20665
-newrelic_lambda_cli-0.8.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-newrelic_lambda_cli-0.8.0.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
-newrelic_lambda_cli-0.8.0.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
-newrelic_lambda_cli-0.8.0.dist-info/RECORD,,