EC2: Simplify DryRun-handling (#5926)

moto/core/responses.py

@@ -838,14 +838,10 @@ class BaseResponse(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
         return "JSON" in self.querystring.get("ContentType", [])
 
     def error_on_dryrun(self) -> None:
-        self.is_not_dryrun()
-
-    def is_not_dryrun(self, action: Optional[str] = None) -> bool:
         if "true" in self.querystring.get("DryRun", ["false"]):
-            a = action or self._get_param("Action")
+            a = self._get_param("Action")
             message = f"An error occurred (DryRunOperation) when calling the {a} operation: Request would have succeeded, but DryRun flag is set"
             raise DryRunClientError(error_type="DryRunOperation", message=message)
-        return True
 
 
 class _RecursiveDictRef(object):

moto/ec2/responses/amis.py

@@ -7,7 +7,9 @@ class AmisResponse(EC2BaseResponse):
         description = self._get_param("Description", if_none="")
         instance_id = self._get_param("InstanceId")
         tag_specifications = self._get_multi_param("TagSpecification")
-        if self.is_not_dryrun("CreateImage"):
+
+        self.error_on_dryrun()
+
         image = self.ec2_backend.create_image(
             instance_id,
             name,
@@ -22,7 +24,9 @@ class AmisResponse(EC2BaseResponse):
         source_region = self._get_param("SourceRegion")
         name = self._get_param("Name")
         description = self._get_param("Description")
-        if self.is_not_dryrun("CopyImage"):
+
+        self.error_on_dryrun()
+
         image = self.ec2_backend.copy_image(
             source_image_id, source_region, name, description
         )
@@ -31,7 +35,9 @@ class AmisResponse(EC2BaseResponse):
 
     def deregister_image(self):
         ami_id = self._get_param("ImageId")
-        if self.is_not_dryrun("DeregisterImage"):
+
+        self.error_on_dryrun()
+
         self.ec2_backend.deregister_image(ami_id)
         template = self.response_template(DEREGISTER_IMAGE_RESPONSE)
         return template.render(success="true")
@@ -60,7 +66,9 @@ class AmisResponse(EC2BaseResponse):
         operation_type = self._get_param("OperationType")
         group = self._get_param("UserGroup.1")
         user_ids = self._get_multi_param("UserId")
-        if self.is_not_dryrun("ModifyImageAttribute"):
+
+        self.error_on_dryrun()
+
         if operation_type == "add":
             self.ec2_backend.add_launch_permission(
                 ami_id, user_ids=user_ids, group=group
@@ -74,16 +82,17 @@ class AmisResponse(EC2BaseResponse):
     def register_image(self):
         name = self.querystring.get("Name")[0]
         description = self._get_param("Description", if_none="")
-        if self.is_not_dryrun("RegisterImage"):
+
+        self.error_on_dryrun()
+
         image = self.ec2_backend.register_image(name, description)
         template = self.response_template(REGISTER_IMAGE_RESPONSE)
         return template.render(image=image)
 
     def reset_image_attribute(self):
-        if self.is_not_dryrun("ResetImageAttribute"):
+        self.error_on_dryrun()
-            raise NotImplementedError(
+
-                "AMIs.reset_image_attribute is not yet implemented"
+        raise NotImplementedError("AMIs.reset_image_attribute is not yet implemented")
-            )
 
 
 CREATE_IMAGE_RESPONSE = """<CreateImageResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">

moto/ec2/responses/elastic_block_store.py

@@ -6,10 +6,10 @@ class ElasticBlockStore(EC2BaseResponse):
         volume_id = self._get_param("VolumeId")
         instance_id = self._get_param("InstanceId")
         device_path = self._get_param("Device")
-        if self.is_not_dryrun("AttachVolume"):
+
-            attachment = self.ec2_backend.attach_volume(
+        self.error_on_dryrun()
-                volume_id, instance_id, device_path
+
-            )
+        attachment = self.ec2_backend.attach_volume(volume_id, instance_id, device_path)
         template = self.response_template(ATTACHED_VOLUME_RESPONSE)
         return template.render(attachment=attachment)
 
@@ -19,7 +19,9 @@ class ElasticBlockStore(EC2BaseResponse):
         description = self._get_param("Description")
         tags = self._parse_tag_specification()
         snapshot_tags = tags.get("snapshot", {})
-        if self.is_not_dryrun("CopySnapshot"):
+
+        self.error_on_dryrun()
+
         snapshot = self.ec2_backend.copy_snapshot(
             source_snapshot_id, source_region, description
         )
@@ -32,7 +34,9 @@ class ElasticBlockStore(EC2BaseResponse):
         description = self._get_param("Description")
         tags = self._parse_tag_specification()
         snapshot_tags = tags.get("snapshot", {})
-        if self.is_not_dryrun("CreateSnapshot"):
+
+        self.error_on_dryrun()
+
         snapshot = self.ec2_backend.create_snapshot(volume_id, description)
         snapshot.add_tags(snapshot_tags)
         template = self.response_template(CREATE_SNAPSHOT_RESPONSE)
@@ -45,7 +49,8 @@ class ElasticBlockStore(EC2BaseResponse):
         tags = self._parse_tag_specification()
         snapshot_tags = tags.get("snapshot", {})
 
-        if self.is_not_dryrun("CreateSnapshots"):
+        self.error_on_dryrun()
+
         snapshots = self.ec2_backend.create_snapshots(
             instance_spec, description, snapshot_tags
         )
@@ -62,7 +67,9 @@ class ElasticBlockStore(EC2BaseResponse):
         encrypted = self._get_bool_param("Encrypted", if_none=False)
         kms_key_id = self._get_param("KmsKeyId")
         iops = self._get_param("Iops")
-        if self.is_not_dryrun("CreateVolume"):
+
+        self.error_on_dryrun()
+
         volume = self.ec2_backend.create_volume(
             size=size,
             zone_name=zone,
@@ -81,7 +88,8 @@ class ElasticBlockStore(EC2BaseResponse):
         target_size = self._get_param("Size")
         target_volume_type = self._get_param("VolumeType")
 
-        if self.is_not_dryrun("ModifyVolume"):
+        self.error_on_dryrun()
+
         volume = self.ec2_backend.modify_volume(
             volume_id, target_size, target_volume_type
         )
@@ -99,13 +107,17 @@ class ElasticBlockStore(EC2BaseResponse):
 
     def delete_snapshot(self):
         snapshot_id = self._get_param("SnapshotId")
-        if self.is_not_dryrun("DeleteSnapshot"):
+
+        self.error_on_dryrun()
+
         self.ec2_backend.delete_snapshot(snapshot_id)
         return DELETE_SNAPSHOT_RESPONSE
 
     def delete_volume(self):
         volume_id = self._get_param("VolumeId")
-        if self.is_not_dryrun("DeleteVolume"):
+
+        self.error_on_dryrun()
+
         self.ec2_backend.delete_volume(volume_id)
         return DELETE_VOLUME_RESPONSE
 
@@ -141,21 +153,23 @@ class ElasticBlockStore(EC2BaseResponse):
         volume_id = self._get_param("VolumeId")
         instance_id = self._get_param("InstanceId")
         device_path = self._get_param("Device")
-        if self.is_not_dryrun("DetachVolume"):
+
-            attachment = self.ec2_backend.detach_volume(
+        self.error_on_dryrun()
-                volume_id, instance_id, device_path
+
-            )
+        attachment = self.ec2_backend.detach_volume(volume_id, instance_id, device_path)
         template = self.response_template(DETATCH_VOLUME_RESPONSE)
         return template.render(attachment=attachment)
 
     def enable_volume_io(self):
-        if self.is_not_dryrun("EnableVolumeIO"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "ElasticBlockStore.enable_volume_io is not yet implemented"
         )
 
     def import_volume(self):
-        if self.is_not_dryrun("ImportVolume"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "ElasticBlockStore.import_volume is not yet implemented"
         )
@@ -172,7 +186,9 @@ class ElasticBlockStore(EC2BaseResponse):
         operation_type = self._get_param("OperationType")
         groups = self._get_multi_param("UserGroup")
         user_ids = self._get_multi_param("UserId")
-        if self.is_not_dryrun("ModifySnapshotAttribute"):
+
+        self.error_on_dryrun()
+
         if operation_type == "add":
             self.ec2_backend.add_create_volume_permission(
                 snapshot_id, user_ids=user_ids, groups=groups
@@ -184,13 +200,15 @@ class ElasticBlockStore(EC2BaseResponse):
         return MODIFY_SNAPSHOT_ATTRIBUTE_RESPONSE
 
     def modify_volume_attribute(self):
-        if self.is_not_dryrun("ModifyVolumeAttribute"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "ElasticBlockStore.modify_volume_attribute is not yet implemented"
         )
 
     def reset_snapshot_attribute(self):
-        if self.is_not_dryrun("ResetSnapshotAttribute"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "ElasticBlockStore.reset_snapshot_attribute is not yet implemented"
         )

moto/ec2/responses/elastic_ip_addresses.py

@@ -9,7 +9,8 @@ class ElasticIPAddresses(EC2BaseResponse):
         tags = self._get_multi_param("TagSpecification")
         tags = add_tag_specification(tags)
 
-        if self.is_not_dryrun("AllocateAddress"):
+        self.error_on_dryrun()
+
         if reallocate_address:
             address = self.ec2_backend.allocate_address(
                 domain, address=reallocate_address, tags=tags
@@ -38,7 +39,8 @@ class ElasticIPAddresses(EC2BaseResponse):
         if "AllowReassociation" in self.querystring:
             reassociate = self._get_param("AllowReassociation") == "true"
 
-        if self.is_not_dryrun("AssociateAddress"):
+        self.error_on_dryrun()
+
         if instance or eni:
             if "PublicIp" in self.querystring:
                 eip = self.ec2_backend.associate_address(
@@ -80,36 +82,44 @@ class ElasticIPAddresses(EC2BaseResponse):
         return template.render(addresses=addresses)
 
     def disassociate_address(self):
-        if self.is_not_dryrun("DisAssociateAddress"):
+        if (
-            if "PublicIp" in self.querystring:
+            "PublicIp" not in self.querystring
-                self.ec2_backend.disassociate_address(
+            and "AssociationId" not in self.querystring
-                    address=self._get_param("PublicIp")
+        ):
-                )
-            elif "AssociationId" in self.querystring:
-                self.ec2_backend.disassociate_address(
-                    association_id=self._get_param("AssociationId")
-                )
-            else:
             self.ec2_backend.raise_error(
                 "MissingParameter",
                 "Invalid request, expect PublicIp/AssociationId parameter.",
             )
 
+        self.error_on_dryrun()
+
+        if "PublicIp" in self.querystring:
+            self.ec2_backend.disassociate_address(address=self._get_param("PublicIp"))
+        elif "AssociationId" in self.querystring:
+            self.ec2_backend.disassociate_address(
+                association_id=self._get_param("AssociationId")
+            )
+
         return self.response_template(DISASSOCIATE_ADDRESS_RESPONSE).render()
 
     def release_address(self):
-        if self.is_not_dryrun("ReleaseAddress"):
+        if (
+            "PublicIp" not in self.querystring
+            and "AllocationId" not in self.querystring
+        ):
+            self.ec2_backend.raise_error(
+                "MissingParameter",
+                "Invalid request, expect PublicIp/AllocationId parameter.",
+            )
+
+        self.error_on_dryrun()
+
         if "PublicIp" in self.querystring:
             self.ec2_backend.release_address(address=self._get_param("PublicIp"))
         elif "AllocationId" in self.querystring:
             self.ec2_backend.release_address(
                 allocation_id=self._get_param("AllocationId")
             )
-            else:
-                self.ec2_backend.raise_error(
-                    "MissingParameter",
-                    "Invalid request, expect PublicIp/AllocationId parameter.",
-                )
 
         return self.response_template(RELEASE_ADDRESS_RESPONSE).render()
 

moto/ec2/responses/elastic_network_interfaces.py

@@ -17,7 +17,8 @@ class ElasticNetworkInterfaces(EC2BaseResponse):
         tags = self._get_multi_param("TagSpecification")
         tags = add_tag_specification(tags)
 
-        if self.is_not_dryrun("CreateNetworkInterface"):
+        self.error_on_dryrun()
+
         eni = self.ec2_backend.create_network_interface(
             subnet,
             private_ip_address,
@@ -34,7 +35,9 @@ class ElasticNetworkInterfaces(EC2BaseResponse):
 
     def delete_network_interface(self):
         eni_id = self._get_param("NetworkInterfaceId")
-        if self.is_not_dryrun("DeleteNetworkInterface"):
+
+        self.error_on_dryrun()
+
         self.ec2_backend.delete_network_interface(eni_id)
         template = self.response_template(DELETE_NETWORK_INTERFACE_RESPONSE)
         return template.render()
@@ -42,7 +45,9 @@ class ElasticNetworkInterfaces(EC2BaseResponse):
     def describe_network_interface_attribute(self):
         eni_id = self._get_param("NetworkInterfaceId")
         attribute = self._get_param("Attribute")
-        if self.is_not_dryrun("DescribeNetworkInterfaceAttribute"):
+
+        self.error_on_dryrun()
+
         eni = self.ec2_backend.get_all_network_interfaces([eni_id])[0]
 
         if attribute == "description":
@@ -68,7 +73,9 @@ class ElasticNetworkInterfaces(EC2BaseResponse):
     def describe_network_interfaces(self):
         eni_ids = self._get_multi_param("NetworkInterfaceId")
         filters = self._filters_from_querystring()
-        if self.is_not_dryrun("DescribeNetworkInterfaces"):
+
+        self.error_on_dryrun()
+
         enis = self.ec2_backend.get_all_network_interfaces(eni_ids, filters)
         template = self.response_template(DESCRIBE_NETWORK_INTERFACES_RESPONSE)
         return template.render(enis=enis)
@@ -77,7 +84,9 @@ class ElasticNetworkInterfaces(EC2BaseResponse):
         eni_id = self._get_param("NetworkInterfaceId")
         instance_id = self._get_param("InstanceId")
         device_index = self._get_param("DeviceIndex")
-        if self.is_not_dryrun("AttachNetworkInterface"):
+
+        self.error_on_dryrun()
+
         attachment_id = self.ec2_backend.attach_network_interface(
             eni_id, instance_id, device_index
         )
@@ -86,7 +95,9 @@ class ElasticNetworkInterfaces(EC2BaseResponse):
 
     def detach_network_interface(self):
         attachment_id = self._get_param("AttachmentId")
-        if self.is_not_dryrun("DetachNetworkInterface"):
+
+        self.error_on_dryrun()
+
         self.ec2_backend.detach_network_interface(attachment_id)
         template = self.response_template(DETACH_NETWORK_INTERFACE_RESPONSE)
         return template.render()
@@ -96,14 +107,17 @@ class ElasticNetworkInterfaces(EC2BaseResponse):
         group_ids = self._get_multi_param("SecurityGroupId")
         source_dest_check = get_attribute_value("SourceDestCheck", self.querystring)
         description = get_attribute_value("Description", self.querystring)
-        if self.is_not_dryrun("ModifyNetworkInterface"):
+
+        self.error_on_dryrun()
+
         self.ec2_backend.modify_network_interface_attribute(
             eni_id, group_ids, source_dest_check, description
         )
         return MODIFY_NETWORK_INTERFACE_ATTRIBUTE_RESPONSE
 
     def reset_network_interface_attribute(self):
-        if self.is_not_dryrun("ResetNetworkInterface"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "ElasticNetworkInterfaces(AmazonVPC).reset_network_interface_attribute is not yet implemented"
         )

moto/ec2/responses/flow_logs.py

@@ -17,7 +17,9 @@ class FlowLogs(EC2BaseResponse):
 
         tags = self._parse_tag_specification()
         tags = tags.get("vpc-flow-log", {})
-        if self.is_not_dryrun("CreateFlowLogs"):
+
+        self.error_on_dryrun()
+
         flow_logs, errors = self.ec2_backend.create_flow_logs(
             resource_type=resource_type,
             resource_ids=resource_ids,
@@ -38,16 +40,19 @@ class FlowLogs(EC2BaseResponse):
         flow_log_ids = self._get_multi_param("FlowLogId")
         filters = self._filters_from_querystring()
         flow_logs = self.ec2_backend.describe_flow_logs(flow_log_ids, filters)
-        if self.is_not_dryrun("DescribeFlowLogs"):
+
+        self.error_on_dryrun()
+
         template = self.response_template(DESCRIBE_FLOW_LOGS_RESPONSE)
         return template.render(flow_logs=flow_logs)
 
     def delete_flow_logs(self):
         flow_log_ids = self._get_multi_param("FlowLogId")
+
+        self.error_on_dryrun()
+
         self.ec2_backend.delete_flow_logs(flow_log_ids)
-        if self.is_not_dryrun("DeleteFlowLogs"):
+        return self.response_template(DELETE_FLOW_LOGS_RESPONSE).render()
-            template = self.response_template(DELETE_FLOW_LOGS_RESPONSE)
-            return template.render()
 
 
 CREATE_FLOW_LOGS_RESPONSE = """

moto/ec2/responses/instances.py

@@ -87,7 +87,8 @@ class InstanceResponse(EC2BaseResponse):
         if mappings:
             kwargs["block_device_mappings"] = mappings
 
-        if self.is_not_dryrun("RunInstance"):
+        self.error_on_dryrun()
+
         new_reservation = self.ec2_backend.add_instances(
             image_id, min_count, user_data, security_group_names, **kwargs
         )
@@ -109,7 +110,9 @@ class InstanceResponse(EC2BaseResponse):
 
     def terminate_instances(self):
         instance_ids = self._get_multi_param("InstanceId")
-        if self.is_not_dryrun("TerminateInstance"):
+
+        self.error_on_dryrun()
+
         instances = self.ec2_backend.terminate_instances(instance_ids)
         from moto.autoscaling import autoscaling_backends
         from moto.elbv2 import elbv2_backends
@@ -117,29 +120,34 @@ class InstanceResponse(EC2BaseResponse):
         autoscaling_backends[self.current_account][
             self.region
         ].notify_terminate_instances(instance_ids)
-            elbv2_backends[self.current_account][
+        elbv2_backends[self.current_account][self.region].notify_terminate_instances(
-                self.region
+            instance_ids
-            ].notify_terminate_instances(instance_ids)
+        )
         template = self.response_template(EC2_TERMINATE_INSTANCES)
         return template.render(instances=instances)
 
     def reboot_instances(self):
         instance_ids = self._get_multi_param("InstanceId")
-        if self.is_not_dryrun("RebootInstance"):
+
+        self.error_on_dryrun()
+
         instances = self.ec2_backend.reboot_instances(instance_ids)
         template = self.response_template(EC2_REBOOT_INSTANCES)
         return template.render(instances=instances)
 
     def stop_instances(self):
         instance_ids = self._get_multi_param("InstanceId")
-        if self.is_not_dryrun("StopInstance"):
+
+        self.error_on_dryrun()
+
         instances = self.ec2_backend.stop_instances(instance_ids)
         template = self.response_template(EC2_STOP_INSTANCES)
         return template.render(instances=instances)
 
     def start_instances(self):
         instance_ids = self._get_multi_param("InstanceId")
-        if self.is_not_dryrun("StartInstance"):
+        self.error_on_dryrun()
+
         instances = self.ec2_backend.start_instances(instance_ids)
         template = self.response_template(EC2_START_INSTANCES)
         return template.render(instances=instances)
@@ -268,7 +276,8 @@ class InstanceResponse(EC2BaseResponse):
             instance_id = self._get_param("InstanceId")
             instance = self.ec2_backend.get_instance(instance_id)
 
-            if self.is_not_dryrun("ModifyInstanceAttribute"):
+            self.error_on_dryrun()
+
             block_device_type = instance.block_device_mapping[device_name_value]
             block_device_type.delete_on_termination = del_on_term_value
 
@@ -288,7 +297,8 @@ class InstanceResponse(EC2BaseResponse):
         if not attribute_key:
             return
 
-        if self.is_not_dryrun("Modify" + attribute_key.split(".")[0]):
+        self.error_on_dryrun()
+
         value = self.querystring.get(attribute_key)[0]
         normalized_attribute = camelcase_to_underscores(attribute_key.split(".")[0])
         instance_id = self._get_param("InstanceId")
@@ -303,7 +313,8 @@ class InstanceResponse(EC2BaseResponse):
         if attribute_key is None:
             return
 
-        if self.is_not_dryrun("ModifyInstanceAttribute"):
+        self.error_on_dryrun()
+
         value = self._get_param("Value")
         normalized_attribute = camelcase_to_underscores(attribute_key)
         instance_id = self._get_param("InstanceId")
@@ -319,7 +330,8 @@ class InstanceResponse(EC2BaseResponse):
                 new_security_grp_list.append(self.querystring.get(key)[0])
 
         instance_id = self._get_param("InstanceId")
-        if self.is_not_dryrun("ModifyInstanceSecurityGroups"):
+        self.error_on_dryrun()
+
         self.ec2_backend.modify_instance_security_groups(
             instance_id, new_security_grp_list
         )

moto/ec2/responses/internet_gateways.py

@@ -5,28 +5,29 @@ class InternetGateways(EC2BaseResponse):
     def attach_internet_gateway(self):
         igw_id = self._get_param("InternetGatewayId")
         vpc_id = self._get_param("VpcId")
-        if self.is_not_dryrun("AttachInternetGateway"):
+
+        self.error_on_dryrun()
+
         self.ec2_backend.attach_internet_gateway(igw_id, vpc_id)
-            template = self.response_template(ATTACH_INTERNET_GATEWAY_RESPONSE)
+        return self.response_template(ATTACH_INTERNET_GATEWAY_RESPONSE).render()
-            return template.render()
 
     def create_internet_gateway(self):
-        if self.is_not_dryrun("CreateInternetGateway"):
+        self.error_on_dryrun()
-            tags = self._get_multi_param(
+
-                "TagSpecification", skip_result_conversion=True
+        tags = self._get_multi_param("TagSpecification", skip_result_conversion=True)
-            )
         if tags:
             tags = tags[0].get("Tag") or []
         igw = self.ec2_backend.create_internet_gateway(tags=tags)
-            template = self.response_template(CREATE_INTERNET_GATEWAY_RESPONSE)
+        return self.response_template(CREATE_INTERNET_GATEWAY_RESPONSE).render(
-            return template.render(internet_gateway=igw)
+            internet_gateway=igw
+        )
 
     def delete_internet_gateway(self):
         igw_id = self._get_param("InternetGatewayId")
-        if self.is_not_dryrun("DeleteInternetGateway"):
+        self.error_on_dryrun()
+
         self.ec2_backend.delete_internet_gateway(igw_id)
-            template = self.response_template(DELETE_INTERNET_GATEWAY_RESPONSE)
+        return self.response_template(DELETE_INTERNET_GATEWAY_RESPONSE).render()
-            return template.render()
 
     def describe_internet_gateways(self):
         filter_dict = self._filters_from_querystring()
@@ -46,10 +47,10 @@ class InternetGateways(EC2BaseResponse):
         # raise else DependencyViolationError()
         igw_id = self._get_param("InternetGatewayId")
         vpc_id = self._get_param("VpcId")
-        if self.is_not_dryrun("DetachInternetGateway"):
+        self.error_on_dryrun()
+
         self.ec2_backend.detach_internet_gateway(igw_id, vpc_id)
-            template = self.response_template(DETACH_INTERNET_GATEWAY_RESPONSE)
+        return self.response_template(DETACH_INTERNET_GATEWAY_RESPONSE).render()
-            return template.render()
 
 
 ATTACH_INTERNET_GATEWAY_RESPONSE = """<AttachInternetGatewayResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">

moto/ec2/responses/ip_addresses.py

@@ -3,13 +3,15 @@ from moto.core.responses import BaseResponse
 
 class IPAddresses(BaseResponse):
     def assign_private_ip_addresses(self):
-        if self.is_not_dryrun("AssignPrivateIPAddress"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "IPAddresses.assign_private_ip_addresses is not yet implemented"
         )
 
     def unassign_private_ip_addresses(self):
-        if self.is_not_dryrun("UnAssignPrivateIPAddress"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "IPAddresses.unassign_private_ip_addresses is not yet implemented"
         )

moto/ec2/responses/key_pairs.py

@@ -4,14 +4,15 @@ from ._base_response import EC2BaseResponse
 class KeyPairs(EC2BaseResponse):
     def create_key_pair(self):
         name = self._get_param("KeyName")
-        if self.is_not_dryrun("CreateKeyPair"):
+        self.error_on_dryrun()
+
         keypair = self.ec2_backend.create_key_pair(name)
-            template = self.response_template(CREATE_KEY_PAIR_RESPONSE)
+        return self.response_template(CREATE_KEY_PAIR_RESPONSE).render(keypair=keypair)
-            return template.render(keypair=keypair)
 
     def delete_key_pair(self):
         name = self._get_param("KeyName")
-        if self.is_not_dryrun("DeleteKeyPair"):
+        self.error_on_dryrun()
+
         self.ec2_backend.delete_key_pair(name)
         return self.response_template(DELETE_KEY_PAIR_RESPONSE).render()
 
@@ -25,10 +26,10 @@ class KeyPairs(EC2BaseResponse):
     def import_key_pair(self):
         name = self._get_param("KeyName")
         material = self._get_param("PublicKeyMaterial")
-        if self.is_not_dryrun("ImportKeyPair"):
+        self.error_on_dryrun()
+
         keypair = self.ec2_backend.import_key_pair(name, material)
-            template = self.response_template(IMPORT_KEYPAIR_RESPONSE)
+        return self.response_template(IMPORT_KEYPAIR_RESPONSE).render(keypair=keypair)
-            return template.render(keypair=keypair)
 
 
 DESCRIBE_KEY_PAIRS_RESPONSE = """<DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">

moto/ec2/responses/launch_templates.py

@@ -48,57 +48,16 @@ def pretty_xml(tree):
     return parsed.toprettyxml(indent="    ")
 
 
-def parse_object(raw_data):
-    out_data = {}
-    for key, value in raw_data.items():
-        key_fix_splits = key.split("_")
-        key_len = len(key_fix_splits)
-
-        new_key = ""
-        for i in range(0, key_len):
-            new_key += key_fix_splits[i][0].upper() + key_fix_splits[i][1:]
-
-        data = out_data
-        splits = new_key.split(".")
-        for split in splits[:-1]:
-            if split not in data:
-                data[split] = {}
-            data = data[split]
-
-        data[splits[-1]] = value
-
-    out_data = parse_lists(out_data)
-    return out_data
-
-
-def parse_lists(data):
-    for key, value in data.items():
-        if isinstance(value, dict):
-            keys = data[key].keys()
-            is_list = all(map(lambda k: k.isnumeric(), keys))
-
-            if is_list:
-                new_value = []
-                keys = sorted(list(keys))
-                for k in keys:
-                    lvalue = value[k]
-                    if isinstance(lvalue, dict):
-                        lvalue = parse_lists(lvalue)
-                    new_value.append(lvalue)
-                data[key] = new_value
-    return data
-
-
 class LaunchTemplates(EC2BaseResponse):
     def create_launch_template(self):
         name = self._get_param("LaunchTemplateName")
         version_description = self._get_param("VersionDescription")
         tag_spec = self._parse_tag_specification()
 
-        raw_template_data = self._get_dict_param("LaunchTemplateData.")
+        parsed_template_data = self._get_multi_param_dict("LaunchTemplateData")
-        parsed_template_data = parse_object(raw_template_data)
+
+        self.error_on_dryrun()
 
-        if self.is_not_dryrun("CreateLaunchTemplate"):
         if tag_spec:
             if "TagSpecifications" not in parsed_template_data:
                 parsed_template_data["TagSpecifications"] = []
@@ -108,8 +67,7 @@ class LaunchTemplates(EC2BaseResponse):
                     {
                         "ResourceType": resource_type,
                         "Tags": [
-                                {"Key": key, "Value": value}
+                            {"Key": key, "Value": value} for key, value in tags.items()
-                                for key, value in tags.items()
                         ],
                     }
                 )
@@ -148,10 +106,10 @@ class LaunchTemplates(EC2BaseResponse):
 
         version_description = self._get_param("VersionDescription")
 
-        raw_template_data = self._get_dict_param("LaunchTemplateData.")
+        template_data = self._get_multi_param_dict("LaunchTemplateData")
-        template_data = parse_object(raw_template_data)
+
+        self.error_on_dryrun()
 
-        if self.is_not_dryrun("CreateLaunchTemplate"):
         version = template.create_version(template_data, version_description)
 
         tree = xml_root("CreateLaunchTemplateVersionResponse")
@@ -175,7 +133,8 @@ class LaunchTemplates(EC2BaseResponse):
         name = self._get_param("LaunchTemplateName")
         tid = self._get_param("LaunchTemplateId")
 
-        if self.is_not_dryrun("DeleteLaunchTemplate"):
+        self.error_on_dryrun()
+
         template = self.ec2_backend.delete_launch_template(name, tid)
 
         tree = xml_root("DeleteLaunchTemplatesResponse")
@@ -191,9 +150,6 @@ class LaunchTemplates(EC2BaseResponse):
 
         return pretty_xml(tree)
 
-    # def delete_launch_template_versions(self):
-    #     pass
-
     def describe_launch_template_versions(self):
         name = self._get_param("LaunchTemplateName")
         template_id = self._get_param("LaunchTemplateId")
@@ -213,7 +169,8 @@ class LaunchTemplates(EC2BaseResponse):
                 "all filters", "DescribeLaunchTemplateVersions"
             )
 
-        if self.is_not_dryrun("DescribeLaunchTemplateVersions"):
+        self.error_on_dryrun()
+
         tree = ElementTree.Element(
             "DescribeLaunchTemplateVersionsResponse",
             {"xmlns": "http://ec2.amazonaws.com/doc/2016-11-15/"},
@@ -271,7 +228,8 @@ class LaunchTemplates(EC2BaseResponse):
         template_ids = self._get_multi_param("LaunchTemplateId")
         filters = self._filters_from_querystring()
 
-        if self.is_not_dryrun("DescribeLaunchTemplates"):
+        self.error_on_dryrun()
+
         tree = ElementTree.Element("DescribeLaunchTemplatesResponse")
         templates_node = ElementTree.SubElement(tree, "launchTemplates")
 
@@ -299,6 +257,3 @@ class LaunchTemplates(EC2BaseResponse):
             )
 
         return pretty_xml(tree)
-
-    # def modify_launch_template(self):
-    #     pass

moto/ec2/responses/monitoring.py

@@ -3,13 +3,13 @@ from moto.core.responses import BaseResponse
 
 class Monitoring(BaseResponse):
     def monitor_instances(self):
-        if self.is_not_dryrun("MonitorInstances"):
+        self.error_on_dryrun()
-            raise NotImplementedError(
+
-                "Monitoring.monitor_instances is not yet implemented"
+        raise NotImplementedError("Monitoring.monitor_instances is not yet implemented")
-            )
 
     def unmonitor_instances(self):
-        if self.is_not_dryrun("UnMonitorInstances"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "Monitoring.unmonitor_instances is not yet implemented"
         )

moto/ec2/responses/placement_groups.py

@@ -3,13 +3,15 @@ from moto.core.responses import BaseResponse
 
 class PlacementGroups(BaseResponse):
     def create_placement_group(self):
-        if self.is_not_dryrun("CreatePlacementGroup"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "PlacementGroups.create_placement_group is not yet implemented"
         )
 
     def delete_placement_group(self):
-        if self.is_not_dryrun("DeletePlacementGroup"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "PlacementGroups.delete_placement_group is not yet implemented"
         )

moto/ec2/responses/reserved_instances.py

@@ -3,13 +3,15 @@ from moto.core.responses import BaseResponse
 
 class ReservedInstances(BaseResponse):
     def cancel_reserved_instances_listing(self):
-        if self.is_not_dryrun("CancelReservedInstances"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "ReservedInstances.cancel_reserved_instances_listing is not yet implemented"
         )
 
     def create_reserved_instances_listing(self):
-        if self.is_not_dryrun("CreateReservedInstances"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "ReservedInstances.create_reserved_instances_listing is not yet implemented"
         )
@@ -30,7 +32,8 @@ class ReservedInstances(BaseResponse):
         )
 
     def purchase_reserved_instances_offering(self):
-        if self.is_not_dryrun("PurchaseReservedInstances"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "ReservedInstances.purchase_reserved_instances_offering is not yet implemented"
         )

moto/ec2/responses/security_groups.py

@@ -128,7 +128,8 @@ class SecurityGroups(EC2BaseResponse):
             )
 
     def authorize_security_group_egress(self):
-        if self.is_not_dryrun("GrantSecurityGroupEgress"):
+        self.error_on_dryrun()
+
         for args in self._process_rules_from_querystring():
             rule, group = self.ec2_backend.authorize_security_group_egress(*args)
         self.ec2_backend.sg_old_egress_ruls[group.id] = group.egress_rules.copy()
@@ -136,7 +137,8 @@ class SecurityGroups(EC2BaseResponse):
         return template.render(rule=rule, group=group)
 
     def authorize_security_group_ingress(self):
-        if self.is_not_dryrun("GrantSecurityGroupIngress"):
+        self.error_on_dryrun()
+
         for args in self._process_rules_from_querystring():
             rule, group = self.ec2_backend.authorize_security_group_ingress(*args)
         self.ec2_backend.sg_old_ingress_ruls[group.id] = group.ingress_rules.copy()
@@ -152,17 +154,14 @@ class SecurityGroups(EC2BaseResponse):
         tags = (tags or {}).get("Tag", [])
         tags = {t["Key"]: t["Value"] for t in tags}
 
-        if self.is_not_dryrun("CreateSecurityGroup"):
+        self.error_on_dryrun()
+
         group = self.ec2_backend.create_security_group(
             name, description, vpc_id=vpc_id, tags=tags
         )
         if group:
-                self.ec2_backend.sg_old_ingress_ruls[
+            self.ec2_backend.sg_old_ingress_ruls[group.id] = group.ingress_rules.copy()
-                    group.id
+            self.ec2_backend.sg_old_egress_ruls[group.id] = group.egress_rules.copy()
-                ] = group.ingress_rules.copy()
-                self.ec2_backend.sg_old_egress_ruls[
-                    group.id
-                ] = group.egress_rules.copy()
         template = self.response_template(CREATE_SECURITY_GROUP_RESPONSE)
         return template.render(group=group)
 
@@ -174,7 +173,8 @@ class SecurityGroups(EC2BaseResponse):
         name = self._get_param("GroupName")
         sg_id = self._get_param("GroupId")
 
-        if self.is_not_dryrun("DeleteSecurityGroup"):
+        self.error_on_dryrun()
+
         if name:
             self.ec2_backend.delete_security_group(name)
         elif sg_id:
@@ -197,19 +197,23 @@ class SecurityGroups(EC2BaseResponse):
     def describe_security_group_rules(self):
         group_id = self._get_param("GroupId")
         filters = self._get_param("Filter")
-        if self.is_not_dryrun("DescribeSecurityGroups"):
+
+        self.error_on_dryrun()
+
         rules = self.ec2_backend.describe_security_group_rules(group_id, filters)
         template = self.response_template(DESCRIBE_SECURITY_GROUP_RULES_RESPONSE)
         return template.render(rules=rules)
 
     def revoke_security_group_egress(self):
-        if self.is_not_dryrun("RevokeSecurityGroupEgress"):
+        self.error_on_dryrun()
+
         for args in self._process_rules_from_querystring():
             self.ec2_backend.revoke_security_group_egress(*args)
         return REVOKE_SECURITY_GROUP_EGRESS_RESPONSE
 
     def revoke_security_group_ingress(self):
-        if self.is_not_dryrun("RevokeSecurityGroupIngress"):
+        self.error_on_dryrun()
+
         for args in self._process_rules_from_querystring():
             self.ec2_backend.revoke_security_group_ingress(*args)
         return REVOKE_SECURITY_GROUP_INGRESS_RESPONSE

moto/ec2/responses/settings.py

@@ -3,25 +3,22 @@ from moto.core.responses import BaseResponse
 
 class Settings(BaseResponse):
     def disable_ebs_encryption_by_default(self):
-        if self.is_not_dryrun("DisableEbsEncryptionByDefault"):
+        self.error_on_dryrun()
+
         self.ec2_backend.disable_ebs_encryption_by_default()
-            template = self.response_template(
+        template = self.response_template(DISABLE_EBS_ENCRYPTION_BY_DEFAULT_RESPONSE)
-                DISABLE_EBS_ENCRYPTION_BY_DEFAULT_RESPONSE
+        return template.render(ebsEncryptionByDefault=False).replace("False", "false")
-            )
-            return template.render(ebsEncryptionByDefault=False).replace(
-                "False", "false"
-            )
 
     def enable_ebs_encryption_by_default(self):
-        if self.is_not_dryrun("EnableEbsEncryptionByDefault"):
+        self.error_on_dryrun()
+
         self.ec2_backend.enable_ebs_encryption_by_default()
-            template = self.response_template(
+        template = self.response_template(ENABLED_EBS_ENCRYPTION_BY_DEFAULT_RESPONSE)
-                ENABLED_EBS_ENCRYPTION_BY_DEFAULT_RESPONSE
-            )
         return template.render(ebsEncryptionByDefault=True).replace("True", "true")
 
     def get_ebs_encryption_by_default(self):
-        if self.is_not_dryrun("GetEbsEncryptionByDefault"):
+        self.error_on_dryrun()
+
         result = self.ec2_backend.get_ebs_encryption_by_default()
         template = self.response_template(GET_EBS_ENCRYPTION_BY_DEFAULT_RESPONSE)
         return (

moto/ec2/responses/spot_instances.py

@@ -4,19 +4,23 @@ from ._base_response import EC2BaseResponse
 class SpotInstances(EC2BaseResponse):
     def cancel_spot_instance_requests(self):
         request_ids = self._get_multi_param("SpotInstanceRequestId")
-        if self.is_not_dryrun("CancelSpotInstance"):
+
+        self.error_on_dryrun()
+
         requests = self.ec2_backend.cancel_spot_instance_requests(request_ids)
         template = self.response_template(CANCEL_SPOT_INSTANCES_TEMPLATE)
         return template.render(requests=requests)
 
     def create_spot_datafeed_subscription(self):
-        if self.is_not_dryrun("CreateSpotDatafeedSubscription"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "SpotInstances.create_spot_datafeed_subscription is not yet implemented"
         )
 
     def delete_spot_datafeed_subscription(self):
-        if self.is_not_dryrun("DeleteSpotDatafeedSubscription"):
+        self.error_on_dryrun()
+
         raise NotImplementedError(
             "SpotInstances.delete_spot_datafeed_subscription is not yet implemented"
         )
@@ -67,7 +71,8 @@ class SpotInstances(EC2BaseResponse):
         )
         tags = self._parse_tag_specification()
 
-        if self.is_not_dryrun("RequestSpotInstance"):
+        self.error_on_dryrun()
+
         requests = self.ec2_backend.request_spot_instances(
             price=price,
             image_id=image_id,

moto/ec2/responses/tags.py

@@ -9,7 +9,9 @@ class TagResponse(EC2BaseResponse):
         validate_resource_ids(resource_ids)
         self.ec2_backend.do_resources_exist(resource_ids)
         tags = tags_from_query_string(self.querystring)
-        if self.is_not_dryrun("CreateTags"):
+
+        self.error_on_dryrun()
+
         self.ec2_backend.create_tags(resource_ids, tags)
         return CREATE_RESPONSE
 
@@ -17,12 +19,17 @@ class TagResponse(EC2BaseResponse):
         resource_ids = self._get_multi_param("ResourceId")
         validate_resource_ids(resource_ids)
         tags = tags_from_query_string(self.querystring)
-        if self.is_not_dryrun("DeleteTags"):
+
+        self.error_on_dryrun()
+
         self.ec2_backend.delete_tags(resource_ids, tags)
         return DELETE_RESPONSE
 
     def describe_tags(self):
         filters = self._filters_from_querystring()
+
+        self.error_on_dryrun()
+
         tags = self.ec2_backend.describe_tags(filters=filters)
         template = self.response_template(DESCRIBE_RESPONSE)
         return template.render(tags=tags)

moto/ecr/responses.py

@@ -90,7 +90,7 @@ class ECRResponse(BaseResponse):
         )
 
     def batch_check_layer_availability(self):
-        if self.is_not_dryrun("BatchCheckLayerAvailability"):
+        self.error_on_dryrun()
         raise NotImplementedError(
             "ECR.batch_check_layer_availability is not yet implemented"
         )
@@ -116,10 +116,8 @@ class ECRResponse(BaseResponse):
         return json.dumps(response)
 
     def complete_layer_upload(self):
-        if self.is_not_dryrun("CompleteLayerUpload"):
+        self.error_on_dryrun()
-            raise NotImplementedError(
+        raise NotImplementedError("ECR.complete_layer_upload is not yet implemented")
-                "ECR.complete_layer_upload is not yet implemented"
-            )
 
     def delete_repository_policy(self):
         registry_id = self._get_param("registryId")
@@ -149,7 +147,7 @@ class ECRResponse(BaseResponse):
         return json.dumps({"authorizationData": auth_data})
 
     def get_download_url_for_layer(self):
-        if self.is_not_dryrun("GetDownloadUrlForLayer"):
+        self.error_on_dryrun()
         raise NotImplementedError(
             "ECR.get_download_url_for_layer is not yet implemented"
         )
@@ -165,10 +163,8 @@ class ECRResponse(BaseResponse):
         )
 
     def initiate_layer_upload(self):
-        if self.is_not_dryrun("InitiateLayerUpload"):
+        self.error_on_dryrun()
-            raise NotImplementedError(
+        raise NotImplementedError("ECR.initiate_layer_upload is not yet implemented")
-                "ECR.initiate_layer_upload is not yet implemented"
-            )
 
     def set_repository_policy(self):
         registry_id = self._get_param("registryId")
@@ -187,7 +183,7 @@ class ECRResponse(BaseResponse):
         )
 
     def upload_layer_part(self):
-        if self.is_not_dryrun("UploadLayerPart"):
+        self.error_on_dryrun()
         raise NotImplementedError("ECR.upload_layer_part is not yet implemented")
 
     def list_tags_for_resource(self):

tests/test_ec2/test_elastic_ip_addresses.py

@@ -155,7 +155,7 @@ def test_eip_associate_classic():
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the DisAssociateAddress operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the DisassociateAddress operation: Request would have succeeded, but DryRun flag is set"
     )
 
     client.disassociate_address(PublicIp=eip.public_ip)

tests/test_ec2/test_elastic_network_interfaces.py

@@ -182,7 +182,7 @@ def test_elastic_network_interfaces_modify_attribute():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the ModifyNetworkInterface operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the ModifyNetworkInterfaceAttribute operation: Request would have succeeded, but DryRun flag is set"
     )
 
     client.modify_network_interface_attribute(

tests/test_ec2/test_instances.py

@@ -43,7 +43,7 @@ def test_instance_launch_and_terminate():
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the RunInstance operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the RunInstances operation: Request would have succeeded, but DryRun flag is set"
     )
 
     reservation = client.run_instances(ImageId=EXAMPLE_AMI_ID, MinCount=1, MaxCount=1)
@@ -85,7 +85,7 @@ def test_instance_launch_and_terminate():
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the TerminateInstance operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the TerminateInstances operation: Request would have succeeded, but DryRun flag is set"
     )
 
     response = client.terminate_instances(InstanceIds=[instance_id])
@@ -920,7 +920,7 @@ def test_instance_start_and_stop():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the StopInstance operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the StopInstances operation: Request would have succeeded, but DryRun flag is set"
     )
 
     stopped_instances = client.stop_instances(InstanceIds=instance_ids)[
@@ -939,7 +939,7 @@ def test_instance_start_and_stop():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the StartInstance operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the StartInstances operation: Request would have succeeded, but DryRun flag is set"
     )
 
     instance1.reload()
@@ -967,7 +967,7 @@ def test_instance_reboot():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the RebootInstance operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the RebootInstances operation: Request would have succeeded, but DryRun flag is set"
     )
 
     instance.state.should.equal({"Code": 16, "Name": "running"})
@@ -988,7 +988,7 @@ def test_instance_attribute_instance_type():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the ModifyInstanceType operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the ModifyInstanceAttribute operation: Request would have succeeded, but DryRun flag is set"
     )
 
     instance.modify_attribute(InstanceType={"Value": "m1.medium"})
@@ -1019,7 +1019,7 @@ def test_modify_instance_attribute_security_groups():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the ModifyInstanceSecurityGroups operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the ModifyInstanceAttribute operation: Request would have succeeded, but DryRun flag is set"
     )
 
     instance.modify_attribute(Groups=[sg_id, sg_id2])
@@ -1043,7 +1043,7 @@ def test_instance_attribute_user_data():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the ModifyUserData operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the ModifyInstanceAttribute operation: Request would have succeeded, but DryRun flag is set"
     )
 
     instance.modify_attribute(UserData={"Value": "this is my user data"})
@@ -1068,7 +1068,7 @@ def test_instance_attribute_source_dest_check():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the ModifySourceDestCheck operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the ModifyInstanceAttribute operation: Request would have succeeded, but DryRun flag is set"
     )
 
     instance.modify_attribute(SourceDestCheck={"Value": False})
@@ -1971,7 +1971,7 @@ def test_get_instance_by_security_group():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the ModifyInstanceSecurityGroups operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the ModifyInstanceAttribute operation: Request would have succeeded, but DryRun flag is set"
     )
 
     client.modify_instance_attribute(InstanceId=instance.id, Groups=[security_group.id])

tests/test_ec2/test_launch_templates.py

@@ -50,6 +50,28 @@ def test_launch_template_create():
     )
 
 
+@mock_ec2
+def test_create_launch_template__dryrun():
+    cli = boto3.client("ec2", region_name="us-east-1")
+
+    template_name = str(uuid4())
+
+    with pytest.raises(ClientError) as exc:
+        cli.create_launch_template(
+            DryRun=True,
+            LaunchTemplateName=template_name,
+            LaunchTemplateData={"ImageId": "ami-abc123"},
+            TagSpecifications=[
+                {"ResourceType": "instance", "Tags": [{"Key": "key", "Value": "value"}]}
+            ],
+        )
+    err = exc.value.response["Error"]
+    err.should.have.key("Code").equals("DryRunOperation")
+    err["Message"].should.equal(
+        "An error occurred (DryRunOperation) when calling the CreateLaunchTemplate operation: Request would have succeeded, but DryRun flag is set"
+    )
+
+
 @mock_ec2
 def test_describe_launch_template_versions():
     template_data = {
@@ -142,6 +164,29 @@ def test_create_launch_template_version():
     version["VersionNumber"].should.equal(2)
 
 
+@mock_ec2
+def test_create_launch_template_version__dryrun():
+    cli = boto3.client("ec2", region_name="us-east-1")
+
+    template_name = str(uuid4())
+    cli.create_launch_template(
+        LaunchTemplateName=template_name, LaunchTemplateData={"ImageId": "ami-abc123"}
+    )
+
+    with pytest.raises(ClientError) as exc:
+        cli.create_launch_template_version(
+            DryRun=True,
+            LaunchTemplateName=template_name,
+            LaunchTemplateData={"ImageId": "ami-def456"},
+            VersionDescription="new ami",
+        )
+    err = exc.value.response["Error"]
+    err.should.have.key("Code").equals("DryRunOperation")
+    err["Message"].should.equal(
+        "An error occurred (DryRunOperation) when calling the CreateLaunchTemplateVersion operation: Request would have succeeded, but DryRun flag is set"
+    )
+
+
 @mock_ec2
 def test_create_launch_template_version_by_id():
     cli = boto3.client("ec2", region_name="us-east-1")
@@ -476,6 +521,9 @@ def test_delete_launch_template__dryrun():
         cli.delete_launch_template(DryRun=True, LaunchTemplateName=template_name)
     err = exc.value.response["Error"]
     err.should.have.key("Code").equals("DryRunOperation")
+    err["Message"].should.equal(
+        "An error occurred (DryRunOperation) when calling the DeleteLaunchTemplate operation: Request would have succeeded, but DryRun flag is set"
+    )
 
     # Template still exists
     cli.describe_launch_templates(LaunchTemplateNames=[template_name])[

tests/test_ec2/test_security_groups.py

@@ -224,7 +224,7 @@ def test_authorize_ip_range_and_revoke():
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the GrantSecurityGroupIngress operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the AuthorizeSecurityGroupIngress operation: Request would have succeeded, but DryRun flag is set"
     )
 
     ingress_permissions = [
@@ -287,7 +287,7 @@ def test_authorize_ip_range_and_revoke():
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the GrantSecurityGroupEgress operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the AuthorizeSecurityGroupEgress operation: Request would have succeeded, but DryRun flag is set"
     )
 
     egress_security_group.authorize_egress(IpPermissions=egress_permissions)

tests/test_ec2/test_spot_instances.py

@@ -57,7 +57,7 @@ def test_request_spot_instances():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the RequestSpotInstance operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the RequestSpotInstances operation: Request would have succeeded, but DryRun flag is set"
     )
 
     request = conn.request_spot_instances(
@@ -178,7 +178,7 @@ def test_cancel_spot_instance_request():
     ex.value.response["Error"]["Code"].should.equal("DryRunOperation")
     ex.value.response["ResponseMetadata"]["HTTPStatusCode"].should.equal(412)
     ex.value.response["Error"]["Message"].should.equal(
-        "An error occurred (DryRunOperation) when calling the CancelSpotInstance operation: Request would have succeeded, but DryRun flag is set"
+        "An error occurred (DryRunOperation) when calling the CancelSpotInstanceRequests operation: Request would have succeeded, but DryRun flag is set"
     )
 
     client.cancel_spot_instance_requests(