Revert stable 8 backports (#2462)

SUMMARY
Reverts two backports for minor features that were intended to be released in 8.3.0, but were instead released in 9.0.0. As such, they are being removed from this branch to reflect what we actually did.

Reviewed-by: Alina Buzachis
Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Mark Chappell

Author: hakbailey

Diff for: changelogs/fragments/20240906-cloudwatch-log-metric-filter-unit-dimensions.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+- Revert backports that ended up being released in 9.0.0. (https://github.com/ansible-collections/amazon.aws/pull/2462)

Diff for: changelogs/fragments/20250114-revert-backports.yml

@@ -56,22 +56,7 @@
         default_value:
           description:
             - The value to emit when a filter pattern does not match a log event.
-            - The I(default_value) and I(dimensions) options are mutually exclusive.
           type: float
-        unit:
-          description:
-            - The unit of the value.
-            - The various options are available `here <https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html>`.
-          type: str
-          version_added: 8.3.0
-        dimensions:
-          description:
-            - A dimension is a name/value pair that is a part of the identity of a metric.
-            - You can assign up to 3 dimensions to a metric.
-            - Dimensions are only supported for JSON or space-delimited metric filters.
-            - The I(default_value) and I(dimensions) options are mutually exclusive.
-          type: dict
-          version_added: 8.3.0
 extends_documentation_fragment:
   - amazon.aws.common.modules
   - amazon.aws.region.modules
@@ -89,26 +74,12 @@
       metric_name: box_free_space
       metric_namespace: fluentd_metrics
       metric_value: "$.value"
-      unit: Bytes
 
 - name: delete metric filter on log group /fluentd/testcase
   amazon.aws.cloudwatchlogs_log_group_metric_filter:
     log_group_name: /fluentd/testcase
     filter_name: BoxFreeStorage
     state: absent
-
-- name: set metric filter on log group /fluentd/testcase with dimensions
-  amazon.aws.cloudwatchlogs_log_group_metric_filter:
-    log_group_name: /fluentd/testcase
-    filter_name: BoxFreeStorage
-    filter_pattern: '{($.value = *) && ($.hostname = *)}'
-    state: present
-    metric_transformation:
-      metric_name: box_free_space
-      metric_namespace: fluentd_metrics
-      metric_value: "$.value"
-      dimensions:
-        hostname: $.hostname
 """
 
 RETURN = r"""
@@ -121,11 +92,7 @@
             "default_value": 3.1415,
             "metric_name": "box_free_space",
             "metric_namespace": "made_with_ansible",
-            "metric_value": "$.value",
-            "unit": "Bytes",
-            "dimensions": {
-              "hostname": "$.hostname"
-            }
+            "metric_value": "$.value"
         }
     ]
 """
@@ -139,32 +106,30 @@ def metricTransformationHandler(metricTransformations, originMetricTransformatio
     if originMetricTransformations:
         change = False
         originMetricTransformations = camel_dict_to_snake_dict(originMetricTransformations)
-        for item in ["default_value", "metric_name", "metric_namespace", "metric_value", "unit", "dimensions"]:
+        for item in ["default_value", "metric_name", "metric_namespace", "metric_value"]:
             if metricTransformations.get(item) != originMetricTransformations.get(item):
                 change = True
     else:
         change = True
 
-    retval = [
-        {
-            "metricName": metricTransformations.get("metric_name"),
-            "metricNamespace": metricTransformations.get("metric_namespace"),
-            "metricValue": metricTransformations.get("metric_value"),
-        }
-    ]
-
-    # Add optional values
     defaultValue = metricTransformations.get("default_value")
-    if defaultValue is not None:
-        retval[0]["defaultValue"] = defaultValue
-
-    dimensions = metricTransformations.get("dimensions")
-    if dimensions is not None:
-        retval[0]["dimensions"] = dimensions
-
-    unit = metricTransformations.get("unit")
-    if unit is not None:
-        retval[0]["unit"] = unit
+    if isinstance(defaultValue, int) or isinstance(defaultValue, float):
+        retval = [
+            {
+                "metricName": metricTransformations.get("metric_name"),
+                "metricNamespace": metricTransformations.get("metric_namespace"),
+                "metricValue": metricTransformations.get("metric_value"),
+                "defaultValue": defaultValue,
+            }
+        ]
+    else:
+        retval = [
+            {
+                "metricName": metricTransformations.get("metric_name"),
+                "metricNamespace": metricTransformations.get("metric_namespace"),
+                "metricValue": metricTransformations.get("metric_value"),
+            }
+        ]
 
     return retval, change
 
@@ -182,8 +147,6 @@ def main():
                 metric_namespace=dict(type="str"),
                 metric_value=dict(type="str"),
                 default_value=dict(type="float"),
-                unit=dict(type="str"),
-                dimensions=dict(type="dict"),
             ),
         ),
     )
@@ -221,12 +184,6 @@ def main():
         metricTransformation = [camel_dict_to_snake_dict(item) for item in [originMetricTransformations]]
 
     elif state == "present":
-        if (
-            metric_transformation.get("default_value") is not None
-            and metric_transformation.get("dimensions") is not None
-        ):
-            module.fail_json(msg="default_value and dimensions are mutually exclusive.")
-
         metricTransformation, change = metricTransformationHandler(
             metricTransformations=metric_transformation, originMetricTransformations=originMetricTransformations
         )

Diff for: changelogs/fragments/ec2_vpc_rote_table_transit_gateway.yml

@@ -57,7 +57,7 @@
     description:
       - List of routes in the route table.
       - Routes are specified as dicts containing the keys V(dest) and one of V(gateway_id),
-        V(instance_id), V(network_interface_id), V(transit_gateway_id), or V(vpc_peering_connection_id).
+        V(instance_id), V(network_interface_id), or V(vpc_peering_connection_id).
       - The value of V(dest) is used for the destination match. It may be a IPv4 CIDR block
         or a IPv6 CIDR block.
       - If V(gateway_id) is specified, you can refer to the VPC's IGW by using the value V(igw).
@@ -108,8 +108,6 @@
         gateway_id: "{{ igw.gateway_id }}"
       - dest: ::/0
         gateway_id: "{{ igw.gateway_id }}"
-      - dest: 0.0.0.0/0
-        gateway_id: "{{ transit_gateway_id }}"
   register: public_route_table
 
 - name: Create VPC gateway
@@ -268,12 +266,6 @@
           type: str
           sample: local
           version_added: 6.0.0
-        transit_gateway_id:
-          description: ID of the Transit gateway.
-          returned: when the route is via a Transit gateway
-          type: str
-          sample: tgw-123456789012
-          version_added: 8.3.0
         origin:
           description: mechanism through which the route is in the table.
           returned: always
@@ -752,8 +744,6 @@ def create_route_spec(connection, module, vpc_id):
             rename_key(route_spec, "gateway_id", "nat_gateway_id")
         if route_spec.get("gateway_id") and route_spec["gateway_id"].startswith("cagw-"):
             rename_key(route_spec, "gateway_id", "carrier_gateway_id")
-        if route_spec.get("gateway_id") and route_spec["gateway_id"].startswith("tgw-"):
-            rename_key(route_spec, "gateway_id", "transit_gateway_id")
 
     return snake_dict_to_camel_dict(routes, capitalize_first=True)
 
@@ -852,6 +842,7 @@ def ensure_route_table_present(connection, module):
         )
     else:
         gateway_changed = False
+
     changed = changed or gateway_changed
 
     if changed:

Diff for: plugins/modules/cloudwatchlogs_log_group_metric_filter.py

@@ -163,12 +163,6 @@
           returned: when the route is via a NAT gateway.
           type: str
           sample: local
-        transit_gateway_id:
-          description: ID of the Transit gateway.
-          returned: when the route is via a Transit gateway.
-          type: str
-          sample: tgw-123456789012
-          version_added: 8.3.0
         origin:
           description: mechanism through which the route is in the table.
           returned: always

Diff for: plugins/modules/ec2_vpc_route_table.py

@@ -100,95 +100,6 @@
           - out is changed
           - out.metric_filters[0].metric_namespace == "made_with_ansible"
 
-    - name: Update metric transformation with dimensions on '{{ log_group_name }}'
-      amazon.aws.cloudwatchlogs_log_group_metric_filter:
-        log_group_name: "{{ log_group_name }}"
-        filter_name: "{{ filter_name }}"
-        filter_pattern: '{ ($.value = *) && ($.hostname = "box")}'
-        state: present
-        metric_transformation:
-          metric_name: box_free_space
-          metric_namespace: made_with_ansible
-          metric_value: $.value
-          dimensions:
-            hostname: $.hostname
-      register: out
-
-    - name: Assert that metric_filter is configured with dimensions
-      ansible.builtin.assert:
-        that:
-          - out is changed
-          - out.metric_filters[0].metric_namespace == "made_with_ansible"
-          - out.metric_filters[0].dimensions.hostname == "$.hostname"
-
-    - name: Update metric transformation with unit on '{{ log_group_name }}'
-      amazon.aws.cloudwatchlogs_log_group_metric_filter:
-        log_group_name: "{{ log_group_name }}"
-        filter_name: "{{ filter_name }}"
-        filter_pattern: '{ ($.value = *) && ($.hostname = "box")}'
-        state: present
-        metric_transformation:
-          metric_name: box_free_space
-          metric_namespace: made_with_ansible
-          metric_value: $.value
-          unit: Bytes
-          dimensions:
-            hostname: $.hostname
-      register: out
-
-    - name: Assert that metric_filter is configured with dimensions and unit
-      ansible.builtin.assert:
-        that:
-          - out is changed
-          - out.metric_filters[0].metric_namespace == "made_with_ansible"
-          - out.metric_filters[0].dimensions.hostname == "$.hostname"
-          - out.metric_filters[0].unit == "Bytes"
-
-    - name: Idempotency check on metric transformation on '{{ log_group_name }}'
-      amazon.aws.cloudwatchlogs_log_group_metric_filter:
-        log_group_name: "{{ log_group_name }}"
-        filter_name: "{{ filter_name }}"
-        filter_pattern: '{ ($.value = *) && ($.hostname = "box")}'
-        state: present
-        metric_transformation:
-          metric_name: box_free_space
-          metric_namespace: made_with_ansible
-          metric_value: $.value
-          unit: Bytes
-          dimensions:
-            hostname: $.hostname
-      register: out
-
-    - name: Assert that idempotent action with unit and dimensions does not register as changed
-      ansible.builtin.assert:
-        that:
-          - out is not changed
-          - out.metric_filters[0].metric_namespace == "made_with_ansible"
-          - out.metric_filters[0].unit == "Bytes"
-          - out.metric_filters[0].dimensions.hostname == "$.hostname"
-
-    - name: Update metric transformation with default_value and dimensions on '{{ log_group_name }}'
-      amazon.aws.cloudwatchlogs_log_group_metric_filter:
-        log_group_name: "{{ log_group_name }}"
-        filter_name: "{{ filter_name }}"
-        filter_pattern: '{ ($.value = *) && ($.hostname = "box")}'
-        state: present
-        metric_transformation:
-          metric_name: box_free_space
-          metric_namespace: made_with_ansible
-          metric_value: $.value
-          default_value: 3.1415
-          dimensions:
-            hostname: $.hostname
-      register: out
-      ignore_errors: true
-
-    - name: Update metric transformation with default_value and dimensions must fail
-      ansible.builtin.assert:
-        that:
-          - out is failed
-          - out.msg == "default_value and dimensions are mutually exclusive."
-
     - name: checkmode delete metric filter on '{{ log_group_name }}'
       amazon.aws.cloudwatchlogs_log_group_metric_filter:
         log_group_name: "{{ log_group_name }}"