newrelic-lambda-cli 0.9.3__tar.gz → 0.9.4__tar.gz

{newrelic_lambda_cli-0.9.3 → newrelic_lambda_cli-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: newrelic-lambda-cli
-Version: 0.9.3
+Version: 0.9.4
 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
@@ -11,7 +11,6 @@ License-File: LICENSE
 Requires-Dist: boto3<5
 Requires-Dist: click>=7.1.2
 Requires-Dist: colorama
-Requires-Dist: emoji<3,>=2
 Requires-Dist: gql<3,>=2
 Requires-Dist: requests<3
 Requires-Dist: tabulate
@@ -377,7 +376,7 @@ Using these together will auto format your git commits.
 ## Running Tests
 
 ```bash
-python setup.py test
+pytest tests
 ```
 
 ## Troubleshooting

{newrelic_lambda_cli-0.9.3 → newrelic_lambda_cli-0.9.4}/README.md

@@ -359,7 +359,7 @@ Using these together will auto format your git commits.
 ## Running Tests
 
 ```bash
-python setup.py test
+pytest tests
 ```
 
 ## Troubleshooting

newrelic_lambda_cli-0.9.4/newrelic_lambda_cli/cliutils.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+import click
+
+from click.exceptions import Exit
+
+
+def done(message):
+    """Prints a done message to the terminal"""
+    click.echo(f"✔️ {message} ✔️")
+
+
+def failure(message, exit=False):
+    """Prints a failure message to the terminal"""
+    click.secho(
+        f"✘ {message}",
+        fg="red",
+        err=True,
+    )
+    if exit:
+        raise Exit(1)
+
+
+def success(message):
+    """Prints a success message to the terminal"""
+    click.secho(
+        f"✔️ {message}",
+        fg="green",
+    )
+
+
+def warning(message):
+    """Prints a warning message to the terminal"""
+    click.secho(
+        f"⚠️ {message}",
+        fg="blue",
+    )

{newrelic_lambda_cli-0.9.3 → newrelic_lambda_cli-0.9.4}/newrelic_lambda_cli/subscriptions.py

@@ -100,8 +100,8 @@ def create_log_subscription(input, function_name):
     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 "
-            "integration installed?"
+            "Could not find newrelic-log-ingestion function in stack: %s. Is the New Relic AWS "
+            "integration installed?" % input.stackname
         )
         return False
     destination_arn = destination["Configuration"]["FunctionArn"]

{newrelic_lambda_cli-0.9.3 → newrelic_lambda_cli-0.9.4}/newrelic_lambda_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: newrelic-lambda-cli
-Version: 0.9.3
+Version: 0.9.4
 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
@@ -11,7 +11,6 @@ License-File: LICENSE
 Requires-Dist: boto3<5
 Requires-Dist: click>=7.1.2
 Requires-Dist: colorama
-Requires-Dist: emoji<3,>=2
 Requires-Dist: gql<3,>=2
 Requires-Dist: requests<3
 Requires-Dist: tabulate
@@ -377,7 +376,7 @@ Using these together will auto format your git commits.
 ## Running Tests
 
 ```bash
-python setup.py test
+pytest tests
 ```
 
 ## Troubleshooting

{newrelic_lambda_cli-0.9.3 → newrelic_lambda_cli-0.9.4}/newrelic_lambda_cli.egg-info/requires.txt

@@ -1,7 +1,6 @@
 boto3<5
 click>=7.1.2
 colorama
-emoji<3,>=2
 gql<3,>=2
 requests<3
 tabulate

{newrelic_lambda_cli-0.9.3 → newrelic_lambda_cli-0.9.4}/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.3",
+    version="0.9.4",
     python_requires=">=3.3",
     description="A CLI to install the New Relic AWS Lambda integration and layers.",
     long_description=README,
@@ -19,13 +19,11 @@ setup(
         "boto3<5",
         "click>=7.1.2",
         "colorama",
-        "emoji>=2,<3",
         "gql>=2,<3",
         "requests<3",
         "tabulate",
     ],
     setup_requires=["pytest-runner"],
-    tests_require=["moto", "pytest", "requests"],
     entry_points={
         "console_scripts": ["newrelic-lambda = newrelic_lambda_cli.cli:main"]
     },

{newrelic_lambda_cli-0.9.3 → newrelic_lambda_cli-0.9.4}/tests/test_functions.py

@@ -1,6 +1,6 @@
 import boto3
 from unittest import mock
-from moto import mock_lambda
+from moto import mock_aws
 from unittest.mock import MagicMock
 
 from newrelic_lambda_cli.functions import get_aliased_functions, list_functions
@@ -8,7 +8,7 @@ from newrelic_lambda_cli.functions import get_aliased_functions, list_functions
 from .conftest import layer_install
 
 
-@mock_lambda
+@mock_aws
 @mock.patch("newrelic_lambda_cli.functions.list_functions", autospec=True)
 def test_get_aliased_functions(mock_list_functions, aws_credentials):
     """
@@ -60,7 +60,7 @@ def test_get_aliased_functions(mock_list_functions, aws_credentials):
     ]
 
 
-@mock_lambda
+@mock_aws
 def test_list_functions(aws_credentials):
     session = boto3.Session(region_name="us-east-1")
     assert list(list_functions(session)) == []

{newrelic_lambda_cli-0.9.3 → newrelic_lambda_cli-0.9.4}/tests/test_integrations.py

@@ -2,12 +2,7 @@ from __future__ import absolute_import
 
 import boto3
 import botocore
-from moto import (
-    mock_cloudformation,
-    mock_iam,
-    mock_lambda,
-    mock_sts,
-)
+from moto import mock_aws
 import pytest
 from unittest.mock import call, patch, MagicMock, ANY
 
@@ -190,7 +185,7 @@ def test_remove_log_ingestion_function_not_present(success_mock):
     success_mock.assert_not_called()
 
 
-@mock_cloudformation
+@mock_aws
 def test__get_cf_stack_status(aws_credentials):
     session = boto3.Session(region_name="us-east-1")
     assert _get_cf_stack_status(session, "foo-bar-baz") is None
@@ -332,7 +327,7 @@ def test__get_stack_output_value():
         )
 
 
-@mock_cloudformation
+@mock_aws
 def test__create_role(aws_credentials):
     session = boto3.Session(region_name="us-east-1")
     assert (
@@ -340,13 +335,13 @@ def test__create_role(aws_credentials):
     )
 
 
-@mock_iam
+@mock_aws
 def test__get_role(aws_credentials):
     session = boto3.Session(region_name="us-east-1")
     assert _get_role(session, "arn:aws:iam::1234567890:role/foobar") is None
 
 
-@mock_cloudformation
+@mock_aws
 def test__import_log_ingestion_function(aws_credentials):
     session = boto3.Session(region_name="us-east-1")
     _import_log_ingestion_function(
@@ -361,14 +356,13 @@ def test__import_log_ingestion_function(aws_credentials):
     )
 
 
-@mock_sts
+@mock_aws
 def test_get_aws_account_id(aws_credentials):
     session = boto3.Session(region_name="us-east-1")
     assert get_aws_account_id(session) == "123456789012"
 
 
-@mock_cloudformation
-@mock_lambda
+@mock_aws
 @patch("newrelic_lambda_cli.integrations._get_sar_template_url", autospec=True)
 @patch("newrelic_lambda_cli.integrations._create_log_ingestion_function", autospec=True)
 def test_update_log_ingestion_function(

{newrelic_lambda_cli-0.9.3 → newrelic_lambda_cli-0.9.4}/tests/test_layers.py

@@ -1,6 +1,6 @@
 import boto3
 from click import UsageError
-from moto import mock_lambda
+from moto import mock_aws
 import pytest
 
 from unittest.mock import ANY, call, MagicMock, patch
@@ -20,7 +20,7 @@ from newrelic_lambda_cli.utils import get_arn_prefix
 from .conftest import layer_install, layer_uninstall
 
 
-@mock_lambda
+@mock_aws
 def test_add_new_relic(aws_credentials, mock_function_config):
     session = boto3.Session(region_name="us-east-1")
 
@@ -235,7 +235,7 @@ def test_add_new_relic(aws_credentials, mock_function_config):
     assert update_kwargs["Layers"][0] != get_arn_prefix("us-east-1")
 
 
-@mock_lambda
+@mock_aws
 def test_add_new_relic_dotnet(aws_credentials, mock_function_config):
     session = boto3.Session(region_name="us-east-1")
 
@@ -298,7 +298,7 @@ def test_add_new_relic_dotnet(aws_credentials, mock_function_config):
         )
 
 
-@mock_lambda
+@mock_aws
 def test_remove_new_relic(aws_credentials, mock_function_config):
     session = boto3.Session(region_name="us-east-1")
 

newrelic_lambda_cli-0.9.3/newrelic_lambda_cli/cliutils.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import click
-import emoji
-
-from click.exceptions import Exit
-
-
-def done(message):
-    """Prints a done message to the terminal"""
-    click.echo(emoji.emojize(":sparkles: %s :sparkles:" % message, language="alias"))
-
-
-def failure(message, exit=False):
-    """Prints a failure message to the terminal"""
-    click.echo(
-        emoji.emojize(":heavy_multiplication_x: %s" % message, language="alias"),
-        color="red",
-        err=True,
-    )
-    if exit:
-        raise Exit(1)
-
-
-def success(message):
-    """Prints a success message to the terminal"""
-    click.echo(
-        emoji.emojize(":heavy_check_mark: %s" % message, language="alias"),
-        color="green",
-    )
-
-
-def warning(message):
-    """Prints a warningmessage to the terminal"""
-    click.echo(
-        emoji.emojize(":heavy_exclamation_mark: %s" % message, language="alias"),
-        color="blue",
-    )