diff --git a/amazonka-emr.cabal b/amazonka-emr.cabal --- a/amazonka-emr.cabal +++ b/amazonka-emr.cabal @@ -1,5 +1,5 @@ name: amazonka-emr -version: 0.0.6 +version: 0.0.7 synopsis: Amazon Elastic MapReduce SDK. homepage: https://github.com/brendanhay/amazonka license: OtherLicense @@ -59,5 +59,5 @@ other-modules: build-depends: - amazonka-core == 0.0.6.* + amazonka-core == 0.0.7.* , base >= 4.7 && < 5 diff --git a/gen/Network/AWS/EMR/AddInstanceGroups.hs b/gen/Network/AWS/EMR/AddInstanceGroups.hs --- a/gen/Network/AWS/EMR/AddInstanceGroups.hs +++ b/gen/Network/AWS/EMR/AddInstanceGroups.hs @@ -131,5 +131,5 @@ instance FromJSON AddInstanceGroupsResponse where parseJSON = withObject "AddInstanceGroupsResponse" $ \o -> AddInstanceGroupsResponse - <$> o .: "InstanceGroupIds" + <$> o .:? "InstanceGroupIds" .!= mempty <*> o .:? "JobFlowId" diff --git a/gen/Network/AWS/EMR/AddJobFlowSteps.hs b/gen/Network/AWS/EMR/AddJobFlowSteps.hs --- a/gen/Network/AWS/EMR/AddJobFlowSteps.hs +++ b/gen/Network/AWS/EMR/AddJobFlowSteps.hs @@ -147,4 +147,4 @@ instance FromJSON AddJobFlowStepsResponse where parseJSON = withObject "AddJobFlowStepsResponse" $ \o -> AddJobFlowStepsResponse - <$> o .: "StepIds" + <$> o .:? "StepIds" .!= mempty diff --git a/gen/Network/AWS/EMR/DescribeJobFlows.hs b/gen/Network/AWS/EMR/DescribeJobFlows.hs --- a/gen/Network/AWS/EMR/DescribeJobFlows.hs +++ b/gen/Network/AWS/EMR/DescribeJobFlows.hs @@ -158,4 +158,4 @@ instance FromJSON DescribeJobFlowsResponse where parseJSON = withObject "DescribeJobFlowsResponse" $ \o -> DescribeJobFlowsResponse - <$> o .: "JobFlows" + <$> o .:? "JobFlows" .!= mempty diff --git a/gen/Network/AWS/EMR/ListBootstrapActions.hs b/gen/Network/AWS/EMR/ListBootstrapActions.hs --- a/gen/Network/AWS/EMR/ListBootstrapActions.hs +++ b/gen/Network/AWS/EMR/ListBootstrapActions.hs @@ -129,7 +129,7 @@ instance FromJSON ListBootstrapActionsResponse where parseJSON = withObject "ListBootstrapActionsResponse" $ \o -> ListBootstrapActionsResponse - <$> o .: "BootstrapActions" + <$> o .:? "BootstrapActions" .!= mempty <*> o .:? "Marker" instance AWSPager ListBootstrapActions where diff --git a/gen/Network/AWS/EMR/ListClusters.hs b/gen/Network/AWS/EMR/ListClusters.hs --- a/gen/Network/AWS/EMR/ListClusters.hs +++ b/gen/Network/AWS/EMR/ListClusters.hs @@ -150,7 +150,7 @@ instance FromJSON ListClustersResponse where parseJSON = withObject "ListClustersResponse" $ \o -> ListClustersResponse - <$> o .: "Clusters" + <$> o .:? "Clusters" .!= mempty <*> o .:? "Marker" instance AWSPager ListClusters where diff --git a/gen/Network/AWS/EMR/ListInstanceGroups.hs b/gen/Network/AWS/EMR/ListInstanceGroups.hs --- a/gen/Network/AWS/EMR/ListInstanceGroups.hs +++ b/gen/Network/AWS/EMR/ListInstanceGroups.hs @@ -129,7 +129,7 @@ instance FromJSON ListInstanceGroupsResponse where parseJSON = withObject "ListInstanceGroupsResponse" $ \o -> ListInstanceGroupsResponse - <$> o .: "InstanceGroups" + <$> o .:? "InstanceGroups" .!= mempty <*> o .:? "Marker" instance AWSPager ListInstanceGroups where diff --git a/gen/Network/AWS/EMR/ListInstances.hs b/gen/Network/AWS/EMR/ListInstances.hs --- a/gen/Network/AWS/EMR/ListInstances.hs +++ b/gen/Network/AWS/EMR/ListInstances.hs @@ -154,7 +154,7 @@ instance FromJSON ListInstancesResponse where parseJSON = withObject "ListInstancesResponse" $ \o -> ListInstancesResponse - <$> o .: "Instances" + <$> o .:? "Instances" .!= mempty <*> o .:? "Marker" instance AWSPager ListInstances where diff --git a/gen/Network/AWS/EMR/ListSteps.hs b/gen/Network/AWS/EMR/ListSteps.hs --- a/gen/Network/AWS/EMR/ListSteps.hs +++ b/gen/Network/AWS/EMR/ListSteps.hs @@ -138,7 +138,7 @@ instance FromJSON ListStepsResponse where parseJSON = withObject "ListStepsResponse" $ \o -> ListStepsResponse <$> o .:? "Marker" - <*> o .: "Steps" + <*> o .:? "Steps" .!= mempty instance AWSPager ListSteps where page rq rs diff --git a/gen/Network/AWS/EMR/Types.hs b/gen/Network/AWS/EMR/Types.hs --- a/gen/Network/AWS/EMR/Types.hs +++ b/gen/Network/AWS/EMR/Types.hs @@ -713,7 +713,7 @@ instance FromJSON JobFlowDetail where parseJSON = withObject "JobFlowDetail" $ \o -> JobFlowDetail <$> o .:? "AmiVersion" - <*> o .: "BootstrapActions" + <*> o .:? "BootstrapActions" .!= mempty <*> o .: "ExecutionStatusDetail" <*> o .: "Instances" <*> o .: "JobFlowId" @@ -721,8 +721,8 @@ <*> o .:? "LogUri" <*> o .: "Name" <*> o .:? "ServiceRole" - <*> o .: "Steps" - <*> o .: "SupportedProducts" + <*> o .:? "Steps" .!= mempty + <*> o .:? "SupportedProducts" .!= mempty <*> o .:? "VisibleToAllUsers" instance ToJSON JobFlowDetail where @@ -808,7 +808,7 @@ instance FromJSON SupportedProductConfig where parseJSON = withObject "SupportedProductConfig" $ \o -> SupportedProductConfig - <$> o .: "Args" + <$> o .:? "Args" .!= mempty <*> o .:? "Name" instance ToJSON SupportedProductConfig where @@ -854,7 +854,7 @@ instance FromJSON Command where parseJSON = withObject "Command" $ \o -> Command - <$> o .: "Args" + <$> o .:? "Args" .!= mempty <*> o .:? "Name" <*> o .:? "ScriptPath" @@ -1067,8 +1067,8 @@ instance FromJSON Application where parseJSON = withObject "Application" $ \o -> Application - <$> o .: "AdditionalInfo" - <*> o .: "Args" + <$> o .:? "AdditionalInfo" .!= mempty + <*> o .:? "Args" .!= mempty <*> o .:? "Name" <*> o .:? "Version" @@ -1348,7 +1348,7 @@ instance FromJSON Cluster where parseJSON = withObject "Cluster" $ \o -> Cluster - <$> o .: "Applications" + <$> o .:? "Applications" .!= mempty <*> o .:? "AutoTerminate" <*> o .:? "Ec2InstanceAttributes" <*> o .:? "Id" @@ -1358,7 +1358,7 @@ <*> o .:? "RunningAmiVersion" <*> o .:? "ServiceRole" <*> o .:? "Status" - <*> o .: "Tags" + <*> o .:? "Tags" .!= mempty <*> o .:? "TerminationProtected" <*> o .:? "VisibleToAllUsers" @@ -1615,10 +1615,10 @@ instance FromJSON HadoopStepConfig where parseJSON = withObject "HadoopStepConfig" $ \o -> HadoopStepConfig - <$> o .: "Args" + <$> o .:? "Args" .!= mempty <*> o .:? "Jar" <*> o .:? "MainClass" - <*> o .: "Properties" + <*> o .:? "Properties" .!= mempty instance ToJSON HadoopStepConfig where toJSON HadoopStepConfig{..} = object @@ -2100,10 +2100,10 @@ instance FromJSON HadoopJarStepConfig where parseJSON = withObject "HadoopJarStepConfig" $ \o -> HadoopJarStepConfig - <$> o .: "Args" + <$> o .:? "Args" .!= mempty <*> o .: "Jar" <*> o .:? "MainClass" - <*> o .: "Properties" + <*> o .:? "Properties" .!= mempty instance ToJSON HadoopJarStepConfig where toJSON HadoopJarStepConfig{..} = object @@ -2158,7 +2158,7 @@ instance FromJSON InstanceGroupModifyConfig where parseJSON = withObject "InstanceGroupModifyConfig" $ \o -> InstanceGroupModifyConfig - <$> o .: "EC2InstanceIdsToTerminate" + <$> o .:? "EC2InstanceIdsToTerminate" .!= mempty <*> o .:? "InstanceCount" <*> o .: "InstanceGroupId" @@ -2892,7 +2892,7 @@ <*> o .:? "Ec2SubnetId" <*> o .:? "HadoopVersion" <*> o .:? "InstanceCount" - <*> o .: "InstanceGroups" + <*> o .:? "InstanceGroups" .!= mempty <*> o .:? "KeepJobFlowAliveWhenNoSteps" <*> o .:? "MasterInstanceType" <*> o .:? "Placement" @@ -3318,7 +3318,7 @@ <*> o .:? "Ec2SubnetId" <*> o .:? "HadoopVersion" <*> o .: "InstanceCount" - <*> o .: "InstanceGroups" + <*> o .:? "InstanceGroups" .!= mempty <*> o .:? "KeepJobFlowAliveWhenNoSteps" <*> o .:? "MasterInstanceId" <*> o .: "MasterInstanceType" @@ -3641,7 +3641,7 @@ instance FromJSON ScriptBootstrapActionConfig where parseJSON = withObject "ScriptBootstrapActionConfig" $ \o -> ScriptBootstrapActionConfig - <$> o .: "Args" + <$> o .:? "Args" .!= mempty <*> o .: "Path" instance ToJSON ScriptBootstrapActionConfig where