diff --git a/amazonka-ec2.cabal b/amazonka-ec2.cabal --- a/amazonka-ec2.cabal +++ b/amazonka-ec2.cabal @@ -1,5 +1,5 @@ name: amazonka-ec2 -version: 0.1.3 +version: 0.1.4 synopsis: Amazon Elastic Compute Cloud SDK. homepage: https://github.com/brendanhay/amazonka license: OtherLicense @@ -205,5 +205,5 @@ Network.AWS.EC2.Internal build-depends: - amazonka-core == 0.1.3.* + amazonka-core == 0.1.4.* , base >= 4.7 && < 5 diff --git a/gen/Network/AWS/EC2/Types.hs b/gen/Network/AWS/EC2/Types.hs --- a/gen/Network/AWS/EC2/Types.hs +++ b/gen/Network/AWS/EC2/Types.hs @@ -1462,12 +1462,12 @@ instance Hashable ImageAttributeName instance FromText ImageAttributeName where - parser = takeText >>= \case - "blockDeviceMapping" -> pure ImageBlockDeviceMapping + parser = takeLowerText >>= \case + "blockdevicemapping" -> pure ImageBlockDeviceMapping "description" -> pure ImageDescription "kernel" -> pure ImageKernel - "launchPermission" -> pure ImageLaunchPermission - "productCodes" -> pure ImageProductCodes + "launchpermission" -> pure ImageLaunchPermission + "productcodes" -> pure ImageProductCodes "ramdisk" -> pure ImageRamdisk e -> fail $ "Failure parsing ImageAttributeName from " ++ show e @@ -1495,7 +1495,7 @@ instance Hashable PermissionGroup instance FromText PermissionGroup where - parser = takeText >>= \case + parser = takeLowerText >>= \case "all" -> pure All e -> fail $ "Failure parsing PermissionGroup from " ++ show e @@ -2052,8 +2052,8 @@ instance Hashable VpnStaticRouteSource instance FromText VpnStaticRouteSource where - parser = takeText >>= \case - "Static" -> pure Static + parser = takeLowerText >>= \case + "static" -> pure Static e -> fail $ "Failure parsing VpnStaticRouteSource from " ++ show e @@ -2200,7 +2200,7 @@ instance Hashable InstanceLifecycleType instance FromText InstanceLifecycleType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "spot" -> pure Spot e -> fail $ "Failure parsing InstanceLifecycleType from " ++ show e @@ -2223,7 +2223,7 @@ instance Hashable VirtualizationType instance FromText VirtualizationType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "hvm" -> pure Hvm "paravirtual" -> pure Paravirtual e -> fail $ @@ -2251,7 +2251,7 @@ instance Hashable NetworkInterfaceStatus instance FromText NetworkInterfaceStatus where - parser = takeText >>= \case + parser = takeLowerText >>= \case "attaching" -> pure Attaching "available" -> pure Available "detaching" -> pure Detaching @@ -2280,8 +2280,8 @@ instance Hashable PlatformValues instance FromText PlatformValues where - parser = takeText >>= \case - "Windows" -> pure Windows + parser = takeLowerText >>= \case + "windows" -> pure Windows e -> fail $ "Failure parsing PlatformValues from " ++ show e @@ -2382,8 +2382,8 @@ instance Hashable RecurringChargeFrequency instance FromText RecurringChargeFrequency where - parser = takeText >>= \case - "Hourly" -> pure Hourly + parser = takeLowerText >>= \case + "hourly" -> pure Hourly e -> fail $ "Failure parsing RecurringChargeFrequency from " ++ show e @@ -2601,7 +2601,7 @@ instance Hashable VolumeState instance FromText VolumeState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "available" -> pure VSAvailable "creating" -> pure VSCreating "deleted" -> pure VSDeleted @@ -3047,7 +3047,7 @@ instance Hashable AccountAttributeName instance FromText AccountAttributeName where - parser = takeText >>= \case + parser = takeLowerText >>= \case "default-vpc" -> pure DefaultVpc "supported-platforms" -> pure SupportedPlatforms e -> fail $ @@ -3339,7 +3339,7 @@ instance Hashable VpcState instance FromText VpcState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "available" -> pure VpcStateAvailable "pending" -> pure VpcStatePending e -> fail $ @@ -3380,7 +3380,7 @@ instance Hashable ResourceType instance FromText ResourceType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "customer-gateway" -> pure RTCustomerGateway "dhcp-options" -> pure RTDhcpOptions "image" -> pure RTImage @@ -3436,7 +3436,7 @@ instance Hashable ReportStatusType instance FromText ReportStatusType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "impaired" -> pure Impaired "ok" -> pure Ok e -> fail $ @@ -3461,8 +3461,8 @@ instance Hashable CurrencyCodeValues instance FromText CurrencyCodeValues where - parser = takeText >>= \case - "USD" -> pure Usd + parser = takeLowerText >>= \case + "usd" -> pure Usd e -> fail $ "Failure parsing CurrencyCodeValues from " ++ show e @@ -3784,7 +3784,7 @@ instance Hashable AttachmentStatus instance FromText AttachmentStatus where - parser = takeText >>= \case + parser = takeLowerText >>= \case "attached" -> pure ASAttached "attaching" -> pure ASAttaching "detached" -> pure ASDetached @@ -3815,10 +3815,10 @@ instance Hashable RouteOrigin instance FromText RouteOrigin where - parser = takeText >>= \case - "CreateRoute" -> pure OriginCreateRoute - "CreateRouteTable" -> pure OriginCreateRouteTable - "EnableVgwRoutePropagation" -> pure OriginEnableVgwRoutePropagation + parser = takeLowerText >>= \case + "createroute" -> pure OriginCreateRoute + "createroutetable" -> pure OriginCreateRouteTable + "enablevgwroutepropagation" -> pure OriginEnableVgwRoutePropagation e -> fail $ "Failure parsing RouteOrigin from " ++ show e @@ -3845,7 +3845,7 @@ instance Hashable ListingState instance FromText ListingState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "available" -> pure LSAvailable "cancelled" -> pure LSCancelled "pending" -> pure LSPending @@ -4080,7 +4080,7 @@ instance Hashable AvailabilityZoneState instance FromText AvailabilityZoneState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "available" -> pure AZSAvailable e -> fail $ "Failure parsing AvailabilityZoneState from " ++ show e @@ -4879,7 +4879,7 @@ instance Hashable SummaryStatus instance FromText SummaryStatus where - parser = takeText >>= \case + parser = takeLowerText >>= \case "impaired" -> pure SSImpaired "insufficient-data" -> pure SSInsufficientData "not-applicable" -> pure SSNotApplicable @@ -5025,7 +5025,7 @@ instance Hashable RuleAction instance FromText RuleAction where - parser = takeText >>= \case + parser = takeLowerText >>= \case "allow" -> pure Allow "deny" -> pure Deny e -> fail $ @@ -5258,9 +5258,9 @@ instance Hashable TelemetryStatus instance FromText TelemetryStatus where - parser = takeText >>= \case - "DOWN" -> pure Down - "UP" -> pure Up + parser = takeLowerText >>= \case + "down" -> pure Down + "up" -> pure Up e -> fail $ "Failure parsing TelemetryStatus from " ++ show e @@ -5487,7 +5487,7 @@ instance Hashable SnapshotState instance FromText SnapshotState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "completed" -> pure Completed "error" -> pure Error "pending" -> pure Pending @@ -5854,7 +5854,7 @@ instance Hashable VolumeAttachmentState instance FromText VolumeAttachmentState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "attached" -> pure VASAttached "attaching" -> pure VASAttaching "detached" -> pure VASDetached @@ -5922,7 +5922,7 @@ instance Hashable RouteState instance FromText RouteState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "active" -> pure Active "blackhole" -> pure Blackhole e -> fail $ @@ -6013,7 +6013,7 @@ instance Hashable BundleTaskState instance FromText BundleTaskState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "bundling" -> pure BTSBundling "cancelling" -> pure BTSCancelling "complete" -> pure BTSComplete @@ -6087,9 +6087,9 @@ instance Hashable VpcAttributeName instance FromText VpcAttributeName where - parser = takeText >>= \case - "enableDnsHostnames" -> pure EnableDnsHostnames - "enableDnsSupport" -> pure EnableDnsSupport + parser = takeLowerText >>= \case + "enablednshostnames" -> pure EnableDnsHostnames + "enablednssupport" -> pure EnableDnsSupport e -> fail $ "Failure parsing VpcAttributeName from " ++ show e @@ -6214,7 +6214,7 @@ instance Hashable SpotInstanceState instance FromText SpotInstanceState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "active" -> pure SISActive "cancelled" -> pure SISCancelled "closed" -> pure SISClosed @@ -6691,7 +6691,7 @@ instance Hashable InstanceType instance FromText InstanceType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "c1.medium" -> pure C1_Medium "c1.xlarge" -> pure C1_XLarge "c3.2xlarge" -> pure C3_2XLarge @@ -7100,7 +7100,7 @@ instance Hashable CancelSpotInstanceRequestState instance FromText CancelSpotInstanceRequestState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "active" -> pure CSIRSActive "cancelled" -> pure CSIRSCancelled "closed" -> pure CSIRSClosed @@ -7134,7 +7134,7 @@ instance Hashable PlacementGroupState instance FromText PlacementGroupState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "available" -> pure PGSAvailable "deleted" -> pure PGSDeleted "deleting" -> pure PGSDeleting @@ -7267,7 +7267,7 @@ instance Hashable ExportEnvironment instance FromText ExportEnvironment where - parser = takeText >>= \case + parser = takeLowerText >>= \case "citrix" -> pure Citrix "microsoft" -> pure Microsoft "vmware" -> pure Vmware @@ -7518,7 +7518,7 @@ instance Hashable ShutdownBehavior instance FromText ShutdownBehavior where - parser = takeText >>= \case + parser = takeLowerText >>= \case "stop" -> pure Stop "terminate" -> pure Terminate e -> fail $ @@ -7675,7 +7675,7 @@ instance Hashable SubnetState instance FromText SubnetState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "available" -> pure SSAvailable "pending" -> pure SSPending e -> fail $ @@ -7700,7 +7700,7 @@ instance Hashable ContainerFormat instance FromText ContainerFormat where - parser = takeText >>= \case + parser = takeLowerText >>= \case "ova" -> pure Ova e -> fail $ "Failure parsing ContainerFormat from " ++ show e @@ -7829,7 +7829,7 @@ instance Hashable StatusType instance FromText StatusType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "failed" -> pure Failed "insufficient-data" -> pure InsufficientData "passed" -> pure Passed @@ -7917,11 +7917,11 @@ instance Hashable NetworkInterfaceAttribute instance FromText NetworkInterfaceAttribute where - parser = takeText >>= \case + parser = takeLowerText >>= \case "attachment" -> pure Attachment "description" -> pure Description - "groupSet" -> pure GroupSet - "sourceDestCheck" -> pure SourceDestCheck + "groupset" -> pure GroupSet + "sourcedestcheck" -> pure SourceDestCheck e -> fail $ "Failure parsing NetworkInterfaceAttribute from " ++ show e @@ -7948,7 +7948,7 @@ instance Hashable ImageTypeValues instance FromText ImageTypeValues where - parser = takeText >>= \case + parser = takeLowerText >>= \case "kernel" -> pure Kernel "machine" -> pure Machine "ramdisk" -> pure Ramdisk @@ -8015,9 +8015,9 @@ instance Hashable SnapshotAttributeName instance FromText SnapshotAttributeName where - parser = takeText >>= \case - "createVolumePermission" -> pure SANCreateVolumePermission - "productCodes" -> pure SANProductCodes + parser = takeLowerText >>= \case + "createvolumepermission" -> pure SANCreateVolumePermission + "productcodes" -> pure SANProductCodes e -> fail $ "Failure parsing SnapshotAttributeName from " ++ show e @@ -8101,7 +8101,7 @@ instance Hashable VpnState instance FromText VpnState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "available" -> pure VpnStateAvailable "deleted" -> pure VpnStateDeleted "deleting" -> pure VpnStateDeleting @@ -8211,7 +8211,7 @@ instance Hashable HypervisorType instance FromText HypervisorType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "ovm" -> pure Ovm "xen" -> pure Xen e -> fail $ @@ -8366,7 +8366,7 @@ instance Hashable ReservedInstanceState instance FromText ReservedInstanceState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "active" -> pure RISActive "payment-failed" -> pure RISPaymentFailed "payment-pending" -> pure RISPaymentPending @@ -8407,20 +8407,20 @@ instance Hashable InstanceAttributeName instance FromText InstanceAttributeName where - parser = takeText >>= \case - "blockDeviceMapping" -> pure IANInstanceBlockDeviceMapping - "disableApiTermination" -> pure IANInstanceDisableApiTermination - "ebsOptimized" -> pure IANInstanceEbsOptimized - "groupSet" -> pure IANInstanceGroupSet - "instanceInitiatedShutdownBehavior" -> pure IANInstanceInstanceInitiatedShutdownBehavior - "instanceType" -> pure IANInstanceInstanceType + parser = takeLowerText >>= \case + "blockdevicemapping" -> pure IANInstanceBlockDeviceMapping + "disableapitermination" -> pure IANInstanceDisableApiTermination + "ebsoptimized" -> pure IANInstanceEbsOptimized + "groupset" -> pure IANInstanceGroupSet + "instanceinitiatedshutdownbehavior" -> pure IANInstanceInstanceInitiatedShutdownBehavior + "instancetype" -> pure IANInstanceInstanceType "kernel" -> pure IANInstanceKernel - "productCodes" -> pure IANInstanceProductCodes + "productcodes" -> pure IANInstanceProductCodes "ramdisk" -> pure IANInstanceRamdisk - "rootDeviceName" -> pure IANInstanceRootDeviceName - "sourceDestCheck" -> pure IANInstanceSourceDestCheck - "sriovNetSupport" -> pure IANInstanceSriovNetSupport - "userData" -> pure IANInstanceUserData + "rootdevicename" -> pure IANInstanceRootDeviceName + "sourcedestcheck" -> pure IANInstanceSourceDestCheck + "sriovnetsupport" -> pure IANInstanceSriovNetSupport + "userdata" -> pure IANInstanceUserData e -> fail $ "Failure parsing InstanceAttributeName from " ++ show e @@ -8536,7 +8536,7 @@ instance Hashable ConversionTaskState instance FromText ConversionTaskState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "active" -> pure CTSActive "cancelled" -> pure CTSCancelled "cancelling" -> pure CTSCancelling @@ -8611,7 +8611,7 @@ instance Hashable Tenancy instance FromText Tenancy where - parser = takeText >>= \case + parser = takeLowerText >>= \case "dedicated" -> pure Dedicated "default" -> pure Default' e -> fail $ @@ -8786,7 +8786,7 @@ instance Hashable PlacementStrategy instance FromText PlacementStrategy where - parser = takeText >>= \case + parser = takeLowerText >>= \case "cluster" -> pure Cluster e -> fail $ "Failure parsing PlacementStrategy from " ++ show e @@ -9300,7 +9300,7 @@ instance Hashable ArchitectureValues instance FromText ArchitectureValues where - parser = takeText >>= \case + parser = takeLowerText >>= \case "i386" -> pure I386 "x86_64" -> pure X8664 e -> fail $ @@ -9333,7 +9333,7 @@ instance Hashable ReportInstanceReasonCodes instance FromText ReportInstanceReasonCodes where - parser = takeText >>= \case + parser = takeLowerText >>= \case "instance-stuck-in-state" -> pure InstanceStuckInState "not-accepting-credentials" -> pure NotAcceptingCredentials "other" -> pure Other @@ -9584,7 +9584,7 @@ instance Hashable DeviceType instance FromText DeviceType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "ebs" -> pure Ebs "instance-store" -> pure InstanceStore e -> fail $ @@ -9610,7 +9610,7 @@ instance Hashable DomainType instance FromText DomainType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "standard" -> pure DTStandard "vpc" -> pure DTVpc e -> fail $ @@ -9703,10 +9703,10 @@ instance Hashable OfferingTypeValues instance FromText OfferingTypeValues where - parser = takeText >>= \case - "Heavy Utilization" -> pure HeavyUtilization - "Light Utilization" -> pure LightUtilization - "Medium Utilization" -> pure MediumUtilization + parser = takeLowerText >>= \case + "heavy utilization" -> pure HeavyUtilization + "light utilization" -> pure LightUtilization + "medium utilization" -> pure MediumUtilization e -> fail $ "Failure parsing OfferingTypeValues from " ++ show e @@ -9850,7 +9850,7 @@ instance Hashable VolumeType instance FromText VolumeType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "gp2" -> pure Gp2 "io1" -> pure Io1 "standard" -> pure Standard @@ -10004,7 +10004,7 @@ instance Hashable ImageState instance FromText ImageState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "available" -> pure ISAvailable "deregistered" -> pure ISDeregistered e -> fail $ @@ -10029,7 +10029,7 @@ instance Hashable GatewayType instance FromText GatewayType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "ipsec.1" -> pure Ipsec1 e -> fail $ "Failure parsing GatewayType from " ++ show e @@ -10286,7 +10286,7 @@ instance Hashable MonitoringState instance FromText MonitoringState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "disabled" -> pure MSDisabled "enabled" -> pure MSEnabled "pending" -> pure MSPending @@ -10342,7 +10342,7 @@ instance Hashable StatusName instance FromText StatusName where - parser = takeText >>= \case + parser = takeLowerText >>= \case "reachability" -> pure Reachability e -> fail $ "Failure parsing StatusName from " ++ show e @@ -10415,7 +10415,7 @@ instance Hashable VolumeStatusName instance FromText VolumeStatusName where - parser = takeText >>= \case + parser = takeLowerText >>= \case "io-enabled" -> pure IoEnabled "io-performance" -> pure IoPerformance e -> fail $ @@ -10441,9 +10441,9 @@ instance Hashable VolumeAttributeName instance FromText VolumeAttributeName where - parser = takeText >>= \case - "autoEnableIO" -> pure AutoEnableIO - "productCodes" -> pure ProductCodes + parser = takeLowerText >>= \case + "autoenableio" -> pure AutoEnableIO + "productcodes" -> pure ProductCodes e -> fail $ "Failure parsing VolumeAttributeName from " ++ show e @@ -10611,7 +10611,7 @@ instance Hashable ListingStatus instance FromText ListingStatus where - parser = takeText >>= \case + parser = takeLowerText >>= \case "active" -> pure ListingStatusActive "cancelled" -> pure ListingStatusCancelled "closed" -> pure ListingStatusClosed @@ -10672,7 +10672,7 @@ instance Hashable VolumeStatusInfoStatus instance FromText VolumeStatusInfoStatus where - parser = takeText >>= \case + parser = takeLowerText >>= \case "impaired" -> pure VSISImpaired "insufficient-data" -> pure VSISInsufficientData "ok" -> pure VSISOk @@ -10731,11 +10731,11 @@ instance Hashable RIProductDescription instance FromText RIProductDescription where - parser = takeText >>= \case - "Linux/UNIX" -> pure RIPDLinuxUNIX - "Linux/UNIX (Amazon VPC)" -> pure RIPDLinuxUNIXAmazonVPC - "Windows" -> pure RIPDWindows - "Windows (Amazon VPC)" -> pure RIPDWindowsAmazonVPC + parser = takeLowerText >>= \case + "linux/unix" -> pure RIPDLinuxUNIX + "linux/unix (amazon vpc)" -> pure RIPDLinuxUNIXAmazonVPC + "windows" -> pure RIPDWindows + "windows (amazon vpc)" -> pure RIPDWindowsAmazonVPC e -> fail $ "Failure parsing RIProductDescription from " ++ show e @@ -11107,9 +11107,9 @@ instance Hashable DatafeedSubscriptionState instance FromText DatafeedSubscriptionState where - parser = takeText >>= \case - "Active" -> pure DSSActive - "Inactive" -> pure DSSInactive + parser = takeLowerText >>= \case + "active" -> pure DSSActive + "inactive" -> pure DSSInactive e -> fail $ "Failure parsing DatafeedSubscriptionState from " ++ show e @@ -11135,7 +11135,7 @@ instance Hashable ExportTaskState instance FromText ExportTaskState where - parser = takeText >>= \case + parser = takeLowerText >>= \case "active" -> pure ETSActive "cancelled" -> pure ETSCancelled "cancelling" -> pure ETSCancelling @@ -11165,7 +11165,7 @@ instance Hashable ProductCodeValues instance FromText ProductCodeValues where - parser = takeText >>= \case + parser = takeLowerText >>= \case "devpay" -> pure Devpay "marketplace" -> pure Marketplace e -> fail $ @@ -11429,7 +11429,7 @@ instance Hashable EventCode instance FromText EventCode where - parser = takeText >>= \case + parser = takeLowerText >>= \case "instance-reboot" -> pure InstanceReboot "instance-retirement" -> pure InstanceRetirement "instance-stop" -> pure InstanceStop @@ -11461,7 +11461,7 @@ instance Hashable SpotInstanceType instance FromText SpotInstanceType where - parser = takeText >>= \case + parser = takeLowerText >>= \case "one-time" -> pure OneTime "persistent" -> pure Persistent e -> fail $ @@ -11770,7 +11770,7 @@ instance Hashable InstanceStateName instance FromText InstanceStateName where - parser = takeText >>= \case + parser = takeLowerText >>= \case "pending" -> pure ISNPending "running" -> pure ISNRunning "shutting-down" -> pure ISNShuttingDown @@ -12317,8 +12317,8 @@ instance Hashable ResetImageAttributeName instance FromText ResetImageAttributeName where - parser = takeText >>= \case - "launchPermission" -> pure RIANLaunchPermission + parser = takeLowerText >>= \case + "launchpermission" -> pure RIANLaunchPermission e -> fail $ "Failure parsing ResetImageAttributeName from " ++ show e @@ -12663,10 +12663,10 @@ instance Hashable DiskImageFormat instance FromText DiskImageFormat where - parser = takeText >>= \case - "RAW" -> pure Raw - "VHD" -> pure Vhd - "VMDK" -> pure Vmdk + parser = takeLowerText >>= \case + "raw" -> pure Raw + "vhd" -> pure Vhd + "vmdk" -> pure Vmdk e -> fail $ "Failure parsing DiskImageFormat from " ++ show e