From dd22e7855a2d28b969a955ec940c30bf5d141804 Mon Sep 17 00:00:00 2001
From: Mike Grima <mgrima@netflix.com>
Date: Mon, 27 Apr 2020 12:48:23 -0700
Subject: [PATCH] Fixed a regression with CloudWatch

---
 moto/cloudwatch/responses.py                  |  2 +-
 moto/s3/models.py                             |  6 +-
 tests/test_cloudwatch/test_cloudwatch.py      | 63 ++++++++++---------
 .../test_cloudwatch/test_cloudwatch_boto3.py  |  8 +--
 4 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/moto/cloudwatch/responses.py b/moto/cloudwatch/responses.py
index 93abb8b95..56ba68bb9 100644
--- a/moto/cloudwatch/responses.py
+++ b/moto/cloudwatch/responses.py
@@ -384,7 +384,7 @@ LIST_METRICS_TEMPLATE = """<ListMetricsResponse xmlns="http://monitoring.amazona
                     </member>
                     {% endfor %}
                 </Dimensions>
-                <MetricName>Metric:{{ metric.name }}</MetricName>
+                <MetricName>{{ metric.name }}</MetricName>
                 <Namespace>{{ metric.namespace }}</Namespace>
             </member>
             {% endfor %}
diff --git a/moto/s3/models.py b/moto/s3/models.py
index c7693fe14..7373dc9e3 100644
--- a/moto/s3/models.py
+++ b/moto/s3/models.py
@@ -22,7 +22,7 @@ import six
 from bisect import insort
 from moto.core import ACCOUNT_ID, BaseBackend, BaseModel
 from moto.core.utils import iso_8601_datetime_with_milliseconds, rfc_1123_datetime
-from moto.cloudwatch.models import metric_providers, MetricDatum
+from moto.cloudwatch.models import MetricDatum
 from moto.utilities.tagging_service import TaggingService
 from .exceptions import (
     BucketAlreadyExists,
@@ -1159,9 +1159,11 @@ class S3Backend(BaseBackend):
         self.account_public_access_block = None
         self.tagger = TaggingService()
 
+        # TODO: This is broken! DO NOT IMPORT MUTABLE DATA TYPES FROM OTHER AREAS -- THIS BREAKS UNMOCKING!
+        # WRAP WITH A GETTER/SETTER FUNCTION
         # Register this class as a CloudWatch Metric Provider
         # Must provide a method 'get_cloudwatch_metrics' that will return a list of metrics, based on the data available
-        metric_providers["S3"] = self
+        # metric_providers["S3"] = self
 
     def get_cloudwatch_metrics(self):
         metrics = []
diff --git a/tests/test_cloudwatch/test_cloudwatch.py b/tests/test_cloudwatch/test_cloudwatch.py
index 2d338cf35..60b6898bd 100644
--- a/tests/test_cloudwatch/test_cloudwatch.py
+++ b/tests/test_cloudwatch/test_cloudwatch.py
@@ -88,7 +88,7 @@ def test_put_metric_data():
     metric_names.should.have(1)
     metric = metrics[0]
     metric.namespace.should.equal("tester")
-    metric.name.should.equal("Metric:metric")
+    metric.name.should.equal("metric")
     dict(metric.dimensions).should.equal({"InstanceId": ["i-0123456,i-0123457"]})
 
 
@@ -157,33 +157,34 @@ def test_get_metric_statistics():
     datapoint.should.have.key("Timestamp").which.should.equal(metric_timestamp)
 
 
-@mock_s3_deprecated
-@mock_cloudwatch_deprecated
-def test_cloudwatch_return_s3_metrics():
-
-    region = "us-east-1"
-
-    cw = boto.ec2.cloudwatch.connect_to_region(region)
-    s3 = boto.s3.connect_to_region(region)
-
-    bucket_name_1 = "test-bucket-1"
-    bucket_name_2 = "test-bucket-2"
-
-    bucket1 = s3.create_bucket(bucket_name=bucket_name_1)
-    key = Key(bucket1)
-    key.key = "the-key"
-    key.set_contents_from_string("foobar" * 4)
-    s3.create_bucket(bucket_name=bucket_name_2)
-
-    metrics_s3_bucket_1 = cw.list_metrics(dimensions={"BucketName": bucket_name_1})
-    # Verify that the OOTB S3 metrics are available for the created buckets
-    len(metrics_s3_bucket_1).should.be(2)
-    metric_names = [m.name for m in metrics_s3_bucket_1]
-    sorted(metric_names).should.equal(
-        ["Metric:BucketSizeBytes", "Metric:NumberOfObjects"]
-    )
-
-    # Explicit clean up - the metrics for these buckets are messing with subsequent tests
-    key.delete()
-    s3.delete_bucket(bucket_name_1)
-    s3.delete_bucket(bucket_name_2)
+# TODO: THIS IS CURRENTLY BROKEN!
+# @mock_s3_deprecated
+# @mock_cloudwatch_deprecated
+# def test_cloudwatch_return_s3_metrics():
+#
+#     region = "us-east-1"
+#
+#     cw = boto.ec2.cloudwatch.connect_to_region(region)
+#     s3 = boto.s3.connect_to_region(region)
+#
+#     bucket_name_1 = "test-bucket-1"
+#     bucket_name_2 = "test-bucket-2"
+#
+#     bucket1 = s3.create_bucket(bucket_name=bucket_name_1)
+#     key = Key(bucket1)
+#     key.key = "the-key"
+#     key.set_contents_from_string("foobar" * 4)
+#     s3.create_bucket(bucket_name=bucket_name_2)
+#
+#     metrics_s3_bucket_1 = cw.list_metrics(dimensions={"BucketName": bucket_name_1})
+#     # Verify that the OOTB S3 metrics are available for the created buckets
+#     len(metrics_s3_bucket_1).should.be(2)
+#     metric_names = [m.name for m in metrics_s3_bucket_1]
+#     sorted(metric_names).should.equal(
+#         ["Metric:BucketSizeBytes", "Metric:NumberOfObjects"]
+#     )
+#
+#     # Explicit clean up - the metrics for these buckets are messing with subsequent tests
+#     key.delete()
+#     s3.delete_bucket(bucket_name_1)
+#     s3.delete_bucket(bucket_name_2)
diff --git a/tests/test_cloudwatch/test_cloudwatch_boto3.py b/tests/test_cloudwatch/test_cloudwatch_boto3.py
index 12c875a92..0c814ee44 100644
--- a/tests/test_cloudwatch/test_cloudwatch_boto3.py
+++ b/tests/test_cloudwatch/test_cloudwatch_boto3.py
@@ -155,7 +155,7 @@ def test_put_metric_data_no_dimensions():
     metrics.should.have.length_of(1)
     metric = metrics[0]
     metric["Namespace"].should.equal("tester")
-    metric["MetricName"].should.equal("Metric:metric")
+    metric["MetricName"].should.equal("metric")
 
 
 @mock_cloudwatch
@@ -183,7 +183,7 @@ def test_put_metric_data_with_statistics():
     metrics.should.have.length_of(1)
     metric = metrics[0]
     metric["Namespace"].should.equal("tester")
-    metric["MetricName"].should.equal("Metric:statmetric")
+    metric["MetricName"].should.equal("statmetric")
     # TODO: test statistics - https://github.com/spulec/moto/issues/1615
 
 
@@ -266,12 +266,12 @@ def test_list_metrics():
             {
                 u"Namespace": "list_test_1/",
                 u"Dimensions": [],
-                u"MetricName": "Metric:metric1",
+                u"MetricName": "metric1",
             },
             {
                 u"Namespace": "list_test_1/",
                 u"Dimensions": [],
-                u"MetricName": "Metric:metric1",
+                u"MetricName": "metric1",
             },
         ]
     )