diff --git a/Makefile b/Makefile index 944e2c06a6a..abd2062e322 100644 --- a/Makefile +++ b/Makefile @@ -1,36 +1,22 @@ -SHELL := /usr/bin/env bash -FLAGS := -j --disable-documentation --disable-library-coverage -DEPS := vendor/ede +DEPS := $(wildcard amazonka-*) -.PHONY: test lint doc +.PHONY: install clean -all: build +build: $(addprefix build-,$(DEPS)) build-amazonka -build: - cabal build $(addprefix -,$(findstring j,$(MAKEFLAGS))) +build-%: + make -C $* build -install: cabal.sandbox.config add-sources - cabal install $(FLAGS) +install: cabal.sandbox.config $(addprefix install-,$(DEPS)) install-amazonka -clean: - -rm -rf dist cabal.sandbox.config .cabal-sandbox vendor - cabal clean +install-%: + make -C $* install -test: - cabal test --test-options=\ - "--num-threads=4 +RTS -N4 -RTS --quickcheck-tests=20 --quickcheck-max-size=50" +clean: $(addprefix clean-,$(DEPS)) clean-amazonka +# rm -rf .cabal-sandbox cabal.sandbox.config -lint: - hlint src - -doc: - cabal haddock +clean-%: + make -C $* clean cabal.sandbox.config: cabal sandbox init - -add-sources: cabal.sandbox.config $(DEPS) - $(foreach dir,$(DEPS),cabal sandbox add-source $(dir);) - -vendor/%: - git clone https://github.com/brendanhay/$*.git $@ diff --git a/README.md b/README.md index e69de29bb2d..919b47203d1 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,19 @@ +# Amazonka + +* [Description](#description) +* [Contribute](#contribute) +* [Licence](#licence) + +## Description + +A comprehensive Amazon Web Services SDK for Haskell. + + +## Contribute + +For any problems, comments, or feedback please create an issue [here on GitHub](https://github.com/brendanhay/amazonka/issues). + + +## Licence + +Amazonka is released under the [Mozilla Public License Version 2.0](http://www.mozilla.org/MPL/). diff --git a/aws/LICENSE b/amazonka-autoscaling/LICENSE similarity index 100% rename from aws/LICENSE rename to amazonka-autoscaling/LICENSE diff --git a/aws/amazonka-autoscaling/Makefile b/amazonka-autoscaling/Makefile similarity index 100% rename from aws/amazonka-autoscaling/Makefile rename to amazonka-autoscaling/Makefile diff --git a/aws/amazonka-autoscaling/README.md b/amazonka-autoscaling/README.md similarity index 100% rename from aws/amazonka-autoscaling/README.md rename to amazonka-autoscaling/README.md diff --git a/Setup.hs b/amazonka-autoscaling/Setup.hs similarity index 100% rename from Setup.hs rename to amazonka-autoscaling/Setup.hs diff --git a/aws/amazonka-autoscaling/amazonka-autoscaling.cabal b/amazonka-autoscaling/amazonka-autoscaling.cabal similarity index 100% rename from aws/amazonka-autoscaling/amazonka-autoscaling.cabal rename to amazonka-autoscaling/amazonka-autoscaling.cabal diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/AttachInstances.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/AttachInstances.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/AttachInstances.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/AttachInstances.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CompleteLifecycleAction.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CompleteLifecycleAction.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CompleteLifecycleAction.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/CompleteLifecycleAction.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateAutoScalingGroup.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateAutoScalingGroup.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateAutoScalingGroup.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateAutoScalingGroup.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateLaunchConfiguration.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateLaunchConfiguration.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateLaunchConfiguration.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateLaunchConfiguration.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateOrUpdateTags.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateOrUpdateTags.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateOrUpdateTags.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/CreateOrUpdateTags.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteAutoScalingGroup.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteAutoScalingGroup.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteAutoScalingGroup.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteAutoScalingGroup.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteLaunchConfiguration.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteLaunchConfiguration.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteLaunchConfiguration.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteLaunchConfiguration.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteLifecycleHook.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteLifecycleHook.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteLifecycleHook.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteLifecycleHook.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteNotificationConfiguration.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteNotificationConfiguration.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteNotificationConfiguration.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteNotificationConfiguration.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeletePolicy.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeletePolicy.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeletePolicy.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeletePolicy.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteScheduledAction.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteScheduledAction.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteScheduledAction.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteScheduledAction.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteTags.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteTags.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteTags.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DeleteTags.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAccountLimits.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAccountLimits.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAccountLimits.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAccountLimits.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAdjustmentTypes.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAdjustmentTypes.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAdjustmentTypes.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAdjustmentTypes.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingGroups.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingGroups.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingGroups.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingGroups.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingInstances.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingInstances.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingInstances.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingInstances.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingNotificationTypes.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingNotificationTypes.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingNotificationTypes.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeAutoScalingNotificationTypes.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLaunchConfigurations.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLaunchConfigurations.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLaunchConfigurations.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLaunchConfigurations.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLifecycleHookTypes.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLifecycleHookTypes.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLifecycleHookTypes.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLifecycleHookTypes.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLifecycleHooks.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLifecycleHooks.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLifecycleHooks.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeLifecycleHooks.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeMetricCollectionTypes.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeMetricCollectionTypes.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeMetricCollectionTypes.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeMetricCollectionTypes.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeNotificationConfigurations.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeNotificationConfigurations.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeNotificationConfigurations.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeNotificationConfigurations.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribePolicies.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribePolicies.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribePolicies.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribePolicies.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScalingActivities.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScalingActivities.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScalingActivities.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScalingActivities.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScalingProcessTypes.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScalingProcessTypes.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScalingProcessTypes.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScalingProcessTypes.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScheduledActions.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScheduledActions.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScheduledActions.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeScheduledActions.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeTags.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeTags.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeTags.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeTags.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeTerminationPolicyTypes.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeTerminationPolicyTypes.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeTerminationPolicyTypes.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DescribeTerminationPolicyTypes.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DetachInstances.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DetachInstances.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DetachInstances.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DetachInstances.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DisableMetricsCollection.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DisableMetricsCollection.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/DisableMetricsCollection.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/DisableMetricsCollection.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/EnableMetricsCollection.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/EnableMetricsCollection.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/EnableMetricsCollection.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/EnableMetricsCollection.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/EnterStandby.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/EnterStandby.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/EnterStandby.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/EnterStandby.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/ExecutePolicy.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/ExecutePolicy.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/ExecutePolicy.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/ExecutePolicy.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/ExitStandby.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/ExitStandby.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/ExitStandby.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/ExitStandby.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutLifecycleHook.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutLifecycleHook.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutLifecycleHook.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutLifecycleHook.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutNotificationConfiguration.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutNotificationConfiguration.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutNotificationConfiguration.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutNotificationConfiguration.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutScalingPolicy.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutScalingPolicy.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutScalingPolicy.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutScalingPolicy.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutScheduledUpdateGroupAction.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutScheduledUpdateGroupAction.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutScheduledUpdateGroupAction.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/PutScheduledUpdateGroupAction.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/RecordLifecycleActionHeartbeat.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/RecordLifecycleActionHeartbeat.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/RecordLifecycleActionHeartbeat.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/RecordLifecycleActionHeartbeat.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/ResumeProcesses.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/ResumeProcesses.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/ResumeProcesses.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/ResumeProcesses.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/SetDesiredCapacity.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/SetDesiredCapacity.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/SetDesiredCapacity.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/SetDesiredCapacity.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/SetInstanceHealth.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/SetInstanceHealth.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/SetInstanceHealth.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/SetInstanceHealth.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/SuspendProcesses.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/SuspendProcesses.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/SuspendProcesses.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/SuspendProcesses.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/TerminateInstanceInAutoScalingGroup.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/TerminateInstanceInAutoScalingGroup.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/TerminateInstanceInAutoScalingGroup.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/TerminateInstanceInAutoScalingGroup.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/Types.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/Types.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/Types.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/Types.hs diff --git a/aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/UpdateAutoScalingGroup.hs b/amazonka-autoscaling/gen/Network/AWS/AutoScaling/UpdateAutoScalingGroup.hs similarity index 100% rename from aws/amazonka-autoscaling/gen/Network/AWS/AutoScaling/UpdateAutoScalingGroup.hs rename to amazonka-autoscaling/gen/Network/AWS/AutoScaling/UpdateAutoScalingGroup.hs diff --git a/aws/amazonka-autoscaling/LICENSE b/amazonka-cloudformation/LICENSE similarity index 100% rename from aws/amazonka-autoscaling/LICENSE rename to amazonka-cloudformation/LICENSE diff --git a/aws/amazonka-cloudformation/Makefile b/amazonka-cloudformation/Makefile similarity index 100% rename from aws/amazonka-cloudformation/Makefile rename to amazonka-cloudformation/Makefile diff --git a/aws/amazonka-cloudformation/README.md b/amazonka-cloudformation/README.md similarity index 100% rename from aws/amazonka-cloudformation/README.md rename to amazonka-cloudformation/README.md diff --git a/aws/amazonka-autoscaling/Setup.hs b/amazonka-cloudformation/Setup.hs similarity index 100% rename from aws/amazonka-autoscaling/Setup.hs rename to amazonka-cloudformation/Setup.hs diff --git a/aws/amazonka-cloudformation/amazonka-cloudformation.cabal b/amazonka-cloudformation/amazonka-cloudformation.cabal similarity index 100% rename from aws/amazonka-cloudformation/amazonka-cloudformation.cabal rename to amazonka-cloudformation/amazonka-cloudformation.cabal diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/CancelUpdateStack.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/CancelUpdateStack.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/CancelUpdateStack.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/CancelUpdateStack.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/CreateStack.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/CreateStack.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/CreateStack.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/CreateStack.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DeleteStack.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DeleteStack.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DeleteStack.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/DeleteStack.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackEvents.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackEvents.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackEvents.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackEvents.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackResource.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackResource.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackResource.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackResource.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackResources.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackResources.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackResources.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStackResources.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStacks.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStacks.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStacks.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/DescribeStacks.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/EstimateTemplateCost.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/EstimateTemplateCost.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/EstimateTemplateCost.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/EstimateTemplateCost.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetStackPolicy.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetStackPolicy.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetStackPolicy.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetStackPolicy.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetTemplate.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetTemplate.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetTemplate.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetTemplate.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetTemplateSummary.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetTemplateSummary.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetTemplateSummary.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/GetTemplateSummary.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/ListStackResources.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/ListStackResources.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/ListStackResources.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/ListStackResources.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/ListStacks.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/ListStacks.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/ListStacks.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/ListStacks.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/SetStackPolicy.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/SetStackPolicy.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/SetStackPolicy.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/SetStackPolicy.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/SignalResource.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/SignalResource.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/SignalResource.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/SignalResource.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/Types.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/Types.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/Types.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/Types.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/UpdateStack.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/UpdateStack.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/UpdateStack.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/UpdateStack.hs diff --git a/aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/ValidateTemplate.hs b/amazonka-cloudformation/gen/Network/AWS/CloudFormation/ValidateTemplate.hs similarity index 100% rename from aws/amazonka-cloudformation/gen/Network/AWS/CloudFormation/ValidateTemplate.hs rename to amazonka-cloudformation/gen/Network/AWS/CloudFormation/ValidateTemplate.hs diff --git a/aws/amazonka-cloudformation/LICENSE b/amazonka-cloudfront/LICENSE similarity index 100% rename from aws/amazonka-cloudformation/LICENSE rename to amazonka-cloudfront/LICENSE diff --git a/aws/amazonka-cloudfront/Makefile b/amazonka-cloudfront/Makefile similarity index 100% rename from aws/amazonka-cloudfront/Makefile rename to amazonka-cloudfront/Makefile diff --git a/aws/amazonka-cloudfront/README.md b/amazonka-cloudfront/README.md similarity index 100% rename from aws/amazonka-cloudfront/README.md rename to amazonka-cloudfront/README.md diff --git a/aws/amazonka-cloudformation/Setup.hs b/amazonka-cloudfront/Setup.hs similarity index 100% rename from aws/amazonka-cloudformation/Setup.hs rename to amazonka-cloudfront/Setup.hs diff --git a/aws/amazonka-cloudfront/amazonka-cloudfront.cabal b/amazonka-cloudfront/amazonka-cloudfront.cabal similarity index 100% rename from aws/amazonka-cloudfront/amazonka-cloudfront.cabal rename to amazonka-cloudfront/amazonka-cloudfront.cabal diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateDistribution.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateDistribution.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateDistribution.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateDistribution.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateInvalidation.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateInvalidation.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateInvalidation.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateInvalidation.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteCloudFrontOriginAccessIdentity.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteCloudFrontOriginAccessIdentity.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteCloudFrontOriginAccessIdentity.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteCloudFrontOriginAccessIdentity.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteDistribution.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteDistribution.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteDistribution.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteDistribution.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteStreamingDistribution.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteStreamingDistribution.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteStreamingDistribution.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/DeleteStreamingDistribution.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetDistribution.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetDistribution.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetDistribution.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/GetDistribution.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetDistributionConfig.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetDistributionConfig.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetDistributionConfig.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/GetDistributionConfig.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetInvalidation.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetInvalidation.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetInvalidation.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/GetInvalidation.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListDistributions.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListDistributions.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListDistributions.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/ListDistributions.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListInvalidations.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListInvalidations.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListInvalidations.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/ListInvalidations.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/Types.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/Types.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/Types.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/Types.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateDistribution.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateDistribution.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateDistribution.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateDistribution.hs diff --git a/aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs b/amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs similarity index 100% rename from aws/amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs rename to amazonka-cloudfront/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs diff --git a/aws/amazonka-cloudfront/LICENSE b/amazonka-cloudsearch-domains/LICENSE similarity index 100% rename from aws/amazonka-cloudfront/LICENSE rename to amazonka-cloudsearch-domains/LICENSE diff --git a/aws/amazonka-cloudsearch-domains/Makefile b/amazonka-cloudsearch-domains/Makefile similarity index 100% rename from aws/amazonka-cloudsearch-domains/Makefile rename to amazonka-cloudsearch-domains/Makefile diff --git a/aws/amazonka-cloudsearch-domains/README.md b/amazonka-cloudsearch-domains/README.md similarity index 100% rename from aws/amazonka-cloudsearch-domains/README.md rename to amazonka-cloudsearch-domains/README.md diff --git a/aws/amazonka-cloudfront/Setup.hs b/amazonka-cloudsearch-domains/Setup.hs similarity index 100% rename from aws/amazonka-cloudfront/Setup.hs rename to amazonka-cloudsearch-domains/Setup.hs diff --git a/aws/amazonka-cloudsearch-domains/amazonka-cloudsearch-domains.cabal b/amazonka-cloudsearch-domains/amazonka-cloudsearch-domains.cabal similarity index 100% rename from aws/amazonka-cloudsearch-domains/amazonka-cloudsearch-domains.cabal rename to amazonka-cloudsearch-domains/amazonka-cloudsearch-domains.cabal diff --git a/aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains.hs b/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains.hs similarity index 100% rename from aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains.hs rename to amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains.hs diff --git a/aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Search.hs b/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Search.hs similarity index 100% rename from aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Search.hs rename to amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Search.hs diff --git a/aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Suggest.hs b/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Suggest.hs similarity index 100% rename from aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Suggest.hs rename to amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Suggest.hs diff --git a/aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Types.hs b/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Types.hs similarity index 100% rename from aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Types.hs rename to amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/Types.hs diff --git a/aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/UploadDocuments.hs b/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/UploadDocuments.hs similarity index 100% rename from aws/amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/UploadDocuments.hs rename to amazonka-cloudsearch-domains/gen/Network/AWS/CloudSearchDomains/UploadDocuments.hs diff --git a/aws/amazonka-cloudsearch-domains/LICENSE b/amazonka-cloudsearch/LICENSE similarity index 100% rename from aws/amazonka-cloudsearch-domains/LICENSE rename to amazonka-cloudsearch/LICENSE diff --git a/aws/amazonka-cloudsearch/Makefile b/amazonka-cloudsearch/Makefile similarity index 100% rename from aws/amazonka-cloudsearch/Makefile rename to amazonka-cloudsearch/Makefile diff --git a/aws/amazonka-cloudsearch/README.md b/amazonka-cloudsearch/README.md similarity index 100% rename from aws/amazonka-cloudsearch/README.md rename to amazonka-cloudsearch/README.md diff --git a/aws/amazonka-cloudsearch-domains/Setup.hs b/amazonka-cloudsearch/Setup.hs similarity index 100% rename from aws/amazonka-cloudsearch-domains/Setup.hs rename to amazonka-cloudsearch/Setup.hs diff --git a/aws/amazonka-cloudsearch/amazonka-cloudsearch.cabal b/amazonka-cloudsearch/amazonka-cloudsearch.cabal similarity index 100% rename from aws/amazonka-cloudsearch/amazonka-cloudsearch.cabal rename to amazonka-cloudsearch/amazonka-cloudsearch.cabal diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/BuildSuggesters.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/BuildSuggesters.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/BuildSuggesters.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/BuildSuggesters.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/CreateDomain.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/CreateDomain.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/CreateDomain.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/CreateDomain.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineAnalysisScheme.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineAnalysisScheme.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineAnalysisScheme.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineAnalysisScheme.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineExpression.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineExpression.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineExpression.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineExpression.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineIndexField.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineIndexField.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineIndexField.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineIndexField.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineSuggester.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineSuggester.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineSuggester.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DefineSuggester.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteAnalysisScheme.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteAnalysisScheme.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteAnalysisScheme.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteAnalysisScheme.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteDomain.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteDomain.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteDomain.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteDomain.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteExpression.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteExpression.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteExpression.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteExpression.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteIndexField.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteIndexField.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteIndexField.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteIndexField.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteSuggester.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteSuggester.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteSuggester.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DeleteSuggester.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeAnalysisSchemes.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeAnalysisSchemes.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeAnalysisSchemes.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeAnalysisSchemes.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeAvailabilityOptions.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeAvailabilityOptions.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeAvailabilityOptions.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeAvailabilityOptions.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeDomains.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeDomains.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeDomains.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeDomains.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeExpressions.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeExpressions.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeExpressions.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeExpressions.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeIndexFields.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeIndexFields.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeIndexFields.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeIndexFields.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeScalingParameters.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeScalingParameters.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeScalingParameters.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeScalingParameters.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeServiceAccessPolicies.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeServiceAccessPolicies.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeServiceAccessPolicies.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeServiceAccessPolicies.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeSuggesters.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeSuggesters.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeSuggesters.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/DescribeSuggesters.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/IndexDocuments.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/IndexDocuments.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/IndexDocuments.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/IndexDocuments.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/ListDomainNames.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/ListDomainNames.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/ListDomainNames.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/ListDomainNames.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/Types.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/Types.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/Types.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/Types.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateAvailabilityOptions.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateAvailabilityOptions.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateAvailabilityOptions.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateAvailabilityOptions.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateScalingParameters.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateScalingParameters.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateScalingParameters.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateScalingParameters.hs diff --git a/aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateServiceAccessPolicies.hs b/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateServiceAccessPolicies.hs similarity index 100% rename from aws/amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateServiceAccessPolicies.hs rename to amazonka-cloudsearch/gen/Network/AWS/CloudSearch/UpdateServiceAccessPolicies.hs diff --git a/aws/amazonka-cloudsearch/LICENSE b/amazonka-cloudtrail/LICENSE similarity index 100% rename from aws/amazonka-cloudsearch/LICENSE rename to amazonka-cloudtrail/LICENSE diff --git a/aws/amazonka-cloudtrail/Makefile b/amazonka-cloudtrail/Makefile similarity index 100% rename from aws/amazonka-cloudtrail/Makefile rename to amazonka-cloudtrail/Makefile diff --git a/aws/amazonka-cloudtrail/README.md b/amazonka-cloudtrail/README.md similarity index 100% rename from aws/amazonka-cloudtrail/README.md rename to amazonka-cloudtrail/README.md diff --git a/aws/amazonka-cloudsearch/Setup.hs b/amazonka-cloudtrail/Setup.hs similarity index 100% rename from aws/amazonka-cloudsearch/Setup.hs rename to amazonka-cloudtrail/Setup.hs diff --git a/aws/amazonka-cloudtrail/amazonka-cloudtrail.cabal b/amazonka-cloudtrail/amazonka-cloudtrail.cabal similarity index 100% rename from aws/amazonka-cloudtrail/amazonka-cloudtrail.cabal rename to amazonka-cloudtrail/amazonka-cloudtrail.cabal diff --git a/aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail.hs b/amazonka-cloudtrail/gen/Network/AWS/CloudTrail.hs similarity index 100% rename from aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail.hs rename to amazonka-cloudtrail/gen/Network/AWS/CloudTrail.hs diff --git a/aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/CreateTrail.hs b/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/CreateTrail.hs similarity index 100% rename from aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/CreateTrail.hs rename to amazonka-cloudtrail/gen/Network/AWS/CloudTrail/CreateTrail.hs diff --git a/aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/DeleteTrail.hs b/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/DeleteTrail.hs similarity index 100% rename from aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/DeleteTrail.hs rename to amazonka-cloudtrail/gen/Network/AWS/CloudTrail/DeleteTrail.hs diff --git a/aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/DescribeTrails.hs b/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/DescribeTrails.hs similarity index 100% rename from aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/DescribeTrails.hs rename to amazonka-cloudtrail/gen/Network/AWS/CloudTrail/DescribeTrails.hs diff --git a/aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/GetTrailStatus.hs b/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/GetTrailStatus.hs similarity index 100% rename from aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/GetTrailStatus.hs rename to amazonka-cloudtrail/gen/Network/AWS/CloudTrail/GetTrailStatus.hs diff --git a/aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/StartLogging.hs b/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/StartLogging.hs similarity index 100% rename from aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/StartLogging.hs rename to amazonka-cloudtrail/gen/Network/AWS/CloudTrail/StartLogging.hs diff --git a/aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/StopLogging.hs b/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/StopLogging.hs similarity index 100% rename from aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/StopLogging.hs rename to amazonka-cloudtrail/gen/Network/AWS/CloudTrail/StopLogging.hs diff --git a/aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/Types.hs b/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/Types.hs similarity index 100% rename from aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/Types.hs rename to amazonka-cloudtrail/gen/Network/AWS/CloudTrail/Types.hs diff --git a/aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/UpdateTrail.hs b/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/UpdateTrail.hs similarity index 100% rename from aws/amazonka-cloudtrail/gen/Network/AWS/CloudTrail/UpdateTrail.hs rename to amazonka-cloudtrail/gen/Network/AWS/CloudTrail/UpdateTrail.hs diff --git a/aws/amazonka-cloudtrail/LICENSE b/amazonka-cloudwatch-logs/LICENSE similarity index 100% rename from aws/amazonka-cloudtrail/LICENSE rename to amazonka-cloudwatch-logs/LICENSE diff --git a/aws/amazonka-cloudwatch-logs/Makefile b/amazonka-cloudwatch-logs/Makefile similarity index 100% rename from aws/amazonka-cloudwatch-logs/Makefile rename to amazonka-cloudwatch-logs/Makefile diff --git a/aws/amazonka-cloudwatch-logs/README.md b/amazonka-cloudwatch-logs/README.md similarity index 100% rename from aws/amazonka-cloudwatch-logs/README.md rename to amazonka-cloudwatch-logs/README.md diff --git a/aws/amazonka-cloudtrail/Setup.hs b/amazonka-cloudwatch-logs/Setup.hs similarity index 100% rename from aws/amazonka-cloudtrail/Setup.hs rename to amazonka-cloudwatch-logs/Setup.hs diff --git a/aws/amazonka-cloudwatch-logs/amazonka-cloudwatch-logs.cabal b/amazonka-cloudwatch-logs/amazonka-cloudwatch-logs.cabal similarity index 100% rename from aws/amazonka-cloudwatch-logs/amazonka-cloudwatch-logs.cabal rename to amazonka-cloudwatch-logs/amazonka-cloudwatch-logs.cabal diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/CreateLogGroup.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/CreateLogGroup.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/CreateLogGroup.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/CreateLogGroup.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/CreateLogStream.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/CreateLogStream.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/CreateLogStream.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/CreateLogStream.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteLogGroup.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteLogGroup.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteLogGroup.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteLogGroup.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteLogStream.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteLogStream.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteLogStream.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteLogStream.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteMetricFilter.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteMetricFilter.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteMetricFilter.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteMetricFilter.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteRetentionPolicy.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteRetentionPolicy.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteRetentionPolicy.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DeleteRetentionPolicy.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeLogGroups.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeLogGroups.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeLogGroups.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeLogGroups.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeLogStreams.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeLogStreams.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeLogStreams.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeLogStreams.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeMetricFilters.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeMetricFilters.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeMetricFilters.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/DescribeMetricFilters.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/GetLogEvents.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/GetLogEvents.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/GetLogEvents.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/GetLogEvents.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutLogEvents.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutLogEvents.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutLogEvents.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutLogEvents.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutMetricFilter.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutMetricFilter.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutMetricFilter.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutMetricFilter.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutRetentionPolicy.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutRetentionPolicy.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutRetentionPolicy.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/PutRetentionPolicy.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/TestMetricFilter.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/TestMetricFilter.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/TestMetricFilter.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/TestMetricFilter.hs diff --git a/aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/Types.hs b/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/Types.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/Types.hs rename to amazonka-cloudwatch-logs/gen/Network/AWS/CloudWatchLogs/Types.hs diff --git a/aws/amazonka-cloudwatch-logs/LICENSE b/amazonka-cloudwatch/LICENSE similarity index 100% rename from aws/amazonka-cloudwatch-logs/LICENSE rename to amazonka-cloudwatch/LICENSE diff --git a/aws/amazonka-cloudwatch/Makefile b/amazonka-cloudwatch/Makefile similarity index 100% rename from aws/amazonka-cloudwatch/Makefile rename to amazonka-cloudwatch/Makefile diff --git a/aws/amazonka-cloudwatch/README.md b/amazonka-cloudwatch/README.md similarity index 100% rename from aws/amazonka-cloudwatch/README.md rename to amazonka-cloudwatch/README.md diff --git a/aws/amazonka-cloudwatch-logs/Setup.hs b/amazonka-cloudwatch/Setup.hs similarity index 100% rename from aws/amazonka-cloudwatch-logs/Setup.hs rename to amazonka-cloudwatch/Setup.hs diff --git a/aws/amazonka-cloudwatch/amazonka-cloudwatch.cabal b/amazonka-cloudwatch/amazonka-cloudwatch.cabal similarity index 100% rename from aws/amazonka-cloudwatch/amazonka-cloudwatch.cabal rename to amazonka-cloudwatch/amazonka-cloudwatch.cabal diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DeleteAlarms.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DeleteAlarms.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DeleteAlarms.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DeleteAlarms.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarmHistory.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarmHistory.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarmHistory.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarmHistory.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarms.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarms.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarms.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarms.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarmsForMetric.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarmsForMetric.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarmsForMetric.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DescribeAlarmsForMetric.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DisableAlarmActions.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DisableAlarmActions.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DisableAlarmActions.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/DisableAlarmActions.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/EnableAlarmActions.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/EnableAlarmActions.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/EnableAlarmActions.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/EnableAlarmActions.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/GetMetricStatistics.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/GetMetricStatistics.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/GetMetricStatistics.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/GetMetricStatistics.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/ListMetrics.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/ListMetrics.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/ListMetrics.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/ListMetrics.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/PutMetricAlarm.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/PutMetricAlarm.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/PutMetricAlarm.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/PutMetricAlarm.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/PutMetricData.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/PutMetricData.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/PutMetricData.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/PutMetricData.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/SetAlarmState.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/SetAlarmState.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/SetAlarmState.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/SetAlarmState.hs diff --git a/aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/Types.hs b/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/Types.hs similarity index 100% rename from aws/amazonka-cloudwatch/gen/Network/AWS/CloudWatch/Types.hs rename to amazonka-cloudwatch/gen/Network/AWS/CloudWatch/Types.hs diff --git a/aws/amazonka-cloudwatch/LICENSE b/amazonka-codedeploy/LICENSE similarity index 100% rename from aws/amazonka-cloudwatch/LICENSE rename to amazonka-codedeploy/LICENSE diff --git a/aws/amazonka-codedeploy/Makefile b/amazonka-codedeploy/Makefile similarity index 100% rename from aws/amazonka-codedeploy/Makefile rename to amazonka-codedeploy/Makefile diff --git a/aws/amazonka-codedeploy/README.md b/amazonka-codedeploy/README.md similarity index 100% rename from aws/amazonka-codedeploy/README.md rename to amazonka-codedeploy/README.md diff --git a/aws/amazonka-cloudwatch/Setup.hs b/amazonka-codedeploy/Setup.hs similarity index 100% rename from aws/amazonka-cloudwatch/Setup.hs rename to amazonka-codedeploy/Setup.hs diff --git a/aws/amazonka-codedeploy/amazonka-codedeploy.cabal b/amazonka-codedeploy/amazonka-codedeploy.cabal similarity index 100% rename from aws/amazonka-codedeploy/amazonka-codedeploy.cabal rename to amazonka-codedeploy/amazonka-codedeploy.cabal diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/BatchGetApplications.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/BatchGetApplications.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/BatchGetApplications.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/BatchGetApplications.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/BatchGetDeployments.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/BatchGetDeployments.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/BatchGetDeployments.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/BatchGetDeployments.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateApplication.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateApplication.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateApplication.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateApplication.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeployment.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeployment.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeployment.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeployment.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeploymentConfig.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeploymentConfig.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeploymentConfig.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeploymentConfig.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeploymentGroup.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeploymentGroup.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeploymentGroup.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/CreateDeploymentGroup.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteApplication.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteApplication.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteApplication.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteApplication.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteDeploymentConfig.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteDeploymentConfig.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteDeploymentConfig.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteDeploymentConfig.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteDeploymentGroup.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteDeploymentGroup.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteDeploymentGroup.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/DeleteDeploymentGroup.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetApplication.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetApplication.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetApplication.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetApplication.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetApplicationRevision.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetApplicationRevision.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetApplicationRevision.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetApplicationRevision.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeployment.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeployment.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeployment.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeployment.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentConfig.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentConfig.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentConfig.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentConfig.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentGroup.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentGroup.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentGroup.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentGroup.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentInstance.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentInstance.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentInstance.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/GetDeploymentInstance.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListApplicationRevisions.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListApplicationRevisions.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListApplicationRevisions.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListApplicationRevisions.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListApplications.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListApplications.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListApplications.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListApplications.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentConfigs.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentConfigs.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentConfigs.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentConfigs.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentGroups.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentGroups.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentGroups.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentGroups.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentInstances.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentInstances.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentInstances.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeploymentInstances.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeployments.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeployments.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeployments.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/ListDeployments.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/RegisterApplicationRevision.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/RegisterApplicationRevision.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/RegisterApplicationRevision.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/RegisterApplicationRevision.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/StopDeployment.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/StopDeployment.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/StopDeployment.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/StopDeployment.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/Types.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/Types.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/Types.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/Types.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/UpdateApplication.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/UpdateApplication.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/UpdateApplication.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/UpdateApplication.hs diff --git a/aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/UpdateDeploymentGroup.hs b/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/UpdateDeploymentGroup.hs similarity index 100% rename from aws/amazonka-codedeploy/gen/Network/AWS/CodeDeploy/UpdateDeploymentGroup.hs rename to amazonka-codedeploy/gen/Network/AWS/CodeDeploy/UpdateDeploymentGroup.hs diff --git a/aws/amazonka-codedeploy/LICENSE b/amazonka-cognito-identity/LICENSE similarity index 100% rename from aws/amazonka-codedeploy/LICENSE rename to amazonka-cognito-identity/LICENSE diff --git a/aws/amazonka-cognito-identity/Makefile b/amazonka-cognito-identity/Makefile similarity index 100% rename from aws/amazonka-cognito-identity/Makefile rename to amazonka-cognito-identity/Makefile diff --git a/aws/amazonka-cognito-identity/README.md b/amazonka-cognito-identity/README.md similarity index 100% rename from aws/amazonka-cognito-identity/README.md rename to amazonka-cognito-identity/README.md diff --git a/aws/amazonka-codedeploy/Setup.hs b/amazonka-cognito-identity/Setup.hs similarity index 100% rename from aws/amazonka-codedeploy/Setup.hs rename to amazonka-cognito-identity/Setup.hs diff --git a/aws/amazonka-cognito-identity/amazonka-cognito-identity.cabal b/amazonka-cognito-identity/amazonka-cognito-identity.cabal similarity index 100% rename from aws/amazonka-cognito-identity/amazonka-cognito-identity.cabal rename to amazonka-cognito-identity/amazonka-cognito-identity.cabal diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/CreateIdentityPool.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/CreateIdentityPool.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/CreateIdentityPool.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/CreateIdentityPool.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/DeleteIdentityPool.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/DeleteIdentityPool.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/DeleteIdentityPool.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/DeleteIdentityPool.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/DescribeIdentityPool.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/DescribeIdentityPool.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/DescribeIdentityPool.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/DescribeIdentityPool.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetId.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetId.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetId.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetId.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetOpenIdToken.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetOpenIdToken.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetOpenIdToken.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetOpenIdToken.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetOpenIdTokenForDeveloperIdentity.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetOpenIdTokenForDeveloperIdentity.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetOpenIdTokenForDeveloperIdentity.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/GetOpenIdTokenForDeveloperIdentity.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/ListIdentities.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/ListIdentities.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/ListIdentities.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/ListIdentities.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/ListIdentityPools.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/ListIdentityPools.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/ListIdentityPools.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/ListIdentityPools.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/LookupDeveloperIdentity.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/LookupDeveloperIdentity.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/LookupDeveloperIdentity.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/LookupDeveloperIdentity.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/MergeDeveloperIdentities.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/MergeDeveloperIdentities.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/MergeDeveloperIdentities.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/MergeDeveloperIdentities.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/Types.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/Types.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/Types.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/Types.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UnlinkDeveloperIdentity.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UnlinkDeveloperIdentity.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UnlinkDeveloperIdentity.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UnlinkDeveloperIdentity.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UnlinkIdentity.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UnlinkIdentity.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UnlinkIdentity.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UnlinkIdentity.hs diff --git a/aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UpdateIdentityPool.hs b/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UpdateIdentityPool.hs similarity index 100% rename from aws/amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UpdateIdentityPool.hs rename to amazonka-cognito-identity/gen/Network/AWS/CognitoIdentity/UpdateIdentityPool.hs diff --git a/aws/amazonka-cognito-identity/LICENSE b/amazonka-cognito-sync/LICENSE similarity index 100% rename from aws/amazonka-cognito-identity/LICENSE rename to amazonka-cognito-sync/LICENSE diff --git a/aws/amazonka-cognito-sync/Makefile b/amazonka-cognito-sync/Makefile similarity index 100% rename from aws/amazonka-cognito-sync/Makefile rename to amazonka-cognito-sync/Makefile diff --git a/aws/amazonka-cognito-sync/README.md b/amazonka-cognito-sync/README.md similarity index 100% rename from aws/amazonka-cognito-sync/README.md rename to amazonka-cognito-sync/README.md diff --git a/aws/amazonka-cognito-identity/Setup.hs b/amazonka-cognito-sync/Setup.hs similarity index 100% rename from aws/amazonka-cognito-identity/Setup.hs rename to amazonka-cognito-sync/Setup.hs diff --git a/aws/amazonka-cognito-sync/amazonka-cognito-sync.cabal b/amazonka-cognito-sync/amazonka-cognito-sync.cabal similarity index 100% rename from aws/amazonka-cognito-sync/amazonka-cognito-sync.cabal rename to amazonka-cognito-sync/amazonka-cognito-sync.cabal diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DeleteDataset.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DeleteDataset.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DeleteDataset.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DeleteDataset.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeDataset.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeDataset.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeDataset.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeDataset.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeIdentityPoolUsage.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeIdentityPoolUsage.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeIdentityPoolUsage.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeIdentityPoolUsage.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeIdentityUsage.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeIdentityUsage.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeIdentityUsage.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/DescribeIdentityUsage.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/GetIdentityPoolConfiguration.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/GetIdentityPoolConfiguration.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/GetIdentityPoolConfiguration.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/GetIdentityPoolConfiguration.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListDatasets.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListDatasets.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListDatasets.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListDatasets.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListIdentityPoolUsage.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListIdentityPoolUsage.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListIdentityPoolUsage.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListIdentityPoolUsage.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListRecords.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListRecords.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListRecords.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/ListRecords.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/RegisterDevice.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/RegisterDevice.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/RegisterDevice.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/RegisterDevice.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/SetIdentityPoolConfiguration.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/SetIdentityPoolConfiguration.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/SetIdentityPoolConfiguration.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/SetIdentityPoolConfiguration.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/SubscribeToDataset.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/SubscribeToDataset.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/SubscribeToDataset.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/SubscribeToDataset.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/Types.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/Types.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/Types.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/Types.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/UnsubscribeFromDataset.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/UnsubscribeFromDataset.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/UnsubscribeFromDataset.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/UnsubscribeFromDataset.hs diff --git a/aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/UpdateRecords.hs b/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/UpdateRecords.hs similarity index 100% rename from aws/amazonka-cognito-sync/gen/Network/AWS/CognitoSync/UpdateRecords.hs rename to amazonka-cognito-sync/gen/Network/AWS/CognitoSync/UpdateRecords.hs diff --git a/aws/amazonka-cognito-sync/LICENSE b/amazonka-config/LICENSE similarity index 100% rename from aws/amazonka-cognito-sync/LICENSE rename to amazonka-config/LICENSE diff --git a/aws/amazonka-config/Makefile b/amazonka-config/Makefile similarity index 100% rename from aws/amazonka-config/Makefile rename to amazonka-config/Makefile diff --git a/aws/amazonka-config/README.md b/amazonka-config/README.md similarity index 100% rename from aws/amazonka-config/README.md rename to amazonka-config/README.md diff --git a/aws/amazonka-cognito-sync/Setup.hs b/amazonka-config/Setup.hs similarity index 100% rename from aws/amazonka-cognito-sync/Setup.hs rename to amazonka-config/Setup.hs diff --git a/aws/amazonka-config/amazonka-config.cabal b/amazonka-config/amazonka-config.cabal similarity index 100% rename from aws/amazonka-config/amazonka-config.cabal rename to amazonka-config/amazonka-config.cabal diff --git a/aws/amazonka-config/gen/Network/AWS/Config.hs b/amazonka-config/gen/Network/AWS/Config.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config.hs rename to amazonka-config/gen/Network/AWS/Config.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/DeleteDeliveryChannel.hs b/amazonka-config/gen/Network/AWS/Config/DeleteDeliveryChannel.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/DeleteDeliveryChannel.hs rename to amazonka-config/gen/Network/AWS/Config/DeleteDeliveryChannel.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/DeliverConfigSnapshot.hs b/amazonka-config/gen/Network/AWS/Config/DeliverConfigSnapshot.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/DeliverConfigSnapshot.hs rename to amazonka-config/gen/Network/AWS/Config/DeliverConfigSnapshot.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/DescribeConfigurationRecorderStatus.hs b/amazonka-config/gen/Network/AWS/Config/DescribeConfigurationRecorderStatus.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/DescribeConfigurationRecorderStatus.hs rename to amazonka-config/gen/Network/AWS/Config/DescribeConfigurationRecorderStatus.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/DescribeConfigurationRecorders.hs b/amazonka-config/gen/Network/AWS/Config/DescribeConfigurationRecorders.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/DescribeConfigurationRecorders.hs rename to amazonka-config/gen/Network/AWS/Config/DescribeConfigurationRecorders.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/DescribeDeliveryChannelStatus.hs b/amazonka-config/gen/Network/AWS/Config/DescribeDeliveryChannelStatus.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/DescribeDeliveryChannelStatus.hs rename to amazonka-config/gen/Network/AWS/Config/DescribeDeliveryChannelStatus.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/DescribeDeliveryChannels.hs b/amazonka-config/gen/Network/AWS/Config/DescribeDeliveryChannels.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/DescribeDeliveryChannels.hs rename to amazonka-config/gen/Network/AWS/Config/DescribeDeliveryChannels.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/GetResourceConfigHistory.hs b/amazonka-config/gen/Network/AWS/Config/GetResourceConfigHistory.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/GetResourceConfigHistory.hs rename to amazonka-config/gen/Network/AWS/Config/GetResourceConfigHistory.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/PutConfigurationRecorder.hs b/amazonka-config/gen/Network/AWS/Config/PutConfigurationRecorder.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/PutConfigurationRecorder.hs rename to amazonka-config/gen/Network/AWS/Config/PutConfigurationRecorder.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/PutDeliveryChannel.hs b/amazonka-config/gen/Network/AWS/Config/PutDeliveryChannel.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/PutDeliveryChannel.hs rename to amazonka-config/gen/Network/AWS/Config/PutDeliveryChannel.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/StartConfigurationRecorder.hs b/amazonka-config/gen/Network/AWS/Config/StartConfigurationRecorder.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/StartConfigurationRecorder.hs rename to amazonka-config/gen/Network/AWS/Config/StartConfigurationRecorder.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/StopConfigurationRecorder.hs b/amazonka-config/gen/Network/AWS/Config/StopConfigurationRecorder.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/StopConfigurationRecorder.hs rename to amazonka-config/gen/Network/AWS/Config/StopConfigurationRecorder.hs diff --git a/aws/amazonka-config/gen/Network/AWS/Config/Types.hs b/amazonka-config/gen/Network/AWS/Config/Types.hs similarity index 100% rename from aws/amazonka-config/gen/Network/AWS/Config/Types.hs rename to amazonka-config/gen/Network/AWS/Config/Types.hs diff --git a/aws/amazonka-config/LICENSE b/amazonka-datapipeline/LICENSE similarity index 100% rename from aws/amazonka-config/LICENSE rename to amazonka-datapipeline/LICENSE diff --git a/aws/amazonka-datapipeline/Makefile b/amazonka-datapipeline/Makefile similarity index 100% rename from aws/amazonka-datapipeline/Makefile rename to amazonka-datapipeline/Makefile diff --git a/aws/amazonka-datapipeline/README.md b/amazonka-datapipeline/README.md similarity index 100% rename from aws/amazonka-datapipeline/README.md rename to amazonka-datapipeline/README.md diff --git a/aws/amazonka-config/Setup.hs b/amazonka-datapipeline/Setup.hs similarity index 100% rename from aws/amazonka-config/Setup.hs rename to amazonka-datapipeline/Setup.hs diff --git a/aws/amazonka-datapipeline/amazonka-datapipeline.cabal b/amazonka-datapipeline/amazonka-datapipeline.cabal similarity index 100% rename from aws/amazonka-datapipeline/amazonka-datapipeline.cabal rename to amazonka-datapipeline/amazonka-datapipeline.cabal diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ActivatePipeline.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ActivatePipeline.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ActivatePipeline.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/ActivatePipeline.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/CreatePipeline.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/CreatePipeline.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/CreatePipeline.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/CreatePipeline.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/DeletePipeline.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/DeletePipeline.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/DeletePipeline.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/DeletePipeline.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/DescribeObjects.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/DescribeObjects.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/DescribeObjects.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/DescribeObjects.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/DescribePipelines.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/DescribePipelines.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/DescribePipelines.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/DescribePipelines.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/EvaluateExpression.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/EvaluateExpression.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/EvaluateExpression.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/EvaluateExpression.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/GetPipelineDefinition.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/GetPipelineDefinition.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/GetPipelineDefinition.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/GetPipelineDefinition.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ListPipelines.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ListPipelines.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ListPipelines.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/ListPipelines.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/PollForTask.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/PollForTask.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/PollForTask.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/PollForTask.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/PutPipelineDefinition.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/PutPipelineDefinition.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/PutPipelineDefinition.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/PutPipelineDefinition.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/QueryObjects.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/QueryObjects.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/QueryObjects.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/QueryObjects.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ReportTaskProgress.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ReportTaskProgress.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ReportTaskProgress.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/ReportTaskProgress.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ReportTaskRunnerHeartbeat.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ReportTaskRunnerHeartbeat.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ReportTaskRunnerHeartbeat.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/ReportTaskRunnerHeartbeat.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/SetStatus.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/SetStatus.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/SetStatus.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/SetStatus.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/SetTaskStatus.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/SetTaskStatus.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/SetTaskStatus.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/SetTaskStatus.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/Types.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/Types.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/Types.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/Types.hs diff --git a/aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ValidatePipelineDefinition.hs b/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ValidatePipelineDefinition.hs similarity index 100% rename from aws/amazonka-datapipeline/gen/Network/AWS/DataPipeline/ValidatePipelineDefinition.hs rename to amazonka-datapipeline/gen/Network/AWS/DataPipeline/ValidatePipelineDefinition.hs diff --git a/aws/amazonka-datapipeline/LICENSE b/amazonka-directconnect/LICENSE similarity index 100% rename from aws/amazonka-datapipeline/LICENSE rename to amazonka-directconnect/LICENSE diff --git a/aws/amazonka-directconnect/Makefile b/amazonka-directconnect/Makefile similarity index 100% rename from aws/amazonka-directconnect/Makefile rename to amazonka-directconnect/Makefile diff --git a/aws/amazonka-directconnect/README.md b/amazonka-directconnect/README.md similarity index 100% rename from aws/amazonka-directconnect/README.md rename to amazonka-directconnect/README.md diff --git a/aws/amazonka-datapipeline/Setup.hs b/amazonka-directconnect/Setup.hs similarity index 100% rename from aws/amazonka-datapipeline/Setup.hs rename to amazonka-directconnect/Setup.hs diff --git a/aws/amazonka-directconnect/amazonka-directconnect.cabal b/amazonka-directconnect/amazonka-directconnect.cabal similarity index 100% rename from aws/amazonka-directconnect/amazonka-directconnect.cabal rename to amazonka-directconnect/amazonka-directconnect.cabal diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocateConnectionOnInterconnect.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocateConnectionOnInterconnect.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocateConnectionOnInterconnect.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocateConnectionOnInterconnect.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocatePrivateVirtualInterface.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocatePrivateVirtualInterface.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocatePrivateVirtualInterface.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocatePrivateVirtualInterface.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocatePublicVirtualInterface.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocatePublicVirtualInterface.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocatePublicVirtualInterface.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/AllocatePublicVirtualInterface.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmConnection.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmConnection.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmConnection.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmConnection.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmPrivateVirtualInterface.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmPrivateVirtualInterface.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmPrivateVirtualInterface.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmPrivateVirtualInterface.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmPublicVirtualInterface.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmPublicVirtualInterface.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmPublicVirtualInterface.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/ConfirmPublicVirtualInterface.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreateConnection.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreateConnection.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreateConnection.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/CreateConnection.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreateInterconnect.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreateInterconnect.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreateInterconnect.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/CreateInterconnect.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreatePrivateVirtualInterface.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreatePrivateVirtualInterface.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreatePrivateVirtualInterface.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/CreatePrivateVirtualInterface.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreatePublicVirtualInterface.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreatePublicVirtualInterface.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/CreatePublicVirtualInterface.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/CreatePublicVirtualInterface.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteConnection.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteConnection.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteConnection.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteConnection.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteInterconnect.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteInterconnect.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteInterconnect.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteInterconnect.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteVirtualInterface.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteVirtualInterface.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteVirtualInterface.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/DeleteVirtualInterface.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeConnections.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeConnections.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeConnections.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeConnections.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeConnectionsOnInterconnect.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeConnectionsOnInterconnect.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeConnectionsOnInterconnect.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeConnectionsOnInterconnect.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeInterconnects.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeInterconnects.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeInterconnects.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeInterconnects.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeLocations.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeLocations.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeLocations.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeLocations.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeVirtualGateways.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeVirtualGateways.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeVirtualGateways.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeVirtualGateways.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeVirtualInterfaces.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeVirtualInterfaces.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeVirtualInterfaces.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/DescribeVirtualInterfaces.hs diff --git a/aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/Types.hs b/amazonka-directconnect/gen/Network/AWS/DirectConnect/Types.hs similarity index 100% rename from aws/amazonka-directconnect/gen/Network/AWS/DirectConnect/Types.hs rename to amazonka-directconnect/gen/Network/AWS/DirectConnect/Types.hs diff --git a/aws/amazonka-directconnect/LICENSE b/amazonka-dynamodb/LICENSE similarity index 100% rename from aws/amazonka-directconnect/LICENSE rename to amazonka-dynamodb/LICENSE diff --git a/aws/amazonka-dynamodb/Makefile b/amazonka-dynamodb/Makefile similarity index 100% rename from aws/amazonka-dynamodb/Makefile rename to amazonka-dynamodb/Makefile diff --git a/aws/amazonka-dynamodb/README.md b/amazonka-dynamodb/README.md similarity index 100% rename from aws/amazonka-dynamodb/README.md rename to amazonka-dynamodb/README.md diff --git a/aws/amazonka-directconnect/Setup.hs b/amazonka-dynamodb/Setup.hs similarity index 100% rename from aws/amazonka-directconnect/Setup.hs rename to amazonka-dynamodb/Setup.hs diff --git a/aws/amazonka-dynamodb/amazonka-dynamodb.cabal b/amazonka-dynamodb/amazonka-dynamodb.cabal similarity index 100% rename from aws/amazonka-dynamodb/amazonka-dynamodb.cabal rename to amazonka-dynamodb/amazonka-dynamodb.cabal diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/BatchGetItem.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/BatchGetItem.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/BatchGetItem.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/BatchGetItem.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/BatchWriteItem.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/BatchWriteItem.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/BatchWriteItem.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/BatchWriteItem.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/CreateTable.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/CreateTable.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/CreateTable.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/CreateTable.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/DeleteItem.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/DeleteItem.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/DeleteItem.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/DeleteItem.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/DeleteTable.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/DeleteTable.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/DeleteTable.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/DeleteTable.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/DescribeTable.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/DescribeTable.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/DescribeTable.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/DescribeTable.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/GetItem.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/GetItem.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/GetItem.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/GetItem.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/ListTables.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/ListTables.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/ListTables.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/ListTables.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/PutItem.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/PutItem.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/PutItem.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/PutItem.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/Query.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/Query.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/Query.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/Query.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/Scan.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/Scan.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/Scan.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/Scan.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/Types.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/Types.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/Types.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/Types.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/UpdateItem.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/UpdateItem.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/UpdateItem.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/UpdateItem.hs diff --git a/aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/UpdateTable.hs b/amazonka-dynamodb/gen/Network/AWS/DynamoDB/UpdateTable.hs similarity index 100% rename from aws/amazonka-dynamodb/gen/Network/AWS/DynamoDB/UpdateTable.hs rename to amazonka-dynamodb/gen/Network/AWS/DynamoDB/UpdateTable.hs diff --git a/aws/amazonka-dynamodb/LICENSE b/amazonka-ec2/LICENSE similarity index 100% rename from aws/amazonka-dynamodb/LICENSE rename to amazonka-ec2/LICENSE diff --git a/aws/amazonka-ec2/Makefile b/amazonka-ec2/Makefile similarity index 100% rename from aws/amazonka-ec2/Makefile rename to amazonka-ec2/Makefile diff --git a/aws/amazonka-ec2/README.md b/amazonka-ec2/README.md similarity index 100% rename from aws/amazonka-ec2/README.md rename to amazonka-ec2/README.md diff --git a/aws/amazonka-dynamodb/Setup.hs b/amazonka-ec2/Setup.hs similarity index 100% rename from aws/amazonka-dynamodb/Setup.hs rename to amazonka-ec2/Setup.hs diff --git a/aws/amazonka-ec2/amazonka-ec2.cabal b/amazonka-ec2/amazonka-ec2.cabal similarity index 100% rename from aws/amazonka-ec2/amazonka-ec2.cabal rename to amazonka-ec2/amazonka-ec2.cabal diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2.hs b/amazonka-ec2/gen/Network/AWS/EC2.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2.hs rename to amazonka-ec2/gen/Network/AWS/EC2.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AcceptVpcPeeringConnection.hs b/amazonka-ec2/gen/Network/AWS/EC2/AcceptVpcPeeringConnection.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AcceptVpcPeeringConnection.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AcceptVpcPeeringConnection.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AllocateAddress.hs b/amazonka-ec2/gen/Network/AWS/EC2/AllocateAddress.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AllocateAddress.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AllocateAddress.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AssignPrivateIpAddresses.hs b/amazonka-ec2/gen/Network/AWS/EC2/AssignPrivateIpAddresses.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AssignPrivateIpAddresses.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AssignPrivateIpAddresses.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AssociateAddress.hs b/amazonka-ec2/gen/Network/AWS/EC2/AssociateAddress.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AssociateAddress.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AssociateAddress.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AssociateDhcpOptions.hs b/amazonka-ec2/gen/Network/AWS/EC2/AssociateDhcpOptions.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AssociateDhcpOptions.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AssociateDhcpOptions.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AssociateRouteTable.hs b/amazonka-ec2/gen/Network/AWS/EC2/AssociateRouteTable.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AssociateRouteTable.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AssociateRouteTable.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AttachInternetGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/AttachInternetGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AttachInternetGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AttachInternetGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AttachNetworkInterface.hs b/amazonka-ec2/gen/Network/AWS/EC2/AttachNetworkInterface.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AttachNetworkInterface.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AttachNetworkInterface.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AttachVolume.hs b/amazonka-ec2/gen/Network/AWS/EC2/AttachVolume.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AttachVolume.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AttachVolume.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AttachVpnGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/AttachVpnGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AttachVpnGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AttachVpnGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AuthorizeSecurityGroupEgress.hs b/amazonka-ec2/gen/Network/AWS/EC2/AuthorizeSecurityGroupEgress.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AuthorizeSecurityGroupEgress.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AuthorizeSecurityGroupEgress.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/AuthorizeSecurityGroupIngress.hs b/amazonka-ec2/gen/Network/AWS/EC2/AuthorizeSecurityGroupIngress.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/AuthorizeSecurityGroupIngress.hs rename to amazonka-ec2/gen/Network/AWS/EC2/AuthorizeSecurityGroupIngress.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/BundleInstance.hs b/amazonka-ec2/gen/Network/AWS/EC2/BundleInstance.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/BundleInstance.hs rename to amazonka-ec2/gen/Network/AWS/EC2/BundleInstance.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CancelBundleTask.hs b/amazonka-ec2/gen/Network/AWS/EC2/CancelBundleTask.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CancelBundleTask.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CancelBundleTask.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CancelConversionTask.hs b/amazonka-ec2/gen/Network/AWS/EC2/CancelConversionTask.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CancelConversionTask.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CancelConversionTask.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CancelExportTask.hs b/amazonka-ec2/gen/Network/AWS/EC2/CancelExportTask.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CancelExportTask.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CancelExportTask.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs b/amazonka-ec2/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CancelReservedInstancesListing.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs b/amazonka-ec2/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CancelSpotInstanceRequests.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ConfirmProductInstance.hs b/amazonka-ec2/gen/Network/AWS/EC2/ConfirmProductInstance.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ConfirmProductInstance.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ConfirmProductInstance.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CopyImage.hs b/amazonka-ec2/gen/Network/AWS/EC2/CopyImage.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CopyImage.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CopyImage.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CopySnapshot.hs b/amazonka-ec2/gen/Network/AWS/EC2/CopySnapshot.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CopySnapshot.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CopySnapshot.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateCustomerGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateCustomerGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateCustomerGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateCustomerGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateDhcpOptions.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateDhcpOptions.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateDhcpOptions.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateDhcpOptions.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateImage.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateImage.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateImage.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateImage.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateInstanceExportTask.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateInstanceExportTask.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateInstanceExportTask.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateInstanceExportTask.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateInternetGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateInternetGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateInternetGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateInternetGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateKeyPair.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateKeyPair.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateKeyPair.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateKeyPair.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkAcl.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkAcl.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkAcl.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkAcl.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkAclEntry.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkAclEntry.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkAclEntry.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkAclEntry.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkInterface.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkInterface.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkInterface.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateNetworkInterface.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreatePlacementGroup.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreatePlacementGroup.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreatePlacementGroup.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreatePlacementGroup.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateReservedInstancesListing.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateRoute.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateRoute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateRoute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateRoute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateRouteTable.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateRouteTable.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateRouteTable.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateRouteTable.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateSecurityGroup.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateSecurityGroup.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateSecurityGroup.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateSecurityGroup.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateSnapshot.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateSnapshot.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateSnapshot.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateSnapshot.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateSpotDatafeedSubscription.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateSubnet.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateSubnet.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateSubnet.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateSubnet.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateTags.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateTags.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateTags.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateTags.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVolume.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateVolume.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVolume.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateVolume.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpc.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateVpc.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpc.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateVpc.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpcPeeringConnection.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateVpcPeeringConnection.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpcPeeringConnection.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateVpcPeeringConnection.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpnConnection.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateVpnConnection.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpnConnection.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateVpnConnection.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpnConnectionRoute.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateVpnConnectionRoute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpnConnectionRoute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateVpnConnectionRoute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpnGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/CreateVpnGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/CreateVpnGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/CreateVpnGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteCustomerGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteCustomerGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteCustomerGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteCustomerGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteDhcpOptions.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteDhcpOptions.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteDhcpOptions.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteDhcpOptions.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteInternetGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteInternetGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteInternetGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteInternetGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteKeyPair.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteKeyPair.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteKeyPair.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteKeyPair.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkAcl.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkAcl.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkAcl.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkAcl.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkAclEntry.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkAclEntry.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkAclEntry.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkAclEntry.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkInterface.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkInterface.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkInterface.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteNetworkInterface.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeletePlacementGroup.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeletePlacementGroup.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeletePlacementGroup.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeletePlacementGroup.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteRoute.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteRoute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteRoute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteRoute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteRouteTable.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteRouteTable.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteRouteTable.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteRouteTable.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteSecurityGroup.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteSecurityGroup.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteSecurityGroup.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteSecurityGroup.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteSnapshot.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteSnapshot.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteSnapshot.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteSnapshot.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteSpotDatafeedSubscription.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteSubnet.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteSubnet.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteSubnet.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteSubnet.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteTags.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteTags.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteTags.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteTags.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVolume.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteVolume.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVolume.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteVolume.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpc.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpc.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpc.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteVpc.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpcPeeringConnection.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpcPeeringConnection.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpcPeeringConnection.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteVpcPeeringConnection.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnConnection.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnConnection.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnConnection.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnConnection.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnConnectionRoute.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnConnectionRoute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnConnectionRoute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnConnectionRoute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeleteVpnGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DeregisterImage.hs b/amazonka-ec2/gen/Network/AWS/EC2/DeregisterImage.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DeregisterImage.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DeregisterImage.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeAccountAttributes.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeAccountAttributes.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeAccountAttributes.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeAccountAttributes.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeAddresses.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeAddresses.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeAddresses.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeAddresses.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeAvailabilityZones.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeBundleTasks.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeBundleTasks.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeBundleTasks.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeBundleTasks.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeConversionTasks.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeConversionTasks.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeConversionTasks.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeConversionTasks.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeCustomerGateways.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeCustomerGateways.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeCustomerGateways.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeCustomerGateways.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeDhcpOptions.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeDhcpOptions.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeDhcpOptions.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeDhcpOptions.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeExportTasks.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeExportTasks.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeExportTasks.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeExportTasks.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeImageAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeImageAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeImageAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeImageAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeImages.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeImages.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeImages.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeImages.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeInstanceAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeInstanceStatus.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeInstanceStatus.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeInstanceStatus.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeInstanceStatus.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeInternetGateways.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeInternetGateways.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeInternetGateways.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeInternetGateways.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeKeyPairs.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeKeyPairs.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeKeyPairs.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeKeyPairs.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkAcls.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkAcls.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkAcls.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkAcls.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkInterfaceAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkInterfaceAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkInterfaceAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkInterfaceAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkInterfaces.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkInterfaces.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkInterfaces.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeNetworkInterfaces.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribePlacementGroups.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribePlacementGroups.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribePlacementGroups.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribePlacementGroups.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeRegions.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeRegions.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeRegions.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeRegions.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesListings.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesModifications.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeReservedInstancesOfferings.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeRouteTables.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeRouteTables.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeRouteTables.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeRouteTables.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSecurityGroups.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeSecurityGroups.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSecurityGroups.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeSecurityGroups.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeSnapshotAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSnapshots.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeSnapshots.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSnapshots.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeSnapshots.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotDatafeedSubscription.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotInstanceRequests.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeSpotPriceHistory.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSubnets.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeSubnets.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeSubnets.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeSubnets.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeTags.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeTags.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeTags.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeTags.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumeAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumeStatus.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumeStatus.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumeStatus.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumeStatus.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumes.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumes.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumes.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeVolumes.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcPeeringConnections.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcPeeringConnections.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcPeeringConnections.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcPeeringConnections.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcs.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcs.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcs.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeVpcs.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpnConnections.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpnConnections.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpnConnections.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeVpnConnections.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpnGateways.hs b/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpnGateways.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DescribeVpnGateways.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DescribeVpnGateways.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DetachInternetGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/DetachInternetGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DetachInternetGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DetachInternetGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DetachNetworkInterface.hs b/amazonka-ec2/gen/Network/AWS/EC2/DetachNetworkInterface.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DetachNetworkInterface.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DetachNetworkInterface.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DetachVolume.hs b/amazonka-ec2/gen/Network/AWS/EC2/DetachVolume.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DetachVolume.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DetachVolume.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DetachVpnGateway.hs b/amazonka-ec2/gen/Network/AWS/EC2/DetachVpnGateway.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DetachVpnGateway.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DetachVpnGateway.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DisableVgwRoutePropagation.hs b/amazonka-ec2/gen/Network/AWS/EC2/DisableVgwRoutePropagation.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DisableVgwRoutePropagation.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DisableVgwRoutePropagation.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DisassociateAddress.hs b/amazonka-ec2/gen/Network/AWS/EC2/DisassociateAddress.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DisassociateAddress.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DisassociateAddress.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/DisassociateRouteTable.hs b/amazonka-ec2/gen/Network/AWS/EC2/DisassociateRouteTable.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/DisassociateRouteTable.hs rename to amazonka-ec2/gen/Network/AWS/EC2/DisassociateRouteTable.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/EnableVgwRoutePropagation.hs b/amazonka-ec2/gen/Network/AWS/EC2/EnableVgwRoutePropagation.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/EnableVgwRoutePropagation.hs rename to amazonka-ec2/gen/Network/AWS/EC2/EnableVgwRoutePropagation.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/EnableVolumeIO.hs b/amazonka-ec2/gen/Network/AWS/EC2/EnableVolumeIO.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/EnableVolumeIO.hs rename to amazonka-ec2/gen/Network/AWS/EC2/EnableVolumeIO.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/GetConsoleOutput.hs b/amazonka-ec2/gen/Network/AWS/EC2/GetConsoleOutput.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/GetConsoleOutput.hs rename to amazonka-ec2/gen/Network/AWS/EC2/GetConsoleOutput.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/GetPasswordData.hs b/amazonka-ec2/gen/Network/AWS/EC2/GetPasswordData.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/GetPasswordData.hs rename to amazonka-ec2/gen/Network/AWS/EC2/GetPasswordData.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ImportInstance.hs b/amazonka-ec2/gen/Network/AWS/EC2/ImportInstance.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ImportInstance.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ImportInstance.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ImportKeyPair.hs b/amazonka-ec2/gen/Network/AWS/EC2/ImportKeyPair.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ImportKeyPair.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ImportKeyPair.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ImportVolume.hs b/amazonka-ec2/gen/Network/AWS/EC2/ImportVolume.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ImportVolume.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ImportVolume.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyImageAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ModifyImageAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyImageAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ModifyImageAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ModifyInstanceAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyNetworkInterfaceAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ModifyNetworkInterfaceAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyNetworkInterfaceAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ModifyNetworkInterfaceAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyReservedInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/ModifyReservedInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyReservedInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ModifyReservedInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ModifySnapshotAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ModifySubnetAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ModifySubnetAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ModifySubnetAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ModifySubnetAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyVolumeAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ModifyVolumeAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyVolumeAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ModifyVolumeAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyVpcAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ModifyVpcAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ModifyVpcAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ModifyVpcAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/MonitorInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/MonitorInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/MonitorInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/MonitorInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs b/amazonka-ec2/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs rename to amazonka-ec2/gen/Network/AWS/EC2/PurchaseReservedInstancesOffering.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/RebootInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/RebootInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/RebootInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/RebootInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/RegisterImage.hs b/amazonka-ec2/gen/Network/AWS/EC2/RegisterImage.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/RegisterImage.hs rename to amazonka-ec2/gen/Network/AWS/EC2/RegisterImage.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/RejectVpcPeeringConnection.hs b/amazonka-ec2/gen/Network/AWS/EC2/RejectVpcPeeringConnection.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/RejectVpcPeeringConnection.hs rename to amazonka-ec2/gen/Network/AWS/EC2/RejectVpcPeeringConnection.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ReleaseAddress.hs b/amazonka-ec2/gen/Network/AWS/EC2/ReleaseAddress.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ReleaseAddress.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ReleaseAddress.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ReplaceNetworkAclAssociation.hs b/amazonka-ec2/gen/Network/AWS/EC2/ReplaceNetworkAclAssociation.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ReplaceNetworkAclAssociation.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ReplaceNetworkAclAssociation.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ReplaceNetworkAclEntry.hs b/amazonka-ec2/gen/Network/AWS/EC2/ReplaceNetworkAclEntry.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ReplaceNetworkAclEntry.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ReplaceNetworkAclEntry.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ReplaceRoute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ReplaceRoute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ReplaceRoute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ReplaceRoute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ReplaceRouteTableAssociation.hs b/amazonka-ec2/gen/Network/AWS/EC2/ReplaceRouteTableAssociation.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ReplaceRouteTableAssociation.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ReplaceRouteTableAssociation.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ReportInstanceStatus.hs b/amazonka-ec2/gen/Network/AWS/EC2/ReportInstanceStatus.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ReportInstanceStatus.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ReportInstanceStatus.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/RequestSpotInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/RequestSpotInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/RequestSpotInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/RequestSpotInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ResetImageAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ResetImageAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ResetImageAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ResetImageAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ResetInstanceAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ResetInstanceAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ResetInstanceAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ResetInstanceAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ResetNetworkInterfaceAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ResetNetworkInterfaceAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ResetNetworkInterfaceAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ResetNetworkInterfaceAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs b/amazonka-ec2/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs rename to amazonka-ec2/gen/Network/AWS/EC2/ResetSnapshotAttribute.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/RevokeSecurityGroupEgress.hs b/amazonka-ec2/gen/Network/AWS/EC2/RevokeSecurityGroupEgress.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/RevokeSecurityGroupEgress.hs rename to amazonka-ec2/gen/Network/AWS/EC2/RevokeSecurityGroupEgress.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/RevokeSecurityGroupIngress.hs b/amazonka-ec2/gen/Network/AWS/EC2/RevokeSecurityGroupIngress.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/RevokeSecurityGroupIngress.hs rename to amazonka-ec2/gen/Network/AWS/EC2/RevokeSecurityGroupIngress.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/RunInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/RunInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/RunInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/RunInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/StartInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/StartInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/StartInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/StartInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/StopInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/StopInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/StopInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/StopInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/TerminateInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/TerminateInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/TerminateInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/TerminateInstances.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/Types.hs b/amazonka-ec2/gen/Network/AWS/EC2/Types.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/Types.hs rename to amazonka-ec2/gen/Network/AWS/EC2/Types.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/UnassignPrivateIpAddresses.hs b/amazonka-ec2/gen/Network/AWS/EC2/UnassignPrivateIpAddresses.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/UnassignPrivateIpAddresses.hs rename to amazonka-ec2/gen/Network/AWS/EC2/UnassignPrivateIpAddresses.hs diff --git a/aws/amazonka-ec2/gen/Network/AWS/EC2/UnmonitorInstances.hs b/amazonka-ec2/gen/Network/AWS/EC2/UnmonitorInstances.hs similarity index 100% rename from aws/amazonka-ec2/gen/Network/AWS/EC2/UnmonitorInstances.hs rename to amazonka-ec2/gen/Network/AWS/EC2/UnmonitorInstances.hs diff --git a/aws/amazonka-ec2/src/Network/AWS/EC2/Internal.hs b/amazonka-ec2/src/Network/AWS/EC2/Internal.hs similarity index 100% rename from aws/amazonka-ec2/src/Network/AWS/EC2/Internal.hs rename to amazonka-ec2/src/Network/AWS/EC2/Internal.hs diff --git a/aws/amazonka-ec2/LICENSE b/amazonka-elasticache/LICENSE similarity index 100% rename from aws/amazonka-ec2/LICENSE rename to amazonka-elasticache/LICENSE diff --git a/aws/amazonka-elasticache/Makefile b/amazonka-elasticache/Makefile similarity index 100% rename from aws/amazonka-elasticache/Makefile rename to amazonka-elasticache/Makefile diff --git a/aws/amazonka-elasticache/README.md b/amazonka-elasticache/README.md similarity index 100% rename from aws/amazonka-elasticache/README.md rename to amazonka-elasticache/README.md diff --git a/aws/amazonka-ec2/Setup.hs b/amazonka-elasticache/Setup.hs similarity index 100% rename from aws/amazonka-ec2/Setup.hs rename to amazonka-elasticache/Setup.hs diff --git a/aws/amazonka-elasticache/amazonka-elasticache.cabal b/amazonka-elasticache/amazonka-elasticache.cabal similarity index 100% rename from aws/amazonka-elasticache/amazonka-elasticache.cabal rename to amazonka-elasticache/amazonka-elasticache.cabal diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/AuthorizeCacheSecurityGroupIngress.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/AuthorizeCacheSecurityGroupIngress.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/AuthorizeCacheSecurityGroupIngress.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/AuthorizeCacheSecurityGroupIngress.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CopySnapshot.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/CopySnapshot.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CopySnapshot.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/CopySnapshot.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheCluster.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheCluster.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheCluster.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheCluster.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheParameterGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheParameterGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheParameterGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheParameterGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheSecurityGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheSecurityGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheSecurityGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheSecurityGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheSubnetGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheSubnetGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheSubnetGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateCacheSubnetGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateReplicationGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateReplicationGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateReplicationGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateReplicationGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateSnapshot.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateSnapshot.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateSnapshot.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/CreateSnapshot.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheCluster.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheCluster.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheCluster.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheCluster.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheParameterGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheParameterGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheParameterGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheParameterGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheSecurityGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheSecurityGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheSecurityGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheSecurityGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheSubnetGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheSubnetGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheSubnetGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteCacheSubnetGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteReplicationGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteReplicationGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteReplicationGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteReplicationGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteSnapshot.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteSnapshot.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteSnapshot.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DeleteSnapshot.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheClusters.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheClusters.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheClusters.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheClusters.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheEngineVersions.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheEngineVersions.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheEngineVersions.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheEngineVersions.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheParameterGroups.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheParameterGroups.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheParameterGroups.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheParameterGroups.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheParameters.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheParameters.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheParameters.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheParameters.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheSecurityGroups.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheSecurityGroups.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheSecurityGroups.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheSecurityGroups.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheSubnetGroups.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheSubnetGroups.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheSubnetGroups.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeCacheSubnetGroups.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeEngineDefaultParameters.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeEngineDefaultParameters.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeEngineDefaultParameters.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeEngineDefaultParameters.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeEvents.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeEvents.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeEvents.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeEvents.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReplicationGroups.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReplicationGroups.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReplicationGroups.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReplicationGroups.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodes.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodes.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodes.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodes.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodesOfferings.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodesOfferings.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodesOfferings.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeReservedCacheNodesOfferings.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeSnapshots.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeSnapshots.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeSnapshots.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/DescribeSnapshots.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheCluster.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheCluster.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheCluster.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheCluster.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheParameterGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheParameterGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheParameterGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheParameterGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheSubnetGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheSubnetGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheSubnetGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyCacheSubnetGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyReplicationGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyReplicationGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyReplicationGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/ModifyReplicationGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/PurchaseReservedCacheNodesOffering.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/PurchaseReservedCacheNodesOffering.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/PurchaseReservedCacheNodesOffering.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/PurchaseReservedCacheNodesOffering.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/RebootCacheCluster.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/RebootCacheCluster.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/RebootCacheCluster.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/RebootCacheCluster.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ResetCacheParameterGroup.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/ResetCacheParameterGroup.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/ResetCacheParameterGroup.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/ResetCacheParameterGroup.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/RevokeCacheSecurityGroupIngress.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/RevokeCacheSecurityGroupIngress.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/RevokeCacheSecurityGroupIngress.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/RevokeCacheSecurityGroupIngress.hs diff --git a/aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/Types.hs b/amazonka-elasticache/gen/Network/AWS/ElastiCache/Types.hs similarity index 100% rename from aws/amazonka-elasticache/gen/Network/AWS/ElastiCache/Types.hs rename to amazonka-elasticache/gen/Network/AWS/ElastiCache/Types.hs diff --git a/aws/amazonka-elasticache/LICENSE b/amazonka-elasticbeanstalk/LICENSE similarity index 100% rename from aws/amazonka-elasticache/LICENSE rename to amazonka-elasticbeanstalk/LICENSE diff --git a/aws/amazonka-elasticbeanstalk/Makefile b/amazonka-elasticbeanstalk/Makefile similarity index 100% rename from aws/amazonka-elasticbeanstalk/Makefile rename to amazonka-elasticbeanstalk/Makefile diff --git a/aws/amazonka-elasticbeanstalk/README.md b/amazonka-elasticbeanstalk/README.md similarity index 100% rename from aws/amazonka-elasticbeanstalk/README.md rename to amazonka-elasticbeanstalk/README.md diff --git a/aws/amazonka-elasticache/Setup.hs b/amazonka-elasticbeanstalk/Setup.hs similarity index 100% rename from aws/amazonka-elasticache/Setup.hs rename to amazonka-elasticbeanstalk/Setup.hs diff --git a/aws/amazonka-elasticbeanstalk/amazonka-elasticbeanstalk.cabal b/amazonka-elasticbeanstalk/amazonka-elasticbeanstalk.cabal similarity index 100% rename from aws/amazonka-elasticbeanstalk/amazonka-elasticbeanstalk.cabal rename to amazonka-elasticbeanstalk/amazonka-elasticbeanstalk.cabal diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CheckDNSAvailability.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/CreateStorageLocation.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DeleteEnvironmentConfiguration.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironmentResources.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RebuildEnvironment.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RestartAppServer.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/SwapEnvironmentCNAMEs.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/Types.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/Types.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/Types.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/Types.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs diff --git a/aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs b/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs rename to amazonka-elasticbeanstalk/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs diff --git a/aws/amazonka-elasticbeanstalk/LICENSE b/amazonka-elastictranscoder/LICENSE similarity index 100% rename from aws/amazonka-elasticbeanstalk/LICENSE rename to amazonka-elastictranscoder/LICENSE diff --git a/aws/amazonka-elastictranscoder/Makefile b/amazonka-elastictranscoder/Makefile similarity index 100% rename from aws/amazonka-elastictranscoder/Makefile rename to amazonka-elastictranscoder/Makefile diff --git a/aws/amazonka-elastictranscoder/README.md b/amazonka-elastictranscoder/README.md similarity index 100% rename from aws/amazonka-elastictranscoder/README.md rename to amazonka-elastictranscoder/README.md diff --git a/aws/amazonka-elasticbeanstalk/Setup.hs b/amazonka-elastictranscoder/Setup.hs similarity index 100% rename from aws/amazonka-elasticbeanstalk/Setup.hs rename to amazonka-elastictranscoder/Setup.hs diff --git a/aws/amazonka-elastictranscoder/amazonka-elastictranscoder.cabal b/amazonka-elastictranscoder/amazonka-elastictranscoder.cabal similarity index 100% rename from aws/amazonka-elastictranscoder/amazonka-elastictranscoder.cabal rename to amazonka-elastictranscoder/amazonka-elastictranscoder.cabal diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CancelJob.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CancelJob.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CancelJob.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CancelJob.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreateJob.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreateJob.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreateJob.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreateJob.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreatePipeline.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreatePipeline.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreatePipeline.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreatePipeline.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreatePreset.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreatePreset.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreatePreset.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/CreatePreset.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/DeletePipeline.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/DeletePipeline.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/DeletePipeline.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/DeletePipeline.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/DeletePreset.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/DeletePreset.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/DeletePreset.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/DeletePreset.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListJobsByPipeline.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListJobsByPipeline.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListJobsByPipeline.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListJobsByPipeline.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListJobsByStatus.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListJobsByStatus.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListJobsByStatus.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListJobsByStatus.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListPipelines.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListPipelines.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListPipelines.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListPipelines.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListPresets.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListPresets.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListPresets.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ListPresets.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadJob.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadJob.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadJob.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadJob.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadPipeline.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadPipeline.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadPipeline.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadPipeline.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadPreset.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadPreset.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadPreset.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/ReadPreset.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/TestRole.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/TestRole.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/TestRole.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/TestRole.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/Types.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/Types.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/Types.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/Types.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipeline.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipeline.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipeline.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipeline.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipelineNotifications.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipelineNotifications.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipelineNotifications.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipelineNotifications.hs diff --git a/aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipelineStatus.hs b/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipelineStatus.hs similarity index 100% rename from aws/amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipelineStatus.hs rename to amazonka-elastictranscoder/gen/Network/AWS/ElasticTranscoder/UpdatePipelineStatus.hs diff --git a/aws/amazonka-elastictranscoder/LICENSE b/amazonka-elb/LICENSE similarity index 100% rename from aws/amazonka-elastictranscoder/LICENSE rename to amazonka-elb/LICENSE diff --git a/aws/amazonka-elb/Makefile b/amazonka-elb/Makefile similarity index 100% rename from aws/amazonka-elb/Makefile rename to amazonka-elb/Makefile diff --git a/aws/amazonka-elb/README.md b/amazonka-elb/README.md similarity index 100% rename from aws/amazonka-elb/README.md rename to amazonka-elb/README.md diff --git a/aws/amazonka-elastictranscoder/Setup.hs b/amazonka-elb/Setup.hs similarity index 100% rename from aws/amazonka-elastictranscoder/Setup.hs rename to amazonka-elb/Setup.hs diff --git a/aws/amazonka-elb/amazonka-elb.cabal b/amazonka-elb/amazonka-elb.cabal similarity index 100% rename from aws/amazonka-elb/amazonka-elb.cabal rename to amazonka-elb/amazonka-elb.cabal diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB.hs b/amazonka-elb/gen/Network/AWS/ELB.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB.hs rename to amazonka-elb/gen/Network/AWS/ELB.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/AddTags.hs b/amazonka-elb/gen/Network/AWS/ELB/AddTags.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/AddTags.hs rename to amazonka-elb/gen/Network/AWS/ELB/AddTags.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/ApplySecurityGroupsToLoadBalancer.hs b/amazonka-elb/gen/Network/AWS/ELB/ApplySecurityGroupsToLoadBalancer.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/ApplySecurityGroupsToLoadBalancer.hs rename to amazonka-elb/gen/Network/AWS/ELB/ApplySecurityGroupsToLoadBalancer.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/AttachLoadBalancerToSubnets.hs b/amazonka-elb/gen/Network/AWS/ELB/AttachLoadBalancerToSubnets.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/AttachLoadBalancerToSubnets.hs rename to amazonka-elb/gen/Network/AWS/ELB/AttachLoadBalancerToSubnets.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/ConfigureHealthCheck.hs b/amazonka-elb/gen/Network/AWS/ELB/ConfigureHealthCheck.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/ConfigureHealthCheck.hs rename to amazonka-elb/gen/Network/AWS/ELB/ConfigureHealthCheck.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/CreateAppCookieStickinessPolicy.hs b/amazonka-elb/gen/Network/AWS/ELB/CreateAppCookieStickinessPolicy.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/CreateAppCookieStickinessPolicy.hs rename to amazonka-elb/gen/Network/AWS/ELB/CreateAppCookieStickinessPolicy.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/CreateLBCookieStickinessPolicy.hs b/amazonka-elb/gen/Network/AWS/ELB/CreateLBCookieStickinessPolicy.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/CreateLBCookieStickinessPolicy.hs rename to amazonka-elb/gen/Network/AWS/ELB/CreateLBCookieStickinessPolicy.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancer.hs b/amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancer.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancer.hs rename to amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancer.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancerListeners.hs b/amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancerListeners.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancerListeners.hs rename to amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancerListeners.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancerPolicy.hs b/amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancerPolicy.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancerPolicy.hs rename to amazonka-elb/gen/Network/AWS/ELB/CreateLoadBalancerPolicy.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancer.hs b/amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancer.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancer.hs rename to amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancer.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancerListeners.hs b/amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancerListeners.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancerListeners.hs rename to amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancerListeners.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancerPolicy.hs b/amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancerPolicy.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancerPolicy.hs rename to amazonka-elb/gen/Network/AWS/ELB/DeleteLoadBalancerPolicy.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DeregisterInstancesFromLoadBalancer.hs b/amazonka-elb/gen/Network/AWS/ELB/DeregisterInstancesFromLoadBalancer.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DeregisterInstancesFromLoadBalancer.hs rename to amazonka-elb/gen/Network/AWS/ELB/DeregisterInstancesFromLoadBalancer.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DescribeInstanceHealth.hs b/amazonka-elb/gen/Network/AWS/ELB/DescribeInstanceHealth.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DescribeInstanceHealth.hs rename to amazonka-elb/gen/Network/AWS/ELB/DescribeInstanceHealth.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerAttributes.hs b/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerAttributes.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerAttributes.hs rename to amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerAttributes.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerPolicies.hs b/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerPolicies.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerPolicies.hs rename to amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerPolicies.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerPolicyTypes.hs b/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerPolicyTypes.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerPolicyTypes.hs rename to amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancerPolicyTypes.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancers.hs b/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancers.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancers.hs rename to amazonka-elb/gen/Network/AWS/ELB/DescribeLoadBalancers.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DescribeTags.hs b/amazonka-elb/gen/Network/AWS/ELB/DescribeTags.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DescribeTags.hs rename to amazonka-elb/gen/Network/AWS/ELB/DescribeTags.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DetachLoadBalancerFromSubnets.hs b/amazonka-elb/gen/Network/AWS/ELB/DetachLoadBalancerFromSubnets.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DetachLoadBalancerFromSubnets.hs rename to amazonka-elb/gen/Network/AWS/ELB/DetachLoadBalancerFromSubnets.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/DisableAvailabilityZonesForLoadBalancer.hs b/amazonka-elb/gen/Network/AWS/ELB/DisableAvailabilityZonesForLoadBalancer.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/DisableAvailabilityZonesForLoadBalancer.hs rename to amazonka-elb/gen/Network/AWS/ELB/DisableAvailabilityZonesForLoadBalancer.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/EnableAvailabilityZonesForLoadBalancer.hs b/amazonka-elb/gen/Network/AWS/ELB/EnableAvailabilityZonesForLoadBalancer.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/EnableAvailabilityZonesForLoadBalancer.hs rename to amazonka-elb/gen/Network/AWS/ELB/EnableAvailabilityZonesForLoadBalancer.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/ModifyLoadBalancerAttributes.hs b/amazonka-elb/gen/Network/AWS/ELB/ModifyLoadBalancerAttributes.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/ModifyLoadBalancerAttributes.hs rename to amazonka-elb/gen/Network/AWS/ELB/ModifyLoadBalancerAttributes.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/RegisterInstancesWithLoadBalancer.hs b/amazonka-elb/gen/Network/AWS/ELB/RegisterInstancesWithLoadBalancer.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/RegisterInstancesWithLoadBalancer.hs rename to amazonka-elb/gen/Network/AWS/ELB/RegisterInstancesWithLoadBalancer.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/RemoveTags.hs b/amazonka-elb/gen/Network/AWS/ELB/RemoveTags.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/RemoveTags.hs rename to amazonka-elb/gen/Network/AWS/ELB/RemoveTags.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerListenerSSLCertificate.hs b/amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerListenerSSLCertificate.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerListenerSSLCertificate.hs rename to amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerListenerSSLCertificate.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerPoliciesForBackendServer.hs b/amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerPoliciesForBackendServer.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerPoliciesForBackendServer.hs rename to amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerPoliciesForBackendServer.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerPoliciesOfListener.hs b/amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerPoliciesOfListener.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerPoliciesOfListener.hs rename to amazonka-elb/gen/Network/AWS/ELB/SetLoadBalancerPoliciesOfListener.hs diff --git a/aws/amazonka-elb/gen/Network/AWS/ELB/Types.hs b/amazonka-elb/gen/Network/AWS/ELB/Types.hs similarity index 100% rename from aws/amazonka-elb/gen/Network/AWS/ELB/Types.hs rename to amazonka-elb/gen/Network/AWS/ELB/Types.hs diff --git a/aws/amazonka-elb/LICENSE b/amazonka-emr/LICENSE similarity index 100% rename from aws/amazonka-elb/LICENSE rename to amazonka-emr/LICENSE diff --git a/aws/amazonka-emr/Makefile b/amazonka-emr/Makefile similarity index 100% rename from aws/amazonka-emr/Makefile rename to amazonka-emr/Makefile diff --git a/aws/amazonka-emr/README.md b/amazonka-emr/README.md similarity index 100% rename from aws/amazonka-emr/README.md rename to amazonka-emr/README.md diff --git a/aws/amazonka-elb/Setup.hs b/amazonka-emr/Setup.hs similarity index 100% rename from aws/amazonka-elb/Setup.hs rename to amazonka-emr/Setup.hs diff --git a/aws/amazonka-emr/amazonka-emr.cabal b/amazonka-emr/amazonka-emr.cabal similarity index 100% rename from aws/amazonka-emr/amazonka-emr.cabal rename to amazonka-emr/amazonka-emr.cabal diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR.hs b/amazonka-emr/gen/Network/AWS/EMR.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR.hs rename to amazonka-emr/gen/Network/AWS/EMR.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/AddInstanceGroups.hs b/amazonka-emr/gen/Network/AWS/EMR/AddInstanceGroups.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/AddInstanceGroups.hs rename to amazonka-emr/gen/Network/AWS/EMR/AddInstanceGroups.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/AddJobFlowSteps.hs b/amazonka-emr/gen/Network/AWS/EMR/AddJobFlowSteps.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/AddJobFlowSteps.hs rename to amazonka-emr/gen/Network/AWS/EMR/AddJobFlowSteps.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/AddTags.hs b/amazonka-emr/gen/Network/AWS/EMR/AddTags.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/AddTags.hs rename to amazonka-emr/gen/Network/AWS/EMR/AddTags.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/DescribeCluster.hs b/amazonka-emr/gen/Network/AWS/EMR/DescribeCluster.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/DescribeCluster.hs rename to amazonka-emr/gen/Network/AWS/EMR/DescribeCluster.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/DescribeJobFlows.hs b/amazonka-emr/gen/Network/AWS/EMR/DescribeJobFlows.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/DescribeJobFlows.hs rename to amazonka-emr/gen/Network/AWS/EMR/DescribeJobFlows.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/DescribeStep.hs b/amazonka-emr/gen/Network/AWS/EMR/DescribeStep.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/DescribeStep.hs rename to amazonka-emr/gen/Network/AWS/EMR/DescribeStep.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/ListBootstrapActions.hs b/amazonka-emr/gen/Network/AWS/EMR/ListBootstrapActions.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/ListBootstrapActions.hs rename to amazonka-emr/gen/Network/AWS/EMR/ListBootstrapActions.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/ListClusters.hs b/amazonka-emr/gen/Network/AWS/EMR/ListClusters.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/ListClusters.hs rename to amazonka-emr/gen/Network/AWS/EMR/ListClusters.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/ListInstanceGroups.hs b/amazonka-emr/gen/Network/AWS/EMR/ListInstanceGroups.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/ListInstanceGroups.hs rename to amazonka-emr/gen/Network/AWS/EMR/ListInstanceGroups.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/ListInstances.hs b/amazonka-emr/gen/Network/AWS/EMR/ListInstances.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/ListInstances.hs rename to amazonka-emr/gen/Network/AWS/EMR/ListInstances.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/ListSteps.hs b/amazonka-emr/gen/Network/AWS/EMR/ListSteps.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/ListSteps.hs rename to amazonka-emr/gen/Network/AWS/EMR/ListSteps.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/ModifyInstanceGroups.hs b/amazonka-emr/gen/Network/AWS/EMR/ModifyInstanceGroups.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/ModifyInstanceGroups.hs rename to amazonka-emr/gen/Network/AWS/EMR/ModifyInstanceGroups.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/RemoveTags.hs b/amazonka-emr/gen/Network/AWS/EMR/RemoveTags.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/RemoveTags.hs rename to amazonka-emr/gen/Network/AWS/EMR/RemoveTags.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/RunJobFlow.hs b/amazonka-emr/gen/Network/AWS/EMR/RunJobFlow.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/RunJobFlow.hs rename to amazonka-emr/gen/Network/AWS/EMR/RunJobFlow.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/SetTerminationProtection.hs b/amazonka-emr/gen/Network/AWS/EMR/SetTerminationProtection.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/SetTerminationProtection.hs rename to amazonka-emr/gen/Network/AWS/EMR/SetTerminationProtection.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/SetVisibleToAllUsers.hs b/amazonka-emr/gen/Network/AWS/EMR/SetVisibleToAllUsers.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/SetVisibleToAllUsers.hs rename to amazonka-emr/gen/Network/AWS/EMR/SetVisibleToAllUsers.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/TerminateJobFlows.hs b/amazonka-emr/gen/Network/AWS/EMR/TerminateJobFlows.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/TerminateJobFlows.hs rename to amazonka-emr/gen/Network/AWS/EMR/TerminateJobFlows.hs diff --git a/aws/amazonka-emr/gen/Network/AWS/EMR/Types.hs b/amazonka-emr/gen/Network/AWS/EMR/Types.hs similarity index 100% rename from aws/amazonka-emr/gen/Network/AWS/EMR/Types.hs rename to amazonka-emr/gen/Network/AWS/EMR/Types.hs diff --git a/aws/amazonka-emr/LICENSE b/amazonka-iam/LICENSE similarity index 100% rename from aws/amazonka-emr/LICENSE rename to amazonka-iam/LICENSE diff --git a/aws/amazonka-iam/Makefile b/amazonka-iam/Makefile similarity index 100% rename from aws/amazonka-iam/Makefile rename to amazonka-iam/Makefile diff --git a/aws/amazonka-iam/README.md b/amazonka-iam/README.md similarity index 100% rename from aws/amazonka-iam/README.md rename to amazonka-iam/README.md diff --git a/aws/amazonka-emr/Setup.hs b/amazonka-iam/Setup.hs similarity index 100% rename from aws/amazonka-emr/Setup.hs rename to amazonka-iam/Setup.hs diff --git a/aws/amazonka-iam/amazonka-iam.cabal b/amazonka-iam/amazonka-iam.cabal similarity index 100% rename from aws/amazonka-iam/amazonka-iam.cabal rename to amazonka-iam/amazonka-iam.cabal diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM.hs b/amazonka-iam/gen/Network/AWS/IAM.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM.hs rename to amazonka-iam/gen/Network/AWS/IAM.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/AddClientIDToOpenIDConnectProvider.hs b/amazonka-iam/gen/Network/AWS/IAM/AddClientIDToOpenIDConnectProvider.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/AddClientIDToOpenIDConnectProvider.hs rename to amazonka-iam/gen/Network/AWS/IAM/AddClientIDToOpenIDConnectProvider.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/AddRoleToInstanceProfile.hs b/amazonka-iam/gen/Network/AWS/IAM/AddRoleToInstanceProfile.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/AddRoleToInstanceProfile.hs rename to amazonka-iam/gen/Network/AWS/IAM/AddRoleToInstanceProfile.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/AddUserToGroup.hs b/amazonka-iam/gen/Network/AWS/IAM/AddUserToGroup.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/AddUserToGroup.hs rename to amazonka-iam/gen/Network/AWS/IAM/AddUserToGroup.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ChangePassword.hs b/amazonka-iam/gen/Network/AWS/IAM/ChangePassword.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ChangePassword.hs rename to amazonka-iam/gen/Network/AWS/IAM/ChangePassword.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateAccessKey.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateAccessKey.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateAccessKey.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateAccessKey.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateAccountAlias.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateAccountAlias.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateAccountAlias.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateAccountAlias.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateGroup.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateGroup.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateGroup.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateGroup.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateInstanceProfile.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateInstanceProfile.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateInstanceProfile.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateInstanceProfile.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateLoginProfile.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateLoginProfile.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateLoginProfile.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateLoginProfile.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateOpenIDConnectProvider.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateOpenIDConnectProvider.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateOpenIDConnectProvider.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateOpenIDConnectProvider.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateRole.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateRole.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateRole.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateRole.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateSAMLProvider.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateSAMLProvider.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateSAMLProvider.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateSAMLProvider.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateUser.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateUser.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateUser.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateUser.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/CreateVirtualMFADevice.hs b/amazonka-iam/gen/Network/AWS/IAM/CreateVirtualMFADevice.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/CreateVirtualMFADevice.hs rename to amazonka-iam/gen/Network/AWS/IAM/CreateVirtualMFADevice.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeactivateMFADevice.hs b/amazonka-iam/gen/Network/AWS/IAM/DeactivateMFADevice.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeactivateMFADevice.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeactivateMFADevice.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteAccessKey.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteAccessKey.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteAccessKey.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteAccessKey.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteAccountAlias.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteAccountAlias.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteAccountAlias.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteAccountAlias.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteAccountPasswordPolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteAccountPasswordPolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteAccountPasswordPolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteAccountPasswordPolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteGroup.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteGroup.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteGroup.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteGroup.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteGroupPolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteGroupPolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteGroupPolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteGroupPolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteInstanceProfile.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteInstanceProfile.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteInstanceProfile.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteInstanceProfile.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteLoginProfile.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteLoginProfile.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteLoginProfile.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteLoginProfile.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteOpenIDConnectProvider.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteOpenIDConnectProvider.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteOpenIDConnectProvider.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteOpenIDConnectProvider.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteRole.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteRole.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteRole.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteRole.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteRolePolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteRolePolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteRolePolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteRolePolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteSAMLProvider.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteSAMLProvider.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteSAMLProvider.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteSAMLProvider.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteServerCertificate.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteServerCertificate.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteServerCertificate.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteServerCertificate.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteSigningCertificate.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteSigningCertificate.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteSigningCertificate.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteSigningCertificate.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteUser.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteUser.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteUser.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteUser.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteUserPolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteUserPolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteUserPolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteUserPolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/DeleteVirtualMFADevice.hs b/amazonka-iam/gen/Network/AWS/IAM/DeleteVirtualMFADevice.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/DeleteVirtualMFADevice.hs rename to amazonka-iam/gen/Network/AWS/IAM/DeleteVirtualMFADevice.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/EnableMFADevice.hs b/amazonka-iam/gen/Network/AWS/IAM/EnableMFADevice.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/EnableMFADevice.hs rename to amazonka-iam/gen/Network/AWS/IAM/EnableMFADevice.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GenerateCredentialReport.hs b/amazonka-iam/gen/Network/AWS/IAM/GenerateCredentialReport.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GenerateCredentialReport.hs rename to amazonka-iam/gen/Network/AWS/IAM/GenerateCredentialReport.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetAccountPasswordPolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/GetAccountPasswordPolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetAccountPasswordPolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetAccountPasswordPolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetAccountSummary.hs b/amazonka-iam/gen/Network/AWS/IAM/GetAccountSummary.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetAccountSummary.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetAccountSummary.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetCredentialReport.hs b/amazonka-iam/gen/Network/AWS/IAM/GetCredentialReport.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetCredentialReport.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetCredentialReport.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetGroup.hs b/amazonka-iam/gen/Network/AWS/IAM/GetGroup.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetGroup.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetGroup.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetGroupPolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/GetGroupPolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetGroupPolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetGroupPolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetInstanceProfile.hs b/amazonka-iam/gen/Network/AWS/IAM/GetInstanceProfile.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetInstanceProfile.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetInstanceProfile.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetLoginProfile.hs b/amazonka-iam/gen/Network/AWS/IAM/GetLoginProfile.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetLoginProfile.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetLoginProfile.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetOpenIDConnectProvider.hs b/amazonka-iam/gen/Network/AWS/IAM/GetOpenIDConnectProvider.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetOpenIDConnectProvider.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetOpenIDConnectProvider.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetRole.hs b/amazonka-iam/gen/Network/AWS/IAM/GetRole.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetRole.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetRole.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetRolePolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/GetRolePolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetRolePolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetRolePolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetSAMLProvider.hs b/amazonka-iam/gen/Network/AWS/IAM/GetSAMLProvider.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetSAMLProvider.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetSAMLProvider.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetServerCertificate.hs b/amazonka-iam/gen/Network/AWS/IAM/GetServerCertificate.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetServerCertificate.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetServerCertificate.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetUser.hs b/amazonka-iam/gen/Network/AWS/IAM/GetUser.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetUser.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetUser.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/GetUserPolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/GetUserPolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/GetUserPolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/GetUserPolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListAccessKeys.hs b/amazonka-iam/gen/Network/AWS/IAM/ListAccessKeys.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListAccessKeys.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListAccessKeys.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListAccountAliases.hs b/amazonka-iam/gen/Network/AWS/IAM/ListAccountAliases.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListAccountAliases.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListAccountAliases.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListGroupPolicies.hs b/amazonka-iam/gen/Network/AWS/IAM/ListGroupPolicies.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListGroupPolicies.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListGroupPolicies.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListGroups.hs b/amazonka-iam/gen/Network/AWS/IAM/ListGroups.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListGroups.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListGroups.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListGroupsForUser.hs b/amazonka-iam/gen/Network/AWS/IAM/ListGroupsForUser.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListGroupsForUser.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListGroupsForUser.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListInstanceProfiles.hs b/amazonka-iam/gen/Network/AWS/IAM/ListInstanceProfiles.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListInstanceProfiles.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListInstanceProfiles.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListInstanceProfilesForRole.hs b/amazonka-iam/gen/Network/AWS/IAM/ListInstanceProfilesForRole.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListInstanceProfilesForRole.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListInstanceProfilesForRole.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListMFADevices.hs b/amazonka-iam/gen/Network/AWS/IAM/ListMFADevices.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListMFADevices.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListMFADevices.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListOpenIDConnectProviders.hs b/amazonka-iam/gen/Network/AWS/IAM/ListOpenIDConnectProviders.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListOpenIDConnectProviders.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListOpenIDConnectProviders.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListRolePolicies.hs b/amazonka-iam/gen/Network/AWS/IAM/ListRolePolicies.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListRolePolicies.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListRolePolicies.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListRoles.hs b/amazonka-iam/gen/Network/AWS/IAM/ListRoles.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListRoles.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListRoles.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListSAMLProviders.hs b/amazonka-iam/gen/Network/AWS/IAM/ListSAMLProviders.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListSAMLProviders.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListSAMLProviders.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListServerCertificates.hs b/amazonka-iam/gen/Network/AWS/IAM/ListServerCertificates.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListServerCertificates.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListServerCertificates.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListSigningCertificates.hs b/amazonka-iam/gen/Network/AWS/IAM/ListSigningCertificates.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListSigningCertificates.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListSigningCertificates.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListUserPolicies.hs b/amazonka-iam/gen/Network/AWS/IAM/ListUserPolicies.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListUserPolicies.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListUserPolicies.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListUsers.hs b/amazonka-iam/gen/Network/AWS/IAM/ListUsers.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListUsers.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListUsers.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ListVirtualMFADevices.hs b/amazonka-iam/gen/Network/AWS/IAM/ListVirtualMFADevices.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ListVirtualMFADevices.hs rename to amazonka-iam/gen/Network/AWS/IAM/ListVirtualMFADevices.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/PutGroupPolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/PutGroupPolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/PutGroupPolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/PutGroupPolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/PutRolePolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/PutRolePolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/PutRolePolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/PutRolePolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/PutUserPolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/PutUserPolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/PutUserPolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/PutUserPolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/RemoveClientIDFromOpenIDConnectProvider.hs b/amazonka-iam/gen/Network/AWS/IAM/RemoveClientIDFromOpenIDConnectProvider.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/RemoveClientIDFromOpenIDConnectProvider.hs rename to amazonka-iam/gen/Network/AWS/IAM/RemoveClientIDFromOpenIDConnectProvider.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/RemoveRoleFromInstanceProfile.hs b/amazonka-iam/gen/Network/AWS/IAM/RemoveRoleFromInstanceProfile.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/RemoveRoleFromInstanceProfile.hs rename to amazonka-iam/gen/Network/AWS/IAM/RemoveRoleFromInstanceProfile.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/RemoveUserFromGroup.hs b/amazonka-iam/gen/Network/AWS/IAM/RemoveUserFromGroup.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/RemoveUserFromGroup.hs rename to amazonka-iam/gen/Network/AWS/IAM/RemoveUserFromGroup.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/ResyncMFADevice.hs b/amazonka-iam/gen/Network/AWS/IAM/ResyncMFADevice.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/ResyncMFADevice.hs rename to amazonka-iam/gen/Network/AWS/IAM/ResyncMFADevice.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/Types.hs b/amazonka-iam/gen/Network/AWS/IAM/Types.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/Types.hs rename to amazonka-iam/gen/Network/AWS/IAM/Types.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateAccessKey.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateAccessKey.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateAccessKey.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateAccessKey.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateAccountPasswordPolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateAccountPasswordPolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateAccountPasswordPolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateAccountPasswordPolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateAssumeRolePolicy.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateAssumeRolePolicy.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateAssumeRolePolicy.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateAssumeRolePolicy.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateGroup.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateGroup.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateGroup.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateGroup.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateLoginProfile.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateLoginProfile.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateLoginProfile.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateLoginProfile.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateOpenIDConnectProviderThumbprint.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateOpenIDConnectProviderThumbprint.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateOpenIDConnectProviderThumbprint.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateOpenIDConnectProviderThumbprint.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateSAMLProvider.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateSAMLProvider.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateSAMLProvider.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateSAMLProvider.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateServerCertificate.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateServerCertificate.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateServerCertificate.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateServerCertificate.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateSigningCertificate.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateSigningCertificate.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateSigningCertificate.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateSigningCertificate.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UpdateUser.hs b/amazonka-iam/gen/Network/AWS/IAM/UpdateUser.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UpdateUser.hs rename to amazonka-iam/gen/Network/AWS/IAM/UpdateUser.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UploadServerCertificate.hs b/amazonka-iam/gen/Network/AWS/IAM/UploadServerCertificate.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UploadServerCertificate.hs rename to amazonka-iam/gen/Network/AWS/IAM/UploadServerCertificate.hs diff --git a/aws/amazonka-iam/gen/Network/AWS/IAM/UploadSigningCertificate.hs b/amazonka-iam/gen/Network/AWS/IAM/UploadSigningCertificate.hs similarity index 100% rename from aws/amazonka-iam/gen/Network/AWS/IAM/UploadSigningCertificate.hs rename to amazonka-iam/gen/Network/AWS/IAM/UploadSigningCertificate.hs diff --git a/aws/amazonka-iam/LICENSE b/amazonka-importexport/LICENSE similarity index 100% rename from aws/amazonka-iam/LICENSE rename to amazonka-importexport/LICENSE diff --git a/aws/amazonka-importexport/Makefile b/amazonka-importexport/Makefile similarity index 100% rename from aws/amazonka-importexport/Makefile rename to amazonka-importexport/Makefile diff --git a/aws/amazonka-importexport/README.md b/amazonka-importexport/README.md similarity index 100% rename from aws/amazonka-importexport/README.md rename to amazonka-importexport/README.md diff --git a/aws/amazonka-iam/Setup.hs b/amazonka-importexport/Setup.hs similarity index 100% rename from aws/amazonka-iam/Setup.hs rename to amazonka-importexport/Setup.hs diff --git a/aws/amazonka-importexport/amazonka-importexport.cabal b/amazonka-importexport/amazonka-importexport.cabal similarity index 100% rename from aws/amazonka-importexport/amazonka-importexport.cabal rename to amazonka-importexport/amazonka-importexport.cabal diff --git a/aws/amazonka-importexport/gen/Network/AWS/ImportExport.hs b/amazonka-importexport/gen/Network/AWS/ImportExport.hs similarity index 100% rename from aws/amazonka-importexport/gen/Network/AWS/ImportExport.hs rename to amazonka-importexport/gen/Network/AWS/ImportExport.hs diff --git a/aws/amazonka-importexport/gen/Network/AWS/ImportExport/CancelJob.hs b/amazonka-importexport/gen/Network/AWS/ImportExport/CancelJob.hs similarity index 100% rename from aws/amazonka-importexport/gen/Network/AWS/ImportExport/CancelJob.hs rename to amazonka-importexport/gen/Network/AWS/ImportExport/CancelJob.hs diff --git a/aws/amazonka-importexport/gen/Network/AWS/ImportExport/CreateJob.hs b/amazonka-importexport/gen/Network/AWS/ImportExport/CreateJob.hs similarity index 100% rename from aws/amazonka-importexport/gen/Network/AWS/ImportExport/CreateJob.hs rename to amazonka-importexport/gen/Network/AWS/ImportExport/CreateJob.hs diff --git a/aws/amazonka-importexport/gen/Network/AWS/ImportExport/GetStatus.hs b/amazonka-importexport/gen/Network/AWS/ImportExport/GetStatus.hs similarity index 100% rename from aws/amazonka-importexport/gen/Network/AWS/ImportExport/GetStatus.hs rename to amazonka-importexport/gen/Network/AWS/ImportExport/GetStatus.hs diff --git a/aws/amazonka-importexport/gen/Network/AWS/ImportExport/ListJobs.hs b/amazonka-importexport/gen/Network/AWS/ImportExport/ListJobs.hs similarity index 100% rename from aws/amazonka-importexport/gen/Network/AWS/ImportExport/ListJobs.hs rename to amazonka-importexport/gen/Network/AWS/ImportExport/ListJobs.hs diff --git a/aws/amazonka-importexport/gen/Network/AWS/ImportExport/Types.hs b/amazonka-importexport/gen/Network/AWS/ImportExport/Types.hs similarity index 100% rename from aws/amazonka-importexport/gen/Network/AWS/ImportExport/Types.hs rename to amazonka-importexport/gen/Network/AWS/ImportExport/Types.hs diff --git a/aws/amazonka-importexport/gen/Network/AWS/ImportExport/UpdateJob.hs b/amazonka-importexport/gen/Network/AWS/ImportExport/UpdateJob.hs similarity index 100% rename from aws/amazonka-importexport/gen/Network/AWS/ImportExport/UpdateJob.hs rename to amazonka-importexport/gen/Network/AWS/ImportExport/UpdateJob.hs diff --git a/aws/amazonka-importexport/LICENSE b/amazonka-kinesis/LICENSE similarity index 100% rename from aws/amazonka-importexport/LICENSE rename to amazonka-kinesis/LICENSE diff --git a/aws/amazonka-kinesis/Makefile b/amazonka-kinesis/Makefile similarity index 100% rename from aws/amazonka-kinesis/Makefile rename to amazonka-kinesis/Makefile diff --git a/aws/amazonka-kinesis/README.md b/amazonka-kinesis/README.md similarity index 100% rename from aws/amazonka-kinesis/README.md rename to amazonka-kinesis/README.md diff --git a/aws/amazonka-importexport/Setup.hs b/amazonka-kinesis/Setup.hs similarity index 100% rename from aws/amazonka-importexport/Setup.hs rename to amazonka-kinesis/Setup.hs diff --git a/aws/amazonka-kinesis/amazonka-kinesis.cabal b/amazonka-kinesis/amazonka-kinesis.cabal similarity index 100% rename from aws/amazonka-kinesis/amazonka-kinesis.cabal rename to amazonka-kinesis/amazonka-kinesis.cabal diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/AddTagsToStream.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/AddTagsToStream.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/AddTagsToStream.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/AddTagsToStream.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/CreateStream.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/CreateStream.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/CreateStream.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/CreateStream.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/DeleteStream.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/DeleteStream.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/DeleteStream.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/DeleteStream.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/DescribeStream.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/DescribeStream.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/DescribeStream.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/DescribeStream.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/GetRecords.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/GetRecords.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/GetRecords.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/GetRecords.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/GetShardIterator.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/GetShardIterator.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/GetShardIterator.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/GetShardIterator.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/ListStreams.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/ListStreams.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/ListStreams.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/ListStreams.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/ListTagsForStream.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/ListTagsForStream.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/ListTagsForStream.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/ListTagsForStream.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/MergeShards.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/MergeShards.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/MergeShards.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/MergeShards.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/PutRecord.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/PutRecord.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/PutRecord.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/PutRecord.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/RemoveTagsFromStream.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/RemoveTagsFromStream.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/RemoveTagsFromStream.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/RemoveTagsFromStream.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/SplitShard.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/SplitShard.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/SplitShard.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/SplitShard.hs diff --git a/aws/amazonka-kinesis/gen/Network/AWS/Kinesis/Types.hs b/amazonka-kinesis/gen/Network/AWS/Kinesis/Types.hs similarity index 100% rename from aws/amazonka-kinesis/gen/Network/AWS/Kinesis/Types.hs rename to amazonka-kinesis/gen/Network/AWS/Kinesis/Types.hs diff --git a/aws/amazonka-kinesis/LICENSE b/amazonka-kms/LICENSE similarity index 100% rename from aws/amazonka-kinesis/LICENSE rename to amazonka-kms/LICENSE diff --git a/aws/amazonka-kms/Makefile b/amazonka-kms/Makefile similarity index 100% rename from aws/amazonka-kms/Makefile rename to amazonka-kms/Makefile diff --git a/aws/amazonka-kms/README.md b/amazonka-kms/README.md similarity index 100% rename from aws/amazonka-kms/README.md rename to amazonka-kms/README.md diff --git a/aws/amazonka-kinesis/Setup.hs b/amazonka-kms/Setup.hs similarity index 100% rename from aws/amazonka-kinesis/Setup.hs rename to amazonka-kms/Setup.hs diff --git a/aws/amazonka-kms/amazonka-kms.cabal b/amazonka-kms/amazonka-kms.cabal similarity index 100% rename from aws/amazonka-kms/amazonka-kms.cabal rename to amazonka-kms/amazonka-kms.cabal diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS.hs b/amazonka-kms/gen/Network/AWS/KMS.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS.hs rename to amazonka-kms/gen/Network/AWS/KMS.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/CreateAlias.hs b/amazonka-kms/gen/Network/AWS/KMS/CreateAlias.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/CreateAlias.hs rename to amazonka-kms/gen/Network/AWS/KMS/CreateAlias.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/CreateGrant.hs b/amazonka-kms/gen/Network/AWS/KMS/CreateGrant.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/CreateGrant.hs rename to amazonka-kms/gen/Network/AWS/KMS/CreateGrant.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/CreateKey.hs b/amazonka-kms/gen/Network/AWS/KMS/CreateKey.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/CreateKey.hs rename to amazonka-kms/gen/Network/AWS/KMS/CreateKey.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/Decrypt.hs b/amazonka-kms/gen/Network/AWS/KMS/Decrypt.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/Decrypt.hs rename to amazonka-kms/gen/Network/AWS/KMS/Decrypt.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/DeleteAlias.hs b/amazonka-kms/gen/Network/AWS/KMS/DeleteAlias.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/DeleteAlias.hs rename to amazonka-kms/gen/Network/AWS/KMS/DeleteAlias.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/DescribeKey.hs b/amazonka-kms/gen/Network/AWS/KMS/DescribeKey.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/DescribeKey.hs rename to amazonka-kms/gen/Network/AWS/KMS/DescribeKey.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/DisableKey.hs b/amazonka-kms/gen/Network/AWS/KMS/DisableKey.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/DisableKey.hs rename to amazonka-kms/gen/Network/AWS/KMS/DisableKey.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/DisableKeyRotation.hs b/amazonka-kms/gen/Network/AWS/KMS/DisableKeyRotation.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/DisableKeyRotation.hs rename to amazonka-kms/gen/Network/AWS/KMS/DisableKeyRotation.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/EnableKey.hs b/amazonka-kms/gen/Network/AWS/KMS/EnableKey.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/EnableKey.hs rename to amazonka-kms/gen/Network/AWS/KMS/EnableKey.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/EnableKeyRotation.hs b/amazonka-kms/gen/Network/AWS/KMS/EnableKeyRotation.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/EnableKeyRotation.hs rename to amazonka-kms/gen/Network/AWS/KMS/EnableKeyRotation.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/Encrypt.hs b/amazonka-kms/gen/Network/AWS/KMS/Encrypt.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/Encrypt.hs rename to amazonka-kms/gen/Network/AWS/KMS/Encrypt.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/GenerateDataKey.hs b/amazonka-kms/gen/Network/AWS/KMS/GenerateDataKey.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/GenerateDataKey.hs rename to amazonka-kms/gen/Network/AWS/KMS/GenerateDataKey.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs b/amazonka-kms/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs rename to amazonka-kms/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/GenerateRandom.hs b/amazonka-kms/gen/Network/AWS/KMS/GenerateRandom.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/GenerateRandom.hs rename to amazonka-kms/gen/Network/AWS/KMS/GenerateRandom.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/GetKeyPolicy.hs b/amazonka-kms/gen/Network/AWS/KMS/GetKeyPolicy.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/GetKeyPolicy.hs rename to amazonka-kms/gen/Network/AWS/KMS/GetKeyPolicy.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/GetKeyRotationStatus.hs b/amazonka-kms/gen/Network/AWS/KMS/GetKeyRotationStatus.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/GetKeyRotationStatus.hs rename to amazonka-kms/gen/Network/AWS/KMS/GetKeyRotationStatus.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/ListAliases.hs b/amazonka-kms/gen/Network/AWS/KMS/ListAliases.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/ListAliases.hs rename to amazonka-kms/gen/Network/AWS/KMS/ListAliases.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/ListGrants.hs b/amazonka-kms/gen/Network/AWS/KMS/ListGrants.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/ListGrants.hs rename to amazonka-kms/gen/Network/AWS/KMS/ListGrants.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/ListKeyPolicies.hs b/amazonka-kms/gen/Network/AWS/KMS/ListKeyPolicies.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/ListKeyPolicies.hs rename to amazonka-kms/gen/Network/AWS/KMS/ListKeyPolicies.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/ListKeys.hs b/amazonka-kms/gen/Network/AWS/KMS/ListKeys.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/ListKeys.hs rename to amazonka-kms/gen/Network/AWS/KMS/ListKeys.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/PutKeyPolicy.hs b/amazonka-kms/gen/Network/AWS/KMS/PutKeyPolicy.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/PutKeyPolicy.hs rename to amazonka-kms/gen/Network/AWS/KMS/PutKeyPolicy.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/ReEncrypt.hs b/amazonka-kms/gen/Network/AWS/KMS/ReEncrypt.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/ReEncrypt.hs rename to amazonka-kms/gen/Network/AWS/KMS/ReEncrypt.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/RetireGrant.hs b/amazonka-kms/gen/Network/AWS/KMS/RetireGrant.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/RetireGrant.hs rename to amazonka-kms/gen/Network/AWS/KMS/RetireGrant.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/RevokeGrant.hs b/amazonka-kms/gen/Network/AWS/KMS/RevokeGrant.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/RevokeGrant.hs rename to amazonka-kms/gen/Network/AWS/KMS/RevokeGrant.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/Types.hs b/amazonka-kms/gen/Network/AWS/KMS/Types.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/Types.hs rename to amazonka-kms/gen/Network/AWS/KMS/Types.hs diff --git a/aws/amazonka-kms/gen/Network/AWS/KMS/UpdateKeyDescription.hs b/amazonka-kms/gen/Network/AWS/KMS/UpdateKeyDescription.hs similarity index 100% rename from aws/amazonka-kms/gen/Network/AWS/KMS/UpdateKeyDescription.hs rename to amazonka-kms/gen/Network/AWS/KMS/UpdateKeyDescription.hs diff --git a/aws/amazonka-kms/LICENSE b/amazonka-lambda/LICENSE similarity index 100% rename from aws/amazonka-kms/LICENSE rename to amazonka-lambda/LICENSE diff --git a/aws/amazonka-lambda/Makefile b/amazonka-lambda/Makefile similarity index 100% rename from aws/amazonka-lambda/Makefile rename to amazonka-lambda/Makefile diff --git a/aws/amazonka-lambda/README.md b/amazonka-lambda/README.md similarity index 100% rename from aws/amazonka-lambda/README.md rename to amazonka-lambda/README.md diff --git a/aws/amazonka-kms/Setup.hs b/amazonka-lambda/Setup.hs similarity index 100% rename from aws/amazonka-kms/Setup.hs rename to amazonka-lambda/Setup.hs diff --git a/aws/amazonka-lambda/amazonka-lambda.cabal b/amazonka-lambda/amazonka-lambda.cabal similarity index 100% rename from aws/amazonka-lambda/amazonka-lambda.cabal rename to amazonka-lambda/amazonka-lambda.cabal diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda.hs b/amazonka-lambda/gen/Network/AWS/Lambda.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda.hs rename to amazonka-lambda/gen/Network/AWS/Lambda.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/AddEventSource.hs b/amazonka-lambda/gen/Network/AWS/Lambda/AddEventSource.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/AddEventSource.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/AddEventSource.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/DeleteFunction.hs b/amazonka-lambda/gen/Network/AWS/Lambda/DeleteFunction.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/DeleteFunction.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/DeleteFunction.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/GetEventSource.hs b/amazonka-lambda/gen/Network/AWS/Lambda/GetEventSource.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/GetEventSource.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/GetEventSource.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/GetFunction.hs b/amazonka-lambda/gen/Network/AWS/Lambda/GetFunction.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/GetFunction.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/GetFunction.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/GetFunctionConfiguration.hs b/amazonka-lambda/gen/Network/AWS/Lambda/GetFunctionConfiguration.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/GetFunctionConfiguration.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/GetFunctionConfiguration.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/InvokeAsync.hs b/amazonka-lambda/gen/Network/AWS/Lambda/InvokeAsync.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/InvokeAsync.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/InvokeAsync.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/ListEventSources.hs b/amazonka-lambda/gen/Network/AWS/Lambda/ListEventSources.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/ListEventSources.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/ListEventSources.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/ListFunctions.hs b/amazonka-lambda/gen/Network/AWS/Lambda/ListFunctions.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/ListFunctions.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/ListFunctions.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/RemoveEventSource.hs b/amazonka-lambda/gen/Network/AWS/Lambda/RemoveEventSource.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/RemoveEventSource.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/RemoveEventSource.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/Types.hs b/amazonka-lambda/gen/Network/AWS/Lambda/Types.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/Types.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/Types.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/UpdateFunctionConfiguration.hs b/amazonka-lambda/gen/Network/AWS/Lambda/UpdateFunctionConfiguration.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/UpdateFunctionConfiguration.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/UpdateFunctionConfiguration.hs diff --git a/aws/amazonka-lambda/gen/Network/AWS/Lambda/UploadFunction.hs b/amazonka-lambda/gen/Network/AWS/Lambda/UploadFunction.hs similarity index 100% rename from aws/amazonka-lambda/gen/Network/AWS/Lambda/UploadFunction.hs rename to amazonka-lambda/gen/Network/AWS/Lambda/UploadFunction.hs diff --git a/aws/amazonka-lambda/LICENSE b/amazonka-opsworks/LICENSE similarity index 100% rename from aws/amazonka-lambda/LICENSE rename to amazonka-opsworks/LICENSE diff --git a/aws/amazonka-opsworks/Makefile b/amazonka-opsworks/Makefile similarity index 100% rename from aws/amazonka-opsworks/Makefile rename to amazonka-opsworks/Makefile diff --git a/aws/amazonka-opsworks/README.md b/amazonka-opsworks/README.md similarity index 100% rename from aws/amazonka-opsworks/README.md rename to amazonka-opsworks/README.md diff --git a/aws/amazonka-lambda/Setup.hs b/amazonka-opsworks/Setup.hs similarity index 100% rename from aws/amazonka-lambda/Setup.hs rename to amazonka-opsworks/Setup.hs diff --git a/aws/amazonka-opsworks/amazonka-opsworks.cabal b/amazonka-opsworks/amazonka-opsworks.cabal similarity index 100% rename from aws/amazonka-opsworks/amazonka-opsworks.cabal rename to amazonka-opsworks/amazonka-opsworks.cabal diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/AssignVolume.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/AssignVolume.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/AssignVolume.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/AssignVolume.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/AssociateElasticIp.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/AssociateElasticIp.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/AssociateElasticIp.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/AssociateElasticIp.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/AttachElasticLoadBalancer.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/AttachElasticLoadBalancer.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/AttachElasticLoadBalancer.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/AttachElasticLoadBalancer.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CloneStack.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/CloneStack.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CloneStack.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/CloneStack.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateApp.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateApp.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateApp.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateApp.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateDeployment.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateDeployment.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateDeployment.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateDeployment.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateInstance.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateInstance.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateInstance.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateInstance.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateLayer.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateLayer.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateLayer.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateLayer.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateStack.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateStack.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateStack.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateStack.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateUserProfile.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateUserProfile.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateUserProfile.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/CreateUserProfile.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteApp.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteApp.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteApp.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteApp.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteInstance.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteInstance.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteInstance.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteInstance.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteLayer.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteLayer.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteLayer.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteLayer.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteStack.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteStack.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteStack.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteStack.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteUserProfile.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteUserProfile.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteUserProfile.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DeleteUserProfile.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterElasticIp.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterElasticIp.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterElasticIp.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterElasticIp.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterRdsDbInstance.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterRdsDbInstance.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterRdsDbInstance.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterRdsDbInstance.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterVolume.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterVolume.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterVolume.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DeregisterVolume.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeApps.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeApps.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeApps.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeApps.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeCommands.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeCommands.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeCommands.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeCommands.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeDeployments.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeDeployments.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeDeployments.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeDeployments.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeElasticIps.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeElasticIps.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeElasticIps.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeElasticIps.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeElasticLoadBalancers.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeElasticLoadBalancers.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeElasticLoadBalancers.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeElasticLoadBalancers.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeInstances.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeInstances.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeInstances.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeInstances.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeLayers.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeLayers.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeLayers.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeLayers.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeLoadBasedAutoScaling.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeLoadBasedAutoScaling.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeLoadBasedAutoScaling.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeLoadBasedAutoScaling.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeMyUserProfile.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeMyUserProfile.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeMyUserProfile.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeMyUserProfile.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribePermissions.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribePermissions.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribePermissions.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribePermissions.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeRaidArrays.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeRaidArrays.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeRaidArrays.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeRaidArrays.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeRdsDbInstances.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeRdsDbInstances.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeRdsDbInstances.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeRdsDbInstances.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeServiceErrors.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeServiceErrors.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeServiceErrors.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeServiceErrors.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeStackSummary.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeStackSummary.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeStackSummary.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeStackSummary.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeStacks.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeStacks.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeStacks.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeStacks.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeTimeBasedAutoScaling.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeTimeBasedAutoScaling.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeTimeBasedAutoScaling.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeTimeBasedAutoScaling.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeUserProfiles.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeUserProfiles.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeUserProfiles.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeUserProfiles.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeVolumes.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeVolumes.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeVolumes.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DescribeVolumes.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DetachElasticLoadBalancer.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DetachElasticLoadBalancer.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DetachElasticLoadBalancer.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DetachElasticLoadBalancer.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DisassociateElasticIp.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/DisassociateElasticIp.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/DisassociateElasticIp.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/DisassociateElasticIp.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/GetHostnameSuggestion.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/GetHostnameSuggestion.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/GetHostnameSuggestion.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/GetHostnameSuggestion.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/RebootInstance.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/RebootInstance.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/RebootInstance.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/RebootInstance.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterElasticIp.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterElasticIp.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterElasticIp.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterElasticIp.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterRdsDbInstance.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterRdsDbInstance.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterRdsDbInstance.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterRdsDbInstance.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterVolume.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterVolume.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterVolume.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/RegisterVolume.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/SetLoadBasedAutoScaling.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/SetLoadBasedAutoScaling.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/SetLoadBasedAutoScaling.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/SetLoadBasedAutoScaling.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/SetPermission.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/SetPermission.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/SetPermission.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/SetPermission.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/SetTimeBasedAutoScaling.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/SetTimeBasedAutoScaling.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/SetTimeBasedAutoScaling.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/SetTimeBasedAutoScaling.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/StartInstance.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/StartInstance.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/StartInstance.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/StartInstance.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/StartStack.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/StartStack.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/StartStack.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/StartStack.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/StopInstance.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/StopInstance.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/StopInstance.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/StopInstance.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/StopStack.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/StopStack.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/StopStack.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/StopStack.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/Types.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/Types.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/Types.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/Types.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UnassignVolume.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UnassignVolume.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UnassignVolume.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UnassignVolume.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateApp.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateApp.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateApp.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateApp.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateElasticIp.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateElasticIp.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateElasticIp.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateElasticIp.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateInstance.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateInstance.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateInstance.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateInstance.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateLayer.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateLayer.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateLayer.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateLayer.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateMyUserProfile.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateMyUserProfile.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateMyUserProfile.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateMyUserProfile.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateRdsDbInstance.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateRdsDbInstance.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateRdsDbInstance.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateRdsDbInstance.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateStack.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateStack.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateStack.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateStack.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateUserProfile.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateUserProfile.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateUserProfile.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateUserProfile.hs diff --git a/aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateVolume.hs b/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateVolume.hs similarity index 100% rename from aws/amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateVolume.hs rename to amazonka-opsworks/gen/Network/AWS/OpsWorks/UpdateVolume.hs diff --git a/aws/amazonka-opsworks/LICENSE b/amazonka-rds/LICENSE similarity index 100% rename from aws/amazonka-opsworks/LICENSE rename to amazonka-rds/LICENSE diff --git a/aws/amazonka-rds/Makefile b/amazonka-rds/Makefile similarity index 100% rename from aws/amazonka-rds/Makefile rename to amazonka-rds/Makefile diff --git a/aws/amazonka-rds/README.md b/amazonka-rds/README.md similarity index 100% rename from aws/amazonka-rds/README.md rename to amazonka-rds/README.md diff --git a/aws/amazonka-opsworks/Setup.hs b/amazonka-rds/Setup.hs similarity index 100% rename from aws/amazonka-opsworks/Setup.hs rename to amazonka-rds/Setup.hs diff --git a/aws/amazonka-rds/amazonka-rds.cabal b/amazonka-rds/amazonka-rds.cabal similarity index 100% rename from aws/amazonka-rds/amazonka-rds.cabal rename to amazonka-rds/amazonka-rds.cabal diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS.hs b/amazonka-rds/gen/Network/AWS/RDS.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS.hs rename to amazonka-rds/gen/Network/AWS/RDS.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs b/amazonka-rds/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs rename to amazonka-rds/gen/Network/AWS/RDS/AddSourceIdentifierToSubscription.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/AddTagsToResource.hs b/amazonka-rds/gen/Network/AWS/RDS/AddTagsToResource.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/AddTagsToResource.hs rename to amazonka-rds/gen/Network/AWS/RDS/AddTagsToResource.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs b/amazonka-rds/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs rename to amazonka-rds/gen/Network/AWS/RDS/AuthorizeDBSecurityGroupIngress.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CopyDBParameterGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/CopyDBParameterGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CopyDBParameterGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/CopyDBParameterGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CopyDBSnapshot.hs b/amazonka-rds/gen/Network/AWS/RDS/CopyDBSnapshot.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CopyDBSnapshot.hs rename to amazonka-rds/gen/Network/AWS/RDS/CopyDBSnapshot.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CopyOptionGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/CopyOptionGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CopyOptionGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/CopyOptionGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBInstance.hs b/amazonka-rds/gen/Network/AWS/RDS/CreateDBInstance.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBInstance.hs rename to amazonka-rds/gen/Network/AWS/RDS/CreateDBInstance.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs b/amazonka-rds/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs rename to amazonka-rds/gen/Network/AWS/RDS/CreateDBInstanceReadReplica.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBParameterGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/CreateDBParameterGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBParameterGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/CreateDBParameterGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/CreateDBSecurityGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBSnapshot.hs b/amazonka-rds/gen/Network/AWS/RDS/CreateDBSnapshot.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBSnapshot.hs rename to amazonka-rds/gen/Network/AWS/RDS/CreateDBSnapshot.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/CreateDBSubnetGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CreateEventSubscription.hs b/amazonka-rds/gen/Network/AWS/RDS/CreateEventSubscription.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CreateEventSubscription.hs rename to amazonka-rds/gen/Network/AWS/RDS/CreateEventSubscription.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/CreateOptionGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/CreateOptionGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/CreateOptionGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/CreateOptionGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBInstance.hs b/amazonka-rds/gen/Network/AWS/RDS/DeleteDBInstance.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBInstance.hs rename to amazonka-rds/gen/Network/AWS/RDS/DeleteDBInstance.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/DeleteDBSecurityGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBSnapshot.hs b/amazonka-rds/gen/Network/AWS/RDS/DeleteDBSnapshot.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBSnapshot.hs rename to amazonka-rds/gen/Network/AWS/RDS/DeleteDBSnapshot.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/DeleteDBSubnetGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DeleteEventSubscription.hs b/amazonka-rds/gen/Network/AWS/RDS/DeleteEventSubscription.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DeleteEventSubscription.hs rename to amazonka-rds/gen/Network/AWS/RDS/DeleteEventSubscription.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DeleteOptionGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/DeleteOptionGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DeleteOptionGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/DeleteOptionGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBInstances.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeDBInstances.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBInstances.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeDBInstances.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBLogFiles.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeDBLogFiles.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBLogFiles.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeDBLogFiles.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBParameters.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeDBParameters.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBParameters.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeDBParameters.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBSnapshots.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeDBSnapshots.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBSnapshots.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeDBSnapshots.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeEventCategories.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeEventCategories.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeEventCategories.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeEventCategories.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeEvents.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeEvents.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeEvents.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeEvents.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeOptionGroups.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeOptionGroups.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeOptionGroups.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeOptionGroups.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs b/amazonka-rds/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs rename to amazonka-rds/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs b/amazonka-rds/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs rename to amazonka-rds/gen/Network/AWS/RDS/DownloadDBLogFilePortion.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/ListTagsForResource.hs b/amazonka-rds/gen/Network/AWS/RDS/ListTagsForResource.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/ListTagsForResource.hs rename to amazonka-rds/gen/Network/AWS/RDS/ListTagsForResource.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/ModifyDBInstance.hs b/amazonka-rds/gen/Network/AWS/RDS/ModifyDBInstance.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/ModifyDBInstance.hs rename to amazonka-rds/gen/Network/AWS/RDS/ModifyDBInstance.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/ModifyDBParameterGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/ModifyDBSubnetGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/ModifyEventSubscription.hs b/amazonka-rds/gen/Network/AWS/RDS/ModifyEventSubscription.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/ModifyEventSubscription.hs rename to amazonka-rds/gen/Network/AWS/RDS/ModifyEventSubscription.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/ModifyOptionGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/ModifyOptionGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/ModifyOptionGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/ModifyOptionGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/PromoteReadReplica.hs b/amazonka-rds/gen/Network/AWS/RDS/PromoteReadReplica.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/PromoteReadReplica.hs rename to amazonka-rds/gen/Network/AWS/RDS/PromoteReadReplica.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs b/amazonka-rds/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs rename to amazonka-rds/gen/Network/AWS/RDS/PurchaseReservedDBInstancesOffering.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/RebootDBInstance.hs b/amazonka-rds/gen/Network/AWS/RDS/RebootDBInstance.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/RebootDBInstance.hs rename to amazonka-rds/gen/Network/AWS/RDS/RebootDBInstance.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs b/amazonka-rds/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs rename to amazonka-rds/gen/Network/AWS/RDS/RemoveSourceIdentifierFromSubscription.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/RemoveTagsFromResource.hs b/amazonka-rds/gen/Network/AWS/RDS/RemoveTagsFromResource.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/RemoveTagsFromResource.hs rename to amazonka-rds/gen/Network/AWS/RDS/RemoveTagsFromResource.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/ResetDBParameterGroup.hs b/amazonka-rds/gen/Network/AWS/RDS/ResetDBParameterGroup.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/ResetDBParameterGroup.hs rename to amazonka-rds/gen/Network/AWS/RDS/ResetDBParameterGroup.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs b/amazonka-rds/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs rename to amazonka-rds/gen/Network/AWS/RDS/RestoreDBInstanceFromDBSnapshot.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs b/amazonka-rds/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs rename to amazonka-rds/gen/Network/AWS/RDS/RestoreDBInstanceToPointInTime.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs b/amazonka-rds/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs rename to amazonka-rds/gen/Network/AWS/RDS/RevokeDBSecurityGroupIngress.hs diff --git a/aws/amazonka-rds/gen/Network/AWS/RDS/Types.hs b/amazonka-rds/gen/Network/AWS/RDS/Types.hs similarity index 100% rename from aws/amazonka-rds/gen/Network/AWS/RDS/Types.hs rename to amazonka-rds/gen/Network/AWS/RDS/Types.hs diff --git a/aws/amazonka-rds/LICENSE b/amazonka-redshift/LICENSE similarity index 100% rename from aws/amazonka-rds/LICENSE rename to amazonka-redshift/LICENSE diff --git a/aws/amazonka-redshift/Makefile b/amazonka-redshift/Makefile similarity index 100% rename from aws/amazonka-redshift/Makefile rename to amazonka-redshift/Makefile diff --git a/aws/amazonka-redshift/README.md b/amazonka-redshift/README.md similarity index 100% rename from aws/amazonka-redshift/README.md rename to amazonka-redshift/README.md diff --git a/aws/amazonka-rds/Setup.hs b/amazonka-redshift/Setup.hs similarity index 100% rename from aws/amazonka-rds/Setup.hs rename to amazonka-redshift/Setup.hs diff --git a/aws/amazonka-redshift/amazonka-redshift.cabal b/amazonka-redshift/amazonka-redshift.cabal similarity index 100% rename from aws/amazonka-redshift/amazonka-redshift.cabal rename to amazonka-redshift/amazonka-redshift.cabal diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift.hs b/amazonka-redshift/gen/Network/AWS/Redshift.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift.hs rename to amazonka-redshift/gen/Network/AWS/Redshift.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs b/amazonka-redshift/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/AuthorizeClusterSecurityGroupIngress.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs b/amazonka-redshift/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/AuthorizeSnapshotAccess.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CopyClusterSnapshot.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateCluster.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CreateCluster.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateCluster.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CreateCluster.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterParameterGroup.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSecurityGroup.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSnapshot.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CreateClusterSubnetGroup.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateEventSubscription.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CreateEventSubscription.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateEventSubscription.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CreateEventSubscription.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateHsmClientCertificate.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CreateHsmClientCertificate.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateHsmClientCertificate.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CreateHsmClientCertificate.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateHsmConfiguration.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CreateHsmConfiguration.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateHsmConfiguration.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CreateHsmConfiguration.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateTags.hs b/amazonka-redshift/gen/Network/AWS/Redshift/CreateTags.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/CreateTags.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/CreateTags.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteCluster.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DeleteCluster.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteCluster.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DeleteCluster.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterParameterGroup.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterParameterGroup.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterParameterGroup.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterParameterGroup.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSecurityGroup.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSecurityGroup.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSecurityGroup.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSecurityGroup.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSnapshot.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSubnetGroup.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSubnetGroup.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSubnetGroup.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DeleteClusterSubnetGroup.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteEventSubscription.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DeleteEventSubscription.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteEventSubscription.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DeleteEventSubscription.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteHsmClientCertificate.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DeleteHsmClientCertificate.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteHsmClientCertificate.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DeleteHsmClientCertificate.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteHsmConfiguration.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DeleteHsmConfiguration.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteHsmConfiguration.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DeleteHsmConfiguration.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteTags.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DeleteTags.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DeleteTags.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DeleteTags.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterParameters.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterParameters.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterParameters.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterParameters.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterVersions.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterVersions.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterVersions.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusterVersions.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusters.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusters.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusters.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeClusters.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeDefaultClusterParameters.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeEventCategories.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeEventCategories.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeEventCategories.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeEventCategories.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeEvents.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeEvents.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeEvents.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeEvents.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeLoggingStatus.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeReservedNodes.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeReservedNodes.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeReservedNodes.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeReservedNodes.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeResize.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeResize.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeResize.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeResize.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeTags.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DescribeTags.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DescribeTags.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DescribeTags.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DisableLogging.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DisableLogging.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DisableLogging.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DisableLogging.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs b/amazonka-redshift/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/DisableSnapshotCopy.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/EnableLogging.hs b/amazonka-redshift/gen/Network/AWS/Redshift/EnableLogging.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/EnableLogging.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/EnableLogging.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs b/amazonka-redshift/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/EnableSnapshotCopy.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifyCluster.hs b/amazonka-redshift/gen/Network/AWS/Redshift/ModifyCluster.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifyCluster.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/ModifyCluster.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifyClusterParameterGroup.hs b/amazonka-redshift/gen/Network/AWS/Redshift/ModifyClusterParameterGroup.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifyClusterParameterGroup.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/ModifyClusterParameterGroup.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs b/amazonka-redshift/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/ModifyClusterSubnetGroup.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifyEventSubscription.hs b/amazonka-redshift/gen/Network/AWS/Redshift/ModifyEventSubscription.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifyEventSubscription.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/ModifyEventSubscription.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs b/amazonka-redshift/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/ModifySnapshotCopyRetentionPeriod.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs b/amazonka-redshift/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/PurchaseReservedNodeOffering.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/RebootCluster.hs b/amazonka-redshift/gen/Network/AWS/Redshift/RebootCluster.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/RebootCluster.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/RebootCluster.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/ResetClusterParameterGroup.hs b/amazonka-redshift/gen/Network/AWS/Redshift/ResetClusterParameterGroup.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/ResetClusterParameterGroup.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/ResetClusterParameterGroup.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs b/amazonka-redshift/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/RestoreFromClusterSnapshot.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs b/amazonka-redshift/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/RevokeClusterSecurityGroupIngress.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs b/amazonka-redshift/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/RevokeSnapshotAccess.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/RotateEncryptionKey.hs b/amazonka-redshift/gen/Network/AWS/Redshift/RotateEncryptionKey.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/RotateEncryptionKey.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/RotateEncryptionKey.hs diff --git a/aws/amazonka-redshift/gen/Network/AWS/Redshift/Types.hs b/amazonka-redshift/gen/Network/AWS/Redshift/Types.hs similarity index 100% rename from aws/amazonka-redshift/gen/Network/AWS/Redshift/Types.hs rename to amazonka-redshift/gen/Network/AWS/Redshift/Types.hs diff --git a/aws/amazonka-redshift/LICENSE b/amazonka-route53-domains/LICENSE similarity index 100% rename from aws/amazonka-redshift/LICENSE rename to amazonka-route53-domains/LICENSE diff --git a/aws/amazonka-route53-domains/Makefile b/amazonka-route53-domains/Makefile similarity index 100% rename from aws/amazonka-route53-domains/Makefile rename to amazonka-route53-domains/Makefile diff --git a/aws/amazonka-route53-domains/README.md b/amazonka-route53-domains/README.md similarity index 100% rename from aws/amazonka-route53-domains/README.md rename to amazonka-route53-domains/README.md diff --git a/aws/amazonka-redshift/Setup.hs b/amazonka-route53-domains/Setup.hs similarity index 100% rename from aws/amazonka-redshift/Setup.hs rename to amazonka-route53-domains/Setup.hs diff --git a/aws/amazonka-route53-domains/amazonka-route53-domains.cabal b/amazonka-route53-domains/amazonka-route53-domains.cabal similarity index 100% rename from aws/amazonka-route53-domains/amazonka-route53-domains.cabal rename to amazonka-route53-domains/amazonka-route53-domains.cabal diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/CheckDomainAvailability.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/CheckDomainAvailability.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/CheckDomainAvailability.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/CheckDomainAvailability.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/DisableDomainAutoRenew.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/DisableDomainAutoRenew.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/DisableDomainAutoRenew.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/DisableDomainAutoRenew.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/DisableDomainTransferLock.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/DisableDomainTransferLock.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/DisableDomainTransferLock.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/DisableDomainTransferLock.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/EnableDomainAutoRenew.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/EnableDomainAutoRenew.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/EnableDomainAutoRenew.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/EnableDomainAutoRenew.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/EnableDomainTransferLock.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/EnableDomainTransferLock.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/EnableDomainTransferLock.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/EnableDomainTransferLock.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/GetDomainDetail.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/GetDomainDetail.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/GetDomainDetail.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/GetDomainDetail.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/GetOperationDetail.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/GetOperationDetail.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/GetOperationDetail.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/GetOperationDetail.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/ListDomains.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/ListDomains.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/ListDomains.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/ListDomains.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/ListOperations.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/ListOperations.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/ListOperations.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/ListOperations.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/RegisterDomain.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/RegisterDomain.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/RegisterDomain.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/RegisterDomain.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/RetrieveDomainAuthCode.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/RetrieveDomainAuthCode.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/RetrieveDomainAuthCode.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/RetrieveDomainAuthCode.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/TransferDomain.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/TransferDomain.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/TransferDomain.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/TransferDomain.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/Types.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/Types.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/Types.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/Types.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainContact.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainContact.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainContact.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainContact.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainContactPrivacy.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainContactPrivacy.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainContactPrivacy.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainContactPrivacy.hs diff --git a/aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainNameservers.hs b/amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainNameservers.hs similarity index 100% rename from aws/amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainNameservers.hs rename to amazonka-route53-domains/gen/Network/AWS/Route53Domains/UpdateDomainNameservers.hs diff --git a/aws/amazonka-route53-domains/LICENSE b/amazonka-route53/LICENSE similarity index 100% rename from aws/amazonka-route53-domains/LICENSE rename to amazonka-route53/LICENSE diff --git a/aws/amazonka-route53/Makefile b/amazonka-route53/Makefile similarity index 100% rename from aws/amazonka-route53/Makefile rename to amazonka-route53/Makefile diff --git a/aws/amazonka-route53/README.md b/amazonka-route53/README.md similarity index 100% rename from aws/amazonka-route53/README.md rename to amazonka-route53/README.md diff --git a/aws/amazonka-route53-domains/Setup.hs b/amazonka-route53/Setup.hs similarity index 100% rename from aws/amazonka-route53-domains/Setup.hs rename to amazonka-route53/Setup.hs diff --git a/aws/amazonka-route53/amazonka-route53.cabal b/amazonka-route53/amazonka-route53.cabal similarity index 100% rename from aws/amazonka-route53/amazonka-route53.cabal rename to amazonka-route53/amazonka-route53.cabal diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53.hs b/amazonka-route53/gen/Network/AWS/Route53.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53.hs rename to amazonka-route53/gen/Network/AWS/Route53.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/AssociateVPCWithHostedZone.hs b/amazonka-route53/gen/Network/AWS/Route53/AssociateVPCWithHostedZone.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/AssociateVPCWithHostedZone.hs rename to amazonka-route53/gen/Network/AWS/Route53/AssociateVPCWithHostedZone.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/ChangeResourceRecordSets.hs b/amazonka-route53/gen/Network/AWS/Route53/ChangeResourceRecordSets.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/ChangeResourceRecordSets.hs rename to amazonka-route53/gen/Network/AWS/Route53/ChangeResourceRecordSets.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/ChangeTagsForResource.hs b/amazonka-route53/gen/Network/AWS/Route53/ChangeTagsForResource.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/ChangeTagsForResource.hs rename to amazonka-route53/gen/Network/AWS/Route53/ChangeTagsForResource.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/CreateHealthCheck.hs b/amazonka-route53/gen/Network/AWS/Route53/CreateHealthCheck.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/CreateHealthCheck.hs rename to amazonka-route53/gen/Network/AWS/Route53/CreateHealthCheck.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/CreateHostedZone.hs b/amazonka-route53/gen/Network/AWS/Route53/CreateHostedZone.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/CreateHostedZone.hs rename to amazonka-route53/gen/Network/AWS/Route53/CreateHostedZone.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/CreateReusableDelegationSet.hs b/amazonka-route53/gen/Network/AWS/Route53/CreateReusableDelegationSet.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/CreateReusableDelegationSet.hs rename to amazonka-route53/gen/Network/AWS/Route53/CreateReusableDelegationSet.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/DeleteHealthCheck.hs b/amazonka-route53/gen/Network/AWS/Route53/DeleteHealthCheck.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/DeleteHealthCheck.hs rename to amazonka-route53/gen/Network/AWS/Route53/DeleteHealthCheck.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/DeleteHostedZone.hs b/amazonka-route53/gen/Network/AWS/Route53/DeleteHostedZone.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/DeleteHostedZone.hs rename to amazonka-route53/gen/Network/AWS/Route53/DeleteHostedZone.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/DeleteReusableDelegationSet.hs b/amazonka-route53/gen/Network/AWS/Route53/DeleteReusableDelegationSet.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/DeleteReusableDelegationSet.hs rename to amazonka-route53/gen/Network/AWS/Route53/DeleteReusableDelegationSet.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/DisassociateVPCFromHostedZone.hs b/amazonka-route53/gen/Network/AWS/Route53/DisassociateVPCFromHostedZone.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/DisassociateVPCFromHostedZone.hs rename to amazonka-route53/gen/Network/AWS/Route53/DisassociateVPCFromHostedZone.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/GetChange.hs b/amazonka-route53/gen/Network/AWS/Route53/GetChange.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/GetChange.hs rename to amazonka-route53/gen/Network/AWS/Route53/GetChange.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/GetCheckerIpRanges.hs b/amazonka-route53/gen/Network/AWS/Route53/GetCheckerIpRanges.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/GetCheckerIpRanges.hs rename to amazonka-route53/gen/Network/AWS/Route53/GetCheckerIpRanges.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/GetGeoLocation.hs b/amazonka-route53/gen/Network/AWS/Route53/GetGeoLocation.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/GetGeoLocation.hs rename to amazonka-route53/gen/Network/AWS/Route53/GetGeoLocation.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheck.hs b/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheck.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheck.hs rename to amazonka-route53/gen/Network/AWS/Route53/GetHealthCheck.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckCount.hs b/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckCount.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckCount.hs rename to amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckCount.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckLastFailureReason.hs b/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckLastFailureReason.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckLastFailureReason.hs rename to amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckLastFailureReason.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckStatus.hs b/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckStatus.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckStatus.hs rename to amazonka-route53/gen/Network/AWS/Route53/GetHealthCheckStatus.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/GetHostedZone.hs b/amazonka-route53/gen/Network/AWS/Route53/GetHostedZone.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/GetHostedZone.hs rename to amazonka-route53/gen/Network/AWS/Route53/GetHostedZone.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/GetReusableDelegationSet.hs b/amazonka-route53/gen/Network/AWS/Route53/GetReusableDelegationSet.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/GetReusableDelegationSet.hs rename to amazonka-route53/gen/Network/AWS/Route53/GetReusableDelegationSet.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/ListGeoLocations.hs b/amazonka-route53/gen/Network/AWS/Route53/ListGeoLocations.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/ListGeoLocations.hs rename to amazonka-route53/gen/Network/AWS/Route53/ListGeoLocations.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/ListHealthChecks.hs b/amazonka-route53/gen/Network/AWS/Route53/ListHealthChecks.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/ListHealthChecks.hs rename to amazonka-route53/gen/Network/AWS/Route53/ListHealthChecks.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/ListHostedZones.hs b/amazonka-route53/gen/Network/AWS/Route53/ListHostedZones.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/ListHostedZones.hs rename to amazonka-route53/gen/Network/AWS/Route53/ListHostedZones.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/ListResourceRecordSets.hs b/amazonka-route53/gen/Network/AWS/Route53/ListResourceRecordSets.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/ListResourceRecordSets.hs rename to amazonka-route53/gen/Network/AWS/Route53/ListResourceRecordSets.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/ListReusableDelegationSets.hs b/amazonka-route53/gen/Network/AWS/Route53/ListReusableDelegationSets.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/ListReusableDelegationSets.hs rename to amazonka-route53/gen/Network/AWS/Route53/ListReusableDelegationSets.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/ListTagsForResource.hs b/amazonka-route53/gen/Network/AWS/Route53/ListTagsForResource.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/ListTagsForResource.hs rename to amazonka-route53/gen/Network/AWS/Route53/ListTagsForResource.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/ListTagsForResources.hs b/amazonka-route53/gen/Network/AWS/Route53/ListTagsForResources.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/ListTagsForResources.hs rename to amazonka-route53/gen/Network/AWS/Route53/ListTagsForResources.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/Types.hs b/amazonka-route53/gen/Network/AWS/Route53/Types.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/Types.hs rename to amazonka-route53/gen/Network/AWS/Route53/Types.hs diff --git a/aws/amazonka-route53/gen/Network/AWS/Route53/UpdateHealthCheck.hs b/amazonka-route53/gen/Network/AWS/Route53/UpdateHealthCheck.hs similarity index 100% rename from aws/amazonka-route53/gen/Network/AWS/Route53/UpdateHealthCheck.hs rename to amazonka-route53/gen/Network/AWS/Route53/UpdateHealthCheck.hs diff --git a/aws/amazonka-route53/LICENSE b/amazonka-s3/LICENSE similarity index 100% rename from aws/amazonka-route53/LICENSE rename to amazonka-s3/LICENSE diff --git a/aws/amazonka-s3/Makefile b/amazonka-s3/Makefile similarity index 100% rename from aws/amazonka-s3/Makefile rename to amazonka-s3/Makefile diff --git a/aws/amazonka-s3/README.md b/amazonka-s3/README.md similarity index 100% rename from aws/amazonka-s3/README.md rename to amazonka-s3/README.md diff --git a/aws/amazonka-route53/Setup.hs b/amazonka-s3/Setup.hs similarity index 100% rename from aws/amazonka-route53/Setup.hs rename to amazonka-s3/Setup.hs diff --git a/aws/amazonka-s3/amazonka-s3.cabal b/amazonka-s3/amazonka-s3.cabal similarity index 100% rename from aws/amazonka-s3/amazonka-s3.cabal rename to amazonka-s3/amazonka-s3.cabal diff --git a/aws/amazonka-s3/gen/Network/AWS/S3.hs b/amazonka-s3/gen/Network/AWS/S3.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3.hs rename to amazonka-s3/gen/Network/AWS/S3.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/AbortMultipartUpload.hs b/amazonka-s3/gen/Network/AWS/S3/AbortMultipartUpload.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/AbortMultipartUpload.hs rename to amazonka-s3/gen/Network/AWS/S3/AbortMultipartUpload.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/CompleteMultipartUpload.hs b/amazonka-s3/gen/Network/AWS/S3/CompleteMultipartUpload.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/CompleteMultipartUpload.hs rename to amazonka-s3/gen/Network/AWS/S3/CompleteMultipartUpload.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/CopyObject.hs b/amazonka-s3/gen/Network/AWS/S3/CopyObject.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/CopyObject.hs rename to amazonka-s3/gen/Network/AWS/S3/CopyObject.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/CreateBucket.hs b/amazonka-s3/gen/Network/AWS/S3/CreateBucket.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/CreateBucket.hs rename to amazonka-s3/gen/Network/AWS/S3/CreateBucket.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/CreateMultipartUpload.hs b/amazonka-s3/gen/Network/AWS/S3/CreateMultipartUpload.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/CreateMultipartUpload.hs rename to amazonka-s3/gen/Network/AWS/S3/CreateMultipartUpload.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucket.hs b/amazonka-s3/gen/Network/AWS/S3/DeleteBucket.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucket.hs rename to amazonka-s3/gen/Network/AWS/S3/DeleteBucket.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketCors.hs b/amazonka-s3/gen/Network/AWS/S3/DeleteBucketCors.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketCors.hs rename to amazonka-s3/gen/Network/AWS/S3/DeleteBucketCors.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketLifecycle.hs b/amazonka-s3/gen/Network/AWS/S3/DeleteBucketLifecycle.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketLifecycle.hs rename to amazonka-s3/gen/Network/AWS/S3/DeleteBucketLifecycle.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketPolicy.hs b/amazonka-s3/gen/Network/AWS/S3/DeleteBucketPolicy.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketPolicy.hs rename to amazonka-s3/gen/Network/AWS/S3/DeleteBucketPolicy.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketTagging.hs b/amazonka-s3/gen/Network/AWS/S3/DeleteBucketTagging.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketTagging.hs rename to amazonka-s3/gen/Network/AWS/S3/DeleteBucketTagging.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketWebsite.hs b/amazonka-s3/gen/Network/AWS/S3/DeleteBucketWebsite.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/DeleteBucketWebsite.hs rename to amazonka-s3/gen/Network/AWS/S3/DeleteBucketWebsite.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/DeleteObject.hs b/amazonka-s3/gen/Network/AWS/S3/DeleteObject.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/DeleteObject.hs rename to amazonka-s3/gen/Network/AWS/S3/DeleteObject.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/DeleteObjects.hs b/amazonka-s3/gen/Network/AWS/S3/DeleteObjects.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/DeleteObjects.hs rename to amazonka-s3/gen/Network/AWS/S3/DeleteObjects.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketAcl.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketAcl.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketAcl.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketAcl.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketCors.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketCors.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketCors.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketCors.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketLifecycle.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketLifecycle.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketLifecycle.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketLifecycle.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketLocation.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketLocation.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketLocation.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketLocation.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketLogging.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketLogging.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketLogging.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketLogging.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketNotification.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketNotification.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketNotification.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketNotification.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketPolicy.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketPolicy.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketPolicy.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketPolicy.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketRequestPayment.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketRequestPayment.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketRequestPayment.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketRequestPayment.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketTagging.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketTagging.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketTagging.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketTagging.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketVersioning.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketVersioning.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketVersioning.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketVersioning.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetBucketWebsite.hs b/amazonka-s3/gen/Network/AWS/S3/GetBucketWebsite.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetBucketWebsite.hs rename to amazonka-s3/gen/Network/AWS/S3/GetBucketWebsite.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetObject.hs b/amazonka-s3/gen/Network/AWS/S3/GetObject.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetObject.hs rename to amazonka-s3/gen/Network/AWS/S3/GetObject.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetObjectAcl.hs b/amazonka-s3/gen/Network/AWS/S3/GetObjectAcl.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetObjectAcl.hs rename to amazonka-s3/gen/Network/AWS/S3/GetObjectAcl.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/GetObjectTorrent.hs b/amazonka-s3/gen/Network/AWS/S3/GetObjectTorrent.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/GetObjectTorrent.hs rename to amazonka-s3/gen/Network/AWS/S3/GetObjectTorrent.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/HeadBucket.hs b/amazonka-s3/gen/Network/AWS/S3/HeadBucket.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/HeadBucket.hs rename to amazonka-s3/gen/Network/AWS/S3/HeadBucket.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/HeadObject.hs b/amazonka-s3/gen/Network/AWS/S3/HeadObject.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/HeadObject.hs rename to amazonka-s3/gen/Network/AWS/S3/HeadObject.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/ListBuckets.hs b/amazonka-s3/gen/Network/AWS/S3/ListBuckets.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/ListBuckets.hs rename to amazonka-s3/gen/Network/AWS/S3/ListBuckets.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/ListMultipartUploads.hs b/amazonka-s3/gen/Network/AWS/S3/ListMultipartUploads.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/ListMultipartUploads.hs rename to amazonka-s3/gen/Network/AWS/S3/ListMultipartUploads.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/ListObjectVersions.hs b/amazonka-s3/gen/Network/AWS/S3/ListObjectVersions.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/ListObjectVersions.hs rename to amazonka-s3/gen/Network/AWS/S3/ListObjectVersions.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/ListObjects.hs b/amazonka-s3/gen/Network/AWS/S3/ListObjects.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/ListObjects.hs rename to amazonka-s3/gen/Network/AWS/S3/ListObjects.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/ListParts.hs b/amazonka-s3/gen/Network/AWS/S3/ListParts.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/ListParts.hs rename to amazonka-s3/gen/Network/AWS/S3/ListParts.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketAcl.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketAcl.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketAcl.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketAcl.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketCors.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketCors.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketCors.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketCors.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketLifecycle.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketLifecycle.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketLifecycle.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketLifecycle.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketLogging.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketLogging.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketLogging.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketLogging.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketNotification.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketNotification.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketNotification.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketNotification.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketPolicy.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketPolicy.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketPolicy.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketPolicy.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketRequestPayment.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketRequestPayment.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketRequestPayment.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketRequestPayment.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketTagging.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketTagging.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketTagging.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketTagging.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketVersioning.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketVersioning.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketVersioning.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketVersioning.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutBucketWebsite.hs b/amazonka-s3/gen/Network/AWS/S3/PutBucketWebsite.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutBucketWebsite.hs rename to amazonka-s3/gen/Network/AWS/S3/PutBucketWebsite.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutObject.hs b/amazonka-s3/gen/Network/AWS/S3/PutObject.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutObject.hs rename to amazonka-s3/gen/Network/AWS/S3/PutObject.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/PutObjectAcl.hs b/amazonka-s3/gen/Network/AWS/S3/PutObjectAcl.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/PutObjectAcl.hs rename to amazonka-s3/gen/Network/AWS/S3/PutObjectAcl.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/RestoreObject.hs b/amazonka-s3/gen/Network/AWS/S3/RestoreObject.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/RestoreObject.hs rename to amazonka-s3/gen/Network/AWS/S3/RestoreObject.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/Types.hs b/amazonka-s3/gen/Network/AWS/S3/Types.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/Types.hs rename to amazonka-s3/gen/Network/AWS/S3/Types.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/UploadPart.hs b/amazonka-s3/gen/Network/AWS/S3/UploadPart.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/UploadPart.hs rename to amazonka-s3/gen/Network/AWS/S3/UploadPart.hs diff --git a/aws/amazonka-s3/gen/Network/AWS/S3/UploadPartCopy.hs b/amazonka-s3/gen/Network/AWS/S3/UploadPartCopy.hs similarity index 100% rename from aws/amazonka-s3/gen/Network/AWS/S3/UploadPartCopy.hs rename to amazonka-s3/gen/Network/AWS/S3/UploadPartCopy.hs diff --git a/aws/amazonka-s3/src/Network/AWS/S3/Internal.hs b/amazonka-s3/src/Network/AWS/S3/Internal.hs similarity index 100% rename from aws/amazonka-s3/src/Network/AWS/S3/Internal.hs rename to amazonka-s3/src/Network/AWS/S3/Internal.hs diff --git a/aws/amazonka-s3/LICENSE b/amazonka-sdb/LICENSE similarity index 100% rename from aws/amazonka-s3/LICENSE rename to amazonka-sdb/LICENSE diff --git a/aws/amazonka-sdb/Makefile b/amazonka-sdb/Makefile similarity index 100% rename from aws/amazonka-sdb/Makefile rename to amazonka-sdb/Makefile diff --git a/aws/amazonka-sdb/README.md b/amazonka-sdb/README.md similarity index 100% rename from aws/amazonka-sdb/README.md rename to amazonka-sdb/README.md diff --git a/aws/amazonka-s3/Setup.hs b/amazonka-sdb/Setup.hs similarity index 100% rename from aws/amazonka-s3/Setup.hs rename to amazonka-sdb/Setup.hs diff --git a/aws/amazonka-sdb/amazonka-sdb.cabal b/amazonka-sdb/amazonka-sdb.cabal similarity index 100% rename from aws/amazonka-sdb/amazonka-sdb.cabal rename to amazonka-sdb/amazonka-sdb.cabal diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB.hs b/amazonka-sdb/gen/Network/AWS/SDB.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB.hs rename to amazonka-sdb/gen/Network/AWS/SDB.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/BatchDeleteAttributes.hs b/amazonka-sdb/gen/Network/AWS/SDB/BatchDeleteAttributes.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/BatchDeleteAttributes.hs rename to amazonka-sdb/gen/Network/AWS/SDB/BatchDeleteAttributes.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/BatchPutAttributes.hs b/amazonka-sdb/gen/Network/AWS/SDB/BatchPutAttributes.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/BatchPutAttributes.hs rename to amazonka-sdb/gen/Network/AWS/SDB/BatchPutAttributes.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/CreateDomain.hs b/amazonka-sdb/gen/Network/AWS/SDB/CreateDomain.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/CreateDomain.hs rename to amazonka-sdb/gen/Network/AWS/SDB/CreateDomain.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/DeleteAttributes.hs b/amazonka-sdb/gen/Network/AWS/SDB/DeleteAttributes.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/DeleteAttributes.hs rename to amazonka-sdb/gen/Network/AWS/SDB/DeleteAttributes.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/DeleteDomain.hs b/amazonka-sdb/gen/Network/AWS/SDB/DeleteDomain.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/DeleteDomain.hs rename to amazonka-sdb/gen/Network/AWS/SDB/DeleteDomain.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/DomainMetadata.hs b/amazonka-sdb/gen/Network/AWS/SDB/DomainMetadata.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/DomainMetadata.hs rename to amazonka-sdb/gen/Network/AWS/SDB/DomainMetadata.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/GetAttributes.hs b/amazonka-sdb/gen/Network/AWS/SDB/GetAttributes.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/GetAttributes.hs rename to amazonka-sdb/gen/Network/AWS/SDB/GetAttributes.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/ListDomains.hs b/amazonka-sdb/gen/Network/AWS/SDB/ListDomains.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/ListDomains.hs rename to amazonka-sdb/gen/Network/AWS/SDB/ListDomains.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/PutAttributes.hs b/amazonka-sdb/gen/Network/AWS/SDB/PutAttributes.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/PutAttributes.hs rename to amazonka-sdb/gen/Network/AWS/SDB/PutAttributes.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/Select.hs b/amazonka-sdb/gen/Network/AWS/SDB/Select.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/Select.hs rename to amazonka-sdb/gen/Network/AWS/SDB/Select.hs diff --git a/aws/amazonka-sdb/gen/Network/AWS/SDB/Types.hs b/amazonka-sdb/gen/Network/AWS/SDB/Types.hs similarity index 100% rename from aws/amazonka-sdb/gen/Network/AWS/SDB/Types.hs rename to amazonka-sdb/gen/Network/AWS/SDB/Types.hs diff --git a/aws/amazonka-sdb/LICENSE b/amazonka-ses/LICENSE similarity index 100% rename from aws/amazonka-sdb/LICENSE rename to amazonka-ses/LICENSE diff --git a/aws/amazonka-ses/Makefile b/amazonka-ses/Makefile similarity index 100% rename from aws/amazonka-ses/Makefile rename to amazonka-ses/Makefile diff --git a/aws/amazonka-ses/README.md b/amazonka-ses/README.md similarity index 100% rename from aws/amazonka-ses/README.md rename to amazonka-ses/README.md diff --git a/aws/amazonka-sdb/Setup.hs b/amazonka-ses/Setup.hs similarity index 100% rename from aws/amazonka-sdb/Setup.hs rename to amazonka-ses/Setup.hs diff --git a/aws/amazonka-ses/amazonka-ses.cabal b/amazonka-ses/amazonka-ses.cabal similarity index 100% rename from aws/amazonka-ses/amazonka-ses.cabal rename to amazonka-ses/amazonka-ses.cabal diff --git a/aws/amazonka-ses/gen/Network/AWS/SES.hs b/amazonka-ses/gen/Network/AWS/SES.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES.hs rename to amazonka-ses/gen/Network/AWS/SES.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/DeleteIdentity.hs b/amazonka-ses/gen/Network/AWS/SES/DeleteIdentity.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/DeleteIdentity.hs rename to amazonka-ses/gen/Network/AWS/SES/DeleteIdentity.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/DeleteVerifiedEmailAddress.hs b/amazonka-ses/gen/Network/AWS/SES/DeleteVerifiedEmailAddress.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/DeleteVerifiedEmailAddress.hs rename to amazonka-ses/gen/Network/AWS/SES/DeleteVerifiedEmailAddress.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/GetIdentityDkimAttributes.hs b/amazonka-ses/gen/Network/AWS/SES/GetIdentityDkimAttributes.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/GetIdentityDkimAttributes.hs rename to amazonka-ses/gen/Network/AWS/SES/GetIdentityDkimAttributes.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/GetIdentityNotificationAttributes.hs b/amazonka-ses/gen/Network/AWS/SES/GetIdentityNotificationAttributes.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/GetIdentityNotificationAttributes.hs rename to amazonka-ses/gen/Network/AWS/SES/GetIdentityNotificationAttributes.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/GetIdentityVerificationAttributes.hs b/amazonka-ses/gen/Network/AWS/SES/GetIdentityVerificationAttributes.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/GetIdentityVerificationAttributes.hs rename to amazonka-ses/gen/Network/AWS/SES/GetIdentityVerificationAttributes.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/GetSendQuota.hs b/amazonka-ses/gen/Network/AWS/SES/GetSendQuota.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/GetSendQuota.hs rename to amazonka-ses/gen/Network/AWS/SES/GetSendQuota.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/GetSendStatistics.hs b/amazonka-ses/gen/Network/AWS/SES/GetSendStatistics.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/GetSendStatistics.hs rename to amazonka-ses/gen/Network/AWS/SES/GetSendStatistics.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/ListIdentities.hs b/amazonka-ses/gen/Network/AWS/SES/ListIdentities.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/ListIdentities.hs rename to amazonka-ses/gen/Network/AWS/SES/ListIdentities.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/ListVerifiedEmailAddresses.hs b/amazonka-ses/gen/Network/AWS/SES/ListVerifiedEmailAddresses.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/ListVerifiedEmailAddresses.hs rename to amazonka-ses/gen/Network/AWS/SES/ListVerifiedEmailAddresses.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/SendEmail.hs b/amazonka-ses/gen/Network/AWS/SES/SendEmail.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/SendEmail.hs rename to amazonka-ses/gen/Network/AWS/SES/SendEmail.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/SendRawEmail.hs b/amazonka-ses/gen/Network/AWS/SES/SendRawEmail.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/SendRawEmail.hs rename to amazonka-ses/gen/Network/AWS/SES/SendRawEmail.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/SetIdentityDkimEnabled.hs b/amazonka-ses/gen/Network/AWS/SES/SetIdentityDkimEnabled.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/SetIdentityDkimEnabled.hs rename to amazonka-ses/gen/Network/AWS/SES/SetIdentityDkimEnabled.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/SetIdentityFeedbackForwardingEnabled.hs b/amazonka-ses/gen/Network/AWS/SES/SetIdentityFeedbackForwardingEnabled.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/SetIdentityFeedbackForwardingEnabled.hs rename to amazonka-ses/gen/Network/AWS/SES/SetIdentityFeedbackForwardingEnabled.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/SetIdentityNotificationTopic.hs b/amazonka-ses/gen/Network/AWS/SES/SetIdentityNotificationTopic.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/SetIdentityNotificationTopic.hs rename to amazonka-ses/gen/Network/AWS/SES/SetIdentityNotificationTopic.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/Types.hs b/amazonka-ses/gen/Network/AWS/SES/Types.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/Types.hs rename to amazonka-ses/gen/Network/AWS/SES/Types.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/VerifyDomainDkim.hs b/amazonka-ses/gen/Network/AWS/SES/VerifyDomainDkim.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/VerifyDomainDkim.hs rename to amazonka-ses/gen/Network/AWS/SES/VerifyDomainDkim.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/VerifyDomainIdentity.hs b/amazonka-ses/gen/Network/AWS/SES/VerifyDomainIdentity.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/VerifyDomainIdentity.hs rename to amazonka-ses/gen/Network/AWS/SES/VerifyDomainIdentity.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/VerifyEmailAddress.hs b/amazonka-ses/gen/Network/AWS/SES/VerifyEmailAddress.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/VerifyEmailAddress.hs rename to amazonka-ses/gen/Network/AWS/SES/VerifyEmailAddress.hs diff --git a/aws/amazonka-ses/gen/Network/AWS/SES/VerifyEmailIdentity.hs b/amazonka-ses/gen/Network/AWS/SES/VerifyEmailIdentity.hs similarity index 100% rename from aws/amazonka-ses/gen/Network/AWS/SES/VerifyEmailIdentity.hs rename to amazonka-ses/gen/Network/AWS/SES/VerifyEmailIdentity.hs diff --git a/aws/amazonka-ses/LICENSE b/amazonka-sns/LICENSE similarity index 100% rename from aws/amazonka-ses/LICENSE rename to amazonka-sns/LICENSE diff --git a/aws/amazonka-sns/Makefile b/amazonka-sns/Makefile similarity index 100% rename from aws/amazonka-sns/Makefile rename to amazonka-sns/Makefile diff --git a/aws/amazonka-sns/README.md b/amazonka-sns/README.md similarity index 100% rename from aws/amazonka-sns/README.md rename to amazonka-sns/README.md diff --git a/aws/amazonka-ses/Setup.hs b/amazonka-sns/Setup.hs similarity index 100% rename from aws/amazonka-ses/Setup.hs rename to amazonka-sns/Setup.hs diff --git a/aws/amazonka-sns/amazonka-sns.cabal b/amazonka-sns/amazonka-sns.cabal similarity index 100% rename from aws/amazonka-sns/amazonka-sns.cabal rename to amazonka-sns/amazonka-sns.cabal diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS.hs b/amazonka-sns/gen/Network/AWS/SNS.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS.hs rename to amazonka-sns/gen/Network/AWS/SNS.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/AddPermission.hs b/amazonka-sns/gen/Network/AWS/SNS/AddPermission.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/AddPermission.hs rename to amazonka-sns/gen/Network/AWS/SNS/AddPermission.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/ConfirmSubscription.hs b/amazonka-sns/gen/Network/AWS/SNS/ConfirmSubscription.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/ConfirmSubscription.hs rename to amazonka-sns/gen/Network/AWS/SNS/ConfirmSubscription.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/CreatePlatformApplication.hs b/amazonka-sns/gen/Network/AWS/SNS/CreatePlatformApplication.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/CreatePlatformApplication.hs rename to amazonka-sns/gen/Network/AWS/SNS/CreatePlatformApplication.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/CreatePlatformEndpoint.hs b/amazonka-sns/gen/Network/AWS/SNS/CreatePlatformEndpoint.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/CreatePlatformEndpoint.hs rename to amazonka-sns/gen/Network/AWS/SNS/CreatePlatformEndpoint.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/CreateTopic.hs b/amazonka-sns/gen/Network/AWS/SNS/CreateTopic.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/CreateTopic.hs rename to amazonka-sns/gen/Network/AWS/SNS/CreateTopic.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/DeleteEndpoint.hs b/amazonka-sns/gen/Network/AWS/SNS/DeleteEndpoint.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/DeleteEndpoint.hs rename to amazonka-sns/gen/Network/AWS/SNS/DeleteEndpoint.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/DeletePlatformApplication.hs b/amazonka-sns/gen/Network/AWS/SNS/DeletePlatformApplication.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/DeletePlatformApplication.hs rename to amazonka-sns/gen/Network/AWS/SNS/DeletePlatformApplication.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/DeleteTopic.hs b/amazonka-sns/gen/Network/AWS/SNS/DeleteTopic.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/DeleteTopic.hs rename to amazonka-sns/gen/Network/AWS/SNS/DeleteTopic.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/GetEndpointAttributes.hs b/amazonka-sns/gen/Network/AWS/SNS/GetEndpointAttributes.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/GetEndpointAttributes.hs rename to amazonka-sns/gen/Network/AWS/SNS/GetEndpointAttributes.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/GetPlatformApplicationAttributes.hs b/amazonka-sns/gen/Network/AWS/SNS/GetPlatformApplicationAttributes.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/GetPlatformApplicationAttributes.hs rename to amazonka-sns/gen/Network/AWS/SNS/GetPlatformApplicationAttributes.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/GetSubscriptionAttributes.hs b/amazonka-sns/gen/Network/AWS/SNS/GetSubscriptionAttributes.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/GetSubscriptionAttributes.hs rename to amazonka-sns/gen/Network/AWS/SNS/GetSubscriptionAttributes.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/GetTopicAttributes.hs b/amazonka-sns/gen/Network/AWS/SNS/GetTopicAttributes.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/GetTopicAttributes.hs rename to amazonka-sns/gen/Network/AWS/SNS/GetTopicAttributes.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/ListEndpointsByPlatformApplication.hs b/amazonka-sns/gen/Network/AWS/SNS/ListEndpointsByPlatformApplication.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/ListEndpointsByPlatformApplication.hs rename to amazonka-sns/gen/Network/AWS/SNS/ListEndpointsByPlatformApplication.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/ListPlatformApplications.hs b/amazonka-sns/gen/Network/AWS/SNS/ListPlatformApplications.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/ListPlatformApplications.hs rename to amazonka-sns/gen/Network/AWS/SNS/ListPlatformApplications.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/ListSubscriptions.hs b/amazonka-sns/gen/Network/AWS/SNS/ListSubscriptions.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/ListSubscriptions.hs rename to amazonka-sns/gen/Network/AWS/SNS/ListSubscriptions.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/ListSubscriptionsByTopic.hs b/amazonka-sns/gen/Network/AWS/SNS/ListSubscriptionsByTopic.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/ListSubscriptionsByTopic.hs rename to amazonka-sns/gen/Network/AWS/SNS/ListSubscriptionsByTopic.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/ListTopics.hs b/amazonka-sns/gen/Network/AWS/SNS/ListTopics.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/ListTopics.hs rename to amazonka-sns/gen/Network/AWS/SNS/ListTopics.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/Publish.hs b/amazonka-sns/gen/Network/AWS/SNS/Publish.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/Publish.hs rename to amazonka-sns/gen/Network/AWS/SNS/Publish.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/RemovePermission.hs b/amazonka-sns/gen/Network/AWS/SNS/RemovePermission.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/RemovePermission.hs rename to amazonka-sns/gen/Network/AWS/SNS/RemovePermission.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/SetEndpointAttributes.hs b/amazonka-sns/gen/Network/AWS/SNS/SetEndpointAttributes.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/SetEndpointAttributes.hs rename to amazonka-sns/gen/Network/AWS/SNS/SetEndpointAttributes.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/SetPlatformApplicationAttributes.hs b/amazonka-sns/gen/Network/AWS/SNS/SetPlatformApplicationAttributes.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/SetPlatformApplicationAttributes.hs rename to amazonka-sns/gen/Network/AWS/SNS/SetPlatformApplicationAttributes.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/SetSubscriptionAttributes.hs b/amazonka-sns/gen/Network/AWS/SNS/SetSubscriptionAttributes.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/SetSubscriptionAttributes.hs rename to amazonka-sns/gen/Network/AWS/SNS/SetSubscriptionAttributes.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/SetTopicAttributes.hs b/amazonka-sns/gen/Network/AWS/SNS/SetTopicAttributes.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/SetTopicAttributes.hs rename to amazonka-sns/gen/Network/AWS/SNS/SetTopicAttributes.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/Subscribe.hs b/amazonka-sns/gen/Network/AWS/SNS/Subscribe.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/Subscribe.hs rename to amazonka-sns/gen/Network/AWS/SNS/Subscribe.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/Types.hs b/amazonka-sns/gen/Network/AWS/SNS/Types.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/Types.hs rename to amazonka-sns/gen/Network/AWS/SNS/Types.hs diff --git a/aws/amazonka-sns/gen/Network/AWS/SNS/Unsubscribe.hs b/amazonka-sns/gen/Network/AWS/SNS/Unsubscribe.hs similarity index 100% rename from aws/amazonka-sns/gen/Network/AWS/SNS/Unsubscribe.hs rename to amazonka-sns/gen/Network/AWS/SNS/Unsubscribe.hs diff --git a/aws/amazonka-sns/LICENSE b/amazonka-sqs/LICENSE similarity index 100% rename from aws/amazonka-sns/LICENSE rename to amazonka-sqs/LICENSE diff --git a/aws/amazonka-sqs/Makefile b/amazonka-sqs/Makefile similarity index 100% rename from aws/amazonka-sqs/Makefile rename to amazonka-sqs/Makefile diff --git a/aws/amazonka-sqs/README.md b/amazonka-sqs/README.md similarity index 100% rename from aws/amazonka-sqs/README.md rename to amazonka-sqs/README.md diff --git a/aws/amazonka-sns/Setup.hs b/amazonka-sqs/Setup.hs similarity index 100% rename from aws/amazonka-sns/Setup.hs rename to amazonka-sqs/Setup.hs diff --git a/aws/amazonka-sqs/amazonka-sqs.cabal b/amazonka-sqs/amazonka-sqs.cabal similarity index 100% rename from aws/amazonka-sqs/amazonka-sqs.cabal rename to amazonka-sqs/amazonka-sqs.cabal diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS.hs b/amazonka-sqs/gen/Network/AWS/SQS.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS.hs rename to amazonka-sqs/gen/Network/AWS/SQS.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/AddPermission.hs b/amazonka-sqs/gen/Network/AWS/SQS/AddPermission.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/AddPermission.hs rename to amazonka-sqs/gen/Network/AWS/SQS/AddPermission.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/ChangeMessageVisibility.hs b/amazonka-sqs/gen/Network/AWS/SQS/ChangeMessageVisibility.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/ChangeMessageVisibility.hs rename to amazonka-sqs/gen/Network/AWS/SQS/ChangeMessageVisibility.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs b/amazonka-sqs/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs rename to amazonka-sqs/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/CreateQueue.hs b/amazonka-sqs/gen/Network/AWS/SQS/CreateQueue.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/CreateQueue.hs rename to amazonka-sqs/gen/Network/AWS/SQS/CreateQueue.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/DeleteMessage.hs b/amazonka-sqs/gen/Network/AWS/SQS/DeleteMessage.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/DeleteMessage.hs rename to amazonka-sqs/gen/Network/AWS/SQS/DeleteMessage.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/DeleteMessageBatch.hs b/amazonka-sqs/gen/Network/AWS/SQS/DeleteMessageBatch.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/DeleteMessageBatch.hs rename to amazonka-sqs/gen/Network/AWS/SQS/DeleteMessageBatch.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/DeleteQueue.hs b/amazonka-sqs/gen/Network/AWS/SQS/DeleteQueue.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/DeleteQueue.hs rename to amazonka-sqs/gen/Network/AWS/SQS/DeleteQueue.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/GetQueueAttributes.hs b/amazonka-sqs/gen/Network/AWS/SQS/GetQueueAttributes.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/GetQueueAttributes.hs rename to amazonka-sqs/gen/Network/AWS/SQS/GetQueueAttributes.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/GetQueueUrl.hs b/amazonka-sqs/gen/Network/AWS/SQS/GetQueueUrl.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/GetQueueUrl.hs rename to amazonka-sqs/gen/Network/AWS/SQS/GetQueueUrl.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs b/amazonka-sqs/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs rename to amazonka-sqs/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/ListQueues.hs b/amazonka-sqs/gen/Network/AWS/SQS/ListQueues.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/ListQueues.hs rename to amazonka-sqs/gen/Network/AWS/SQS/ListQueues.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/ReceiveMessage.hs b/amazonka-sqs/gen/Network/AWS/SQS/ReceiveMessage.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/ReceiveMessage.hs rename to amazonka-sqs/gen/Network/AWS/SQS/ReceiveMessage.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/RemovePermission.hs b/amazonka-sqs/gen/Network/AWS/SQS/RemovePermission.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/RemovePermission.hs rename to amazonka-sqs/gen/Network/AWS/SQS/RemovePermission.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/SendMessage.hs b/amazonka-sqs/gen/Network/AWS/SQS/SendMessage.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/SendMessage.hs rename to amazonka-sqs/gen/Network/AWS/SQS/SendMessage.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/SendMessageBatch.hs b/amazonka-sqs/gen/Network/AWS/SQS/SendMessageBatch.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/SendMessageBatch.hs rename to amazonka-sqs/gen/Network/AWS/SQS/SendMessageBatch.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/SetQueueAttributes.hs b/amazonka-sqs/gen/Network/AWS/SQS/SetQueueAttributes.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/SetQueueAttributes.hs rename to amazonka-sqs/gen/Network/AWS/SQS/SetQueueAttributes.hs diff --git a/aws/amazonka-sqs/gen/Network/AWS/SQS/Types.hs b/amazonka-sqs/gen/Network/AWS/SQS/Types.hs similarity index 100% rename from aws/amazonka-sqs/gen/Network/AWS/SQS/Types.hs rename to amazonka-sqs/gen/Network/AWS/SQS/Types.hs diff --git a/aws/amazonka-sqs/LICENSE b/amazonka-storagegateway/LICENSE similarity index 100% rename from aws/amazonka-sqs/LICENSE rename to amazonka-storagegateway/LICENSE diff --git a/aws/amazonka-storagegateway/Makefile b/amazonka-storagegateway/Makefile similarity index 100% rename from aws/amazonka-storagegateway/Makefile rename to amazonka-storagegateway/Makefile diff --git a/aws/amazonka-storagegateway/README.md b/amazonka-storagegateway/README.md similarity index 100% rename from aws/amazonka-storagegateway/README.md rename to amazonka-storagegateway/README.md diff --git a/aws/amazonka-sqs/Setup.hs b/amazonka-storagegateway/Setup.hs similarity index 100% rename from aws/amazonka-sqs/Setup.hs rename to amazonka-storagegateway/Setup.hs diff --git a/aws/amazonka-storagegateway/amazonka-storagegateway.cabal b/amazonka-storagegateway/amazonka-storagegateway.cabal similarity index 100% rename from aws/amazonka-storagegateway/amazonka-storagegateway.cabal rename to amazonka-storagegateway/amazonka-storagegateway.cabal diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ActivateGateway.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ActivateGateway.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ActivateGateway.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/ActivateGateway.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddCache.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddCache.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddCache.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddCache.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddUploadBuffer.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddUploadBuffer.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddUploadBuffer.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddUploadBuffer.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddWorkingStorage.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddWorkingStorage.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddWorkingStorage.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/AddWorkingStorage.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CancelArchival.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CancelArchival.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CancelArchival.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/CancelArchival.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CancelRetrieval.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CancelRetrieval.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CancelRetrieval.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/CancelRetrieval.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateCachediSCSIVolume.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateCachediSCSIVolume.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateCachediSCSIVolume.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateCachediSCSIVolume.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateSnapshot.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateSnapshot.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateSnapshot.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateSnapshot.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateSnapshotFromVolumeRecoveryPoint.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateSnapshotFromVolumeRecoveryPoint.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateSnapshotFromVolumeRecoveryPoint.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateSnapshotFromVolumeRecoveryPoint.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateStorediSCSIVolume.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateStorediSCSIVolume.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateStorediSCSIVolume.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateStorediSCSIVolume.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateTapes.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateTapes.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateTapes.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/CreateTapes.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteBandwidthRateLimit.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteBandwidthRateLimit.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteBandwidthRateLimit.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteBandwidthRateLimit.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteChapCredentials.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteChapCredentials.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteChapCredentials.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteChapCredentials.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteGateway.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteGateway.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteGateway.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteGateway.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteSnapshotSchedule.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteSnapshotSchedule.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteSnapshotSchedule.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteSnapshotSchedule.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteTape.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteTape.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteTape.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteTape.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteTapeArchive.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteTapeArchive.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteTapeArchive.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteTapeArchive.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteVolume.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteVolume.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteVolume.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DeleteVolume.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeBandwidthRateLimit.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeBandwidthRateLimit.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeBandwidthRateLimit.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeBandwidthRateLimit.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeCache.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeCache.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeCache.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeCache.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeMaintenanceStartTime.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeMaintenanceStartTime.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeMaintenanceStartTime.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeMaintenanceStartTime.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeSnapshotSchedule.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeSnapshotSchedule.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeSnapshotSchedule.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeSnapshotSchedule.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapes.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapes.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapes.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeTapes.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DisableGateway.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DisableGateway.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/DisableGateway.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/DisableGateway.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListGateways.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListGateways.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListGateways.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListGateways.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListLocalDisks.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListLocalDisks.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListLocalDisks.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListLocalDisks.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListVolumes.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListVolumes.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListVolumes.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/ListVolumes.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/RetrieveTapeArchive.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/RetrieveTapeArchive.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/RetrieveTapeArchive.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/RetrieveTapeArchive.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/RetrieveTapeRecoveryPoint.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/RetrieveTapeRecoveryPoint.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/RetrieveTapeRecoveryPoint.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/RetrieveTapeRecoveryPoint.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ShutdownGateway.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ShutdownGateway.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/ShutdownGateway.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/ShutdownGateway.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/StartGateway.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/StartGateway.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/StartGateway.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/StartGateway.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/Types.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/Types.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/Types.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/Types.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateBandwidthRateLimit.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateBandwidthRateLimit.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateBandwidthRateLimit.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateBandwidthRateLimit.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateChapCredentials.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateChapCredentials.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateChapCredentials.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateChapCredentials.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateGatewayInformation.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateGatewayInformation.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateGatewayInformation.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateGatewayInformation.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateGatewaySoftwareNow.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateGatewaySoftwareNow.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateGatewaySoftwareNow.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateGatewaySoftwareNow.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateMaintenanceStartTime.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateMaintenanceStartTime.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateMaintenanceStartTime.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateMaintenanceStartTime.hs diff --git a/aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateSnapshotSchedule.hs b/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateSnapshotSchedule.hs similarity index 100% rename from aws/amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateSnapshotSchedule.hs rename to amazonka-storagegateway/gen/Network/AWS/StorageGateway/UpdateSnapshotSchedule.hs diff --git a/aws/amazonka-storagegateway/LICENSE b/amazonka-sts/LICENSE similarity index 100% rename from aws/amazonka-storagegateway/LICENSE rename to amazonka-sts/LICENSE diff --git a/aws/amazonka-sts/Makefile b/amazonka-sts/Makefile similarity index 100% rename from aws/amazonka-sts/Makefile rename to amazonka-sts/Makefile diff --git a/aws/amazonka-sts/README.md b/amazonka-sts/README.md similarity index 100% rename from aws/amazonka-sts/README.md rename to amazonka-sts/README.md diff --git a/aws/amazonka-storagegateway/Setup.hs b/amazonka-sts/Setup.hs similarity index 100% rename from aws/amazonka-storagegateway/Setup.hs rename to amazonka-sts/Setup.hs diff --git a/aws/amazonka-sts/amazonka-sts.cabal b/amazonka-sts/amazonka-sts.cabal similarity index 100% rename from aws/amazonka-sts/amazonka-sts.cabal rename to amazonka-sts/amazonka-sts.cabal diff --git a/aws/amazonka-sts/gen/Network/AWS/STS.hs b/amazonka-sts/gen/Network/AWS/STS.hs similarity index 100% rename from aws/amazonka-sts/gen/Network/AWS/STS.hs rename to amazonka-sts/gen/Network/AWS/STS.hs diff --git a/aws/amazonka-sts/gen/Network/AWS/STS/AssumeRole.hs b/amazonka-sts/gen/Network/AWS/STS/AssumeRole.hs similarity index 100% rename from aws/amazonka-sts/gen/Network/AWS/STS/AssumeRole.hs rename to amazonka-sts/gen/Network/AWS/STS/AssumeRole.hs diff --git a/aws/amazonka-sts/gen/Network/AWS/STS/AssumeRoleWithSAML.hs b/amazonka-sts/gen/Network/AWS/STS/AssumeRoleWithSAML.hs similarity index 100% rename from aws/amazonka-sts/gen/Network/AWS/STS/AssumeRoleWithSAML.hs rename to amazonka-sts/gen/Network/AWS/STS/AssumeRoleWithSAML.hs diff --git a/aws/amazonka-sts/gen/Network/AWS/STS/AssumeRoleWithWebIdentity.hs b/amazonka-sts/gen/Network/AWS/STS/AssumeRoleWithWebIdentity.hs similarity index 100% rename from aws/amazonka-sts/gen/Network/AWS/STS/AssumeRoleWithWebIdentity.hs rename to amazonka-sts/gen/Network/AWS/STS/AssumeRoleWithWebIdentity.hs diff --git a/aws/amazonka-sts/gen/Network/AWS/STS/DecodeAuthorizationMessage.hs b/amazonka-sts/gen/Network/AWS/STS/DecodeAuthorizationMessage.hs similarity index 100% rename from aws/amazonka-sts/gen/Network/AWS/STS/DecodeAuthorizationMessage.hs rename to amazonka-sts/gen/Network/AWS/STS/DecodeAuthorizationMessage.hs diff --git a/aws/amazonka-sts/gen/Network/AWS/STS/GetFederationToken.hs b/amazonka-sts/gen/Network/AWS/STS/GetFederationToken.hs similarity index 100% rename from aws/amazonka-sts/gen/Network/AWS/STS/GetFederationToken.hs rename to amazonka-sts/gen/Network/AWS/STS/GetFederationToken.hs diff --git a/aws/amazonka-sts/gen/Network/AWS/STS/GetSessionToken.hs b/amazonka-sts/gen/Network/AWS/STS/GetSessionToken.hs similarity index 100% rename from aws/amazonka-sts/gen/Network/AWS/STS/GetSessionToken.hs rename to amazonka-sts/gen/Network/AWS/STS/GetSessionToken.hs diff --git a/aws/amazonka-sts/gen/Network/AWS/STS/Types.hs b/amazonka-sts/gen/Network/AWS/STS/Types.hs similarity index 100% rename from aws/amazonka-sts/gen/Network/AWS/STS/Types.hs rename to amazonka-sts/gen/Network/AWS/STS/Types.hs diff --git a/aws/amazonka-sts/LICENSE b/amazonka-support/LICENSE similarity index 100% rename from aws/amazonka-sts/LICENSE rename to amazonka-support/LICENSE diff --git a/aws/amazonka-support/Makefile b/amazonka-support/Makefile similarity index 100% rename from aws/amazonka-support/Makefile rename to amazonka-support/Makefile diff --git a/aws/amazonka-support/README.md b/amazonka-support/README.md similarity index 100% rename from aws/amazonka-support/README.md rename to amazonka-support/README.md diff --git a/aws/amazonka-sts/Setup.hs b/amazonka-support/Setup.hs similarity index 100% rename from aws/amazonka-sts/Setup.hs rename to amazonka-support/Setup.hs diff --git a/aws/amazonka-support/amazonka-support.cabal b/amazonka-support/amazonka-support.cabal similarity index 100% rename from aws/amazonka-support/amazonka-support.cabal rename to amazonka-support/amazonka-support.cabal diff --git a/aws/amazonka-support/gen/Network/AWS/Support.hs b/amazonka-support/gen/Network/AWS/Support.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support.hs rename to amazonka-support/gen/Network/AWS/Support.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/AddAttachmentsToSet.hs b/amazonka-support/gen/Network/AWS/Support/AddAttachmentsToSet.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/AddAttachmentsToSet.hs rename to amazonka-support/gen/Network/AWS/Support/AddAttachmentsToSet.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/AddCommunicationToCase.hs b/amazonka-support/gen/Network/AWS/Support/AddCommunicationToCase.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/AddCommunicationToCase.hs rename to amazonka-support/gen/Network/AWS/Support/AddCommunicationToCase.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/CreateCase.hs b/amazonka-support/gen/Network/AWS/Support/CreateCase.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/CreateCase.hs rename to amazonka-support/gen/Network/AWS/Support/CreateCase.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/DescribeAttachment.hs b/amazonka-support/gen/Network/AWS/Support/DescribeAttachment.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/DescribeAttachment.hs rename to amazonka-support/gen/Network/AWS/Support/DescribeAttachment.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/DescribeCases.hs b/amazonka-support/gen/Network/AWS/Support/DescribeCases.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/DescribeCases.hs rename to amazonka-support/gen/Network/AWS/Support/DescribeCases.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/DescribeCommunications.hs b/amazonka-support/gen/Network/AWS/Support/DescribeCommunications.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/DescribeCommunications.hs rename to amazonka-support/gen/Network/AWS/Support/DescribeCommunications.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/DescribeServices.hs b/amazonka-support/gen/Network/AWS/Support/DescribeServices.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/DescribeServices.hs rename to amazonka-support/gen/Network/AWS/Support/DescribeServices.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/DescribeSeverityLevels.hs b/amazonka-support/gen/Network/AWS/Support/DescribeSeverityLevels.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/DescribeSeverityLevels.hs rename to amazonka-support/gen/Network/AWS/Support/DescribeSeverityLevels.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckRefreshStatuses.hs b/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckRefreshStatuses.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckRefreshStatuses.hs rename to amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckRefreshStatuses.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckResult.hs b/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckResult.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckResult.hs rename to amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckResult.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckSummaries.hs b/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckSummaries.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckSummaries.hs rename to amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorCheckSummaries.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorChecks.hs b/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorChecks.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorChecks.hs rename to amazonka-support/gen/Network/AWS/Support/DescribeTrustedAdvisorChecks.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/RefreshTrustedAdvisorCheck.hs b/amazonka-support/gen/Network/AWS/Support/RefreshTrustedAdvisorCheck.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/RefreshTrustedAdvisorCheck.hs rename to amazonka-support/gen/Network/AWS/Support/RefreshTrustedAdvisorCheck.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/ResolveCase.hs b/amazonka-support/gen/Network/AWS/Support/ResolveCase.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/ResolveCase.hs rename to amazonka-support/gen/Network/AWS/Support/ResolveCase.hs diff --git a/aws/amazonka-support/gen/Network/AWS/Support/Types.hs b/amazonka-support/gen/Network/AWS/Support/Types.hs similarity index 100% rename from aws/amazonka-support/gen/Network/AWS/Support/Types.hs rename to amazonka-support/gen/Network/AWS/Support/Types.hs diff --git a/aws/amazonka-support/LICENSE b/amazonka-swf/LICENSE similarity index 100% rename from aws/amazonka-support/LICENSE rename to amazonka-swf/LICENSE diff --git a/aws/amazonka-swf/Makefile b/amazonka-swf/Makefile similarity index 100% rename from aws/amazonka-swf/Makefile rename to amazonka-swf/Makefile diff --git a/aws/amazonka-swf/README.md b/amazonka-swf/README.md similarity index 100% rename from aws/amazonka-swf/README.md rename to amazonka-swf/README.md diff --git a/aws/amazonka-support/Setup.hs b/amazonka-swf/Setup.hs similarity index 100% rename from aws/amazonka-support/Setup.hs rename to amazonka-swf/Setup.hs diff --git a/aws/amazonka-swf/amazonka-swf.cabal b/amazonka-swf/amazonka-swf.cabal similarity index 100% rename from aws/amazonka-swf/amazonka-swf.cabal rename to amazonka-swf/amazonka-swf.cabal diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF.hs b/amazonka-swf/gen/Network/AWS/SWF.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF.hs rename to amazonka-swf/gen/Network/AWS/SWF.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs b/amazonka-swf/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs rename to amazonka-swf/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/CountOpenWorkflowExecutions.hs b/amazonka-swf/gen/Network/AWS/SWF/CountOpenWorkflowExecutions.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/CountOpenWorkflowExecutions.hs rename to amazonka-swf/gen/Network/AWS/SWF/CountOpenWorkflowExecutions.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/CountPendingActivityTasks.hs b/amazonka-swf/gen/Network/AWS/SWF/CountPendingActivityTasks.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/CountPendingActivityTasks.hs rename to amazonka-swf/gen/Network/AWS/SWF/CountPendingActivityTasks.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/CountPendingDecisionTasks.hs b/amazonka-swf/gen/Network/AWS/SWF/CountPendingDecisionTasks.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/CountPendingDecisionTasks.hs rename to amazonka-swf/gen/Network/AWS/SWF/CountPendingDecisionTasks.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/DeprecateActivityType.hs b/amazonka-swf/gen/Network/AWS/SWF/DeprecateActivityType.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/DeprecateActivityType.hs rename to amazonka-swf/gen/Network/AWS/SWF/DeprecateActivityType.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/DeprecateDomain.hs b/amazonka-swf/gen/Network/AWS/SWF/DeprecateDomain.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/DeprecateDomain.hs rename to amazonka-swf/gen/Network/AWS/SWF/DeprecateDomain.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/DeprecateWorkflowType.hs b/amazonka-swf/gen/Network/AWS/SWF/DeprecateWorkflowType.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/DeprecateWorkflowType.hs rename to amazonka-swf/gen/Network/AWS/SWF/DeprecateWorkflowType.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/DescribeActivityType.hs b/amazonka-swf/gen/Network/AWS/SWF/DescribeActivityType.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/DescribeActivityType.hs rename to amazonka-swf/gen/Network/AWS/SWF/DescribeActivityType.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/DescribeDomain.hs b/amazonka-swf/gen/Network/AWS/SWF/DescribeDomain.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/DescribeDomain.hs rename to amazonka-swf/gen/Network/AWS/SWF/DescribeDomain.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs b/amazonka-swf/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs rename to amazonka-swf/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/DescribeWorkflowType.hs b/amazonka-swf/gen/Network/AWS/SWF/DescribeWorkflowType.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/DescribeWorkflowType.hs rename to amazonka-swf/gen/Network/AWS/SWF/DescribeWorkflowType.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs b/amazonka-swf/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs rename to amazonka-swf/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/ListActivityTypes.hs b/amazonka-swf/gen/Network/AWS/SWF/ListActivityTypes.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/ListActivityTypes.hs rename to amazonka-swf/gen/Network/AWS/SWF/ListActivityTypes.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs b/amazonka-swf/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs rename to amazonka-swf/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/ListDomains.hs b/amazonka-swf/gen/Network/AWS/SWF/ListDomains.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/ListDomains.hs rename to amazonka-swf/gen/Network/AWS/SWF/ListDomains.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/ListOpenWorkflowExecutions.hs b/amazonka-swf/gen/Network/AWS/SWF/ListOpenWorkflowExecutions.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/ListOpenWorkflowExecutions.hs rename to amazonka-swf/gen/Network/AWS/SWF/ListOpenWorkflowExecutions.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/ListWorkflowTypes.hs b/amazonka-swf/gen/Network/AWS/SWF/ListWorkflowTypes.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/ListWorkflowTypes.hs rename to amazonka-swf/gen/Network/AWS/SWF/ListWorkflowTypes.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/PollForActivityTask.hs b/amazonka-swf/gen/Network/AWS/SWF/PollForActivityTask.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/PollForActivityTask.hs rename to amazonka-swf/gen/Network/AWS/SWF/PollForActivityTask.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/PollForDecisionTask.hs b/amazonka-swf/gen/Network/AWS/SWF/PollForDecisionTask.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/PollForDecisionTask.hs rename to amazonka-swf/gen/Network/AWS/SWF/PollForDecisionTask.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs b/amazonka-swf/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs rename to amazonka-swf/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/RegisterActivityType.hs b/amazonka-swf/gen/Network/AWS/SWF/RegisterActivityType.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/RegisterActivityType.hs rename to amazonka-swf/gen/Network/AWS/SWF/RegisterActivityType.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/RegisterDomain.hs b/amazonka-swf/gen/Network/AWS/SWF/RegisterDomain.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/RegisterDomain.hs rename to amazonka-swf/gen/Network/AWS/SWF/RegisterDomain.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/RegisterWorkflowType.hs b/amazonka-swf/gen/Network/AWS/SWF/RegisterWorkflowType.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/RegisterWorkflowType.hs rename to amazonka-swf/gen/Network/AWS/SWF/RegisterWorkflowType.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/RequestCancelWorkflowExecution.hs b/amazonka-swf/gen/Network/AWS/SWF/RequestCancelWorkflowExecution.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/RequestCancelWorkflowExecution.hs rename to amazonka-swf/gen/Network/AWS/SWF/RequestCancelWorkflowExecution.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskCanceled.hs b/amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskCanceled.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskCanceled.hs rename to amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskCanceled.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskCompleted.hs b/amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskCompleted.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskCompleted.hs rename to amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskCompleted.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskFailed.hs b/amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskFailed.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskFailed.hs rename to amazonka-swf/gen/Network/AWS/SWF/RespondActivityTaskFailed.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/RespondDecisionTaskCompleted.hs b/amazonka-swf/gen/Network/AWS/SWF/RespondDecisionTaskCompleted.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/RespondDecisionTaskCompleted.hs rename to amazonka-swf/gen/Network/AWS/SWF/RespondDecisionTaskCompleted.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/SignalWorkflowExecution.hs b/amazonka-swf/gen/Network/AWS/SWF/SignalWorkflowExecution.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/SignalWorkflowExecution.hs rename to amazonka-swf/gen/Network/AWS/SWF/SignalWorkflowExecution.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/StartWorkflowExecution.hs b/amazonka-swf/gen/Network/AWS/SWF/StartWorkflowExecution.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/StartWorkflowExecution.hs rename to amazonka-swf/gen/Network/AWS/SWF/StartWorkflowExecution.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs b/amazonka-swf/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs rename to amazonka-swf/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs diff --git a/aws/amazonka-swf/gen/Network/AWS/SWF/Types.hs b/amazonka-swf/gen/Network/AWS/SWF/Types.hs similarity index 100% rename from aws/amazonka-swf/gen/Network/AWS/SWF/Types.hs rename to amazonka-swf/gen/Network/AWS/SWF/Types.hs diff --git a/amazonka.cabal b/amazonka.cabal deleted file mode 100644 index 48790ca10a8..00000000000 --- a/amazonka.cabal +++ /dev/null @@ -1,122 +0,0 @@ -name: amazonka -version: 0.5.0 -synopsis: Interfaces to various Amazon Web Service APIs -homepage: http://github.com/brendanhay/amazonka -license: OtherLicense -license-file: LICENSE -author: Brendan Hay -copyright: Copyright (c) 2013-2014 Brendan Hay -maintainer: Brendan Hay -stability: Experimental -category: AWS, Cloud, Network -build-type: Simple -cabal-version: >= 1.10 - -description: - Pending - -extra-source-files: - README.md - -source-repository head - type: git - location: git://github.com/brendanhay/amazonka.git - -library - default-language: Haskell2010 - hs-source-dirs: src - ghc-options: -Wall -O2 - - exposed-modules: - Network.AWS - , Network.AWS.Auth - , Network.AWS.Internal - , Network.AWS.Headers - - , Network.AWS.AutoScaling - , Network.AWS.CloudWatch - , Network.AWS.EC2 - , Network.AWS.EC2.Metadata - , Network.AWS.ELB - , Network.AWS.IAM - , Network.AWS.Route53 - , Network.AWS.S3 - - other-modules: - Network.AWS.Internal.Instances - , Network.AWS.Internal.Request - , Network.AWS.Internal.Signing - , Network.AWS.Internal.String - , Network.AWS.Internal.Time - , Network.AWS.Internal.Types - , Network.AWS.Internal.XML - - , Network.AWS.AutoScaling.Types - , Network.AWS.CloudWatch.Types - , Network.AWS.EC2.Types - , Network.AWS.ELB.Types - , Network.AWS.IAM.Types - , Network.AWS.Route53.Types - , Network.AWS.S3.Types - - , Text.XML.Expat.Pickle.Generic - - build-depends: - aeson >= 0.7 - , async - , base >= 4.6 && < 5 - , base16-bytestring - , base64-bytestring - , bytestring - , case-insensitive - , conduit >= 1.1 - , conduit-extra - , containers - , cryptohash - , data-default - , deepseq - , either == 4.3.* - , errors >= 1.4.4 - , exceptions == 0.6.* - , hexpat >= 0.20 - , http-conduit - , http-types - , lifted-base - , mtl - , old-locale - , querystring-pickle >= 0.1.7 - , resourcet >= 1.1.2 - , text >= 1.0 - , time - , transformers - , transformers-base - , unordered-containers - --- test-suite amazonka-tests --- default-language: Haskell2010 --- type: exitcode-stdio-1.0 --- hs-source-dirs: test --- main-is: Main.hs --- ghc-options: -Wall -threaded - --- build-depends: --- aeson >= 0.6.2.1 --- , amazonka --- , base >= 4.6 && < 5 --- , bytestring --- , containers --- , derive --- , directory --- , ede --- , http-types --- , http-common --- , natural-sort --- , old-locale --- , querystring-pickle >= 0.1.7 --- , tasty --- , tasty-quickcheck --- , template-haskell --- , text --- , time --- , transformers --- , vector diff --git a/aws/amazonka-swf/LICENSE b/amazonka/LICENSE similarity index 100% rename from aws/amazonka-swf/LICENSE rename to amazonka/LICENSE diff --git a/aws/amazonka/Makefile b/amazonka/Makefile similarity index 100% rename from aws/amazonka/Makefile rename to amazonka/Makefile diff --git a/aws/amazonka/README.md b/amazonka/README.md similarity index 100% rename from aws/amazonka/README.md rename to amazonka/README.md diff --git a/aws/amazonka-swf/Setup.hs b/amazonka/Setup.hs similarity index 100% rename from aws/amazonka-swf/Setup.hs rename to amazonka/Setup.hs diff --git a/aws/amazonka/amazonka.cabal b/amazonka/amazonka.cabal similarity index 100% rename from aws/amazonka/amazonka.cabal rename to amazonka/amazonka.cabal diff --git a/aws/amazonka/src/Control/Monad/Trans/AWS.hs b/amazonka/src/Control/Monad/Trans/AWS.hs similarity index 100% rename from aws/amazonka/src/Control/Monad/Trans/AWS.hs rename to amazonka/src/Control/Monad/Trans/AWS.hs diff --git a/aws/amazonka/src/Network/AWS.hs b/amazonka/src/Network/AWS.hs similarity index 100% rename from aws/amazonka/src/Network/AWS.hs rename to amazonka/src/Network/AWS.hs diff --git a/aws/Makefile b/aws/Makefile deleted file mode 100644 index abd2062e322..00000000000 --- a/aws/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -DEPS := $(wildcard amazonka-*) - -.PHONY: install clean - -build: $(addprefix build-,$(DEPS)) build-amazonka - -build-%: - make -C $* build - -install: cabal.sandbox.config $(addprefix install-,$(DEPS)) install-amazonka - -install-%: - make -C $* install - -clean: $(addprefix clean-,$(DEPS)) clean-amazonka -# rm -rf .cabal-sandbox cabal.sandbox.config - -clean-%: - make -C $* clean - -cabal.sandbox.config: - cabal sandbox init diff --git a/aws/README.md b/aws/README.md deleted file mode 100644 index 919b47203d1..00000000000 --- a/aws/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# Amazonka - -* [Description](#description) -* [Contribute](#contribute) -* [Licence](#licence) - -## Description - -A comprehensive Amazon Web Services SDK for Haskell. - - -## Contribute - -For any problems, comments, or feedback please create an issue [here on GitHub](https://github.com/brendanhay/amazonka/issues). - - -## Licence - -Amazonka is released under the [Mozilla Public License Version 2.0](http://www.mozilla.org/MPL/). diff --git a/aws/gen/assets/LICENSE b/aws/gen/assets/LICENSE deleted file mode 100644 index a612ad9813b..00000000000 --- a/aws/gen/assets/LICENSE +++ /dev/null @@ -1,373 +0,0 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/aws/gen/assets/Setup.hs b/aws/gen/assets/Setup.hs deleted file mode 100644 index 9a994af677b..00000000000 --- a/aws/gen/assets/Setup.hs +++ /dev/null @@ -1,2 +0,0 @@ -import Distribution.Simple -main = defaultMain diff --git a/aws/script/generate-pages b/aws/script/generate-pages deleted file mode 100755 index 417f30f46b2..00000000000 --- a/aws/script/generate-pages +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set -e - -doc=$HOME/Projects/aws-doc -libs=$HOME/Projects/aws/amazonka-* - -standalone-haddock \ - -o $doc \ - --package-db $HOME/Projects/aws/.cabal-sandbox/x86_64-osx-ghc-7.8.3-packages.conf.d \ - amazonka core $libs - -cd $doc - -git checkout gh-pages || true -git add . -git commit -am "Updating" -git push origin gh-pages diff --git a/aws/amazonka/LICENSE b/core/LICENSE similarity index 100% rename from aws/amazonka/LICENSE rename to core/LICENSE diff --git a/aws/core/Makefile b/core/Makefile similarity index 100% rename from aws/core/Makefile rename to core/Makefile diff --git a/aws/core/README.md b/core/README.md similarity index 100% rename from aws/core/README.md rename to core/README.md diff --git a/aws/amazonka/Setup.hs b/core/Setup.hs similarity index 100% rename from aws/amazonka/Setup.hs rename to core/Setup.hs diff --git a/aws/core/amazonka-core.cabal b/core/amazonka-core.cabal similarity index 100% rename from aws/core/amazonka-core.cabal rename to core/amazonka-core.cabal diff --git a/aws/core/src/Network/AWS/Auth.hs b/core/src/Network/AWS/Auth.hs similarity index 100% rename from aws/core/src/Network/AWS/Auth.hs rename to core/src/Network/AWS/Auth.hs diff --git a/aws/core/src/Network/AWS/Data.hs b/core/src/Network/AWS/Data.hs similarity index 100% rename from aws/core/src/Network/AWS/Data.hs rename to core/src/Network/AWS/Data.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Base64.hs b/core/src/Network/AWS/Data/Internal/Base64.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Base64.hs rename to core/src/Network/AWS/Data/Internal/Base64.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Body.hs b/core/src/Network/AWS/Data/Internal/Body.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Body.hs rename to core/src/Network/AWS/Data/Internal/Body.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/ByteString.hs b/core/src/Network/AWS/Data/Internal/ByteString.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/ByteString.hs rename to core/src/Network/AWS/Data/Internal/ByteString.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Header.hs b/core/src/Network/AWS/Data/Internal/Header.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Header.hs rename to core/src/Network/AWS/Data/Internal/Header.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/JSON.hs b/core/src/Network/AWS/Data/Internal/JSON.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/JSON.hs rename to core/src/Network/AWS/Data/Internal/JSON.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/List.hs b/core/src/Network/AWS/Data/Internal/List.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/List.hs rename to core/src/Network/AWS/Data/Internal/List.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Map.hs b/core/src/Network/AWS/Data/Internal/Map.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Map.hs rename to core/src/Network/AWS/Data/Internal/Map.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Numeric.hs b/core/src/Network/AWS/Data/Internal/Numeric.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Numeric.hs rename to core/src/Network/AWS/Data/Internal/Numeric.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Path.hs b/core/src/Network/AWS/Data/Internal/Path.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Path.hs rename to core/src/Network/AWS/Data/Internal/Path.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Query.hs b/core/src/Network/AWS/Data/Internal/Query.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Query.hs rename to core/src/Network/AWS/Data/Internal/Query.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Sensitive.hs b/core/src/Network/AWS/Data/Internal/Sensitive.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Sensitive.hs rename to core/src/Network/AWS/Data/Internal/Sensitive.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Text.hs b/core/src/Network/AWS/Data/Internal/Text.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Text.hs rename to core/src/Network/AWS/Data/Internal/Text.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/Time.hs b/core/src/Network/AWS/Data/Internal/Time.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/Time.hs rename to core/src/Network/AWS/Data/Internal/Time.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/URI.hs b/core/src/Network/AWS/Data/Internal/URI.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/URI.hs rename to core/src/Network/AWS/Data/Internal/URI.hs diff --git a/aws/core/src/Network/AWS/Data/Internal/XML.hs b/core/src/Network/AWS/Data/Internal/XML.hs similarity index 100% rename from aws/core/src/Network/AWS/Data/Internal/XML.hs rename to core/src/Network/AWS/Data/Internal/XML.hs diff --git a/aws/core/src/Network/AWS/EC2/Metadata.hs b/core/src/Network/AWS/EC2/Metadata.hs similarity index 100% rename from aws/core/src/Network/AWS/EC2/Metadata.hs rename to core/src/Network/AWS/EC2/Metadata.hs diff --git a/aws/core/src/Network/AWS/Error.hs b/core/src/Network/AWS/Error.hs similarity index 100% rename from aws/core/src/Network/AWS/Error.hs rename to core/src/Network/AWS/Error.hs diff --git a/aws/core/src/Network/AWS/Pagination.hs b/core/src/Network/AWS/Pagination.hs similarity index 100% rename from aws/core/src/Network/AWS/Pagination.hs rename to core/src/Network/AWS/Pagination.hs diff --git a/aws/core/src/Network/AWS/Prelude.hs b/core/src/Network/AWS/Prelude.hs similarity index 100% rename from aws/core/src/Network/AWS/Prelude.hs rename to core/src/Network/AWS/Prelude.hs diff --git a/aws/core/src/Network/AWS/Request/Internal.hs b/core/src/Network/AWS/Request/Internal.hs similarity index 100% rename from aws/core/src/Network/AWS/Request/Internal.hs rename to core/src/Network/AWS/Request/Internal.hs diff --git a/aws/core/src/Network/AWS/Request/JSON.hs b/core/src/Network/AWS/Request/JSON.hs similarity index 100% rename from aws/core/src/Network/AWS/Request/JSON.hs rename to core/src/Network/AWS/Request/JSON.hs diff --git a/aws/core/src/Network/AWS/Request/Query.hs b/core/src/Network/AWS/Request/Query.hs similarity index 100% rename from aws/core/src/Network/AWS/Request/Query.hs rename to core/src/Network/AWS/Request/Query.hs diff --git a/aws/core/src/Network/AWS/Request/RestJSON.hs b/core/src/Network/AWS/Request/RestJSON.hs similarity index 100% rename from aws/core/src/Network/AWS/Request/RestJSON.hs rename to core/src/Network/AWS/Request/RestJSON.hs diff --git a/aws/core/src/Network/AWS/Request/RestXML.hs b/core/src/Network/AWS/Request/RestXML.hs similarity index 100% rename from aws/core/src/Network/AWS/Request/RestXML.hs rename to core/src/Network/AWS/Request/RestXML.hs diff --git a/aws/core/src/Network/AWS/Response.hs b/core/src/Network/AWS/Response.hs similarity index 100% rename from aws/core/src/Network/AWS/Response.hs rename to core/src/Network/AWS/Response.hs diff --git a/aws/core/src/Network/AWS/Signing/Internal.hs b/core/src/Network/AWS/Signing/Internal.hs similarity index 100% rename from aws/core/src/Network/AWS/Signing/Internal.hs rename to core/src/Network/AWS/Signing/Internal.hs diff --git a/aws/core/src/Network/AWS/Signing/V2.hs b/core/src/Network/AWS/Signing/V2.hs similarity index 100% rename from aws/core/src/Network/AWS/Signing/V2.hs rename to core/src/Network/AWS/Signing/V2.hs diff --git a/aws/core/src/Network/AWS/Signing/V3.hs b/core/src/Network/AWS/Signing/V3.hs similarity index 100% rename from aws/core/src/Network/AWS/Signing/V3.hs rename to core/src/Network/AWS/Signing/V3.hs diff --git a/aws/core/src/Network/AWS/Signing/V4.hs b/core/src/Network/AWS/Signing/V4.hs similarity index 100% rename from aws/core/src/Network/AWS/Signing/V4.hs rename to core/src/Network/AWS/Signing/V4.hs diff --git a/aws/core/src/Network/AWS/Types.hs b/core/src/Network/AWS/Types.hs similarity index 100% rename from aws/core/src/Network/AWS/Types.hs rename to core/src/Network/AWS/Types.hs diff --git a/aws/core/test/Main.hs b/core/test/Main.hs similarity index 100% rename from aws/core/test/Main.hs rename to core/test/Main.hs diff --git a/aws/core/test/Test/AWS/Signing.hs b/core/test/Test/AWS/Signing.hs similarity index 100% rename from aws/core/test/Test/AWS/Signing.hs rename to core/test/Test/AWS/Signing.hs diff --git a/aws/core/test/resources/v4/get-header-key-duplicate.authz b/core/test/resources/v4/get-header-key-duplicate.authz similarity index 100% rename from aws/core/test/resources/v4/get-header-key-duplicate.authz rename to core/test/resources/v4/get-header-key-duplicate.authz diff --git a/aws/core/test/resources/v4/get-header-key-duplicate.creq b/core/test/resources/v4/get-header-key-duplicate.creq similarity index 100% rename from aws/core/test/resources/v4/get-header-key-duplicate.creq rename to core/test/resources/v4/get-header-key-duplicate.creq diff --git a/aws/core/test/resources/v4/get-header-key-duplicate.req b/core/test/resources/v4/get-header-key-duplicate.req similarity index 100% rename from aws/core/test/resources/v4/get-header-key-duplicate.req rename to core/test/resources/v4/get-header-key-duplicate.req diff --git a/aws/core/test/resources/v4/get-header-key-duplicate.sreq b/core/test/resources/v4/get-header-key-duplicate.sreq similarity index 100% rename from aws/core/test/resources/v4/get-header-key-duplicate.sreq rename to core/test/resources/v4/get-header-key-duplicate.sreq diff --git a/aws/core/test/resources/v4/get-header-key-duplicate.sts b/core/test/resources/v4/get-header-key-duplicate.sts similarity index 100% rename from aws/core/test/resources/v4/get-header-key-duplicate.sts rename to core/test/resources/v4/get-header-key-duplicate.sts diff --git a/aws/core/test/resources/v4/get-header-value-order.authz b/core/test/resources/v4/get-header-value-order.authz similarity index 100% rename from aws/core/test/resources/v4/get-header-value-order.authz rename to core/test/resources/v4/get-header-value-order.authz diff --git a/aws/core/test/resources/v4/get-header-value-order.creq b/core/test/resources/v4/get-header-value-order.creq similarity index 100% rename from aws/core/test/resources/v4/get-header-value-order.creq rename to core/test/resources/v4/get-header-value-order.creq diff --git a/aws/core/test/resources/v4/get-header-value-order.req b/core/test/resources/v4/get-header-value-order.req similarity index 100% rename from aws/core/test/resources/v4/get-header-value-order.req rename to core/test/resources/v4/get-header-value-order.req diff --git a/aws/core/test/resources/v4/get-header-value-order.sreq b/core/test/resources/v4/get-header-value-order.sreq similarity index 100% rename from aws/core/test/resources/v4/get-header-value-order.sreq rename to core/test/resources/v4/get-header-value-order.sreq diff --git a/aws/core/test/resources/v4/get-header-value-order.sts b/core/test/resources/v4/get-header-value-order.sts similarity index 100% rename from aws/core/test/resources/v4/get-header-value-order.sts rename to core/test/resources/v4/get-header-value-order.sts diff --git a/aws/core/test/resources/v4/get-header-value-trim.authz b/core/test/resources/v4/get-header-value-trim.authz similarity index 100% rename from aws/core/test/resources/v4/get-header-value-trim.authz rename to core/test/resources/v4/get-header-value-trim.authz diff --git a/aws/core/test/resources/v4/get-header-value-trim.creq b/core/test/resources/v4/get-header-value-trim.creq similarity index 100% rename from aws/core/test/resources/v4/get-header-value-trim.creq rename to core/test/resources/v4/get-header-value-trim.creq diff --git a/aws/core/test/resources/v4/get-header-value-trim.req b/core/test/resources/v4/get-header-value-trim.req similarity index 100% rename from aws/core/test/resources/v4/get-header-value-trim.req rename to core/test/resources/v4/get-header-value-trim.req diff --git a/aws/core/test/resources/v4/get-header-value-trim.sreq b/core/test/resources/v4/get-header-value-trim.sreq similarity index 100% rename from aws/core/test/resources/v4/get-header-value-trim.sreq rename to core/test/resources/v4/get-header-value-trim.sreq diff --git a/aws/core/test/resources/v4/get-header-value-trim.sts b/core/test/resources/v4/get-header-value-trim.sts similarity index 100% rename from aws/core/test/resources/v4/get-header-value-trim.sts rename to core/test/resources/v4/get-header-value-trim.sts diff --git a/aws/core/test/resources/v4/get-relative-relative.authz b/core/test/resources/v4/get-relative-relative.authz similarity index 100% rename from aws/core/test/resources/v4/get-relative-relative.authz rename to core/test/resources/v4/get-relative-relative.authz diff --git a/aws/core/test/resources/v4/get-relative-relative.creq b/core/test/resources/v4/get-relative-relative.creq similarity index 100% rename from aws/core/test/resources/v4/get-relative-relative.creq rename to core/test/resources/v4/get-relative-relative.creq diff --git a/aws/core/test/resources/v4/get-relative-relative.req b/core/test/resources/v4/get-relative-relative.req similarity index 100% rename from aws/core/test/resources/v4/get-relative-relative.req rename to core/test/resources/v4/get-relative-relative.req diff --git a/aws/core/test/resources/v4/get-relative-relative.sreq b/core/test/resources/v4/get-relative-relative.sreq similarity index 100% rename from aws/core/test/resources/v4/get-relative-relative.sreq rename to core/test/resources/v4/get-relative-relative.sreq diff --git a/aws/core/test/resources/v4/get-relative-relative.sts b/core/test/resources/v4/get-relative-relative.sts similarity index 100% rename from aws/core/test/resources/v4/get-relative-relative.sts rename to core/test/resources/v4/get-relative-relative.sts diff --git a/aws/core/test/resources/v4/get-relative.authz b/core/test/resources/v4/get-relative.authz similarity index 100% rename from aws/core/test/resources/v4/get-relative.authz rename to core/test/resources/v4/get-relative.authz diff --git a/aws/core/test/resources/v4/get-relative.creq b/core/test/resources/v4/get-relative.creq similarity index 100% rename from aws/core/test/resources/v4/get-relative.creq rename to core/test/resources/v4/get-relative.creq diff --git a/aws/core/test/resources/v4/get-relative.req b/core/test/resources/v4/get-relative.req similarity index 100% rename from aws/core/test/resources/v4/get-relative.req rename to core/test/resources/v4/get-relative.req diff --git a/aws/core/test/resources/v4/get-relative.sreq b/core/test/resources/v4/get-relative.sreq similarity index 100% rename from aws/core/test/resources/v4/get-relative.sreq rename to core/test/resources/v4/get-relative.sreq diff --git a/aws/core/test/resources/v4/get-relative.sts b/core/test/resources/v4/get-relative.sts similarity index 100% rename from aws/core/test/resources/v4/get-relative.sts rename to core/test/resources/v4/get-relative.sts diff --git a/aws/core/test/resources/v4/get-slash-dot-slash.authz b/core/test/resources/v4/get-slash-dot-slash.authz similarity index 100% rename from aws/core/test/resources/v4/get-slash-dot-slash.authz rename to core/test/resources/v4/get-slash-dot-slash.authz diff --git a/aws/core/test/resources/v4/get-slash-dot-slash.creq b/core/test/resources/v4/get-slash-dot-slash.creq similarity index 100% rename from aws/core/test/resources/v4/get-slash-dot-slash.creq rename to core/test/resources/v4/get-slash-dot-slash.creq diff --git a/aws/core/test/resources/v4/get-slash-dot-slash.req b/core/test/resources/v4/get-slash-dot-slash.req similarity index 100% rename from aws/core/test/resources/v4/get-slash-dot-slash.req rename to core/test/resources/v4/get-slash-dot-slash.req diff --git a/aws/core/test/resources/v4/get-slash-dot-slash.sreq b/core/test/resources/v4/get-slash-dot-slash.sreq similarity index 100% rename from aws/core/test/resources/v4/get-slash-dot-slash.sreq rename to core/test/resources/v4/get-slash-dot-slash.sreq diff --git a/aws/core/test/resources/v4/get-slash-dot-slash.sts b/core/test/resources/v4/get-slash-dot-slash.sts similarity index 100% rename from aws/core/test/resources/v4/get-slash-dot-slash.sts rename to core/test/resources/v4/get-slash-dot-slash.sts diff --git a/aws/core/test/resources/v4/get-slash-pointless-dot.authz b/core/test/resources/v4/get-slash-pointless-dot.authz similarity index 100% rename from aws/core/test/resources/v4/get-slash-pointless-dot.authz rename to core/test/resources/v4/get-slash-pointless-dot.authz diff --git a/aws/core/test/resources/v4/get-slash-pointless-dot.creq b/core/test/resources/v4/get-slash-pointless-dot.creq similarity index 100% rename from aws/core/test/resources/v4/get-slash-pointless-dot.creq rename to core/test/resources/v4/get-slash-pointless-dot.creq diff --git a/aws/core/test/resources/v4/get-slash-pointless-dot.req b/core/test/resources/v4/get-slash-pointless-dot.req similarity index 100% rename from aws/core/test/resources/v4/get-slash-pointless-dot.req rename to core/test/resources/v4/get-slash-pointless-dot.req diff --git a/aws/core/test/resources/v4/get-slash-pointless-dot.sreq b/core/test/resources/v4/get-slash-pointless-dot.sreq similarity index 100% rename from aws/core/test/resources/v4/get-slash-pointless-dot.sreq rename to core/test/resources/v4/get-slash-pointless-dot.sreq diff --git a/aws/core/test/resources/v4/get-slash-pointless-dot.sts b/core/test/resources/v4/get-slash-pointless-dot.sts similarity index 100% rename from aws/core/test/resources/v4/get-slash-pointless-dot.sts rename to core/test/resources/v4/get-slash-pointless-dot.sts diff --git a/aws/core/test/resources/v4/get-slash.authz b/core/test/resources/v4/get-slash.authz similarity index 100% rename from aws/core/test/resources/v4/get-slash.authz rename to core/test/resources/v4/get-slash.authz diff --git a/aws/core/test/resources/v4/get-slash.creq b/core/test/resources/v4/get-slash.creq similarity index 100% rename from aws/core/test/resources/v4/get-slash.creq rename to core/test/resources/v4/get-slash.creq diff --git a/aws/core/test/resources/v4/get-slash.req b/core/test/resources/v4/get-slash.req similarity index 100% rename from aws/core/test/resources/v4/get-slash.req rename to core/test/resources/v4/get-slash.req diff --git a/aws/core/test/resources/v4/get-slash.sreq b/core/test/resources/v4/get-slash.sreq similarity index 100% rename from aws/core/test/resources/v4/get-slash.sreq rename to core/test/resources/v4/get-slash.sreq diff --git a/aws/core/test/resources/v4/get-slash.sts b/core/test/resources/v4/get-slash.sts similarity index 100% rename from aws/core/test/resources/v4/get-slash.sts rename to core/test/resources/v4/get-slash.sts diff --git a/aws/core/test/resources/v4/get-slashes.authz b/core/test/resources/v4/get-slashes.authz similarity index 100% rename from aws/core/test/resources/v4/get-slashes.authz rename to core/test/resources/v4/get-slashes.authz diff --git a/aws/core/test/resources/v4/get-slashes.creq b/core/test/resources/v4/get-slashes.creq similarity index 100% rename from aws/core/test/resources/v4/get-slashes.creq rename to core/test/resources/v4/get-slashes.creq diff --git a/aws/core/test/resources/v4/get-slashes.req b/core/test/resources/v4/get-slashes.req similarity index 100% rename from aws/core/test/resources/v4/get-slashes.req rename to core/test/resources/v4/get-slashes.req diff --git a/aws/core/test/resources/v4/get-slashes.sreq b/core/test/resources/v4/get-slashes.sreq similarity index 100% rename from aws/core/test/resources/v4/get-slashes.sreq rename to core/test/resources/v4/get-slashes.sreq diff --git a/aws/core/test/resources/v4/get-slashes.sts b/core/test/resources/v4/get-slashes.sts similarity index 100% rename from aws/core/test/resources/v4/get-slashes.sts rename to core/test/resources/v4/get-slashes.sts diff --git a/aws/core/test/resources/v4/get-space.authz b/core/test/resources/v4/get-space.authz similarity index 100% rename from aws/core/test/resources/v4/get-space.authz rename to core/test/resources/v4/get-space.authz diff --git a/aws/core/test/resources/v4/get-space.creq b/core/test/resources/v4/get-space.creq similarity index 100% rename from aws/core/test/resources/v4/get-space.creq rename to core/test/resources/v4/get-space.creq diff --git a/aws/core/test/resources/v4/get-space.req b/core/test/resources/v4/get-space.req similarity index 100% rename from aws/core/test/resources/v4/get-space.req rename to core/test/resources/v4/get-space.req diff --git a/aws/core/test/resources/v4/get-space.sreq b/core/test/resources/v4/get-space.sreq similarity index 100% rename from aws/core/test/resources/v4/get-space.sreq rename to core/test/resources/v4/get-space.sreq diff --git a/aws/core/test/resources/v4/get-space.sts b/core/test/resources/v4/get-space.sts similarity index 100% rename from aws/core/test/resources/v4/get-space.sts rename to core/test/resources/v4/get-space.sts diff --git a/aws/core/test/resources/v4/get-unreserved.authz b/core/test/resources/v4/get-unreserved.authz similarity index 100% rename from aws/core/test/resources/v4/get-unreserved.authz rename to core/test/resources/v4/get-unreserved.authz diff --git a/aws/core/test/resources/v4/get-unreserved.creq b/core/test/resources/v4/get-unreserved.creq similarity index 100% rename from aws/core/test/resources/v4/get-unreserved.creq rename to core/test/resources/v4/get-unreserved.creq diff --git a/aws/core/test/resources/v4/get-unreserved.req b/core/test/resources/v4/get-unreserved.req similarity index 100% rename from aws/core/test/resources/v4/get-unreserved.req rename to core/test/resources/v4/get-unreserved.req diff --git a/aws/core/test/resources/v4/get-unreserved.sreq b/core/test/resources/v4/get-unreserved.sreq similarity index 100% rename from aws/core/test/resources/v4/get-unreserved.sreq rename to core/test/resources/v4/get-unreserved.sreq diff --git a/aws/core/test/resources/v4/get-unreserved.sts b/core/test/resources/v4/get-unreserved.sts similarity index 100% rename from aws/core/test/resources/v4/get-unreserved.sts rename to core/test/resources/v4/get-unreserved.sts diff --git a/aws/core/test/resources/v4/get-utf8.authz b/core/test/resources/v4/get-utf8.authz similarity index 100% rename from aws/core/test/resources/v4/get-utf8.authz rename to core/test/resources/v4/get-utf8.authz diff --git a/aws/core/test/resources/v4/get-utf8.creq b/core/test/resources/v4/get-utf8.creq similarity index 100% rename from aws/core/test/resources/v4/get-utf8.creq rename to core/test/resources/v4/get-utf8.creq diff --git a/aws/core/test/resources/v4/get-utf8.req b/core/test/resources/v4/get-utf8.req similarity index 100% rename from aws/core/test/resources/v4/get-utf8.req rename to core/test/resources/v4/get-utf8.req diff --git a/aws/core/test/resources/v4/get-utf8.sreq b/core/test/resources/v4/get-utf8.sreq similarity index 100% rename from aws/core/test/resources/v4/get-utf8.sreq rename to core/test/resources/v4/get-utf8.sreq diff --git a/aws/core/test/resources/v4/get-utf8.sts b/core/test/resources/v4/get-utf8.sts similarity index 100% rename from aws/core/test/resources/v4/get-utf8.sts rename to core/test/resources/v4/get-utf8.sts diff --git a/aws/core/test/resources/v4/get-vanilla-empty-query-key.authz b/core/test/resources/v4/get-vanilla-empty-query-key.authz similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-empty-query-key.authz rename to core/test/resources/v4/get-vanilla-empty-query-key.authz diff --git a/aws/core/test/resources/v4/get-vanilla-empty-query-key.creq b/core/test/resources/v4/get-vanilla-empty-query-key.creq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-empty-query-key.creq rename to core/test/resources/v4/get-vanilla-empty-query-key.creq diff --git a/aws/core/test/resources/v4/get-vanilla-empty-query-key.req b/core/test/resources/v4/get-vanilla-empty-query-key.req similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-empty-query-key.req rename to core/test/resources/v4/get-vanilla-empty-query-key.req diff --git a/aws/core/test/resources/v4/get-vanilla-empty-query-key.sreq b/core/test/resources/v4/get-vanilla-empty-query-key.sreq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-empty-query-key.sreq rename to core/test/resources/v4/get-vanilla-empty-query-key.sreq diff --git a/aws/core/test/resources/v4/get-vanilla-empty-query-key.sts b/core/test/resources/v4/get-vanilla-empty-query-key.sts similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-empty-query-key.sts rename to core/test/resources/v4/get-vanilla-empty-query-key.sts diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key-case.authz b/core/test/resources/v4/get-vanilla-query-order-key-case.authz similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key-case.authz rename to core/test/resources/v4/get-vanilla-query-order-key-case.authz diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key-case.creq b/core/test/resources/v4/get-vanilla-query-order-key-case.creq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key-case.creq rename to core/test/resources/v4/get-vanilla-query-order-key-case.creq diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key-case.req b/core/test/resources/v4/get-vanilla-query-order-key-case.req similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key-case.req rename to core/test/resources/v4/get-vanilla-query-order-key-case.req diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key-case.sreq b/core/test/resources/v4/get-vanilla-query-order-key-case.sreq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key-case.sreq rename to core/test/resources/v4/get-vanilla-query-order-key-case.sreq diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key-case.sts b/core/test/resources/v4/get-vanilla-query-order-key-case.sts similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key-case.sts rename to core/test/resources/v4/get-vanilla-query-order-key-case.sts diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key.authz b/core/test/resources/v4/get-vanilla-query-order-key.authz similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key.authz rename to core/test/resources/v4/get-vanilla-query-order-key.authz diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key.creq b/core/test/resources/v4/get-vanilla-query-order-key.creq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key.creq rename to core/test/resources/v4/get-vanilla-query-order-key.creq diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key.req b/core/test/resources/v4/get-vanilla-query-order-key.req similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key.req rename to core/test/resources/v4/get-vanilla-query-order-key.req diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key.sreq b/core/test/resources/v4/get-vanilla-query-order-key.sreq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key.sreq rename to core/test/resources/v4/get-vanilla-query-order-key.sreq diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-key.sts b/core/test/resources/v4/get-vanilla-query-order-key.sts similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-key.sts rename to core/test/resources/v4/get-vanilla-query-order-key.sts diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-value.authz b/core/test/resources/v4/get-vanilla-query-order-value.authz similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-value.authz rename to core/test/resources/v4/get-vanilla-query-order-value.authz diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-value.creq b/core/test/resources/v4/get-vanilla-query-order-value.creq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-value.creq rename to core/test/resources/v4/get-vanilla-query-order-value.creq diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-value.req b/core/test/resources/v4/get-vanilla-query-order-value.req similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-value.req rename to core/test/resources/v4/get-vanilla-query-order-value.req diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-value.sreq b/core/test/resources/v4/get-vanilla-query-order-value.sreq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-value.sreq rename to core/test/resources/v4/get-vanilla-query-order-value.sreq diff --git a/aws/core/test/resources/v4/get-vanilla-query-order-value.sts b/core/test/resources/v4/get-vanilla-query-order-value.sts similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-order-value.sts rename to core/test/resources/v4/get-vanilla-query-order-value.sts diff --git a/aws/core/test/resources/v4/get-vanilla-query-unreserved.authz b/core/test/resources/v4/get-vanilla-query-unreserved.authz similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-unreserved.authz rename to core/test/resources/v4/get-vanilla-query-unreserved.authz diff --git a/aws/core/test/resources/v4/get-vanilla-query-unreserved.creq b/core/test/resources/v4/get-vanilla-query-unreserved.creq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-unreserved.creq rename to core/test/resources/v4/get-vanilla-query-unreserved.creq diff --git a/aws/core/test/resources/v4/get-vanilla-query-unreserved.req b/core/test/resources/v4/get-vanilla-query-unreserved.req similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-unreserved.req rename to core/test/resources/v4/get-vanilla-query-unreserved.req diff --git a/aws/core/test/resources/v4/get-vanilla-query-unreserved.sreq b/core/test/resources/v4/get-vanilla-query-unreserved.sreq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-unreserved.sreq rename to core/test/resources/v4/get-vanilla-query-unreserved.sreq diff --git a/aws/core/test/resources/v4/get-vanilla-query-unreserved.sts b/core/test/resources/v4/get-vanilla-query-unreserved.sts similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query-unreserved.sts rename to core/test/resources/v4/get-vanilla-query-unreserved.sts diff --git a/aws/core/test/resources/v4/get-vanilla-query.authz b/core/test/resources/v4/get-vanilla-query.authz similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query.authz rename to core/test/resources/v4/get-vanilla-query.authz diff --git a/aws/core/test/resources/v4/get-vanilla-query.creq b/core/test/resources/v4/get-vanilla-query.creq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query.creq rename to core/test/resources/v4/get-vanilla-query.creq diff --git a/aws/core/test/resources/v4/get-vanilla-query.req b/core/test/resources/v4/get-vanilla-query.req similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query.req rename to core/test/resources/v4/get-vanilla-query.req diff --git a/aws/core/test/resources/v4/get-vanilla-query.sreq b/core/test/resources/v4/get-vanilla-query.sreq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query.sreq rename to core/test/resources/v4/get-vanilla-query.sreq diff --git a/aws/core/test/resources/v4/get-vanilla-query.sts b/core/test/resources/v4/get-vanilla-query.sts similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-query.sts rename to core/test/resources/v4/get-vanilla-query.sts diff --git a/aws/core/test/resources/v4/get-vanilla-ut8-query.authz b/core/test/resources/v4/get-vanilla-ut8-query.authz similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-ut8-query.authz rename to core/test/resources/v4/get-vanilla-ut8-query.authz diff --git a/aws/core/test/resources/v4/get-vanilla-ut8-query.creq b/core/test/resources/v4/get-vanilla-ut8-query.creq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-ut8-query.creq rename to core/test/resources/v4/get-vanilla-ut8-query.creq diff --git a/aws/core/test/resources/v4/get-vanilla-ut8-query.req b/core/test/resources/v4/get-vanilla-ut8-query.req similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-ut8-query.req rename to core/test/resources/v4/get-vanilla-ut8-query.req diff --git a/aws/core/test/resources/v4/get-vanilla-ut8-query.sreq b/core/test/resources/v4/get-vanilla-ut8-query.sreq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-ut8-query.sreq rename to core/test/resources/v4/get-vanilla-ut8-query.sreq diff --git a/aws/core/test/resources/v4/get-vanilla-ut8-query.sts b/core/test/resources/v4/get-vanilla-ut8-query.sts similarity index 100% rename from aws/core/test/resources/v4/get-vanilla-ut8-query.sts rename to core/test/resources/v4/get-vanilla-ut8-query.sts diff --git a/aws/core/test/resources/v4/get-vanilla.authz b/core/test/resources/v4/get-vanilla.authz similarity index 100% rename from aws/core/test/resources/v4/get-vanilla.authz rename to core/test/resources/v4/get-vanilla.authz diff --git a/aws/core/test/resources/v4/get-vanilla.creq b/core/test/resources/v4/get-vanilla.creq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla.creq rename to core/test/resources/v4/get-vanilla.creq diff --git a/aws/core/test/resources/v4/get-vanilla.req b/core/test/resources/v4/get-vanilla.req similarity index 100% rename from aws/core/test/resources/v4/get-vanilla.req rename to core/test/resources/v4/get-vanilla.req diff --git a/aws/core/test/resources/v4/get-vanilla.sreq b/core/test/resources/v4/get-vanilla.sreq similarity index 100% rename from aws/core/test/resources/v4/get-vanilla.sreq rename to core/test/resources/v4/get-vanilla.sreq diff --git a/aws/core/test/resources/v4/get-vanilla.sts b/core/test/resources/v4/get-vanilla.sts similarity index 100% rename from aws/core/test/resources/v4/get-vanilla.sts rename to core/test/resources/v4/get-vanilla.sts diff --git a/aws/core/test/resources/v4/post-header-key-case.authz b/core/test/resources/v4/post-header-key-case.authz similarity index 100% rename from aws/core/test/resources/v4/post-header-key-case.authz rename to core/test/resources/v4/post-header-key-case.authz diff --git a/aws/core/test/resources/v4/post-header-key-case.creq b/core/test/resources/v4/post-header-key-case.creq similarity index 100% rename from aws/core/test/resources/v4/post-header-key-case.creq rename to core/test/resources/v4/post-header-key-case.creq diff --git a/aws/core/test/resources/v4/post-header-key-case.req b/core/test/resources/v4/post-header-key-case.req similarity index 100% rename from aws/core/test/resources/v4/post-header-key-case.req rename to core/test/resources/v4/post-header-key-case.req diff --git a/aws/core/test/resources/v4/post-header-key-case.sreq b/core/test/resources/v4/post-header-key-case.sreq similarity index 100% rename from aws/core/test/resources/v4/post-header-key-case.sreq rename to core/test/resources/v4/post-header-key-case.sreq diff --git a/aws/core/test/resources/v4/post-header-key-case.sts b/core/test/resources/v4/post-header-key-case.sts similarity index 100% rename from aws/core/test/resources/v4/post-header-key-case.sts rename to core/test/resources/v4/post-header-key-case.sts diff --git a/aws/core/test/resources/v4/post-header-key-sort.authz b/core/test/resources/v4/post-header-key-sort.authz similarity index 100% rename from aws/core/test/resources/v4/post-header-key-sort.authz rename to core/test/resources/v4/post-header-key-sort.authz diff --git a/aws/core/test/resources/v4/post-header-key-sort.creq b/core/test/resources/v4/post-header-key-sort.creq similarity index 100% rename from aws/core/test/resources/v4/post-header-key-sort.creq rename to core/test/resources/v4/post-header-key-sort.creq diff --git a/aws/core/test/resources/v4/post-header-key-sort.req b/core/test/resources/v4/post-header-key-sort.req similarity index 100% rename from aws/core/test/resources/v4/post-header-key-sort.req rename to core/test/resources/v4/post-header-key-sort.req diff --git a/aws/core/test/resources/v4/post-header-key-sort.sreq b/core/test/resources/v4/post-header-key-sort.sreq similarity index 100% rename from aws/core/test/resources/v4/post-header-key-sort.sreq rename to core/test/resources/v4/post-header-key-sort.sreq diff --git a/aws/core/test/resources/v4/post-header-key-sort.sts b/core/test/resources/v4/post-header-key-sort.sts similarity index 100% rename from aws/core/test/resources/v4/post-header-key-sort.sts rename to core/test/resources/v4/post-header-key-sort.sts diff --git a/aws/core/test/resources/v4/post-header-value-case.authz b/core/test/resources/v4/post-header-value-case.authz similarity index 100% rename from aws/core/test/resources/v4/post-header-value-case.authz rename to core/test/resources/v4/post-header-value-case.authz diff --git a/aws/core/test/resources/v4/post-header-value-case.creq b/core/test/resources/v4/post-header-value-case.creq similarity index 100% rename from aws/core/test/resources/v4/post-header-value-case.creq rename to core/test/resources/v4/post-header-value-case.creq diff --git a/aws/core/test/resources/v4/post-header-value-case.req b/core/test/resources/v4/post-header-value-case.req similarity index 100% rename from aws/core/test/resources/v4/post-header-value-case.req rename to core/test/resources/v4/post-header-value-case.req diff --git a/aws/core/test/resources/v4/post-header-value-case.sreq b/core/test/resources/v4/post-header-value-case.sreq similarity index 100% rename from aws/core/test/resources/v4/post-header-value-case.sreq rename to core/test/resources/v4/post-header-value-case.sreq diff --git a/aws/core/test/resources/v4/post-header-value-case.sts b/core/test/resources/v4/post-header-value-case.sts similarity index 100% rename from aws/core/test/resources/v4/post-header-value-case.sts rename to core/test/resources/v4/post-header-value-case.sts diff --git a/aws/core/test/resources/v4/post-vanilla-empty-query-value.authz b/core/test/resources/v4/post-vanilla-empty-query-value.authz similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-empty-query-value.authz rename to core/test/resources/v4/post-vanilla-empty-query-value.authz diff --git a/aws/core/test/resources/v4/post-vanilla-empty-query-value.creq b/core/test/resources/v4/post-vanilla-empty-query-value.creq similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-empty-query-value.creq rename to core/test/resources/v4/post-vanilla-empty-query-value.creq diff --git a/aws/core/test/resources/v4/post-vanilla-empty-query-value.req b/core/test/resources/v4/post-vanilla-empty-query-value.req similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-empty-query-value.req rename to core/test/resources/v4/post-vanilla-empty-query-value.req diff --git a/aws/core/test/resources/v4/post-vanilla-empty-query-value.sreq b/core/test/resources/v4/post-vanilla-empty-query-value.sreq similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-empty-query-value.sreq rename to core/test/resources/v4/post-vanilla-empty-query-value.sreq diff --git a/aws/core/test/resources/v4/post-vanilla-empty-query-value.sts b/core/test/resources/v4/post-vanilla-empty-query-value.sts similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-empty-query-value.sts rename to core/test/resources/v4/post-vanilla-empty-query-value.sts diff --git a/aws/core/test/resources/v4/post-vanilla-query.authz b/core/test/resources/v4/post-vanilla-query.authz similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-query.authz rename to core/test/resources/v4/post-vanilla-query.authz diff --git a/aws/core/test/resources/v4/post-vanilla-query.creq b/core/test/resources/v4/post-vanilla-query.creq similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-query.creq rename to core/test/resources/v4/post-vanilla-query.creq diff --git a/aws/core/test/resources/v4/post-vanilla-query.req b/core/test/resources/v4/post-vanilla-query.req similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-query.req rename to core/test/resources/v4/post-vanilla-query.req diff --git a/aws/core/test/resources/v4/post-vanilla-query.sreq b/core/test/resources/v4/post-vanilla-query.sreq similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-query.sreq rename to core/test/resources/v4/post-vanilla-query.sreq diff --git a/aws/core/test/resources/v4/post-vanilla-query.sts b/core/test/resources/v4/post-vanilla-query.sts similarity index 100% rename from aws/core/test/resources/v4/post-vanilla-query.sts rename to core/test/resources/v4/post-vanilla-query.sts diff --git a/aws/core/test/resources/v4/post-vanilla.authz b/core/test/resources/v4/post-vanilla.authz similarity index 100% rename from aws/core/test/resources/v4/post-vanilla.authz rename to core/test/resources/v4/post-vanilla.authz diff --git a/aws/core/test/resources/v4/post-vanilla.creq b/core/test/resources/v4/post-vanilla.creq similarity index 100% rename from aws/core/test/resources/v4/post-vanilla.creq rename to core/test/resources/v4/post-vanilla.creq diff --git a/aws/core/test/resources/v4/post-vanilla.req b/core/test/resources/v4/post-vanilla.req similarity index 100% rename from aws/core/test/resources/v4/post-vanilla.req rename to core/test/resources/v4/post-vanilla.req diff --git a/aws/core/test/resources/v4/post-vanilla.sreq b/core/test/resources/v4/post-vanilla.sreq similarity index 100% rename from aws/core/test/resources/v4/post-vanilla.sreq rename to core/test/resources/v4/post-vanilla.sreq diff --git a/aws/core/test/resources/v4/post-vanilla.sts b/core/test/resources/v4/post-vanilla.sts similarity index 100% rename from aws/core/test/resources/v4/post-vanilla.sts rename to core/test/resources/v4/post-vanilla.sts diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.authz b/core/test/resources/v4/post-x-www-form-urlencoded-parameters.authz similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.authz rename to core/test/resources/v4/post-x-www-form-urlencoded-parameters.authz diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.creq b/core/test/resources/v4/post-x-www-form-urlencoded-parameters.creq similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.creq rename to core/test/resources/v4/post-x-www-form-urlencoded-parameters.creq diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.req b/core/test/resources/v4/post-x-www-form-urlencoded-parameters.req similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.req rename to core/test/resources/v4/post-x-www-form-urlencoded-parameters.req diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.sreq b/core/test/resources/v4/post-x-www-form-urlencoded-parameters.sreq similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.sreq rename to core/test/resources/v4/post-x-www-form-urlencoded-parameters.sreq diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.sts b/core/test/resources/v4/post-x-www-form-urlencoded-parameters.sts similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded-parameters.sts rename to core/test/resources/v4/post-x-www-form-urlencoded-parameters.sts diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded.authz b/core/test/resources/v4/post-x-www-form-urlencoded.authz similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded.authz rename to core/test/resources/v4/post-x-www-form-urlencoded.authz diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded.creq b/core/test/resources/v4/post-x-www-form-urlencoded.creq similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded.creq rename to core/test/resources/v4/post-x-www-form-urlencoded.creq diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded.req b/core/test/resources/v4/post-x-www-form-urlencoded.req similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded.req rename to core/test/resources/v4/post-x-www-form-urlencoded.req diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded.sreq b/core/test/resources/v4/post-x-www-form-urlencoded.sreq similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded.sreq rename to core/test/resources/v4/post-x-www-form-urlencoded.sreq diff --git a/aws/core/test/resources/v4/post-x-www-form-urlencoded.sts b/core/test/resources/v4/post-x-www-form-urlencoded.sts similarity index 100% rename from aws/core/test/resources/v4/post-x-www-form-urlencoded.sts rename to core/test/resources/v4/post-x-www-form-urlencoded.sts diff --git a/aws/core/LICENSE b/gen/LICENSE similarity index 100% rename from aws/core/LICENSE rename to gen/LICENSE diff --git a/aws/gen/Makefile b/gen/Makefile similarity index 100% rename from aws/gen/Makefile rename to gen/Makefile diff --git a/aws/gen/README.md b/gen/README.md similarity index 100% rename from aws/gen/README.md rename to gen/README.md diff --git a/aws/core/Setup.hs b/gen/Setup.hs similarity index 100% rename from aws/core/Setup.hs rename to gen/Setup.hs diff --git a/aws/gen/amazonka-gen.cabal b/gen/amazonka-gen.cabal similarity index 100% rename from aws/gen/amazonka-gen.cabal rename to gen/amazonka-gen.cabal diff --git a/aws/gen/LICENSE b/gen/assets/LICENSE similarity index 100% rename from aws/gen/LICENSE rename to gen/assets/LICENSE diff --git a/aws/gen/assets/Makefile b/gen/assets/Makefile similarity index 100% rename from aws/gen/assets/Makefile rename to gen/assets/Makefile diff --git a/aws/gen/Setup.hs b/gen/assets/Setup.hs similarity index 100% rename from aws/gen/Setup.hs rename to gen/assets/Setup.hs diff --git a/aws/gen/overrides/autoscaling.json b/gen/overrides/autoscaling.json similarity index 100% rename from aws/gen/overrides/autoscaling.json rename to gen/overrides/autoscaling.json diff --git a/aws/gen/overrides/cloudformation.json b/gen/overrides/cloudformation.json similarity index 100% rename from aws/gen/overrides/cloudformation.json rename to gen/overrides/cloudformation.json diff --git a/aws/gen/overrides/cloudfront.json b/gen/overrides/cloudfront.json similarity index 100% rename from aws/gen/overrides/cloudfront.json rename to gen/overrides/cloudfront.json diff --git a/aws/gen/overrides/cloudsearch.json b/gen/overrides/cloudsearch.json similarity index 100% rename from aws/gen/overrides/cloudsearch.json rename to gen/overrides/cloudsearch.json diff --git a/aws/gen/overrides/cloudsearchdomain.json b/gen/overrides/cloudsearchdomain.json similarity index 100% rename from aws/gen/overrides/cloudsearchdomain.json rename to gen/overrides/cloudsearchdomain.json diff --git a/aws/gen/overrides/cloudtrail.json b/gen/overrides/cloudtrail.json similarity index 100% rename from aws/gen/overrides/cloudtrail.json rename to gen/overrides/cloudtrail.json diff --git a/aws/gen/overrides/cloudwatch.json b/gen/overrides/cloudwatch.json similarity index 100% rename from aws/gen/overrides/cloudwatch.json rename to gen/overrides/cloudwatch.json diff --git a/aws/gen/overrides/codedeploy.json b/gen/overrides/codedeploy.json similarity index 100% rename from aws/gen/overrides/codedeploy.json rename to gen/overrides/codedeploy.json diff --git a/aws/gen/overrides/cognito-identity.json b/gen/overrides/cognito-identity.json similarity index 100% rename from aws/gen/overrides/cognito-identity.json rename to gen/overrides/cognito-identity.json diff --git a/aws/gen/overrides/cognito-sync.json b/gen/overrides/cognito-sync.json similarity index 100% rename from aws/gen/overrides/cognito-sync.json rename to gen/overrides/cognito-sync.json diff --git a/aws/gen/overrides/config.json b/gen/overrides/config.json similarity index 100% rename from aws/gen/overrides/config.json rename to gen/overrides/config.json diff --git a/aws/gen/overrides/datapipeline.json b/gen/overrides/datapipeline.json similarity index 100% rename from aws/gen/overrides/datapipeline.json rename to gen/overrides/datapipeline.json diff --git a/aws/gen/overrides/directconnect.json b/gen/overrides/directconnect.json similarity index 100% rename from aws/gen/overrides/directconnect.json rename to gen/overrides/directconnect.json diff --git a/aws/gen/overrides/dynamodb.json b/gen/overrides/dynamodb.json similarity index 100% rename from aws/gen/overrides/dynamodb.json rename to gen/overrides/dynamodb.json diff --git a/aws/gen/overrides/ec2.json b/gen/overrides/ec2.json similarity index 100% rename from aws/gen/overrides/ec2.json rename to gen/overrides/ec2.json diff --git a/aws/gen/overrides/elasticache.json b/gen/overrides/elasticache.json similarity index 100% rename from aws/gen/overrides/elasticache.json rename to gen/overrides/elasticache.json diff --git a/aws/gen/overrides/elasticbeanstalk.json b/gen/overrides/elasticbeanstalk.json similarity index 100% rename from aws/gen/overrides/elasticbeanstalk.json rename to gen/overrides/elasticbeanstalk.json diff --git a/aws/gen/overrides/elastictranscoder.json b/gen/overrides/elastictranscoder.json similarity index 100% rename from aws/gen/overrides/elastictranscoder.json rename to gen/overrides/elastictranscoder.json diff --git a/aws/gen/overrides/elb.json b/gen/overrides/elb.json similarity index 100% rename from aws/gen/overrides/elb.json rename to gen/overrides/elb.json diff --git a/aws/gen/overrides/emr.json b/gen/overrides/emr.json similarity index 100% rename from aws/gen/overrides/emr.json rename to gen/overrides/emr.json diff --git a/aws/gen/overrides/iam.json b/gen/overrides/iam.json similarity index 100% rename from aws/gen/overrides/iam.json rename to gen/overrides/iam.json diff --git a/aws/gen/overrides/importexport.json b/gen/overrides/importexport.json similarity index 100% rename from aws/gen/overrides/importexport.json rename to gen/overrides/importexport.json diff --git a/aws/gen/overrides/kinesis.json b/gen/overrides/kinesis.json similarity index 100% rename from aws/gen/overrides/kinesis.json rename to gen/overrides/kinesis.json diff --git a/aws/gen/overrides/kms.json b/gen/overrides/kms.json similarity index 100% rename from aws/gen/overrides/kms.json rename to gen/overrides/kms.json diff --git a/aws/gen/overrides/lambda.json b/gen/overrides/lambda.json similarity index 100% rename from aws/gen/overrides/lambda.json rename to gen/overrides/lambda.json diff --git a/aws/gen/overrides/logs.json b/gen/overrides/logs.json similarity index 100% rename from aws/gen/overrides/logs.json rename to gen/overrides/logs.json diff --git a/aws/gen/overrides/opsworks.json b/gen/overrides/opsworks.json similarity index 100% rename from aws/gen/overrides/opsworks.json rename to gen/overrides/opsworks.json diff --git a/aws/gen/overrides/rds.json b/gen/overrides/rds.json similarity index 100% rename from aws/gen/overrides/rds.json rename to gen/overrides/rds.json diff --git a/aws/gen/overrides/redshift.json b/gen/overrides/redshift.json similarity index 100% rename from aws/gen/overrides/redshift.json rename to gen/overrides/redshift.json diff --git a/aws/gen/overrides/route53.json b/gen/overrides/route53.json similarity index 100% rename from aws/gen/overrides/route53.json rename to gen/overrides/route53.json diff --git a/aws/gen/overrides/route53domains.json b/gen/overrides/route53domains.json similarity index 100% rename from aws/gen/overrides/route53domains.json rename to gen/overrides/route53domains.json diff --git a/aws/gen/overrides/s3.json b/gen/overrides/s3.json similarity index 100% rename from aws/gen/overrides/s3.json rename to gen/overrides/s3.json diff --git a/aws/gen/overrides/sdb.json b/gen/overrides/sdb.json similarity index 100% rename from aws/gen/overrides/sdb.json rename to gen/overrides/sdb.json diff --git a/aws/gen/overrides/ses.json b/gen/overrides/ses.json similarity index 100% rename from aws/gen/overrides/ses.json rename to gen/overrides/ses.json diff --git a/aws/gen/overrides/sns.json b/gen/overrides/sns.json similarity index 100% rename from aws/gen/overrides/sns.json rename to gen/overrides/sns.json diff --git a/aws/gen/overrides/sqs.json b/gen/overrides/sqs.json similarity index 100% rename from aws/gen/overrides/sqs.json rename to gen/overrides/sqs.json diff --git a/aws/gen/overrides/storagegateway.json b/gen/overrides/storagegateway.json similarity index 100% rename from aws/gen/overrides/storagegateway.json rename to gen/overrides/storagegateway.json diff --git a/aws/gen/overrides/sts.json b/gen/overrides/sts.json similarity index 100% rename from aws/gen/overrides/sts.json rename to gen/overrides/sts.json diff --git a/aws/gen/overrides/support.json b/gen/overrides/support.json similarity index 100% rename from aws/gen/overrides/support.json rename to gen/overrides/support.json diff --git a/aws/gen/overrides/swf.json b/gen/overrides/swf.json similarity index 100% rename from aws/gen/overrides/swf.json rename to gen/overrides/swf.json diff --git a/aws/gen/src/Gen/Documentation.hs b/gen/src/Gen/Documentation.hs similarity index 100% rename from aws/gen/src/Gen/Documentation.hs rename to gen/src/Gen/Documentation.hs diff --git a/aws/gen/src/Gen/Filters.hs b/gen/src/Gen/Filters.hs similarity index 100% rename from aws/gen/src/Gen/Filters.hs rename to gen/src/Gen/Filters.hs diff --git a/aws/gen/src/Gen/IO.hs b/gen/src/Gen/IO.hs similarity index 100% rename from aws/gen/src/Gen/IO.hs rename to gen/src/Gen/IO.hs diff --git a/aws/gen/src/Gen/JSON.hs b/gen/src/Gen/JSON.hs similarity index 100% rename from aws/gen/src/Gen/JSON.hs rename to gen/src/Gen/JSON.hs diff --git a/aws/gen/src/Gen/Names.hs b/gen/src/Gen/Names.hs similarity index 100% rename from aws/gen/src/Gen/Names.hs rename to gen/src/Gen/Names.hs diff --git a/aws/gen/src/Gen/Stage1.hs b/gen/src/Gen/Stage1.hs similarity index 100% rename from aws/gen/src/Gen/Stage1.hs rename to gen/src/Gen/Stage1.hs diff --git a/aws/gen/src/Gen/Stage2.hs b/gen/src/Gen/Stage2.hs similarity index 100% rename from aws/gen/src/Gen/Stage2.hs rename to gen/src/Gen/Stage2.hs diff --git a/aws/gen/src/Gen/TH.hs b/gen/src/Gen/TH.hs similarity index 100% rename from aws/gen/src/Gen/TH.hs rename to gen/src/Gen/TH.hs diff --git a/aws/gen/src/Gen/Transform.hs b/gen/src/Gen/Transform.hs similarity index 100% rename from aws/gen/src/Gen/Transform.hs rename to gen/src/Gen/Transform.hs diff --git a/aws/gen/src/Gen/Types.hs b/gen/src/Gen/Types.hs similarity index 100% rename from aws/gen/src/Gen/Types.hs rename to gen/src/Gen/Types.hs diff --git a/aws/gen/src/Main.hs b/gen/src/Main.hs similarity index 100% rename from aws/gen/src/Main.hs rename to gen/src/Main.hs diff --git a/aws/gen/stage1/_endpoints.json b/gen/stage1/_endpoints.json similarity index 100% rename from aws/gen/stage1/_endpoints.json rename to gen/stage1/_endpoints.json diff --git a/aws/gen/stage1/_retry.json b/gen/stage1/_retry.json similarity index 100% rename from aws/gen/stage1/_retry.json rename to gen/stage1/_retry.json diff --git a/aws/gen/stage1/autoscaling/2011-01-01.api.json b/gen/stage1/autoscaling/2011-01-01.api.json similarity index 100% rename from aws/gen/stage1/autoscaling/2011-01-01.api.json rename to gen/stage1/autoscaling/2011-01-01.api.json diff --git a/aws/gen/stage1/autoscaling/2011-01-01.paginators.json b/gen/stage1/autoscaling/2011-01-01.paginators.json similarity index 100% rename from aws/gen/stage1/autoscaling/2011-01-01.paginators.json rename to gen/stage1/autoscaling/2011-01-01.paginators.json diff --git a/aws/gen/stage1/cloudformation/2010-05-15.api.json b/gen/stage1/cloudformation/2010-05-15.api.json similarity index 100% rename from aws/gen/stage1/cloudformation/2010-05-15.api.json rename to gen/stage1/cloudformation/2010-05-15.api.json diff --git a/aws/gen/stage1/cloudformation/2010-05-15.paginators.json b/gen/stage1/cloudformation/2010-05-15.paginators.json similarity index 100% rename from aws/gen/stage1/cloudformation/2010-05-15.paginators.json rename to gen/stage1/cloudformation/2010-05-15.paginators.json diff --git a/aws/gen/stage1/cloudfront/2014-05-31.api.json b/gen/stage1/cloudfront/2014-05-31.api.json similarity index 100% rename from aws/gen/stage1/cloudfront/2014-05-31.api.json rename to gen/stage1/cloudfront/2014-05-31.api.json diff --git a/aws/gen/stage1/cloudfront/2014-05-31.paginators.json b/gen/stage1/cloudfront/2014-05-31.paginators.json similarity index 100% rename from aws/gen/stage1/cloudfront/2014-05-31.paginators.json rename to gen/stage1/cloudfront/2014-05-31.paginators.json diff --git a/aws/gen/stage1/cloudfront/2014-05-31.waiters.json b/gen/stage1/cloudfront/2014-05-31.waiters.json similarity index 100% rename from aws/gen/stage1/cloudfront/2014-05-31.waiters.json rename to gen/stage1/cloudfront/2014-05-31.waiters.json diff --git a/aws/gen/stage1/cloudfront/2014-10-21.api.json b/gen/stage1/cloudfront/2014-10-21.api.json similarity index 100% rename from aws/gen/stage1/cloudfront/2014-10-21.api.json rename to gen/stage1/cloudfront/2014-10-21.api.json diff --git a/aws/gen/stage1/cloudfront/2014-10-21.paginators.json b/gen/stage1/cloudfront/2014-10-21.paginators.json similarity index 100% rename from aws/gen/stage1/cloudfront/2014-10-21.paginators.json rename to gen/stage1/cloudfront/2014-10-21.paginators.json diff --git a/aws/gen/stage1/cloudfront/2014-10-21.waiters.json b/gen/stage1/cloudfront/2014-10-21.waiters.json similarity index 100% rename from aws/gen/stage1/cloudfront/2014-10-21.waiters.json rename to gen/stage1/cloudfront/2014-10-21.waiters.json diff --git a/aws/gen/stage1/cloudsearch/2013-01-01.api.json b/gen/stage1/cloudsearch/2013-01-01.api.json similarity index 100% rename from aws/gen/stage1/cloudsearch/2013-01-01.api.json rename to gen/stage1/cloudsearch/2013-01-01.api.json diff --git a/aws/gen/stage1/cloudsearchdomain/2013-01-01.api.json b/gen/stage1/cloudsearchdomain/2013-01-01.api.json similarity index 100% rename from aws/gen/stage1/cloudsearchdomain/2013-01-01.api.json rename to gen/stage1/cloudsearchdomain/2013-01-01.api.json diff --git a/aws/gen/stage1/cloudtrail/2013-11-01.api.json b/gen/stage1/cloudtrail/2013-11-01.api.json similarity index 100% rename from aws/gen/stage1/cloudtrail/2013-11-01.api.json rename to gen/stage1/cloudtrail/2013-11-01.api.json diff --git a/aws/gen/stage1/cloudwatch/2010-08-01.api.json b/gen/stage1/cloudwatch/2010-08-01.api.json similarity index 100% rename from aws/gen/stage1/cloudwatch/2010-08-01.api.json rename to gen/stage1/cloudwatch/2010-08-01.api.json diff --git a/aws/gen/stage1/cloudwatch/2010-08-01.paginators.json b/gen/stage1/cloudwatch/2010-08-01.paginators.json similarity index 100% rename from aws/gen/stage1/cloudwatch/2010-08-01.paginators.json rename to gen/stage1/cloudwatch/2010-08-01.paginators.json diff --git a/aws/gen/stage1/codedeploy/2014-10-06.api.json b/gen/stage1/codedeploy/2014-10-06.api.json similarity index 100% rename from aws/gen/stage1/codedeploy/2014-10-06.api.json rename to gen/stage1/codedeploy/2014-10-06.api.json diff --git a/aws/gen/stage1/cognito-identity/2014-06-30.api.json b/gen/stage1/cognito-identity/2014-06-30.api.json similarity index 100% rename from aws/gen/stage1/cognito-identity/2014-06-30.api.json rename to gen/stage1/cognito-identity/2014-06-30.api.json diff --git a/aws/gen/stage1/cognito-sync/2014-06-30.api.json b/gen/stage1/cognito-sync/2014-06-30.api.json similarity index 100% rename from aws/gen/stage1/cognito-sync/2014-06-30.api.json rename to gen/stage1/cognito-sync/2014-06-30.api.json diff --git a/aws/gen/stage1/config/2014-11-12.api.json b/gen/stage1/config/2014-11-12.api.json similarity index 100% rename from aws/gen/stage1/config/2014-11-12.api.json rename to gen/stage1/config/2014-11-12.api.json diff --git a/aws/gen/stage1/datapipeline/2012-10-29.api.json b/gen/stage1/datapipeline/2012-10-29.api.json similarity index 100% rename from aws/gen/stage1/datapipeline/2012-10-29.api.json rename to gen/stage1/datapipeline/2012-10-29.api.json diff --git a/aws/gen/stage1/datapipeline/2012-10-29.paginators.json b/gen/stage1/datapipeline/2012-10-29.paginators.json similarity index 100% rename from aws/gen/stage1/datapipeline/2012-10-29.paginators.json rename to gen/stage1/datapipeline/2012-10-29.paginators.json diff --git a/aws/gen/stage1/directconnect/2012-10-25.api.json b/gen/stage1/directconnect/2012-10-25.api.json similarity index 100% rename from aws/gen/stage1/directconnect/2012-10-25.api.json rename to gen/stage1/directconnect/2012-10-25.api.json diff --git a/aws/gen/stage1/dynamodb/2012-08-10.api.json b/gen/stage1/dynamodb/2012-08-10.api.json similarity index 100% rename from aws/gen/stage1/dynamodb/2012-08-10.api.json rename to gen/stage1/dynamodb/2012-08-10.api.json diff --git a/aws/gen/stage1/dynamodb/2012-08-10.paginators.json b/gen/stage1/dynamodb/2012-08-10.paginators.json similarity index 100% rename from aws/gen/stage1/dynamodb/2012-08-10.paginators.json rename to gen/stage1/dynamodb/2012-08-10.paginators.json diff --git a/aws/gen/stage1/dynamodb/2012-08-10.waiters.json b/gen/stage1/dynamodb/2012-08-10.waiters.json similarity index 100% rename from aws/gen/stage1/dynamodb/2012-08-10.waiters.json rename to gen/stage1/dynamodb/2012-08-10.waiters.json diff --git a/aws/gen/stage1/ec2/2014-09-01.api.json b/gen/stage1/ec2/2014-09-01.api.json similarity index 100% rename from aws/gen/stage1/ec2/2014-09-01.api.json rename to gen/stage1/ec2/2014-09-01.api.json diff --git a/aws/gen/stage1/ec2/2014-09-01.paginators.json b/gen/stage1/ec2/2014-09-01.paginators.json similarity index 100% rename from aws/gen/stage1/ec2/2014-09-01.paginators.json rename to gen/stage1/ec2/2014-09-01.paginators.json diff --git a/aws/gen/stage1/ec2/2014-09-01.waiters.json b/gen/stage1/ec2/2014-09-01.waiters.json similarity index 100% rename from aws/gen/stage1/ec2/2014-09-01.waiters.json rename to gen/stage1/ec2/2014-09-01.waiters.json diff --git a/aws/gen/stage1/ec2/2014-10-01.api.json b/gen/stage1/ec2/2014-10-01.api.json similarity index 100% rename from aws/gen/stage1/ec2/2014-10-01.api.json rename to gen/stage1/ec2/2014-10-01.api.json diff --git a/aws/gen/stage1/ec2/2014-10-01.paginators.json b/gen/stage1/ec2/2014-10-01.paginators.json similarity index 100% rename from aws/gen/stage1/ec2/2014-10-01.paginators.json rename to gen/stage1/ec2/2014-10-01.paginators.json diff --git a/aws/gen/stage1/ec2/2014-10-01.waiters.json b/gen/stage1/ec2/2014-10-01.waiters.json similarity index 100% rename from aws/gen/stage1/ec2/2014-10-01.waiters.json rename to gen/stage1/ec2/2014-10-01.waiters.json diff --git a/aws/gen/stage1/elasticache/2014-09-30.api.json b/gen/stage1/elasticache/2014-09-30.api.json similarity index 100% rename from aws/gen/stage1/elasticache/2014-09-30.api.json rename to gen/stage1/elasticache/2014-09-30.api.json diff --git a/aws/gen/stage1/elasticache/2014-09-30.paginators.json b/gen/stage1/elasticache/2014-09-30.paginators.json similarity index 100% rename from aws/gen/stage1/elasticache/2014-09-30.paginators.json rename to gen/stage1/elasticache/2014-09-30.paginators.json diff --git a/aws/gen/stage1/elasticbeanstalk/2010-12-01.api.json b/gen/stage1/elasticbeanstalk/2010-12-01.api.json similarity index 100% rename from aws/gen/stage1/elasticbeanstalk/2010-12-01.api.json rename to gen/stage1/elasticbeanstalk/2010-12-01.api.json diff --git a/aws/gen/stage1/elasticbeanstalk/2010-12-01.paginators.json b/gen/stage1/elasticbeanstalk/2010-12-01.paginators.json similarity index 100% rename from aws/gen/stage1/elasticbeanstalk/2010-12-01.paginators.json rename to gen/stage1/elasticbeanstalk/2010-12-01.paginators.json diff --git a/aws/gen/stage1/elastictranscoder/2012-09-25.api.json b/gen/stage1/elastictranscoder/2012-09-25.api.json similarity index 100% rename from aws/gen/stage1/elastictranscoder/2012-09-25.api.json rename to gen/stage1/elastictranscoder/2012-09-25.api.json diff --git a/aws/gen/stage1/elastictranscoder/2012-09-25.paginators.json b/gen/stage1/elastictranscoder/2012-09-25.paginators.json similarity index 100% rename from aws/gen/stage1/elastictranscoder/2012-09-25.paginators.json rename to gen/stage1/elastictranscoder/2012-09-25.paginators.json diff --git a/aws/gen/stage1/elastictranscoder/2012-09-25.waiters.json b/gen/stage1/elastictranscoder/2012-09-25.waiters.json similarity index 100% rename from aws/gen/stage1/elastictranscoder/2012-09-25.waiters.json rename to gen/stage1/elastictranscoder/2012-09-25.waiters.json diff --git a/aws/gen/stage1/elb/2012-06-01.api.json b/gen/stage1/elb/2012-06-01.api.json similarity index 100% rename from aws/gen/stage1/elb/2012-06-01.api.json rename to gen/stage1/elb/2012-06-01.api.json diff --git a/aws/gen/stage1/elb/2012-06-01.paginators.json b/gen/stage1/elb/2012-06-01.paginators.json similarity index 100% rename from aws/gen/stage1/elb/2012-06-01.paginators.json rename to gen/stage1/elb/2012-06-01.paginators.json diff --git a/aws/gen/stage1/emr/2009-03-31.api.json b/gen/stage1/emr/2009-03-31.api.json similarity index 100% rename from aws/gen/stage1/emr/2009-03-31.api.json rename to gen/stage1/emr/2009-03-31.api.json diff --git a/aws/gen/stage1/emr/2009-03-31.paginators.json b/gen/stage1/emr/2009-03-31.paginators.json similarity index 100% rename from aws/gen/stage1/emr/2009-03-31.paginators.json rename to gen/stage1/emr/2009-03-31.paginators.json diff --git a/aws/gen/stage1/emr/2009-03-31.waiters.json b/gen/stage1/emr/2009-03-31.waiters.json similarity index 100% rename from aws/gen/stage1/emr/2009-03-31.waiters.json rename to gen/stage1/emr/2009-03-31.waiters.json diff --git a/aws/gen/stage1/iam/2010-05-08.api.json b/gen/stage1/iam/2010-05-08.api.json similarity index 100% rename from aws/gen/stage1/iam/2010-05-08.api.json rename to gen/stage1/iam/2010-05-08.api.json diff --git a/aws/gen/stage1/iam/2010-05-08.paginators.json b/gen/stage1/iam/2010-05-08.paginators.json similarity index 100% rename from aws/gen/stage1/iam/2010-05-08.paginators.json rename to gen/stage1/iam/2010-05-08.paginators.json diff --git a/aws/gen/stage1/importexport/2010-06-01.api.json b/gen/stage1/importexport/2010-06-01.api.json similarity index 100% rename from aws/gen/stage1/importexport/2010-06-01.api.json rename to gen/stage1/importexport/2010-06-01.api.json diff --git a/aws/gen/stage1/importexport/2010-06-01.paginators.json b/gen/stage1/importexport/2010-06-01.paginators.json similarity index 100% rename from aws/gen/stage1/importexport/2010-06-01.paginators.json rename to gen/stage1/importexport/2010-06-01.paginators.json diff --git a/aws/gen/stage1/kinesis/2013-12-02.api.json b/gen/stage1/kinesis/2013-12-02.api.json similarity index 100% rename from aws/gen/stage1/kinesis/2013-12-02.api.json rename to gen/stage1/kinesis/2013-12-02.api.json diff --git a/aws/gen/stage1/kinesis/2013-12-02.paginators.json b/gen/stage1/kinesis/2013-12-02.paginators.json similarity index 100% rename from aws/gen/stage1/kinesis/2013-12-02.paginators.json rename to gen/stage1/kinesis/2013-12-02.paginators.json diff --git a/aws/gen/stage1/kms/2014-11-01.api.json b/gen/stage1/kms/2014-11-01.api.json similarity index 100% rename from aws/gen/stage1/kms/2014-11-01.api.json rename to gen/stage1/kms/2014-11-01.api.json diff --git a/aws/gen/stage1/lambda/2014-11-11.api.json b/gen/stage1/lambda/2014-11-11.api.json similarity index 100% rename from aws/gen/stage1/lambda/2014-11-11.api.json rename to gen/stage1/lambda/2014-11-11.api.json diff --git a/aws/gen/stage1/logs/2014-03-28.api.json b/gen/stage1/logs/2014-03-28.api.json similarity index 100% rename from aws/gen/stage1/logs/2014-03-28.api.json rename to gen/stage1/logs/2014-03-28.api.json diff --git a/aws/gen/stage1/opsworks/2013-02-18.api.json b/gen/stage1/opsworks/2013-02-18.api.json similarity index 100% rename from aws/gen/stage1/opsworks/2013-02-18.api.json rename to gen/stage1/opsworks/2013-02-18.api.json diff --git a/aws/gen/stage1/rds/2014-09-01.api.json b/gen/stage1/rds/2014-09-01.api.json similarity index 100% rename from aws/gen/stage1/rds/2014-09-01.api.json rename to gen/stage1/rds/2014-09-01.api.json diff --git a/aws/gen/stage1/rds/2014-09-01.paginators.json b/gen/stage1/rds/2014-09-01.paginators.json similarity index 100% rename from aws/gen/stage1/rds/2014-09-01.paginators.json rename to gen/stage1/rds/2014-09-01.paginators.json diff --git a/aws/gen/stage1/rds/2014-09-01.waiters.json b/gen/stage1/rds/2014-09-01.waiters.json similarity index 100% rename from aws/gen/stage1/rds/2014-09-01.waiters.json rename to gen/stage1/rds/2014-09-01.waiters.json diff --git a/aws/gen/stage1/redshift/2012-12-01.api.json b/gen/stage1/redshift/2012-12-01.api.json similarity index 100% rename from aws/gen/stage1/redshift/2012-12-01.api.json rename to gen/stage1/redshift/2012-12-01.api.json diff --git a/aws/gen/stage1/redshift/2012-12-01.paginators.json b/gen/stage1/redshift/2012-12-01.paginators.json similarity index 100% rename from aws/gen/stage1/redshift/2012-12-01.paginators.json rename to gen/stage1/redshift/2012-12-01.paginators.json diff --git a/aws/gen/stage1/redshift/2012-12-01.waiters.json b/gen/stage1/redshift/2012-12-01.waiters.json similarity index 100% rename from aws/gen/stage1/redshift/2012-12-01.waiters.json rename to gen/stage1/redshift/2012-12-01.waiters.json diff --git a/aws/gen/stage1/route53/2013-04-01.api.json b/gen/stage1/route53/2013-04-01.api.json similarity index 100% rename from aws/gen/stage1/route53/2013-04-01.api.json rename to gen/stage1/route53/2013-04-01.api.json diff --git a/aws/gen/stage1/route53/2013-04-01.paginators.json b/gen/stage1/route53/2013-04-01.paginators.json similarity index 100% rename from aws/gen/stage1/route53/2013-04-01.paginators.json rename to gen/stage1/route53/2013-04-01.paginators.json diff --git a/aws/gen/stage1/route53domains/2014-05-15.api.json b/gen/stage1/route53domains/2014-05-15.api.json similarity index 100% rename from aws/gen/stage1/route53domains/2014-05-15.api.json rename to gen/stage1/route53domains/2014-05-15.api.json diff --git a/aws/gen/stage1/s3/2006-03-01.api.json b/gen/stage1/s3/2006-03-01.api.json similarity index 100% rename from aws/gen/stage1/s3/2006-03-01.api.json rename to gen/stage1/s3/2006-03-01.api.json diff --git a/aws/gen/stage1/s3/2006-03-01.paginators.json b/gen/stage1/s3/2006-03-01.paginators.json similarity index 100% rename from aws/gen/stage1/s3/2006-03-01.paginators.json rename to gen/stage1/s3/2006-03-01.paginators.json diff --git a/aws/gen/stage1/s3/2006-03-01.waiters.json b/gen/stage1/s3/2006-03-01.waiters.json similarity index 100% rename from aws/gen/stage1/s3/2006-03-01.waiters.json rename to gen/stage1/s3/2006-03-01.waiters.json diff --git a/aws/gen/stage1/sdb/2009-04-15.api.json b/gen/stage1/sdb/2009-04-15.api.json similarity index 100% rename from aws/gen/stage1/sdb/2009-04-15.api.json rename to gen/stage1/sdb/2009-04-15.api.json diff --git a/aws/gen/stage1/sdb/2009-04-15.paginators.json b/gen/stage1/sdb/2009-04-15.paginators.json similarity index 100% rename from aws/gen/stage1/sdb/2009-04-15.paginators.json rename to gen/stage1/sdb/2009-04-15.paginators.json diff --git a/aws/gen/stage1/ses/2010-12-01.api.json b/gen/stage1/ses/2010-12-01.api.json similarity index 100% rename from aws/gen/stage1/ses/2010-12-01.api.json rename to gen/stage1/ses/2010-12-01.api.json diff --git a/aws/gen/stage1/ses/2010-12-01.paginators.json b/gen/stage1/ses/2010-12-01.paginators.json similarity index 100% rename from aws/gen/stage1/ses/2010-12-01.paginators.json rename to gen/stage1/ses/2010-12-01.paginators.json diff --git a/aws/gen/stage1/ses/2010-12-01.waiters.json b/gen/stage1/ses/2010-12-01.waiters.json similarity index 100% rename from aws/gen/stage1/ses/2010-12-01.waiters.json rename to gen/stage1/ses/2010-12-01.waiters.json diff --git a/aws/gen/stage1/sns/2010-03-31.api.json b/gen/stage1/sns/2010-03-31.api.json similarity index 100% rename from aws/gen/stage1/sns/2010-03-31.api.json rename to gen/stage1/sns/2010-03-31.api.json diff --git a/aws/gen/stage1/sns/2010-03-31.paginators.json b/gen/stage1/sns/2010-03-31.paginators.json similarity index 100% rename from aws/gen/stage1/sns/2010-03-31.paginators.json rename to gen/stage1/sns/2010-03-31.paginators.json diff --git a/aws/gen/stage1/sqs/2012-11-05.api.json b/gen/stage1/sqs/2012-11-05.api.json similarity index 100% rename from aws/gen/stage1/sqs/2012-11-05.api.json rename to gen/stage1/sqs/2012-11-05.api.json diff --git a/aws/gen/stage1/storagegateway/2013-06-30.api.json b/gen/stage1/storagegateway/2013-06-30.api.json similarity index 100% rename from aws/gen/stage1/storagegateway/2013-06-30.api.json rename to gen/stage1/storagegateway/2013-06-30.api.json diff --git a/aws/gen/stage1/storagegateway/2013-06-30.paginators.json b/gen/stage1/storagegateway/2013-06-30.paginators.json similarity index 100% rename from aws/gen/stage1/storagegateway/2013-06-30.paginators.json rename to gen/stage1/storagegateway/2013-06-30.paginators.json diff --git a/aws/gen/stage1/sts/2011-06-15.api.json b/gen/stage1/sts/2011-06-15.api.json similarity index 100% rename from aws/gen/stage1/sts/2011-06-15.api.json rename to gen/stage1/sts/2011-06-15.api.json diff --git a/aws/gen/stage1/support/2013-04-15.api.json b/gen/stage1/support/2013-04-15.api.json similarity index 100% rename from aws/gen/stage1/support/2013-04-15.api.json rename to gen/stage1/support/2013-04-15.api.json diff --git a/aws/gen/stage1/support/2013-04-15.paginators.json b/gen/stage1/support/2013-04-15.paginators.json similarity index 100% rename from aws/gen/stage1/support/2013-04-15.paginators.json rename to gen/stage1/support/2013-04-15.paginators.json diff --git a/aws/gen/stage1/swf/2012-01-25.api.json b/gen/stage1/swf/2012-01-25.api.json similarity index 100% rename from aws/gen/stage1/swf/2012-01-25.api.json rename to gen/stage1/swf/2012-01-25.api.json diff --git a/aws/gen/stage1/swf/2012-01-25.paginators.json b/gen/stage1/swf/2012-01-25.paginators.json similarity index 100% rename from aws/gen/stage1/swf/2012-01-25.paginators.json rename to gen/stage1/swf/2012-01-25.paginators.json diff --git a/aws/gen/stage2/autoscaling.json b/gen/stage2/autoscaling.json similarity index 100% rename from aws/gen/stage2/autoscaling.json rename to gen/stage2/autoscaling.json diff --git a/aws/gen/stage2/cloudformation.json b/gen/stage2/cloudformation.json similarity index 100% rename from aws/gen/stage2/cloudformation.json rename to gen/stage2/cloudformation.json diff --git a/aws/gen/stage2/cloudfront.json b/gen/stage2/cloudfront.json similarity index 100% rename from aws/gen/stage2/cloudfront.json rename to gen/stage2/cloudfront.json diff --git a/aws/gen/stage2/cloudsearch.json b/gen/stage2/cloudsearch.json similarity index 100% rename from aws/gen/stage2/cloudsearch.json rename to gen/stage2/cloudsearch.json diff --git a/aws/gen/stage2/cloudsearchdomain.json b/gen/stage2/cloudsearchdomain.json similarity index 100% rename from aws/gen/stage2/cloudsearchdomain.json rename to gen/stage2/cloudsearchdomain.json diff --git a/aws/gen/stage2/cloudtrail.json b/gen/stage2/cloudtrail.json similarity index 100% rename from aws/gen/stage2/cloudtrail.json rename to gen/stage2/cloudtrail.json diff --git a/aws/gen/stage2/cloudwatch.json b/gen/stage2/cloudwatch.json similarity index 100% rename from aws/gen/stage2/cloudwatch.json rename to gen/stage2/cloudwatch.json diff --git a/aws/gen/stage2/codedeploy.json b/gen/stage2/codedeploy.json similarity index 100% rename from aws/gen/stage2/codedeploy.json rename to gen/stage2/codedeploy.json diff --git a/aws/gen/stage2/cognito-identity.json b/gen/stage2/cognito-identity.json similarity index 100% rename from aws/gen/stage2/cognito-identity.json rename to gen/stage2/cognito-identity.json diff --git a/aws/gen/stage2/cognito-sync.json b/gen/stage2/cognito-sync.json similarity index 100% rename from aws/gen/stage2/cognito-sync.json rename to gen/stage2/cognito-sync.json diff --git a/aws/gen/stage2/config.json b/gen/stage2/config.json similarity index 100% rename from aws/gen/stage2/config.json rename to gen/stage2/config.json diff --git a/aws/gen/stage2/datapipeline.json b/gen/stage2/datapipeline.json similarity index 100% rename from aws/gen/stage2/datapipeline.json rename to gen/stage2/datapipeline.json diff --git a/aws/gen/stage2/directconnect.json b/gen/stage2/directconnect.json similarity index 100% rename from aws/gen/stage2/directconnect.json rename to gen/stage2/directconnect.json diff --git a/aws/gen/stage2/dynamodb.json b/gen/stage2/dynamodb.json similarity index 100% rename from aws/gen/stage2/dynamodb.json rename to gen/stage2/dynamodb.json diff --git a/aws/gen/stage2/ec2.json b/gen/stage2/ec2.json similarity index 100% rename from aws/gen/stage2/ec2.json rename to gen/stage2/ec2.json diff --git a/aws/gen/stage2/elasticache.json b/gen/stage2/elasticache.json similarity index 100% rename from aws/gen/stage2/elasticache.json rename to gen/stage2/elasticache.json diff --git a/aws/gen/stage2/elasticbeanstalk.json b/gen/stage2/elasticbeanstalk.json similarity index 100% rename from aws/gen/stage2/elasticbeanstalk.json rename to gen/stage2/elasticbeanstalk.json diff --git a/aws/gen/stage2/elastictranscoder.json b/gen/stage2/elastictranscoder.json similarity index 100% rename from aws/gen/stage2/elastictranscoder.json rename to gen/stage2/elastictranscoder.json diff --git a/aws/gen/stage2/elb.json b/gen/stage2/elb.json similarity index 100% rename from aws/gen/stage2/elb.json rename to gen/stage2/elb.json diff --git a/aws/gen/stage2/emr.json b/gen/stage2/emr.json similarity index 100% rename from aws/gen/stage2/emr.json rename to gen/stage2/emr.json diff --git a/aws/gen/stage2/iam.json b/gen/stage2/iam.json similarity index 100% rename from aws/gen/stage2/iam.json rename to gen/stage2/iam.json diff --git a/aws/gen/stage2/importexport.json b/gen/stage2/importexport.json similarity index 100% rename from aws/gen/stage2/importexport.json rename to gen/stage2/importexport.json diff --git a/aws/gen/stage2/kinesis.json b/gen/stage2/kinesis.json similarity index 100% rename from aws/gen/stage2/kinesis.json rename to gen/stage2/kinesis.json diff --git a/aws/gen/stage2/kms.json b/gen/stage2/kms.json similarity index 100% rename from aws/gen/stage2/kms.json rename to gen/stage2/kms.json diff --git a/aws/gen/stage2/lambda.json b/gen/stage2/lambda.json similarity index 100% rename from aws/gen/stage2/lambda.json rename to gen/stage2/lambda.json diff --git a/aws/gen/stage2/logs.json b/gen/stage2/logs.json similarity index 100% rename from aws/gen/stage2/logs.json rename to gen/stage2/logs.json diff --git a/aws/gen/stage2/opsworks.json b/gen/stage2/opsworks.json similarity index 100% rename from aws/gen/stage2/opsworks.json rename to gen/stage2/opsworks.json diff --git a/aws/gen/stage2/rds.json b/gen/stage2/rds.json similarity index 100% rename from aws/gen/stage2/rds.json rename to gen/stage2/rds.json diff --git a/aws/gen/stage2/redshift.json b/gen/stage2/redshift.json similarity index 100% rename from aws/gen/stage2/redshift.json rename to gen/stage2/redshift.json diff --git a/aws/gen/stage2/route53.json b/gen/stage2/route53.json similarity index 100% rename from aws/gen/stage2/route53.json rename to gen/stage2/route53.json diff --git a/aws/gen/stage2/route53domains.json b/gen/stage2/route53domains.json similarity index 100% rename from aws/gen/stage2/route53domains.json rename to gen/stage2/route53domains.json diff --git a/aws/gen/stage2/s3.json b/gen/stage2/s3.json similarity index 100% rename from aws/gen/stage2/s3.json rename to gen/stage2/s3.json diff --git a/aws/gen/stage2/sdb.json b/gen/stage2/sdb.json similarity index 100% rename from aws/gen/stage2/sdb.json rename to gen/stage2/sdb.json diff --git a/aws/gen/stage2/ses.json b/gen/stage2/ses.json similarity index 100% rename from aws/gen/stage2/ses.json rename to gen/stage2/ses.json diff --git a/aws/gen/stage2/sns.json b/gen/stage2/sns.json similarity index 100% rename from aws/gen/stage2/sns.json rename to gen/stage2/sns.json diff --git a/aws/gen/stage2/sqs.json b/gen/stage2/sqs.json similarity index 100% rename from aws/gen/stage2/sqs.json rename to gen/stage2/sqs.json diff --git a/aws/gen/stage2/storagegateway.json b/gen/stage2/storagegateway.json similarity index 100% rename from aws/gen/stage2/storagegateway.json rename to gen/stage2/storagegateway.json diff --git a/aws/gen/stage2/sts.json b/gen/stage2/sts.json similarity index 100% rename from aws/gen/stage2/sts.json rename to gen/stage2/sts.json diff --git a/aws/gen/stage2/support.json b/gen/stage2/support.json similarity index 100% rename from aws/gen/stage2/support.json rename to gen/stage2/support.json diff --git a/aws/gen/stage2/swf.json b/gen/stage2/swf.json similarity index 100% rename from aws/gen/stage2/swf.json rename to gen/stage2/swf.json diff --git a/aws/gen/templates/_include/applicative.ede b/gen/templates/_include/applicative.ede similarity index 100% rename from aws/gen/templates/_include/applicative.ede rename to gen/templates/_include/applicative.ede diff --git a/aws/gen/templates/_include/body.ede b/gen/templates/_include/body.ede similarity index 100% rename from aws/gen/templates/_include/body.ede rename to gen/templates/_include/body.ede diff --git a/aws/gen/templates/_include/constructor-documentation.ede b/gen/templates/_include/constructor-documentation.ede similarity index 100% rename from aws/gen/templates/_include/constructor-documentation.ede rename to gen/templates/_include/constructor-documentation.ede diff --git a/aws/gen/templates/_include/constructor-signature.ede b/gen/templates/_include/constructor-signature.ede similarity index 100% rename from aws/gen/templates/_include/constructor-signature.ede rename to gen/templates/_include/constructor-signature.ede diff --git a/aws/gen/templates/_include/constructor.ede b/gen/templates/_include/constructor.ede similarity index 100% rename from aws/gen/templates/_include/constructor.ede rename to gen/templates/_include/constructor.ede diff --git a/aws/gen/templates/_include/datatype.ede b/gen/templates/_include/datatype.ede similarity index 100% rename from aws/gen/templates/_include/datatype.ede rename to gen/templates/_include/datatype.ede diff --git a/aws/gen/templates/_include/deriving.ede b/gen/templates/_include/deriving.ede similarity index 100% rename from aws/gen/templates/_include/deriving.ede rename to gen/templates/_include/deriving.ede diff --git a/aws/gen/templates/_include/field.ede b/gen/templates/_include/field.ede similarity index 100% rename from aws/gen/templates/_include/field.ede rename to gen/templates/_include/field.ede diff --git a/aws/gen/templates/_include/headers.ede b/gen/templates/_include/headers.ede similarity index 100% rename from aws/gen/templates/_include/headers.ede rename to gen/templates/_include/headers.ede diff --git a/aws/gen/templates/_include/imports.ede b/gen/templates/_include/imports.ede similarity index 100% rename from aws/gen/templates/_include/imports.ede rename to gen/templates/_include/imports.ede diff --git a/aws/gen/templates/_include/iso.ede b/gen/templates/_include/iso.ede similarity index 100% rename from aws/gen/templates/_include/iso.ede rename to gen/templates/_include/iso.ede diff --git a/aws/gen/templates/_include/json-from.ede b/gen/templates/_include/json-from.ede similarity index 100% rename from aws/gen/templates/_include/json-from.ede rename to gen/templates/_include/json-from.ede diff --git a/aws/gen/templates/_include/json-operator.ede b/gen/templates/_include/json-operator.ede similarity index 100% rename from aws/gen/templates/_include/json-operator.ede rename to gen/templates/_include/json-operator.ede diff --git a/aws/gen/templates/_include/json-to.ede b/gen/templates/_include/json-to.ede similarity index 100% rename from aws/gen/templates/_include/json-to.ede rename to gen/templates/_include/json-to.ede diff --git a/aws/gen/templates/_include/lenses.ede b/gen/templates/_include/lenses.ede similarity index 100% rename from aws/gen/templates/_include/lenses.ede rename to gen/templates/_include/lenses.ede diff --git a/aws/gen/templates/_include/license.ede b/gen/templates/_include/license.ede similarity index 100% rename from aws/gen/templates/_include/license.ede rename to gen/templates/_include/license.ede diff --git a/aws/gen/templates/_include/list.ede b/gen/templates/_include/list.ede similarity index 100% rename from aws/gen/templates/_include/list.ede rename to gen/templates/_include/list.ede diff --git a/aws/gen/templates/_include/nullary.ede b/gen/templates/_include/nullary.ede similarity index 100% rename from aws/gen/templates/_include/nullary.ede rename to gen/templates/_include/nullary.ede diff --git a/aws/gen/templates/_include/operation-exports.ede b/gen/templates/_include/operation-exports.ede similarity index 100% rename from aws/gen/templates/_include/operation-exports.ede rename to gen/templates/_include/operation-exports.ede diff --git a/aws/gen/templates/_include/pager-operator.ede b/gen/templates/_include/pager-operator.ede similarity index 100% rename from aws/gen/templates/_include/pager-operator.ede rename to gen/templates/_include/pager-operator.ede diff --git a/aws/gen/templates/_include/pager.ede b/gen/templates/_include/pager.ede similarity index 100% rename from aws/gen/templates/_include/pager.ede rename to gen/templates/_include/pager.ede diff --git a/aws/gen/templates/_include/path.ede b/gen/templates/_include/path.ede similarity index 100% rename from aws/gen/templates/_include/path.ede rename to gen/templates/_include/path.ede diff --git a/aws/gen/templates/_include/query-to.ede b/gen/templates/_include/query-to.ede similarity index 100% rename from aws/gen/templates/_include/query-to.ede rename to gen/templates/_include/query-to.ede diff --git a/aws/gen/templates/_include/query.ede b/gen/templates/_include/query.ede similarity index 100% rename from aws/gen/templates/_include/query.ede rename to gen/templates/_include/query.ede diff --git a/aws/gen/templates/_include/record.ede b/gen/templates/_include/record.ede similarity index 100% rename from aws/gen/templates/_include/record.ede rename to gen/templates/_include/record.ede diff --git a/aws/gen/templates/_include/request.ede b/gen/templates/_include/request.ede similarity index 100% rename from aws/gen/templates/_include/request.ede rename to gen/templates/_include/request.ede diff --git a/aws/gen/templates/_include/response-body.ede b/gen/templates/_include/response-body.ede similarity index 100% rename from aws/gen/templates/_include/response-body.ede rename to gen/templates/_include/response-body.ede diff --git a/aws/gen/templates/_include/response-json.ede b/gen/templates/_include/response-json.ede similarity index 100% rename from aws/gen/templates/_include/response-json.ede rename to gen/templates/_include/response-json.ede diff --git a/aws/gen/templates/_include/response-xml.ede b/gen/templates/_include/response-xml.ede similarity index 100% rename from aws/gen/templates/_include/response-xml.ede rename to gen/templates/_include/response-xml.ede diff --git a/aws/gen/templates/_include/response.ede b/gen/templates/_include/response.ede similarity index 100% rename from aws/gen/templates/_include/response.ede rename to gen/templates/_include/response.ede diff --git a/aws/gen/templates/_include/service.ede b/gen/templates/_include/service.ede similarity index 100% rename from aws/gen/templates/_include/service.ede rename to gen/templates/_include/service.ede diff --git a/aws/gen/templates/_include/types-exports.ede b/gen/templates/_include/types-exports.ede similarity index 100% rename from aws/gen/templates/_include/types-exports.ede rename to gen/templates/_include/types-exports.ede diff --git a/aws/gen/templates/_include/xml-from.ede b/gen/templates/_include/xml-from.ede similarity index 100% rename from aws/gen/templates/_include/xml-from.ede rename to gen/templates/_include/xml-from.ede diff --git a/aws/gen/templates/_include/xml-operator.ede b/gen/templates/_include/xml-operator.ede similarity index 100% rename from aws/gen/templates/_include/xml-operator.ede rename to gen/templates/_include/xml-operator.ede diff --git a/aws/gen/templates/_include/xml-to-root.ede b/gen/templates/_include/xml-to-root.ede similarity index 100% rename from aws/gen/templates/_include/xml-to-root.ede rename to gen/templates/_include/xml-to-root.ede diff --git a/aws/gen/templates/_include/xml-to.ede b/gen/templates/_include/xml-to.ede similarity index 100% rename from aws/gen/templates/_include/xml-to.ede rename to gen/templates/_include/xml-to.ede diff --git a/aws/gen/templates/cabal.ede b/gen/templates/cabal.ede similarity index 100% rename from aws/gen/templates/cabal.ede rename to gen/templates/cabal.ede diff --git a/aws/gen/templates/operation-json.ede b/gen/templates/operation-json.ede similarity index 100% rename from aws/gen/templates/operation-json.ede rename to gen/templates/operation-json.ede diff --git a/aws/gen/templates/operation-query.ede b/gen/templates/operation-query.ede similarity index 100% rename from aws/gen/templates/operation-query.ede rename to gen/templates/operation-query.ede diff --git a/aws/gen/templates/operation-xml.ede b/gen/templates/operation-xml.ede similarity index 100% rename from aws/gen/templates/operation-xml.ede rename to gen/templates/operation-xml.ede diff --git a/aws/gen/templates/readme.ede b/gen/templates/readme.ede similarity index 100% rename from aws/gen/templates/readme.ede rename to gen/templates/readme.ede diff --git a/aws/gen/templates/service.ede b/gen/templates/service.ede similarity index 100% rename from aws/gen/templates/service.ede rename to gen/templates/service.ede diff --git a/aws/gen/templates/types-json.ede b/gen/templates/types-json.ede similarity index 100% rename from aws/gen/templates/types-json.ede rename to gen/templates/types-json.ede diff --git a/aws/gen/templates/types-query.ede b/gen/templates/types-query.ede similarity index 100% rename from aws/gen/templates/types-query.ede rename to gen/templates/types-query.ede diff --git a/aws/gen/templates/types-xml.ede b/gen/templates/types-xml.ede similarity index 100% rename from aws/gen/templates/types-xml.ede rename to gen/templates/types-xml.ede diff --git a/script/generate-pages b/script/generate-pages index faa0534dbe2..417f30f46b2 100755 --- a/script/generate-pages +++ b/script/generate-pages @@ -1,20 +1,18 @@ #!/usr/bin/env bash -set -x -set -o errexit +set -e -cabal configure --disable-tests +doc=$HOME/Projects/aws-doc +libs=$HOME/Projects/aws/amazonka-* -DOCDIR=`mktemp -d -t pages.XXXXXX` -cabal haddock --haddock-option=-o$DOCDIR +standalone-haddock \ + -o $doc \ + --package-db $HOME/Projects/aws/.cabal-sandbox/x86_64-osx-ghc-7.8.3-packages.conf.d \ + amazonka core $libs -HEAD=`git rev-parse HEAD` +cd $doc -git checkout gh-pages -git rm -rf --ignore-unmatch . - -mv $DOCDIR/* . -rm -rf dist/ -git add *.html *.js *.css *.gif *.png - -git commit -m "Generated documentation from $HEAD" +git checkout gh-pages || true +git add . +git commit -am "Updating" +git push origin gh-pages diff --git a/aws/script/upload-documentation b/script/upload-documentation similarity index 100% rename from aws/script/upload-documentation rename to script/upload-documentation diff --git a/aws/share/include.mk b/share/include.mk similarity index 100% rename from aws/share/include.mk rename to share/include.mk diff --git a/src/Network/AWS.hs b/src/Network/AWS.hs deleted file mode 100644 index 9704e363660..00000000000 --- a/src/Network/AWS.hs +++ /dev/null @@ -1,206 +0,0 @@ -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RankNTypes #-} -{-# LANGUAGE RecordWildCards #-} - --- Module : Network.AWS --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | -module Network.AWS - ( - -- * AWS Context - AWS - , runAWS - - , AWSEnv - , loadAWSEnv - , runAWSEnv - - , getEnv - , runEnv - - -- * Credentials - , Credentials (..) - - -- * Regions - , Region (..) - , within - , getRegion - - -- * Debugging - , getDebug - , whenDebug - - -- * Synchronous Requests - , send - , send_ - , sendCatch - - -- * Asynchronous Actions - , async - , wait - , wait_ - - -- * Asynchronous Requests - , sendAsync - , waitAsync - , waitAsync_ - - -- * Paginated Requests - , paginate - , paginateCatch - - -- * File Bodies - , requestBodyFile - - -- * Errors - , ToError (..) - , AWSError (..) - , hoistError - , liftEitherT - - -- * Types - , AvailabilityZone (..) - , InstanceType (..) - , Items (..) - , Members (..) - - -- * S3 Presigning - , presignS3 - ) where - -import Control.Applicative -import qualified Control.Concurrent.Async as A -import Control.Error -import Control.Exception -import qualified Control.Exception.Lifted as Lifted -import Control.Monad -import Control.Monad.Error -import Control.Monad.Trans.Reader -import Control.Monad.Trans.Resource -import Control.Monad.Trans.Resource.Internal -import Data.Acquire -import Data.Conduit -import qualified Data.Conduit.Binary as Conduit -import Network.AWS.Auth -import Network.AWS.Internal -import Network.HTTP.Conduit -import System.IO - -type AWSEnv = InternalState -> Env - -runAWS :: Credentials -> Bool -> AWS a -> IO (Either AWSError a) -runAWS cred dbg aws = - runEitherT (loadAWSEnv cred dbg) >>= - either (return . Left . toError) - (`runAWSEnv` aws) - -runAWSEnv :: AWSEnv -> AWS a -> IO (Either AWSError a) -runAWSEnv f aws = runResourceT . withInternalState $ \s -> runEnv (f s) aws - -loadAWSEnv :: (Applicative m, MonadIO m) - => Credentials - -> Bool - -> EitherT String m AWSEnv -loadAWSEnv cred dbg = Env defaultRegion dbg - <$> liftIO (newManager conduitManagerSettings) - <*> credentials cred - -runEnv :: Env -> AWS a -> IO (Either AWSError a) -runEnv env aws = runEitherT $ runReaderT (unwrap aws) env - --- | Run an 'AWS' operation inside a specific 'Region'. -within :: Region -> AWS a -> AWS a -within reg = AWS . local (\e -> e { awsRegion = reg }) . unwrap - -hoistError :: (MonadError e m, Error e) => Either e a -> m a -hoistError = either throwError return - -liftEitherT :: ToError e => EitherT e IO a -> AWS a -liftEitherT = AWS . lift . fmapLT toError - --- | Send a request and return the associated response type. -send :: (Rq a, ToError (Er a)) => a -> AWS (Rs a) -send = (hoistError . fmapL toError =<<) . sendCatch - -send_ :: (Rq a, ToError (Er a)) => a -> AWS () -send_ = void . send - -sendCatch :: Rq a => a -> AWS (Either (Er a) (Rs a)) -sendCatch rq = do - s <- sign $ request rq - whenDebug . liftIO $ putStrLn "[Signed]" >> print s - m <- getManager - h <- http s m - whenDebug . liftIO $ putStrLn "[Response]" >> print h - rs <- response rq h - hoistError rs - -async :: AWS a -> AWS (A.Async (Either AWSError a)) -async aws = getEnv >>= resourceAsync . lift . (`runEnv` aws) - -wait :: A.Async (Either AWSError a) -> AWS a -wait a = liftIO (A.waitCatch a) >>= hoistError . join . fmapL toError - -wait_ :: A.Async (Either AWSError a) -> AWS () -wait_ = void . wait - -sendAsync :: Rq a => a -> AWS (A.Async (Either AWSError (Either (Er a) (Rs a)))) -sendAsync = async . sendCatch - -waitAsync :: ToError e => A.Async (Either AWSError (Either e a)) -> AWS a -waitAsync a = wait a >>= hoistError . fmapL toError - -waitAsync_ :: ToError e => A.Async (Either AWSError (Either e a)) -> AWS () -waitAsync_ = void . waitAsync - --- | Create a 'Source' which yields the initial and subsequent repsonses --- for requests that support pagination. -paginate :: (Rq a, Pg a, ToError (Er a)) - => a - -> Source AWS (Rs a) -paginate rq = paginateCatch rq $= awaitForever go - where - go (Left e) = lift . liftEitherT . left $ toError e - go (Right x) = yield x - -paginateCatch :: (Rq a, Pg a, ToError (Er a)) - => a - -> Source AWS (Either (Er a) (Rs a)) -paginateCatch = go . Just - where - go Nothing = return () - go (Just rq) = do - rs <- lift $ sendCatch rq - yield rs - either (const $ return ()) - (go . next rq) - rs - -resourceAsync :: MonadResource m => ResourceT IO a -> m (A.Async a) -resourceAsync (ResourceT f) = liftResourceT . ResourceT $ \g -> Lifted.mask $ \h -> - bracket_ - (stateAlloc g) - (return ()) - (A.async $ bracket_ - (return ()) - (stateCleanup ReleaseNormal g) - (h $ f g)) - -requestBodyFile :: MonadIO m => FilePath -> m (Maybe RequestBody) -requestBodyFile f = runMaybeT $ do - n <- join . hushT $ syncIO getFileSize - return . requestBodySource n $ Conduit.sourceFile f - where - getFileSize = fmap hoistMaybe $ - bracket (openBinaryFile f ReadMode) - hClose - (fmap (Just . fromIntegral) . hFileSize) diff --git a/src/Network/AWS/Auth.hs b/src/Network/AWS/Auth.hs deleted file mode 100644 index 15995e224b9..00000000000 --- a/src/Network/AWS/Auth.hs +++ /dev/null @@ -1,129 +0,0 @@ -{-# LANGUAGE BangPatterns #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE ViewPatterns #-} - --- Module : Network.AWS.Auth --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | -module Network.AWS.Auth where - -import Control.Applicative -import Control.Concurrent -import Control.Error -import Control.Monad -import Control.Monad.IO.Class -import qualified Data.Aeson as Aeson -import qualified Data.ByteString.Char8 as BS -import qualified Data.ByteString.Lazy.Char8 as LBS -import Data.IORef -import Data.Monoid -import Data.String -import Data.Text (Text) -import qualified Data.Text as Text -import qualified Data.Text.Encoding as Text -import Data.Time -import Network.AWS.EC2.Metadata -import Network.AWS.Internal hiding (Env) -import System.Environment - -data Credentials - = AuthBasic Text Text - -- ^ Basic credentials containing an access key and a secret key. - | AuthSession Text Text Text - -- ^ Session credentials containing access key, secret key, and a security token. - | AuthProfile Text - -- ^ A specific IAM Profile name to query the local instance-data for credentials. - | AuthEnv Text Text - -- ^ Environment variable names to read for the access and secret keys. - | AuthDiscover - -- ^ Attempt to read the default access and secret keys from the environment, - -- falling back to the first available IAM profile if they are not set. - -- - -- This attempts to resolve rather than directly - -- retrieving for IAM profile information to ensure - -- the request terminates promptly if not running on EC2. - deriving (Eq, Ord) - -instance Show Credentials where - show (AuthBasic a _) = Text.unpack $ Text.concat ["Basic ", a, " ****"] - show (AuthSession a _ _) = Text.unpack $ Text.concat ["Session ", a, " **** ****"] - show (AuthProfile n) = Text.unpack $ "Profile " <> n - show (AuthEnv a s) = Text.unpack $ Text.concat ["Env ", a, " ", s] - show AuthDiscover = "Discover" - --- | Default access key environment variable: 'AWS_ACCESS_KEY' -accessKey :: Text -accessKey = "AWS_ACCESS_KEY" - --- | Default secret key environment variable: 'AWS_SECRET_KEY' -secretKey :: Text -secretKey = "AWS_SECRET_KEY" - -credentials :: (Applicative m, MonadIO m) - => Credentials - -> EitherT String m (IORef Auth) -credentials = mk - where - mk (AuthBasic a s) = ref $ Auth a s Nothing Nothing - mk (AuthSession a s t) = ref $ Auth a s (Just t) Nothing - mk (AuthProfile n) = fromProfile n - mk (AuthEnv a s) = fromKeys a s - mk AuthDiscover = fromKeys accessKey secretKey - <|> (defaultProfile >>= fromProfile) - - fromKeys a s = Auth <$> key a <*> key s <*> pure Nothing <*> pure Nothing - >>= ref - - key (Text.unpack -> k) = fmapLT (fromString . show) (syncIO $ lookupEnv k) - >>= failWith (fromString $ "Unable to read ENV variable: " ++ k) - >>= return . Text.pack - - ref = liftIO . newIORef - -defaultProfile :: (Applicative m, MonadIO m) => EitherT String m Text -defaultProfile = do - ls <- BS.lines <$> meta (IAM $ SecurityCredentials Nothing) - p <- tryHead "Unable to get default IAM Profile from metadata" ls - return $ Text.decodeUtf8 p - --- | The IORef wrapper + timer is designed so that multiple concurrenct --- accesses of 'Auth' from the 'AWS' environment are not required to calculate --- expiry and sequentially queue to update it. --- --- The forked timer ensures a singular owner and pre-emptive refresh of the --- temporary session credentials. -fromProfile :: (Applicative m, MonadIO m) - => Text - -> EitherT String m (IORef Auth) -fromProfile name = do - !a@Auth{..} <- auth - fmapLT show . syncIO . liftIO $ do - ref <- newIORef a - start ref expiration - return ref - where - auth :: (Applicative m, MonadIO m) => EitherT String m Auth - auth = do - m <- LBS.fromStrict <$> meta (IAM . SecurityCredentials $ Just name) - hoistEither $ Aeson.eitherDecode m - - start ref = maybe (return ()) (timer ref <=< delay) - - delay n = truncate . diffUTCTime n <$> getCurrentTime - - -- FIXME: guard against a lower expiration than the -60 - -- remove the error . show shenanigans - timer ref n = void . forkIO $ do - threadDelay $ (n - 60) * 1000000 - !a@Auth{..} <- eitherT (error . show) return auth - atomicWriteIORef ref a - start ref expiration diff --git a/src/Network/AWS/AutoScaling.hs b/src/Network/AWS/AutoScaling.hs deleted file mode 100644 index 50e6cc39b47..00000000000 --- a/src/Network/AWS/AutoScaling.hs +++ /dev/null @@ -1,1343 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies #-} - --- Module : Network.AWS.AutoScaling --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | Auto Scaling is a web service designed to automatically launch or terminate --- Amazon Elastic Compute Cloud (Amazon EC2) instances based on user-defined --- policies, schedules, and health checks. --- --- This service is used in conjunction with Amazon CloudWatch and --- Elastic Load Balancing services. -module Network.AWS.AutoScaling - ( - -- * Actions - -- ** CreateAutoScalingGroup - CreateAutoScalingGroup (..) - , CreateAutoScalingGroupResponse (..) - - -- ** CreateLaunchConfiguration - , CreateLaunchConfiguration (..) - , CreateLaunchConfigurationResponse (..) - - -- ** CreateOrUpdateTags - , CreateOrUpdateTags (..) - , CreateOrUpdateTagsResponse (..) - - -- ** DeleteAutoScalingGroup - , DeleteAutoScalingGroup (..) - , DeleteAutoScalingGroupResponse (..) - - -- ** DeleteLaunchConfiguration - , DeleteLaunchConfiguration (..) - , DeleteLaunchConfigurationResponse (..) - - -- ** DeleteNotificationConfiguration - , DeleteNotificationConfiguration (..) - , DeleteNotificationConfigurationResponse (..) - - -- ** DeletePolicy - , DeletePolicy (..) - , DeletePolicyResponse (..) - - -- ** DeleteScheduledAction - , DeleteScheduledAction (..) - , DeleteScheduledActionResponse (..) - - -- ** DeleteTags - , DeleteTags (..) - , DeleteTagsResponse (..) - - -- ** DescribeAdjustmentTypes - , DescribeAdjustmentTypes (..) - , DescribeAdjustmentTypesResponse (..) - - -- ** DescribeAutoScalingGroups - , DescribeAutoScalingGroups (..) - , DescribeAutoScalingGroupsResponse (..) - - -- ** DescribeAutoScalingInstances - , DescribeAutoScalingInstances (..) - , DescribeAutoScalingInstancesResponse (..) - - -- ** DescribeAutoScalingNotificationTypes - , DescribeAutoScalingNotificationTypes (..) - , DescribeAutoScalingNotificationTypesResponse (..) - - -- ** DescribeLaunchConfigurations - , DescribeLaunchConfigurations (..) - , DescribeLaunchConfigurationsResponse (..) - - -- ** DescribeMetricCollectionTypes - , DescribeMetricCollectionTypes (..) - , DescribeMetricCollectionTypesResponse (..) - - -- ** DescribeNotificationConfigurations - , DescribeNotificationConfigurations (..) - , DescribeNotificationConfigurationsResponse (..) - - -- ** DescribePolicies - , DescribePolicies (..) - , DescribePoliciesResponse (..) - - -- ** DescribeScalingActivities - , DescribeScalingActivities (..) - , DescribeScalingActivitiesResponse (..) - - -- ** DescribeScalingProcessTypes - , DescribeScalingProcessTypes (..) - , DescribeScalingProcessTypesResponse (..) - - -- ** DescribeScheduledActions - , DescribeScheduledActions (..) - , DescribeScheduledActionsResponse (..) - - -- ** DescribeTags - , DescribeTags (..) - , DescribeTagsResponse (..) - - -- ** DescribeTerminationPolicyTypes - , DescribeTerminationPolicyTypes (..) - , DescribeTerminationPolicyTypesResponse (..) - - -- ** DisableMetricsCollection - , DisableMetricsCollection (..) - , DisableMetricsCollectionResponse (..) - - -- ** EnableMetricsCollection - , EnableMetricsCollection (..) - , EnableMetricsCollectionResponse (..) - - -- ** ExecutePolicy - , ExecutePolicy (..) - , ExecutePolicyResponse (..) - - -- ** PutNotificationConfiguration - , PutNotificationConfiguration (..) - , PutNotificationConfigurationResponse (..) - - -- ** PutScalingPolicy - , PutScalingPolicy (..) - , PutScalingPolicyResponse (..) - - -- ** PutScheduledUpdateGroupAction - , PutScheduledUpdateGroupAction (..) - , PutScheduledUpdateGroupActionResponse (..) - - -- ** ResumeProcesses - , ResumeProcesses (..) - , ResumeProcessesResponse (..) - - -- ** SetDesiredCapacity - , SetDesiredCapacity (..) - , SetDesiredCapacityResponse (..) - - -- ** SetInstanceHealth - , SetInstanceHealth (..) - , SetInstanceHealthResponse (..) - - -- ** SuspendProcesses - , SuspendProcesses (..) - , SuspendProcessesResponse (..) - - -- ** TerminateInstanceInAutoScalingGroup - , TerminateInstanceInAutoScalingGroup (..) - , TerminateInstanceInAutoScalingGroupResponse (..) - - -- ** UpdateAutoScalingGroup - , UpdateAutoScalingGroup (..) - , UpdateAutoScalingGroupResponse (..) - - -- * Data Types - , module Network.AWS.AutoScaling.Types - - -- * Common - , module Network.AWS - ) where - -import Data.Text (Text) -import Data.Time -import Network.AWS -import Network.AWS.AutoScaling.Types -import Network.AWS.Internal -import Network.HTTP.Types.Method - --- | Creates a new Auto Scaling group with the specified name and other --- attributes. When the creation request is completed, the Auto Scaling group --- is ready to be used in other calls. Note The Auto Scaling group name must --- be unique within the scope of your AWS account. --- --- -data CreateAutoScalingGroup = CreateAutoScalingGroup - { casgAutoScalingGroupName :: !Text - -- ^ The name of the Auto Scaling group. - , casgAvailabilityZones :: Members AvailabilityZone - -- ^ A list of Availability Zones for the Auto Scaling group. This is - -- required unless you have specified subnets. - , casgDefaultCooldown :: Maybe Integer - -- ^ The amount of time, in seconds, between a successful scaling - -- activity and the succeeding scaling activity. - , casgDesiredCapacity :: Maybe Integer - -- ^ The number of Amazon EC2 instances that should be running in the - -- group. The desired capacity must be greater than or equal to the - -- minimum size and less than or equal to the maximum size specified - -- for the Auto Scaling group. - , casgHealthCheckGracePeriod :: Maybe Integer - -- ^ Length of time in seconds after a new Amazon EC2 instance comes - -- into service that Auto Scaling starts checking its health. During - -- this time any health check failure for the that instance is ignored. - , casgHealthCheckType :: Maybe Text - -- ^ The service you want the health checks from, Amazon EC2 or - -- Elastic Load Balancer. Valid values are EC2 or ELB. - , casgLaunchConfigurationName :: !Text - -- ^ The name of an existing launch configuration to use to launch new - -- instances. - , casgLoadBalancerNames :: Members Text - -- ^ A list of existing Elastic Load Balancing load balancers to use. - -- The load balancers must be associated with the AWS account. - , casgMaxSize :: !Integer - -- ^ The maximum size of the Auto Scaling group. - , casgMinSize :: !Integer - -- ^ The minimum size of the Auto Scaling group. - , casgPlacementGroup :: Maybe Text - -- ^ Physical location of an existing cluster placement group into - -- which you want to launch your instances. For information about - -- cluster placement group, see Using Cluster Instances - , casgTags :: Members Tag - -- ^ The tag to be created or updated. Each tag should be defined by - -- its resource type, resource ID, key, value, and a propagate flag. - -- Valid values: key=value, value=value, propagate=true or false. - -- Value and propagate are optional parameters. - , casgTerminationPolicies :: Members Text - -- ^ A standalone termination policy or a list of termination policies - -- used to select the instance to terminate. The policies are - -- executed in the order that they are listed. - , casgVPCZoneIdentifier :: Maybe Text - -- ^ A comma-separated list of subnet identifiers of Amazon Virtual - -- Private Clouds (Amazon VPCs). - } deriving (Eq, Show, Generic) - -instance IsQuery CreateAutoScalingGroup - -instance Rq CreateAutoScalingGroup where - type Er CreateAutoScalingGroup = AutoScalingErrorResponse - type Rs CreateAutoScalingGroup = CreateAutoScalingGroupResponse - request = query4 autoScaling GET "CreateAutoScalingGroup" - -data CreateAutoScalingGroupResponse = CreateAutoScalingGroupResponse - { casgrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML CreateAutoScalingGroupResponse where - xmlPickler = withNS autoScalingNS - --- | Creates a new launch configuration. The launch configuration name must be --- unique within the scope of the client's AWS account. --- --- The maximum limit of launch configurations, which by default is 100, --- must not yet have been met; otherwise, the call will fail. --- --- When created, the new launch configuration is available for immediate use. --- --- -data CreateLaunchConfiguration = CreateLaunchConfiguration - { clcBlockDeviceMappings :: Members BlockDeviceMapping - -- ^ A list of mappings that specify how block devices are exposed to - -- the instance. Each mapping is made up of a VirtualName, a - -- DeviceName, and an ebs data structure that contains information - -- about the associated Elastic Block Storage volume. For more - -- information about Amazon EC2 BlockDeviceMappings, go to Block - -- Device Mapping in the Amazon EC2 product documentation. - , clcEbsOptimized :: Maybe Bool - -- ^ Whether the instance is optimized for EBS I/O. The optimization - -- provides dedicated throughput to Amazon EBS and an optimized - -- configuration stack to provide optimal EBS I/O performance. This - -- optimization is not available with all instance types. Additional - -- usage charges apply when using an EBS Optimized instance. By - -- default the instance is not optimized for EBS I/O. For - -- information about EBS-optimized instances, go to EBS-Optimized - -- Instances in the Amazon Elastic Compute Cloud User Guide. - , clcIamInstanceProfile :: Maybe Text - -- ^ The name or the Amazon Resource Name (ARN) of the instance - -- profile associated with the IAM role for the instance. - , clcImageId :: !Text - -- ^ Unique ID of the Amazon Machine Image (AMI) you want to use to - -- launch your EC2 instances. For information about finding Amazon - -- EC2 AMIs, see Finding a Suitable AMI in the Amazon Elastic - -- Compute Cloud User Guide. - , clcInstanceMonitoring :: Maybe InstanceMonitoring - -- ^ Enables detailed monitoring if it is disabled. Detailed - -- monitoring is enabled by default. - , clcInstanceType :: !InstanceType - -- ^ The instance type of the Amazon EC2 instance. For information - -- about available Amazon EC2 instance types, see Available Instance - -- Types in the Amazon Elastic Cloud Compute User Guide. - , clcKernelId :: Maybe Text - -- ^ The ID of the kernel associated with the Amazon EC2 AMI. - , clcKeyName :: Maybe Text - -- ^ The name of the Amazon EC2 key pair. For more information, see - -- Getting a Key Pair in the Amazon Elastic Compute Cloud User Guide. - , clcLaunchConfigurationName :: !Text - -- ^ The name of the launch configuration to create. - , clcRamdiskId :: Maybe Text - -- ^ The ID of the RAM disk associated with the Amazon EC2 AMI. - , clcSecurityGroups :: Members Text - -- ^ The security groups with which to associate Amazon EC2 or Amazon - -- VPC instances. - , clcSpotPrice :: Maybe Text - -- ^ The maximum hourly price to be paid for any Spot Instance - -- launched to fulfill the request. Spot Instances are launched when - -- the price you specify exceeds the current Spot market price. For - -- more information on launching Spot Instances, see Using Auto - -- Scaling to Launch Spot Instances in the Auto Scaling Developer - -- Guide. - , clcUserData :: Maybe Text - -- ^ The user data to make available to the launched Amazon EC2 - -- instances. For more information about Amazon EC2 user data, see - -- User Data Retrieval in the Amazon Elastic Compute Cloud User - -- Guide. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateLaunchConfiguration - -instance Rq CreateLaunchConfiguration where - type Er CreateLaunchConfiguration = AutoScalingErrorResponse - type Rs CreateLaunchConfiguration = CreateLaunchConfigurationResponse - request = query4 autoScaling GET "CreateLaunchConfiguration" - -data CreateLaunchConfigurationResponse = CreateLaunchConfigurationResponse - { clcrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML CreateLaunchConfigurationResponse where - xmlPickler = withNS autoScalingNS - --- | Creates new tags or updates existing tags for an Auto Scaling group. Note A --- tag's definition is composed of a resource ID, resource type, key and --- value, and the propagate flag. Value and the propagate flag are optional --- parameters. See the Request Parameters for more information. For --- information on creating tags for your Auto Scaling group, see Tag Your Auto --- Scaling Groups and Amazon EC2 Instances. --- --- -data CreateOrUpdateTags = CreateOrUpdateTags - { coutTags :: Members Tag - -- ^ The tag to be created or updated. Each tag should be defined by - -- its resource type, resource ID, key, value, and a propagate flag. - -- The resource type and resource ID identify the type and name of - -- resource for which the tag is created. Currently, - -- auto-scaling-group is the only supported resource type. The valid - -- value for the resource ID is groupname. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateOrUpdateTags - -instance Rq CreateOrUpdateTags where - type Er CreateOrUpdateTags = AutoScalingErrorResponse - type Rs CreateOrUpdateTags = CreateOrUpdateTagsResponse - request = query4 autoScaling GET "CreateOrUpdateTags" - -data CreateOrUpdateTagsResponse = CreateOrUpdateTagsResponse - { coutrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML CreateOrUpdateTagsResponse where - xmlPickler = withNS autoScalingNS - --- | Deletes the specified Auto Scaling group if the group has no instances and --- no scaling activities in progress. Note To remove all instances before --- calling DeleteAutoScalingGroup, you can call UpdateAutoScalingGroup to set --- the minimum and maximum size of the AutoScalingGroup to zero. --- --- -data DeleteAutoScalingGroup = DeleteAutoScalingGroup - { dasgAutoScalingGroupName :: !Text - -- ^ The name of the Auto Scaling group to delete. - , dasgForceDelete :: Maybe Bool - -- ^ Starting with API version 2011-01-01, specifies that the Auto - -- Scaling group will be deleted along with all instances associated - -- with the group, without waiting for all instances to be - -- terminated. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteAutoScalingGroup - -instance Rq DeleteAutoScalingGroup where - type Er DeleteAutoScalingGroup = AutoScalingErrorResponse - type Rs DeleteAutoScalingGroup = DeleteAutoScalingGroupResponse - request = query4 autoScaling GET "DeleteAutoScalingGroup" - -data DeleteAutoScalingGroupResponse = DeleteAutoScalingGroupResponse - { dasgrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML DeleteAutoScalingGroupResponse where - xmlPickler = withNS autoScalingNS - --- | Deletes the specified LaunchConfiguration. The specified launch --- configuration must not be attached to an Auto Scaling group. When this call --- completes, the launch configuration is no longer available for use. --- --- -data DeleteLaunchConfiguration = DeleteLaunchConfiguration - { dlcLaunchConfigurationName :: !Text - -- ^ The name of the launch configuration. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteLaunchConfiguration - -instance Rq DeleteLaunchConfiguration where - type Er DeleteLaunchConfiguration = AutoScalingErrorResponse - type Rs DeleteLaunchConfiguration = DeleteLaunchConfigurationResponse - request = query4 autoScaling GET "DeleteLaunchConfiguration" - -data DeleteLaunchConfigurationResponse = DeleteLaunchConfigurationResponse - { dlcrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML DeleteLaunchConfigurationResponse where - xmlPickler = withNS autoScalingNS - --- | Deletes notifications created by PutNotificationConfiguration. --- --- -data DeleteNotificationConfiguration = DeleteNotificationConfiguration - { dncAutoScalingGroupName :: !Text - -- ^ The name of the Auto Scaling group. - , dncTopicARN :: !Text - -- ^ The Amazon Resource Name (ARN) of the Amazon Simple Notification - -- Service (SNS) topic. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteNotificationConfiguration - -instance Rq DeleteNotificationConfiguration where - type Er DeleteNotificationConfiguration = AutoScalingErrorResponse - type Rs DeleteNotificationConfiguration = DeleteNotificationConfigurationResponse - request = query4 autoScaling GET "DeleteNotificationConfiguration" - -data DeleteNotificationConfigurationResponse = DeleteNotificationConfigurationResponse - deriving (Eq, Read, Show, Generic) - -instance IsXML DeleteNotificationConfigurationResponse where - xmlPickler = xpEmpty $ Just autoScalingNS - --- | Deletes a policy created by PutScalingPolicy. --- --- -data DeletePolicy = DeletePolicy - { dpAutoScalingGroupName :: Maybe Text - -- ^ The name of the Auto Scaling group. - , dpPolicyName :: !Text - -- ^ The name or PolicyARN of the policy you want to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeletePolicy - -instance Rq DeletePolicy where - type Er DeletePolicy = AutoScalingErrorResponse - type Rs DeletePolicy = DeletePolicyResponse - request = query4 autoScaling GET "DeletePolicy" - -data DeletePolicyResponse = DeletePolicyResponse - deriving (Eq, Read, Show, Generic) - -instance IsXML DeletePolicyResponse where - xmlPickler = xpEmpty $ Just autoScalingNS - --- | Deletes a scheduled action previously created using the --- PutScheduledUpdateGroupAction. --- --- -data DeleteScheduledAction = DeleteScheduledAction - { dsaAutoScalingGroupName :: Maybe Text - -- ^ The name of the Auto Scaling group. - , dsaScheduledActionName :: !Text - -- ^ The name of the action you want to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteScheduledAction - -instance Rq DeleteScheduledAction where - type Er DeleteScheduledAction = AutoScalingErrorResponse - type Rs DeleteScheduledAction = DeleteScheduledActionResponse - request = query4 autoScaling GET "DeleteScheduledAction" - -data DeleteScheduledActionResponse = DeleteScheduledActionResponse - deriving (Eq, Read, Show, Generic) - -instance IsXML DeleteScheduledActionResponse where - xmlPickler = xpEmpty $ Just autoScalingNS - --- | Removes the specified tags or a set of tags from a set of resources. --- --- -data DeleteTags = DeleteTags - { dtTags :: Members Tag - -- ^ Each tag should be defined by its resource type, resource ID, - -- key, value, and a propagate flag. Valid values are: Resource type - -- = auto-scaling-group, Resource ID = AutoScalingGroupName, - -- key=value, value=value, propagate=true or false. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteTags - -instance Rq DeleteTags where - type Er DeleteTags = AutoScalingErrorResponse - type Rs DeleteTags = DeleteTagsResponse - request = query4 autoScaling GET "DeleteTags" - -data DeleteTagsResponse = DeleteTagsResponse - deriving (Eq, Read, Show, Generic) - -instance IsXML DeleteTagsResponse where - xmlPickler = xpEmpty $ Just autoScalingNS - --- | Returns policy adjustment types for use in the PutScalingPolicy action. --- --- -data DescribeAdjustmentTypes = DescribeAdjustmentTypes - deriving (Eq, Show, Generic) - -instance IsQuery DescribeAdjustmentTypes - -instance Rq DescribeAdjustmentTypes where - type Er DescribeAdjustmentTypes = AutoScalingErrorResponse - type Rs DescribeAdjustmentTypes = DescribeAdjustmentTypesResponse - request = query4 autoScaling GET "DescribeAdjustmentTypes" - -data DescribeAdjustmentTypesResponse = DescribeAdjustmentTypesResponse - { datrDescribeAdjustmentTypesResult :: !DescribeAdjustmentTypesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAdjustmentTypesResponse where - xmlPickler = withNS autoScalingNS - --- | Returns a full description of each Auto Scaling group in the given list. --- This includes all Amazon EC2 instances that are members of the group. If a --- list of names is not provided, the service returns the full details of all --- Auto Scaling groups. This action supports pagination by returning a token --- if there are more pages to retrieve. To get the next page, call this action --- again with the returned token as the NextToken parameter. --- --- -data DescribeAutoScalingGroups = DescribeAutoScalingGroups - { dasgAutoScalingGroupNames :: Members Text - -- ^ A list of Auto Scaling group names. - , dasgMaxRecords :: Maybe Integer - -- ^ The maximum number of records to return. - , dasgNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned - -- results. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeAutoScalingGroups - -instance Rq DescribeAutoScalingGroups where - type Er DescribeAutoScalingGroups = AutoScalingErrorResponse - type Rs DescribeAutoScalingGroups = DescribeAutoScalingGroupsResponse - request = query4 autoScaling GET "DescribeAutoScalingGroups" - -instance Pg DescribeAutoScalingGroups where - next dasg dasgr - | Just x <- tok = Just $ dasg { dasgNextToken = Just x } - | otherwise = Nothing - where - tok = dasgrNextToken (dashrDescribeAutoScalingGroupsResult dasgr) - -data DescribeAutoScalingGroupsResponse = DescribeAutoScalingGroupsResponse - { dashrDescribeAutoScalingGroupsResult :: !DescribeAutoScalingGroupsResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAutoScalingGroupsResponse where - xmlPickler = withNS autoScalingNS - --- | Returns a description of each Auto Scaling instance in the InstanceIds --- list. If a list is not provided, the service returns the full details of --- all instances up to a maximum of 50. By default, the service returns a list --- of 20 items. This action supports pagination by returning a token if there --- are more pages to retrieve. To get the next page, call this action again --- with the returned token as the NextToken parameter. --- --- -data DescribeAutoScalingInstances = DescribeAutoScalingInstances - { dasiInstanceIds :: Members Text - -- ^ The list of Auto Scaling instances to describe. If this list is - -- omitted, all auto scaling instances are described. The list of - -- requested instances cannot contain more than 50 items. If unknown - -- instances are requested, they are ignored with no error. - , dasiMaxRecords :: Maybe Integer - -- ^ The maximum number of Auto Scaling instances to be described with - -- each call. - , dasiNextToken :: Maybe Text - -- ^ The token returned by a previous call to indicate that there is - -- more data available. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeAutoScalingInstances - -instance Rq DescribeAutoScalingInstances where - type Er DescribeAutoScalingInstances = AutoScalingErrorResponse - type Rs DescribeAutoScalingInstances = DescribeAutoScalingInstancesResponse - request = query4 autoScaling GET "DescribeAutoScalingInstances" - -data DescribeAutoScalingInstancesResponse = DescribeAutoScalingInstancesResponse - { dasirDescribeAutoScalingInstancesResult :: !DescribeAutoScalingInstancesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAutoScalingInstancesResponse where - xmlPickler = withNS autoScalingNS - --- | Returns a list of all notification types that are supported by Auto --- Scaling. --- --- -data DescribeAutoScalingNotificationTypes = DescribeAutoScalingNotificationTypes - { dasntAutoScalingNotificationTypes :: !Text - -- ^ Returns a list of all notification types supported by Auto - -- Scaling. They are: - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeAutoScalingNotificationTypes - -instance Rq DescribeAutoScalingNotificationTypes where - type Er DescribeAutoScalingNotificationTypes = AutoScalingErrorResponse - type Rs DescribeAutoScalingNotificationTypes = DescribeAutoScalingNotificationTypesResponse - request = query4 autoScaling GET "DescribeAutoScalingNotificationTypes" - -data DescribeAutoScalingNotificationTypesResponse = DescribeAutoScalingNotificationTypesResponse - { dasntrDescribeAutoScalingNotificationTypesResult :: !DescribeAutoScalingNotificationTypesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAutoScalingNotificationTypesResponse where - xmlPickler = withNS autoScalingNS - --- | Returns a full description of the launch configurations, or the specified --- launch configurations, if they exist. If no name is specified, then the --- full details of all launch configurations are returned. --- --- -data DescribeLaunchConfigurations = DescribeLaunchConfigurations - { dlcLaunchConfigurationNames :: Members Text - -- ^ A list of launch configuration names. - , dlcMaxRecords :: Maybe Integer - -- ^ The maximum number of launch configurations. The default is 100. - , dlcNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned - -- results. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeLaunchConfigurations - -instance Rq DescribeLaunchConfigurations where - type Er DescribeLaunchConfigurations = AutoScalingErrorResponse - type Rs DescribeLaunchConfigurations = DescribeLaunchConfigurationsResponse - request = query4 autoScaling GET "DescribeLaunchConfigurations" - -data DescribeLaunchConfigurationsResponse = DescribeLaunchConfigurationsResponse - { dldrDescribeLaunchConfigurationsResult :: !DescribeLaunchConfigurationsResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLaunchConfigurationsResponse where - xmlPickler = withNS autoScalingNS - --- | Returns a list of metrics and a corresponding list of granularities for --- each metric. --- --- -data DescribeMetricCollectionTypes = DescribeMetricCollectionTypes - deriving (Eq, Show, Generic) - -instance IsQuery DescribeMetricCollectionTypes - -instance Rq DescribeMetricCollectionTypes where - type Er DescribeMetricCollectionTypes = AutoScalingErrorResponse - type Rs DescribeMetricCollectionTypes = DescribeMetricCollectionTypesResponse - request = query4 autoScaling GET "DescribeMetricCollectionTypes" - -data DescribeMetricCollectionTypesResponse = DescribeMetricCollectionTypesResponse - { dmctDescribeMetricCollectionTypesResult :: !DescribeMetricCollectionTypesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeMetricCollectionTypesResponse where - xmlPickler = withNS autoScalingNS - --- | Returns a list of notification actions associated with Auto Scaling groups --- for specified events. --- --- -data DescribeNotificationConfigurations = DescribeNotificationConfigurations - { dncAutoScalingGroupNames :: Members Text - -- ^ The name of the Auto Scaling group. - , dncMaxRecords :: Maybe Integer - -- ^ Maximum number of records to be returned. - , dncNextToken :: Maybe Text - -- ^ A string that is used to mark the start of the next batch of - -- returned results for pagination. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeNotificationConfigurations - -instance Rq DescribeNotificationConfigurations where - type Er DescribeNotificationConfigurations = AutoScalingErrorResponse - type Rs DescribeNotificationConfigurations = DescribeNotificationConfigurationsResponse - request = query4 autoScaling GET "DescribeNotificationConfigurations" - -data DescribeNotificationConfigurationsResponse = DescribeNotificationConfigurationsResponse - { dndrDescribeNotificationConfigurationsResult :: !DescribeNotificationConfigurationsResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeNotificationConfigurationsResponse where - xmlPickler = withNS autoScalingNS - --- | Returns descriptions of what each policy does. This action supports --- pagination. If the response includes a token, there are more records --- available. To get the additional records, repeat the request with the --- response token as the NextToken parameter. --- --- -data DescribePolicies = DescribePolicies - { dqAutoScalingGroupName :: Maybe Text - -- ^ The name of the Auto Scaling group. - , dqMaxRecords :: Maybe Integer - -- ^ The maximum number of policies that will be described with each - -- call. - , dqNextToken :: Maybe Text - -- ^ A string that is used to mark the start of the next batch of - -- returned results for pagination. - , dqPolicyNames :: Members Text - -- ^ A list of policy names or policy ARNs to be described. If this - -- list is omitted, all policy names are described. If an auto - -- scaling group name is provided, the results are limited to that - -- group. The list of requested policy names cannot contain more - -- than 50 items. If unknown policy names are requested, they are - -- ignored with no error. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribePolicies - -instance Rq DescribePolicies where - type Er DescribePolicies = AutoScalingErrorResponse - type Rs DescribePolicies = DescribePoliciesResponse - request = query4 autoScaling GET "DescribePolicies" - -data DescribePoliciesResponse = DescribePoliciesResponse - { dqrDescribePoliciesResult :: !DescribePoliciesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribePoliciesResponse where - xmlPickler = withNS autoScalingNS - --- | Returns the scaling activities for the specified Auto Scaling group. If the --- specified ActivityIds list is empty, all the activities from the past six --- weeks are returned. Activities are sorted by completion time. Activities --- still in progress appear first on the list. This action supports --- pagination. If the response includes a token, there are more records --- available. To get the additional records, repeat the request with the --- response token as the NextToken parameter. --- --- -data DescribeScalingActivities = DescribeScalingActivities - { dsbActivityIds :: Members Text - -- ^ A list containing the activity IDs of the desired scaling - -- activities. If this list is omitted, all activities are - -- described. If an AutoScalingGroupName is provided, the results - -- are limited to that group. The list of requested activities - -- cannot contain more than 50 items. If unknown activities are - -- requested, they are ignored with no error. - , dsbAutoScalingGroupName :: Maybe Text - -- ^ The name of the AutoScalingGroup. - , dsbMaxRecords :: Maybe Integer - -- ^ The maximum number of scaling activities to return. - , dsbNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned - -- results for pagination. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeScalingActivities - -instance Rq DescribeScalingActivities where - type Er DescribeScalingActivities = AutoScalingErrorResponse - type Rs DescribeScalingActivities = DescribeScalingActivitiesResponse - request = query4 autoScaling GET "DescribeScalingActivities" - -data DescribeScalingActivitiesResponse = DescribeScalingActivitiesResponse - { dsbrDescribeScalingActivitiesResult :: !DescribeScalingActivitiesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeScalingActivitiesResponse where - xmlPickler = withNS autoScalingNS - --- | Returns scaling process types for use in the ResumeProcesses and --- SuspendProcesses actions. --- --- -data DescribeScalingProcessTypes = DescribeScalingProcessTypes - { dsptProcesses :: !ProcessType - -- ^ A list of ProcessType names. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeScalingProcessTypes - -instance Rq DescribeScalingProcessTypes where - type Er DescribeScalingProcessTypes = AutoScalingErrorResponse - type Rs DescribeScalingProcessTypes = DescribeScalingProcessTypesResponse - request = query4 autoScaling GET "DescribeScalingProcessTypes" - -data DescribeScalingProcessTypesResponse = DescribeScalingProcessTypesResponse - { dsptrDescribeScalingProcessTypesResult :: !DescribeScalingProcessTypesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeScalingProcessTypesResponse where - xmlPickler = withNS autoScalingNS - --- | Lists all the actions scheduled for your Auto Scaling group that haven't --- been executed. To see a list of actions already executed, see the activity --- record returned in DescribeScalingActivities. --- --- -data DescribeScheduledActions = DescribeScheduledActions - { dscAutoScalingGroupName :: Maybe Text - -- ^ The name of the Auto Scaling group. - , dscEndTime :: Maybe UTCTime - -- ^ The latest scheduled start time to return. If scheduled action - -- names are provided, this field is ignored. - , dscMaxRecords :: Maybe Integer - -- ^ The maximum number of scheduled actions to return. - , dscNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned - -- results. - , dscScheduledActionNames :: Members Text - -- ^ A list of scheduled actions to be described. If this list is - -- omitted, all scheduled actions are described. The list of - -- requested scheduled actions cannot contain more than 50 items. If - -- an auto scaling group name is provided, the results are limited - -- to that group. If unknown scheduled actions are requested, they - -- are ignored with no error. - , dscStartTime :: Maybe UTCTime - -- ^ The earliest scheduled start time to return. If scheduled action - -- names are provided, this field will be ignored. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeScheduledActions - -instance Rq DescribeScheduledActions where - type Er DescribeScheduledActions = AutoScalingErrorResponse - type Rs DescribeScheduledActions = DescribeScheduledActionsResponse - request = query4 autoScaling GET "DescribeScheduledActions" - -data DescribeScheduledActionsResponse = DescribeScheduledActionsResponse - { dscrDescribeScheduledActionsResult :: !DescribeScheduledActionsResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeScheduledActionsResponse where - xmlPickler = withNS autoScalingNS - --- | Lists the Auto Scaling group tags. You can use filters to limit results --- when describing tags. For example, you can query4 autoScaling for tags of a particular --- Auto Scaling group. You can specify multiple values for a filter. A tag --- must match at least one of the specified values for it to be included in --- the results. You can also specify multiple filters. The result includes --- information for a particular tag only if it matches all your filters. If --- there's no match, no special message is returned. --- --- -data DescribeTags = DescribeTags - { dtFilters :: Members Filter - -- ^ The value of the filter type used to identify the tags to be - -- returned. For example, you can filter so that tags are returned - -- according to Auto Scaling group, the key and value, or whether - -- the new tag will be applied to instances launched after the tag - -- is created (PropagateAtLaunch). - , dtMaxRecords :: Maybe Integer - -- ^ The maximum number of records to return. - , dtNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned - -- results. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeTags - -instance Rq DescribeTags where - type Er DescribeTags = AutoScalingErrorResponse - type Rs DescribeTags = DescribeTagsResponse - request = query4 autoScaling GET "DescribeTags" - -instance Pg DescribeTags where - next rq rs - | Just x <- dtrNextToken (dtrDescribeTagsResult rs) = Just $ rq { dtNextToken = Just x } - | otherwise = Nothing - -data DescribeTagsResponse = DescribeTagsResponse - { dtrDescribeTagsResult :: !DescribeTagsResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeTagsResponse where - xmlPickler = withNS autoScalingNS - --- | Returns a list of all termination policies supported by Auto Scaling. --- --- -data DescribeTerminationPolicyTypes = DescribeTerminationPolicyTypes - { dtptTerminationPolicyTypes :: !Text - -- ^ Termination policies supported by Auto Scaling. They are: - -- OldestInstance, OldestLaunchConfiguration, NewestInstance, - -- ClosestToNextInstanceHour, Default - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeTerminationPolicyTypes - -instance Rq DescribeTerminationPolicyTypes where - type Er DescribeTerminationPolicyTypes = AutoScalingErrorResponse - type Rs DescribeTerminationPolicyTypes = DescribeTerminationPolicyTypesResponse - request = query4 autoScaling GET "DescribeTerminationPolicyTypes" - -data DescribeTerminationPolicyTypesResponse = DescribeTerminationPolicyTypesResponse - { dtptrDescribeTerminationPolicyTypesResult :: !DescribeTerminationPolicyTypesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeTerminationPolicyTypesResponse where - xmlPickler = withNS autoScalingNS - --- | Disables monitoring of group metrics for the Auto Scaling group specified --- in AutoScalingGroupName. You can specify the list of affected metrics with --- the Metrics parameter. --- --- -data DisableMetricsCollection = DisableMetricsCollection - { dmcAutoScalingGroupName :: !Text - -- ^ The name or ARN of the Auto Scaling Group. - , dmcMetrics :: Members Text - -- ^ The list of metrics to disable. If no metrics are specified, all - -- metrics are disabled. The following metrics are supported: - } deriving (Eq, Show, Generic) - -instance IsQuery DisableMetricsCollection - -instance Rq DisableMetricsCollection where - type Er DisableMetricsCollection = AutoScalingErrorResponse - type Rs DisableMetricsCollection = DisableMetricsCollectionResponse - request = query4 autoScaling GET "DisableMetricsCollection" - -data DisableMetricsCollectionResponse = DisableMetricsCollectionResponse - { dmcrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML DisableMetricsCollectionResponse where - xmlPickler = withNS autoScalingNS - --- | Enables monitoring of group metrics for the Auto Scaling group specified in --- AutoScalingGroupName. You can specify the list of enabled metrics with the --- Metrics parameter. Auto Scaling metrics collection can be turned on only if --- the InstanceMonitoring flag, in the Auto Scaling group's launch --- configuration, is set to True. --- --- -data EnableMetricsCollection = EnableMetricsCollection - { emcAutoScalingGroupName :: !Text - -- ^ The name or ARN of the Auto Scaling group. - , emcGranularity :: !Text - -- ^ The granularity to associate with the metrics to collect. - -- Currently, the only legal granularity is "1Minute". - , emcMetrics :: Members Text - -- ^ The list of metrics to collect. If no metrics are specified, all - -- metrics are enabled. The following metrics are supported: - } deriving (Eq, Show, Generic) - -instance IsQuery EnableMetricsCollection - -instance Rq EnableMetricsCollection where - type Er EnableMetricsCollection = AutoScalingErrorResponse - type Rs EnableMetricsCollection = EnableMetricsCollectionResponse - request = query4 autoScaling GET "EnableMetricsCollection" - -data EnableMetricsCollectionResponse = EnableMetricsCollectionResponse - { emcrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML EnableMetricsCollectionResponse where - xmlPickler = withNS autoScalingNS - --- | Executes the specified policy. --- --- -data ExecutePolicy = ExecutePolicy - { epAutoScalingGroupName :: Maybe Text - -- ^ The name or the Amazon Resource Name (ARN) of the Auto Scaling - -- group. - , epHonorCooldown :: Maybe Bool - -- ^ Set to True if you want Auto Scaling to wait for the cooldown - -- period associated with the Auto Scaling group to complete before - -- executing the policy. - , epPolicyName :: !Text - -- ^ The name or ARN of the policy you want to run. - } deriving (Eq, Show, Generic) - -instance IsQuery ExecutePolicy - -instance Rq ExecutePolicy where - type Er ExecutePolicy = AutoScalingErrorResponse - type Rs ExecutePolicy = ExecutePolicyResponse - request = query4 autoScaling GET "ExecutePolicy" - -data ExecutePolicyResponse = ExecutePolicyResponse - { eprResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML ExecutePolicyResponse where - xmlPickler = withNS autoScalingNS - --- | Configures an Auto Scaling group to send notifications when specified --- events take place. Subscribers to this topic can have messages for events --- delivered to an endpoint such as a web server or email address. For more --- information see Get Email Notifications When Your Auto Scaling Group --- Changes A new PutNotificationConfiguration overwrites an existing --- configuration. --- --- -data PutNotificationConfiguration = PutNotificationConfiguration - { pncAutoScalingGroupName :: !Text - -- ^ The name of the Auto Scaling group. - , pncNotificationTypes :: Members Text - -- ^ The type of event that will cause the notification to be sent. - -- For details about notification types supported by Auto Scaling, - -- see DescribeAutoScalingNotificationTypes. - , pncTopicARN :: !Text - -- ^ The Amazon Resource Name (ARN) of the Amazon Simple Notification - -- Service (SNS) topic. - } deriving (Eq, Show, Generic) - -instance IsQuery PutNotificationConfiguration - -instance Rq PutNotificationConfiguration where - type Er PutNotificationConfiguration = AutoScalingErrorResponse - type Rs PutNotificationConfiguration = PutNotificationConfigurationResponse - request = query4 autoScaling GET "PutNotificationConfiguration" - -data PutNotificationConfigurationResponse = PutNotificationConfigurationResponse - { pncrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML PutNotificationConfigurationResponse where - xmlPickler = withNS autoScalingNS - --- | Creates or updates a policy for an Auto Scaling group. To update an --- existing policy, use the existing policy name and set the parameter(s) you --- want to change. Any existing parameter not changed in an update to an --- existing policy is not changed in this update request. --- --- -data PutScalingPolicy = PutScalingPolicy - { pspAdjustmentType :: !Text - -- ^ Specifies whether the ScalingAdjustment is an absolute number or - -- a percentage of the current capacity. Valid values are - -- ChangeInCapacity, ExactCapacity, and PercentChangeInCapacity. - , pspAutoScalingGroupName :: !Text - -- ^ The name or ARN of the Auto Scaling group. - , pspCooldown :: Maybe Integer - -- ^ The amount of time, in seconds, after a scaling activity - -- completes and before the next scaling acitvity can start. - , pspMinAdjustmentStep :: Maybe Integer - -- ^ Used with AdjustmentType with the value PercentChangeInCapacity, - -- the scaling policy changes the DesiredCapacity of the Auto - -- Scaling group by at least the number of instances specified in - -- the value. - , pspPolicyName :: !Text - -- ^ The name of the policy you want to create or update. - , pspScalingAdjustment :: !Integer - -- ^ The number of instances by which to scale. AdjustmentType - -- determines the interpretation of this number (e.g., as an - -- absolute number or as a percentage of the existing Auto Scaling - -- group size). A positive increment adds to the current capacity - -- and a negative value removes from the current capacity. - } deriving (Eq, Show, Generic) - -instance IsQuery PutScalingPolicy - -instance Rq PutScalingPolicy where - type Er PutScalingPolicy = AutoScalingErrorResponse - type Rs PutScalingPolicy = PutScalingPolicyResponse - request = query4 autoScaling GET "PutScalingPolicy" - -data PutScalingPolicyResponse = PutScalingPolicyResponse - { psprPutScalingPolicyResult :: !PutScalingPolicyResult - } deriving (Eq, Show, Generic) - -instance IsXML PutScalingPolicyResponse where - xmlPickler = withNS autoScalingNS - --- | Creates or updates a scheduled scaling action for an Auto Scaling group. --- When updating a scheduled scaling action, if you leave a parameter --- unspecified, the corresponding value remains unchanged in the affected Auto --- Scaling group. For information on creating or updating a scheduled action --- for your Auto Scaling group, see Scale Based on a Schedule. Note Auto --- Scaling supports the date and time expressed in "YYYY-MM-DDThh:mm:ssZ" --- format in UTC/GMT only. --- --- -data PutScheduledUpdateGroupAction = PutScheduledUpdateGroupAction - { psugaAutoScalingGroupName :: !Text - -- ^ The name or ARN of the Auto Scaling group. - , psugaDesiredCapacity :: Maybe Integer - -- ^ The number of Amazon EC2 instances that should be running in the - -- group. - , psugaEndTime :: Maybe UTCTime - -- ^ The time for this action to end. - , psugaMaxSize :: Maybe Integer - -- ^ The maximum size for the Auto Scaling group. - , psugaMinSize :: Maybe Integer - -- ^ The minimum size for the new Auto Scaling group. - , psugaRecurrence :: Maybe Text - -- ^ The time when recurring future actions will start. Start time is - -- specified by the user following the Unix cron syntax format. For - -- information about cron syntax, go to Wikipedia, The Free - -- Encyclopedia. - , psugaScheduledActionName :: !Text - -- ^ The name of this scaling action. - , psugaStartTime :: Maybe UTCTime - -- ^ The time for this action to start, as in --start-time - -- 2010-06-01T00:00:00Z. - , psugaTime :: Maybe UTCTime - -- ^ Time is deprecated. - } deriving (Eq, Show, Generic) - -instance IsQuery PutScheduledUpdateGroupAction - -instance Rq PutScheduledUpdateGroupAction where - type Er PutScheduledUpdateGroupAction = AutoScalingErrorResponse - type Rs PutScheduledUpdateGroupAction = PutScheduledUpdateGroupActionResponse - request = query4 autoScaling GET "PutScheduledUpdateGroupAction" - -data PutScheduledUpdateGroupActionResponse = PutScheduledUpdateGroupActionResponse - { psugarResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML PutScheduledUpdateGroupActionResponse where - xmlPickler = withNS autoScalingNS - --- | Resumes all suspended Auto Scaling processes for an Auto Scaling group. For --- information on suspending and resuming Auto Scaling process, see Suspend --- and Resume Auto Scaling Process. --- --- -data ResumeProcesses = ResumeProcesses - { rpAutoScalingGroupName :: !Text - -- ^ The name or Amazon Resource Name (ARN) of the Auto Scaling group. - , rpScalingProcesses :: Members Text - -- ^ The processes that you want to suspend or resume, which can - -- include one or more of the following: - } deriving (Eq, Show, Generic) - -instance IsQuery ResumeProcesses - -instance Rq ResumeProcesses where - type Er ResumeProcesses = AutoScalingErrorResponse - type Rs ResumeProcesses = ResumeProcessesResponse - request = query4 autoScaling GET "ResumeProcesses" - -data ResumeProcessesResponse = ResumeProcessesResponse - { rprResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML ResumeProcessesResponse where - xmlPickler = withNS autoScalingNS - --- | Sets the desired size of the specified AutoScalingGroup. --- --- -data SetDesiredCapacity = SetDesiredCapacity - { sdcAutoScalingGroupName :: !Text - -- ^ The name of the Auto Scaling group. - , sdcDesiredCapacity :: !Integer - -- ^ The new capacity setting for the Auto Scaling group. - , sdcHonorCooldown :: Maybe Bool - -- ^ By default, SetDesiredCapacity overrides any cooldown period - -- associated with the Auto Scaling group. Set to True if you want - -- Auto Scaling to wait for the cooldown period associated with the - -- Auto Scaling group to complete before initiating a scaling - -- activity to set your Auto Scaling group to the new capacity - -- setting. - } deriving (Eq, Show, Generic) - -instance IsQuery SetDesiredCapacity - -instance Rq SetDesiredCapacity where - type Er SetDesiredCapacity = AutoScalingErrorResponse - type Rs SetDesiredCapacity = SetDesiredCapacityResponse - request = query4 autoScaling GET "SetDesiredCapacity" - -data SetDesiredCapacityResponse = SetDesiredCapacityResponse - { sdcrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML SetDesiredCapacityResponse where - xmlPickler = withNS autoScalingNS - --- | Sets the health status of a specified instance that belongs to any of your --- Auto Scaling groups. For more information, see Configure Health Checks for --- Your Auto Scaling group. --- --- -data SetInstanceHealth = SetInstanceHealth - { sihHealthStatus :: !Text - -- ^ The health status of the instance. Set to Healthy if you want the - -- instance to remain in service. Set to Unhealthy if you want the - -- instance to be out of service. Auto Scaling will terminate and - -- replace the unhealthy instance. - , sihInstanceId :: !Text - -- ^ The identifier of the Amazon EC2 instance. - , sihShouldRespectGracePeriod :: Maybe Bool - -- ^ If the Auto Scaling group of the specified instance has a - -- HealthCheckGracePeriod specified for the group, by default, this - -- call will respect the grace period. Set this to False, if you do - -- not want the call to respect the grace period associated with the - -- group. - } deriving (Eq, Show, Generic) - -instance IsQuery SetInstanceHealth - -instance Rq SetInstanceHealth where - type Er SetInstanceHealth = AutoScalingErrorResponse - type Rs SetInstanceHealth = SetInstanceHealthResponse - request = query4 autoScaling GET "SetInstanceHealth" - -data SetInstanceHealthResponse = SetInstanceHealthResponse - { sihrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML SetInstanceHealthResponse where - xmlPickler = withNS autoScalingNS - --- | Suspends Auto Scaling processes for an Auto Scaling group. To suspend --- specific process types, specify them by name with the --- ScalingProcesses.member.N parameter. To suspend all process types, omit the --- ScalingProcesses.member.N parameter. Important Suspending either of the two --- primary process types, Launch or Terminate, can prevent other process types --- from functioning properly. To resume processes that have been suspended, --- use ResumeProcesses For more information on suspending and resuming Auto --- Scaling process, see Suspend and Resume Auto Scaling Process. --- --- -data SuspendProcesses = SuspendProcesses - { spAutoScalingGroupName :: !Text - -- ^ The name or Amazon Resource Name (ARN) of the Auto Scaling group. - , spScalingProcesses :: Members Text - -- ^ The processes that you want to suspend or resume, which can - -- include one or more of the following: - } deriving (Eq, Show, Generic) - -instance IsQuery SuspendProcesses - -instance Rq SuspendProcesses where - type Er SuspendProcesses = AutoScalingErrorResponse - type Rs SuspendProcesses = SuspendProcessesResponse - request = query4 autoScaling GET "SuspendProcesses" - -data SuspendProcessesResponse = SuspendProcessesResponse - { sprResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML SuspendProcessesResponse where - xmlPickler = withNS autoScalingNS - --- | Terminates the specified instance. Optionally, the desired group size can --- be adjusted. Note This call simply registers a termination request. The --- termination of the instance cannot happen immediately. --- --- -data TerminateInstanceInAutoScalingGroup = TerminateInstanceInAutoScalingGroup - { tiiasgInstanceId :: !Text - -- ^ The ID of the Amazon EC2 instance to be terminated. - , tiiasgShouldDecrementDesiredCapacity :: !Bool - -- ^ Specifies whether (true) or not (false) terminating this instance - -- should also decrement the size of the AutoScalingGroup. - } deriving (Eq, Show, Generic) - -instance IsQuery TerminateInstanceInAutoScalingGroup - -instance Rq TerminateInstanceInAutoScalingGroup where - type Er TerminateInstanceInAutoScalingGroup = AutoScalingErrorResponse - type Rs TerminateInstanceInAutoScalingGroup = TerminateInstanceInAutoScalingGroupResponse - request = query4 autoScaling GET "TerminateInstanceInAutoScalingGroup" - -data TerminateInstanceInAutoScalingGroupResponse = TerminateInstanceInAutoScalingGroupResponse - { tiiasgrResponseMetadata :: !ResponseMetadata - , tiiasgrTerminateInstanceInAutoScalingGroupResult :: !TerminateInstanceInAutoScalingGroupResult - } deriving (Eq, Show, Generic) - -instance IsXML TerminateInstanceInAutoScalingGroupResponse where - xmlPickler = withNS autoScalingNS - --- | Updates the configuration for the specified AutoScalingGroup. --- --- Note: To update an Auto Scaling group with a launch configuration that has the --- InstanceMonitoring flag set to False, you must first ensure that collection --- of group metrics is disabled. Otherwise, calls to UpdateAutoScalingGroup --- will fail. If you have previously enabled group metrics collection, you can --- disable collection of all group metrics by calling --- DisableMetricsCollection. The new settings are registered upon the --- completion of this call. Any launch configuration settings take effect on --- any triggers after this call returns. --- --- -data UpdateAutoScalingGroup = UpdateAutoScalingGroup - { uasgAutoScalingGroupName :: !Text - -- ^ The name of the Auto Scaling group. - , uasgAvailabilityZones :: Members AvailabilityZone - -- ^ Availability Zones for the group. - , uasgDefaultCooldown :: Maybe Integer - -- ^ The amount of time, in seconds, after a scaling activity - -- completes before any further scaling activities can start. For - -- more information, see Cooldown Period. - , uasgDesiredCapacity :: Maybe Integer - -- ^ The desired capacity for the Auto Scaling group. - , uasgHealthCheckGracePeriod :: Maybe Integer - -- ^ The length of time that Auto Scaling waits before checking an - -- instance's health status. The grace period begins when an - -- instance comes into service. - , uasgHealthCheckType :: Maybe Text - -- ^ The type of health check for the instances in the Auto Scaling - -- group. The health check type can either be EC2 for Amazon EC2 or - -- ELB for Elastic Load Balancing. - , uasgLaunchConfigurationName :: Maybe Text - -- ^ The name of the launch configuration. - , uasgMaxSize :: Maybe Integer - -- ^ The maximum size of the Auto Scaling group. - , uasgMinSize :: Maybe Integer - -- ^ The minimum size of the Auto Scaling group. - , uasgPlacementGroup :: Maybe Text - -- ^ The name of the cluster placement group, if applicable. For more - -- information, go to Using Cluster Instances in the Amazon EC2 User - -- Guide. - , uasgTerminationPolicies :: Members Text - -- ^ A standalone termination policy or a list of termination policies - -- used to select the instance to terminate. The policies are - -- executed in the order that they are listed. - , uasgVPCZoneIdentifier :: Maybe Text - -- ^ The subnet identifier for the Amazon VPC connection, if - -- applicable. You can specify several subnets in a comma-separated - -- list. - } deriving (Eq, Show, Generic) - -instance IsQuery UpdateAutoScalingGroup - -instance Rq UpdateAutoScalingGroup where - type Er UpdateAutoScalingGroup = AutoScalingErrorResponse - type Rs UpdateAutoScalingGroup = UpdateAutoScalingGroupResponse - request = query4 autoScaling GET "UpdateAutoScalingGroup" - -data UpdateAutoScalingGroupResponse = UpdateAutoScalingGroupResponse - { uasgrResponseMetadata :: !ResponseMetadata - } deriving (Eq, Show, Generic) - -instance IsXML UpdateAutoScalingGroupResponse where - xmlPickler = withNS autoScalingNS diff --git a/src/Network/AWS/AutoScaling/Types.hs b/src/Network/AWS/AutoScaling/Types.hs deleted file mode 100644 index 1708dfc3bc2..00000000000 --- a/src/Network/AWS/AutoScaling/Types.hs +++ /dev/null @@ -1,744 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE OverloadedStrings #-} - --- Module : Network.AWS.AutoScaling.Types --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.AutoScaling.Types where - -import Data.ByteString (ByteString) -import Data.Monoid -import Data.Text (Text) -import Data.Time -import Network.AWS.Internal - --- | Currently supported version of the AutoScaling service. -autoScaling :: Service -autoScaling = Service Regional version4 "autoscaling" "2011-01-01" - --- | XML namespace to annotate AutoScaling elements with. -autoScalingNS :: ByteString -autoScalingNS = "http://autoscaling.amazonaws.com/doc/" <> svcVersion autoScaling <> "/" - --- | Helper to define AutoScaling namespaced XML elements. -autoScalingElem :: ByteString -> NName ByteString -autoScalingElem = mkNName autoScalingNS - -data ErrorType = Receiver | Sender - deriving (Eq, Show, Read, Generic) - -instance IsXML ErrorType where - xmlPickler = xpContent xpPrim - -data AutoScalingError = AutoScalingError - { aseType :: !ErrorType - , aseCode :: !Text - , aseMessage :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML AutoScalingError where - xmlPickler = withNS autoScalingNS - -data AutoScalingErrorResponse = AutoScalingErrorResponse - { aserError :: !AutoScalingError - , aserRequestId :: !Text - } deriving (Eq, Show, Generic) - -instance ToError AutoScalingErrorResponse where - toError = Err . show - -instance IsXML AutoScalingErrorResponse where - xmlPickler = withNS autoScalingNS - -data ResponseMetadata = ResponseMetadata - { rmRequestId :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML ResponseMetadata where - xmlPickler = withNS autoScalingNS - --- data Error = Error --- { eType :: !ErrorType --- , eCode :: !Text --- , eMessage :: !Text --- , eDetail :: !Text --- } deriving (Eq, Show, Generic) - --- instance IsXML Error where --- xmlPickler = withNS autoScalingNS - -newtype ResourceName = ResourceName Text - deriving (Eq, Show, Generic) - -instance IsQuery ResourceName - --- | A scaling Activity is a long-running process that represents a change to --- your AutoScalingGroup, such as changing the size of the group. It can also --- be a process to replace an instance, or a process to perform any other --- long-running operations supported by the API. --- --- -data Activity = Activity - { aActivityId :: !Text - -- ^ Specifies the ID of the activity. - , aAutoScalingGroupName :: !Text - -- ^ The name of the Auto Scaling group. - , aCause :: !Text - -- ^ Contains the reason the activity was begun. - , aDescription :: Maybe Text - -- ^ Contains a friendly, more verbose description of the scaling activity. - , aDetails :: Maybe Text - -- ^ Contains details of the scaling activity. - , aEndTime :: Maybe UTCTime - -- ^ Provides the end time of this activity. - , aProgress :: Maybe Integer - -- ^ Specifies a value between 0 and 100 that indicates the progress - -- of the activity. - , aStartTime :: !UTCTime - -- ^ Provides the start time of this activity. - , aStatusCode :: !Text - -- ^ Contains the current status of the activity. - , aStatusMessage :: Maybe Text - -- ^ Contains a friendly, more verbose description of the activity status. - } deriving (Eq, Show, Generic) - -instance IsQuery Activity - -instance IsXML Activity where - xmlPickler = withNS autoScalingNS - --- | Specifies whether the PutScalingPolicy ScalingAdjustment parameter is an --- absolute number or a percentage of the current capacity. --- --- -data AdjustmentType - = ChangeInCapacity - | ExactCapacity - | PercentChangeInCapacity - deriving (Eq, Read, Show, Generic) - -instance IsQuery AdjustmentType where - queryPickler = qpPrim - -instance IsXML AdjustmentType where - xmlPickler = xpElem (autoScalingElem "AdjustmentType") $ xpContent xpPrim - --- | The Alarm data type. --- --- -data Alarm = Alarm - { aAlarmARN :: Maybe Text - -- ^ The Amazon Resource Name (ARN) of the alarm. - , aAlarmName :: Maybe Text - -- ^ The name of the alarm. - } deriving (Eq, Show, Generic) - -instance IsQuery Alarm - -instance IsXML Alarm where - xmlPickler = withNS autoScalingNS - --- | The AutoScalingGroup data type. --- --- -data AutoScalingGroup = AutoScalingGroup - { asgAutoScalingGroupARN :: Maybe Text - -- ^ The Amazon Resource Name (ARN) of the Auto Scaling group. - , asgAutoScalingGroupName :: !Text - -- ^ Specifies the name of the group. - , asgAvailabilityZones :: [AvailabilityZone] - -- ^ Contains a list of Availability Zones for the group. - , asgCreatedTime :: !UTCTime - -- ^ Specifies the date and time the Auto Scaling group was created. - , asgDefaultCooldown :: !Integer - -- ^ The number of seconds after a scaling activity completes before - -- any further scaling activities can start. - , asgDesiredCapacity :: !Integer - -- ^ Specifies the desired capacity for the Auto Scaling group. - , asgEnabledMetrics :: Members EnabledMetric - -- ^ A list of metrics enabled for this Auto Scaling group. - , asgHealthCheckGracePeriod :: Maybe Integer - -- ^ The length of time that Auto Scaling waits before checking an - -- instance's health status. The grace period begins when an - -- instance comes into service. - , asgHealthCheckType :: !Text - -- ^ The service of interest for the health status check, either "EC2" - -- for Amazon EC2 or "ELB" for Elastic Load Balancing. - , asgInstances :: Members Instance - -- ^ Provides a summary list of Amazon EC2 instances. - , asgLaunchConfigurationName :: Maybe Text - -- ^ Specifies the name of the associated LaunchConfiguration. - , asgLoadBalancerNames :: [Text] - -- ^ A list of load balancers associated with this Auto Scaling group. - , asgMaxSize :: !Integer - -- ^ Contains the maximum size of the Auto Scaling group. - , asgMinSize :: !Integer - -- ^ Contains the minimum size of the Auto Scaling group. - , asgPlacementGroup :: Maybe Text - -- ^ The name of the cluster placement group, if applicable. - , asgStatus :: Maybe Text - -- ^ The current state of the Auto Scaling group when a - -- DeleteAutoScalingGroup action is in progress. - , asgSuspendedProcesses :: Members SuspendedProcess - -- ^ Suspended processes associated with this Auto Scaling group. - , asgTags :: Members Tag - -- ^ A list of tags for the Auto Scaling group. - , asgTerminationPolicies :: [Text] - -- ^ A standalone termination policy or a list of termination policies - -- for this Auto Scaling group. - , asgVPCZoneIdentifier :: Maybe Text - -- ^ The subnet identifier for the Amazon VPC connection, if applicable. - -- You can specify several subnets in a comma-separated list. - } deriving (Eq, Show, Generic) - -instance IsXML AutoScalingGroup where - xmlPickler = withNS autoScalingNS - --- | The AutoScalingInstanceDetails data type. --- --- -data AutoScalingInstanceDetails = AutoScalingInstanceDetails - { asidAutoScalingGroupName :: !Text - -- ^ The name of the Auto Scaling group associated with this instance. - , asidAvailabilityZone :: !AvailabilityZone - -- ^ The Availability Zone in which this instance resides. - , asidHealthStatus :: !Text - -- ^ The health status of this instance. "Healthy" means that the - -- instance is healthy and should remain in service. "Unhealthy" - -- means that the instance is unhealthy. Auto Scaling should - -- terminate and replace it. - , asidInstanceId :: !Text - -- ^ The instance ID of the Amazon EC2 instance. - , asidLaunchConfigurationName :: !Text - -- ^ The launch configuration associated with this instance. - , asidLifecycleState :: !Text - -- ^ The life cycle state of this instance. for more information, see - -- Instance Lifecycle State in the Auto Scaling Developer Guide. - } deriving (Eq, Show, Generic) - -instance IsQuery AutoScalingInstanceDetails - -instance IsXML AutoScalingInstanceDetails where - xmlPickler = withNS autoScalingNS - --- | The BlockDeviceMapping data type. --- --- -data BlockDeviceMapping = BlockDeviceMapping - { bdmDeviceName :: !Text - -- ^ The name of the device within Amazon EC2. - , bdmEbs :: Maybe Ebs - -- ^ The Elastic Block Storage volume information. - , bdmVirtualName :: Maybe Text - -- ^ The virtual name associated with the device. - } deriving (Eq, Show, Generic) - -instance IsQuery BlockDeviceMapping - -instance IsXML BlockDeviceMapping where - xmlPickler = withNS autoScalingNS - --- | The output of the DescribeAdjustmentTypes action. --- --- -data DescribeAdjustmentTypesResult = DescribeAdjustmentTypesResult - { datrAdjustmentTypes :: Members AdjustmentType - -- ^ A list of specific policy adjustment types. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAdjustmentTypesResult where - xmlPickler = withNS autoScalingNS - --- | The AutoScalingGroupsType data type. --- --- -data DescribeAutoScalingGroupsResult = DescribeAutoScalingGroupsResult - { dasgrAutoScalingGroups :: Members AutoScalingGroup - -- ^ A list of Auto Scaling groups. - , dasgrNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned results. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAutoScalingGroupsResult where - xmlPickler = withNS autoScalingNS - --- | The AutoScalingInstancesType data type. --- --- -data DescribeAutoScalingInstancesResult = DescribeAutoScalingInstancesResult - { dasirAutoScalingInstances :: Members AutoScalingInstanceDetails - -- ^ A list of Auto Scaling instances. - , dasirNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned results. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAutoScalingInstancesResult where - xmlPickler = withNS autoScalingNS - --- | The AutoScalingNotificationTypes data type. --- --- -data DescribeAutoScalingNotificationTypesResult = DescribeAutoScalingNotificationTypesResult - { dasntrAutoScalingNotificationTypes :: [Text] - -- ^ Returns a list of all notification types supported by Auto Scaling. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAutoScalingNotificationTypesResult where - xmlPickler = withNS autoScalingNS - --- | The LaunchConfigurationsType data type. --- --- -data DescribeLaunchConfigurationsResult = DescribeLaunchConfigurationsResult - { dlcrLaunchConfigurations :: Members LaunchConfiguration - -- ^ A list of launch configurations. - , dlcrNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned results. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLaunchConfigurationsResult where - xmlPickler = withNS autoScalingNS - --- | The output of the DescribeMetricCollectionTypes action. --- --- -data DescribeMetricCollectionTypesResult = DescribeMetricCollectionTypesResult - { dmctrGranularities :: Members MetricGranularityType - -- ^ A list of granularities for the listed Metrics. - , dmctrMetrics :: Members MetricCollectionType - -- ^ The list of Metrics collected. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeMetricCollectionTypesResult where - xmlPickler = withNS autoScalingNS - --- | The output of the DescribeNotificationConfigurations action. --- --- -data DescribeNotificationConfigurationsResult = DescribeNotificationConfigurationsResult - { dncrNextToken :: Maybe Text - -- ^ A string that is used to mark the start of the next batch of - -- returned results for pagination. - , dncrNotificationConfigurations :: Members NotificationConfiguration - -- ^ The list of notification configurations. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeNotificationConfigurationsResult where - xmlPickler = withNS autoScalingNS - --- | The PoliciesType data type. --- --- -data DescribePoliciesResult = DescribePoliciesResult - { dprNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned results. - , dprScalingPolicies :: Members ScalingPolicy - -- ^ A list of scaling policies. - } deriving (Eq, Show, Generic) - -instance IsXML DescribePoliciesResult where - xmlPickler = withNS autoScalingNS - --- | The output for the DescribeScalingActivities action. --- --- -data DescribeScalingActivitiesResult = DescribeScalingActivitiesResult - { dsarActivities :: Members Activity - -- ^ A list of the requested scaling activities. - , dsarNextToken :: Maybe Text - -- ^ Acts as a paging mechanism for large result sets. Set to a - -- non-empty string if there are additional results waiting to be - -- returned. Pass this in to subsequent calls to return additional - -- results. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeScalingActivitiesResult where - xmlPickler = withNS autoScalingNS - --- | The output of the DescribeScalingProcessTypes action. --- --- -data DescribeScalingProcessTypesResult = DescribeScalingProcessTypesResult - { dsptrProcesses :: Members ProcessType - -- ^ A list of ProcessType names. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeScalingProcessTypesResult where - xmlPickler = withNS autoScalingNS - --- | A scaling action that is scheduled for a future time and date. An action --- can be scheduled up to thirty days in advance. Starting with API version --- 2011-01-01, you can use recurrence to specify that a scaling action occurs --- regularly on a schedule. --- --- -data DescribeScheduledActionsResult = DescribeScheduledActionsResult - { dsasNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned - -- results. - , dsasScheduledUpdateGroupActions :: Members ScheduledUpdateGroupAction - -- ^ A list of scheduled actions designed to update an Auto Scaling - -- group. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeScheduledActionsResult where - xmlPickler = withNS autoScalingNS - --- | DescribeTagsResult --- --- -data DescribeTagsResult = DescribeTagsResult - { dtrNextToken :: Maybe Text - -- ^ A string used to mark the start of the next batch of returned results. - , dtrTags :: Members Tag - -- ^ The list of tags. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeTagsResult where - xmlPickler = withNS autoScalingNS - --- | The TerminationPolicyTypes data type. --- --- -data DescribeTerminationPolicyTypesResult = DescribeTerminationPolicyTypesResult - { dtptrTerminationPolicyTypes :: [Text] - -- ^ Termination policies supported by Auto Scaling. They are: - -- OldestInstance, OldestLaunchConfiguration, NewestInstance, - -- ClosestToNextInstanceHour, Default - } deriving (Eq, Show, Generic) - -instance IsXML DescribeTerminationPolicyTypesResult where - xmlPickler = withNS autoScalingNS - --- | The Ebs data type. --- --- -data Ebs = Ebs - { eSnapshotId :: Maybe Text - -- ^ The snapshot ID. - , eVolumeSize :: Maybe Integer - -- ^ The volume size, in gigabytes. - } deriving (Eq, Show, Generic) - -instance IsQuery Ebs - -instance IsXML Ebs where - xmlPickler = withNS autoScalingNS - --- | The EnabledMetric data type. --- --- -data EnabledMetric = EnabledMetric - { emGranularity :: Maybe Text - -- ^ The granularity of the enabled metric. - , emMetric :: Maybe Text - -- ^ The name of the enabled metric. - } deriving (Eq, Show, Generic) - -instance IsQuery EnabledMetric - -instance IsXML EnabledMetric where - xmlPickler = withNS autoScalingNS - --- | The Filter data type. --- --- -data Filter = Filter - { fName :: Text - -- ^ The name of the filter. Valid Name values are: - -- "auto-scaling-group", "key", "value", and "propagate-at-launch". - , fValues :: [Text] - -- ^ The value of the filter. - } deriving (Eq, Show, Generic) - -instance IsQuery Filter - -instance IsXML Filter where - xmlPickler = withNS autoScalingNS - --- | The Instance data type. --- --- -data Instance = Instance - { iAvailabilityZone :: !AvailabilityZone - -- ^ Availability Zones associated with this instance. - , iHealthStatus :: !Text - -- ^ The instance's health status. - , iInstanceId :: !Text - -- ^ Specifies the ID of the Amazon EC2 instance. - , iLaunchConfigurationName :: Maybe Text - -- ^ The launch configuration associated with this instance. - , iLifecycleState :: !Text - -- ^ Contains a description of the current lifecycle state. - } deriving (Eq, Show, Generic) - -instance IsQuery Instance - -instance IsXML Instance where - xmlPickler = withNS autoScalingNS - --- | The InstanceMonitoring data type. --- --- -data InstanceMonitoring = InstanceMonitoring - { imEnabled :: Bool - -- ^ If True, instance monitoring is enabled. - } deriving (Eq, Show, Generic) - -instance IsQuery InstanceMonitoring - -instance IsXML InstanceMonitoring where - xmlPickler = withNS autoScalingNS - --- | The LaunchConfiguration data type. --- --- -data LaunchConfiguration = LaunchConfiguration - { lcBlockDeviceMappings :: Members BlockDeviceMapping - -- ^ Specifies how block devices are exposed to the instance. Each - -- mapping is made up of a virtualName and a deviceName. - , lcCreatedTime :: !UTCTime - -- ^ Provides the creation date and time for this launch - -- configuration. - , lcEbsOptimized :: Maybe Bool - -- ^ Specifies whether the instance is optimized for EBS I/O (true) or - -- not (false). - , lcIamInstanceProfile :: Maybe Text - -- ^ Provides the name or the Amazon Resource Name (ARN) of the - -- instance profile associated with the IAM role for the instance. - -- The instance profile contains the IAM role. - , lcImageId :: !Text - -- ^ Provides the unique ID of the Amazon Machine Image (AMI) that was - -- assigned during registration. - , lcInstanceMonitoring :: Maybe InstanceMonitoring - -- ^ Controls whether instances in this group are launched with - -- detailed monitoring or not. - , lcInstanceType :: !Text - -- ^ Specifies the instance type of the Amazon EC2 instance. - , lcKernelId :: Maybe Text - -- ^ Provides the ID of the kernel associated with the Amazon EC2 AMI. - , lcKeyName :: Maybe Text - -- ^ Provides the name of the Amazon EC2 key pair. - , lcLaunchConfigurationARN :: Maybe Text - -- ^ The launch configuration's Amazon Resource Name (ARN). - , lcLaunchConfigurationName :: !Text - -- ^ Specifies the name of the launch configuration. - , lcRamdiskId :: Maybe Text - -- ^ Provides ID of the RAM disk associated with the Amazon EC2 AMI. - , lcSecurityGroups :: Maybe Text - -- ^ A description of the security groups to associate with the Amazon - -- EC2 instances. - , lcSpotPrice :: Maybe Text - -- ^ Specifies the price to bid when launching Spot Instances. - , lcUserData :: Maybe Text - -- ^ The user data available to the launched Amazon EC2 instances. - } deriving (Eq, Show, Generic) - -instance IsQuery LaunchConfiguration - -instance IsXML LaunchConfiguration where - xmlPickler = withNS autoScalingNS - --- | The MetricCollectionType data type. --- --- -data MetricCollectionType = MetricCollectionType - { mctMetric :: Text - -- ^ Type: String - } deriving (Eq, Show, Generic) - -instance IsQuery MetricCollectionType - -instance IsXML MetricCollectionType where - xmlPickler = withNS autoScalingNS - --- | The MetricGranularityType data type. --- --- -data MetricGranularityType = MetricGranularityType - { mgtGranularity :: Text - -- ^ The granularity of a Metric. - } deriving (Eq, Show, Generic) - -instance IsQuery MetricGranularityType - -instance IsXML MetricGranularityType where - xmlPickler = withNS autoScalingNS - --- | The NotificationConfiguration data type. --- --- -data NotificationConfiguration = NotificationConfiguration - { ncAutoScalingGroupName :: Maybe Text - -- ^ Specifies the Auto Scaling group name. - , ncNotificationType :: Maybe Text - -- ^ The types of events for an action to start. - , ncTopicARN :: Maybe Text - -- ^ The Amazon Resource Name (ARN) of the Amazon Simple Notification - -- Service (SNS) topic. - } deriving (Eq, Show, Generic) - -instance IsQuery NotificationConfiguration - -instance IsXML NotificationConfiguration where - xmlPickler = withNS autoScalingNS - --- | There are two primary Auto Scaling process types: Launch and Terminate. The --- Launch process creates a new Amazon EC2 instance for an Auto Scaling group, --- and the Terminate process removes an existing Amazon EC2 instance. The --- remaining Auto Scaling process types relate to specific Auto Scaling --- features: Important If you suspend Launch or Terminate, all other process --- types are affected to varying degrees. --- --- -data ProcessType = ProcessType - { ptProcessName :: !Text - -- ^ The name of a process. - } deriving (Eq, Show, Generic) - -instance IsQuery ProcessType - -instance IsXML ProcessType where - xmlPickler = withNS autoScalingNS - --- | The PolicyARNType data type. --- --- -data PutScalingPolicyResult = PutScalingPolicyResult - { psprPolicyARN :: Text - -- ^ A policy's Amazon Resource Name (ARN). - } deriving (Eq, Show, Generic) - -instance IsXML PutScalingPolicyResult where - xmlPickler = withNS autoScalingNS - --- | The ScalingPolicy data type. --- --- -data ScalingPolicy = ScalingPolicy - { spAdjustmentType :: Maybe Text - -- ^ Specifies whether the ScalingAdjustment is an absolute number or - -- a percentage of the current capacity. Valid values are - -- ChangeInCapacity, ExactCapacity, and PercentChangeInCapacity. - , spAlarms :: Members Alarm - -- ^ A list of CloudWatch Alarms related to the policy. - , sqAutoScalingGroupName :: Maybe Text - -- ^ The name of the Auto Scaling group associated with this scaling - -- policy. - , sqCooldown :: Maybe Integer - -- ^ The amount of time, in seconds, after a scaling activity - -- completes before any further trigger-related scaling activities - -- can start. - , sqMinAdjustmentStep :: Maybe Integer - -- ^ Changes the DesiredCapacity of the Auto Scaling group by at least - -- the specified number of instances. - , sqPolicyARN :: Maybe Text - -- ^ The Amazon Resource Name (ARN) of the policy. - , sqPolicyName :: Maybe Text - -- ^ The name of the scaling policy. - , sqScalingAdjustment :: Maybe Integer - -- ^ The number associated with the specified adjustment type. A - -- positive value adds to the current capacity and a negative value - -- removes from the current capacity. - } deriving (Eq, Show, Generic) - -instance IsQuery ScalingPolicy - -instance IsXML ScalingPolicy where - xmlPickler = withNS autoScalingNS - --- | This data type stores information about a scheduled update to an Auto --- Scaling group. --- --- -data ScheduledUpdateGroupAction = ScheduledUpdateGroupAction - { sugaAutoScalingGroupName :: Maybe Text - -- ^ The name of the Auto Scaling group to be updated. - , sugaDesiredCapacity :: Maybe Integer - -- ^ The number of instances you prefer to maintain in your Auto - -- Scaling group. - , sugaEndTime :: Maybe UTCTime - -- ^ The time that the action is scheduled to end. This value can be - -- up to one month in the future. - , sugaMaxSize :: Maybe Integer - -- ^ The maximum size of the Auto Scaling group. - , sugaMinSize :: Maybe Integer - -- ^ The minimum size of the Auto Scaling group. - , sugaRecurrence :: Maybe Text - -- ^ The regular schedule that an action occurs. - , sugaScheduledActionARN :: Maybe Text - -- ^ The Amazon Resource Name (ARN) of this scheduled action. - , sugaScheduledActionName :: Maybe Text - -- ^ The name of this scheduled action. - , sugaStartTime :: Maybe UTCTime - -- ^ The time that the action is scheduled to begin. This value can be - -- up to one month in the future. - , sugaTime :: Maybe UTCTime - -- ^ Time is deprecated. - } deriving (Eq, Show, Generic) - -instance IsQuery ScheduledUpdateGroupAction - -instance IsXML ScheduledUpdateGroupAction where - xmlPickler = withNS autoScalingNS - --- | An Auto Scaling process that has been suspended. For more information, see --- ProcessType. --- --- -data SuspendedProcess = SuspendedProcess - { spProcessName :: Maybe Text - -- ^ The name of the suspended process. - , spSuspensionReason :: Maybe Text - -- ^ The reason that the process was suspended. - } deriving (Eq, Show, Generic) - -instance IsQuery SuspendedProcess - -instance IsXML SuspendedProcess where - xmlPickler = withNS autoScalingNS - --- | The tag applied to an Auto Scaling group. --- --- -data Tag = Tag - { tKey :: !Text - -- ^ The key of the tag. - , tPropagateAtLaunch :: Maybe Bool - -- ^ Specifies whether the new tag will be applied to instances - -- launched after the tag is created. The same behavior applies to - -- updates: If you change a tag, the changed tag will be applied to - -- all instances launched after you made the change. - , tResourceId :: Maybe Text - -- ^ The name of the Auto Scaling group. - , tResourceType :: Maybe Text - -- ^ The kind of resource to which the tag is applied. Currently, Auto - -- Scaling supports the auto-scaling-group resource type. - , tValue :: Maybe Text - -- ^ The value of the tag. - } deriving (Eq, Show, Generic) - -instance IsQuery Tag - -instance IsXML Tag where - xmlPickler = withNS autoScalingNS - --- | The output for the TerminateInstanceInAutoScalingGroup action. --- --- -data TerminateInstanceInAutoScalingGroupResult = TerminateInstanceInAutoScalingGroupResult - { tiiasgrActivity :: Maybe Activity - -- ^ A scaling Activity. - } deriving (Eq, Show, Generic) - -instance IsXML TerminateInstanceInAutoScalingGroupResult where - xmlPickler = withNS autoScalingNS diff --git a/src/Network/AWS/CloudWatch.hs b/src/Network/AWS/CloudWatch.hs deleted file mode 100644 index 82057b0bea5..00000000000 --- a/src/Network/AWS/CloudWatch.hs +++ /dev/null @@ -1,501 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies #-} - --- Module : Network.AWS.CloudWatch --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | Amazon CloudWatch is a web service that enables you to publish, monitor, and --- manage various metrics, as well as configure alarm actions based on data --- from metrics. -module Network.AWS.CloudWatch - ( - -- * Actions - -- ** DeleteAlarms - DeleteAlarms (..) - , DeleteAlarmsResponse (..) - - -- ** DescribeAlarmHistory - , DescribeAlarmHistory (..) - , DescribeAlarmHistoryResponse (..) - - -- ** DescribeAlarms - , DescribeAlarms (..) - , DescribeAlarmsResponse (..) - - -- ** DescribeAlarmsForMetric - , DescribeAlarmsForMetric (..) - , DescribeAlarmsForMetricResponse (..) - - -- ** DisableAlarmActions - , DisableAlarmActions (..) - , DisableAlarmActionsResponse (..) - - -- ** EnableAlarmActions - , EnableAlarmActions (..) - , EnableAlarmActionsResponse (..) - - -- ** GetMetricStatistics - , GetMetricStatistics (..) - , GetMetricStatisticsResponse (..) - - -- ** ListMetrics - , ListMetrics (..) - , ListMetricsResponse (..) - - -- ** PutMetricAlarm - , PutMetricAlarm (..) - , PutMetricAlarmResponse (..) - - -- ** PutMetricData - , PutMetricData (..) - , PutMetricDataResponse (..) - - -- ** SetAlarmState - , SetAlarmState (..) - , SetAlarmStateResponse (..) - - -- * Data Types - , module Network.AWS.CloudWatch.Types - - -- * Common - , module Network.AWS - ) where - -import Data.Text (Text) -import Data.Time -import Network.AWS -import Network.AWS.CloudWatch.Types -import Network.AWS.Internal -import Network.HTTP.Types.Method - --- | Deletes all specified alarms. In the event of an error, no alarms are --- deleted. --- --- -data DeleteAlarms = DeleteAlarms - { daAlarmNames :: Members Text - -- ^ A list of alarms to be deleted. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteAlarms - -instance Rq DeleteAlarms where - type Er DeleteAlarms = CloudWatchError - type Rs DeleteAlarms = DeleteAlarmsResponse - request = query4 cloudWatch GET "DeleteAlarms" - -data DeleteAlarmsResponse = DeleteAlarmsResponse - { darResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteAlarmsResponse where - xmlPickler = withNS cloudWatchNS - --- | Retrieves history for the specified alarm. Filter alarms by date range or --- item type. If an alarm name is not specified, Amazon CloudWatch returns --- histories for all of the owner's alarms. Note Amazon CloudWatch retains the --- history of an alarm for two weeks, whether or not you delete the alarm. --- --- -data DescribeAlarmHistory = DescribeAlarmHistory - { dahAlarmName :: Maybe Text - -- ^ The name of the alarm. - , dahEndDate :: Maybe UTCTime - -- ^ The ending date to retrieve alarm history. - , dahHistoryItemType :: Maybe Text - -- ^ The type of alarm histories to retrieve. - , dahMaxRecords :: Maybe Integer - -- ^ The maximum number of alarm history records to retrieve. - , dahNextToken :: Maybe Text - -- ^ The token returned by a previous call to indicate that there is - -- more data available. - , dahStartDate :: Maybe UTCTime - -- ^ The starting date to retrieve alarm history. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeAlarmHistory - -instance Rq DescribeAlarmHistory where - type Er DescribeAlarmHistory = CloudWatchError - type Rs DescribeAlarmHistory = DescribeAlarmHistoryResponse - request = query4 cloudWatch GET "DescribeAlarmHistory" - -data DescribeAlarmHistoryResponse = DescribeAlarmHistoryResponse - { dahrResponseMetadata :: !Text - , dahrDescribeAlarmHistoryResult :: !DescribeAlarmHistoryResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAlarmHistoryResponse where - xmlPickler = withNS cloudWatchNS - --- | Retrieves alarms with the specified names. If no name is specified, all --- alarms for the user are returned. Alarms can be retrieved by using only a --- prefix for the alarm name, the alarm state, or a prefix for any action. --- --- -data DescribeAlarms = DescribeAlarms - { daActionPrefix :: Maybe Text - -- ^ The action name prefix. - , daAlarmNamePrefix :: Maybe Text - -- ^ The alarm name prefix. AlarmNames cannot be specified if this - -- parameter is specified. - , dbAlarmNames :: Members Text - -- ^ A list of alarm names to retrieve information for. - , dbMaxRecords :: Maybe Integer - -- ^ The maximum number of alarm descriptions to retrieve. - , dbNextToken :: Maybe Text - -- ^ The token returned by a previous call to indicate that there is - -- more data available. - , dbStateValue :: Maybe Text - -- ^ The state value to be used in matching alarms. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeAlarms - -instance Rq DescribeAlarms where - type Er DescribeAlarms = CloudWatchError - type Rs DescribeAlarms = DescribeAlarmsResponse - request = query4 cloudWatch GET "DescribeAlarms" - -data DescribeAlarmsResponse = DescribeAlarmsResponse - { dasResponseMetadata :: !Text - , dasDescribeAlarmsResult :: !DescribeAlarmsResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAlarmsResponse where - xmlPickler = withNS cloudWatchNS - --- | Retrieves all alarms for a single metric. Specify a statistic, period, or --- unit to filter the set of alarms further. --- --- -data DescribeAlarmsForMetric = DescribeAlarmsForMetric - { dafmDimensions :: Members Dimension - -- ^ The list of dimensions associated with the metric. - , dafmMetricName :: !Text - -- ^ The name of the metric. - , dafmNamespace :: !Text - -- ^ The namespace of the metric. - , dafmPeriod :: Maybe Integer - -- ^ The period in seconds over which the statistic is applied. - , dafmStatistic :: Maybe Text - -- ^ The statistic for the metric. - , dafmUnit :: Maybe Text - -- ^ The unit for the metric. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeAlarmsForMetric - -instance Rq DescribeAlarmsForMetric where - type Er DescribeAlarmsForMetric = CloudWatchError - type Rs DescribeAlarmsForMetric = DescribeAlarmsForMetricResponse - request = query4 cloudWatch GET "DescribeAlarmsForMetric" - -data DescribeAlarmsForMetricResponse = DescribeAlarmsForMetricResponse - { dafmrResponseMetadata :: !Text - , dafmrDescribeAlarmsForMetricResult :: !DescribeAlarmsForMetricResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAlarmsForMetricResponse where - xmlPickler = withNS cloudWatchNS - --- | Disables actions for the specified alarms. When an alarm's actions are --- disabled the alarm's state may change, but none of the alarm's actions will --- execute. --- --- -data DisableAlarmActions = DisableAlarmActions - { daaAlarmNames :: Members Text - -- ^ The names of the alarms to disable actions for. - } deriving (Eq, Show, Generic) - -instance IsQuery DisableAlarmActions - -instance Rq DisableAlarmActions where - type Er DisableAlarmActions = CloudWatchError - type Rs DisableAlarmActions = DisableAlarmActionsResponse - request = query4 cloudWatch GET "DisableAlarmActions" - -data DisableAlarmActionsResponse = DisableAlarmActionsResponse - { daarResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DisableAlarmActionsResponse where - xmlPickler = withNS cloudWatchNS - --- | Enables actions for the specified alarms. --- --- -data EnableAlarmActions = EnableAlarmActions - { eaaAlarmNames :: Members Text - -- ^ The names of the alarms to enable actions for. - } deriving (Eq, Show, Generic) - -instance IsQuery EnableAlarmActions - -instance Rq EnableAlarmActions where - type Er EnableAlarmActions = CloudWatchError - type Rs EnableAlarmActions = EnableAlarmActionsResponse - request = query4 cloudWatch GET "EnableAlarmActions" - -data EnableAlarmActionsResponse = EnableAlarmActionsResponse - { eaarResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML EnableAlarmActionsResponse where - xmlPickler = withNS cloudWatchNS - --- | Gets statistics for the specified metric. The maximum number of data points --- returned from a single GetMetricStatistics request is 1,440, whereas the --- maximum number of data points that can be queried is 50,850. If you make a --- request that generates more than 1,440 data points, Amazon CloudWatch --- returns an error. In such a case, you can alter the request by narrowing --- the specified time range or increasing the specified period. Alternatively, --- you can make multiple requests across adjacent time ranges. --- GetMetricStatistics does not return the data in chronological order. Amazon --- CloudWatch aggregates data points based on the length of the period that --- you specify. For example, if you request statistics with a one-minute --- granularity, Amazon CloudWatch aggregates data points with time stamps that --- fall within the same one-minute period. In such a case, the data points --- queried can greatly outnumber the data points returned. The following --- examples show various statistics allowed by the data point query4 cloudWatch maximum of --- 50,850 when you call GetMetricStatistics on Amazon EC2 instances with --- detailed (one-minute) monitoring enabled: For information about the --- namespace, metric names, and dimensions that other Amazon Web Services --- products use to send metrics to CloudWatch, go to Amazon CloudWatch --- Metrics, Namespaces, and Dimensions Reference in the Amazon CloudWatch --- Developer Guide. --- --- -data GetMetricStatistics = GetMetricStatistics - { gmsDimensions :: Members Dimension - -- ^ A list of dimensions describing qualities of the metric. - , gmsEndTime :: !UTCTime - -- ^ The time stamp to use for determining the last datapoint to - -- return. The value specified is exclusive; results will include - -- datapoints up to the time stamp specified. - , gmsMetricName :: !Text - -- ^ The name of the metric, with or without spaces. - , gmsNamespace :: !Text - -- ^ The namespace of the metric, with or without spaces. - , gmsPeriod :: !Integer - -- ^ The granularity, in seconds, of the returned datapoints. Period - -- must be at least 60 seconds and must be a multiple of 60. The - -- default value is 60. - , gmsStartTime :: !UTCTime - -- ^ The time stamp to use for determining the first datapoint to - -- return. The value specified is inclusive; results include - -- datapoints with the time stamp specified. - , gmsStatistics :: Members Text - -- ^ The metric statistics to return. For information about specific - -- statistics returned by GetMetricStatistics, go to Statistics in - -- the Amazon CloudWatch Developer Guide. - , gmsUnit :: Maybe Text - -- ^ The unit for the metric. - } deriving (Eq, Show, Generic) - -instance IsQuery GetMetricStatistics - -instance Rq GetMetricStatistics where - type Er GetMetricStatistics = CloudWatchError - type Rs GetMetricStatistics = GetMetricStatisticsResponse - request = query4 cloudWatch GET "GetMetricStatistics" - -data GetMetricStatisticsResponse = GetMetricStatisticsResponse - { gmsrResponseMetadata :: !Text - , gmsrGetMetricStatisticsResult :: !GetMetricStatisticsResult - } deriving (Eq, Show, Generic) - -instance IsXML GetMetricStatisticsResponse where - xmlPickler = withNS cloudWatchNS - --- | Returns a list of valid metrics stored for the AWS account owner. Returned --- metrics can be used with GetMetricStatistics to obtain statistical data for --- a given metric. Note Up to 500 results are returned for any one call. To --- retrieve further results, use returned NextToken values with subsequent --- ListMetrics operations. Note If you create a metric with the PutMetricData --- action, allow up to fifteen minutes for the metric to appear in calls to --- the ListMetrics action. Statistics about the metric, however, are available --- sooner using GetMetricStatistics. --- --- -data ListMetrics = ListMetrics - { lmDimensions :: Members DimensionFilter - -- ^ A list of dimensions to filter against. - , lmMetricName :: Maybe Text - -- ^ The name of the metric to filter against. - , lmNamespace :: Maybe Text - -- ^ The namespace to filter against. - , lmNextToken :: Maybe Text - -- ^ The token returned by a previous call to indicate that there is - -- more data available. - } deriving (Eq, Show, Generic) - -instance IsQuery ListMetrics - -instance Rq ListMetrics where - type Er ListMetrics = CloudWatchError - type Rs ListMetrics = ListMetricsResponse - request = query4 cloudWatch GET "ListMetrics" - -data ListMetricsResponse = ListMetricsResponse - { lmrResponseMetadata :: !Text - , lmrListMetricsResult :: !ListMetricsResult - } deriving (Eq, Show, Generic) - -instance IsXML ListMetricsResponse where - xmlPickler = withNS cloudWatchNS - --- | Creates or updates an alarm and associates it with the specified Amazon --- CloudWatch metric. Optionally, this operation can associate one or more --- Amazon Simple Notification Service resources with the alarm. When this --- operation creates an alarm, the alarm state is immediately set to --- INSUFFICIENT_DATA. The alarm is evaluated and its StateValue is set --- appropriately. Any actions associated with the StateValue is then executed. --- Note When updating an existing alarm, its StateValue is left unchanged. --- --- -data PutMetricAlarm = PutMetricAlarm - { pmaActionsEnabled :: Maybe Bool - -- ^ Indicates whether or not actions should be executed during any - -- changes to the alarm's state. - , pmaAlarmActions :: Members Text - -- ^ The list of actions to execute when this alarm transitions into - -- an ALARM state from any other state. Each action is specified as - -- an Amazon Resource Number (ARN). Currently the only action - -- supported is publishing to an Amazon SNS topic or an Amazon Auto - -- Scaling policy. - , pmaAlarmDescription :: Maybe Text - -- ^ The description for the alarm. - , pmaAlarmName :: !Text - -- ^ The descriptive name for the alarm. This name must be unique - -- within the user's AWS account - , pmaComparisonOperator :: !Text - -- ^ The arithmetic operation to use when comparing the specified - -- Statistic and Threshold. The specified Statistic value is used as - -- the first operand. - , pmaDimensions :: Members Dimension - -- ^ The dimensions for the alarm's associated metric. - , pmaEvaluationPeriods :: !Integer - -- ^ The number of periods over which data is compared to the - -- specified threshold. - , pmaInsufficientDataActions :: Members Text - -- ^ The list of actions to execute when this alarm transitions into - -- an INSUFFICIENT_DATA state from any other state. Each action is - -- specified as an Amazon Resource Number (ARN). Currently the only - -- action supported is publishing to an Amazon SNS topic or an - -- Amazon Auto Scaling policy. - , pmaMetricName :: !Text - -- ^ The name for the alarm's associated metric. - , pmaNamespace :: !Text - -- ^ The namespace for the alarm's associated metric. - , pmaOKActions :: Members Text - -- ^ The list of actions to execute when this alarm transitions into - -- an OK state from any other state. Each action is specified as an - -- Amazon Resource Number (ARN). Currently the only action supported - -- is publishing to an Amazon SNS topic or an Amazon Auto Scaling - -- policy. - , pmaPeriod :: !Integer - -- ^ The period in seconds over which the specified statistic is - -- applied. - , pmaStatistic :: !Text - -- ^ The statistic to apply to the alarm's associated metric. - , pmaThreshold :: !Double - -- ^ The value against which the specified statistic is compared. - , pmaUnit :: Maybe Text - -- ^ The unit for the alarm's associated metric. - } deriving (Eq, Show, Generic) - -instance IsQuery PutMetricAlarm - -instance Rq PutMetricAlarm where - type Er PutMetricAlarm = CloudWatchError - type Rs PutMetricAlarm = PutMetricAlarmResponse - request = query4 cloudWatch GET "PutMetricAlarm" - -data PutMetricAlarmResponse = PutMetricAlarmResponse - { pmarResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML PutMetricAlarmResponse where - xmlPickler = withNS cloudWatchNS - --- | Publishes metric data points to Amazon CloudWatch. Amazon CloudWatch --- associates the data points with the specified metric. If the specified --- metric does not exist, Amazon CloudWatch creates the metric. When Amazon --- CloudWatch creates a metric, it can take up to fifteen minutes for the --- metric to appear in calls to the ListMetrics action. Each PutMetricData --- request is limited to 8 KB in size for HTTP GET requests and is limited to --- 40 KB in size for HTTP POST requests. Important Although the Value --- parameter accepts numbers of type Double, Amazon CloudWatch rejects values --- that are either too small or too large. Values must be in the range of --- 8.515920e-109 to 1.174271e+108 (Base 10) or 2e-360 to 2e360 (Base 2). In --- addition, special values (e.g., NaN, +Infinity, -Infinity) are not --- supported. Data that is timestamped 24 hours or more in the past may take --- in excess of 48 hours to become available from submission time using --- GetMetricStatistics. --- --- -data PutMetricData = PutMetricData - { pmdMetricData :: Members MetricDatum - -- ^ A list of data describing the metric. - , pmdNamespace :: !Text - -- ^ The namespace for the metric data. - } deriving (Eq, Show, Generic) - -instance IsQuery PutMetricData - -instance Rq PutMetricData where - type Er PutMetricData = CloudWatchError - type Rs PutMetricData = PutMetricDataResponse - request = query4 cloudWatch GET "PutMetricData" - -data PutMetricDataResponse = PutMetricDataResponse - { pmdrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML PutMetricDataResponse where - xmlPickler = withNS cloudWatchNS - --- | Temporarily sets the state of an alarm. When the updated StateValue differs --- from the previous value, the action configured for the appropriate state is --- invoked. This is not a permanent change. The next periodic alarm check (in --- about a minute) will set the alarm to its actual state. --- --- -data SetAlarmState = SetAlarmState - { sasAlarmName :: !Text - -- ^ The descriptive name for the alarm. This name must be unique - -- within the user's AWS account. The maximum length is 255 - -- characters. - , sasStateReason :: !Text - -- ^ The reason that this alarm is set to this specific state (in - -- human-readable text format) - , sasStateReasonData :: Maybe Text - -- ^ The reason that this alarm is set to this specific state (in - -- machine-readable JSON format) - , sasStateValue :: !Text - -- ^ The value of the state. - } deriving (Eq, Show, Generic) - -instance IsQuery SetAlarmState - -instance Rq SetAlarmState where - type Er SetAlarmState = CloudWatchError - type Rs SetAlarmState = SetAlarmStateResponse - request = query4 cloudWatch GET "SetAlarmState" - -data SetAlarmStateResponse = SetAlarmStateResponse - { sasrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML SetAlarmStateResponse where - xmlPickler = withNS cloudWatchNS diff --git a/src/Network/AWS/CloudWatch/Types.hs b/src/Network/AWS/CloudWatch/Types.hs deleted file mode 100644 index 97fa22802b9..00000000000 --- a/src/Network/AWS/CloudWatch/Types.hs +++ /dev/null @@ -1,345 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} - --- Module : Network.AWS.CloudWatch.Types --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.CloudWatch.Types where - -import Data.ByteString (ByteString) -import Data.Monoid -import Data.Text (Text) -import Data.Time -import Network.AWS.Internal - --- | Currently supported version of the CloudWatch service. -cloudWatch :: Service -cloudWatch = Service Regional version4 "monitoring" "2010-08-01" - --- | XML namespace to annotate CloudWatch elements with. -cloudWatchNS :: ByteString -cloudWatchNS = "http://monitoring.amazonaws.com/doc/" <> svcVersion cloudWatch <> "/" - --- | Helper to define CloudWatch namespaced XML elements. -cloudWatchElem :: ByteString -> NName ByteString -cloudWatchElem = mkNName cloudWatchNS - -data CloudWatchError = CloudWatchError - { cweCode :: !Text - , cweMessage :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML CloudWatchError where - xmlPickler = withNS cloudWatchNS - -instance ToError CloudWatchError where - toError = Err . show - --- | The AlarmHistoryItem data type contains descriptive information about the --- history of a specific alarm. If you call DescribeAlarmHistory, Amazon --- CloudWatch returns this data type as part of the DescribeAlarmHistoryResult --- data type. --- --- -data AlarmHistoryItem = AlarmHistoryItem - { ahiAlarmName :: Maybe Text - -- ^ The descriptive name for the alarm. - , ahiHistoryData :: Maybe Text - -- ^ Machine-readable data about the alarm in JSON format. - , ahiHistoryItemType :: Maybe Text - -- ^ The type of alarm history item. - , ahiHistorySummary :: Maybe Text - -- ^ A human-readable summary of the alarm history. - , ahiTimestamp :: Maybe UTCTime - -- ^ The time stamp for the alarm history item. - } deriving (Eq, Show, Generic) - -instance IsQuery AlarmHistoryItem - -instance IsXML AlarmHistoryItem where - xmlPickler = withNS cloudWatchNS - --- | The Datapoint data type encapsulates the statistical data that Amazon --- CloudWatch computes from metric data. --- --- -data Datapoint = Datapoint - { dAverage :: Maybe Double - -- ^ The average of metric values that correspond to the datapoint. - , dMaximum :: Maybe Double - -- ^ The maximum of the metric value used for the datapoint. - , dMinimum :: Maybe Double - -- ^ The minimum metric value used for the datapoint. - , dSampleCount :: Maybe Double - -- ^ The number of metric values that contributed to the aggregate - -- value of this datapoint. - , dSum :: Maybe Double - -- ^ The sum of metric values used for the datapoint. - , dTimestamp :: Maybe UTCTime - -- ^ The time stamp used for the datapoint. - , dUnit :: Maybe Text - -- ^ The standard unit used for the datapoint. - } deriving (Eq, Show, Generic) - -instance IsQuery Datapoint - -instance IsXML Datapoint where - xmlPickler = withNS cloudWatchNS - --- | The output for the DescribeAlarmHistory action. --- --- -data DescribeAlarmHistoryResult = DescribeAlarmHistoryResult - { dahrAlarmHistoryItems :: Maybe AlarmHistoryItem - -- ^ A list of alarm histories in JSON format. - , dahrNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned - -- results. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeAlarmHistoryResult - -instance IsXML DescribeAlarmHistoryResult where - xmlPickler = withNS cloudWatchNS - --- | The output for the DescribeAlarmsForMetric action. --- --- -data DescribeAlarmsForMetricResult = DescribeAlarmsForMetricResult - { dafmrMetricAlarms :: Maybe MetricAlarm - -- ^ A list of information for each alarm with the specified metric. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeAlarmsForMetricResult - -instance IsXML DescribeAlarmsForMetricResult where - xmlPickler = withNS cloudWatchNS - --- | The output for the DescribeAlarms action. --- --- -data DescribeAlarmsResult = DescribeAlarmsResult - { darMetricAlarms :: Maybe MetricAlarm - -- ^ A list of information for the specified alarms. - , darNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned - -- results. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeAlarmsResult - -instance IsXML DescribeAlarmsResult where - xmlPickler = withNS cloudWatchNS - --- | The Dimension data type further expands on the identity of a metric using a --- Name, Value pair. For examples that use one or more dimensions, see --- PutMetricData. --- --- -data Dimension = Dimension - { dName :: !Text - -- ^ The name of the dimension. - , dValue :: !Text - -- ^ The value representing the dimension measurement - } deriving (Eq, Show, Generic) - -instance IsQuery Dimension - -instance IsXML Dimension where - xmlPickler = withNS cloudWatchNS - --- | The DimensionFilter data type is used to filter ListMetrics results. --- --- -data DimensionFilter = DimensionFilter - { dfName :: !Text - -- ^ The dimension name to be matched. - , dfValue :: Maybe Text - -- ^ The value of the dimension to be matched. - } deriving (Eq, Show, Generic) - -instance IsQuery DimensionFilter - -instance IsXML DimensionFilter where - xmlPickler = withNS cloudWatchNS - --- | The output for the GetMetricStatistics action. --- --- -data GetMetricStatisticsResult = GetMetricStatisticsResult - { gmsrDatapoints :: Maybe Datapoint - -- ^ The datapoints for the specified metric. - , gmsrLabel :: Maybe Text - -- ^ A label describing the specified metric. - } deriving (Eq, Show, Generic) - -instance IsQuery GetMetricStatisticsResult - -instance IsXML GetMetricStatisticsResult where - xmlPickler = withNS cloudWatchNS - --- | The output for the ListMetrics action. --- --- -data ListMetricsResult = ListMetricsResult - { lmrMetrics :: Maybe Metric - -- ^ A list of metrics used to generate statistics for an AWS account. - , lmrNextToken :: Maybe Text - -- ^ A string that marks the start of the next batch of returned - -- results. - } deriving (Eq, Show, Generic) - -instance IsQuery ListMetricsResult - -instance IsXML ListMetricsResult where - xmlPickler = withNS cloudWatchNS - --- | The Metric data type contains information about a specific metric. If you --- call ListMetrics, Amazon CloudWatch returns information contained by this --- data type. The example in the Examples section publishes two metrics named --- buffers and latency. Both metrics are in the examples namespace. Both --- metrics have two dimensions, InstanceID and InstanceType. --- --- -data Metric = Metric - { mDimensions :: Maybe Dimension - -- ^ A list of dimensions associated with the metric. - , mMetricName :: Maybe Text - -- ^ The name of the metric. - , mNamespace :: Maybe Text - -- ^ The namespace of the metric. - } deriving (Eq, Show, Generic) - -instance IsQuery Metric - -instance IsXML Metric where - xmlPickler = withNS cloudWatchNS - --- | The MetricAlarm data type represents an alarm. You can use PutMetricAlarm --- to create or update an alarm. --- --- -data MetricAlarm = MetricAlarm - { maActionsEnabled :: Maybe Bool - -- ^ Indicates whether actions should be executed during any changes - -- to the alarm's state. - , maAlarmActions :: Maybe Text - -- ^ The list of actions to execute when this alarm transitions into - -- an ALARM state from any other state. Each action is specified as - -- an Amazon Resource Number (ARN). Currently the only actions - -- supported are publishing to an Amazon SNS topic and triggering an - -- Auto Scaling policy. - , maAlarmArn :: Maybe Text - -- ^ The Amazon Resource Name (ARN) of the alarm. - , maAlarmConfigurationUpdatedTimestamp :: Maybe UTCTime - -- ^ The time stamp of the last update to the alarm configuration. - , maAlarmDescription :: Maybe Text - -- ^ The description for the alarm. - , maAlarmName :: Maybe Text - -- ^ The name of the alarm. - , maComparisonOperator :: Maybe Text - -- ^ The arithmetic operation to use when comparing the specified - -- Statistic and Threshold. The specified Statistic value is used as - -- the first operand. - , maDimensions :: Maybe Dimension - -- ^ The list of dimensions associated with the alarm's associated - -- metric. - , maEvaluationPeriods :: Maybe Integer - -- ^ The number of periods over which data is compared to the - -- specified threshold. - , maInsufficientDataActions :: Maybe Text - -- ^ The list of actions to execute when this alarm transitions into - -- an INSUFFICIENT_DATA state from any other state. Each action is - -- specified as an Amazon Resource Number (ARN). Currently the only - -- actions supported are publishing to an Amazon SNS topic or - -- triggering an Auto Scaling policy. - , maMetricName :: Maybe Text - -- ^ The name of the alarm's metric. - , maNamespace :: Maybe Text - -- ^ The namespace of alarm's associated metric. - , maOKActions :: Maybe Text - -- ^ The list of actions to execute when this alarm transitions into - -- an OK state from any other state. Each action is specified as an - -- Amazon Resource Number (ARN). Currently the only actions - -- supported are publishing to an Amazon SNS topic and triggering an - -- Auto Scaling policy. - , maPeriod :: Maybe Integer - -- ^ The period in seconds over which the statistic is applied. - , maStateReason :: Maybe Text - -- ^ A human-readable explanation for the alarm's state. - , maStateReasonData :: Maybe Text - -- ^ An explanation for the alarm's state in machine-readable JSON - -- format - , maStateUpdatedTimestamp :: Maybe UTCTime - -- ^ The time stamp of the last update to the alarm's state. - , maStateValue :: Maybe Text - -- ^ The state value for the alarm. - , maStatistic :: Maybe Text - -- ^ The statistic to apply to the alarm's associated metric. - , maThreshold :: Maybe Double - -- ^ The value against which the specified statistic is compared. - , maUnit :: Maybe Text - -- ^ The unit of the alarm's associated metric. - } deriving (Eq, Show, Generic) - -instance IsQuery MetricAlarm - -instance IsXML MetricAlarm where - xmlPickler = withNS cloudWatchNS - --- | The MetricDatum data type encapsulates the information sent with --- PutMetricData to either create a new metric or add new values to be --- aggregated into an existing metric. --- --- -data MetricDatum = MetricDatum - { mdDimensions :: Maybe Dimension - -- ^ A list of dimensions associated with the metric. Note, when using - -- the Dimensions value in a query, you need to append .member.N to - -- it (e.g., Dimensions.member.N). - , mdMetricName :: !Text - -- ^ The name of the metric. - , mdStatisticValues :: Maybe StatisticSet - -- ^ A set of statistical values describing the metric. - , mdTimestamp :: Maybe UTCTime - -- ^ The time stamp used for the metric in ISO 8601 Universal - -- Coordinated Time (UTC) format. If not specified, the default - -- value is set to the time the metric data was received. - , mdUnit :: Maybe Text - -- ^ The unit of the metric. - , mdValue :: Maybe Double - -- ^ The value for the metric. - } deriving (Eq, Show, Generic) - -instance IsQuery MetricDatum - -instance IsXML MetricDatum where - xmlPickler = withNS cloudWatchNS - --- | The StatisticSet data type describes the StatisticValues component of --- MetricDatum, and represents a set of statistics that describes a specific --- metric. --- --- -data StatisticSet = StatisticSet - { ssMaximum :: !Double - -- ^ The maximum value of the sample set. - , ssMinimum :: !Double - -- ^ The minimum value of the sample set. - , ssSampleCount :: !Double - -- ^ The number of samples used for the statistic set. - , ssSum :: !Double - -- ^ The sum of values for the sample set. - } deriving (Eq, Show, Generic) - -instance IsQuery StatisticSet - -instance IsXML StatisticSet where - xmlPickler = withNS cloudWatchNS diff --git a/src/Network/AWS/EC2.hs b/src/Network/AWS/EC2.hs deleted file mode 100644 index c63c686dd06..00000000000 --- a/src/Network/AWS/EC2.hs +++ /dev/null @@ -1,6292 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies #-} - --- Module : Network.AWS.EC2 --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | Amazon Elastic Compute Cloud provides resizable computing --- capacity in the Amazon Web Services cloud. -module Network.AWS.EC2 - ( - -- * Actions - -- ** AllocateAddress - AllocateAddress (..) - , AllocateAddressResponse (..) - - -- ** AssignPrivateIpAddresses - , AssignPrivateIpAddresses (..) - , AssignPrivateIpAddressesResponse (..) - - -- ** AssociateAddress - , AssociateAddress (..) - , AssociateAddressResponse (..) - - -- ** AssociateDhcpOptions - , AssociateDhcpOptions (..) - , AssociateDhcpOptionsResponse (..) - - -- ** AssociateRouteTable - , AssociateRouteTable (..) - , AssociateRouteTableResponse (..) - - -- ** AttachInternetGateway - , AttachInternetGateway (..) - , AttachInternetGatewayResponse (..) - - -- ** AttachNetworkInterface - , AttachNetworkInterface (..) - , AttachNetworkInterfaceResponse (..) - - -- ** AttachVolume - , AttachVolume (..) - , AttachVolumeResponse (..) - - -- ** AttachVpnGateway - , AttachVpnGateway (..) - , AttachVpnGatewayResponse (..) - - -- ** AuthorizeSecurityGroupEgress - , AuthorizeSecurityGroupEgress (..) - , AuthorizeSecurityGroupEgressResponse (..) - - -- ** AuthorizeSecurityGroupIngress - , AuthorizeSecurityGroupIngress (..) - , AuthorizeSecurityGroupIngressResponse (..) - - -- ** BundleInstance - , BundleInstance (..) - , BundleInstanceResponse (..) - - -- ** CancelBundleTask - , CancelBundleTask (..) - , CancelBundleTaskResponse (..) - - -- ** CancelConversionTask - , CancelConversionTask (..) - , CancelConversionTaskResponse (..) - - -- ** CancelExportTask - , CancelExportTask (..) - , CancelExportTaskResponse (..) - - -- ** CancelReservedInstancesListing - , CancelReservedInstancesListing (..) - , CancelReservedInstancesListingResponse (..) - - -- ** CancelSpotInstanceRequests - , CancelSpotInstanceRequests (..) - , CancelSpotInstanceRequestsResponse (..) - - -- -- ** ConfirmProductInstance - -- , ConfirmProductInstance (..) - - -- -- ** CopyImage - -- , CopyImage (..) - - -- -- ** CopySnapshot - -- , CopySnapshot (..) - - -- -- ** CreateCustomerGateway - -- , CreateCustomerGateway (..) - - -- -- ** CreateDhcpOptions - -- , CreateDhcpOptions (..) - - -- ** CreateImage - , CreateImage (..) - , CreateImageResponse (..) - - -- -- ** CreateInstanceExportTask - -- , CreateInstanceExportTask (..) - - -- -- ** CreateInternetGateway - -- , CreateInternetGateway (..) - - -- ** CreateKeyPair - , CreateKeyPair (..) - , CreateKeyPairResponse (..) - - -- -- ** CreateNetworkAcl - -- , CreateNetworkAcl (..) - - -- -- ** CreateNetworkAclEntry - -- , CreateNetworkAclEntry (..) - - -- -- ** CreateNetworkInterface - -- , CreateNetworkInterface (..) - - -- -- ** CreatePlacementGroup - -- , CreatePlacementGroup (..) - - -- -- ** CreateReservedInstancesListing - -- , CreateReservedInstancesListing (..) - - -- -- ** CreateRoute - -- , CreateRoute (..) - - -- -- ** CreateRouteTable - -- , CreateRouteTable (..) - - -- ** CreateSecurityGroup - , CreateSecurityGroup (..) - , CreateSecurityGroupResponse (..) - - -- -- ** CreateSnapshot - -- , CreateSnapshot (..) - - -- -- ** CreateSpotDatafeedSubscription - -- , CreateSpotDatafeedSubscription (..) - - -- -- ** CreateSubnet - -- , CreateSubnet (..) - - -- ** CreateTags - , CreateTags (..) - , CreateTagsResponse (..) - - -- -- ** CreateVolume - -- , CreateVolume (..) - - -- -- ** CreateVpc - -- , CreateVpc (..) - - -- -- ** CreateVpnConnection - -- , CreateVpnConnection (..) - - -- -- ** CreateVpnConnectionRoute - -- , CreateVpnConnectionRoute (..) - - -- -- ** CreateVpnGateway - -- , CreateVpnGateway (..) - - -- -- ** DeleteCustomerGateway - -- , DeleteCustomerGateway (..) - - -- -- ** DeleteDhcpOptions - -- , DeleteDhcpOptions (..) - - -- -- ** DeleteInternetGateway - -- , DeleteInternetGateway (..) - - -- -- ** DeleteKeyPair - -- , DeleteKeyPair (..) - - -- -- ** DeleteNetworkAcl - -- , DeleteNetworkAcl (..) - - -- -- ** DeleteNetworkAclEntry - -- , DeleteNetworkAclEntry (..) - - -- -- ** DeleteNetworkInterface - -- , DeleteNetworkInterface (..) - - -- -- ** DeletePlacementGroup - -- , DeletePlacementGroup (..) - - -- -- ** DeleteRoute - -- , DeleteRoute (..) - - -- -- ** DeleteRouteTable - -- , DeleteRouteTable (..) - - -- ** DeleteSecurityGroup - , DeleteSecurityGroup (..) - , DeleteSecurityGroupResponse (..) - - -- -- ** DeleteSnapshot - -- , DeleteSnapshot (..) - - -- -- ** DeleteSpotDatafeedSubscription - -- , DeleteSpotDatafeedSubscription (..) - - -- -- ** DeleteSubnet - -- , DeleteSubnet (..) - - -- -- ** DeleteTags - -- , DeleteTags (..) - - -- -- ** DeleteVolume - -- , DeleteVolume (..) - - -- -- ** DeleteVpc - -- , DeleteVpc (..) - - -- -- ** DeleteVpnConnection - -- , DeleteVpnConnection (..) - - -- -- ** DeleteVpnConnectionRoute - -- , DeleteVpnConnectionRoute (..) - - -- -- ** DeleteVpnGateway - -- , DeleteVpnGateway (..) - - -- -- ** DeregisterImage - -- , DeregisterImage (..) - - -- -- ** DescribeAccountAttributes - -- , DescribeAccountAttributes (..) - - -- -- ** DescribeAddresses - -- , DescribeAddresses (..) - - -- ** DescribeAvailabilityZones - , DescribeAvailabilityZones (..) - , DescribeAvailabilityZonesResponse (..) - - -- -- ** DescribeBundleTasks - -- , DescribeBundleTasks (..) - - -- -- ** DescribeConversionTasks - -- , DescribeConversionTasks (..) - - -- -- ** DescribeCustomerGateways - -- , DescribeCustomerGateways (..) - - -- -- ** DescribeDhcpOptions - -- , DescribeDhcpOptions (..) - - -- -- ** DescribeExportTasks - -- , DescribeExportTasks (..) - - -- -- ** DescribeImageAttribute - -- , DescribeImageAttribute (..) - - -- ** DescribeImages - , DescribeImages (..) - , DescribeImagesResponse (..) - - -- -- ** DescribeInstanceAttribute - -- , DescribeInstanceAttribute (..) - - -- ** DescribeInstances - , DescribeInstances (..) - , DescribeInstancesResponse (..) - - -- -- ** DescribeInstanceStatus - -- , DescribeInstanceStatus (..) - - -- -- ** DescribeInternetGateways - -- , DescribeInternetGateways (..) - - -- ** DescribeKeyPairs - , DescribeKeyPairs (..) - , DescribeKeyPairsResponse (..) - - -- -- ** DescribeNetworkAcls - -- , DescribeNetworkAcls (..) - - -- -- ** DescribeNetworkInterfaceAttribute - -- , DescribeNetworkInterfaceAttribute (..) - - -- -- ** DescribeNetworkInterfaces - -- , DescribeNetworkInterfaces (..) - - -- -- ** DescribePlacementGroups - -- , DescribePlacementGroups (..) - - -- ** DescribeRegions - , DescribeRegions (..) - , DescribeRegionsResponse (..) - - -- -- ** DescribeReservedInstances - -- , DescribeReservedInstances (..) - - -- -- ** DescribeReservedInstancesListings - -- , DescribeReservedInstancesListings (..) - - -- -- ** DescribeReservedInstancesOfferings - -- , DescribeReservedInstancesOfferings (..) - - -- -- ** DescribeRouteTables - -- , DescribeRouteTables (..) - - -- ** DescribeSecurityGroups - , DescribeSecurityGroups (..) - , DescribeSecurityGroupsResponse (..) - - -- -- ** DescribeSnapshotAttribute - -- , DescribeSnapshotAttribute (..) - - -- -- ** DescribeSnapshots - -- , DescribeSnapshots (..) - - -- -- ** DescribeSpotDatafeedSubscription - -- , DescribeSpotDatafeedSubscription (..) - - -- -- ** DescribeSpotInstanceRequests - -- , DescribeSpotInstanceRequests (..) - - -- -- ** DescribeSpotPriceHistory - -- , DescribeSpotPriceHistory (..) - - -- -- ** DescribeSubnets - -- , DescribeSubnets (..) - - -- ** DescribeTags - , DescribeTags (..) - , DescribeTagsResponse (..) - - -- -- ** DescribeVolumeAttribute - -- , DescribeVolumeAttribute (..) - - -- -- ** DescribeVolumes - -- , DescribeVolumes (..) - - -- -- ** DescribeVolumeStatus - -- , DescribeVolumeStatus (..) - - -- -- ** DescribeVpcAttribute - -- , DescribeVpcAttribute (..) - - -- -- ** DescribeVpcs - -- , DescribeVpcs (..) - - -- -- ** DescribeVpnConnections - -- , DescribeVpnConnections (..) - - -- -- ** DescribeVpnGateways - -- , DescribeVpnGateways (..) - - -- -- ** DetachInternetGateway - -- , DetachInternetGateway (..) - - -- -- ** DetachNetworkInterface - -- , DetachNetworkInterface (..) - - -- -- ** DetachVolume - -- , DetachVolume (..) - - -- -- ** DetachVpnGateway - -- , DetachVpnGateway (..) - - -- -- ** DisableVgwRoutePropagation - -- , DisableVgwRoutePropagation (..) - - -- -- ** DisassociateAddress - -- , DisassociateAddress (..) - - -- -- ** DisassociateRouteTable - -- , DisassociateRouteTable (..) - - -- -- ** EnableVgwRoutePropagation - -- , EnableVgwRoutePropagation (..) - - -- -- ** EnableVolumeIO - -- , EnableVolumeIO (..) - - -- -- ** GetConsoleOutput - -- , GetConsoleOutput (..) - - -- -- ** GetPasswordData - -- , GetPasswordData (..) - - -- -- ** ImportInstance - -- , ImportInstance (..) - - -- -- ** ImportKeyPair - -- , ImportKeyPair (..) - - -- -- ** ImportVolume - -- , ImportVolume (..) - - -- -- ** ModifyImageAttribute - -- , ModifyImageAttribute (..) - - -- -- ** ModifyInstanceAttribute - -- , ModifyInstanceAttribute (..) - - -- -- ** ModifyNetworkInterfaceAttribute - -- , ModifyNetworkInterfaceAttribute (..) - - -- -- ** ModifySnapshotAttribute - -- , ModifySnapshotAttribute (..) - - -- -- ** ModifyVolumeAttribute - -- , ModifyVolumeAttribute (..) - - -- -- ** ModifyVpcAttribute - -- , ModifyVpcAttribute (..) - - -- -- ** MonitorInstances - -- , MonitorInstances (..) - - -- -- ** PurchaseReservedInstancesOffering - -- , PurchaseReservedInstancesOffering (..) - - -- -- ** RebootInstances - -- , RebootInstances (..) - - -- -- ** RegisterImage - -- , RegisterImage (..) - - -- -- ** ReleaseAddress - -- , ReleaseAddress (..) - - -- -- ** ReplaceNetworkAclAssociation - -- , ReplaceNetworkAclAssociation (..) - - -- -- ** ReplaceNetworkAclEntry - -- , ReplaceNetworkAclEntry (..) - - -- -- ** ReplaceRoute - -- , ReplaceRoute (..) - - -- -- ** ReplaceRouteTableAssociation - -- , ReplaceRouteTableAssociation (..) - - -- -- ** ReportInstanceStatus - -- , ReportInstanceStatus (..) - - -- -- ** RequestSpotInstances - -- , RequestSpotInstances (..) - - -- -- ** ResetImageAttribute - -- , ResetImageAttribute (..) - - -- -- ** ResetInstanceAttribute - -- , ResetInstanceAttribute (..) - - -- -- ** ResetNetworkInterfaceAttribute - -- , ResetNetworkInterfaceAttribute (..) - - -- -- ** ResetSnapshotAttribute - -- , ResetSnapshotAttribute (..) - - -- ** RevokeSecurityGroupEgress - , RevokeSecurityGroupEgress (..) - , RevokeSecurityGroupEgressResponse (..) - - -- ** RevokeSecurityGroupIngress - , RevokeSecurityGroupIngress (..) - , RevokeSecurityGroupIngressResponse (..) - - -- ** RunInstances - , RunInstances (..) - , RunInstancesResponse (..) - - -- -- ** StartInstances - -- , StartInstances (..) - -- , StartInstancesResponse (..) - - -- -- ** StopInstances - -- , StopInstances (..) - -- , StopInstancesResponse (..) - - -- ** TerminateInstances - , TerminateInstances (..) - , TerminateInstancesResponse (..) - - -- -- ** UnassignPrivateIpAddresses - -- , UnassignPrivateIpAddresses (..) - - -- -- ** UnmonitorInstances - -- , UnmonitorInstances (..) - - -- * Data Types - , module Network.AWS.EC2.Types - - -- * Common - , module Network.AWS - ) where - -import Data.Text (Text) -import Data.Time -import Network.AWS -import Network.AWS.EC2.Types -import Network.AWS.Internal -import Network.HTTP.Types.Method - --- | Acquires an Elastic IP address.An Elastic IP address is for use either in --- the EC2-Classic platform or in a VPC. --- --- -data AllocateAddress = AllocateAddress - { aaDomain :: Maybe AddressDomain - -- ^ Set to vpc to allocate the address for use with instances in a - -- VPC. - } deriving (Eq, Show, Generic) - -instance IsQuery AllocateAddress - -instance Rq AllocateAddress where - type Er AllocateAddress = EC2ErrorResponse - type Rs AllocateAddress = AllocateAddressResponse - request = query4 ec2 GET "AllocateAddress" - -data AllocateAddressResponse = AllocateAddressResponse - { aarRequestId :: !Text - -- ^ The ID of the request. - , aarPublicIp :: !Text - -- ^ The Elastic IP address. - , aarDomain :: !AddressDomain - -- ^ Indicates whether this Elastic IP address is for use with - -- instances in EC2-Classic (standaard) or instances in a VPC (vpc). - , aarAllocationId :: Maybe Text - -- ^ [EC2-VPC] The ID that AWS assigns to represent the allocation of - -- the Elastic IP address for use with a VPC. - } deriving (Eq, Show, Generic) - -instance IsXML AllocateAddressResponse where - xmlPickler = ec2XML - --- | Assigns one or more secondary private IP addresses to the specified network --- interface. --- --- You can specify one or more specific secondary IP addresses, or --- you can specify the number of secondary IP addresses to be automatically --- assigned within the subnet's CIDR block range. --- --- The number of secondary IP --- addresses that you can assign to an instance varies by instance type. --- --- -data AssignPrivateIpAddresses = AssignPrivateIpAddresses - { apiaNetworkInterfaceId :: !Text - -- ^ The ID of the network interface. - , apiaPrivateIpAddress :: [Text] - -- ^ The IP addresses to be assigned as a secondary private IP address - -- to the network interface. - , apiaSecondaryPrivateIpAddressCount :: Maybe Integer - -- ^ The number of secondary IP addresses to assign to the network - -- interface. - , apiaAllowReassignment :: Maybe Bool - -- ^ Specifies whether to allow an IP address that is already assigned - -- to another network interface or instance to be reassigned to the - -- specified network interface. - } deriving (Eq, Show, Generic) - -instance IsQuery AssignPrivateIpAddresses - -instance Rq AssignPrivateIpAddresses where - type Er AssignPrivateIpAddresses = EC2ErrorResponse - type Rs AssignPrivateIpAddresses = AssignPrivateIpAddressesResponse - request = query4 ec2 GET "AssignPrivateIpAddresses" - -data AssignPrivateIpAddressesResponse = AssignPrivateIpAddressesResponse - { apiaRequestId :: !Text - -- ^ The ID of the request. - , apiaReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an - -- error. - } deriving (Eq, Show, Generic) - -instance IsXML AssignPrivateIpAddressesResponse where - xmlPickler = withRootNS ec2NS "AssignPrivateIpAddresses" - --- | Associates an Elastic IP address with an instance or a network interface. --- --- -data AssociateAddress = AssociateAddress - { abPublicIp :: !Text - -- ^ The Elastic IP address. - , abInstanceId :: !Text - -- ^ The ID of the instance. The operation fails if you specify an - -- instance ID unless exactly one network interface is attached. - , abAllocationId :: Maybe Text - -- ^ [EC2-VPC] The allocation ID. - , abNetworkInterfaceId :: Maybe Text - -- ^ [EC2-VPC] The ID of the network interface. - , abPrivateIpAddress :: Maybe Text - -- ^ [EC2-VPC] The primary or secondary private IP address to - -- associate with the Elastic IP address. If no private IP address - -- is specified, the Elastic IP address is associated with the - -- primary private IP address. - , abAllowReassociation :: Maybe Bool - -- ^ [EC2-VPC] Allows an Elastic IP address that is already associated - -- with an instance or network interface to be re-associated with - -- the specified instance or network interface. Otherwise, the - -- operation fails. - } deriving (Eq, Show, Generic) - -instance IsQuery AssociateAddress - -instance Rq AssociateAddress where - type Er AssociateAddress = EC2ErrorResponse - type Rs AssociateAddress = AssociateAddressResponse - request = query4 ec2 GET "AssociateAddress" - -data AssociateAddressResponse = AssociateAddressResponse - { abrRequestId :: !Text - -- ^ The ID of the request. - , abrReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an error. - , abrAssociationId :: Maybe Text - -- ^ [EC2-VPC] The ID that represents the association of the Elastic - -- IP address with an instance. - } deriving (Eq, Show, Generic) - -instance IsXML AssociateAddressResponse where - xmlPickler = ec2XML - --- | Associates a set of DHCP options (that you've previously created) with the --- specified VPC, or associates no DHCP options with the VPC. --- --- After you associate the options with the VPC, any existing instances and all new --- instances that you launch in that VPC use the options. You don't need to --- restart or relaunch the instances. They automatically pick up the changes --- within a few hours, depending on how frequently the instance renews its --- DHCP lease. You can explicitly renew the lease using the operating system --- on the instance. --- --- -data AssociateDhcpOptions = AssociateDhcpOptions - { adoDhcpOptionsId :: !Text - -- ^ The ID of the DHCP options set, or default to associate no DHCP - -- options with the VPC. - , adoVpcId :: !Text - -- ^ The ID of the VPC. - } deriving (Eq, Show, Generic) - -instance IsQuery AssociateDhcpOptions - -instance Rq AssociateDhcpOptions where - type Er AssociateDhcpOptions = EC2ErrorResponse - type Rs AssociateDhcpOptions = AssociateDhcpOptionsResponse - request = query4 ec2 GET "AssociateDhcpOptions" - -data AssociateDhcpOptionsResponse = AssociateDhcpOptionsResponse - { adorRequestId :: !Text - -- ^ The ID of the request. - , adorReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an - -- error. - } deriving (Eq, Show, Generic) - -instance IsXML AssociateDhcpOptionsResponse where - xmlPickler = ec2XML - --- | Associates a subnet with a route table. --- --- The subnet and route table must be in the same VPC. --- This association causes traffic originating from the --- subnet to be routed according to the routes in the route table. The action --- returns an association ID, which you need in order to disassociate the --- route table from the subnet later. A route table can be associated with --- multiple subnets. --- --- -data AssociateRouteTable = AssociateRouteTable - { artRouteTableId :: !Text - -- ^ The ID of the route table. - , artSubnetId :: !Text - -- ^ The ID of the subnet. - } deriving (Eq, Show, Generic) - -instance IsQuery AssociateRouteTable - -instance Rq AssociateRouteTable where - type Er AssociateRouteTable = EC2ErrorResponse - type Rs AssociateRouteTable = AssociateRouteTableResponse - request = query4 ec2 GET "AssociateRouteTable" - -data AssociateRouteTableResponse = AssociateRouteTableResponse - { artrRequestId :: !Text - -- ^ The ID of the request. - , artrAssociationId :: !Text - -- ^ The route table association ID (needed to disassociate the route table). - } deriving (Eq, Show, Generic) - -instance IsXML AssociateRouteTableResponse where - xmlPickler = ec2XML - --- | Attaches an Internet gateway to a VPC, enabling connectivity between the --- Internet and the VPC. --- --- -data AttachInternetGateway = AttachInternetGateway - { aigInternetGatewayId :: !Text - -- ^ The ID of the Internet gateway. - , aigVpcId :: !Text - -- ^ The ID of the VPC. - } deriving (Eq, Show, Generic) - -instance IsQuery AttachInternetGateway - -instance Rq AttachInternetGateway where - type Er AttachInternetGateway = EC2ErrorResponse - type Rs AttachInternetGateway = AttachInternetGatewayResponse - request = query4 ec2 GET "AttachInternetGateway" - -data AttachInternetGatewayResponse = AttachInternetGatewayResponse - { aigrRequestId :: !Text - -- ^ The ID of the request. - , aigrReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an error. - } deriving (Eq, Show, Generic) - -instance IsXML AttachInternetGatewayResponse where - xmlPickler = ec2XML - --- | Attaches a network interface to an instance. --- --- -data AttachNetworkInterface = AttachNetworkInterface - { aniNetworkInterfaceId :: !Text - -- ^ The ID of the network interface. - , aniInstanceId :: !Text - -- ^ The ID of the instance. - , aniDeviceIndex :: !Integer - -- ^ The index of the device for the network interface attachment. - } deriving (Eq, Show, Generic) - -instance IsQuery AttachNetworkInterface - -instance Rq AttachNetworkInterface where - type Er AttachNetworkInterface = EC2ErrorResponse - type Rs AttachNetworkInterface = AttachNetworkInterfaceResponse - request = query4 ec2 GET "AttachNetworkInterface" - -data AttachNetworkInterfaceResponse = AttachNetworkInterfaceResponse - { anirRequestId :: !Text - -- ^ The ID of the attachment request. - , anirAttachmentId :: !Text - -- ^ The ID of the network interface attachment. - } deriving (Eq, Show, Generic) - -instance IsXML AttachNetworkInterfaceResponse where - xmlPickler = ec2XML - --- | Attaches an Amazon EBS volume to a running or stopped instance and exposes --- it to the instance with the specified device name. --- --- -data AttachVolume = AttachVolume - { avVolumeId :: !Text - -- ^ The ID of the Amazon EBS volume. The volume and instance must be - -- within the same Availability Zone. - , avInstanceId :: !Text - -- ^ The ID of the instance. - , avDevice :: !Text - -- ^ The device name to expose to the instance (for example, /dev/sdh - -- or xvdh). - } deriving (Eq, Show, Generic) - -instance IsQuery AttachVolume - -instance Rq AttachVolume where - type Er AttachVolume = EC2ErrorResponse - type Rs AttachVolume = AttachVolumeResponse - request = query4 ec2 GET "AttachVolume" - -data AttachVolumeResponse = AttachVolumeResponse - { avrRequestId :: !Text - -- ^ The ID of the request. - , avrVolumeId :: !Text - -- ^ The ID of the volume. - , avrInstanceId :: !Text - -- ^ The ID of the instance. - , avrDevice :: !Text - -- ^ The device name. - , avrStatus :: !VolumeStatus - -- ^ The attachment state of the volume. - , avrAttachTime :: !UTCTime - -- ^ The time stamp when the attachment initiated. - } deriving (Eq, Show, Generic) - -instance IsXML AttachVolumeResponse where - xmlPickler = ec2XML - --- | Attaches a virtual private gateway to a VPC. --- --- -data AttachVpnGateway = AttachVpnGateway - { avgVpnGatewayId :: !Text - -- ^ The ID of the virtual private gateway. - , avgVpcId :: !Text - -- ^ The ID of the VPC. - } deriving (Eq, Show, Generic) - -instance IsQuery AttachVpnGateway - -instance Rq AttachVpnGateway where - type Er AttachVpnGateway = EC2ErrorResponse - type Rs AttachVpnGateway = AttachVpnGatewayResponse - request = query4 ec2 GET "AttachVpnGateway" - -data AttachVpnGatewayResponse = AttachVpnGatewayResponse - { avgrRequestId :: !Text - -- ^ The ID of the request. - , avgrAttachment :: !Attachment - -- ^ Information about the attachment. - } deriving (Eq, Show, Generic) - -instance IsXML AttachVpnGatewayResponse where - xmlPickler = ec2XML - --- | Adds one or more egress rules to a security group for use with a VPC. --- --- Specifically, this action permits instances to send traffic to one or more --- destination CIDR IP address ranges, or to one or more destination security --- groups for the same VPC. --- --- This action doesn't apply to security groups for use in EC2-Classic. --- --- -data AuthorizeSecurityGroupEgress = AuthorizeSecurityGroupEgress - { asgeGroupId :: !Text - -- ^ The ID of the security group to modify. - , asgeIpPermissions :: [IpPermissionType] - -- ^ The IP protocol name or number (see Protocol Numbers). - } deriving (Eq, Show, Generic) - -instance IsQuery AuthorizeSecurityGroupEgress - -instance Rq AuthorizeSecurityGroupEgress where - type Er AuthorizeSecurityGroupEgress = EC2ErrorResponse - type Rs AuthorizeSecurityGroupEgress = AuthorizeSecurityGroupEgressResponse - request = query4 ec2 GET "AuthorizeSecurityGroupEgress" - -data AuthorizeSecurityGroupEgressResponse = AuthorizeSecurityGroupEgressResponse - { asgerRequestId :: !Text - -- ^ The ID of the request. - , asgerReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an - -- error. - } deriving (Eq, Show, Generic) - -instance IsXML AuthorizeSecurityGroupEgressResponse where - xmlPickler = ec2XML - --- | Adds one or more ingress rules to a security group. --- --- Rule changes are propagated to instances within the security group as quickly as possible. --- --- -data AuthorizeSecurityGroupIngress = AuthorizeSecurityGroupIngress - { asgiGroupId :: Maybe Text - -- ^ The ID of the security group to modify. The security group must - -- belong to your account. - , asgiGroupName :: Maybe Text - -- ^ The name of the security group to modify. - , asgiIpPermissions :: [IpPermissionType] - -- ^ The IP protocol name or number (see Protocol Numbers). For - -- EC2-Classic, security groups can have rules only for TCP, UDP, - -- and ICMP. For EC2-VPC, security groups can have rules assigned to - -- any protocol number. - } deriving (Eq, Show, Generic) - -instance IsQuery AuthorizeSecurityGroupIngress - -instance Rq AuthorizeSecurityGroupIngress where - type Er AuthorizeSecurityGroupIngress = EC2ErrorResponse - type Rs AuthorizeSecurityGroupIngress = AuthorizeSecurityGroupIngressResponse - request = query4 ec2 GET "AuthorizeSecurityGroupIngress" - -data AuthorizeSecurityGroupIngressResponse = AuthorizeSecurityGroupIngressResponse - { asgirRequestId :: !Text - -- ^ The ID of the request. - , asgirReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an - -- error. - } deriving (Eq, Show, Generic) - -instance IsXML AuthorizeSecurityGroupIngressResponse where - xmlPickler = ec2XML - --- | Bundles an Amazon instance store-backed Windows instance.During bundling, --- only the root device volume (C:\) is bundled. Data on other instance store --- volumes is not preserved. --- --- -data BundleInstance = BundleInstance - { biInstanceId :: !Text - -- ^ The ID of the instance to bundle. - , biStorage :: !BundleInstanceTaskStorage - -- ^ Bundle storage instructions. - } deriving (Eq, Show, Generic) - -instance IsQuery BundleInstance - -instance Rq BundleInstance where - type Er BundleInstance = EC2ErrorResponse - type Rs BundleInstance = BundleInstanceResponse - request = query4 ec2 GET "BundleInstance" - -data BundleInstanceResponse = BundleInstanceResponse - { birRequestId :: !Text - -- ^ The ID of the request. - , birBundleInstanceTask :: !BundleInstanceTask - -- ^ The bundle task. - } deriving (Eq, Show, Generic) - -instance IsXML BundleInstanceResponse where - xmlPickler = ec2XML - --- | Cancels a bundling operation for an instance store-backed Windows instance. --- --- - -data CancelBundleTask = CancelBundleTask - { cbtBundleId :: !Text - -- ^ The ID of the bundle task. - } deriving (Eq, Show, Generic) - -instance IsQuery CancelBundleTask - -instance Rq CancelBundleTask where - type Er CancelBundleTask = EC2ErrorResponse - type Rs CancelBundleTask = CancelBundleTaskResponse - request = query4 ec2 GET "CancelBundleTask" - -data CancelBundleTaskResponse = CancelBundleTaskResponse - { cbtRequestId :: !Text - -- ^ The ID of the request. - , cbtBundleInstanceTask :: !BundleInstanceTask - -- ^ The bundle task. - } deriving (Eq, Show, Generic) - -instance IsXML CancelBundleTaskResponse where - xmlPickler = ec2XML - --- | Cancels an active conversion task. --- --- The task can be the import of an --- instance or volume. The action removes all artifacts of the conversion, --- including a partially uploaded volume or instance. If the conversion is --- complete or is in the process of transferring the final disk image, the --- command fails and returns an exception. --- --- - -data CancelConversionTask = CancelConversionTask - { cctConversionTaskId :: !Text - -- ^ The ID of the conversion task. - } deriving (Eq, Show, Generic) - -instance IsQuery CancelConversionTask - -instance Rq CancelConversionTask where - type Er CancelConversionTask = EC2ErrorResponse - type Rs CancelConversionTask = CancelConversionTaskResponse - request = query4 ec2 GET "CancelConversionTask" - -data CancelConversionTaskResponse = CancelConversionTaskResponse - { cctRequestId :: !Text - -- ^ The ID of the request. - , cctReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an - -- error. - } deriving (Eq, Show, Generic) - -instance IsXML CancelConversionTaskResponse where - xmlPickler = ec2XML - --- | Cancels an active export task. The request removes all artifacts of the --- export, including any partially created Amazon S3 objects. If the export --- task is complete or is in the process of transferring the final disk image, --- the command fails and returns an error. --- --- - -data CancelExportTask = CancelExportTask - { cetExportTaskId :: !Text - -- ^ The ID of the export task. This is the ID returned by - -- CreateInstanceExportTask. - } deriving (Eq, Show, Generic) - -instance IsQuery CancelExportTask - -instance Rq CancelExportTask where - type Er CancelExportTask = EC2ErrorResponse - type Rs CancelExportTask = CancelExportTaskResponse - request = query4 ec2 GET "CancelExportTask" - -data CancelExportTaskResponse = CancelExportTaskResponse - { cetRequestId :: !Text - -- ^ The ID of the request. - , cetReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an error. - } deriving (Eq, Show, Generic) - -instance IsXML CancelExportTaskResponse where - xmlPickler = ec2XML - --- | Cancels the specified Reserved Instance listing in the Reserved Instance Marketplace. --- --- - -data CancelReservedInstancesListing = CancelReservedInstancesListing - { crilReservedInstancesListingId :: !Text - -- ^ The ID of the Reserved Instance listing to be canceled. - } deriving (Eq, Show, Generic) - -instance IsQuery CancelReservedInstancesListing - -instance Rq CancelReservedInstancesListing where - type Er CancelReservedInstancesListing = EC2ErrorResponse - type Rs CancelReservedInstancesListing = CancelReservedInstancesListingResponse - request = query4 ec2 GET "CancelReservedInstancesListing" - -data CancelReservedInstancesListingResponse = CancelReservedInstancesListingResponse - { crilRequestId :: !Text - -- ^ The ID of the request. - , crilReservedInstancesListingsSet :: !DescribeReservedInstancesListingsResponseSetItemType - -- ^ The Reserved Instance listing for cancellation. - } deriving (Eq, Show, Generic) - -instance IsXML CancelReservedInstancesListingResponse where - xmlPickler = ec2XML - --- | Cancels one or more Spot Instance requests. --- --- - -data CancelSpotInstanceRequests = CancelSpotInstanceRequests - { csirSpotInstanceRequestId :: [Text] - -- ^ One or more Spot Instance request IDs. - } deriving (Eq, Show, Generic) - -instance IsQuery CancelSpotInstanceRequests - -instance Rq CancelSpotInstanceRequests where - type Er CancelSpotInstanceRequests = EC2ErrorResponse - type Rs CancelSpotInstanceRequests = CancelSpotInstanceRequestsResponse - request = query4 ec2 GET "CancelSpotInstanceRequests" - -data CancelSpotInstanceRequestsResponse = CancelSpotInstanceRequestsResponse - { csirRequestId :: !Text - -- ^ The ID of the request. - , csirSpotInstanceRequestSet :: [CancelSpotInstanceRequestsResponseSetItemType] - -- ^ A list of Spot Instance requests. Each request is wrapped in an - -- item element. - } deriving (Eq, Show, Generic) - -instance IsXML CancelSpotInstanceRequestsResponse where - xmlPickler = ec2XML - --- -- | Determines whether a product code is associated with an instance. This --- -- action can only be used by the owner of the product code. It is useful when --- -- a product code owner needs to verify whether another user's instance is --- -- eligible for support. --- -- --- -- - --- data ConfirmProductInstance = ConfirmProductInstance --- { cpiProductCode :: !Text --- -- ^ The product code. This must be an Amazon DevPay product code that --- -- you own. --- , cpiInstanceId :: !Text --- -- ^ The instance. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ConfirmProductInstance - --- instance IsXML ConfirmProductInstance where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ConfirmProductInstance ConfirmProductInstanceResponse where --- request = query4 ec2 GET "ConfirmProductInstance" - --- data ConfirmProductInstanceResponse = ConfirmProductInstanceResponse --- { cpiRequestId :: !Text --- -- ^ The ID of the request. --- , cpiReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- , cpiOwnerId :: !Text --- -- ^ The instance owner's account ID. Only present if the product code --- -- is attached to the instance. --- } deriving (Eq, Show, Generic) - --- instance IsXML ConfirmProductInstanceResponse where --- xmlPickler = ec2XML - --- -- | Initiates the copy of an AMI from the specified source region to the region --- -- in which the request was made. --- -- --- -- - --- data CopyImage = CopyImage --- { ciSourceRegion :: !Text --- -- ^ The name of the region that contains the AMI to be copied --- -- (source). --- , ciSourceImageId :: !Text --- -- ^ The ID of the AMI to copy. --- , ciName :: Maybe Text --- -- ^ The name of the new AMI in the destination region. --- , ciDescription :: Maybe Text --- -- ^ A description for the new AMI in the destination region. --- , ciClientToken :: Maybe Text --- -- ^ Unique, case-sensitive identifier you provide to ensure --- -- idempotency of the request. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CopyImage - --- instance IsXML CopyImage where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 CopyImage CopyImageResponse where --- request = query4 ec2 GET "CopyImage" - --- data CopyImageResponse = CopyImageResponse --- { ciRequestId :: !Text --- -- ^ The ID of the request. --- , ciImageId :: !Text --- -- ^ The ID of the new AMI. --- } deriving (Eq, Show, Generic) - --- instance IsXML CopyImageResponse where --- xmlPickler = ec2XML - --- -- | Copies a point-in-time snapshot of an Amazon Elastic Block Store (Amazon --- -- EBS) volume and stores it in Amazon Simple Storage Service (Amazon S3). You --- -- can copy the snapshot within the same region or from one region to another. --- -- You can use the snapshot to create Amazon EBS volumes or Amazon Machine --- -- Images (AMIs).For more information about Amazon EBS, see Amazon Elastic --- -- Block Store (Amazon EBS). --- -- --- -- - --- data CopySnapshot = CopySnapshot --- { csSourceRegion :: !Text --- -- ^ The ID of the region that contains the snapshot to be copied. --- , csSourceSnapshotId :: !Text --- -- ^ The ID of the Amazon EBS snapshot to copy. --- , csDescription :: Maybe Text --- -- ^ A description for the new Amazon EBS snapshot. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CopySnapshot - --- instance AWSRequest EC2 CopySnapshot CopySnapshotResponse where --- request = query4 ec2 GET "CopySnapshot" - --- data CopySnapshotResponse = CopySnapshotResponse --- { csRequestId :: !Text --- -- ^ The ID of the request. --- , csSnapshotId :: !Text --- -- ^ The ID of the new snapshot. --- } deriving (Eq, Show, Generic) - --- instance IsXML CopySnapshotResponse where --- xmlPickler = ec2XML - --- -- | Provides information to AWS about your VPN customer gateway device. The --- -- customer gateway is the appliance at your end of the VPN connection. (The --- -- device on the AWS side of the VPN connection is the virtual private --- -- gateway.) You must provide the Internet-routable IP address of the customer --- -- gateway's external interface. The IP address must be static and can't be --- -- behind a device performing network address translation (NAT).You must --- -- provide the Internet-routable IP address of the customer gateway's external --- -- interface. The IP address must be static and can't be behind a device --- -- performing network address translation (NAT).For devices that use Border --- -- Gateway Protocol (BGP), you can also provide the device's BGP Autonomous --- -- System Number (ASN). You can use an existing ASN assigned to your network. --- -- If you don't have an ASN already, you can use a private ASN (in the 64512 - --- -- 65534 range).For more information about ASNs, see the Wikipedia article.For --- -- more information about VPN customer gateways, see Adding a Hardware Virtual --- -- Private Gateway to Your VPC in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data CreateCustomerGateway = CreateCustomerGateway --- { ccgType :: !Text --- -- ^ The type of VPN connection this customer gateway supports. --- , ccgIpAddress :: !Text --- -- ^ The Internet-routable IP address for the customer gateway's --- -- outside interface. The address must be static. --- , ccgBgpAsn :: Maybe Integer --- -- ^ For devices that support BGP, the customer gateway's Border --- -- Gateway Protocol (BGP) Autonomous System Number (ASN). --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateCustomerGateway - --- instance AWSRequest EC2 CreateCustomerGateway CreateCustomerGatewayResponse where --- request = query4 ec2 GET "CreateCustomerGateway" - --- data CreateCustomerGatewayResponse = CreateCustomerGatewayResponse --- { ccgRequestId :: !Text --- -- ^ The ID of the request. --- , ccgCustomerGateway :: !CustomerGatewayType --- -- ^ Information about the customer gateway. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateCustomerGatewayResponse where --- xmlPickler = ec2XML - --- -- | Creates a set of DHCP options for your VPC. After creating the set, you --- -- must associate it with the VPC, causing all existing and new instances that --- -- you launch in the VPC to use this set of DHCP options. The following are --- -- the individual DHCP options you can specify. For more information about the --- -- options, see RFC 2132. --- -- --- -- - --- data CreateDhcpOptions = CreateDhcpOptions --- { cdoDhcpConfiguration :: Members DhcConfigurationItemType --- -- ^ A list of dhcp configurations. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateDhcpOptions - --- instance AWSRequest EC2 CreateDhcpOptions CreateDhcpOptionsResponse where --- request = query4 ec2 GET "CreateDhcpOptions" - --- data CreateDhcpOptionsResponse = CreateDhcpOptionsResponse --- { cdoRequestId :: !Text --- -- ^ The ID of the request. --- , cdoDhcpOptions :: !DhcpOptionsType --- -- ^ A set of DHCP options. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateDhcpOptionsResponse where --- xmlPickler = ec2XML - --- | Creates an Amazon EBS-backed AMI from an Amazon EBS-backed instance that is --- either running or stopped. --- --- -data CreateImage = CreateImage - { ciInstanceId :: !Text - -- ^ The ID of the instance. - , cjName :: !Text - -- ^ A name for the new image. - , cjDescription :: Maybe Text - -- ^ A description for the new image. - , cjNoReboot :: Maybe Bool - -- ^ By default this parameter is set to false, which means Amazon EC2 - -- attempts to cleanly shut down the instance before image creation - -- and then reboots the instance. When the parameter is set to true, - -- Amazon EC2 doesn't shut down the instance before creating the - -- image. When this option is used, file system integrity on the - -- created image can't be guaranteed. - , cjBlockDeviceMapping :: [BlockDeviceMappingItemType] - -- ^ The device name exposed to the instance (for example, /dev/sdh or xvdh). - } deriving (Eq, Show, Generic) - -instance IsQuery CreateImage - -instance IsXML CreateImage where - xmlPickler = ec2XML - -instance Rq CreateImage where - type Er CreateImage = EC2ErrorResponse - type Rs CreateImage = CreateImageResponse - request = query4 ec2 GET "CreateImage" - -data CreateImageResponse = CreateImageResponse - { cjRequestId :: !Text - -- ^ The ID of the request. - , cjImageId :: !Text - -- ^ The ID of the new AMI. - } deriving (Eq, Show, Generic) - -instance IsXML CreateImageResponse where - xmlPickler = ec2XML - --- -- | Exports a running or stopped instance to an Amazon S3 bucket.For --- -- information about the supported operating systems, image formats, and known --- -- limitations for the types of instances you can export, see Exporting EC2 --- -- Instances in the Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data CreateInstanceExportTask = CreateInstanceExportTask --- { cietDescription :: Maybe Text --- -- ^ A description for the conversion task or the resource being --- -- exported. The maximum length is 255 bytes. --- , cietInstanceId :: !Text --- -- ^ The ID of the instance. --- , cietTargetEnvironment :: !Text --- -- ^ The target virtualization environment. --- , cietExportToS3 :: Maybe ExportToS3Task --- -- ^ The format for the exported image. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateInstanceExportTask - --- instance AWSRequest EC2 CreateInstanceExportTask CreateInstanceExportTaskResponse where --- request = query4 ec2 GET "CreateInstanceExportTask" - --- data CreateInstanceExportTaskResponse = CreateInstanceExportTaskResponse --- { cietRequestId :: !Text --- -- ^ The ID of the request. --- , cietExportTask :: !ExportTaskResponseType --- -- ^ The details of the created ExportVM task. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateInstanceExportTaskResponse where --- xmlPickler = ec2XML - --- -- | Creates an Internet gateway for use with a VPC. After creating the Internet --- -- gateway, you attach it to a VPC using AttachInternetGateway.For more --- -- information about your VPC and Internet gateway, see the Amazon Virtual --- -- Private Cloud User Guide. --- -- --- -- - --- data CreateInternetGateway = CreateInternetGateway --- deriving (Eq, Read, Show, Generic) - --- instance IsQuery CreateInternetGateway - --- instance IsXML CreateInternetGateway where --- xmlPickler = xpEmpty $ Just ec2NS - --- instance AWSRequest EC2 CreateInternetGateway CreateInternetGatewayResponse where --- request = query4 ec2 GET "CreateInternetGateway" - --- data CreateInternetGatewayResponse = CreateInternetGatewayResponse --- { cigRequestId :: !Text --- -- ^ The ID of the request. --- , cigInternetGateway :: !InternetGatewayType --- -- ^ Information about the Internet gateway --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateInternetGatewayResponse where --- xmlPickler = ec2XML - --- | Creates a 2048-bit RSA key pair with the specified name. Amazon EC2 stores --- the public key and displays the private key for you to save to a file. The --- private key is returned as an unencrypted PEM encoded PKCS#8 private key. --- If a key with the specified name already exists, Amazon EC2 returns an --- error. You can have up to five thousand key pairs per region.For more --- information about key pairs, see Key Pairs in the Amazon Elastic Compute --- Cloud User Guide. --- --- -data CreateKeyPair = CreateKeyPair - { ckpKeyName :: !Text - -- ^ A unique name for the key pair. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateKeyPair - -instance Rq CreateKeyPair where - type Er CreateKeyPair = EC2ErrorResponse - type Rs CreateKeyPair = CreateKeyPairResponse - request = query4 ec2 GET "CreateKeyPair" - -data CreateKeyPairResponse = CreateKeyPairResponse - { ckpRequestId :: !Text - -- ^ The ID of the request. - , ckqKeyName :: !Text - -- ^ The name of the key pair name. - , ckqKeyFingerprint :: !Text - -- ^ A SHA-1 digest of the DER encoded private key. - , ckqKeyMaterial :: !Text - -- ^ An unencrypted PEM encoded RSA private key. - } deriving (Eq, Show, Generic) - -instance IsXML CreateKeyPairResponse where - xmlPickler = ec2XML - --- -- | Creates a network ACL in a VPC. Network ACLs provide an optional layer of --- -- security (on top of security groups) for the instances in your VPC.For more --- -- information about network ACLs, see Network ACLs in the Amazon Virtual --- -- Private Cloud User Guide. --- -- --- -- - --- data CreateNetworkAcl = CreateNetworkAcl --- { cnaVpcId :: !Text --- -- ^ The ID of the VPC. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateNetworkAcl - --- instance AWSRequest EC2 CreateNetworkAcl CreateNetworkAclResponse where --- request = query4 ec2 GET "CreateNetworkAcl" - --- data CreateNetworkAclResponse = CreateNetworkAclResponse --- { cnaRequestId :: !Text --- -- ^ The ID of the request. --- , cnaNetworkAcl :: !NetworkAclType --- -- ^ Information about the new network ACL. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateNetworkAclResponse where --- xmlPickler = ec2XML - --- -- | Creates an entry (a rule) in a network ACL with the specified rule number. --- -- Each network ACL has a set of numbered ingress rules and a separate set of --- -- numbered egress rules. When determining whether a packet should be allowed --- -- in or out of a subnet associated with the ACL, we process the entries in --- -- the ACL according to the rule numbers, in ascending order. Each network ACL --- -- has a set of ingress rules and a separate set of egress rules.After you add --- -- an entry, you can't modify it; you must either replace it, or create a new --- -- entry and delete the old one.For more information about network ACLs, see --- -- Network ACLs in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data CreateNetworkAclEntry = CreateNetworkAclEntry --- { cnaeNetworkAclId :: !Text --- -- ^ The ID of the ACL. --- , cnaeRuleNumber :: !Integer --- -- ^ The rule number to assign to the entry (for example, 100). ACL --- -- entries are processed in ascending order by rule number. --- , cnaeProtocol :: !Integer --- -- ^ The IP protocol the rule applies to. You can use -1 to mean all --- -- protocols. --- , cnaeRuleAction :: !Text --- -- ^ Indicates whether to allow or deny traffic that matches the rule. --- , cnaeEgress :: Maybe Bool --- -- ^ Indicates whether this rule applies to egress traffic from the --- -- subnet (true) or ingress traffic to the subnet (false). --- , cnaeCidrBlock :: !Text --- -- ^ The CIDR range to allow or deny, in CIDR notation (for example, --- -- 172.16.0.0/24). --- , cnaeIcmp :: Maybe IcmpType --- -- ^ For the ICMP protocol, the ICMP code and type. --- , cnaePortRange :: Maybe PortRangeType --- -- ^ The first port in the range. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateNetworkAclEntry - --- instance AWSRequest EC2 CreateNetworkAclEntry CreateNetworkAclEntryResponse where --- request = query4 ec2 GET "CreateNetworkAclEntry" - --- data CreateNetworkAclEntryResponse = CreateNetworkAclEntryResponse --- { cnaeRequestId :: !Text --- -- ^ The ID of the request. --- , cnaeReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateNetworkAclEntryResponse where --- xmlPickler = ec2XML - --- -- | Creates a network interface in the specified subnet.For more information --- -- about network interfaces, see Elastic Network Interfaces in the Amazon --- -- Elastic Compute Cloud User Guide. --- -- --- -- - --- data CreateNetworkInterface = CreateNetworkInterface --- { cniSubnetId :: !Text --- -- ^ The ID of the subnet to associate with the network interface. --- , cniPrivateIpAddress :: Maybe Text --- -- ^ The primary private IP address of the network interface. If you --- -- don't specify an IP address, Amazon EC2 will select one for you --- -- from the subnet range. --- , cniPrivateIpAddresses :: Members PrivateIpAddresses --- -- ^ The private IP address of the specified network interface. You --- -- can use this parameter multiple times to specify explicit private --- -- IP addresses for a network interface, but only one private IP --- -- address can be designated as primary. --- , cniSecondaryPrivateIpAddressCount :: Maybe Integer --- -- ^ The number of secondary private IP addresses to assign to a --- -- network interface. When you specify a number of secondary IP --- -- addresses, Amazon EC2 selects these IP addresses within the --- -- subnet range. --- , cniDescription :: Maybe Text --- -- ^ A description for the network interface. --- , cniSecurityGroupId :: Members SecurityGroupIdSetItemType --- -- ^ The list of security group IDs for the network interface. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateNetworkInterface - --- instance IsXML CreateNetworkInterface where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 CreateNetworkInterface CreateNetworkInterfaceResponse where --- request = query4 ec2 GET "CreateNetworkInterface" - --- data CreateNetworkInterfaceResponse = CreateNetworkInterfaceResponse --- { cniRequestId :: !Text --- -- ^ The ID of the request. --- , cniNetworkInterface :: !NetworkInterfaceType --- -- ^ The network interface that was created. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateNetworkInterfaceResponse where --- xmlPickler = ec2XML - --- -- | Creates a placement group that you launch cluster instances into. You must --- -- give the group a name unique within the scope of your account.For more --- -- information about placement groups and cluster instances, see Cluster --- -- Instances in the Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data CreatePlacementGroup = CreatePlacementGroup --- { cpgGroupName :: !Text --- -- ^ A name for the placement group. --- , cpgStrategy :: !Text --- -- ^ The placement strategy. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreatePlacementGroup - --- instance AWSRequest EC2 CreatePlacementGroup CreatePlacementGroupResponse where --- request = query4 ec2 GET "CreatePlacementGroup" - --- data CreatePlacementGroupResponse = CreatePlacementGroupResponse --- { cpgRequestId :: !Text --- -- ^ The ID of the request. --- , cpgReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreatePlacementGroupResponse where --- xmlPickler = ec2XML - --- -- | Creates a listing for Amazon EC2 Reserved Instances that will be sold in --- -- the Reserved Instance Marketplace. You can submit one Reserved Instance --- -- listing at a time.The Reserved Instance Marketplace matches sellers who --- -- want to resell Reserved Instance capacity that they no longer need with --- -- buyers who want to purchase additional capacity. Reserved Instances bought --- -- and sold through the Reserved Instance Marketplace work like any other --- -- Reserved Instances.If you want to sell your Reserved Instances, you must --- -- first register as a Seller in the Reserved Instance Marketplace. After --- -- completing the registration process, you can create a Reserved Instance --- -- Marketplace listing of some or all of your Reserved Instances, and specify --- -- the upfront price you want to receive for them. Your Reserved Instance --- -- listings then become available for purchase.For more information about --- -- Reserved Instance Marketplace, see Reserved Instance Marketplace in the --- -- Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data CreateReservedInstancesListing = CreateReservedInstancesListing --- { crilReservedInstancesId :: !Text --- -- ^ The ID of the active Reserved Instance. --- , crilInstanceCount :: !Integer --- -- ^ The number of instances that are a part of a Reserved Instance --- -- account that will be listed in the Reserved Instance Marketplace. --- -- This number should be less than or equal to the instance count --- -- associated with the Reserved Instance ID specified in this call. --- , crilPriceSchedules :: !PriceScheduleRequestSetItemType --- -- ^ A list specifying the price of the Reserved Instance for each --- -- month remaining in the Reserved Instance term. --- , crilClientToken :: !Text --- -- ^ Unique, case-sensitive identifier you provide to ensure --- -- idempotency of your listings. This helps avoid duplicate --- -- listings. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateReservedInstancesListing - --- instance AWSRequest EC2 CreateReservedInstancesListing CreateReservedInstancesListingResponse where --- request = query4 ec2 GET "CreateReservedInstancesListing" - --- data CreateReservedInstancesListingResponse = CreateReservedInstancesListingResponse --- { crimRequestId :: !Text --- -- ^ The ID of the request. --- , crimReservedInstancesListingSet :: !DescribeReservedInstancesListingsResponseSetItemType --- -- ^ The Reserved Instances listing that was created. The listing --- -- information is wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateReservedInstancesListingResponse where --- xmlPickler = ec2XML - --- -- | Creates a route in a route table within a VPC. The route's target can be --- -- either a gateway attached to the VPC or a NAT instance in the VPC.When --- -- determining how to route traffic, we use the route with the most specific --- -- match. For example, let's say the traffic is destined for 192.0.2.3, and --- -- the route table includes the following two routes: Both routes apply to the --- -- traffic destined for 192.0.2.3. However, the second route in the list --- -- covers a smaller number of IP addresses and is therefore more specific, so --- -- we use that route to determine where to target the traffic.For more --- -- information about route tables, see Route Tables in the Amazon Virtual --- -- Private Cloud User Guide. --- -- --- -- - --- data CreateRoute = CreateRoute --- { crRouteTableId :: !Text --- -- ^ The ID of the route table for the route. --- , crDestinationCidrBlock :: !Text --- -- ^ The CIDR address block used for the destination match. Routing --- -- decisions are based on the most specific match. --- , crGatewayId :: !Text --- -- ^ The ID of an Internet gateway attached to your VPC. --- , crInstanceId :: !Text --- -- ^ The ID of a NAT instance in your VPC. The operation fails if you --- -- specify an instance ID unless exactly one network interface is --- -- attached. --- , crNetworkInterfaceId :: !Text --- -- ^ The ID of a network interface. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateRoute - --- instance IsXML CreateRoute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 CreateRoute CreateRouteResponse where --- request = query4 ec2 GET "CreateRoute" - --- data CreateRouteResponse = CreateRouteResponse --- { crRequestId :: !Text --- -- ^ The ID of the request. --- , crReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateRouteResponse where --- xmlPickler = ec2XML - --- -- | Creates a route table for the specified VPC. After you create a route --- -- table, you can add routes and associate the table with a subnet.For more --- -- information about route tables, see Route Tables in the Amazon Virtual --- -- Private Cloud User Guide. --- -- --- -- - --- data CreateRouteTable = CreateRouteTable --- { crtVpcId :: !Text --- -- ^ The ID of the VPC. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateRouteTable - --- instance IsXML CreateRouteTable where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 CreateRouteTable CreateRouteTableResponse where --- request = query4 ec2 GET "CreateRouteTable" - --- data CreateRouteTableResponse = CreateRouteTableResponse --- { crtRequestId :: !Text --- -- ^ The ID of the request. --- , crtRouteTable :: !RouteTableType --- -- ^ Information about the newly created route table. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateRouteTableResponse where --- xmlPickler = ec2XML - --- | Creates a security group. --- --- A security group is for use with instances either in the EC2-Classic platform --- or in a specific VPC. --- --- When you create a security group, you specify a friendly name of your --- choice. You can have a security group for use in EC2-Classic with the same --- name as a security group for use in a VPC. However, you can't have two --- security groups for use in EC2-Classic with the same name or two security --- groups for use in a VPC with the same name. --- --- -data CreateSecurityGroup = CreateSecurityGroup - { csgGroupName :: !Text - -- ^ The name of the security group. - , csgGroupDescription :: !Text - -- ^ A description for the security group. This is informational only. - , csgVpcId :: Maybe Text - -- ^ [EC2-VPC] The ID of the VPC. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateSecurityGroup - -instance Rq CreateSecurityGroup where - type Er CreateSecurityGroup = EC2ErrorResponse - type Rs CreateSecurityGroup = CreateSecurityGroupResponse - request = query4 ec2 GET "CreateSecurityGroup" - -data CreateSecurityGroupResponse = CreateSecurityGroupResponse - { csgrRequestId :: !Text - -- ^ The ID of the request. - , csgrReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an error. - , csgrGroupId :: !Text - -- ^ The ID of the new security group. - } deriving (Eq, Show, Generic) - -instance IsXML CreateSecurityGroupResponse where - xmlPickler = ec2XML - --- -- | Creates a snapshot of an Amazon EBS volume and stores it in Amazon S3. You --- -- can use snapshots for backups, to make copies of instance store volumes, --- -- and to save data before shutting down an instance.When a snapshot is --- -- created, any AWS Marketplace product codes from the volume are propagated --- -- to the snapshot.You can take a snapshot of an attached volume that is in --- -- use. However, snapshots only capture data that has been written to your --- -- Amazon EBS volume at the time the snapshot command is issued. This may --- -- exclude any data that has been cached by any applications or the operating --- -- system. If you can pause any file writes to the volume long enough to take --- -- a snapshot, your snapshot should be complete. However, if you can't pause --- -- all file writes to the volume, you should unmount the volume from within --- -- the instance, issue the snapshot command, and then remount the volume to --- -- ensure a consistent and complete snapshot. You may remount and use your --- -- volume while the snapshot status is pending.To create a snapshot for Amazon --- -- EBS volumes that serve as root devices, you should stop the instance before --- -- taking the snapshot.To unmount the volume in Linux/UNIX, use the following --- -- command:Where device_name is the device name (for example, /dev/sdh).To --- -- unmount the volume in Windows, open Disk Management, right-click the volume --- -- to unmount, and select Change Drive Letter and Path. Select the mount point --- -- to remove, and then click Remove.For more information about Amazon EBS, see --- -- Amazon Elastic Block Store in the Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data CreateSnapshot = CreateSnapshot --- { csVolumeId :: !Text --- -- ^ The ID of the Amazon EBS volume. --- , ctDescription :: Maybe Text --- -- ^ A description for the snapshot. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateSnapshot - --- instance AWSRequest EC2 CreateSnapshot CreateSnapshotResponse where --- request = query4 ec2 GET "CreateSnapshot" - --- data CreateSnapshotResponse = CreateSnapshotResponse --- { ctRequestId :: !Text --- -- ^ The ID of the request. --- , ctSnapshotId :: !Text --- -- ^ The ID of the snapshot. --- , ctVolumeId :: !Text --- -- ^ The ID of the volume. --- , ctStatus :: !Text --- -- ^ The snapshot state. --- , ctStartTime :: !UTCTime --- -- ^ The time stamp when the snapshot was initiated. --- , ctProgress :: !Text --- -- ^ The progress of the snapshot, as a percentage. --- , ctOwnerId :: !Text --- -- ^ The AWS account ID of the Amazon EBS snapshot owner. --- , ctVolumeSize :: !Text --- -- ^ The size of the volume, in GiB. --- , cuDescription :: !Text --- -- ^ The description for the snapshot. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateSnapshotResponse where --- xmlPickler = ec2XML - --- -- | Creates the datafeed for Spot Instances, enabling you to view Spot Instance --- -- usage logs. You can create one data feed per account. For more information --- -- about Spot Instances, see Spot Instances in the Amazon Elastic Compute --- -- Cloud User Guide. --- -- --- -- - --- data CreateSpotDatafeedSubscription = CreateSpotDatafeedSubscription --- { csdsBucket :: !Text --- -- ^ The Amazon S3 bucket in which to store the Spot Instance --- -- datafeed. --- , csdsPrefix :: Maybe Text --- -- ^ A prefix for the datafeed file names. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateSpotDatafeedSubscription - --- instance AWSRequest EC2 CreateSpotDatafeedSubscription CreateSpotDatafeedSubscriptionResponse where --- request = query4 ec2 GET "CreateSpotDatafeedSubscription" - --- data CreateSpotDatafeedSubscriptionResponse = CreateSpotDatafeedSubscriptionResponse --- { csdsRequestId :: !Text --- -- ^ The ID of the request. --- , csdsSpotDatafeedSubscription :: !SpotDatafeedSubscriptionType --- -- ^ Type: SpotDatafeedSubscriptionType --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateSpotDatafeedSubscriptionResponse where --- xmlPickler = ec2XML - --- -- | Creates a subnet in an existing VPC.When you create each subnet, you --- -- provide the VPC ID and the CIDR block you want for the subnet. After you --- -- create a subnet, you can't change its CIDR block. The subnet's CIDR block --- -- can be the same as the VPC's CIDR block (assuming you want only a single --- -- subnet in the VPC), or a subset of the VPC's CIDR block. If you create more --- -- than one subnet in a VPC, the subnets' CIDR blocks must not overlap. The --- -- smallest subnet (and VPC) you can create uses a /28 netmask (16 IP --- -- addresses), and the largest uses a /16 netmask (65,536 IP addresses).If you --- -- add more than one subnet to a VPC, they're set up in a star topology with a --- -- logical router in the middle. By default, you can create up to 20 subnets --- -- in a VPC. If you need more than 20 subnets, you can request more by going --- -- to Request to Increase Amazon VPC Limits.If you launch an instance in a VPC --- -- using an Amazon EBS-backed AMI, the IP address doesn't change if you stop --- -- and restart the instance (unlike a similar instance launched outside a VPC, --- -- which gets a new IP address when restarted). It's therefore possible to --- -- have a subnet with no running instances (they're all stopped), but no --- -- remaining IP addresses available. For more information about Amazon --- -- EBS-backed AMIs, see AMI Basics in the Amazon Elastic Compute Cloud User --- -- Guide. For more information about subnets, see Your VPC and Subnets in the --- -- Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data CreateSubnet = CreateSubnet --- { csVpcId :: !Text --- -- ^ The ID of the VPC. --- , csCidrBlock :: !Text --- -- ^ The CIDR block for the subnet. For example, 10.0.0.0/24. --- , csAvailabilityZone :: Maybe Text --- -- ^ The Availability Zone for the subnet. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateSubnet - --- instance AWSRequest EC2 CreateSubnet CreateSubnetResponse where --- request = query4 ec2 GET "CreateSubnet" - --- data CreateSubnetResponse = CreateSubnetResponse --- { cuRequestId :: !Text --- -- ^ The ID of the request. --- , cuSubnet :: !SubnetType --- -- ^ Information about the subnet. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateSubnetResponse where --- xmlPickler = ec2XML - --- | Adds or overwrites one or more tags for the specified EC2 resource or --- resources. Each resource can have a maximum of 10 tags. Each tag consists --- of a key and optional value. Tag keys must be unique per resource. --- --- -data CreateTags = CreateTags - { ctResourceId :: [Text] - -- ^ The IDs of one or more resources to tag. For example, ami-1a2b3c4d. - , ctTag :: [ResourceTagSetItemType] - -- ^ The key for a tag. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateTags - -instance Rq CreateTags where - type Er CreateTags = EC2ErrorResponse - type Rs CreateTags = CreateTagsResponse - request = query4 ec2 GET "CreateTags" - -data CreateTagsResponse = CreateTagsResponse - { cvRequestId :: !Text - -- ^ The ID of the request. - , cvReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an error. - } deriving (Eq, Show, Generic) - -instance IsXML CreateTagsResponse where - xmlPickler = ec2XML - --- -- | Creates an Amazon EBS volume that can be attached to any instance in the --- -- same Availability Zone.Any AWS Marketplace product codes from the snapshot --- -- are propagated to the volume. --- -- --- -- - --- data CreateVolume = CreateVolume --- { cvSize :: Maybe Text --- -- ^ The size of the volume, in GiBs. --- , cvSnapshotId :: !Text --- -- ^ The snapshot from which to create the volume. --- , cvAvailabilityZone :: !Text --- -- ^ The Availability Zone in which to create the volume. Use --- -- DescribeAvailabilityZones to list the Availability Zones that are --- -- currently available to you. --- , cvVolumeType :: Maybe Text --- -- ^ The volume type. --- , cvIops :: !Integer --- -- ^ The number of I/O operations per second (IOPS) that the volume --- -- supports. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateVolume - --- instance IsXML CreateVolume where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 CreateVolume CreateVolumeResponse where --- request = query4 ec2 GET "CreateVolume" - --- data CreateVolumeResponse = CreateVolumeResponse --- { cwRequestId :: !Text --- -- ^ The ID of the request. --- , cwVolumeId :: !Text --- -- ^ The ID of the volume. --- , cwSize :: !Text --- -- ^ The size of the volume, in GiBs. --- , cwSnapshotId :: !Text --- -- ^ The snapshot from which the volume was created, if applicable. --- , cwAvailabilityZone :: !Text --- -- ^ The Availability Zone for the volume. --- , cwStatus :: !Text --- -- ^ The volume state. --- , cwCreateTime :: !UTCTime --- -- ^ The time stamp when volume creation was initiated. --- , cwVolumeType :: !Text --- -- ^ The volume type. --- , cwIops :: !Integer --- -- ^ The number of I/O operations per second (IOPS) that the volume --- -- supports. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateVolumeResponse where --- xmlPickler = ec2XML - --- -- | Creates a VPC with the specified CIDR block.The smallest VPC you can create --- -- uses a /28 netmask (16 IP addresses), and the largest uses a /16 netmask --- -- (65,536 IP addresses). To help you decide how big to make your VPC, see --- -- Your VPC and Subnets in the Amazon Virtual Private Cloud User Guide.By --- -- default, each instance you launch in the VPC has the default DHCP options, --- -- which includes only a default DNS server that we provide --- -- (AmazonProvidedDNS).For more information about DHCP options, see DHCP --- -- Options Sets in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data CreateVpc = CreateVpc --- { cvCidrBlock :: !Text --- -- ^ The CIDR block for the VPC (for example, 10.0.0.0/16). --- , cvInstanceTenancy :: Maybe Text --- -- ^ The supported tenancy options for instances launched into the --- -- VPC. A value of default means that instances can be launched with --- -- any tenancy; a value of dedicated means all instances launched --- -- into the VPC are launched as dedicated tenancy instances --- -- regardless of the tenancy assigned to the instance at launch. --- -- Dedicated tenancy instances runs on single-tenant hardware. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateVpc - --- instance AWSRequest EC2 CreateVpc CreateVpcResponse where --- request = query4 ec2 GET "CreateVpc" - --- data CreateVpcResponse = CreateVpcResponse --- { cxRequestId :: !Text --- -- ^ The ID of the request. --- , cxVpc :: !VpcType --- -- ^ Information about the VPC. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateVpcResponse where --- xmlPickler = ec2XML - --- -- | Creates a VPN connection between an existing virtual private gateway and a --- -- VPN customer gateway. The only supported connection type is ipsec.1. The --- -- response includes information that you need to give to your network --- -- administrator to configure your customer gateway. We recommend that you use --- -- the command line version of this operation (ec2-create-vpn-connection), --- -- which lets you get the configuration information formatted in a friendlier --- -- way. For information about the command, see ec2-create-vpn-connection in --- -- the Amazon Elastic Compute Cloud Command Line Reference.If you decide to --- -- shut down your VPN connection for any reason and later create a new VPN --- -- connection, you must reconfigure your customer gateway with the new --- -- information returned from this call.For more information about VPN --- -- connections, see Adding a Hardware Virtual Private Gateway to Your VPC in --- -- the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data CreateVpnConnection = CreateVpnConnection --- { cvcType :: !Text --- -- ^ The type of VPN connection. --- , cvcCustomerGatewayId :: !Text --- -- ^ The ID of the customer gateway. --- , cvcVpnGatewayId :: !Text --- -- ^ The ID of the virtual private gateway. --- , cvcOptions :: Maybe VpnConnectionOptions --- -- ^ Indicates whether the VPN connection requires static routes. If --- -- you are creating a VPN connection for a device that does not --- -- support BGP, you must specify true. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateVpnConnection - --- instance AWSRequest EC2 CreateVpnConnection CreateVpnConnectionResponse where --- request = query4 ec2 GET "CreateVpnConnection" - --- data CreateVpnConnectionResponse = CreateVpnConnectionResponse --- { cvcRequestId :: !Text --- -- ^ The ID of the request. --- , cvcVpnConnection :: !VpnConnectionType --- -- ^ Information about the VPN connection. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateVpnConnectionResponse where --- xmlPickler = ec2XML - --- -- | Creates a static route associated with a VPN connection between an existing --- -- virtual private gateway and a VPN customer gateway. The static route allows --- -- traffic to be routed from the virtual private gateway to the VPN customer --- -- gateway.For more information about VPN connections, see Adding a Hardware --- -- Virtual Private Gateway to Your VPC in the Amazon Virtual Private Cloud --- -- User Guide. --- -- --- -- - --- data CreateVpnConnectionRoute = CreateVpnConnectionRoute --- { cvcrDestinationCidrBlock :: !Text --- -- ^ The CIDR block associated with the local subnet of the customer --- -- network. --- , cvcrVpnConnectionId :: !Text --- -- ^ The ID of the VPN connection. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateVpnConnectionRoute - --- instance IsXML CreateVpnConnectionRoute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 CreateVpnConnectionRoute CreateVpnConnectionRouteResponse where --- request = query4 ec2 GET "CreateVpnConnectionRoute" - --- data CreateVpnConnectionRouteResponse = CreateVpnConnectionRouteResponse --- { cvcrRequestId :: !Text --- -- ^ The ID of the request. --- , cvcrReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateVpnConnectionRouteResponse where --- xmlPickler = ec2XML - --- -- | Creates a virtual private gateway. A virtual private gateway is the --- -- VPC-side endpoint for your VPN connection. You can create a virtual private --- -- gateway before creating the VPC itself. For more information about virtual --- -- private gateways, see Adding a Hardware Virtual Private Gateway to Your VPC --- -- in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data CreateVpnGateway = CreateVpnGateway --- { cvgType :: !Text --- -- ^ The type of VPN connection this virtual private gateway supports. --- } deriving (Eq, Show, Generic) - --- instance IsQuery CreateVpnGateway - --- instance AWSRequest EC2 CreateVpnGateway CreateVpnGatewayResponse where --- request = query4 ec2 GET "CreateVpnGateway" - --- data CreateVpnGatewayResponse = CreateVpnGatewayResponse --- { cvgRequestId :: !Text --- -- ^ The ID of the request. --- , cvgVpnGateway :: !VpnGatewayType --- -- ^ Information about the virtual private gateway. --- } deriving (Eq, Show, Generic) - --- instance IsXML CreateVpnGatewayResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified VPN customer gateway. You must delete the VPN --- -- connection before you can delete the customer gateway.For more information --- -- about VPN customer gateways, see Adding a Hardware Virtual Private Gateway --- -- to Your VPC in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data DeleteCustomerGateway = DeleteCustomerGateway --- { dcgCustomerGatewayId :: !Text --- -- ^ The ID of the customer gateway. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteCustomerGateway - --- instance AWSRequest EC2 DeleteCustomerGateway DeleteCustomerGatewayResponse where --- request = query4 ec2 GET "DeleteCustomerGateway" - --- data DeleteCustomerGatewayResponse = DeleteCustomerGatewayResponse --- { dcgRequestId :: !Text --- -- ^ The ID of the request. --- , dcgReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteCustomerGatewayResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified set of DHCP options. You must disassociate the set of --- -- DHCP options before you can delete it. You can disassociate the set of DHCP --- -- options by associating either a new set of options or the default set of --- -- options with the VPC. For more information about DHCP options sets, see --- -- DHCP Options Sets in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data DeleteDhcpOptions = DeleteDhcpOptions --- { ddoDhcpOptionsId :: !Text --- -- ^ The ID of the DHCP options set. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteDhcpOptions - --- instance AWSRequest EC2 DeleteDhcpOptions DeleteDhcpOptionsResponse where --- request = query4 ec2 GET "DeleteDhcpOptions" - --- data DeleteDhcpOptionsResponse = DeleteDhcpOptionsResponse --- { ddoRequestId :: !Text --- -- ^ The ID of the request. --- , ddoReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteDhcpOptionsResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified Internet gateway. You must detach the Internet --- -- gateway from the VPC before you can delete it. For more information about --- -- your VPC and Internet gateway, see the Amazon Virtual Private Cloud User --- -- Guide. --- -- --- -- - --- data DeleteInternetGateway = DeleteInternetGateway --- { digInternetGatewayId :: !Text --- -- ^ The ID of the Internet gateway. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteInternetGateway - --- instance AWSRequest EC2 DeleteInternetGateway DeleteInternetGatewayResponse where --- request = query4 ec2 GET "DeleteInternetGateway" - --- data DeleteInternetGatewayResponse = DeleteInternetGatewayResponse --- { digRequestId :: !Text --- -- ^ The ID of the request. --- , digReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteInternetGatewayResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified key pair, by removing the public key from Amazon EC2. --- -- You must own the key pair. --- -- --- -- - --- data DeleteKeyPair = DeleteKeyPair --- { dkpKeyName :: !Text --- -- ^ The name of the key pair. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteKeyPair - --- instance AWSRequest EC2 DeleteKeyPair DeleteKeyPairResponse where --- request = query4 ec2 GET "DeleteKeyPair" - --- data DeleteKeyPairResponse = DeleteKeyPairResponse --- { dkpRequestId :: !Text --- -- ^ The ID of the request. --- , dkpReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteKeyPairResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified network ACL. You can't delete the ACL if it's --- -- associated with any subnets. You can't delete the default network ACL. For --- -- more information about network ACLs, see Network ACLs in the Amazon Virtual --- -- Private Cloud User Guide. --- -- --- -- - --- data DeleteNetworkAcl = DeleteNetworkAcl --- { dnaNetworkAclId :: !Text --- -- ^ The ID of the network ACL. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteNetworkAcl - --- instance AWSRequest EC2 DeleteNetworkAcl DeleteNetworkAclResponse where --- request = query4 ec2 GET "DeleteNetworkAcl" - --- data DeleteNetworkAclResponse = DeleteNetworkAclResponse --- { dnaRequestId :: !Text --- -- ^ The ID of the request. --- , dnaReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteNetworkAclResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified ingress or egress entry (rule) from the specified --- -- network ACL. For more information about network ACLs, see Network ACLs in --- -- the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data DeleteNetworkAclEntry = DeleteNetworkAclEntry --- { dnaeNetworkAclId :: !Text --- -- ^ The ID of the network ACL. --- , dnaeRuleNumber :: !Integer --- -- ^ The rule number for the entry to delete. --- , dnaeEgress :: Maybe Bool --- -- ^ Indicates whether the rule is an egress rule (true) or ingress --- -- rule (false). --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteNetworkAclEntry - --- instance AWSRequest EC2 DeleteNetworkAclEntry DeleteNetworkAclEntryResponse where --- request = query4 ec2 GET "DeleteNetworkAclEntry" - --- data DeleteNetworkAclEntryResponse = DeleteNetworkAclEntryResponse --- { dnaeRequestId :: !Text --- -- ^ The ID of the request. --- , dnaeReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteNetworkAclEntryResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified network interface. You must detach the network --- -- interface before you can delete it. --- -- --- -- - --- data DeleteNetworkInterface = DeleteNetworkInterface --- { dniNetworkInterfaceId :: !Text --- -- ^ The ID of the network interface. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteNetworkInterface - --- instance IsXML DeleteNetworkInterface where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DeleteNetworkInterface DeleteNetworkInterfaceResponse where --- request = query4 ec2 GET "DeleteNetworkInterface" - --- data DeleteNetworkInterfaceResponse = DeleteNetworkInterfaceResponse --- { dniRequestId :: !Text --- -- ^ The ID of the request. --- , dniReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteNetworkInterfaceResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified placement group. You must terminate all instances in --- -- the placement group before you can delete the placement group. For more --- -- information about placement groups and cluster instances, see Cluster --- -- Instances in the Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data DeletePlacementGroup = DeletePlacementGroup --- { dpgGroupName :: !Text --- -- ^ The name of the placement group. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeletePlacementGroup - --- instance AWSRequest EC2 DeletePlacementGroup DeletePlacementGroupResponse where --- request = query4 ec2 GET "DeletePlacementGroup" - --- data DeletePlacementGroupResponse = DeletePlacementGroupResponse --- { dpgRequestId :: !Text --- -- ^ The ID of the request. --- , dpgReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeletePlacementGroupResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified route from the specified route table. For more --- -- information about route tables, see Route Tables in the Amazon Virtual --- -- Private Cloud User Guide. --- -- --- -- - --- data DeleteRoute = DeleteRoute --- { drRouteTableId :: !Text --- -- ^ The ID of the route table. --- , drDestinationCidrBlock :: !Text --- -- ^ The CIDR range for the route. The value you specify must match --- -- the CIDR for the route exactly. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteRoute - --- instance IsXML DeleteRoute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DeleteRoute DeleteRouteResponse where --- request = query4 ec2 GET "DeleteRoute" - --- data DeleteRouteResponse = DeleteRouteResponse --- { drRequestId :: !Text --- -- ^ The ID of the request. --- , drReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteRouteResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified route table. You must disassociate the route table --- -- from any subnets before you can delete it. You can't delete the main route --- -- table. For more information about route tables, see Route Tables in the --- -- Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data DeleteRouteTable = DeleteRouteTable --- { drtRouteTableId :: !Text --- -- ^ The ID of the route table. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteRouteTable - --- instance IsXML DeleteRouteTable where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DeleteRouteTable DeleteRouteTableResponse where --- request = query4 ec2 GET "DeleteRouteTable" - --- data DeleteRouteTableResponse = DeleteRouteTableResponse --- { drtRequestId :: !Text --- -- ^ The ID of the request. --- , drtReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteRouteTableResponse where --- xmlPickler = ec2XML - --- | Deletes a security group.A security group is for use with instances either --- in the EC2-Classic platform or in a specific VPC. --- --- -data DeleteSecurityGroup = DeleteSecurityGroup - { dsgGroupName :: Maybe Text - -- ^ The name of the security group. - , dsgGroupId :: Maybe Text - -- ^ The ID of the security group. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteSecurityGroup - -instance Rq DeleteSecurityGroup where - type Er DeleteSecurityGroup = EC2ErrorResponse - type Rs DeleteSecurityGroup = DeleteSecurityGroupResponse - request = query4 ec2 GET "DeleteSecurityGroup" - -data DeleteSecurityGroupResponse = DeleteSecurityGroupResponse - { dsgrRequestId :: !Text - -- ^ The ID of the request. - , dsgrReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an error. - } deriving (Eq, Show, Generic) - -instance IsXML DeleteSecurityGroupResponse where - xmlPickler = ec2XML - --- -- | Deletes the specified snapshot. --- -- --- -- - --- data DeleteSnapshot = DeleteSnapshot --- { dsSnapshotId :: !Text --- -- ^ The ID of the Amazon EBS snapshot. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteSnapshot - --- instance AWSRequest EC2 DeleteSnapshot DeleteSnapshotResponse where --- request = query4 ec2 GET "DeleteSnapshot" - --- data DeleteSnapshotResponse = DeleteSnapshotResponse --- { dsRequestId :: !Text --- -- ^ The ID of the request. --- , dsReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteSnapshotResponse where --- xmlPickler = ec2XML - --- -- | Deletes the datafeed for Spot Instances. For more information about Spot --- -- Instances, see Spot Instances in the Amazon Elastic Compute Cloud User --- -- Guide. --- -- --- -- - --- data DeleteSpotDatafeedSubscription = DeleteSpotDatafeedSubscription --- deriving (Eq, Read, Show, Generic) - --- instance IsQuery DeleteSpotDatafeedSubscription - --- instance IsXML DeleteSpotDatafeedSubscription where --- xmlPickler = xpEmpty $ Just ec2NS - --- instance AWSRequest EC2 DeleteSpotDatafeedSubscription DeleteSpotDatafeedSubscriptionResponse where --- request = query4 ec2 GET "DeleteSpotDatafeedSubscription" - --- data DeleteSpotDatafeedSubscriptionResponse = DeleteSpotDatafeedSubscriptionResponse --- { dsdsRequestId :: !Text --- -- ^ The ID of the request. --- , dsdsReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteSpotDatafeedSubscriptionResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified subnet. You must terminate all running instances in --- -- the subnet before you can delete the subnet. --- -- --- -- - --- data DeleteSubnet = DeleteSubnet --- { dsSubnetId :: !Text --- -- ^ The ID of the subnet. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteSubnet - --- instance AWSRequest EC2 DeleteSubnet DeleteSubnetResponse where --- request = query4 ec2 GET "DeleteSubnet" - --- data DeleteSubnetResponse = DeleteSubnetResponse --- { dtRequestId :: !Text --- -- ^ The ID of the request. --- , dtReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteSubnetResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified set of tags from the specified set of resources. This --- -- call is designed to follow a DescribeTags call.For more information about --- -- tags, see Tagging Your Resources in the Amazon Elastic Compute Cloud User --- -- Guide. --- -- --- -- - --- data DeleteTags = DeleteTags --- { dtResourceId :: Members Text --- -- ^ The ID of the resource. For example, ami-1a2b3c4d. You can --- -- specify more than one resource ID. --- , dtTag :: Members TagType --- -- ^ The tag's key. You can specify more than one tag to delete. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteTags - --- instance AWSRequest EC2 DeleteTags DeleteTagsResponse where --- request = query4 ec2 GET "DeleteTags" - --- data DeleteTagsResponse = DeleteTagsResponse --- { duRequestId :: !Text --- -- ^ The ID of the request. --- , duReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteTagsResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified Amazon EBS volume. The volume must be in the --- -- available state (not attached to an instance). For more information about --- -- Amazon EBS, see Amazon Elastic Block Store in the Amazon Elastic Compute --- -- Cloud User Guide. --- -- --- -- - --- data DeleteVolume = DeleteVolume --- { dvVolumeId :: !Text --- -- ^ The ID of the volume. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteVolume - --- instance IsXML DeleteVolume where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DeleteVolume DeleteVolumeResponse where --- request = query4 ec2 GET "DeleteVolume" - --- data DeleteVolumeResponse = DeleteVolumeResponse --- { dvRequestId :: !Text --- -- ^ The ID of the request. --- , dvReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteVolumeResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified VPC. You must detach or delete all gateways and --- -- resources that are associated with the VPC before you can delete it. For --- -- example, you must terminate all instances running in the VPC, delete all --- -- security groups associated with the VPC (except the default one), delete --- -- all route tables associated with the VPC (except the default one), and so --- -- on. --- -- --- -- - --- data DeleteVpc = DeleteVpc --- { dvVpcId :: !Text --- -- ^ The ID of the VPC. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteVpc - --- instance AWSRequest EC2 DeleteVpc DeleteVpcResponse where --- request = query4 ec2 GET "DeleteVpc" - --- data DeleteVpcResponse = DeleteVpcResponse --- { dwRequestId :: !Text --- -- ^ The ID of the request. --- , dwReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteVpcResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified VPN connection.If you're deleting the VPC and its --- -- associated components, we recommend that you detach the virtual private --- -- gateway from the VPC and delete the VPC before deleting the VPN --- -- connection.Another reason to use this command is if you believe that the --- -- tunnel credentials for your VPN connection have been compromised. In that --- -- situation, you can delete the VPN connection and create a new one that has --- -- new keys, without needing to delete the VPC or virtual private gateway. If --- -- you create a new VPN connection, you must reconfigure the customer gateway --- -- using the new configuration information returned with the new VPN --- -- connection ID.For more information about VPN connections, see Adding a --- -- Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual Private --- -- Cloud User Guide. --- -- --- -- - --- data DeleteVpnConnection = DeleteVpnConnection --- { dvcVpnConnectionId :: !Text --- -- ^ The ID of the VPN connection. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteVpnConnection - --- instance AWSRequest EC2 DeleteVpnConnection DeleteVpnConnectionResponse where --- request = query4 ec2 GET "DeleteVpnConnection" - --- data DeleteVpnConnectionResponse = DeleteVpnConnectionResponse --- { dvcRequestId :: !Text --- -- ^ The ID of the request. --- , dvcReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteVpnConnectionResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified static route associated with a VPN connection between --- -- an existing virtual private gateway and a VPN customer gateway. The static --- -- route allows traffic to be routed from the virtual private gateway to the --- -- VPN customer gateway.For more information about VPN connections, see Adding --- -- a Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual --- -- Private Cloud User Guide. --- -- --- -- - --- data DeleteVpnConnectionRoute = DeleteVpnConnectionRoute --- { dvcrDestinationCidrBlock :: !Text --- -- ^ The CIDR block associated with the local subnet of the customer --- -- network. --- , dvcrVpnConnectionId :: !Text --- -- ^ The ID of the VPN connection. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteVpnConnectionRoute - --- instance IsXML DeleteVpnConnectionRoute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DeleteVpnConnectionRoute DeleteVpnConnectionRouteResponse where --- request = query4 ec2 GET "DeleteVpnConnectionRoute" - --- data DeleteVpnConnectionRouteResponse = DeleteVpnConnectionRouteResponse --- { dvcrRequestId :: !Text --- -- ^ The ID of the request. --- , dvcrReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteVpnConnectionRouteResponse where --- xmlPickler = ec2XML - --- -- | Deletes the specified virtual private gateway. We recommend that before you --- -- delete a virtual private gateway, you detach it from the VPC and delete the --- -- VPN connection. Note that you don't need to delete the virtual private --- -- gateway if you plan to delete and recreate the VPN connection between your --- -- VPC and your network.For more information about virtual private gateways, --- -- see Adding a Hardware Virtual Private Gateway to Your VPC in the Amazon --- -- Virtual Private Cloud User Guide. --- -- --- -- - --- data DeleteVpnGateway = DeleteVpnGateway --- { dvgVpnGatewayId :: !Text --- -- ^ The ID of the virtual private gateway. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeleteVpnGateway - --- instance AWSRequest EC2 DeleteVpnGateway DeleteVpnGatewayResponse where --- request = query4 ec2 GET "DeleteVpnGateway" - --- data DeleteVpnGatewayResponse = DeleteVpnGatewayResponse --- { dvgRequestId :: !Text --- -- ^ The ID of the request. --- , dvgReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteVpnGatewayResponse where --- xmlPickler = ec2XML - --- -- | Deregisters the specified AMI. After you deregister an AMI, it can't be --- -- used to launch new instances. --- -- --- -- - --- data DeregisterImage = DeregisterImage --- { diImageId :: !Text --- -- ^ The ID of the AMI. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DeregisterImage - --- instance IsXML DeregisterImage where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DeregisterImage DeregisterImageResponse where --- request = query4 ec2 GET "DeregisterImage" - --- data DeregisterImageResponse = DeregisterImageResponse --- { diRequestId :: !Text --- -- ^ The ID of the request. --- , diReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DeregisterImageResponse where --- xmlPickler = ec2XML - --- -- | Describes the specified attribute of your AWS account.The following are the --- -- supported account attributes. --- -- --- -- - --- data DescribeAccountAttributes = DescribeAccountAttributes --- { daaAttributeName :: Members Text --- -- ^ One or more account attribute names. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeAccountAttributes - --- instance AWSRequest EC2 DescribeAccountAttributes DescribeAccountAttributesResponse where --- request = query4 ec2 GET "DescribeAccountAttributes" - --- data DescribeAccountAttributesResponse = DescribeAccountAttributesResponse --- { daaRequestId :: !Text --- -- ^ The ID of the request. --- , daaAccountAttributeSet :: !AccountAttributeSetItemType --- -- ^ A list of the names and values of the requested attributes, each --- -- one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeAccountAttributesResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your Elastic IP addresses.An Elastic IP address is --- -- for use in either the EC2-Classic platform or in a VPC. For more --- -- information, see Elastic IP Addresses in the Amazon Elastic Compute Cloud --- -- User Guide. --- -- --- -- - --- -- data AddressFilter = --- -- , daDomain :: !Text --- -- -- ^ Indicates whether the address is for use in a VPC. --- -- , daInstance-id :: !Text --- -- -- ^ The instance the address is associated with (if any). --- -- , daPublic-ip :: !Text --- -- -- ^ The Elastic IP address. --- -- , daAllocation-id :: !Text --- -- -- ^ The allocation ID for the address (VPC only). --- -- , daAssociation-id :: !Text --- -- -- ^ The association ID for the address (VPC only). --- -- , daNetwork-interface-id :: !Text --- -- -- ^ The network interface (if any) that the address is associated --- -- -- with (VPC only). --- -- , daNetwork-interface-owner-id :: !Text --- -- -- ^ The owner IID. --- -- , daPrivate-ip-address :: !Text --- -- -- ^ The private IP address associated with the Elastic IP address --- -- -- (VPC only). - --- data DescribeAddresses = DescribeAddresses --- { daPublicIp :: Members Text --- -- ^ [EC2-Classic] One or more Elastic IP addresses. --- , daAllocationId :: Members Text --- -- ^ [EC2-VPC] One or more allocation IDs. --- , daFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeAddresses - --- instance AWSRequest EC2 DescribeAddresses DescribeAddressesResponse where --- request = query4 ec2 GET "DescribeAddresses" - --- data DescribeAddressesResponse = DescribeAddressesResponse --- { daRequestId :: !Text --- -- ^ The ID of the request. --- , daAddressesSet :: !DescribeAddressesResponseItemType --- -- ^ A list of Elastic IP addresses, each one wrapped in an item --- -- element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeAddressesResponse where --- xmlPickler = ec2XML - --- | Describes one or more of the Availability Zones that are available to you. --- The results include zones only for the region you're currently using. --- --- -data DescribeAvailabilityZones = DescribeAvailabilityZones - { dazZoneName :: [Text] - -- ^ One or more Availability Zone names. - , dazFilter :: [Filter] - -- ^ The name of a filter. - } deriving (Eq, Show, Generic) - --- data AvailabilityZoneFilter --- , dazMessage :: !Text --- -- ^ Information about the Availability Zone. --- , dazRegion-name :: !Text --- -- ^ The region for the Availability Zone (for example, us-east-1). --- , dazState :: !Text --- -- ^ The state of the Availability Zone --- , dazZone-name :: !Text --- -- ^ The name of the zone. - -instance IsQuery DescribeAvailabilityZones - -instance Rq DescribeAvailabilityZones where - type Er DescribeAvailabilityZones = EC2ErrorResponse - type Rs DescribeAvailabilityZones = DescribeAvailabilityZonesResponse - request = query4 ec2 GET "DescribeAvailabilityZones" - -data DescribeAvailabilityZonesResponse = DescribeAvailabilityZonesResponse - { dazrRequestId :: !Text - -- ^ The ID of the request. - , dazrAvailabilityZoneInfo :: [AvailabilityZoneItemType] - -- ^ A list of Availability Zones. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeAvailabilityZonesResponse where - xmlPickler = ec2XML - --- -- | Describes one or more of your bundling tasks. --- -- --- -- - --- -- data BundleFilter --- -- , dbtBundle-id :: !Text --- -- -- ^ The ID of the bundle task. --- -- , dbtError-code :: !Text --- -- -- ^ If the task failed, the error code returned. --- -- , dbtError-message :: !Text --- -- -- ^ If the task failed, the error message returned. --- -- , dbtInstance-id :: !Text --- -- -- ^ The ID of the instance that was bundled. --- -- , dbtProgress :: !Text --- -- -- ^ The level of task completion, as a percentage (for example, 20%). --- -- , dbtS3-bucket :: !Text --- -- -- ^ The Amazon S3 bucket to store the AMI. --- -- , dbtS3-prefix :: !Text --- -- -- ^ The beginning of the AMI name. --- -- , dbtStart-time :: !UTCTime --- -- -- ^ The time the task started (for example, --- -- -- 2008-09-15T17:15:20.000Z). --- -- , dbtState :: !Text --- -- -- ^ The state of the task. --- -- , dbtUpdate-time :: !UTCTime --- -- -- ^ The time of the most recent update for the task (for example, --- -- -- 2008-09-15T17:15:20.000Z). - - --- data DescribeBundleTasks = DescribeBundleTasks --- { dbtBundleId :: Members Text --- -- ^ One or more bundle task IDs. --- , dbtFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeBundleTasks - --- instance AWSRequest EC2 DescribeBundleTasks DescribeBundleTasksResponse where --- request = query4 ec2 GET "DescribeBundleTasks" - --- data DescribeBundleTasksResponse = DescribeBundleTasksResponse --- { dbtRequestId :: !Text --- -- ^ The ID of the request. --- , dbtBundleInstanceTasksSet :: !BundleInstanceTaskType --- -- ^ A list of bundle tasks, each one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeBundleTasksResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your conversion tasks. --- -- --- -- - --- data DescribeConversionTasks = DescribeConversionTasks --- { dctConversionTaskId :: Members Text --- -- ^ One or more conversion task IDs. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeConversionTasks - --- instance AWSRequest EC2 DescribeConversionTasks DescribeConversionTasksResponse where --- request = query4 ec2 GET "DescribeConversionTasks" - --- data DescribeConversionTasksResponse = DescribeConversionTasksResponse --- { dctConversionTasks :: !ConversionTaskType --- -- ^ A list of conversion tasks, each one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeConversionTasksResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your VPN customer gateways.For more information --- -- about VPN customer gateways, see Adding a Hardware Virtual Private Gateway --- -- to Your VPC in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- -- data GatewayFilter --- -- , dchBgp-asn :: !Text --- -- -- ^ The customer gateway's Border Gateway Protocol (BGP) Autonomous --- -- -- System Number (ASN). --- -- , dchCustomer-gateway-id :: !Text --- -- -- ^ The ID of the customer gateway. --- -- , dchIp-address :: !Text --- -- -- ^ The IP address of the customer gateway's Internet-routable --- -- -- external interface (for example, 12.1.2.3). --- -- , dchState :: !Text --- -- -- ^ The state of the customer gateway. --- -- , dchType :: !Text --- -- -- ^ The type of customer gateway. Currently the only supported type --- -- -- is ipsec.1. --- -- , dchTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dchTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dchTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dchKey :: !Text --- -- -- ^ - --- data DescribeCustomerGateways = DescribeCustomerGateways --- { dchCustomerGatewayId :: Members Text --- -- ^ One or more customer gateway IDs. --- , dchFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeCustomerGateways - --- instance AWSRequest EC2 DescribeCustomerGateways DescribeCustomerGatewaysResponse where --- request = query4 ec2 GET "DescribeCustomerGateways" - --- data DescribeCustomerGatewaysResponse = DescribeCustomerGatewaysResponse --- { dchRequestId :: !Text --- -- ^ The ID of the request. --- , dchCustomerGatewaySet :: !CustomerGatewayType --- -- ^ A list of customer gateways, each one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeCustomerGatewaysResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your DHCP options sets.For more information about --- -- DHCP options sets, see DHCP Options Sets in the Amazon Virtual Private --- -- Cloud User Guide. --- -- --- -- - --- -- data DhcpFilter --- -- , ddpDhcp-options-id :: !Text --- -- -- ^ The ID of a set of DHCP options. --- -- , ddpKey :: !Text --- -- -- ^ The key for one of the options (for example, domain-name). --- -- , ddpValue :: !Text --- -- -- ^ The value for one of the options. --- -- , ddpTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , ddpTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , ddpTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , ddqKey :: !Text --- -- -- ^ - --- data DescribeDhcpOptions = DescribeDhcpOptions --- { ddpDhcpOptionsId :: Members Text --- -- ^ The IDs of one or more DHCP options sets. --- , ddpFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeDhcpOptions - --- instance AWSRequest EC2 DescribeDhcpOptions DescribeDhcpOptionsResponse where --- request = query4 ec2 GET "DescribeDhcpOptions" - --- data DescribeDhcpOptionsResponse = DescribeDhcpOptionsResponse --- { ddqRequestId :: !Text --- -- ^ The ID of the request. --- , ddqDhcpOptionsSet :: !DhcpOptionsType --- -- ^ A list of DHCP options sets, each one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeDhcpOptionsResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your export tasks. --- -- --- -- - --- data DescribeExportTasks = DescribeExportTasks --- { detExportTaskId :: Members Text --- -- ^ One or more export task IDs. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeExportTasks - --- instance AWSRequest EC2 DescribeExportTasks DescribeExportTasksResponse where --- request = query4 ec2 GET "DescribeExportTasks" - --- data DescribeExportTasksResponse = DescribeExportTasksResponse --- { detRequestId :: !Text --- -- ^ The ID of the request. --- , detExportTaskSet :: !ExportTaskResponseType --- -- ^ A list of export tasks, each one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeExportTasksResponse where --- xmlPickler = ec2XML - --- -- | Describes an attributes of an AMI. You can specify only one attribute at a --- -- time. --- -- --- -- - --- data DescribeImageAttribute = DescribeImageAttribute --- { diaImageId :: !Text --- -- ^ The ID of the AMI. --- , diaAttribute :: !Text --- -- ^ The AMI attribute. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeImageAttribute - --- instance IsXML DescribeImageAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DescribeImageAttribute DescribeImageAttributeResponse where --- request = query4 ec2 GET "DescribeImageAttribute" - --- data DescribeImageAttributeResponse = DescribeImageAttributeResponse --- { diaRequestId :: !Text --- -- ^ The ID of the request. --- , dibImageId :: !Text --- -- ^ The ID of the AMI. --- , dibLaunchPermission :: !LaunchPermissionItemType --- -- ^ A list of launch permissions, each one wrapped in an item --- -- element. --- , dibProductCodes :: !ProductCodeItemType --- -- ^ A list of product codes, each one wrapped in an item element that --- -- contains a product code and a product code type. --- , dibKernel :: !Text --- -- ^ The kernel ID, wrapped in a value element. --- , dibRamdisk :: !Text --- -- ^ The RAM disk ID, wrapped in a value element. --- , dibDescription :: !Text --- -- ^ A user-created description for the AMI, wrapped in a value --- -- element. --- , dibBlockDeviceMapping :: !BlockDeviceMappingItemType --- -- ^ One or more block device mapping entries, each one wrapped in an --- -- item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeImageAttributeResponse where --- xmlPickler = ec2XML - --- | Describes one or more of the images (AMIs, AKIs, and ARIs) available to --- you. Images available to you include public images, private images that you --- own, and private images owned by other AWS accounts but for which you have --- explicit launch permissions. --- --- -data DescribeImages = DescribeImages - { djExecutableBy :: [Text] - -- ^ Describes the images for which the specified user has explicit - -- launch permissions. The user ID can be an AWS account ID, self to - -- return images for which the sender of the request has explicit - -- launch permissions, or all to return AMIs with public launch permissions. - , djImageId :: [Text] - -- ^ One or more image IDs. - , djOwner :: [Text] - -- ^ Describes images owned by the specified owners. Use the IDs - -- amazon, aws-marketplace, and self to describe images owned by - -- Amazon, AWS Marketplace, or you, respectively. - , djFilter :: [Filter] - -- ^ The name of a filter. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeImages - -instance Rq DescribeImages where - type Er DescribeImages = EC2ErrorResponse - type Rs DescribeImages = DescribeImagesResponse - request = query4 ec2 GET "DescribeImages" - -data DescribeImagesResponse = DescribeImagesResponse - { djRequestId :: !Text - -- ^ The ID of the request. - , djImagesSet :: [DescribeImagesResponseItemType] - -- ^ A list of images. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeImagesResponse where - xmlPickler = ec2XML - --- -- | Describes an attribute of the specified instance. You can specify only one --- -- attribute at a time. --- -- --- -- - --- data DescribeInstanceAttribute = DescribeInstanceAttribute --- { diaInstanceId :: !Text --- -- ^ The ID of the instance. --- , dibAttribute :: !Text --- -- ^ The instance attribute. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeInstanceAttribute - --- instance IsXML DescribeInstanceAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DescribeInstanceAttribute DescribeInstanceAttributeResponse where --- request = query4 ec2 GET "DescribeInstanceAttribute" - --- data DescribeInstanceAttributeResponse = DescribeInstanceAttributeResponse --- { dibRequestId :: !Text --- -- ^ The ID of the request. --- , dibInstanceId :: !Text --- -- ^ The ID of the instance. --- , dicBlockDeviceMapping :: !InstanceBlockDeviceMappingResponseItemType --- -- ^ The block device mapping of the instance. --- , dicDisableApiTermination :: !Bool --- -- ^ If the value is true, you can't terminate the instance through --- -- the Amazon EC2 console, CLI, or API; otherwise, you can. --- , dicEbsOptimized :: !Bool --- -- ^ Indicates whether the instance is optimized for EBS I/O. --- , dicGroupSet :: !GroupItemType --- -- ^ The security groups associated with the instance. --- , dicInstanceInitiatedShutdownBehavior :: !Text --- -- ^ Indicates whether an instance stops or terminates when you --- -- initiate shutdown from the instance (using the operating system --- -- command for system shutdown). --- , dicInstanceType :: !Text --- -- ^ The instance type. --- , dicKernel :: !Text --- -- ^ The kernel ID. --- , dicProductCodes :: !ProductCodesSetItemType --- -- ^ A list of product codes. --- , dicRamdisk :: !Text --- -- ^ The RAM disk ID. --- , dicRootDeviceName :: !Text --- -- ^ The name of the root device (for example, /dev/sda1). --- , dicSourceDestCheck :: !Bool --- -- ^ Indicates whether source/destination checking is enabled. A value --- -- of true means checking is enabled, and false means checking is --- -- disabled. This value must be false for a NAT instance to perform --- -- NAT. --- , dicUserData :: !Text --- -- ^ The Base64-encoded MIME user data. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeInstanceAttributeResponse where --- xmlPickler = ec2XML - --- | Describes one or more of your instances. --- --- * If you specify one or more instance IDs, Amazon EC2 returns information --- for those instances. --- --- * If you do not specify instance IDs, Amazon EC2 returns information for all --- relevant instances. --- --- * If you specify an invalid instance ID, an error is returned. --- --- * If you specify an instance that you do not own, it is not included in the --- returned results. --- --- * Recently terminated instances might appear in the returned --- results. This interval is usually less than one hour. --- --- -data DescribeInstances = DescribeInstances - { diInstanceId :: [Text] - -- ^ One or more instance IDs. - , diFilter :: [Filter] - -- ^ The name of a filter. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeInstances - -instance Rq DescribeInstances where - type Er DescribeInstances = EC2ErrorResponse - type Rs DescribeInstances = DescribeInstancesResponse - request = query4 ec2 GET "DescribeInstances" - -data DescribeInstancesResponse = DescribeInstancesResponse - { dirRequestId :: !Text - -- ^ The ID of the request. - , dirReservationSet :: [ReservationInfoType] - -- ^ A list of reservations, each one wrapped in an item element. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeInstancesResponse where - xmlPickler = ec2XML - --- -- | Describes the status of one or more instances, including any scheduled --- -- events.Instance status has two main components: Instance status provides --- -- information about four types of scheduled events for an instance that may --- -- require your attention: When your instance is retired, it will either be --- -- terminated (if its root device type is the instance-store) or stopped (if --- -- its root device type is an EBS volume). Instances stopped due to retirement --- -- will not be restarted, but you can do so manually. You can also avoid --- -- retirement of EBS-backed instances by manually restarting your instance --- -- when its event code is instance-retirement. This ensures that your instance --- -- is started on a different underlying host. --- -- --- -- - --- -- data InstanceStatusFilter --- -- , disAvailability-zone :: !Text --- -- -- ^ The Availability Zone of the instance. --- -- , disEvent :: Members eventType --- -- -- ^ The code identifying the type of event. --- -- , disInstance-state-name :: !Text --- -- -- ^ The state of the instance. --- -- , disInstance-state-code :: !Integer --- -- -- ^ A code representing the state of the instance. The high byte is --- -- -- an opaque internal value and should be ignored. The low byte is --- -- -- set based on the state represented --- -- , disSystem-status :: Members system-statusType --- -- -- ^ The system status of the instance. --- -- , disInstance-status :: Members instance-statusType --- -- -- ^ The status of the instance. - --- data DescribeInstanceStatus = DescribeInstanceStatus --- { disInstanceId :: Maybe Text --- -- ^ One or more instance IDs. --- , disIncludeAllInstances :: Maybe Bool --- -- ^ When true, includes the health status for all instances. When --- -- false, includes the health status for running instances only. --- , disMaxResults :: Maybe Integer --- -- ^ The maximum number of paginated instance items per response. --- , disNextToken :: Maybe Text --- -- ^ The next paginated set of results to return. --- , disFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeInstanceStatus - --- instance AWSRequest EC2 DescribeInstanceStatus DescribeInstanceStatusResponse where --- request = query4 ec2 GET "DescribeInstanceStatus" - --- data DescribeInstanceStatusResponse = DescribeInstanceStatusResponse --- { disRequestId :: !Text --- -- ^ The ID of the request. --- , disInstanceStatusSet :: !InstanceStatusItemType --- -- ^ A list of instances status descriptions, each one wrapped in an --- -- item element. --- , ditNextToken :: !Text --- -- ^ The next paginated set of results to return. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeInstanceStatusResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your Internet gateways. --- -- --- -- - --- -- data GatewayFilter --- -- , dihAttachment :: Members attachmentType --- -- -- ^ The current state of the attachment between the gateway and the --- -- -- VPC. Returned only if a VPC is attached. --- -- , dihInternet-gateway-id :: !Text --- -- -- ^ The ID of the Internet gateway. --- -- , dihTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dihTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dihTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dihKey :: !Text --- -- -- ^ - --- data DescribeInternetGateways = DescribeInternetGateways --- { dihInternetGatewayId :: Members Text --- -- ^ One or more Internet gateway IDs. --- , dihFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeInternetGateways - --- instance AWSRequest EC2 DescribeInternetGateways DescribeInternetGatewaysResponse where --- request = query4 ec2 GET "DescribeInternetGateways" - --- data DescribeInternetGatewaysResponse = DescribeInternetGatewaysResponse --- { dihRequestId :: !Text --- -- ^ The ID of the request. --- , dihInternetGatewaySet :: !InternetGatewayType --- -- ^ A list of Internet gateways, each one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeInternetGatewaysResponse where --- xmlPickler = ec2XML - --- -- data KeyPairFilter --- -- , dkqFingerprint :: !Text --- -- -- ^ The fingerprint of the key pair. --- -- , dkqKey-name :: !Text --- -- -- ^ The name of the key pair. - --- | Describes one or more of your key pairs. --- --- -data DescribeKeyPairs = DescribeKeyPairs - { dkqKeyName :: [Text] - -- ^ One or more key pair names. - , dkqFilter :: [Filter] - -- ^ The name of a filter. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeKeyPairs - -instance Rq DescribeKeyPairs where - type Er DescribeKeyPairs = EC2ErrorResponse - type Rs DescribeKeyPairs = DescribeKeyPairsResponse - request = query4 ec2 GET "DescribeKeyPairs" - -data DescribeKeyPairsResponse = DescribeKeyPairsResponse - { dkqRequestId :: !Text - -- ^ The ID of the request. - , dkqKeySet :: [DescribeKeyPairsResponseItemType] - -- ^ A list of key pairs. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeKeyPairsResponse where - xmlPickler = ec2XML - --- -- | Describes one or more of your network ACLs.For more information about --- -- network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User --- -- Guide. --- -- --- -- - --- -- data NetworkAclFilter --- -- , dnbAssociation :: Members associationType --- -- -- ^ The ID of an association ID for the ACL. --- -- , dnbDefault :: !Bool --- -- -- ^ Indicates whether the ACL is the default network ACL for the VPC. --- -- , dnbEntry :: Members entryType --- -- -- ^ The CIDR range specified in the entry. --- -- , dnbNetwork-acl-id :: !Text --- -- -- ^ The ID of the network ACL. --- -- , dnbTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dnbTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dnbTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dnbKey :: !Text --- -- -- ^ The ID of the VPC for the network ACL. --- -- , dnbVpc-id :: !Text --- -- -- ^ - --- data DescribeNetworkAcls = DescribeNetworkAcls --- { dnbNetworkAclId :: Members Text --- -- ^ One or more network ACL IDs. --- , dnbFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeNetworkAcls - --- instance AWSRequest EC2 DescribeNetworkAcls DescribeNetworkAclsResponse where --- request = query4 ec2 GET "DescribeNetworkAcls" - --- data DescribeNetworkAclsResponse = DescribeNetworkAclsResponse --- { dnbRequestId :: !Text --- -- ^ The ID of the request. --- , dnbNetworkAclSet :: !NetworkAclType --- -- ^ A list of network ACLs, each one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeNetworkAclsResponse where --- xmlPickler = ec2XML - --- -- | Describes a network interface attribute. You can specify only one attribute --- -- at a time. --- -- --- -- - --- data DescribeNetworkInterfaceAttribute = DescribeNetworkInterfaceAttribute --- { dniaNetworkInterfaceId :: !Text --- -- ^ The ID of the network interface. --- , dniaAttribute :: !Text --- -- ^ The attribute of the network interface. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeNetworkInterfaceAttribute - --- instance IsXML DescribeNetworkInterfaceAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DescribeNetworkInterfaceAttribute DescribeNetworkInterfaceAttributeResponse where --- request = query4 ec2 GET "DescribeNetworkInterfaceAttribute" - --- data DescribeNetworkInterfaceAttributeResponse = DescribeNetworkInterfaceAttributeResponse --- { dniaRequestId :: !Text --- -- ^ The ID of the request. --- , dnibNetworkInterfaceId :: !Text --- -- ^ The ID of the network interface. --- , dnibDescription :: !Text --- -- ^ The description of the network interface. --- , dnibSourceDestCheck :: !Bool --- -- ^ Indicates whether source/destination checking is enabled. --- , dnibGroupSet :: !GroupItemType --- -- ^ The security groups associated with the network interface. --- , dnibAttachment :: !NetworkInterfaceAttachmentType --- -- ^ The attachment (if any) of the network interface. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeNetworkInterfaceAttributeResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your network interfaces. --- -- --- -- - --- -- data NetworkInterfaceFilter --- -- , dnjAddresses :: Members addressesType --- -- -- ^ The private IP addresses associated with the network interface. --- -- , dnjAssociation :: Members associationType --- -- -- ^ The association ID returned when the network interface was --- -- -- associated with an IP address. --- -- , dnjAttachment :: Members attachmentType --- -- -- ^ The ID of the interface attachment. --- -- , dnjAvailability-zone :: !Text --- -- -- ^ The Availability Zone of the network interface. --- -- , dnjDescription :: !Text --- -- -- ^ The description of the network interface. --- -- , dnjGroup-id :: !Text --- -- -- ^ The ID of a security group associated with the network interface. --- -- , dnjGroup-name :: !Text --- -- -- ^ The name of a security group associated with the network --- -- -- interface. --- -- , dnjMac-address :: !Text --- -- -- ^ The MAC address of the network interface. --- -- , dnjNetwork-interface-id :: !Text --- -- -- ^ The ID of the network interface. --- -- , dnjOwner-id :: !Text --- -- -- ^ The AWS account ID of the network interface owner. --- -- , dnjPrivate-ip-address :: !Text --- -- -- ^ The private IP address or addresses of the network interface. --- -- , dnjPrivate-dns-name :: !Text --- -- -- ^ The private DNS name of the network interface. --- -- , dnjRequester-id :: !Text --- -- -- ^ The ID of the entity that launched the instance on your behalf --- -- -- (for example, AWS Management Console, Auto Scaling, and so on). --- -- , dnjRequester-managed :: !Bool --- -- -- ^ Indicates whether the network interface is being managed by an --- -- -- AWS service (for example, AWS Management Console, Auto Scaling, --- -- -- and so on). --- -- , dnjSource-dest-check :: !Bool --- -- -- ^ Indicates whether the network interface performs --- -- -- source/destination checking. A value of true means checking is --- -- -- enabled, and false means checking is disabled. The value must be --- -- -- false for the network interface to perform Network Address --- -- -- Translation (NAT) in your VPC. --- -- , dnjStatus :: !Text --- -- -- ^ The status of the network interface. If the network interface is --- -- -- not attached to an instance, the status shows available; if a --- -- -- network interface is attached to an instance the status shows --- -- -- in-use. --- -- , dnjSubnet-id :: !Text --- -- -- ^ The ID of the subnet for the network interface. --- -- , dnjTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dnjTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dnjTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dnjKey :: !Text --- -- -- ^ The ID of the VPC for the network interface. --- -- , dnjVpc-id :: !Text --- -- -- ^ - --- data DescribeNetworkInterfaces = DescribeNetworkInterfaces --- { dnjNetworkInterfaceId :: Members Text --- -- ^ One or more network interface IDs. --- , dnjFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeNetworkInterfaces - --- instance AWSRequest EC2 DescribeNetworkInterfaces DescribeNetworkInterfacesResponse where --- request = query4 ec2 GET "DescribeNetworkInterfaces" - --- data DescribeNetworkInterfacesResponse = DescribeNetworkInterfacesResponse --- { dnjRequestId :: !Text --- -- ^ The ID of the request. --- , dnjNetworkInterfaceSet :: !NetworkInterfaceType --- -- ^ Information about the network interfaces, each one wrapped in an --- -- item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeNetworkInterfacesResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your placement groups. For more information about --- -- placement groups and cluster instances, see Cluster Instances in the Amazon --- -- Elastic Compute Cloud User Guide. --- -- --- -- - --- -- data PlacementGroupFilter --- -- , dphGroup-name :: !Text --- -- -- ^ The name of the placement group. --- -- , dphState :: !Text --- -- -- ^ The state of the placement group. --- -- , dphStrategy :: !Text --- -- -- ^ The strategy of the placement group. - - --- data DescribePlacementGroups = DescribePlacementGroups --- { dphGroupName :: Members Text --- -- ^ One or more placement group names. --- , dphFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribePlacementGroups - --- instance AWSRequest EC2 DescribePlacementGroups DescribePlacementGroupsResponse where --- request = query4 ec2 GET "DescribePlacementGroups" - --- data DescribePlacementGroupsResponse = DescribePlacementGroupsResponse --- { dphRequestId :: !Text --- -- ^ The ID of the request. --- , dphPlacementGroupSet :: !PlacementGroupInfoType --- -- ^ A list of placement groups, each one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribePlacementGroupsResponse where --- xmlPickler = ec2XML - --- -- data RegionFilter --- -- , drEndpoint :: !Text --- -- -- ^ The endpoint of the region (for example, --- -- -- ec2.us-east-1.amazonaws.com). --- -- , drRegion-name :: !Text --- -- -- ^ The name of the region. - --- | Describes one or more regions that are currently available to you.For a --- list of the regions supported by Amazon EC2, see Regions and Endpoints. --- --- -data DescribeRegions = DescribeRegions - { drRegionName :: [Region] - -- ^ One or more region names. - , drFilter :: [Filter] - -- ^ The name of a filter. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeRegions - -instance Rq DescribeRegions where - type Er DescribeRegions = EC2ErrorResponse - type Rs DescribeRegions = DescribeRegionsResponse - request = query4 ec2 GET "DescribeRegions" - -data DescribeRegionsResponse = DescribeRegionsResponse - { drrRequestId :: !Text - -- ^ The ID of the request. - , drrRegionInfo :: [RegionItemType] - -- ^ A list of regions, each one wrapped in an item element. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeRegionsResponse where - xmlPickler = ec2XML - --- -- | Describes one or more of the Reserved Instances that you purchased. --- -- --- -- - --- -- data ReservedInstanceFilter --- -- , driAvailability-zone :: !Text --- -- -- ^ The Availability Zone where the Reserved Instance can be used. --- -- , driDuration :: !Integer --- -- -- ^ The duration of the Reserved Instance (one year or three years), --- -- -- in seconds. --- -- , driFixed-price :: !Double --- -- -- ^ The purchase price of the Reserved Instance (for example, 9800.0) --- -- , driInstance-type :: !Text --- -- -- ^ The instance type on which the Reserved Instance can be used. --- -- , driProduct-description :: !Text --- -- -- ^ The product description of the Reserved Instance. --- -- , driReserved-instances-id :: !Text --- -- -- ^ The ID of the Reserved Instance. --- -- , driStart :: !UTCTime --- -- -- ^ The time at which the Reserved Instance purchase request was --- -- -- placed (for example, 2010-08-07T11:54:42.000Z). --- -- , driState :: !Text --- -- -- ^ The state of the Reserved Instance. --- -- , driTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , driTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , driTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , driKey :: !Double --- -- -- ^ The usage price of the Reserved Instance, per hour (for example, --- -- -- 0.84) --- -- , driUsage-price :: !Text --- -- -- ^ - --- data DescribeReservedInstances = DescribeReservedInstances --- { driReservedInstancesId :: Members Text --- -- ^ One or more Reserved Instance IDs. --- , driOfferingType :: Maybe Text --- -- ^ The Reserved Instance offering type. --- , driFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeReservedInstances - --- instance AWSRequest EC2 DescribeReservedInstances DescribeReservedInstancesResponse where --- request = query4 ec2 GET "DescribeReservedInstances" - --- data DescribeReservedInstancesResponse = DescribeReservedInstancesResponse --- { driRequestId :: !Text --- -- ^ The ID of the request. --- , driReservedInstancesSet :: !DescribeReservedInstancesResponseSetItemType --- -- ^ A list of Reserved Instances, each one wrapped in an item --- -- element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeReservedInstancesResponse where --- xmlPickler = ec2XML - --- -- | Describes your account's Reserved Instance listings in the Reserved --- -- Instance Marketplace. This call returns information, such as the ID of the --- -- Reserved Instance to which a listing is associated. --- -- --- -- - --- -- data ReservedInstanceFilter --- -- , drilStatus :: !Text --- -- -- ^ Status of the Reserved Instance listing. --- -- , drilStatus-message :: !Text --- -- -- ^ Reason for the status. --- -- , drilReserved-instances-listing-id :: !Text --- -- -- ^ The ID of the Reserved Instances listing. --- -- , drilReserved-instances-id :: !Text --- -- -- ^ The ID of the Reserved Instances. - --- data DescribeReservedInstancesListings = DescribeReservedInstancesListings --- { drilReservedInstancesListingId :: Members DescribeReservedInstancesListingSetItemType --- -- ^ The information about the Reserved Instance listing wrapped in an --- -- item element. --- , drilReservedInstancesId :: Members DescribeReservedInstancesSetItemType --- -- ^ The set of Reserved Instances IDs which are used to see --- -- associated listings. --- , drilFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeReservedInstancesListings - --- instance AWSRequest EC2 DescribeReservedInstancesListings DescribeReservedInstancesListingsResponse where --- request = query4 ec2 GET "DescribeReservedInstancesListings" - --- data DescribeReservedInstancesListingsResponse = DescribeReservedInstancesListingsResponse --- { drilRequestId :: !Text --- -- ^ The ID of the request. --- , drilReservedInstancesListingsSet :: !DescribeReservedInstancesListingsResponseSetItemType --- -- ^ The Reserved Instance listing information wrapped in an item --- -- element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeReservedInstancesListingsResponse where --- xmlPickler = ec2XML - --- -- | Describes Reserved Instance offerings that are available for purchase. --- -- --- -- - --- data ReservedInstancesOfferingFilter --- -- , drioInstanceTenancy :: Maybe Text --- -- -- ^ The tenancy of the Reserved Instance offering. A Reserved --- -- -- Instance with tenancy of dedicated will run on single-tenant --- -- -- hardware and can only be launched within a VPC. --- -- , drioOfferingType :: Maybe Text --- -- -- ^ The Reserved Instance offering type. --- -- , drioIncludeMarketplace :: Maybe Bool --- -- -- ^ Include Marketplace offerings in the response. --- -- , drioMinDuration :: Maybe Integer --- -- -- ^ Minimum duration (in seconds) to filter when searching for --- -- -- offerings. --- -- , drioMaxDuration :: Maybe Integer --- -- -- ^ Maximum duration (in seconds) to filter when searching for --- -- -- offerings. --- -- , drioMaxInstanceCount :: Maybe Integer --- -- -- ^ Maximum number of instances to filter when searching for --- -- -- offerings. --- -- , drioNextToken :: Maybe Text --- -- -- ^ Token to use when requesting the next paginated set of offerings. --- -- , drioMaxResults :: Maybe Integer --- -- -- ^ Maximum number of offerings to return. --- -- , drioAvailability-zone :: !Text --- -- -- ^ The Availability Zone where the Reserved Instance can be used. --- -- , drioDuration :: !Integer --- -- -- ^ The duration of the Reserved Instance (for example, one year or --- -- -- three years), in seconds. --- -- , drioFixed-price :: !Double --- -- -- ^ The purchase price of the Reserved Instance (for example, 9800.0) --- -- , drioInstance-type :: !Text --- -- -- ^ The Amazon EC2 instance type on which the Reserved Instance can --- -- -- be used. --- -- , drioMarketplace :: !Bool --- -- -- ^ Set to true to show only Reserved Instance Marketplace offerings. --- -- -- When this filter is not used, which is the default behavior, all --- -- -- offerings from AWS and Reserved Instance Marketplace are listed. --- -- , drioProduct-description :: !Text --- -- -- ^ The description of the Reserved Instance. --- -- , drioReserved-instances-offering-id :: !Text --- -- -- ^ The Reserved Instances offering ID. --- -- , drioUsage-price :: !Double --- -- -- ^ The usage price of the Reserved Instance, per hour (for example, --- -- -- 0.84) - --- data DescribeReservedInstancesOfferings = DescribeReservedInstancesOfferings --- { drioReservedInstancesOfferingId :: Members Text --- -- ^ One or more Reserved Instances offering IDs. --- , drioInstanceType :: Maybe Text --- -- ^ The Amazon EC2 instance type on which the Reserved Instance can --- -- be used. See Available Instance Types for more information. --- , drioAvailabilityZone :: Maybe Text --- -- ^ The Availability Zone in which the Reserved Instance can be used. --- , drioProductDescription :: Maybe Text --- -- ^ The Reserved Instance description. Instances that include (Amazon --- -- VPC) in the description are for use with Amazon VPC. --- , drioFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeReservedInstancesOfferings - --- instance AWSRequest EC2 DescribeReservedInstancesOfferings DescribeReservedInstancesOfferingsResponse where --- request = query4 ec2 GET "DescribeReservedInstancesOfferings" - --- data DescribeReservedInstancesOfferingsResponse = DescribeReservedInstancesOfferingsResponse --- { drioRequestId :: !Text --- -- ^ The ID of the request. --- , drioReservedInstancesOfferingsSet :: !DescribeReservedInstancesOfferingsResponseSetItemType --- -- ^ A list of Reserved Instances offerings. Each offering's --- -- information is wrapped in an item element. --- , dripNextToken :: !Text --- -- ^ The next paginated set of results to return. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeReservedInstancesOfferingsResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your route tables.For more information about route --- -- tables, see Route Tables in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- -- data RouteTableFilter --- -- , druAssociation :: Members associationType --- -- -- ^ The ID of an association ID for the route table. --- -- , druRoute-table-id :: !Text --- -- -- ^ The ID of the route table. --- -- , druRoute :: Members routeType --- -- -- ^ The CIDR range specified in a route in the table. --- -- , druTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , druTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , druTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , druKey :: !Text --- -- -- ^ The ID of the VPC for the route table. --- -- , druVpc-id :: !Text --- -- -- ^ - --- data DescribeRouteTables = DescribeRouteTables --- { druRouteTableId :: Members Text --- -- ^ One or more route table IDs. --- , druFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeRouteTables - --- instance AWSRequest EC2 DescribeRouteTables DescribeRouteTablesResponse where --- request = query4 ec2 GET "DescribeRouteTables" - --- data DescribeRouteTablesResponse = DescribeRouteTablesResponse --- { druRequestId :: !Text --- -- ^ The ID of the request. --- , druRouteTableSet :: !RouteTableType --- -- ^ A list of route tables, each one wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeRouteTablesResponse where --- xmlPickler = ec2XML - --- | A security group is for use with instances either in the EC2-Classic --- platform or in a specific VPC. --- --- -data DescribeSecurityGroups = DescribeSecurityGroups - { dshGroupName :: [Text] - -- ^ A list of group names. - , dshGroupId :: [Text] - -- ^ A list of group ids. - , dshFilter :: [Filter] - -- ^ The name of a filter. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeSecurityGroups - -instance Rq DescribeSecurityGroups where - type Er DescribeSecurityGroups = EC2ErrorResponse - type Rs DescribeSecurityGroups = DescribeSecurityGroupsResponse - request = query4 ec2 GET "DescribeSecurityGroups" - -data DescribeSecurityGroupsResponse = DescribeSecurityGroupsResponse - { dshrRequestId :: !Text - -- ^ The ID of the request. - , dshrSecurityGroupInfo :: [SecurityGroupItemType] - -- ^ A list of security groups. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeSecurityGroupsResponse where - xmlPickler = ec2XML - --- -- | Describes an attribute of the specified snapshot. You can specify only one --- -- attribute at a time. --- -- --- -- - --- data DescribeSnapshotAttribute = DescribeSnapshotAttribute --- { dsaSnapshotId :: !Text --- -- ^ The ID of the Amazon EBS snapshot. --- , dsaAttribute :: !Text --- -- ^ The snapshot attribute. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeSnapshotAttribute - --- instance IsXML DescribeSnapshotAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DescribeSnapshotAttribute DescribeSnapshotAttributeResponse where --- request = query4 ec2 GET "DescribeSnapshotAttribute" - --- data DescribeSnapshotAttributeResponse = DescribeSnapshotAttributeResponse --- { dsaRequestId :: !Text --- -- ^ The ID of the request. --- , dsbSnapshotId :: !Text --- -- ^ The ID of the Amazon EBS snapshot. --- , dsbCreateVolumePermission :: !CreateVolumePermissionItemType --- -- ^ A list of permissions for creating volumes from the snapshot. --- -- Each permission is wrapped in an item element. --- , dsbProductCodes :: !ProductCodesSetItemType --- -- ^ A list of product codes. Each product code is wrapped in an item --- -- element type that contains a product code and a type. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeSnapshotAttributeResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of the Amazon EBS snapshots available to you. --- -- Snapshots available to you include public snapshots available for any AWS --- -- account to launch, private snapshots you own, and private snapshots owned --- -- by another AWS account but for which you've been given explicit create --- -- volume permissions. --- -- --- -- - --- -- data SnapshotFilter --- -- , dtOwner-alias :: !Text --- -- -- ^ The AWS account alias (for example, amazon) that owns the --- -- -- snapshot. --- -- , dtOwner-id :: !Text --- -- -- ^ The ID of the AWS account that owns the snapshot. --- -- , dtProgress :: !Text --- -- -- ^ The progress of the snapshot, as a percentage (for example, 80%). --- -- , dtSnapshot-id :: !Text --- -- -- ^ The snapshot ID. --- -- , dtStart-time :: !UTCTime --- -- -- ^ The time stamp when the snapshot was initiated. --- -- , dtStatus :: !Text --- -- -- ^ The status of the snapshot. --- -- , dtTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dtTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dtTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dtKey :: !Text --- -- -- ^ The ID of the volume the snapshot is for. --- -- , dtVolume-id :: !Text --- -- -- ^ The size of the volume, in GiB (for example, 20). --- -- , dtVolume-size :: !Text --- -- -- ^ - - --- data DescribeSnapshots = DescribeSnapshots --- { dtSnapshotId :: Members Text --- -- ^ One or more snapshot IDs. --- , dtOwner :: Members Text --- -- ^ Returns the snapshots owned by the specified owner. Multiple --- -- owners can be specified. --- , dtRestorableBy :: Members Text --- -- ^ One or more AWS accounts IDs that can create volumes from the --- -- snapshot. --- , dtFilter :: Members Text --- -- ^ The name of a filter. --- , dtDescription :: !Text --- -- ^ A description of the snapshot. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeSnapshots - --- instance AWSRequest EC2 DescribeSnapshots DescribeSnapshotsResponse where --- request = query4 ec2 GET "DescribeSnapshots" - --- data DescribeSnapshotsResponse = DescribeSnapshotsResponse --- { dyRequestId :: !Text --- -- ^ The ID of the request. --- , dySnapshotSet :: !DescribeSnapshotsSetItemResponseType --- -- ^ A list of snapshots. Each snapshot is wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeSnapshotsResponse where --- xmlPickler = ec2XML - --- -- | Describes the datafeed for Spot Instances. For more information about Spot --- -- Instances, see Spot Instances in the Amazon Elastic Compute Cloud User --- -- Guide. --- -- --- -- - --- data DescribeSpotDatafeedSubscription = DescribeSpotDatafeedSubscription --- deriving (Eq, Read, Show, Generic) - --- instance IsQuery DescribeSpotDatafeedSubscription - --- instance IsXML DescribeSpotDatafeedSubscription where --- xmlPickler = xpEmpty $ Just ec2NS - --- instance AWSRequest EC2 DescribeSpotDatafeedSubscription DescribeSpotDatafeedSubscriptionResponse where --- request = query4 ec2 GET "DescribeSpotDatafeedSubscription" - --- data DescribeSpotDatafeedSubscriptionResponse = DescribeSpotDatafeedSubscriptionResponse --- { dsdtRequestId :: !Text --- -- ^ The ID of the request. --- , dsdtSpotDatafeedSubscription :: !SpotDatafeedSubscriptionType --- -- ^ The Spot Instance datafeed subscription. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeSpotDatafeedSubscriptionResponse where --- xmlPickler = ec2XML - --- -- | Describes the Spot Instance requests that belong to your account. Spot --- -- Instances are instances that Amazon EC2 starts on your behalf when the --- -- maximum price that you specify exceeds the current Spot Price. Amazon EC2 --- -- periodically sets the Spot Price based on available Spot Instance capacity --- -- and current Spot Instance requests. --- -- --- -- - --- -- data SpotInstanceFilter --- -- , dsirAvailability-zone-group :: !Text --- -- -- ^ The Availability Zone group. If you specify the same Availability --- -- -- Zone group for all Spot Instance requests, all Spot Instances are --- -- -- launched in the same Availability Zone. --- -- , dsirCreate-time :: !Text --- -- -- ^ The time stamp when the Spot Instance request was created. --- -- , dsirFault-code :: !Text --- -- -- ^ The fault code related to the request. --- -- , dsirFault-message :: !Text --- -- -- ^ The fault message related to the request. --- -- , dsirInstance-id :: !Text --- -- -- ^ The ID of the instance that fulfilled the request. --- -- , dsirLaunch-group :: !Text --- -- -- ^ The Spot Instance launch group. Launch groups are Spot Instances --- -- -- that launch together and terminate together. --- -- , dsirLaunch :: Members launchType --- -- -- ^ Whether the Amazon EBS volume is deleted on instance termination. --- -- , dsirProduct-description :: !Text --- -- -- ^ The product description associated with the instance. --- -- , dsirSpot-instance-request-id :: !Text --- -- -- ^ The Spot Instance request ID. --- -- , dsirSpot-price :: !Text --- -- -- ^ The maximum hourly price for any Spot Instance launched to --- -- -- fulfill the request. --- -- , dsirState :: !Text --- -- -- ^ The state of the Spot Instance request. Spot bid status --- -- -- information can help you track your Amazon EC2 Spot Instance --- -- -- requests. For information, see Tracking Spot Requests with Bid --- -- -- Status Codes in the Amazon Elastic Compute Cloud User Guide. --- -- , dsirStatus-code :: !Text --- -- -- ^ The short code describing the most recent evaluation of your Spot --- -- -- Instance request. --- -- , dsirStatus-message :: !Text --- -- -- ^ The message explaining the status of the Spot Instance request. --- -- , dsirTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dsirTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dsirTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dsirKey :: !Text --- -- -- ^ The type of Spot Instance request. --- -- , dsirType :: !Text --- -- -- ^ The Availability Zone in which the bid is launched. --- -- , dsirLaunched-availability-zone :: !UTCTime --- -- -- ^ The start date of the request. --- -- , dsirValid-from :: !UTCTime --- -- -- ^ The end date of the request. --- -- , dsirValid-until :: !Text --- -- -- ^ - --- data DescribeSpotInstanceRequests = DescribeSpotInstanceRequests --- { dsirSpotInstanceRequestId :: Members Text --- -- ^ One or more Spot Instance request IDs. --- , dsirFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeSpotInstanceRequests - --- instance AWSRequest EC2 DescribeSpotInstanceRequests DescribeSpotInstanceRequestsResponse where --- request = query4 ec2 GET "DescribeSpotInstanceRequests" - --- data DescribeSpotInstanceRequestsResponse = DescribeSpotInstanceRequestsResponse --- { dsirRequestId :: !Text --- -- ^ The ID of the request. --- , dsirSpotInstanceRequestSet :: !SpotInstanceRequestSetItemType --- -- ^ A list of Spot Instance requests. Each request is wrapped in an --- -- item element. --- , dsirNetworkInterfaceSet :: !InstanceNetworkInterfaceSetItemRequestType --- -- ^ Information about the network interface. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeSpotInstanceRequestsResponse where --- xmlPickler = ec2XML - --- -- | Describes the Spot Price history. --- -- --- -- - --- -- data SpotPriceFilter --- -- , dsphInstance-type :: !Text --- -- -- ^ The type of instance (for example, m1.small). --- -- , dsphProduct-description :: !Text --- -- -- ^ The product description for the Spot Price. --- -- , dsphSpot-price :: !Text --- -- -- ^ The Spot Price. The value must match exactly (or use wildcards; --- -- -- greater than or less than comparison is not supported). --- -- , dsphAvailability-zone :: !Text --- -- -- ^ The Availability Zone for which prices should be returned. --- -- , dsphTimestamp :: !UTCTime --- -- -- ^ The timestamp of the Spot Price history (for example, --- -- -- 2010-08-16T05:06:11.000Z). You can use wildcards (* and ?). --- -- -- Greater than or less than comparison is not supported. - --- data DescribeSpotPriceHistory = DescribeSpotPriceHistory --- { dsphStartTime :: Maybe UTCTime --- -- ^ The start date and time of the Spot Instance price history data. --- , dsphEndTime :: Maybe UTCTime --- -- ^ The end date and time of the Spot Instance price history data. --- , dsphInstanceType :: Members Text --- -- ^ The instance type to return. --- , dsphProductDescription :: Members Text --- -- ^ Filters the results by basic product description. --- , dsphFilter :: Members Text --- -- ^ The name of a filter. --- , dsphAvailabilityZone :: Maybe Text --- -- ^ Filters the results by availability zone. --- , dsphMaxResults :: Maybe Integer --- -- ^ The number of rows to return. --- , dsphNextToken :: Maybe Text --- -- ^ The next set of rows to return. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeSpotPriceHistory - --- instance AWSRequest EC2 DescribeSpotPriceHistory DescribeSpotPriceHistoryResponse where --- request = query4 ec2 GET "DescribeSpotPriceHistory" - --- data DescribeSpotPriceHistoryResponse = DescribeSpotPriceHistoryResponse --- { dsphRequestId :: !Text --- -- ^ The ID of the request. --- , dsphSpotPriceHistorySet :: !SpotPriceHistorySetItemType --- -- ^ A list of historical Spot Prices. Each price is wrapped in an --- -- item element. --- , dspiNextToken :: !Text --- -- ^ The string marking the next set of results returned. Displays --- -- empty if there are no more results to be returned. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeSpotPriceHistoryResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your subnets. --- -- --- -- - --- -- data SubnetFilter --- -- , duAvailability-zone :: !Text --- -- -- ^ The Availability Zone for the subnet. --- -- , duAvailable-ip-address-count :: !Text --- -- -- ^ The number of IP addresses in the subnet that are available. --- -- , duCidr :: !Text --- -- -- ^ The CIDR block of the subnet. The CIDR block you specify must --- -- -- exactly match the subnet's CIDR block for information to be --- -- -- returned for the subnet. --- -- , duDefaultForAz :: !Bool --- -- -- ^ Indicates whether this is the default subnet for the Availability --- -- -- Zone. --- -- , duState :: !Text --- -- -- ^ The state of the subnet. --- -- , duSubnet-id :: !Text --- -- -- ^ The ID of the subnet. --- -- , duTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , duTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , duTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , duKey :: !Text --- -- -- ^ The ID of the VPC for the subnet. --- -- , duVpc-id :: !Text --- -- -- ^ - --- data DescribeSubnets = DescribeSubnets --- { dtSubnetId :: Members Text --- -- ^ One or more subnet IDs. --- , duFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeSubnets - --- instance AWSRequest EC2 DescribeSubnets DescribeSubnetsResponse where --- request = query4 ec2 GET "DescribeSubnets" - --- data DescribeSubnetsResponse = DescribeSubnetsResponse --- { dzRequestId :: !Text --- -- ^ The ID of the request. --- , dzSubnetSet :: !SubnetType --- -- ^ A list of subnets. Each subnet is wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeSubnetsResponse where --- xmlPickler = ec2XML - --- | Describes one or more of the tags for your EC2 resources. --- --- - -data DescribeTags = DescribeTags - { dtagsFilter :: [TagFilter] - -- ^ The name of a filter. - } deriving (Eq, Show, Generic) - -instance IsQuery DescribeTags - -instance Rq DescribeTags where - type Er DescribeTags = EC2ErrorResponse - type Rs DescribeTags = DescribeTagsResponse - request = query4 ec2 GET "DescribeTags" - -data DescribeTagsResponse = DescribeTagsResponse - { dtagsrRequestId :: !Text - -- ^ The ID of the request. - , dtagsrTagSet :: [TagSetItemType] - -- ^ A list of tags. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeTagsResponse where - xmlPickler = ec2XML - --- -- | Describes the specified attribute of the specified volume. You can specify --- -- only one attribute at a time. --- -- --- -- - --- data DescribeVolumeAttribute = DescribeVolumeAttribute --- { dvaVolumeId :: !Text --- -- ^ The ID of the volume. --- , dvaAttribute :: !Text --- -- ^ The instance attribute. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeVolumeAttribute - --- instance IsXML DescribeVolumeAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DescribeVolumeAttribute DescribeVolumeAttributeResponse where --- request = query4 ec2 GET "DescribeVolumeAttribute" - --- data DescribeVolumeAttributeResponse = DescribeVolumeAttributeResponse --- { dvaRequestId :: !Text --- -- ^ The ID of the request. --- , dvbVolumeId :: !Text --- -- ^ The ID of the volume. --- , dvbAutoEnableIO :: Maybe Bool --- -- ^ The state of autoEnableIO attribute. --- , dvbProductCodes :: !ProductCodesSetItemType --- -- ^ A list of product codes. Each product code is wrapped in an item --- -- element that contains a product code and a type. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeVolumeAttributeResponse where --- xmlPickler = ec2XML - --- -- | Describes the specified Amazon EBS volumes.For more information about --- -- Amazon EBS, see Amazon Elastic Block Store in the Amazon Elastic Compute --- -- Cloud User Guide. --- -- --- -- - --- -- data VolumeFilter --- -- , dwAttachment :: Members AttachmentType --- -- -- ^ The time stamp when the attachment initiated. --- -- , dwAvailability-zone :: !Text --- -- -- ^ The Availability Zone in which the volume was created. --- -- , dwCreate-time :: !UTCTime --- -- -- ^ The time stamp when the volume was created. --- -- , dwSize :: !Text --- -- -- ^ The size of the volume, in GiB (for example, 20). --- -- , dwSnapshot-id :: !Text --- -- -- ^ The snapshot from which the volume was created. --- -- , dwStatus :: !Text --- -- -- ^ The status of the volume. --- -- , dwTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dwTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dwTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dwKey :: !Text --- -- -- ^ The volume ID. --- -- , dwVolume-id :: !Text --- -- -- ^ The Amazon EBS volume type. If the volume is an io1 volume, the --- -- -- response includes the IOPS as well. --- -- , dwVolume-type :: !Text --- -- -- ^ - --- data DescribeVolumes = DescribeVolumes --- { dwVolumeId :: Members Text --- -- ^ One or more volume IDs. --- , dwFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeVolumes - --- instance AWSRequest EC2 DescribeVolumes DescribeVolumesResponse where --- request = query4 ec2 GET "DescribeVolumes" - --- data DescribeVolumesResponse = DescribeVolumesResponse --- { ebRequestId :: !Text --- -- ^ The ID of the request. --- , ebVolumeSet :: !DescribeVolumesSetItemResponseType --- -- ^ A list of volumes. Each volume is wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeVolumesResponse where --- xmlPickler = ec2XML - --- -- | Describes the status of the specified volumes. Volume status provides the --- -- result of the checks performed on your volumes to determine events that can --- -- impair the performance of your volumes. --- -- --- -- - --- -- data VolumeFilter --- -- , dvsAvailability-zone :: !Text --- -- -- ^ The Availability Zone of the instance. --- -- , dvsVolume-status :: Members volume-statusType --- -- -- ^ The status of the volume. --- -- , dvsEvent :: Members eventType --- -- -- ^ A description of the event. --- -- , dvsAction :: Members actionType - --- data DescribeVolumeStatus = DescribeVolumeStatus --- { dvsVolumeId :: Members Text --- -- ^ One or more volume IDs. --- , dvsFilter :: Members Text --- -- ^ The name of a filter. --- , dvsMaxResults :: Maybe Integer --- -- ^ The maximum number of paginated volume items per response. --- , dvsNextToken :: Maybe Text --- -- ^ A string specifying the next paginated set of results to return --- -- using the pagination token returned by a previous call to this --- -- API. --- -- ^ The action code for the event, for example, enable-volume-io --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeVolumeStatus - --- instance AWSRequest EC2 DescribeVolumeStatus DescribeVolumeStatusResponse where --- request = query4 ec2 GET "DescribeVolumeStatus" - --- data DescribeVolumeStatusResponse = DescribeVolumeStatusResponse --- { dvsRequestId :: !Text --- -- ^ The ID of the request. --- , dvsVolumeStatusSet :: !VolumeStatusItemType --- -- ^ A list of volumes. Each volume is wrapped in an item element. --- , dvtNextToken :: !Text --- -- ^ A string specifying the next paginated set of results to return. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeVolumeStatusResponse where --- xmlPickler = ec2XML - --- -- | Describes the specified attribute of the specified VPC. You can specify --- -- only one attribute at a time. --- -- --- -- - --- data DescribeVpcAttribute = DescribeVpcAttribute --- { dvaVpcId :: !Text --- -- ^ The ID of the VPC. --- , dvbAttribute :: !Text --- -- ^ The VPC attribute. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeVpcAttribute - --- instance IsXML DescribeVpcAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DescribeVpcAttribute DescribeVpcAttributeResponse where --- request = query4 ec2 GET "DescribeVpcAttribute" - --- data DescribeVpcAttributeResponse = DescribeVpcAttributeResponse --- { dvbRequestId :: !Text --- -- ^ The ID of the request. --- , dvbEnableDnsSupport :: !Bool --- -- ^ Indicates whether DNS resolution is enabled for the VPC. If this --- -- attribute is true, the Amazon DNS server resolves DNS hostnames --- -- for your instances to their corresponding IP addresses; --- -- otherwise, it does not. --- , dvbEnableDnsHostnames :: !Bool --- -- ^ Indicates whether the instances launched in the VPC get DNS --- -- hostnames. If this attribute is true, instances in the VPC get --- -- DNS hostnames; otherwise, they do not. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeVpcAttributeResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your VPCs. --- -- --- -- - --- -- data VpcFilter --- -- , dxCidr :: !Text --- -- -- ^ The CIDR block of the VPC. The CIDR block you specify must --- -- -- exactly match the VPC's CIDR block for information to be returned --- -- -- for the VPC. --- -- , dxDhcp-options-id :: !Text --- -- -- ^ The ID of a set of DHCP options. --- -- , dxIsDefault :: !Bool --- -- -- ^ Indicates whether the VPC is the default VPC. --- -- , dxState :: !Text --- -- -- ^ The state of the VPC. --- -- , dxTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dxTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dxTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dxKey :: !Text --- -- -- ^ The ID of the VPC. --- -- , dxVpc-id :: !Text --- -- -- ^ - --- data DescribeVpcs = DescribeVpcs --- { dwVpcId :: Members Text --- -- ^ One or more VPC IDs. --- , dxFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeVpcs - --- instance AWSRequest EC2 DescribeVpcs DescribeVpcsResponse where --- request = query4 ec2 GET "DescribeVpcs" - --- data DescribeVpcsResponse = DescribeVpcsResponse --- { ecRequestId :: !Text --- -- ^ The ID of the request. --- , ecVpcSet :: !VpcType --- -- ^ A list of VPCs. Each VPC is wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeVpcsResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your VPN connections.For more information about --- -- VPN connections, see Adding a Hardware Virtual Private Gateway to Your VPC --- -- in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- -- data VpcConnectionFilter --- -- , dvdCustomer-gateway-configuration :: !Text --- -- -- ^ The configuration information for the customer gateway. --- -- , dvdCustomer-gateway-id :: !Text --- -- -- ^ The ID of a customer gateway associated with the VPN connection. --- -- , dvdState :: !Text --- -- -- ^ The state of the VPN connection. --- -- , dvdOption :: Members optionType --- -- -- ^ Indicates whether the connection has static routes only. Used for --- -- -- devices that do not support Border Gateway Protocol (BGP). --- -- , dvdRoute :: Members routeType --- -- -- ^ The destination CIDR block. This corresponds to the subnet used --- -- -- in a customer data center. --- -- , dvdBgp-asn :: !Integer --- -- -- ^ The BGP Autonomous System Number (ASN) associated with a BGP --- -- -- device. --- -- , dvdTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dvdTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dvdTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dvdKey :: !Text --- -- -- ^ The type of VPN connection. Currently the only supported type is --- -- -- ipsec.1. --- -- , dvdType :: !Text --- -- -- ^ The ID of the VPN connection. --- -- , dvdVpn-connection-id :: !Text --- -- -- ^ The ID of a virtual private gateway associated with the VPN --- -- -- connection. --- -- , dvdVpn-gateway-id :: !Text --- -- -- ^ - --- data DescribeVpnConnections = DescribeVpnConnections --- { dvdVpnConnectionId :: Members Text --- -- ^ One or more VPN connection IDs. --- , dvdFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeVpnConnections - --- instance AWSRequest EC2 DescribeVpnConnections DescribeVpnConnectionsResponse where --- request = query4 ec2 GET "DescribeVpnConnections" - --- data DescribeVpnConnectionsResponse = DescribeVpnConnectionsResponse --- { dvdRequestId :: !Text --- -- ^ The ID of the request. --- , dvdVpnConnectionSet :: !VpnConnectionType --- -- ^ A list of VPN connections. Each VPN connection is wrapped in an --- -- item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeVpnConnectionsResponse where --- xmlPickler = ec2XML - --- -- | Describes one or more of your virtual private gateways. For more --- -- information about virtual private gateways, see Adding an IPsec Hardware --- -- VPN to Your VPC in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- -- data VpnGatewayFilter --- -- , dvhAttachment :: Members AttachmentType --- -- -- ^ The current state of the attachment between the gateway and the VPC. --- -- , dvhAvailability-zone :: !Text --- -- -- ^ The Availability Zone for the virtual private gateway. --- -- , dvhState :: !Text --- -- -- ^ The state of the virtual private gateway. --- -- , dvhTag-key :: !Text --- -- -- ^ The key of a tag assigned to the resource. This filter is --- -- -- independent of the tag-value filter. For example, if you use both --- -- -- the filter "tag-key=Purpose" and the filter "tag-value=X", you --- -- -- get any resources assigned both the tag key Purpose (regardless --- -- -- of what the tag's value is), and the tag value X (regardless of --- -- -- what the tag's key is). If you want to list only resources where --- -- -- Purpose is X, see the tag:key filter. --- -- , dvhTag-value :: !Text --- -- -- ^ The value of a tag assigned to the resource. This filter is --- -- -- independent of the tag-key filter. --- -- , dvhTag: :: !Text --- -- -- ^ Filters the response based on a specific tag/value combination. --- -- , dvhKey :: !Text --- -- -- ^ The type of virtual private gateway. Currently the only supported --- -- -- type is ipsec.1. --- -- , dvhType :: !Text --- -- -- ^ The ID of the virtual private gateway. --- -- , dvhVpn-gateway-id :: !Text --- -- -- ^ - --- data DescribeVpnGateways = DescribeVpnGateways --- { dvhVpnGatewayId :: Members Text --- -- ^ One or more virtual private gateway IDs. --- , dvhFilter :: Members Text --- -- ^ The name of a filter. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DescribeVpnGateways - --- instance AWSRequest EC2 DescribeVpnGateways DescribeVpnGatewaysResponse where --- request = query4 ec2 GET "DescribeVpnGateways" - --- data DescribeVpnGatewaysResponse = DescribeVpnGatewaysResponse --- { dvhRequestId :: !Text --- -- ^ The ID of the request. --- , dvhVpnGatewaySet :: !VpnGatewayType --- -- ^ A list of virtual private gateways. Each virtual private gateway --- -- is wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML DescribeVpnGatewaysResponse where --- xmlPickler = ec2XML - --- -- | Detaches an Internet gateway from a VPC, disabling connectivity between the --- -- Internet and the VPC. The VPC must not contain any running instances with --- -- Elastic IP addresses. --- -- --- -- - --- data DetachInternetGateway = DetachInternetGateway --- { diiInternetGatewayId :: !Text --- -- ^ The ID of the Internet gateway. --- , diiVpcId :: !Text --- -- ^ The ID of the VPC. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DetachInternetGateway - --- instance AWSRequest EC2 DetachInternetGateway DetachInternetGatewayResponse where --- request = query4 ec2 GET "DetachInternetGateway" - --- data DetachInternetGatewayResponse = DetachInternetGatewayResponse --- { diiRequestId :: !Text --- -- ^ The ID of the request. --- , diiReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DetachInternetGatewayResponse where --- xmlPickler = ec2XML - --- -- | Detaches a network interface from an instance. --- -- --- -- - --- data DetachNetworkInterface = DetachNetworkInterface --- { dniAttachmentId :: !Text --- -- ^ The ID of the attachment. --- , dniForce :: Maybe Bool --- -- ^ Set to true to force a detachment. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DetachNetworkInterface - --- instance IsXML DetachNetworkInterface where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DetachNetworkInterface DetachNetworkInterfaceResponse where --- request = query4 ec2 GET "DetachNetworkInterface" - --- data DetachNetworkInterfaceResponse = DetachNetworkInterfaceResponse --- { dnkRequestId :: !Text --- -- ^ The ID of the request. --- , dnkReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DetachNetworkInterfaceResponse where --- xmlPickler = ec2XML - --- -- | Detaches an Amazon EBS volume from an instance. Make sure to unmount any --- -- file systems on the device within your operating system before detaching --- -- the volume. Failure to do so will result in the volume being stuck in --- -- "busy" state while detaching. For more information about Amazon EBS, see --- -- Amazon Elastic Block Store in the Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data DetachVolume = DetachVolume --- { dxVolumeId :: !Text --- -- ^ The ID of the volume. --- , dxInstanceId :: Maybe Text --- -- ^ The ID of the instance. --- , dxDevice :: Maybe Text --- -- ^ The device name. --- , dxForce :: Maybe Bool --- -- ^ Forces detachment if the previous detachment attempt did not --- -- occur cleanly (logging into an instance, unmounting the volume, --- -- and detaching normally). This option can lead to data loss or a --- -- corrupted file system. Use this option only as a last resort to --- -- detach a volume from a failed instance. The instance won't have --- -- an opportunity to flush file system caches or file system --- -- metadata. If you use this option, you must perform file system --- -- check and repair procedures. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DetachVolume - --- instance IsXML DetachVolume where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DetachVolume DetachVolumeResponse where --- request = query4 ec2 GET "DetachVolume" - --- data DetachVolumeResponse = DetachVolumeResponse --- { edRequestId :: !Text --- -- ^ The ID of the request. --- , edVolumeId :: !Text --- -- ^ The ID of the volume. --- , edInstanceId :: !Text --- -- ^ The ID of the instance. --- , edDevice :: !Text --- -- ^ The device name exposed to the instance. --- , edStatus :: !Text --- -- ^ The attachment state. --- , edAttachTime :: !UTCTime --- -- ^ The time stamp when the attachment initiated. --- } deriving (Eq, Show, Generic) - --- instance IsXML DetachVolumeResponse where --- xmlPickler = ec2XML - --- -- | Detaches a virtual private gateway from a VPC. You do this if you're --- -- planning to turn off the VPC and not use it anymore. You can confirm a --- -- virtual private gateway has been completely detached from a VPC by --- -- describing the virtual private gateway (any attachments to the virtual --- -- private gateway are also described). --- -- --- -- You must wait for the attachment's state to switch to detached before you --- -- can delete the VPC or attach a different VPC to the virtual private gateway. --- -- --- -- - --- data DetachVpnGateway = DetachVpnGateway --- { dviVpnGatewayId :: !Text --- -- ^ The ID of the virtual private gateway. --- , dviVpcId :: !Text --- -- ^ The ID of the VPC. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DetachVpnGateway - --- instance AWSRequest EC2 DetachVpnGateway DetachVpnGatewayResponse where --- request = query4 ec2 GET "DetachVpnGateway" - --- data DetachVpnGatewayResponse = DetachVpnGatewayResponse --- { dviRequestId :: !Text --- -- ^ The ID of the request. --- , dviReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DetachVpnGatewayResponse where --- xmlPickler = ec2XML - --- -- | Disables a virtual private gateway (VGW) from propagating routes to the --- -- routing tables of a VPC. --- -- --- -- - --- data DisableVgwRoutePropagation = DisableVgwRoutePropagation --- { dvrpRouteTableId :: !Text --- -- ^ The ID of the routing table. --- , dvrpGatewayId :: !Text --- -- ^ The ID of the virtual private gateway. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DisableVgwRoutePropagation - --- instance AWSRequest EC2 DisableVgwRoutePropagation DisableVgwRoutePropagationResponse where --- request = query4 ec2 GET "DisableVgwRoutePropagation" - --- data DisableVgwRoutePropagationResponse = DisableVgwRoutePropagationResponse --- { dvrpRequestId :: !Text --- -- ^ The ID of the request. --- , dvrpReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DisableVgwRoutePropagationResponse where --- xmlPickler = ec2XML - --- -- | Disassociates an Elastic IP address from the instance or network interface --- -- it's associated with. An Elastic IP address is for use in either the --- -- EC2-Classic platform or in a VPC. --- -- --- -- - --- data DisassociateAddress = DisassociateAddress --- { dbPublicIp :: !Text --- -- ^ [EC2-Classic] The Elastic IP address. --- , dbAssociationId :: !Text --- -- ^ [EC2-VPC] The association ID. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DisassociateAddress - --- instance AWSRequest EC2 DisassociateAddress DisassociateAddressResponse where --- request = query4 ec2 GET "DisassociateAddress" - --- data DisassociateAddressResponse = DisassociateAddressResponse --- { dbRequestId :: !Text --- -- ^ The ID of the request. --- , dbReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DisassociateAddressResponse where --- xmlPickler = ec2XML - --- -- | Disassociates a subnet from a route table.After you perform this action, --- -- the subnet no longer uses the routes in the route table. Instead, it uses --- -- the routes in the VPC's main route table. For more information about route --- -- tables, see Route Tables in the Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data DisassociateRouteTable = DisassociateRouteTable --- { drtAssociationId :: !Text --- -- ^ The association ID representing the current association between --- -- the route table and subnet. --- } deriving (Eq, Show, Generic) - --- instance IsQuery DisassociateRouteTable - --- instance IsXML DisassociateRouteTable where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 DisassociateRouteTable DisassociateRouteTableResponse where --- request = query4 ec2 GET "DisassociateRouteTable" - --- data DisassociateRouteTableResponse = DisassociateRouteTableResponse --- { drvRequestId :: !Text --- -- ^ The ID of the request. --- , drvReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML DisassociateRouteTableResponse where --- xmlPickler = ec2XML - --- -- | Enables a virtual private gateway (VGW) to propagate routes to the routing --- -- tables of a VPC. --- -- --- -- - --- data EnableVgwRoutePropagation = EnableVgwRoutePropagation --- { evrpRouteTableId :: !Text --- -- ^ The ID of the routing table. --- , evrpGatewayId :: !Text --- -- ^ The ID of the virtual private gateway. --- } deriving (Eq, Show, Generic) - --- instance IsQuery EnableVgwRoutePropagation - --- instance AWSRequest EC2 EnableVgwRoutePropagation EnableVgwRoutePropagationResponse where --- request = query4 ec2 GET "EnableVgwRoutePropagation" - --- data EnableVgwRoutePropagationResponse = EnableVgwRoutePropagationResponse --- { evrpRequestId :: !Text --- -- ^ The ID of the request. --- , evrpReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML EnableVgwRoutePropagationResponse where --- xmlPickler = ec2XML - --- -- | Enables I/O operations for a volume that had I/O operations disabled --- -- because the data on the volume was potentially inconsistent. --- -- --- -- - --- data EnableVolumeIO = EnableVolumeIO --- { evioVolumeId :: !Text --- -- ^ The ID of the volume. --- } deriving (Eq, Show, Generic) - --- instance IsQuery EnableVolumeIO - --- instance AWSRequest EC2 EnableVolumeIO EnableVolumeIOResponse where --- request = query4 ec2 GET "EnableVolumeIO" - --- data EnableVolumeIOResponse = EnableVolumeIOResponse --- { evioRequestId :: !Text --- -- ^ The ID of the request. --- , evioReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML EnableVolumeIOResponse where --- xmlPickler = ec2XML - --- -- | Gets the console output for the specified instance. Instances do not have a --- -- physical monitor through which you can view their console output. They also --- -- lack physical controls that allow you to power up, reboot, or shut them --- -- down. To allow these actions, we provide them through the Amazon EC2 API --- -- and command line interface.Instance console output is buffered and posted --- -- shortly after instance boot, reboot, and termination. Amazon EC2 preserves --- -- the most recent 64 KB output which will be available for at least one hour --- -- after the most recent post.For Linux/UNIX instances, the instance console --- -- output displays the exact console output that would normally be displayed --- -- on a physical monitor attached to a machine. This output is buffered --- -- because the instance produces it and then posts it to a store where the --- -- instance's owner can retrieve it.For Windows instances, the instance --- -- console output displays the last three system event log errors. --- -- --- -- - --- data GetConsoleOutput = GetConsoleOutput --- { gcoInstanceId :: !Text --- -- ^ The ID of the instance. --- } deriving (Eq, Show, Generic) - --- instance IsQuery GetConsoleOutput - --- instance AWSRequest EC2 GetConsoleOutput GetConsoleOutputResponse where --- request = query4 ec2 GET "GetConsoleOutput" - --- data GetConsoleOutputResponse = GetConsoleOutputResponse --- { gcoRequestId :: !Text --- -- ^ The ID of the request. --- , gcpInstanceId :: !Text --- -- ^ The ID of the instance. --- , gcpTimestamp :: !UTCTime --- -- ^ The time the output was last updated. --- , gcpOutput :: !Text --- -- ^ The console output, Base64 encoded. --- } deriving (Eq, Show, Generic) - --- instance IsXML GetConsoleOutputResponse where --- xmlPickler = ec2XML - --- -- | Retrieves the encrypted administrator password for an instance running --- -- Windows.The Windows password is only generated the first time an AMI is --- -- launched. It is not generated for rebundled AMIs or after the password is --- -- changed on an instance.The password is encrypted using the key pair that --- -- you specified when you launched the instance. You must provide the --- -- corresponding key pair file.Password generation and encryption takes a few --- -- moments. Please wait up to 15 minutes after launching an instance before --- -- trying to retrieve the generated password. --- -- --- -- - --- data GetPasswordData = GetPasswordData --- { gpdInstanceId :: !Text --- -- ^ The ID of a Windows instance. --- } deriving (Eq, Show, Generic) - --- instance IsQuery GetPasswordData - --- instance AWSRequest EC2 GetPasswordData GetPasswordDataResponse where --- request = query4 ec2 GET "GetPasswordData" - --- data GetPasswordDataResponse = GetPasswordDataResponse --- { gpdRequestId :: !Text --- -- ^ The ID of the request. --- , gpeInstanceId :: !Text --- -- ^ The ID of the instance. --- , gpeTimestamp :: !UTCTime --- -- ^ The time the data was last updated. --- , gpePasswordData :: !Text --- -- ^ The password of the instance. --- } deriving (Eq, Show, Generic) - --- instance IsXML GetPasswordDataResponse where --- xmlPickler = ec2XML - --- -- | Creates an import instance task using metadata from the specified disk --- -- image. After importing the image, you then upload it using the --- -- ec2-upload-disk-image command in the EC2 command line tools. For more --- -- information, see Using the Command Line Tools to Import Your Virtual --- -- Machine to Amazon EC2 in the Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data ImportInstance = ImportInstance --- { iiDescription :: Maybe Text --- -- ^ A description for the instance being imported. --- , iiLaunchSpecification :: Members LaunchSpecificationType --- -- ^ The architecture of the instance. --- , iiDiskImage :: Members DiskImageType --- -- ^ The file format of the disk image. --- , iiPlatform :: Maybe Text --- -- ^ The instance operating system. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ImportInstance - --- instance IsXML ImportInstance where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ImportInstance ImportInstanceResponse where --- request = query4 ec2 GET "ImportInstance" - --- data ImportInstanceResponse = ImportInstanceResponse --- { iiConversionTask :: !ConversionTaskType --- -- ^ Information about the import instance task. --- } deriving (Eq, Show, Generic) - --- instance IsXML ImportInstanceResponse where --- xmlPickler = ec2XML - --- -- | Imports the public key from an RSA key pair that you created with a --- -- third-party tool. Compare this with CreateKeyPair, in which AWS creates the --- -- key pair and gives the keys to you (AWS keeps a copy of the public key). --- -- With ImportKeyPair, you create the key pair and give AWS just the public --- -- key. The private key is never transferred between you and AWS.You can --- -- easily create an RSA key pair on Windows and Linux using the ssh-keygen --- -- command line tool (provided with the standard OpenSSH installation). --- -- Standard library support for RSA key pair creation is also available in --- -- Java, Ruby, Python, and many other programming languages.Supported --- -- formats:DSA keys are not supported. Make sure your key generator is set up --- -- to create RSA keys.Supported lengths: 1024, 2048, and 4096.Note that you --- -- can have up to five thousand key pairs per region. --- -- --- -- - --- data ImportKeyPair = ImportKeyPair --- { ikpKeyName :: !Text --- -- ^ A unique name for the key pair. --- , ikpPublicKeyMaterial :: !Text --- -- ^ The public key. You must base64 encode the public key material --- -- before sending it to AWS. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ImportKeyPair - --- instance AWSRequest EC2 ImportKeyPair ImportKeyPairResponse where --- request = query4 ec2 GET "ImportKeyPair" - --- data ImportKeyPairResponse = ImportKeyPairResponse --- { ikpRequestId :: !Text --- -- ^ The ID of the request. --- , ikqKeyName :: !Text --- -- ^ The key pair name you provided. --- , ikqKeyFingerprint :: !Text --- -- ^ The MD5 public key fingerprint as specified in section 4 of --- -- RFC4716. --- } deriving (Eq, Show, Generic) - --- instance IsXML ImportKeyPairResponse where --- xmlPickler = ec2XML - --- -- | Creates an import volume task using metadata from the specified disk image. --- -- After importing the image, you then upload it using the --- -- ec2-upload-disk-image command in the EC2 command line tools. For more --- -- information, see Using the Command Line Tools to Import Your Virtual --- -- Machine to Amazon EC2 in the Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data ImportVolume = ImportVolume --- { ivAvailabilityZone :: !Text --- -- ^ The Availability Zone for the resulting Amazon EBS volume. --- , ivImage :: Members ImageType --- -- ^ The file format of the disk image. --- , ivDescription :: Maybe Text --- -- ^ An optional description for the volume being imported. --- , ivVolume :: Members VolumeType --- -- ^ The size, in GB (2^30 bytes), of an Amazon EBS volume to hold the --- -- converted image. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ImportVolume - --- instance IsXML ImportVolume where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ImportVolume ImportVolumeResponse where --- request = query4 ec2 GET "ImportVolume" - --- data ImportVolumeResponse = ImportVolumeResponse --- { ivConversionTask :: !ConversionTaskType --- -- ^ Information about the import volume task. --- } deriving (Eq, Show, Generic) - --- instance IsXML ImportVolumeResponse where --- xmlPickler = ec2XML - --- -- | Modifies the specified attribute of the specified AMI. You can specify only --- -- one attribute at a time. --- -- --- -- - --- data ModifyImageAttribute = ModifyImageAttribute --- { miaImageId :: !Text --- -- ^ The ID of the AMI. --- , miaLaunchPermission :: Members LaunchPermissionType --- -- ^ Adds the specified AWS account ID to the AMI's list of launch --- -- permissions. --- , miaProductCode :: Members Text --- -- ^ Adds the specified product code to the specified instance --- -- store-backed AMI. After you add a product code to an AMI, it --- -- can't be removed. --- , miaDescription :: Members DescriptionType --- -- ^ Changes the AMI's description to the specified value. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ModifyImageAttribute - --- instance IsXML ModifyImageAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ModifyImageAttribute ModifyImageAttributeResponse where --- request = query4 ec2 GET "ModifyImageAttribute" - --- data ModifyImageAttributeResponse = ModifyImageAttributeResponse --- { miaRequestId :: !Text --- -- ^ The ID of the request. --- , miaReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ModifyImageAttributeResponse where --- xmlPickler = ec2XML - --- -- | Modifies the specified attribute of the specified instance. You can specify --- -- only one attribute at a time. --- -- --- -- - --- data ModifyInstanceAttribute = ModifyInstanceAttribute --- { miaInstanceId :: !Text --- -- ^ The ID of the instance. --- , miaInstanceType :: Maybe InstanceType --- -- ^ Changes the instance type to the specified value. See Available --- -- Instance Types for more information. An --- -- InvalidInstanceAttributeValue error will be returned if the --- -- instance type is not valid. --- , miaKernel :: Maybe Text --- -- ^ Changes the instance's kernel to the specified value. --- , miaRamdisk :: Maybe Text --- -- ^ Changes the instance's RAM disk to the specified value. --- , miaUserData :: Maybe Text --- -- ^ Changes the instance's user data to the specified value. --- , miaDisableApiTermination :: Maybe Bool --- -- ^ If the value is true, you can't terminate the instance using the --- -- Amazon EC2 console, CLI, or API; otherwise you can. --- , miaInstanceInitiatedShutdownBehavior :: Maybe Text --- -- ^ Indicates whether an instance stops or terminates when you --- -- initiate shutdown from the instance (using the operating system --- -- command for system shutdown). --- , miaBlockDeviceMapping :: Members InstanceBlockDeviceMappingItemType --- -- ^ Modifies the DeleteOnTermination attribute for volumes that are --- -- currently attached. The volume must be owned by the caller. If no --- -- value is specified for DeleteOnTermination, the default is true --- -- and the volume is deleted when the instance is terminated. --- , miaSourceDestCheck :: Maybe Bool --- -- ^ Indicates whether source/destination checking is enabled. A value --- -- of true means checking is enabled, and false means checking is --- -- disabled. This value must be false for a NAT instance to perform --- -- NAT. --- , miaGroupId :: Members Text --- -- ^ [EC2-VPC] Changes the instance's security group. You must specify --- -- at least one security group, even if it's just the default --- -- security group for the VPC. You must specify the security group --- -- ID, not the security group name. --- , miaEbsOptimized :: Maybe Bool --- -- ^ Indicates whether the instance is optimized for EBS I/O. This --- -- optimization provides dedicated throughput to Amazon EBS and an --- -- optimized configuration stack to provide optimal EBS I/O --- -- performance. This optimization isn't available with all instance --- -- types. Additional usage charges apply when using an EBS Optimized --- -- instance. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ModifyInstanceAttribute - --- instance IsXML ModifyInstanceAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ModifyInstanceAttribute ModifyInstanceAttributeResponse where --- request = query4 ec2 GET "ModifyInstanceAttribute" - --- data ModifyInstanceAttributeResponse = ModifyInstanceAttributeResponse --- { mibRequestId :: !Text --- -- ^ The ID of the request. --- , mibReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ModifyInstanceAttributeResponse where --- xmlPickler = ec2XML - --- -- | Modifies the specified network interface attribute. You can specify only --- -- one attribute at a time. --- -- --- -- - --- data ModifyNetworkInterfaceAttribute = ModifyNetworkInterfaceAttribute --- { mniaNetworkInterfaceId :: !Text --- -- ^ The ID of the network interface. --- , mniaDescription :: Members DescriptionType --- -- ^ A description for the network interface. --- , mniaSecurityGroupId :: Members Text --- -- ^ Changes the security groups that a network interface is in. The --- -- new set of groups you specify replaces the current set. You must --- -- specify at least one group, even if it's just the default --- -- security group in the VPC. You must specify the group ID and not --- -- the group name. --- , mniaSourceDestCheck :: Members SourceDestCheckType --- -- ^ Indicates whether source/destination checking is enabled. A value --- -- of true means checking is enabled, and false means checking is --- -- disabled. This value must be false for a NAT instance to perform --- -- NAT. --- , mniaAttachment :: Members AttachmentType --- -- ^ The ID of the interface attachment. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ModifyNetworkInterfaceAttribute - --- instance IsXML ModifyNetworkInterfaceAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ModifyNetworkInterfaceAttribute ModifyNetworkInterfaceAttributeResponse where --- request = query4 ec2 GET "ModifyNetworkInterfaceAttribute" - --- data ModifyNetworkInterfaceAttributeResponse = ModifyNetworkInterfaceAttributeResponse --- { mniaRequestId :: !Text --- -- ^ The ID of the request. --- , mniaReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ModifyNetworkInterfaceAttributeResponse where --- xmlPickler = ec2XML - --- -- | Adds or remove permission settings for the specified snapshot. --- -- --- -- - --- data ModifySnapshotAttribute = ModifySnapshotAttribute --- { msaSnapshotId :: !Text --- -- ^ The ID of the snapshot. --- , msaCreateVolumePermission :: Members CreateVolumePermissionType --- -- ^ Adds the specified AWS account ID to the volume's list of create --- -- volume permissions. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ModifySnapshotAttribute - --- instance IsXML ModifySnapshotAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ModifySnapshotAttribute ModifySnapshotAttributeResponse where --- request = query4 ec2 GET "ModifySnapshotAttribute" - --- data ModifySnapshotAttributeResponse = ModifySnapshotAttributeResponse --- { msaRequestId :: !Text --- -- ^ The ID of the request. --- , msaReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ModifySnapshotAttributeResponse where --- xmlPickler = ec2XML - --- -- | Modifies a volume attribute.By default, all I/O operations for the volume --- -- are suspended when the data on the volume is determined to be potentially --- -- inconsistent, to prevent undetectable, latent data corruption. The I/O --- -- access to the volume can be resumed by first calling EnableVolumeIO action --- -- to enable I/O access and then checking the data consistency on your --- -- volume.You can change the default behavior to resume I/O operations without --- -- calling EnableVolumeIO action by setting the AutoEnableIO attribute of the --- -- volume to true. We recommend that you change this attribute only for --- -- volumes that are stateless, or disposable, or for boot volumes. --- -- --- -- - --- data ModifyVolumeAttribute = ModifyVolumeAttribute --- { mvaVolumeId :: !Text --- -- ^ The ID of the volume. --- , mvaAutoEnableIO :: Members AutoEnableIOType --- -- ^ Specifies whether the volume should be auto-enabled for I/O --- -- operations. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ModifyVolumeAttribute - --- instance IsXML ModifyVolumeAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ModifyVolumeAttribute ModifyVolumeAttributeResponse where --- request = query4 ec2 GET "ModifyVolumeAttribute" - --- data ModifyVolumeAttributeResponse = ModifyVolumeAttributeResponse --- { mvaRequestId :: !Text --- -- ^ The ID of the request. --- , mvaReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ModifyVolumeAttributeResponse where --- xmlPickler = ec2XML - --- -- | Modifies the specified attribute of the specified VPC. --- -- --- -- - --- data ModifyVpcAttribute = ModifyVpcAttribute --- { mvaVpcId :: !Text --- -- ^ The ID of the VPC. --- , mvaEnableDnsSupport :: Maybe Bool --- -- ^ Specifies whether DNS resolution is supported for the VPC. If --- -- this attribute is true, the Amazon DNS server resolves DNS --- -- hostnames for your instances to their corresponding IP addresses; --- -- otherwise, it does not. --- , mvaEnableDnsHostnames :: Maybe Bool --- -- ^ Specifies whether the instances launched in the VPC get DNS --- -- hostnames. If this attribute is true, instances in the VPC get --- -- DNS hostnames; otherwise, they do not. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ModifyVpcAttribute - --- instance IsXML ModifyVpcAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ModifyVpcAttribute ModifyVpcAttributeResponse where --- request = query4 ec2 GET "ModifyVpcAttribute" - --- data ModifyVpcAttributeResponse = ModifyVpcAttributeResponse --- { mvbRequestId :: !Text --- -- ^ The ID of the request. --- , mvbReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ModifyVpcAttributeResponse where --- xmlPickler = ec2XML - --- -- | Enables monitoring for a running instance. For more information about --- -- monitoring instances, see Monitoring Your Instances and Volumes in the --- -- Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data MonitorInstances = MonitorInstances --- { miInstanceId :: Members Text --- -- ^ One or more instance IDs. --- } deriving (Eq, Show, Generic) - --- instance IsQuery MonitorInstances - --- instance AWSRequest EC2 MonitorInstances MonitorInstancesResponse where --- request = query4 ec2 GET "MonitorInstances" - --- data MonitorInstancesResponse = MonitorInstancesResponse --- { miRequestId :: !Text --- -- ^ The ID of the request. --- , miInstancesSet :: !MonitorInstancesResponseSetItemType --- -- ^ A list of instances. Each instance is wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML MonitorInstancesResponse where --- xmlPickler = ec2XML - --- -- | Purchases a Reserved Instance for use with your account. With Amazon EC2 --- -- Reserved Instances, you obtain a capacity reservation for a certain --- -- instance configuration over a specified period of time. You pay a lower --- -- usage rate than with On-Demand instances for the time that you actually use --- -- the capacity reservation. Starting with the 2011-11-01 API version, AWS --- -- expanded its offering of Reserved Instances to address a range of projected --- -- instance usage. There are three types of Reserved Instances based on --- -- customer utilization levels: Heavy Utilization, Medium Utilization, and --- -- Light Utilization.The Medium Utilization offering type is equivalent to the --- -- Reserved Instance offering available before API version 2011-11-01. If you --- -- are using tools that predate the 2011-11-01 API version, --- -- DescribeReservedInstancesOfferings will only list information about the --- -- Medium Utilization Reserved Instance offering type.For information about --- -- Reserved Instance pricing tiers, go to Understanding Reserved Instance --- -- pricing tiers in the Amazon Elastic Compute Cloud User Guide. For more --- -- information about Reserved Instances, go to Reserved Instances also in the --- -- Amazon Elastic Compute Cloud User Guide.You determine the type of the --- -- Reserved Instances offerings by including the optional offeringType --- -- parameter when calling DescribeReservedInstancesOfferings. After you've --- -- identified the Reserved Instance with the offering type you want, specify --- -- its ReservedInstancesOfferingId when you call --- -- PurchaseReservedInstancesOffering. Starting with the 2012-08-15 API --- -- version, you can also purchase Reserved Instances from the Reserved --- -- Instance Marketplace. The Reserved Instance Marketplace matches sellers who --- -- want to resell Reserved Instance capacity that they no longer need with --- -- buyers who want to purchase additional capacity. Reserved Instances bought --- -- and sold through the Reserved Instance Marketplace work like any other --- -- Reserved Instances.By default, with the 2012-08-15 API version, --- -- DescribeReservedInstancesOfferings returns information about Amazon EC2 --- -- Reserved Instances available directly from AWS, plus instance offerings --- -- available on the Reserved Instance Marketplace. If you are using tools that --- -- predate the 2012-08-15 API version, the DescribeReservedInstancesOfferings --- -- action will only list information about Amazon EC2 Reserved Instances --- -- available directly from AWS.For more information about the Reserved --- -- Instance Marketplace, go to Reserved Instance Marketplace in the Amazon --- -- Elastic Compute Cloud User Guide. You determine the Reserved Instance --- -- Marketplace offerings by specifying true for the optional --- -- includeMarketplace parameter when calling --- -- DescribeReservedInstancesOfferings. After you've identified the Reserved --- -- Instance with the offering type you want, specify its --- -- reservedInstancesOfferingId when you call --- -- PurchaseReservedInstancesOffering. --- -- --- -- - --- data PurchaseReservedInstancesOffering = PurchaseReservedInstancesOffering --- { prioReservedInstancesOfferingId :: !Text --- -- ^ The ID of the Reserved Instance offering you want to purchase. --- , prioInstanceCount :: !Integer --- -- ^ The number of Reserved Instances to purchase. --- , prioLimitPrice :: Maybe ReservedInstanceLimitPriceType --- -- ^ Specified for Reserved Instance Marketplace offerings to limit --- -- the total order and ensure that the Reserved Instances are not --- -- purchased at unexpected prices. --- } deriving (Eq, Show, Generic) - --- instance IsQuery PurchaseReservedInstancesOffering - --- instance AWSRequest EC2 PurchaseReservedInstancesOffering PurchaseReservedInstancesOfferingResponse where --- request = query4 ec2 GET "PurchaseReservedInstancesOffering" - --- data PurchaseReservedInstancesOfferingResponse = PurchaseReservedInstancesOfferingResponse --- { prioRequestId :: !Text --- -- ^ The ID of the request. --- , prioReservedInstancesId :: !Text --- -- ^ The IDs of the purchased Reserved Instances. --- } deriving (Eq, Show, Generic) - --- instance IsXML PurchaseReservedInstancesOfferingResponse where --- xmlPickler = ec2XML - --- -- | Requests a reboot of one or more instances. This operation is asynchronous; --- -- it only queues a request to reboot the specified instance(s). The operation --- -- will succeed if the instances are valid and belong to you. Requests to --- -- reboot terminated instances are ignored. --- -- --- -- - --- data RebootInstances = RebootInstances --- { riInstanceId :: Members Text --- -- ^ One or more instance IDs. --- } deriving (Eq, Show, Generic) - --- instance IsQuery RebootInstances - --- instance AWSRequest EC2 RebootInstances RebootInstancesResponse where --- request = query4 ec2 GET "RebootInstances" - --- data RebootInstancesResponse = RebootInstancesResponse --- { riRequestId :: !Text --- -- ^ The ID of the request. --- , riReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML RebootInstancesResponse where --- xmlPickler = ec2XML - --- -- | Registers an AMI. When you're creating an AMI, this is the final step you --- -- must complete before you can launch an instance from the AMI. For more --- -- information about creating AMIs, see Creating Your Own AMIs in the Amazon --- -- Elastic Compute Cloud User Guide.You can also use the RegisterImage action --- -- to create an EBS-backed AMI from a snapshot of a root device volume. For --- -- more information, see Launching an Instance from a Snapshot in the Amazon --- -- Elastic Compute Cloud User Guide.If needed, you can deregister an AMI at --- -- any time. Any modifications you make to an AMI backed by instance store --- -- invalidates its registration. If you make changes to an image, deregister --- -- the previous image and register the new image. --- -- --- -- - --- data RegisterImage = RegisterImage --- { riImageLocation :: !Text --- -- ^ The full path to your AMI manifest in Amazon S3 storage. --- , riName :: !Text --- -- ^ A name for your AMI. --- , riDescription :: Maybe Text --- -- ^ A description for your AMI. --- , riArchitecture :: Maybe Text --- -- ^ The architecture of the image. --- , riKernelId :: Maybe Text --- -- ^ The ID of the kernel. --- , riRamdiskId :: Maybe Text --- -- ^ The ID of the RAM disk. --- , riVirtualizationType :: Maybe Text --- -- ^ The type of virtualization. --- , riRootDeviceName :: !Text --- -- ^ The name of the root device (for example, /dev/sda1, or xvda). --- , riBlockDeviceMapping :: Members BlockDeviceMappingType --- -- ^ The device name exposed to the instance (for example, /dev/sdh or --- -- xvdh). --- } deriving (Eq, Show, Generic) - --- instance IsQuery RegisterImage - --- instance IsXML RegisterImage where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 RegisterImage RegisterImageResponse where --- request = query4 ec2 GET "RegisterImage" - --- data RegisterImageResponse = RegisterImageResponse --- { rjRequestId :: !Text --- -- ^ The ID of the request. --- , rjImageId :: !Text --- -- ^ The ID of the newly registered AMI. --- } deriving (Eq, Show, Generic) - --- instance IsXML RegisterImageResponse where --- xmlPickler = ec2XML - --- -- | Releases the specified Elastic IP address. An Elastic IP address is for use --- -- either in the EC2-Classic platform or in a VPC.[EC2-Classic, default VPC] Releasing an Elastic IP address --- -- automatically disassociates it from any instance that it's associated with. --- -- To disassociate an Elastic IP address without releasing it, use the --- -- ec2-disassociate-address command. [Nondefault VPC] You must use the --- -- ec2-disassociate-address command to disassociate the Elastic IP address --- -- before you try to release it. Otherwise, Amazon EC2 returns an error --- -- (InvalidIPAddress.InUse). --- -- --- -- - --- data ReleaseAddress = ReleaseAddress --- { raPublicIp :: !Text --- -- ^ [EC2-Classic] The Elastic IP address. --- , raAllocationId :: !Text --- -- ^ [EC2-VPC] The allocation ID. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ReleaseAddress - --- instance AWSRequest EC2 ReleaseAddress ReleaseAddressResponse where --- request = query4 ec2 GET "ReleaseAddress" - --- data ReleaseAddressResponse = ReleaseAddressResponse --- { raRequestId :: !Text --- -- ^ The ID of the request. --- , raReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ReleaseAddressResponse where --- xmlPickler = ec2XML - --- -- | Changes which network ACL a subnet is associated with. By default when you --- -- create a subnet, it's automatically associated with the default network --- -- ACL. For more information about network ACLs, see Network ACLs in the --- -- Amazon Virtual Private Cloud User Guide. --- -- --- -- - --- data ReplaceNetworkAclAssociation = ReplaceNetworkAclAssociation --- { rnaaAssociationId :: !Text --- -- ^ The ID representing the current association between the original --- -- network ACL and the subnet. --- , rnaaNetworkAclId :: !Text --- -- ^ The ID of the new ACL to associate with the subnet. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ReplaceNetworkAclAssociation - --- instance AWSRequest EC2 ReplaceNetworkAclAssociation ReplaceNetworkAclAssociationResponse where --- request = query4 ec2 GET "ReplaceNetworkAclAssociation" - --- data ReplaceNetworkAclAssociationResponse = ReplaceNetworkAclAssociationResponse --- { rnaaRequestId :: !Text --- -- ^ The ID of the request. --- , rnaaNewAssociationId :: !Text --- -- ^ The ID of the new association. --- } deriving (Eq, Show, Generic) - --- instance IsXML ReplaceNetworkAclAssociationResponse where --- xmlPickler = ec2XML - --- -- | Replaces an entry (rule) in a network ACL. For more information about --- -- network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User --- -- Guide. --- -- --- -- - --- data ReplaceNetworkAclEntry = ReplaceNetworkAclEntry --- { rnaeNetworkAclId :: !Text --- -- ^ The ID of the ACL. --- , rnaeRuleNumber :: !Integer --- -- ^ The rule number of the entry to replace. --- , rnaeProtocol :: !Integer --- -- ^ The IP protocol the rule applies to. You can use -1 to mean all --- -- protocols. --- , rnaeRuleAction :: !Text --- -- ^ Indicates whether to allow or deny traffic that matches the rule. --- , rnaeEgress :: Maybe Bool --- -- ^ Indicates whether this rule applies to egress traffic from the --- -- subnet (true) or ingress traffic to the subnet (false). --- , rnaeCidrBlock :: !Text --- -- ^ The CIDR range to allow or deny, in CIDR notation (for example, --- -- 172.16.0.0/24). --- , rnaeIcmp :: Members IcmpType --- -- ^ For the ICMP protocol, the ICMP code. You can use -1 to specify --- -- all ICMP codes for the given ICMP type. --- , rnaePortRange :: Members PortRangeType --- -- ^ The first port in the range. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ReplaceNetworkAclEntry - --- instance AWSRequest EC2 ReplaceNetworkAclEntry ReplaceNetworkAclEntryResponse where --- request = query4 ec2 GET "ReplaceNetworkAclEntry" - --- data ReplaceNetworkAclEntryResponse = ReplaceNetworkAclEntryResponse --- { rnaeRequestId :: !Text --- -- ^ The ID of the request. --- , rnaeReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ReplaceNetworkAclEntryResponse where --- xmlPickler = ec2XML - --- -- | Replaces an existing route within a route table in a VPC. For more --- -- information about route tables, see Route Tables in the Amazon Virtual --- -- Private Cloud User Guide. --- -- --- -- - --- data ReplaceRoute = ReplaceRoute --- { rrRouteTableId :: !Text --- -- ^ The ID of the route table. --- , rrDestinationCidrBlock :: !Text --- -- ^ The CIDR address block used for the destination match. The value --- -- you provide must match the CIDR of an existing route in the --- -- table. --- , rrGatewayId :: !Text --- -- ^ The ID of a gateway attached to your VPC. --- , rrInstanceId :: !Text --- -- ^ The ID of a NAT instance in your VPC. --- , rrNetworkInterfaceId :: !Text --- -- ^ Allows routing to network interface attachments. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ReplaceRoute - --- instance IsXML ReplaceRoute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ReplaceRoute ReplaceRouteResponse where --- request = query4 ec2 GET "ReplaceRoute" - --- data ReplaceRouteResponse = ReplaceRouteResponse --- { rrRequestId :: !Text --- -- ^ The ID of the request. --- , rrReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ReplaceRouteResponse where --- xmlPickler = ec2XML - --- -- | Changes the route table associated with a given subnet in a VPC. After you --- -- execute this action, the subnet uses the routes in the new route table it's --- -- associated with. For more information about route tables, see Route Tables --- -- in the Amazon Virtual Private Cloud User Guide.You can also use this action --- -- to change which table is the main route table in the VPC. You just specify --- -- the main route table's association ID and the route table that you want to --- -- be the new main route table. --- -- --- -- - --- data ReplaceRouteTableAssociation = ReplaceRouteTableAssociation --- { rrtaAssociationId :: !Text --- -- ^ The association ID. --- , rrtaRouteTableId :: !Text --- -- ^ The ID of the new route table to associate with the subnet. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ReplaceRouteTableAssociation - --- instance AWSRequest EC2 ReplaceRouteTableAssociation ReplaceRouteTableAssociationResponse where --- request = query4 ec2 GET "ReplaceRouteTableAssociation" - --- data ReplaceRouteTableAssociationResponse = ReplaceRouteTableAssociationResponse --- { rrtaRequestId :: !Text --- -- ^ The ID of the request. --- , rrtaNewAssociationId :: !Text --- -- ^ The ID of the new association. --- } deriving (Eq, Show, Generic) - --- instance IsXML ReplaceRouteTableAssociationResponse where --- xmlPickler = ec2XML - --- -- | Use this action to submit feedback about an instance's status. This action --- -- works only for instances that are in the running state. If your experience --- -- with the instance differs from the instance status returned by the --- -- DescribeInstanceStatus action, use ReportInstanceStatus to report your --- -- experience with the instance. Amazon EC2 collects this information to --- -- improve the accuracy of status checks. To report an instance's status, --- -- specify an instance ID with the InstanceId.n parameter and a reason code --- -- with the ReasonCode.n parameter that applies to that instance. The --- -- following table contains descriptions of all available reason codes. --- -- --- -- - --- data ReportInstanceStatus = ReportInstanceStatus --- { risInstanceId :: Members Text --- -- ^ One or more instance IDs. --- , risStatus :: !Text --- -- ^ The status of all instances listed in the InstanceId.n parameter. --- , risStartTime :: Maybe UTCTime --- -- ^ The time at which the reported instance health state began. --- , risEndTime :: Maybe UTCTime --- -- ^ The time at which the reported instance health state ended. --- , risReasonCode :: Members Text --- -- ^ A reason code that describes a specific instance's health state. --- -- Each code you supply corresponds to an instance ID that you --- -- supply with the InstanceId.n parameter. See the Description --- -- section for descriptions of each reason code. --- , risDescription :: Maybe Text --- -- ^ Descriptive text about the instance health state. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ReportInstanceStatus - --- instance AWSRequest EC2 ReportInstanceStatus ReportInstanceStatusResponse where --- request = query4 ec2 GET "ReportInstanceStatus" - --- data ReportInstanceStatusResponse = ReportInstanceStatusResponse --- { risRequestId :: !Text --- -- ^ The ID of the request. --- , risReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ReportInstanceStatusResponse where --- xmlPickler = ec2XML - --- -- | Creates a Spot Instance request. Spot Instances are instances that Amazon --- -- EC2 starts on your behalf when the maximum price that you specify exceeds --- -- the current Spot Price. Amazon EC2 periodically sets the Spot Price based --- -- on available Spot Instance capacity and current Spot Instance requests. For --- -- more information about Spot Instances, see Spot Instances in the Amazon --- -- Elastic Compute Cloud User Guide. --- -- --- -- - --- data RequestSpotInstances = RequestSpotInstances --- { rsiSpotPrice :: !Text --- -- ^ The maximum hourly price for any Spot Instance launched to --- -- fulfill the request. --- , rsiInstanceCount :: Maybe Integer --- -- ^ The maximum number of Spot Instances to launch. --- , rsiType :: Maybe Text --- -- ^ The Spot Instance request type. --- , rsiValidFrom :: Maybe UTCTime --- -- ^ The start date of the request. If this is a one-time request, the --- -- request becomes active at this date and time and remains active --- -- until all instances launch, the request expires, or the request --- -- is canceled. If the request is persistent, the request becomes --- -- active at this date and time and remains active until it expires --- -- or is canceled. --- , rsiValidUntil :: Maybe UTCTime --- -- ^ The end date of the request. If this is a one-time request, the --- -- request remains active until all instances launch, the request is --- -- canceled, or this date is reached. If the request is persistent, --- -- it remains active until it is canceled or this date and time is --- -- reached. --- , rsiLaunchGroup :: Maybe Text --- -- ^ The instance launch group. Launch groups are Spot Instances that --- -- launch together and terminate together. --- , rsiAvailabilityZoneGroup :: Maybe Text --- -- ^ The user-specified name for a logical grouping of bids. --- , rsiLaunchSpecification :: Members LaunchSpecificationType --- -- ^ The ID of the AMI. --- } deriving (Eq, Show, Generic) - --- instance IsQuery RequestSpotInstances - --- instance AWSRequest EC2 RequestSpotInstances RequestSpotInstancesResponse where --- request = query4 ec2 GET "RequestSpotInstances" - --- data RequestSpotInstancesResponse = RequestSpotInstancesResponse --- { rsiRequestId :: !Text --- -- ^ The ID of the request. --- , rsiSpotInstanceRequestSet :: !SpotInstanceRequestSetItemType --- -- ^ Information about the Spot Instance request, wrapped in an item --- -- element. --- } deriving (Eq, Show, Generic) - --- instance IsXML RequestSpotInstancesResponse where --- xmlPickler = ec2XML - --- -- | Resets an attribute of an AMI to its default value. --- -- --- -- - --- data ResetImageAttribute = ResetImageAttribute --- { riaImageId :: !Text --- -- ^ The ID of the AMI. --- , riaAttribute :: !Text --- -- ^ The attribute to reset (currently you can only reset the launch --- -- permission attribute). --- } deriving (Eq, Show, Generic) - --- instance IsQuery ResetImageAttribute - --- instance IsXML ResetImageAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ResetImageAttribute ResetImageAttributeResponse where --- request = query4 ec2 GET "ResetImageAttribute" - --- data ResetImageAttributeResponse = ResetImageAttributeResponse --- { riaRequestId :: !Text --- -- ^ The ID of the request. --- , riaReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ResetImageAttributeResponse where --- xmlPickler = ec2XML - --- -- | Resets an attribute of an instance to its default value. To reset the --- -- kernel or RAM disk, the instance must be in a stopped state. To reset the --- -- SourceDestCheck, the instance can be either running or stopped. The --- -- SourceDestCheck attribute controls whether source/destination checking is --- -- enabled. The default value is true, which means checking is enabled. This --- -- value must be false for a NAT instance to perform NAT. For more --- -- information, see NAT Instances in the Amazon Virtual Private Cloud User --- -- Guide. --- -- --- -- - --- data ResetInstanceAttribute = ResetInstanceAttribute --- { riaInstanceId :: !Text --- -- ^ The ID of the instance. --- , ribAttribute :: !Text --- -- ^ The attribute to reset. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ResetInstanceAttribute - --- instance IsXML ResetInstanceAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ResetInstanceAttribute ResetInstanceAttributeResponse where --- request = query4 ec2 GET "ResetInstanceAttribute" - --- data ResetInstanceAttributeResponse = ResetInstanceAttributeResponse --- { ribRequestId :: !Text --- -- ^ The ID of the request. --- , ribReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ResetInstanceAttributeResponse where --- xmlPickler = ec2XML - --- -- | Resets a network interface attribute. You can specify only one attribute at --- -- a time. --- -- --- -- - --- data ResetNetworkInterfaceAttribute = ResetNetworkInterfaceAttribute --- { rniaNetworkInterfaceId :: !Text --- -- ^ The ID of the network interface. --- , rniaAttribute :: !Text --- -- ^ The name of the attribute to reset. --- } deriving (Eq, Show, Generic) - --- instance IsQuery ResetNetworkInterfaceAttribute - --- instance IsXML ResetNetworkInterfaceAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ResetNetworkInterfaceAttribute ResetNetworkInterfaceAttributeResponse where --- request = query4 ec2 GET "ResetNetworkInterfaceAttribute" - --- data ResetNetworkInterfaceAttributeResponse = ResetNetworkInterfaceAttributeResponse --- { rniaRequestId :: !Text --- -- ^ The ID of the request. --- , rniaReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ResetNetworkInterfaceAttributeResponse where --- xmlPickler = ec2XML - --- -- | Resets permission settings for the specified snapshot. --- -- --- -- - --- data ResetSnapshotAttribute = ResetSnapshotAttribute --- { rsaSnapshotId :: !Text --- -- ^ The ID of the snapshot. --- , rsaAttribute :: !Text --- -- ^ The attribute to reset (currently only the attribute for --- -- permission to create volumes can be reset) --- } deriving (Eq, Show, Generic) - --- instance IsQuery ResetSnapshotAttribute - --- instance IsXML ResetSnapshotAttribute where --- xmlPickler = ec2XML - --- instance AWSRequest EC2 ResetSnapshotAttribute ResetSnapshotAttributeResponse where --- request = query4 ec2 GET "ResetSnapshotAttribute" - --- data ResetSnapshotAttributeResponse = ResetSnapshotAttributeResponse --- { rsaRequestId :: !Text --- -- ^ The ID of the request. --- , rsaReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML ResetSnapshotAttributeResponse where --- xmlPickler = ec2XML - --- | Removes one or more egress rules from a security group for EC2-VPC. --- --- The values that you specify in the revoke request (for example, ports) must --- match the existing rule's values for the rule to be revoked. --- --- -data RevokeSecurityGroupEgress = RevokeSecurityGroupEgress - { rsgeGroupId :: !Text - -- ^ The ID of the security group to modify. - , rsgeIpPermissions :: [IpPermissionType] - -- ^ The IP protocol name or number (see Protocol Numbers). - } deriving (Eq, Show, Generic) - -instance IsQuery RevokeSecurityGroupEgress - -instance Rq RevokeSecurityGroupEgress where - type Er RevokeSecurityGroupEgress = EC2ErrorResponse - type Rs RevokeSecurityGroupEgress = RevokeSecurityGroupEgressResponse - request = query4 ec2 GET "RevokeSecurityGroupEgress" - -data RevokeSecurityGroupEgressResponse = RevokeSecurityGroupEgressResponse - { rsgerRequestId :: !Text - -- ^ The ID of the request. - , rsgerReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an error. - } deriving (Eq, Show, Generic) - -instance IsXML RevokeSecurityGroupEgressResponse where - xmlPickler = ec2XML - --- | Removes one or more ingress rules from a security group. --- --- The values that you specify in the revoke request (for example, ports) must --- match the existing rule's values for the rule to be removed. --- --- -data RevokeSecurityGroupIngress = RevokeSecurityGroupIngress - { rsgiGroupId :: Maybe Text - -- ^ The ID of the security group to modify. The security group must - -- belong to your account. - , rsgiGroupName :: Maybe Text - -- ^ The name of the security group to modify. - , rsgiIpPermissions :: [IpPermissionType] - -- ^ The IP protocol name or number (see Protocol Numbers). For - -- EC2-Classic, security groups can have rules only for TCP, UDP, - -- and ICMP. For EC2-VPC, security groups can have rules assigned to - -- any protocol number. - } deriving (Eq, Show, Generic) - -instance IsQuery RevokeSecurityGroupIngress - -instance Rq RevokeSecurityGroupIngress where - type Er RevokeSecurityGroupIngress = EC2ErrorResponse - type Rs RevokeSecurityGroupIngress = RevokeSecurityGroupIngressResponse - request = query4 ec2 GET "RevokeSecurityGroupIngress" - -data RevokeSecurityGroupIngressResponse = RevokeSecurityGroupIngressResponse - { rsgirRequestId :: !Text - -- ^ The ID of the request. - , rsgirReturn :: !Bool - -- ^ Returns true if the request succeeds. Otherwise, returns an error. - } deriving (Eq, Show, Generic) - -instance IsXML RevokeSecurityGroupIngressResponse where - xmlPickler = ec2XML - --- | Launches the specified number of instances of an AMI for which you have --- permissions.When you launch an instance, it enters the pending state. After --- the instance is ready for you, it enters the running state. To check the --- state of your instance, call DescribeInstances.If you don't specify a --- security group when launching an instance, Amazon EC2 uses the default --- security group.Linux instances have access to the public --- key of the key pair at boot. You can use this key to provide secure access --- to the instance. Amazon EC2 public images use this feature to provide --- secure access without passwords.You can provide optional user data --- when launching an instance. --- --- -data RunInstances = RunInstances - { riImageId :: !Text - -- ^ The ID of the AMI, which you can get by calling DescribeImages. - , riMinCount :: !Integer - -- ^ The minimum number of instances to launch. If you specify a - -- minimum that is more instances than Amazon EC2 can launch in the - -- target Availability Zone, Amazon EC2 launches no instances. - , riMaxCount :: !Integer - -- ^ The maximum number of instances to launch. If you specify more - -- instances than Amazon EC2 can launch in the target Availability - -- Zone, Amazon EC2 launches the largest possible number of - -- instances above MinCount. - , riKeyName :: Maybe Text - -- ^ The name of the key pair. You can create a key pair using - -- CreateKeyPair or ImportKeyPair. - , riSecurityGroupId :: [Text] - -- ^ One or more security group IDs. You can create a security group - -- using CreateSecurityGroup. - , riSecurityGroup :: [Text] - -- ^ [EC2-Classic, default VPC] One or more security group names. For - -- a nondefault VPC, you must use SecurityGroupId. - , riUserData :: Maybe Text - -- ^ The Base64-encoded MIME user data for the instances. - , riInstanceType :: Maybe InstanceType - -- ^ The instance type. Defaults to m1.small if absent. - , riPlacement :: Maybe PlacementType - -- ^ The Availability Zone for the instance. - , rjKernelId :: Maybe Text - -- ^ The ID of the kernel. - , rjRamdiskId :: Maybe Text - -- ^ The ID of the RAM disk. - , rjBlockDeviceMapping :: [InstanceBlockDeviceMappingItemType] - -- ^ The device name exposed to the instance (for example, /dev/sdh or xvdh). - , rjMonitoring :: Maybe MonitoringInstanceType - -- ^ Enables monitoring for the instance. - , rjSubnetId :: Maybe Text - -- ^ [EC2-VPC] The ID of the subnet to launch the instance into. - , rjDisableApiTermination :: Maybe Bool - -- ^ If you set this parameter to true, you can't terminate the - -- instance using the Amazon EC2 console, CLI, or API; otherwise, - -- you can. If you set this parameter to true and then later want to - -- be able to terminate the instance, you must first change the - -- value of the disableApiTermination attribute to false using - -- ModifyInstanceAttribute. Alternatively, if you set - -- InstanceInitiatedShutdownBehavior to terminate, you can terminate - -- the instance by running the shutdown command from the instance. - , rjInstanceInitiatedShutdownBehavior :: Maybe Text -- FIXME: Should be stop | terminate - -- ^ Indicates whether an instance stops or terminates when you - -- initiate shutdown from the instance (using the operating system - -- command for system shutdown). - , rjPrivateIpAddress :: Maybe Text - -- ^ [EC2-VPC] The primary IP address. You must specify a value from - -- the IP address range of the subnet. - , rjClientToken :: Maybe Text - -- ^ Unique, case-sensitive identifier you provide to ensure - -- idempotency of the request. - , rjNetworkInterface :: [NetworkInterfaceType] - -- ^ An existing interface to attach to a single instance. Requires - -- n=1 instances. - , rjIamInstanceProfile :: [IamInstanceProfileRequestType] - -- ^ The Amazon Resource Name (ARN) of the IAM instance profile to - -- associate with the instances. - , rjEbsOptimized :: Maybe Bool - -- ^ Indicates whether the instance is optimized for EBS I/O. This - -- optimization provides dedicated throughput to Amazon EBS and an - -- optimized configuration stack to provide optimal Amazon EBS I/O - -- performance. This optimization isn't available with all instance - -- types. Additional usage charges apply when using an EBS-optimized - -- instance. - } deriving (Eq, Show, Generic) - -instance IsQuery RunInstances - -instance Rq RunInstances where - type Er RunInstances = EC2ErrorResponse - type Rs RunInstances = RunInstancesResponse - request = query4 ec2 GET "RunInstances" - -data RunInstancesResponse = RunInstancesResponse - { rirRequestId :: !Text - -- ^ The ID of the request. - , rirReservationId :: !Text - -- ^ The ID of the reservation. - , rirOwnerId :: !Text - -- ^ The ID of the AWS account that owns the reservation. - , rirGroupSet :: [GroupItemType] - -- ^ A list of security groups the instance belongs to. Each group is - -- wrapped in an item element. - , rirInstancesSet :: [RunningInstancesItemType] - -- ^ A list of instances. Each instance is wrapped in an item element. - , rirRequesterId :: Maybe Text - -- ^ The ID of the requester that launched the instances on your - -- behalf (for example, AWS Management Console, Auto Scaling). - } deriving (Eq, Show, Generic) - -instance IsXML RunInstancesResponse where - xmlPickler = ec2XML - --- -- | Starts an Amazon EBS-backed AMI that you've previously stopped. Instances --- -- that use Amazon EBS volumes as their root devices can be quickly stopped --- -- and started. When an instance is stopped, the compute resources are --- -- released and you are not billed for hourly instance usage. However, your --- -- root partition Amazon EBS volume remains, continues to persist your data, --- -- and you are charged for Amazon EBS volume usage. You can restart your --- -- instance at any time. Each time you transition an instance from stopped to --- -- started, we charge a full instance hour, even if transitions happen --- -- multiple times within a single hour. Before stopping an instance, make sure --- -- it is in a state from which it can be restarted. Stopping an instance does --- -- not preserve data stored in RAM. Performing this operation on an instance --- -- that uses an instance store as its root device returns an error.For more --- -- information, see Stopping Instances in the Amazon Elastic Compute Cloud --- -- User Guide. --- -- --- -- - --- data StartInstances = StartInstances --- { siInstanceId :: Members Text --- -- ^ One or more instance IDs. --- } deriving (Eq, Show, Generic) - --- instance IsQuery StartInstances - --- instance AWSRequest EC2 StartInstances StartInstancesResponse where --- request = query4 ec2 GET "StartInstances" - --- data StartInstancesResponse = StartInstancesResponse --- { siRequestId :: !Text --- -- ^ The ID of the request. --- , siInstancesSet :: !InstanceStateChangeType --- -- ^ A list of instance state changes. Each change is wrapped in an --- -- item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML StartInstancesResponse where --- xmlPickler = ec2XML - --- -- | Stops an Amazon EBS-backed instance. Each time you transition an instance --- -- from stopped to started, we charge a full instance hour, even if --- -- transitions happen multiple times within a single hour.You can't start or --- -- stop Spot Instances.Instances that use Amazon EBS volumes as their root --- -- devices can be quickly stopped and started. When an instance is stopped, --- -- the compute resources are released and you are not billed for hourly --- -- instance usage. However, your root partition Amazon EBS volume remains, --- -- continues to persist your data, and you are charged for Amazon EBS volume --- -- usage. You can restart your instance at any time. Before stopping an --- -- instance, make sure it is in a state from which it can be restarted. --- -- Stopping an instance does not preserve data stored in RAM. Performing this --- -- operation on an instance that uses an instance store as its root device --- -- returns an error.You can stop, start, and terminate EBS-backed instances. --- -- You can only terminate S3-backed instances. What happens to an instance --- -- differs if you stop it or terminate it. For example, when you stop an --- -- instance, the root device and any other devices attached to the instance --- -- persist. When you terminate an instance, the root device and any other --- -- devices attached during the instance launch are automatically deleted. For --- -- more information about the differences between stopping and terminating --- -- instances, see Stopping Instances in the Amazon Elastic Compute Cloud User --- -- Guide --- -- --- -- - --- data StopInstances = StopInstances --- { sjInstanceId :: Members Text --- -- ^ One or more instance IDs. --- , sjForce :: Maybe Bool --- -- ^ Forces the instances to stop. The instances will not have an --- -- opportunity to flush file system caches or file system metadata. --- -- If you use this option, you must perform file system check and --- -- repair procedures. This option is not recommended for Windows --- -- instances. --- } deriving (Eq, Show, Generic) - --- instance IsQuery StopInstances - --- instance AWSRequest EC2 StopInstances StopInstancesResponse where --- request = query4 ec2 GET "StopInstances" - --- data StopInstancesResponse = StopInstancesResponse --- { sjRequestId :: !Text --- -- ^ The ID of the request. --- , sjInstancesSet :: !InstanceStateChangeType --- -- ^ A list of instance state changes. Each change is wrapped in an --- -- item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML StopInstancesResponse where --- xmlPickler = ec2XML - --- | Shuts down one or more instances. This operation is idempotent; if you --- terminate an instance more than once, each call will succeed. Terminated --- instances will remain visible after termination (approximately one --- hour).You can stop, start, and terminate EBS-backed instances. You can only --- terminate S3-backed instances. What happens to an instance differs if you --- stop it or terminate it. For example, when you stop an instance, the root --- device and any other devices attached to the instance persist. When you --- terminate an instance, the root device and any other devices attached --- during the instance launch are automatically deleted. For more information --- about the differences between stopping and terminating instances, see --- Stopping Instances in the Amazon Elastic Compute Cloud User Guide --- --- -data TerminateInstances = TerminateInstances - { tiInstanceId :: [Text] - -- ^ One or more instance IDs. - } deriving (Eq, Show, Generic) - -instance IsQuery TerminateInstances - -instance Rq TerminateInstances where - type Er TerminateInstances = EC2ErrorResponse - type Rs TerminateInstances = TerminateInstancesResponse - request = query4 ec2 GET "TerminateInstances" - -data TerminateInstancesResponse = TerminateInstancesResponse - { tiRequestId :: !Text - -- ^ The ID of the request. - , tiInstancesSet :: [InstanceStateChangeType] - -- ^ A list of instance state changes. Each change is wrapped in an - -- item element. - } deriving (Eq, Show, Generic) - -instance IsXML TerminateInstancesResponse where - xmlPickler = ec2XML - --- instance IsXML TerminateInstancesResponse where --- xmlPickler = ec2XML - --- -- | Unassigns one or more secondary private IP addresses from a network --- -- interface. --- -- --- -- - --- data UnassignPrivateIpAddresses = UnassignPrivateIpAddresses --- { upiaNetworkInterfaceId :: !Text --- -- ^ The network interface from which the secondary private IP address --- -- will be unassigned. --- , upiaPrivateIpAddress :: Members AssignPrivateIpAddressesSetItemRequestType --- -- ^ The secondary private IP addresses that you want to unassign from --- -- the network interface. You can specify this option multiple times --- -- to unassign more than one IP address. --- } deriving (Eq, Show, Generic) - --- instance IsQuery UnassignPrivateIpAddresses - --- instance AWSRequest EC2 UnassignPrivateIpAddresses UnassignPrivateIpAddressesResponse where --- request = query4 ec2 GET "UnassignPrivateIpAddresses" - --- data UnassignPrivateIpAddressesResponse = UnassignPrivateIpAddressesResponse --- { upiaRequestId :: !Text --- -- ^ The ID of the request. --- , upiaReturn :: !Bool --- -- ^ Returns true if the request succeeds. Otherwise, returns an --- -- error. --- } deriving (Eq, Show, Generic) - --- instance IsXML UnassignPrivateIpAddressesResponse where --- xmlPickler = ec2XML - --- -- | Disables monitoring for a running instance. For more information about --- -- monitoring instances, see Monitoring Your Instances and Volumes in the --- -- Amazon Elastic Compute Cloud User Guide. --- -- --- -- - --- data UnmonitorInstances = UnmonitorInstances --- { uiInstanceId :: Members Text --- -- ^ One or more instance IDs. --- } deriving (Eq, Show, Generic) - --- instance IsQuery UnmonitorInstances - --- instance AWSRequest EC2 UnmonitorInstances UnmonitorInstancesResponse where --- request = query4 ec2 GET "UnmonitorInstances" - --- data UnmonitorInstancesResponse = UnmonitorInstancesResponse --- { uiRequestId :: !Text --- -- ^ The ID of the request. --- , uiInstancesSet :: !MonitorInstancesResponseSetItemType --- -- ^ A list of monitoring information for one or more instances. Each --- -- set of information is wrapped in an item element. --- } deriving (Eq, Show, Generic) - --- instance IsXML UnmonitorInstancesResponse where --- xmlPickler = ec2XML diff --git a/src/Network/AWS/EC2/Metadata.hs b/src/Network/AWS/EC2/Metadata.hs deleted file mode 100644 index e984ab49ac8..00000000000 --- a/src/Network/AWS/EC2/Metadata.hs +++ /dev/null @@ -1,290 +0,0 @@ -{-# LANGUAGE DeriveDataTypeable #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE OverloadedStrings #-} - --- Module : Network.AWS.EC2.Metadata --- Copyright : (c) 2013-2014 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | Retrieve an EC2 instance's local metadata. -module Network.AWS.EC2.Metadata where - -import Control.Applicative -import Control.Error -import qualified Control.Exception as EX -import Control.Monad.Error -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as LBS -import Data.Data -import Data.Monoid -import Data.Text (Text) -import qualified Data.Text as Text -import GHC.Generics -import Network.AWS.Internal.String -import Network.HTTP.Conduit -import Network.HTTP.Types (status404) - -class ToPath a where - toPath :: a -> Text - -data Dynamic - = FWS - -- ^ Value showing whether the customer has enabled detailed one-minute - -- monitoring in CloudWatch. - -- - -- Valid values: enabled | disabled. - | Document - -- ^ JSON containing instance attributes, such as instance-id, - -- private IP address, etc. - | PKCS7 - -- ^ Used to verify the document's authenticity and content against the - -- signature. - | Signature - deriving (Eq, Ord, Show, Data, Typeable, Generic) - -instance ToPath Dynamic where - toPath FWS = "fws/instance-monitoring" - toPath Document = "instance-identity/document" - toPath PKCS7 = "instance-identity/pkcs7" - toPath Signature = "instance-identity/signature" - -data Meta - = AMIId - -- ^ The AMI ID used to launch the instance. - | AMILaunchIndex - -- ^ If you started more than one instance at the same time, this value - -- indicates the order in which the instance was launched. - -- The value of the first instance launched is 0. - | AMIManifestPath - -- ^ The path to the AMI's manifest file in Amazon S3. - -- If you used an Amazon EBS-backed AMI to launch the instance, - -- the returned result is unknown. - | AncestorAMIIds - -- ^ The AMI IDs of any instances that were rebundled to create this AMI. - -- This value will only exist if the AMI manifest file contained an - -- ancestor-amis key. - | BlockDevice !Mapping - -- ^ See: 'Mapping' - | Hostname - -- ^ The private hostname of the instance. In cases where multiple network - -- interfaces are present, this refers to the eth0 device - -- (the device for which the device number is 0). - | IAM !Info - -- ^ See: 'Info' - | InstanceAction - -- ^ Notifies the instance that it should reboot in preparation for bundling. - -- Valid values: none | shutdown | bundle-pending. - | InstanceId - -- ^ The ID of this instance. - | InstanceType - -- ^ The type of instance. - -- - -- See: @InstanceType@ - | KernelId - -- ^ The ID of the kernel launched with this instance, if applicable. - | LocalHostname - -- ^ The private DNS hostname of the instance. In cases where multiple - -- network interfaces are present, this refers to the eth0 device - -- (the device for which the device number is 0). - | LocalIPV4 - -- ^ The private IP address of the instance. In cases where multiple network - -- interfaces are present, this refers to the eth0 device - -- (the device for which the device number is 0). - | MAC - -- ^ The instance's media access control (MAC) address. In cases where - -- multiple network interfaces are present, this refers to the eth0 device - -- (the device for which the device number is 0). - | Network !Text !Interface - -- ^ See: 'Interface' - | AvailabilityZone - -- ^ The Availability Zone in which the instance launched. - | ProductCodes - -- ^ Product codes associated with the instance, if any. - | PublicHostname - -- ^ The instance's public DNS. If the instance is in a VPC, this category - -- is only returned if the enableDnsHostnames attribute is set to true. - -- For more information, see Using DNS with Your VPC. - | PublicIPV4 - -- ^ The public IP address. If an Elastic IP address is associated with the - -- instance, the value returned is the Elastic IP address. - | OpenSSHKey - -- ^ Public key. Only available if supplied at instance launch time. - | RAMDiskId - -- ^ The ID of the RAM disk specified at launch time, if applicable. - | ReservationId - -- ^ ID of the reservation. - | SecurityGroups - -- ^ The names of the security groups applied to the instance. - deriving (Eq, Ord, Show, Data, Typeable, Generic) - -instance ToPath Meta where - toPath AMIId = "ami-id" - toPath AMILaunchIndex = "ami-launch-index" - toPath AMIManifestPath = "ami-manifest-path" - toPath AncestorAMIIds = "ancestor-ami-ids" - toPath (BlockDevice m) = "block-device-mapping/" <> toPath m - toPath Hostname = "hostname" - toPath (IAM m) = "iam/" <> toPath m - toPath InstanceAction = "instance-action" - toPath InstanceId = "instance-id" - toPath InstanceType = "instance-type" - toPath KernelId = "kernel-id" - toPath LocalHostname = "local-hostname" - toPath LocalIPV4 = "local-ipv4" - toPath MAC = "mac" - toPath (Network x m) = "network/interfaces/macs/" <> x <> ('/' `Text.cons` toPath m) - toPath AvailabilityZone = "placement/availability-zone" - toPath ProductCodes = "product-codes" - toPath PublicHostname = "public-hostname" - toPath PublicIPV4 = "public-ipv4" - toPath OpenSSHKey = "public-keys/0/openssh-key" - toPath RAMDiskId = "ramdisk-id" - toPath ReservationId = "reservation-id" - toPath SecurityGroups = "security-groups" - -data Mapping - = AMI - -- ^ The virtual device that contains the root/boot file system. - | EBS !Int - -- ^ The virtual devices associated with Amazon EBS volumes, if present. - -- This value is only available in metadata if it is present at launch time. - -- The N indicates the index of the Amazon EBS volume (such as ebs1 or ebs2). - | Ephemeral !Int - -- ^ The virtual devices associated with ephemeral devices, if present. - -- The N indicates the index of the ephemeral volume. - | Root - -- ^ The virtual devices or partitions associated with the root devices, - -- or partitions on the virtual device, where the root (/ or C:) file system - -- is associated with the given instance. - | Swap - -- ^ The virtual devices associated with swap. Not always present. - deriving (Eq, Ord, Show, Data, Typeable, Generic) - -instance ToPath Mapping where - toPath AMI = "ami" - toPath (EBS n) = "ebs" <> Text.pack (show n) - toPath (Ephemeral n) = "ephemeral" <> Text.pack (show n) - toPath Root = "root" - toPath Swap = "root" - -data Interface - = IDeviceNumber - -- ^ The device number associated with that interface. Each interface must - -- have a unique device number. The device number serves as a hint to device - -- naming in the instance; for example, device-number is 2 for the eth2 device. - | IIPV4Associations !Text - -- ^ The private IPv4 addresses that are associated with each public-ip - -- address and assigned to that interface. - | ILocalHostname - -- ^ The interface's local hostname. - | ILocalIPV4s - -- ^ The private IP addresses associated with the interface. - | IMAC - -- ^ The instance's MAC address. - | IOwnerId - -- ^ The ID of the owner of the network interface. In multiple-interface - -- environments, an interface can be attached by a third party, such as - -- Elastic Load Balancing. Traffic on an interface is always billed to - -- the interface owner. - | IPublicHostname - -- ^ The interface's public DNS. If the instance is in a VPC, this category - -- is only returned if the enableDnsHostnames attribute is set to true. - -- For more information, see Using DNS with Your VPC. - | IPublicIPV4s - -- ^ The Elastic IP addresses associated with the interface. There may be - -- multiple IP addresses on an instance. - | ISecurityGroups - -- ^ Security groups to which the network interface belongs. Returned only - -- for instances launched into a VPC. - | ISecurityGroupIds - -- ^ IDs of the security groups to which the network interface belongs. - -- Returned only for instances launched into a VPC. For more information on - -- security groups in the EC2-VPC platform, see Security Groups for Your VPC. - | ISubnetId - -- ^ The ID of the subnet in which the interface resides. Returned only for - -- instances launched into a VPC. - | ISubnetIPV4_CIDRBlock - -- ^ The CIDR block of the subnet in which the interface resides. Returned - -- only for instances launched into a VPC. - | IVPCId - -- ^ The ID of the VPC in which the interface resides. Returned only for - -- instances launched into a VPC. - | IVPCIPV4_CIDRBlock - -- ^ The CIDR block of the VPC in which the interface resides. Returned only - -- for instances launched into a VPC. - deriving (Eq, Ord, Show, Data, Typeable, Generic) - -instance ToPath Interface where - toPath IDeviceNumber = "device-number" - toPath (IIPV4Associations ip) = "ipv4-associations/" <> ip - toPath ILocalHostname = "local-hostname" - toPath ILocalIPV4s = "local-ipv4s" - toPath IMAC = "mac" - toPath IOwnerId = "owner-id" - toPath IPublicHostname = "public-hostname" - toPath IPublicIPV4s = "public-ipv4s" - toPath ISecurityGroups = "security-groups" - toPath ISecurityGroupIds = "security-group-ids" - toPath ISubnetId = "subnet-id" - toPath ISubnetIPV4_CIDRBlock = "subnet-ipv4-cidr-block" - toPath IVPCId = "vpc-id" - toPath IVPCIPV4_CIDRBlock = "vpc-ipv4-cidr-block" - -data Info - = Info - -- ^ Returns information about the last time the instance profile was updated, - -- including the instance's LastUpdated date, InstanceProfileArn, - -- and InstanceProfileId. - | SecurityCredentials (Maybe Text) - -- ^ Where role-name is the name of the IAM role associated with the instance. - -- Returns the temporary security credentials. - -- - -- See: 'Auth' for JSON deserialisation. - deriving (Eq, Ord, Show, Data, Typeable, Generic) - -instance ToPath Info where - toPath Info = "info" - toPath (SecurityCredentials r) = "security-credentials/" <> fromMaybe "" r - -ec2 :: (Functor m, MonadIO m) => m Bool -ec2 = fmap isRight - . runEitherT - . syncIO - $ simpleHttp "http://instance-data/latest" - -user :: MonadIO m => m (Maybe LBS.ByteString) -user = liftIO $ EX.catch (Just <$> simpleHttp url) ex - where - url = "http://169.254.169.254/latest/user-data" - - ex (StatusCodeException s _ _) - | status404 == s = return Nothing - ex e = EX.throw e - -meta :: (Functor m, MonadIO m) => Meta -> EitherT String m ByteString -meta = get "http://169.254.169.254/latest/meta-data/" - -dynamic :: (Functor m, MonadIO m) => Dynamic -> EitherT String m ByteString -dynamic = get "http://169.254.169.254/latest/dynamic/" - -get :: (Functor m, MonadIO m, ToPath a) - => Text - -> a - -> EitherT String m ByteString -get base p = do - rs <- fmapLT show - . syncIO - . simpleHttp - . Text.unpack - $ base <> toPath p - - case strip '\n' $ LBS.toStrict rs of - "" -> throwError "Failed to receive any data" - bs -> return bs diff --git a/src/Network/AWS/EC2/Types.hs b/src/Network/AWS/EC2/Types.hs deleted file mode 100644 index 3fb8c8c6c7d..00000000000 --- a/src/Network/AWS/EC2/Types.hs +++ /dev/null @@ -1,2555 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE OverloadedStrings #-} - --- Module : Network.AWS.EC2.Types --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.EC2.Types where - -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import Data.Monoid -import Data.Text (Text) -import Data.Text.Encoding -import Data.Time -import Network.AWS.Internal -import Text.Read - --- | Currently supported version (2013-07-15) of the EC2 service. -ec2 :: Service -ec2 = Service Regional version2 "ec2" "2013-08-15" - --- | XML namespace to annotate EC2 elements with. -ec2NS :: ByteString -ec2NS = "http://ec2.amazonaws.com/doc/" <> svcVersion ec2 <> "/" - --- | Helper to define EC2 namespaced XML elements. -ec2Elem :: ByteString -> NName ByteString -ec2Elem = mkNName ec2NS - -ec2XML :: XMLGeneric a -ec2XML = withNS' ec2NS $ (namespacedXMLOptions ec2NS) - { xmlFieldModifier = mkNName ec2NS . lowerHead . stripLower - , xmlListElement = mkNName ec2NS "item" - } - -ec2ItemXML :: XMLGeneric a -ec2ItemXML = withRootNS' ec2NS "item" $ (namespacedXMLOptions ec2NS) - { xmlFieldModifier = mkNName ec2NS . lowerHead . stripLower - , xmlListElement = mkNName ec2NS "item" - } - -data EC2Error = EC2Error - { ecCode :: !Text - , ecMessage :: !Text - } deriving (Eq, Ord, Show, Generic) - -instance IsXML EC2Error where - xmlPickler = genericXMLPickler $ defaultXMLOptions - { xmlCtorModifier = mkAnNName . stripPrefix "EC2" - } - -instance IsXML [EC2Error] where - xmlPickler = xpElemList (mkAnNName "Error") xmlPickler - -data EC2ErrorResponse = EC2ErrorResponse - { eerErrors :: [EC2Error] - , eerRequestID :: !Text - } deriving (Eq, Ord, Show, Generic) - -instance ToError EC2ErrorResponse where - toError = Err . show - -instance IsXML EC2ErrorResponse - -data Protocol = TCP | UDP | ICMP - deriving (Eq, Ord, Generic) - -instance Show Protocol where - show TCP = "tcp" - show UDP = "udp" - show ICMP = "icmp" - -instance Read Protocol where - readPrec = readAssocList - [ ("tcp", TCP) - , ("udp", UDP) - , ("icmp", ICMP) - ] - -instance IsQuery Protocol where - queryPickler = qpPrim - -instance IsXML Protocol where - xmlPickler = xpContent xpPrim - -data AddressDomain = AddressStandard | AddressVPC - deriving (Eq) - -instance Show AddressDomain where - show AddressStandard = "standard" - show AddressVPC = "vpc" - -instance Read AddressDomain where - readPrec = readAssocList - [ ("standard", AddressStandard) - , ("vpc", AddressVPC) - ] - -instance IsQuery AddressDomain where - queryPickler = qpPrim - -instance IsXML AddressDomain where - xmlPickler = xpContent xpPrim - -data VolumeStatus = Attaching | Attached | Detaching | Detached - deriving (Eq) - -instance Show VolumeStatus where - show Attaching = "attaching" - show Attached = "attached" - show Detaching = "detaching" - show Detached = "detached" - -instance Read VolumeStatus where - readPrec = readAssocList - [ ("attaching", Attaching) - , ("attached", Attached) - , ("detaching", Detaching) - , ("detached", Detached) - ] - -instance IsXML VolumeStatus where - xmlPickler = xpContent xpPrim - --- data AccountAttributeSetItemType = AccountAttributeSetItemType --- { aasitAttributeName :: !Text --- -- ^ The name of the attribute. --- , aasitAttributeValueSet :: !AccountAttributeValueSetItemType --- -- ^ A list of the attribute values, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery AccountAttributeSetItemType - --- instance IsXML AccountAttributeSetItemType where --- xmlPickler = ec2XML - --- data AccountAttributeValueSetItemType = AccountAttributeValueSetItemType --- { aavsitAttributeValue :: !Text --- -- ^ The value of the attribute. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery AccountAttributeValueSetItemType - --- instance IsXML AccountAttributeValueSetItemType where --- xmlPickler = ec2XML - --- data PrivateIpAddress = PrivateIpAddress --- { piaPrivateIpAddress :: !Text --- -- ^ The private IP address. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery AssignPrivateIpAddressesSetItemRequestType - --- instance IsXML AssignPrivateIpAddressesSetItemRequestType where --- xmlPickler = ec2XML - --- data AttachmentSetItemResponseType = AttachmentSetItemResponseType --- { asirtVolumeId :: !Text --- -- ^ The ID of the volume. --- , asirtInstanceId :: !Text --- -- ^ The ID of the instance. --- , asirtDevice :: !Text --- -- ^ The device name exposed to the instance (for example, /dev/sdh). --- , asirtStatus :: !Text --- -- ^ The attachment state. --- , asirtAttachTime :: !UTCTime --- -- ^ The time stamp when the attachment initiated. --- , asirtDeleteOnTermination :: !Bool --- -- ^ Indicates whether the volume is deleted on instance termination. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery AttachmentSetItemResponseType - --- instance IsXML AttachmentSetItemResponseType where --- xmlPickler = ec2XML - -data Attachment = Attachment - { atVpcId :: !Text - -- ^ The ID of the VPC. - , atState :: !Text - -- ^ The current state of the attachment. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML Attachment where - xmlPickler = ec2XML - -data AvailabilityZoneItemType = AvailabilityZoneItemType - { azitZoneName :: !AvailabilityZone - -- ^ The name of the Availability Zone. - , azitZoneState :: !Text - -- ^ The state of the Availability Zone. - -- FIXME: Should be - available | impaired | unavailable - , azitRegionName :: !Region - -- ^ The name of the region. - , azitMessageSet :: [AvailabilityZoneMessageType] - -- ^ Any messages about the Availability Zone. - } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery AvailabilityZoneItemType - -instance IsXML AvailabilityZoneItemType where - xmlPickler = ec2ItemXML - -data AvailabilityZoneMessageType = AvailabilityZoneMessageType - { azmtMessage :: !Text - -- ^ The message about the Availability Zone. - } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery AvailabilityZoneMessageType - -instance IsXML AvailabilityZoneMessageType where - xmlPickler = ec2ItemXML - -data BlockDeviceMappingItemType = BlockDeviceMappingItemType - { bdmitDeviceName :: !Text - -- ^ The device name exposed to the instance (for example, /dev/sdh). - , bdmitVirtualName :: Maybe Text - -- ^ The virtual device name. - , bdmitEbs :: Maybe EbsBlockDeviceType - -- ^ Parameters used to automatically set up Amazon EBS volumes when - -- the instance is launched. - , bdmitNoDevice :: Maybe Text - -- ^ Include this empty element to suppress the specified device - -- included in the block device mapping of the AMI. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery BlockDeviceMappingItemType - -instance IsXML BlockDeviceMappingItemType where - xmlPickler = ec2ItemXML - -data BundleInstanceS3Storage = BundleInstanceS3Storage - { bissAwsAccessKeyId :: !Text - -- ^ The access key ID of the owner of the bucket. - , bissBucket :: !Text - -- ^ The bucket in which to store the AMI. You can specify a bucket - -- that you already own or a new bucket that Amazon EC2 creates on - -- your behalf. If you specify a bucket that belongs to someone - -- else, Amazon EC2 returns an error. - , bissPrefix :: !Text - -- ^ The beginning of the file name of the AMI. - , bissUploadPolicy :: !Text - -- ^ A Base64-encoded Amazon S3 upload policy that gives Amazon EC2 - -- permission to upload items into Amazon S3 on the user's behalf. - , bissUploadPolicySignature :: !Text - -- ^ The signature of the Base64 encoded JSON document. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery BundleInstanceS3Storage - -instance IsXML BundleInstanceS3Storage where - xmlPickler = ec2XML - -data BundleInstanceTaskStorage = BundleInstanceTaskStorage - { bitsS3 :: !BundleInstanceS3Storage - -- ^ An Amazon S3 storage location. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery BundleInstanceTaskStorage - -instance IsXML BundleInstanceTaskStorage where - xmlPickler = ec2XML - -data BundleInstanceTaskError = BundleInstanceTaskError - { biteCode :: !Text - -- ^ The error code. - , biteMessage :: !Text - -- ^ The error message. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML BundleInstanceTaskError where - xmlPickler = ec2XML - -data BundleInstanceState - = Pending - | WaitingForShutdown --waiting-for-shutdown - | Bundling - | Storing - | Cancelling - | Complete - | Failed - deriving (Eq, Ord) - -instance Show BundleInstanceState where - show st = case st of - Pending -> "pending" - WaitingForShutdown -> "waiting-for-shutdown" - Bundling -> "bundling" - Storing -> "storing" - Cancelling -> "cancelling" - Complete -> "complete" - Failed -> "failed" - -instance Read BundleInstanceState where - readPrec = readAssocList - [ ("pending", Pending) - , ("waiting-for-shutdown", WaitingForShutdown) - , ("bundling", Bundling) - , ("storing", Storing) - , ("cancelling", Cancelling) - , ("complete", Complete) - , ("failed", Failed) - ] - -instance IsXML BundleInstanceState where - xmlPickler = xpContent xpPrim - -data BundleInstanceTask = BundleInstanceTask - { bitInstanceId :: !Text - -- ^ The ID of the instance associated with this bundle task. - , bitBundleId :: !Text - -- ^ The ID for this bundle task. - , bitState :: !BundleInstanceState - -- ^ The state of the task. - , bitStartTime :: !UTCTime - -- ^ The time this task started. - , bitUpdateTime :: !UTCTime - -- ^ The time of the most recent update for the task. - , bitStorage :: !BundleInstanceTaskStorage - -- ^ The Amazon S3 storage locations. - , bitProgress :: !Text - -- ^ The level of task completion, as a percent (for example, 20%). - , bitError :: Maybe BundleInstanceTaskError - -- ^ If the task fails, a description of the error. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML BundleInstanceTask where - xmlPickler = ec2XML - -data CancelSpotInstanceRequestsResponseSetItemType = CancelSpotInstanceRequestsResponseSetItemType - { csirrsitSpotInstanceRequestId :: !Text - -- ^ The ID of the Spot Instance request. - , csirrsitState :: !Text - -- ^ The state of the Spot Instance request. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML CancelSpotInstanceRequestsResponseSetItemType where - xmlPickler = ec2XML - --- data ConversionTaskType = ConversionTaskType --- { cttConversionTaskId :: !Text --- -- ^ The ID of the conversion task --- , cttExpirationTime :: !Text --- -- ^ The time when the task expires. If the upload isn't complete --- -- before the expiration time, we automatically cancel the task. --- , cttImportVolume :: !ImportVolumeTaskDetailsType --- -- ^ If the task is for importing a volume, this contains information --- -- about the import volume task. --- , cttImportInstance :: !ImportInstanceTaskDetailsType --- -- ^ If the task is for importing an instance, this contains --- -- information about the import instance task. --- , cttState :: !Text --- -- ^ The state of the conversion task. --- , cttStatusMessage :: !Text --- -- ^ The status message related to the conversion task. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ConversionTaskType - --- instance IsXML ConversionTaskType where --- xmlPickler = ec2XML - --- data CreateVolumePermissionItemType = CreateVolumePermissionItemType --- { cvpitUserId :: !Text --- -- ^ The ID of an AWS account that can create volumes from the --- -- snapshot. --- , cvpitGroup :: !Text --- -- ^ The group that is allowed to create volumes from the snapshot. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery CreateVolumePermissionItemType - --- instance IsXML CreateVolumePermissionItemType where --- xmlPickler = ec2XML - --- data CustomerGatewayType = CustomerGatewayType --- { cgtCustomerGatewayId :: !Text --- -- ^ The ID of the customer gateway. --- , cgtState :: !Text --- -- ^ The current state of the customer gateway. --- , cgtType :: !Text --- -- ^ The type of VPN connection the customer gateway supports. --- , cgtIpAddress :: !Text --- -- ^ The Internet-routable IP address of the customer gateway's --- -- outside interface. --- , cgtBgpAsn :: !Integer --- -- ^ The customer gateway's Border Gateway Protocol (BGP) Autonomous --- -- System Number (ASN). --- , cgtTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery CustomerGatewayType - --- instance IsXML CustomerGatewayType where --- xmlPickler = ec2XML - --- data DescribeAddressesResponseItemType = DescribeAddressesResponseItemType --- { daritPublicIp :: !Text --- -- ^ The public IP address. --- , daritAllocationId :: !Text --- -- ^ The ID representing the allocation of the address for use with --- -- EC2-VPC. --- , daritDomain :: !Text --- -- ^ Indicates whether this Elastic IP address is for instances in --- -- EC2-Classic or EC2-VPC. --- , daritInstanceId :: !Text --- -- ^ The ID of the instance the address is associated with (if any). --- , daritAssociationId :: !Text --- -- ^ The ID representing the association of an Elastic IP address with --- -- an instance in a VPC. --- , daritNetworkInterfaceId :: !Text --- -- ^ The ID of the network interface. --- , daritNetworkInterfaceOwnerId :: !Text --- -- ^ The ID of the AWS account that owns the network interface. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DescribeAddressesResponseItemType - --- instance IsXML DescribeAddressesResponseItemType where --- xmlPickler = ec2XML - -data DescribeImagesResponseItemType = DescribeImagesResponseItemType - { diritImageId :: !Text - -- ^ The ID of the AMI. - , diritImageLocation :: !Text - -- ^ The location of the AMI. - , diritImageState :: !Text - -- ^ Current state of the AMI. If the operation returns available, the - -- image is successfully registered and available for launching. - , diritImageOwnerId :: !Text - -- ^ AWS account ID of the image owner. - , diritIsPublic :: !Bool - -- ^ Indicates whether the image has public launch permissions. The - -- value is true if this image has public launch permissions or - -- false if it has only implicit and explicit launch permissions. - , diritProductCodes :: [ProductCodesSetItemType] - -- ^ Any product codes associated with the AMI. - , diritArchitecture :: !Text - -- ^ The architecture of the image. - , diritImageType :: !Text - -- ^ The type of image. - , diritKernelId :: Maybe Text - -- ^ The kernel associated with the image, if any. - -- Only applicable for machine images. - , diritRamdiskId :: Maybe Text - -- ^ The RAM disk associated with the image, if any. - -- Only applicable for machine images. - , diritPlatform :: Maybe Text - -- ^ The value is Windows for Windows AMIs; otherwise blank. - , diritStateReason :: Maybe StateReasonType - -- ^ The reason for the state change. - , diritImageOwnerAlias :: Maybe Text - -- ^ The AWS account alias (for example, amazon, self, etc.) or AWS - -- account ID that owns the AMI. - , diritName :: !Text - -- ^ The name of the AMI that was provided during image creation. - , diritDescription :: Maybe Text - -- ^ The description of the AMI that was provided during image creation. - , diritRootDeviceType :: !Text - -- ^ The type of root device used by the AMI. The AMI can use an - -- Amazon EBS volume or an instance store volume. - , diritRootDeviceName :: Maybe Text - -- ^ The device name of the root device (for example, /dev/sda1 or - -- xvda). - , diritBlockDeviceMapping :: [BlockDeviceMappingItemType] - -- ^ Any block device mapping entries. - , diritVirtualizationType :: !Text - -- ^ The type of virtualization of the AMI. - , diritTagSet :: [ResourceTagSetItemType] - -- ^ Any tags assigned to the resource. - , diritHypervisor :: !Text - -- ^ The image's hypervisor type. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML DescribeImagesResponseItemType where - xmlPickler = ec2ItemXML - -data DescribeKeyPairsResponseItemType = DescribeKeyPairsResponseItemType - { dkpritKeyName :: !Text - -- ^ The name of the key pair. - , dkpritKeyFingerprint :: !Text - -- ^ If you used CreateKeyPair to create the key pair, this is the - -- SHA-1 digest of the DER encoded private key. If you used - -- ImportKeyPair to provide AWS the public key, this is the MD5 - -- public key fingerprint as specified in section 4 of RFC4716. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML DescribeKeyPairsResponseItemType where - xmlPickler = ec2ItemXML - -data DescribeReservedInstancesListingsResponseSetItemType = DescribeReservedInstancesListingsResponseSetItemType - { drilrsitReservedInstancesListingId :: !Text - -- ^ The ID of the Reserved Instance listing. - , drilrsitReservedInstancesId :: !Text - -- ^ The ID of the Reserved Instance. - , drilrsitCreateDate :: !UTCTime - -- ^ The time the listing was created. - , drilrsitUpdateDate :: !UTCTime - -- ^ The last modified timestamp of the listing. - , drilrsitStatus :: !Text - -- ^ The status of the Reserved Instance listing. - , drilrsitStatusMessage :: !Text - -- ^ The reason for the current status of the Reserved Instance - -- listing. The response can be blank. - , drilrsitInstanceCounts :: [InstanceCountsSetItemType] - -- ^ The number of instances in this state. - , drilrsitPriceSchedules :: [PriceScheduleSetItemType] - -- ^ The price of the Reserved Instance listing. - , drilrsitTagSet :: [ResourceTagSetItemType] - -- ^ The tags assigned to the resource. Each tag's information is - -- wrapped in an item element. - , drilrsitClientToken :: !Text - -- ^ The idempotency token you provided when you created the listing. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML DescribeReservedInstancesListingsResponseSetItemType where - xmlPickler = ec2ItemXML - --- data DescribeReservedInstancesListingSetItemType = DescribeReservedInstancesListingSetItemType --- { drilsitReservedInstancesListingId :: !Text --- -- ^ The ID of the Reserved Instance listing. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DescribeReservedInstancesListingSetItemType - --- instance IsXML DescribeReservedInstancesListingSetItemType where --- xmlPickler = ec2XML - --- data DescribeReservedInstancesOfferingsResponseSetItemType = DescribeReservedInstancesOfferingsResponseSetItemType --- { driorsitReservedInstancesOfferingId :: !Text --- -- ^ The ID of the Reserved Instance offering. --- , driorsitInstanceType :: !Text --- -- ^ The instance type on which the Reserved Instance can be used. --- , driorsitAvailabilityZone :: !Text --- -- ^ The Availability Zone in which the Reserved Instance can be used. --- , driorsitDuration :: !Integer --- -- ^ The duration of the Reserved Instance, in seconds. --- , driorsitFixedPrice :: !Double --- -- ^ The purchase price of the Reserved Instance. --- , driorsitUsagePrice :: !Double --- -- ^ The usage price of the Reserved Instance, per hour. --- , driorsitProductDescription :: !Text --- -- ^ The Reserved Instance description. --- , driorsitInstanceTenancy :: !Text --- -- ^ The tenancy of the reserved instance. --- , driorsitCurrencyCode :: !Text --- -- ^ The currency of the Reserved Instance offering you are --- -- purchasing. It's specified using ISO 4217 standard currency --- -- codes. At this time, the only supported currency is USD. --- , driorsitOfferingType :: !Text --- -- ^ The Reserved Instance offering type. --- , driorsitRecurringCharges :: !RecurringChargesSetItemType --- -- ^ The recurring charge tag assigned to the resource. --- , driorsitMarketplace :: !Bool --- -- ^ Indicates whether the offering is available through the Reserved --- -- Instance Marketplace (resale) or AWS. Returns true if it is a --- -- Marketplace offering. --- , driorsitPricingDetailsSet :: !PricingDetailsSetItemType --- -- ^ The pricing details of the Reserved Instance offering wrapped in --- -- an item element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DescribeReservedInstancesOfferingsResponseSetItemType - --- instance IsXML DescribeReservedInstancesOfferingsResponseSetItemType where --- xmlPickler = ec2XML - --- data DescribeReservedInstancesOfferingsResponseType = DescribeReservedInstancesOfferingsResponseType --- { driortRequestId :: !Text --- -- ^ The ID of the Reserved Instance offering request. --- , driortReservedInstancesOfferingsSet :: !DescribeReservedInstancesOfferingsResponseSetItemType --- -- ^ The instance type on which the Reserved Instance can be used. --- , driortNextToken :: !Text --- -- ^ The next paginated set of results to return. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DescribeReservedInstancesOfferingsResponseType - --- instance IsXML DescribeReservedInstancesOfferingsResponseType where --- xmlPickler = ec2XML - --- data DescribeReservedInstancesResponseSetItemType = DescribeReservedInstancesResponseSetItemType --- { drirsitReservedInstancesId :: !Text --- -- ^ The ID of the Reserved Instance. --- , drirsitInstanceType :: !Text --- -- ^ The instance type on which the Reserved Instance can be used. --- , drirsitAvailabilityZone :: !Text --- -- ^ The Availability Zone in which the Reserved Instance can be used. --- , drirsitStart :: !UTCTime --- -- ^ The date and time the Reserved Instance started. --- , drirsitDuration :: !Integer --- -- ^ The duration of the Reserved Instance, in seconds. --- , drirsitFixedPrice :: !Double --- -- ^ The purchase price of the Reserved Instance. --- , drirsitUsagePrice :: !Double --- -- ^ The usage price of the Reserved Instance, per hour. --- , drirsitInstanceCount :: !Integer --- -- ^ The number of Reserved Instances purchased. --- , drirsitProductDescription :: !Text --- -- ^ The Reserved Instance description. --- , drirsitState :: !Text --- -- ^ The state of the Reserved Instance purchase. --- , drirsitTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- , drirsitInstanceTenancy :: !Text --- -- ^ The tenancy of the reserved instance. --- , drirsitCurrencyCode :: !Text --- -- ^ The currency of the Reserved Instance. It's specified using ISO --- -- 4217 standard currency codes. At this time, the only supported --- -- currency is USD. --- , drirsitOfferingType :: !Text --- -- ^ The Reserved Instance offering type. --- , drirsitRecurringCharges :: !RecurringChargesSetItemType --- -- ^ The recurring charge tag assigned to the resource. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DescribeReservedInstancesResponseSetItemType - --- instance IsXML DescribeReservedInstancesResponseSetItemType where --- xmlPickler = ec2XML - --- data DescribeReservedInstancesSetItemType = DescribeReservedInstancesSetItemType --- { drisitReservedInstancesId :: !Text --- -- ^ The ID of the Reserved Instance. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DescribeReservedInstancesSetItemType - --- instance IsXML DescribeReservedInstancesSetItemType where --- xmlPickler = ec2XML - --- data DescribeSnapshotsSetItemResponseType = DescribeSnapshotsSetItemResponseType --- { dssirtSnapshotId :: !Text --- -- ^ The ID of the snapshot. --- , dssirtVolumeId :: !Text --- -- ^ The ID of the volume. --- , dssirtStatus :: !Text --- -- ^ The snapshot state. --- , dssirtStartTime :: !UTCTime --- -- ^ The time stamp when the snapshot was initiated. --- , dssirtProgress :: !Text --- -- ^ The progress of the snapshot, as a percentage. --- , dssirtOwnerId :: !Text --- -- ^ The ID of the AWS account that owns the snapshot. --- , dssirtVolumeSize :: !Text --- -- ^ The size of the volume, in GiB. --- , dssirtDescription :: !Text --- -- ^ The description of the snapshot. --- , dssirtOwnerAlias :: !Text --- -- ^ The AWS account alias (for example, amazon, self) or AWS account --- -- ID that owns the AMI. --- , dssirtTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DescribeSnapshotsSetItemResponseType - --- instance IsXML DescribeSnapshotsSetItemResponseType where --- xmlPickler = ec2XML - --- data DescribeVolumesSetItemResponseType = DescribeVolumesSetItemResponseType --- { dvsirtVolumeId :: !Text --- -- ^ The ID of the volume. --- , dvsirtSize :: !Text --- -- ^ The size of the volume, in GiBs. --- , dvsirtSnapshotId :: !Text --- -- ^ The snapshot from which the volume was created (optional). --- , dvsirtAvailabilityZone :: !Text --- -- ^ The Availability Zone in which the volume was created. --- , dvsirtStatus :: !Text --- -- ^ The state of the volume. --- , dvsirtCreateTime :: !UTCTime --- -- ^ The time stamp when volume creation was initiated. --- , dvsirtAttachmentSet :: !AttachmentSetItemResponseType --- -- ^ Any volumes attached, each one wrapped in an item element. --- , dvsirtTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- , dvsirtVolumeType :: !Text --- -- ^ The volume type. --- , dvsirtIops :: !Integer --- -- ^ The number of I/O operations per second (IOPS) that the volume --- -- supports. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DescribeVolumesSetItemResponseType - --- instance IsXML DescribeVolumesSetItemResponseType where --- xmlPickler = ec2XML - --- data DhcpConfigurationItemType = DhcpConfigurationItemType --- { dcitKey :: !Text --- -- ^ The name of a DHCP option. --- , dcitValueSet :: !DhcpValueType --- -- ^ Any values for a DHCP option, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DhcpConfigurationItemType - --- instance IsXML DhcpConfigurationItemType where --- xmlPickler = ec2XML - --- data DhcpOptionsType = DhcpOptionsType --- { dotDhcpOptionsId :: !Text --- -- ^ The ID of the set of DHCP options. --- , dotDhcpConfigurationSet :: !DhcpConfigurationItemType --- -- ^ The DHCP options in the set. Each option's key and set of values --- -- are wrapped in an item element. --- , dotTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DhcpOptionsType - --- instance IsXML DhcpOptionsType where --- xmlPickler = ec2XML - --- data DhcpValueType = DhcpValueType --- { dvtValue :: !Text --- -- ^ A value for the DHCP option. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DhcpValueType - --- instance IsXML DhcpValueType where --- xmlPickler = ec2XML - --- data DiskImageDescriptionType = DiskImageDescriptionType --- { didtFormat :: !Text --- -- ^ The disk image format. --- , didtSize :: !Integer --- -- ^ The size of the disk image. --- , didtImportManifestUrl :: !Text --- -- ^ A presigned URL for the import manifest stored in Amazon S3. For --- -- information about creating a presigned URL for an Amazon S3 --- -- object, read the "Query String Request Authentication --- -- Alternative" section of the Authenticating REST Requests topic in --- -- the Amazon Simple Storage Service Developer Guide. --- , didtChecksum :: !Text --- -- ^ The checksum computed for the disk image. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DiskImageDescriptionType - --- instance IsXML DiskImageDescriptionType where --- xmlPickler = ec2XML - --- data DiskImageVolumeDescriptionType = DiskImageVolumeDescriptionType --- { divdtSize :: !Integer --- -- ^ The size of the volume. --- , divdtId :: !Text --- -- ^ The volume identifier. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery DiskImageVolumeDescriptionType - --- instance IsXML DiskImageVolumeDescriptionType where --- xmlPickler = ec2XML - -data EbsBlockDeviceType = EbsBlockDeviceType - { ebdtSnapshotId :: !Text - -- ^ The ID of the snapshot. - , ebdtVolumeSize :: !Integer - -- ^ The size of the volume, in GiB. - , ebdtDeleteOnTermination :: !Bool - -- ^ Indicates whether the Amazon EBS volume is deleted on instance termination. - , ebdtVolumeType :: !Text - -- ^ The volume type. - , ebdtIops :: Maybe Integer - -- ^ The number of I/O operations per second (IOPS) that the volume - -- supports. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery EbsBlockDeviceType - -instance IsXML EbsBlockDeviceType where - xmlPickler = ec2XML - -data EbsInstanceBlockDeviceMappingResponseType = EbsInstanceBlockDeviceMappingResponseType - { eibdmrtVolumeId :: !Text - -- ^ The ID of the Amazon EBS volume. - , eibdmrtStatus :: !Text - -- ^ The attachment state. - , eibdmrtAttachTime :: !UTCTime - -- ^ The time stamp when the attachment initiated. - , eibdmrtDeleteOnTermination :: !Bool - -- ^ Indicates whether the volume is deleted on instance termination. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML EbsInstanceBlockDeviceMappingResponseType where - xmlPickler = ec2ItemXML - --- data ExportToS3Task = ExportToS3Task --- { etstDiskImageFormat :: Maybe Text --- , etstContainerFormat :: Maybe Text --- , etstS3Bucket :: !Text --- , etstS3Prefix :: !Text --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ExportToS3Task - --- instance IsXML ExportToS3Task where --- xmlPickler = ec2XML - --- data ExportTaskResponseType = ExportTaskResponseType --- { etrtExportTaskId :: !Text --- -- ^ The ID of the export task. --- , etrtDescription :: !Text --- -- ^ A description of the resource being exported. --- , etrtState :: !Text --- -- ^ The state of the conversion task. --- , etrtStatusMessage :: !Text --- -- ^ The status message related to the export task. --- , etrtInstanceExport :: !InstanceExportTaskResponseType --- -- ^ The instance being exported. --- , etrtExportToS3 :: !ExportToS3TaskResponseType --- -- ^ The destination Amazon S3 bucket. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ExportTaskResponseType - --- instance IsXML ExportTaskResponseType where --- xmlPickler = ec2XML - --- data ExportToS3TaskResponseType = ExportToS3TaskResponseType --- { etstrtDiskImageFormat :: !Text --- -- ^ The format for the exported image. --- , etstrtContainerFormat :: !Text --- -- ^ The container format used to combine disk images with metadata --- -- (such as OVF). --- , etstrtS3Bucket :: !Text --- -- ^ The Amazon S3 bucket for the destination image. --- , etstrtS3Key :: !Text --- -- ^ The image written to a single object in s3bucket at the S3 key --- -- s3prefix + exportTaskId + '.' +diskImageFormat. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ExportToS3TaskResponseType - --- instance IsXML ExportToS3TaskResponseType where --- xmlPickler = ec2XML - -data GroupItemType = GroupItemType - { gitGroupId :: !Text - -- ^ The ID of the security group. - , gitGroupName :: !Text - -- ^ The name of the security group. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery GroupItemType - -instance IsXML GroupItemType where - xmlPickler = ec2ItemXML - -data IamInstanceProfileRequestType = IamInstanceProfileRequestType - { iiprtArn :: Maybe Text - -- ^ The Amazon Resource Name (ARN) of the instance profile. - , iiprtName :: Maybe Text - -- ^ The name of the instance profile. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery IamInstanceProfileRequestType - --- instance IsXML IamInstanceProfileRequestType where --- xmlPickler = ec2XML - -data IamInstanceProfileResponseType = IamInstanceProfileResponseType - { iipruArn :: !Text - -- ^ The Amazon Resource Name (ARN) of the instance profile. - , iipruId :: !Text - -- ^ The ID of the instance profile. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML IamInstanceProfileResponseType where - xmlPickler = ec2XML - --- data IcmpType = IcmpType --- { itctCode :: !Integer --- -- ^ The ICMP code. A value of -1 means all codes for the specified --- -- ICMP type. --- , itctType :: !Integer --- -- ^ The ICMP type. A value of -1 means all types. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery IcmpTypeCodeType - --- instance IsXML IcmpTypeCodeType where --- xmlPickler = ec2XML - --- data InstancePlacement = InstancePlacement --- { ipAvailabilityZone :: !Maybe Text --- , ipGroupName :: !Maybe Text --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InstancePlacement - --- instance IsXML InstancePlacement where --- xmlPickler = ec2XML - --- data ImportInstanceLaunchSpecification = ImportInstanceLaunchSpecification --- { iilsArchitecture :: !Text --- , iilsGroupSet :: Members GroupItemType --- , iilsUserData :: Maybe UserDataType --- , iilsInstance :: !Text --- , iilsPlacement :: Maybe InstancePlacementType --- , iilsMonitoring :: Maybe MonitoringInstanceType --- , iilsSubnetId :: Maybe Text --- , iilsInstanceInitiatedShutdownBehavior :: Maybe Text --- , iilsPrivateIpAddress :: Maybe Text --- } deriving (Show) - --- data ImportInstanceTaskDetailsType = ImportInstanceTaskDetailsType --- { iitdtVolumes :: !ImportInstanceVolumeDetailItemType --- -- ^ Any instance volumes for import, each one wrapped in an item --- -- element. --- , iitdtInstanceId :: !Text --- -- ^ The ID of the instance. --- , iitdtPlatform :: !Text --- -- ^ The value is Windows for Windows AMIs; otherwise blank. --- , iitdtDescription :: !Text --- -- ^ An optional description of the instance. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ImportInstanceTaskDetailsType - --- instance IsXML ImportInstanceTaskDetailsType where --- xmlPickler = ec2XML - --- data ImportInstanceVolumeDetailItemType = ImportInstanceVolumeDetailItemType --- { iivditBytesConverted :: !Integer --- -- ^ The number of bytes converted so far. --- , iivditAvailabilityZone :: !Text --- -- ^ The Availability Zone where the resulting instance will reside. --- , iivditImage :: !DiskImageDescriptionType --- -- ^ The image. --- , iivditDescription :: !Text --- -- ^ The description you provided when starting the import instance --- -- task. --- , iivditVolume :: !DiskImageVolumeDescriptionType --- -- ^ The volume. --- , iivditStatus :: !Text --- -- ^ The status of the import of this particular disk image. --- , iivditStatusMessage :: !Text --- -- ^ The status information or errors related to the disk image. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ImportInstanceVolumeDetailItemType - --- instance IsXML ImportInstanceVolumeDetailItemType where --- xmlPickler = ec2XML - --- data ImportVolumeTaskDetailsType = ImportVolumeTaskDetailsType --- { ivtdtBytesConverted :: !Integer --- -- ^ The number of bytes converted so far. --- , ivtdtAvailabilityZone :: !Text --- -- ^ The Availability Zone where the resulting volume will reside. --- , ivtdtDescription :: !Text --- -- ^ The description you provided when starting the import volume --- -- task. --- , ivtdtImage :: !DiskImageDescriptionType --- -- ^ The image. --- , ivtdtVolume :: !DiskImageVolumeDescriptionType --- -- ^ The volume. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ImportVolumeTaskDetailsType - --- instance IsXML ImportVolumeTaskDetailsType where --- xmlPickler = ec2XML - -data InstanceBlockDeviceMappingItemType = InstanceBlockDeviceMappingItemType - { ibdmitDeviceName :: !Text - -- ^ The device name exposed to the instance (for example, /dev/sdh or - -- xvdh). - , ibdmitVirtualName :: !Text - -- ^ The virtual device name. - , ibdmitEbs :: !InstanceEbsBlockDeviceType - -- ^ Parameters used to automatically set up Amazon EBS volumes when - -- the instance is launched. - , ibdmitNoDevice :: !Text - -- ^ Include this empty element to suppress the specified device - -- included in the block device mapping of the AMI. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery InstanceBlockDeviceMappingItemType - --- instance IsXML InstanceBlockDeviceMappingItemType where --- xmlPickler = ec2XML - -data InstanceBlockDeviceMappingResponseItemType = InstanceBlockDeviceMappingResponseItemType - { ibdmritDeviceName :: !Text - -- ^ The device name exposed to the instance (for example, /dev/sdh, or xvdh). - , ibdmritEbs :: !EbsInstanceBlockDeviceMappingResponseType - -- ^ Parameters used to automatically set up Amazon EBS volumes when - -- the instance is launched. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML InstanceBlockDeviceMappingResponseItemType where - xmlPickler = ec2ItemXML - -data InstanceCountsSetItemType = InstanceCountsSetItemType - { icsitState :: !Text - -- ^ The states of the listed Reserved Instances. - , icsitInstanceCount :: !Integer - -- ^ The number of listed Reserved Instances in the state specified by - -- the state. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML InstanceCountsSetItemType where - xmlPickler = ec2XML - -data InstanceEbsBlockDeviceType = InstanceEbsBlockDeviceType - { iebdtDeleteOnTermination :: !Bool - -- ^ Indicates whether the volume is deleted on instance termination. - , iebdtVolumeId :: !Text - -- ^ The ID of the volume. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery InstanceEbsBlockDeviceType - --- instance IsXML InstanceEbsBlockDeviceType where --- xmlPickler = ec2XML - --- data InstanceExportTaskResponseType = InstanceExportTaskResponseType --- { ietrtInstanceId :: !Text --- -- ^ The ID of the resource being exported. --- , ietrtTargetEnvironment :: !Text --- -- ^ The target virtualization environment. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InstanceExportTaskResponseType - --- instance IsXML InstanceExportTaskResponseType where --- xmlPickler = ec2XML - -data InstanceMonitoringStateType = InstanceMonitoringStateType - { imstState :: !Text - -- ^ The state of monitoring for the instance. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML InstanceMonitoringStateType where - xmlPickler = ec2XML - -data InstanceNetworkInterfaceAssociationType = InstanceNetworkInterfaceAssociationType - { iniatPublicIp :: !Text - -- ^ The address of the Elastic IP address bound to the network interface. - , iniatPublicDnsName :: !Text - -- ^ The public DNS name. - , iniatIpOwnerId :: !Text - -- ^ The ID of the owner of the Elastic IP address. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML InstanceNetworkInterfaceAssociationType where - xmlPickler = ec2XML - -data InstanceNetworkInterfaceAttachmentType = InstanceNetworkInterfaceAttachmentType - { iniatAttachmentID :: !Text - -- ^ The ID of the network interface attachment. - , iniatDeviceIndex :: !Integer - -- ^ The index of the device on the instance for the network interface attachment. - , iniatStatus :: !Text - -- ^ The attachment state. - , iniatAttachTime :: !UTCTime - -- ^ The time stamp when the attachment initiated. - , iniatDeleteOnTermination :: !Bool - -- ^ Indicates whether the network interface is deleted when the - -- instance is terminated. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML InstanceNetworkInterfaceAttachmentType where - xmlPickler = ec2XML - --- data InstanceNetworkInterfaceSetItemRequestType = InstanceNetworkInterfaceSetItemRequestType --- { inisirtNetworkInterfaceId :: !Text --- -- ^ The ID of the network interface. --- , inisirtDeviceIndex :: !Integer --- -- ^ Required. The index of the device on the instance for the network --- -- interface attachment. --- , inisirtSubnetId :: !Text --- -- ^ The ID of the subnet associated with the network string. --- , inisirtDescription :: !Text --- -- ^ The description of the network interface. --- , inisirtPrivateIpAddress :: !Text --- -- ^ The private IP address of the network interface. --- , inisirtGroupSet :: !SecurityGroupIdSetItemType --- -- ^ The IDs of the security groups for use by the network interface. --- , inisirtDeleteOnTermination :: !Bool --- -- ^ If set to true, the interface is deleted when the instance is --- -- terminated. --- , inisirtPrivateIpAddressesSet :: !PrivateIpAddressesSetItemRequestType --- -- ^ The list of IP addresses to assign to the network interface. --- , inisirtSecondaryPrivateIpAddressCount :: !Integer --- -- ^ The number of secondary private IP addresses. You cannot specify --- -- this option with privateIpAddressSet. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InstanceNetworkInterfaceSetItemRequestType - --- instance IsXML InstanceNetworkInterfaceSetItemRequestType where --- xmlPickler = ec2XML - -data InstanceNetworkInterfaceSetItemType = InstanceNetworkInterfaceSetItemType - { inisitNetworkInterfaceId :: !Text - -- ^ The ID of the network interface. - , inisitSubnetId :: !Text - -- ^ The ID of the subnet. - , inisitVpcId :: !Text - -- ^ The ID of the VPC. - , inisitDescription :: !Text - -- ^ The description. - , inisitOwnerId :: !Text - -- ^ The ID of the customer who created the network interface. - , inisitStatus :: !Text - -- ^ The status of the network interface. - , inisitMacAddress :: !Text - -- ^ The MAC address. - , inisitPrivateIpAddress :: !Text - -- ^ The IP address of the network interface within the subnet. - , inisitPrivateDnsName :: !Text - -- ^ The private DNS name. - , inisitSourceDestCheck :: !Bool - -- ^ Indicates whether to validate network traffic to or from this - -- network interface. - , inisitGroupSet :: [GroupItemType] - -- ^ A security group. - , inisitAttachment :: !InstanceNetworkInterfaceAttachmentType - -- ^ The network interface attachment. - , inisitAssociation :: !InstanceNetworkInterfaceAssociationType - -- ^ The association information for an Elastic IP associated with the - -- network interface. - , inisitPrivateIpAddressesSet :: [InstancePrivateIpAddressesSetItemType] - -- ^ The private IP addresses associated with the network interface. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML InstanceNetworkInterfaceSetItemType where - xmlPickler = ec2XML - -data InstancePrivateIpAddressesSetItemType = InstancePrivateIpAddressesSetItemType - { ipiasitPrivateIpAddress :: !Text - -- ^ The private IP address of the network interface - , ipiasitPrivateDnsName :: !Text - -- ^ The private DNS name. - , ipiasitPrimary :: !Bool - -- ^ Indicates whether this IP address is the primary private IP - -- address of the network interface. - , ipiasitAssociation :: !InstanceNetworkInterfaceAssociationType - -- ^ The association information for an Elastic IP address associated - -- with the network interface. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML InstancePrivateIpAddressesSetItemType where - xmlPickler = ec2XML - -data InstanceStateChangeType = InstanceStateChangeType - { isctInstanceId :: !Text - -- ^ The instance ID. - , isctCurrentState :: !InstanceStateType - -- ^ The current state of the instance. - , isctPreviousState :: !InstanceStateType - -- ^ The previous state of the instance. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML InstanceStateChangeType where - xmlPickler = ec2ItemXML - -data InstanceStateType = InstanceStateType - { istCode :: !Integer - -- ^ The low byte represents the state. The high byte is an opaque - -- internal value and should be ignored. - , istName :: !Text - -- ^ The current state of the instance. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML InstanceStateType where - xmlPickler = ec2XML - --- data InstanceStatusDetailsSetType = InstanceStatusDetailsSetType --- { isdstName :: !Text --- -- ^ The type of instance status detail. --- , isdstStatus :: !Text --- -- ^ The status. --- , isdstImpairedSince :: !UTCTime --- -- ^ The time when a status check failed. For an instance that was --- -- launched and impaired, this is the time when the instance was --- -- launched. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InstanceStatusDetailsSetType - --- instance IsXML InstanceStatusDetailsSetType where --- xmlPickler = ec2XML - --- data InstanceStatusEventsSetType = InstanceStatusEventsSetType --- { isest[:: !InstanceStatusEventType] --- -- ^ The scheduled events for the instance. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InstanceStatusEventsSetType - --- instance IsXML InstanceStatusEventsSetType where --- xmlPickler = ec2XML - --- data InstanceStatusEventType = InstanceStatusEventType --- { isetCode :: !Text --- -- ^ The associated code of the event. --- , isetDescription :: !Text --- -- ^ A description of the event. --- , isetNotBefore :: !UTCTime --- -- ^ The earliest scheduled start time for the event. --- , isetNotAfter :: !UTCTime --- -- ^ The latest scheduled end time for the event. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InstanceStatusEventType - --- instance IsXML InstanceStatusEventType where --- xmlPickler = ec2XML - --- data InstanceStatusItemType = InstanceStatusItemType --- { isitInstanceId :: !Text --- -- ^ The ID of the instance. --- , isitAvailabilityZone :: !Text --- -- ^ The Availability Zone of the instance. --- , isitEventsSet :: !InstanceStatusEventsSetType --- -- ^ Extra information regarding events associated with the instance. --- , isitInstanceState :: !InstanceStateType --- -- ^ The intended state of the instance. Calls to --- -- DescribeInstanceStatus require that an instance be in the running --- -- state. --- , isitSystemStatus :: !InstanceStatusType --- -- ^ Reports impaired functionality that stems from issues related to --- -- the systems that support an instance, such as hardware failures --- -- and network connectivity problems. --- , isitInstanceStatus :: !InstanceStatusType --- -- ^ Reports impaired functionality that arises from problems internal --- -- to the instance. The DescribeInstanceStatus response elements --- -- report such problems as impaired reachability. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InstanceStatusItemType - --- instance IsXML InstanceStatusItemType where --- xmlPickler = ec2XML - --- data InstanceStatusSetType = InstanceStatusSetType --- { isst[:: !InstanceStatusItemType] --- -- ^ The status of the instance. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InstanceStatusSetType - --- instance IsXML InstanceStatusSetType where --- xmlPickler = ec2XML - --- data InstanceStatusType = InstanceStatusType --- { istStatus :: !Text --- -- ^ The status. --- , istDetails :: !InstanceStatusDetailsSetType --- -- ^ The system instance health or application instance health. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InstanceStatusType - --- instance IsXML InstanceStatusType where --- xmlPickler = ec2XML - --- data InternetGatewayAttachmentType = InternetGatewayAttachmentType --- { igatVpcId :: !Text --- -- ^ The ID of the VPC. --- , igatState :: !Text --- -- ^ The current state of the attachment. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InternetGatewayAttachmentType - --- instance IsXML InternetGatewayAttachmentType where --- xmlPickler = ec2XML - --- data InternetGatewayType = InternetGatewayType --- { igtInternetGatewayId :: !Text --- -- ^ The ID of the Internet gateway. --- , igtAttachmentSet :: !InternetGatewayAttachmentType --- -- ^ Any VPCs attached to the Internet gateway, each one wrapped in an --- -- item element. --- , igtTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery InternetGatewayType - --- instance IsXML InternetGatewayType where --- xmlPickler = ec2XML - -data UserIdGroupPair = UserIdGroupPair - { uigUserId :: Maybe Text - -- ^ The ID of an AWS account. Cannot be used when specifying a CIDR - -- IP address range. - , uigGroupId :: Maybe Text - -- ^ The ID of the security group in the specified AWS account. - -- Cannot be used when specifying a CIDR IP address range. - , uigGroupName :: Maybe Text - -- ^ The name of the security group in the specified AWS account. - -- Cannot be used when specifying a CIDR IP address range. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery UserIdGroupPair - -instance IsXML UserIdGroupPair where - xmlPickler = ec2ItemXML - -data IpPermissionType = IpPermissionType - { iptIpProtocol :: !Protocol - -- ^ The protocol. - , iptFromPort :: !Integer - -- ^ The start of port range for the ICMP and UDP protocols, or an ICMP - -- type number. A value of -1 indicates all ICMP types. - , iptToPort :: !Integer - -- ^ The end of port range for the ICMP and UDP protocols, or an ICMP - -- code. A value of -1 indicates all ICMP codes for the given ICMP type. - , iptGroups :: [UserIdGroupPair] - -- ^ A list of security group and AWS account ID pairs. - , iptIpRanges :: [IpRange] - -- ^ A list of IP ranges. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery IpPermissionType - -instance IsXML IpPermissionType where - xmlPickler = ec2ItemXML - -data IpRange = IpRange - { irCidrIp :: !Text - -- ^ The CIDR range. You can either specify a CIDR range or a source - -- security group, not both. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery IpRange - -instance IsXML IpRange where - xmlPickler = ec2ItemXML - --- data LaunchPermissionItemType = LaunchPermissionItemType --- { lpitGroup :: !Text --- -- ^ The name of the group. --- , lpitUserId :: !Text --- -- ^ The AWS account ID. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery LaunchPermissionItemType - --- instance IsXML LaunchPermissionItemType where --- xmlPickler = ec2XML - --- data LaunchSpecificationRequestType = LaunchSpecificationRequestType --- { lsrtImageId :: !Text --- -- ^ The AMI ID. --- , lsrtKeyName :: !Text --- -- ^ The name of the key pair. --- , lsrtGroupSet :: !GroupItemType --- -- ^ A list of security groups. Each group is wrapped in an item --- -- element. --- , lsrtUserData :: !UserDataType --- -- ^ Base64-encoded MIME user data made available to the instance(s) --- -- in the reservation. --- , lsrtInstanceType :: !Text --- -- ^ The instance type. --- , lsrtPlacement :: !PlacementRequestType --- -- ^ The placement information for the instance. --- , lsrtKernelId :: !Text --- -- ^ The ID of the kernel to select. --- , lsrtRamdiskId :: !Text --- -- ^ The ID of the RAM disk to select. Some kernels require additional --- -- drivers at launch. Check the kernel requirements for information --- -- on whether you need to specify a RAM disk and search for the --- -- kernel ID. --- , lsrtBlockDeviceMapping :: !BlockDeviceMappingItemType --- -- ^ Any block device mapping entries for the instance. Each entry is --- -- wrapped in an item element. --- , lsrtMonitoring :: !MonitoringInstanceType --- -- ^ The monitoring information for the instance. --- , lsrtSubnetId :: !Text --- -- ^ The ID of the subnet. --- , lsrtNetworkInterfaceSet :: !InstanceNetworkInterfaceSetItemRequestType --- -- ^ The network interfaces associated with the instance. --- , lsrtIamInstanceProfile :: !IamInstanceProfileRequestType --- -- ^ The IAM Instance Profile (IIP) associated with the instance. --- , lsrtEbsOptimized :: !Bool --- -- ^ Indicates whether the instance is optimized for EBS I/O. This --- -- optimization provides dedicated throughput to Amazon EBS and an --- -- optimized configuration stack to provide optimal EBS I/O --- -- performance. This optimization isn't available with all instance --- -- types. Additional usage charges apply when using an EBS Optimized --- -- instance. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery LaunchSpecificationRequestType - --- instance IsXML LaunchSpecificationRequestType where --- xmlPickler = ec2XML - --- data LaunchSpecificationResponseType = LaunchSpecificationResponseType --- { lsruImageId :: !Text --- -- ^ The AMI ID. --- , lsruKeyName :: !Text --- -- ^ The name of the key pair. --- , lsruGroupSet :: !GroupItemType --- -- ^ A list of security groups. Each group is wrapped in an item --- -- element. --- , lsruInstanceType :: !Text --- -- ^ The instance type. --- , lsruPlacement :: !PlacementRequestType --- -- ^ The placement information for the instance. --- , lsruKernelId :: !Text --- -- ^ The ID of the kernel to select. --- , lsruRamdiskId :: !Text --- -- ^ The ID of the RAM disk to select. Some kernels require additional --- -- drivers at launch. Check the kernel requirements for information --- -- on whether you need to specify a RAM disk and search for the --- -- kernel ID. --- , lsruBlockDeviceMapping :: !BlockDeviceMappingItemType --- -- ^ Any block device mapping entries for the instance. Each entry is --- -- wrapped in an item element. --- , lsruMonitoring :: !MonitoringInstanceType --- -- ^ The monitoring information for the instance. --- , lsruSubnetId :: !Text --- -- ^ The ID of the subnet. --- , lsruNetworkInterfaceSet :: !InstanceNetworkInterfaceSetItemRequestType --- -- ^ The network interfaces for the instance. --- , lsruIamInstanceProfile :: !IamInstanceProfileRequestType --- -- ^ The IAM Instance Profile (IIP) associated with the instance. --- , lsruEbsOptimized :: !Bool --- -- ^ Indicates whether the instance is optimized for EBS I/O. This --- -- optimization provides dedicated throughput to Amazon EBS and an --- -- optimized configuration stack to provide optimal EBS I/O --- -- performance. This optimization isn't available with all instance --- -- types. Additional usage charges apply when using an EBS Optimized --- -- instance. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery LaunchSpecificationResponseType - --- instance IsXML LaunchSpecificationResponseType where --- xmlPickler = ec2XML - -data MonitoringInstanceType = MonitoringInstanceType - { mitEnabled :: !Bool - -- ^ Indicates whether monitoring is enabled for the instance. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery MonitoringInstanceType - --- instance IsXML MonitoringInstanceType where --- xmlPickler = ec2XML - --- data MonitorInstancesResponseSetItemType = MonitorInstancesResponseSetItemType --- { mirsitInstanceId :: !Text --- -- ^ The instance ID. --- , mirsitMonitoring :: !InstanceMonitoringStateType --- -- ^ The monitoring information. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery MonitorInstancesResponseSetItemType - --- instance IsXML MonitorInstancesResponseSetItemType where --- xmlPickler = ec2XML - --- data NetworkAclAssociationType = NetworkAclAssociationType --- { naatNetworkAclAssociationId :: !Text --- -- ^ An identifier representing the association between a network ACL --- -- and a subnet. --- , naatNetworkAclId :: !Text --- -- ^ The ID of the network ACL. --- , naatSubnetId :: !Text --- -- ^ The ID of the subnet. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery NetworkAclAssociationType - --- instance IsXML NetworkAclAssociationType where --- xmlPickler = ec2XML - --- data NetworkAclEntryType = NetworkAclEntryType --- { naetRuleNumber :: !Integer --- -- ^ The rule number for the entry. ACL entries are processed in --- -- ascending order by rule number. --- , naetProtocol :: !Integer --- -- ^ The protocol. A value of -1 means all protocols. --- , naetRuleAction :: !Text --- -- ^ Indicates whether to allow or deny the traffic that matches the --- -- rule. --- , naetEgress :: !Bool --- -- ^ Indicates an egress rule (rule is applied to traffic leaving the --- -- subnet). Value of true indicates egress. --- , naetCidrBlock :: !Text --- -- ^ The network range to allow or deny, in CIDR notation. --- , naetIcmpTypeCode :: !IcmpTypeCodeType --- -- ^ ICMP protocol: The ICMP type and code. --- , naetPortRange :: !PortRangeType --- -- ^ ICMP or UDP protocols: The range of ports the rule applies to. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery NetworkAclEntryType - --- instance IsXML NetworkAclEntryType where --- xmlPickler = ec2XML - --- data NetworkAclType = NetworkAclType --- { natNetworkAclId :: !Text --- -- ^ The ID of the network ACL. --- , natVpcId :: !Text --- -- ^ The ID of the VPC for the network ACL. --- , natDefault :: !Bool --- -- ^ Indicates whether this is the default network ACL for the VPC. --- , natEntrySet :: !NetworkAclEntryType --- -- ^ A list of entries (rules) in the network ACL. Each entry is --- -- wrapped in an item element. --- , natAssociationSet :: !NetworkAclAssociationType --- -- ^ A list of associations between the network ACL and one or more --- -- subnets. Each association is wrapped in an item element. --- , natTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery NetworkAclType - --- instance IsXML NetworkAclType where --- xmlPickler = ec2XML - -data NetworkInterfaceAssociationType = NetworkInterfaceAssociationType - { niatPublicIp :: !Text - -- ^ The address of the Elastic IP address bound to the network - -- interface. - , niatPublicDnsName :: !Text - -- ^ The public DNS name. - , niatIpOwnerId :: !Text - -- ^ The ID of the Elastic IP address owner. - , niatAllocationID :: !Text - -- ^ The allocation ID. - , niatAssociationID :: !Text - -- ^ The association ID. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery NetworkInterfaceAssociationType - --- instance IsXML NetworkInterfaceAssociationType where --- xmlPickler = ec2XML - -data NetworkInterfaceAttachmentType = NetworkInterfaceAttachmentType - { niatAttachmentID :: !Text - -- ^ The ID of the network interface attachment. - , niatInstanceID :: !Text - -- ^ The ID of the instance. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery NetworkInterfaceAttachmentType - --- instance IsXML NetworkInterfaceAttachmentType where --- xmlPickler = ec2XML - -data NetworkInterfacePrivateIpAddressesSetItemType = NetworkInterfacePrivateIpAddressesSetItemType - { nipiasitPrivateIpAddress :: !Text - -- ^ The private IP address of the network interface. - , nipiasitPrivateDnsName :: !Text - -- ^ The private DNS name. - , nipiasitPrimary :: !Bool - -- ^ Indicates whether this IP address is the primary private IP - -- address of the network interface. - , nipiasitAssociation :: !NetworkInterfaceAssociationType - -- ^ The association information for an Elastic IP address associated - -- with the network interface. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery NetworkInterfacePrivateIpAddressesSetItemType - --- instance IsXML NetworkInterfacePrivateIpAddressesSetItemType where --- xmlPickler = ec2XML - -data NetworkInterfaceType = NetworkInterfaceType - { nitNetworkInterfaceId :: !Text - -- ^ The ID of the network interface. - , nitSubnetId :: !Text - -- ^ The ID of the subnet. - , niuNetworkInterfaceId :: !Text - -- ^ The ID of the network interface. - , niuSubnetId :: !Text - -- ^ The ID of the subnet. - , niuVpcId :: !Text - -- ^ The ID of the VPC. - , niuAvailabilityZone :: !Text - -- ^ The Availability Zone. - , niuDescription :: !Text - -- ^ A description. - , niuOwnerId :: !Text - -- ^ The ID of the customer who created the interface. - , niuRequesterId :: !Text - -- ^ The ID of the entity that launched the instance on your behalf - -- (for example, AWS Management Console or Auto Scaling) - , niuRequesterManaged :: !Text - -- ^ Indicates whether the network interface is being managed by AWS. - , niuStatus :: !Text - -- ^ The status of the network interface. - , niuMacAddress :: !Text - -- ^ The MAC address. - , niuPrivateIpAddress :: !Text - -- ^ The IP address of the network interface within the subnet. - , niuPrivateDnsName :: !Text - -- ^ The private DNS name. - , niuSourceDestCheck :: !Bool - -- ^ Indicates whether traffic to or from the instance is validated. - , niuGroupSet :: !GroupItemType - -- ^ The security group. - , niuAttachment :: !NetworkInterfaceAttachmentType - -- ^ The network interface attachment. - , niuAssociation :: !NetworkInterfaceAssociationType - -- ^ The association information for an Elastic IP associated with the - -- network interface. - , niuTagSet :: !ResourceTagSetItemType - -- ^ The tags assigned to the resource. - , niuPrivateIpAddressesSet :: !NetworkInterfacePrivateIpAddressesSetItemType - -- ^ The private IP addresses associated with the network interface. - -- [are returned in a set.] - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery NetworkInterfaceType - --- instance IsXML NetworkInterfaceType where --- xmlPickler = ec2XML - --- data PlacementGroupInfoType = PlacementGroupInfoType --- { pgitGroupName :: !Text --- -- ^ The name of the placement group. --- , pgitStrategy :: !Text --- -- ^ The placement strategy. --- , pgitState :: !Text --- -- ^ The status of the placement group. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery PlacementGroupInfoType - --- instance IsXML PlacementGroupInfoType where --- xmlPickler = ec2XML - --- data PlacementRequestType = PlacementRequestType --- { prtAvailabilityZone :: !Text --- -- ^ The Availability Zone for the instance. --- , prtGroupName :: !Text --- -- ^ The name of a placement group for the instance. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery PlacementRequestType - --- instance IsXML PlacementRequestType where --- xmlPickler = ec2XML - --- FIXME: is the corresponding request type now irrelavant? -data PlacementType = PlacementType - { pruAvailabilityZone :: Maybe AvailabilityZone - -- ^ The Availability Zone of the instance. - , pruGroupName :: Maybe Text - -- ^ The name of the placement group the instance is in - -- (for cluster compute instances). - , pruTenancy :: Maybe Text - -- ^ The tenancy of the instance (if the instance is running within a -- VPC). - -- FIXME: switch to enum default | dedicated - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery PlacementType - -instance IsXML PlacementType where - xmlPickler = ec2XML - --- data PortRangeType = PortRangeType --- { prtFrom :: !Integer --- -- ^ The first port in the range. --- , prtTo :: !Integer --- -- ^ The last port in the range. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery PortRangeType - --- instance IsXML PortRangeType where --- xmlPickler = ec2XML - --- data PriceScheduleRequestSetItemType = PriceScheduleRequestSetItemType --- { psrsitTerm :: !Integer --- -- ^ The number of months remaining in the reservation. For example, 2 --- -- is the second to the last month before the capacity reservation --- -- expires. --- , psrsitPrice :: !Double --- -- ^ The fixed price for the term. --- , psrsitCurrencyCode :: !Text --- -- ^ The currency for transacting the Reserved Instance resale. At --- -- this time, the only supported currency is USD. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery PriceScheduleRequestSetItemType - --- instance IsXML PriceScheduleRequestSetItemType where --- xmlPickler = ec2XML - -data PriceScheduleSetItemType = PriceScheduleSetItemType - { pssitTerm :: !Integer - -- ^ The number of months remaining in the reservation. For example, 2 - -- is the second to the last month before the capacity reservation - -- expires. - , pssitPrice :: !Double - -- ^ The fixed price for the term. - , pssitCurrencyCode :: !Text - -- ^ The currency for transacting the Reserved Instance resale. At - -- this time, the only supported currency is USD. - , pssitActive :: !Bool - -- ^ The current price schedule, as determined by the term remaining - -- for the Reserved Instance in the listing. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML PriceScheduleSetItemType where - xmlPickler = ec2XML - --- data PriceScheduleSetType = PriceScheduleSetType --- { psst[:: !PriceScheduleSetItemType] --- -- ^ The Reserved Instance listing price schedule item. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery PriceScheduleSetType - --- instance IsXML PriceScheduleSetType where --- xmlPickler = ec2XML - --- data PricingDetailsSetItemType = PricingDetailsSetItemType --- { pdsitPrice :: !Integer --- -- ^ The price per instance. --- , pdsitCount :: !Integer --- -- ^ The number of instances available for the price. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery PricingDetailsSetItemType - --- instance IsXML PricingDetailsSetItemType where --- xmlPickler = ec2XML - --- data PrivateIpAddressesSetItemRequestType = PrivateIpAddressesSetItemRequestType --- { piasirtPrivateIpAddressesSet :: !AssignPrivateIpAddressesSetItemRequestType --- -- ^ The list of private IP addresses. --- , piasirtPrimary :: !Bool --- -- ^ Indicates whether the private IP address is the primary private --- -- IP address. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery PrivateIpAddressesSetItemRequestType - --- instance IsXML PrivateIpAddressesSetItemRequestType where --- xmlPickler = ec2XML - --- data ProductCodeItemType = ProductCodeItemType --- { pcitProductCode :: !Text --- -- ^ The product code. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ProductCodeItemType - --- instance IsXML ProductCodeItemType where --- xmlPickler = ec2XML - -data ProductCodesSetItemType = ProductCodesSetItemType - { pcsitProductCode :: !Text - -- ^ The product code. - , pcsitType :: !Text - -- ^ The type of product code. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML ProductCodesSetItemType where - xmlPickler = ec2ItemXML - --- data ProductDescriptionSetItemType = ProductDescriptionSetItemType --- { pdsitProductDescription :: !Text --- -- ^ The description of the AMI. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ProductDescriptionSetItemType - --- instance IsXML ProductDescriptionSetItemType where --- xmlPickler = ec2XML - --- data PropagatingVgwType = PropagatingVgwType --- { pvtGatewayID :: !Text --- -- ^ The ID of the virtual private gateway (VGW). --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery PropagatingVgwType - --- instance IsXML PropagatingVgwType where --- xmlPickler = ec2XML - --- data RecurringChargesSetItemType = RecurringChargesSetItemType --- { rcsitFrequency :: !Text --- -- ^ The frequency of the recurring charge. --- , rcsitAmount :: !Double --- -- ^ The amount of the recurring charge. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery RecurringChargesSetItemType - --- instance IsXML RecurringChargesSetItemType where --- xmlPickler = ec2XML - -data RegionItemType = RegionItemType - { ritRegionName :: !Text - -- ^ The name of the region. - , ritRegionEndpoint :: !Text - -- ^ The region service endpoint. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML RegionItemType where - xmlPickler = ec2ItemXML - -data ReservationInfoType = ReservationInfoType - { ritReservationId :: !Text - -- ^ The ID of the reservation. - , ritOwnerId :: !Text - -- ^ The ID of the AWS account that owns the reservation. - , ritGroupSet :: [GroupItemType] - -- ^ A list of security groups. - , ritInstancesSet :: [RunningInstancesItemType] - -- ^ A list of instances. - , ritRequesterId :: Maybe Text - -- ^ The ID of the requester that launched the instances on your - -- behalf (for example, AWS Management Console or Auto Scaling). - } deriving (Eq, Ord, Show, Generic) - -instance IsXML ReservationInfoType where - xmlPickler = ec2ItemXML - --- data ReservedInstanceLimitPriceType = ReservedInstanceLimitPriceType --- { rilptAmount :: !Double --- -- ^ Used for Reserved Instance Marketplace offerings. Specifies the --- -- limit price on the total order (instanceCount * price). --- , rilptCurrencyCode :: !Double --- -- ^ Currency in which the limitPrice amount is specified. At this --- -- time, the only supported currency is USD. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery ReservedInstanceLimitPriceType - --- instance IsXML ReservedInstanceLimitPriceType where --- xmlPickler = ec2XML - -data ResourceTagSetItemType = ResourceTagSetItemType - { rtsitKey :: !Text - -- ^ The tag key. - , rtsitValue :: !Text - -- ^ The tag value. - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery ResourceTagSetItemType - -instance IsXML ResourceTagSetItemType where - xmlPickler = ec2ItemXML - --- data RouteTableAssociationType = RouteTableAssociationType --- { rtatRouteTableAssociationId :: !Text --- -- ^ An identifier representing the association between a route table --- -- and a subnet. --- , rtatRouteTableId :: !Text --- -- ^ The ID of the route table. --- , rtatSubnetId :: !Text --- -- ^ The ID of the subnet. --- , rtatMain :: !Bool --- -- ^ Indicates whether this is the main route table. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery RouteTableAssociationType - --- instance IsXML RouteTableAssociationType where --- xmlPickler = ec2XML - --- data RouteTableType = RouteTableType --- { rttRouteTableId :: !Text --- -- ^ The route table's ID. --- , rttVpcId :: !Text --- -- ^ The ID of the VPC for the route table. --- , rttRouteSet :: !RouteType --- -- ^ A list of routes in the route table. Each route is wrapped in an --- -- item element. --- , rttAssociationSet :: !RouteTableAssociationType --- -- ^ A list of associations between the route table and one or more --- -- subnets. Each association is wrapped in an item element. --- , rttPropagatingVgwSet :: !PropagatingVgwType --- -- ^ The IDs of any virtual private gateways (VGW) propagating routes, --- -- each route wrapped in an item element. --- , rttTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery RouteTableType - --- instance IsXML RouteTableType where --- xmlPickler = ec2XML - --- data RouteType = RouteType --- { rtDestinationCidrBlock :: !Text --- -- ^ The CIDR address block used for the destination match. --- , rtGatewayId :: !Text --- -- ^ The ID of a gateway attached to your VPC. --- , rtInstanceId :: !Text --- -- ^ The ID of a NAT instance in your VPC. --- , rtInstanceOwnerId :: !Text --- -- ^ The owner of the instance. --- , rtNetworkInterfaceId :: !Text --- -- ^ The network interface ID. --- , rtState :: !Text --- -- ^ The state of the route. The blackhole state indicates that the --- -- route's target isn't available (for example, the specified --- -- gateway isn't attached to the VPC, or the specified NAT instance --- -- has been terminated). --- , rtOrigin :: !Text --- -- ^ Describes how the route was created. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery RouteType - --- instance IsXML RouteType where --- xmlPickler = ec2XML - -data RunningInstancesItemType = RunningInstancesItemType - { riitInstanceId :: !Text - -- ^ The ID of the instance launched. - , riitImageId :: !Text - -- ^ The ID of the AMI used to launch the instance. - , riitInstanceState :: !InstanceStateType - -- ^ The current state of the instance. - , riitPrivateDnsName :: Maybe Text - -- ^ The private DNS name assigned to the instance. This DNS name can - -- only be used inside the Amazon EC2 network. This element remains - -- empty until the instance enters the running state. - , riitDnsName :: Maybe Text - -- ^ The public DNS name assigned to the instance. This element - -- remains empty until the instance enters the running state. - , riitReason :: Maybe Text - -- ^ The reason for the most recent state transition. - -- This might be an empty string. - , riitKeyName :: !Text - -- ^ The key pair name, if this instance was launched with an - -- associated key pair. - , riitAmiLaunchIndex :: !Text - -- ^ The AMI launch index, which can be used to find this instance in - -- the launch group. - , riitProductCodes :: [ProductCodesSetItemType] - -- ^ The product codes attached to this instance. - , riitInstanceType :: InstanceType - -- ^ The instance type. - , riitLaunchTime :: !UTCTime - -- ^ The time the instance was launched. - , riitPlacement :: !PlacementType - -- ^ The location where the instance launched. - , riitKernelId :: Maybe Text - -- ^ The kernel associated with this instance. - , riitRamdiskId :: Maybe Text - -- ^ The RAM disk associated with this instance. - , riitPlatform :: Maybe Text - -- ^ The value is Windows for Windows AMIs; otherwise blank. - , riitMonitoring :: !InstanceMonitoringStateType - -- ^ The monitoring information for the instance. - , riitSubnetId :: Maybe Text - -- ^ The ID of the subnet in which the instance is running. - , riitVpcId :: Maybe Text - -- ^ The ID of the VPC in which the instance is running. - , riitPrivateIpAddress :: Maybe Text - -- ^ The private IP address assigned to the instance. - , riitIpAddress :: Maybe Text - -- ^ The IP address of the instance. - , riitSourceDestCheck :: Maybe Bool - -- ^ Specifies whether to enable an instance launched in a VPC to - -- perform NAT. This controls whether source/destination checking is - -- enabled on the instance. A value of true means checking is - -- enabled, and false means checking is disabled. The value must be - -- false for the instance to perform NAT. For more information, go - -- to NAT Instances in the Amazon Virtual Private Cloud User Guide. - , riitGroupSet :: [GroupItemType] - -- ^ A list of the security groups for the instance. - , riitStateReason :: Maybe StateReasonType - -- ^ The reason for the most recent state transition. See - -- StateReasonType for a listing of supported state change codes. - , riitArchitecture :: !Text - -- ^ The architecture of the image. - , riitRootDeviceType :: !Text - -- ^ The root device type used by the AMI. The AMI can use an Amazon - -- EBS or instance store root device. - , riitRootDeviceName :: Maybe Text - -- ^ The root device name (for example, /dev/sda1). - , riitBlockDeviceMapping :: [InstanceBlockDeviceMappingResponseItemType] - -- ^ Any block device mapping entries for the instance. - , riitInstanceLifecycle :: Maybe Text - -- ^ Indicates whether this is a Spot Instance. - , riitSpotInstanceRequestId :: Maybe Text - -- ^ The ID of the Spot Instance request. - , riitVirtualizationType :: !Text - -- ^ The instance's virtualization type. - , riitClientToken :: Maybe Text - -- ^ The idempotency token you provided when you launched the instance. - , riitTagSet :: [ResourceTagSetItemType] - -- ^ Any tags assigned to the resource. - , riitHypervisor :: !Text - -- ^ The instance's hypervisor type. - , riitNetworkInterfaceSet :: [InstanceNetworkInterfaceSetItemType] - -- ^ The network interfaces for the instance. - , riitIamInstanceProfile :: Maybe IamInstanceProfileResponseType - -- ^ The IAM Instance Profile (IIP) associated with the instance. - , riitEbsOptimized :: !Bool - -- ^ Indicates whether the instance is optimized for EBS I/O. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML RunningInstancesItemType where - xmlPickler = ec2ItemXML - --- data SecurityGroupIdSetItemType = SecurityGroupIdSetItemType --- { sgisitGroupId :: !Text --- -- ^ The ID of the security group associated with the network --- -- interface. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery SecurityGroupIdSetItemType - --- instance IsXML SecurityGroupIdSetItemType where --- xmlPickler = ec2XML - -data SecurityGroupItemType = SecurityGroupItemType - { sgitOwnerId :: !Text - -- ^ The AWS account ID of the owner of the security group. - , sgitGroupId :: !Text - -- ^ The ID of the security group. - , sgitGroupName :: !Text - -- ^ The name of the security group. - , sgitGroupDescription :: !Text - -- ^ A description of the security group. - , sgitVpcId :: Maybe Text - -- ^ [EC2-VPC] The ID of the VPC for the security group. - , sgitIpPermissions :: [IpPermissionType] - -- ^ A list of inbound rules associated with the security group. - , sgitIpPermissionsEgress :: [IpPermissionType] - -- ^ [EC2-VPC] A list of outbound rules associated with the security group. - -- , sgitTagSet :: [ResourceTagSetItemType] - -- -- ^ Any tags assigned to the resource, each one wrapped in an item element. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML SecurityGroupItemType where - xmlPickler = ec2ItemXML - --- data SpotDatafeedSubscriptionType = SpotDatafeedSubscriptionType --- { sdstOwnerId :: !Text --- -- ^ The AWS account ID of the account. --- , sdstBucket :: !Text --- -- ^ The Amazon S3 bucket where the Spot Instance datafeed is located. --- , sdstPrefix :: !Text --- -- ^ The prefix that is prepended to datafeed files. --- , sdstState :: !Text --- -- ^ The state of the Spot Instance datafeed subscription. --- , sdstFault :: !SpotInstanceStateFaultType --- -- ^ The fault codes for the Spot Instance request, if any. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery SpotDatafeedSubscriptionType - --- instance IsXML SpotDatafeedSubscriptionType where --- xmlPickler = ec2XML - --- data SpotInstanceRequestSetItemType = SpotInstanceRequestSetItemType --- { sirsitSpotInstanceRequestId :: !Text --- -- ^ The ID of the Spot Instance request. --- , sirsitSpotPrice :: !Text --- -- ^ The maximum hourly price for any Spot Instance launched to --- -- fulfill the request. --- , sirsitType :: !Text --- -- ^ The Spot Instance request type. --- , sirsitState :: !Text --- -- ^ The state of the Spot Instance request. Spot bid status --- -- information can help you track your Spot Instance requests. For --- -- information, see Tracking Spot Requests with Bid Status Codes in --- -- the Amazon Elastic Compute Cloud User Guide. --- , sirsitFault :: !SpotInstanceStateFaultType --- -- ^ The fault codes for the Spot Instance request, if any. --- , sirsitStatus :: !SpotInstanceStatusMessageType --- -- ^ The status code and status message describing the Spot Instance --- -- request. --- , sirsitValidFrom :: !UTCTime --- -- ^ The start date of the request. If this is a one-time request, the --- -- request becomes active at this date and time and remains active --- -- until all instances launch, the request expires, or the request --- -- is canceled. If the request is persistent, the request becomes --- -- active at this date and time and remains active until it expires --- -- or is canceled. --- , sirsitValidUntil :: !UTCTime --- -- ^ The end date of the request. If this is a one-time request, the --- -- request remains active until all instances launch, the request is --- -- canceled, or this date is reached. If the request is persistent, --- -- it remains active until it is canceled or this date is reached. --- , sirsitLaunchGroup :: !Text --- -- ^ The instance launch group. Launch groups are Spot Instances that --- -- launch together and terminate together. --- , sirsitAvailabilityZoneGroup :: !Text --- -- ^ The Availability Zone group. If you specify the same Availability --- -- Zone group for all Spot Instance requests, all Spot Instances are --- -- launched in the same Availability Zone. --- , sirsitLaunchedAvailabilityZone :: !Text --- -- ^ The Availability Zone in which the bid is launched. --- , sirsitLaunchSpecification :: !LaunchSpecificationResponseType --- -- ^ Additional information for launching instances. --- , sirsitInstanceId :: !Text --- -- ^ The instance ID, if an instance has been launched to fulfill the --- -- Spot Instance request. --- , sirsitCreateTime :: !UTCTime --- -- ^ The time stamp when the Spot Instance request was created. --- , sirsitProductDescription :: !Text --- -- ^ The product description associated with the Spot Instance. --- , sirsitTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery SpotInstanceRequestSetItemType - --- instance IsXML SpotInstanceRequestSetItemType where --- xmlPickler = ec2XML - --- data SpotInstanceStateFaultType = SpotInstanceStateFaultType --- { sisftCode :: !Text --- -- ^ The reason code for the Spot Instance state change. --- , sisftMessage :: !Text --- -- ^ The message for the Spot Instance state change. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery SpotInstanceStateFaultType - --- instance IsXML SpotInstanceStateFaultType where --- xmlPickler = ec2XML - --- data SpotInstanceStatusMessageType = SpotInstanceStatusMessageType --- { sismtCode :: !Text --- -- ^ The status code of the request. --- , sismtUpdateTime :: !UTCTime --- -- ^ The time of the most recent status update. --- , sismtMessage :: !Text --- -- ^ The description for the status code for the Spot request. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery SpotInstanceStatusMessageType - --- instance IsXML SpotInstanceStatusMessageType where --- xmlPickler = ec2XML - --- data SpotPriceHistorySetItemType = SpotPriceHistorySetItemType --- { sphsitInstanceType :: !Text --- -- ^ The instance type. --- , sphsitProductDescription :: !Text --- -- ^ A general description of the AMI. --- , sphsitSpotPrice :: !Text --- -- ^ The maximum price you will pay to launch one or more Spot --- -- Instances. --- , sphsitTimestamp :: !UTCTime --- -- ^ The date and time the request was created. --- , sphsitAvailabilityZone :: !Text --- -- ^ The Availability Zone. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery SpotPriceHistorySetItemType - --- instance IsXML SpotPriceHistorySetItemType where --- xmlPickler = ec2XML - -data StateReasonType = StateReasonType - { srtCode :: !Text - -- ^ The reason code for the state change. - , srtMessage :: !Text - -- ^ The message for the state change. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML StateReasonType where - xmlPickler = ec2XML - --- data SubnetType = SubnetType --- { stSubnetId :: !Text --- -- ^ The ID of the subnet. --- , stState :: !Text --- -- ^ The current state of the subnet. --- , stVpcId :: !Text --- -- ^ The ID of the VPC the subnet is in. --- , stCidrBlock :: !Text --- -- ^ The CIDR block assigned to the subnet. --- , stAvailableIpAddressCount :: !Integer --- -- ^ The number of unused IP addresses in the subnet (the IP addresses --- -- for any stopped instances are considered unavailable). --- , stAvailabilityZone :: !Text --- -- ^ The Availability Zone of the subnet. --- , stDefaultForAz :: !Bool --- -- ^ Indicates whether this is the default subnet for the Availability --- -- Zone. --- , stMapPublicIpOnLaunch :: !Bool --- -- ^ Indicates whether instances launched in this subnet receive a --- -- public IP address. --- , stTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery SubnetType - --- instance IsXML SubnetType where --- xmlPickler = ec2XML - -data TagSetItemType = TagSetItemType - { tsitResourceId :: !Text - -- ^ The ID of the resource. For example, ami-1a2b3c4d. - , tsitResourceType :: !Text - -- ^ The type of resource. - , tsitKey :: !Text - -- ^ The key of the tag. - , tsitValue :: !Text - -- ^ The value of the tag. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML TagSetItemType where - xmlPickler = ec2ItemXML - --- data UserDataType = UserDataType --- { udtData :: !Text --- -- ^ The Base64-encoded MIME user data made available to the --- -- instance(s) in the reservation. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery UserDataType - --- instance IsXML UserDataType where --- xmlPickler = ec2XML - --- data VolumeStatusItemType = VolumeStatusItemType --- { vsitVolumeId :: !Text --- -- ^ The volume ID. --- , vsitAvailabilityZone :: !Text --- -- ^ The Availability Zone of the volume. --- , vsitVolumeStatus :: !VolumeStatusInfoType --- -- ^ The volume status. The status of each volume is wrapped in an --- -- item element. --- , vsitEventSet :: !VolumeStatusEventItemType --- -- ^ A list of events associated with the volume. Each event is --- -- wrapped in an item element. --- , vsitActionSet :: !VolumeStatusActionItemType --- -- ^ The details of the action. Each action detail is wrapped in an --- -- item element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VolumeStatusItemType - --- instance IsXML VolumeStatusItemType where --- xmlPickler = ec2XML - --- data VolumeStatusInfoType = VolumeStatusInfoType --- { vsitStatus :: !Text --- -- ^ The status of the volume. --- , vsitDetails :: !VolumeStatusDetailsItemType --- -- ^ The details of the volume status. Each volume status detail is --- -- wrapped in an item type. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VolumeStatusInfoType - --- instance IsXML VolumeStatusInfoType where --- xmlPickler = ec2XML - --- data VolumeStatusDetailsItemType = VolumeStatusDetailsItemType --- { vsditName :: !Text --- -- ^ The name of the volume status. --- , vsditStatus :: !Text --- -- ^ The intended status of the volume status. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VolumeStatusDetailsItemType - --- instance IsXML VolumeStatusDetailsItemType where --- xmlPickler = ec2XML - --- data VolumeStatusEventItemType = VolumeStatusEventItemType --- { vseitEventType :: !Text --- -- ^ The type of this event. --- , vseitEventId :: !Text --- -- ^ The ID of this event. --- , vseitDescription :: !Text --- -- ^ A description of the event. --- , vseitNotBefore :: !UTCTime --- -- ^ The earliest start time of the event. --- , vseitNotAfter :: !UTCTime --- -- ^ The latest end time of the event. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VolumeStatusEventItemType - --- instance IsXML VolumeStatusEventItemType where --- xmlPickler = ec2XML - --- data VolumeStatusActionItemType = VolumeStatusActionItemType --- { vsaitCode :: !Text --- -- ^ The code identifying the action, for example, enable-volume-io. --- , vsaitEventType :: !Text --- -- ^ The event type associated with this action. --- , vsaitEventId :: !Text --- -- ^ The ID of the event associated with this action. --- , vsaitDescription :: !Text --- -- ^ A description of the action. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VolumeStatusActionItemType - --- instance IsXML VolumeStatusActionItemType where --- xmlPickler = ec2XML - --- data VpcType = VpcType --- { vtVpcId :: !Text --- -- ^ The ID of the VPC. --- , vtState :: !Text --- -- ^ The current state of the VPC. --- , vtCidrBlock :: !Text --- -- ^ The CIDR block for the VPC. --- , vtDhcpOptionsId :: !Text --- -- ^ The ID of the set of DHCP options you've associated with the VPC --- -- (or default if the default options are associated with the VPC). --- , vtTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- , vtInstanceTenancy :: !Text --- -- ^ The allowed tenancy of instances launched into the VPC. --- , vtIsDefault :: !Bool --- -- ^ Indicates whether the VPC is the default VPC. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VpcType - --- instance IsXML VpcType where --- xmlPickler = ec2XML - --- data VpnConnectionOptions = VpnConnectionOptions --- { vcortStaticRoutesOnly :: !Bool --- -- ^ Indicates whether the VPN connection uses static routes only. --- -- Static routes must be used for devices that don't support BGP. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VpnConnectionOptionsResponseType - --- instance IsXML VpnConnectionOptionsResponseType where --- xmlPickler = ec2XML - --- data VpnConnectionType = VpnConnectionType --- { vctVpnConnectionId :: !Text --- -- ^ The ID of the VPN connection. --- , vctState :: !Text --- -- ^ The current state of the VPN connection. --- , vctCustomerGatewayConfiguration :: !Text --- -- ^ The configuration information for the VPN connection's customer --- -- gateway (in the native XML format). This element is always --- -- present in the CreateVpnConnection response; however, it's --- -- present in the DescribeVpnConnections response only if the VPN --- -- connection is in the pending or available state. --- , vctType :: !Text --- -- ^ The type of VPN connection. --- , vctCustomerGatewayId :: !Text --- -- ^ The ID of the customer gateway at your end of the VPN connection. --- , vctVpnGatewayId :: !Text --- -- ^ The ID of the virtual private gateway at the AWS side of the VPN --- -- connection. --- , vctTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- , vctVgwTelemetry :: !VpnTunnelTelemetryType --- -- ^ The virtual private gateway. Each gateway is wrapped in an item --- -- element. --- , vctOptions :: !VpnConnectionOptionsResponseType --- -- ^ The option set describing the VPN connection. --- , vctRoutes :: !VpnStaticRouteType --- -- ^ The set of static routes associated with a VPN connection. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VpnConnectionType - --- instance IsXML VpnConnectionType where --- xmlPickler = ec2XML - --- data VpnGatewayType = VpnGatewayType --- { vgtVpnGatewayId :: !Text --- -- ^ The ID of the virtual private gateway. --- , vgtState :: !Text --- -- ^ The current state of the virtual private gateway. --- , vgtType :: !Text --- -- ^ The type of VPN connection the virtual private gateway supports. --- , vgtAvailabilityZone :: !Text --- -- ^ The Availability Zone where the virtual private gateway was --- -- created. --- , vgtAttachments :: !AttachmentType --- -- ^ Any VPCs attached to the virtual private gateway, each one --- -- wrapped in an item element. --- , vgtTagSet :: !ResourceTagSetItemType --- -- ^ Any tags assigned to the resource, each one wrapped in an item --- -- element. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VpnGatewayType - --- instance IsXML VpnGatewayType where --- xmlPickler = ec2XML - --- data VpnStaticRouteType = VpnStaticRouteType --- { vsrtDestinationCidrBlock :: !Text --- -- ^ The CIDR block associated with the local subnet of the customer --- -- data center. --- , vsrtSource :: !Text --- -- ^ Indicates how the routes were provided. --- , vsrtState :: !Text --- -- ^ The current state of the static route. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VpnStaticRouteType - --- instance IsXML VpnStaticRouteType where --- xmlPickler = ec2XML - --- data VpnTunnelTelemetryType = VpnTunnelTelemetryType --- { vtttOutsideIpAddress :: !Text --- -- ^ The Internet-routable IP address of the virtual private gateway's --- -- outside interface. --- , vtttStatus :: !Text --- -- ^ The status of the VPN tunnel. --- , vtttLastStatusChange :: !UTCTime --- -- ^ The date and time of the last change in status. --- , vtttStatusMessage :: !Text --- -- ^ If an error occurs, a description of the error. --- , vtttAcceptedRouteCount :: !Integer --- -- ^ The number of accepted routes. --- } deriving (Eq, Ord, Show, Generic) - --- instance IsQuery VpnTunnelTelemetryType - --- instance IsXML VpnTunnelTelemetryType where --- xmlPickler = ec2XML - -data Filter = Filter - { filterName :: !Text - , filterValue :: [Text] - } deriving (Eq, Ord, Show, Generic) - -instance IsQuery Filter - -newtype Filters a = Filters { unFilters :: [a] } - deriving (Eq, Ord, Show, Generic) - -instance IsQuery a => IsQuery (Filters a) - -data TagResourceType - = CustomerGateway - | DhcpOptions - | Image - | Instance - | InternetGateway - | NetworkAcl - | NetworkInterface - | ReservedInstances - | RouteTable - | SecurityGroup - | Snapshot - | SpotInstancesRequest - | Subnet - | Volume - | Vpc - | VpnConnection - | VpnGateway - deriving (Eq, Ord, Read, Generic) - -instance Show TagResourceType where - show t = case t of - CustomerGateway -> "customer-gateway" - DhcpOptions -> "dhcp-options" - Image -> "image" - Instance -> "instance" - InternetGateway -> "internet-gateway" - NetworkAcl -> "network-acl" - NetworkInterface -> "network-interface" - ReservedInstances -> "reserved-instances" - RouteTable -> "route-table" - SecurityGroup -> "security-group" - Snapshot -> "snapshot" - SpotInstancesRequest -> "spot-instances-request" - Subnet -> "subnet" - Volume -> "volume" - Vpc -> "vpc" - VpnConnection -> "vpn-connection" - VpnGateway -> "vpn-gateway" - -instance IsQuery TagResourceType where - queryPickler = qpPrim - - -- = customer-gateway - -- | dhcp-options - -- | image - -- | instance - -- | internet-gateway - -- | network-acl - -- | network-interface - -- | reserved-instances - -- | route-table - -- | security-group - -- | snapshot - -- | spot-instances-request - -- | subnet - -- | volume - -- | vpc - -- | vpn-connection - -- | vpn-gateway - -data TagFilter - = TagKey [Text] - -- ^ The tag key. - | TagResourceId [Text] - -- ^ The resource ID. - | TagResourceType [TagResourceType] - -- ^ The resource type. - | TagValue [Text] - -- ^ The tag value. - deriving (Eq, Ord, Show, Generic) - -instance IsQuery TagFilter where - queryPickler = QueryPU p u - where - p (TagKey ks) = List $ Pair "Name" (Value "key") : map enc ks - p (TagResourceId is) = List $ Pair "Name" (Value "resource-id") : map enc is - p (TagResourceType ts) = List $ Pair "Name" (Value "resource-type") : map enc' ts - p (TagValue vs) = List $ Pair "Name" (Value "value") : map enc vs - - u = undefined - - enc = Pair "Value" . Value . encodeUtf8 - enc' = Pair "Value" . Value . BS.pack . show diff --git a/src/Network/AWS/ELB.hs b/src/Network/AWS/ELB.hs deleted file mode 100644 index d7ff83656c7..00000000000 --- a/src/Network/AWS/ELB.hs +++ /dev/null @@ -1,963 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies #-} - --- Module : Network.AWS.ELB --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | Elastic Load Balancing helps you improve the availability and scalability --- of your application running on Amazon Elastic Cloud Compute (Amazon EC2). -module Network.AWS.ELB - ( - -- * Actions - -- ** ApplySecurityGroupsToLoadBalancer - ApplySecurityGroupsToLoadBalancer (..) - , ApplySecurityGroupsToLoadBalancerResponse (..) - - -- ** AttachLoadBalancerToSubnets - , AttachLoadBalancerToSubnets (..) - , AttachLoadBalancerToSubnetsResponse (..) - - -- ** ConfigureHealthCheck - , ConfigureHealthCheck (..) - , ConfigureHealthCheckResponse (..) - - -- ** CreateAppCookieStickinessPolicy - , CreateAppCookieStickinessPolicy (..) - , CreateAppCookieStickinessPolicyResponse (..) - - -- ** CreatelbCookieStickinessPolicy - , CreatelbCookieStickinessPolicy (..) - , CreatelbCookieStickinessPolicyResponse (..) - - -- ** CreateLoadBalancer - , CreateLoadBalancer (..) - , CreateLoadBalancerResponse (..) - - -- ** CreateLoadBalancerListeners - , CreateLoadBalancerListeners (..) - , CreateLoadBalancerListenersResponse (..) - - -- ** CreateLoadBalancerPolicy - , CreateLoadBalancerPolicy (..) - , CreateLoadBalancerPolicyResponse (..) - - -- ** DeleteLoadBalancer - , DeleteLoadBalancer (..) - , DeleteLoadBalancerResponse (..) - - -- ** DeleteLoadBalancerListeners - , DeleteLoadBalancerListeners (..) - , DeleteLoadBalancerListenersResponse (..) - - -- ** DeleteLoadBalancerPolicy - , DeleteLoadBalancerPolicy (..) - , DeleteLoadBalancerPolicyResponse (..) - - -- ** DeregisterInstancesFromLoadBalancer - , DeregisterInstancesFromLoadBalancer (..) - , DeregisterInstancesFromLoadBalancerResponse (..) - - -- ** DescribeInstanceHealth - , DescribeInstanceHealth (..) - , DescribeInstanceHealthResponse (..) - - -- ** DescribeLoadBalancerPolicies - , DescribeLoadBalancerPolicies (..) - , DescribeLoadBalancerPoliciesResponse (..) - - -- ** DescribeLoadBalancerPolicyTypes - , DescribeLoadBalancerPolicyTypes (..) - , DescribeLoadBalancerPolicyTypesResponse (..) - - -- ** DescribeLoadBalancers - , DescribeLoadBalancers (..) - , DescribeLoadBalancersResponse (..) - - -- ** DetachLoadBalancerFromSubnets - , DetachLoadBalancerFromSubnets (..) - , DetachLoadBalancerFromSubnetsResponse (..) - - -- ** DisableAvailabilityZonesForLoadBalancer - , DisableAvailabilityZonesForLoadBalancer (..) - , DisableAvailabilityZonesForLoadBalancerResponse (..) - - -- ** EnableAvailabilityZonesForLoadBalancer - , EnableAvailabilityZonesForLoadBalancer (..) - , EnableAvailabilityZonesForLoadBalancerResponse (..) - - -- ** RegisterInstancesWithLoadBalancer - , RegisterInstancesWithLoadBalancer (..) - , RegisterInstancesWithLoadBalancerResponse (..) - - -- ** SetLoadBalancerListenerSSLCertificate - , SetLoadBalancerListenerSSLCertificate (..) - , SetLoadBalancerListenerSSLCertificateResponse (..) - - -- ** SetLoadBalancerPoliciesForBackendServer - , SetLoadBalancerPoliciesForBackendServer (..) - , SetLoadBalancerPoliciesForBackendServerResponse (..) - - -- ** SetLoadBalancerPoliciesOfListener - , SetLoadBalancerPoliciesOfListener (..) - , SetLoadBalancerPoliciesOfListenerResponse (..) - - -- * Data Types - , module Network.AWS.ELB.Types - - -- * Common - , module Network.AWS - ) where - -import Data.Text (Text) -import Network.AWS -import Network.AWS.ELB.Types -import Network.AWS.Internal -import Network.HTTP.Types.Method - --- | Associates one or more security groups with your load balancer in VPC. The --- provided security group IDs will override any currently applied security --- groups. --- --- -data ApplySecurityGroupsToLoadBalancer = ApplySecurityGroupsToLoadBalancer - { asgtlbLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - , asgtlbSecurityGroups :: Members Text - -- ^ A list of security group IDs to associate with your load balancer - -- in VPC. The security group IDs must be provided as the ID and not - -- the security group name (For example, sg-1234). - } deriving (Eq, Show, Generic) - -instance IsXML ApplySecurityGroupsToLoadBalancer where - xmlPickler = withNS elbNS - -instance IsQuery ApplySecurityGroupsToLoadBalancer - -instance Rq ApplySecurityGroupsToLoadBalancer where - type Er ApplySecurityGroupsToLoadBalancer = ErrorResponse - type Rs ApplySecurityGroupsToLoadBalancer = ApplySecurityGroupsToLoadBalancerResponse - request = query4 elb GET "ApplySecurityGroupsToLoadBalancer" - -data ApplySecurityGroupsToLoadBalancerResponse = ApplySecurityGroupsToLoadBalancerResponse - { asgtlbrResponseMetadata :: !Text - , asgtlbrApplySecurityGroupsToLoadBalancerResult :: !ApplySecurityGroupsToLoadBalancerResult - } deriving (Eq, Show, Generic) - -instance IsXML ApplySecurityGroupsToLoadBalancerResponse where - xmlPickler = withNS elbNS - --- | Adds one or more subnets to the set of configured subnets in the VPC for --- the load balancer. The Loadbalancers evenly distribute requests across all --- of the registered subnets. --- --- -data AttachLoadBalancerToSubnets = AttachLoadBalancerToSubnets - { albtsLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - , albtsSubnets :: Members Text - -- ^ A list of subnet IDs to add for the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML AttachLoadBalancerToSubnets where - xmlPickler = withNS elbNS - -instance IsQuery AttachLoadBalancerToSubnets - -instance Rq AttachLoadBalancerToSubnets where - type Er AttachLoadBalancerToSubnets = ErrorResponse - type Rs AttachLoadBalancerToSubnets = AttachLoadBalancerToSubnetsResponse - request = query4 elb GET "AttachLoadBalancerToSubnets" - -data AttachLoadBalancerToSubnetsResponse = AttachLoadBalancerToSubnetsResponse - { albtsrResponseMetadata :: !Text - , albtsrAttachLoadBalancerToSubnetsResult :: !AttachLoadBalancerToSubnetsResult - } deriving (Eq, Show, Generic) - -instance IsXML AttachLoadBalancerToSubnetsResponse where - xmlPickler = withNS elbNS - --- | Enables the client to define an application healthcheck for the instances. --- --- -data ConfigureHealthCheck = ConfigureHealthCheck - { chcHealthCheck :: !HealthCheck - -- ^ A structure containing the configuration information for the new - -- healthcheck. - , chcLoadBalancerName :: !Text - -- ^ The mnemonic name associated with the load balancer. This name - -- must be unique within the client AWS account. - } deriving (Eq, Show, Generic) - -instance IsXML ConfigureHealthCheck where - xmlPickler = withNS elbNS - -instance IsQuery ConfigureHealthCheck - -instance Rq ConfigureHealthCheck where - type Er ConfigureHealthCheck = ErrorResponse - type Rs ConfigureHealthCheck = ConfigureHealthCheckResponse - request = query4 elb GET "ConfigureHealthCheck" - -data ConfigureHealthCheckResponse = ConfigureHealthCheckResponse - { chcrResponseMetadata :: !Text - , chcrConfigureHealthCheckResult :: !ConfigureHealthCheckResult - } deriving (Eq, Show, Generic) - -instance IsXML ConfigureHealthCheckResponse where - xmlPickler = withNS elbNS - --- | Generates a stickiness policy with sticky session lifetimes that follow --- that of an application-generated cookie. This policy can be associated only --- with HTTP/HTTPS listeners. This policy is similar to the policy created by --- CreatelbCookieStickinessPolicy, except that the lifetime of the special --- Elastic Load Balancing cookie follows the lifetime of the --- application-generated cookie specified in the policy configuration. The --- load balancer only inserts a new stickiness cookie when the application --- response includes a new application cookie. If the application cookie is --- explicitly removed or expires, the session stops being sticky until a new --- application cookie is issued. Note An application client must receive and --- send two cookies: the application-generated cookie and the special Elastic --- Load Balancing cookie named AWSELB. This is the default behavior for many --- common web browsers. For information on using --- CreateAppCookieStickinessPolicy, see Using the Query4 Elb API in the Enabling --- Application-Controlled Sesssion Stickiness section of the Elastic Load --- Balancing Developer Guide. --- --- -data CreateAppCookieStickinessPolicy = CreateAppCookieStickinessPolicy - { cacspCookieName :: !Text - -- ^ Name of the application cookie used for stickiness. - , cacspLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - , cacspPolicyName :: !Text - -- ^ The name of the policy being created. The name must be unique - -- within the set of policies for this load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML CreateAppCookieStickinessPolicy where - xmlPickler = withNS elbNS - -instance IsQuery CreateAppCookieStickinessPolicy - -instance Rq CreateAppCookieStickinessPolicy where - type Er CreateAppCookieStickinessPolicy = ErrorResponse - type Rs CreateAppCookieStickinessPolicy = CreateAppCookieStickinessPolicyResponse - request = query4 elb GET "CreateAppCookieStickinessPolicy" - -data CreateAppCookieStickinessPolicyResponse = CreateAppCookieStickinessPolicyResponse - { cacsprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML CreateAppCookieStickinessPolicyResponse where - xmlPickler = withNS elbNS - --- | Generates a stickiness policy with sticky session lifetimes controlled by --- the lifetime of the browser (user-agent) or a specified expiration period. --- This policy can be associated only with HTTP/HTTPS listeners. When a load --- balancer implements this policy, the load balancer uses a special cookie to --- track the backend server instance for each request. When the load balancer --- receives a request, it first checks to see if this cookie is present in the --- request. If so, the load balancer sends the request to the application --- server specified in the cookie. If not, the load balancer sends the request --- to a server that is chosen based on the existing load balancing algorithm. --- A cookie is inserted into the response for binding subsequent requests from --- the same user to that server. The validity of the cookie is based on the --- cookie expiration time, which is specified in the policy configuration. For --- information on using CreatelbCookieStickinessPolicy, see Using the Query --- API in the Enabling Duration-Based Sesssion Stickiness section of the --- Elastic Load Balancing Developer Guide. --- --- -data CreatelbCookieStickinessPolicy = CreatelbCookieStickinessPolicy - { clbcspCookieExpirationPeriod :: Maybe Integer - -- ^ The time period in seconds after which the cookie should be - -- considered stale. Not specifying this parameter indicates that - -- the sticky session will last for the duration of the browser - -- session. - , clbcspLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - , clbcspPolicyName :: !Text - -- ^ The name of the policy being created. The name must be unique - -- within the set of policies for this load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML CreatelbCookieStickinessPolicy where - xmlPickler = withNS elbNS - -instance IsQuery CreatelbCookieStickinessPolicy - -instance Rq CreatelbCookieStickinessPolicy where - type Er CreatelbCookieStickinessPolicy = ErrorResponse - type Rs CreatelbCookieStickinessPolicy = CreatelbCookieStickinessPolicyResponse - request = query4 elb GET "CreatelbCookieStickinessPolicy" - -data CreatelbCookieStickinessPolicyResponse = CreatelbCookieStickinessPolicyResponse - { clbcsprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML CreatelbCookieStickinessPolicyResponse where - xmlPickler = withNS elbNS - --- | Creates a new load balancer. After the call has completed successfully, a --- new load balancer is created; however, it will not be usable until at least --- one instance has been registered. When the load balancer creation is --- completed, the client can check whether or not it is usable by using the --- DescribeInstanceHealth action. The load balancer is usable as soon as any --- registered instance is InService. Note Currently, the client's quota of --- load balancers is limited to ten per Region. Note Load balancer DNS names --- vary depending on the Region they're created in. For load balancers created --- in the United States, the DNS name ends with: For load balancers created in --- the EU (Ireland) Region, the DNS name ends with: For information on using --- CreateLoadBalancer to create a new load balancer in Amazon EC2, go to Using --- Query4 Elb API section in the Creating a Load Balancer With SSL Cipher Settings --- and Back-end Authentication topic of the Elastic Load Balancing Developer --- Guide. For information on using CreateLoadBalancer to create a new load --- balancer in Amazon VPC, see Using the Query4 Elb API in the Creating a Basic --- Load Balancer in Amazon VPC section in the Elastic Load Balancing Developer --- Guide. --- --- -data CreateLoadBalancer = CreateLoadBalancer - { clbAvailabilityZones :: Members AvailabilityZone - -- ^ A list of Availability Zones. - , clbListeners :: Members Listener - -- ^ A list of the following tuples: LoadBalancerPort, InstancePort, - -- and Protocol. - , clbLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within your set of load balancers. - , clbScheme :: Maybe Text - -- ^ The type of a load balancer. - , clbSecurityGroups :: Members Text - -- ^ The security groups assigned to your load balancer within your - -- VPC. - , clbSubnets :: Members Text - -- ^ A list of subnet IDs in your VPC to attach to your load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML CreateLoadBalancer where - xmlPickler = withNS elbNS - -instance IsQuery CreateLoadBalancer - -instance Rq CreateLoadBalancer where - type Er CreateLoadBalancer = ErrorResponse - type Rs CreateLoadBalancer = CreateLoadBalancerResponse - request = query4 elb GET "CreateLoadBalancer" - -data CreateLoadBalancerResponse = CreateLoadBalancerResponse - { clbrResponseMetadata :: !Text - , clbrCreateLoadBalancerResult :: !CreateLoadBalancerResult - } deriving (Eq, Show, Generic) - -instance IsXML CreateLoadBalancerResponse where - xmlPickler = withNS elbNS - --- | Creates one or more listeners on a load balancer for the specified port. If --- a listener with the given port does not already exist, it will be created; --- otherwise, the properties of the new listener must match the properties of --- the existing listener. --- --- -data CreateLoadBalancerListeners = CreateLoadBalancerListeners - { clblListeners :: Members Listener - -- ^ A list of LoadBalancerPort, InstancePort, Protocol, and - -- SSLCertificateId items. - , clblLoadBalancerName :: !Text - -- ^ The name of the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML CreateLoadBalancerListeners where - xmlPickler = withNS elbNS - -instance IsQuery CreateLoadBalancerListeners - -instance Rq CreateLoadBalancerListeners where - type Er CreateLoadBalancerListeners = ErrorResponse - type Rs CreateLoadBalancerListeners = CreateLoadBalancerListenersResponse - request = query4 elb GET "CreateLoadBalancerListeners" - -data CreateLoadBalancerListenersResponse = CreateLoadBalancerListenersResponse - { clblrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML CreateLoadBalancerListenersResponse where - xmlPickler = withNS elbNS - --- | Creates a new policy that contains the necessary attributes depending on --- the policy type. Policies are settings that are saved for your load --- balancer and that can be applied to the front-end listener, or the back-end --- application server, depending on your policy type. --- --- -data CreateLoadBalancerPolicy = CreateLoadBalancerPolicy - { clbpLoadBalancerName :: !Text - -- ^ The name associated with the LoadBalancer for which the policy is - -- being created. This name must be unique within the client AWS - -- account. - , clbpPolicyAttributes :: Members PolicyAttribute - -- ^ A list of attributes associated with the policy being created. - , clbpPolicyName :: !Text - -- ^ The name of the load balancer policy being created. The name must - -- be unique within the set of policies for this load balancer. - , clbpPolicyTypeName :: !Text - -- ^ The name of the base policy type being used to create this - -- policy. To get the list of policy types, use the - -- DescribeLoadBalancerPolicyTypes action. - } deriving (Eq, Show, Generic) - -instance IsXML CreateLoadBalancerPolicy where - xmlPickler = withNS elbNS - -instance IsQuery CreateLoadBalancerPolicy - -instance Rq CreateLoadBalancerPolicy where - type Er CreateLoadBalancerPolicy = ErrorResponse - type Rs CreateLoadBalancerPolicy = CreateLoadBalancerPolicyResponse - request = query4 elb GET "CreateLoadBalancerPolicy" - -data CreateLoadBalancerPolicyResponse = CreateLoadBalancerPolicyResponse - { clbprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML CreateLoadBalancerPolicyResponse where - xmlPickler = withNS elbNS - --- | Deletes the specified load balancer. If attempting to recreate the load --- balancer, the client must reconfigure all the settings. The DNS name --- associated with a deleted load balancer will no longer be usable. Once --- deleted, the name and associated DNS record of the load balancer no longer --- exist and traffic sent to any of its IP addresses will no longer be --- delivered to client instances. The client will not receive the same DNS --- name even if a new load balancer with same load balancer name is created. --- To successfully call this API, the client must provide the same account --- credentials as were used to create the load balancer. Note By design, if --- the load balancer does not exist or has already been deleted, --- DeleteLoadBalancer still succeeds. --- --- -data DeleteLoadBalancer = DeleteLoadBalancer - { dlbLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - } deriving (Eq, Show, Generic) - -instance IsXML DeleteLoadBalancer where - xmlPickler = withNS elbNS - -instance IsQuery DeleteLoadBalancer - -instance Rq DeleteLoadBalancer where - type Er DeleteLoadBalancer = ErrorResponse - type Rs DeleteLoadBalancer = DeleteLoadBalancerResponse - request = query4 elb GET "DeleteLoadBalancer" - -data DeleteLoadBalancerResponse = DeleteLoadBalancerResponse - { dlbrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteLoadBalancerResponse where - xmlPickler = withNS elbNS - --- | Deletes listeners from the load balancer for the specified port. --- --- -data DeleteLoadBalancerListeners = DeleteLoadBalancerListeners - { dlblLoadBalancerName :: !Text - -- ^ The mnemonic name associated with the load balancer. - , dlblLoadBalancerPorts :: Members Integer - -- ^ The client port number(s) of the load balancer listener(s) to be - -- removed. - } deriving (Eq, Show, Generic) - -instance IsXML DeleteLoadBalancerListeners where - xmlPickler = withNS elbNS - -instance IsQuery DeleteLoadBalancerListeners - -instance Rq DeleteLoadBalancerListeners where - type Er DeleteLoadBalancerListeners = ErrorResponse - type Rs DeleteLoadBalancerListeners = DeleteLoadBalancerListenersResponse - request = query4 elb GET "DeleteLoadBalancerListeners" - -data DeleteLoadBalancerListenersResponse = DeleteLoadBalancerListenersResponse - { dlblrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteLoadBalancerListenersResponse where - xmlPickler = withNS elbNS - --- | Deletes a policy from the load balancer. The specified policy must not be --- enabled for any listeners. --- --- -data DeleteLoadBalancerPolicy = DeleteLoadBalancerPolicy - { dlbpLoadBalancerName :: !Text - -- ^ The mnemonic name associated with the load balancer. The name - -- must be unique within your AWS account. - , dlbpPolicyName :: !Text - -- ^ The mnemonic name for the policy being deleted. - } deriving (Eq, Show, Generic) - -instance IsXML DeleteLoadBalancerPolicy where - xmlPickler = withNS elbNS - -instance IsQuery DeleteLoadBalancerPolicy - -instance Rq DeleteLoadBalancerPolicy where - type Er DeleteLoadBalancerPolicy = ErrorResponse - type Rs DeleteLoadBalancerPolicy = DeleteLoadBalancerPolicyResponse - request = query4 elb GET "DeleteLoadBalancerPolicy" - -data DeleteLoadBalancerPolicyResponse = DeleteLoadBalancerPolicyResponse - { dlbprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteLoadBalancerPolicyResponse where - xmlPickler = withNS elbNS - --- | Deregisters instances from the load balancer. Once the instance is --- deregistered, it will stop receiving traffic from the load balancer. In --- order to successfully call this API, the same account credentials as those --- used to create the load balancer must be provided. --- --- -data DeregisterInstancesFromLoadBalancer = DeregisterInstancesFromLoadBalancer - { diflbInstances :: Members Instance - -- ^ A list of EC2 instance IDs consisting of all instances to be - -- deregistered. - , diflbLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - } deriving (Eq, Show, Generic) - -instance IsXML DeregisterInstancesFromLoadBalancer where - xmlPickler = withNS elbNS - -instance IsQuery DeregisterInstancesFromLoadBalancer - -instance Rq DeregisterInstancesFromLoadBalancer where - type Er DeregisterInstancesFromLoadBalancer = ErrorResponse - type Rs DeregisterInstancesFromLoadBalancer = DeregisterInstancesFromLoadBalancerResponse - request = query4 elb GET "DeregisterInstancesFromLoadBalancer" - -data DeregisterInstancesFromLoadBalancerResponse = DeregisterInstancesFromLoadBalancerResponse - { diflbrResponseMetadata :: !Text - , diflbrDeregisterInstancesFromLoadBalancerResult :: !DeregisterInstancesFromLoadBalancerResult - } deriving (Eq, Show, Generic) - -instance IsXML DeregisterInstancesFromLoadBalancerResponse where - xmlPickler = withNS elbNS - --- | Returns the current state of the instances of the specified load balancer. --- If no instances are specified, the state of all the instances for the load --- balancer is returned. Note The client must have created the specified input --- load balancer in order to retrieve this information; the client must --- provide the same account credentials as those that were used to create the --- load balancer. --- --- -data DescribeInstanceHealth = DescribeInstanceHealth - { dihInstances :: Members Instance - -- ^ A list of instance IDs whose states are being queried. - , dihLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeInstanceHealth where - xmlPickler = withNS elbNS - -instance IsQuery DescribeInstanceHealth - -instance Rq DescribeInstanceHealth where - type Er DescribeInstanceHealth = ErrorResponse - type Rs DescribeInstanceHealth = DescribeInstanceHealthResponse - request = query4 elb GET "DescribeInstanceHealth" - -data DescribeInstanceHealthResponse = DescribeInstanceHealthResponse - { dihrResponseMetadata :: !Text - , dihrDescribeInstanceHealthResult :: !DescribeInstanceHealthResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeInstanceHealthResponse where - xmlPickler = withNS elbNS - --- | Returns detailed descriptions of the policies. If you specify a load --- balancer name, the operation returns either the descriptions of the --- specified policies, or descriptions of all the policies created for the --- load balancer. If you don't specify a load balancer name, the operation --- returns descriptions of the specified sample policies, or descriptions of --- all the sample policies. The names of the sample policies have the --- ELBSample- prefix. --- --- -data DescribeLoadBalancerPolicies = DescribeLoadBalancerPolicies - { dlbqLoadBalancerName :: Maybe Text - -- ^ The mnemonic name associated with the load balancer. If no name - -- is specified, the operation returns the attributes of either all - -- the sample policies pre-defined by Elastic Load Balancing or the - -- specified sample polices. - , dlbqPolicyNames :: Members Text - -- ^ The names of LoadBalancer policies you've created or Elastic Load - -- Balancing sample policy names. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLoadBalancerPolicies where - xmlPickler = withNS elbNS - -instance IsQuery DescribeLoadBalancerPolicies - -instance Rq DescribeLoadBalancerPolicies where - type Er DescribeLoadBalancerPolicies = ErrorResponse - type Rs DescribeLoadBalancerPolicies = DescribeLoadBalancerPoliciesResponse - request = query4 elb GET "DescribeLoadBalancerPolicies" - -data DescribeLoadBalancerPoliciesResponse = DescribeLoadBalancerPoliciesResponse - { dlbpsResponseMetadata :: !Text - , dlbpsDescribeLoadBalancerPoliciesResult :: !DescribeLoadBalancerPoliciesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLoadBalancerPoliciesResponse where - xmlPickler = withNS elbNS - --- | Returns meta-information on the specified load balancer policies defined by --- the Elastic Load Balancing service. The policy types that are returned from --- this action can be used in a CreateLoadBalancerPolicy action to instantiate --- specific policy configurations that will be applied to a load balancer. --- --- -data DescribeLoadBalancerPolicyTypes = DescribeLoadBalancerPolicyTypes - { dlbptPolicyTypeNames :: Members Text - -- ^ Specifies the name of the policy types. If no names are - -- specified, returns the description of all the policy types - -- defined by Elastic Load Balancing service. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLoadBalancerPolicyTypes where - xmlPickler = withNS elbNS - -instance IsQuery DescribeLoadBalancerPolicyTypes - -instance Rq DescribeLoadBalancerPolicyTypes where - type Er DescribeLoadBalancerPolicyTypes = ErrorResponse - type Rs DescribeLoadBalancerPolicyTypes = DescribeLoadBalancerPolicyTypesResponse - request = query4 elb GET "DescribeLoadBalancerPolicyTypes" - -data DescribeLoadBalancerPolicyTypesResponse = DescribeLoadBalancerPolicyTypesResponse - { dlbptrResponseMetadata :: !Text - , dlbptrDescribeLoadBalancerPolicyTypesResult :: !DescribeLoadBalancerPolicyTypesResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLoadBalancerPolicyTypesResponse where - xmlPickler = withNS elbNS - --- | Returns detailed configuration information for the specified load --- balancers. If no load balancers are specified, the operation returns --- configuration information for all load balancers created by the caller. --- Note The client must have created the specified input load balancers in --- order to retrieve this information; the client must provide the same --- account credentials as those that were used to create the load balancer. --- --- -data DescribeLoadBalancers = DescribeLoadBalancers - { dlbLoadBalancerNames :: Members Text - -- ^ A list of names associated with the load balancers at creation - -- time. - , dlbMarker :: Maybe Text - -- ^ An optional parameter reserved for future use. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLoadBalancers where - xmlPickler = withNS elbNS - -instance IsQuery DescribeLoadBalancers - -instance Rq DescribeLoadBalancers where - type Er DescribeLoadBalancers = ErrorResponse - type Rs DescribeLoadBalancers = DescribeLoadBalancersResponse - request = query4 elb GET "DescribeLoadBalancers" - -instance Pg DescribeLoadBalancers where - next rq rs - | Just x <- dlbrNextMarker (dlbsDescribeLoadBalancersResult rs) = Just $ rq { dlbMarker = Just x } - | otherwise = Nothing - -data DescribeLoadBalancersResponse = DescribeLoadBalancersResponse - { dlbsResponseMetadata :: !Text - , dlbsDescribeLoadBalancersResult :: !DescribeLoadBalancersResult - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLoadBalancersResponse where - xmlPickler = withNS elbNS - --- | Removes subnets from the set of configured subnets in the VPC for the load --- balancer. After a subnet is removed all of the EndPoints registered with --- the load balancer that are in the removed subnet will go into the --- OutOfService state. When a subnet is removed, the load balancer will --- balance the traffic among the remaining routable subnets for the load --- balancer. --- --- -data DetachLoadBalancerFromSubnets = DetachLoadBalancerFromSubnets - { dlbfsLoadBalancerName :: !Text - -- ^ The name associated with the load balancer to be detached. The - -- name must be unique within the client AWS account. - , dlbfsSubnets :: Members Text - -- ^ A list of subnet IDs to remove from the set of configured subnets - -- for the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML DetachLoadBalancerFromSubnets where - xmlPickler = withNS elbNS - -instance IsQuery DetachLoadBalancerFromSubnets - -instance Rq DetachLoadBalancerFromSubnets where - type Er DetachLoadBalancerFromSubnets = ErrorResponse - type Rs DetachLoadBalancerFromSubnets = DetachLoadBalancerFromSubnetsResponse - request = query4 elb GET "DetachLoadBalancerFromSubnets" - -data DetachLoadBalancerFromSubnetsResponse = DetachLoadBalancerFromSubnetsResponse - { dlbfsrResponseMetadata :: !Text - , dlbfsrDetachLoadBalancerFromSubnetsResult :: !DetachLoadBalancerFromSubnetsResult - } deriving (Eq, Show, Generic) - -instance IsXML DetachLoadBalancerFromSubnetsResponse where - xmlPickler = withNS elbNS - --- | Removes the specified EC2 Availability Zones from the set of configured --- Availability Zones for the load balancer. There must be at least one --- Availability Zone registered with a load balancer at all times. A client --- cannot remove all the Availability Zones from a load balancer. Once an --- Availability Zone is removed, all the instances registered with the load --- balancer that are in the removed Availability Zone go into the OutOfService --- state. Upon Availability Zone removal, the load balancer attempts to --- equally balance the traffic among its remaining usable Availability Zones. --- Trying to remove an Availability Zone that was not associated with the load --- balancer does nothing. Note In order for this call to be successful, the --- client must have created the load balancer. The client must provide the --- same account credentials as those that were used to create the load --- balancer. --- --- -data DisableAvailabilityZonesForLoadBalancer = DisableAvailabilityZonesForLoadBalancer - { dazflbAvailabilityZones :: Members Text - -- ^ A list of Availability Zones to be removed from the load - -- balancer. - , dazflbLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - } deriving (Eq, Show, Generic) - -instance IsXML DisableAvailabilityZonesForLoadBalancer where - xmlPickler = withNS elbNS - -instance IsQuery DisableAvailabilityZonesForLoadBalancer - -instance Rq DisableAvailabilityZonesForLoadBalancer where - type Er DisableAvailabilityZonesForLoadBalancer = ErrorResponse - type Rs DisableAvailabilityZonesForLoadBalancer = DisableAvailabilityZonesForLoadBalancerResponse - request = query4 elb GET "DisableAvailabilityZonesForLoadBalancer" - -data DisableAvailabilityZonesForLoadBalancerResponse = DisableAvailabilityZonesForLoadBalancerResponse - { dazflbrResponseMetadata :: !Text - , dazflbrDisableAvailabilityZonesForLoadBalancerResult :: !DisableAvailabilityZonesForLoadBalancerResult - } deriving (Eq, Show, Generic) - -instance IsXML DisableAvailabilityZonesForLoadBalancerResponse where - xmlPickler = withNS elbNS - --- | Adds one or more EC2 Availability Zones to the load balancer. The load --- balancer evenly distributes requests across all its registered Availability --- Zones that contain instances. As a result, the client must ensure that its --- load balancer is appropriately scaled for each registered Availability --- Zone. Note The new EC2 Availability Zones to be added must be in the same --- EC2 Region as the Availability Zones for which the load balancer was --- created. --- --- -data EnableAvailabilityZonesForLoadBalancer = EnableAvailabilityZonesForLoadBalancer - { eazflbAvailabilityZones :: Members Text - -- ^ A list of new Availability Zones for the load balancer. Each - -- Availability Zone must be in the same Region as the load - -- balancer. - , eazflbLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - } deriving (Eq, Show, Generic) - -instance IsXML EnableAvailabilityZonesForLoadBalancer where - xmlPickler = withNS elbNS - -instance IsQuery EnableAvailabilityZonesForLoadBalancer - -instance Rq EnableAvailabilityZonesForLoadBalancer where - type Er EnableAvailabilityZonesForLoadBalancer = ErrorResponse - type Rs EnableAvailabilityZonesForLoadBalancer = EnableAvailabilityZonesForLoadBalancerResponse - request = query4 elb GET "EnableAvailabilityZonesForLoadBalancer" - -data EnableAvailabilityZonesForLoadBalancerResponse = EnableAvailabilityZonesForLoadBalancerResponse - { eazflbrResponseMetadata :: !Text - , eazflbrEnableAvailabilityZonesForLoadBalancerResult :: !EnableAvailabilityZonesForLoadBalancerResult - } deriving (Eq, Show, Generic) - -instance IsXML EnableAvailabilityZonesForLoadBalancerResponse where - xmlPickler = withNS elbNS - --- | Adds new instances to the load balancer. Once the instance is registered, --- it starts receiving traffic and requests from the load balancer. Any --- instance that is not in any of the Availability Zones registered for the --- load balancer will be moved to the OutOfService state. It will move to the --- InService state when the Availability Zone is added to the load balancer. --- Note In order for this call to be successful, the client must have created --- the load balancer. The client must provide the same account credentials as --- those that were used to create the load balancer. Note Completion of this --- API does not guarantee that operation has completed. Rather, it means that --- the request has been registered and the changes will happen shortly. --- --- -data RegisterInstancesWithLoadBalancer = RegisterInstancesWithLoadBalancer - { riwlbInstances :: Members Instance - -- ^ A list of instance IDs that should be registered with the load - -- balancer. - , riwlbLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - } deriving (Eq, Show, Generic) - -instance IsXML RegisterInstancesWithLoadBalancer where - xmlPickler = withNS elbNS - -instance IsQuery RegisterInstancesWithLoadBalancer - -instance Rq RegisterInstancesWithLoadBalancer where - type Er RegisterInstancesWithLoadBalancer = ErrorResponse - type Rs RegisterInstancesWithLoadBalancer = RegisterInstancesWithLoadBalancerResponse - request = query4 elb GET "RegisterInstancesWithLoadBalancer" - -data RegisterInstancesWithLoadBalancerResponse = RegisterInstancesWithLoadBalancerResponse - { riwlbrResponseMetadata :: !Text - , riwlbrRegisterInstancesWithLoadBalancerResult :: !RegisterInstancesWithLoadBalancerResult - } deriving (Eq, Show, Generic) - -instance IsXML RegisterInstancesWithLoadBalancerResponse where - xmlPickler = withNS elbNS - --- | Sets the certificate that terminates the specified listener's SSL --- connections. The specified certificate replaces any prior certificate that --- was used on the same load balancer and port. For information on using --- SetLoadBalancerListenerSSLCertificate, see Using the Query4 Elb API in the --- Updating an SSL Certificate for a Load Balancer section in of the Elastic --- Load Balancing Developer Guide. --- --- -data SetLoadBalancerListenerSSLCertificate = SetLoadBalancerListenerSSLCertificate - { slblsslcLoadBalancerName :: !Text - -- ^ The name of the the load balancer. - , slblsslcLoadBalancerPort :: !Integer - -- ^ The port that uses the specified SSL certificate. - , slblsslcSSLCertificateId :: !Text - -- ^ The ID of the SSL certificate chain to use. For more information - -- on SSL certificates, see Managing Server Certificates in the AWS - -- Identity and Access Management documentation. - } deriving (Eq, Show, Generic) - -instance IsXML SetLoadBalancerListenerSSLCertificate where - xmlPickler = withNS elbNS - -instance IsQuery SetLoadBalancerListenerSSLCertificate - -instance Rq SetLoadBalancerListenerSSLCertificate where - type Er SetLoadBalancerListenerSSLCertificate = ErrorResponse - type Rs SetLoadBalancerListenerSSLCertificate = SetLoadBalancerListenerSSLCertificateResponse - request = query4 elb GET "SetLoadBalancerListenerSSLCertificate" - -data SetLoadBalancerListenerSSLCertificateResponse = SetLoadBalancerListenerSSLCertificateResponse - { slblsslcrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML SetLoadBalancerListenerSSLCertificateResponse where - xmlPickler = withNS elbNS - --- | Replaces the current set of policies associated with a port on which the --- back-end server is listening with a new set of policies. After the policies --- have been created using CreateLoadBalancerPolicy, they can be applied here --- as a list. At this time, only the back-end server authentication policy --- type can be applied to the back-end ports; this policy type is composed of --- multiple public key policies. --- --- -data SetLoadBalancerPoliciesForBackendServer = SetLoadBalancerPoliciesForBackendServer - { slbpfbsInstancePort :: !Integer - -- ^ The port number associated with the back-end server. - , slbpfbsLoadBalancerName :: !Text - -- ^ The mnemonic name associated with the load balancer. This name - -- must be unique within the client AWS account. - , slbpfbsPolicyNames :: Members Text - -- ^ List of policy names to be set. If the list is empty, then all - -- current polices are removed from the back-end server. - } deriving (Eq, Show, Generic) - -instance IsXML SetLoadBalancerPoliciesForBackendServer where - xmlPickler = withNS elbNS - -instance IsQuery SetLoadBalancerPoliciesForBackendServer - -instance Rq SetLoadBalancerPoliciesForBackendServer where - type Er SetLoadBalancerPoliciesForBackendServer = ErrorResponse - type Rs SetLoadBalancerPoliciesForBackendServer = SetLoadBalancerPoliciesForBackendServerResponse - request = query4 elb GET "SetLoadBalancerPoliciesForBackendServer" - -data SetLoadBalancerPoliciesForBackendServerResponse = SetLoadBalancerPoliciesForBackendServerResponse - { slbpfbsrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML SetLoadBalancerPoliciesForBackendServerResponse where - xmlPickler = withNS elbNS - --- | Associates, updates, or disables a policy with a listener on the load --- balancer. You can associate multiple policies with a listener. --- --- -data SetLoadBalancerPoliciesOfListener = SetLoadBalancerPoliciesOfListener - { slbpolLoadBalancerName :: !Text - -- ^ The name associated with the load balancer. The name must be - -- unique within the client AWS account. - , slbpolLoadBalancerPort :: !Integer - -- ^ The external port of the load balancer with which this policy - -- applies to. - , slbpolPolicyNames :: Members Text - -- ^ List of policies to be associated with the listener. Currently - -- this list can have at most one policy. If the list is empty, the - -- current policy is removed from the listener. - } deriving (Eq, Show, Generic) - -instance IsXML SetLoadBalancerPoliciesOfListener where - xmlPickler = withNS elbNS - -instance IsQuery SetLoadBalancerPoliciesOfListener - -instance Rq SetLoadBalancerPoliciesOfListener where - type Er SetLoadBalancerPoliciesOfListener = ErrorResponse - type Rs SetLoadBalancerPoliciesOfListener = SetLoadBalancerPoliciesOfListenerResponse - request = query4 elb GET "SetLoadBalancerPoliciesOfListener" - -data SetLoadBalancerPoliciesOfListenerResponse = SetLoadBalancerPoliciesOfListenerResponse - { slbpolrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML SetLoadBalancerPoliciesOfListenerResponse where - xmlPickler = withNS elbNS diff --git a/src/Network/AWS/ELB/Types.hs b/src/Network/AWS/ELB/Types.hs deleted file mode 100644 index 2f847fc0a11..00000000000 --- a/src/Network/AWS/ELB/Types.hs +++ /dev/null @@ -1,576 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} - --- Module : Network.AWS.ELB.Types --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.ELB.Types where - -import Data.ByteString (ByteString) -import Data.Monoid -import Data.Text (Text) -import Data.Time -import Network.AWS.Internal - --- | Currently supported version of the ELB service. -elb :: Service -elb = Service Regional version4 "elasticloadbalancing" "2012-06-01" - --- | XML namespace to annotate ELB elements with. -elbNS :: ByteString -elbNS = "http://elasticloadbalancing.amazonaws.com/doc/" <> svcVersion elb <> "/" - --- | Helper to define ELB namespaced XML elements. -elbElem :: ByteString -> NName ByteString -elbElem = mkNName elbNS - -data ELBError = ELBError - { elbeCode :: !Text - , elbeMessage :: !Text - , elbeType :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML ELBError where - xmlPickler = withNS elbNS - -data ErrorResponse = ErrorResponse - { elberError :: !ELBError - , elberRequestId :: !Text - } deriving (Eq, Show, Generic) - -instance ToError ErrorResponse where - toError = Err . show - -instance IsXML ErrorResponse where - xmlPickler = withNS elbNS - --- | The AppCookieStickinessPolicy data type. --- --- -data AppCookieStickinessPolicy = AppCookieStickinessPolicy - { acspCookieName :: Maybe Text - -- ^ The name of the application cookie used for stickiness. - , acspPolicyName :: Maybe Text - -- ^ The mnemonic name for the policy being created. The name must be - -- unique within a set of policies for this load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML AppCookieStickinessPolicy where - xmlPickler = withNS elbNS - -instance IsQuery AppCookieStickinessPolicy - --- | The out for the ApplySecurityGroupsToLoadBalancer action. --- --- -data ApplySecurityGroupsToLoadBalancerResult = ApplySecurityGroupsToLoadBalancerResult - { asgtlbrSecurityGroups :: Maybe Text - -- ^ A list of security group IDs associated with your load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML ApplySecurityGroupsToLoadBalancerResult where - xmlPickler = withNS elbNS - -instance IsQuery ApplySecurityGroupsToLoadBalancerResult - --- | The output for the AttachLoadBalancerToSubnets action. --- --- -data AttachLoadBalancerToSubnetsResult = AttachLoadBalancerToSubnetsResult - { albtsrSubnets :: Maybe Text - -- ^ A list of subnet IDs added for the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML AttachLoadBalancerToSubnetsResult where - xmlPickler = withNS elbNS - -instance IsQuery AttachLoadBalancerToSubnetsResult - --- | This data type is used as a response element in the DescribeLoadBalancers --- action to describe the configuration of the back-end server. --- --- -data BackendServerDescription = BackendServerDescription - { bsdInstancePort :: Maybe Integer - -- ^ Provides the port on which the back-end server is listening. - , bsdPolicyNames :: Maybe Text - -- ^ Provides a list of policy names enabled for the back-end server. - } deriving (Eq, Show, Generic) - -instance IsXML BackendServerDescription where - xmlPickler = withNS elbNS - -instance IsQuery BackendServerDescription - --- | The output for the ConfigureHealthCheck action. --- --- -data ConfigureHealthCheckResult = ConfigureHealthCheckResult - { chcrHealthCheck :: Maybe HealthCheck - -- ^ The updated healthcheck for the instances. - } deriving (Eq, Show, Generic) - -instance IsXML ConfigureHealthCheckResult where - xmlPickler = withNS elbNS - -instance IsQuery ConfigureHealthCheckResult - --- | The output for the CreateLoadBalancer action. --- --- -data CreateLoadBalancerResult = CreateLoadBalancerResult - { clbrDNSName :: Maybe Text - -- ^ The DNS name for the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML CreateLoadBalancerResult where - xmlPickler = withNS elbNS - -instance IsQuery CreateLoadBalancerResult - --- | The output for the DeregisterInstancesFromLoadBalancer action. --- --- -data DeregisterInstancesFromLoadBalancerResult = DeregisterInstancesFromLoadBalancerResult - { diflbrInstances :: Maybe Instance - -- ^ An updated list of remaining instances registered with the load - -- balancer. - } deriving (Eq, Show, Generic) - -instance IsXML DeregisterInstancesFromLoadBalancerResult where - xmlPickler = withNS elbNS - -instance IsQuery DeregisterInstancesFromLoadBalancerResult - --- | The output for the DescribeInstanceHealth action. --- --- -data DescribeInstanceHealthResult = DescribeInstanceHealthResult - { dihrInstanceStates :: Maybe InstanceState - -- ^ A list containing health information for the specified instances. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeInstanceHealthResult where - xmlPickler = withNS elbNS - -instance IsQuery DescribeInstanceHealthResult - --- | The output for the DescribeLoadBalancerPolicies action. --- --- -data DescribeLoadBalancerPoliciesResult = DescribeLoadBalancerPoliciesResult - { dlbprPolicyDescriptions :: Maybe PolicyDescription - -- ^ A list of policy description structures. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLoadBalancerPoliciesResult where - xmlPickler = withNS elbNS - -instance IsQuery DescribeLoadBalancerPoliciesResult - --- | The output for the DescribeLoadBalancerPolicyTypes action. --- --- -data DescribeLoadBalancerPolicyTypesResult = DescribeLoadBalancerPolicyTypesResult - { dlbptrPolicyTypeDescriptions :: Maybe PolicyTypeDescription - -- ^ List of policy type description structures of the specified - -- policy type. If no policy type names are specified, returns the - -- description of all the policy types defined by Elastic Load - -- Balancing service. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLoadBalancerPolicyTypesResult where - xmlPickler = withNS elbNS - -instance IsQuery DescribeLoadBalancerPolicyTypesResult - --- | The output for the DescribeLoadBalancers action. --- --- -data DescribeLoadBalancersResult = DescribeLoadBalancersResult - { dlbrLoadBalancerDescriptions :: Members LoadBalancerDescription - -- ^ A list of load balancer description structures. - , dlbrNextMarker :: Maybe Text - -- ^ An optional parameter reserved for future use. - } deriving (Eq, Show, Generic) - -instance IsXML DescribeLoadBalancersResult where - xmlPickler = withNS elbNS - -instance IsQuery DescribeLoadBalancersResult - --- | The output for the DetachLoadBalancerFromSubnets action. --- --- -data DetachLoadBalancerFromSubnetsResult = DetachLoadBalancerFromSubnetsResult - { dlbfsrSubnets :: Maybe Text - -- ^ A list of subnet IDs removed from the configured set of subnets - -- for the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML DetachLoadBalancerFromSubnetsResult where - xmlPickler = withNS elbNS - -instance IsQuery DetachLoadBalancerFromSubnetsResult - --- | The output for the DisableAvailabilityZonesForLoadBalancer action. --- --- -data DisableAvailabilityZonesForLoadBalancerResult = DisableAvailabilityZonesForLoadBalancerResult - { dazflbrAvailabilityZones :: Members Text - -- ^ A list of updated Availability Zones for the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML DisableAvailabilityZonesForLoadBalancerResult where - xmlPickler = withNS elbNS - -instance IsQuery DisableAvailabilityZonesForLoadBalancerResult - --- | The output for the EnableAvailabilityZonesForLoadBalancer action. --- --- -data EnableAvailabilityZonesForLoadBalancerResult = EnableAvailabilityZonesForLoadBalancerResult - { eazflbrAvailabilityZones :: Members Text - -- ^ An updated list of Availability Zones for the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML EnableAvailabilityZonesForLoadBalancerResult where - xmlPickler = withNS elbNS - -instance IsQuery EnableAvailabilityZonesForLoadBalancerResult - --- | The HealthCheck data type. --- --- -data HealthCheck = HealthCheck - { hcHealthyThreshold :: !Integer - -- ^ Specifies the number of consecutive health probe successes - -- required before moving the instance to the Healthy state. - , hcInterval :: !Integer - -- ^ Specifies the approximate interval, in seconds, between health - -- checks of an individual instance. - , hcTarget :: !Text - -- ^ Specifies the instance being checked. The protocol is either TCP, - -- HTTP, HTTPS, or SSL. The range of valid ports is one (1) through - -- 65535. - , hcTimeout :: !Integer - -- ^ Specifies the amount of time, in seconds, during which no - -- response means a failed health probe. - , hcUnhealthyThreshold :: !Integer - -- ^ Specifies the number of consecutive health probe failures - -- required before moving the instance to the Unhealthy state. - } deriving (Eq, Show, Generic) - -instance IsXML HealthCheck where - xmlPickler = withNS elbNS - -instance IsQuery HealthCheck - --- | The Instance data type. --- --- -data Instance = Instance - { iInstanceId :: Maybe Text - -- ^ Provides an EC2 instance ID. - } deriving (Eq, Show, Generic) - -instance IsXML Instance where - xmlPickler = withNS elbNS - -instance IsQuery Instance - --- | The InstanceState data type. --- --- -data InstanceState = InstanceState - { isDescription :: Maybe Text - -- ^ Provides a description of the instance state. - , isInstanceId :: Maybe Text - -- ^ Provides an EC2 instance ID. - , isReasonCode :: Maybe Text - -- ^ Provides information about the cause of OutOfService instances. - -- Specifically, it indicates whether the cause is Elastic Load - -- Balancing or the instance behind the load balancer. - , isState :: Maybe Text - -- ^ Specifies the current state of the instance. Valid value: - -- InService|OutOfService - } deriving (Eq, Show, Generic) - -instance IsXML InstanceState where - xmlPickler = withNS elbNS - -instance IsQuery InstanceState - --- | The LBCookieStickinessPolicy data type. --- --- -data LBCookieStickinessPolicy = LBCookieStickinessPolicy - { lbcspCookieExpirationPeriod :: Maybe Integer - -- ^ The time period in seconds after which the cookie should be - -- considered stale. Not specifying this parameter indicates that - -- the stickiness session will last for the duration of the browser - -- session. - , lbcspPolicyName :: Maybe Text - -- ^ The name for the policy being created. The name must be unique - -- within the set of policies for this load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML LBCookieStickinessPolicy where - xmlPickler = withNS elbNS - -instance IsQuery LBCookieStickinessPolicy - --- | The Listener data type. --- --- -data Listener = Listener - { lInstancePort :: !Integer - -- ^ Specifies the TCP port on which the instance server is listening. - -- This property cannot be modified for the life of the load - -- balancer. - , lInstanceProtocol :: Maybe Text - -- ^ Specifies the protocol to use for routing traffic to back-end - -- instances - HTTP, HTTPS, TCP, or SSL. This property cannot be - -- modified for the life of the load balancer. - , lLoadBalancerPort :: !Integer - -- ^ Specifies the external load balancer port number. This property - -- cannot be modified for the life of the load balancer. - , lProtocol :: !Text - -- ^ Specifies the load balancer transport protocol to use for routing - -- - HTTP, HTTPS, TCP or SSL. This property cannot be modified for - -- the life of the load balancer. - , lSSLCertificateId :: Maybe Text - -- ^ The ARN string of the server certificate. To get the ARN of the - -- server certificate, call the AWS Identity and Access Management - -- UploadServerCertificate API. - } deriving (Eq, Show, Generic) - -instance IsXML Listener where - xmlPickler = withNS elbNS - -instance IsQuery Listener - --- | The ListenerDescription data type. --- --- -data ListenerDescription = ListenerDescription - { ldListener :: Maybe Listener - -- ^ The Listener data type. - , ldPolicyNames :: Maybe Text - -- ^ A list of policies enabled for this listener. An empty list - -- indicates that no policies are enabled. - } deriving (Eq, Show, Generic) - -instance IsXML ListenerDescription where - xmlPickler = withNS elbNS - -instance IsQuery ListenerDescription - --- | Contains the result of a successful invocation of DescribeLoadBalancers. --- --- -data LoadBalancerDescription = LoadBalancerDescription - { lbdAvailabilityZones :: [Text] - -- ^ Specifies a list of Availability Zones. - , lbdBackendServerDescriptions :: Members BackendServerDescription - -- ^ Contains a list of back-end server descriptions. - , lbdCanonicalHostedZoneName :: Maybe Text - -- ^ Provides the name of the Amazon Route 53 hosted zone that is - -- associated with the load balancer. For information on how to - -- associate your load balancer with a hosted zone, go to Using - -- Domain Names With Elastic Load Balancing in the Elastic Load - -- Balancing Developer Guide. - , lbdCanonicalHostedZoneNameID :: Maybe Text - -- ^ Provides the ID of the Amazon Route 53 hosted zone name that is - -- associated with the load balancer. For information on how to - -- associate or disassociate your load balancer with a hosted zone, - -- go to Using Domain Names With Elastic Load Balancing in the - -- Elastic Load Balancing Developer Guide. - , lbdCreatedTime :: Maybe UTCTime - -- ^ Provides the date and time the load balancer was created. - , lbdDNSName :: Maybe Text - -- ^ Specifies the external DNS name associated with the load - -- balancer. - , lbdHealthCheck :: Maybe HealthCheck - -- ^ Specifies information regarding the various health probes - -- conducted on the load balancer. - , lbdInstances :: Members Instance - -- ^ Provides a list of EC2 instance IDs for the load balancer. - , lbdListenerDescriptions :: Members ListenerDescription - -- ^ LoadBalancerPort, InstancePort, Protocol, InstanceProtocol, and - -- PolicyNames are returned in a list of tuples in the - -- ListenerDescriptions element. - , lbdLoadBalancerName :: Maybe Text - -- ^ Specifies the name associated with the load balancer. - , lbdPolicies :: Maybe Policies - -- ^ Provides a list of policies defined for the load balancer. - , lbdScheme :: Maybe Text - -- ^ Specifies the type of load balancer. - , lbdSecurityGroups :: Members Text - -- ^ The security groups the load balancer is a member of (VPC only). - , lbdSourceSecurityGroup :: Maybe SourceSecurityGroup - -- ^ The security group that you can use as part of your inbound rules - -- for your load balancer's back-end Amazon EC2 application - -- instances. To only allow traffic from load balancers, add a - -- security group rule to your back end instance that specifies this - -- source security group as the inbound source. - , lbdSubnets :: Members Text - -- ^ Provides a list of VPC subnet IDs for the load balancer. - , lbdVPCId :: Maybe Text - -- ^ Provides the ID of the VPC attached to the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML LoadBalancerDescription where - xmlPickler = withNS elbNS - -instance IsQuery LoadBalancerDescription - --- | The policies data type. --- --- -data Policies = Policies - { pAppCookieStickinessPolicies :: Maybe AppCookieStickinessPolicy - -- ^ A list of the AppCookieStickinessPolicy objects created with - -- CreateAppCookieStickinessPolicy. - , pLBCookieStickinessPolicies :: Maybe LBCookieStickinessPolicy - -- ^ A list of LBCookieStickinessPolicy objects created with - -- CreateAppCookieStickinessPolicy. - , pOtherPolicies :: Maybe Text - -- ^ A list of policy names other than the stickiness policies. - } deriving (Eq, Show, Generic) - -instance IsXML Policies where - xmlPickler = withNS elbNS - -instance IsQuery Policies - --- | The PolicyAttribute data type. This data type contains a key/value pair --- that defines properties of a specific policy. --- --- -data PolicyAttribute = PolicyAttribute - { paAttributeName :: Maybe Text - -- ^ The name of the attribute associated with the policy. - , paAttributeValue :: Maybe Text - -- ^ The value of the attribute associated with the policy. - } deriving (Eq, Show, Generic) - -instance IsXML PolicyAttribute where - xmlPickler = withNS elbNS - -instance IsQuery PolicyAttribute - --- | The PolicyAttributeDescription data type. This data type is used to --- describe the attributes and values associated with a policy. --- --- -data PolicyAttributeDescription = PolicyAttributeDescription - { padAttributeName :: Maybe Text - -- ^ The name of the attribute associated with the policy. - , padAttributeValue :: Maybe Text - -- ^ The value of the attribute associated with the policy. - } deriving (Eq, Show, Generic) - -instance IsXML PolicyAttributeDescription where - xmlPickler = withNS elbNS - -instance IsQuery PolicyAttributeDescription - --- | The PolicyAttributeTypeDescription data type. This data type is used to --- describe values that are acceptable for the policy attribute. --- --- -data PolicyAttributeTypeDescription = PolicyAttributeTypeDescription - { patdAttributeName :: Maybe Text - -- ^ The name of the attribute associated with the policy type. - , patdAttributeType :: Maybe Text - -- ^ The type of attribute. For example, Boolean, Integer, etc. - , patdCardinality :: Maybe Text - -- ^ The cardinality of the attribute. Valid Values: - , patdDefaultValue :: Maybe Text - -- ^ The default value of the attribute, if applicable. - , patdDescription :: Maybe Text - -- ^ A human-readable description of the attribute. - } deriving (Eq, Show, Generic) - -instance IsXML PolicyAttributeTypeDescription where - xmlPickler = withNS elbNS - -instance IsQuery PolicyAttributeTypeDescription - --- | The PolicyDescription data type. --- --- -data PolicyDescription = PolicyDescription - { pdPolicyAttributeDescriptions :: Maybe PolicyAttributeDescription - -- ^ A list of policy attribute description structures. - , pdPolicyName :: Maybe Text - -- ^ The name of the policy associated with the load balancer. - , pdPolicyTypeName :: Maybe Text - -- ^ The name of the policy type associated with the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML PolicyDescription where - xmlPickler = withNS elbNS - -instance IsQuery PolicyDescription - --- | The PolicyTypeDescription data type. --- --- -data PolicyTypeDescription = PolicyTypeDescription - { ptdDescription :: Maybe Text - -- ^ A human-readable description of the policy type. - , ptdPolicyAttributeTypeDescriptions :: Maybe PolicyAttributeTypeDescription - -- ^ The description of the policy attributes associated with the load - -- balancer policies defined by the Elastic Load Balancing service. - , ptdPolicyTypeName :: Maybe Text - -- ^ The name of the policy type. - } deriving (Eq, Show, Generic) - -instance IsXML PolicyTypeDescription where - xmlPickler = withNS elbNS - -instance IsQuery PolicyTypeDescription - --- | The output for the RegisterInstancesWithLoadBalancer action. --- --- -data RegisterInstancesWithLoadBalancerResult = RegisterInstancesWithLoadBalancerResult - { riwlbrInstances :: Maybe Instance - -- ^ An updated list of instances for the load balancer. - } deriving (Eq, Show, Generic) - -instance IsXML RegisterInstancesWithLoadBalancerResult where - xmlPickler = withNS elbNS - -instance IsQuery RegisterInstancesWithLoadBalancerResult - --- | This data type is used as a response element in the DescribeLoadBalancers --- action. For information about Elastic Load Balancing security groups, go to --- Using Security Groups With Elastic Load Balancing in the Elastic Load --- Balancing Developer Guide. --- --- -data SourceSecurityGroup = SourceSecurityGroup - { ssgGroupName :: Maybe Text - -- ^ Name of the source security group. Use this value for the - -- --source-group parameter of the ec2-authorize command in the - -- Amazon EC2 command line tool. - , ssgOwnerAlias :: Maybe Text - -- ^ Owner of the source security group. Use this value for the - -- --source-group-user parameter of the ec2-authorize command in the - -- Amazon EC2 command line tool. - } deriving (Eq, Show, Generic) - -instance IsXML SourceSecurityGroup where - xmlPickler = withNS elbNS - -instance IsQuery SourceSecurityGroup diff --git a/src/Network/AWS/Headers.hs b/src/Network/AWS/Headers.hs deleted file mode 100644 index dd36f64d041..00000000000 --- a/src/Network/AWS/Headers.hs +++ /dev/null @@ -1,327 +0,0 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE GADTs #-} -{-# LANGUAGE KindSignatures #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TupleSections #-} - -{-# OPTIONS_GHC -fno-warn-type-defaults #-} - --- Module : Network.AWS.Headers --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Headers where - -import Data.ByteString (ByteString) -import Network.HTTP.Types (Header) - --- import Crypto.Hash.MD5 --- import qualified Data.ByteString.Base64 as Base64 --- import qualified Data.ByteString.Char8 as BS --- import Data.CaseInsensitive (CI) --- import qualified Data.CaseInsensitive as Case --- import Data.Monoid --- import Data.Text (Text) --- import qualified Data.Text as Text --- import qualified Data.Text.Encoding as Text -import Data.Time -import Network.AWS.Internal.Time --- import GHC.TypeLits --- import Network.Http.Client (Method) - -default (ByteString) - -hAccept :: ByteString -> Header -hAccept = ("Accept-Encoding",) - -hDate :: ByteString -> Header -hDate = ("Date",) - -hHost :: ByteString -> Header -hHost = ("Host",) - -hAuth :: ByteString -> Header -hAuth = ("Authorization",) - -hAMZAuth :: ByteString -> Header -hAMZAuth = ("X-Amzn-Authorization",) - -hAMZDate :: UTCTime -> Header -hAMZDate = ("X-Amz-Date",) . formatISO8601 - -hAMZToken :: ByteString -> Header -hAMZToken = ("X-Amz-Security-Token",) - - --- class IsHeader a where --- encodeHeader :: a -> ByteString -> (CI ByteString, ByteString) - --- instance IsHeader v => IsHeader (ByteString, v) where --- encodeHeader (k, v) = encodeHeader v . (`mappend` k) - --- instance IsHeader v => IsHeader (Text, v) where --- encodeHeader (k, v) = encodeHeader (Text.encodeUtf8 k, v) - --- instance IsHeader ByteString where --- encodeHeader s = (, s) . Case.mk - --- instance IsHeader Text where --- encodeHeader s = (, Text.encodeUtf8 s) . Case.mk - --- instance IsHeader [Text] where --- encodeHeader xs = encodeHeader (Text.intercalate "," xs) - --- instance IsHeader String where --- encodeHeader s = (, BS.pack s) . Case.mk - --- instance IsHeader Integer where --- encodeHeader n = encodeHeader (show n) - --- instance IsHeader Method where --- encodeHeader m = encodeHeader (show m) - --- data AnyHeader where --- AnyHeader :: IsHeader a => a -> AnyHeader - --- instance IsHeader AnyHeader where --- encodeHeader (AnyHeader h) = encodeHeader h - --- instance Show AnyHeader where --- show (AnyHeader h) = show $ encodeHeader h mempty - --- hdr :: IsHeader a => a -> AnyHeader --- hdr = AnyHeader - --- data Header (k :: Symbol) v = Header v - --- instance Functor (Header k) where --- fmap f (Header x) = Header $ f x - --- instance (SingI k, IsHeader v) => IsHeader (Header k v) where --- encodeHeader h@(Header v) = encodeHeader v . mappend (withSing $ f h) --- where --- f :: Header k v -> Sing k -> ByteString --- f _ = BS.pack . fromSing - --- instance (SingI k, IsHeader v) => Show (Header k v) where --- show = show . (`encodeHeader` mempty) - --- type ContentLength = Header "content-length" Integer --- type ContentLanguage = Header "content-language" ByteString --- type Expect = Header "expect" ByteString --- type Expires = Header "expires" ByteString --- type Range = Header "range" ByteString --- type IfModifiedSince = Header "if-modified-since" ByteString --- type IfUnmodifiedSince = Header "if-unmodified-since" ByteString --- type IfMatch = Header "if-match" ByteString --- type IfNoneMatch = Header "if-none-match" ByteString - --- data Content (t :: Symbol) (s :: Symbol) = Content - --- instance (SingI t, SingI s) => IsHeader (Content t s) where --- encodeHeader c = encodeHeader (BS.pack "content-type", val) --- where --- val = BS.concat [contentType c, "/", contentSubType c] - --- contentType :: SingI t => Content t s -> ByteString --- contentType = withSing . f --- where --- f :: Content t s -> Sing t -> ByteString --- f _ = BS.pack . fromSing - --- contentSubType :: SingI s => Content t s -> ByteString --- contentSubType = withSing . f --- where --- f :: Content t s -> Sing s -> ByteString --- f _ = BS.pack . fromSing - --- type JSON = Content "application" "json" --- type XML = Content "application" "xml" --- type FormURLEncoded = Content "application" "x-www-form-urlencoded" - --- class CacheValue a where --- cacheValue :: ByteString -> a -> ByteString - --- newtype Cache (k :: Symbol) v = Cache v - --- instance (SingI k, CacheValue v) => IsHeader (Cache k v) where --- encodeHeader c@(Cache v) = --- encodeHeader (BS.pack "cache-control", cacheValue (withSing $ f c) v) --- where --- f :: Cache k v -> Sing k -> ByteString --- f _ = BS.pack . fromSing - --- type Public = Cache "public" () --- type Private = Cache "private" (Maybe Text) --- type NoCache = Cache "no-cache" (Maybe Text) --- type NoStore = Cache "no-store" () --- type NoTransform = Cache "no-transform" () --- type MustRevalidate = Cache "must-revalidate" () --- type ProxyRevalidate = Cache "proxy-revalidate" () --- type MaxAge = Cache "max-age" Integer --- type SMaxAge = Cache "s-maxage" Integer --- type MaxStale = Cache "max-stale" (Maybe Integer) --- type MinFresh = Cache "min-fresh" Integer --- type OnlyIfCache = Cache "only-if-cached" () - --- data Encoding (t :: Symbol) = Encoding - --- instance SingI t => IsHeader (Encoding t) where --- encodeHeader e = encodeHeader (BS.pack "encoding", withSing $ f e) --- where --- f :: Encoding t -> Sing t -> ByteString --- f _ = BS.pack . fromSing - --- type GZipEncoding = Encoding "gzip" --- type DeflateEncoding = Encoding "deflate" - --- newtype Param (k :: Symbol) v = Param v - --- class ParamValue a where --- paramValue :: a -> ByteString - --- instance ParamValue ByteString where --- paramValue = id - --- instance (SingI k, ParamValue v) => ParamValue (Param k v) where --- paramValue p@(Param v) = BS.concat [withSing $ f p, "=", paramValue v] --- where --- f :: Param k v -> Sing k -> ByteString --- f _ = BS.pack . fromSing - --- data AnyParam where --- AnyParam :: ParamValue a => a -> AnyParam - --- instance ParamValue AnyParam where --- paramValue (AnyParam p) = paramValue p - --- prm :: ParamValue a => a -> AnyParam --- prm = AnyParam - --- newtype Disposition (t :: Symbol) = Disposition [AnyParam] - --- instance SingI t => IsHeader (Disposition t) where --- encodeHeader d@(Disposition ps) = --- encodeHeader (BS.pack "content-disposition", val) --- where --- val = BS.intercalate ";" $ withSing (f d) : map paramValue ps - --- f :: Disposition t -> Sing t -> ByteString --- f _ = BS.pack . fromSing - --- -- | Displayed automatically [RFC2183] --- type Inline = Disposition "inline" - --- -- | Attachment user controlled display [RFC2183] --- type Attachment = Disposition "attachment" - --- -- | Process as form response [RFC2388] --- type FormData = Disposition "form-data" - --- -- | Tunneled content to be processed silently [RFC3204] --- type Signal = Disposition "signal" - --- -- | Custom ring tone to alert the user [RFC3261] --- type Alert = Disposition "alert" - --- -- | Displayed as an icon to the user [RFC3261] --- type Icon = Disposition "icon" - --- -- | Should be displayed to the user [RFC3261] --- type Render = Disposition "render" - --- -- | Contains a list of URIs that indicates the recipients --- -- of the request [RFC5364] --- type RecipientListHistory = Disposition "recipient-list-history" - --- -- | Describes a communications session. --- -- For example, an RFC2327 SDP body [RFC3261] --- type Session = Disposition "session" - --- -- | Authenticated Identity Body [RFC3893] --- type AIB = Disposition "aib" - --- -- | Describes an early communications session. --- -- For example, and [RFC2327] SDP body [RFC3959] --- type EarlySession = Disposition "early-session" - --- -- | Includes a list of URIs to which URI-list services --- -- are to be applied. [RFC5363] --- type RecipientList = Disposition "recipient-list" - --- -- | Payload of the message carrying this Content-Disposition header --- -- field value is an Instant Message Disposition Notification as requested --- -- in the corresponding Instant Message. [RFC5438] --- type Notification = Disposition "notification" - --- -- | Needs to be handled according to a reference to the body that is located --- -- in the same SIP message as the body. [RFC5621] --- type ByReference = Disposition "by-reference" - --- -- | Contains information associated with an Info Package --- type InfoPackage = Disposition "info-package" - --- -- | Name to be used when creating file [RFC2183] --- type FileName = Param "filename" ByteString - --- -- | When content was created [RFC2183] --- type CreationDate = Param "creation-date" UTCTime - --- -- | When content was last modified [RFC2183] --- type ModificationDate = Param "modification-date" UTCTime - --- -- | When content was last read [RFC2183] --- type ReadDate = Param "read-date" UTCTime - --- -- | Approximate size of content in octets [RFC2183] --- type Size = Param "size" Integer - --- -- | Original field name in form [RFC2388] --- type Name = Param "name" ByteString - --- -- | Whether or not processing is required [RFC3204] --- type Handling = Param "handling" HandlingType - --- -- | Type or use of audio content [RFC2421] --- type Voice = Param "voice" VoiceType - --- data HandlingType --- = Required --- | Optional --- deriving (Eq, Show) - --- instance ParamValue HandlingType where --- paramValue Required = "required" --- paramValue Optional = "optional" - --- data VoiceType --- = VoiceMessage --- | VoiceMessageNotification --- | OriginatorSpokenName --- | RecipientSpokenName --- | SpokenSubject --- deriving (Eq, Show) - --- instance ParamValue VoiceType where --- paramValue vt = case vt of --- VoiceMessage -> "Voice-Message" --- VoiceMessageNotification -> "Voice-Message-Notification" --- OriginatorSpokenName -> "Originator-Spoken-Name" --- RecipientSpokenName -> "Recipient-Spoken-Name" --- SpokenSubject -> "Spoken-Subject" - --- newtype MD5 = MD5 ByteString deriving (Eq, Show) - --- md5 :: ByteString -> MD5 --- md5 = MD5 . Base64.encode . hash - --- instance IsHeader MD5 where --- encodeHeader (MD5 bs) = encodeHeader (BS.pack "content-md5", bs) diff --git a/src/Network/AWS/IAM.hs b/src/Network/AWS/IAM.hs deleted file mode 100644 index 23504f5bb8c..00000000000 --- a/src/Network/AWS/IAM.hs +++ /dev/null @@ -1,2450 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE ViewPatterns #-} - --- Module : Network.AWS.IAM --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | IAM is a web service that enables AWS customers to manage users and user --- permissions under their AWS account. -module Network.AWS.IAM - ( - -- * Actions - -- ** AddRoleToInstanceProfile - AddRoleToInstanceProfile (..) - , AddRoleToInstanceProfileResponse (..) - - -- ** AddUserToGroup - , AddUserToGroup (..) - , AddUserToGroupResponse (..) - - -- ** ChangePassword - , ChangePassword (..) - , ChangePasswordResponse (..) - - -- ** CreateAccessKey - , CreateAccessKey (..) - , CreateAccessKeyResponse (..) - - -- ** CreateAccountAlias - , CreateAccountAlias (..) - , CreateAccountAliasResponse (..) - - -- ** CreateGroup - , CreateGroup (..) - , CreateGroupResponse (..) - - -- ** CreateInstanceProfile - , CreateInstanceProfile (..) - , CreateInstanceProfileResponse (..) - - -- ** CreateLoginProfile - , CreateLoginProfile (..) - , CreateLoginProfileResponse (..) - - -- ** CreateRole - , CreateRole (..) - , CreateRoleResponse (..) - - -- ** CreateUser - , CreateUser (..) - , CreateUserResponse (..) - - -- ** CreateVirtualMFADevice - , CreateVirtualMFADevice (..) - , CreateVirtualMFADeviceResponse (..) - - -- ** DeactivateMFADevice - , DeactivateMFADevice (..) - , DeactivateMFADeviceResponse (..) - - -- ** DeleteAccessKey - , DeleteAccessKey (..) - , DeleteAccessKeyResponse (..) - - -- ** DeleteAccountAlias - , DeleteAccountAlias (..) - , DeleteAccountAliasResponse (..) - - -- ** DeleteAccountPasswordPolicy - , DeleteAccountPasswordPolicy (..) - , DeleteAccountPasswordPolicyResponse (..) - - -- ** DeleteGroup - , DeleteGroup (..) - , DeleteGroupResponse (..) - - -- ** DeleteGroupPolicy - , DeleteGroupPolicy (..) - , DeleteGroupPolicyResponse (..) - - -- ** DeleteInstanceProfile - , DeleteInstanceProfile (..) - , DeleteInstanceProfileResponse (..) - - -- ** DeleteLoginProfile - , DeleteLoginProfile (..) - , DeleteLoginProfileResponse (..) - - -- ** DeleteRole - , DeleteRole (..) - , DeleteRoleResponse (..) - - -- ** DeleteRolePolicy - , DeleteRolePolicy (..) - , DeleteRolePolicyResponse (..) - - -- ** DeleteServerCertificate - , DeleteServerCertificate (..) - , DeleteServerCertificateResponse (..) - - -- ** DeleteSigningCertificate - , DeleteSigningCertificate (..) - , DeleteSigningCertificateResponse (..) - - -- ** DeleteUser - , DeleteUser (..) - , DeleteUserResponse (..) - - -- ** DeleteUserPolicy - , DeleteUserPolicy (..) - , DeleteUserPolicyResponse (..) - - -- ** DeleteVirtualMFADevice - , DeleteVirtualMFADevice (..) - , DeleteVirtualMFADeviceResponse (..) - - -- ** EnableMFADevice - , EnableMFADevice (..) - , EnableMFADeviceResponse (..) - - -- ** GetAccountPasswordPolicy - , GetAccountPasswordPolicy (..) - , GetAccountPasswordPolicyResponse (..) - - -- ** GetAccountSummary - , GetAccountSummary (..) - , GetAccountSummaryResponse (..) - - -- ** GetGroup - , GetGroup (..) - , GetGroupResponse (..) - - -- ** GetGroupPolicy - , GetGroupPolicy (..) - , GetGroupPolicyResponse (..) - - -- ** GetInstanceProfile - , GetInstanceProfile (..) - , GetInstanceProfileResponse (..) - - -- ** GetLoginProfile - , GetLoginProfile (..) - , GetLoginProfileResponse (..) - - -- ** GetRole - , GetRole (..) - , GetRoleResponse (..) - - -- ** GetRolePolicy - , GetRolePolicy (..) - , GetRolePolicyResponse (..) - - -- ** GetServerCertificate - , GetServerCertificate (..) - , GetServerCertificateResponse (..) - - -- ** GetUser - , GetUser (..) - , GetUserResponse (..) - - -- ** GetUserPolicy - , GetUserPolicy (..) - , GetUserPolicyResponse (..) - - -- ** ListAccessKeys - , ListAccessKeys (..) - , ListAccessKeysResponse (..) - - -- ** ListAccountAliases - , ListAccountAliases (..) - , ListAccountAliasesResponse (..) - - -- ** ListGroupPolicies - , ListGroupPolicies (..) - , ListGroupPoliciesResponse (..) - - -- ** ListGroups - , ListGroups (..) - , ListGroupsResponse (..) - - -- ** ListGroupsForUser - , ListGroupsForUser (..) - , ListGroupsForUserResponse (..) - - -- ** ListInstanceProfiles - , ListInstanceProfiles (..) - , ListInstanceProfilesResponse (..) - - -- ** ListInstanceProfilesForRole - , ListInstanceProfilesForRole (..) - , ListInstanceProfilesForRoleResponse (..) - - -- ** ListMFADevices - , ListMFADevices (..) - , ListMFADevicesResponse (..) - - -- ** ListRolePolicies - , ListRolePolicies (..) - , ListRolePoliciesResponse (..) - - -- ** ListRoles - , ListRoles (..) - , ListRolesResponse (..) - - -- ** ListServerCertificates - , ListServerCertificates (..) - , ListServerCertificatesResponse (..) - - -- ** ListSigningCertificates - , ListSigningCertificates (..) - , ListSigningCertificatesResponse (..) - - -- ** ListUserPolicies - , ListUserPolicies (..) - , ListUserPoliciesResponse (..) - - -- ** ListUsers - , ListUsers (..) - , ListUsersResponse (..) - - -- ** ListVirtualMFADevices - , ListVirtualMFADevices (..) - , ListVirtualMFADevicesResponse (..) - - -- ** PutGroupPolicy - , PutGroupPolicy (..) - , PutGroupPolicyResponse (..) - - -- ** PutRolePolicy - , PutRolePolicy (..) - , PutRolePolicyResponse (..) - - -- ** PutUserPolicy - , PutUserPolicy (..) - , PutUserPolicyResponse (..) - - -- ** RemoveRoleFromInstanceProfile - , RemoveRoleFromInstanceProfile (..) - , RemoveRoleFromInstanceProfileResponse (..) - - -- ** RemoveUserFromGroup - , RemoveUserFromGroup (..) - , RemoveUserFromGroupResponse (..) - - -- ** ResyncMFADevice - , ResyncMFADevice (..) - , ResyncMFADeviceResponse (..) - - -- ** UpdateAccessKey - , UpdateAccessKey (..) - , UpdateAccessKeyResponse (..) - - -- ** UpdateAccountPasswordPolicy - , UpdateAccountPasswordPolicy (..) - , UpdateAccountPasswordPolicyResponse (..) - - -- ** UpdateAssumeRolePolicy - , UpdateAssumeRolePolicy (..) - , UpdateAssumeRolePolicyResponse (..) - - -- ** UpdateGroup - , UpdateGroup (..) - , UpdateGroupResponse (..) - - -- ** UpdateLoginProfile - , UpdateLoginProfile (..) - , UpdateLoginProfileResponse (..) - - -- ** UpdateServerCertificate - , UpdateServerCertificate (..) - , UpdateServerCertificateResponse (..) - - -- ** UpdateSigningCertificate - , UpdateSigningCertificate (..) - , UpdateSigningCertificateResponse (..) - - -- ** UpdateUser - , UpdateUser (..) - , UpdateUserResponse (..) - - -- ** UploadServerCertificate - , UploadServerCertificate (..) - , UploadServerCertificateResponse (..) - - -- ** UploadSigningCertificate - , UploadSigningCertificate (..) - , UploadSigningCertificateResponse (..) - - -- * Data Types - , module Network.AWS.IAM.Types - - -- * Common - , module Network.AWS - ) where - -import Data.Text (Text) -import Network.AWS -import Network.AWS.IAM.Types -import Network.AWS.Internal -import Network.HTTP.Types.Method - --- | Adds the specified role to the specified instance profile. For more --- information about roles, go to Working with Roles. For more information --- about instance profiles, go to About Instance Profiles. --- --- -data AddRoleToInstanceProfile = AddRoleToInstanceProfile - { artipInstanceProfileName :: !Text - -- ^ Name of the instance profile to update. - , artipRoleName :: !Text - -- ^ Name of the role to add. - } deriving (Eq, Show, Generic) - -instance IsQuery AddRoleToInstanceProfile - -instance Rq AddRoleToInstanceProfile where - type Er AddRoleToInstanceProfile = IAMError - type Rs AddRoleToInstanceProfile = AddRoleToInstanceProfileResponse - request = query4 iam GET "AddRoleToInstanceProfile" - -data AddRoleToInstanceProfileResponse = AddRoleToInstanceProfileResponse - { artiprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML AddRoleToInstanceProfileResponse where - xmlPickler = withNS iamNS - --- | Adds the specified user to the specified group. --- --- -data AddUserToGroup = AddUserToGroup - { autgGroupName :: !Text - -- ^ Name of the group to update. - , autgUserName :: !Text - -- ^ Name of the user to add. - } deriving (Eq, Show, Generic) - -instance IsQuery AddUserToGroup - -instance Rq AddUserToGroup where - type Er AddUserToGroup = IAMError - type Rs AddUserToGroup = AddUserToGroupResponse - request = query4 iam GET "AddUserToGroup" - -data AddUserToGroupResponse = AddUserToGroupResponse - { autgrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML AddUserToGroupResponse where - xmlPickler = withNS iamNS - --- | Changes the password of the IAM user calling ChangePassword. The root --- account password is not affected by this action. For information about --- modifying passwords, see Managing Passwords. --- --- -data ChangePassword = ChangePassword - { cpNewPassword :: !Text - -- ^ Type: String - , cpOldPassword :: !Text - -- ^ Type: String - } deriving (Eq, Show, Generic) - -instance IsQuery ChangePassword - -instance Rq ChangePassword where - type Er ChangePassword = IAMError - type Rs ChangePassword = ChangePasswordResponse - request = query4 iam GET "ChangePassword" - -data ChangePasswordResponse = ChangePasswordResponse - { cprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML ChangePasswordResponse where - xmlPickler = withNS iamNS - --- | Creates a new AWS Secret Access Key and corresponding AWS Access Key ID for --- the specified user. The default status for new keys is Active. If you do --- not specify a user name, IAM determines the user name implicitly based on --- the AWS Access Key ID signing the request. Because this action works for --- access keys under the AWS account, you can use this API to manage root --- credentials even if the AWS account has no associated users. For --- information about limits on the number of keys you can create, see --- Limitations on IAM Entities in Using AWS Identity and Access Management. --- Important To ensure the security of your AWS account, the Secret Access Key --- is accessible only during key and user creation. You must save the key (for --- example, in a text file) if you want to be able to access it again. If a --- secret key is lost, you can delete the access keys for the associated user --- and then create new keys. --- --- -data CreateAccessKey = CreateAccessKey - { cakUserName :: Maybe Text - -- ^ The user name that the new key will belong to. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateAccessKey - -instance Rq CreateAccessKey where - type Er CreateAccessKey = IAMError - type Rs CreateAccessKey = CreateAccessKeyResponse - request = query4 iam GET "CreateAccessKey" - -data CreateAccessKeyResponse = CreateAccessKeyResponse - { cakrResponseMetadata :: !Text - , cakrCreateAccessKeyResult :: !CreateAccessKeyResult - } deriving (Eq, Show, Generic) - -instance IsXML CreateAccessKeyResponse where - xmlPickler = withNS iamNS - --- | This action creates an alias for your AWS account. For information about --- using an AWS account alias, see Using an Alias for Your AWS Account ID in --- Using AWS Identity and Access Management. --- --- -data CreateAccountAlias = CreateAccountAlias - { caaAccountAlias :: !Text - -- ^ Name of the account alias to create. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateAccountAlias - -instance Rq CreateAccountAlias where - type Er CreateAccountAlias = IAMError - type Rs CreateAccountAlias = CreateAccountAliasResponse - request = query4 iam GET "CreateAccountAlias" - -data CreateAccountAliasResponse = CreateAccountAliasResponse - { caarResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML CreateAccountAliasResponse where - xmlPickler = withNS iamNS - --- | Creates a new group. For information about the number of groups you can --- create, see Limitations on IAM Entities in Using AWS Identity and Access --- Management. --- --- -data CreateGroup = CreateGroup - { cgGroupName :: !Text - -- ^ Name of the group to create. Do not include the path in this - -- value. - , cgPath :: Maybe Text - -- ^ The path to the group. For more information about paths, see - -- Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateGroup - -instance Rq CreateGroup where - type Er CreateGroup = IAMError - type Rs CreateGroup = CreateGroupResponse - request = query4 iam GET "CreateGroup" - -data CreateGroupResponse = CreateGroupResponse - { cgrResponseMetadata :: !Text - , cgrCreateGroupResult :: !CreateGroupResult - } deriving (Eq, Show, Generic) - -instance IsXML CreateGroupResponse where - xmlPickler = withNS iamNS - --- | Creates a new instance profile. For information about instance profiles, go --- to About Instance Profiles. For information about the number of instance --- profiles you can create, see Limitations on IAM Entities in Using AWS --- Identity and Access Management. --- --- -data CreateInstanceProfile = CreateInstanceProfile - { cipInstanceProfileName :: !Text - -- ^ Name of the instance profile to create. - , cipPath :: Maybe Text - -- ^ The path to the instance profile. For more information about - -- paths, see Identifiers for IAM Entities in Using AWS Identity and - -- Access Management. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateInstanceProfile - -instance Rq CreateInstanceProfile where - type Er CreateInstanceProfile = IAMError - type Rs CreateInstanceProfile = CreateInstanceProfileResponse - request = query4 iam GET "CreateInstanceProfile" - -data CreateInstanceProfileResponse = CreateInstanceProfileResponse - { ciprResponseMetadata :: !Text - , ciprCreateInstanceProfileResult :: !CreateInstanceProfileResult - } deriving (Eq, Show, Generic) - -instance IsXML CreateInstanceProfileResponse where - xmlPickler = withNS iamNS - --- | Creates a password for the specified user, giving the user the ability to --- access AWS services through the AWS Management Console. For more --- information about managing passwords, see Managing Passwords in Using IAM. --- --- -data CreateLoginProfile = CreateLoginProfile - { clpPassword :: !Text - -- ^ The new password for the user name. - , clpUserName :: !Text - -- ^ Name of the user to create a password for. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateLoginProfile - -instance Rq CreateLoginProfile where - type Er CreateLoginProfile = IAMError - type Rs CreateLoginProfile = CreateLoginProfileResponse - request = query4 iam GET "CreateLoginProfile" - -data CreateLoginProfileResponse = CreateLoginProfileResponse - { clprResponseMetadata :: !Text - , clprCreateLoginProfileResult :: !CreateLoginProfileResult - } deriving (Eq, Show, Generic) - -instance IsXML CreateLoginProfileResponse where - xmlPickler = withNS iamNS - --- | Creates a new role for your AWS account. For more information about roles, --- go to Working with Roles. For information about limitations on role names --- and the number of roles you can create, go to Limitations on IAM Entities --- in Using AWS Identity and Access Management. The policy grants permission --- to an EC2 instance to assume the role. The policy is URL-encoded according --- to RFC 3986. For more information about RFC 3986, go to --- http://www.faqs.org/rfcs/rfc3986.html. Currently, only EC2 instances can --- assume roles. --- --- -data CreateRole = CreateRole - { crAssumeRolePolicyDocument :: !Text - -- ^ The policy that grants an entity permission to assume the role. - , crPath :: Maybe Text - -- ^ The path to the role. - , crRoleName :: !Text - -- ^ Name of the role to create. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateRole - -instance Rq CreateRole where - type Er CreateRole = IAMError - type Rs CreateRole = CreateRoleResponse - request = query4 iam GET "CreateRole" - -data CreateRoleResponse = CreateRoleResponse - { crrResponseMetadata :: !Text - , crrCreateRoleResult :: !CreateRoleResult - } deriving (Eq, Show, Generic) - -instance IsXML CreateRoleResponse where - xmlPickler = withNS iamNS - --- | Creates a new user for your AWS account. For information about limitations --- on the number of users you can create, see Limitations on IAM Entities in --- Using AWS Identity and Access Management. --- --- -data CreateUser = CreateUser - { cuPath :: Maybe Text - -- ^ The path for the user name. For more information about paths, see - -- Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , cuUserName :: !Text - -- ^ Name of the user to create. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateUser - -instance Rq CreateUser where - type Er CreateUser = IAMError - type Rs CreateUser = CreateUserResponse - request = query4 iam GET "CreateUser" - -data CreateUserResponse = CreateUserResponse - { curResponseMetadata :: !Text - , curCreateUserResult :: !CreateUserResult - } deriving (Eq, Show, Generic) - -instance IsXML CreateUserResponse where - xmlPickler = withNS iamNS - --- | Creates a new virtual MFA device for the AWS account. After creating the --- virtual MFA, use EnableMFADevice to attach the MFA device to an IAM user. --- For more information about creating and working with virtual MFA devices, --- go to Using a Virtual MFA Device in Using AWS Identity and Access --- Management. For information about limits on the number of MFA devices you --- can create, see Limitations on Entities in Using AWS Identity and Access --- Management. Important The seed information contained in the QR code and the --- Base32 string should be treated like any other secret access information, --- such as your AWS access keys or your passwords. After you provision your --- virtual device, you should ensure that the information is destroyed --- following secure procedures. --- --- -data CreateVirtualMFADevice = CreateVirtualMFADevice - { cvmfadPath :: Maybe Text - -- ^ The path for the virtual MFA device. For more information about - -- paths, see Identifiers for IAM Entities in Using AWS Identity and - -- Access Management. - , cvmfadVirtualMFADeviceName :: !Text - -- ^ The name of the virtual MFA device. Use with path to uniquely - -- identify a virtual MFA device. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateVirtualMFADevice - -instance Rq CreateVirtualMFADevice where - type Er CreateVirtualMFADevice = IAMError - type Rs CreateVirtualMFADevice = CreateVirtualMFADeviceResponse - request = query4 iam GET "CreateVirtualMFADevice" - -data CreateVirtualMFADeviceResponse = CreateVirtualMFADeviceResponse - { cvmfadrResponseMetadata :: !Text - , cvmfadrCreateVirtualMFADeviceResult :: !CreateVirtualMFADeviceResult - } deriving (Eq, Show, Generic) - -instance IsXML CreateVirtualMFADeviceResponse where - xmlPickler = withNS iamNS - --- | Deactivates the specified MFA device and removes it from association with --- the user name for which it was originally enabled. --- --- -data DeactivateMFADevice = DeactivateMFADevice - { dmfadSerialNumber :: !Text - -- ^ The serial number that uniquely identifies the MFA device. For - -- virtual MFA devices, the serial number is the device ARN. - , dmfadUserName :: !Text - -- ^ Name of the user whose MFA device you want to deactivate. - } deriving (Eq, Show, Generic) - -instance IsQuery DeactivateMFADevice - -instance Rq DeactivateMFADevice where - type Er DeactivateMFADevice = IAMError - type Rs DeactivateMFADevice = DeactivateMFADeviceResponse - request = query4 iam GET "DeactivateMFADevice" - -data DeactivateMFADeviceResponse = DeactivateMFADeviceResponse - { dmfadrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeactivateMFADeviceResponse where - xmlPickler = withNS iamNS - --- | Deletes the access key associated with the specified user. If you do not --- specify a user name, IAM determines the user name implicitly based on the --- AWS Access Key ID signing the request. Because this action works for access --- keys under the AWS account, you can use this API to manage root credentials --- even if the AWS account has no associated users. --- --- -data DeleteAccessKey = DeleteAccessKey - { dakAccessKeyId :: !Text - -- ^ The Access Key ID for the Access Key ID and Secret Access Key you - -- want to delete. - , dakUserName :: Maybe Text - -- ^ Name of the user whose key you want to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteAccessKey - -instance Rq DeleteAccessKey where - type Er DeleteAccessKey = IAMError - type Rs DeleteAccessKey = DeleteAccessKeyResponse - request = query4 iam GET "DeleteAccessKey" - -data DeleteAccessKeyResponse = DeleteAccessKeyResponse - { dakrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteAccessKeyResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified AWS account alias. For information about using an AWS --- account alias, see Using an Alias for Your AWS Account ID in Using AWS --- Identity and Access Management. --- --- -data DeleteAccountAlias = DeleteAccountAlias - { daaAccountAlias :: !Text - -- ^ Name of the account alias to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteAccountAlias - -instance Rq DeleteAccountAlias where - type Er DeleteAccountAlias = IAMError - type Rs DeleteAccountAlias = DeleteAccountAliasResponse - request = query4 iam GET "DeleteAccountAlias" - -data DeleteAccountAliasResponse = DeleteAccountAliasResponse - { daarResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteAccountAliasResponse where - xmlPickler = withNS iamNS - --- | Deletes the password policy for the AWS account. --- --- -data DeleteAccountPasswordPolicy = DeleteAccountPasswordPolicy - { dappNoSuchEntity :: !Text - -- ^ The request was rejected because it referenced an entity that - -- does not exist. The error message describes the entity. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteAccountPasswordPolicy - -instance Rq DeleteAccountPasswordPolicy where - type Er DeleteAccountPasswordPolicy = IAMError - type Rs DeleteAccountPasswordPolicy = DeleteAccountPasswordPolicyResponse - request = query4 iam GET "DeleteAccountPasswordPolicy" - -data DeleteAccountPasswordPolicyResponse = DeleteAccountPasswordPolicyResponse - { dapprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteAccountPasswordPolicyResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified group. The group must not contain any users or have --- any attached policies. --- --- -data DeleteGroup = DeleteGroup - { dgGroupName :: !Text - -- ^ Name of the group to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteGroup - -instance Rq DeleteGroup where - type Er DeleteGroup = IAMError - type Rs DeleteGroup = DeleteGroupResponse - request = query4 iam GET "DeleteGroup" - -data DeleteGroupResponse = DeleteGroupResponse - { dgrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteGroupResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified policy that is associated with the specified group. --- --- -data DeleteGroupPolicy = DeleteGroupPolicy - { dgpGroupName :: !Text - -- ^ Name of the group the policy is associated with. - , dgpPolicyName :: !Text - -- ^ Name of the policy document to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteGroupPolicy - -instance Rq DeleteGroupPolicy where - type Er DeleteGroupPolicy = IAMError - type Rs DeleteGroupPolicy = DeleteGroupPolicyResponse - request = query4 iam GET "DeleteGroupPolicy" - -data DeleteGroupPolicyResponse = DeleteGroupPolicyResponse - { dgprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteGroupPolicyResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified instance profile. The instance profile must not have --- an associated role. Important Make sure you do not have any Amazon EC2 --- instances running with the instance profile you are about to delete. --- Deleting a role or instance profile that is associated with a running --- instance will break any applications running on the instance. For more --- information about instance profiles, go to About Instance Profiles. --- --- -data DeleteInstanceProfile = DeleteInstanceProfile - { dipInstanceProfileName :: !Text - -- ^ Name of the instance profile to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteInstanceProfile - -instance Rq DeleteInstanceProfile where - type Er DeleteInstanceProfile = IAMError - type Rs DeleteInstanceProfile = DeleteInstanceProfileResponse - request = query4 iam GET "DeleteInstanceProfile" - -data DeleteInstanceProfileResponse = DeleteInstanceProfileResponse - { diprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteInstanceProfileResponse where - xmlPickler = withNS iamNS - --- | Deletes the password for the specified user, which terminates the user's --- ability to access AWS services through the AWS Management Console. --- Important Deleting a user's password does not prevent a user from accessing --- IAM through the command line interface or the API. To prevent all user --- access you must also either make the access key inactive or delete it. For --- more information about making keys inactive or deleting them, see --- UpdateAccessKey and DeleteAccessKey. --- --- -data DeleteLoginProfile = DeleteLoginProfile - { dlpUserName :: !Text - -- ^ Name of the user whose password you want to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteLoginProfile - -instance Rq DeleteLoginProfile where - type Er DeleteLoginProfile = IAMError - type Rs DeleteLoginProfile = DeleteLoginProfileResponse - request = query4 iam GET "DeleteLoginProfile" - -data DeleteLoginProfileResponse = DeleteLoginProfileResponse - { dlprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteLoginProfileResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified role. The role must not have any policies attached. --- For more information about roles, go to Working with Roles. Important Make --- sure you do not have any Amazon EC2 instances running with the role you are --- about to delete. Deleting a role or instance profile that is associated --- with a running instance will break any applications running on the --- instance. --- --- -data DeleteRole = DeleteRole - { drRoleName :: !Text - -- ^ Name of the role to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteRole - -instance Rq DeleteRole where - type Er DeleteRole = IAMError - type Rs DeleteRole = DeleteRoleResponse - request = query4 iam GET "DeleteRole" - -data DeleteRoleResponse = DeleteRoleResponse - { drrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteRoleResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified policy associated with the specified role. --- --- -data DeleteRolePolicy = DeleteRolePolicy - { drpPolicyName :: !Text - -- ^ Name of the policy document to delete. - , drpRoleName :: !Text - -- ^ Name of the role the associated with the policy. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteRolePolicy - -instance Rq DeleteRolePolicy where - type Er DeleteRolePolicy = IAMError - type Rs DeleteRolePolicy = DeleteRolePolicyResponse - request = query4 iam GET "DeleteRolePolicy" - -data DeleteRolePolicyResponse = DeleteRolePolicyResponse - { drprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteRolePolicyResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified server certificate. Important If you are using a --- server certificate with Elastic Load Balancing, deleting the certificate --- could have implications for your application. If Elastic Load Balancing --- doesn't detect the deletion of bound certificates, it may continue to use --- the certificates. This could cause Elastic Load Balancing to stop accepting --- traffic. We recommend that you remove the reference to the certificate from --- Elastic Load Balancing before using this command to delete the certificate. --- For more information, go to DeleteLoadBalancerListeners in the Elastic Load --- Balancing API Reference. --- --- -data DeleteServerCertificate = DeleteServerCertificate - { dscServerCertificateName :: !Text - -- ^ The name of the server certificate you want to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteServerCertificate - -instance Rq DeleteServerCertificate where - type Er DeleteServerCertificate = IAMError - type Rs DeleteServerCertificate = DeleteServerCertificateResponse - request = query4 iam GET "DeleteServerCertificate" - -data DeleteServerCertificateResponse = DeleteServerCertificateResponse - { dscrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteServerCertificateResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified signing certificate associated with the specified --- user. If you do not specify a user name, IAM determines the user name --- implicitly based on the AWS Access Key ID signing the request. Because this --- action works for access keys under the AWS account, you can use this API to --- manage root credentials even if the AWS account has no associated users. --- --- -data DeleteSigningCertificate = DeleteSigningCertificate - { dscCertificateId :: !Text - -- ^ ID of the signing certificate to delete. - , dscUserName :: Maybe Text - -- ^ Name of the user the signing certificate belongs to. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteSigningCertificate - -instance Rq DeleteSigningCertificate where - type Er DeleteSigningCertificate = IAMError - type Rs DeleteSigningCertificate = DeleteSigningCertificateResponse - request = query4 iam GET "DeleteSigningCertificate" - -data DeleteSigningCertificateResponse = DeleteSigningCertificateResponse - { dscsResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteSigningCertificateResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified user. The user must not belong to any groups, have --- any keys or signing certificates, or have any attached policies. --- --- -data DeleteUser = DeleteUser - { duUserName :: !Text - -- ^ Name of the user to delete. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteUser - -instance Rq DeleteUser where - type Er DeleteUser = IAMError - type Rs DeleteUser = DeleteUserResponse - request = query4 iam GET "DeleteUser" - -data DeleteUserResponse = DeleteUserResponse - { durResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteUserResponse where - xmlPickler = withNS iamNS - --- | Deletes the specified policy associated with the specified user. --- --- -data DeleteUserPolicy = DeleteUserPolicy - { dupPolicyName :: !Text - -- ^ Name of the policy document to delete. - , dupUserName :: !Text - -- ^ Name of the user the policy is associated with. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteUserPolicy - -instance Rq DeleteUserPolicy where - type Er DeleteUserPolicy = IAMError - type Rs DeleteUserPolicy = DeleteUserPolicyResponse - request = query4 iam GET "DeleteUserPolicy" - -data DeleteUserPolicyResponse = DeleteUserPolicyResponse - { duprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteUserPolicyResponse where - xmlPickler = withNS iamNS - --- | Deletes a virtual MFA device. Note You must deactivate a user's virtual MFA --- device before you can delete it. For information about deactivating MFA --- devices, see DeactivateMFADevice. --- --- -data DeleteVirtualMFADevice = DeleteVirtualMFADevice - { dvmfadSerialNumber :: !Text - -- ^ The serial number that uniquely identifies the MFA device. For - -- virtual MFA devices, the serial number is the same as the ARN. - } deriving (Eq, Show, Generic) - -instance IsQuery DeleteVirtualMFADevice - -instance Rq DeleteVirtualMFADevice where - type Er DeleteVirtualMFADevice = IAMError - type Rs DeleteVirtualMFADevice = DeleteVirtualMFADeviceResponse - request = query4 iam GET "DeleteVirtualMFADevice" - -data DeleteVirtualMFADeviceResponse = DeleteVirtualMFADeviceResponse - { dvmfadrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteVirtualMFADeviceResponse where - xmlPickler = withNS iamNS - --- | Enables the specified MFA device and associates it with the specified user --- name. When enabled, the MFA device is required for every subsequent login --- by the user name associated with the device. --- --- -data EnableMFADevice = EnableMFADevice - { emfadAuthenticationCode1 :: !Text - -- ^ An authentication code emitted by the device. - , emfadAuthenticationCode2 :: !Text - -- ^ A subsequent authentication code emitted by the device. - , emfadSerialNumber :: !Text - -- ^ The serial number that uniquely identifies the MFA device. For - -- virtual MFA devices, the serial number is the device ARN. - , emfadUserName :: !Text - -- ^ Name of the user for whom you want to enable the MFA device. - } deriving (Eq, Show, Generic) - -instance IsQuery EnableMFADevice - -instance Rq EnableMFADevice where - type Er EnableMFADevice = IAMError - type Rs EnableMFADevice = EnableMFADeviceResponse - request = query4 iam GET "EnableMFADevice" - -data EnableMFADeviceResponse = EnableMFADeviceResponse - { emfadrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML EnableMFADeviceResponse where - xmlPickler = withNS iamNS - --- | Retrieves the password policy for the AWS account. For more information --- about using a password policy, go to Managing an IAM Password Policy. --- --- -data GetAccountPasswordPolicy = GetAccountPasswordPolicy - { gappPasswordPolicy :: !PasswordPolicy - -- ^ The PasswordPolicy data type contains information about the - -- account password policy. - } deriving (Eq, Show, Generic) - -instance IsQuery GetAccountPasswordPolicy - -instance Rq GetAccountPasswordPolicy where - type Er GetAccountPasswordPolicy = IAMError - type Rs GetAccountPasswordPolicy = GetAccountPasswordPolicyResponse - request = query4 iam GET "GetAccountPasswordPolicy" - -data GetAccountPasswordPolicyResponse = GetAccountPasswordPolicyResponse - { gapprResponseMetadata :: !Text - , gapprGetAccountPasswordPolicyResult :: !GetAccountPasswordPolicyResult - } deriving (Eq, Show, Generic) - -instance IsXML GetAccountPasswordPolicyResponse where - xmlPickler = withNS iamNS - --- | Retrieves account level information about account entity usage and IAM --- quotas. For information about limitations on IAM entities, see Limitations --- on IAM Entities in Using AWS Identity and Access Management. --- --- -data GetAccountSummary = GetAccountSummary - { gasSummaryMap :: !Text - -- ^ A set of key value pairs containing account-level information. - } deriving (Eq, Show, Generic) - -instance IsQuery GetAccountSummary - -instance Rq GetAccountSummary where - type Er GetAccountSummary = IAMError - type Rs GetAccountSummary = GetAccountSummaryResponse - request = query4 iam GET "GetAccountSummary" - -data GetAccountSummaryResponse = GetAccountSummaryResponse - { gasrResponseMetadata :: !Text - , gasrGetAccountSummaryResult :: !GetAccountSummaryResult - } deriving (Eq, Show, Generic) - -instance IsXML GetAccountSummaryResponse where - xmlPickler = withNS iamNS - --- | Returns a list of users that are in the specified group. You can paginate --- the results using the MaxItems and Marker parameters. --- --- -data GetGroup = GetGroup - { ggGroupName :: !Text - -- ^ Name of the group. - , ggMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - , ggMaxItems :: Maybe Integer - -- ^ Use this only when paginating results to indicate the maximum - -- number of user names you want in the response. If there are - -- additional user names beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - } deriving (Eq, Show, Generic) - -instance IsQuery GetGroup - -instance Rq GetGroup where - type Er GetGroup = IAMError - type Rs GetGroup = GetGroupResponse - request = query4 iam GET "GetGroup" - -data GetGroupResponse = GetGroupResponse - { ggrResponseMetadata :: !Text - , ggrGetGroupResult :: !GetGroupResult - } deriving (Eq, Show, Generic) - -instance IsXML GetGroupResponse where - xmlPickler = withNS iamNS - --- | Retrieves the specified policy document for the specified group. The --- returned policy is URL-encoded according to RFC 3986. For more information --- about RFC 3986, go to http://www.faqs.org/rfcs/rfc3986.html. --- --- -data GetGroupPolicy = GetGroupPolicy - { ggpGroupName :: !Text - -- ^ Name of the group the policy is associated with. - , ggpPolicyName :: !Text - -- ^ Name of the policy document to get. - } deriving (Eq, Show, Generic) - -instance IsQuery GetGroupPolicy - -instance Rq GetGroupPolicy where - type Er GetGroupPolicy = IAMError - type Rs GetGroupPolicy = GetGroupPolicyResponse - request = query4 iam GET "GetGroupPolicy" - -data GetGroupPolicyResponse = GetGroupPolicyResponse - { ggprResponseMetadata :: !Text - , ggprGetGroupPolicyResult :: !GetGroupPolicyResult - } deriving (Eq, Show, Generic) - -instance IsXML GetGroupPolicyResponse where - xmlPickler = withNS iamNS - --- | Retrieves information about the specified instance profile, including the --- instance profile's path, GUID, ARN, and role. For more information about --- instance profiles, go to About Instance Profiles. For more information --- about ARNs, go to ARNs. --- --- -data GetInstanceProfile = GetInstanceProfile - { gipInstanceProfileName :: !Text - -- ^ Name of the instance profile to get information about. - } deriving (Eq, Show, Generic) - -instance IsQuery GetInstanceProfile - -instance Rq GetInstanceProfile where - type Er GetInstanceProfile = IAMError - type Rs GetInstanceProfile = GetInstanceProfileResponse - request = query4 iam GET "GetInstanceProfile" - -data GetInstanceProfileResponse = GetInstanceProfileResponse - { giprResponseMetadata :: !Text - , giprGetInstanceProfileResult :: !GetInstanceProfileResult - } deriving (Eq, Show, Generic) - -instance IsXML GetInstanceProfileResponse where - xmlPickler = withNS iamNS - --- | Retrieves the user name and password create date for the specified user. --- --- -data GetLoginProfile = GetLoginProfile - { glpUserName :: !Text - -- ^ Name of the user whose login profile you want to retrieve. - } deriving (Eq, Show, Generic) - -instance IsQuery GetLoginProfile - -instance Rq GetLoginProfile where - type Er GetLoginProfile = IAMError - type Rs GetLoginProfile = GetLoginProfileResponse - request = query4 iam GET "GetLoginProfile" - -data GetLoginProfileResponse = GetLoginProfileResponse - { glprResponseMetadata :: !Text - , glprGetLoginProfileResult :: !GetLoginProfileResult - } deriving (Eq, Show, Generic) - -instance IsXML GetLoginProfileResponse where - xmlPickler = withNS iamNS - --- | Retrieves information about the specified role, including the role's path, --- GUID, ARN, and the policy granting permission to EC2 to assume the role. --- For more information about ARNs, go to ARNs. For more information about --- roles, go to Working with Roles. The returned policy is URL-encoded --- according to RFC 3986. For more information about RFC 3986, go to --- http://www.faqs.org/rfcs/rfc3986.html. --- --- -data GetRole = GetRole - { grRoleName :: !Text - -- ^ Name of the role to get information about. - } deriving (Eq, Show, Generic) - -instance IsQuery GetRole - -instance Rq GetRole where - type Er GetRole = IAMError - type Rs GetRole = GetRoleResponse - request = query4 iam GET "GetRole" - -data GetRoleResponse = GetRoleResponse - { grrResponseMetadata :: !Text - , grrGetRoleResult :: !GetRoleResult - } deriving (Eq, Show, Generic) - -instance IsXML GetRoleResponse where - xmlPickler = withNS iamNS - --- | Retrieves the specified policy document for the specified role. For more --- information about roles, go to Working with Roles. The returned policy is --- URL-encoded according to RFC 3986. For more information about RFC 3986, go --- to http://www.faqs.org/rfcs/rfc3986.html. --- --- -data GetRolePolicy = GetRolePolicy - { grpPolicyName :: !Text - -- ^ Name of the policy document to get. - , grpRoleName :: !Text - -- ^ Name of the role associated with the policy. - } deriving (Eq, Show, Generic) - -instance IsQuery GetRolePolicy - -instance Rq GetRolePolicy where - type Er GetRolePolicy = IAMError - type Rs GetRolePolicy = GetRolePolicyResponse - request = query4 iam GET "GetRolePolicy" - -data GetRolePolicyResponse = GetRolePolicyResponse - { grprResponseMetadata :: !Text - , grprGetRolePolicyResult :: !GetRolePolicyResult - } deriving (Eq, Show, Generic) - -instance IsXML GetRolePolicyResponse where - xmlPickler = withNS iamNS - --- | Retrieves information about the specified server certificate. --- --- -data GetServerCertificate = GetServerCertificate - { gscServerCertificateName :: !Text - -- ^ The name of the server certificate you want to retrieve - -- information about. - } deriving (Eq, Show, Generic) - -instance IsQuery GetServerCertificate - -instance Rq GetServerCertificate where - type Er GetServerCertificate = IAMError - type Rs GetServerCertificate = GetServerCertificateResponse - request = query4 iam GET "GetServerCertificate" - -data GetServerCertificateResponse = GetServerCertificateResponse - { gscrResponseMetadata :: !Text - , gscrGetServerCertificateResult :: !GetServerCertificateResult - } deriving (Eq, Show, Generic) - -instance IsXML GetServerCertificateResponse where - xmlPickler = withNS iamNS - --- | Retrieves information about the specified user, including the user's path, --- GUID, and ARN. If you do not specify a user name, IAM determines the user --- name implicitly based on the AWS Access Key ID signing the request. --- --- -data GetUser = GetUser - { guUserName :: Maybe Text - -- ^ Name of the user to get information about. - } deriving (Eq, Show, Generic) - -instance IsQuery GetUser - -instance Rq GetUser where - type Er GetUser = IAMError - type Rs GetUser = GetUserResponse - request = query4 iam GET "GetUser" - -data GetUserResponse = GetUserResponse - { gurResponseMetadata :: !Text - , gurGetUserResult :: !GetUserResult - } deriving (Eq, Show, Generic) - -instance IsXML GetUserResponse where - xmlPickler = withNS iamNS - --- | Retrieves the specified policy document for the specified user. The --- returned policy is URL-encoded according to RFC 3986. For more information --- about RFC 3986, go to http://www.faqs.org/rfcs/rfc3986.html. --- --- -data GetUserPolicy = GetUserPolicy - { gupPolicyName :: !Text - -- ^ Name of the policy document to get. - , gupUserName :: !Text - -- ^ Name of the user who the policy is associated with. - } deriving (Eq, Show, Generic) - -instance IsQuery GetUserPolicy - -instance Rq GetUserPolicy where - type Er GetUserPolicy = IAMError - type Rs GetUserPolicy = GetUserPolicyResponse - request = query4 iam GET "GetUserPolicy" - -data GetUserPolicyResponse = GetUserPolicyResponse - { guprResponseMetadata :: !Text - , guprGetUserPolicyResult :: !GetUserPolicyResult - } deriving (Eq, Show, Generic) - -instance IsXML GetUserPolicyResponse where - xmlPickler = withNS iamNS - --- | Returns information about the Access Key IDs associated with the specified --- user. If there are none, the action returns an empty list. Although each --- user is limited to a small number of keys, you can still paginate the --- results using the MaxItems and Marker parameters. If the UserName field is --- not specified, the UserName is determined implicitly based on the AWS --- Access Key ID used to sign the request. Because this action works for --- access keys under the AWS account, this API can be used to manage root --- credentials even if the AWS account has no associated users. Note To ensure --- the security of your AWS account, the secret access key is accessible only --- during key and user creation. --- --- -data ListAccessKeys = ListAccessKeys - { lakMarker :: Maybe Text - -- ^ Use this parameter only when paginating results, and only in a - -- subsequent request after you've received a response where the - -- results are truncated. Set it to the value of the Marker element - -- in the response you just received. - , lakMaxItems :: Maybe Integer - -- ^ Use this parameter only when paginating results to indicate the - -- maximum number of keys you want in the response. If there are - -- additional keys beyond the maximum you specify, the IsTruncated - -- response element is true. This parameter is optional. If you do - -- not include it, it defaults to 100. - , lakUserName :: Maybe Text - -- ^ Name of the user. - } deriving (Eq, Show, Generic) - -instance IsQuery ListAccessKeys - -instance Rq ListAccessKeys where - type Er ListAccessKeys = IAMError - type Rs ListAccessKeys = ListAccessKeysResponse - request = query4 iam GET "ListAccessKeys" - -data ListAccessKeysResponse = ListAccessKeysResponse - { lakrResponseMetadata :: !Text - , lakrListAccessKeysResult :: !ListAccessKeysResult - } deriving (Eq, Show, Generic) - -instance IsXML ListAccessKeysResponse where - xmlPickler = withNS iamNS - --- | Lists the account aliases associated with the account. For information --- about using an AWS account alias, see Using an Alias for Your AWS Account --- ID in Using AWS Identity and Access Management. You can paginate the --- results using the MaxItems and Marker parameters. --- --- -data ListAccountAliases = ListAccountAliases - { laaMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - , laaMaxItems :: Maybe Integer - -- ^ Use this only when paginating results to indicate the maximum - -- number of account aliases you want in the response. If there are - -- additional account aliases beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - } deriving (Eq, Show, Generic) - -instance IsQuery ListAccountAliases - -instance Rq ListAccountAliases where - type Er ListAccountAliases = IAMError - type Rs ListAccountAliases = ListAccountAliasesResponse - request = query4 iam GET "ListAccountAliases" - -data ListAccountAliasesResponse = ListAccountAliasesResponse - { laarResponseMetadata :: !Text - , laarListAccountAliasesResult :: !ListAccountAliasesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListAccountAliasesResponse where - xmlPickler = withNS iamNS - --- | Lists the names of the policies associated with the specified group. If --- there are none, the action returns an empty list. You can paginate the --- results using the MaxItems and Marker parameters. --- --- -data ListGroupPolicies = ListGroupPolicies - { lgpGroupName :: !Text - -- ^ The name of the group to list policies for. - , lgpMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - , lgpMaxItems :: Maybe Integer - -- ^ Use this only when paginating results to indicate the maximum - -- number of policy names you want in the response. If there are - -- additional policy names beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - } deriving (Eq, Show, Generic) - -instance IsQuery ListGroupPolicies - -instance Rq ListGroupPolicies where - type Er ListGroupPolicies = IAMError - type Rs ListGroupPolicies = ListGroupPoliciesResponse - request = query4 iam GET "ListGroupPolicies" - -data ListGroupPoliciesResponse = ListGroupPoliciesResponse - { lgprResponseMetadata :: !Text - , lgprListGroupPoliciesResult :: !ListGroupPoliciesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListGroupPoliciesResponse where - xmlPickler = withNS iamNS - --- | Lists the groups that have the specified path prefix. You can paginate the --- results using the MaxItems and Marker parameters. --- --- -data ListGroups = ListGroups - { lgMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - , lgMaxItems :: Maybe Integer - -- ^ Use this only when paginating results to indicate the maximum - -- number of groups you want in the response. If there are - -- additional groups beyond the maximum you specify, the IsTruncated - -- response element is true. This parameter is optional. If you do - -- not include it, it defaults to 100. - , lgPathPrefix :: Maybe Text - -- ^ The path prefix for filtering the results. For example: - -- /division_abc/subdivision_xyz/, which would get all groups whose - -- path starts with /division_abc/subdivision_xyz/. - } deriving (Eq, Show, Generic) - -instance IsQuery ListGroups - -instance Rq ListGroups where - type Er ListGroups = IAMError - type Rs ListGroups = ListGroupsResponse - request = query4 iam GET "ListGroups" - -data ListGroupsResponse = ListGroupsResponse - { lgrResponseMetadata :: !Text - , lgrListGroupsResult :: !ListGroupsResult - } deriving (Eq, Show, Generic) - -instance IsXML ListGroupsResponse where - xmlPickler = withNS iamNS - --- | Lists the groups the specified user belongs to. You can paginate the --- results using the MaxItems and Marker parameters. --- --- -data ListGroupsForUser = ListGroupsForUser - { lgfuMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - , lgfuMaxItems :: Maybe Integer - -- ^ Use this only when paginating results to indicate the maximum - -- number of groups you want in the response. If there are - -- additional groups beyond the maximum you specify, the IsTruncated - -- response element is true. This parameter is optional. If you do - -- not include it, it defaults to 100. - , lgfuUserName :: !Text - -- ^ The name of the user to list groups for. - } deriving (Eq, Show, Generic) - -instance IsQuery ListGroupsForUser - -instance Rq ListGroupsForUser where - type Er ListGroupsForUser = IAMError - type Rs ListGroupsForUser = ListGroupsForUserResponse - request = query4 iam GET "ListGroupsForUser" - -data ListGroupsForUserResponse = ListGroupsForUserResponse - { lgfurResponseMetadata :: !Text - , lgfurListGroupsForUserResult :: !ListGroupsForUserResult - } deriving (Eq, Show, Generic) - -instance IsXML ListGroupsForUserResponse where - xmlPickler = withNS iamNS - --- | Lists the instance profiles that have the specified path prefix. If there --- are none, the action returns an empty list. For more information about --- instance profiles, go to About Instance Profiles. You can paginate the --- results using the MaxItems and Marker parameters. --- --- -data ListInstanceProfiles = ListInstanceProfiles - { lipMarker :: Maybe Text - -- ^ Use this parameter only when paginating results, and only in a - -- subsequent request after you've received a response where the - -- results are truncated. Set it to the value of the Marker element - -- in the response you just received. - , lipMaxItems :: Maybe Integer - -- ^ Use this parameter only when paginating results to indicate the - -- maximum number of user names you want in the response. If there - -- are additional user names beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - , lipPathPrefix :: Maybe Text - -- ^ The path prefix for filtering the results. For example: - -- /application_abc/component_xyz/, which would get all instance - -- profiles whose path starts with /application_abc/component_xyz/. - } deriving (Eq, Show, Generic) - -instance IsQuery ListInstanceProfiles - -instance Rq ListInstanceProfiles where - type Er ListInstanceProfiles = IAMError - type Rs ListInstanceProfiles = ListInstanceProfilesResponse - request = query4 iam GET "ListInstanceProfiles" - -data ListInstanceProfilesResponse = ListInstanceProfilesResponse - { liprResponseMetadata :: !Text - , liprListInstanceProfilesResult :: !ListInstanceProfilesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListInstanceProfilesResponse where - xmlPickler = withNS iamNS - --- | Lists the instance profiles that have the specified associated role. If --- there are none, the action returns an empty list. For more information --- about instance profiles, go to About Instance Profiles. You can paginate --- the results using the MaxItems and Marker parameters. --- --- -data ListInstanceProfilesForRole = ListInstanceProfilesForRole - { lipfrMarker :: Maybe Text - -- ^ Use this parameter only when paginating results, and only in a - -- subsequent request after you've received a response where the - -- results are truncated. Set it to the value of the Marker element - -- in the response you just received. - , lipfrMaxItems :: Maybe Integer - -- ^ Use this parameter only when paginating results to indicate the - -- maximum number of user names you want in the response. If there - -- are additional user names beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - , lipfrRoleName :: !Text - -- ^ The name of the role to list instance profiles for. - } deriving (Eq, Show, Generic) - -instance IsQuery ListInstanceProfilesForRole - -instance Rq ListInstanceProfilesForRole where - type Er ListInstanceProfilesForRole = IAMError - type Rs ListInstanceProfilesForRole = ListInstanceProfilesForRoleResponse - request = query4 iam GET "ListInstanceProfilesForRole" - -data ListInstanceProfilesForRoleResponse = ListInstanceProfilesForRoleResponse - { lipfrrResponseMetadata :: !Text - , lipfrrListInstanceProfilesForRoleResult :: !ListInstanceProfilesForRoleResult - } deriving (Eq, Show, Generic) - -instance IsXML ListInstanceProfilesForRoleResponse where - xmlPickler = withNS iamNS - --- | Lists the MFA devices. If the request includes the user name, then this --- action lists all the MFA devices associated with the specified user name. --- If you do not specify a user name, IAM determines the user name implicitly --- based on the AWS Access Key ID signing the request. You can paginate the --- results using the MaxItems and Marker parameters. --- --- -data ListMFADevices = ListMFADevices - { lmfadMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - , lmfadMaxItems :: Maybe Integer - -- ^ Use this only when paginating results to indicate the maximum - -- number of MFA devices you want in the response. If there are - -- additional MFA devices beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - , lmfadUserName :: Maybe Text - -- ^ Name of the user whose MFA devices you want to list. - } deriving (Eq, Show, Generic) - -instance IsQuery ListMFADevices - -instance Rq ListMFADevices where - type Er ListMFADevices = IAMError - type Rs ListMFADevices = ListMFADevicesResponse - request = query4 iam GET "ListMFADevices" - -data ListMFADevicesResponse = ListMFADevicesResponse - { lmfadrResponseMetadata :: !Text - , lmfadrListMFADevicesResult :: !ListMFADevicesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListMFADevicesResponse where - xmlPickler = withNS iamNS - --- | Lists the names of the policies associated with the specified role. If --- there are none, the action returns an empty list. You can paginate the --- results using the MaxItems and Marker parameters. --- --- -data ListRolePolicies = ListRolePolicies - { lrpMarker :: Maybe Text - -- ^ Use this parameter only when paginating results, and only in a - -- subsequent request after you've received a response where the - -- results are truncated. Set it to the value of the Marker element - -- in the response you just received. - , lrpMaxItems :: Maybe Integer - -- ^ Use this parameter only when paginating results to indicate the - -- maximum number of user names you want in the response. If there - -- are additional user names beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - , lrpRoleName :: !Text - -- ^ The name of the role to list policies for. - } deriving (Eq, Show, Generic) - -instance IsQuery ListRolePolicies - -instance Rq ListRolePolicies where - type Er ListRolePolicies = IAMError - type Rs ListRolePolicies = ListRolePoliciesResponse - request = query4 iam GET "ListRolePolicies" - -data ListRolePoliciesResponse = ListRolePoliciesResponse - { lrprResponseMetadata :: !Text - , lrprListRolePoliciesResult :: !ListRolePoliciesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListRolePoliciesResponse where - xmlPickler = withNS iamNS - --- | Lists the roles that have the specified path prefix. If there are none, the --- action returns an empty list. For more information about roles, go to --- Working with Roles. You can paginate the results using the MaxItems and --- Marker parameters. The returned policy is URL-encoded according to RFC --- 3986. For more information about RFC 3986, go to --- http://www.faqs.org/rfcs/rfc3986.html. --- --- -data ListRoles = ListRoles - { lrMarker :: Maybe Text - -- ^ Use this parameter only when paginating results, and only in a - -- subsequent request after you've received a response where the - -- results are truncated. Set it to the value of the Marker element - -- in the response you just received. - , lrMaxItems :: Maybe Integer - -- ^ Use this parameter only when paginating results to indicate the - -- maximum number of user names you want in the response. If there - -- are additional user names beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - , lrPathPrefix :: Maybe Text - -- ^ The path prefix for filtering the results. For example: - -- /application_abc/component_xyz/, which would get all roles whose - -- path starts with /application_abc/component_xyz/. - } deriving (Eq, Show, Generic) - -instance IsQuery ListRoles - -instance Rq ListRoles where - type Er ListRoles = IAMError - type Rs ListRoles = ListRolesResponse - request = query4 iam GET "ListRoles" - -instance Pg ListRoles where - next ListRoles{..} (lrrListRolesResult -> ListRolesResult{..}) - | not lrrIsTruncated = Nothing - | otherwise = Just $ ListRoles lrrMarker lrMaxItems lrPathPrefix - -data ListRolesResponse = ListRolesResponse - { lrrResponseMetadata :: !Text - , lrrListRolesResult :: !ListRolesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListRolesResponse where - xmlPickler = withNS iamNS - --- | Lists the server certificates that have the specified path prefix. If none --- exist, the action returns an empty list. You can paginate the results using --- the MaxItems and Marker parameters. --- --- -data ListServerCertificates = ListServerCertificates - { lscMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - , lscMaxItems :: Maybe Integer - -- ^ Use this only when paginating results to indicate the maximum - -- number of server certificates you want in the response. If there - -- are additional server certificates beyond the maximum you - -- specify, the IsTruncated response element will be set to true. - -- This parameter is optional. If you do not include it, it defaults - -- to 100. - , lscPathPrefix :: Maybe Text - -- ^ The path prefix for filtering the results. For example: - -- /company/servercerts would get all server certificates for which - -- the path starts with /company/servercerts. - } deriving (Eq, Show, Generic) - -instance IsQuery ListServerCertificates - -instance Rq ListServerCertificates where - type Er ListServerCertificates = IAMError - type Rs ListServerCertificates = ListServerCertificatesResponse - request = query4 iam GET "ListServerCertificates" - -data ListServerCertificatesResponse = ListServerCertificatesResponse - { lscrResponseMetadata :: !Text - , lscrListServerCertificatesResult :: !ListServerCertificatesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListServerCertificatesResponse where - xmlPickler = withNS iamNS - --- | Returns information about the signing certificates associated with the --- specified user. If there are none, the action returns an empty list. --- Although each user is limited to a small number of signing certificates, --- you can still paginate the results using the MaxItems and Marker --- parameters. If the UserName field is not specified, the user name is --- determined implicitly based on the AWS Access Key ID used to sign the --- request. Because this action works for access keys under the AWS account, --- this API can be used to manage root credentials even if the AWS account has --- no associated users. --- --- -data ListSigningCertificates = ListSigningCertificates - { lsdMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - , lsdMaxItems :: Maybe Integer - -- ^ Use this only when paginating results to indicate the maximum - -- number of certificate IDs you want in the response. If there are - -- additional certificate IDs beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - , lsdUserName :: Maybe Text - -- ^ The name of the user. - } deriving (Eq, Show, Generic) - -instance IsQuery ListSigningCertificates - -instance Rq ListSigningCertificates where - type Er ListSigningCertificates = IAMError - type Rs ListSigningCertificates = ListSigningCertificatesResponse - request = query4 iam GET "ListSigningCertificates" - -data ListSigningCertificatesResponse = ListSigningCertificatesResponse - { lscsResponseMetadata :: !Text - , lscsListSigningCertificatesResult :: !ListSigningCertificatesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListSigningCertificatesResponse where - xmlPickler = withNS iamNS - --- | Lists the names of the policies associated with the specified user. If --- there are none, the action returns an empty list. You can paginate the --- results using the MaxItems and Marker parameters. --- --- -data ListUserPolicies = ListUserPolicies - { lupMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - , lupMaxItems :: Maybe Integer - -- ^ Use this only when paginating results to indicate the maximum - -- number of policy names you want in the response. If there are - -- additional policy names beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - , lupUserName :: !Text - -- ^ The name of the user to list policies for. - } deriving (Eq, Show, Generic) - -instance IsQuery ListUserPolicies - -instance Rq ListUserPolicies where - type Er ListUserPolicies = IAMError - type Rs ListUserPolicies = ListUserPoliciesResponse - request = query4 iam GET "ListUserPolicies" - -data ListUserPoliciesResponse = ListUserPoliciesResponse - { luprResponseMetadata :: !Text - , luprListUserPoliciesResult :: !ListUserPoliciesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListUserPoliciesResponse where - xmlPickler = withNS iamNS - --- | Lists the users that have the specified path prefix. If there are none, the --- action returns an empty list. You can paginate the results using the --- MaxItems and Marker parameters. --- --- -data ListUsers = ListUsers - { luMarker :: Maybe Text - -- ^ Use this parameter only when paginating results, and only in a - -- subsequent request after you've received a response where the - -- results are truncated. Set it to the value of the Marker element - -- in the response you just received. - , luMaxItems :: Maybe Integer - -- ^ Use this parameter only when paginating results to indicate the - -- maximum number of user names you want in the response. If there - -- are additional user names beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - , luPathPrefix :: Maybe Text - -- ^ The path prefix for filtering the results. For example: - -- /division_abc/subdivision_xyz/, which would get all user names - -- whose path starts with /division_abc/subdivision_xyz/. - } deriving (Eq, Show, Generic) - -instance IsQuery ListUsers - -instance Rq ListUsers where - type Er ListUsers = IAMError - type Rs ListUsers = ListUsersResponse - request = query4 iam GET "ListUsers" - -data ListUsersResponse = ListUsersResponse - { lurResponseMetadata :: !Text - , lurListUsersResult :: !ListUsersResult - } deriving (Eq, Show, Generic) - -instance IsXML ListUsersResponse where - xmlPickler = withNS iamNS - --- | Lists the virtual MFA devices under the AWS account by assignment status. --- If you do not specify an assignment status, the action returns a list of --- all virtual MFA devices. Assignment status can be Assigned, Unassigned, or --- Any. You can paginate the results using the MaxItems and Marker parameters. --- --- -data ListVirtualMFADevices = ListVirtualMFADevices - { lvmfadAssignmentStatus :: Maybe Text - -- ^ The status (unassigned or assigned) of the devices to list. If - -- you do not specify an AssignmentStatus, the action defaults to - -- Any which lists both assigned and unassigned virtual MFA devices. - , lvmfadMarker :: Maybe Text - -- ^ Use this parameter only when paginating results, and only in a - -- subsequent request after you've received a response where the - -- results are truncated. Set it to the value of the Marker element - -- in the response you just received. - , lvmfadMaxItems :: Maybe Integer - -- ^ Use this parameter only when paginating results to indicate the - -- maximum number of user names you want in the response. If there - -- are additional user names beyond the maximum you specify, the - -- IsTruncated response element is true. This parameter is optional. - -- If you do not include it, it defaults to 100. - } deriving (Eq, Show, Generic) - -instance IsQuery ListVirtualMFADevices - -instance Rq ListVirtualMFADevices where - type Er ListVirtualMFADevices = IAMError - type Rs ListVirtualMFADevices = ListVirtualMFADevicesResponse - request = query4 iam GET "ListVirtualMFADevices" - -data ListVirtualMFADevicesResponse = ListVirtualMFADevicesResponse - { lvmfadrResponseMetadata :: !Text - , lvmfadrListVirtualMFADevicesResult :: !ListVirtualMFADevicesResult - } deriving (Eq, Show, Generic) - -instance IsXML ListVirtualMFADevicesResponse where - xmlPickler = withNS iamNS - --- | Adds (or updates) a policy document associated with the specified group. --- For information about policies, refer to Overview of Policies in Using AWS --- Identity and Access Management. For information about limits on the number --- of policies you can associate with a group, see Limitations on IAM Entities --- in Using AWS Identity and Access Management. Note Because policy documents --- can be large, you should use POST rather than GET when calling --- PutGroupPolicy. For information about setting up signatures and --- authorization through the API, go to Signing AWS API Requests in the AWS --- General Reference. For general information about using the Query4 Iam API with --- IAM, go to Making Query4 Iam Requests in Using IAM. --- --- -data PutGroupPolicy = PutGroupPolicy - { pgpGroupName :: !Text - -- ^ Name of the group to associate the policy with. - , pgpPolicyDocument :: !Text - -- ^ The policy document. - , pgpPolicyName :: !Text - -- ^ Name of the policy document. - } deriving (Eq, Show, Generic) - -instance IsQuery PutGroupPolicy - -instance Rq PutGroupPolicy where - type Er PutGroupPolicy = IAMError - type Rs PutGroupPolicy = PutGroupPolicyResponse - request = query4 iam GET "PutGroupPolicy" - -data PutGroupPolicyResponse = PutGroupPolicyResponse - { pgprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML PutGroupPolicyResponse where - xmlPickler = withNS iamNS - --- | Adds (or updates) a policy document associated with the specified role. For --- information about policies, go to Overview of Policies in Using AWS --- Identity and Access Management. For information about limits on the --- policies you can associate with a role, see Limitations on IAM Entities in --- Using AWS Identity and Access Management. Note Because policy documents can --- be large, you should use POST rather than GET when calling PutRolePolicy. --- For information about setting up signatures and authorization through the --- API, go to Signing AWS API Requests in the AWS General Reference. For --- general information about using the Query4 Iam API with IAM, go to Making Query --- Requests in Using IAM. --- --- -data PutRolePolicy = PutRolePolicy - { prpPolicyDocument :: !Text - -- ^ The policy document. - , prpPolicyName :: !Text - -- ^ Name of the policy document. - , prpRoleName :: !Text - -- ^ Name of the role to associate the policy with. - } deriving (Eq, Show, Generic) - -instance IsQuery PutRolePolicy - -instance Rq PutRolePolicy where - type Er PutRolePolicy = IAMError - type Rs PutRolePolicy = PutRolePolicyResponse - request = query4 iam GET "PutRolePolicy" - -data PutRolePolicyResponse = PutRolePolicyResponse - { prprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML PutRolePolicyResponse where - xmlPickler = withNS iamNS - --- | Adds (or updates) a policy document associated with the specified user. For --- information about policies, refer to Overview of Policies in Using AWS --- Identity and Access Management. For information about limits on the number --- of policies you can associate with a user, see Limitations on IAM Entities --- in Using AWS Identity and Access Management. Note Because policy documents --- can be large, you should use POST rather than GET when calling --- PutUserPolicy. For information about setting up signatures and --- authorization through the API, go to Signing AWS API Requests in the AWS --- General Reference. For general information about using the Query4 Iam API with --- IAM, go to Making Query4 Iam Requests in Using IAM. --- --- -data PutUserPolicy = PutUserPolicy - { pupPolicyDocument :: !Text - -- ^ The policy document. - , pupPolicyName :: !Text - -- ^ Name of the policy document. - , pupUserName :: !Text - -- ^ Name of the user to associate the policy with. - } deriving (Eq, Show, Generic) - -instance IsQuery PutUserPolicy - -instance Rq PutUserPolicy where - type Er PutUserPolicy = IAMError - type Rs PutUserPolicy = PutUserPolicyResponse - request = query4 iam GET "PutUserPolicy" - -data PutUserPolicyResponse = PutUserPolicyResponse - { puprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML PutUserPolicyResponse where - xmlPickler = withNS iamNS - --- | Removes the specified role from the specified instance profile. Important --- Make sure you do not have any Amazon EC2 instances running with the role --- you are about to remove from the instance profile. Removing a role from an --- instance profile that is associated with a running instance will break any --- applications running on the instance. For more information about roles, go --- to Working with Roles. For more information about instance profiles, go to --- About Instance Profiles. --- --- -data RemoveRoleFromInstanceProfile = RemoveRoleFromInstanceProfile - { rrfipInstanceProfileName :: !Text - -- ^ Name of the instance profile to update. - , rrfipRoleName :: !Text - -- ^ Name of the role to remove. - } deriving (Eq, Show, Generic) - -instance IsQuery RemoveRoleFromInstanceProfile - -instance Rq RemoveRoleFromInstanceProfile where - type Er RemoveRoleFromInstanceProfile = IAMError - type Rs RemoveRoleFromInstanceProfile = RemoveRoleFromInstanceProfileResponse - request = query4 iam GET "RemoveRoleFromInstanceProfile" - -data RemoveRoleFromInstanceProfileResponse = RemoveRoleFromInstanceProfileResponse - { rrfiprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML RemoveRoleFromInstanceProfileResponse where - xmlPickler = withNS iamNS - --- | Removes the specified user from the specified group. --- --- -data RemoveUserFromGroup = RemoveUserFromGroup - { rufgGroupName :: !Text - -- ^ Name of the group to update. - , rufgUserName :: !Text - -- ^ Name of the user to remove. - } deriving (Eq, Show, Generic) - -instance IsQuery RemoveUserFromGroup - -instance Rq RemoveUserFromGroup where - type Er RemoveUserFromGroup = IAMError - type Rs RemoveUserFromGroup = RemoveUserFromGroupResponse - request = query4 iam GET "RemoveUserFromGroup" - -data RemoveUserFromGroupResponse = RemoveUserFromGroupResponse - { rufgrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML RemoveUserFromGroupResponse where - xmlPickler = withNS iamNS - --- | Synchronizes the specified MFA device with AWS servers. --- --- -data ResyncMFADevice = ResyncMFADevice - { rmfadAuthenticationCode1 :: !Text - -- ^ An authentication code emitted by the device. - , rmfadAuthenticationCode2 :: !Text - -- ^ A subsequent authentication code emitted by the device. - , rmfadSerialNumber :: !Text - -- ^ Serial number that uniquely identifies the MFA device. - , rmfadUserName :: !Text - -- ^ Name of the user whose MFA device you want to resynchronize. - } deriving (Eq, Show, Generic) - -instance IsQuery ResyncMFADevice - -instance Rq ResyncMFADevice where - type Er ResyncMFADevice = IAMError - type Rs ResyncMFADevice = ResyncMFADeviceResponse - request = query4 iam GET "ResyncMFADevice" - -data ResyncMFADeviceResponse = ResyncMFADeviceResponse - { rmfadrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML ResyncMFADeviceResponse where - xmlPickler = withNS iamNS - --- | Changes the status of the specified access key from Active to Inactive, or --- vice versa. This action can be used to disable a user's key as part of a --- key rotation work flow. If the UserName field is not specified, the --- UserName is determined implicitly based on the AWS Access Key ID used to --- sign the request. Because this action works for access keys under the AWS --- account, this API can be used to manage root credentials even if the AWS --- account has no associated users. For information about rotating keys, see --- Managing Keys and Certificates in Using AWS Identity and Access Management. --- --- -data UpdateAccessKey = UpdateAccessKey - { uakAccessKeyId :: !Text - -- ^ The Access Key ID of the Secret Access Key you want to update. - , uakStatus :: !Text - -- ^ The status you want to assign to the Secret Access Key. Active - -- means the key can be used for API calls to AWS, while Inactive - -- means the key cannot be used. - , uakUserName :: Maybe Text - -- ^ Name of the user whose key you want to update. - } deriving (Eq, Show, Generic) - -instance IsQuery UpdateAccessKey - -instance Rq UpdateAccessKey where - type Er UpdateAccessKey = IAMError - type Rs UpdateAccessKey = UpdateAccessKeyResponse - request = query4 iam GET "UpdateAccessKey" - -data UpdateAccessKeyResponse = UpdateAccessKeyResponse - { uakrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML UpdateAccessKeyResponse where - xmlPickler = withNS iamNS - --- | Updates the password policy settings for the account. For more information --- about using a password policy, go to Managing an IAM Password Policy. --- --- -data UpdateAccountPasswordPolicy = UpdateAccountPasswordPolicy - { uappAllowUsersToChangePassword :: Maybe Bool - -- ^ Type: Boolean - , uappMinimumPasswordLength :: Maybe Integer - -- ^ Type: Integer - , uappRequireLowercaseCharacters :: Maybe Bool - -- ^ Type: Boolean - , uappRequireNumbers :: Maybe Bool - -- ^ Type: Boolean - , uappRequireSymbols :: Maybe Bool - -- ^ Type: Boolean - , uappRequireUppercaseCharacters :: Maybe Bool - -- ^ Type: Boolean - } deriving (Eq, Show, Generic) - -instance IsQuery UpdateAccountPasswordPolicy - -instance Rq UpdateAccountPasswordPolicy where - type Er UpdateAccountPasswordPolicy = IAMError - type Rs UpdateAccountPasswordPolicy = UpdateAccountPasswordPolicyResponse - request = query4 iam GET "UpdateAccountPasswordPolicy" - -data UpdateAccountPasswordPolicyResponse = UpdateAccountPasswordPolicyResponse - { uapprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML UpdateAccountPasswordPolicyResponse where - xmlPickler = withNS iamNS - --- | Updates the policy that grants an entity permission to assume a role. --- Currently, only an Amazon EC2 instance can assume a role. For more --- information about roles, go to Working with Roles. --- --- -data UpdateAssumeRolePolicy = UpdateAssumeRolePolicy - { uarpPolicyDocument :: !Text - -- ^ The policy that grants an entity permission to assume the role. - , uarpRoleName :: !Text - -- ^ Name of the role to update. - } deriving (Eq, Show, Generic) - -instance IsQuery UpdateAssumeRolePolicy - -instance Rq UpdateAssumeRolePolicy where - type Er UpdateAssumeRolePolicy = IAMError - type Rs UpdateAssumeRolePolicy = UpdateAssumeRolePolicyResponse - request = query4 iam GET "UpdateAssumeRolePolicy" - -data UpdateAssumeRolePolicyResponse = UpdateAssumeRolePolicyResponse - { uarprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML UpdateAssumeRolePolicyResponse where - xmlPickler = withNS iamNS - --- | Updates the name and/or the path of the specified group. Important You --- should understand the implications of changing a group's path or name. For --- more information, see Renaming Users and Groups in Using AWS Identity and --- Access Management. Note To change a group name the requester must have --- appropriate permissions on both the source object and the target object. --- For example, to change Managers to MGRs, the entity making the request must --- have permission on Managers and MGRs, or must have permission on all (*). --- For more information about permissions, see Permissions and Policies. --- --- -data UpdateGroup = UpdateGroup - { ugGroupName :: !Text - -- ^ Name of the group to update. If you're changing the name of the - -- group, this is the original name. - , ugNewGroupName :: Maybe Text - -- ^ New name for the group. Only include this if changing the group's - -- name. - , ugNewPath :: Maybe Text - -- ^ New path for the group. Only include this if changing the group's - -- path. - } deriving (Eq, Show, Generic) - -instance IsQuery UpdateGroup - -instance Rq UpdateGroup where - type Er UpdateGroup = IAMError - type Rs UpdateGroup = UpdateGroupResponse - request = query4 iam GET "UpdateGroup" - -data UpdateGroupResponse = UpdateGroupResponse - { ugrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML UpdateGroupResponse where - xmlPickler = withNS iamNS - --- | Changes the password for the specified user. --- --- -data UpdateLoginProfile = UpdateLoginProfile - { ulpPassword :: !Text - -- ^ The new password for the user name. - , ulpUserName :: !Text - -- ^ Name of the user whose password you want to update. - } deriving (Eq, Show, Generic) - -instance IsQuery UpdateLoginProfile - -instance Rq UpdateLoginProfile where - type Er UpdateLoginProfile = IAMError - type Rs UpdateLoginProfile = UpdateLoginProfileResponse - request = query4 iam GET "UpdateLoginProfile" - -data UpdateLoginProfileResponse = UpdateLoginProfileResponse - { ulprResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML UpdateLoginProfileResponse where - xmlPickler = withNS iamNS - --- | Updates the name and/or the path of the specified server certificate. --- Important You should understand the implications of changing a server --- certificate's path or name. For more information, see Managing Server --- Certificates in Using AWS Identity and Access Management. Note To change a --- server certificate name the requester must have appropriate permissions on --- both the source object and the target object. For example, to change the --- name from ProductionCert to ProdCert, the entity making the request must --- have permission on ProductionCert and ProdCert, or must have permission on --- all (*). For more information about permissions, see Permissions and --- Policies. --- --- -data UpdateServerCertificate = UpdateServerCertificate - { uscNewPath :: Maybe Text - -- ^ The new path for the server certificate. Include this only if you - -- are updating the server certificate's path. - , uscNewServerCertificateName :: Maybe Text - -- ^ The new name for the server certificate. Include this only if you - -- are updating the server certificate's name. - , uscServerCertificateName :: !Text - -- ^ The name of the server certificate that you want to update. - } deriving (Eq, Show, Generic) - -instance IsQuery UpdateServerCertificate - -instance Rq UpdateServerCertificate where - type Er UpdateServerCertificate = IAMError - type Rs UpdateServerCertificate = UpdateServerCertificateResponse - request = query4 iam GET "UpdateServerCertificate" - -data UpdateServerCertificateResponse = UpdateServerCertificateResponse - { uscrResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML UpdateServerCertificateResponse where - xmlPickler = withNS iamNS - --- | Changes the status of the specified signing certificate from active to --- disabled, or vice versa. This action can be used to disable a user's --- signing certificate as part of a certificate rotation work flow. If the --- UserName field is not specified, the UserName is determined implicitly --- based on the AWS Access Key ID used to sign the request. Because this --- action works for access keys under the AWS account, this API can be used to --- manage root credentials even if the AWS account has no associated users. --- For information about rotating certificates, see Managing Keys and --- Certificates in Using AWS Identity and Access Management. --- --- -data UpdateSigningCertificate = UpdateSigningCertificate - { uscCertificateId :: !Text - -- ^ The ID of the signing certificate you want to update. - , uscStatus :: !Text - -- ^ The status you want to assign to the certificate. Active means - -- the certificate can be used for API calls to AWS, while Inactive - -- means the certificate cannot be used. - , uscUserName :: Maybe Text - -- ^ Name of the user the signing certificate belongs to. - } deriving (Eq, Show, Generic) - -instance IsQuery UpdateSigningCertificate - -instance Rq UpdateSigningCertificate where - type Er UpdateSigningCertificate = IAMError - type Rs UpdateSigningCertificate = UpdateSigningCertificateResponse - request = query4 iam GET "UpdateSigningCertificate" - -data UpdateSigningCertificateResponse = UpdateSigningCertificateResponse - { uscsResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML UpdateSigningCertificateResponse where - xmlPickler = withNS iamNS - --- | Updates the name and/or the path of the specified user. Important You --- should understand the implications of changing a user's path or name. For --- more information, see Renaming Users and Groups in Using AWS Identity and --- Access Management. Note To change a user name the requester must have --- appropriate permissions on both the source object and the target object. --- For example, to change Bob to Robert, the entity making the request must --- have permission on Bob and Robert, or must have permission on all (*). For --- more information about permissions, see Permissions and Policies. --- --- -data UpdateUser = UpdateUser - { uuNewPath :: Maybe Text - -- ^ New path for the user. Include this parameter only if you're - -- changing the user's path. - , uuNewUserName :: Maybe Text - -- ^ New name for the user. Include this parameter only if you're - -- changing the user's name. - , uuUserName :: !Text - -- ^ Name of the user to update. If you're changing the name of the - -- user, this is the original user name. - } deriving (Eq, Show, Generic) - -instance IsQuery UpdateUser - -instance Rq UpdateUser where - type Er UpdateUser = IAMError - type Rs UpdateUser = UpdateUserResponse - request = query4 iam GET "UpdateUser" - -data UpdateUserResponse = UpdateUserResponse - { uurResponseMetadata :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML UpdateUserResponse where - xmlPickler = withNS iamNS - --- | Uploads a server certificate entity for the AWS account. The server --- certificate entity includes a public key certificate, a private key, and an --- optional certificate chain, which should all be PEM-encoded. For --- information about the number of server certificates you can upload, see --- Limitations on IAM Entities in Using AWS Identity and Access Management. --- Note Because the body of the public key certificate, private key, and the --- certificate chain can be large, you should use POST rather than GET when --- calling UploadServerCertificate. For information about setting up --- signatures and authorization through the API, go to Signing AWS API --- Requests in the AWS General Reference. For general information about using --- the Query4 Iam API with IAM, go to Making Query4 Iam Requests in Using IAM. --- --- -data UploadServerCertificate = UploadServerCertificate - { uscCertificateBody :: !Text - -- ^ The contents of the public key certificate in PEM-encoded format. - , uscCertificateChain :: Maybe Text - -- ^ The contents of the certificate chain. This is typically a - -- concatenation of the PEM-encoded public key certificates of the - -- chain. - , uscPath :: Maybe Text - -- ^ The path for the server certificate. For more information about - -- paths, see Identifiers for IAM Entities in Using AWS Identity and - -- Access Management. - , uscPrivateKey :: !Text - -- ^ The contents of the private key in PEM-encoded format. - , usdServerCertificateName :: !Text - -- ^ The name for the server certificate. Do not include the path in - -- this value. - } deriving (Eq, Show, Generic) - -instance IsQuery UploadServerCertificate - -instance Rq UploadServerCertificate where - type Er UploadServerCertificate = IAMError - type Rs UploadServerCertificate = UploadServerCertificateResponse - request = query4 iam GET "UploadServerCertificate" - -data UploadServerCertificateResponse = UploadServerCertificateResponse - { usctResponseMetadata :: !Text - , usctUploadServerCertificateResult :: !UploadServerCertificateResult - } deriving (Eq, Show, Generic) - -instance IsXML UploadServerCertificateResponse where - xmlPickler = withNS iamNS - --- | Uploads an X.509 signing certificate and associates it with the specified --- user. Some AWS services use X.509 signing certificates to validate requests --- that are signed with a corresponding private key. When you upload the --- certificate, its default status is Active. If the UserName field is not --- specified, the user name is determined implicitly based on the AWS Access --- Key ID used to sign the request. Because this action works for access keys --- under the AWS account, this API can be used to manage root credentials even --- if the AWS account has no associated users. Note Because the body of a --- X.509 certificate can be large, you should use POST rather than GET when --- calling UploadSigningCertificate. For information about setting up --- signatures and authorization through the API, go to Signing AWS API --- Requests in the AWS General Reference. For general information about using --- the Query4 Iam API with IAM, go to Making Query4 Iam Requests in Using IAM. --- --- -data UploadSigningCertificate = UploadSigningCertificate - { usdCertificateBody :: !Text - -- ^ The contents of the signing certificate. - , usdUserName :: Maybe Text - -- ^ Name of the user the signing certificate is for. - } deriving (Eq, Show, Generic) - -instance IsQuery UploadSigningCertificate - -instance Rq UploadSigningCertificate where - type Er UploadSigningCertificate = IAMError - type Rs UploadSigningCertificate = UploadSigningCertificateResponse - request = query4 iam GET "UploadSigningCertificate" - -data UploadSigningCertificateResponse = UploadSigningCertificateResponse - { uscuResponseMetadata :: !Text - , uscuUploadSigningCertificateResult :: !UploadSigningCertificateResult - } deriving (Eq, Show, Generic) - -instance IsXML UploadSigningCertificateResponse where - xmlPickler = withNS iamNS diff --git a/src/Network/AWS/IAM/Types.hs b/src/Network/AWS/IAM/Types.hs deleted file mode 100644 index f352d7cffcb..00000000000 --- a/src/Network/AWS/IAM/Types.hs +++ /dev/null @@ -1,1030 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} - --- Module : Network.AWS.IAM.Types --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.IAM.Types where - -import Data.ByteString (ByteString) -import Data.Monoid -import Data.Text (Text) -import Data.Time -import Network.AWS.Internal - --- | Currently supported version of the IAM service. -iam :: Service -iam = Service Global version4 "iam" "2010-05-08" - --- | XML namespace to annotate IAM elements with. -iamNS :: ByteString -iamNS = "https://iam.amazonaws.com/doc/" <> svcVersion iam <> "/" - --- | Helper to define IAM namespaced XML elements. -iamElem :: ByteString -> NName ByteString -iamElem = mkNName iamNS - -data ErrorType = ErrorType - { etType :: !Text - , etCode :: !Text - , etMessage :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML ErrorType where - xmlPickler = withNS iamNS - -data IAMError = IAMError - { erError :: !ErrorType - , erRequestId :: !Text - } deriving (Eq, Show, Generic) - -instance ToError IAMError where - toError = Err . show - -instance IsXML IAMError where - xmlPickler = withNS iamNS - --- | The AccessKey data type contains information about an AWS access key. This --- data type is used as a response element in the actions CreateAccessKey and --- ListAccessKeys. --- --- -data AccessKey = AccessKey - { akAccessKeyId :: !Text - -- ^ The ID for this access key. - , akCreateDate :: Maybe UTCTime - -- ^ The date when the access key was created. - , akSecretAccessKey :: !Text - -- ^ The secret key used to sign requests. - , akStatus :: !Text - -- ^ The status of the access key. Active means the key is valid for - -- API calls, while Inactive means it is not. - , akUserName :: !Text - -- ^ Name of the user the key is associated with. - } deriving (Eq, Show, Generic) - -instance IsQuery AccessKey - -instance IsXML AccessKey where - xmlPickler = withNS iamNS - --- | The AccessKey data type contains information about an AWS access key, --- without its secret key. This data type is used as a response element in the --- action ListAccessKeys. --- --- -data AccessKeyMetadata = AccessKeyMetadata - { akmAccessKeyId :: Maybe Text - -- ^ The ID for this access key. - , akmCreateDate :: Maybe UTCTime - -- ^ The date when the access key was created. - , akmStatus :: Maybe Text - -- ^ The status of the access key. Active means the key is valid for - -- API calls, while Inactive means it is not. - , akmUserName :: Maybe Text - -- ^ Name of the user the key is associated with. - } deriving (Eq, Show, Generic) - -instance IsQuery AccessKeyMetadata - -instance IsXML AccessKeyMetadata where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the CreateAccessKey --- action. --- --- -data CreateAccessKeyResult = CreateAccessKeyResult - { cakrAccessKey :: !AccessKey - -- ^ Information about the access key. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateAccessKeyResult - -instance IsXML CreateAccessKeyResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the CreateGroup action. --- --- -data CreateGroupResult = CreateGroupResult - { cgrGroup :: !Group - -- ^ Information about the group. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateGroupResult - -instance IsXML CreateGroupResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the CreateInstanceProfile --- action. --- --- -data CreateInstanceProfileResult = CreateInstanceProfileResult - { ciprInstanceProfile :: !InstanceProfile - -- ^ Information about the instance profile. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateInstanceProfileResult - -instance IsXML CreateInstanceProfileResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the CreateLoginProfile --- action. --- --- -data CreateLoginProfileResult = CreateLoginProfileResult - { clprLoginProfile :: !LoginProfile - -- ^ The user name and password create date. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateLoginProfileResult - -instance IsXML CreateLoginProfileResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the CreateRole action. --- --- -data CreateRoleResult = CreateRoleResult - { crrRole :: !Role - -- ^ Information about the role. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateRoleResult - -instance IsXML CreateRoleResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the CreateUser action. --- --- -data CreateUserResult = CreateUserResult - { curUser :: Maybe User - -- ^ Information about the user. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateUserResult - -instance IsXML CreateUserResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the --- CreateVirtualMFADevice action. --- --- -data CreateVirtualMFADeviceResult = CreateVirtualMFADeviceResult - { cvmfadrVirtualMFADevice :: !VirtualMFADevice - -- ^ A newly created virtual MFA device. - } deriving (Eq, Show, Generic) - -instance IsQuery CreateVirtualMFADeviceResult - -instance IsXML CreateVirtualMFADeviceResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the --- GetAccountPasswordPolicy action. --- --- -data GetAccountPasswordPolicyResult = GetAccountPasswordPolicyResult - { gapprPasswordPolicy :: !PasswordPolicy - -- ^ The PasswordPolicy data type contains information about the - -- account password policy. - } deriving (Eq, Show, Generic) - -instance IsQuery GetAccountPasswordPolicyResult - -instance IsXML GetAccountPasswordPolicyResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetAccountSummary --- action. --- --- -data GetAccountSummaryResult = GetAccountSummaryResult - { gasrSummaryMap :: Maybe Text - -- ^ A set of key value pairs containing account-level information. - } deriving (Eq, Show, Generic) - -instance IsQuery GetAccountSummaryResult - -instance IsXML GetAccountSummaryResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetGroupPolicy --- action. --- --- -data GetGroupPolicyResult = GetGroupPolicyResult - { ggprGroupName :: !Text - -- ^ The group the policy is associated with. - , ggprPolicyDocument :: !Text - -- ^ The policy document. - , ggprPolicyName :: !Text - -- ^ The name of the policy. - } deriving (Eq, Show, Generic) - -instance IsQuery GetGroupPolicyResult - -instance IsXML GetGroupPolicyResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetGroup action. --- --- -data GetGroupResult = GetGroupResult - { ggrGroup :: !Group - -- ^ Information about the group. - , ggrIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more user names to list. - -- If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more user names in the list. - , ggrMarker :: Maybe Text - -- ^ If IsTruncated is true, then this element is present and contains - -- the value to use for the Marker parameter in a subsequent - -- pagination request. - , ggrUsers :: !User - -- ^ A list of users in the group. - } deriving (Eq, Show, Generic) - -instance IsQuery GetGroupResult - -instance IsXML GetGroupResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetInstanceProfile --- action. --- --- -data GetInstanceProfileResult = GetInstanceProfileResult - { giprInstanceProfile :: !InstanceProfile - -- ^ Information about the instance profile. - } deriving (Eq, Show, Generic) - -instance IsQuery GetInstanceProfileResult - -instance IsXML GetInstanceProfileResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetLoginProfile --- action. --- --- -data GetLoginProfileResult = GetLoginProfileResult - { glprLoginProfile :: !LoginProfile - -- ^ User name and password create date for the user. - } deriving (Eq, Show, Generic) - -instance IsQuery GetLoginProfileResult - -instance IsXML GetLoginProfileResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetRolePolicy action. --- --- -data GetRolePolicyResult = GetRolePolicyResult - { grprPolicyDocument :: !Text - -- ^ The policy document. - , grprPolicyName :: !Text - -- ^ The name of the policy. - , grprRoleName :: !Text - -- ^ The role the policy is associated with. - } deriving (Eq, Show, Generic) - -instance IsQuery GetRolePolicyResult - -instance IsXML GetRolePolicyResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetRole action. --- --- -data GetRoleResult = GetRoleResult - { grrRole :: !Role - -- ^ Information about the role. - } deriving (Eq, Show, Generic) - -instance IsQuery GetRoleResult - -instance IsXML GetRoleResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetServerCertificate --- action. --- --- -data GetServerCertificateResult = GetServerCertificateResult - { gscrServerCertificate :: !ServerCertificate - -- ^ Information about the server certificate. - } deriving (Eq, Show, Generic) - -instance IsQuery GetServerCertificateResult - -instance IsXML GetServerCertificateResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetUserPolicy action. --- --- -data GetUserPolicyResult = GetUserPolicyResult - { guprPolicyDocument :: !Text - -- ^ The policy document. - , guprPolicyName :: !Text - -- ^ The name of the policy. - , guprUserName :: !Text - -- ^ The user the policy is associated with. - } deriving (Eq, Show, Generic) - -instance IsQuery GetUserPolicyResult - -instance IsXML GetUserPolicyResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the GetUser action. --- --- -data GetUserResult = GetUserResult - { gurUser :: !User - -- ^ Information about the user. - } deriving (Eq, Show, Generic) - -instance IsQuery GetUserResult - -instance IsXML GetUserResult where - xmlPickler = withNS iamNS - --- | The Group data type contains information about a group. This data type is --- used as a response element in the following actions: --- --- -data Group = Group - { gArn :: !Text - -- ^ The Amazon Resource Name (ARN) specifying the group. For more - -- information about ARNs and how to use them in policies, see - -- Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , gCreateDate :: !UTCTime - -- ^ The date when the group was created. - , gGroupId :: !Text - -- ^ The stable and unique string identifying the group. For more - -- information about IDs, see Identifiers for IAM Entities in Using - -- AWS Identity and Access Management. - , gGroupName :: !Text - -- ^ The name that identifies the group. - , gPath :: !Text - -- ^ Path to the group. For more information about paths, see - -- Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - } deriving (Eq, Show, Generic) - -instance IsQuery Group - -instance IsXML Group where - xmlPickler = withNS iamNS - --- | The InstanceProfile data type contains information about an instance --- profile. This data type is used as a response element in the following --- actions: CreateInstanceProfile GetInstanceProfile ListInstanceProfiles --- ListInstanceProfilesForRole --- --- -data InstanceProfile = InstanceProfile - { ipArn :: !Text - -- ^ The Amazon Resource Name (ARN) specifying the instance profile. - -- For more information about ARNs and how to use them in policies, - -- see Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , ipCreateDate :: !UTCTime - -- ^ The date when the instance profile was created. - , ipInstanceProfileId :: !Text - -- ^ The stable and unique string identifying the instance profile. - -- For more information about IDs, see Identifiers for IAM Entities - -- in Using AWS Identity and Access Management. - , ipInstanceProfileName :: !Text - -- ^ The name identifying the instance profile. - , ipPath :: !Text - -- ^ Path to the instance profile. For more information about paths, - -- see Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , ipRoles :: [Role] - -- ^ The roles associated with the instance profile. - } deriving (Eq, Show, Generic) - -instance IsQuery InstanceProfile - -instance IsXML InstanceProfile where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListAccessKeys --- action. --- --- -data ListAccessKeysResult = ListAccessKeysResult - { lakrAccessKeyMetadata :: !AccessKeyMetadata - -- ^ A list of access key metadata. - , lakrIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more keys to list. If - -- your results were truncated, you can make a subsequent pagination - -- request using the Marker request parameter to retrieve more keys - -- in the list. - , lakrMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - } deriving (Eq, Show, Generic) - -instance IsQuery ListAccessKeysResult - -instance IsXML ListAccessKeysResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListAccountAliases --- action. --- --- -data ListAccountAliasesResult = ListAccountAliasesResult - { laarAccountAliases :: !Text - -- ^ A list of aliases associated with the account. - , laarIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more account aliases to - -- list. If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more account aliases in the list. - , laarMarker :: Maybe Text - -- ^ Use this only when paginating results, and only in a subsequent - -- request after you've received a response where the results are - -- truncated. Set it to the value of the Marker element in the - -- response you just received. - } deriving (Eq, Show, Generic) - -instance IsQuery ListAccountAliasesResult - -instance IsXML ListAccountAliasesResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListGroupPolicies --- action. --- --- -data ListGroupPoliciesResult = ListGroupPoliciesResult - { lgprIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more policy names to - -- list. If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more policy names in the list. - , lgprMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - , lgprPolicyNames :: !Text - -- ^ A list of policy names. - } deriving (Eq, Show, Generic) - -instance IsQuery ListGroupPoliciesResult - -instance IsXML ListGroupPoliciesResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListGroupsForUser --- action. --- --- -data ListGroupsForUserResult = ListGroupsForUserResult - { lgfurGroups :: !Group - -- ^ A list of groups. - , lgfurIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more groups to list. If - -- your results were truncated, you can make a subsequent pagination - -- request using the Marker request parameter to retrieve more - -- groups in the list. - , lgfurMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - } deriving (Eq, Show, Generic) - -instance IsQuery ListGroupsForUserResult - -instance IsXML ListGroupsForUserResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListGroups action. --- --- -data ListGroupsResult = ListGroupsResult - { lgrGroups :: !Group - -- ^ A list of groups. - , lgrIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more groups to list. If - -- your results were truncated, you can make a subsequent pagination - -- request using the Marker request parameter to retrieve more - -- groups in the list. - , lgrMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - } deriving (Eq, Show, Generic) - -instance IsQuery ListGroupsResult - -instance IsXML ListGroupsResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the --- ListInstanceProfilesForRole action. --- --- -data ListInstanceProfilesForRoleResult = ListInstanceProfilesForRoleResult - { lipfrrInstanceProfiles :: !InstanceProfile - -- ^ A list of instance profiles. - , lipfrrIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more instance profiles to - -- list. If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more instance profiles in the list. - , lipfrrMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - } deriving (Eq, Show, Generic) - -instance IsQuery ListInstanceProfilesForRoleResult - -instance IsXML ListInstanceProfilesForRoleResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListInstanceProfiles --- action. --- --- -data ListInstanceProfilesResult = ListInstanceProfilesResult - { liprInstanceProfiles :: !InstanceProfile - -- ^ A list of instance profiles. - , liprIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more instance profiles to - -- list. If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more instance profiles in the list. - , liprMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - } deriving (Eq, Show, Generic) - -instance IsQuery ListInstanceProfilesResult - -instance IsXML ListInstanceProfilesResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListMFADevices --- action. --- --- -data ListMFADevicesResult = ListMFADevicesResult - { lmfadrIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more MFA devices to list. - -- If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more MFA devices in the list. - , lmfadrMFADevices :: !MFADevice - -- ^ A list of MFA devices. - , lmfadrMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - } deriving (Eq, Show, Generic) - -instance IsQuery ListMFADevicesResult - -instance IsXML ListMFADevicesResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListRolePolicies --- action. --- --- -data ListRolePoliciesResult = ListRolePoliciesResult - { lrprIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more policy names to - -- list. If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more policy names in the list. - , lrprMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - , lrprPolicyNames :: Members Text - -- ^ A list of policy names. - } deriving (Eq, Show, Generic) - -instance IsQuery ListRolePoliciesResult - -instance IsXML ListRolePoliciesResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListRoles action. --- --- -data ListRolesResult = ListRolesResult - { lrrIsTruncated :: Bool - -- ^ A flag that indicates whether there are more roles to list. If - -- your results were truncated, you can make a subsequent pagination - -- request using the Marker request parameter to retrieve more roles - -- in the list. - , lrrMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - , lrrRoles :: Members Role - -- ^ A list of roles. - } deriving (Eq, Show, Generic) - -instance IsQuery ListRolesResult - -instance IsXML ListRolesResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the --- ListServerCertificates action. --- --- -data ListServerCertificatesResult = ListServerCertificatesResult - { lscrIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more server certificates - -- to list. If your results were truncated, you can make a - -- subsequent pagination request using the Marker request parameter - -- to retrieve more server certificates in the list. - , lscrMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - , lscrServerCertificateMetadataList :: !ServerCertificateMetadata - -- ^ A list of server certificates. - } deriving (Eq, Show, Generic) - -instance IsQuery ListServerCertificatesResult - -instance IsXML ListServerCertificatesResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the --- ListSigningCertificates action. --- --- -data ListSigningCertificatesResult = ListSigningCertificatesResult - { lscrCertificates :: !SigningCertificate - -- ^ A list of the user's signing certificate information. - , lscsIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more certificate IDs to - -- list. If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more certificates in the list. - , lscsMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - } deriving (Eq, Show, Generic) - -instance IsQuery ListSigningCertificatesResult - -instance IsXML ListSigningCertificatesResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListUserPolicies --- action. --- --- -data ListUserPoliciesResult = ListUserPoliciesResult - { luprIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more policy names to - -- list. If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more policy names in the list. - , luprMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - , luprPolicyNames :: !Text - -- ^ A list of policy names. - } deriving (Eq, Show, Generic) - -instance IsQuery ListUserPoliciesResult - -instance IsXML ListUserPoliciesResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListUsers action. --- --- -data ListUsersResult = ListUsersResult - { lurIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more user names to list. - -- If your results were truncated, you can make a subsequent - -- pagination request using the Marker request parameter to retrieve - -- more users in the list. - , lurMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - , lurUsers :: !User - -- ^ A list of users. - } deriving (Eq, Show, Generic) - -instance IsQuery ListUsersResult - -instance IsXML ListUsersResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the ListVirtualMFADevices --- action. --- --- -data ListVirtualMFADevicesResult = ListVirtualMFADevicesResult - { lvmfadrIsTruncated :: Maybe Bool - -- ^ A flag that indicates whether there are more items to list. If - -- your results were truncated, you can make a subsequent pagination - -- request using the Marker request parameter to retrieve more items - -- the list. - , lvmfadrMarker :: Maybe Text - -- ^ If IsTruncated is true, this element is present and contains the - -- value to use for the Marker parameter in a subsequent pagination - -- request. - , lvmfadrVirtualMFADevices :: !VirtualMFADevice - -- ^ Type: VirtualMFADevice list - } deriving (Eq, Show, Generic) - -instance IsQuery ListVirtualMFADevicesResult - -instance IsXML ListVirtualMFADevicesResult where - xmlPickler = withNS iamNS - --- | The LoginProfile data type contains the user name and password create date --- for a user. This data type is used as a response element in the actions --- CreateLoginProfile and GetLoginProfile. --- --- -data LoginProfile = LoginProfile - { lpCreateDate :: !UTCTime - -- ^ The date when the password for the user was created. - , lpUserName :: !Text - -- ^ The name of the user, which can be used for signing into the AWS - -- Management Console. - } deriving (Eq, Show, Generic) - -instance IsQuery LoginProfile - -instance IsXML LoginProfile where - xmlPickler = withNS iamNS - --- | The MFADevice data type contains information about an MFA device. This data --- type is used as a response element in the action ListMFADevices. --- --- -data MFADevice = MFADevice - { mfadEnableDate :: !UTCTime - -- ^ The date when the MFA device was enabled for the user. - , mfadSerialNumber :: !Text - -- ^ The serial number that uniquely identifies the MFA device. For - -- virtual MFA devices, the serial number is the device ARN. - , mfadUserName :: !Text - -- ^ The user with whom the MFA device is associated. - } deriving (Eq, Show, Generic) - -instance IsQuery MFADevice - -instance IsXML MFADevice where - xmlPickler = withNS iamNS - --- | The PasswordPolicy data type contains information about the account --- password policy. This data type is used as a response element in the action --- GetAccountPasswordPolicy. --- --- -data PasswordPolicy = PasswordPolicy - { ppAllowUsersToChangePassword :: Maybe Bool - -- ^ Specifies whether to allow IAM users to change their own - -- password. - , ppMinimumPasswordLength :: Maybe Integer - -- ^ Minimum length to require for IAM user passwords. - , ppRequireLowercaseCharacters :: Maybe Bool - -- ^ Specifies whether to require lowercase characters for IAM user - -- passwords. - , ppRequireNumbers :: Maybe Bool - -- ^ Specifies whether to require numbers for IAM user passwords. - , ppRequireSymbols :: Maybe Bool - -- ^ Specifies whether to require symbols for IAM user passwords. - , ppRequireUppercaseCharacters :: Maybe Bool - -- ^ Specifies whether to require uppercase characters for IAM user - -- passwords. - } deriving (Eq, Show, Generic) - -instance IsQuery PasswordPolicy - -instance IsXML PasswordPolicy where - xmlPickler = withNS iamNS - --- | The Role data type contains information about a role. This data type is --- used as a response element in the following actions: CreateRole GetRole --- ListRoles --- --- -data Role = Role - { rArn :: !Text - -- ^ The Amazon Resource Name (ARN) specifying the role. For more - -- information about ARNs and how to use them in policies, see - -- Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , rAssumeRolePolicyDocument :: Maybe Text - -- ^ The policy that grants an entity permission to assume the role. - , rCreateDate :: !UTCTime - -- ^ The date when the role was created. - , rPath :: !Text - -- ^ Path to the role. For more information about paths, see - -- Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , rRoleId :: !Text - -- ^ The stable and unique string identifying the role. For more - -- information about IDs, see Identifiers for IAM Entities in Using - -- AWS Identity and Access Management. - , rRoleName :: !Text - -- ^ The name identifying the role. - } deriving (Eq, Show, Generic) - -instance IsQuery Role - -instance IsXML Role where - xmlPickler = withNS iamNS - --- | The ServerCertificate data type contains information about a server --- certificate. This data type is used as a response element in the action --- GetServerCertificate. --- --- -data ServerCertificate = ServerCertificate - { scCertificateBody :: !Text - -- ^ The contents of the public key certificate. - , scCertificateChain :: Maybe Text - -- ^ The contents of the public key certificate chain. - , scServerCertificateMetadata :: !ServerCertificateMetadata - -- ^ The meta information of the server certificate, such as its name, - -- path, ID, and ARN. - } deriving (Eq, Show, Generic) - -instance IsQuery ServerCertificate - -instance IsXML ServerCertificate where - xmlPickler = withNS iamNS - --- | ServerCertificateMetadata contains information about a server certificate --- without its certificate body, certificate chain, and private key. This data --- type is used as a response element in the action UploadServerCertificate --- and ListServerCertificates. --- --- -data ServerCertificateMetadata = ServerCertificateMetadata - { scmArn :: !Text - -- ^ The Amazon Resource Name (ARN) specifying the server certificate. - -- For more information about ARNs and how to use them in policies, - -- see Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , scmPath :: !Text - -- ^ Path to the server certificate. For more information about paths, - -- see Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , scmServerCertificateId :: !Text - -- ^ The stable and unique string identifying the server certificate. - -- For more information about IDs, see Identifiers for IAM Entities - -- in Using AWS Identity and Access Management. - , scmServerCertificateName :: !Text - -- ^ The name that identifies the server certificate. - , scmUploadDate :: Maybe UTCTime - -- ^ The date when the server certificate was uploaded. - } deriving (Eq, Show, Generic) - -instance IsQuery ServerCertificateMetadata - -instance IsXML ServerCertificateMetadata where - xmlPickler = withNS iamNS - --- | The SigningCertificate data type contains information about an X.509 --- signing certificate. This data type is used as a response element in the --- actions UploadSigningCertificate and ListSigningCertificates. --- --- -data SigningCertificate = SigningCertificate - { sdCertificateBody :: !Text - -- ^ The contents of the signing certificate. - , sdCertificateId :: !Text - -- ^ The ID for the signing certificate. - , sdStatus :: !Text - -- ^ The status of the signing certificate. Active means the key is - -- valid for API calls, while Inactive means it is not. - , sdUploadDate :: Maybe UTCTime - -- ^ The date when the signing certificate was uploaded. - , sdUserName :: !Text - -- ^ Name of the user the signing certificate is associated with. - } deriving (Eq, Show, Generic) - -instance IsQuery SigningCertificate - -instance IsXML SigningCertificate where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the --- UploadServerCertificate action. --- --- -data UploadServerCertificateResult = UploadServerCertificateResult - { uscrServerCertificateMetadata :: Maybe ServerCertificateMetadata - -- ^ The meta information of the uploaded server certificate without - -- its certificate body, certificate chain, and private key. - } deriving (Eq, Show, Generic) - -instance IsQuery UploadServerCertificateResult - -instance IsXML UploadServerCertificateResult where - xmlPickler = withNS iamNS - --- | Contains the result of a successful invocation of the --- UploadSigningCertificate action. --- --- -data UploadSigningCertificateResult = UploadSigningCertificateResult - { uscrCertificate :: !SigningCertificate - -- ^ Information about the certificate. - } deriving (Eq, Show, Generic) - -instance IsQuery UploadSigningCertificateResult - -instance IsXML UploadSigningCertificateResult where - xmlPickler = withNS iamNS - --- | The User data type contains information about a user. This data type is --- used as a response element in the following actions: CreateUser GetUser --- ListUsers --- --- -data User = User - { uArn :: !Text - -- ^ The Amazon Resource Name (ARN) specifying the user. For more - -- information about ARNs and how to use them in policies, see - -- Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , uCreateDate :: !UTCTime - -- ^ The date when the user was created. - , uPath :: !Text - -- ^ Path to the user. For more information about paths, see - -- Identifiers for IAM Entities in Using AWS Identity and Access - -- Management. - , uUserId :: !Text - -- ^ The stable and unique string identifying the user. For more - -- information about IDs, see Identifiers for IAM Entities in Using - -- AWS Identity and Access Management. - , uUserName :: !Text - -- ^ The name identifying the user. - } deriving (Eq, Show, Generic) - -instance IsQuery User - -instance IsXML User where - xmlPickler = withNS iamNS - --- | The VirtualMFADevice data type contains information about a virtual MFA --- device. --- --- -data VirtualMFADevice = VirtualMFADevice - { vmfadBase32StringSeed :: Maybe Text - -- ^ The Base32 seed defined as specified in RFC3548. The - -- Base32StringSeed is Base64-encoded. - , vmfadEnableDate :: Maybe UTCTime - -- ^ Type: DateTime - , vmfadQRCodePNG :: Maybe Text - -- ^ A QR code PNG image that encodes - -- otpauth://totp/$virtualMFADeviceName@$AccountName? - -- secret=$Base32String where $virtualMFADeviceName is one of the - -- create call arguments, AccountName is the user name if set - -- (accountId otherwise), and Base32String is the seed in Base32 - -- format. The Base32String is Base64-encoded. - , vmfadSerialNumber :: !Text - -- ^ The serial number associated with VirtualMFADevice. - , vmfadUser :: Maybe User - -- ^ The User data type contains information about a user. - } deriving (Eq, Show, Generic) - -instance IsQuery VirtualMFADevice - -instance IsXML VirtualMFADevice where - xmlPickler = withNS iamNS diff --git a/src/Network/AWS/Internal.hs b/src/Network/AWS/Internal.hs deleted file mode 100644 index 0412ccdb14c..00000000000 --- a/src/Network/AWS/Internal.hs +++ /dev/null @@ -1,27 +0,0 @@ --- Module : Network.AWS.Internal --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Internal - ( - -- * Internal Modules - module Internal - ) where - -import Control.Error as Internal -import GHC.Generics as Internal -import Network.AWS.Internal.Instances as Internal -import Network.AWS.Internal.Request as Internal -import Network.AWS.Internal.Signing as Internal -import Network.AWS.Internal.String as Internal -import Network.AWS.Internal.Time as Internal -import Network.AWS.Internal.Types as Internal -import Network.AWS.Internal.XML as Internal -import Network.HTTP.QueryString.Pickle as Internal -import Text.XML.Expat.Pickle.Generic as Internal diff --git a/src/Network/AWS/Internal/Instances.hs b/src/Network/AWS/Internal/Instances.hs deleted file mode 100644 index 214fa491f3b..00000000000 --- a/src/Network/AWS/Internal/Instances.hs +++ /dev/null @@ -1,86 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE OverloadedStrings #-} - -{-# OPTIONS_GHC -fno-warn-orphans #-} - --- Module : Network.AWS.Internal.Instances --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Internal.Instances where - -import Control.Monad -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import Data.Time -import Network.AWS.Internal.Time -import Network.AWS.Internal.Types -import Network.HTTP.QueryString.Pickle -import Text.XML.Expat.Pickle.Generic - -instance IsQuery a => IsQuery [a] where - queryPickler = qpOrdinalList queryPickler - -instance IsQuery a => IsQuery (Items a) where - queryPickler = (Items, items) `qpWrap` qpOrdinalList queryPickler - -instance IsXML a => IsXML (Items a) where - xmlPickler = xpWrap (Items, items) $ xpElemList (name "item") pu - where - name = maybe mkAnNName mkNName . join $ nnNamespace `fmap` root pu - pu = xmlPickler - -instance IsQuery a => IsQuery (Members a) where - queryPickler = qpWrap (Members, members) - (qpElem "member" $ qpOrdinalList queryPickler) - -instance IsXML a => IsXML (Members a) where - xmlPickler = xpWrap (Members, members) $ xpElemList (name "member") pu - where - name = maybe mkAnNName mkNName . join $ nnNamespace `fmap` root pu - pu = xmlPickler - -instance IsQuery () where - queryPickler = qpLift () - -instance IsQuery Bool where - queryPickler = QueryPU (Value . lowerBool) u - where - u (Value s) = parseBool s - u e = Left $ "unable to encode Bool from: " ++ show e - -instance IsXML Bool where - xmlPickler = xpContent $ XMLPU lowerBool parseBool Nothing - -instance IsQuery UTCTime where - queryPickler = QueryPU (Value . formatISO8601) u - where - u (Value s) = parseISO8601 $ BS.unpack s - u o = Left $ "unable to parse ISO8601 time from: " ++ show o - -instance IsXML UTCTime where - xmlPickler = xpContent XMLPU - { pickleTree = formatISO8601 - , unpickleTree = parseISO8601 . BS.unpack - , root = Nothing - } - -instance IsQuery Double where - queryPickler = qpPrim - -lowerBool :: Bool -> ByteString -lowerBool True = "true" -lowerBool False = "false" - -parseBool :: ByteString -> Either String Bool -parseBool "true" = Right True -parseBool "false" = Right False -parseBool e = Left $ "unable to parse Bool from: " ++ show e diff --git a/src/Network/AWS/Internal/Request.hs b/src/Network/AWS/Internal/Request.hs deleted file mode 100644 index f77017c0e04..00000000000 --- a/src/Network/AWS/Internal/Request.hs +++ /dev/null @@ -1,40 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} - --- Module : Network.AWS.Internal.Request --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Internal.Request where - -import Control.Arrow -import Data.ByteString (ByteString) -import Network.AWS.Internal.String -import Network.AWS.Internal.Types -import Network.HTTP.Conduit -import Network.HTTP.QueryString.Pickle -import Network.HTTP.Types hiding (toQuery) -import Text.XML.Expat.Pickle.Generic - -query :: IsQuery a => Service -> StdMethod -> ByteString -> a -> Raw -query s@Service{..} m p x = Raw s m p q [] (RequestBodyBS "") - where - q = map (second Just) (toQuery x) - -query4 :: IsQuery a => Service -> StdMethod -> ByteString -> a -> Raw -query4 s m a q = query s m "/" q .?. [("Action", Just a)] - -xml :: IsXML a => Service -> StdMethod -> ByteString -> a -> Raw -xml s@Service{..} m p = Raw s m ("/" `addPrefix` p) [] [] . RequestBodyBS . toXML - -(.?.) :: Raw -> [(ByteString, Maybe ByteString)] -> Raw -(.?.) r q = r { rqQuery = rqQuery r ++ q } - -(.:.) :: Raw -> [Header] -> Raw -(.:.) r hs = r { rqHeaders = rqHeaders r ++ hs } diff --git a/src/Network/AWS/Internal/Signing.hs b/src/Network/AWS/Internal/Signing.hs deleted file mode 100644 index af5e9a1bbaa..00000000000 --- a/src/Network/AWS/Internal/Signing.hs +++ /dev/null @@ -1,331 +0,0 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE ViewPatterns #-} - --- Module : Network.AWS.Internal.Signing --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Internal.Signing - ( sign - , version2 - , version3 - , version4 - , versionS3 - , presignS3 - ) where - -import Control.Applicative -import Control.Monad.IO.Class -import qualified Crypto.Hash.SHA1 as SHA1 -import qualified Crypto.Hash.SHA256 as SHA256 -import qualified Crypto.MAC.HMAC as HMAC -import Data.ByteString (ByteString) -import qualified Data.ByteString.Base16 as Base16 -import qualified Data.ByteString.Base64 as Base64 -import qualified Data.ByteString.Char8 as BS -import Data.CaseInsensitive (CI) -import qualified Data.CaseInsensitive as Case -import Data.Default -import Data.Function (on) -import Data.List (groupBy, nub, sort, sortBy, find) -import Data.Maybe -import Data.Monoid -import Data.Ord -import Data.Time (UTCTime, getCurrentTime) -import Data.Time.Clock.POSIX -import Network.AWS.Headers -import Network.AWS.Internal.String -import Network.AWS.Internal.Time -import Network.AWS.Internal.Types -import Network.HTTP.Conduit -import Network.HTTP.Types (Header, StdMethod, urlEncode) - -data Common = Common - { _service :: !ByteString - , _version :: !ByteString - , _host :: !ByteString - , _query :: [(ByteString, Maybe ByteString)] - } - -sign :: Raw -> AWS Request -sign raw@Raw{..} = do - auth <- getAuth - reg <- region rqService - time <- liftIO getCurrentTime - - let sig = svcSigner rqService - hs = hHost (endpoint rqService reg) : rqHeaders - - return $! sig (raw { rqHeaders = hs }) auth reg time - -version2 :: Signer -version2 raw@Raw{..} auth reg time = - signed rqMethod _host rqPath query headers rqBody - where - Common{..} = common raw reg - - query = encoded <> "&Signature=" <> urlEncode True signature - - signature = Base64.encode - . hmacSHA256 (secretAccessKey auth) - $ BS.intercalate "\n" - [ BS.pack $ show rqMethod - , _host - , rqPath - , encoded - ] - - encoded = renderQuery $ _query - ++ [ ("Version", Just _version) - , ("SignatureVersion", Just "2") - , ("SignatureMethod", Just "HmacSHA256") - , ("Timestamp", Just $ formatISO8601 time) - , ("AWSAccessKeyId", Just $ accessKeyId auth) - ] - ++ maybeToList ((\x -> ("SecurityToken", Just x)) <$> securityToken auth) - - headers = hDate (formatISO8601 time) : rqHeaders - -version3 :: Signer -version3 raw@Raw{..} auth reg time = - signed rqMethod _host rqPath query headers rqBody - where - Common{..} = common raw reg - - query = renderQuery _query - headers = hDate (formatRFC822 time) - : hAMZAuth authorisation - : maybeToList (hAMZToken <$> securityToken auth) - ++ rqHeaders - - authorisation = "AWS3-HTTPS AWSAccessKeyId=" - <> accessKeyId auth - <> ", Algorithm=HmacSHA256, Signature=" - <> Base64.encode (hmacSHA256 (secretAccessKey auth) $ formatRFC822 time) - -version4 :: Signer -version4 raw@Raw{..} auth reg time = - signed rqMethod _host rqPath query (hAuth authorisation : headers) rqBody - where - Common{..} = common raw reg - - query = renderQuery . sort $ ("Version", Just _version) : _query - headers = hAMZDate time - : maybeToList (hAMZToken <$> securityToken auth) - ++ rqHeaders - - authorisation = mconcat - [ algorithm - , " Credential=" - , accessKeyId auth - , "/" - , credentialScope - , ", SignedHeaders=" - , signedHeaders - , ", Signature=" - , signature - ] - - signature = Base16.encode $ hmacSHA256 signingKey stringToSign - signingKey = foldl1 hmacSHA256 $ ("AWS4" <> secretAccessKey auth) : scope - - stringToSign = BS.intercalate "\n" - [ algorithm - , formatAWS time - , credentialScope - , Base16.encode $ SHA256.hash canonicalRequest - ] - - credentialScope = BS.intercalate "/" scope - - algorithm = "AWS4-HMAC-SHA256" - scope = [formatBasic time, BS.pack $ show reg, _service, "aws4_request"] - - canonicalRequest = BS.intercalate "\n" - [ BS.pack $ show rqMethod - , rqPath - , query - , canonicalHeaders - , signedHeaders - , bodySHA256 - ] - - canonicalHeaders = mconcat $ map flattenValues grouped - - signedHeaders = BS.intercalate ";" . nub $ - map (Case.foldedCase . fst) grouped - - grouped = groupHeaders headers - - bodySHA256 = Base16.encode $ SHA256.hash "" - -- sinkHash :: (Monad m, Hash ctx d) => Consumer ByteString m SHA256 - -versionS3 :: ByteString -> Signer -versionS3 bucket raw@Raw{..} auth reg time = - signed rqMethod _host rqPath query (authorisation : headers) rqBody - where - Common{..} = common raw reg - - query = renderQuery _query - - authorisation = hAuth $ "AWS " <> accessKeyId auth <> ":" <> signature - - signature = Base64.encode $ hmacSHA1 (secretAccessKey auth) stringToSign - - stringToSign = BS.concat - [ BS.pack $ show rqMethod - , "\n" - , optionalHeader "content-md5" - , "\n" - , optionalHeader "content-type" - , "\n" - , date - , "\n" - , canonicalHeaders - , canonicalResource - ] - - optionalHeader = fromMaybe "" . (`lookupHeader` headers) - - canonicalHeaders = BS.concat - . map flattenValues - . filter (BS.isPrefixOf "x-amz-" . Case.foldedCase . fst) - $ groupHeaders headers - - headers = hDate date - : maybeToList (hAMZToken <$> securityToken auth) - ++ rqHeaders - - date = formatRFC822 time - - canonicalResource = wrap '/' bucket <> stripPrefix "/" rqPath <> subResource - - subResource = maybe "" (mappend "?" . f) $ find ((`elem` keys) . fst) _query - where - f (k, Just v) = k <> "=" <> v - f (k, _) = k - - keys = - [ "acl" - , "cors" - , "defaultObjectAcl" - , "location" - , "logging" - , "partNumber" - , "policy" - , "requestPayment" - , "torrent" - , "versioning" - , "versionId" - , "versions" - , "website" - , "uploads" - , "uploadId" - , "response-content-type" - , "response-content-language" - , "response-expires" - , "response-cache-control" - , "response-content-disposition" - , "response-content-encoding" - , "delete" - , "lifecycle" - , "tagging" - , "restore" - , "storageClass" - , "notification" - ] - -presignS3 :: StdMethod - -> ByteString - -> ByteString - -> UTCTime - -> AWS ByteString -presignS3 meth (strip '/' -> bucket) (strip '/' -> key) expires = do - auth <- getAuth - - let access = accessKeyId auth - secret = secretAccessKey auth - - return $! mconcat - [ "https://" - , bucket - , ".s3.amazonaws.com/" - , key - , "?AWSAccessKeyId=" <> access - , "&Expires=" <> expiry - , "&Signature=" <> signature secret - ] - where - signature = urlEncode True - . Base64.encode - . (`hmacSHA1` stringToSign) - - stringToSign = BS.intercalate "\n" - [ BS.pack $ show meth - , "" - , "" - , expiry - , "/" <> bucket <> "/" <> key - ] - - expiry = BS.pack $ show (truncate $ utcTimeToPOSIXSeconds expires :: Integer) - -common :: Raw -> Region -> Common -common Raw{..} reg = Common - { _service = svcName rqService - , _version = svcVersion rqService - , _host = endpoint rqService reg - , _query = sort rqQuery - } - -signed :: StdMethod - -> ByteString - -> ByteString - -> ByteString - -> [Header] - -> RequestBody - -> Request -signed meth host path qs hs body = def - { secure = True - , method = BS.pack $ show meth - , host = host - , port = 443 - , path = path - , queryString = qs - , requestHeaders = hs - , requestBody = body - , checkStatus = \_ _ _ -> Nothing - } - -hmacSHA1 :: ByteString -> ByteString -> ByteString -hmacSHA1 key msg = HMAC.hmac SHA1.hash 64 key msg - -hmacSHA256 :: ByteString -> ByteString -> ByteString -hmacSHA256 key msg = HMAC.hmac SHA256.hash 64 key msg - -groupHeaders :: [Header] -> [Header] -groupHeaders = sort . map f . groupBy ((==) `on` fst) - where - f (h:hs) = (fst h, BS.intercalate "," . sort . map snd $ h : hs) - f [] = ("", "") - -lookupHeader :: ByteString -> [Header] -> Maybe ByteString -lookupHeader (Case.mk -> key) = lookup key - -flattenValues :: IsByteString a => (CI ByteString, a) -> ByteString -flattenValues (k, v) = mconcat [Case.foldedCase k, ":", strip ' ' v, "\n"] - --- | Ensures the querystring is sorted - very important! -renderQuery :: [(ByteString, Maybe ByteString)] -> ByteString -renderQuery = BS.intercalate "&" . map f . sortBy (comparing fst) - where - f (k, Just v) = mconcat [k, "=", urlEncode True v] - f (k, _) = k diff --git a/src/Network/AWS/Internal/String.hs b/src/Network/AWS/Internal/String.hs deleted file mode 100644 index 8e4ae101f0c..00000000000 --- a/src/Network/AWS/Internal/String.hs +++ /dev/null @@ -1,101 +0,0 @@ -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE ViewPatterns #-} - --- Module : Network.AWS.Internal.String --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Internal.String - ( - -- * Type Class - IsByteString (..) - - -- * ByteStrings - , strip - , stripLower - , stripPrefix - , wrap - , addPrefix - , addSuffix - , lowerHead - , hyphenate - ) where - -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import Data.Char -import Data.Monoid -import Data.Text (Text) -import qualified Data.Text.Encoding as Text - -class IsByteString a where - toBS :: a -> ByteString - -instance IsByteString ByteString where - toBS = id - -instance IsByteString Text where - toBS = Text.encodeUtf8 - -instance IsByteString String where - toBS = BS.pack - -strip :: IsByteString a => Char -> a -> ByteString -strip c (toBS -> bs) - | BS.null bs = bs - | fst m = c `strip` BS.tail bs - | snd m = c `strip` BS.init bs - | otherwise = bs - where - m = c `match` bs - -stripLower :: IsByteString a => a -> ByteString -stripLower = BS.dropWhile isLower . toBS - -stripPrefix :: IsByteString a => a -> a -> ByteString -stripPrefix (toBS -> x) (toBS -> y) - | x `BS.isPrefixOf` y = BS.drop (BS.length x) y - | otherwise = y - -wrap :: IsByteString a => Char -> a -> ByteString -wrap c (toBS -> bs) = case c `match` bs of - (True, True) -> bs - (False, True) -> c `BS.cons` bs - (True, False) -> bs `BS.snoc` c - (False, False) -> let b = BS.singleton c - in BS.concat [b, bs, b] - -addPrefix :: IsByteString a => a -> a -> ByteString -addPrefix (toBS -> x) (toBS -> y) - | x `BS.isPrefixOf` y = y - | otherwise = x <> y - -addSuffix :: IsByteString a => a -> a -> ByteString -addSuffix (toBS -> x) (toBS -> y) - | x `BS.isSuffixOf` y = y - | otherwise = y <> x - -lowerHead :: IsByteString a => a -> ByteString -lowerHead (toBS -> bs) - | BS.null bs = bs - | isUpper h = toLower h `BS.cons` BS.tail bs - | otherwise = bs - where - h = BS.head bs - -match :: Char -> ByteString -> (Bool, Bool) -match c bs - | BS.null bs = (False, False) - | otherwise = (c == BS.head bs, c == BS.last bs) - -hyphenate :: String -> String -hyphenate = tail . snd . break (== '-') . concatMap f - where - f c | isUpper c = ['-', toLower c] - | otherwise = [c] diff --git a/src/Network/AWS/Internal/Time.hs b/src/Network/AWS/Internal/Time.hs deleted file mode 100644 index 168a7bc8c23..00000000000 --- a/src/Network/AWS/Internal/Time.hs +++ /dev/null @@ -1,41 +0,0 @@ --- Module : Network.AWS.Internal.Time --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Internal.Time - ( - -- * Formatters - formatRFC822 - , formatISO8601 - , formatAWS - , formatBasic - - -- * Parsers - , parseISO8601 - ) where - -import Control.Error -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import Data.Time (UTCTime) -import qualified Data.Time as Time -import System.Locale - -formatRFC822, formatISO8601, formatAWS, formatBasic :: UTCTime -> ByteString -formatRFC822 = formatTime "%a, %d %b %Y %H:%M:%S GMT" -formatISO8601 = formatTime (iso8601DateFormat $ Just "%XZ") -formatAWS = formatTime "%Y%m%dT%H%M%SZ" -formatBasic = formatTime "%Y%m%d" - -parseISO8601 :: String -> Either String UTCTime -parseISO8601 = note "unable to parse ISO8601 time" - . Time.parseTime defaultTimeLocale "%FT%T%QZ" - -formatTime :: String -> UTCTime -> ByteString -formatTime fmt = BS.pack . Time.formatTime defaultTimeLocale fmt diff --git a/src/Network/AWS/Internal/Types.hs b/src/Network/AWS/Internal/Types.hs deleted file mode 100644 index 37c3a7ff7dd..00000000000 --- a/src/Network/AWS/Internal/Types.hs +++ /dev/null @@ -1,455 +0,0 @@ -{-# LANGUAGE DefaultSignatures #-} -{-# LANGUAGE DeriveDataTypeable #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE DeriveTraversable #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeFamilies #-} - --- Module : Network.AWS.Internal.Types --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Internal.Types where - -import Control.Applicative -import Control.DeepSeq -import Control.Error -import Control.Exception hiding (catch, mask, uninterruptibleMask) -import Control.Monad -import Control.Monad.Base -import Control.Monad.Catch -import Control.Monad.Error -import Control.Monad.Reader -import Control.Monad.Trans.Resource -import Data.Aeson hiding (Error) -import Data.ByteString.Char8 (ByteString) -import qualified Data.ByteString.Char8 as BS -import qualified Data.ByteString.Lazy.Char8 as LBS -import Data.Conduit -import qualified Data.Conduit.Binary as Conduit -import Data.Foldable (Foldable) -import Data.IORef -import Data.Monoid -import Data.String -import Data.Text (Text) -import qualified Data.Text as Text -import qualified Data.Text.Encoding as Text -import Data.Time -import Data.Traversable -import Data.Typeable -import GHC.Generics -import Network.HTTP.Conduit -import Network.HTTP.QueryString.Pickle -import Network.HTTP.Types -import qualified Text.ParserCombinators.ReadP as ReadP -import qualified Text.Read as Read -import Text.XML.Expat.Pickle.Generic - -class Rq a where - type Er a - type Rs a - - request :: a -> Raw - response :: a - -> Response (ResumableSource AWS ByteString) - -> AWS (Either AWSError (Either (Er a) (Rs a))) - - default response :: (IsXML (Er a), IsXML (Rs a)) - => a - -> Response (ResumableSource AWS ByteString) - -> AWS (Either AWSError (Either (Er a) (Rs a))) - response _ rs = do - -- FIXME: use xml-conduit instead of hexpat to avoid need to conv to bs - lbs <- responseBody rs $$+- Conduit.sinkLbs - let bs = LBS.toStrict lbs - whenDebug . liftIO $ BS.putStrLn bs - return $ - if statusIsSuccessful $ responseStatus rs - then either (Left . Err) (Right . Right) $ success bs - else either (Left . Err) (Right . Left) $ failure bs - where - success :: ByteString -> Either String (Rs a) - success = fromXML - - failure :: ByteString -> Either String (Er a) - failure = fromXML - -instance Show (ResumableSource AWS ByteString) where - show _ = "ResumableSource AWS ByteString" - -class Pg a where - next :: a -> Rs a -> Maybe a - -data AWSError = Err String | Ex SomeException | Ers [AWSError] - deriving (Show, Typeable) - -instance Exception AWSError - -instance Monoid AWSError where - mempty = Ers [] - mappend (Ers a) (Ers b) = Ers $ a ++ b - mappend (Ers a) b = Ers $ a ++ [b] - mappend a (Ers b) = Ers $ a : b - mappend a b = Ers [a, b] - -instance Error AWSError where - strMsg = Err - -instance IsString AWSError where - fromString = Err - -instance NFData AWSError - -class ToError a where - toError :: a -> AWSError - -instance ToError AWSError where - toError = id - -instance ToError String where - toError = Err - -instance ToError ByteString where - toError = Err . BS.unpack - -instance ToError Text where - toError = Err . Text.unpack - -instance ToError SomeException where - toError = Ex - -data Auth = Auth - { authAccessKeyId :: !Text - , authSecretAccessKey :: !Text - , authSecurityToken :: Maybe Text - , expiration :: Maybe UTCTime - } - -accessKeyId :: Auth -> ByteString -accessKeyId = Text.encodeUtf8 . authAccessKeyId - -secretAccessKey :: Auth -> ByteString -secretAccessKey = Text.encodeUtf8 . authSecretAccessKey - -securityToken :: Auth -> Maybe ByteString -securityToken = fmap Text.encodeUtf8 . authSecurityToken - -instance FromJSON Auth where - parseJSON (Object o) = Auth - <$> o .: "AccessKeyId" - <*> o .: "SecretAccessKey" - <*> o .:? "Token" - <*> o .:? "Expiration" - parseJSON _ = mzero - -data Env = Env - { awsRegion :: !Region - , awsDebug :: !Bool - , awsManager :: !Manager - , awsAuth :: !(IORef Auth) - , awsResource :: !InternalState - } - -newtype AWS a = AWS - { unwrap :: ReaderT Env (EitherT AWSError IO) a - } deriving - ( Functor - , Applicative - , Alternative - , Monad - , MonadPlus - , MonadIO - , MonadBase IO - , MonadCatch - , MonadMask - , MonadThrow - , MonadReader Env - , MonadError AWSError - ) - -instance MonadResource AWS where - liftResourceT f = AWS $ - fmap awsResource ask >>= liftIO . runInternalState f - {-# INLINE liftResourceT #-} - -instance MonadMask (EitherT AWSError IO) where - mask a = EitherT $ - mask $ \u -> runEitherT (a $ mapEitherT u) - {-# INLINE mask #-} - - uninterruptibleMask a = EitherT $ - uninterruptibleMask $ \u -> runEitherT (a $ mapEitherT u) - {-# INLINE uninterruptibleMask #-} - -getEnv :: AWS Env -getEnv = AWS ask - -getAuth :: AWS Auth -getAuth = fmap awsAuth getEnv >>= liftIO . readIORef - -getManager :: AWS Manager -getManager = awsManager <$> getEnv - -getRegion :: AWS Region -getRegion = awsRegion <$> getEnv - -getDebug :: AWS Bool -getDebug = awsDebug <$> getEnv - -whenDebug :: AWS () -> AWS () -whenDebug f = getDebug >>= \p -> when p f - -type Signer = Raw -> Auth -> Region -> UTCTime -> Request - -data Endpoint - = Global - | Regional - | Custom ByteString - -data Service = Service - { svcEndpoint :: !Endpoint - , svcSigner :: !Signer - , svcName :: !ByteString - , svcVersion :: !ByteString - } - -endpoint :: Service -> Region -> ByteString -endpoint Service{..} reg = - case svcEndpoint of - Custom bs -> bs - Global -> svcName <> ".amazonaws.com" - Regional -> BS.intercalate "." $ - [svcName, BS.pack $ show reg, "amazonaws.com"] - -data Raw = Raw - { rqService :: !Service - , rqMethod :: !StdMethod - , rqPath :: !ByteString - , rqQuery :: [(ByteString, Maybe ByteString)] - , rqHeaders :: [Header] - , rqBody :: !RequestBody - } - -instance Show Raw where - show Raw{..} = unlines - [ "Raw:" - , "rqMethod = " ++ show rqMethod - , "rqPath = " ++ show rqPath - , "rqHeaders = " ++ show rqHeaders - , "rqQuery = " ++ show rqQuery - ] - -data Region - = NorthVirginia - | NorthCalifornia - | Oregon - | Ireland - | Singapore - | Tokyo - | Sydney - | SaoPaulo - deriving (Eq, Ord) - -instance Show Region where - show reg = case reg of - NorthVirginia -> "us-east-1" - NorthCalifornia -> "us-west-1" - Oregon -> "us-west-2" - Ireland -> "eu-west-1" - Singapore -> "ap-southeast-1" - Tokyo -> "ap-northeast-1" - Sydney -> "ap-southeast-2" - SaoPaulo -> "sa-east-1" - -instance Read Region where - readPrec = readAssocList - [ ("us-east-1", NorthVirginia) - , ("us-west-1", NorthCalifornia) - , ("us-west-2", Oregon) - , ("eu-west-1", Ireland) - , ("ap-southeast-1", Singapore) - , ("ap-northeast-1", Tokyo) - , ("ap-southeast-2", Sydney) - , ("sa-east-1", SaoPaulo) - ] - -instance IsQuery Region where - queryPickler = qpPrim - -instance IsXML Region where - xmlPickler = xpContent xpPrim - -defaultRegion :: Region -defaultRegion = NorthVirginia - -region :: Service -> AWS Region -region Service{..} = - case svcEndpoint of - Global -> return defaultRegion - _ -> getRegion - -data AvailabilityZone = AZ - { azRegion :: !Region - , azSuffix :: !Char - } deriving (Eq, Ord) - -instance Show AvailabilityZone where - show (AZ r z) = show r ++ [z] - -instance Read AvailabilityZone where - readsPrec _ [] = [] - readsPrec _ s = [(AZ (read $ init s) (last s), "")] - -instance IsQuery AvailabilityZone where - queryPickler = qpPrim - -instance IsXML AvailabilityZone where - xmlPickler = xpContent xpPrim - -data InstanceType - = T1_Micro - | T2_Micro - | T2_Small - | T2_Medium - | M1_Small - | M1_Medium - | M1_Large - | M1_XLarge - | M3_Medium - | M3_Large - | M3_XLarge - | M3_2XLarge - | C3_Large - | C3_XLarge - | C3_2XLarge - | C3_4XLarge - | C3_8XLarge - | C1_Medium - | C1_XLarge - | CC2_8XLarge - | M2_XLarge - | M2_2XLarge - | M2_4XLarge - | CR1_8XLarge - | HI1_4XLarge - | HS1_8XLarge - | CG1_4XLarge - | G2_2XLarge - | I2_XLarge - | I2_2XLarge - | I2_4XLarge - | I2_8XLarge - | R3_Large - | R3_XLarge - | R3_2XLarge - | R3_4XLarge - | R3_8XLarge - deriving (Eq, Ord, Generic) - -instance Show InstanceType where - show typ = case typ of - T1_Micro -> "t1.micro" - T2_Micro -> "t2.micro" - T2_Small -> "t2.small" - T2_Medium -> "t2.medium" - M1_Small -> "m1.small" - M1_Medium -> "m1.medium" - M1_Large -> "m1.large" - M1_XLarge -> "m1.xlarge" - M3_Medium -> "m3.medium" - M3_Large -> "m3.large" - M3_XLarge -> "m3.xlarge" - M3_2XLarge -> "m3.2xlarge" - C3_Large -> "c3.large" - C3_XLarge -> "c3.xlarge" - C3_2XLarge -> "c3.2xlarge" - C3_4XLarge -> "c3.4xlarge" - C3_8XLarge -> "c3.8xlarge" - C1_Medium -> "c1.medium" - C1_XLarge -> "c1.xlarge" - CC2_8XLarge -> "cc2.8xlarge" - M2_XLarge -> "m2.xlarge" - M2_2XLarge -> "m2.2xlarge" - M2_4XLarge -> "m2.4xlarge" - CR1_8XLarge -> "cr1.8xlarge" - HI1_4XLarge -> "hi1.4xlarge" - HS1_8XLarge -> "hs1.8xlarge" - CG1_4XLarge -> "cg1.4xlarge" - G2_2XLarge -> "g2.2xlarge" - I2_XLarge -> "i2.xlarge" - I2_2XLarge -> "i2.2xlarge" - I2_4XLarge -> "i2.4xlarge" - I2_8XLarge -> "i2.8xlarge" - R3_Large -> "r3.large" - R3_XLarge -> "r3.xlarge" - R3_2XLarge -> "r3.2xlarge" - R3_4XLarge -> "r3.4xlarge" - R3_8XLarge -> "r3.8xlarge" - -instance Read InstanceType where - readPrec = readAssocList - [ ("t1.micro", T1_Micro) - , ("t2.micro", T2_Micro) - , ("t2.small", T2_Small) - , ("t2.medium", T2_Medium) - , ("m1.small", M1_Small) - , ("m1.medium", M1_Medium) - , ("m1.large", M1_Large) - , ("m1.xlarge", M1_XLarge) - , ("m3.medium", M3_Medium) - , ("m3.large", M3_Large) - , ("m3.xlarge", M3_XLarge) - , ("m3.2xlarge", M3_2XLarge) - , ("c3.large", C3_Large) - , ("c3.xlarge", C3_XLarge) - , ("c3.2xlarge", C3_2XLarge) - , ("c3.4xlarge", C3_4XLarge) - , ("c3.8xlarge", C3_8XLarge) - , ("c1.medium", C1_Medium) - , ("c1.xlarge", C1_XLarge) - , ("cc2.8xlarge", CC2_8XLarge) - , ("m2.xlarge", M2_XLarge) - , ("m2.2xlarge", M2_2XLarge) - , ("m2.4xlarge", M2_4XLarge) - , ("cr1.8xlarge", CR1_8XLarge) - , ("hi1.4xlarge", HI1_4XLarge) - , ("hs1.8xlarge", HS1_8XLarge) - , ("cg1.4xlarge", CG1_4XLarge) - , ("g2.2xlarge", G2_2XLarge) - , ("i2.xlarge", I2_XLarge) - , ("i2.2xlarge", I2_2XLarge) - , ("i2.4xlarge", I2_4XLarge) - , ("i2.8xlarge", I2_8XLarge) - , ("r3.large", R3_Large) - , ("r3.xlarge", R3_XLarge) - , ("r3.2xlarge", R3_2XLarge) - , ("r3.4xlarge", R3_4XLarge) - , ("r3.8xlarge", R3_8XLarge) - ] - -instance IsQuery InstanceType where - queryPickler = qpPrim - -instance IsXML InstanceType where - xmlPickler = xpContent xpPrim - -readAssocList :: [(String, a)] -> Read.ReadPrec a -readAssocList xs = Read.choice $ - map (\(x, y) -> Read.lift $ ReadP.string x >> return y) xs - -newtype Items a = Items { items :: [a] } - deriving (Eq, Show, Generic, Functor, Applicative, Foldable, Traversable, Monoid) - -newtype Members a = Members { members :: [a] } - deriving (Eq, Show, Generic, Functor, Applicative, Foldable, Traversable, Monoid) diff --git a/src/Network/AWS/Internal/XML.hs b/src/Network/AWS/Internal/XML.hs deleted file mode 100644 index e396d34401a..00000000000 --- a/src/Network/AWS/Internal/XML.hs +++ /dev/null @@ -1,52 +0,0 @@ -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE Rank2Types #-} - --- Module : Network.AWS.Internal.XML --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Internal.XML - ( - -- * XML Helpers - withNS - , withNS' - , withRootNS - , withRootNS' - , xpTextContent - ) where - -import Data.ByteString (ByteString) -import Data.Text (Text) -import qualified Data.Text.Encoding as Text -import Text.XML.Expat.Pickle.Generic - -withNS :: ByteString -> XMLGeneric a -withNS ns = withNS' ns $ xmlOptions ns - -withNS' :: ByteString -> XMLOptions -> XMLGeneric a -withNS' ns opts = pu { root = (mkNName ns . nnLocalPart) `fmap` root pu } - where - pu = genericXMLPickler opts - -withRootNS :: ByteString -> ByteString -> XMLGeneric a -withRootNS ns name = withRootNS' ns name $ xmlOptions ns - -withRootNS' :: ByteString -> ByteString -> XMLOptions -> XMLGeneric a -withRootNS' ns name opts = (genericXMLPickler opts) - { root = Just $ mkNName ns name - } - -xmlOptions :: ByteString -> XMLOptions -xmlOptions ns = (namespacedXMLOptions ns) - { xmlListElement = mkNName ns "member" - } - -xpTextContent :: XMLPU [Node] Text -xpTextContent = (Text.decodeUtf8, Text.encodeUtf8) `xpWrap` xpContent xpText diff --git a/src/Network/AWS/Route53.hs b/src/Network/AWS/Route53.hs deleted file mode 100644 index 2f15a550f71..00000000000 --- a/src/Network/AWS/Route53.hs +++ /dev/null @@ -1,469 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TypeFamilies #-} - --- Module : Network.AWS.Route53 --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | Route 53 is a web service that enables you to manage your DNS records. -module Network.AWS.Route53 - ( - -- * Actions on Hosted Zones - -- ** POST CreateHostedZone - CreateHostedZone (..) - , CreateHostedZoneResponse (..) - - -- ** GET GetHostedZone - , GetHostedZone (..) - , GetHostedZoneResponse (..) - - -- ** GET ListHostedZones - , ListHostedZones (..) - , ListHostedZonesResponse (..) - - -- ** DELETE DeleteHostedZone - , DeleteHostedZone (..) - , DeleteHostedZoneResponse (..) - - -- * Actions on Record Sets - -- ** POST ChangeResourceRecordSets - , ChangeResourceRecordSets (..) - , ChangeResourceRecordSetsResponse (..) - - -- ** GET ListResourceRecordSets - , ListResourceRecordSets (..) - , ListResourceRecordSetsResponse (..) - - -- ** GET GetChange - , GetChange (..) - , GetChangeResponse (..) - - -- * Actions on Health Checks - -- ** POST CreateHealthCheck - , CreateHealthCheck (..) - , CreateHealthCheckResponse (..) - - -- ** GET GetHealthCheck - , GetHealthCheck (..) - , GetHealthCheckResponse (..) - - -- ** GET ListHealthChecks - , ListHealthChecks (..) - , ListHealthChecksResponse (..) - - -- ** DELETE DeleteHealthCheck - , DeleteHealthCheck (..) - , DeleteHealthCheckResponse (..) - - -- * Data Types - , module Network.AWS.Route53.Types - - -- * Common - , module Network.AWS - ) where - -import Data.ByteString (ByteString) -import Data.Monoid -import Data.String -import Data.Text (Text) -import Network.AWS -import Network.AWS.Internal hiding (query, xml) -import qualified Network.AWS.Internal.Request as Rq -import Network.AWS.Route53.Types -import Network.HTTP.Types.Method - -query :: IsQuery a => StdMethod -> ByteString -> a -> Raw -query m p = Rq.query route53 m (path p) - -xml :: IsXML a => StdMethod -> ByteString -> a -> Raw -xml m p = Rq.xml route53 m (path p) - -path :: ByteString -> ByteString -path = mappend (svcVersion route53) . addPrefix "/" - --- --- Hosted Zones --- - --- | Creates a new hosted zone. --- --- -data CreateHostedZone = CreateHostedZone - { chzName :: !Text - -- ^ The name of the domain. - , chzCallerReference :: !CallerReference - -- ^ A unique string that identifies the request and that allows - -- failed CreateHostedZone requests to be retried without the risk - -- of executing the operation twice. - , chzHostedZoneConfig :: Maybe Config - -- ^ A complex type that contains an optional comment about your hosted zone. - } deriving (Eq, Show, Generic) - -instance IsXML CreateHostedZone where - xmlPickler = withRootNS route53NS "CreateHostedZoneRequest" - -instance Rq CreateHostedZone where - type Er CreateHostedZone = ErrorResponse - type Rs CreateHostedZone = CreateHostedZoneResponse - request = xml POST "hostedzone" - -data CreateHostedZoneResponse = CreateHostedZoneResponse - { chzrHostedZone :: !HostedZone - -- ^ Information about the hosted zone. - , chzrChangeInfo :: !ChangeInfo - -- ^ Information about the changes being made to the hosted zone. - , chzrDelegationSet :: !DelegationSet - -- ^ The name servers for this hosted zone. - } deriving (Eq, Show, Generic) - -instance IsXML CreateHostedZoneResponse where - xmlPickler = withNS route53NS - --- | Gets information about a specified hosted zone. --- --- -newtype GetHostedZone = GetHostedZone - { ghzId :: HostedZoneId - -- ^ Hosted Zone Id. - } deriving (Eq, Show, IsString) - -instance Rq GetHostedZone where - type Er GetHostedZone = ErrorResponse - type Rs GetHostedZone = GetHostedZoneResponse - request chk = query GET (prefixed $ ghzId chk) () - -data GetHostedZoneResponse = GetHostedZoneResponse - { ghzrHostedZone :: !HostedZone - -- ^ Information about the hosted zone. - , ghzrDelegationSet :: !DelegationSet - -- ^ The name servers for this hosted zone. - } deriving (Eq, Show, Generic) - -instance IsXML GetHostedZoneResponse where - xmlPickler = withNS route53NS - --- | Gets a list of the hosted zones that are associated with the --- current AWS account. --- --- -data ListHostedZones = ListHostedZones - { lhzMarker :: Maybe Text - -- ^ To get the next group of maxitems hosted zones, submit another request - -- with the value of the NextMarker element that was returned in the - -- previous response. - , lhzMaxItems :: Maybe Integer - -- ^ Maximum number of hosted zones to include in the response. - } deriving (Eq, Show, Generic) - -instance IsQuery ListHostedZones where - queryPickler = genericQueryPickler loweredQueryOptions - -instance Rq ListHostedZones where - type Er ListHostedZones = ErrorResponse - type Rs ListHostedZones = ListHostedZonesResponse - request = query GET "hostedzone" - -instance Pg ListHostedZones where - next lhz ListHostedZonesResponse{..} - | not lhzrIsTruncated = Nothing - | otherwise = Just $ lhz { lhzMarker = lhzrNextMarker } - -data ListHostedZonesResponse = ListHostedZonesResponse - { lhzrHostedZones :: [HostedZone] - -- ^ A list of hosted zone descriptions. - , lhzrIsTruncated :: !Bool - -- ^ Whether the result list has been truncated. - , lhzrMarker :: Maybe Text - -- ^ Value of the marker in the previous request. - , lhzrNextMarker :: Maybe Text - -- ^ If IsTruncated is true, the hosted zone ID of the first hosted zone - -- in the next group of maxitems hosted zones. - , lhzrMaxItems :: !Integer - -- ^ Value of maxitems in the previous request. - } deriving (Eq, Show, Generic) - -instance IsXML ListHostedZonesResponse where - xmlPickler = withNS route53NS - --- | Deletes a hosted zone. --- --- -newtype DeleteHostedZone = DeleteHostedZone - { dhzId :: HostedZoneId - -- ^ Hosted Zone Id. - } deriving (Eq, Show, IsString) - -instance Rq DeleteHostedZone where - type Er DeleteHostedZone = ErrorResponse - type Rs DeleteHostedZone = DeleteHostedZoneResponse - request chk = query DELETE (prefixed $ dhzId chk) () - -data DeleteHostedZoneResponse = DeleteHostedZoneResponse - { dhzrChangeInfo :: !ChangeInfo - -- ^ Information about the changes being made to the hosted zone. - } deriving (Eq, Show, Generic) - -instance IsXML DeleteHostedZoneResponse where - xmlPickler = withNS route53NS - --- --- Record Sets --- - --- | Adds, deletes, and changes resource record sets in a Route 53 hosted zone. --- --- -data ChangeResourceRecordSets = ChangeResourceRecordSets - { crrsZoneId :: !HostedZoneId - -- ^ Hosted Zone Id. - , crrsChangeBatch :: !ChangeBatch - -- ^ ChangeBatch describing the record set modifications you wish to perform. - } deriving (Eq, Show, Generic) - -instance IsXML ChangeResourceRecordSets where - xmlPickler = (xpWrap - (ChangeResourceRecordSets "", \(ChangeResourceRecordSets _ cs) -> cs) - (xpElem (route53Elem "ChangeBatch") $ genericXMLPickler defaultXMLOptions)) - { root = Just $ mkNName route53NS "ChangeResourceRecordSetsRequest" - } - -instance Rq ChangeResourceRecordSets where - type Er ChangeResourceRecordSets = ErrorResponse - type Rs ChangeResourceRecordSets = ChangeResourceRecordSetsResponse - request rq = xml POST (prefixed (crrsZoneId rq) <> "/rrset") rq - -data ChangeResourceRecordSetsResponse = ChangeResourceRecordSetsResponse - { crrsrChangeInfo :: !ChangeInfo - } deriving (Eq, Show, Generic) - -instance IsXML ChangeResourceRecordSetsResponse where - xmlPickler = withNS route53NS - --- | Lists details about all of the resource record sets in a hosted zone. --- --- -data ListResourceRecordSets = ListResourceRecordSets - { lrrsZoneId :: !HostedZoneId - -- ^ The ID of the hosted zone containing the resource - -- records sets to be retrieved. - , lrrsName :: Maybe Text - -- ^ The first name in the lexicographic ordering of domain names - -- to be retrieved in the response to the ListResourceRecordSets request. - , lrrsType :: Maybe RecordType - -- ^ The type of resource record set to begin the record listing from. - , lrrsIdentifier :: Maybe Text - -- ^ Weighted and latency resource record sets only: If results were - -- truncated for a given DNS name and type, the value of SetIdentifier - -- for the next resource record set that has the current DNS name and type. - , lrrsMaxItems :: Maybe Integer - -- ^ The maximum number of resource records sets to include in the - -- response xml for this request. If the response includes more than - -- maxitems resource record sets, the value of the IsTruncated element - -- in the response is true, and the values of the NextRecordName and - -- NextRecordType elements in the response identify the first resource - -- record set in the next group of maxitems resource record sets. - } deriving (Eq, Show, Generic) - -instance IsQuery ListResourceRecordSets where - queryPickler = genericQueryPickler loweredQueryOptions - -instance Rq ListResourceRecordSets where - type Er ListResourceRecordSets = ErrorResponse - type Rs ListResourceRecordSets = ListResourceRecordSetsResponse - request rq = query GET (prefixed (lrrsZoneId rq) <> "/rrset") rq - -instance Pg ListResourceRecordSets where - next rq ListResourceRecordSetsResponse{..} - | not lrrsrIsTruncated = Nothing - | otherwise = Just $ ListResourceRecordSets - (lrrsZoneId rq) - lrrsrNextRecordName - lrrsrNextRecordType - lrrsrNextRecordIdentifier - (Just lrrsrMaxItems) - -data ListResourceRecordSetsResponse = ListResourceRecordSetsResponse - { lrrsrResourceRecordSets :: [ResourceRecordSet] - -- ^ A list of resource record sets. - , lrrsrIsTruncated :: !Bool - -- ^ Whether the result list has been truncated. - , lrrsrMaxItems :: !Integer - -- ^ Value of maxitems in the previous request. - , lrrsrNextRecordName :: Maybe Text - -- ^ If IsTruncated is true, the DNS domain name of the first resource - -- record set in the next group of maxitems resource record sets. - , lrrsrNextRecordType :: Maybe RecordType - -- ^ If IsTruncated is true, the DNS record type of the first resource - -- record set in the next group of maxitems resource record sets. - , lrrsrNextRecordIdentifier :: Maybe Text - -- ^ If IsTruncated is true and results were truncated for a weighted, - -- latency, or failover resource record set, the value of SetIdentifier - -- for the first resource record set in the next group of maxitems resource - -- record sets. - } deriving (Eq, Show, Generic) - -instance IsXML ListResourceRecordSetsResponse where - xmlPickler = withNS route53NS - --- | Returns the current status of a change batch request that you --- submitted by using ChangeResourceRecordSets. --- --- -newtype GetChange = GetChange - { gcId :: ChangeId - -- ^ The ID of the change batch request. The value that you specify here - -- is the value that POST ChangeResourceRecordSets returned in the Id - -- element when you submitted the request. - } deriving (Eq, Show, IsString) - -instance Rq GetChange where - type Er GetChange = ErrorResponse - type Rs GetChange = GetChangeResponse - request chk = query GET (prefixed $ gcId chk) () - -data GetChangeResponse = GetChangeResponse - { gcrChangeInfo :: !ChangeInfo - -- ^ A description of the changes being made to the hosted zone. - } deriving (Eq, Show, Generic) - -instance IsXML GetChangeResponse where - xmlPickler = withNS route53NS - --- --- Health Checks --- - --- | Creates a new health check. --- --- -data CreateHealthCheck = CreateHealthCheck - { chcCallerReference :: !CallerReference - -- ^ A unique string that identifies the request and that allows failed - -- CreateHealthCheck requests to be retried without the risk of executing - -- the operation twice. You must use a unique CallerReference string every - -- time you create a health check. - , chcHealthCheckConfig :: !HealthCheckConfig - -- ^ Health check configuration. - } deriving (Eq, Show, Generic) - -instance IsXML CreateHealthCheck where - xmlPickler = withRootNS route53NS "CreateHealthCheckRequest" - -instance Rq CreateHealthCheck where - type Er CreateHealthCheck = ErrorResponse - type Rs CreateHealthCheck = CreateHealthCheckResponse - request = xml POST "healthcheck" - -data CreateHealthCheckResponse = CreateHealthCheckResponse - { chcrHealthCheck :: !HealthCheck - -- ^ Information about the created health check. - } deriving (Eq, Show, Generic) - -instance IsXML CreateHealthCheckResponse where - xmlPickler = withNS route53NS - --- | Gets information about a specified health check. --- --- -newtype GetHealthCheck = GetHealthCheck - { ghcId :: HealthCheckId - -- ^ The ID for the health check for which you want detailed information. - -- When you created the health check, CreateHealthCheck returned the ID - -- in the response, in the HealthCheckId element. - } deriving (Eq, Show, IsString) - -instance Rq GetHealthCheck where - type Er GetHealthCheck = ErrorResponse - type Rs GetHealthCheck = GetHealthCheckResponse - request chk = query GET (prefixed $ ghcId chk) () - -data GetHealthCheckResponse = GetHealthCheckResponse - { ghcrHealthCheck :: !HealthCheck - -- ^ Information about a health check. - } deriving (Eq, Show, Generic) - -instance IsXML GetHealthCheckResponse where - xmlPickler = withNS route53NS - --- | Gets a list of the health checks that are associated --- with the current AWS account. --- --- -data ListHealthChecks = ListHealthChecks - { lhcMarker :: Maybe Text - -- ^ If the response to a ListHealthChecks is more than one page, - -- marker is the health check ID for the first health check on the - -- next page of results. - , lhcMaxItems :: Maybe Integer - -- ^ The maximum number of HealthCheck elements you want ListHealthChecks - -- to return on each page of the response body. If the AWS account includes - -- more HealthCheck elements than the value of maxitems, the response is - -- broken into pages. Each page contains the number of HealthCheck elements - -- specified by maxitems. - } deriving (Eq, Show, Generic) - -instance IsQuery ListHealthChecks where - queryPickler = genericQueryPickler loweredQueryOptions - -instance Rq ListHealthChecks where - type Er ListHealthChecks = ErrorResponse - type Rs ListHealthChecks = ListHealthChecksResponse - request = query GET "healthcheck" - -instance Pg ListHealthChecks where - next _ ListHealthChecksResponse{..} - | not lhcrIsTruncated = Nothing - | otherwise = Just $ ListHealthChecks lhcrNextMarker (Just lhcrMaxItems) - -data ListHealthChecksResponse = ListHealthChecksResponse - { lhcrHealthChecks :: [HealthCheck] - -- ^ A list of health check descriptions. - , lhcrIsTruncated :: !Bool - -- ^ Whether the result list has been truncated. - , lhcrMarker :: Maybe Text - -- ^ Value of the marker in the previous request. - , lhcrNextMarker :: Maybe Text - -- ^ If IsTruncated is true, the hosted zone ID of the first hosted zone - -- in the next group of maxitems hosted zones. - , lhcrMaxItems :: !Integer - -- ^ Value of maxitems in the previous request. - } deriving (Eq, Show, Generic) - -instance IsXML ListHealthChecksResponse where - xmlPickler = withNS route53NS - --- | Deletes a health check. --- --- Caution: Route 53 does not prevent you from deleting a health check even if --- the health check is associated with one or more resource record sets. --- If you delete a health check and you don't update the associated resource --- record sets, the future status of the health check cannot be predicted and --- may change. This will affect the routing of DNS queries for your DNS failover --- configuration. --- --- -newtype DeleteHealthCheck = DeleteHealthCheck - { dhcId :: HealthCheckId - -- ^ Health Check Id. - } deriving (Eq, Show, IsString) - -instance Rq DeleteHealthCheck where - type Er DeleteHealthCheck = ErrorResponse - type Rs DeleteHealthCheck = DeleteHealthCheckResponse - request chk = query DELETE (prefixed $ dhcId chk) () - -data DeleteHealthCheckResponse = DeleteHealthCheckResponse - deriving (Eq, Read, Show, Generic) - -instance IsXML DeleteHealthCheckResponse where - xmlPickler = xpConst route53NS DeleteHealthCheckResponse diff --git a/src/Network/AWS/Route53/Types.hs b/src/Network/AWS/Route53/Types.hs deleted file mode 100644 index 3096e9d3d0b..00000000000 --- a/src/Network/AWS/Route53/Types.hs +++ /dev/null @@ -1,367 +0,0 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE OverloadedStrings #-} - --- Module : Network.AWS.Route53.Types --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.Route53.Types where - -import Control.Applicative ((<$>)) -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import Data.Monoid -import Data.String -import Data.Text (Text) -import Data.Text.Encoding -import Data.Time -import Network.AWS.Internal -import Text.Read - --- | Currently supported version of the Route53 service. -route53 :: Service -route53 = Service Global version3 "route53" "2012-12-12" - --- | XML namespace to annotate Route53 elements with. -route53NS :: ByteString -route53NS = "https://route53.amazonaws.com/doc/" <> svcVersion route53 <> "/" - --- | Helper to define Route53 namespaced XML elements. -route53Elem :: ByteString -> NName ByteString -route53Elem = mkNName route53NS - -class Prefixed a where - prefixed :: a -> ByteString - -data ErrorType = ErrorType - { etType :: !Text - , etCode :: !Text - , etMessage :: !Text - } deriving (Eq, Ord, Show, Generic) - -instance IsXML ErrorType where - xmlPickler = withNS route53NS - -data ErrorResponse - = ErrorResponse - { erError :: !ErrorType - , erRequestId :: !Text - } - | InvalidChangeBatch - { erMessages :: [Text] - } - deriving (Eq, Ord, Show, Generic) - -instance ToError ErrorResponse where - toError = Err . show - -instance IsXML ErrorResponse where - xmlPickler = withNS route53NS - --- instance IsXML ResourceRecordSet where --- xmlPickler = genericXMLPickler $ (namespacedXMLOptions route53NS) --- { xmlCtorModifier = const $ route53Elem "ResourceRecordSet" --- } - --- --- --- Sender --- InvalidChangeBatch --- --- Tried to create an alias that targets asd., type CNAME in zone ZORL6RE8A5Z9D, but the alias target name does not lie within the target zone --- --- 8e36cb8f-1566-11e3-96d1-856ead110654 --- - --- --- --- --- Tried to create resource record set duplicate.example.com. type A, --- but it already exists --- --- --- - -newtype CallerReference = CallerReference { unCallerReference :: Text } - deriving (Eq, Ord, Show, Generic) - -instance IsXML CallerReference where - xmlPickler = (CallerReference, unCallerReference) `xpWrap` xpTextContent - -callerRef :: IO CallerReference -callerRef = CallerReference . decodeUtf8 . formatAWS <$> getCurrentTime - -data Protocol = HTTP | TCP - deriving (Eq, Ord, Read, Show, Generic) - -instance IsXML Protocol where - xmlPickler = xpContent xpPrim - -data RecordType = A | AAAA | CNAME | MX | NS | PTR | SOA | SPF | SRV | TXT - deriving (Eq, Ord, Read, Show, Generic) - -instance IsXML RecordType where - xmlPickler = xpContent xpPrim - -instance IsQuery RecordType - -data Config = Config - { cComment :: Maybe Text - } deriving (Eq, Ord, Show, Generic) - -instance IsXML Config where - xmlPickler = withNS route53NS - -newtype HostedZoneId = HostedZoneId ByteString - deriving (Eq, Ord, IsString, IsByteString) - -hostedZoneId :: IsByteString a => a -> HostedZoneId -hostedZoneId = HostedZoneId . stripPrefix "/hostedzone/" . toBS - -unHostedZoneId :: HostedZoneId -> Text -unHostedZoneId (HostedZoneId bs) = decodeUtf8 $ stripPrefix "/hostedzone/" bs - -instance Show HostedZoneId where - show = BS.unpack . prefixed - -instance Prefixed HostedZoneId where - prefixed = addPrefix "/hostedzone/" - -instance IsXML HostedZoneId where - xmlPickler = (hostedZoneId, unHostedZoneId) `xpWrap` xmlPickler - -instance IsQuery HostedZoneId where - queryPickler = (hostedZoneId, unHostedZoneId) `qpWrap` queryPickler - -data HostedZone = HostedZone - { hzId :: !HostedZoneId - -- ^ The ID of the hosted zone. - , hzName :: !Text - -- ^ The name of the domain. For resource record types that include a - -- domain name, specify a fully qualified domain name, for example, - -- www.example.com. The trailing dot is optional; Route 53 assumes - -- that the domain name is fully qualified. This means that Route 53 - -- treats www.example.com (without a trailing dot) and - -- www.example.com. (with a trailing dot) as identical. - , hzCallerReference :: !CallerReference - -- ^ A unique string that identifies the request to create the hosted - -- zone. - , hzConfig :: !Config - -- ^ A complex type that contains an optional comment about your - -- hosted zone. - , hzResourceRecordSetCount :: !Integer - -- ^ The number of resource record sets in the hosted zone. - } deriving (Eq, Ord, Show, Generic) - -instance IsXML HostedZone where - xmlPickler = withNS route53NS - -newtype DelegationSet = DelegationSet { dsNameServers :: [Text] } - deriving (Eq, Ord, Show, Generic) - -instance IsXML DelegationSet where - xmlPickler = xpWrap (DelegationSet, dsNameServers) - (xpElem (route53Elem "NameServers") - $ xpElemList (route53Elem "NameServer") xmlPickler) - -newtype ChangeId = ChangeId { unChangeId :: Text } - deriving (Eq, Ord, IsString, IsByteString) - -instance Show ChangeId where - show = BS.unpack . prefixed - -instance Prefixed ChangeId where - prefixed = addPrefix "/change/" - -instance IsXML ChangeId where - xmlPickler = (ChangeId, unChangeId) `xpWrap` xmlPickler - -data ChangeStatus = PENDING | INSYNC - deriving (Eq, Ord, Read, Show, Generic) - -instance IsXML ChangeStatus where - xmlPickler = xpContent xpPrim - -data ChangeInfo = ChangeInfo - { ciId :: !ChangeId - , ciStatus :: !ChangeStatus - , ciSubmittedAt :: !UTCTime - } deriving (Eq, Ord, Show, Generic) - -instance IsXML ChangeInfo where - xmlPickler = withNS route53NS - -data ChangeAction = CreateAction | DeleteAction - deriving (Eq, Ord) - -instance Show ChangeAction where - show CreateAction = "CREATE" - show DeleteAction = "DELETE" - -instance Read ChangeAction where - readPrec = readAssocList - [ ("CREATE", CreateAction) - , ("DELETE", DeleteAction) - ] - -instance IsXML ChangeAction where - xmlPickler = xpContent xpPrim - -data Change = Change - { cAction :: !ChangeAction - , cResourceRecordSet :: !ResourceRecordSet - } deriving (Eq, Ord, Show, Generic) - -instance IsXML Change where - xmlPickler = withNS route53NS - -data ChangeBatch = ChangeBatch - { cbComment :: Maybe Text - , cbChanges :: [Change] - } deriving (Eq, Ord, Show, Generic) - -instance IsXML ChangeBatch where - xmlPickler = withNS route53NS - -newtype ResourceRecords = ResourceRecords { rrValues :: [Text] } - deriving (Eq, Ord, Show, Generic) - -instance IsXML ResourceRecords where - xmlPickler = xpWrap (ResourceRecords, rrValues) - (xpElemList (route53Elem "ResourceRecord") - $ xpElem (route53Elem "Value") xmlPickler) - -data AliasTarget = AliasTarget - { atHostedZoneId :: !HostedZoneId - , atDNSName :: !Text - , atEvaluateTargetHealth :: !Bool - } deriving (Eq, Ord, Show, Generic) - -instance IsXML AliasTarget where - xmlPickler = withNS route53NS - -data Failover = PRIMARY | SECONDARY - deriving (Eq, Ord, Read, Show, Generic) - -instance IsXML Failover where - xmlPickler = xpContent xpPrim - -data ResourceRecordSet - = FailoverRecordSet - { rrsName :: !Text - , rrsType :: !RecordType - , rrsSetIdentifier :: !Text - , rrsFailover :: !Failover - , rrsTTL :: !Integer - , rrsResourceRecords :: !ResourceRecords - , rrsHealthCheckId :: Maybe HealthCheckId - } - - | FailoverAliasRecordSet - { rrsName :: !Text - , rrsType :: !RecordType - , rrsSetIdentifier :: !Text - , rrsFailover :: !Failover - , rrsAliasTarget :: !AliasTarget - , rrsHealthCheckId :: Maybe HealthCheckId - } - - | LatencyRecordSet - { rrsName :: !Text - , rrsType :: !RecordType - , rrsSetIdentifier :: !Text - , rrsRegion :: !Region - , rrsTTL :: !Integer - , rrsResourceRecords :: !ResourceRecords - , rrsHealthCheckId :: Maybe HealthCheckId - } - - | LatencyAliasRecordSet - { rrsName :: !Text - , rrsType :: !RecordType - , rrsSetIdentifier :: !Text - , rrsRegion :: !Region - , rrsAliasTarget :: !AliasTarget - , rrsHealthCheckId :: Maybe HealthCheckId - } - - | WeightedRecordSet - { rrsName :: !Text - , rrsType :: !RecordType - , rrsSetIdentifier :: !Text - , rrsWeight :: !Integer - , rrsTTL :: !Integer - , rrsResourceRecords :: !ResourceRecords - , rrsHealthCheckId :: Maybe HealthCheckId - } - - | WeightedAliasRecordSet - { rrsName :: !Text - , rrsType :: !RecordType - , rrsSetIdentifier :: !Text - , rrsWeight :: !Integer - , rrsAliasTarget :: !AliasTarget - , rrsHealthCheckId :: Maybe HealthCheckId - } - - | BasicRecordSet - { rrsName :: !Text - , rrsType :: !RecordType - , rrsTTL :: !Integer - , rrsResourceRecords :: !ResourceRecords - , rrsHealthCheckId :: Maybe HealthCheckId - } - - | AliasRecordSet - { rrsName :: !Text - , rrsType :: !RecordType - , rrsAliasTarget :: !AliasTarget - , rrsHealthCheckId :: Maybe HealthCheckId - } - - deriving (Eq, Ord, Show, Generic) - -instance IsXML ResourceRecordSet where - xmlPickler = genericXMLPickler $ (namespacedXMLOptions route53NS) - { xmlCtorModifier = const $ route53Elem "ResourceRecordSet" - } - -data HealthCheckConfig = HealthCheckConfig - { hccIPAddress :: !Text - , hccPort :: !Int - , hccType :: !Protocol - , hccResourcePath :: !Text - , hccFullyQualifiedDomainName :: !Text - } deriving (Eq, Ord, Show, Generic) - -instance IsXML HealthCheckConfig where - xmlPickler = withNS route53NS - -newtype HealthCheckId = HealthCheckId { unHealthCheckId :: Text } - deriving (Eq, Ord, IsString, IsByteString) - -instance Show HealthCheckId where - show = BS.unpack . prefixed - -instance Prefixed HealthCheckId where - prefixed = addPrefix "/healthcheck/" - -instance IsXML HealthCheckId where - xmlPickler = (HealthCheckId, unHealthCheckId) `xpWrap` xmlPickler - -data HealthCheck = HealthCheck - { hcId :: !HealthCheckId - , hcCallerReference :: !CallerReference - , hcHealthCheckConfig :: !HealthCheckConfig - } deriving (Eq, Ord, Show, Generic) - -instance IsXML HealthCheck where - xmlPickler = withNS route53NS diff --git a/src/Network/AWS/S3.hs b/src/Network/AWS/S3.hs deleted file mode 100644 index c21e8d3dc87..00000000000 --- a/src/Network/AWS/S3.hs +++ /dev/null @@ -1,947 +0,0 @@ -{-# LANGUAGE GADTs #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE StandaloneDeriving #-} -{-# LANGUAGE TypeFamilies #-} - --- Module : Network.AWS.S3 --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - --- | Amazon Simple Storage Service (Amazon S3) is a web service that enables you --- to store data in the cloud. --- --- You can then download the data or use the data with other AWS services, --- such as Amazon Elastic Compute Cloud (Amazon EC2). -module Network.AWS.S3 - ( - -- * Operations on the Service - -- ** GET Service - -- GetService (..) - -- , GetServiceResponse (..) - - -- * Operations on Buckets - -- ** GET Bucket - GetBucket (..) - , GetBucketResponse (..) - - -- ** GET Bucket?versions - , GetBucketVersions (..) - , GetBucketVersionsResponse (..) - - -- * Operations on Objects - -- ** DELETE Object - , DeleteObject (..) - , DeleteObjectResponse - - -- -- ** POST Delete Multiple Objects - -- , DeleteMultipleObjects (..) - -- , DeleteMultipleObjectsResponse (..) - - -- ** GET Object - , GetObject (..) - , GetVersion (..) - , GetObjectResponse - - -- -- ** GET Object ACL - -- , GetObjectACL (..) - -- , GetObjectACLResponse (..) - - -- -- ** GET Object Torrent - -- , GetObjectTorrent (..) - -- , GetObjectTorrentResponse - - -- ** HEAD Object - , HeadObject (..) - , HeadObjectResponse - - -- -- ** OPTIONS Object - -- , OptionsObject (..) - -- , OptionsObjectResponse - - -- -- ** POST Object Restore - -- , PostObjectRestore (..) - -- , PostObjectRestoreResponse - - -- ** PUT Object - , PutObject (..) - , PutObjectResponse - - -- -- ** PUT Object ACL - -- , PutObjectACL (..) - -- , PutObjectACLResponse - - -- ** PUT Object Copy - , PutObjectCopy (..) - , PutObjectCopyResponse - - -- -- ** POST Initiate Multipart Upload - -- , InitiateMultipartUpload (..) - -- , InitiateMultipartUploadResponse - - -- -- ** PUT Upload Part - -- , UploadPart (..) - - -- -- ** PUT Upload Part Copy - -- , UploadPartCopy (..) - - -- -- ** POST Complete Multipart Upload - -- , CompleteMultipartUpload (..) - - -- -- ** DELETE Abort Multipart Upload - -- , AbortMultipartUpload (..) - - -- -- ** GET List Parts - -- , ListParts (..) - - -- * Data Types - , module Network.AWS.S3.Types - - -- * Common - , module Network.AWS - ) where - -import Control.Arrow -import Control.Monad.IO.Class -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import qualified Data.ByteString.Lazy.Char8 as LBS -import Data.Conduit -import qualified Data.Conduit.Binary as Conduit -import Data.Monoid -import Data.Text (Text) -import qualified Data.Text as Text -import qualified Data.Text.Encoding as Text -import Network.AWS -import Network.AWS.Internal hiding (xml, query) -import Network.AWS.S3.Types -import Network.HTTP.Conduit -import Network.HTTP.Types.Header -import Network.HTTP.Types.Method -import Network.HTTP.Types.Status - -type S3Response = Response (ResumableSource AWS ByteString) - -object :: StdMethod -> Text -> Text -> [Header] -> RequestBody -> Raw -object m b p hs = Raw s m (Text.encodeUtf8 p) [] hs - where - s = (s3 n) { svcEndpoint = Custom $ n <> ".s3.amazonaws.com" } - n = Text.encodeUtf8 b - -query :: IsQuery a => StdMethod -> Text -> Text -> a -> Raw -query m b p x = object m b p [] mempty .?. map (second Just) (toQuery x) - -xml :: IsXML a => StdMethod -> Text -> Text -> a -> Raw -xml m b p = object m b p [] . RequestBodyBS . toXML - -s3Response :: a - -> S3Response - -> AWS (Either AWSError (Either S3ErrorResponse S3Response)) -s3Response _ rs - | code >= 200 && code < 400 = return . Right $ Right rs - | otherwise = do - lbs <- responseBody rs $$+- Conduit.sinkLbs - if LBS.null lbs - then return . Right . Left $ - S3ErrorResponse (Text.pack $ show rs) "" "Empty Response" - else do - whenDebug . liftIO $ LBS.putStrLn $ "[ResponseBody]\n" <> lbs - return . either Left (Right . Left) . parse $ LBS.toStrict lbs - where - parse :: ByteString -> Either AWSError S3ErrorResponse - parse = fmapL toError . fromXML - - -- plain = Right rs - -- badRequest = Left $ S3ErrorResponse "Bad Request." (Just 400) - -- forbidden = Left $ S3ErrorResponse "Forbidden." (Just 403) - -- notFound = Left $ S3ErrorResponse "Not Found." (Just 404) - - code = statusCode (responseStatus rs) - --- --- Service --- - --- -- | Returns a list of all buckets owned by the requester. --- -- --- -- --- data GetService = GetService deriving (Eq, Show) - --- instance Rq GetService where --- type Er GetService = S3ErrorResponse --- type Rs GetService = GetServiceResponse --- request _ = empty GET "/" - --- data GetServiceResponse = GetServiceResponse --- { gsrOwner :: !Owner --- -- ^ Information about the bucket owner. --- , gsrBuckets :: [Bucket] --- -- ^ A list of buckets for the service. --- } deriving (Eq, Show, Generic) - --- instance IsXML GetServiceResponse where --- xmlPickler = withRootNS s3NS "ListAllMyBucketsResult" - --- --- Buckets --- - --- | This implementation of the GET operation returns some or all (up to 1000) of --- the objects in a bucket. You can use the request parameters as selection --- criteria to return a subset of the objects in a bucket. --- --- To use this implementation of the operation, you must have READ access --- to the bucket. --- --- -data GetBucket = GetBucket - { gbBucket :: !Text - -- ^ Target bucket. - , gbDelimiter :: !Delimiter - -- ^ A delimiter is a character you use to group keys. - -- All keys that contain the same string between the prefix, - -- if specified, and the first occurrence of the delimiter after - -- the prefix are grouped under a single result element, CommonPrefixes. - , gbPrefix :: Maybe Text - -- ^ Limits the response to keys that begin with the specified prefix. - -- You can use prefixes to separate a bucket into different groupings of keys. - -- (You can think of using prefix to make groups in the same way you'd - -- use a folder in a file system.) - , gbMaxKeys :: !Int - -- ^ Sets the maximum number of keys returned in the response body. - -- The response might contain fewer keys but will never contain more. - -- Use pagination to access additional matching keys. - , gbMarker :: Maybe Text - -- ^ Specifies the key to start with when listing objects in a bucket. - -- Amazon S3 lists objects in alphabetical order. - } deriving (Eq, Show, Generic) - -instance IsQuery GetBucket where - queryPickler = genericQueryPickler $ defaultQueryOptions - { queryFieldModifier = hyphenate - } - -instance Rq GetBucket where - type Er GetBucket = S3ErrorResponse - type Rs GetBucket = GetBucketResponse - request gb@GetBucket{..} = query GET gbBucket "/" gb - -instance Pg GetBucket where - next gb@GetBucket{..} GetBucketResponse{..} - | not gbrIsTruncated = Nothing - | isJust gbrNextMarker = Just $ gb { gbMarker = gbrNextMarker } - | null gbrContents = Nothing - | otherwise = Just $ gb { gbMarker = Just $ bcKey (last gbrContents) } - --- FIXME: consider the interaction between the nested list item pickler's root --- and the parent using xpElemList vs xpList via generics/default -data GetBucketResponse = GetBucketResponse - { gbrName :: !Text - , gbrPrefix :: Maybe Text - , gbrMarker :: Maybe Text - , gbrNextMarker :: Maybe Text - -- ^ When response is truncated (the IsTruncated element value in the - -- response is true), you can use the key name in this field as marker in the - -- subsequent request to get next set of objects. Amazon S3 lists objects in - -- alphabetical order. This element is returned only if you have delimiter - -- request parameter specified. If response does not include the NextMaker and it - -- is truncated, you can use the value of the last Key in the response as the - -- marker in the subsequent request to get the next set of object keys. - , gbrMaxKeys :: !Int - , gbrIsTruncated :: !Bool - , gbrContents :: [Contents] - } deriving (Eq, Show, Generic) - -instance IsXML GetBucketResponse where - xmlPickler = pu { root = Just $ mkNName s3NS "ListBucketResult" } - where - pu = xpWrap (\(n, p, m, nm, k, t, c) -> GetBucketResponse n p m nm k t c, - \GetBucketResponse{..} -> (gbrName, gbrPrefix, gbrMarker, gbrNextMarker, gbrMaxKeys, gbrIsTruncated, gbrContents)) $ - xp7Tuple (e "Name") - (xpOption $ e "Prefix") - (xpOption $ e "Marker") - (xpOption $ e "NextMarker") - (e "MaxKeys") - (e "IsTruncated") - (xpFindMatches $ xpElem (mkNName s3NS "Contents") xmlPickler) - - e n = xpElem (mkNName s3NS n) xmlPickler - -newtype GetBucketVersions = GetBucketVersions GetBucket - deriving (Eq, Show) - -instance Rq GetBucketVersions where - type Er GetBucketVersions = S3ErrorResponse - type Rs GetBucketVersions = GetBucketVersionsResponse - request (GetBucketVersions gb) = request gb .?. [("versions", Nothing)] - -data GetBucketVersionsResponse = GetBucketVersionsResponse - { gbvrName :: !Text - , gbvrPrefix :: Maybe Text - , gbvrKeyMarker :: Maybe Text - , gbvrNextKeyMarker :: Maybe Text - , gbvrMaxKeys :: !Int - , gbvrIsTruncated :: !Bool - , gbvrVersions :: [Version] - } deriving (Eq, Show, Generic) - -instance IsXML GetBucketVersionsResponse where - xmlPickler = pu { root = Just $ mkNName s3NS "ListVersionsResult" } - where - pu = xpWrap (\(n, p, m, nm, k, t, c) -> GetBucketVersionsResponse n p m nm k t c, - \GetBucketVersionsResponse{..} -> (gbvrName, gbvrPrefix, gbvrKeyMarker, gbvrNextKeyMarker, gbvrMaxKeys, gbvrIsTruncated, gbvrVersions)) $ - xp7Tuple (e "Name") - (xpOption $ e "Prefix") - (xpOption $ e "KeyMarker") - (xpOption $ e "NextKeyMarker") - (e "MaxKeys") - (e "IsTruncated") - (xpFindMatches $ xpElem (mkNName s3NS "Version") xmlPickler) - - e n = xpElem (mkNName s3NS n) xmlPickler - --- | This implementation of the PUT operation creates a new bucket. --- --- By default, the bucket is created in the US Standard region. You can --- optionally specify a region in the request body. --- You might choose a Region to optimize latency, minimize costs, or address --- regulatory requirements. --- --- For example, if you reside in Europe, you will probably find it advantageous --- to create buckets in the EU (Ireland) Region. --- --- -data PutBucket = PutBucket - { pbName :: !Text - -- ^ Target bucket. - , pbLocation :: !Region - -- ^ Specifies the region where the bucket will be created. - , pbHeaders :: [Header] - -- ^ Common request headers. - } deriving (Eq, Show) - -instance Rq PutBucket where - type Er PutBucket = S3ErrorResponse - type Rs PutBucket = PutBucketResponse - request PutBucket{..} = - xml PUT pbName "/" (CreateBucketConfiguration pbLocation) .:. pbHeaders - response = s3Response - -type PutBucketResponse = S3Response - --- --- Objects --- - --- | Removes the null version (if there is one) of an object and inserts a --- delete marker, which becomes the latest version of the object. --- --- If there isn't a null version, Amazon S3 does not remove any objects. --- --- -data DeleteObject = DeleteObject - { doBucket :: !Text - , doKey :: !Text - , doHeaders :: [Header] - } deriving (Eq, Show) - -instance Rq DeleteObject where - type Er DeleteObject = S3ErrorResponse - type Rs DeleteObject = DeleteObjectResponse - request DeleteObject{..} = object DELETE doBucket doKey doHeaders mempty - response = s3Response - -type DeleteObjectResponse = S3Response - --- -- | Delete multiple objects from a bucket using a single HTTP request. --- -- --- -- If you know the object keys that you want to delete, then this operation --- -- provides a suitable alternative to sending individual delete requests --- -- (see 'DeleteObject'), reducing per-request overhead. --- -- --- -- --- data DeleteMultipleObjects = DeleteMultipleObjects --- { dmoBucket :: !Text --- , dmoMD5 :: !MD5 --- -- , dmoLength :: !ContentLength --- , dmoHeaders :: [AnyHeader] --- , dmoObjects :: !DMObjects --- } - --- deriving instance Show DeleteMultipleObjects - --- instance Rq DeleteMultipleObjects where --- type Er DeleteMultipleObjects = S3ErrorResponse --- type Rs DeleteMultipleObjects = DeleteMultipleObjectsResponse --- request DeleteMultipleObjects{..} = --- xml POST "/?delete" dmoBucket (hdr dmoMD5 : dmoHeaders) dmoObjects - --- data DeleteMultipleObjectsResponse = DeleteMultipleObjectsResponse --- { dmorDeleted :: [DeletedObject] --- , dmorError :: [DeleteError] --- } deriving (Eq, Show, Generic) - --- instance IsXML DeleteMultipleObjectsResponse where --- xmlPickler = withRootNS s3NS "DeleteResult" - --- | Retrieves an object from Amazon S3. --- --- You must have READ access to the object. --- --- If you grant READ access to the anonymous user, you can return the object --- without using an authorization header. --- --- -data GetObject = GetObject - { goBucket :: !Text - , goKey :: !Text - , goHeaders :: [Header] - } deriving (Eq, Show) - -instance Rq GetObject where - type Er GetObject = S3ErrorResponse - type Rs GetObject = GetObjectResponse - request GetObject{..} = object GET goBucket goKey goHeaders mempty - response = s3Response - -type GetObjectResponse = S3Response - -data GetVersion a = GetVersion !a !Text - deriving (Eq, Show) - -instance (Rq a, Rs a ~ S3Response) => Rq (GetVersion a) where - type Er (GetVersion a) = S3ErrorResponse - type Rs (GetVersion a) = Rs a - request (GetVersion rq v) = - request rq .?. [("versionId", Just $ Text.encodeUtf8 v)] - response = s3Response - --- -- | Uses the ACL subresource to return the access control list (ACL) of an object. --- -- --- -- You must have READ_ACP access to the object. --- -- --- -- By default, returns ACL information about the latest version of an object. --- -- To return ACL information about a different version, use the versionId subresource. --- -- --- -- --- data GetObjectACL = GetObjectACL --- { goaclBucket :: !Text --- , goaclKey :: !Text --- , goaclHeaders :: [AnyHeader] --- } - --- deriving instance Show GetObjectACL - --- instance Rq GetObjectACL where --- type Er GetObjectACL = S3ErrorResponse --- type Rs GetObjectACL = GetObjectACLResponse --- request GetObjectACL {..} = --- object GET goaclBucket goaclKey goaclHeaders Empty - --- response _ rs' = fmap (fmap (fmap f)) $ defaultResponse rs' --- where --- f x = x { goaclrHeaders = rsHeaders rs' } - --- data GetObjectACLResponse = GetObjectACLResponse --- { goaclrHeaders :: [(ByteString, ByteString)] --- , goaclrPolicy :: !AccessControlPolicy --- } - --- deriving instance Show GetObjectACLResponse - --- instance IsXML GetObjectACLResponse where --- xmlPickler = xpWrap --- (GetObjectACLResponse [], \(GetObjectACLResponse _ p) -> p) --- (genericXMLPickler defaultXMLOptions) - --- -- | Use the torrent subresource to return torrent files from a bucket. --- -- --- -- You can get torrent only for objects that are less than 5 GB in size. --- -- --- -- --- data GetObjectTorrent = GetObjectTorrent --- { gotBucket :: !Text --- , gotKey :: !Text --- , gotHeaders :: [AnyHeader] --- } - --- deriving instance Show GetObjectTorrent - --- instance Rq GetObjectTorrent where --- type Er GetObjectTorrent = S3ErrorResponse --- type Rs GetObjectTorrent = GetObjectTorrentResponse --- request GetObjectTorrent{..} = --- object GET gotBucket (gotKey <> "?torrent") gotHeaders Empty - --- response = bodyRs - --- type GetObjectTorrentResponse = S3Response - --- | Retrieves metadata from an object without returning the object itself. --- --- You must have READ access to the object. --- --- By default, the HEAD operation retrieves metadata from the latest version of an object. If the latest version is a delete marker, Amazon S3 behaves as if the object was deleted. To retrieve metadata from a different version, use the versionId subresource. --- --- -data HeadObject = HeadObject - { hoBucket :: !Text - , hoKey :: !Text - , hoHeaders :: [Header] - } deriving (Eq, Show) - -instance Rq HeadObject where - type Er HeadObject = S3ErrorResponse - type Rs HeadObject = HeadObjectResponse - request HeadObject{..} = object HEAD hoBucket hoKey hoHeaders mempty - response = s3Response - -type HeadObjectResponse = S3Response - --- -- | Preflight request to determine if an actual request can be sent with the --- -- specific origin, HTTP method, and headers. --- -- --- -- Amazon S3 supports cross-origin resource sharing (CORS) by enabling you to add --- -- a cors subresource on a bucket. --- -- --- -- When a browser sends this preflight request, Amazon S3 responds by evaluating --- -- the rules that are defined in the cors configuration. --- -- --- -- If cors is not enabled on the bucket, then Amazon S3 returns a 403 Forbidden response. --- -- --- -- --- data OptionsObject = OptionsObject --- { ooBucket :: !Text --- , ooKey :: !Text --- , ooOrigin :: !Origin --- , ooRequestMethod :: !AccessControlRequestMethod --- , ooRequestHeaders :: !AccessControlRequestHeaders --- , ooHeaders :: [AnyHeader] --- } - --- deriving instance Show OptionsObject - --- instance Rq OptionsObject where --- type Er OptionsObject = S3ErrorResponse --- type Rs OptionsObject = OptionsObjectResponse --- request OptionsObject{..} = object OPTIONS ooBucket ooKey hs Empty --- where --- hs = hdr ooOrigin --- : hdr ooRequestMethod --- : hdr ooRequestHeaders --- : ooHeaders - --- response = headerRs - --- type OptionsObjectResponse = S3Response - --- -- | Restores a temporary copy of an archived object. --- -- --- -- In the request, you specify the number of days that you want the restored --- -- copy to exist. After the specified period, Amazon S3 deletes the temporary copy. --- -- --- -- Note that the object remains archived; Amazon S3 deletes only the restored copy. --- -- --- -- An object in the Glacier storage class is an archived object. To access the --- -- object, you must first initiate a restore request, which restores a copy of --- -- the archived object. Restore jobs typically complete in three to five hours. --- -- --- -- --- data PostObjectRestore = PostObjectRestore --- { porBucket :: !Text --- , porKey :: !Text --- , porMD5 :: !MD5 --- , porRestoreRequest :: !RestoreRequest --- } - --- deriving instance Show PostObjectRestore - --- instance Rq PostObjectRestore where --- type Er PostObjectRestore = S3ErrorResponse --- type Rs PostObjectRestore = PostObjectRestoreResponse --- request PostObjectRestore{..} = sign (versionS3 name) $ --- Request svc POST path [hdr porMD5] [] (Strict $ toXML porRestoreRequest) --- where --- svc = override (name <> ".s3.amazonaws.com") s3 --- name = Text.encodeUtf8 porBucket --- path = addPrefix "/" porKey <> "?restore" - --- response = headerRs - --- type PostObjectRestoreResponse = S3Response - --- | Add an object to a bucket. --- --- You must have WRITE permissions on a bucket to add an object to it. --- --- Amazon S3 never adds partial objects; if you receive a success response, --- Amazon S3 added the entire object to the bucket. --- --- Amazon S3 is a distributed system. If it receives multiple write requests --- for the same object simultaneously, it overwrites all but the last object written. --- --- Amazon S3 does not provide object locking; if you need this, make sure to --- build it into your application layer or use versioning instead. --- --- If you enable versioning for a bucket, Amazon S3 automatically generates a --- unique version ID for the object being stored. Amazon S3 returns this ID in --- the response using the x-amz-version-id response header. --- --- If versioning is suspended, Amazon S3 always uses null as the version ID for --- the object stored. --- --- -data PutObject = PutObject - { poBucket :: !Text - , poKey :: !Text - , poHeaders :: [Header] - , poBody :: !RequestBody - } - -instance Rq PutObject where - type Er PutObject = S3ErrorResponse - type Rs PutObject = PutObjectResponse - request PutObject{..} = object PUT poBucket poKey poHeaders poBody - response = s3Response - -type PutObjectResponse = S3Response - --- -- | Set the access control list (ACL) permissions for an object that already --- -- exists in a bucket. --- -- --- -- You must have WRITE_ACP permission to set the ACL of an object. --- -- --- -- You can use one of the following two ways to set an object's permissions: --- -- * Specify the ACL in the request body, or --- -- * Specify permissions using request headers --- -- --- -- Depending on your application needs, you may choose to set the ACL on an --- -- object using either the request body or the headers. --- -- --- -- For example, if you have an existing application that updates an object ACL --- -- using the request body, then you can continue to use that approach. --- -- --- -- --- data PutObjectACL = PutObjectACL --- { poaclBucket :: !Text --- , poaclKey :: !Text --- , poaclPolicy :: Maybe AccessControlPolicy --- , poaclHeaders :: [AnyHeader] --- } - --- deriving instance Show PutObjectACL - --- instance Rq PutObjectACL where --- type Er PutObjectACL = S3ErrorResponse --- type Rs PutObjectACL = PutObjectACLResponse --- request PutObjectACL{..} = --- object PUT poaclBucket (poaclKey <> "?acl") poaclHeaders Empty --- response = headerRs - --- type PutObjectACLResponse = S3Response - --- | Create a copy of an object that is already stored in Amazon S3. --- --- A copy operation is the same as performing a GET and then a PUT. --- --- Note You can store individual objects of up to 5 TB in Amazon S3. --- --- You create a copy of your object up to 5 GB in size in a single atomic --- operation using this API. However, for copying an object greater than 5 GB, --- you must use the multipart upload API. --- --- When copying an object, you can preserve most of the metadata (default) or --- specify new metadata. However, the ACL is not preserved and is set to private --- for the user making the request. --- --- By default, x-amz-copy-source identifies the latest version of an object to --- copy. (If the latest version is a Delete Marker, Amazon S3 behaves as if the --- object was deleted.) To copy a different version, use the versionId subresource. --- --- If you enable Versioning on the target bucket, Amazon S3 generates a unique --- version ID for the object being copied. This version ID is different from --- the version ID of the source object. --- --- -data PutObjectCopy = PutObjectCopy - { pocBucket :: !Text - , pocKey :: !Text - , pocSource :: !Text - , pocDirective :: !Directive - , pocHeaders :: [Header] - } - -instance Rq PutObjectCopy where - type Er PutObjectCopy = S3ErrorResponse - type Rs PutObjectCopy = PutObjectCopyResponse - request PutObjectCopy{..} = - object PUT pocBucket pocKey hs (RequestBodyBS "") - where - hs = [ ("X-AMZ-Copy-Source", Text.encodeUtf8 pocSource) - , ("X-AMZ-Metadata-Directive", BS.pack $ show pocDirective) - ] ++ pocHeaders - - response = s3Response - -type PutObjectCopyResponse = S3Response - --- x-amz-copy-source: /source_bucket/sourceObject --- x-amz-metadata-directive: metadata_directive --- x-amz-copy-source-if-match: etag --- x-amz-copy-source-if-none-match: etag --- x-amz-copy-source-if-unmodified-since: time_stamp --- x-amz-copy-source-if-modified-since: time_stamp - --- -- | Initiate a multipart upload and return an upload ID. --- -- --- -- This upload ID is used to associate all the parts in the specific multipart --- -- upload. You specify this upload ID in each of your subsequent upload part --- -- requests (see 'UploadPart'). --- -- --- -- You also include this upload ID in the final request to either complete or --- -- abort the multipart upload request. --- -- --- -- --- data InitiateMultipartUpload = InitiateMultipartUpload --- { imuBucket :: !Text --- , imuKey :: !Text --- , imuHeaders :: [AnyHeader] --- } - --- deriving instance Show InitiateMultipartUpload - --- instance Rq InitiateMultipartUpload where --- type Er InitiateMultipartUpload = S3ErrorResponse --- type Rs InitiateMultipartUpload = InitiateMultipartUploadResponse --- request InitiateMultipartUpload{..} = --- object POST imuBucket (imuKey <> "?uploads") imuHeaders Empty - --- data InitiateMultipartUploadResponse = InitiateMultipartUploadResponse --- { imurBucket :: !Text --- , imurKey :: !Text --- , imurUploadId :: !Text --- } deriving (Eq, Show, Generic) - --- instance IsXML InitiateMultipartUploadResponse where --- xmlPickler = withRootNS s3NS "InitiateMultipartUploadResult" - --- -- | Upload a part in a multipart upload. --- -- --- -- Note In this operation you provide part data in your request. However, you --- -- have an option to specify your existing Amazon S3 object as data source for --- -- the part your are uploading. --- -- --- -- To upload a part from an existing object you use the 'UploadPartCopy' operation. --- -- --- -- You must initiate a multipart upload (see 'InitiateMultipartUpload') before --- -- you can upload any part. --- -- --- -- In response to your initiate request. Amazon S3 returns an upload ID, --- -- a unique identifier, that you must include in your upload part request. --- -- --- -- Part numbers can be any number from 1 to 10,000, inclusive. A part number --- -- uniquely identifies a part and also defines its position within the object --- -- being created. --- -- --- -- If you upload a new part using the same part number that was used with a --- -- previous part, the previously uploaded part is overwritten. --- -- --- -- Each part must be at least 5 MB in size, except the last part. --- -- --- -- There is no size limit on the last part of your multipart upload. --- -- --- -- --- data UploadPart = UploadPart --- { upBucket :: !Text --- , upKey :: !Text --- , upPartNumber :: !Text --- , upUploadId :: !Text --- , upHeaders :: [AnyHeader] --- , upBody :: !Body --- -- Content Length ? --- } - --- deriving instance Show UploadPart - --- instance Rq UploadPart where --- type Er UploadPart = S3ErrorResponse --- type Rs UploadPart = UploadPartResponse --- request UploadPart{..} = object PUT upBucket path upHeaders upBody --- where --- path = Text.concat --- [ upKey --- , "?partNumber=" --- , upPartNumber --- , "&uploadId=" --- , upUploadId --- ] - --- response = headerRs - --- type UploadPartResponse = S3Response - --- -- | Uploads a part by copying data from an existing object as data source. --- -- --- -- You specify the data source by adding the request header x-amz-copy-source --- -- in your request and a byte range by adding the request header x-amz-copy-source-range --- -- in your request. --- -- --- -- Note Instead of using an existing object as part data, you might use the --- -- 'UploadPart' operation and provide data in your request. For more information, see Upload Part. --- -- --- -- --- data UploadPartCopy = UploadPartCopy --- { upcBucket :: !Text --- , upcKey :: !Text --- , upcSource :: !CopySource --- , upcPartNumber :: !Text --- , upcUploadId :: !Text --- , upcHeaders :: [AnyHeader] --- } - --- deriving instance Show UploadPartCopy - --- instance Rq UploadPartCopy where --- type Er UploadPartCopy = S3ErrorResponse --- type Rs UploadPartCopy = UploadPartCopyResponse --- request UploadPartCopy{..} = --- object PUT upcBucket path (hdr upcSource : upcHeaders) Empty --- where --- path = Text.concat --- [ upcKey --- , "?partNumber=" --- , upcPartNumber --- , "&uploadId=" --- , upcUploadId --- ] - --- response = headerRs - --- type UploadPartCopyResponse = S3Response - --- -- | Completes a multipart upload by assembling previously uploaded parts. --- -- --- -- You first initiate the multipart upload and then upload all parts using --- -- the 'UploadPart' operation. --- -- --- -- After successfully uploading all relevant parts of an upload, you call this --- -- operation to complete the upload. --- -- --- -- Upon receiving this request, Amazon S3 concatenates all the parts in --- -- ascending order by part number to create a new object. --- -- --- -- In the 'CompleteMultipartUpload' request, you must provide the parts list. --- -- --- -- You must ensure the parts list is complete, this operation concatenates the --- -- parts you provide in the list. --- -- --- -- For each part in the list, you must provide the part number and the ETag --- -- header value, returned after that part was uploaded. --- -- --- -- Processing of a Complete Multipart Upload request could take several minutes --- -- to complete. After Amazon S3 begins processing the request, it sends an HTTP --- -- response header that specifies a 200 OK response. --- -- --- -- While processing is in progress, Amazon S3 periodically sends whitespace --- -- characters to keep the connection from timing out. Because a request could --- -- fail after the initial 200 OK response has been sent, it is important that --- -- you check the response body to determine whether the request succeeded. --- -- --- -- --- data CompleteMultipartUpload = CompleteMultipartUpload --- { cmuBucket :: !Text --- , cmuKey :: !Text --- , cmuUploadId :: !Text --- -- Content Length? --- , cmuHeaders :: [AnyHeader] --- , cmuParts :: [Part] --- } - --- deriving instance Show CompleteMultipartUpload - --- instance Rq CompleteMultipartUpload where --- type Er CompleteMultipartUpload = S3ErrorResponse --- type Rs CompleteMultipartUpload = CompleteMultipartUploadResponse --- request CompleteMultipartUpload{..} = undefined --- -- object POST cmuBucket path cmuHeaders . Strict $ toXML "" --- where --- path = Text.concat [cmuKey, "&uploadId=", cmuUploadId] - --- response = undefined - --- type CompleteMultipartUploadResponse = S3Response - --- -- | Aborts a multipart upload. --- -- --- -- After a multipart upload is aborted, no additional parts can be uploaded --- -- using that upload ID. --- -- --- -- The storage consumed by any previously uploaded parts will be freed. --- -- --- -- However, if any part uploads are currently in progress, those part uploads --- -- might or might not succeed. As a result, it might be necessary to abort a --- -- given multipart upload multiple times in order to completely free all --- -- storage consumed by all parts. --- -- --- -- --- data AbortMultipartUpload = AbortMultipartUpload --- { amuBucket :: !Text --- , amuKey :: !Text --- , amuUploadId :: !Text -- UploadId --- } deriving (Eq, Show, Generic) --- -- "uri": "/{Bucket}/{Key}?uploadId={UploadId}" - --- instance Rq AbortMultipartUpload where --- type Er AbortMultipartUpload = S3ErrorResponse --- type Rs AbortMultipartUpload = AbortMultipartUploadResponse --- request AbortMultipartUpload{..} = undefined --- response = undefined - --- -- NoSuchUpload = 404 --- -- The specified multipart upload does not exist. --- -- The upload ID might be invalid, or the multipart upload might have been aborted or completed. --- -- empty response - --- data AbortMultipartUploadResponse = AbortMultipartUploadResponse --- deriving (Eq, Show, Generic) - --- -- | List the parts that have been uploaded for a specific multipart upload. --- -- --- -- This operation must include the upload ID, which you obtain by sending --- -- 'InitiateMultipartUpload'. --- -- --- -- This returns a maximum of 1,000 uploaded parts and the default number of --- -- parts returned is 1,000 parts. --- -- --- -- You can restrict the number of parts returned by specifying the 'maxParts' --- -- parameter. --- -- --- -- If your multipart upload consists of more than 1,000 parts, the response --- -- returns an 'IsTruncated' field with the value of 'True', and a --- -- 'NextPartNumberMarker' element. --- -- --- -- In subsequent List Parts requests you can include the part-number-marker --- -- query string parameter and set its value to the NextPartNumberMarker field --- -- value from the previous response. --- -- --- -- --- data ListParts = ListParts --- { --- } - --- deriving instance Show ListParts - --- instance Rq ListParts where --- type Er ListParts = S3ErrorResponse --- type Rs ListParts = ListPartsResponse --- request ListParts{..} = undefined --- response = undefined - --- type ListPartsResponse = S3Response diff --git a/src/Network/AWS/S3/Types.hs b/src/Network/AWS/S3/Types.hs deleted file mode 100644 index 9c40721f410..00000000000 --- a/src/Network/AWS/S3/Types.hs +++ /dev/null @@ -1,485 +0,0 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} - --- Module : Network.AWS.S3.Types --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Network.AWS.S3.Types where - -import Data.ByteString (ByteString) -import Data.Monoid -import Data.Text (Text) -import Data.Time -import Network.AWS.Internal -import qualified Text.Read as Read - --- | Currently supported version of the S3 service. -s3 :: ByteString -> Service -s3 b = Service Global (versionS3 b) "s3" "2006-03-01" - --- | XML namespace to annotate S3 elements with. --- FIXME: Some S3 namespaces have the doc.* prefix? -s3NS :: ByteString -s3NS = "http://s3.amazonaws.com/doc/" <> svcVersion (s3 "") <> "/" - --- | Helper to define S3 namespaced XML elements. -s3Elem :: ByteString -> NName ByteString -s3Elem = mkNName s3NS - -data S3ErrorResponse = S3ErrorResponse - { serMessage :: !Text - , serResource :: !Text - , serCode :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML S3ErrorResponse where - xmlPickler = (genericXMLPickler defaultXMLOptions) - { root = Just $ mkAnNName "Error" - } - -instance ToError S3ErrorResponse where - toError = Err . show - -data Bucket = Bucket - { bName :: !Text - -- ^ Bucket's name. - , bCreationDate :: !UTCTime - -- ^ Date the bucket was created. - } deriving (Eq, Show, Generic) - -instance IsXML Bucket - -newtype Delimiter = Delimiter { unDelimiter :: Char } - deriving (Eq, Show) - -instance IsQuery Delimiter where - queryPickler = (Delimiter, unDelimiter) `qpWrap` qpPrim - --- --- GetBucket --- - -data Contents = Contents - { bcKey :: !Text - , bcLastModified :: !UTCTime - , bcETag :: !ETag - , bcSize :: !Integer - , bcStorageClass :: !StorageClass - , bcVersionId :: Maybe Text --- , bcOwner :: !Owner - } deriving (Eq, Show, Generic) - -instance IsXML Contents where - xmlPickler = withRootNS s3NS "Contents" - --- --- GetVersions --- - -data Version = Version - { vKey :: !Text - , vVersionId :: !Text - , vIsLatest :: !Bool - , vLastModified :: !UTCTime - , vETag :: !ETag - , vSize :: !Integer - , vStorageClass :: !StorageClass - } deriving (Eq, Show, Generic) - -instance IsXML Version where - xmlPickler = withRootNS s3NS "Version" - --- --- PutBucket --- - -data CreateBucketConfiguration = CreateBucketConfiguration - { gbcLocationConstraint :: !Region - } deriving (Eq, Show, Generic) - -instance IsXML CreateBucketConfiguration where - xmlPickler = withNS s3NS - --- --- DeleteMultipleObjects --- - -data DMObject = DMObject - { oKey :: !Text - , oVersion :: Maybe Text - } deriving (Eq, Show, Generic) - -instance IsXML DMObject - -data DMObjects = DMObjects - { oQuiet :: !Bool - , oObjects :: [DMObject] - } deriving (Eq, Show) - -instance IsXML DMObjects where - xmlPickler = pu { root = Just $ mkAnNName "Delete" } - where - pu = xpWrap (uncurry DMObjects, \(DMObjects q os) -> (q, os)) $ - xpPair (xpElem (mkAnNName "Quiet") xmlPickler) - (xpElemList (mkAnNName "Object") xmlPickler) - --- --- DeleteMultipleObjectsResponse --- - -data DeletedObject = DeletedObject - { dobjKey :: !Text - , dobjVersionId :: Maybe Text - , dobjDeleteMarker :: Maybe Bool - , dobjDeleteMarkerVersionId :: Maybe Text - } deriving (Eq, Show, Generic) - -instance IsXML DeletedObject where - xmlPickler = withRootNS s3NS "Deleted" - -data DeleteError = DeleteError - { deKey :: !Text - , deVersionId :: Maybe Text - , deCode :: !Text - , deMessage :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML DeleteError where - xmlPickler = withRootNS s3NS "Error" - --- --- GetObjectACLResponse --- - -data Owner = Owner - { oID :: !Text - -- ^ Bucket owner's user ID. - , oDisplayName :: !Text - -- ^ Bucket owner's display name. - } deriving (Eq, Show, Generic) - -instance IsXML Owner - -data Grantee = Grantee - { gID :: !Text - , gDisplayName :: !Text - } deriving (Eq, Show, Generic) - -instance IsXML Grantee - --- FIXME: Grantee Values --- You can specify the person (grantee) to whom you're assigning access rights (using request elements) in the following ways: - --- By the person's ID: - --- IDGranteesEmail --- --- DisplayName is optional and ignored in the request. - --- By Email address: - --- Grantees@email.comlt;/Grantee> --- The grantee is resolved to the CanonicalUser and, in a response to a GET Object acl request, appears as the CanonicalUser. - --- By URI: - --- http://acs.amazonaws.com/groups/global/AuthenticatedUsers - -data Grant = Grant - { gGrantee :: !Grantee - , gPermission :: !Text -- FULL_CONTROL | WRITE | READ_ACP - } deriving (Eq, Show, Generic) - -instance IsXML Grant - --- --- --- 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a --- mtd@amazon.com --- --- --- --- --- 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a --- mtd@amazon.com --- --- FULL_CONTROL --- --- --- - -data AccessControlList = AccessControlList - { aclGrant :: [Grant] - } deriving (Eq, Show, Generic) - -instance IsXML AccessControlList - -data AccessControlPolicy = AccessControlPolicy - { acpOwner :: !Owner - , acpAccessControlList :: !AccessControlList - } deriving (Eq, Show, Generic) - -instance IsXML AccessControlPolicy - --- --- PostObjectRestore --- - -data RestoreRequest = RestoreRequest - { rrDays :: !Int - } deriving (Eq, Show, Generic) - -instance IsXML RestoreRequest where - xmlPickler = withNS s3NS - --- --- CompleteMultipartUpload --- - -data Part = Part - { pPartNumber :: !Text - , pETag :: !ETag - } deriving (Eq, Show, Generic) - -instance IsXML Part - --- type Bucket = T.Text - --- data BucketInfo --- = BucketInfo { --- bucketName :: Bucket --- , bucketCreationDate :: UTCTime --- } --- deriving (Show) - --- type Object = T.Text - --- data Object = Object --- { objectKey :: T.Text --- , objectLastModified :: UTCTime --- , objectETag :: T.Text --- , objectSize :: Integer --- , objectStorageClass :: StorageClass --- , objectOwner :: UserInfo --- } deriving (Eq, Show, Generic) - -data AES256 = AES256 deriving (Show) - --- instance IsHeader AES256 where --- encodeHeader = encodeHeader . show - -data CannedACL - = Private - | PublicRead - | PublicReadWrite - | AuthenticatedRead - | BucketOwnerRead - | BucketOwnerFullControl - | LogDeliveryWrite - -instance Show CannedACL where - show acl = case acl of - Private -> "private" - PublicRead -> "public-read" - PublicReadWrite -> "public-read-write" - AuthenticatedRead -> "authenticated-read" - BucketOwnerRead -> "bucket-owner-read" - BucketOwnerFullControl -> "bucket-owner-full-control" - LogDeliveryWrite -> "log-delivery-write" - -data StorageClass - = Standard - | ReducedRedundancy - | Glacier - deriving (Eq) - -instance Show StorageClass where - show Standard = "STANDARD" - show ReducedRedundancy = "REDUCED_REDUNDANCY" - show Glacier = "GLACIER" - -instance Read StorageClass where - readPrec = readAssocList - [ ("STANDARD", Standard) - , ("REDUCED_REDUNDANCY", ReducedRedundancy) - , ("GLACIER", Glacier) - ] - -instance IsXML StorageClass where - xmlPickler = xpContent xpPrim - -data Directive - = Copy - | Replace - -data Source = Source - { srcBucket :: !Text - , srcKey :: !Text - } deriving (Eq, Show) - -instance Show Directive where - show Copy = "COPY" - show Replace = "REPLACE" - -newtype ETag = ETag { unETag :: Text } - deriving (Eq, Show) - -instance IsXML ETag where - xmlPickler = (ETag, unETag) `xpWrap` xmlPickler - --- instance IsHeader ETag where --- encodeHeader (ETag t) = encodeHeader t - --- type Metadata = Header "x-amz-meta-" (Text, Text) - --- type Storage = Header "x-amz-storage-class" StorageClass - --- type ACL = Header "x-amz-acl" CannedACL - --- -- type GrantRead = Header "x-amz-grant-read" Text --- -- type GrantWrite = Header "x-amz-grant-write" Text --- -- type GrantReadACP = Header "x-amz-grant-read-acp" Text --- -- type GrantWriteACP = Header "x-amz-grant-write-acp" Text --- -- type GrantFullControl = Header "x-amz-grant-full-control" Text - --- -- FIXME: --- -- For each of these headers, the value is a comma-separated list of one or more grantees. You specify each grantee as a type=value pair, where the type can be one of the following: - --- -- emailAddress — if value specified is the email address of an AWS account --- -- id — if value specified is the canonical user ID of an AWS account --- -- uri — if granting permission to a predefined group. - --- -- For example, the following x-amz-grant-read header grants list objects permission to the two AWS accounts identified by their email addresses. --- -- x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - --- -- | When a bucket is configured as a website, you can set this metadata on the --- -- object so the website endpoint will evaluate the request for the object as --- -- a 301 redirect to another object in the same bucket or an external URL. --- type RedirectLocation = Header "x-amz-website-redirect-location" Text - --- -- | If the object is stored using server-side encryption, response includes --- -- this header with value of the encryption algorithm used. --- type Encryption = Header "x-amz-server-side-encryption" AES256 - --- -- | Sets the Content-Type header of the response. --- type ResponseContentType = Header "response-content-type" Text - --- -- | Sets the Content-Language header of the response. --- type ResponseContentLanguage = Header "response-content-language" Text - --- -- | Sets the Expires header of the response. --- type ResponseExpires = Header "response-expires" Text - --- -- | Sets the Cache-Control header of the response. --- type ResponseCacheControl = Header "response-cache-control" Text - --- -- | Sets the Content-Disposition header of the response. --- type ResponseContentDisposition = Header "response-content-disposition" Text - --- -- | Sets the Content-Encoding header of the response. --- type ResponseContentEncoding = Header "response-content-encoding" Text - --- -- | Specifies whether the object retrieved was (true) or was not (false) --- -- a Delete Marker. --- -- --- -- If false, this response header does not appear in the response. --- type DeleteMarker = Header "x-amz-delete-marker" Bool - --- -- | If the object expiration is configured (see PUT Bucket lifecycle), the --- -- response includes this header. It includes the expiry-date and rule-id key --- -- value pairs providing object expiration information. --- -- The value of the rule-id is URL encoded. --- type Expiration = Header "x-amz-expiration" UTCTime - --- -- | Provides information about object restoration operation and expiration time --- -- of the restored object copy. --- type Restore = Header "x-amz-restore" Text - --- -- | Returns the version ID of the retrieved object if it has a unique version ID. --- type VersionId = Header "x-amz-version-id" Text - --- -- | The value is the concatenation of the authentication device's serial number, --- -- a space, and the value displayed on your authentication device. --- -- --- -- Condition: Required to permanently delete a versioned object if versioning --- -- is configured with MFA Delete enabled. --- type MFA = Header "x-amz-mfa" Text - --- -- | Identifies the origin of the cross-origin request to Amazon S3. --- -- --- -- For example, http://www.example.com. --- type Origin = Header "origin" Text - --- -- | Identifies what HTTP method will be used in the actual request. --- type AccessControlRequestMethod = Header "access-control-request-method" Method - --- -- | A comma-delimited list of HTTP headers that will be sent in the --- -- actual request. --- type AccessControlRequestHeaders = Header "access-control-request-headers" [Text] - --- -- | The name of the source bucket and key name of the source object, --- -- separated by a slash (/). --- -- --- -- This string must be URL-encoded. Additionally, the source bucket must be --- -- valid and you must have READ access to the valid source object. --- -- --- -- If the source object is archived in Amazon Glacier (storage class of the --- -- object is GLACIER), you must first restore a temporary copy using the POST --- -- Object restore. Otherwise, Amazon S3 returns the 403 ObjectNotInActiveTierError --- -- error response. --- type CopySource = Header "x-amz-copy-source" Source - --- -- | The range of bytes to copy from the source object. --- -- --- -- The range value must use the form bytes=first-last, where the first and last --- -- are the zero-based byte offsets to copy. --- -- --- -- For example, bytes=0-9 indicates that you want to copy the first ten bytes --- -- of the source. --- type CopySourceRange = Header "x-amz-copy-source-range" Text - --- -- | Specifies whether the metadata is copied from the source object or replaced --- -- with metadata provided in the request. --- -- --- -- If copied, the metadata, except for the version ID, remains unchanged. --- -- In addition, the server-side-encryption, storage-class, and --- -- website-redirect-location metadata from the source is not copied. --- -- If you specify this metadata explicitly in the copy request, Amazon S3 --- -- adds this metadata to the resulting object. If you specify headers in the --- -- request specifying any user-defined metadata, Amazon S3 ignores these headers. --- -- --- -- If replaced, all original metadata is replaced by the metadata you specify. --- type MetadataDirective = Header "x-amz-metadata-directive" Directive - --- -- | Copies the object if its entity tag (ETag) matches the specified tag; --- -- otherwise, the request returns a 412 HTTP status code error. --- -- --- -- Constraints: This header can be used with x-amz-copy-source-if-unmodified-since, --- -- but cannot be used with other conditional copy headers. --- type CopySourceIfMatch = Header "x-amz-copy-source-if-match" ETag - --- -- | Copies the object if its entity tag (ETag) is different than the specified ETag; --- -- otherwise, the request returns a 412 HTTP status code error. --- -- --- -- Constraints: This header can be used with x-amz-copy-source-if-modified-since, --- -- but cannot be used with other conditional copy headers. --- type CopySourceIfNoneMatch = Header "x-amz-copy-source-if-none-match" ETag - --- -- | Copies the object if it hasn't been modified since the specified time; --- -- otherwise, the request returns a 412 HTTP status code error. --- type CopySourceIfUnmodifiedSince = Header "x-amz-copy-source-if-unmodified-since" UTCTime - --- -- | Copies the object if it has been modified since the specified time; --- -- otherwise, the request returns a 412 HTTP status code error. --- type CopySourceIfModifiedSince = Header "x-amz-copy-source-if-modified-since" UTCTime diff --git a/src/Text/XML/Expat/Pickle/Generic.hs b/src/Text/XML/Expat/Pickle/Generic.hs deleted file mode 100644 index 4f3b99e4956..00000000000 --- a/src/Text/XML/Expat/Pickle/Generic.hs +++ /dev/null @@ -1,518 +0,0 @@ -{-# LANGUAGE DefaultSignatures #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE Rank2Types #-} -{-# LANGUAGE OverlappingInstances #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeOperators #-} - -{-# OPTIONS_GHC -fno-warn-missing-signatures #-} - --- Module : Text.XML.Expat.Pickle.Generic --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- Berkeley Software Distribution License, v. 3.0. --- You can obtain it at --- http://http://opensource.org/licenses/BSD-3-Clause. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Text.XML.Expat.Pickle.Generic - ( - -- * Class - IsXML (..) - - -- * Functions - , toXML - , toIndentedXML - , fromXML - - -- * Data Types - , Node - , XMLPU (..) - - -- * Options - , XMLOptions (..) - , defaultXMLOptions - , namespacedXMLOptions - - -- * Generics - , XMLGeneric - , genericXMLPickler - - -- * Combinators - , xpWrap - , xpList - , xpElemList - , xpElem - , xpSum - , xpEither - , xpPrim - , xpOption - , xpPair - , xpTriple - , xp4Tuple - , xp5Tuple - , xp6Tuple - , xp7Tuple - , xpUnit - , xpLift - , xpEmpty - , xpConst - , xpText - , xpText0 - , xpContent - - , xpFindMatches - - -- * Re-exported Tag Helpers - , module Text.XML.Expat.Internal.Namespaced - , module Text.XML.Expat.Internal.Qualified - ) where - -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import Data.Char (isLower) -import Data.Either -import Data.Maybe -import Data.Monoid -import Data.Text (Text) -import Data.Text.Encoding -import GHC.Generics -import Text.XML.Expat.Format -import Text.XML.Expat.Internal.Namespaced -import Text.XML.Expat.Internal.Qualified hiding (fromQualified) -import Text.XML.Expat.Tree hiding (Node, fromQualified) - --- --- Class --- - -type Node = NNode ByteString - -data XMLPU t a = XMLPU - { pickleTree :: a -> t - , unpickleTree :: t -> Either String a - , root :: Maybe (NName ByteString) - } - -type PU = XMLPU - -class IsXML a where - xmlPickler :: PU [Node] a - - default xmlPickler :: (Generic a, GIsXML (Rep a)) => PU [Node] a - xmlPickler = genericXMLPickler defaultXMLOptions - --- --- Functions --- - -toXML :: IsXML a => a -> ByteString -toXML = toIndentedXML 2 - -toIndentedXML :: IsXML a => Int -> a -> ByteString -toIndentedXML i = format' - . indent i - . fromQualified - . fromNamespaced - . pickleTree (xpRoot xmlPickler) - -fromXML :: IsXML a => ByteString -> Either String a -fromXML = either (Left . show) unpickle . parse' defaultParseOptions - where - unpickle = unpickleTree (xpRoot xmlPickler) . toNamespaced . toQualified - --- --- Options --- - -data XMLOptions = XMLOptions - { xmlCtorModifier :: String -> NName ByteString - -- ^ Function applied to constructor tags. - , xmlFieldModifier :: String -> NName ByteString - -- ^ Function applied to record field labels. - , xmlListElement :: NName ByteString - -- ^ Default element name to wrap list items with. - } - -defaultXMLOptions :: XMLOptions -defaultXMLOptions = XMLOptions - { xmlCtorModifier = mkAnNName . BS.pack - , xmlFieldModifier = mkAnNName . BS.pack . dropWhile isLower - , xmlListElement = mkAnNName "Value" - } - -namespacedXMLOptions :: ByteString -> XMLOptions -namespacedXMLOptions ns = XMLOptions - { xmlCtorModifier = mkNName ns . BS.pack - , xmlFieldModifier = mkNName ns . BS.pack . dropWhile isLower - , xmlListElement = mkNName ns "Value" - } - --- --- Generics --- - -type XMLGeneric a = (Generic a, GIsXML (Rep a)) => PU [Node] a - -genericXMLPickler opts = - (to, from) `xpWrap` (gXMLPickler opts) (genericXMLPickler opts) - -class GIsXML f where - gXMLPickler :: XMLOptions -> PU [Node] a -> PU [Node] (f a) - -instance IsXML a => GIsXML (K1 i a) where - gXMLPickler _ _ = (K1, unK1) `xpWrap` xmlPickler - -instance (GIsXML a, GIsXML b) => GIsXML (a :+: b) where - gXMLPickler opts f = gXMLPickler opts f `xpSum` gXMLPickler opts f - -instance (GIsXML a, GIsXML b) => GIsXML (a :*: b) where - gXMLPickler opts f = xpWrap - (uncurry (:*:), \(a :*: b) -> (a, b)) - (gXMLPickler opts f `xpPair` gXMLPickler opts f) - -instance (Datatype d, GIsXML a) => GIsXML (D1 d a) where - gXMLPickler opts = xpWrap (M1, unM1) . gXMLPickler opts - -instance (Constructor c, GIsXML a) => GIsXML (C1 c a) where - gXMLPickler opts f = (xpWrap (M1, unM1) $ gXMLPickler opts f) - { root = Just . xmlCtorModifier opts $ conName (undefined :: C1 c a p) - } - -instance (Selector s, GIsXML a) => GIsXML (S1 s a) where - gXMLPickler opts f = xpElem - (xmlFieldModifier opts $ selName (undefined :: S1 s a p)) - ((M1, unM1) `xpWrap` gXMLPickler opts f) - -instance (Selector s, IsXML a) => GIsXML (S1 s (K1 i [a])) where - gXMLPickler opts _ = xpDefault - (xmlFieldModifier opts $ selName (undefined :: t s (K1 i [a]) p)) - (M1 $ K1 []) - ((M1 . K1, unK1 . unM1) `xpWrap` xpList (xpElem key pu)) - where - key = fromMaybe (xmlListElement opts) $ root pu - pu = xmlPickler - -instance (Selector s, IsXML a) => GIsXML (S1 s (K1 i (Maybe a))) where - gXMLPickler opts _ = - (M1 . K1, unK1 . unM1) `xpWrap` xpOption (xpElem name xmlPickler) - where - name = xmlFieldModifier opts $ selName (undefined :: t s (K1 i (Maybe a)) p) - --- --- Combinators --- - -xpRoot :: PU [Node] a -> PU Node a -xpRoot pu = pu - { pickleTree = - (maybe head (\n -> Element n []) $ root pu) . pickleTree pu - , unpickleTree = \t -> case t of - (Element _ _ cs) -> unpickleTree pu cs - t1 -> unpickleTree pu [t1] - } - -xpWrap :: (a -> b, b -> a) -> PU [n] a -> PU [n] b -xpWrap (f, g) pu = pu - { pickleTree = pickleTree pu . g - , unpickleTree = fmap f . unpickleTree pu - } - -xpElemList :: NName ByteString -> PU [Node] a -> PU [Node] [a] -xpElemList name = xpList . xpElem name - -xpFindMatches :: PU [Node] a -> PU [Node] [a] -xpFindMatches pu = pu - { pickleTree = concatMap (pickleTree pu) - , unpickleTree = Right . snd . partitionEithers . unpickle - } - where - unpickle (e@(Element _ _ _):es) = unpickleTree pu [e] : unpickle es - unpickle (_:es) = unpickle es - unpickle [] = [] - -xpList :: PU [Node] a -> PU [Node] [a] -xpList pu = pu - { pickleTree = concatMap (pickleTree pu) - , unpickleTree = concatEithers . unpickle - } - where - unpickle (e@(Element _ _ _):es) = unpickleTree pu [e] : unpickle es - unpickle (_:es) = unpickle es - unpickle [] = [] - - concatEithers xs = case partitionEithers xs of - ([], rs) -> Right rs - (l:_, _) -> Left l - -xpElem :: NName ByteString -> PU [Node] a -> PU [Node] a -xpElem name pu = XMLPU - { root = Just name - , pickleTree = \x -> [Element name [] (pickleTree pu x)] - , unpickleTree = \t -> - let children = map matching t - in case catMaybes children of - [] -> Left $ "can't find " ++ tag - (x:_) -> case x of - Left e -> Left $ "in " ++ tag ++ ", " ++ e - r -> r - } - where - matching (Element n _ cs) - | n == name = Just $ unpickleTree pu cs - matching _ = Nothing - - tag = "<" ++ show name ++ ">" - -xpDefault :: NName ByteString -> a -> PU [Node] a -> PU [Node] a -xpDefault name val pu = XMLPU - { root = Just name - , pickleTree = \x -> [Element name [] (pickleTree pu x)] - , unpickleTree = \t -> - let children = map matching t - in case catMaybes children of - [] -> Right val - (x:_) -> case x of - Left e -> Left $ "in " ++ tag ++ ", " ++ e - r -> r - } - where - matching (Element n _ cs) - | n == name = Just $ unpickleTree pu cs - matching _ = Nothing - - tag = "<" ++ show name ++ ">" - -xpSum :: PU [t] (f r) -> PU [t] (g r) -> PU [t] ((f :+: g) r) -xpSum left right = (inp, out) `xpWrap` xpEither left right - where - inp (Left x) = L1 x - inp (Right x) = R1 x - - out (L1 x) = Left x - out (R1 x) = Right x - -xpEither :: PU [t] a -> PU [t] b -> PU [t] (Either a b) -xpEither pa pb = XMLPU - { root = listToMaybe $ catMaybes [root pa, root pb] - , pickleTree = either (pickleTree pa) (pickleTree pb) - , unpickleTree = \t -> case unpickleTree pa t of - Right x -> Right . Left $ x - Left _ -> Right `fmap` unpickleTree pb t - } - -xpPrim :: (Read a, Show a) => PU ByteString a -xpPrim = XMLPU - { root = Nothing - , pickleTree = BS.pack . show - , unpickleTree = \t -> - let s = BS.unpack t - in case reads s of - [(x, "")] -> Right x - _ -> Left $ "failed to read text: " ++ s - } - -xpOption :: PU [n] a -> PU [n] (Maybe a) -xpOption pu = pu - { pickleTree = maybe [] (pickleTree pu) - , unpickleTree = Right . either (const Nothing) Just . unpickleTree pu - } - -xpPair :: PU [n] a -> PU [n] b -> PU [n] (a, b) -xpPair pa pb = XMLPU - { root = listToMaybe $ catMaybes [root pa, root pb] - , pickleTree = \(a, b) -> concat [pickleTree pa a, pickleTree pb b] - , unpickleTree = \t -> - case (unpickleTree pa t, unpickleTree pb t) of - (Right a, Right b) -> Right (a, b) - (Left e, _) -> Left $ "in 1st of pair, " ++ e - (_, Left e) -> Left $ "in 2nd of pair, " ++ e - } - -xpTriple :: PU [n] a -> PU [n] b -> PU [n] c -> PU [n] (a, b, c) -xpTriple pa pb pc = XMLPU - { root = listToMaybe $ catMaybes [root pa, root pb, root pc] - , pickleTree = \(a, b, c) -> - concat [pickleTree pa a, pickleTree pb b, pickleTree pc c] - , unpickleTree = \t -> - case (unpickleTree pa t, unpickleTree pb t, unpickleTree pc t) of - (Right a, Right b, Right c) -> Right (a, b, c) - (Left e, _, _) -> Left $ "in 1st of triple, " ++ e - (_, Left e, _) -> Left $ "in 2nd of triple, " ++ e - (_, _, Left e) -> Left $ "in 3rd of triple, " ++ e - } - -xp4Tuple :: PU [n] a -> PU [n] b -> PU [n] c -> PU [n] d -> PU [n] (a, b, c, d) -xp4Tuple pa pb pc pd = XMLPU - { root = listToMaybe $ catMaybes [root pa, root pb, root pc, root pd] - , pickleTree = \(a, b, c, d) -> - concat [pickleTree pa a, pickleTree pb b, pickleTree pc c, pickleTree pd d] - , unpickleTree = \t -> - case (unpickleTree pa t, unpickleTree pb t, unpickleTree pc t, - unpickleTree pd t) of - (Right a, Right b, Right c, Right d) -> Right (a, b, c, d) - (Left e, _, _, _) -> Left $ "in 1st of 4-tuple, " ++ e - (_, Left e, _, _) -> Left $ "in 2nd of 4-tuple, " ++ e - (_, _, Left e, _) -> Left $ "in 3rd of 4-tuple, " ++ e - (_, _, _, Left e) -> Left $ "in 4th of 4-tuple, " ++ e - } - -xp5Tuple :: PU [n] a -> PU [n] b -> PU [n] c -> PU [n] d -> PU [n] e -> PU [n] (a, b, c, d, e) -xp5Tuple pa pb pc pd pe = XMLPU - { root = listToMaybe $ catMaybes [root pa, root pb, root pc, root pd, root pe] - , pickleTree = \(a, b, c, d, e) -> - concat [pickleTree pa a, pickleTree pb b, pickleTree pc c, pickleTree pd d, pickleTree pe e] - , unpickleTree = \t -> - case (unpickleTree pa t, unpickleTree pb t, unpickleTree pc t, - unpickleTree pd t, unpickleTree pe t) of - (Right a, Right b, Right c, Right d, Right e) -> Right (a, b, c, d, e) - (Left e, _, _, _, _) -> Left $ "in 1st of 5-tuple, " ++ e - (_, Left e, _, _, _) -> Left $ "in 2nd of 5-tuple, " ++ e - (_, _, Left e, _, _) -> Left $ "in 3rd of 5-tuple, " ++ e - (_, _, _, Left e, _) -> Left $ "in 4th of 5-tuple, " ++ e - (_, _, _, _, Left e) -> Left $ "in 5th of 5-tuple, " ++ e - } - -xp6Tuple :: Show n => PU [n] a -> PU [n] b -> PU [n] c -> PU [n] d -> PU [n] e -> PU [n] f -> PU [n] (a, b, c, d, e, f) -xp6Tuple pa pb pc pd pe pf = XMLPU - { root = listToMaybe $ catMaybes [root pa, root pb, root pc, root pd, root pe, root pf] - , pickleTree = \(a, b, c, d, e, f) -> - concat [pickleTree pa a, pickleTree pb b, pickleTree pc c, pickleTree pd d, pickleTree pe e, pickleTree pf f] - , unpickleTree = \t -> - case (unpickleTree pa t, unpickleTree pb t, unpickleTree pc t, - unpickleTree pd t, unpickleTree pe t, unpickleTree pf t) of - (Right a, Right b, Right c, Right d, Right e', Right f) -> Right (a, b, c, d, e', f) - (Left e, _, _, _, _, _) -> Left $ "in 1st of 6-tuple, " ++ e - (_, Left e, _, _, _, _) -> Left $ "in 2nd of 6-tuple, " ++ e - (_, _, Left e, _, _, _) -> Left $ "in 3rd of 6-tuple, " ++ e - (_, _, _, Left e, _, _) -> Left $ "in 4th of 6-tuple, " ++ e - (_, _, _, _, Left e, _) -> Left $ "in 5th of 6-tuple, " ++ e - (_, _, _, _, _, Left e) -> Left $ "in 6th of 6-tuple, " ++ e - } - -xp7Tuple :: Show n => PU [n] a -> PU [n] b -> PU [n] c -> PU [n] d -> PU [n] e -> PU [n] f -> PU [n] g -> PU [n] (a, b, c, d, e, f, g) -xp7Tuple pa pb pc pd pe pf pg = XMLPU - { root = listToMaybe $ catMaybes [root pa, root pb, root pc, root pd, root pe, root pf, root pg] - , pickleTree = \(a, b, c, d, e, f, g) -> - concat [pickleTree pa a, pickleTree pb b, pickleTree pc c, pickleTree pd d, pickleTree pe e, pickleTree pf f, pickleTree pg g] - , unpickleTree = \t -> - case (unpickleTree pa t, unpickleTree pb t, unpickleTree pc t, - unpickleTree pd t, unpickleTree pe t, unpickleTree pf t, unpickleTree pg t) of - (Right a, Right b, Right c, Right d, Right e', Right f, Right g) -> Right (a, b, c, d, e', f, g) - (Left e, _, _, _, _, _, _) -> Left $ "in 1st of 7-tuple, " ++ e - (_, Left e, _, _, _, _, _) -> Left $ "in 2nd of 7-tuple, " ++ e - (_, _, Left e, _, _, _, _) -> Left $ "in 3rd of 7-tuple, " ++ e - (_, _, _, Left e, _, _, _) -> Left $ "in 4th of 7-tuple, " ++ e - (_, _, _, _, Left e, _, _) -> Left $ "in 5th of 7-tuple, " ++ e - (_, _, _, _, _, Left e, _) -> Left $ "in 6th of 7-tuple, " ++ e - (_, _, _, _, _, _, Left e) -> Left $ "in 7th of 7-tuple, " ++ e - } - -xpUnit :: PU [n] () -xpUnit = xpLift () - -xpLift :: a -> PU [n] a -xpLift a = XMLPU - { root = Nothing - , pickleTree = const [] - , unpickleTree = const $ Right a - } - -xpEmpty :: (Read a, Show a) => Maybe ByteString -> PU [Node] a -xpEmpty mns = XMLPU - { root = Nothing - , pickleTree = \x -> [Element (name x) [] []] - , unpickleTree = \t -> case t of - [(Element n _ _)] -> let s = BS.unpack $ nnLocalPart n - in case reads s of - [(x, "")] -> Right x - _ -> Left $ "failed to read: " ++ s - l -> Left $ "expected empty element, got: " ++ show l - } - where - name x = maybe (mkAnNName local) (`mkNName` local) mns - where - local = BS.pack $ show x - -xpConst :: Show a => ByteString -> a -> XMLPU [Node] a -xpConst ns val = XMLPU - { root = Just name - , pickleTree = const [Element name [] []] - , unpickleTree = const $ Right val - } - where - name = mkNName ns . BS.pack $ show val - -xpText :: PU ByteString ByteString -xpText = XMLPU - { root = Nothing - , pickleTree = id - , unpickleTree = \t -> if BS.null t then Left "empty text" else Right t - } - -xpText0 :: PU ByteString ByteString -xpText0 = XMLPU - { root = Nothing - , pickleTree = id - , unpickleTree = Right - } - -xpContent :: PU ByteString a -> PU [Node] a -xpContent pu = XMLPU - { root = root pu - , pickleTree = \t -> - let txt = pickleTree pu t - in if gxNullString txt then [] else [Text txt] - , unpickleTree = unpickleTree pu . mconcat . map extract - } - where - extract (Element _ _ cs) = mconcat $ map extract cs - extract (Text txt) = txt - --- --- Instances --- - -instance IsXML a => IsXML (Maybe a) where - xmlPickler = xpOption xmlPickler - -instance (IsXML a, IsXML b) => IsXML (Either a b) where - xmlPickler = xmlPickler `xpEither` xmlPickler - -instance IsXML Int where - xmlPickler = xpContent xpPrim - -instance IsXML Integer where - xmlPickler = xpContent xpPrim - -instance IsXML Double where - xmlPickler = xpContent xpPrim - -instance IsXML Float where - xmlPickler = xpContent xpPrim - -instance IsXML ByteString where - xmlPickler = xpContent xpText - -instance IsXML Text where - xmlPickler = (decodeUtf8, encodeUtf8) `xpWrap` xmlPickler - --- --- Qualified Prefix Hack --- - -fromQualified :: (NodeClass n c, GenericXMLString text) - => n c (QName text) text - -> n c text text -fromQualified = mapAllTags tag - where - tag (QName Nothing local) = local - tag (QName (Just prefix) local) - | prefix == xmlns = prefix - | otherwise = local diff --git a/test/Main.hs b/test/Main.hs deleted file mode 100644 index f8c116084c3..00000000000 --- a/test/Main.hs +++ /dev/null @@ -1,34 +0,0 @@ --- Module : Main --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Main (main) where - -import qualified Test.Route53 as R53 -import qualified Test.S3 as S3 -import Test.Tasty - --- -- import qualified Test.AutoScaling as AutoScaling --- --import qualified Test.EC2 as EC2 --- -- import qualified Test.Signing as Signing - -main :: IO () -main = defaultMain $ testGroup "Amazonka" - [ R53.tests - , S3.tests --- , AutoScaling.tests - ] - --- -- testGroup "EC2" EC2.tests --- -- , testGroup "IAM" IAM.tests --- -- , testGroup "CloudWatch" CloudWatch.tests --- -- , testGroup "OpsWorks" OpsWorks.tests --- -- , testGroup "S3" S3.tests --- -- , testGroup "Signing" Signing.tests --- ] diff --git a/test/Test/Arbitrary.hs b/test/Test/Arbitrary.hs deleted file mode 100644 index 6164178b1df..00000000000 --- a/test/Test/Arbitrary.hs +++ /dev/null @@ -1,75 +0,0 @@ -{-# LANGUAGE TemplateHaskell #-} - -{-# OPTIONS_GHC -fno-warn-orphans #-} - --- Module : Test.Arbitrary --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Test.Arbitrary where - -import Control.Applicative -import Data.Aeson -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import Data.DeriveTH -import Data.Text (Text) -import qualified Data.Text as Text -import Data.Time -import qualified Data.Vector as V -import Network.AWS.Internal -import Test.Tasty.QuickCheck - -instance Arbitrary ByteString where - arbitrary = fmap BS.pack . listOf1 $ oneof - [ choose ('\48', '\57') - , choose ('\65', '\90') - , choose ('\97', '\122') - ] - -instance Arbitrary Text where - arbitrary = fmap Text.pack . listOf1 $ oneof - [ choose ('\48', '\57') - , choose ('\65', '\90') - , choose ('\97', '\122') - ] - -instance Arbitrary UTCTime where - arbitrary = flip UTCTime 0 <$> arbitrary - shrink ut@(UTCTime day dayTime) = - [ut { utctDay = d' } | d' <- shrink day ] ++ - [ut { utctDayTime = t' } | t' <- shrink dayTime] - -instance Arbitrary Day where - arbitrary = ModifiedJulianDay <$> (2000 +) <$> arbitrary - shrink = (ModifiedJulianDay <$>) . shrink . toModifiedJulianDay - -instance Arbitrary DiffTime where - arbitrary = fromRational . toRational <$> choose (0 :: Double, 86400) - shrink = shrinkRealFrac - -instance ToJSON Region where - toJSON = String . Text.pack . show - -instance ToJSON InstanceType where - toJSON = String . Text.pack . show - -instance ToJSON a => ToJSON (Members a) where - toJSON = Array . V.fromList . fmap toJSON . members - -instance ToJSON a => ToJSON (Items a) where - toJSON = Array . V.fromList . fmap toJSON . items - -$(derives [makeArbitrary] - [ ''Region - , ''InstanceType - , ''Members - , ''Items - ]) - diff --git a/test/Test/AutoScaling.hs b/test/Test/AutoScaling.hs deleted file mode 100644 index 202c5f661f0..00000000000 --- a/test/Test/AutoScaling.hs +++ /dev/null @@ -1,212 +0,0 @@ -{-# LANGUAGE TemplateHaskell #-} - -{-# OPTIONS_GHC -fno-warn-orphans #-} - --- Module : Test.AutoScaling --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Test.AutoScaling (tests) where - -import qualified Data.Text as Text -import Network.AWS.AutoScaling -import Test.Common - -tests :: [Test] -tests = (:[]) $ testVersion autoScalingVersion - [ testGroup "Requests" - [ testProperty "CreateAutoScalingGroup" (prop :: TRq CreateAutoScalingGroup) - , testProperty "CreateLaunchConfiguration" (prop :: TRq CreateLaunchConfiguration) - , testProperty "CreateOrUpdateTags" (prop :: TRq CreateOrUpdateTags) - , testProperty "DeleteAutoScalingGroup" (prop :: TRq DeleteAutoScalingGroup) - , testProperty "DeleteLaunchConfiguration" (prop :: TRq DeleteLaunchConfiguration) - , testProperty "DeleteNotificationConfiguration" (prop :: TRq DeleteNotificationConfiguration) - , testProperty "DeletePolicy" (prop :: TRq DeletePolicy) - , testProperty "DeleteScheduledAction" (prop :: TRq DeleteScheduledAction) - , testProperty "DeleteTags" (prop :: TRq DeleteTags) - , testProperty "DescribeAdjustmentTypes" (prop :: TRq DescribeAdjustmentTypes) - , testProperty "DescribeAutoScalingGroups" (prop :: TRq DescribeAutoScalingGroups) - , testProperty "DescribeAutoScalingInstances" (prop :: TRq DescribeAutoScalingInstances) - , testProperty "DescribeAutoScalingNotificationTypes" (prop :: TRq DescribeAutoScalingNotificationTypes) - , testProperty "DescribeLaunchConfigurations" (prop :: TRq DescribeLaunchConfigurations) - , testProperty "DescribeMetricCollectionTypes" (prop :: TRq DescribeMetricCollectionTypes) - , testProperty "DescribeNotificationConfigurations" (prop :: TRq DescribeNotificationConfigurations) - , testProperty "DescribePolicies" (prop :: TRq DescribePolicies) - , testProperty "DescribeScalingActivities" (prop :: TRq DescribeScalingActivities) - , testProperty "DescribeScalingProcessTypes" (prop :: TRq DescribeScalingProcessTypes) - , testProperty "DescribeScheduledActions" (prop :: TRq DescribeScheduledActions) - , testProperty "DescribeTags" (prop :: TRq DescribeTags) - , testProperty "DescribeTerminationPolicyTypes" (prop :: TRq DescribeTerminationPolicyTypes) - , testProperty "DisableMetricsCollection" (prop :: TRq DisableMetricsCollection) - , testProperty "EnableMetricsCollection" (prop :: TRq EnableMetricsCollection) - , testProperty "ExecutePolicy" (prop :: TRq ExecutePolicy) - , testProperty "PutNotificationConfiguration" (prop :: TRq PutNotificationConfiguration) - , testProperty "PutScalingPolicy" (prop :: TRq PutScalingPolicy) - , testProperty "PutScheduledUpdateGroupAction" (prop :: TRq PutScheduledUpdateGroupAction) - , testProperty "ResumeProcesses" (prop :: TRq ResumeProcesses) - , testProperty "SetDesiredCapacity" (prop :: TRq SetDesiredCapacity) - , testProperty "SetInstanceHealth" (prop :: TRq SetInstanceHealth) - , testProperty "SuspendProcesses" (prop :: TRq SuspendProcesses) - , testProperty "TerminateInstanceInAutoScalingGroup" (prop :: TRq TerminateInstanceInAutoScalingGroup) - , testProperty "UpdateAutoScalingGroup" (prop :: TRq UpdateAutoScalingGroup) - ] - - , testGroup "Responses" - [ testProperty "CreateAutoScalingGroupResponse" (prop :: TRs CreateAutoScalingGroupResponse) - , testProperty "CreateLaunchConfigurationResponse" (prop :: TRs CreateLaunchConfigurationResponse) - , testProperty "CreateOrUpdateTagsResponse" (prop :: TRs CreateOrUpdateTagsResponse) - , testProperty "DeleteAutoScalingGroupResponse" (prop :: TRs DeleteAutoScalingGroupResponse) - , testProperty "DeleteLaunchConfigurationResponse" (prop :: TRs DeleteLaunchConfigurationResponse) - , testProperty "DeleteNotificationConfigurationResponse" (prop :: TRs DeleteNotificationConfigurationResponse) - , testProperty "DeletePolicyResponse" (prop :: TRs DeletePolicyResponse) - , testProperty "DeleteScheduledActionResponse" (prop :: TRs DeleteScheduledActionResponse) - , testProperty "DeleteTagsResponse" (prop :: TRs DeleteTagsResponse) - , testProperty "DescribeAdjustmentTypesResponse" (prop :: TRs DescribeAdjustmentTypesResponse) - -- , testProperty "DescribeAutoScalingGroupsResponse" (prop :: TRs DescribeAutoScalingGroupsResponse) - , testProperty "DescribeAutoScalingInstancesResponse" (prop :: TRs DescribeAutoScalingInstancesResponse) - , testProperty "DescribeAutoScalingNotificationTypesResponse" (prop :: TRs DescribeAutoScalingNotificationTypesResponse) - , testProperty "DescribeLaunchConfigurationsResponse" (prop :: TRs DescribeLaunchConfigurationsResponse) - , testProperty "DescribeMetricCollectionTypesResponse" (prop :: TRs DescribeMetricCollectionTypesResponse) - , testProperty "DescribeNotificationConfigurationsResponse" (prop :: TRs DescribeNotificationConfigurationsResponse) - , testProperty "DescribePoliciesResponse" (prop :: TRs DescribePoliciesResponse) - , testProperty "DescribeScalingActivitiesResponse" (prop :: TRs DescribeScalingActivitiesResponse) - , testProperty "DescribeScalingProcessTypesResponse" (prop :: TRs DescribeScalingProcessTypesResponse) - , testProperty "DescribeScheduledActionsResponse" (prop :: TRs DescribeScheduledActionsResponse) - , testProperty "DescribeTagsResponse" (prop :: TRs DescribeTagsResponse) - , testProperty "DescribeTerminationPolicyTypesResponse" (prop :: TRs DescribeTerminationPolicyTypesResponse) - , testProperty "DisableMetricsCollectionResponse" (prop :: TRs DisableMetricsCollectionResponse) - , testProperty "EnableMetricsCollectionResponse" (prop :: TRs EnableMetricsCollectionResponse) - , testProperty "ExecutePolicyResponse" (prop :: TRs ExecutePolicyResponse) - , testProperty "PutNotificationConfigurationResponse" (prop :: TRs PutNotificationConfigurationResponse) - , testProperty "PutScalingPolicyResponse" (prop :: TRs PutScalingPolicyResponse) - , testProperty "PutScheduledUpdateGroupActionResponse" (prop :: TRs PutScheduledUpdateGroupActionResponse) - , testProperty "ResumeProcessesResponse" (prop :: TRs ResumeProcessesResponse) - , testProperty "SetDesiredCapacityResponse" (prop :: TRs SetDesiredCapacityResponse) - , testProperty "SetInstanceHealthResponse" (prop :: TRs SetInstanceHealthResponse) - , testProperty "SuspendProcessesResponse" (prop :: TRs SuspendProcessesResponse) - , testProperty "TerminateInstanceInAutoScalingGroupResponse" (prop :: TRs TerminateInstanceInAutoScalingGroupResponse) - , testProperty "UpdateAutoScalingGroupResponse" (prop :: TRs UpdateAutoScalingGroupResponse) - ] - ] - -instance ToJSON AdjustmentType where - toJSON = stringify . show - -$(deriveArbitrary - [ ''AdjustmentType - ]) - -$(deriveDependency - [ ''Activity - , ''Alarm - , ''AutoScalingGroup - , ''AutoScalingInstanceDetails - , ''BlockDeviceMapping - , ''DescribeAdjustmentTypesResult - , ''DescribeAutoScalingGroupsResult - , ''DescribeAutoScalingInstancesResult - , ''DescribeAutoScalingNotificationTypesResult - , ''DescribeLaunchConfigurationsResult - , ''DescribeMetricCollectionTypesResult - , ''DescribeNotificationConfigurationsResult - , ''DescribePoliciesResult - , ''DescribeScalingActivitiesResult - , ''DescribeScalingProcessTypesResult - , ''DescribeScheduledActionsResult - , ''DescribeTagsResult - , ''DescribeTerminationPolicyTypesResult - , ''Ebs - , ''EnabledMetric - , ''Filter - , ''Instance - , ''InstanceMonitoring - , ''LaunchConfiguration - , ''MetricCollectionType - , ''MetricGranularityType - , ''NotificationConfiguration - , ''ProcessType - , ''PutScalingPolicyResult - , ''ScalingPolicy - , ''ScheduledUpdateGroupAction - , ''SuspendedProcess - , ''Tag - , ''TerminateInstanceInAutoScalingGroupResult - , ''ResponseMetadata - ]) - -$(deriveProperty "test/resources/AutoScaling" - [ ''CreateAutoScalingGroup - , ''CreateAutoScalingGroupResponse - , ''CreateLaunchConfiguration - , ''CreateLaunchConfigurationResponse - , ''CreateOrUpdateTags - , ''CreateOrUpdateTagsResponse - , ''DeleteAutoScalingGroup - , ''DeleteAutoScalingGroupResponse - , ''DeleteLaunchConfiguration - , ''DeleteLaunchConfigurationResponse - , ''DeleteNotificationConfiguration - , ''DeleteNotificationConfigurationResponse - , ''DeletePolicy - , ''DeletePolicyResponse - , ''DeleteScheduledAction - , ''DeleteScheduledActionResponse - , ''DeleteTags - , ''DeleteTagsResponse - , ''DescribeAdjustmentTypes - , ''DescribeAdjustmentTypesResponse - , ''DescribeAutoScalingGroups - , ''DescribeAutoScalingGroupsResponse - , ''DescribeAutoScalingInstances - , ''DescribeAutoScalingInstancesResponse - , ''DescribeAutoScalingNotificationTypes - , ''DescribeAutoScalingNotificationTypesResponse - , ''DescribeLaunchConfigurations - , ''DescribeLaunchConfigurationsResponse - , ''DescribeMetricCollectionTypes - , ''DescribeMetricCollectionTypesResponse - , ''DescribeNotificationConfigurations - , ''DescribeNotificationConfigurationsResponse - , ''DescribePolicies - , ''DescribePoliciesResponse - , ''DescribeScalingActivities - , ''DescribeScalingActivitiesResponse - , ''DescribeScalingProcessTypes - , ''DescribeScalingProcessTypesResponse - , ''DescribeScheduledActions - , ''DescribeScheduledActionsResponse - , ''DescribeTags - , ''DescribeTagsResponse - , ''DescribeTerminationPolicyTypes - , ''DescribeTerminationPolicyTypesResponse - , ''DisableMetricsCollection - , ''DisableMetricsCollectionResponse - , ''EnableMetricsCollection - , ''EnableMetricsCollectionResponse - , ''ExecutePolicy - , ''ExecutePolicyResponse - , ''PutNotificationConfiguration - , ''PutNotificationConfigurationResponse - , ''PutScalingPolicy - , ''PutScalingPolicyResponse - , ''PutScheduledUpdateGroupAction - , ''PutScheduledUpdateGroupActionResponse - , ''ResumeProcesses - , ''ResumeProcessesResponse - , ''SetDesiredCapacity - , ''SetDesiredCapacityResponse - , ''SetInstanceHealth - , ''SetInstanceHealthResponse - , ''SuspendProcesses - , ''SuspendProcessesResponse - , ''TerminateInstanceInAutoScalingGroup - , ''TerminateInstanceInAutoScalingGroupResponse - , ''UpdateAutoScalingGroup - , ''UpdateAutoScalingGroupResponse - ]) diff --git a/test/Test/Common.hs b/test/Test/Common.hs deleted file mode 100644 index 321f94a5a65..00000000000 --- a/test/Test/Common.hs +++ /dev/null @@ -1,205 +0,0 @@ -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE GADTs #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} - --- Module : Test.Common --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Test.Common - ( - -- * Group Tests - testVersion - - -- * Properties - , TRq - , TRs - , prop - , qc - - -- * Aeson - , ToJSON (..) - , FromJSON (..) - , Value (..) - , stringify - - -- * Re-exported Modules - , module Test.TH - , module Test.Tasty - , module Test.Tasty.QuickCheck - ) where - -import qualified Algorithms.NaturalSort as Nat -import Control.Applicative -import Control.Monad ((<=<)) -import Data.Aeson (ToJSON(..), FromJSON(..), Value(..)) -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import qualified Data.ByteString.Lazy as LBS -import Data.List ((\\), sortBy) -import Data.Maybe -import Data.Monoid -import qualified Data.Text as Text -import qualified Data.Text.Encoding as Text -import qualified Data.Text.Lazy.Builder as LText -import qualified Data.Text.Lazy.Encoding as LText -import qualified Data.Text.Lazy.IO as LText -import Network.AWS.Internal -import qualified Network.Http.Internal as Client -import System.IO.Unsafe (unsafePerformIO) -import Test.Arbitrary () -import Test.TH -import Test.Tasty -import Test.Tasty.QuickCheck -import qualified Text.EDE as EDE - -testVersion :: Service -> [TestTree] -> TestTree -testVersion svc = testGroup . BS.unpack $ mconcat - ["***** [", svcName svc, "] [", svcVersion svc, "] *****"] - -qc :: Testable a => TestName -> a -> TestTree -qc = testProperty - -class TestProperty a where - prop :: a -> Bool - -type TRq a = TestRequest a -> Bool -type TRs a = TestResponse a -> Bool - -data TestRequest a = TestRequest - { trqRequest :: !a - , trqSigned :: !Signed - , trqEncoded :: !ByteString - , trqTemplate :: Either String ByteString - , trqDiff :: [String] - , trqJSON :: !Value - } - -instance (Eq a, Arbitrary a) => TestProperty (TestRequest a) where - prop = all null . trqDiff - -instance (Eq a, Show a, Arbitrary a, Template a, ToJSON a, Rq a) - => Arbitrary (TestRequest a) where - arbitrary = do - rq <- arbitrary - let Right raw = unsafePerformIO . runAWS creds False $ request rq - enc = encode raw - tmpl = render (template rq) (toJSON rq) - diff = difference tmpl enc - return $ TestRequest rq raw enc tmpl diff (toJSON rq) - where - encode Signed{..} = BS.unlines $ filter (not . BS.null) - [ BS.pack (show rqMethod) <> " " <> rqPath - , BS.intercalate "\n" . map join $ sortBy sort rqQuery - , fromMaybe "" $ Client.lookupHeader (Client.qHeaders sRequest) "content-type" - , body - ] - where - Request{..} = sMeta - body = case sBody of - Strict bs -> bs - _ -> "" - - creds = FromKeys "access" "secret" - - join (k, v) = k <> "=" <> v - sort x y = Nat.compare (Text.decodeUtf8 $ fst x) (Text.decodeUtf8 $ fst y) - -instance Show a => Show (TestRequest a) where - show TestRequest{..} = unlines $ - [ "[Request]" - , show trqRequest - , "" - , "[JSON]" - , show trqJSON - , "" - , "[Signed]" - , show trqSigned - , "" - , "[Actual]" - , formatBS trqEncoded - , "[Expected]" - , formatBS $ either BS.pack id trqTemplate - , "[Diff]" - , if all null trqDiff then "" else formatLines trqDiff - ] - -data TestResponse a = TestResponse - { trsResponse :: !a - , trsParsed :: Either String a - , trsTemplate :: Either String ByteString - , trsXML :: ByteString - , trsDiff :: [String] - , trsJSON :: !Value - } - -instance (Eq a, Arbitrary a) => TestProperty (TestResponse a) where - prop TestResponse{..} = either (const False) (== trsResponse) trsParsed - -instance (Eq a, Show a, Arbitrary a, Template a, IsXML a, ToJSON a) - => Arbitrary (TestResponse a) where - arbitrary = do - rsp <- arbitrary - let xml = toIndentedXML 2 rsp - json = toJSON rsp - tmpl = render (template rsp) json - diff = difference tmpl xml - return $ TestResponse rsp (tmpl >>= fromXML) tmpl xml diff json - -instance Show a => Show (TestResponse a) where - show TestResponse{..} = unlines - [ "[Response]" - , show trsResponse - , "" - , "[Parsed]" - , show trsParsed - , "" - , "[JSON]" - , show trsJSON - , "" - , "[Actual]" - , formatBS trsXML - , "[Expected]" - , formatBS $ either BS.pack id trsTemplate - , "[Diff]" - , if all null trsDiff then "" else formatLines trsDiff - ] - -formatBS :: ByteString -> String -formatBS = formatLines . lines . BS.unpack - -formatLines :: [String] -> String -formatLines = concatMap fmt - . takeWhile (not . null . snd) - . dropWhile (null . snd) - . zipWith (,) ([1..] :: [Int]) - where - fmt (n, s) = show n ++ ": " ++ s ++ "\n" - -difference :: Either String ByteString -> ByteString -> [String] -difference x y = zipWithTail (normalise $ either (const "") id x) (normalise y) - where - normalise = map (BS.unpack . BS.unwords . BS.words) . BS.lines - - zipWithTail (a:as) (b:bs) = twoWay b a : zipWithTail as bs - zipWithTail [] bs = bs - zipWithTail as _ = as - - twoWay a b = (a \\ b) ++ (b \\ a) - -stringify :: Show a => a -> Value -stringify = String . Text.pack . show - -render :: FilePath -> Value -> Either String ByteString -render tmpl (Object o) = f <$> unsafePerformIO g - where - f = LBS.toStrict . LText.encodeUtf8 . LText.toLazyText - g = (EDE.eitherRender o <=< EDE.eitherParse) <$> LText.readFile tmpl -render tmpl _ = Right . unsafePerformIO $ BS.readFile tmpl diff --git a/test/Test/EC2.hs b/test/Test/EC2.hs deleted file mode 100644 index 274aaef9398..00000000000 --- a/test/Test/EC2.hs +++ /dev/null @@ -1,677 +0,0 @@ -{-# LANGUAGE TemplateHaskell #-} - -{-# OPTIONS_GHC -fno-warn-orphans #-} - --- Module : Test.EC2 --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Test.EC2 (tests) where - -import Network.AWS.EC2 -import Test.Common - -tests :: [Test] -tests = (:[]) $ testVersion ec2Version - [ testGroup "Requests" - [ testProperty "AllocateAddress" (prop :: TRq AllocateAddress) - -- , testProperty "AssignPrivateIpAddresses" (prop :: TRq AssignPrivateIpAddresses) - -- , testProperty "AssociateAddress" (prop :: TRq AssociateAddress) - -- , testProperty "AssociateDhcpOptions" (prop :: TRq AssociateDhcpOptions) - -- , testProperty "AssociateRouteTable" (prop :: TRq AssociateRouteTable) - -- , testProperty "AttachInternetGateway" (prop :: TRq AttachInternetGateway) - -- , testProperty "AttachNetworkInterface" (prop :: TRq AttachNetworkInterface) - -- , testProperty "AttachVolume" (prop :: TRq AttachVolume) - -- , testProperty "AttachVpnGateway" (prop :: TRq AttachVpnGateway) - -- , testProperty "AuthorizeSecurityGroupEgress" (prop :: TRq AuthorizeSecurityGroupEgress) - -- , testProperty "AuthorizeSecurityGroupIngress" (prop :: TRq AuthorizeSecurityGroupIngress) - -- , testProperty "BundleInstance" (prop :: TRq BundleInstance) - -- , testProperty "CancelBundleTask" (prop :: TRq CancelBundleTask) - -- , testProperty "CancelConversionTask" (prop :: TRq CancelConversionTask) - -- , testProperty "CancelExportTask" (prop :: TRq CancelExportTask) - -- , testProperty "CancelReservedInstancesListing" (prop :: TRq CancelReservedInstancesListing) - -- , testProperty "CancelSpotInstanceRequests" (prop :: TRq CancelSpotInstanceRequests) - - -- , testProperty "ConfirmProductInstance" (prop :: TRq ConfirmProductInstance) - -- , testProperty "CopyImage" (prop :: TRq CopyImage) - -- , testProperty "CopySnapshot" (prop :: TRq CopySnapshot) - -- , testProperty "CreateCustomerGateway" (prop :: TRq CreateCustomerGateway) - -- , testProperty "CreateDhcpOptions" (prop :: TRq CreateDhcpOptions) - -- , testProperty "CreateImage" (prop :: TRq CreateImage) - -- , testProperty "CreateInstanceExportTask" (prop :: TRq CreateInstanceExportTask) - -- , testProperty "CreateInternetGateway" (prop :: TRq CreateInternetGateway) - -- , testProperty "CreateKeyPair" (prop :: TRq CreateKeyPair) - -- , testProperty "CreateNetworkAcl" (prop :: TRq CreateNetworkAcl) - -- , testProperty "CreateNetworkAclEntry" (prop :: TRq CreateNetworkAclEntry) - -- , testProperty "CreateNetworkInterface" (prop :: TRq CreateNetworkInterface) - -- , testProperty "CreatePlacementGroup" (prop :: TRq CreatePlacementGroup) - -- , testProperty "CreateReservedInstancesListing" (prop :: TRq CreateReservedInstancesListing) - -- , testProperty "CreateRoute" (prop :: TRq CreateRoute) - -- , testProperty "CreateRouteTable" (prop :: TRq CreateRouteTable) - , testProperty "CreateSecurityGroup" (prop :: TRq CreateSecurityGroup) - -- , testProperty "CreateSnapshot" (prop :: TRq CreateSnapshot) - -- , testProperty "CreateSpotDatafeedSubscription" (prop :: TRq CreateSpotDatafeedSubscription) - -- , testProperty "CreateSubnet" (prop :: TRq CreateSubnet) - -- , testProperty "CreateTags" (prop :: TRq CreateTags) - -- , testProperty "CreateVolume" (prop :: TRq CreateVolume) - -- , testProperty "CreateVpc" (prop :: TRq CreateVpc) - -- , testProperty "CreateVpnConnection" (prop :: TRq CreateVpnConnection) - -- , testProperty "CreateVpnConnectionRoute" (prop :: TRq CreateVpnConnectionRoute) - -- , testProperty "CreateVpnGateway" (prop :: TRq CreateVpnGateway) - -- , testProperty "DeleteCustomerGateway" (prop :: TRq DeleteCustomerGateway) - -- , testProperty "DeleteDhcpOptions" (prop :: TRq DeleteDhcpOptions) - -- , testProperty "DeleteInternetGateway" (prop :: TRq DeleteInternetGateway) - -- , testProperty "DeleteKeyPair" (prop :: TRq DeleteKeyPair) - -- , testProperty "DeleteNetworkAcl" (prop :: TRq DeleteNetworkAcl) - -- , testProperty "DeleteNetworkAclEntry" (prop :: TRq DeleteNetworkAclEntry) - -- , testProperty "DeleteNetworkInterface" (prop :: TRq DeleteNetworkInterface) - -- , testProperty "DeletePlacementGroup" (prop :: TRq DeletePlacementGroup) - -- , testProperty "DeleteRoute" (prop :: TRq DeleteRoute) - -- , testProperty "DeleteRouteTable" (prop :: TRq DeleteRouteTable) - , testProperty "DeleteSecurityGroup" (prop :: TRq DeleteSecurityGroup) - -- , testProperty "DeleteSnapshot" (prop :: TRq DeleteSnapshot) - -- , testProperty "DeleteSpotDatafeedSubscription" (prop :: TRq DeleteSpotDatafeedSubscription) - -- , testProperty "DeleteSubnet" (prop :: TRq DeleteSubnet) - -- , testProperty "DeleteTags" (prop :: TRq DeleteTags) - -- , testProperty "DeleteVolume" (prop :: TRq DeleteVolume) - -- , testProperty "DeleteVpc" (prop :: TRq DeleteVpc) - -- , testProperty "DeleteVpnConnection" (prop :: TRq DeleteVpnConnection) - -- , testProperty "DeleteVpnConnectionRoute" (prop :: TRq DeleteVpnConnectionRoute) - -- , testProperty "DeleteVpnGateway" (prop :: TRq DeleteVpnGateway) - -- , testProperty "DeregisterImage" (prop :: TRq DeregisterImage) - -- , testProperty "DescribeAccountAttributes" (prop :: TRq DescribeAccountAttributes) - -- , testProperty "DescribeAddresses" (prop :: TRq DescribeAddresses) - -- , testProperty "DescribeAvailabilityZones" (prop :: TRq DescribeAvailabilityZones) - -- , testProperty "DescribeBundleTasks" (prop :: TRq DescribeBundleTasks) - -- , testProperty "DescribeConversionTasks" (prop :: TRq DescribeConversionTasks) - -- , testProperty "DescribeCustomerGateways" (prop :: TRq DescribeCustomerGateways) - -- , testProperty "DescribeDhcpOptions" (prop :: TRq DescribeDhcpOptions) - -- , testProperty "DescribeExportTasks" (prop :: TRq DescribeExportTasks) - -- , testProperty "DescribeImageAttribute" (prop :: TRq DescribeImageAttribute) - , testProperty "DescribeImages" (prop :: TRq DescribeImages) - -- , testProperty "DescribeInstanceAttribute" (prop :: TRq DescribeInstanceAttribute) - , testProperty "DescribeInstances" (prop :: TRq DescribeInstances) - -- , testProperty "DescribeInstanceStatus" (prop :: TRq DescribeInstanceStatus) - -- , testProperty "DescribeInternetGateways" (prop :: TRq DescribeInternetGateways) - -- , testProperty "DescribeKeyPairs" (prop :: TRq DescribeKeyPairs) - -- , testProperty "DescribeNetworkAcls" (prop :: TRq DescribeNetworkAcls) - -- , testProperty "DescribeNetworkInterfaceAttribute" (prop :: TRq DescribeNetworkInterfaceAttribute) - -- , testProperty "DescribeNetworkInterfaces" (prop :: TRq DescribeNetworkInterfaces) - -- , testProperty "DescribePlacementGroups" (prop :: TRq DescribePlacementGroups) - -- , testProperty "DescribeRegions" (prop :: TRq DescribeRegions) - -- , testProperty "DescribeReservedInstances" (prop :: TRq DescribeReservedInstances) - -- , testProperty "DescribeReservedInstancesListings" (prop :: TRq DescribeReservedInstancesListings) - -- , testProperty "DescribeReservedInstancesOfferings" (prop :: TRq DescribeReservedInstancesOfferings) - -- , testProperty "DescribeRouteTables" (prop :: TRq DescribeRouteTables) - , testProperty "DescribeSecurityGroups" (prop :: TRq DescribeSecurityGroups) - -- , testProperty "DescribeSnapshotAttribute" (prop :: TRq DescribeSnapshotAttribute) - -- , testProperty "DescribeSnapshots" (prop :: TRq DescribeSnapshots) - -- , testProperty "DescribeSpotDatafeedSubscription" (prop :: TRq DescribeSpotDatafeedSubscription) - -- , testProperty "DescribeSpotInstanceRequests" (prop :: TRq DescribeSpotInstanceRequests) - -- , testProperty "DescribeSpotPriceHistory" (prop :: TRq DescribeSpotPriceHistory) - -- , testProperty "DescribeSubnets" (prop :: TRq DescribeSubnets) - , testProperty "DescribeTags" (prop :: TRq DescribeTags) - -- , testProperty "DescribeVolumeAttribute" (prop :: TRq DescribeVolumeAttribute) - -- , testProperty "DescribeVolumes" (prop :: TRq DescribeVolumes) - -- , testProperty "DescribeVolumeStatus" (prop :: TRq DescribeVolumeStatus) - -- , testProperty "DescribeVpcAttribute" (prop :: TRq DescribeVpcAttribute) - -- , testProperty "DescribeVpcs" (prop :: TRq DescribeVpcs) - -- , testProperty "DescribeVpnConnections" (prop :: TRq DescribeVpnConnections) - -- , testProperty "DescribeVpnGateways" (prop :: TRq DescribeVpnGateways) - -- , testProperty "DetachInternetGateway" (prop :: TRq DetachInternetGateway) - -- , testProperty "DetachNetworkInterface" (prop :: TRq DetachNetworkInterface) - -- , testProperty "DetachVolume" (prop :: TRq DetachVolume) - -- , testProperty "DetachVpnGateway" (prop :: TRq DetachVpnGateway) - -- , testProperty "DisableVgwRoutePropagation" (prop :: TRq DisableVgwRoutePropagation) - -- , testProperty "DisassociateAddress" (prop :: TRq DisassociateAddress) - -- , testProperty "DisassociateRouteTable" (prop :: TRq DisassociateRouteTable) - -- , testProperty "EnableVgwRoutePropagation" (prop :: TRq EnableVgwRoutePropagation) - -- , testProperty "EnableVolumeIO" (prop :: TRq EnableVolumeIO) - -- , testProperty "GetConsoleOutput" (prop :: TRq GetConsoleOutput) - -- , testProperty "GetPasswordData" (prop :: TRq GetPasswordData) - -- , testProperty "ImportInstance" (prop :: TRq ImportInstance) - -- , testProperty "ImportKeyPair" (prop :: TRq ImportKeyPair) - -- , testProperty "ImportVolume" (prop :: TRq ImportVolume) - -- , testProperty "ModifyImageAttribute" (prop :: TRq ModifyImageAttribute) - -- , testProperty "ModifyInstanceAttribute" (prop :: TRq ModifyInstanceAttribute) - -- , testProperty "ModifyNetworkInterfaceAttribute" (prop :: TRq ModifyNetworkInterfaceAttribute) - -- , testProperty "ModifySnapshotAttribute" (prop :: TRq ModifySnapshotAttribute) - -- , testProperty "ModifyVolumeAttribute" (prop :: TRq ModifyVolumeAttribute) - -- , testProperty "ModifyVpcAttribute" (prop :: TRq ModifyVpcAttribute) - -- , testProperty "MonitorInstances" (prop :: TRq MonitorInstances) - -- , testProperty "PurchaseReservedInstancesOffering" (prop :: TRq PurchaseReservedInstancesOffering) - -- , testProperty "RebootInstances" (prop :: TRq RebootInstances) - -- , testProperty "RegisterImage" (prop :: TRq RegisterImage) - -- , testProperty "ReleaseAddress" (prop :: TRq ReleaseAddress) - -- , testProperty "ReplaceNetworkAclAssociation" (prop :: TRq ReplaceNetworkAclAssociation) - -- , testProperty "ReplaceNetworkAclEntry" (prop :: TRq ReplaceNetworkAclEntry) - -- , testProperty "ReplaceRoute" (prop :: TRq ReplaceRoute) - -- , testProperty "ReplaceRouteTableAssociation" (prop :: TRq ReplaceRouteTableAssociation) - -- , testProperty "ReportInstanceStatus" (prop :: TRq ReportInstanceStatus) - -- , testProperty "RequestSpotInstances" (prop :: TRq RequestSpotInstances) - -- , testProperty "ResetImageAttribute" (prop :: TRq ResetImageAttribute) - -- , testProperty "ResetInstanceAttribute" (prop :: TRq ResetInstanceAttribute) - -- , testProperty "ResetNetworkInterfaceAttribute" (prop :: TRq ResetNetworkInterfaceAttribute) - -- , testProperty "ResetSnapshotAttribute" (prop :: TRq ResetSnapshotAttribute) - , testProperty "RevokeSecurityGroupEgress" (prop :: TRq RevokeSecurityGroupEgress) - , testProperty "RevokeSecurityGroupIngress" (prop :: TRq RevokeSecurityGroupIngress) - -- , testProperty "RunInstances" (prop :: TRq RunInstances) - -- , testProperty "StartInstances" (prop :: TRq StartInstances) - -- , testProperty "StopInstances" (prop :: TRq StopInstances) - -- , testProperty "TerminateInstances" (prop :: TRq TerminateInstances) - -- , testProperty "UnassignPrivateIpAddresses" (prop :: TRq UnassignPrivateIpAddresses) - -- , testProperty "UnmonitorInstances" (prop :: TRq UnmonitorInstances) - ] - - , testGroup "Responses" - [ testProperty "AllocateAddressResponse" (prop :: TRs AllocateAddressResponse) - -- , testProperty "AssignPrivateIpAddressesResponse" (prop :: TRs AssignPrivateIpAddressesResponse) - -- , testProperty "AssociateAddressResponse" (prop :: TRs AssociateAddressResponse) - -- , testProperty "AssociateDhcpOptionsResponse" (prop :: TRs AssociateDhcpOptionsResponse) - -- , testProperty "AssociateRouteTableResponse" (prop :: TRs AssociateRouteTableResponse) - -- , testProperty "AttachInternetGatewayResponse" (prop :: TRs AttachInternetGatewayResponse) - -- , testProperty "AttachNetworkInterfaceResponse" (prop :: TRs AttachNetworkInterfaceResponse) - -- , testProperty "AttachVolumeResponse" (prop :: TRs AttachVolumeResponse) - -- , testProperty "AttachVpnGatewayResponse" (prop :: TRs AttachVpnGatewayResponse) - -- , testProperty "AuthorizeSecurityGroupEgressResponse" (prop :: TRs AuthorizeSecurityGroupEgressResponse) - -- , testProperty "AuthorizeSecurityGroupIngressResponse" (prop :: TRs AuthorizeSecurityGroupIngressResponse) - -- , testProperty "BundleInstanceResponse" (prop :: TRs BundleInstanceResponse) - -- , testProperty "CancelBundleTaskResponse" (prop :: TRs CancelBundleTaskResponse) - -- , testProperty "CancelConversionTaskResponse" (prop :: TRs CancelConversionTaskResponse) - -- , testProperty "CancelExportTaskResponse" (prop :: TRs CancelExportTaskResponse) - -- , testProperty "CancelReservedInstancesListingResponse" (prop :: TRs CancelReservedInstancesListingResponse) - -- , testProperty "CancelSpotInstanceRequestsResponse" (prop :: TRs CancelSpotInstanceRequestsResponse) - -- , testProperty "ConfirmProductInstanceResponse" (prop :: TRs ConfirmProductInstanceResponse) - -- , testProperty "CopyImageResponse" (prop :: TRs CopyImageResponse) - -- , testProperty "CopySnapshotResponse" (prop :: TRs CopySnapshotResponse) - -- , testProperty "CreateCustomerGatewayResponse" (prop :: TRs CreateCustomerGatewayResponse) - -- , testProperty "CreateDhcpOptionsResponse" (prop :: TRs CreateDhcpOptionsResponse) - -- , testProperty "CreateImageResponse" (prop :: TRs CreateImageResponse) - -- , testProperty "CreateInstanceExportTaskResponse" (prop :: TRs CreateInstanceExportTaskResponse) - -- , testProperty "CreateInternetGatewayResponse" (prop :: TRs CreateInternetGatewayResponse) - -- , testProperty "CreateKeyPairResponse" (prop :: TRs CreateKeyPairResponse) - -- , testProperty "CreateNetworkAclResponse" (prop :: TRs CreateNetworkAclResponse) - -- , testProperty "CreateNetworkAclEntryResponse" (prop :: TRs CreateNetworkAclEntryResponse) - -- , testProperty "CreateNetworkInterfaceResponse" (prop :: TRs CreateNetworkInterfaceResponse) - -- , testProperty "CreatePlacementGroupResponse" (prop :: TRs CreatePlacementGroupResponse) - -- , testProperty "CreateReservedInstancesListingResponse" (prop :: TRs CreateReservedInstancesListingResponse) - -- , testProperty "CreateRouteResponse" (prop :: TRs CreateRouteResponse) - -- , testProperty "CreateRouteTableResponse" (prop :: TRs CreateRouteTableResponse) - , testProperty "CreateSecurityGroupResponse" (prop :: TRs CreateSecurityGroupResponse) - -- , testProperty "CreateSnapshotResponse" (prop :: TRs CreateSnapshotResponse) - -- , testProperty "CreateSpotDatafeedSubscriptionResponse" (prop :: TRs CreateSpotDatafeedSubscriptionResponse) - -- , testProperty "CreateSubnetResponse" (prop :: TRs CreateSubnetResponse) - -- , testProperty "CreateTagsResponse" (prop :: TRs CreateTagsResponse) - -- , testProperty "CreateVolumeResponse" (prop :: TRs CreateVolumeResponse) - -- , testProperty "CreateVpcResponse" (prop :: TRs CreateVpcResponse) - -- , testProperty "CreateVpnConnectionResponse" (prop :: TRs CreateVpnConnectionResponse) - -- , testProperty "CreateVpnConnectionRouteResponse" (prop :: TRs CreateVpnConnectionRouteResponse) - -- , testProperty "CreateVpnGatewayResponse" (prop :: TRs CreateVpnGatewayResponse) - -- , testProperty "DeleteCustomerGatewayResponse" (prop :: TRs DeleteCustomerGatewayResponse) - -- , testProperty "DeleteDhcpOptionsResponse" (prop :: TRs DeleteDhcpOptionsResponse) - -- , testProperty "DeleteInternetGatewayResponse" (prop :: TRs DeleteInternetGatewayResponse) - -- , testProperty "DeleteKeyPairResponse" (prop :: TRs DeleteKeyPairResponse) - -- , testProperty "DeleteNetworkAclResponse" (prop :: TRs DeleteNetworkAclResponse) - -- , testProperty "DeleteNetworkAclEntryResponse" (prop :: TRs DeleteNetworkAclEntryResponse) - -- , testProperty "DeleteNetworkInterfaceResponse" (prop :: TRs DeleteNetworkInterfaceResponse) - -- , testProperty "DeletePlacementGroupResponse" (prop :: TRs DeletePlacementGroupResponse) - -- , testProperty "DeleteRouteResponse" (prop :: TRs DeleteRouteResponse) - -- , testProperty "DeleteRouteTableResponse" (prop :: TRs DeleteRouteTableResponse) - , testProperty "DeleteSecurityGroupResponse" (prop :: TRs DeleteSecurityGroupResponse) - -- , testProperty "DeleteSnapshotResponse" (prop :: TRs DeleteSnapshotResponse) - -- , testProperty "DeleteSpotDatafeedSubscriptionResponse" (prop :: TRs DeleteSpotDatafeedSubscriptionResponse) - -- , testProperty "DeleteSubnetResponse" (prop :: TRs DeleteSubnetResponse) - -- , testProperty "DeleteTagsResponse" (prop :: TRs DeleteTagsResponse) - -- , testProperty "DeleteVolumeResponse" (prop :: TRs DeleteVolumeResponse) - -- , testProperty "DeleteVpcResponse" (prop :: TRs DeleteVpcResponse) - -- , testProperty "DeleteVpnConnectionResponse" (prop :: TRs DeleteVpnConnectionResponse) - -- , testProperty "DeleteVpnConnectionRouteResponse" (prop :: TRs DeleteVpnConnectionRouteResponse) - -- , testProperty "DeleteVpnGatewayResponse" (prop :: TRs DeleteVpnGatewayResponse) - -- , testProperty "DeregisterImageResponse" (prop :: TRs DeregisterImageResponse) - -- , testProperty "DescribeAccountAttributesResponse" (prop :: TRs DescribeAccountAttributesResponse) - -- , testProperty "DescribeAddressesResponse" (prop :: TRs DescribeAddressesResponse) - -- , testProperty "DescribeAvailabilityZonesResponse" (prop :: TRs DescribeAvailabilityZonesResponse) - -- , testProperty "DescribeBundleTasksResponse" (prop :: TRs DescribeBundleTasksResponse) - -- , testProperty "DescribeConversionTasksResponse" (prop :: TRs DescribeConversionTasksResponse) - -- , testProperty "DescribeCustomerGatewaysResponse" (prop :: TRs DescribeCustomerGatewaysResponse) - -- , testProperty "DescribeDhcpOptionsResponse" (prop :: TRs DescribeDhcpOptionsResponse) - -- , testProperty "DescribeExportTasksResponse" (prop :: TRs DescribeExportTasksResponse) - -- , testProperty "DescribeImageAttributeResponse" (prop :: TRs DescribeImageAttributeResponse) - , testProperty "DescribeImagesResponse" (prop :: TRs DescribeImagesResponse) - -- , testProperty "DescribeInstanceAttributeResponse" (prop :: TRs DescribeInstanceAttributeResponse) - , testProperty "DescribeInstancesResponse" (prop :: TRs DescribeInstancesResponse) - -- , testProperty "DescribeInstanceStatusResponse" (prop :: TRs DescribeInstanceStatusResponse) - -- , testProperty "DescribeInternetGatewaysResponse" (prop :: TRs DescribeInternetGatewaysResponse) - -- , testProperty "DescribeKeyPairsResponse" (prop :: TRs DescribeKeyPairsResponse) - -- , testProperty "DescribeNetworkAclsResponse" (prop :: TRs DescribeNetworkAclsResponse) - -- , testProperty "DescribeNetworkInterfaceAttributeResponse" (prop :: TRs DescribeNetworkInterfaceAttributeResponse) - -- , testProperty "DescribeNetworkInterfacesResponse" (prop :: TRs DescribeNetworkInterfacesResponse) - -- , testProperty "DescribePlacementGroupsResponse" (prop :: TRs DescribePlacementGroupsResponse) - -- , testProperty "DescribeRegionsResponse" (prop :: TRs DescribeRegionsResponse) - -- , testProperty "DescribeReservedInstancesResponse" (prop :: TRs DescribeReservedInstancesResponse) - -- , testProperty "DescribeReservedInstancesListingsResponse" (prop :: TRs DescribeReservedInstancesListingsResponse) - -- , testProperty "DescribeReservedInstancesOfferingsResponse" (prop :: TRs DescribeReservedInstancesOfferingsResponse) - -- , testProperty "DescribeRouteTablesResponse" (prop :: TRs DescribeRouteTablesResponse) - , testProperty "DescribeSecurityGroupsResponse" (prop :: TRs DescribeSecurityGroupsResponse) - -- , testProperty "DescribeSnapshotAttributeResponse" (prop :: TRs DescribeSnapshotAttributeResponse) - -- , testProperty "DescribeSnapshotsResponse" (prop :: TRs DescribeSnapshotsResponse) - -- , testProperty "DescribeSpotDatafeedSubscriptionResponse" (prop :: TRs DescribeSpotDatafeedSubscriptionResponse) - -- , testProperty "DescribeSpotInstanceRequestsResponse" (prop :: TRs DescribeSpotInstanceRequestsResponse) - -- , testProperty "DescribeSpotPriceHistoryResponse" (prop :: TRs DescribeSpotPriceHistoryResponse) - -- , testProperty "DescribeSubnetsResponse" (prop :: TRs DescribeSubnetsResponse) - , testProperty "DescribeTagsResponse" (prop :: TRs DescribeTagsResponse) - -- , testProperty "DescribeVolumeAttributeResponse" (prop :: TRs DescribeVolumeAttributeResponse) - -- , testProperty "DescribeVolumesResponse" (prop :: TRs DescribeVolumesResponse) - -- , testProperty "DescribeVolumeStatusResponse" (prop :: TRs DescribeVolumeStatusResponse) - -- , testProperty "DescribeVpcAttributeResponse" (prop :: TRs DescribeVpcAttributeResponse) - -- , testProperty "DescribeVpcsResponse" (prop :: TRs DescribeVpcsResponse) - -- , testProperty "DescribeVpnConnectionsResponse" (prop :: TRs DescribeVpnConnectionsResponse) - -- , testProperty "DescribeVpnGatewaysResponse" (prop :: TRs DescribeVpnGatewaysResponse) - -- , testProperty "DetachInternetGatewayResponse" (prop :: TRs DetachInternetGatewayResponse) - -- , testProperty "DetachNetworkInterfaceResponse" (prop :: TRs DetachNetworkInterfaceResponse) - -- , testProperty "DetachVolumeResponse" (prop :: TRs DetachVolumeResponse) - -- , testProperty "DetachVpnGatewayResponse" (prop :: TRs DetachVpnGatewayResponse) - -- , testProperty "DisableVgwRoutePropagationResponse" (prop :: TRs DisableVgwRoutePropagationResponse) - -- , testProperty "DisassociateAddressResponse" (prop :: TRs DisassociateAddressResponse) - -- , testProperty "DisassociateRouteTableResponse" (prop :: TRs DisassociateRouteTableResponse) - -- , testProperty "EnableVgwRoutePropagationResponse" (prop :: TRs EnableVgwRoutePropagationResponse) - -- , testProperty "EnableVolumeIOResponse" (prop :: TRs EnableVolumeIOResponse) - -- , testProperty "GetConsoleOutputResponse" (prop :: TRs GetConsoleOutputResponse) - -- , testProperty "GetPasswordDataResponse" (prop :: TRs GetPasswordDataResponse) - -- , testProperty "ImportInstanceResponse" (prop :: TRs ImportInstanceResponse) - -- , testProperty "ImportKeyPairResponse" (prop :: TRs ImportKeyPairResponse) - -- , testProperty "ImportVolumeResponse" (prop :: TRs ImportVolumeResponse) - -- , testProperty "ModifyImageAttributeResponse" (prop :: TRs ModifyImageAttributeResponse) - -- , testProperty "ModifyInstanceAttributeResponse" (prop :: TRs ModifyInstanceAttributeResponse) - -- , testProperty "ModifyNetworkInterfaceAttributeResponse" (prop :: TRs ModifyNetworkInterfaceAttributeResponse) - -- , testProperty "ModifySnapshotAttributeResponse" (prop :: TRs ModifySnapshotAttributeResponse) - -- , testProperty "ModifyVolumeAttributeResponse" (prop :: TRs ModifyVolumeAttributeResponse) - -- , testProperty "ModifyVpcAttributeResponse" (prop :: TRs ModifyVpcAttributeResponse) - -- , testProperty "MonitorInstancesResponse" (prop :: TRs MonitorInstancesResponse) - -- , testProperty "PurchaseReservedInstancesOfferingResponse" (prop :: TRs PurchaseReservedInstancesOfferingResponse) - -- , testProperty "RebootInstancesResponse" (prop :: TRs RebootInstancesResponse) - -- , testProperty "RegisterImageResponse" (prop :: TRs RegisterImageResponse) - -- , testProperty "ReleaseAddressResponse" (prop :: TRs ReleaseAddressResponse) - -- , testProperty "ReplaceNetworkAclAssociationResponse" (prop :: TRs ReplaceNetworkAclAssociationResponse) - -- , testProperty "ReplaceNetworkAclEntryResponse" (prop :: TRs ReplaceNetworkAclEntryResponse) - -- , testProperty "ReplaceRouteResponse" (prop :: TRs ReplaceRouteResponse) - -- , testProperty "ReplaceRouteTableAssociationResponse" (prop :: TRs ReplaceRouteTableAssociationResponse) - -- , testProperty "ReportInstanceStatusResponse" (prop :: TRs ReportInstanceStatusResponse) - -- , testProperty "RequestSpotInstancesResponse" (prop :: TRs RequestSpotInstancesResponse) - -- , testProperty "ResetImageAttributeResponse" (prop :: TRs ResetImageAttributeResponse) - -- , testProperty "ResetInstanceAttributeResponse" (prop :: TRs ResetInstanceAttributeResponse) - -- , testProperty "ResetNetworkInterfaceAttributeResponse" (prop :: TRs ResetNetworkInterfaceAttributeResponse) - -- , testProperty "ResetSnapshotAttributeResponse" (prop :: TRs ResetSnapshotAttributeResponse) - , testProperty "RevokeSecurityGroupEgressResponse" (prop :: TRs RevokeSecurityGroupEgressResponse) - , testProperty "RevokeSecurityGroupIngressResponse" (prop :: TRs RevokeSecurityGroupIngressResponse) - -- , testProperty "RunInstancesResponse" (prop :: TRs RunInstancesResponse) - -- , testProperty "StartInstancesResponse" (prop :: TRs StartInstancesResponse) - -- , testProperty "StopInstancesResponse" (prop :: TRs StopInstancesResponse) - -- , testProperty "TerminateInstancesResponse" (prop :: TRs TerminateInstancesResponse) - -- , testProperty "UnassignPrivateIpAddressesResponse" (prop :: TRs UnassignPrivateIpAddressesResponse) - -- , testProperty "UnmonitorInstancesResponse" (prop :: TRs UnmonitorInstancesResponse) - ] - ] - -instance ToJSON AddressDomain where - toJSON = stringify - -instance ToJSON VolumeStatus where - toJSON = stringify - -instance ToJSON BundleInstanceState where - toJSON = stringify - -instance ToJSON TagResourceType where - toJSON = stringify - -instance ToJSON Protocol where - toJSON = stringify - -$(deriveArbitrary - [ ''AddressDomain - , ''BundleInstanceState - , ''TagResourceType - , ''VolumeStatus - , ''Protocol - ]) - -$(deriveDependency - [ ''Attachment - , ''BlockDeviceMappingItemType - , ''BundleInstanceS3Storage - , ''BundleInstanceTask - , ''BundleInstanceTaskError - , ''BundleInstanceTaskStorage - , ''CancelSpotInstanceRequestsResponseSetItemType - , ''DescribeImagesResponseItemType - , ''DescribeReservedInstancesListingsResponseSetItemType - , ''EbsBlockDeviceType - , ''EbsInstanceBlockDeviceMappingResponseType - , ''Filter - , ''Filters - , ''GroupItemType - , ''IamInstanceProfileResponseType - , ''InstanceBlockDeviceMappingResponseItemType - , ''InstanceCountsSetItemType - , ''InstanceMonitoringStateType - , ''InstanceNetworkInterfaceAssociationType - , ''InstanceNetworkInterfaceAttachmentType - , ''InstanceNetworkInterfaceSetItemType - , ''InstancePrivateIpAddressesSetItemType - , ''InstanceStateType - , ''IpPermission - , ''IpRange - , ''PlacementResponseType - , ''PriceScheduleSetItemType - , ''ProductCodesSetItemType - , ''ReservationInfoType - , ''ResourceTagSetItemType - , ''RunningInstancesItemType - , ''SecurityGroupItemType - , ''StateReasonType - , ''TagFilter - , ''TagSetItemType - , ''UserIdGroupPair - ]) - -$(deriveProperty "test/resources/EC2" - [ ''AllocateAddress - , ''AllocateAddressResponse - , ''AssignPrivateIpAddresses - , ''AssignPrivateIpAddressesResponse - , ''AssociateAddress - , ''AssociateAddressResponse - , ''AssociateDhcpOptions - , ''AssociateDhcpOptionsResponse - , ''AssociateRouteTable - , ''AssociateRouteTableResponse - , ''AttachInternetGateway - , ''AttachInternetGatewayResponse - , ''AttachNetworkInterface - , ''AttachNetworkInterfaceResponse - , ''AttachVolume - , ''AttachVolumeResponse - , ''AttachVpnGateway - , ''AttachVpnGatewayResponse - , ''AuthorizeSecurityGroupEgress - , ''AuthorizeSecurityGroupEgressResponse - , ''AuthorizeSecurityGroupIngress - , ''AuthorizeSecurityGroupIngressResponse - , ''BundleInstance - , ''BundleInstanceResponse - , ''CancelBundleTask - , ''CancelBundleTaskResponse - , ''CancelConversionTask - , ''CancelConversionTaskResponse - , ''CancelExportTask - , ''CancelExportTaskResponse - , ''CancelReservedInstancesListing - , ''CancelReservedInstancesListingResponse - , ''CancelSpotInstanceRequests - , ''CancelSpotInstanceRequestsResponse - -- , ''ConfirmProductInstance - -- , ''ConfirmProductInstanceResponse - -- , ''CopyImage - -- , ''CopyImageResponse - -- , ''CopySnapshot - -- , ''CopySnapshotResponse - -- , ''CreateCustomerGateway - -- , ''CreateCustomerGatewayResponse - -- , ''CreateDhcpOptions - -- , ''CreateDhcpOptionsResponse - -- , ''CreateImage - -- , ''CreateImageResponse - -- , ''CreateInstanceExportTask - -- , ''CreateInstanceExportTaskResponse - -- , ''CreateInternetGateway - -- , ''CreateInternetGatewayResponse - -- , ''CreateKeyPair - -- , ''CreateKeyPairResponse - -- , ''CreateNetworkAcl - -- , ''CreateNetworkAclResponse - -- , ''CreateNetworkAclEntry - -- , ''CreateNetworkAclEntryResponse - -- , ''CreateNetworkInterface - -- , ''CreateNetworkInterfaceResponse - -- , ''CreatePlacementGroup - -- , ''CreatePlacementGroupResponse - -- , ''CreateReservedInstancesListing - -- , ''CreateReservedInstancesListingResponse - -- , ''CreateRoute - -- , ''CreateRouteResponse - -- , ''CreateRouteTable - -- , ''CreateRouteTableResponse - , ''CreateSecurityGroup - , ''CreateSecurityGroupResponse - -- , ''CreateSnapshot - -- , ''CreateSnapshotResponse - -- , ''CreateSpotDatafeedSubscription - -- , ''CreateSpotDatafeedSubscriptionResponse - -- , ''CreateSubnet - -- , ''CreateSubnetResponse - -- , ''CreateTags - -- , ''CreateTagsResponse - -- , ''CreateVolume - -- , ''CreateVolumeResponse - -- , ''CreateVpc - -- , ''CreateVpcResponse - -- , ''CreateVpnConnection - -- , ''CreateVpnConnectionResponse - -- , ''CreateVpnConnectionRoute - -- , ''CreateVpnConnectionRouteResponse - -- , ''CreateVpnGateway - -- , ''CreateVpnGatewayResponse - -- , ''DeleteCustomerGateway - -- , ''DeleteCustomerGatewayResponse - -- , ''DeleteDhcpOptions - -- , ''DeleteDhcpOptionsResponse - -- , ''DeleteInternetGateway - -- , ''DeleteInternetGatewayResponse - -- , ''DeleteKeyPair - -- , ''DeleteKeyPairResponse - -- , ''DeleteNetworkAcl - -- , ''DeleteNetworkAclResponse - -- , ''DeleteNetworkAclEntry - -- , ''DeleteNetworkAclEntryResponse - -- , ''DeleteNetworkInterface - -- , ''DeleteNetworkInterfaceResponse - -- , ''DeletePlacementGroup - -- , ''DeletePlacementGroupResponse - -- , ''DeleteRoute - -- , ''DeleteRouteResponse - -- , ''DeleteRouteTable - -- , ''DeleteRouteTableResponse - , ''DeleteSecurityGroup - , ''DeleteSecurityGroupResponse - -- , ''DeleteSnapshot - -- , ''DeleteSnapshotResponse - -- , ''DeleteSpotDatafeedSubscription - -- , ''DeleteSpotDatafeedSubscriptionResponse - -- , ''DeleteSubnet - -- , ''DeleteSubnetResponse - -- , ''DeleteTags - -- , ''DeleteTagsResponse - -- , ''DeleteVolume - -- , ''DeleteVolumeResponse - -- , ''DeleteVpc - -- , ''DeleteVpcResponse - -- , ''DeleteVpnConnection - -- , ''DeleteVpnConnectionResponse - -- , ''DeleteVpnConnectionRoute - -- , ''DeleteVpnConnectionRouteResponse - -- , ''DeleteVpnGateway - -- , ''DeleteVpnGatewayResponse - -- , ''DeregisterImage - -- , ''DeregisterImageResponse - -- , ''DescribeAccountAttributes - -- , ''DescribeAccountAttributesResponse - -- , ''DescribeAddresses - -- , ''DescribeAddressesResponse - -- , ''DescribeAvailabilityZones - -- , ''DescribeAvailabilityZonesResponse - -- , ''DescribeBundleTasks - -- , ''DescribeBundleTasksResponse - -- , ''DescribeConversionTasks - -- , ''DescribeConversionTasksResponse - -- , ''DescribeCustomerGateways - -- , ''DescribeCustomerGatewaysResponse - -- , ''DescribeDhcpOptions - -- , ''DescribeDhcpOptionsResponse - -- , ''DescribeExportTasks - -- , ''DescribeExportTasksResponse - -- , ''DescribeImageAttribute - -- , ''DescribeImageAttributeResponse - , ''DescribeImages - , ''DescribeImagesResponse - -- , ''DescribeInstanceAttribute - -- , ''DescribeInstanceAttributeResponse - , ''DescribeInstances - , ''DescribeInstancesResponse - -- , ''DescribeInstanceStatus - -- , ''DescribeInstanceStatusResponse - -- , ''DescribeInternetGateways - -- , ''DescribeInternetGatewaysResponse - -- , ''DescribeKeyPairs - -- , ''DescribeKeyPairsResponse - -- , ''DescribeNetworkAcls - -- , ''DescribeNetworkAclsResponse - -- , ''DescribeNetworkInterfaceAttribute - -- , ''DescribeNetworkInterfaceAttributeResponse - -- , ''DescribeNetworkInterfaces - -- , ''DescribeNetworkInterfacesResponse - -- , ''DescribePlacementGroups - -- , ''DescribePlacementGroupsResponse - -- , ''DescribeRegions - -- , ''DescribeRegionsResponse - -- , ''DescribeReservedInstances - -- , ''DescribeReservedInstancesResponse - -- , ''DescribeReservedInstancesListings - -- , ''DescribeReservedInstancesListingsResponse - -- , ''DescribeReservedInstancesOfferings - -- , ''DescribeReservedInstancesOfferingsResponse - -- , ''DescribeRouteTables - -- , ''DescribeRouteTablesResponse - , ''DescribeSecurityGroups - , ''DescribeSecurityGroupsResponse - -- , ''DescribeSnapshotAttribute - -- , ''DescribeSnapshotAttributeResponse - -- , ''DescribeSnapshots - -- , ''DescribeSnapshotsResponse - -- , ''DescribeSpotDatafeedSubscription - -- , ''DescribeSpotDatafeedSubscriptionResponse - -- , ''DescribeSpotInstanceRequests - -- , ''DescribeSpotInstanceRequestsResponse - -- , ''DescribeSpotPriceHistory - -- , ''DescribeSpotPriceHistoryResponse - -- , ''DescribeSubnets - -- , ''DescribeSubnetsResponse - , ''DescribeTags - , ''DescribeTagsResponse - -- , ''DescribeVolumeAttribute - -- , ''DescribeVolumeAttributeResponse - -- , ''DescribeVolumes - -- , ''DescribeVolumesResponse - -- , ''DescribeVolumeStatus - -- , ''DescribeVolumeStatusResponse - -- , ''DescribeVpcAttribute - -- , ''DescribeVpcAttributeResponse - -- , ''DescribeVpcs - -- , ''DescribeVpcsResponse - -- , ''DescribeVpnConnections - -- , ''DescribeVpnConnectionsResponse - -- , ''DescribeVpnGateways - -- , ''DescribeVpnGatewaysResponse - -- , ''DetachInternetGateway - -- , ''DetachInternetGatewayResponse - -- , ''DetachNetworkInterface - -- , ''DetachNetworkInterfaceResponse - -- , ''DetachVolume - -- , ''DetachVolumeResponse - -- , ''DetachVpnGateway - -- , ''DetachVpnGatewayResponse - -- , ''DisableVgwRoutePropagation - -- , ''DisableVgwRoutePropagationResponse - -- , ''DisassociateAddress - -- , ''DisassociateAddressResponse - -- , ''DisassociateRouteTable - -- , ''DisassociateRouteTableResponse - -- , ''EnableVgwRoutePropagation - -- , ''EnableVgwRoutePropagationResponse - -- , ''EnableVolumeIO - -- , ''EnableVolumeIOResponse - -- , ''GetConsoleOutput - -- , ''GetConsoleOutputResponse - -- , ''GetPasswordData - -- , ''GetPasswordDataResponse - -- , ''ImportInstance - -- , ''ImportInstanceResponse - -- , ''ImportKeyPair - -- , ''ImportKeyPairResponse - -- , ''ImportVolume - -- , ''ImportVolumeResponse - -- , ''ModifyImageAttribute - -- , ''ModifyImageAttributeResponse - -- , ''ModifyInstanceAttribute - -- , ''ModifyInstanceAttributeResponse - -- , ''ModifyNetworkInterfaceAttribute - -- , ''ModifyNetworkInterfaceAttributeResponse - -- , ''ModifySnapshotAttribute - -- , ''ModifySnapshotAttributeResponse - -- , ''ModifyVolumeAttribute - -- , ''ModifyVolumeAttributeResponse - -- , ''ModifyVpcAttribute - -- , ''ModifyVpcAttributeResponse - -- , ''MonitorInstances - -- , ''MonitorInstancesResponse - -- , ''PurchaseReservedInstancesOffering - -- , ''PurchaseReservedInstancesOfferingResponse - -- , ''RebootInstances - -- , ''RebootInstancesResponse - -- , ''RegisterImage - -- , ''RegisterImageResponse - -- , ''ReleaseAddress - -- , ''ReleaseAddressResponse - -- , ''ReplaceNetworkAclAssociation - -- , ''ReplaceNetworkAclAssociationResponse - -- , ''ReplaceNetworkAclEntry - -- , ''ReplaceNetworkAclEntryResponse - -- , ''ReplaceRoute - -- , ''ReplaceRouteResponse - -- , ''ReplaceRouteTableAssociation - -- , ''ReplaceRouteTableAssociationResponse - -- , ''ReportInstanceStatus - -- , ''ReportInstanceStatusResponse - -- , ''RequestSpotInstances - -- , ''RequestSpotInstancesResponse - -- , ''ResetImageAttribute - -- , ''ResetImageAttributeResponse - -- , ''ResetInstanceAttribute - -- , ''ResetInstanceAttributeResponse - -- , ''ResetNetworkInterfaceAttribute - -- , ''ResetNetworkInterfaceAttributeResponse - -- , ''ResetSnapshotAttribute - -- , ''ResetSnapshotAttributeResponse - , ''RevokeSecurityGroupEgress - , ''RevokeSecurityGroupEgressResponse - , ''RevokeSecurityGroupIngress - , ''RevokeSecurityGroupIngressResponse - -- , ''RunInstances - -- , ''RunInstancesResponse - -- , ''StartInstances - -- , ''StartInstancesResponse - -- , ''StopInstances - -- , ''StopInstancesResponse - -- , ''TerminateInstances - -- , ''TerminateInstancesResponse - -- , ''UnassignPrivateIpAddresses - -- , ''UnassignPrivateIpAddressesResponse - -- , ''UnmonitorInstances - -- , ''UnmonitorInstancesResponse - ]) diff --git a/test/Test/Route53.hs b/test/Test/Route53.hs deleted file mode 100644 index 3d35f4a307d..00000000000 --- a/test/Test/Route53.hs +++ /dev/null @@ -1,139 +0,0 @@ -{-# LANGUAGE TemplateHaskell #-} - -{-# OPTIONS_GHC -fno-warn-orphans #-} - --- Module : Test.Route53 --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Test.Route53 (tests) where - -import Network.AWS.Route53 -import Test.Common - -tests :: TestTree -tests = testVersion route53 - [ testGroup "Hosted Zones" - [ testGroup "Requests" - [ qc "CreateHostedZone" (prop :: TRq CreateHostedZone) - , qc "GetHostedZone" (prop :: TRq GetHostedZone) - , qc "ListHostedZones" (prop :: TRq ListHostedZones) - , qc "DeleteHostedZone" (prop :: TRq DeleteHostedZone) - ] - , testGroup "Responses" - [ qc "CreateHostedZoneResponse" (prop :: TRs CreateHostedZoneResponse) - , qc "GetHostedZoneResponse" (prop :: TRs GetHostedZoneResponse) - , qc "ListHostedZonesResponse" (prop :: TRs ListHostedZonesResponse) - , qc "DeleteHostedZoneResponse" (prop :: TRs DeleteHostedZoneResponse) - ] - ] - - , testGroup "Record Sets" - [ testGroup "Requests" - [ qc "ChangeResourceRecordSets" (prop :: TRq ChangeResourceRecordSets) - , qc "ListResourceRecordSets" (prop :: TRq ListResourceRecordSets) - , qc "GetChange" (prop :: TRq GetChange) - ] - , testGroup "Responses" - [ qc "ChangeResourceRecordSetsResponse" (prop :: TRs ChangeResourceRecordSetsResponse) - , qc "ListResourceRecordSetsResponse" (prop :: TRs ListResourceRecordSetsResponse) - , qc "GetChangeResponse" (prop :: TRs GetChangeResponse) - ] - ] - - , testGroup "Health Checks" - [ testGroup "Requests" - [ qc "CreateHealthCheck" (prop :: TRq CreateHealthCheck) - , qc "GetHealthCheck" (prop :: TRq GetHealthCheck) - , qc "ListHealthChecks" (prop :: TRq ListHealthChecks) - , qc "DeleteHealthCheck" (prop :: TRq DeleteHealthCheck) - ] - , testGroup "Responses" - [ qc "CreateHealthCheckResponse" (prop :: TRs CreateHealthCheckResponse) - , qc "GetHealthCheckResponse" (prop :: TRs GetHealthCheckResponse) - , qc "ListHealthChecksResponse" (prop :: TRs ListHealthChecksResponse) - , qc "DeleteHealthCheckResponse" (prop :: TRs DeleteHealthCheckResponse) - ] - ] - ] - -instance ToJSON CallerReference where - toJSON = String . unCallerReference - -instance ToJSON Protocol where - toJSON = stringify - -instance ToJSON ChangeStatus where - toJSON = stringify - -instance ToJSON RecordType where - toJSON = stringify - -instance ToJSON Failover where - toJSON = stringify - -instance ToJSON ChangeId where - toJSON = String . unChangeId - -instance ToJSON HostedZoneId where - toJSON = String . unHostedZoneId - -instance ToJSON HealthCheckId where - toJSON = String . unHealthCheckId - -$(deriveArbitrary - [ ''CallerReference - , ''Protocol - , ''ChangeStatus - , ''RecordType - , ''Failover - , ''ChangeId - , ''HostedZoneId - , ''HealthCheckId - ]) - -$(deriveDependency - [ ''DelegationSet - , ''ChangeInfo - , ''Config - , ''HostedZone - , ''ResourceRecords - , ''ResourceRecordSet - , ''HealthCheck - , ''HealthCheckConfig - , ''AliasTarget - , ''ChangeAction - , ''ChangeBatch - , ''Change - ]) - -$(deriveProperty "test/resources/Route53" - [ ''CreateHostedZone - , ''CreateHostedZoneResponse - , ''GetHostedZone - , ''GetHostedZoneResponse - , ''ListHostedZones - , ''ListHostedZonesResponse - , ''DeleteHostedZone - , ''DeleteHostedZoneResponse - , ''ChangeResourceRecordSets - , ''ChangeResourceRecordSetsResponse - , ''ListResourceRecordSets - , ''ListResourceRecordSetsResponse - , ''GetChange - , ''GetChangeResponse - , ''CreateHealthCheck - , ''CreateHealthCheckResponse - , ''GetHealthCheck - , ''GetHealthCheckResponse - , ''ListHealthChecks - , ''ListHealthChecksResponse - , ''DeleteHealthCheck - , ''DeleteHealthCheckResponse - ]) diff --git a/test/Test/S3.hs b/test/Test/S3.hs deleted file mode 100644 index 0df4a526e5b..00000000000 --- a/test/Test/S3.hs +++ /dev/null @@ -1,49 +0,0 @@ -{-# LANGUAGE TemplateHaskell #-} - -{-# OPTIONS_GHC -fno-warn-orphans #-} - --- Module : Test.S3 --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Test.S3 (tests) where - -import Network.AWS.S3 -import Test.Common - -tests :: TestTree -tests = testVersion s3 - [ testGroup "Service" - [ qc "GetService" (prop :: TRq GetService) - , qc "GetServiceResponse" (prop :: TRs GetServiceResponse) - ] - - , testGroup "Bucket" - [ - ] - - , testGroup "Object" - [ - ] - -- [ qc "GetObject" (prop :: TRq GetObject) - -- -- , qc "PutObject" (prop :: TRq PutObject) - -- ] - ] - -$(deriveDependency - [ ''Bucket - , ''Owner - ]) - -$(deriveProperty "test/resources/S3" - [ ''GetService - , ''GetServiceResponse - -- , ''GetObject - -- , ''PutObject - ]) diff --git a/test/Test/Signing.hs b/test/Test/Signing.hs deleted file mode 100644 index 2567e76bae7..00000000000 --- a/test/Test/Signing.hs +++ /dev/null @@ -1,126 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE ViewPatterns #-} - -{-# OPTIONS_GHC -fno-warn-orphans #-} - --- Module : Test.Signing --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Test.Signing (tests) where - -import Control.Applicative -import Control.Monad -import Data.Attoparsec as P -import Data.Attoparsec.Char8 (char8, endOfLine, isDigit_w8) -import qualified Data.Attoparsec.Char8 as P8 -import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BS -import Data.List ((\\)) -import Data.Time -import Network.AWS.Internal -import Network.HTTP.Types (urlDecode) -import System.Directory -import System.Locale -import Test.Framework -import Test.Framework.Providers.HUnit -import Test.HUnit hiding (Test, path) - -tests :: [Test] -tests = - [ testGroup "Version4" - [ testSigner "get-header-key-duplicate" - , testSigner "get-header-value-order" - , testSigner "get-header-value-trim" - , testSigner "get-relative-relative" - , testSigner "get-relative" - , testSigner "get-slash-dot-slash" - , testSigner "get-slash-pointless-dot" - , testSigner "get-slash" - , testSigner "get-slashes" - , testSigner "get-space" - , testSigner "get-unreserved" - , testSigner "get-utf8" - , testSigner "get-vanilla-empty-query-key" - , testSigner "get-vanilla-query-order-key-case" - , testSigner "get-vanilla-query-order-key" - , testSigner "get-vanilla-query-order-value" - , testSigner "get-vanilla-query-unreserved" - , testSigner "get-vanilla-query" - , testSigner "get-vanilla-ut8-query" - , testSigner "get-vanilla" - , testSigner "post-header-key-case" - , testSigner "post-header-key-sort" - , testSigner "post-header-value-case" - , testSigner "post-vanilla-empty-query-value" - , testSigner "post-vanilla-query-nonunreserved" - , testSigner "post-vanilla-query-space" - , testSigner "post-vanilla-query" - , testSigner "post-vanilla" - , testSigner "post-x-www-form-urlencoded-parameters" - , testSigner "post-x-www-form-urlencoded" - ] - ] - -testSigner :: String -> Test -testSigner name = testCase name $ do - (rq, expect) <- loadMetadata SigningVersion4 name - - let hdr = BS.unpack . fromMaybe "" $ "Date" `lookup` rqHeaders rq - time = readTime defaultTimeLocale "%a, %d %b %Y %H:%M:%S GMT" hdr - - (_ , actual) <- sign' rq auth NorthVirgnia time - - when (actual /= expect) $ do - let f = \(BS.unpack -> x) (BS.unpack -> y) -> (x \\ y) ++ (y \\ x) - - print $ f (smdCReq expect) (smdCReq actual) - print $ f (smdSTS expect) (smdSTS actual) - print $ f (smdAuthz expect) (smdAuthz actual) - print $ f (smdSReq expect) (smdSReq actual) - - assertEqual "Signing results do not match." expect actual - where - auth = Auth "AKIDEXAMPLE" "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY" - -loadMetadata :: SigningVersion -> String -> IO (RawRequest, SigningMetadata) -loadMetadata ver name = do - (,) <$> (parseRequest <$> load ".req") - <*> (SigningMetadata - <$> load ".creq" - <*> load ".sts" - <*> load ".authz" - <*> load ".sreq") - where - load ext = BS.readFile =<< path ext `fmap` getCurrentDirectory - path ext = (++ ("/test/resources/" ++ show ver ++ "/" ++ name ++ ext)) - -parseRequest :: ByteString -> RawRequest -parseRequest = either error id . parseOnly parser - where - parser = do - meth <- P.takeWhile1 token <* char8 ' ' - uri <- P.takeWhile1 (/= 32) <* char8 ' ' - _ <- "http/" *> P.takeWhile (\c -> isDigit_w8 c || c == 46) <* endOfLine - hdrs <- many1 header - - let (path, q) = BS.span (/= '?') uri - qry = decodeQuery (urlDecode True) . maybe "" snd $ BS.uncons q - - return $! RawRequest - service (read $ BS.unpack meth) FormEncoded path hdrs qry Nothing - - header = (,) - <$> P.takeWhile token <* char8 ':' <* skipWhile P8.isHorizontalSpace - <*> takeTill P8.isEndOfLine <* endOfLine - - token w = w <= 127 && notInClass "\0-\31()<>@,;:\\\"/[]?={} \t" w - - service = Service "host" "2011-09-09" SigningVersion4 (const "host.foo.com") diff --git a/test/Test/TH.hs b/test/Test/TH.hs deleted file mode 100644 index 79dcce026d6..00000000000 --- a/test/Test/TH.hs +++ /dev/null @@ -1,73 +0,0 @@ -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} - --- Module : Test.TH --- Copyright : (c) 2013 Brendan Hay --- License : This Source Code Form is subject to the terms of --- the Mozilla Public License, v. 2.0. --- A copy of the MPL can be found in the LICENSE file or --- you can obtain it at http://mozilla.org/MPL/2.0/. --- Maintainer : Brendan Hay --- Stability : experimental --- Portability : non-portable (GHC extensions) - -module Test.TH - ( - -- * Locating Test Templats - Template (..) - - -- * Specific Derivations - , deriveDependency - , deriveProperty - - -- * Individual Derivations - , deriveJSON - , deriveArbitrary - , deriveTemplate - ) where - -import Control.Monad -import qualified Data.Aeson.TH as Aeson -import qualified Data.ByteString.Char8 as BS -import qualified Data.DeriveTH as Derive -import Language.Haskell.TH -import Network.AWS.Internal -import System.Directory - -class Template a where - template :: a -> FilePath - -deriveDependency :: [Name] -> Q [Dec] -deriveDependency names = liftM concat $ mapM ($ names) - [ deriveJSON - , deriveArbitrary - ] - -deriveProperty :: FilePath -> [Name] -> Q [Dec] -deriveProperty dir names = liftM concat $ mapM ($ names) - [ deriveJSON - , deriveArbitrary - , deriveTemplate dir - ] - -deriveJSON :: [Name] -> Q [Dec] -deriveJSON = liftM concat . mapM (Aeson.deriveToJSON Aeson.defaultOptions) - -deriveArbitrary :: [Name] -> Q [Dec] -deriveArbitrary = Derive.derives [Derive.makeArbitrary] - -deriveTemplate :: FilePath -> [Name] -> Q [Dec] -deriveTemplate dir = liftM concat . mapM derive - where - derive name = [d|instance Template $(conT name) where template _ = $(path)|] - where - path = runIO $ do - d <- getCurrentDirectory - return $! LitE $! StringL $! concat - [ d - , "/" - , BS.unpack $ stripPrefix "/" dir - , "/" - , nameBase name - ] diff --git a/test/resources/AutoScaling/CreateAutoScalingGroup b/test/resources/AutoScaling/CreateAutoScalingGroup deleted file mode 100644 index 21f60dfba19..00000000000 --- a/test/resources/AutoScaling/CreateAutoScalingGroup +++ /dev/null @@ -1,50 +0,0 @@ -GET / -Action=CreateAutoScalingGroup -AutoScalingGroupName={{ casgAutoScalingGroupName }} -{% if casgAvailabilityZones %} -AvailabilityZones.member.{{ n }}={{.}} -{% endif %} -{% if casgDefaultCooldown %} -DefaultCooldown={{ casgDefaultCooldown }} -{% endif %} -{% if casgDesiredCapacity %} -DesiredCapacity={{ casgDesiredCapacity }} -{% endif %} -{% if casgHealthCheckGracePeriod %} -HealthCheckGracePeriod={{ casgHealthCheckGracePeriod }} -{% endif %} -{% if casgHealthCheckType %} -HealthCheckType={{ casgHealthCheckType }} -{% endif %} -LaunchConfigurationName={{ casgLaunchConfigurationName }} -{% if casgLoadBalancerNames %} -LoadBalancerNames.member.{{ n }}={{.}} -{% endif %} -MaxSize={{ casgMaxSize }} -MinSize={{ casgMinSize }} -{% if casgPlacementGroup %} -PlacementGroup={{ casgPlacementGroup }} -{% endif %} -{% if casgTags %} -{% if tKey %} -Tags.member.{{ n }}.Key={{ tKey }} -{% endif %} -{% if tPropagateAtLaunch %} -Tags.member.{{ n }}.PropagateAtLaunch={{ tPropagateAtLaunch }} -{% endif %} -{% if tResourceId %} -Tags.member.{{ n }}.ResourceId={{ tResourceId }} -{% endif %} -{% if tResourceType %} -Tags.member.{{ n }}.ResourceType={{ tResourceType }} -{% endif %} -{% if tValue %} -Tags.member.{{ n }}.Value={{ tValue }} -{% endif %} -{% endif %} -{% if casgTerminationPolicies %} -TerminationPolicies.member.{{ n }}={{.}} -{% endif %} -{% if casgVPCZoneIdentifier %} -VPCZoneIdentifier={{ casgVPCZoneIdentifier }} -{% endif %} diff --git a/test/resources/AutoScaling/CreateAutoScalingGroupResponse b/test/resources/AutoScaling/CreateAutoScalingGroupResponse deleted file mode 100644 index 83d32667bdd..00000000000 --- a/test/resources/AutoScaling/CreateAutoScalingGroupResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if casgrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/CreateLaunchConfiguration b/test/resources/AutoScaling/CreateLaunchConfiguration deleted file mode 100644 index 5e430ef023b..00000000000 --- a/test/resources/AutoScaling/CreateLaunchConfiguration +++ /dev/null @@ -1,48 +0,0 @@ -GET / -Action=CreateLaunchConfiguration -{% if clcBlockDeviceMappings %} -{% if bdmDeviceName %} -BlockDeviceMappings.member.{{ n }}.DeviceName={{ bdmDeviceName }} -{% endif %} -{% if bdmEbs %} -{% if eSnapshotId %} -BlockDeviceMappings.member.{{ n }}.Ebs.SnapshotId={{ eSnapshotId }} -{% endif %} -{% if eVolumeSize %} -BlockDeviceMappings.member.{{ n }}.Ebs.VolumeSize={{ eVolumeSize }} -{% endif %} -{% endif %} -{% if bdmVirtualName %} -BlockDeviceMappings.member.{{ n }}.VirtualName={{ bdmVirtualName }} -{% endif %} -{% endif %} -{% if clcEbsOptimized %} -EbsOptimized={{ clcEbsOptimized }} -{% endif %} -{% if clcIamInstanceProfile %} -IamInstanceProfile={{ clcIamInstanceProfile }} -{% endif %} -ImageId={{ clcImageId }} -{% if clcInstanceMonitoring %} -InstanceMonitoring.Enabled={{clcInstanceMonitoring.imEnabled}} -{% endif %} -InstanceType={{ clcInstanceType }} -{% if clcKernelId %} -KernelId={{ clcKernelId }} -{% endif %} -{% if clcKeyName %} -KeyName={{ clcKeyName }} -{% endif %} -LaunchConfigurationName={{ clcLaunchConfigurationName }} -{% if clcRamdiskId %} -RamdiskId={{ clcRamdiskId }} -{% endif %} -{% if clcSecurityGroups %} -SecurityGroups.member.{{ n }}={{.}} -{% endif %} -{% if clcSpotPrice %} -SpotPrice={{ clcSpotPrice }} -{% endif %} -{% if clcUserData %} -UserData={{ clcUserData }} -{% endif %} diff --git a/test/resources/AutoScaling/CreateLaunchConfigurationResponse b/test/resources/AutoScaling/CreateLaunchConfigurationResponse deleted file mode 100644 index aa939c30e09..00000000000 --- a/test/resources/AutoScaling/CreateLaunchConfigurationResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if clcrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/CreateOrUpdateTags b/test/resources/AutoScaling/CreateOrUpdateTags deleted file mode 100644 index 044c84e4a54..00000000000 --- a/test/resources/AutoScaling/CreateOrUpdateTags +++ /dev/null @@ -1,19 +0,0 @@ -GET / -Action=CreateOrUpdateTags -{% if coutTags %} -{% if tKey %} -Tags.member.{{ n }}.Key={{ tKey }} -{% endif %} -{% if tPropagateAtLaunch %} -Tags.member.{{ n }}.PropagateAtLaunch={{ tPropagateAtLaunch }} -{% endif %} -{% if tResourceId %} -Tags.member.{{ n }}.ResourceId={{ tResourceId }} -{% endif %} -{% if tResourceType %} -Tags.member.{{ n }}.ResourceType={{ tResourceType }} -{% endif %} -{% if tValue %} -Tags.member.{{ n }}.Value={{ tValue }} -{% endif %} -{% endif %} diff --git a/test/resources/AutoScaling/CreateOrUpdateTagsResponse b/test/resources/AutoScaling/CreateOrUpdateTagsResponse deleted file mode 100644 index 8f4e4a2c4b9..00000000000 --- a/test/resources/AutoScaling/CreateOrUpdateTagsResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if coutrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DeleteAutoScalingGroup b/test/resources/AutoScaling/DeleteAutoScalingGroup deleted file mode 100644 index 27121f82944..00000000000 --- a/test/resources/AutoScaling/DeleteAutoScalingGroup +++ /dev/null @@ -1,6 +0,0 @@ -GET / -Action=DeleteAutoScalingGroup -AutoScalingGroupName={{ dasgAutoScalingGroupName }} -{% if dasgForceDelete %} -ForceDelete={{ dasgForceDelete }} -{% endif %} diff --git a/test/resources/AutoScaling/DeleteAutoScalingGroupResponse b/test/resources/AutoScaling/DeleteAutoScalingGroupResponse deleted file mode 100644 index 1f8cb65d1fd..00000000000 --- a/test/resources/AutoScaling/DeleteAutoScalingGroupResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if dasgrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DeleteLaunchConfiguration b/test/resources/AutoScaling/DeleteLaunchConfiguration deleted file mode 100644 index c773eaa2d3a..00000000000 --- a/test/resources/AutoScaling/DeleteLaunchConfiguration +++ /dev/null @@ -1,3 +0,0 @@ -GET / -Action=DeleteLaunchConfiguration -LaunchConfigurationName={{ dlcLaunchConfigurationName }} diff --git a/test/resources/AutoScaling/DeleteLaunchConfigurationResponse b/test/resources/AutoScaling/DeleteLaunchConfigurationResponse deleted file mode 100644 index f80d7ef85f4..00000000000 --- a/test/resources/AutoScaling/DeleteLaunchConfigurationResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if dlcrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DeleteNotificationConfiguration b/test/resources/AutoScaling/DeleteNotificationConfiguration deleted file mode 100644 index d4d49cce32a..00000000000 --- a/test/resources/AutoScaling/DeleteNotificationConfiguration +++ /dev/null @@ -1,4 +0,0 @@ -GET / -Action=DeleteNotificationConfiguration -AutoScalingGroupName={{ dncAutoScalingGroupName }} -TopicARN={{ dncTopicARN }} diff --git a/test/resources/AutoScaling/DeleteNotificationConfigurationResponse b/test/resources/AutoScaling/DeleteNotificationConfigurationResponse deleted file mode 100644 index e4adb6f8012..00000000000 --- a/test/resources/AutoScaling/DeleteNotificationConfigurationResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if dncrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DeletePolicy b/test/resources/AutoScaling/DeletePolicy deleted file mode 100644 index 3d2c9216279..00000000000 --- a/test/resources/AutoScaling/DeletePolicy +++ /dev/null @@ -1,6 +0,0 @@ -GET / -Action=DeletePolicy -{% if dpAutoScalingGroupName %} -AutoScalingGroupName={{ dpAutoScalingGroupName }} -{% endif %} -PolicyName={{ dpPolicyName }} diff --git a/test/resources/AutoScaling/DeletePolicyResponse b/test/resources/AutoScaling/DeletePolicyResponse deleted file mode 100644 index 81e931ff953..00000000000 --- a/test/resources/AutoScaling/DeletePolicyResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if dprResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DeleteScheduledAction b/test/resources/AutoScaling/DeleteScheduledAction deleted file mode 100644 index d97349be49c..00000000000 --- a/test/resources/AutoScaling/DeleteScheduledAction +++ /dev/null @@ -1,6 +0,0 @@ -GET / -Action=DeleteScheduledAction -{% if dsaAutoScalingGroupName %} -AutoScalingGroupName={{ dsaAutoScalingGroupName }} -{% endif %} -ScheduledActionName={{ dsaScheduledActionName }} diff --git a/test/resources/AutoScaling/DeleteScheduledActionResponse b/test/resources/AutoScaling/DeleteScheduledActionResponse deleted file mode 100644 index 7c2d633a6e7..00000000000 --- a/test/resources/AutoScaling/DeleteScheduledActionResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if dsarResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DeleteTags b/test/resources/AutoScaling/DeleteTags deleted file mode 100644 index 283103bab98..00000000000 --- a/test/resources/AutoScaling/DeleteTags +++ /dev/null @@ -1,19 +0,0 @@ -GET / -Action=DeleteTags -{% if dtTags %} -{% if tKey %} -Tags.member.{{ n }}.Key={{ tKey }} -{% endif %} -{% if tPropagateAtLaunch %} -Tags.member.{{ n }}.PropagateAtLaunch={{ tPropagateAtLaunch }} -{% endif %} -{% if tResourceId %} -Tags.member.{{ n }}.ResourceId={{ tResourceId }} -{% endif %} -{% if tResourceType %} -Tags.member.{{ n }}.ResourceType={{ tResourceType }} -{% endif %} -{% if tValue %} -Tags.member.{{ n }}.Value={{ tValue }} -{% endif %} -{% endif %} diff --git a/test/resources/AutoScaling/DeleteTagsResponse b/test/resources/AutoScaling/DeleteTagsResponse deleted file mode 100644 index 55a4369c4aa..00000000000 --- a/test/resources/AutoScaling/DeleteTagsResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if dtrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeAdjustmentTypes b/test/resources/AutoScaling/DescribeAdjustmentTypes deleted file mode 100644 index f65ba127f4f..00000000000 --- a/test/resources/AutoScaling/DescribeAdjustmentTypes +++ /dev/null @@ -1,2 +0,0 @@ -GET / -Action=DescribeAdjustmentTypes diff --git a/test/resources/AutoScaling/DescribeAdjustmentTypesResponse b/test/resources/AutoScaling/DescribeAdjustmentTypesResponse deleted file mode 100644 index 430abc162fe..00000000000 --- a/test/resources/AutoScaling/DescribeAdjustmentTypesResponse +++ /dev/null @@ -1,19 +0,0 @@ - - - {% if datrDescribeAdjustmentTypesResult %} - - - {% if datrAdjustmentTypes %} - - {{.}} - - {% endif %} - - - {% endif %} - {% if datrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeAutoScalingGroups b/test/resources/AutoScaling/DescribeAutoScalingGroups deleted file mode 100644 index 8b05eb7ac55..00000000000 --- a/test/resources/AutoScaling/DescribeAutoScalingGroups +++ /dev/null @@ -1,11 +0,0 @@ -GET / -Action=DescribeAutoScalingGroups -{% if dasgAutoScalingGroupNames %} -AutoScalingGroupNames.member.{{ n }}={{.}} -{% endif %} -{% if dasgMaxRecords %} -MaxRecords={{ dasgMaxRecords }} -{% endif %} -{% if dasgNextToken %} -NextToken={{ dasgNextToken }} -{% endif %} diff --git a/test/resources/AutoScaling/DescribeAutoScalingGroupsResponse b/test/resources/AutoScaling/DescribeAutoScalingGroupsResponse deleted file mode 100644 index c413d0499ae..00000000000 --- a/test/resources/AutoScaling/DescribeAutoScalingGroupsResponse +++ /dev/null @@ -1,121 +0,0 @@ - - - {% if dashrDescribeAutoScalingGroupsResult %} - - - {% if dasgrAutoScalingGroups %} - - {% if asgAutoScalingGroupARN %} - {{ asgAutoScalingGroupARN }} - {% endif %} - {% if asgAutoScalingGroupName %} - {{ asgAutoScalingGroupName }} - {% endif %} - - {% if asgAvailabilityZones %} - {{.}} - {% endif %} - - {{ asgCreatedTime }} - {{ asgDefaultCooldown }} - {{ asgDesiredCapacity }} - - {% if asgEnabledMetrics %} - - {% if emGranularity %} - {{ emGranularity }} - {% endif %} - {% if emMetric %} - {{ emMetric }} - {% endif %} - - {% endif %} - - {% if asgHealthCheckGracePeriod %} - {{ asgHealthCheckGracePeriod }} - {% endif %} - {% if asgHealthCheckType %} - {{ asgHealthCheckType }} - {% endif %} - - {% if asgInstances %} - - {{ iAvailabilityZone }} - {{ iHealthStatus }} - {{ iInstanceId }} - {{ iLaunchConfigurationName }} - {{ iLifecycleState }} - - {% endif %} - - {% if asgLaunchConfigurationName %} - {{ asgLaunchConfigurationName }} - {% endif %} - - {% if asgLoadBalancerNames %} - {{.}} - {% endif %} - - {{ asgMaxSize }} - {{ asgMinSize }} - {% if asgPlacementGroup %} - {{ asgPlacementGroup }} - {% endif %} - {% if asgStatus %} - {{ asgStatus }} - {% endif %} - - {% if asgSuspendedProcesses %} - - {% if spProcessName %} - {{ spProcessName }} - {% endif %} - {% if spSuspensionReason %} - {{ spSuspensionReason }} - {% endif %} - - {% endif %} - - - {% if asgTags %} - - {% if tKey %} - {{ tKey }} - {% endif %} - {% if tPropagateAtLaunch %} - {{ tPropagateAtLaunch }} - {% endif %} - {% if tResourceId %} - {{ tResourceId }} - {% endif %} - {% if tResourceType %} - {{ tResourceType }} - {% endif %} - {% if tValue %} - {{ tValue }} - {% endif %} - - {% endif %} - - - {% if asgTerminationPolicies %} - {{.}} - {% endif %} - - {% if asgVPCZoneIdentifier %} - {{ asgVPCZoneIdentifier }} - {% endif %} - - {% endif %} - - {% if dasgrNextToken %} - {{ dasgrNextToken }} - {% endif %} - - {% endif %} - {% if dashrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeAutoScalingInstances b/test/resources/AutoScaling/DescribeAutoScalingInstances deleted file mode 100644 index 54224040319..00000000000 --- a/test/resources/AutoScaling/DescribeAutoScalingInstances +++ /dev/null @@ -1,11 +0,0 @@ -GET / -Action=DescribeAutoScalingInstances -{% if dasiInstanceIds %} -InstanceIds.member.{{ n }}={{.}} -{% endif %} -{% if dasiMaxRecords %} -MaxRecords={{ dasiMaxRecords }} -{% endif %} -{% if dasiNextToken %} -NextToken={{ dasiNextToken }} -{% endif %} diff --git a/test/resources/AutoScaling/DescribeAutoScalingInstancesResponse b/test/resources/AutoScaling/DescribeAutoScalingInstancesResponse deleted file mode 100644 index ff1ce94c321..00000000000 --- a/test/resources/AutoScaling/DescribeAutoScalingInstancesResponse +++ /dev/null @@ -1,27 +0,0 @@ - - - {% if dasirDescribeAutoScalingInstancesResult %} - - - {% if dasirAutoScalingInstances %} - - {{ asidAutoScalingGroupName }} - {{ asidAvailabilityZone }} - {{ asidHealthStatus }} - {{ asidInstanceId }} - {{ asidLaunchConfigurationName }} - {{ asidLifecycleState }} - - {% endif %} - - {% if dasirNextToken %} - {{ dasirNextToken }} - {% endif %} - - {% endif %} - {% if dasirResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeAutoScalingNotificationTypes b/test/resources/AutoScaling/DescribeAutoScalingNotificationTypes deleted file mode 100644 index b5fe4f51e57..00000000000 --- a/test/resources/AutoScaling/DescribeAutoScalingNotificationTypes +++ /dev/null @@ -1,3 +0,0 @@ -GET / -Action=DescribeAutoScalingNotificationTypes -AutoScalingNotificationTypes={{ dasntAutoScalingNotificationTypes }} diff --git a/test/resources/AutoScaling/DescribeAutoScalingNotificationTypesResponse b/test/resources/AutoScaling/DescribeAutoScalingNotificationTypesResponse deleted file mode 100644 index 57313de9a87..00000000000 --- a/test/resources/AutoScaling/DescribeAutoScalingNotificationTypesResponse +++ /dev/null @@ -1,17 +0,0 @@ - - - {% if dasntrDescribeAutoScalingNotificationTypesResult %} - - - {% if dasntrAutoScalingNotificationTypes %} - {{.}} - {% endif %} - - - {% endif %} - {% if dasntrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeLaunchConfigurations b/test/resources/AutoScaling/DescribeLaunchConfigurations deleted file mode 100644 index 97851f507b7..00000000000 --- a/test/resources/AutoScaling/DescribeLaunchConfigurations +++ /dev/null @@ -1,11 +0,0 @@ -GET / -Action=DescribeLaunchConfigurations -{% if dlcLaunchConfigurationNames %} -LaunchConfigurationNames.member.{{ n }}={{.}} -{% endif %} -{% if dlcMaxRecords %} -MaxRecords={{ dlcMaxRecords }} -{% endif %} -{% if dlcNextToken %} -NextToken={{ dlcNextToken }} -{% endif %} diff --git a/test/resources/AutoScaling/DescribeLaunchConfigurationsResponse b/test/resources/AutoScaling/DescribeLaunchConfigurationsResponse deleted file mode 100644 index d1cf3a4cd3d..00000000000 --- a/test/resources/AutoScaling/DescribeLaunchConfigurationsResponse +++ /dev/null @@ -1,77 +0,0 @@ - - - {% if dldrDescribeLaunchConfigurationsResult %} - - {% if dlcrNextToken %} - {{ dlcrNextToken }} - {% endif %} - - {% if dlcrLaunchConfigurations %} - - - {% if lcBlockDeviceMappings %} - - {{ bdmDeviceName }} - {% if bdmEbs %} - - {% if eSnapshotId %} - {{ eSnapshotId }} - {% endif %} - {% if eVolumeSize %} - {{ eVolumeSize }} - {% endif %} - - {% endif %} - {% if bdmVirtualName %} - {{ bdmVirtualName }} - {% endif %} - - {% endif %} - - {{ lcCreatedTime }} - {% if lcEbsOptimized %} - {{ lcEbsOptimized }} - {% endif %} - {% if lcIamInstanceProfile %} - {{ lcIamInstanceProfile }} - {% endif %} - {{ lcImageId }} - {% if lcInstanceMonitoring %} - - {{ imEnabled }} - - {% endif %} - {{ lcInstanceType }} - {% if lcKernelId %} - {{ lcKernelId }} - {% endif %} - {% if lcKeyName %} - {{ lcKeyName }} - {% endif %} - {% if lcLaunchConfigurationARN %} - {{ lcLaunchConfigurationARN }} - {% endif %} - {{ lcLaunchConfigurationName }} - {% if lcRamdiskId %} - {{ lcRamdiskId }} - {% endif %} - {% if lcSecurityGroups %} - {{ lcSecurityGroups }} - {% endif %} - {% if lcSpotPrice %} - {{ lcSpotPrice }} - {% endif %} - {% if lcUserData %} - {{ lcUserData }} - {% endif %} - - {% endif %} - - - {% endif %} - {% if dldrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeMetricCollectionTypes b/test/resources/AutoScaling/DescribeMetricCollectionTypes deleted file mode 100644 index 4cb7de77bc9..00000000000 --- a/test/resources/AutoScaling/DescribeMetricCollectionTypes +++ /dev/null @@ -1,2 +0,0 @@ -GET / -Action=DescribeMetricCollectionTypes diff --git a/test/resources/AutoScaling/DescribeMetricCollectionTypesResponse b/test/resources/AutoScaling/DescribeMetricCollectionTypesResponse deleted file mode 100644 index a469cbe9dda..00000000000 --- a/test/resources/AutoScaling/DescribeMetricCollectionTypesResponse +++ /dev/null @@ -1,26 +0,0 @@ - - - {% if dmctDescribeMetricCollectionTypesResult %} - - - {% if dmctrGranularities %} - - {{ mgtGranularity }} - - {% endif %} - - - {% if dmctrMetrics %} - - {{ mctMetric }} - - {% endif %} - - - {% endif %} - {% if dmctResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeNotificationConfigurations b/test/resources/AutoScaling/DescribeNotificationConfigurations deleted file mode 100644 index eef35a58709..00000000000 --- a/test/resources/AutoScaling/DescribeNotificationConfigurations +++ /dev/null @@ -1,11 +0,0 @@ -GET / -Action=DescribeNotificationConfigurations -{% if dncAutoScalingGroupNames %} -AutoScalingGroupNames.member.{{ n }}={{.}} -{% endif %} -{% if dncMaxRecords %} -MaxRecords={{ dncMaxRecords }} -{% endif %} -{% if dncNextToken %} -NextToken={{ dncNextToken }} -{% endif %} diff --git a/test/resources/AutoScaling/DescribeNotificationConfigurationsResponse b/test/resources/AutoScaling/DescribeNotificationConfigurationsResponse deleted file mode 100644 index 9a3bb576e36..00000000000 --- a/test/resources/AutoScaling/DescribeNotificationConfigurationsResponse +++ /dev/null @@ -1,30 +0,0 @@ - - - {% if dndrDescribeNotificationConfigurationsResult %} - - {% if dncrNextToken %} - {{ dncrNextToken }} - {% endif %} - - {% if dncrNotificationConfigurations %} - - {% if ncAutoScalingGroupName %} - {{ ncAutoScalingGroupName }} - {% endif %} - {% if ncNotificationType %} - {{ ncNotificationType }} - {% endif %} - {% if ncTopicARN %} - {{ ncTopicARN }} - {% endif %} - - {% endif %} - - - {% endif %} - {% if dndrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribePolicies b/test/resources/AutoScaling/DescribePolicies deleted file mode 100644 index 4f405f7b9f0..00000000000 --- a/test/resources/AutoScaling/DescribePolicies +++ /dev/null @@ -1,14 +0,0 @@ -GET / -Action=DescribePolicies -{% if dqAutoScalingGroupName %} -AutoScalingGroupName={{ dqAutoScalingGroupName }} -{% endif %} -{% if dqMaxRecords %} -MaxRecords={{ dqMaxRecords }} -{% endif %} -{% if dqNextToken %} -NextToken={{ dqNextToken }} -{% endif %} -{% if dqPolicyNames %} -PolicyNames.member.{{ n }}={{.}} -{% endif %} diff --git a/test/resources/AutoScaling/DescribePoliciesResponse b/test/resources/AutoScaling/DescribePoliciesResponse deleted file mode 100644 index 612b6b3da67..00000000000 --- a/test/resources/AutoScaling/DescribePoliciesResponse +++ /dev/null @@ -1,54 +0,0 @@ - - - {% if dqrDescribePoliciesResult %} - - {% if dprNextToken %} - {{ dprNextToken }} - {% endif %} - - {% if dprScalingPolicies %} - - {% if spAdjustmentType %} - {{ spAdjustmentType }} - {% endif %} - - {% if spAlarms %} - - {% if aAlarmARN %} - {{ aAlarmARN }} - {% endif %} - {% if aAlarmName %} - {{ aAlarmName }} - {% endif %} - - {% endif %} - - {% if sqAutoScalingGroupName %} - {{ sqAutoScalingGroupName }} - {% endif %} - {% if sqCooldown %} - {{ sqCooldown }} - {% endif %} - {% if sqMinAdjustmentStep %} - {{ sqMinAdjustmentStep }} - {% endif %} - {% if sqPolicyARN %} - {{ sqPolicyARN }} - {% endif %} - {% if sqPolicyName %} - {{ sqPolicyName }} - {% endif %} - {% if sqScalingAdjustment %} - {{ sqScalingAdjustment }} - {% endif %} - - {% endif %} - - - {% endif %} - {% if dqrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeScalingActivities b/test/resources/AutoScaling/DescribeScalingActivities deleted file mode 100644 index 2365c114fb8..00000000000 --- a/test/resources/AutoScaling/DescribeScalingActivities +++ /dev/null @@ -1,14 +0,0 @@ -GET / -Action=DescribeScalingActivities -{% if dsbActivityIds %} -ActivityIds.member.{{ n }}={{.}} -{% endif %} -{% if dsbAutoScalingGroupName %} -AutoScalingGroupName={{ dsbAutoScalingGroupName }} -{% endif %} -{% if dsbMaxRecords %} -MaxRecords={{ dsbMaxRecords }} -{% endif %} -{% if dsbNextToken %} -NextToken={{ dsbNextToken }} -{% endif %} diff --git a/test/resources/AutoScaling/DescribeScalingActivitiesResponse b/test/resources/AutoScaling/DescribeScalingActivitiesResponse deleted file mode 100644 index 998f9b2fa11..00000000000 --- a/test/resources/AutoScaling/DescribeScalingActivitiesResponse +++ /dev/null @@ -1,41 +0,0 @@ - - - {% if dsbrDescribeScalingActivitiesResult %} - - - {% if dsarActivities %} - - {{ aActivityId }} - {{ aAutoScalingGroupName }} - {{ aCause }} - {% if aDescription %} - {{ aDescription }} - {% endif %} - {% if aDetails %} -
{{ aDetails }}
- {% endif %} - {% if aEndTime %} - {{ aEndTime }} - {% endif %} - {% if aProgress %} - {{ aProgress }} - {% endif %} - {{ aStartTime }} - {{ aStatusCode }} - {% if aStatusMessage %} - {{ aStatusMessage }} - {% endif %} - - {% endif %} - - {% if dsarNextToken %} - {{ dsarNextToken }} - {% endif %} - - {% endif %} - {% if dsbrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeScalingProcessTypes b/test/resources/AutoScaling/DescribeScalingProcessTypes deleted file mode 100644 index 4cf656fcc6c..00000000000 --- a/test/resources/AutoScaling/DescribeScalingProcessTypes +++ /dev/null @@ -1,5 +0,0 @@ -GET / -Action=DescribeScalingProcessTypes -{% if dsptProcesses %} -Processes.ProcessName={{ ptProcessName }} -{% endif %} diff --git a/test/resources/AutoScaling/DescribeScalingProcessTypesResponse b/test/resources/AutoScaling/DescribeScalingProcessTypesResponse deleted file mode 100644 index 1710c743258..00000000000 --- a/test/resources/AutoScaling/DescribeScalingProcessTypesResponse +++ /dev/null @@ -1,19 +0,0 @@ - - - {% if dsptrDescribeScalingProcessTypesResult %} - - - {% if dsptrProcesses %} - - {{ ptProcessName }} - - {% endif %} - - - {% endif %} - {% if dsptrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeScheduledActions b/test/resources/AutoScaling/DescribeScheduledActions deleted file mode 100644 index 61f9a12dc29..00000000000 --- a/test/resources/AutoScaling/DescribeScheduledActions +++ /dev/null @@ -1,20 +0,0 @@ -GET / -Action=DescribeScheduledActions -{% if dscAutoScalingGroupName %} -AutoScalingGroupName={{ dscAutoScalingGroupName }} -{% endif %} -{% if dscEndTime %} -EndTime={{ dscEndTime }} -{% endif %} -{% if dscMaxRecords %} -MaxRecords={{ dscMaxRecords }} -{% endif %} -{% if dscNextToken %} -NextToken={{ dscNextToken }} -{% endif %} -{% if dscScheduledActionNames %} -ScheduledActionNames.member.{{ n }}={{.}} -{% endif %} -{% if dscStartTime %} -StartTime={{ dscStartTime }} -{% endif %} diff --git a/test/resources/AutoScaling/DescribeScheduledActionsResponse b/test/resources/AutoScaling/DescribeScheduledActionsResponse deleted file mode 100644 index ab1605825ec..00000000000 --- a/test/resources/AutoScaling/DescribeScheduledActionsResponse +++ /dev/null @@ -1,51 +0,0 @@ - - - {% if dscrDescribeScheduledActionsResult %} - - {% if dsasNextToken %} - {{ dsasNextToken }} - {% endif %} - - {% if dsasScheduledUpdateGroupActions %} - - {% if sugaAutoScalingGroupName %} - {{ sugaAutoScalingGroupName }} - {% endif %} - {% if sugaDesiredCapacity %} - {{ sugaDesiredCapacity }} - {% endif %} - {% if sugaEndTime %} - {{ sugaEndTime }} - {% endif %} - {% if sugaMaxSize %} - {{ sugaMaxSize }} - {% endif %} - {% if sugaMinSize %} - {{ sugaMinSize }} - {% endif %} - {% if sugaRecurrence %} - {{ sugaRecurrence }} - {% endif %} - {% if sugaScheduledActionARN %} - {{ sugaScheduledActionARN }} - {% endif %} - {% if sugaScheduledActionName %} - {{ sugaScheduledActionName }} - {% endif %} - {% if sugaStartTime %} - {{ sugaStartTime }} - {% endif %} - {% if sugaTime %} - - {% endif %} - - {% endif %} - - - {% endif %} - {% if dscrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeTags b/test/resources/AutoScaling/DescribeTags deleted file mode 100644 index 26a593df026..00000000000 --- a/test/resources/AutoScaling/DescribeTags +++ /dev/null @@ -1,16 +0,0 @@ -GET / -Action=DescribeTags -{% if dtFilters %} -{% if fName %} -Filters.member.{{ n }}.Name={{ fName }} -{% endif %} -{% if fValues %} -Filters.member.{{ n }}.Values={{ fValues }} -{% endif %} -{% endif %} -{% if dtMaxRecords %} -MaxRecords={{ dtMaxRecords }} -{% endif %} -{% if dtNextToken %} -NextToken={{ dtNextToken }} -{% endif %} diff --git a/test/resources/AutoScaling/DescribeTagsResponse b/test/resources/AutoScaling/DescribeTagsResponse deleted file mode 100644 index 79a3f05559b..00000000000 --- a/test/resources/AutoScaling/DescribeTagsResponse +++ /dev/null @@ -1,36 +0,0 @@ - - - {% if dtrDescribeTagsResult %} - - {% if dtrNextToken %} - {{ dtrNextToken }} - {% endif %} - - {% if dtrTags %} - - {% if tKey %} - {{ tKey }} - {% endif %} - {% if tPropagateAtLaunch %} - {{ tPropagateAtLaunch }} - {% endif %} - {% if tResourceId %} - {{ tResourceId }} - {% endif %} - {% if tResourceType %} - {{ tResourceType }} - {% endif %} - {% if tValue %} - {{ tValue }} - {% endif %} - - {% endif %} - - - {% endif %} - {% if dtrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DescribeTerminationPolicyTypes b/test/resources/AutoScaling/DescribeTerminationPolicyTypes deleted file mode 100644 index 8573d81258f..00000000000 --- a/test/resources/AutoScaling/DescribeTerminationPolicyTypes +++ /dev/null @@ -1,3 +0,0 @@ -GET / -Action=DescribeTerminationPolicyTypes -TerminationPolicyTypes={{ dtptTerminationPolicyTypes }} diff --git a/test/resources/AutoScaling/DescribeTerminationPolicyTypesResponse b/test/resources/AutoScaling/DescribeTerminationPolicyTypesResponse deleted file mode 100644 index 7c3ea7dcebc..00000000000 --- a/test/resources/AutoScaling/DescribeTerminationPolicyTypesResponse +++ /dev/null @@ -1,17 +0,0 @@ - - - {% if dtptrDescribeTerminationPolicyTypesResult %} - - - {% if dtptrTerminationPolicyTypes %} - {{.}} - {% endif %} - - - {% endif %} - {% if dtptrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/DisableMetricsCollection b/test/resources/AutoScaling/DisableMetricsCollection deleted file mode 100644 index 9e4d893d490..00000000000 --- a/test/resources/AutoScaling/DisableMetricsCollection +++ /dev/null @@ -1,6 +0,0 @@ -GET / -Action=DisableMetricsCollection -AutoScalingGroupName={{ dmcAutoScalingGroupName }} -{% if dmcMetrics %} -Metrics.member.{{ n }}={{.}} -{% endif %} diff --git a/test/resources/AutoScaling/DisableMetricsCollectionResponse b/test/resources/AutoScaling/DisableMetricsCollectionResponse deleted file mode 100644 index b5d8cfeb905..00000000000 --- a/test/resources/AutoScaling/DisableMetricsCollectionResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if dmcrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/EnableMetricsCollection b/test/resources/AutoScaling/EnableMetricsCollection deleted file mode 100644 index 271ed79e317..00000000000 --- a/test/resources/AutoScaling/EnableMetricsCollection +++ /dev/null @@ -1,7 +0,0 @@ -GET / -Action=EnableMetricsCollection -AutoScalingGroupName={{ emcAutoScalingGroupName }} -Granularity={{ emcGranularity }} -{% if emcMetrics %} -Metrics.member.{{ n }}={{.}} -{% endif %} diff --git a/test/resources/AutoScaling/EnableMetricsCollectionResponse b/test/resources/AutoScaling/EnableMetricsCollectionResponse deleted file mode 100644 index 8f1572b8543..00000000000 --- a/test/resources/AutoScaling/EnableMetricsCollectionResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if emcrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/ExecutePolicy b/test/resources/AutoScaling/ExecutePolicy deleted file mode 100644 index f845a2a3d9e..00000000000 --- a/test/resources/AutoScaling/ExecutePolicy +++ /dev/null @@ -1,9 +0,0 @@ -GET / -Action=ExecutePolicy -{% if epAutoScalingGroupName %} -AutoScalingGroupName={{ epAutoScalingGroupName }} -{% endif %} -{% if epHonorCooldown %} -HonorCooldown={{ epHonorCooldown }} -{% endif %} -PolicyName={{ epPolicyName }} diff --git a/test/resources/AutoScaling/ExecutePolicyResponse b/test/resources/AutoScaling/ExecutePolicyResponse deleted file mode 100644 index 301c90a323c..00000000000 --- a/test/resources/AutoScaling/ExecutePolicyResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if eprResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/PutNotificationConfiguration b/test/resources/AutoScaling/PutNotificationConfiguration deleted file mode 100644 index 1973090983b..00000000000 --- a/test/resources/AutoScaling/PutNotificationConfiguration +++ /dev/null @@ -1,7 +0,0 @@ -GET / -Action=PutNotificationConfiguration -AutoScalingGroupName={{ pncAutoScalingGroupName }} -{% if pncNotificationTypes %} -NotificationTypes.member.{{ n }}={{.}} -{% endif %} -TopicARN={{ pncTopicARN }} diff --git a/test/resources/AutoScaling/PutNotificationConfigurationResponse b/test/resources/AutoScaling/PutNotificationConfigurationResponse deleted file mode 100644 index e7034c83ea4..00000000000 --- a/test/resources/AutoScaling/PutNotificationConfigurationResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if pncrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/PutScalingPolicy b/test/resources/AutoScaling/PutScalingPolicy deleted file mode 100644 index 38bf8a9edbf..00000000000 --- a/test/resources/AutoScaling/PutScalingPolicy +++ /dev/null @@ -1,12 +0,0 @@ -GET / -Action=PutScalingPolicy -AdjustmentType={{ pspAdjustmentType }} -AutoScalingGroupName={{ pspAutoScalingGroupName }} -{% if pspCooldown %} -Cooldown={{ pspCooldown }} -{% endif %} -{% if pspMinAdjustmentStep %} -MinAdjustmentStep={{ pspMinAdjustmentStep }} -{% endif %} -PolicyName={{ pspPolicyName }} -ScalingAdjustment={{ pspScalingAdjustment }} diff --git a/test/resources/AutoScaling/PutScalingPolicyResponse b/test/resources/AutoScaling/PutScalingPolicyResponse deleted file mode 100644 index 4f59c284fe7..00000000000 --- a/test/resources/AutoScaling/PutScalingPolicyResponse +++ /dev/null @@ -1,13 +0,0 @@ - - - {% if psprPutScalingPolicyResult %} - - {{ psprPolicyARN }} - - {% endif %} - {% if psprResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/PutScheduledUpdateGroupAction b/test/resources/AutoScaling/PutScheduledUpdateGroupAction deleted file mode 100644 index 9ab5c714589..00000000000 --- a/test/resources/AutoScaling/PutScheduledUpdateGroupAction +++ /dev/null @@ -1,25 +0,0 @@ -GET / -Action=PutScheduledUpdateGroupAction -AutoScalingGroupName={{ psugaAutoScalingGroupName }} -{% if psugaDesiredCapacity %} -DesiredCapacity={{ psugaDesiredCapacity }} -{% endif %} -{% if psugaEndTime %} -EndTime={{ psugaEndTime }} -{% endif %} -{% if psugaMaxSize %} -MaxSize={{ psugaMaxSize }} -{% endif %} -{% if psugaMinSize %} -MinSize={{ psugaMinSize }} -{% endif %} -{% if psugaRecurrence %} -Recurrence={{ psugaRecurrence }} -{% endif %} -ScheduledActionName={{ psugaScheduledActionName }} -{% if psugaStartTime %} -StartTime={{ psugaStartTime }} -{% endif %} -{% if psugaTime %} -Time={{ psugaTime }} -{% endif %} diff --git a/test/resources/AutoScaling/PutScheduledUpdateGroupActionResponse b/test/resources/AutoScaling/PutScheduledUpdateGroupActionResponse deleted file mode 100644 index c07cc65b4de..00000000000 --- a/test/resources/AutoScaling/PutScheduledUpdateGroupActionResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if psugarResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/ResumeProcesses b/test/resources/AutoScaling/ResumeProcesses deleted file mode 100644 index c249e079b7f..00000000000 --- a/test/resources/AutoScaling/ResumeProcesses +++ /dev/null @@ -1,6 +0,0 @@ -GET / -Action=ResumeProcesses -AutoScalingGroupName={{ rpAutoScalingGroupName }} -{% if rpScalingProcesses %} -ScalingProcesses.member.{{ n }}={{.}} -{% endif %} diff --git a/test/resources/AutoScaling/ResumeProcessesResponse b/test/resources/AutoScaling/ResumeProcessesResponse deleted file mode 100644 index 1fc8b2c3b4f..00000000000 --- a/test/resources/AutoScaling/ResumeProcessesResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if rprResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/SetDesiredCapacity b/test/resources/AutoScaling/SetDesiredCapacity deleted file mode 100644 index 3ceca33a540..00000000000 --- a/test/resources/AutoScaling/SetDesiredCapacity +++ /dev/null @@ -1,7 +0,0 @@ -GET / -Action=SetDesiredCapacity -AutoScalingGroupName={{ sdcAutoScalingGroupName }} -DesiredCapacity={{ sdcDesiredCapacity }} -{% if sdcHonorCooldown %} -HonorCooldown={{ sdcHonorCooldown }} -{% endif %} diff --git a/test/resources/AutoScaling/SetDesiredCapacityResponse b/test/resources/AutoScaling/SetDesiredCapacityResponse deleted file mode 100644 index 20497348ef0..00000000000 --- a/test/resources/AutoScaling/SetDesiredCapacityResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if sdcrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/SetInstanceHealth b/test/resources/AutoScaling/SetInstanceHealth deleted file mode 100644 index 908c77de454..00000000000 --- a/test/resources/AutoScaling/SetInstanceHealth +++ /dev/null @@ -1,7 +0,0 @@ -GET / -Action=SetInstanceHealth -HealthStatus={{ sihHealthStatus }} -InstanceId={{ sihInstanceId }} -{% if sihShouldRespectGracePeriod %} -ShouldRespectGracePeriod={{ sihShouldRespectGracePeriod }} -{% endif %} diff --git a/test/resources/AutoScaling/SetInstanceHealthResponse b/test/resources/AutoScaling/SetInstanceHealthResponse deleted file mode 100644 index 851ab11baac..00000000000 --- a/test/resources/AutoScaling/SetInstanceHealthResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if sihrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/SuspendProcesses b/test/resources/AutoScaling/SuspendProcesses deleted file mode 100644 index 3665c63303e..00000000000 --- a/test/resources/AutoScaling/SuspendProcesses +++ /dev/null @@ -1,6 +0,0 @@ -GET / -Action=SuspendProcesses -AutoScalingGroupName={{ spAutoScalingGroupName }} -{% if spScalingProcesses %} -ScalingProcesses.member.{{ n }}={{.}} -{% endif %} diff --git a/test/resources/AutoScaling/SuspendProcessesResponse b/test/resources/AutoScaling/SuspendProcessesResponse deleted file mode 100644 index 1bc9e472dba..00000000000 --- a/test/resources/AutoScaling/SuspendProcessesResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if sprResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/AutoScaling/TerminateInstanceInAutoScalingGroup b/test/resources/AutoScaling/TerminateInstanceInAutoScalingGroup deleted file mode 100644 index c5f6430a013..00000000000 --- a/test/resources/AutoScaling/TerminateInstanceInAutoScalingGroup +++ /dev/null @@ -1,4 +0,0 @@ -GET / -Action=TerminateInstanceInAutoScalingGroup -InstanceId={{ tiiasgInstanceId }} -ShouldDecrementDesiredCapacity={{ tiiasgShouldDecrementDesiredCapacity }} diff --git a/test/resources/AutoScaling/TerminateInstanceInAutoScalingGroupResponse b/test/resources/AutoScaling/TerminateInstanceInAutoScalingGroupResponse deleted file mode 100644 index a0d05816b5b..00000000000 --- a/test/resources/AutoScaling/TerminateInstanceInAutoScalingGroupResponse +++ /dev/null @@ -1,36 +0,0 @@ - - - {% if tiiasgrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - {% if tiiasgrTerminateInstanceInAutoScalingGroupResult %} - - {% if tiiasgrActivity %} - - {{ aActivityId }} - {{ aAutoScalingGroupName }} - {{ aCause }} - {% if aDescription %} - {{ aDescription }} - {% endif %} - {% if aDetails %} -
{{ aDetails }}
- {% endif %} - {% if aEndTime %} - {{ aEndTime }} - {% endif %} - {% if aProgress %} - {{ aProgress }} - {% endif %} - {{ aStartTime }} - {{ aStatusCode }} - {% if aStatusMessage %} - {{ aStatusMessage }} - {% endif %} - - {% endif %} - - {% endif %} - diff --git a/test/resources/AutoScaling/UpdateAutoScalingGroup b/test/resources/AutoScaling/UpdateAutoScalingGroup deleted file mode 100644 index d1a11f53306..00000000000 --- a/test/resources/AutoScaling/UpdateAutoScalingGroup +++ /dev/null @@ -1,37 +0,0 @@ -GET / -Action=UpdateAutoScalingGroup -AutoScalingGroupName={{ uasgAutoScalingGroupName }} -{% if uasgAvailabilityZones %} -AvailabilityZones.member.{{ n }}={{.}} -{% endif %} -{% if uasgDefaultCooldown %} -DefaultCooldown={{ uasgDefaultCooldown }} -{% endif %} -{% if uasgDesiredCapacity %} -DesiredCapacity={{ uasgDesiredCapacity }} -{% endif %} -{% if uasgHealthCheckGracePeriod %} -HealthCheckGracePeriod={{ uasgHealthCheckGracePeriod }} -{% endif %} -{% if uasgHealthCheckType %} -HealthCheckType={{ uasgHealthCheckType }} -{% endif %} -{% if uasgLaunchConfigurationName %} -LaunchConfigurationName={{ uasgLaunchConfigurationName }} -{% endif %} -{% if uasgMaxSize %} -MaxSize={{ uasgMaxSize }} -{% endif %} -{% if uasgMinSize %} -MinSize={{ uasgMinSize }} -{% endif %} -{% if uasgPlacementGroup %} -PlacementGroup={{ uasgPlacementGroup }} -{% endif %} -{% if uasgTerminationPolicies %} -TerminationPolicies.member.{{ n }}={{.}} -{% endif %} -{% if uasgVPCZoneIdentifier %} -VPCZoneIdentifier={{ uasgVPCZoneIdentifier }} -{% endif %} - diff --git a/test/resources/AutoScaling/UpdateAutoScalingGroupResponse b/test/resources/AutoScaling/UpdateAutoScalingGroupResponse deleted file mode 100644 index a9afcd24703..00000000000 --- a/test/resources/AutoScaling/UpdateAutoScalingGroupResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {% if uasgrResponseMetadata %} - - {{ rmRequestId }} - - {% endif %} - diff --git a/test/resources/CloudFront/CreateDistribution b/test/resources/CloudFront/CreateDistribution deleted file mode 100644 index d54616b6f92..00000000000 --- a/test/resources/CloudFront/CreateDistribution +++ /dev/null @@ -1,521 +0,0 @@ -POST /2013-05-12/distribution HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to forward - to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - -201 Created -Location: URI of new distribution -x-amz-request-id: Request ID - - - - ID for the distribution - Deployed | InProgress - creation date and time in - ISO 8601 format - number of invalidation batches being - processed for this distribution - CloudFront domain name assigned to the - distribution - - true | false - number of unique trusted signers from - all cache behaviors - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - - -POST /2013-05-12/distribution HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - -201 Created -Location: https://cloudfront.amazonaws.com/2013-05-12/distribution/EDFDVBD6EXAMPLE -x-amz-request-id: request_id - - - - EDFDVBD6EXAMPLE - Deployed - 2012-05-19T19:37:58Z - 1 - d111111abcdef8.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/CreateDistributionResponse b/test/resources/CloudFront/CreateDistributionResponse deleted file mode 100644 index d54616b6f92..00000000000 --- a/test/resources/CloudFront/CreateDistributionResponse +++ /dev/null @@ -1,521 +0,0 @@ -POST /2013-05-12/distribution HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to forward - to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - -201 Created -Location: URI of new distribution -x-amz-request-id: Request ID - - - - ID for the distribution - Deployed | InProgress - creation date and time in - ISO 8601 format - number of invalidation batches being - processed for this distribution - CloudFront domain name assigned to the - distribution - - true | false - number of unique trusted signers from - all cache behaviors - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - - -POST /2013-05-12/distribution HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - -201 Created -Location: https://cloudfront.amazonaws.com/2013-05-12/distribution/EDFDVBD6EXAMPLE -x-amz-request-id: request_id - - - - EDFDVBD6EXAMPLE - Deployed - 2012-05-19T19:37:58Z - 1 - d111111abcdef8.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/CreateInvalidation b/test/resources/CloudFront/CreateInvalidation deleted file mode 100644 index f604f6e5fa4..00000000000 --- a/test/resources/CloudFront/CreateInvalidation +++ /dev/null @@ -1,73 +0,0 @@ -POST /2013-05-12/distribution/distribution ID/invalidation HTTP/1.0 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Content-Type: text/xml -Other required headers - - - - - number of objects to invalidate - - /path to object to invalidate - - - unique identifier for this invalidation batch - - -HTTP/1.0 201 Created -Content-Type: text/xml -Location: https://cloudfront.amazonaws.com/2013-05-12/distribution/distribution ID/invalidation/invalidation ID - - id that CloudFront assigned to the invalidation - InProgress | Completed - date and time of request - - - number of objects to invalidate - - /path to object to invalidate - - - unique identifier for this invalidation batch - - - -POST /2013-05-12/distribution/distribution ID/invalidation HTTP/1.0 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Content-Type: text/xml - - - - 3 - - /image1.jpg - /image2.jpg - /videos/movie.flv - - - 20120301090001 - - -HTTP/1.0 201 Created -Content-Type: text/xml -Location: https://cloudfront.amazonaws.com/2013-05-12/distribution/distribution ID/invalidation/invalidation ID - - - IDFDVBD632BHDS5 - InProgress - 2009-11-19T19:37:58Z - - - 3 - - /image1.jpg - /image2.jpg - /videos/movie.flv - - - 20120301090001 - - - diff --git a/test/resources/CloudFront/CreateInvalidationResponse b/test/resources/CloudFront/CreateInvalidationResponse deleted file mode 100644 index f604f6e5fa4..00000000000 --- a/test/resources/CloudFront/CreateInvalidationResponse +++ /dev/null @@ -1,73 +0,0 @@ -POST /2013-05-12/distribution/distribution ID/invalidation HTTP/1.0 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Content-Type: text/xml -Other required headers - - - - - number of objects to invalidate - - /path to object to invalidate - - - unique identifier for this invalidation batch - - -HTTP/1.0 201 Created -Content-Type: text/xml -Location: https://cloudfront.amazonaws.com/2013-05-12/distribution/distribution ID/invalidation/invalidation ID - - id that CloudFront assigned to the invalidation - InProgress | Completed - date and time of request - - - number of objects to invalidate - - /path to object to invalidate - - - unique identifier for this invalidation batch - - - -POST /2013-05-12/distribution/distribution ID/invalidation HTTP/1.0 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Content-Type: text/xml - - - - 3 - - /image1.jpg - /image2.jpg - /videos/movie.flv - - - 20120301090001 - - -HTTP/1.0 201 Created -Content-Type: text/xml -Location: https://cloudfront.amazonaws.com/2013-05-12/distribution/distribution ID/invalidation/invalidation ID - - - IDFDVBD632BHDS5 - InProgress - 2009-11-19T19:37:58Z - - - 3 - - /image1.jpg - /image2.jpg - /videos/movie.flv - - - 20120301090001 - - - diff --git a/test/resources/CloudFront/CreateOAI b/test/resources/CloudFront/CreateOAI deleted file mode 100644 index cfd4aa4b889..00000000000 --- a/test/resources/CloudFront/CreateOAI +++ /dev/null @@ -1,54 +0,0 @@ -POST /2013-05-12/origin-access-identity/cloudfront HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - - - - ref - The comment. - - -201 Created -Location: URI of new origin access identity -x-amz-request-id: Request ID - - - - E74FTE3AEXAMPLE - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - - - - - -POST /2013-05-12/origin-access-identity/cloudfront HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - - - - 20120229090000 - My comments - - -201 Created -Location: https://cloudfront.amazonaws.com/2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE -x-amz-request-id: request_id - - - - E74FTE3AEXAMPLE - - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - - 20120229090000 - My comments - - - diff --git a/test/resources/CloudFront/CreateOAIResponse b/test/resources/CloudFront/CreateOAIResponse deleted file mode 100644 index cfd4aa4b889..00000000000 --- a/test/resources/CloudFront/CreateOAIResponse +++ /dev/null @@ -1,54 +0,0 @@ -POST /2013-05-12/origin-access-identity/cloudfront HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - - - - ref - The comment. - - -201 Created -Location: URI of new origin access identity -x-amz-request-id: Request ID - - - - E74FTE3AEXAMPLE - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - - - - - -POST /2013-05-12/origin-access-identity/cloudfront HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - - - - 20120229090000 - My comments - - -201 Created -Location: https://cloudfront.amazonaws.com/2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE -x-amz-request-id: request_id - - - - E74FTE3AEXAMPLE - - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - - 20120229090000 - My comments - - - diff --git a/test/resources/CloudFront/CreateStreamingDistribution b/test/resources/CloudFront/CreateStreamingDistribution deleted file mode 100644 index e2edbe57efa..00000000000 --- a/test/resources/CloudFront/CreateStreamingDistribution +++ /dev/null @@ -1,201 +0,0 @@ -POST /2013-05-12/streaming-distribution HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - - - - unique description for this distribution - - CloudFront domain name assigned to the distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - -201 Created -Location: URI of new streaming distribution -x-amz-request-id: Request ID - - - - id - Deployed | InProgress - date and time in ISO 8601 format - CloudFront domain name for the distribution - - true | false - number of trusted signers for this distribution - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution - - CloudFront domain name assigned to the - streaming distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - - -POST /2013-05-12/streaming-distribution HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - -201 Created -Location: https://cloudfront.amazonaws.com/2013-05-12/streaming-distribution/EGTXBD79EXAMPLE -x-amz-request-id: request_id - - - - EGTXBD79EXAMPLE - Deployed - 2012-05-19T19:37:58Z - s5c39gqb8ow64r.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/CreateStreamingDistributionResponse b/test/resources/CloudFront/CreateStreamingDistributionResponse deleted file mode 100644 index e2edbe57efa..00000000000 --- a/test/resources/CloudFront/CreateStreamingDistributionResponse +++ /dev/null @@ -1,201 +0,0 @@ -POST /2013-05-12/streaming-distribution HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - - - - unique description for this distribution - - CloudFront domain name assigned to the distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - -201 Created -Location: URI of new streaming distribution -x-amz-request-id: Request ID - - - - id - Deployed | InProgress - date and time in ISO 8601 format - CloudFront domain name for the distribution - - true | false - number of trusted signers for this distribution - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution - - CloudFront domain name assigned to the - streaming distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - - -POST /2013-05-12/streaming-distribution HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - -201 Created -Location: https://cloudfront.amazonaws.com/2013-05-12/streaming-distribution/EGTXBD79EXAMPLE -x-amz-request-id: request_id - - - - EGTXBD79EXAMPLE - Deployed - 2012-05-19T19:37:58Z - s5c39gqb8ow64r.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/DeleteDistribution b/test/resources/CloudFront/DeleteDistribution deleted file mode 100644 index 82a749d6d9c..00000000000 --- a/test/resources/CloudFront/DeleteDistribution +++ /dev/null @@ -1,19 +0,0 @@ -DELETE /2013-05-12/distribution/distribution ID HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET or PUT response -Authorization: AWS authentication string -Date: time stamp -Other required headers - -204 No Content -x-amz-request-id: Request ID - -DELETE /2013-05-12/distribution/EDFDVBD6EXAMPLE HTTP 1.1 -Host: cloudfront.amazonaws.com -If-Match: E2QWRUHEXAMPLE -Authorization: AWS authentication string -Other required headers - -204 No Content -x-amz-request-id: request_id - diff --git a/test/resources/CloudFront/DeleteDistributionResponse b/test/resources/CloudFront/DeleteDistributionResponse deleted file mode 100644 index 82a749d6d9c..00000000000 --- a/test/resources/CloudFront/DeleteDistributionResponse +++ /dev/null @@ -1,19 +0,0 @@ -DELETE /2013-05-12/distribution/distribution ID HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET or PUT response -Authorization: AWS authentication string -Date: time stamp -Other required headers - -204 No Content -x-amz-request-id: Request ID - -DELETE /2013-05-12/distribution/EDFDVBD6EXAMPLE HTTP 1.1 -Host: cloudfront.amazonaws.com -If-Match: E2QWRUHEXAMPLE -Authorization: AWS authentication string -Other required headers - -204 No Content -x-amz-request-id: request_id - diff --git a/test/resources/CloudFront/DeleteOAI b/test/resources/CloudFront/DeleteOAI deleted file mode 100644 index d5cc69299f9..00000000000 --- a/test/resources/CloudFront/DeleteOAI +++ /dev/null @@ -1,19 +0,0 @@ -DELETE /2013-05-12/origin-access-identity/cloudfront/ HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET or PUT response -Authorization: AWS authentication string -Date: time stamp -Other required headers - -204 No Content -x-amz-request-id: Request ID - -DELETE /2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE HTTP 1.1 -Host: cloudfront.amazonaws.com -If-Match: E2QWRUHEXAMPLE -Authorization: AWS authentication string -Other required headers - -204 No Content -x-amz-request-id: request_id - diff --git a/test/resources/CloudFront/DeleteOAIResponse b/test/resources/CloudFront/DeleteOAIResponse deleted file mode 100644 index d5cc69299f9..00000000000 --- a/test/resources/CloudFront/DeleteOAIResponse +++ /dev/null @@ -1,19 +0,0 @@ -DELETE /2013-05-12/origin-access-identity/cloudfront/ HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET or PUT response -Authorization: AWS authentication string -Date: time stamp -Other required headers - -204 No Content -x-amz-request-id: Request ID - -DELETE /2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE HTTP 1.1 -Host: cloudfront.amazonaws.com -If-Match: E2QWRUHEXAMPLE -Authorization: AWS authentication string -Other required headers - -204 No Content -x-amz-request-id: request_id - diff --git a/test/resources/CloudFront/DeleteStreamingDistribution b/test/resources/CloudFront/DeleteStreamingDistribution deleted file mode 100644 index 2ba4aceac65..00000000000 --- a/test/resources/CloudFront/DeleteStreamingDistribution +++ /dev/null @@ -1,19 +0,0 @@ -DELETE /2013-05-12/streaming-distribution/distribution ID HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET or PUT response -Authorization: AWS authentication string -Date: time stamp -Other required headers - -204 No Content -x-amz-request-id: Request ID - -DELETE /2013-05-12/streaming-distribution/EGTXBD79EXAMPLE HTTP 1.1 -Host: cloudfront.amazonaws.com -If-Match: E2QWRUHEXAMPLE -Authorization: AWS authentication string -Other required headers - -204 No Content -x-amz-request-id: request_id - diff --git a/test/resources/CloudFront/DeleteStreamingDistributionResponse b/test/resources/CloudFront/DeleteStreamingDistributionResponse deleted file mode 100644 index 2ba4aceac65..00000000000 --- a/test/resources/CloudFront/DeleteStreamingDistributionResponse +++ /dev/null @@ -1,19 +0,0 @@ -DELETE /2013-05-12/streaming-distribution/distribution ID HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET or PUT response -Authorization: AWS authentication string -Date: time stamp -Other required headers - -204 No Content -x-amz-request-id: Request ID - -DELETE /2013-05-12/streaming-distribution/EGTXBD79EXAMPLE HTTP 1.1 -Host: cloudfront.amazonaws.com -If-Match: E2QWRUHEXAMPLE -Authorization: AWS authentication string -Other required headers - -204 No Content -x-amz-request-id: request_id - diff --git a/test/resources/CloudFront/GetConfig b/test/resources/CloudFront/GetConfig deleted file mode 100644 index 045608834a0..00000000000 --- a/test/resources/CloudFront/GetConfig +++ /dev/null @@ -1,240 +0,0 @@ -GET /2013-05-12/distribution/distribution ID/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT on the config -x-amz-request-id: Request ID - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to forward - to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - -GET /2013-05-12/distribution/EDFDVBD6EXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - diff --git a/test/resources/CloudFront/GetConfigResponse b/test/resources/CloudFront/GetConfigResponse deleted file mode 100644 index 045608834a0..00000000000 --- a/test/resources/CloudFront/GetConfigResponse +++ /dev/null @@ -1,240 +0,0 @@ -GET /2013-05-12/distribution/distribution ID/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT on the config -x-amz-request-id: Request ID - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to forward - to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - -GET /2013-05-12/distribution/EDFDVBD6EXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - diff --git a/test/resources/CloudFront/GetDistribution b/test/resources/CloudFront/GetDistribution deleted file mode 100644 index f930da6aaf7..00000000000 --- a/test/resources/CloudFront/GetDistribution +++ /dev/null @@ -1,300 +0,0 @@ -GET /2013-05-12/distribution/distribution ID HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT or DELETE -x-amz-request-id: Request ID - - - - ID for the distribution - Deployed | InProgress - creation date and time in - ISO 8601 format - number of invalidation batches being - processed for this distribution - CloudFront domain name assigned to the - distribution - - true | false - number of unique trusted signers from - all cache behaviors - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - - -GET /2013-05-12/distribution/EDFDVBD6EXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - EDFDVBD6EXAMPLE - Deployed - 2012-05-19T19:37:58Z - 1 - d111111abcdef8.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/GetDistributionResponse b/test/resources/CloudFront/GetDistributionResponse deleted file mode 100644 index f930da6aaf7..00000000000 --- a/test/resources/CloudFront/GetDistributionResponse +++ /dev/null @@ -1,300 +0,0 @@ -GET /2013-05-12/distribution/distribution ID HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT or DELETE -x-amz-request-id: Request ID - - - - ID for the distribution - Deployed | InProgress - creation date and time in - ISO 8601 format - number of invalidation batches being - processed for this distribution - CloudFront domain name assigned to the - distribution - - true | false - number of unique trusted signers from - all cache behaviors - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - - -GET /2013-05-12/distribution/EDFDVBD6EXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - EDFDVBD6EXAMPLE - Deployed - 2012-05-19T19:37:58Z - 1 - d111111abcdef8.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/GetInvalidation b/test/resources/CloudFront/GetInvalidation deleted file mode 100644 index 6b5bb1701e6..00000000000 --- a/test/resources/CloudFront/GetInvalidation +++ /dev/null @@ -1,46 +0,0 @@ -GET /2013-05-12/distribution/distribution ID/invalidation/invalidation ID HTTP/1.0 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string - -HTTP/1.0 200 OK -Content-Type: text/xml - - - id that CloudFront assigned to the invalidation - InProgress | Completed - date and time of request - - - number of objects to invalidate - - /path to object to invalidate - - - unique identifier for this invalidation batch - - - -GET /2013-05-12/distribution/distribution ID/invalidation/invalidation ID HTTP/1.0 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string - -HTTP/1.0 200 OK -Content-Type: text/xml - - - IDFDVBD632BHDS5 - InProgress - 2009-11-19T19:37:58Z - - - 3 - - /image1.jpg - /image2.jpg - /videos/movie.flv - - - 20120301090001 - - - diff --git a/test/resources/CloudFront/GetInvalidationResponse b/test/resources/CloudFront/GetInvalidationResponse deleted file mode 100644 index 6b5bb1701e6..00000000000 --- a/test/resources/CloudFront/GetInvalidationResponse +++ /dev/null @@ -1,46 +0,0 @@ -GET /2013-05-12/distribution/distribution ID/invalidation/invalidation ID HTTP/1.0 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string - -HTTP/1.0 200 OK -Content-Type: text/xml - - - id that CloudFront assigned to the invalidation - InProgress | Completed - date and time of request - - - number of objects to invalidate - - /path to object to invalidate - - - unique identifier for this invalidation batch - - - -GET /2013-05-12/distribution/distribution ID/invalidation/invalidation ID HTTP/1.0 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string - -HTTP/1.0 200 OK -Content-Type: text/xml - - - IDFDVBD632BHDS5 - InProgress - 2009-11-19T19:37:58Z - - - 3 - - /image1.jpg - /image2.jpg - /videos/movie.flv - - - 20120301090001 - - - diff --git a/test/resources/CloudFront/GetOAI b/test/resources/CloudFront/GetOAI deleted file mode 100644 index 4b7637ffffd..00000000000 --- a/test/resources/CloudFront/GetOAI +++ /dev/null @@ -1,41 +0,0 @@ -GET /2013-05-12/origin-access-identity/cloudfront/ HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -Etag: ETag value to use later when doing a PUT or DELETE -x-amz-request-id: Request ID - - - - - id - - ref - The comment. - - - -GET /2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - E74FTE3AEXAMPLE - - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - - 20120229090000 - My comments - - - diff --git a/test/resources/CloudFront/GetOAIConfig b/test/resources/CloudFront/GetOAIConfig deleted file mode 100644 index 1ba9cb31154..00000000000 --- a/test/resources/CloudFront/GetOAIConfig +++ /dev/null @@ -1,32 +0,0 @@ -GET /2013-05-12/origin-access-identity/cloudfront//config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT on the config -x-amz-request-id: Request ID - - - - 20120229090000 - The comment. - - -GET /2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - - 20120229090000 - My comments - - diff --git a/test/resources/CloudFront/GetOAIConfigResponse b/test/resources/CloudFront/GetOAIConfigResponse deleted file mode 100644 index 1ba9cb31154..00000000000 --- a/test/resources/CloudFront/GetOAIConfigResponse +++ /dev/null @@ -1,32 +0,0 @@ -GET /2013-05-12/origin-access-identity/cloudfront//config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT on the config -x-amz-request-id: Request ID - - - - 20120229090000 - The comment. - - -GET /2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - - 20120229090000 - My comments - - diff --git a/test/resources/CloudFront/GetOAIResponse b/test/resources/CloudFront/GetOAIResponse deleted file mode 100644 index 4b7637ffffd..00000000000 --- a/test/resources/CloudFront/GetOAIResponse +++ /dev/null @@ -1,41 +0,0 @@ -GET /2013-05-12/origin-access-identity/cloudfront/ HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -Etag: ETag value to use later when doing a PUT or DELETE -x-amz-request-id: Request ID - - - - - id - - ref - The comment. - - - -GET /2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - E74FTE3AEXAMPLE - - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - - 20120229090000 - My comments - - - diff --git a/test/resources/CloudFront/GetStreamingDistConfig b/test/resources/CloudFront/GetStreamingDistConfig deleted file mode 100644 index 5df245057cf..00000000000 --- a/test/resources/CloudFront/GetStreamingDistConfig +++ /dev/null @@ -1,81 +0,0 @@ -GET /2013-05-12/streaming-distribution/distribution ID/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT on the config -x-amz-request-id: Request ID - - - - unique description for this distribution - - CloudFront domain name assigned to the distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - -GET /2013-05-12/streaming-distribution/EGTXBD79EXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - diff --git a/test/resources/CloudFront/GetStreamingDistConfigResponse b/test/resources/CloudFront/GetStreamingDistConfigResponse deleted file mode 100644 index 5df245057cf..00000000000 --- a/test/resources/CloudFront/GetStreamingDistConfigResponse +++ /dev/null @@ -1,81 +0,0 @@ -GET /2013-05-12/streaming-distribution/distribution ID/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT on the config -x-amz-request-id: Request ID - - - - unique description for this distribution - - CloudFront domain name assigned to the distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - -GET /2013-05-12/streaming-distribution/EGTXBD79EXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - diff --git a/test/resources/CloudFront/GetStreamingDistribution b/test/resources/CloudFront/GetStreamingDistribution deleted file mode 100644 index 8ac1ac683d7..00000000000 --- a/test/resources/CloudFront/GetStreamingDistribution +++ /dev/null @@ -1,139 +0,0 @@ -GET /2013-05-12/streaming-distribution/distribution ID HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT or DELETE -x-amz-request-id: Request ID - - - - id - Deployed | InProgress - date and time in ISO 8601 format - CloudFront domain name for the distribution - - true | false - number of trusted signers for this distribution - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution - - CloudFront domain name assigned to the - streaming distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - - -GET /2013-05-12/streaming-distribution/EDFDVBD6EXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - EGTXBD79EXAMPLE - Deployed - 2012-05-19T19:37:58Z - s5c39gqb8ow64r.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/GetStreamingDistributionResponse b/test/resources/CloudFront/GetStreamingDistributionResponse deleted file mode 100644 index 8ac1ac683d7..00000000000 --- a/test/resources/CloudFront/GetStreamingDistributionResponse +++ /dev/null @@ -1,139 +0,0 @@ -GET /2013-05-12/streaming-distribution/distribution ID HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -ETag: ETag value to use later when doing a PUT or DELETE -x-amz-request-id: Request ID - - - - id - Deployed | InProgress - date and time in ISO 8601 format - CloudFront domain name for the distribution - - true | false - number of trusted signers for this distribution - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution - - CloudFront domain name assigned to the - streaming distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - - -GET /2013-05-12/streaming-distribution/EDFDVBD6EXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -ETag: E2QWRUHEXAMPLE -x-amz-request-id: request_id - - - EGTXBD79EXAMPLE - Deployed - 2012-05-19T19:37:58Z - s5c39gqb8ow64r.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/ListDistributions b/test/resources/CloudFront/ListDistributions deleted file mode 100644 index 3f5e3cda5e5..00000000000 --- a/test/resources/CloudFront/ListDistributions +++ /dev/null @@ -1,265 +0,0 @@ -GET /2013-05-12/distribution?Marker=value&MaxItems=value HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -x-amz-request-id: Request ID - - - - value specified in request - value for Marker parameter in - next request - value specified in request - true | false - number of distributions created by - current AWS account - - - ID for the distribution - Deployed | InProgress - creation date and time in - ISO 8601 format - CloudFront domain name assigned to the - distribution - - number of CNAME aliases - - CNAME alias - - - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - - - -GET /2013-05-12/distribution?MaxItems=2 HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -x-amz-request-id: request_id - - - - RMPARXS293KSTG7 - EMLARXS9EXAMPLE - 2 - true - 1 - - - EDFDVBD6EXAMPLE - Deployed - 2012-05-19T19:37:58Z - d111111abcdef8.cloudfront.net - - 1 - - www.example.com - - - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - - - -GET /2013-05-12/distribution?MaxItems=4?Marker=EMLARXS9EXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:39:00 GMT -Other required headers - diff --git a/test/resources/CloudFront/ListDistributionsResponse b/test/resources/CloudFront/ListDistributionsResponse deleted file mode 100644 index 3f5e3cda5e5..00000000000 --- a/test/resources/CloudFront/ListDistributionsResponse +++ /dev/null @@ -1,265 +0,0 @@ -GET /2013-05-12/distribution?Marker=value&MaxItems=value HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -x-amz-request-id: Request ID - - - - value specified in request - value for Marker parameter in - next request - value specified in request - true | false - number of distributions created by - current AWS account - - - ID for the distribution - Deployed | InProgress - creation date and time in - ISO 8601 format - CloudFront domain name assigned to the - distribution - - number of CNAME aliases - - CNAME alias - - - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - - - -GET /2013-05-12/distribution?MaxItems=2 HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -x-amz-request-id: request_id - - - - RMPARXS293KSTG7 - EMLARXS9EXAMPLE - 2 - true - 1 - - - EDFDVBD6EXAMPLE - Deployed - 2012-05-19T19:37:58Z - d111111abcdef8.cloudfront.net - - 1 - - www.example.com - - - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - - - -GET /2013-05-12/distribution?MaxItems=4?Marker=EMLARXS9EXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:39:00 GMT -Other required headers - diff --git a/test/resources/CloudFront/ListInvalidation b/test/resources/CloudFront/ListInvalidation deleted file mode 100644 index 28c10faf16f..00000000000 --- a/test/resources/CloudFront/ListInvalidation +++ /dev/null @@ -1,50 +0,0 @@ -GET /2013-05-12/distribution/distribution ID/invalidation?Marker=value&MaxItems=value HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Other required headers - -HTTP/1.0 200 OK -Content-Type: text/xml - - - value specified in request - value for Marker parameter in - next request - value specified in request - true | false - number of invalidation batches created by - current AWS account - - - Invalidation ID - InProgress | Completed - - - - -GET /2013-05-12/distribution/distribution ID/invalidation?MaxItems=2 HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Other required headers - -HTTP/1.0 200 OK -Content-Type: text/xml - - - EGTXBD79EXAMPLE - Invalidation ID - 2 - true - 10 - - - Second Invalidation ID - Completed - - - First Invalidation ID - Completed - - - - diff --git a/test/resources/CloudFront/ListInvalidationResponse b/test/resources/CloudFront/ListInvalidationResponse deleted file mode 100644 index 28c10faf16f..00000000000 --- a/test/resources/CloudFront/ListInvalidationResponse +++ /dev/null @@ -1,50 +0,0 @@ -GET /2013-05-12/distribution/distribution ID/invalidation?Marker=value&MaxItems=value HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Other required headers - -HTTP/1.0 200 OK -Content-Type: text/xml - - - value specified in request - value for Marker parameter in - next request - value specified in request - true | false - number of invalidation batches created by - current AWS account - - - Invalidation ID - InProgress | Completed - - - - -GET /2013-05-12/distribution/distribution ID/invalidation?MaxItems=2 HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Other required headers - -HTTP/1.0 200 OK -Content-Type: text/xml - - - EGTXBD79EXAMPLE - Invalidation ID - 2 - true - 10 - - - Second Invalidation ID - Completed - - - First Invalidation ID - Completed - - - - diff --git a/test/resources/CloudFront/ListOAIs b/test/resources/CloudFront/ListOAIs deleted file mode 100644 index 4ca721299e4..00000000000 --- a/test/resources/CloudFront/ListOAIs +++ /dev/null @@ -1,68 +0,0 @@ -GET /2013-05-12/origin-access-identity/cloudfront?Marker=value&MaxItems=value HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -x-amz-request-id: Request ID - - - - value that you specified for - Marker parameter in last request - value to specify for Marker parameter - in next request - value specified for MaxItems in request - true | false - number of origin access identities created by - the current AWS account - - - origin access identity - user id - comment about the origin access identity - - - - -GET /2013-05-12/origin-access-identity/cloudfront?MaxItems=2 HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -x-amz-request-id: request_id - - - - EDFDVBD6EXAMPLE - EMLARXS9EXAMPLE - 2 - true - 4 - - - E74FTE3AEXAMPLE - - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - First origin access identity - - - E58SRM2XEXAMPLE - - 7d843ae7f1792436e72691ab96a9c1414b7c3fbe2ab739a1cf21b0fe2EXAMPLE - - Another origin access identity - - - - -GET /2013-05-12/origin-access-identity/cloudfront?MaxItems=4?Marker=E58SRM2XEXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:39:00 GMT -Other required headers - diff --git a/test/resources/CloudFront/ListOAIsResponse b/test/resources/CloudFront/ListOAIsResponse deleted file mode 100644 index 4ca721299e4..00000000000 --- a/test/resources/CloudFront/ListOAIsResponse +++ /dev/null @@ -1,68 +0,0 @@ -GET /2013-05-12/origin-access-identity/cloudfront?Marker=value&MaxItems=value HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -x-amz-request-id: Request ID - - - - value that you specified for - Marker parameter in last request - value to specify for Marker parameter - in next request - value specified for MaxItems in request - true | false - number of origin access identities created by - the current AWS account - - - origin access identity - user id - comment about the origin access identity - - - - -GET /2013-05-12/origin-access-identity/cloudfront?MaxItems=2 HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -x-amz-request-id: request_id - - - - EDFDVBD6EXAMPLE - EMLARXS9EXAMPLE - 2 - true - 4 - - - E74FTE3AEXAMPLE - - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - First origin access identity - - - E58SRM2XEXAMPLE - - 7d843ae7f1792436e72691ab96a9c1414b7c3fbe2ab739a1cf21b0fe2EXAMPLE - - Another origin access identity - - - - -GET /2013-05-12/origin-access-identity/cloudfront?MaxItems=4?Marker=E58SRM2XEXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:39:00 GMT -Other required headers - diff --git a/test/resources/CloudFront/ListStreamingDistributions b/test/resources/CloudFront/ListStreamingDistributions deleted file mode 100644 index 3756b45087d..00000000000 --- a/test/resources/CloudFront/ListStreamingDistributions +++ /dev/null @@ -1,76 +0,0 @@ -GET /2013-05-12/streaming-distribution?Marker=value&MaxItems=value HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -x-amz-request-id: Request ID - - - - value specified in request - value for Marker parameter in - next request - value specified in request - true | false - number of streaming distributions - created by current AWS account - - - id - status - time - name - - Amazon S3 bucket name - OAI - - CNAME alias - comment about the distribution - maximum price class for the distribution - true | false - - - - -GET /2013-05-12/streaming-distribution?MaxItems=2 HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -x-amz-request-id: request_id - - - - EGTXBD79EXAMPLE - ED4L98SBEXAMPLE - 1 - true - 4 - - - EGTXBD79EXAMPLE - Deployed - 2012-05-19T19:37:58Z - s5c39gqb8ow64r.cloudfront.net - - mystreamingbucket.s3.amazonaws.com - - www.example.com - product.example.com - First distribution - PriceClass_All - true - - - - -GET /2013-05-12/streaming-distribution?MaxItems=4?Marker=ED4L98SBEXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:39:00 GMT -Other required headers - diff --git a/test/resources/CloudFront/ListStreamingDistributionsResponse b/test/resources/CloudFront/ListStreamingDistributionsResponse deleted file mode 100644 index 3756b45087d..00000000000 --- a/test/resources/CloudFront/ListStreamingDistributionsResponse +++ /dev/null @@ -1,76 +0,0 @@ -GET /2013-05-12/streaming-distribution?Marker=value&MaxItems=value HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: time stamp -Other required headers - -200 OK -x-amz-request-id: Request ID - - - - value specified in request - value for Marker parameter in - next request - value specified in request - true | false - number of streaming distributions - created by current AWS account - - - id - status - time - name - - Amazon S3 bucket name - OAI - - CNAME alias - comment about the distribution - maximum price class for the distribution - true | false - - - - -GET /2013-05-12/streaming-distribution?MaxItems=2 HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -Other required headers - -200 OK -x-amz-request-id: request_id - - - - EGTXBD79EXAMPLE - ED4L98SBEXAMPLE - 1 - true - 4 - - - EGTXBD79EXAMPLE - Deployed - 2012-05-19T19:37:58Z - s5c39gqb8ow64r.cloudfront.net - - mystreamingbucket.s3.amazonaws.com - - www.example.com - product.example.com - First distribution - PriceClass_All - true - - - - -GET /2013-05-12/streaming-distribution?MaxItems=4?Marker=ED4L98SBEXAMPLE HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:39:00 GMT -Other required headers - diff --git a/test/resources/CloudFront/PutConfig b/test/resources/CloudFront/PutConfig deleted file mode 100644 index 422c4c3980a..00000000000 --- a/test/resources/CloudFront/PutConfig +++ /dev/null @@ -1,522 +0,0 @@ -PUT /2013-05-12/distribution/distribution ID/config HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET response -Authorization: AWS authentication string -Other required headers - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to forward - to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - -200 OK -ETag: Updated ETag value, which can be used to do another PUT or to do a DELETE -x-amz-request-id: Request ID - - - - ID for the distribution - Deployed | InProgress - creation date and time in - ISO 8601 format - number of invalidation batches being - processed for this distribution - CloudFront domain name assigned to the - distribution - - true | false - number of unique trusted signers from - all cache behaviors - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - - -PUT /2013-05-12/distribution/EDFDVBD6EXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -If-Match: E2QWRUHEXAMPLE -Other required headers - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - -200 OK -ETag: E9LHASXEXAMPLE -x-amz-request-id: request_id - - - - EDFDVBD6EXAMPLE - Deployed - 2012-05-19T19:37:58Z - 1 - d111111abcdef8.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/PutConfigResponse b/test/resources/CloudFront/PutConfigResponse deleted file mode 100644 index 422c4c3980a..00000000000 --- a/test/resources/CloudFront/PutConfigResponse +++ /dev/null @@ -1,522 +0,0 @@ -PUT /2013-05-12/distribution/distribution ID/config HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET response -Authorization: AWS authentication string -Other required headers - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to forward - to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - -200 OK -ETag: Updated ETag value, which can be used to do another PUT or to do a DELETE -x-amz-request-id: Request ID - - - - ID for the distribution - Deployed | InProgress - creation date and time in - ISO 8601 format - number of invalidation batches being - processed for this distribution - CloudFront domain name assigned to the - distribution - - true | false - number of unique trusted signers from - all cache behaviors - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution config - - number of CNAME aliases - - - CNAME alias - - - URL for default root object - - number of origins - - - unique identifier for this origin - domain name of origin - - - origin-access-identity/ - cloudfront/ID - - - - HTTP port that the custom origin - listens on - HTTPS port that the custom origin - listens on - http-only | - match-viewer - - - - - - ID of the origin that the default cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds - - - number of cache behaviors - - - - pattern that specifies files that this - cache behavior applies to - ID of the origin that this cache behavior - applies to - - true | false - - all | whitelist | none - - - number of cookie names to - forward to origin - - name of a cookie to forward to - the origin - - - - - - true | false - number of trusted signers - - - self | AWS account that can create - signed URLs - - - allow-all | - https-only - minimum TTL in seconds for files - specified by PathPattern - - - - comment about the distribution - - true | false - true | false - Amazon S3 bucket to save logs in - prefix for log filenames - - - IAM certificate ID | true - - maximum price class for the distribution - true | false - - - -PUT /2013-05-12/distribution/EDFDVBD6EXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -If-Match: E2QWRUHEXAMPLE -Other required headers - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - -200 OK -ETag: E9LHASXEXAMPLE -x-amz-request-id: request_id - - - - EDFDVBD6EXAMPLE - Deployed - 2012-05-19T19:37:58Z - 1 - d111111abcdef8.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - example.com2012-04-11-5:09pm - - 1 - - www.example.com - - - index.html - - 2 - - - example-Amazon S3-origin - myawsbucket.s3.amazonaws.com - - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - - example-custom-origin - example.com - - 80 - 443 - match-viewer - - - - - - example-Amazon S3-origin - - true - - whitelist - - 1 - - example-cookie - - - - - - true - 3 - - self - 111122223333 - 444455556666 - - - https-only - 0 - - - 1 - - - *.jpg - example-custom-origin - - false - - all - - - - true - 2 - - self - 111122223333 - - - allow-all - 86400 - - - - example comment - - true - true - myawslogbucket.s3.amazonaws.com - example.com. - - - AS1A2M3P4L5E67SIIXR3J - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/PutOAIConfig b/test/resources/CloudFront/PutOAIConfig deleted file mode 100644 index 8948555632e..00000000000 --- a/test/resources/CloudFront/PutOAIConfig +++ /dev/null @@ -1,55 +0,0 @@ -PUT /2013-05-12/origin-access-identity/cloudfront//config HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET response -Authorization: AWS authentication string -Other required headers - - - - ref - The comment. - - -200 OK -ETag: ETag value to use later when doing a DELETE -x-amz-request-id: Request ID - - - - - - - 20120229090000 - The comment. - - - -PUT /2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -If-Match: E2QWRUHEXAMPLE -Other required headers - - - - 20120229090000 - A different comment - - -200 OK -ETag: E9LHASXEXAMPLE -x-amz-request-id: request_id - - - - E74FTE3AEXAMPLE - - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - - 20120229090000 - A different comment - - - diff --git a/test/resources/CloudFront/PutOAIConfigResponse b/test/resources/CloudFront/PutOAIConfigResponse deleted file mode 100644 index 8948555632e..00000000000 --- a/test/resources/CloudFront/PutOAIConfigResponse +++ /dev/null @@ -1,55 +0,0 @@ -PUT /2013-05-12/origin-access-identity/cloudfront//config HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET response -Authorization: AWS authentication string -Other required headers - - - - ref - The comment. - - -200 OK -ETag: ETag value to use later when doing a DELETE -x-amz-request-id: Request ID - - - - - - - 20120229090000 - The comment. - - - -PUT /2013-05-12/origin-access-identity/cloudfront/E74FTE3AEXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -If-Match: E2QWRUHEXAMPLE -Other required headers - - - - 20120229090000 - A different comment - - -200 OK -ETag: E9LHASXEXAMPLE -x-amz-request-id: request_id - - - - E74FTE3AEXAMPLE - - cd13868f797c227fbea2830611a26fe0a21ba1b826ab4bed9b7771c9aEXAMPLE - - - 20120229090000 - A different comment - - - diff --git a/test/resources/CloudFront/PutStreamingDistConfig b/test/resources/CloudFront/PutStreamingDistConfig deleted file mode 100644 index a6c79f4f571..00000000000 --- a/test/resources/CloudFront/PutStreamingDistConfig +++ /dev/null @@ -1,202 +0,0 @@ -PUT /2013-05-12/streaming-distribution/distribution Id/config HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET response -Authorization: AWS authentication string -Other required headers - - - - unique description for this distribution - - CloudFront domain name assigned to the distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - -200 OK -ETag: ETag value to use later when doing a DELETE -x-amz-request-id: Request ID - - - - id - Deployed | InProgress - date and time in ISO 8601 format - CloudFront domain name for the distribution - - true | false - number of trusted signers for this distribution - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution - - CloudFront domain name assigned to the - streaming distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - - -PUT /2013-05-12/streaming-distribution/EGTXBD79EXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -If-Match: E2QWRUHEXAMPLE -Other required headers - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - -200 OK -ETag: E9LHASXEXAMPLE -x-amz-request-id: request_id - - - - EGTXBD79EXAMPLE - Deployed - 2012-05-19T19:37:58Z - s5c39gqb8ow64r.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - - diff --git a/test/resources/CloudFront/PutStreamingDistConfigResponse b/test/resources/CloudFront/PutStreamingDistConfigResponse deleted file mode 100644 index a6c79f4f571..00000000000 --- a/test/resources/CloudFront/PutStreamingDistConfigResponse +++ /dev/null @@ -1,202 +0,0 @@ -PUT /2013-05-12/streaming-distribution/distribution Id/config HTTP/1.1 -Host: cloudfront.amazonaws.com -If-Match: value from ETag header in previous GET response -Authorization: AWS authentication string -Other required headers - - - - unique description for this distribution - - CloudFront domain name assigned to the distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - -200 OK -ETag: ETag value to use later when doing a DELETE -x-amz-request-id: Request ID - - - - id - Deployed | InProgress - date and time in ISO 8601 format - CloudFront domain name for the distribution - - true | false - number of trusted signers for this distribution - - - self | AWS account number - - number of active key pairs for - AwsAccountNumber - - active key pair associated with - AwsAccountNumber - - - - - - - unique description for this - distribution - - CloudFront domain name assigned to the - streaming distribution - origin-access-identity/cloudfront/ID - - - number of CNAME aliases - - CNAME alias - - - comment about the distribution - - true | false - Amazon S3 bucket for logs - prefix for log file names - - - number of trusted signers - - self | AWS account that can create - signed URLs - - - maximum price class for the distribution - true | false - - - -PUT /2013-05-12/streaming-distribution/EGTXBD79EXAMPLE/config HTTP/1.1 -Host: cloudfront.amazonaws.com -Authorization: AWS authentication string -Date: Thu, 17 May 2012 19:37:58 GMT -If-Match: E2QWRUHEXAMPLE -Other required headers - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - -200 OK -ETag: E9LHASXEXAMPLE -x-amz-request-id: request_id - - - - EGTXBD79EXAMPLE - Deployed - 2012-05-19T19:37:58Z - s5c39gqb8ow64r.cloudfront.net - - 3 - - - self - - 1 - - APKA9ONS7QCOWEXAMPLE - - - - - 111122223333 - - 2 - APKAI72T5DYBXEXAMPLE - APKAU72D8DYNXEXAMPLE - - - - 444455556666 - - 0 - - - - - - 20120229090000 - - mystreamingbucket.s3.amazonaws.com - origin-access-identity/cloudfront/E74FTE3AEXAMPLE - - - 1 - - www.example.com - - - example comment - - true - myawslogbucket.s3.amazonaws.com - myprefix/ - - - 3 - - self - 111122223333 - 444455556666 - - - PriceClass_All - true - - - diff --git a/test/resources/CloudWatch/DeleteAlarms b/test/resources/CloudWatch/DeleteAlarms deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/DeleteAlarmsResponse b/test/resources/CloudWatch/DeleteAlarmsResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/DescribeAlarmHistory b/test/resources/CloudWatch/DescribeAlarmHistory deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/DescribeAlarmHistoryResponse b/test/resources/CloudWatch/DescribeAlarmHistoryResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/DescribeAlarms b/test/resources/CloudWatch/DescribeAlarms deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/DescribeAlarmsForMetric b/test/resources/CloudWatch/DescribeAlarmsForMetric deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/DescribeAlarmsForMetricResponse b/test/resources/CloudWatch/DescribeAlarmsForMetricResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/DescribeAlarmsResponse b/test/resources/CloudWatch/DescribeAlarmsResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/DisableAlarmActions b/test/resources/CloudWatch/DisableAlarmActions deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/DisableAlarmActionsResponse b/test/resources/CloudWatch/DisableAlarmActionsResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/EnableAlarmActions b/test/resources/CloudWatch/EnableAlarmActions deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/EnableAlarmActionsResponse b/test/resources/CloudWatch/EnableAlarmActionsResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/GetMetricStatistics b/test/resources/CloudWatch/GetMetricStatistics deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/GetMetricStatisticsResponse b/test/resources/CloudWatch/GetMetricStatisticsResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/ListMetrics b/test/resources/CloudWatch/ListMetrics deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/ListMetricsResponse b/test/resources/CloudWatch/ListMetricsResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/PutMetricAlarm b/test/resources/CloudWatch/PutMetricAlarm deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/PutMetricAlarmResponse b/test/resources/CloudWatch/PutMetricAlarmResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/PutMetricData b/test/resources/CloudWatch/PutMetricData deleted file mode 100644 index e1d45f22f97..00000000000 --- a/test/resources/CloudWatch/PutMetricData +++ /dev/null @@ -1,62 +0,0 @@ - -The following example puts data for a single metric containing one dimension: - -https://monitoring.&api-domain;/doc/2010-08-01/ -?Action=PutMetricData -&Version=2010-08-01 -&Namespace=TestNamespace -&MetricData.member.1.MetricName=buffers -&MetricData.member.1.Unit=Bytes -&MetricData.member.1.Value=231434333 -&MetricData.member.1.Dimensions.member.1.Name=InstanceType -&MetricData.member.1.Dimensions.member.1.Value=m1.small -&AUTHPARAMS - - -The following example puts data for a single metric containing two dimensions: - -https://monitoring.&api-domain;/doc/2010-08-01/ -?Action=PutMetricData -&Version=2010-08-01 -&Namespace=TestNamespace -&MetricData.member.1.MetricName=buffers -&MetricData.member.1.Unit=Bytes -&MetricData.member.1.Value=231434333 -&MetricData.member.1.Dimensions.member.1.Name=InstanceID -&MetricData.member.1.Dimensions.member.1.Value=i-aaba32d4 -&MetricData.member.1.Dimensions.member.2.Name=InstanceType -&MetricData.member.1.Dimensions.member.2.Value=m1.small -&AUTHPARAMS - - -The following example puts data for two metrics, each with two dimensions: - -https://monitoring.&api-domain;/doc/2010-08-01/ -?Action=PutMetricData -&Version=2010-08-01 -&Namespace=TestNamespace -&MetricData.member.1.MetricName=buffers -&MetricData.member.1.Unit=Bytes -&MetricData.member.1.Value=231434333 -&MetricData.member.1.Dimensions.member.1.Name=InstanceID -&MetricData.member.1.Dimensions.member.1.Value=i-aaba32d4 -&MetricData.member.1.Dimensions.member.2.Name=InstanceType -&MetricData.member.1.Dimensions.member.2.Value=m1.small -&MetricData.member.2.MetricName=latency -&MetricData.member.2.Unit=Milliseconds -&MetricData.member.2.Value=23 -&MetricData.member.2.Dimensions.member.1.Name=InstanceID -&MetricData.member.2.Dimensions.member.1.Value=i-aaba32d4 -&MetricData.member.2.Dimensions.member.2.Name=InstanceType -&MetricData.member.2.Dimensions.member.2.Value=m1.small -&AUTHPARAMS - - - - - - e16fc4d3-9a04-11e0-9362-093a1cae5385 - - - - diff --git a/test/resources/CloudWatch/PutMetricDataResponse b/test/resources/CloudWatch/PutMetricDataResponse deleted file mode 100644 index e1d45f22f97..00000000000 --- a/test/resources/CloudWatch/PutMetricDataResponse +++ /dev/null @@ -1,62 +0,0 @@ - -The following example puts data for a single metric containing one dimension: - -https://monitoring.&api-domain;/doc/2010-08-01/ -?Action=PutMetricData -&Version=2010-08-01 -&Namespace=TestNamespace -&MetricData.member.1.MetricName=buffers -&MetricData.member.1.Unit=Bytes -&MetricData.member.1.Value=231434333 -&MetricData.member.1.Dimensions.member.1.Name=InstanceType -&MetricData.member.1.Dimensions.member.1.Value=m1.small -&AUTHPARAMS - - -The following example puts data for a single metric containing two dimensions: - -https://monitoring.&api-domain;/doc/2010-08-01/ -?Action=PutMetricData -&Version=2010-08-01 -&Namespace=TestNamespace -&MetricData.member.1.MetricName=buffers -&MetricData.member.1.Unit=Bytes -&MetricData.member.1.Value=231434333 -&MetricData.member.1.Dimensions.member.1.Name=InstanceID -&MetricData.member.1.Dimensions.member.1.Value=i-aaba32d4 -&MetricData.member.1.Dimensions.member.2.Name=InstanceType -&MetricData.member.1.Dimensions.member.2.Value=m1.small -&AUTHPARAMS - - -The following example puts data for two metrics, each with two dimensions: - -https://monitoring.&api-domain;/doc/2010-08-01/ -?Action=PutMetricData -&Version=2010-08-01 -&Namespace=TestNamespace -&MetricData.member.1.MetricName=buffers -&MetricData.member.1.Unit=Bytes -&MetricData.member.1.Value=231434333 -&MetricData.member.1.Dimensions.member.1.Name=InstanceID -&MetricData.member.1.Dimensions.member.1.Value=i-aaba32d4 -&MetricData.member.1.Dimensions.member.2.Name=InstanceType -&MetricData.member.1.Dimensions.member.2.Value=m1.small -&MetricData.member.2.MetricName=latency -&MetricData.member.2.Unit=Milliseconds -&MetricData.member.2.Value=23 -&MetricData.member.2.Dimensions.member.1.Name=InstanceID -&MetricData.member.2.Dimensions.member.1.Value=i-aaba32d4 -&MetricData.member.2.Dimensions.member.2.Name=InstanceType -&MetricData.member.2.Dimensions.member.2.Value=m1.small -&AUTHPARAMS - - - - - - e16fc4d3-9a04-11e0-9362-093a1cae5385 - - - - diff --git a/test/resources/CloudWatch/SetAlarmState b/test/resources/CloudWatch/SetAlarmState deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/CloudWatch/SetAlarmStateResponse b/test/resources/CloudWatch/SetAlarmStateResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/DynamoDB/BatchGetItem b/test/resources/DynamoDB/BatchGetItem deleted file mode 100644 index d8dc37dea0f..00000000000 --- a/test/resources/DynamoDB/BatchGetItem +++ /dev/null @@ -1,229 +0,0 @@ - -{ - "RequestItems": - { - "string" : - { - "AttributesToGet": [ - "string" - ], - "ConsistentRead": "boolean", - "Keys": [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ] - } - }, - "ReturnConsumedCapacity": "string" -} - - - -{ - "ConsumedCapacity": [ - { - "CapacityUnits": "number", - "TableName": "string" - } - ], - "Responses": - { - "string" : - [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ] - }, - "UnprocessedKeys": - { - "string" : - { - "AttributesToGet": [ - "string" - ], - "ConsistentRead": "boolean", - "Keys": [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ] - } - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.BatchGetItem - -{ - "RequestItems": { - "Forum": { - "Keys": [ - { - "Name":{"S":"Amazon DynamoDB"} - }, - { - "Name":{"S":"Amazon RDS"} - }, - { - "Name":{"S":"Amazon Redshift"} - } - ], - "AttributesToGet": [ - "Name","Threads","Messages","Views" - ] - }, - "Thread": { - "Keys": [ - { - "ForumName":{"S":"Amazon DynamoDB"} - }, - { - "Subject":{"S":"Concurrent reads"} - } - ], - "AttributesToGet": [ - "Tags","Message" - ] - } - }, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Responses": { - "Forum": [ - { - "Name":{ - "S":"Amazon DynamoDB" - }, - "Threads":{ - "N":"5" - }, - "Messages":{ - "N":"19" - }, - "Views":{ - "N":"35" - } - }, - { - "Name":{ - "S":"Amazon RDS" - }, - "Threads":{ - "N":"8" - }, - "Messages":{ - "N":"32" - }, - "Views":{ - "N":"38" - } - }, - { - "Name":{ - "S":"Amazon Redshift" - }, - "Threads":{ - "N":"12" - }, - "Messages":{ - "N":"55" - }, - "Views":{ - "N":"47" - } - } - ] - "Thread": [ - { - "Tags":{ - "SS":["Reads","MultipleUsers"] - }, - "Message":{ - "S":"How many users can read a single data item at a time? Are there any limits?" - } - } - ] - }, - "UnprocessedKeys": { - }, - "ConsumedCapacity": [ - { - "TableName": "Forum", - "CapacityUnits": 3 - }, - { - "TableName": "Thread", - "CapacityUnits": 1 - } - ] -} - - diff --git a/test/resources/DynamoDB/BatchGetItemResponse b/test/resources/DynamoDB/BatchGetItemResponse deleted file mode 100644 index d8dc37dea0f..00000000000 --- a/test/resources/DynamoDB/BatchGetItemResponse +++ /dev/null @@ -1,229 +0,0 @@ - -{ - "RequestItems": - { - "string" : - { - "AttributesToGet": [ - "string" - ], - "ConsistentRead": "boolean", - "Keys": [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ] - } - }, - "ReturnConsumedCapacity": "string" -} - - - -{ - "ConsumedCapacity": [ - { - "CapacityUnits": "number", - "TableName": "string" - } - ], - "Responses": - { - "string" : - [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ] - }, - "UnprocessedKeys": - { - "string" : - { - "AttributesToGet": [ - "string" - ], - "ConsistentRead": "boolean", - "Keys": [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ] - } - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.BatchGetItem - -{ - "RequestItems": { - "Forum": { - "Keys": [ - { - "Name":{"S":"Amazon DynamoDB"} - }, - { - "Name":{"S":"Amazon RDS"} - }, - { - "Name":{"S":"Amazon Redshift"} - } - ], - "AttributesToGet": [ - "Name","Threads","Messages","Views" - ] - }, - "Thread": { - "Keys": [ - { - "ForumName":{"S":"Amazon DynamoDB"} - }, - { - "Subject":{"S":"Concurrent reads"} - } - ], - "AttributesToGet": [ - "Tags","Message" - ] - } - }, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Responses": { - "Forum": [ - { - "Name":{ - "S":"Amazon DynamoDB" - }, - "Threads":{ - "N":"5" - }, - "Messages":{ - "N":"19" - }, - "Views":{ - "N":"35" - } - }, - { - "Name":{ - "S":"Amazon RDS" - }, - "Threads":{ - "N":"8" - }, - "Messages":{ - "N":"32" - }, - "Views":{ - "N":"38" - } - }, - { - "Name":{ - "S":"Amazon Redshift" - }, - "Threads":{ - "N":"12" - }, - "Messages":{ - "N":"55" - }, - "Views":{ - "N":"47" - } - } - ] - "Thread": [ - { - "Tags":{ - "SS":["Reads","MultipleUsers"] - }, - "Message":{ - "S":"How many users can read a single data item at a time? Are there any limits?" - } - } - ] - }, - "UnprocessedKeys": { - }, - "ConsumedCapacity": [ - { - "TableName": "Forum", - "CapacityUnits": 3 - }, - { - "TableName": "Thread", - "CapacityUnits": 1 - } - ] -} - - diff --git a/test/resources/DynamoDB/BatchWriteItem b/test/resources/DynamoDB/BatchWriteItem deleted file mode 100644 index 8579c08090e..00000000000 --- a/test/resources/DynamoDB/BatchWriteItem +++ /dev/null @@ -1,244 +0,0 @@ - -{ - "RequestItems": - { - "string" : - [ - { - "DeleteRequest": { - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "PutRequest": { - "Item": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - } - } - ] - }, - "ReturnConsumedCapacity": "string", - "ReturnItemCollectionMetrics": "string" -} - - - -{ - "ConsumedCapacity": [ - { - "CapacityUnits": "number", - "TableName": "string" - } - ], - "ItemCollectionMetrics": - { - "string" : - [ - { - "ItemCollectionKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "SizeEstimateRangeGB": [ - "number" - ] - } - ] - }, - "UnprocessedItems": - { - "string" : - [ - { - "DeleteRequest": { - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "PutRequest": { - "Item": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - } - } - ] - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive X-Amz-Target: DynamoDB_20120810.BatchWriteItem - -{ - "RequestItems": { - "Forum": [ - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon DynamoDB" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - }, - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon RDS" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - }, - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon Redshift" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - }, - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon ElastiCache" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - } - ] - }, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - { - "UnprocessedItems": { - "Forum": [ - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon ElastiCache" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - } - ] - }, - "ConsumedCapacity": [ - { - "TableName": "Forum", - "CapacityUnits": 3 - } - ] -} - - diff --git a/test/resources/DynamoDB/BatchWriteItemResponse b/test/resources/DynamoDB/BatchWriteItemResponse deleted file mode 100644 index 8579c08090e..00000000000 --- a/test/resources/DynamoDB/BatchWriteItemResponse +++ /dev/null @@ -1,244 +0,0 @@ - -{ - "RequestItems": - { - "string" : - [ - { - "DeleteRequest": { - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "PutRequest": { - "Item": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - } - } - ] - }, - "ReturnConsumedCapacity": "string", - "ReturnItemCollectionMetrics": "string" -} - - - -{ - "ConsumedCapacity": [ - { - "CapacityUnits": "number", - "TableName": "string" - } - ], - "ItemCollectionMetrics": - { - "string" : - [ - { - "ItemCollectionKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "SizeEstimateRangeGB": [ - "number" - ] - } - ] - }, - "UnprocessedItems": - { - "string" : - [ - { - "DeleteRequest": { - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "PutRequest": { - "Item": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - } - } - ] - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive X-Amz-Target: DynamoDB_20120810.BatchWriteItem - -{ - "RequestItems": { - "Forum": [ - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon DynamoDB" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - }, - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon RDS" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - }, - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon Redshift" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - }, - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon ElastiCache" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - } - ] - }, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - { - "UnprocessedItems": { - "Forum": [ - { - "PutRequest": { - "Item": { - "Name": { - "S": "Amazon ElastiCache" - }, - "Category": { - "S": "Amazon Web Services" - } - } - } - } - ] - }, - "ConsumedCapacity": [ - { - "TableName": "Forum", - "CapacityUnits": 3 - } - ] -} - - diff --git a/test/resources/DynamoDB/CreateTable b/test/resources/DynamoDB/CreateTable deleted file mode 100644 index 2614ab5ed4b..00000000000 --- a/test/resources/DynamoDB/CreateTable +++ /dev/null @@ -1,220 +0,0 @@ - -{ - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string" -} - - - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "CreationDateTime": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "IndexSizeBytes": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "LastDecreaseDateTime": "number", - "LastIncreaseDateTime": "number", - "NumberOfDecreasesToday": "number", - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string", - "TableSizeBytes": "number", - "TableStatus": "string" - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.CreateTable - -{ - "AttributeDefinitions": [ - { - "AttributeName": "ForumName", - "AttributeType": "S" - }, - { - "AttributeName": "Subject", - "AttributeType": "S" - }, - { - "AttributeName": "LastPostDateTime", - "AttributeType": "S" - } - ], - "TableName": "Thread", - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "Subject", - "KeyType": "RANGE" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "LastPostIndex", - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "LastPostDateTime", - "KeyType": "RANGE" - } - ], - "Projection": { - "ProjectionType": "KEYS_ONLY" - } - } - ], - "ProvisionedThroughput": { - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - } -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "ForumName", - "AttributeType": "S" - }, - { - "AttributeName": "LastPostDateTime", - "AttributeType": "S" - }, - { - "AttributeName": "Subject", - "AttributeType": "S" - } - ], - "CreationDateTime": 1.36372808007E9, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "Subject", - "KeyType": "RANGE" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "LastPostIndex", - "IndexSizeBytes": 0, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "LastPostDateTime", - "KeyType": "RANGE" - } - ], - "Projection": { - "ProjectionType": "KEYS_ONLY" - } - } - ], - "ProvisionedThroughput": { - "NumberOfDecreasesToday": 0, - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - }, - "TableName": "Thread", - "TableSizeBytes": 0, - "TableStatus": "CREATING" - } -} - - diff --git a/test/resources/DynamoDB/CreateTableResponse b/test/resources/DynamoDB/CreateTableResponse deleted file mode 100644 index 2614ab5ed4b..00000000000 --- a/test/resources/DynamoDB/CreateTableResponse +++ /dev/null @@ -1,220 +0,0 @@ - -{ - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string" -} - - - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "CreationDateTime": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "IndexSizeBytes": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "LastDecreaseDateTime": "number", - "LastIncreaseDateTime": "number", - "NumberOfDecreasesToday": "number", - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string", - "TableSizeBytes": "number", - "TableStatus": "string" - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.CreateTable - -{ - "AttributeDefinitions": [ - { - "AttributeName": "ForumName", - "AttributeType": "S" - }, - { - "AttributeName": "Subject", - "AttributeType": "S" - }, - { - "AttributeName": "LastPostDateTime", - "AttributeType": "S" - } - ], - "TableName": "Thread", - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "Subject", - "KeyType": "RANGE" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "LastPostIndex", - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "LastPostDateTime", - "KeyType": "RANGE" - } - ], - "Projection": { - "ProjectionType": "KEYS_ONLY" - } - } - ], - "ProvisionedThroughput": { - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - } -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "ForumName", - "AttributeType": "S" - }, - { - "AttributeName": "LastPostDateTime", - "AttributeType": "S" - }, - { - "AttributeName": "Subject", - "AttributeType": "S" - } - ], - "CreationDateTime": 1.36372808007E9, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "Subject", - "KeyType": "RANGE" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "LastPostIndex", - "IndexSizeBytes": 0, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "LastPostDateTime", - "KeyType": "RANGE" - } - ], - "Projection": { - "ProjectionType": "KEYS_ONLY" - } - } - ], - "ProvisionedThroughput": { - "NumberOfDecreasesToday": 0, - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - }, - "TableName": "Thread", - "TableSizeBytes": 0, - "TableStatus": "CREATING" - } -} - - diff --git a/test/resources/DynamoDB/DeleteItem b/test/resources/DynamoDB/DeleteItem deleted file mode 100644 index 0454c6dc622..00000000000 --- a/test/resources/DynamoDB/DeleteItem +++ /dev/null @@ -1,161 +0,0 @@ - -{ - "Expected": - { - "string" : - { - "Exists": "boolean", - "Value": { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ReturnConsumedCapacity": "string", - "ReturnItemCollectionMetrics": "string", - "ReturnValues": "string", - "TableName": "string" -} - - - -{ - "Attributes": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "ItemCollectionMetrics": { - "ItemCollectionKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "SizeEstimateRangeGB": [ - "number" - ] - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.DeleteItem - -{ - "TableName": "Thread", - "Key": { - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Subject": { - "S": "How do I update multiple items?" - } - }, - "Expected": { - "Replies": { - "Exists": false - } - }, - "ReturnValues": "ALL_OLD" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Attributes": { - "LastPostedBy": { - "S": "fred@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "201303201023" - }, - "Tags": { - "SS": ["Update","Multiple Items","HelpMe"] - }, - "Subject": { - "S": "How do I update multiple items?" - }, - "Message": { - "S": "I want to update multiple items in a single API call. What's the best way to do that?" - } - } -} - - diff --git a/test/resources/DynamoDB/DeleteItemResponse b/test/resources/DynamoDB/DeleteItemResponse deleted file mode 100644 index 0454c6dc622..00000000000 --- a/test/resources/DynamoDB/DeleteItemResponse +++ /dev/null @@ -1,161 +0,0 @@ - -{ - "Expected": - { - "string" : - { - "Exists": "boolean", - "Value": { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ReturnConsumedCapacity": "string", - "ReturnItemCollectionMetrics": "string", - "ReturnValues": "string", - "TableName": "string" -} - - - -{ - "Attributes": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "ItemCollectionMetrics": { - "ItemCollectionKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "SizeEstimateRangeGB": [ - "number" - ] - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.DeleteItem - -{ - "TableName": "Thread", - "Key": { - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Subject": { - "S": "How do I update multiple items?" - } - }, - "Expected": { - "Replies": { - "Exists": false - } - }, - "ReturnValues": "ALL_OLD" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Attributes": { - "LastPostedBy": { - "S": "fred@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "201303201023" - }, - "Tags": { - "SS": ["Update","Multiple Items","HelpMe"] - }, - "Subject": { - "S": "How do I update multiple items?" - }, - "Message": { - "S": "I want to update multiple items in a single API call. What's the best way to do that?" - } - } -} - - diff --git a/test/resources/DynamoDB/DeleteTable b/test/resources/DynamoDB/DeleteTable deleted file mode 100644 index 478beb20a4b..00000000000 --- a/test/resources/DynamoDB/DeleteTable +++ /dev/null @@ -1,96 +0,0 @@ - -{ - "TableName": "string" -} - - - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "CreationDateTime": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "IndexSizeBytes": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "LastDecreaseDateTime": "number", - "LastIncreaseDateTime": "number", - "NumberOfDecreasesToday": "number", - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string", - "TableSizeBytes": "number", - "TableStatus": "string" - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.DeleteTable - -{ - "TableName": "Reply" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "TableDescription": { - "ItemCount": 0, - "ProvisionedThroughput": { - "NumberOfDecreasesToday": 0, - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - }, - "TableName": "Reply", - "TableSizeBytes": 0, - "TableStatus": "DELETING" - } -} - - diff --git a/test/resources/DynamoDB/DeleteTableResponse b/test/resources/DynamoDB/DeleteTableResponse deleted file mode 100644 index 478beb20a4b..00000000000 --- a/test/resources/DynamoDB/DeleteTableResponse +++ /dev/null @@ -1,96 +0,0 @@ - -{ - "TableName": "string" -} - - - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "CreationDateTime": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "IndexSizeBytes": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "LastDecreaseDateTime": "number", - "LastIncreaseDateTime": "number", - "NumberOfDecreasesToday": "number", - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string", - "TableSizeBytes": "number", - "TableStatus": "string" - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.DeleteTable - -{ - "TableName": "Reply" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "TableDescription": { - "ItemCount": 0, - "ProvisionedThroughput": { - "NumberOfDecreasesToday": 0, - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - }, - "TableName": "Reply", - "TableSizeBytes": 0, - "TableStatus": "DELETING" - } -} - - diff --git a/test/resources/DynamoDB/DescribeTable b/test/resources/DynamoDB/DescribeTable deleted file mode 100644 index 60eebba6f68..00000000000 --- a/test/resources/DynamoDB/DescribeTable +++ /dev/null @@ -1,141 +0,0 @@ - -{ - "TableName": "string" -} - - - -{ - "Table": { - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "CreationDateTime": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "IndexSizeBytes": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "LastDecreaseDateTime": "number", - "LastIncreaseDateTime": "number", - "NumberOfDecreasesToday": "number", - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string", - "TableSizeBytes": "number", - "TableStatus": "string" - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.DescribeTable - -{ - "TableName":"Thread" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Table": { - "AttributeDefinitions": [ - { - "AttributeName": "ForumName", - "AttributeType": "S" - }, - { - "AttributeName": "LastPostDateTime", - "AttributeType": "S" - }, - { - "AttributeName": "Subject", - "AttributeType": "S" - } - ], - "CreationDateTime": 1.363729002358E9, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "Subject", - "KeyType": "RANGE" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "LastPostIndex", - "IndexSizeBytes": 0, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "LastPostDateTime", - "KeyType": "RANGE" - } - ], - "Projection": { - "ProjectionType": "KEYS_ONLY" - } - } - ], - "ProvisionedThroughput": { - "NumberOfDecreasesToday": 0, - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - }, - "TableName": "Thread", - "TableSizeBytes": 0, - "TableStatus": "ACTIVE" - } -} - - diff --git a/test/resources/DynamoDB/DescribeTableResponse b/test/resources/DynamoDB/DescribeTableResponse deleted file mode 100644 index 60eebba6f68..00000000000 --- a/test/resources/DynamoDB/DescribeTableResponse +++ /dev/null @@ -1,141 +0,0 @@ - -{ - "TableName": "string" -} - - - -{ - "Table": { - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "CreationDateTime": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "IndexSizeBytes": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "LastDecreaseDateTime": "number", - "LastIncreaseDateTime": "number", - "NumberOfDecreasesToday": "number", - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string", - "TableSizeBytes": "number", - "TableStatus": "string" - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.DescribeTable - -{ - "TableName":"Thread" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Table": { - "AttributeDefinitions": [ - { - "AttributeName": "ForumName", - "AttributeType": "S" - }, - { - "AttributeName": "LastPostDateTime", - "AttributeType": "S" - }, - { - "AttributeName": "Subject", - "AttributeType": "S" - } - ], - "CreationDateTime": 1.363729002358E9, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "Subject", - "KeyType": "RANGE" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "LastPostIndex", - "IndexSizeBytes": 0, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "LastPostDateTime", - "KeyType": "RANGE" - } - ], - "Projection": { - "ProjectionType": "KEYS_ONLY" - } - } - ], - "ProvisionedThroughput": { - "NumberOfDecreasesToday": 0, - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - }, - "TableName": "Thread", - "TableSizeBytes": 0, - "TableStatus": "ACTIVE" - } -} - - diff --git a/test/resources/DynamoDB/GetItem b/test/resources/DynamoDB/GetItem deleted file mode 100644 index c42d9b78297..00000000000 --- a/test/resources/DynamoDB/GetItem +++ /dev/null @@ -1,111 +0,0 @@ - -{ - "AttributesToGet": [ - "string" - ], - "ConsistentRead": "boolean", - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ReturnConsumedCapacity": "string", - "TableName": "string" -} - - - -{ - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "Item": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.GetItem - -{ - "TableName": "Thread", - "Key": { - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Subject": { - "S": "How do I update multiple items?" - } - }, - "AttributesToGet": ["LastPostDateTime","Message","Tags"], - "ConsistentRead": true, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "ConsumedCapacity": { - "CapacityUnits": 1, - "TableName": "Thread" - }, - "Item": { - "Tags": { - "SS": ["Update","Multiple Items","HelpMe"] - }, - "LastPostDateTime": { - "S": "201303190436" - }, - "Message": { - "S": "I want to update multiple items in a single API call. What's the best way to do that?" - } - } -} - - diff --git a/test/resources/DynamoDB/GetItemResponse b/test/resources/DynamoDB/GetItemResponse deleted file mode 100644 index c42d9b78297..00000000000 --- a/test/resources/DynamoDB/GetItemResponse +++ /dev/null @@ -1,111 +0,0 @@ - -{ - "AttributesToGet": [ - "string" - ], - "ConsistentRead": "boolean", - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ReturnConsumedCapacity": "string", - "TableName": "string" -} - - - -{ - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "Item": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.GetItem - -{ - "TableName": "Thread", - "Key": { - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Subject": { - "S": "How do I update multiple items?" - } - }, - "AttributesToGet": ["LastPostDateTime","Message","Tags"], - "ConsistentRead": true, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "ConsumedCapacity": { - "CapacityUnits": 1, - "TableName": "Thread" - }, - "Item": { - "Tags": { - "SS": ["Update","Multiple Items","HelpMe"] - }, - "LastPostDateTime": { - "S": "201303190436" - }, - "Message": { - "S": "I want to update multiple items in a single API call. What's the best way to do that?" - } - } -} - - diff --git a/test/resources/DynamoDB/ListTables b/test/resources/DynamoDB/ListTables deleted file mode 100644 index e12e6fe2bf0..00000000000 --- a/test/resources/DynamoDB/ListTables +++ /dev/null @@ -1,48 +0,0 @@ - -{ - "ExclusiveStartTableName": "string", - "Limit": "number" -} - - - -{ - "LastEvaluatedTableName": "string", - "TableNames": [ - "string" - ] -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.ListTables - -{ - "ExclusiveStartTableName": "Forum", - "Limit": 3 -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "LastEvaluatedTableName": "Thread", - "TableNames": ["Forum","Reply","Thread"] -} - - diff --git a/test/resources/DynamoDB/ListTablesResponse b/test/resources/DynamoDB/ListTablesResponse deleted file mode 100644 index e12e6fe2bf0..00000000000 --- a/test/resources/DynamoDB/ListTablesResponse +++ /dev/null @@ -1,48 +0,0 @@ - -{ - "ExclusiveStartTableName": "string", - "Limit": "number" -} - - - -{ - "LastEvaluatedTableName": "string", - "TableNames": [ - "string" - ] -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.ListTables - -{ - "ExclusiveStartTableName": "Forum", - "Limit": 3 -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "LastEvaluatedTableName": "Thread", - "TableNames": ["Forum","Reply","Thread"] -} - - diff --git a/test/resources/DynamoDB/PutItem b/test/resources/DynamoDB/PutItem deleted file mode 100644 index 1a9c0f3d42a..00000000000 --- a/test/resources/DynamoDB/PutItem +++ /dev/null @@ -1,155 +0,0 @@ - -{ - "Expected": - { - "string" : - { - "Exists": "boolean", - "Value": { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "Item": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ReturnConsumedCapacity": "string", - "ReturnItemCollectionMetrics": "string", - "ReturnValues": "string", - "TableName": "string" -} - - - -{ - "Attributes": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "ItemCollectionMetrics": { - "ItemCollectionKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "SizeEstimateRangeGB": [ - "number" - ] - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.PutItem - -{ - "TableName": "Thread", - "Item": { - "LastPostDateTime": { - "S": "201303190422" - }, - "Tags": { - "SS": ["Update","Multiple Items","HelpMe"] - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Message": { - "S": "I want to update multiple items in a single API call. What's the best way to do that?" - }, - "Subject": { - "S": "How do I update multiple items?" - }, - "LastPostedBy": { - "S": "fred@example.com" - } - }, - "Expected": { - "ForumName": { - "Exists": false - }, - "Subject": { - "Exists": false - } - } -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ -} - - diff --git a/test/resources/DynamoDB/PutItemResponse b/test/resources/DynamoDB/PutItemResponse deleted file mode 100644 index 1a9c0f3d42a..00000000000 --- a/test/resources/DynamoDB/PutItemResponse +++ /dev/null @@ -1,155 +0,0 @@ - -{ - "Expected": - { - "string" : - { - "Exists": "boolean", - "Value": { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "Item": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ReturnConsumedCapacity": "string", - "ReturnItemCollectionMetrics": "string", - "ReturnValues": "string", - "TableName": "string" -} - - - -{ - "Attributes": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "ItemCollectionMetrics": { - "ItemCollectionKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "SizeEstimateRangeGB": [ - "number" - ] - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.PutItem - -{ - "TableName": "Thread", - "Item": { - "LastPostDateTime": { - "S": "201303190422" - }, - "Tags": { - "SS": ["Update","Multiple Items","HelpMe"] - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Message": { - "S": "I want to update multiple items in a single API call. What's the best way to do that?" - }, - "Subject": { - "S": "How do I update multiple items?" - }, - "LastPostedBy": { - "S": "fred@example.com" - } - }, - "Expected": { - "ForumName": { - "Exists": false - }, - "Subject": { - "Exists": false - } - } -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ -} - - diff --git a/test/resources/DynamoDB/Query b/test/resources/DynamoDB/Query deleted file mode 100644 index 229a273a5e7..00000000000 --- a/test/resources/DynamoDB/Query +++ /dev/null @@ -1,250 +0,0 @@ - -{ - "AttributesToGet": [ - "string" - ], - "ConsistentRead": "boolean", - "ExclusiveStartKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "IndexName": "string", - "KeyConditions": - { - "string" : - { - "AttributeValueList": [ - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - ], - "ComparisonOperator": "string" - } - }, - "Limit": "number", - "ReturnConsumedCapacity": "string", - "ScanIndexForward": "boolean", - "Select": "string", - "TableName": "string" -} - - - -{ - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "Count": "number", - "Items": [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ], - "LastEvaluatedKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.Query - -{ - "TableName": "Thread", - "IndexName": "LastPostIndex", - "Select": "ALL_ATTRIBUTES", - "Limit":3, - "ConsistentRead": true, - "KeyConditions": { - "LastPostDateTime": { - "AttributeValueList": [ - { - "S": "20130101" - }, - { - "S": "20130115" - } - ], - "ComparisonOperator": "BETWEEN" - }, - "ForumName": { - "AttributeValueList": [ - { - "S": "Amazon DynamoDB" - } - ], - "ComparisonOperator": "EQ" - } - }, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Count": 3, - "Items": [ - { - "LastPostedBy": { - "S": "fred@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "20130102054211" - }, - "Tags": { - "SS": ["Problem","Question"] - } - }, - { - "LastPostedBy": { - "S": "alice@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "20130105111307" - }, - "Tags": { - "SS": ["Idea"] - } - }, - { - "LastPostedBy": { - "S": "bob@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "20130108094417" - }, - "Tags": { - "SS": ["AppDesign", "HelpMe"] - } - } - ], - "ConsumedCapacity": { - "TableName": "Thread", - "CapacityUnits": 1 - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.Query - -{ - "TableName": "Thread", - "Select": "COUNT", - "ConsistentRead": true, - "KeyConditions": { - "ForumName": { - "AttributeValueList": [ - { - "S": "Amazon DynamoDB" - } - ], - "ComparisonOperator": "EQ" - } - } -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Count":`17 -} - - diff --git a/test/resources/DynamoDB/QueryResponse b/test/resources/DynamoDB/QueryResponse deleted file mode 100644 index 229a273a5e7..00000000000 --- a/test/resources/DynamoDB/QueryResponse +++ /dev/null @@ -1,250 +0,0 @@ - -{ - "AttributesToGet": [ - "string" - ], - "ConsistentRead": "boolean", - "ExclusiveStartKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "IndexName": "string", - "KeyConditions": - { - "string" : - { - "AttributeValueList": [ - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - ], - "ComparisonOperator": "string" - } - }, - "Limit": "number", - "ReturnConsumedCapacity": "string", - "ScanIndexForward": "boolean", - "Select": "string", - "TableName": "string" -} - - - -{ - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "Count": "number", - "Items": [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ], - "LastEvaluatedKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.Query - -{ - "TableName": "Thread", - "IndexName": "LastPostIndex", - "Select": "ALL_ATTRIBUTES", - "Limit":3, - "ConsistentRead": true, - "KeyConditions": { - "LastPostDateTime": { - "AttributeValueList": [ - { - "S": "20130101" - }, - { - "S": "20130115" - } - ], - "ComparisonOperator": "BETWEEN" - }, - "ForumName": { - "AttributeValueList": [ - { - "S": "Amazon DynamoDB" - } - ], - "ComparisonOperator": "EQ" - } - }, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Count": 3, - "Items": [ - { - "LastPostedBy": { - "S": "fred@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "20130102054211" - }, - "Tags": { - "SS": ["Problem","Question"] - } - }, - { - "LastPostedBy": { - "S": "alice@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "20130105111307" - }, - "Tags": { - "SS": ["Idea"] - } - }, - { - "LastPostedBy": { - "S": "bob@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "20130108094417" - }, - "Tags": { - "SS": ["AppDesign", "HelpMe"] - } - } - ], - "ConsumedCapacity": { - "TableName": "Thread", - "CapacityUnits": 1 - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.Query - -{ - "TableName": "Thread", - "Select": "COUNT", - "ConsistentRead": true, - "KeyConditions": { - "ForumName": { - "AttributeValueList": [ - { - "S": "Amazon DynamoDB" - } - ], - "ComparisonOperator": "EQ" - } - } -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Count":`17 -} - - diff --git a/test/resources/DynamoDB/Scan b/test/resources/DynamoDB/Scan deleted file mode 100644 index de1b386e1d8..00000000000 --- a/test/resources/DynamoDB/Scan +++ /dev/null @@ -1,274 +0,0 @@ - -{ - "AttributesToGet": [ - "string" - ], - "ExclusiveStartKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "Limit": "number", - "ReturnConsumedCapacity": "string", - "ScanFilter": - { - "string" : - { - "AttributeValueList": [ - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - ], - "ComparisonOperator": "string" - } - }, - "Segment": "number", - "Select": "string", - "TableName": "string", - "TotalSegments": "number" -} - - - -{ - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "Count": "number", - "Items": [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ], - "LastEvaluatedKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ScannedCount": "number" -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.Scan - -{ - "TableName": "Reply", - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "ConsumedCapacity": { - "CapacityUnits": 0.5, - "TableName": "Reply" - }, - "Count": 4, - "Items": [ - { - "PostedBy": { - "S": "joe@example.com" - }, - "ReplyDateTime": { - "S": "20130320115336" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "Have you looked at the BatchWriteItem API?" - } - }, - { - "PostedBy": { - "S": "fred@example.com" - }, - "ReplyDateTime": { - "S": "20130320115342" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "No, I didn't know about that. Where can I find more information?" - } - }, - { - "PostedBy": { - "S": "joe@example.com" - }, - "ReplyDateTime": { - "S": "20130320115347" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "BatchWriteItem is documented in the Amazon DynamoDB API Reference." - } - }, - { - "PostedBy": { - "S": "fred@example.com" - }, - "ReplyDateTime": { - "S": "20130320115352" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "OK, I'll take a look at that. Thanks!" - } - } - ], - "ScannedCount": 4 -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.Scan - -{ - "TableName": "Reply", - "ScanFilter": { - "PostedBy": { - "AttributeValueList": [ - { - "S": "joe@example.com" - } - ], - "ComparisonOperator": "EQ" - } - }, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "ConsumedCapacity": { - "CapacityUnits": 0.5, - "TableName": "Reply" - }, - "Count": 2, - "Items": [ - { - "PostedBy": { - "S": "joe@example.com" - }, - "ReplyDateTime": { - "S": "20130320115336" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "Have you looked at the BatchWriteItem API?" - } - }, - { - "PostedBy": { - "S": "joe@example.com" - }, - "ReplyDateTime": { - "S": "20130320115347" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "BatchWriteItem is documented in the Amazon DynamoDB API Reference." - } - } - ], - "ScannedCount": 4 -} - - diff --git a/test/resources/DynamoDB/ScanResponse b/test/resources/DynamoDB/ScanResponse deleted file mode 100644 index de1b386e1d8..00000000000 --- a/test/resources/DynamoDB/ScanResponse +++ /dev/null @@ -1,274 +0,0 @@ - -{ - "AttributesToGet": [ - "string" - ], - "ExclusiveStartKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "Limit": "number", - "ReturnConsumedCapacity": "string", - "ScanFilter": - { - "string" : - { - "AttributeValueList": [ - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - ], - "ComparisonOperator": "string" - } - }, - "Segment": "number", - "Select": "string", - "TableName": "string", - "TotalSegments": "number" -} - - - -{ - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "Count": "number", - "Items": [ - - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - ], - "LastEvaluatedKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ScannedCount": "number" -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.Scan - -{ - "TableName": "Reply", - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "ConsumedCapacity": { - "CapacityUnits": 0.5, - "TableName": "Reply" - }, - "Count": 4, - "Items": [ - { - "PostedBy": { - "S": "joe@example.com" - }, - "ReplyDateTime": { - "S": "20130320115336" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "Have you looked at the BatchWriteItem API?" - } - }, - { - "PostedBy": { - "S": "fred@example.com" - }, - "ReplyDateTime": { - "S": "20130320115342" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "No, I didn't know about that. Where can I find more information?" - } - }, - { - "PostedBy": { - "S": "joe@example.com" - }, - "ReplyDateTime": { - "S": "20130320115347" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "BatchWriteItem is documented in the Amazon DynamoDB API Reference." - } - }, - { - "PostedBy": { - "S": "fred@example.com" - }, - "ReplyDateTime": { - "S": "20130320115352" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "OK, I'll take a look at that. Thanks!" - } - } - ], - "ScannedCount": 4 -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.Scan - -{ - "TableName": "Reply", - "ScanFilter": { - "PostedBy": { - "AttributeValueList": [ - { - "S": "joe@example.com" - } - ], - "ComparisonOperator": "EQ" - } - }, - "ReturnConsumedCapacity": "TOTAL" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "ConsumedCapacity": { - "CapacityUnits": 0.5, - "TableName": "Reply" - }, - "Count": 2, - "Items": [ - { - "PostedBy": { - "S": "joe@example.com" - }, - "ReplyDateTime": { - "S": "20130320115336" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "Have you looked at the BatchWriteItem API?" - } - }, - { - "PostedBy": { - "S": "joe@example.com" - }, - "ReplyDateTime": { - "S": "20130320115347" - }, - "Id": { - "S": "Amazon DynamoDB#How do I update multiple items?" - }, - "Message": { - "S": "BatchWriteItem is documented in the Amazon DynamoDB API Reference." - } - } - ], - "ScannedCount": 4 -} - - diff --git a/test/resources/DynamoDB/UpdateItem b/test/resources/DynamoDB/UpdateItem deleted file mode 100644 index 877898418a3..00000000000 --- a/test/resources/DynamoDB/UpdateItem +++ /dev/null @@ -1,240 +0,0 @@ - -{ - "AttributeUpdates": - { - "string" : - { - "Action": "string", - "Value": { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "Expected": - { - "string" : - { - "Exists": "boolean", - "Value": { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ReturnConsumedCapacity": "string", - "ReturnItemCollectionMetrics": "string", - "ReturnValues": "string", - "TableName": "string" -} - - - -{ - "Attributes": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "ItemCollectionMetrics": { - "ItemCollectionKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "SizeEstimateRangeGB": [ - "number" - ] - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.UpdateItem - -{ - "TableName": "Thread", - "Key": { - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Subject": { - "S": "Maximum number of items?" - } - }, - "AttributeUpdates": { - "LastPostedBy": { - "Value": { - "S": "alice@example.com" - }, - "Action": "PUT" - } - }, - "Expected": { - "LastPostedBy": { - "Value": { - "S": "fred@example.com" - }, - "Exists": true - } - }, - "ReturnValues": "ALL_NEW" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Attributes": { - "LastPostedBy": { - "S": "alice@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "20130320010350" - }, - "Tags": { - "SS": ["Update","Multiple Items","HelpMe"] - }, - "Subject": { - "S": "Maximum number of items?" - }, - "Views": { - "N": "5" - }, - "Message": { - "S": "I want to put 10 million data items to an Amazon DynamoDB table. Is there an upper limit?" - } - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.UpdateItem - -{ - "TableName": "Thread", - "Key": { - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Subject": { - "S": "A question about updates" - } - }, - "AttributeUpdates": { - "Replies": { - "Action": "ADD", - "Value": {"N": "1"} - } - }, - "ReturnValues" : "NONE" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ -} - - diff --git a/test/resources/DynamoDB/UpdateItemResponse b/test/resources/DynamoDB/UpdateItemResponse deleted file mode 100644 index 877898418a3..00000000000 --- a/test/resources/DynamoDB/UpdateItemResponse +++ /dev/null @@ -1,240 +0,0 @@ - -{ - "AttributeUpdates": - { - "string" : - { - "Action": "string", - "Value": { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "Expected": - { - "string" : - { - "Exists": "boolean", - "Value": { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - } - }, - "Key": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ReturnConsumedCapacity": "string", - "ReturnItemCollectionMetrics": "string", - "ReturnValues": "string", - "TableName": "string" -} - - - -{ - "Attributes": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "ConsumedCapacity": { - "CapacityUnits": "number", - "TableName": "string" - }, - "ItemCollectionMetrics": { - "ItemCollectionKey": - { - "string" : - { - "B": "blob", - "BS": [ - "blob" - ], - "N": "string", - "NS": [ - "string" - ], - "S": "string", - "SS": [ - "string" - ] - } - }, - "SizeEstimateRangeGB": [ - "number" - ] - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.UpdateItem - -{ - "TableName": "Thread", - "Key": { - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Subject": { - "S": "Maximum number of items?" - } - }, - "AttributeUpdates": { - "LastPostedBy": { - "Value": { - "S": "alice@example.com" - }, - "Action": "PUT" - } - }, - "Expected": { - "LastPostedBy": { - "Value": { - "S": "fred@example.com" - }, - "Exists": true - } - }, - "ReturnValues": "ALL_NEW" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "Attributes": { - "LastPostedBy": { - "S": "alice@example.com" - }, - "ForumName": { - "S": "Amazon DynamoDB" - }, - "LastPostDateTime": { - "S": "20130320010350" - }, - "Tags": { - "SS": ["Update","Multiple Items","HelpMe"] - }, - "Subject": { - "S": "Maximum number of items?" - }, - "Views": { - "N": "5" - }, - "Message": { - "S": "I want to put 10 million data items to an Amazon DynamoDB table. Is there an upper limit?" - } - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.UpdateItem - -{ - "TableName": "Thread", - "Key": { - "ForumName": { - "S": "Amazon DynamoDB" - }, - "Subject": { - "S": "A question about updates" - } - }, - "AttributeUpdates": { - "Replies": { - "Action": "ADD", - "Value": {"N": "1"} - } - }, - "ReturnValues" : "NONE" -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ -} - - diff --git a/test/resources/DynamoDB/UpdateTable b/test/resources/DynamoDB/UpdateTable deleted file mode 100644 index 3afd92be292..00000000000 --- a/test/resources/DynamoDB/UpdateTable +++ /dev/null @@ -1,150 +0,0 @@ - -{ - "ProvisionedThroughput": { - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string" -} - - - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "CreationDateTime": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "IndexSizeBytes": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "LastDecreaseDateTime": "number", - "LastIncreaseDateTime": "number", - "NumberOfDecreasesToday": "number", - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string", - "TableSizeBytes": "number", - "TableStatus": "string" - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.UpdateTable - -{ - "TableName": "Thread", - "ProvisionedThroughput": { - "ReadCapacityUnits": 10, - "WriteCapacityUnits": 10 - } -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "ForumName", - "AttributeType": "S" - }, - { - "AttributeName": "LastPostDateTime", - "AttributeType": "S" - }, - { - "AttributeName": "Subject", - "AttributeType": "S" - } - ], - "CreationDateTime": 1.363801528686E9, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "Subject", - "KeyType": "RANGE" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "LastPostIndex", - "IndexSizeBytes": 0, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "LastPostDateTime", - "KeyType": "RANGE" - } - ], - "Projection": { - "ProjectionType": "KEYS_ONLY" - } - } - ], - "ProvisionedThroughput": { - "LastIncreaseDateTime": 1.363801701282E9, - "NumberOfDecreasesToday": 0, - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - }, - "TableName": "Thread", - "TableSizeBytes": 0, - "TableStatus": "UPDATING" - } -} - - diff --git a/test/resources/DynamoDB/UpdateTableResponse b/test/resources/DynamoDB/UpdateTableResponse deleted file mode 100644 index 3afd92be292..00000000000 --- a/test/resources/DynamoDB/UpdateTableResponse +++ /dev/null @@ -1,150 +0,0 @@ - -{ - "ProvisionedThroughput": { - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string" -} - - - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "string", - "AttributeType": "string" - } - ], - "CreationDateTime": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "string", - "IndexSizeBytes": "number", - "ItemCount": "number", - "KeySchema": [ - { - "AttributeName": "string", - "KeyType": "string" - } - ], - "Projection": { - "NonKeyAttributes": [ - "string" - ], - "ProjectionType": "string" - } - } - ], - "ProvisionedThroughput": { - "LastDecreaseDateTime": "number", - "LastIncreaseDateTime": "number", - "NumberOfDecreasesToday": "number", - "ReadCapacityUnits": "number", - "WriteCapacityUnits": "number" - }, - "TableName": "string", - "TableSizeBytes": "number", - "TableStatus": "string" - } -} - - - -POST / HTTP/1.1 -Host: dynamodb..; -X-Amz-Date: -Authorization: AWS4-HMAC-SHA256 Credential=, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature= -User-Agent: -x-amz-content-sha256: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Connection: Keep-Alive -X-Amz-Target: DynamoDB_20120810.UpdateTable - -{ - "TableName": "Thread", - "ProvisionedThroughput": { - "ReadCapacityUnits": 10, - "WriteCapacityUnits": 10 - } -} - - - -HTTP/1.1 200 OK -x-amzn-RequestId: -x-amz-crc32: -Content-Type: application/x-amz-json-1.0 -Content-Length: -Date: - -{ - "TableDescription": { - "AttributeDefinitions": [ - { - "AttributeName": "ForumName", - "AttributeType": "S" - }, - { - "AttributeName": "LastPostDateTime", - "AttributeType": "S" - }, - { - "AttributeName": "Subject", - "AttributeType": "S" - } - ], - "CreationDateTime": 1.363801528686E9, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "Subject", - "KeyType": "RANGE" - } - ], - "LocalSecondaryIndexes": [ - { - "IndexName": "LastPostIndex", - "IndexSizeBytes": 0, - "ItemCount": 0, - "KeySchema": [ - { - "AttributeName": "ForumName", - "KeyType": "HASH" - }, - { - "AttributeName": "LastPostDateTime", - "KeyType": "RANGE" - } - ], - "Projection": { - "ProjectionType": "KEYS_ONLY" - } - } - ], - "ProvisionedThroughput": { - "LastIncreaseDateTime": 1.363801701282E9, - "NumberOfDecreasesToday": 0, - "ReadCapacityUnits": 5, - "WriteCapacityUnits": 5 - }, - "TableName": "Thread", - "TableSizeBytes": 0, - "TableStatus": "UPDATING" - } -} - - diff --git a/test/resources/EC2/AllocateAddress b/test/resources/EC2/AllocateAddress deleted file mode 100644 index 985881e2dd2..00000000000 --- a/test/resources/EC2/AllocateAddress +++ /dev/null @@ -1,5 +0,0 @@ -GET / -Action=AllocateAddress -{% if aaDomain %} -Domain={{ aaDomain }} -{% endif %} diff --git a/test/resources/EC2/AllocateAddressResponse b/test/resources/EC2/AllocateAddressResponse deleted file mode 100644 index 67a428849d3..00000000000 --- a/test/resources/EC2/AllocateAddressResponse +++ /dev/null @@ -1,9 +0,0 @@ - - - {{ aarRequestId }} - {{ aarPublicIp }} - {{ aarDomain }} - {% if aarAllocationId %} - {{ aarAllocationId }} - {% endif %} - diff --git a/test/resources/EC2/AssignPrivateIpAddresses b/test/resources/EC2/AssignPrivateIpAddresses deleted file mode 100644 index 4f180f9d9de..00000000000 --- a/test/resources/EC2/AssignPrivateIpAddresses +++ /dev/null @@ -1,12 +0,0 @@ -GET / -Action=AssignPrivateIpAddresses -{% if apiaAllowReassignment %} -AllowReassignment={{ apiaAllowReassignment }} -{% endif %} -NetworkInterfaceId={{ apiaNetworkInterfaceId }} -{% if apiaPrivateIpAddress %} -PrivateIpAddress.{{ n }}={{.}} -{% endif %} -{% if apiaSecondaryPrivateIpAddressCount %} -SecondaryPrivateIpAddressCount={{ apiaSecondaryPrivateIpAddressCount }} -{% endif %} diff --git a/test/resources/EC2/AssignPrivateIpAddressesResponse b/test/resources/EC2/AssignPrivateIpAddressesResponse deleted file mode 100644 index 20cdfe2895c..00000000000 --- a/test/resources/EC2/AssignPrivateIpAddressesResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ apiaRequestId }} - {{ apiaReturn }} - diff --git a/test/resources/EC2/AssociateAddress b/test/resources/EC2/AssociateAddress deleted file mode 100644 index 21a4525e333..00000000000 --- a/test/resources/EC2/AssociateAddress +++ /dev/null @@ -1,16 +0,0 @@ -GET / -Action=AssociateAddress -{% if abAllocationId %} -AllocationId={{ abAllocationId }} -{% endif %} -{% if abAllowReassociation %} -AllowReassociation={{ abAllowReassociation }} -{% endif %} -InstanceId={{ abInstanceId }} -{% if abNetworkInterfaceId %} -NetworkInterfaceId={{ abNetworkInterfaceId }} -{% endif %} -{% if abPrivateIpAddress %} -PrivateIpAddress={{ abPrivateIpAddress }} -{% endif %} -PublicIp={{ abPublicIp }} diff --git a/test/resources/EC2/AssociateAddressResponse b/test/resources/EC2/AssociateAddressResponse deleted file mode 100644 index 1d7c44810b6..00000000000 --- a/test/resources/EC2/AssociateAddressResponse +++ /dev/null @@ -1,8 +0,0 @@ - - - {{ abrRequestId }} - {{ abrReturn }} - {% if abrAssociationId %} - {{ abrAssociationId }} - {% endif %} - diff --git a/test/resources/EC2/AssociateDhcpOptions b/test/resources/EC2/AssociateDhcpOptions deleted file mode 100644 index d0a1b5d49e5..00000000000 --- a/test/resources/EC2/AssociateDhcpOptions +++ /dev/null @@ -1,4 +0,0 @@ -GET / -Action=AssociateDhcpOptions -DhcpOptionsId={{ adoDhcpOptionsId }} -VpcId={{ adoVpcId }} diff --git a/test/resources/EC2/AssociateDhcpOptionsResponse b/test/resources/EC2/AssociateDhcpOptionsResponse deleted file mode 100644 index 504ed7161af..00000000000 --- a/test/resources/EC2/AssociateDhcpOptionsResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ adorRequestId }} - {{ adorReturn }} - diff --git a/test/resources/EC2/AssociateRouteTable b/test/resources/EC2/AssociateRouteTable deleted file mode 100644 index 0739b09576d..00000000000 --- a/test/resources/EC2/AssociateRouteTable +++ /dev/null @@ -1,4 +0,0 @@ -GET / -Action=AssociateRouteTable -RouteTableId={{ artRouteTableId }} -SubnetId={{ artSubnetId }} diff --git a/test/resources/EC2/AssociateRouteTableResponse b/test/resources/EC2/AssociateRouteTableResponse deleted file mode 100644 index 38124de8574..00000000000 --- a/test/resources/EC2/AssociateRouteTableResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ artrRequestId }} - {{ artrAssociationId }} - diff --git a/test/resources/EC2/AttachInternetGateway b/test/resources/EC2/AttachInternetGateway deleted file mode 100644 index 0a857c2f3f1..00000000000 --- a/test/resources/EC2/AttachInternetGateway +++ /dev/null @@ -1,4 +0,0 @@ -GET / -Action=AttachInternetGateway -InternetGatewayId={{ aigInternetGatewayId }} -VpcId={{ aigVpcId }} diff --git a/test/resources/EC2/AttachInternetGatewayResponse b/test/resources/EC2/AttachInternetGatewayResponse deleted file mode 100644 index 4ef612add4a..00000000000 --- a/test/resources/EC2/AttachInternetGatewayResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ aigrRequestId }} - {{ aigrReturn }} - diff --git a/test/resources/EC2/AttachNetworkInterface b/test/resources/EC2/AttachNetworkInterface deleted file mode 100644 index aeae3861d53..00000000000 --- a/test/resources/EC2/AttachNetworkInterface +++ /dev/null @@ -1,5 +0,0 @@ -GET / -Action=AttachNetworkInterface -DeviceIndex={{ aniDeviceIndex }} -InstanceId={{ aniInstanceId }} -NetworkInterfaceId={{ aniNetworkInterfaceId }} diff --git a/test/resources/EC2/AttachNetworkInterfaceResponse b/test/resources/EC2/AttachNetworkInterfaceResponse deleted file mode 100644 index ca68c02f158..00000000000 --- a/test/resources/EC2/AttachNetworkInterfaceResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ anirRequestId }} - {{ anirAttachmentId }} - diff --git a/test/resources/EC2/AttachVolume b/test/resources/EC2/AttachVolume deleted file mode 100644 index a91916d69ab..00000000000 --- a/test/resources/EC2/AttachVolume +++ /dev/null @@ -1,5 +0,0 @@ -GET / -Action=AttachVolume -Device={{ avDevice }} -InstanceId={{ avInstanceId }} -VolumeId={{ avVolumeId }} diff --git a/test/resources/EC2/AttachVolumeResponse b/test/resources/EC2/AttachVolumeResponse deleted file mode 100644 index e163501cdea..00000000000 --- a/test/resources/EC2/AttachVolumeResponse +++ /dev/null @@ -1,9 +0,0 @@ - - - {{ avrRequestId }} - {{ avrVolumeId }} - {{ avrInstanceId }} - {{ avrDevice }} - {{ avrStatus }} - {{ avrAttachTime }} - diff --git a/test/resources/EC2/AttachVpnGateway b/test/resources/EC2/AttachVpnGateway deleted file mode 100644 index f1f6b3c1a35..00000000000 --- a/test/resources/EC2/AttachVpnGateway +++ /dev/null @@ -1,4 +0,0 @@ -GET / -Action=AttachVpnGateway -VpcId={{ avgVpcId }} -VpnGatewayId={{ avgVpnGatewayId }} diff --git a/test/resources/EC2/AttachVpnGatewayResponse b/test/resources/EC2/AttachVpnGatewayResponse deleted file mode 100644 index fd82a6248ef..00000000000 --- a/test/resources/EC2/AttachVpnGatewayResponse +++ /dev/null @@ -1,10 +0,0 @@ - - - {{ avgrRequestId }} - {% if avgrAttachment %} - - {{ atVpcId }} - {{ atState }} - - {% endif %} - diff --git a/test/resources/EC2/AuthorizeSecurityGroupEgress b/test/resources/EC2/AuthorizeSecurityGroupEgress deleted file mode 100644 index 9e7a2b80cc1..00000000000 --- a/test/resources/EC2/AuthorizeSecurityGroupEgress +++ /dev/null @@ -1,20 +0,0 @@ -GET / -Action=AuthorizeSecurityGroupEgress -GroupId={{ asgeGroupId }} -{% if asgeIpPermissions %} -IpPermissions.{{ n }}.FromPort={{ iptFromPort }} -{% if iptGroups %} -{% if uigGroupId %} -IpPermissions.{{ n }}.Groups.{{ o }}.GroupId={{ uigGroupId }} -{% endif %} -{% if uigGroupName %} -IpPermissions.{{ n }}.Groups.{{ o }}.GroupName={{ uigGroupName }} -{% endif %} -IpPermissions.{{ n }}.Groups.{{ o }}.UserId={{ uigUserId }} -{% endif %} -IpPermissions.{{ n }}.IpProtocol={{ iptIpProtocol }} -{% if iptIpRanges %} -IpPermissions.{{ n }}.IpRanges.{{ o }}.CidrIp={{ irCidrIp }} -{% endif %} -IpPermissions.{{ n }}.ToPort={{ iptToPort }} -{% endif %} diff --git a/test/resources/EC2/AuthorizeSecurityGroupEgressResponse b/test/resources/EC2/AuthorizeSecurityGroupEgressResponse deleted file mode 100644 index d2259b11bb4..00000000000 --- a/test/resources/EC2/AuthorizeSecurityGroupEgressResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ asgerRequestId }} - {{ asgerReturn }} - diff --git a/test/resources/EC2/AuthorizeSecurityGroupIngress b/test/resources/EC2/AuthorizeSecurityGroupIngress deleted file mode 100644 index c03b95b7755..00000000000 --- a/test/resources/EC2/AuthorizeSecurityGroupIngress +++ /dev/null @@ -1,25 +0,0 @@ -GET / -Action=AuthorizeSecurityGroupIngress -{% if asgiGroupId %} -GroupId={{ asgiGroupId }} -{% endif %} -{% if asgiGroupName %} -GroupName={{ asgiGroupName }} -{% endif %} -{% if asgiIpPermissions %} -IpPermissions.{{ n }}.FromPort={{ iptFromPort }} -{% if iptGroups %} -{% if uigGroupId %} -IpPermissions.{{ n }}.Groups.{{ o }}.GroupId={{ uigGroupId }} -{% endif %} -{% if uigGroupName %} -IpPermissions.{{ n }}.Groups.{{ o }}.GroupName={{ uigGroupName }} -{% endif %} -IpPermissions.{{ n }}.Groups.{{ o }}.UserId={{ uigUserId }} -{% endif %} -IpPermissions.{{ n }}.IpProtocol={{ iptIpProtocol }} -{% if iptIpRanges %} -IpPermissions.{{ n }}.IpRanges.{{ o }}.CidrIp={{ irCidrIp }} -{% endif %} -IpPermissions.{{ n }}.ToPort={{ iptToPort }} -{% endif %} diff --git a/test/resources/EC2/AuthorizeSecurityGroupIngressResponse b/test/resources/EC2/AuthorizeSecurityGroupIngressResponse deleted file mode 100644 index dc3d35ae479..00000000000 --- a/test/resources/EC2/AuthorizeSecurityGroupIngressResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ asgirRequestId }} - {{ asgirReturn }} - diff --git a/test/resources/EC2/BundleInstance b/test/resources/EC2/BundleInstance deleted file mode 100644 index c0ba415fe69..00000000000 --- a/test/resources/EC2/BundleInstance +++ /dev/null @@ -1,12 +0,0 @@ -GET / -Action=BundleInstance -InstanceId={{ biInstanceId }} -{% if biStorage %} -{{#bitsS3}} -Storage.S3.AwsAccessKeyId={{ bissAwsAccessKeyId }} -Storage.S3.Bucket={{ bissBucket }} -Storage.S3.Prefix={{ bissPrefix }} -Storage.S3.UploadPolicy={{ bissUploadPolicy }} -Storage.S3.UploadPolicySignature={{ bissUploadPolicySignature }} -{{/bitsS3}} -{% endif %} diff --git a/test/resources/EC2/BundleInstanceResponse b/test/resources/EC2/BundleInstanceResponse deleted file mode 100644 index b973620216d..00000000000 --- a/test/resources/EC2/BundleInstanceResponse +++ /dev/null @@ -1,33 +0,0 @@ - - - {{ birRequestId }} - {% if birBundleInstanceTask %} - - {{ bitInstanceId }} - {{ bitBundleId }} - {{ bitState }} - {{ bitStartTime }} - {{ bitUpdateTime }} - {{ bitProgress }} - {% if bitStorage %} - - {{#bitsS3}} - - {{ bissAwsAccessKeyId }} - {{ bissBucket }} - {{ bissPrefix }} - {{ bissUploadPolicy }} - {{ bissUploadPolicySignature }} - - {{/bitsS3}} - - {% endif %} - {% if bitError %} - - {{ biteCode }} - {{ biteMessage }} - - {% endif %} - - {% endif %} - diff --git a/test/resources/EC2/CancelBundleTask b/test/resources/EC2/CancelBundleTask deleted file mode 100644 index 9ab0c762851..00000000000 --- a/test/resources/EC2/CancelBundleTask +++ /dev/null @@ -1,3 +0,0 @@ -GET / -Action=CancelBundleTask -BundleId={{ cbtBundleId }} diff --git a/test/resources/EC2/CancelBundleTaskResponse b/test/resources/EC2/CancelBundleTaskResponse deleted file mode 100644 index 28ce08a294a..00000000000 --- a/test/resources/EC2/CancelBundleTaskResponse +++ /dev/null @@ -1,34 +0,0 @@ - - - {{ cbtrRequestId }} - {% if cbtrBundleInstanceTask %} - - {{ bitInstanceId }} - {{ bitBundleId }} - {{ bitState }} - {{ bitStartTime }} - {{ bitUpdateTime }} - {{ bitProgress }} - {% if bitStorage %} - - {{#bitsS3}} - - {{ bissAwsAccessKeyId }} - {{ bissBucket }} - {{ bissPrefix }} - {{ bissUploadPolicy }} - {{ bissUploadPolicySignature }} - - {{/bitsS3}} - - {% endif %} - {% if bitError %} - - {{ biteCode }} - {{ biteMessage }} - - {% endif %} - - {% endif %} - - diff --git a/test/resources/EC2/CancelConversionTask b/test/resources/EC2/CancelConversionTask deleted file mode 100644 index db97f4526fc..00000000000 --- a/test/resources/EC2/CancelConversionTask +++ /dev/null @@ -1,3 +0,0 @@ -GET / -Action=CancelConversionTask -ConversionTaskId={{ cctConversionTaskId }} diff --git a/test/resources/EC2/CancelConversionTaskResponse b/test/resources/EC2/CancelConversionTaskResponse deleted file mode 100644 index beb502129ef..00000000000 --- a/test/resources/EC2/CancelConversionTaskResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ cctrRequestId }} - {{ cctrReturn }} - diff --git a/test/resources/EC2/CancelExportTask b/test/resources/EC2/CancelExportTask deleted file mode 100644 index 1c50d066597..00000000000 --- a/test/resources/EC2/CancelExportTask +++ /dev/null @@ -1,3 +0,0 @@ -GET / -Action=CancelExportTask -ExportTaskId={{ cetExportTaskId }} diff --git a/test/resources/EC2/CancelExportTaskResponse b/test/resources/EC2/CancelExportTaskResponse deleted file mode 100644 index 063a968f86c..00000000000 --- a/test/resources/EC2/CancelExportTaskResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ cetrRequestId }} - {{ cetrReturn }} - diff --git a/test/resources/EC2/CancelReservedInstancesListing b/test/resources/EC2/CancelReservedInstancesListing deleted file mode 100644 index e7ae0a8d1a7..00000000000 --- a/test/resources/EC2/CancelReservedInstancesListing +++ /dev/null @@ -1,3 +0,0 @@ -GET / -Action=CancelReservedInstancesListing -ReservedInstancesListingId={{ crilReservedInstancesListingId }} diff --git a/test/resources/EC2/CancelReservedInstancesListingResponse b/test/resources/EC2/CancelReservedInstancesListingResponse deleted file mode 100644 index 960b074a5c9..00000000000 --- a/test/resources/EC2/CancelReservedInstancesListingResponse +++ /dev/null @@ -1,66 +0,0 @@ - - - bec2cf62-98ef-434a-8a15-886fcexample - - - 3ebe97b5-f273-43b6-a204-7a18cEXAMPLE - e5a2ff3b-7d14-494f-90af-0b5d0EXAMPLE - 2012-07-12T16:55:28.000Z - 2012-07-12T16:55:28.000Z - cancelled - CANCELLED - - - Available - 0 - - - Sold - 0 - - - Cancelled - 1 - - - Pending - 0 - - - - - 5 - 166.64 - USD - false - - - 4 - 133.32 - USD - false - - - 3 - 99.99 - USD - false - - - 2 - 66.66 - USD - false - - - 1 - 33.33 - USD - false - - - - XqJIt1342112125076 - - - diff --git a/test/resources/EC2/CancelSpotInstanceRequests b/test/resources/EC2/CancelSpotInstanceRequests deleted file mode 100644 index 42be21920b7..00000000000 --- a/test/resources/EC2/CancelSpotInstanceRequests +++ /dev/null @@ -1,5 +0,0 @@ -GET / -Action=CancelSpotInstanceRequests -{% if csirSpotInstanceRequestId %} -SpotInstanceRequestId.{{ n }}={{.}} -{% endif %} diff --git a/test/resources/EC2/CancelSpotInstanceRequestsResponse b/test/resources/EC2/CancelSpotInstanceRequestsResponse deleted file mode 100644 index 9cb429bc733..00000000000 --- a/test/resources/EC2/CancelSpotInstanceRequestsResponse +++ /dev/null @@ -1,12 +0,0 @@ - - - {{ csirrRequestId }} - - {% if csirrSpotInstanceRequestSet %} - - {{ csirrsitSpotInstanceRequestId }} - {{ csirrsitState }} - - {% endif %} - - diff --git a/test/resources/EC2/CreateSecurityGroup b/test/resources/EC2/CreateSecurityGroup deleted file mode 100644 index d2d4270c15b..00000000000 --- a/test/resources/EC2/CreateSecurityGroup +++ /dev/null @@ -1,7 +0,0 @@ -GET / -Action=CreateSecurityGroup -GroupDescription={{ csgGroupDescription }} -GroupName={{ csgGroupName }} -{% if csgVpcId %} -VpcId={{ csgVpcId }} -{% endif %} diff --git a/test/resources/EC2/CreateSecurityGroupResponse b/test/resources/EC2/CreateSecurityGroupResponse deleted file mode 100644 index 722005c70fa..00000000000 --- a/test/resources/EC2/CreateSecurityGroupResponse +++ /dev/null @@ -1,6 +0,0 @@ - - - {{ csgrRequestId }} - {{ csgrReturn }} - {{ csgrGroupId }} - diff --git a/test/resources/EC2/DeleteSecurityGroup b/test/resources/EC2/DeleteSecurityGroup deleted file mode 100644 index 11409a4f002..00000000000 --- a/test/resources/EC2/DeleteSecurityGroup +++ /dev/null @@ -1,8 +0,0 @@ -GET / -Action=DeleteSecurityGroup -{% if dsgGroupId %} -GroupId={{ dsgGroupId }} -{% endif %} -{% if dsgGroupName %} -GroupName={{ dsgGroupName }} -{% endif %} diff --git a/test/resources/EC2/DeleteSecurityGroupResponse b/test/resources/EC2/DeleteSecurityGroupResponse deleted file mode 100644 index 48ea209b957..00000000000 --- a/test/resources/EC2/DeleteSecurityGroupResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ dsgrRequestId }} - {{ dsgrReturn }} - diff --git a/test/resources/EC2/DescribeImages b/test/resources/EC2/DescribeImages deleted file mode 100644 index 13e08cffcc5..00000000000 --- a/test/resources/EC2/DescribeImages +++ /dev/null @@ -1,18 +0,0 @@ -GET / -Action=DescribeImages -{% if djExecutableBy %} -ExecutableBy.{{ n }}={{.}} -{% endif %} -{% if djFilter %} -Filter.{{ n }}.Name={{ filterName }} -{% if filterValue %} -Filter.{{ n }}.Value.{{ o }}={{.}} -{% endif %} -{% endif %} -{% if djImageId %} -ImageId.{{ n }}={{.}} -{% endif %} -{% if djOwner %} -Owner.{{ n }}={{.}} -{% endif %} - diff --git a/test/resources/EC2/DescribeImagesResponse b/test/resources/EC2/DescribeImagesResponse deleted file mode 100644 index 695c6b8b65b..00000000000 --- a/test/resources/EC2/DescribeImagesResponse +++ /dev/null @@ -1,60 +0,0 @@ - - - {{ djRequestId }} - - {% if djImagesSet %} - - {{ diritImageId }} - {{ diritImageLocation }} - {{ diritImageState }} - {{ diritImageOwnerId }} - {{ diritIsPublic }} - - {% if diritProductCodes %} - - {{ pcsitProductCode }} - {{ pcsitType }} - - {% endif %} - - {{ diritArchitecture }} - {{ diritImageType }} - {{ diritKernelId }} - {{ diritRamdiskId }} - {% if diritPlatform %} - {{ diritPlatform }} - {% endif %} - {{ diritImageOwnerAlias }} - {{ diritName }} - {{ diritDescription }} - {{ diritRootDeviceType }} - {{ diritRootDeviceName }} - - {% if diritBlockDeviceMapping %} - - {{ bdmitDeviceName }} - {% if bdmitEbs %} - - {{ ebdtSnapshotId }} - {{ ebdtVolumeSize }} - {{ ebdtDeleteOnTermination }} - {{ ebdtVolumeType }} - - {% endif %} - - {% endif %} - - {{ diritVirtualizationType }} - - {% if diritTagSet %} - - {{ rtsitKey }} - {{ rtsitValue }} - - {% endif %} - - {{ diritHypervisor }} - - {% endif %} - - diff --git a/test/resources/EC2/DescribeInstances b/test/resources/EC2/DescribeInstances deleted file mode 100644 index 48827d853c9..00000000000 --- a/test/resources/EC2/DescribeInstances +++ /dev/null @@ -1,11 +0,0 @@ -GET / -Action=DescribeInstances -{% if diFilter %} -Filter.{{ n }}.Name={{ filterName }} -{% if filterValue %} -Filter.{{ n }}.Value.{{ o }}={{.}} -{% endif %} -{% endif %} -{% if diInstanceId %} -InstanceId.{{ n }}={{.}} -{% endif %} diff --git a/test/resources/EC2/DescribeInstancesResponse b/test/resources/EC2/DescribeInstancesResponse deleted file mode 100644 index 665a4bf3f5d..00000000000 --- a/test/resources/EC2/DescribeInstancesResponse +++ /dev/null @@ -1,192 +0,0 @@ - - - {{ dirRequestId }} - - {% if dirReservationSet %} - - {{ ritReservationId }} - {{ ritOwnerId }} - - {% if ritGroupSet %} - - {{ gitGroupId }} - {{ gitGroupName }} - - {% endif %} - - - {% if ritInstancesSet %} - - {{ riitInstanceId }} - {{ riitImageId }} - - {% if riitInstanceState %} - {{ istCode }} - {{ istName }} - {% endif %} - - {% if riitPrivateDnsName %} - {{ riitPrivateDnsName }} - {% endif %} - {% if riitDnsName %} - {{ riitDnsName }} - {% endif %} - {% if riitReason %} - {{ riitReason }} - {% endif %} - {{ riitKeyName }} - {{ riitAmiLaunchIndex }} - - {% if riitProductCodes %} - - {{ pcsitProductCode }} - {{ pcsitType }} - - {% endif %} - - {{ riitInstanceType }} - {{ riitLaunchTime }} - - {% if riitPlacement %} - {{ pruAvailabilityZone }} - {% if pruGroupName %} - {{ pruGroupName }} - {% endif %} - {{ pruTenancy }} - {% endif %} - - {{ riitKernelId }} - {{ riitRamdiskId }} - {% if riitPlatform %} - {{ riitPlatform }} - {% endif %} - {% if riitMonitoring %} - - {{ imstState }} - - {% endif %} - {{ riitSubnetId }} - {{ riitVpcId }} - {{ riitPrivateIpAddress }} - {{ riitIpAddress }} - {{ riitSourceDestCheck }} - - {% if riitGroupSet %} - - {{ gitGroupId }} - {{ gitGroupName }} - - {% endif %} - - {% if riitStateReason %} - - {{ srtCode }} - {{ srtMessage }} - - {% endif %} - {{ riitArchitecture }} - {{ riitRootDeviceType }} - {{ riitRootDeviceName }} - - {% if riitBlockDeviceMapping %} - - {{ ibdmritDeviceName }} - {% if ibdmritEbs %} - - {{ eibdmrtVolumeId }} - {{ eibdmrtStatus }} - {{ eibdmrtAttachTime }} - {{ eibdmrtDeleteOnTermination }} - - {% endif %} - - {% endif %} - - {% if riitInstanceLifecycle %} - {{ riitInstanceLifecycle }} - {% endif %} - {% if riitSpotInstanceRequestId %} - {{ riitInstanceLifecycle }} - {% endif %} - {{ riitVirtualizationType }} - {{ riitClientToken }} - - {% if riitTagSet %} - - {{ rtsitKey }} - {{ rtsitValue }} - - {% endif %} - - {{ riitHypervisor }} - - {% if riitNetworkInterfaceSet %} - - {{ inisitNetworkInterfaceId }} - {{ inisitSubnetId }} - {{ inisitVpcId }} - {{ inisitDescription }} - {{ inisitOwnerId }} - {{ inisitStatus }} - {{ inisitMacAddress }} - {{ inisitPrivateIpAddress }} - {{ inisitPrivateDnsName }} - {{ inisitSourceDestCheck }} - - {% if inisitGroupSet %} - - {{ gitGroupId }} - {{ gitGroupName }} - - {% endif %} - - {% if inisitAttachment %} - - {{ iniatAttachmentID }} - {{ iniatDeviceIndex }} - {{ iniatStatus }} - {{ iniatAttachTime }} - {{ iniatDeleteOnTermination }} - - {% endif %} - {% if inisitAssociation %} - - {{ iniatPublicIp }} - {{ iniatPublicDnsName }} - {{ iniatIpOwnerId }} - - {% endif %} - - {% if inisitPrivateIpAddressesSet %} - - {{ ipiasitPrivateIpAddress }} - {{ ipiasitPrivateDnsName }} - {{ ipiasitPrimary }} - {% if ipiasitAssociation %} - - {{ iniatPublicIp }} - {{ iniatPublicDnsName }} - {{ iniatIpOwnerId }} - - {% endif %} - - {% endif %} - - - {% endif %} - - {% if riitIamInstanceProfile %} - - {{ iipruId }} - {{ iipruArn }} - - {% endif %} - {{ riitEbsOptimized }} - - {% endif %} - - {{ ritRequesterId }} - - {% endif %} - - diff --git a/test/resources/EC2/DescribeSecurityGroups b/test/resources/EC2/DescribeSecurityGroups deleted file mode 100644 index c77c98a03fa..00000000000 --- a/test/resources/EC2/DescribeSecurityGroups +++ /dev/null @@ -1,14 +0,0 @@ -GET / -Action=DescribeSecurityGroups -{% if dshGroupName %} -GroupName.{{ n }}={{.}} -{% endif %} -{% if dshGroupId %} -GroupId.{{ n }}={{.}} -{% endif %} -{% if dshFilter %} -Filter.{{ n }}.Name={{ filterName }} -{% if filterValue %} -Filter.{{ n }}.Value.{{ o }}={{.}} -{% endif %} -{% endif %} diff --git a/test/resources/EC2/DescribeSecurityGroupsResponse b/test/resources/EC2/DescribeSecurityGroupsResponse deleted file mode 100644 index 33865e62266..00000000000 --- a/test/resources/EC2/DescribeSecurityGroupsResponse +++ /dev/null @@ -1,79 +0,0 @@ - - - {{ dshrRequestId }} - - {% if dshrSecurityGroupInfo %} - - {{ sgitOwnerId }} - {{ sgitGroupId }} - {{ sgitGroupName }} - {{ sgitGroupDescription }} - {% if sgitVpcId %} - {{ sgitVpcId }} - {% endif %} - - {% if sgitIpPermissions %} - - {{ iptIpProtocol }} - {{ iptFromPort }} - {{ iptToPort }} - - {% if iptGroups %} - - {% if uigUserId %} - {{ uigUserId }} - {% endif %} - {% if uigGroupId %} - {{ uigGroupId }} - {% endif %} - {% if uigGroupName %} - {{ uigGroupName }} - {% endif %} - - {% endif %} - - - {% if iptIpRanges %} - - {{ irCidrIp }} - - {% endif %} - - - {% endif %} - - - {% if sgitIpPermissionsEgress %} - - {{ iptIpProtocol }} - {{ iptFromPort }} - {{ iptToPort }} - - {% if iptGroups %} - - {% if uigUserId %} - {{ uigUserId }} - {% endif %} - {% if uigGroupId %} - {{ uigGroupId }} - {% endif %} - {% if uigGroupName %} - {{ uigGroupName }} - {% endif %} - - {% endif %} - - - {% if iptIpRanges %} - - {{ irCidrIp }} - - {% endif %} - - - {% endif %} - - - {% endif %} - - diff --git a/test/resources/EC2/DescribeTags b/test/resources/EC2/DescribeTags deleted file mode 100644 index 221e3bf4e39..00000000000 --- a/test/resources/EC2/DescribeTags +++ /dev/null @@ -1,8 +0,0 @@ -GET / -Action=DescribeTags -{% if dvFilter %} -Filter.{{ n }}.Name={{ filterName }} -{% if filterValue %} -Filter.{{ n }}.Value.{{ o }}={{.}} -{% endif %} -{% endif %} diff --git a/test/resources/EC2/DescribeTagsResponse b/test/resources/EC2/DescribeTagsResponse deleted file mode 100644 index f1930570c40..00000000000 --- a/test/resources/EC2/DescribeTagsResponse +++ /dev/null @@ -1,14 +0,0 @@ - - - {{ dtagsrRequestId }} - - {% if dtagsrTagSet %} - - {{ tsitResourceId }} - {{ tsitResourceType }} - {{ tsitKey }} - {{ tsitValue }} - - {% endif %} - - diff --git a/test/resources/EC2/RevokeSecurityGroupEgress b/test/resources/EC2/RevokeSecurityGroupEgress deleted file mode 100644 index 5856310c763..00000000000 --- a/test/resources/EC2/RevokeSecurityGroupEgress +++ /dev/null @@ -1,2 +0,0 @@ -GET / -Action=RevokeSecurityGroupEgress diff --git a/test/resources/EC2/RevokeSecurityGroupEgressResponse b/test/resources/EC2/RevokeSecurityGroupEgressResponse deleted file mode 100644 index 69bbd0132f4..00000000000 --- a/test/resources/EC2/RevokeSecurityGroupEgressResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ rsgerRequestId }} - {{ rsgerReturn }} - diff --git a/test/resources/EC2/RevokeSecurityGroupIngress b/test/resources/EC2/RevokeSecurityGroupIngress deleted file mode 100644 index 1606b69ca44..00000000000 --- a/test/resources/EC2/RevokeSecurityGroupIngress +++ /dev/null @@ -1,2 +0,0 @@ -GET / -Action=RevokeSecurityGroupIngress diff --git a/test/resources/EC2/RevokeSecurityGroupIngressResponse b/test/resources/EC2/RevokeSecurityGroupIngressResponse deleted file mode 100644 index 39f6013aa08..00000000000 --- a/test/resources/EC2/RevokeSecurityGroupIngressResponse +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ rsgirRequestId }} - {{ rsgirReturn }} - diff --git a/test/resources/ELB/ApplySecurityGroupsToLoadBalancer b/test/resources/ELB/ApplySecurityGroupsToLoadBalancer deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/ApplySecurityGroupsToLoadBalancerResponse b/test/resources/ELB/ApplySecurityGroupsToLoadBalancerResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/AttachLoadBalancerToSubnets b/test/resources/ELB/AttachLoadBalancerToSubnets deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/AttachLoadBalancerToSubnetsResponse b/test/resources/ELB/AttachLoadBalancerToSubnetsResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/ConfigureHealthCheck b/test/resources/ELB/ConfigureHealthCheck deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/ConfigureHealthCheckResponse b/test/resources/ELB/ConfigureHealthCheckResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateAppCookieStickinessPolicy b/test/resources/ELB/CreateAppCookieStickinessPolicy deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateAppCookieStickinessPolicyResponse b/test/resources/ELB/CreateAppCookieStickinessPolicyResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateLBCookieStickinessPolicy b/test/resources/ELB/CreateLBCookieStickinessPolicy deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateLBCookieStickinessPolicyResponse b/test/resources/ELB/CreateLBCookieStickinessPolicyResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateLoadBalancer b/test/resources/ELB/CreateLoadBalancer deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateLoadBalancerListeners b/test/resources/ELB/CreateLoadBalancerListeners deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateLoadBalancerListenersResponse b/test/resources/ELB/CreateLoadBalancerListenersResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateLoadBalancerPolicy b/test/resources/ELB/CreateLoadBalancerPolicy deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateLoadBalancerPolicyResponse b/test/resources/ELB/CreateLoadBalancerPolicyResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/CreateLoadBalancerResponse b/test/resources/ELB/CreateLoadBalancerResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DeleteLoadBalancer b/test/resources/ELB/DeleteLoadBalancer deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DeleteLoadBalancerListeners b/test/resources/ELB/DeleteLoadBalancerListeners deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DeleteLoadBalancerListenersResponse b/test/resources/ELB/DeleteLoadBalancerListenersResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DeleteLoadBalancerPolicy b/test/resources/ELB/DeleteLoadBalancerPolicy deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DeleteLoadBalancerPolicyResponse b/test/resources/ELB/DeleteLoadBalancerPolicyResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DeleteLoadBalancerResponse b/test/resources/ELB/DeleteLoadBalancerResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DeregisterInstancesFromLoadBalancer b/test/resources/ELB/DeregisterInstancesFromLoadBalancer deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DeregisterInstancesFromLoadBalancerResponse b/test/resources/ELB/DeregisterInstancesFromLoadBalancerResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DescribeInstanceHealth b/test/resources/ELB/DescribeInstanceHealth deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DescribeInstanceHealthResponse b/test/resources/ELB/DescribeInstanceHealthResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DescribeLoadBalancerPolicies b/test/resources/ELB/DescribeLoadBalancerPolicies deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DescribeLoadBalancerPoliciesResponse b/test/resources/ELB/DescribeLoadBalancerPoliciesResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DescribeLoadBalancerPolicyTypes b/test/resources/ELB/DescribeLoadBalancerPolicyTypes deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DescribeLoadBalancerPolicyTypesResponse b/test/resources/ELB/DescribeLoadBalancerPolicyTypesResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DescribeLoadBalancers b/test/resources/ELB/DescribeLoadBalancers deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DescribeLoadBalancersResponse b/test/resources/ELB/DescribeLoadBalancersResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DetachLoadBalancerFromSubnets b/test/resources/ELB/DetachLoadBalancerFromSubnets deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DetachLoadBalancerFromSubnetsResponse b/test/resources/ELB/DetachLoadBalancerFromSubnetsResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DisableAvailabilityZonesForLoadBalancer b/test/resources/ELB/DisableAvailabilityZonesForLoadBalancer deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/DisableAvailabilityZonesForLoadBalancerResponse b/test/resources/ELB/DisableAvailabilityZonesForLoadBalancerResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/EnableAvailabilityZonesForLoadBalancer b/test/resources/ELB/EnableAvailabilityZonesForLoadBalancer deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/EnableAvailabilityZonesForLoadBalancerResponse b/test/resources/ELB/EnableAvailabilityZonesForLoadBalancerResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/RegisterInstancesWithLoadBalancer b/test/resources/ELB/RegisterInstancesWithLoadBalancer deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/RegisterInstancesWithLoadBalancerResponse b/test/resources/ELB/RegisterInstancesWithLoadBalancerResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/SetLoadBalancerListenerSSLCertificate b/test/resources/ELB/SetLoadBalancerListenerSSLCertificate deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/SetLoadBalancerListenerSSLCertificateResponse b/test/resources/ELB/SetLoadBalancerListenerSSLCertificateResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/SetLoadBalancerPoliciesForBackendServer b/test/resources/ELB/SetLoadBalancerPoliciesForBackendServer deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/SetLoadBalancerPoliciesForBackendServerResponse b/test/resources/ELB/SetLoadBalancerPoliciesForBackendServerResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/SetLoadBalancerPoliciesOfListener b/test/resources/ELB/SetLoadBalancerPoliciesOfListener deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ELB/SetLoadBalancerPoliciesOfListenerResponse b/test/resources/ELB/SetLoadBalancerPoliciesOfListenerResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/ElasticMapReduce/AddInstanceGroups b/test/resources/ElasticMapReduce/AddInstanceGroups deleted file mode 100644 index b8c6d81318d..00000000000 --- a/test/resources/ElasticMapReduce/AddInstanceGroups +++ /dev/null @@ -1,36 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.AddInstanceGroups -Content-Length: 168 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130715T223346Z -X-Amz-Content-Sha256: ac5a7193b1283898dd822a4b16ca36963879bb010d2dbe57198439973ab2a7d3 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130715/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=4c5e7eb762ea45f292a5cd1a1cc56ed60009e19a9dba3d6e5e4e67e96d43af11 -Accept: */* - - -{ - "JobFlowId": "j-3U7TSX5GZFD8Y", - "InstanceGroups": [{ - "Name": "Task Instance Group", - "InstanceRole": "TASK", - "InstanceCount": 2, - "InstanceType": "m1.small", - "Market": "ON_DEMAND" - }] -} - - -HTTP/1.1 200 OK -x-amzn-RequestId: 9da5a349-ed9e-11e2-90db-69a5154aeb8d -Content-Type: application/x-amz-json-1.1 -Content-Length: 71 -Date: Mon, 15 Jul 2013 22:33:47 GMT - -{ - "InstanceGroupIds": ["ig-294A6A2KWT4WB"], - "JobFlowId": "j-3U7TSX5GZFD8Y" -} - - diff --git a/test/resources/ElasticMapReduce/AddInstanceGroupsResponse b/test/resources/ElasticMapReduce/AddInstanceGroupsResponse deleted file mode 100644 index b8c6d81318d..00000000000 --- a/test/resources/ElasticMapReduce/AddInstanceGroupsResponse +++ /dev/null @@ -1,36 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.AddInstanceGroups -Content-Length: 168 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130715T223346Z -X-Amz-Content-Sha256: ac5a7193b1283898dd822a4b16ca36963879bb010d2dbe57198439973ab2a7d3 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130715/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=4c5e7eb762ea45f292a5cd1a1cc56ed60009e19a9dba3d6e5e4e67e96d43af11 -Accept: */* - - -{ - "JobFlowId": "j-3U7TSX5GZFD8Y", - "InstanceGroups": [{ - "Name": "Task Instance Group", - "InstanceRole": "TASK", - "InstanceCount": 2, - "InstanceType": "m1.small", - "Market": "ON_DEMAND" - }] -} - - -HTTP/1.1 200 OK -x-amzn-RequestId: 9da5a349-ed9e-11e2-90db-69a5154aeb8d -Content-Type: application/x-amz-json-1.1 -Content-Length: 71 -Date: Mon, 15 Jul 2013 22:33:47 GMT - -{ - "InstanceGroupIds": ["ig-294A6A2KWT4WB"], - "JobFlowId": "j-3U7TSX5GZFD8Y" -} - - diff --git a/test/resources/ElasticMapReduce/AddJobFlowSteps b/test/resources/ElasticMapReduce/AddJobFlowSteps deleted file mode 100644 index e39d93bdc4e..00000000000 --- a/test/resources/ElasticMapReduce/AddJobFlowSteps +++ /dev/null @@ -1,45 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.AddJobFlowSteps -Content-Length: 426 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130716T210948Z -X-Amz-Content-Sha256: 9e5ad0a93c22224947ce98eea94f766103d91b28fa82eb60d0cb8b6f9555a6b2 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=2a2393390760ae85eb74ee3a539e1d758bfdd8815a1a6d6f14d4a2fbcfdcd5b7 -Accept: */* - -{ - "JobFlowId": "j-3TS0OIYO4NFN", - "Steps": [{ - "Name": "Example Jar Step", - "ActionOnFailure": "CANCEL_AND_WAIT", - "HadoopJarStep": { - "Jar": "s3n:\\/\\/elasticmapreduce\\/samples\\/cloudburst\\/cloudburst.jar", - "Args": [ - "s3n:\\/\\/elasticmapreduce\\/samples\\/cloudburst\\/input\\/s_suis.br", - "s3n:\\/\\/elasticmapreduce\\/samples\\/cloudburst\\/input\\/100k.br", - "s3n:\\/\\/examples-bucket\\/cloudburst\\/output", - "36", - "3", - "0", - "1", - "240", - "48", - "24", - "24", - "128", - "16" - ] - } - }] -} - -HTTP/1.1 200 OK -x-amzn-RequestId: 6514261f-ee5b-11e2-9345-5332e9ab2e6d -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Tue, 16 Jul 2013 21:05:07 GMT - - - diff --git a/test/resources/ElasticMapReduce/AddJobFlowStepsResponse b/test/resources/ElasticMapReduce/AddJobFlowStepsResponse deleted file mode 100644 index e39d93bdc4e..00000000000 --- a/test/resources/ElasticMapReduce/AddJobFlowStepsResponse +++ /dev/null @@ -1,45 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.AddJobFlowSteps -Content-Length: 426 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130716T210948Z -X-Amz-Content-Sha256: 9e5ad0a93c22224947ce98eea94f766103d91b28fa82eb60d0cb8b6f9555a6b2 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=2a2393390760ae85eb74ee3a539e1d758bfdd8815a1a6d6f14d4a2fbcfdcd5b7 -Accept: */* - -{ - "JobFlowId": "j-3TS0OIYO4NFN", - "Steps": [{ - "Name": "Example Jar Step", - "ActionOnFailure": "CANCEL_AND_WAIT", - "HadoopJarStep": { - "Jar": "s3n:\\/\\/elasticmapreduce\\/samples\\/cloudburst\\/cloudburst.jar", - "Args": [ - "s3n:\\/\\/elasticmapreduce\\/samples\\/cloudburst\\/input\\/s_suis.br", - "s3n:\\/\\/elasticmapreduce\\/samples\\/cloudburst\\/input\\/100k.br", - "s3n:\\/\\/examples-bucket\\/cloudburst\\/output", - "36", - "3", - "0", - "1", - "240", - "48", - "24", - "24", - "128", - "16" - ] - } - }] -} - -HTTP/1.1 200 OK -x-amzn-RequestId: 6514261f-ee5b-11e2-9345-5332e9ab2e6d -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Tue, 16 Jul 2013 21:05:07 GMT - - - diff --git a/test/resources/ElasticMapReduce/DescribeJobFlows b/test/resources/ElasticMapReduce/DescribeJobFlows deleted file mode 100644 index 09868495b56..00000000000 --- a/test/resources/ElasticMapReduce/DescribeJobFlows +++ /dev/null @@ -1,91 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.DescribeJobFlows -Content-Length: 62 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130715T220330Z -X-Amz-Content-Sha256: fce83af973f96f173512aca2845c56862b946feb1de0600326f1365b658a0e39 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130715/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=29F98a6f44e05ad54fe1e8b3d1a7101ab08dc3ad348995f89c533693cee2bb3b -Accept: */* - -{ - "JobFlowIds": ["j-ZKIY4CKQRX72"], - "DescriptionType": "EXTENDED" -} - -HTTP/1.1 200 OK -x-amzn-RequestId: 634d4142-ed9a-11e2-bbba-b56d7d016ec4 -Content-Type: application/x-amz-json-1.1 -Content-Length: 1624 -Date: Mon, 15 Jul 2013 22:03:31 GMT - -{"JobFlows": [{ - "AmiVersion": "2.3.6", - "BootstrapActions": [], - "ExecutionStatusDetail": { - "CreationDateTime": 1.373923429E9, - "EndDateTime": 1.373923995E9, - "LastStateChangeReason": "Steps completed", - "ReadyDateTime": 1.373923754E9, - "StartDateTime": 1.373923754E9, - "State": "COMPLETED" - }, - "Instances": { - "HadoopVersion": "1.0.3", - "InstanceCount": 1, - "InstanceGroups": [{ - "CreationDateTime": 1.373923429E9, - "EndDateTime": 1.373923995E9, - "InstanceGroupId": "ig-3SRUWV3E0NB7K", - "InstanceRequestCount": 1, - "InstanceRole": "MASTER", - "InstanceRunningCount": 0, - "InstanceType": "m1.small", - "LastStateChangeReason": "Job flow terminated", - "Market": "ON_DEMAND", - "Name": "Master InstanceGroup", - "ReadyDateTime": 1.37392375E9, - "StartDateTime": 1.373923646E9, - "State": "ENDED" - }], - "KeepJobFlowAliveWhenNoSteps": false, - "MasterInstanceId": "i-8c4fbbef", - "MasterInstanceType": "m1.small", - "MasterPublicDnsName": "ec2-107-20-46-140.compute-1.amazonaws.com", - "NormalizedInstanceHours": 1, - "Placement": {"AvailabilityZone": "us-east-1a"}, - "TerminationProtected": false - }, - "JobFlowId": "j-ZKIY4CKQRX72", - "Name": "Development Job Flow", - "Steps": [{ - "ExecutionStatusDetail": { - "CreationDateTime": 1.373923429E9, - "EndDateTime": 1.373923914E9, - "StartDateTime": 1.373923754E9, - "State": "COMPLETED" - }, - "StepConfig": { - "ActionOnFailure": "CANCEL_AND_WAIT", - "HadoopJarStep": { - "Args": [ - "-input", - "s3://elasticmapreduce/samples/wordcount/input", - "-output", - "s3://examples-bucket/example-output", - "-mapper", - "s3://elasticmapreduce/samples/wordcount/wordSplitter.py", - "-reducer", - "aggregate" - ], - "Jar": "/home/hadoop/contrib/streaming/hadoop-streaming.jar", - "Properties": [] - }, - "Name": "Example Streaming Step" - } - }], - "SupportedProducts": [], - "VisibleToAllUsers": false -}]} - diff --git a/test/resources/ElasticMapReduce/DescribeJobFlowsResponse b/test/resources/ElasticMapReduce/DescribeJobFlowsResponse deleted file mode 100644 index 09868495b56..00000000000 --- a/test/resources/ElasticMapReduce/DescribeJobFlowsResponse +++ /dev/null @@ -1,91 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.DescribeJobFlows -Content-Length: 62 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130715T220330Z -X-Amz-Content-Sha256: fce83af973f96f173512aca2845c56862b946feb1de0600326f1365b658a0e39 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130715/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=29F98a6f44e05ad54fe1e8b3d1a7101ab08dc3ad348995f89c533693cee2bb3b -Accept: */* - -{ - "JobFlowIds": ["j-ZKIY4CKQRX72"], - "DescriptionType": "EXTENDED" -} - -HTTP/1.1 200 OK -x-amzn-RequestId: 634d4142-ed9a-11e2-bbba-b56d7d016ec4 -Content-Type: application/x-amz-json-1.1 -Content-Length: 1624 -Date: Mon, 15 Jul 2013 22:03:31 GMT - -{"JobFlows": [{ - "AmiVersion": "2.3.6", - "BootstrapActions": [], - "ExecutionStatusDetail": { - "CreationDateTime": 1.373923429E9, - "EndDateTime": 1.373923995E9, - "LastStateChangeReason": "Steps completed", - "ReadyDateTime": 1.373923754E9, - "StartDateTime": 1.373923754E9, - "State": "COMPLETED" - }, - "Instances": { - "HadoopVersion": "1.0.3", - "InstanceCount": 1, - "InstanceGroups": [{ - "CreationDateTime": 1.373923429E9, - "EndDateTime": 1.373923995E9, - "InstanceGroupId": "ig-3SRUWV3E0NB7K", - "InstanceRequestCount": 1, - "InstanceRole": "MASTER", - "InstanceRunningCount": 0, - "InstanceType": "m1.small", - "LastStateChangeReason": "Job flow terminated", - "Market": "ON_DEMAND", - "Name": "Master InstanceGroup", - "ReadyDateTime": 1.37392375E9, - "StartDateTime": 1.373923646E9, - "State": "ENDED" - }], - "KeepJobFlowAliveWhenNoSteps": false, - "MasterInstanceId": "i-8c4fbbef", - "MasterInstanceType": "m1.small", - "MasterPublicDnsName": "ec2-107-20-46-140.compute-1.amazonaws.com", - "NormalizedInstanceHours": 1, - "Placement": {"AvailabilityZone": "us-east-1a"}, - "TerminationProtected": false - }, - "JobFlowId": "j-ZKIY4CKQRX72", - "Name": "Development Job Flow", - "Steps": [{ - "ExecutionStatusDetail": { - "CreationDateTime": 1.373923429E9, - "EndDateTime": 1.373923914E9, - "StartDateTime": 1.373923754E9, - "State": "COMPLETED" - }, - "StepConfig": { - "ActionOnFailure": "CANCEL_AND_WAIT", - "HadoopJarStep": { - "Args": [ - "-input", - "s3://elasticmapreduce/samples/wordcount/input", - "-output", - "s3://examples-bucket/example-output", - "-mapper", - "s3://elasticmapreduce/samples/wordcount/wordSplitter.py", - "-reducer", - "aggregate" - ], - "Jar": "/home/hadoop/contrib/streaming/hadoop-streaming.jar", - "Properties": [] - }, - "Name": "Example Streaming Step" - } - }], - "SupportedProducts": [], - "VisibleToAllUsers": false -}]} - diff --git a/test/resources/ElasticMapReduce/ModifyInstanceGroups b/test/resources/ElasticMapReduce/ModifyInstanceGroups deleted file mode 100644 index 89c1f2754cf..00000000000 --- a/test/resources/ElasticMapReduce/ModifyInstanceGroups +++ /dev/null @@ -1,24 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.ModifyInstanceGroups -Content-Length: 77 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130716T205843Z -X-Amz-Content-Sha256: bb1af3d0c6c6a1a09f21ccd7f04a0e2e6c9ce5b5810b0f6777560fe4f81bda8c -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=17bbbb4448a1f47a14d5657445e9de5cadf16bed58b850585f80865882133b33 -Accept: */* - -{"InstanceGroups": [{ - "InstanceGroupId": "ig-1S8NWT31S2OVG", - "InstanceCount": 5 -}]} - -HTTP/1.1 200 OK -x-amzn-RequestId: 80a74808-ee5a-11e2-90db-69a5154aeb8d -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Tue, 16 Jul 2013 20:58:44 GMT - - - diff --git a/test/resources/ElasticMapReduce/ModifyInstanceGroupsResponse b/test/resources/ElasticMapReduce/ModifyInstanceGroupsResponse deleted file mode 100644 index 89c1f2754cf..00000000000 --- a/test/resources/ElasticMapReduce/ModifyInstanceGroupsResponse +++ /dev/null @@ -1,24 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.ModifyInstanceGroups -Content-Length: 77 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130716T205843Z -X-Amz-Content-Sha256: bb1af3d0c6c6a1a09f21ccd7f04a0e2e6c9ce5b5810b0f6777560fe4f81bda8c -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=17bbbb4448a1f47a14d5657445e9de5cadf16bed58b850585f80865882133b33 -Accept: */* - -{"InstanceGroups": [{ - "InstanceGroupId": "ig-1S8NWT31S2OVG", - "InstanceCount": 5 -}]} - -HTTP/1.1 200 OK -x-amzn-RequestId: 80a74808-ee5a-11e2-90db-69a5154aeb8d -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Tue, 16 Jul 2013 20:58:44 GMT - - - diff --git a/test/resources/ElasticMapReduce/RunJobFlow b/test/resources/ElasticMapReduce/RunJobFlow deleted file mode 100644 index 8c0d2f6fa14..00000000000 --- a/test/resources/ElasticMapReduce/RunJobFlow +++ /dev/null @@ -1,57 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.RunJobFlow -Content-Length: 734 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130715T210803Z -X-Amz-Content-Sha256: 8676d21986e4628a89fb1232a1344063778d4ffc23d10be02b437e0d53a24db3 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130715/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=71f79725c4dbe77c0e842718485f0b37fe6df69e1153c80f7748ebd9617ca2f3 -Accept: */* - - -{ - "Name": "Development Job Flow", - "Instances": { - "KeepJobFlowAliveWhenNoSteps": "false", - "TerminationProtected": "false", - "InstanceGroups": [{ - "Name": "Master Instance Group", - "InstanceRole": "MASTER", - "InstanceCount": 1, - "InstanceType": "m1.small", - "Market": "ON_DEMAND" - }] - }, - "Steps": [{ - "Name": "Example Streaming Step", - "ActionOnFailure": "CANCEL_AND_WAIT", - "HadoopJarStep": { - "Jar": "/home/hadoop/contrib/streaming/hadoop-streaming.jar", - "Args": [ - "-input", - "s3://elasticmapreduce/samples/wordcount/input", - "-output", - "s3://examples-bucket/example-output", - "-mapper", - "s3://elasticmapreduce/samples/wordcount/wordSplitter.py", - "-reducer", - "aggregate" - ] - } - }], - "BootstrapActions": [], - "VisibleToAllUsers": "false", - "NewSupportedProducts": [], - "AmiVersion": "latest" -} - -HTTP/1.1 200 OK -x-amzn-RequestId: a4406d6b-ed92-11e2-9787-192218ecb460 -Content-Type: application/x-amz-json-1.1 -Content-Length: 31 -Date: Mon, 15 Jul 2013 21:08:05 GMT - -{"JobFlowId": "j-ZKIY4CKQRX72"} - - diff --git a/test/resources/ElasticMapReduce/RunJobFlowResponse b/test/resources/ElasticMapReduce/RunJobFlowResponse deleted file mode 100644 index 8c0d2f6fa14..00000000000 --- a/test/resources/ElasticMapReduce/RunJobFlowResponse +++ /dev/null @@ -1,57 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.RunJobFlow -Content-Length: 734 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130715T210803Z -X-Amz-Content-Sha256: 8676d21986e4628a89fb1232a1344063778d4ffc23d10be02b437e0d53a24db3 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130715/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=71f79725c4dbe77c0e842718485f0b37fe6df69e1153c80f7748ebd9617ca2f3 -Accept: */* - - -{ - "Name": "Development Job Flow", - "Instances": { - "KeepJobFlowAliveWhenNoSteps": "false", - "TerminationProtected": "false", - "InstanceGroups": [{ - "Name": "Master Instance Group", - "InstanceRole": "MASTER", - "InstanceCount": 1, - "InstanceType": "m1.small", - "Market": "ON_DEMAND" - }] - }, - "Steps": [{ - "Name": "Example Streaming Step", - "ActionOnFailure": "CANCEL_AND_WAIT", - "HadoopJarStep": { - "Jar": "/home/hadoop/contrib/streaming/hadoop-streaming.jar", - "Args": [ - "-input", - "s3://elasticmapreduce/samples/wordcount/input", - "-output", - "s3://examples-bucket/example-output", - "-mapper", - "s3://elasticmapreduce/samples/wordcount/wordSplitter.py", - "-reducer", - "aggregate" - ] - } - }], - "BootstrapActions": [], - "VisibleToAllUsers": "false", - "NewSupportedProducts": [], - "AmiVersion": "latest" -} - -HTTP/1.1 200 OK -x-amzn-RequestId: a4406d6b-ed92-11e2-9787-192218ecb460 -Content-Type: application/x-amz-json-1.1 -Content-Length: 31 -Date: Mon, 15 Jul 2013 21:08:05 GMT - -{"JobFlowId": "j-ZKIY4CKQRX72"} - - diff --git a/test/resources/ElasticMapReduce/SetTerminationProtection b/test/resources/ElasticMapReduce/SetTerminationProtection deleted file mode 100644 index 15fcd588ac0..00000000000 --- a/test/resources/ElasticMapReduce/SetTerminationProtection +++ /dev/null @@ -1,24 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.SetTerminationProtection -Content-Length: 61 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130716T211420Z -X-Amz-Content-Sha256: c362fadae0fce377aa63f04388aeb90c53cedb17a8bfbb8cffcb10c2378137f9 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=764b6aa1a38733cadff35a2e884887e9f1208a422266bc83ac77e8d0b80bd4cf -Accept: */* - -{ - "JobFlowIds": ["j-3TS0OIYO4NFN"], - "TerminationProtected": true -} - -HTTP/1.1 200 OK -x-amzn-RequestId: af23b1db-ee5c-11e2-9787-192218ecb460 -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Tue, 16 Jul 2013 21:14:21 GMT - - - diff --git a/test/resources/ElasticMapReduce/SetTerminationProtectionResponse b/test/resources/ElasticMapReduce/SetTerminationProtectionResponse deleted file mode 100644 index 15fcd588ac0..00000000000 --- a/test/resources/ElasticMapReduce/SetTerminationProtectionResponse +++ /dev/null @@ -1,24 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.SetTerminationProtection -Content-Length: 61 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130716T211420Z -X-Amz-Content-Sha256: c362fadae0fce377aa63f04388aeb90c53cedb17a8bfbb8cffcb10c2378137f9 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=764b6aa1a38733cadff35a2e884887e9f1208a422266bc83ac77e8d0b80bd4cf -Accept: */* - -{ - "JobFlowIds": ["j-3TS0OIYO4NFN"], - "TerminationProtected": true -} - -HTTP/1.1 200 OK -x-amzn-RequestId: af23b1db-ee5c-11e2-9787-192218ecb460 -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Tue, 16 Jul 2013 21:14:21 GMT - - - diff --git a/test/resources/ElasticMapReduce/SetVisibleToAllUsers b/test/resources/ElasticMapReduce/SetVisibleToAllUsers deleted file mode 100644 index a2d0bfefa15..00000000000 --- a/test/resources/ElasticMapReduce/SetVisibleToAllUsers +++ /dev/null @@ -1,26 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.SetVisibleToAllUsers -Content-Length: 58 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130715T221616Z -X-Amz-Content-Sha256: 2ff32d11eab2383d764ffcb97571454e798689ecd09a7b1bb2327e22b0b930d4 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130715/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=e1a00b37787d9ccc43c9de32f1f0a73813b0bd6643d4db7762b62a7092d51997 -Accept: */* - -{ - "JobFlowIds": ["j-ZKIY4CKQRX72"], - "VisibleToAllUsers": true -} - - -HTTP/1.1 200 OK -x-amzn-RequestId: 2be9cde9-ed9c-11e2-82b6-2351cde3f33f -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Mon, 15 Jul 2013 22:16:18 GMT - - - - diff --git a/test/resources/ElasticMapReduce/SetVisibleToAllUsersResponse b/test/resources/ElasticMapReduce/SetVisibleToAllUsersResponse deleted file mode 100644 index a2d0bfefa15..00000000000 --- a/test/resources/ElasticMapReduce/SetVisibleToAllUsersResponse +++ /dev/null @@ -1,26 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.SetVisibleToAllUsers -Content-Length: 58 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130715T221616Z -X-Amz-Content-Sha256: 2ff32d11eab2383d764ffcb97571454e798689ecd09a7b1bb2327e22b0b930d4 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130715/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=e1a00b37787d9ccc43c9de32f1f0a73813b0bd6643d4db7762b62a7092d51997 -Accept: */* - -{ - "JobFlowIds": ["j-ZKIY4CKQRX72"], - "VisibleToAllUsers": true -} - - -HTTP/1.1 200 OK -x-amzn-RequestId: 2be9cde9-ed9c-11e2-82b6-2351cde3f33f -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Mon, 15 Jul 2013 22:16:18 GMT - - - - diff --git a/test/resources/ElasticMapReduce/TerminateJobFlows b/test/resources/ElasticMapReduce/TerminateJobFlows deleted file mode 100644 index 8c084855057..00000000000 --- a/test/resources/ElasticMapReduce/TerminateJobFlows +++ /dev/null @@ -1,20 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.TerminateJobFlows -Content-Length: 33 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130716T211858Z -X-Amz-Content-Sha256: ab64713f61e066e80a6083844b9249b6c6362d34a7ae7393047aa46d38b9e315 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=9791416eaf09f36aa753a324b0de27ff5cc7084b8548cc748487a2bcb3439d58 -Accept: */* - -{"JobFlowIds": ["j-3TS0OIYO4NFN"]} - -HTTP/1.1 200 OK -x-amzn-RequestId: 5551a7c9-ee5d-11e2-9542-25296c300ff0 -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Tue, 16 Jul 2013 21:18:59 GMT - - diff --git a/test/resources/ElasticMapReduce/TerminateJobFlowsResponse b/test/resources/ElasticMapReduce/TerminateJobFlowsResponse deleted file mode 100644 index 8c084855057..00000000000 --- a/test/resources/ElasticMapReduce/TerminateJobFlowsResponse +++ /dev/null @@ -1,20 +0,0 @@ -POST / HTTP/1.1 -Content-Type: application/x-amz-json-1.1 -X-Amz-Target: ElasticMapReduce.TerminateJobFlows -Content-Length: 33 -User-Agent: aws-sdk-ruby/1.9.2 ruby/1.9.3 i386-mingw32 -Host: us-east-1.elasticmapreduce.amazonaws.com -X-Amz-Date: 20130716T211858Z -X-Amz-Content-Sha256: ab64713f61e066e80a6083844b9249b6c6362d34a7ae7393047aa46d38b9e315 -Authorization: AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130716/us-east-1/elasticmapreduce/aws4_request, SignedHeaders=content-length;content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target, Signature=9791416eaf09f36aa753a324b0de27ff5cc7084b8548cc748487a2bcb3439d58 -Accept: */* - -{"JobFlowIds": ["j-3TS0OIYO4NFN"]} - -HTTP/1.1 200 OK -x-amzn-RequestId: 5551a7c9-ee5d-11e2-9542-25296c300ff0 -Content-Type: application/x-amz-json-1.1 -Content-Length: 0 -Date: Tue, 16 Jul 2013 21:18:59 GMT - - diff --git a/test/resources/IAM/AddRoleToInstanceProfile b/test/resources/IAM/AddRoleToInstanceProfile deleted file mode 100644 index e6fa9cb57fa..00000000000 --- a/test/resources/IAM/AddRoleToInstanceProfile +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=AddRoleToInstanceProfile -&InstanceProfileName=Webserver -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 12657608-99f2-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/AddRoleToInstanceProfileResponse b/test/resources/IAM/AddRoleToInstanceProfileResponse deleted file mode 100644 index e6fa9cb57fa..00000000000 --- a/test/resources/IAM/AddRoleToInstanceProfileResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=AddRoleToInstanceProfile -&InstanceProfileName=Webserver -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 12657608-99f2-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/AddUserToGroup b/test/resources/IAM/AddUserToGroup deleted file mode 100644 index 59208b7603b..00000000000 --- a/test/resources/IAM/AddUserToGroup +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=AddUserToGroup -&GroupName=Managers -&UserName=Bob -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/AddUserToGroupResponse b/test/resources/IAM/AddUserToGroupResponse deleted file mode 100644 index 59208b7603b..00000000000 --- a/test/resources/IAM/AddUserToGroupResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=AddUserToGroup -&GroupName=Managers -&UserName=Bob -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ChangePassword b/test/resources/IAM/ChangePassword deleted file mode 100644 index 2a7241ad350..00000000000 --- a/test/resources/IAM/ChangePassword +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ChangePassword -&OldPassword=U79}kgds4? -&NewPassword=Lb0*1(9xpN -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ChangePasswordResponse b/test/resources/IAM/ChangePasswordResponse deleted file mode 100644 index 2a7241ad350..00000000000 --- a/test/resources/IAM/ChangePasswordResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ChangePassword -&OldPassword=U79}kgds4? -&NewPassword=Lb0*1(9xpN -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/CreateAccessKey b/test/resources/IAM/CreateAccessKey deleted file mode 100644 index 3c5d40c6ca0..00000000000 --- a/test/resources/IAM/CreateAccessKey +++ /dev/null @@ -1,25 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateAccessKey -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - Bob - AKIAIOSFODNN7EXAMPLE - Active - wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/CreateAccessKeyResponse b/test/resources/IAM/CreateAccessKeyResponse deleted file mode 100644 index 3c5d40c6ca0..00000000000 --- a/test/resources/IAM/CreateAccessKeyResponse +++ /dev/null @@ -1,25 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateAccessKey -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - Bob - AKIAIOSFODNN7EXAMPLE - Active - wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/CreateAccountAlias b/test/resources/IAM/CreateAccountAlias deleted file mode 100644 index 2a8dd1e4a84..00000000000 --- a/test/resources/IAM/CreateAccountAlias +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateAccountAlias -&AccountAlias=foocorporation -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 36b5db08-f1b0-11df-8fbe-45274EXAMPLE - - - - diff --git a/test/resources/IAM/CreateAccountAliasResponse b/test/resources/IAM/CreateAccountAliasResponse deleted file mode 100644 index 2a8dd1e4a84..00000000000 --- a/test/resources/IAM/CreateAccountAliasResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateAccountAlias -&AccountAlias=foocorporation -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 36b5db08-f1b0-11df-8fbe-45274EXAMPLE - - - - diff --git a/test/resources/IAM/CreateGroup b/test/resources/IAM/CreateGroup deleted file mode 100644 index ff6cd06c8d1..00000000000 --- a/test/resources/IAM/CreateGroup +++ /dev/null @@ -1,25 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateGroup -&Path=/ -&GroupName=Admins -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - / - Admins - AGPACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:group/Admins - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/CreateGroupResponse b/test/resources/IAM/CreateGroupResponse deleted file mode 100644 index ff6cd06c8d1..00000000000 --- a/test/resources/IAM/CreateGroupResponse +++ /dev/null @@ -1,25 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateGroup -&Path=/ -&GroupName=Admins -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - / - Admins - AGPACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:group/Admins - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/CreateInstanceProfile b/test/resources/IAM/CreateInstanceProfile deleted file mode 100644 index 24c14b7d84e..00000000000 --- a/test/resources/IAM/CreateInstanceProfile +++ /dev/null @@ -1,27 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateInstanceProfile -&InstanceProfileName=Webserver -&Path=/application_abc/component_xyz/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - AIPAD5ARO2C5EXAMPLE3G - - Webserver - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver - 2012-05-09T16:11:10.222Z - - - - 974142ee-99f1-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/CreateInstanceProfileResponse b/test/resources/IAM/CreateInstanceProfileResponse deleted file mode 100644 index 24c14b7d84e..00000000000 --- a/test/resources/IAM/CreateInstanceProfileResponse +++ /dev/null @@ -1,27 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateInstanceProfile -&InstanceProfileName=Webserver -&Path=/application_abc/component_xyz/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - AIPAD5ARO2C5EXAMPLE3G - - Webserver - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver - 2012-05-09T16:11:10.222Z - - - - 974142ee-99f1-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/CreateLoginProfile b/test/resources/IAM/CreateLoginProfile deleted file mode 100644 index 6a05895f612..00000000000 --- a/test/resources/IAM/CreateLoginProfile +++ /dev/null @@ -1,22 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateLoginProfile -&UserName=Bob -&Password=Password1 -&AUTHPARAMS - - - - - - - Bob - 2011-09-19T23:00:56Z - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/CreateLoginProfileResponse b/test/resources/IAM/CreateLoginProfileResponse deleted file mode 100644 index 6a05895f612..00000000000 --- a/test/resources/IAM/CreateLoginProfileResponse +++ /dev/null @@ -1,22 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateLoginProfile -&UserName=Bob -&Password=Password1 -&AUTHPARAMS - - - - - - - Bob - 2011-09-19T23:00:56Z - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/CreateRole b/test/resources/IAM/CreateRole deleted file mode 100644 index 8b61d0e36f7..00000000000 --- a/test/resources/IAM/CreateRole +++ /dev/null @@ -1,27 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateRole -&RoleName=S3Access -&Path=/application_abc/component_xyz/ -&AssumeRolePolicyDocument={"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} -&Version=2010-05-08 -&AUTHPARAMS - - - - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-08T23:34:01.495Z - AROADBQP57FF2AEXAMPLE - - - - 4a93ceee-9966-11e1-b624-b1aEXAMPLE7c - - - - diff --git a/test/resources/IAM/CreateRoleResponse b/test/resources/IAM/CreateRoleResponse deleted file mode 100644 index 8b61d0e36f7..00000000000 --- a/test/resources/IAM/CreateRoleResponse +++ /dev/null @@ -1,27 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateRole -&RoleName=S3Access -&Path=/application_abc/component_xyz/ -&AssumeRolePolicyDocument={"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} -&Version=2010-05-08 -&AUTHPARAMS - - - - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-08T23:34:01.495Z - AROADBQP57FF2AEXAMPLE - - - - 4a93ceee-9966-11e1-b624-b1aEXAMPLE7c - - - - diff --git a/test/resources/IAM/CreateUser b/test/resources/IAM/CreateUser deleted file mode 100644 index 44b4d0f06a2..00000000000 --- a/test/resources/IAM/CreateUser +++ /dev/null @@ -1,25 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateUser -&Path=/division_abc/subdivision_xyz/ -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - /division_abc/subdivision_xyz/ - Bob - AIDACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/Bob - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/CreateUserResponse b/test/resources/IAM/CreateUserResponse deleted file mode 100644 index 44b4d0f06a2..00000000000 --- a/test/resources/IAM/CreateUserResponse +++ /dev/null @@ -1,25 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateUser -&Path=/division_abc/subdivision_xyz/ -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - /division_abc/subdivision_xyz/ - Bob - AIDACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/Bob - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/CreateVirtualMFADevice b/test/resources/IAM/CreateVirtualMFADevice deleted file mode 100644 index 27a287daf57..00000000000 --- a/test/resources/IAM/CreateVirtualMFADevice +++ /dev/null @@ -1,23 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateVirtualMFADevice -&VirtualMFADeviceName=ExampleName -&Path=/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - arn:aws:iam::123456789012:mfa/ExampleName - 2K5K5XTLA7GGE75TQLYEXAMPLEEXAMPLEEXAMPLECHDFW4KJYZ6 - UFQ75LL7COCYKM - 89504E470D0A1A0AASDFAHSDFKJKLJFKALSDFJASDF - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/CreateVirtualMFADeviceResponse b/test/resources/IAM/CreateVirtualMFADeviceResponse deleted file mode 100644 index 27a287daf57..00000000000 --- a/test/resources/IAM/CreateVirtualMFADeviceResponse +++ /dev/null @@ -1,23 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=CreateVirtualMFADevice -&VirtualMFADeviceName=ExampleName -&Path=/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - arn:aws:iam::123456789012:mfa/ExampleName - 2K5K5XTLA7GGE75TQLYEXAMPLEEXAMPLEEXAMPLECHDFW4KJYZ6 - UFQ75LL7COCYKM - 89504E470D0A1A0AASDFAHSDFKJKLJFKALSDFJASDF - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/DeactivateMFADevice b/test/resources/IAM/DeactivateMFADevice deleted file mode 100644 index cf69a59697e..00000000000 --- a/test/resources/IAM/DeactivateMFADevice +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeactivateMFADevice -&UserName=Bob -&SerialNumber=R1234 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeactivateMFADeviceResponse b/test/resources/IAM/DeactivateMFADeviceResponse deleted file mode 100644 index cf69a59697e..00000000000 --- a/test/resources/IAM/DeactivateMFADeviceResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeactivateMFADevice -&UserName=Bob -&SerialNumber=R1234 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteAccessKey b/test/resources/IAM/DeleteAccessKey deleted file mode 100644 index 6110ffee747..00000000000 --- a/test/resources/IAM/DeleteAccessKey +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteAccessKey -&UserName=Bob -&AccessKeyId=AKIAIOSFODNN7EXAMPLE -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteAccessKeyResponse b/test/resources/IAM/DeleteAccessKeyResponse deleted file mode 100644 index 6110ffee747..00000000000 --- a/test/resources/IAM/DeleteAccessKeyResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteAccessKey -&UserName=Bob -&AccessKeyId=AKIAIOSFODNN7EXAMPLE -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteAccountAlias b/test/resources/IAM/DeleteAccountAlias deleted file mode 100644 index 06ea0f6a2ab..00000000000 --- a/test/resources/IAM/DeleteAccountAlias +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteAccountAlias -&AccountAlias=foocorporation -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteAccountAliasResponse b/test/resources/IAM/DeleteAccountAliasResponse deleted file mode 100644 index 06ea0f6a2ab..00000000000 --- a/test/resources/IAM/DeleteAccountAliasResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteAccountAlias -&AccountAlias=foocorporation -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteAccountPasswordPolicy b/test/resources/IAM/DeleteAccountPasswordPolicy deleted file mode 100644 index 6bbbb0ff30c..00000000000 --- a/test/resources/IAM/DeleteAccountPasswordPolicy +++ /dev/null @@ -1,13 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteAccountPasswordPolicy -&Version=2010-05-08 -&AUTHPARAMS - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/DeleteAccountPasswordPolicyResponse b/test/resources/IAM/DeleteAccountPasswordPolicyResponse deleted file mode 100644 index 6bbbb0ff30c..00000000000 --- a/test/resources/IAM/DeleteAccountPasswordPolicyResponse +++ /dev/null @@ -1,13 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteAccountPasswordPolicy -&Version=2010-05-08 -&AUTHPARAMS - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/DeleteGroup b/test/resources/IAM/DeleteGroup deleted file mode 100644 index fc4c21a10e6..00000000000 --- a/test/resources/IAM/DeleteGroup +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteGroup -&Group=Test -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteGroupPolicy b/test/resources/IAM/DeleteGroupPolicy deleted file mode 100644 index 7ccbf0d5292..00000000000 --- a/test/resources/IAM/DeleteGroupPolicy +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteGroupPolicy -&GroupName=Admins -&PolicyName=AdminRoot -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteGroupPolicyResponse b/test/resources/IAM/DeleteGroupPolicyResponse deleted file mode 100644 index 7ccbf0d5292..00000000000 --- a/test/resources/IAM/DeleteGroupPolicyResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteGroupPolicy -&GroupName=Admins -&PolicyName=AdminRoot -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteGroupResponse b/test/resources/IAM/DeleteGroupResponse deleted file mode 100644 index fc4c21a10e6..00000000000 --- a/test/resources/IAM/DeleteGroupResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteGroup -&Group=Test -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteInstanceProfile b/test/resources/IAM/DeleteInstanceProfile deleted file mode 100644 index d22f0e244a1..00000000000 --- a/test/resources/IAM/DeleteInstanceProfile +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteInstanceProfile -&InstanceProfileName=Webserver -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 90c18667-99f3-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/DeleteInstanceProfileResponse b/test/resources/IAM/DeleteInstanceProfileResponse deleted file mode 100644 index d22f0e244a1..00000000000 --- a/test/resources/IAM/DeleteInstanceProfileResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteInstanceProfile -&InstanceProfileName=Webserver -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 90c18667-99f3-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/DeleteLoginProfile b/test/resources/IAM/DeleteLoginProfile deleted file mode 100644 index 3e066ea978e..00000000000 --- a/test/resources/IAM/DeleteLoginProfile +++ /dev/null @@ -1,15 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteLoginProfile -&UserName=Bob -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteLoginProfileResponse b/test/resources/IAM/DeleteLoginProfileResponse deleted file mode 100644 index 3e066ea978e..00000000000 --- a/test/resources/IAM/DeleteLoginProfileResponse +++ /dev/null @@ -1,15 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteLoginProfile -&UserName=Bob -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteRole b/test/resources/IAM/DeleteRole deleted file mode 100644 index a69e637f84d..00000000000 --- a/test/resources/IAM/DeleteRole +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteRole -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 913e3f37-99ed-11e1-a4c3-270EXAMPLE04 - - - - diff --git a/test/resources/IAM/DeleteRolePolicy b/test/resources/IAM/DeleteRolePolicy deleted file mode 100644 index 8762df4d206..00000000000 --- a/test/resources/IAM/DeleteRolePolicy +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteRolePolicy -&PolicyName=S3AccessPolicy -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - c749ee7f-99ef-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/DeleteRolePolicyResponse b/test/resources/IAM/DeleteRolePolicyResponse deleted file mode 100644 index 8762df4d206..00000000000 --- a/test/resources/IAM/DeleteRolePolicyResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteRolePolicy -&PolicyName=S3AccessPolicy -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - c749ee7f-99ef-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/DeleteRoleResponse b/test/resources/IAM/DeleteRoleResponse deleted file mode 100644 index a69e637f84d..00000000000 --- a/test/resources/IAM/DeleteRoleResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteRole -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 913e3f37-99ed-11e1-a4c3-270EXAMPLE04 - - - - diff --git a/test/resources/IAM/DeleteServerCertificate b/test/resources/IAM/DeleteServerCertificate deleted file mode 100644 index 53e2f7e1bfb..00000000000 --- a/test/resources/IAM/DeleteServerCertificate +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteServerCertificate -&ServerCertificateName=ProdServerCert -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteServerCertificateResponse b/test/resources/IAM/DeleteServerCertificateResponse deleted file mode 100644 index 53e2f7e1bfb..00000000000 --- a/test/resources/IAM/DeleteServerCertificateResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteServerCertificate -&ServerCertificateName=ProdServerCert -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteSigningCertificate b/test/resources/IAM/DeleteSigningCertificate deleted file mode 100644 index c3d712427e6..00000000000 --- a/test/resources/IAM/DeleteSigningCertificate +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteSigningCertificate -&UserName=Bob -&CertificateId=TA7SMP42TDN5Z26OBPJE7EXAMPLE -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteSigningCertificateResponse b/test/resources/IAM/DeleteSigningCertificateResponse deleted file mode 100644 index c3d712427e6..00000000000 --- a/test/resources/IAM/DeleteSigningCertificateResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteSigningCertificate -&UserName=Bob -&CertificateId=TA7SMP42TDN5Z26OBPJE7EXAMPLE -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteUser b/test/resources/IAM/DeleteUser deleted file mode 100644 index a44e66240fd..00000000000 --- a/test/resources/IAM/DeleteUser +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteUser -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteUserPolicy b/test/resources/IAM/DeleteUserPolicy deleted file mode 100644 index 81cfa070c91..00000000000 --- a/test/resources/IAM/DeleteUserPolicy +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteUserPolicy -&UserName=Bob -&PolicyName=AllAccessPolicy -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteUserPolicyResponse b/test/resources/IAM/DeleteUserPolicyResponse deleted file mode 100644 index 81cfa070c91..00000000000 --- a/test/resources/IAM/DeleteUserPolicyResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteUserPolicy -&UserName=Bob -&PolicyName=AllAccessPolicy -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteUserResponse b/test/resources/IAM/DeleteUserResponse deleted file mode 100644 index a44e66240fd..00000000000 --- a/test/resources/IAM/DeleteUserResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteUser -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/DeleteVirtualMFADevice b/test/resources/IAM/DeleteVirtualMFADevice deleted file mode 100644 index 7214d642960..00000000000 --- a/test/resources/IAM/DeleteVirtualMFADevice +++ /dev/null @@ -1,19 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteVirtualMFADevice -&SerialNumber=arn:aws:iam::123456789012:mfa/ExampleName -&Version=2010-05-08 -&AUTHPARAMS - - - - - - arn:aws:iam::123456789012:mfa/ExampleName - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/DeleteVirtualMFADeviceResponse b/test/resources/IAM/DeleteVirtualMFADeviceResponse deleted file mode 100644 index 7214d642960..00000000000 --- a/test/resources/IAM/DeleteVirtualMFADeviceResponse +++ /dev/null @@ -1,19 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=DeleteVirtualMFADevice -&SerialNumber=arn:aws:iam::123456789012:mfa/ExampleName -&Version=2010-05-08 -&AUTHPARAMS - - - - - - arn:aws:iam::123456789012:mfa/ExampleName - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/EnableMFADevice b/test/resources/IAM/EnableMFADevice deleted file mode 100644 index 0a47ddfc4c1..00000000000 --- a/test/resources/IAM/EnableMFADevice +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=EnableMFADevice -&UserName=Bob -&SerialNumber=R1234 -&AuthenticationCode1=234567 -&AuthenticationCode2=987654 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/EnableMFADeviceResponse b/test/resources/IAM/EnableMFADeviceResponse deleted file mode 100644 index 0a47ddfc4c1..00000000000 --- a/test/resources/IAM/EnableMFADeviceResponse +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=EnableMFADevice -&UserName=Bob -&SerialNumber=R1234 -&AuthenticationCode1=234567 -&AuthenticationCode2=987654 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetAccountPasswordPolicy b/test/resources/IAM/GetAccountPasswordPolicy deleted file mode 100644 index 8469b5a5993..00000000000 --- a/test/resources/IAM/GetAccountPasswordPolicy +++ /dev/null @@ -1,24 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetAccountPasswordPolicy -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - 6, - false - false - false - false - true - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/GetAccountPasswordPolicyResponse b/test/resources/IAM/GetAccountPasswordPolicyResponse deleted file mode 100644 index 8469b5a5993..00000000000 --- a/test/resources/IAM/GetAccountPasswordPolicyResponse +++ /dev/null @@ -1,24 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetAccountPasswordPolicy -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - 6, - false - false - false - false - true - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/GetAccountSummary b/test/resources/IAM/GetAccountSummary deleted file mode 100644 index b91813a057b..00000000000 --- a/test/resources/IAM/GetAccountSummary +++ /dev/null @@ -1,75 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetAccountSummary -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - - Groups - 31 - - - GroupsQuota - 50 - - - UsersQuota - 150 - - - Users - 35 - - - GroupPolicySizeQuota - 10240 - - - AccessKeysPerUserQuota - 2 - - - GroupsPerUserQuota - 10 - - - UserPolicySizeQuota - 10240 - - - SigningCertificatesPerUserQuota - 2 - - - ServerCertificates - 0 - - - ServerCertificatesQuota - 10 - - - AccountMFAEnabled - 0 - - - MFADevicesInUse - 10 - - - MFADevices - 20 - - - - - f1e38443-f1ad-11df-b1ef-a9265EXAMPLE - - - - diff --git a/test/resources/IAM/GetAccountSummaryResponse b/test/resources/IAM/GetAccountSummaryResponse deleted file mode 100644 index b91813a057b..00000000000 --- a/test/resources/IAM/GetAccountSummaryResponse +++ /dev/null @@ -1,75 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetAccountSummary -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - - Groups - 31 - - - GroupsQuota - 50 - - - UsersQuota - 150 - - - Users - 35 - - - GroupPolicySizeQuota - 10240 - - - AccessKeysPerUserQuota - 2 - - - GroupsPerUserQuota - 10 - - - UserPolicySizeQuota - 10240 - - - SigningCertificatesPerUserQuota - 2 - - - ServerCertificates - 0 - - - ServerCertificatesQuota - 10 - - - AccountMFAEnabled - 0 - - - MFADevicesInUse - 10 - - - MFADevices - 20 - - - - - f1e38443-f1ad-11df-b1ef-a9265EXAMPLE - - - - diff --git a/test/resources/IAM/GetGroup b/test/resources/IAM/GetGroup deleted file mode 100644 index e6d51d89e4e..00000000000 --- a/test/resources/IAM/GetGroup +++ /dev/null @@ -1,43 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetGroup -&GroupName=Admins -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - / - Admins - AGPACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:group/Admins - - - - /division_abc/subdivision_xyz/ - Bob - AIDACKCEVSQ6C2EXAMPLE - - arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/Bob - - - - /division_abc/subdivision_xyz/ - Susan - AIDACKCEVSQ6C2EXAMPLE - - arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/Susan - - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetGroupPolicy b/test/resources/IAM/GetGroupPolicy deleted file mode 100644 index c032c1fe2c1..00000000000 --- a/test/resources/IAM/GetGroupPolicy +++ /dev/null @@ -1,23 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetGroupPolicy -&GroupName=Admins -&PolicyName=AdminRoot -&AUTHPARAMS - - - - - - Admins - AdminRoot - - {"Statement":[{"Effect":"Allow","Action":"*","Resource":"*"}]} - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetGroupPolicyResponse b/test/resources/IAM/GetGroupPolicyResponse deleted file mode 100644 index c032c1fe2c1..00000000000 --- a/test/resources/IAM/GetGroupPolicyResponse +++ /dev/null @@ -1,23 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetGroupPolicy -&GroupName=Admins -&PolicyName=AdminRoot -&AUTHPARAMS - - - - - - Admins - AdminRoot - - {"Statement":[{"Effect":"Allow","Action":"*","Resource":"*"}]} - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetGroupResponse b/test/resources/IAM/GetGroupResponse deleted file mode 100644 index e6d51d89e4e..00000000000 --- a/test/resources/IAM/GetGroupResponse +++ /dev/null @@ -1,43 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetGroup -&GroupName=Admins -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - / - Admins - AGPACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:group/Admins - - - - /division_abc/subdivision_xyz/ - Bob - AIDACKCEVSQ6C2EXAMPLE - - arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/Bob - - - - /division_abc/subdivision_xyz/ - Susan - AIDACKCEVSQ6C2EXAMPLE - - arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/Susan - - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetInstanceProfile b/test/resources/IAM/GetInstanceProfile deleted file mode 100644 index 82eb1ecb354..00000000000 --- a/test/resources/IAM/GetInstanceProfile +++ /dev/null @@ -1,35 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetInstanceProfile -&InstanceProfileName=Webserver -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - AIPAD5ARO2C5EXAMPLE3G - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-09T15:45:35Z - AROACVYKSVTSZFEXAMPLE - - - Webserver - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver - 2012-05-09T16:11:10Z - - - - 37289fda-99f2-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/GetInstanceProfileResponse b/test/resources/IAM/GetInstanceProfileResponse deleted file mode 100644 index 82eb1ecb354..00000000000 --- a/test/resources/IAM/GetInstanceProfileResponse +++ /dev/null @@ -1,35 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetInstanceProfile -&InstanceProfileName=Webserver -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - AIPAD5ARO2C5EXAMPLE3G - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-09T15:45:35Z - AROACVYKSVTSZFEXAMPLE - - - Webserver - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver - 2012-05-09T16:11:10Z - - - - 37289fda-99f2-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/GetLoginProfile b/test/resources/IAM/GetLoginProfile deleted file mode 100644 index eb94f89bb94..00000000000 --- a/test/resources/IAM/GetLoginProfile +++ /dev/null @@ -1,21 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetLoginProfile -&UserName=Bob -&AUTHPARAMS - - - - - - - Bob - 2011-09-19T23:00:56Z - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetLoginProfileResponse b/test/resources/IAM/GetLoginProfileResponse deleted file mode 100644 index eb94f89bb94..00000000000 --- a/test/resources/IAM/GetLoginProfileResponse +++ /dev/null @@ -1,21 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetLoginProfile -&UserName=Bob -&AUTHPARAMS - - - - - - - Bob - 2011-09-19T23:00:56Z - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetRole b/test/resources/IAM/GetRole deleted file mode 100644 index 512e4770de1..00000000000 --- a/test/resources/IAM/GetRole +++ /dev/null @@ -1,26 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetRole -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-08T23:34:01Z - AROADBQP57FF2AEXAMPLE - - - - df37e965-9967-11e1-a4c3-270EXAMPLE04 - - - - diff --git a/test/resources/IAM/GetRolePolicy b/test/resources/IAM/GetRolePolicy deleted file mode 100644 index 1637471cd8a..00000000000 --- a/test/resources/IAM/GetRolePolicy +++ /dev/null @@ -1,22 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetRolePolicy -&PolicyName=S3AccessPolicy -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - S3AccessPolicy - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Action":["s3:*"],"Resource":["*"]}]} - - - 7e7cd8bc-99ef-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/GetRolePolicyResponse b/test/resources/IAM/GetRolePolicyResponse deleted file mode 100644 index 1637471cd8a..00000000000 --- a/test/resources/IAM/GetRolePolicyResponse +++ /dev/null @@ -1,22 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetRolePolicy -&PolicyName=S3AccessPolicy -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - S3AccessPolicy - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Action":["s3:*"],"Resource":["*"]}]} - - - 7e7cd8bc-99ef-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/GetRoleResponse b/test/resources/IAM/GetRoleResponse deleted file mode 100644 index 512e4770de1..00000000000 --- a/test/resources/IAM/GetRoleResponse +++ /dev/null @@ -1,26 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetRole -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-08T23:34:01Z - AROADBQP57FF2AEXAMPLE - - - - df37e965-9967-11e1-a4c3-270EXAMPLE04 - - - - diff --git a/test/resources/IAM/GetServerCertificate b/test/resources/IAM/GetServerCertificate deleted file mode 100644 index 05780a4385f..00000000000 --- a/test/resources/IAM/GetServerCertificate +++ /dev/null @@ -1,44 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetServerCertificate -&ServerCertificateName=ProdServerCert -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - - ProdServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/ProdServerCert - 2010-05-08T01:02:03.004Z - ASCACKCEVSQ6C2EXAMPLE - - -----BEGIN CERTIFICATE----- -MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT -AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT -GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy -MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw -FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf -MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr -dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL -ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf -suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww -CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK -CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH -wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX -wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX -AEaHzTpmEXAMPLE= ------END CERTIFICATE----- - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetServerCertificateResponse b/test/resources/IAM/GetServerCertificateResponse deleted file mode 100644 index 05780a4385f..00000000000 --- a/test/resources/IAM/GetServerCertificateResponse +++ /dev/null @@ -1,44 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetServerCertificate -&ServerCertificateName=ProdServerCert -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - - ProdServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/ProdServerCert - 2010-05-08T01:02:03.004Z - ASCACKCEVSQ6C2EXAMPLE - - -----BEGIN CERTIFICATE----- -MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT -AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT -GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy -MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw -FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf -MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr -dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL -ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf -suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww -CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK -CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH -wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX -wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX -AEaHzTpmEXAMPLE= ------END CERTIFICATE----- - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetUser b/test/resources/IAM/GetUser deleted file mode 100644 index c64c3f9e40a..00000000000 --- a/test/resources/IAM/GetUser +++ /dev/null @@ -1,26 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetUser -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - /division_abc/subdivision_xyz/ - Bob - AIDACKCEVSQ6C2EXAMPLE - - arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/Bob - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetUserPolicy b/test/resources/IAM/GetUserPolicy deleted file mode 100644 index 172f25a7c80..00000000000 --- a/test/resources/IAM/GetUserPolicy +++ /dev/null @@ -1,23 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetUserPolicy -&UserName=Bob -&PolicyName=AllAccessPolicy -&AUTHPARAMS - - - - - - Bob - AllAccessPolicy - - {"Statement":[{"Effect":"Allow","Action":"*","Resource":"*"}]} - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetUserPolicyResponse b/test/resources/IAM/GetUserPolicyResponse deleted file mode 100644 index 172f25a7c80..00000000000 --- a/test/resources/IAM/GetUserPolicyResponse +++ /dev/null @@ -1,23 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetUserPolicy -&UserName=Bob -&PolicyName=AllAccessPolicy -&AUTHPARAMS - - - - - - Bob - AllAccessPolicy - - {"Statement":[{"Effect":"Allow","Action":"*","Resource":"*"}]} - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/GetUserResponse b/test/resources/IAM/GetUserResponse deleted file mode 100644 index c64c3f9e40a..00000000000 --- a/test/resources/IAM/GetUserResponse +++ /dev/null @@ -1,26 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=GetUser -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - /division_abc/subdivision_xyz/ - Bob - AIDACKCEVSQ6C2EXAMPLE - - arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/Bob - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListAccessKeys b/test/resources/IAM/ListAccessKeys deleted file mode 100644 index c984ceedeb6..00000000000 --- a/test/resources/IAM/ListAccessKeys +++ /dev/null @@ -1,32 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListAccessKeys -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - Bob - - - Bob - AKIAIOSFODNN7EXAMPLE - Active - - - Bob - AKIAI44QH8DHBEXAMPLE - Inactive - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListAccessKeysResponse b/test/resources/IAM/ListAccessKeysResponse deleted file mode 100644 index c984ceedeb6..00000000000 --- a/test/resources/IAM/ListAccessKeysResponse +++ /dev/null @@ -1,32 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListAccessKeys -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - Bob - - - Bob - AKIAIOSFODNN7EXAMPLE - Active - - - Bob - AKIAI44QH8DHBEXAMPLE - Inactive - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListAccountAliases b/test/resources/IAM/ListAccountAliases deleted file mode 100644 index fdc2613b123..00000000000 --- a/test/resources/IAM/ListAccountAliases +++ /dev/null @@ -1,21 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListAccountAliases -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - foocorporation - - - - c5a076e9-f1b0-11df-8fbe-45274EXAMPLE - - - - diff --git a/test/resources/IAM/ListAccountAliasesResponse b/test/resources/IAM/ListAccountAliasesResponse deleted file mode 100644 index fdc2613b123..00000000000 --- a/test/resources/IAM/ListAccountAliasesResponse +++ /dev/null @@ -1,21 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListAccountAliases -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - foocorporation - - - - c5a076e9-f1b0-11df-8fbe-45274EXAMPLE - - - - diff --git a/test/resources/IAM/ListGroupPolicies b/test/resources/IAM/ListGroupPolicies deleted file mode 100644 index c1b2b8c0cde..00000000000 --- a/test/resources/IAM/ListGroupPolicies +++ /dev/null @@ -1,22 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListGroupPolicies -&GroupName=Admins -&AUTHPARAMS - - - - - - - AdminRoot - KeyPolicy - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListGroupPoliciesResponse b/test/resources/IAM/ListGroupPoliciesResponse deleted file mode 100644 index c1b2b8c0cde..00000000000 --- a/test/resources/IAM/ListGroupPoliciesResponse +++ /dev/null @@ -1,22 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListGroupPolicies -&GroupName=Admins -&AUTHPARAMS - - - - - - - AdminRoot - KeyPolicy - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListGroups b/test/resources/IAM/ListGroups deleted file mode 100644 index 7ae032548aa..00000000000 --- a/test/resources/IAM/ListGroups +++ /dev/null @@ -1,42 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListGroups -&PathPrefix=/division_abc/subdivision_xyz/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - - /division_abc/subdivision_xyz/ - Admins - AGPACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:group/Admins - - - /division_abc/subdivision_xyz/product_1234/engineering/ - - Test - AGP2MAB8DPLSRHEXAMPLE - arn:aws:iam::123456789012:group - /division_abc/subdivision_xyz/product_1234/engineering/Test - - - /division_abc/subdivision_xyz/product_1234/ - Managers - AGPIODR4TAW7CSEXAMPLE - arn:aws:iam::123456789012 - :group/division_abc/subdivision_xyz/product_1234/Managers - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListGroupsForUser b/test/resources/IAM/ListGroupsForUser deleted file mode 100644 index ace3bcb9360..00000000000 --- a/test/resources/IAM/ListGroupsForUser +++ /dev/null @@ -1,25 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListGroupsForUser -&UserName=Bob -&AUTHPARAMS - - - - - - - - / - Admins - AGPACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:group/Admins - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/ListGroupsForUserResponse b/test/resources/IAM/ListGroupsForUserResponse deleted file mode 100644 index ace3bcb9360..00000000000 --- a/test/resources/IAM/ListGroupsForUserResponse +++ /dev/null @@ -1,25 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListGroupsForUser -&UserName=Bob -&AUTHPARAMS - - - - - - - - / - Admins - AGPACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:group/Admins - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/ListGroupsResponse b/test/resources/IAM/ListGroupsResponse deleted file mode 100644 index 7ae032548aa..00000000000 --- a/test/resources/IAM/ListGroupsResponse +++ /dev/null @@ -1,42 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListGroups -&PathPrefix=/division_abc/subdivision_xyz/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - - /division_abc/subdivision_xyz/ - Admins - AGPACKCEVSQ6C2EXAMPLE - arn:aws:iam::123456789012:group/Admins - - - /division_abc/subdivision_xyz/product_1234/engineering/ - - Test - AGP2MAB8DPLSRHEXAMPLE - arn:aws:iam::123456789012:group - /division_abc/subdivision_xyz/product_1234/engineering/Test - - - /division_abc/subdivision_xyz/product_1234/ - Managers - AGPIODR4TAW7CSEXAMPLE - arn:aws:iam::123456789012 - :group/division_abc/subdivision_xyz/product_1234/Managers - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListInstanceProfiles b/test/resources/IAM/ListInstanceProfiles deleted file mode 100644 index c461264dd7c..00000000000 --- a/test/resources/IAM/ListInstanceProfiles +++ /dev/null @@ -1,38 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListInstanceProfiles -&MaxItems=100 -&PathPrefix=/application_abc/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - - AIPACIFN4OZXG7EXAMPLE - - Database - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Database - 2012-05-09T16:27:03Z - - - AIPACZLSXM2EYYEXAMPLE - - Webserver - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver - 2012-05-09T16:27:11Z - - - - - fd74fa8d-99f3-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/ListInstanceProfilesForRole b/test/resources/IAM/ListInstanceProfilesForRole deleted file mode 100644 index 9b074bad08c..00000000000 --- a/test/resources/IAM/ListInstanceProfilesForRole +++ /dev/null @@ -1,40 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListInstanceProfilesForRole -&MaxItems=100 -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - - AIPACZLS2EYYXMEXAMPLE - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-09T15:45:35Z - AROACVSVTSZYK3EXAMPLE - - - Webserver - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver - 2012-05-09T16:27:11Z - - - - - 6a8c3992-99f4-11e1-a4c3-27EXAMPLE804 - - - - - diff --git a/test/resources/IAM/ListInstanceProfilesForRoleResponse b/test/resources/IAM/ListInstanceProfilesForRoleResponse deleted file mode 100644 index 9b074bad08c..00000000000 --- a/test/resources/IAM/ListInstanceProfilesForRoleResponse +++ /dev/null @@ -1,40 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListInstanceProfilesForRole -&MaxItems=100 -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - - AIPACZLS2EYYXMEXAMPLE - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-09T15:45:35Z - AROACVSVTSZYK3EXAMPLE - - - Webserver - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver - 2012-05-09T16:27:11Z - - - - - 6a8c3992-99f4-11e1-a4c3-27EXAMPLE804 - - - - - diff --git a/test/resources/IAM/ListInstanceProfilesResponse b/test/resources/IAM/ListInstanceProfilesResponse deleted file mode 100644 index c461264dd7c..00000000000 --- a/test/resources/IAM/ListInstanceProfilesResponse +++ /dev/null @@ -1,38 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListInstanceProfiles -&MaxItems=100 -&PathPrefix=/application_abc/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - - AIPACIFN4OZXG7EXAMPLE - - Database - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Database - 2012-05-09T16:27:03Z - - - AIPACZLSXM2EYYEXAMPLE - - Webserver - /application_abc/component_xyz/ - arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver - 2012-05-09T16:27:11Z - - - - - fd74fa8d-99f3-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/ListMFADevices b/test/resources/IAM/ListMFADevices deleted file mode 100644 index c124a6265e4..00000000000 --- a/test/resources/IAM/ListMFADevices +++ /dev/null @@ -1,24 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListMFADevices -&UserName=Bob -&AUTHPARAMS - - - - - - - - Bob - R1234 - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListMFADevicesResponse b/test/resources/IAM/ListMFADevicesResponse deleted file mode 100644 index c124a6265e4..00000000000 --- a/test/resources/IAM/ListMFADevicesResponse +++ /dev/null @@ -1,24 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListMFADevices -&UserName=Bob -&AUTHPARAMS - - - - - - - - Bob - R1234 - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListRolePolicies b/test/resources/IAM/ListRolePolicies deleted file mode 100644 index abcfa673d02..00000000000 --- a/test/resources/IAM/ListRolePolicies +++ /dev/null @@ -1,24 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListRolePolicies -&MaxItems=100 -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - CloudwatchPutMetricPolicy - S3AccessPolicy - - false - - - 8c7e1816-99f0-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/ListRolePoliciesResponse b/test/resources/IAM/ListRolePoliciesResponse deleted file mode 100644 index abcfa673d02..00000000000 --- a/test/resources/IAM/ListRolePoliciesResponse +++ /dev/null @@ -1,24 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListRolePolicies -&MaxItems=100 -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - CloudwatchPutMetricPolicy - S3AccessPolicy - - false - - - 8c7e1816-99f0-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/ListRoles b/test/resources/IAM/ListRoles deleted file mode 100644 index a8b171d55c7..00000000000 --- a/test/resources/IAM/ListRoles +++ /dev/null @@ -1,38 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListRoles -&MaxItems=100 -&PathPrefix=/application_abc/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-09T15:45:35Z - AROACVSVTSZYEXAMPLEYK - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/SDBAccess - SDBAccess - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-09T15:45:45Z - AROAC2ICXG32EXAMPLEWK - - - - - 20f7279f-99ee-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/ListRolesResponse b/test/resources/IAM/ListRolesResponse deleted file mode 100644 index a8b171d55c7..00000000000 --- a/test/resources/IAM/ListRolesResponse +++ /dev/null @@ -1,38 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListRoles -&MaxItems=100 -&PathPrefix=/application_abc/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access - S3Access - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-09T15:45:35Z - AROACVSVTSZYEXAMPLEYK - - - /application_abc/component_xyz/ - arn:aws:iam::123456789012:role/application_abc/component_xyz/SDBAccess - SDBAccess - {"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} - 2012-05-09T15:45:45Z - AROAC2ICXG32EXAMPLEWK - - - - - 20f7279f-99ee-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/ListServerCertificates b/test/resources/IAM/ListServerCertificates deleted file mode 100644 index 21be0d3971b..00000000000 --- a/test/resources/IAM/ListServerCertificates +++ /dev/null @@ -1,48 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListServerCertificates -&PathPrefix=/company/servercerts -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - - - ProdServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/ProdServerCert - 2010-05-08T01:02:03.004Z - ASCACKCEVSQ6CEXAMPLE1 - - - - - BetaServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/BetaServerCert - 2010-05-08T02:03:01.004Z - ASCACKCEVSQ6CEXAMPLE2 - - - - - TestServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/TestServerCert - 2010-05-08T03:01:02.004Z - ASCACKCEVSQ6CEXAMPLE3 - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListServerCertificatesResponse b/test/resources/IAM/ListServerCertificatesResponse deleted file mode 100644 index 21be0d3971b..00000000000 --- a/test/resources/IAM/ListServerCertificatesResponse +++ /dev/null @@ -1,48 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListServerCertificates -&PathPrefix=/company/servercerts -&Version=2010-05-08 -&AUTHPARAMS - - - - - - false - - - - ProdServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/ProdServerCert - 2010-05-08T01:02:03.004Z - ASCACKCEVSQ6CEXAMPLE1 - - - - - BetaServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/BetaServerCert - 2010-05-08T02:03:01.004Z - ASCACKCEVSQ6CEXAMPLE2 - - - - - TestServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/TestServerCert - 2010-05-08T03:01:02.004Z - ASCACKCEVSQ6CEXAMPLE3 - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListSigningCertificates b/test/resources/IAM/ListSigningCertificates deleted file mode 100644 index 2de092f0730..00000000000 --- a/test/resources/IAM/ListSigningCertificates +++ /dev/null @@ -1,43 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListSigningCertificates -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - Bob - - - Bob - TA7SMP42TDN5Z26OBPJE7EXAMPLE - -----BEGIN CERTIFICATE----- - MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT - AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT - GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy - MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw - FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf - MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr - dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL - ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf - suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww - CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK - CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH - wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX - wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX - AEaHzTpmEXAMPLE= - -----END CERTIFICATE----- - Active - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListSigningCertificatesResponse b/test/resources/IAM/ListSigningCertificatesResponse deleted file mode 100644 index 2de092f0730..00000000000 --- a/test/resources/IAM/ListSigningCertificatesResponse +++ /dev/null @@ -1,43 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListSigningCertificates -&UserName=Bob -&Version=2010-05-08 -&AUTHPARAMS - - - - - - Bob - - - Bob - TA7SMP42TDN5Z26OBPJE7EXAMPLE - -----BEGIN CERTIFICATE----- - MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT - AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT - GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy - MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw - FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf - MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr - dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL - ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf - suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww - CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK - CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH - wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX - wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX - AEaHzTpmEXAMPLE= - -----END CERTIFICATE----- - Active - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListUserPolicies b/test/resources/IAM/ListUserPolicies deleted file mode 100644 index 43501b54af3..00000000000 --- a/test/resources/IAM/ListUserPolicies +++ /dev/null @@ -1,22 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListUserPolicies -&UserName=Bob -&AUTHPARAMS - - - - - - - AllAccessPolicy - KeyPolicy - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListUserPoliciesResponse b/test/resources/IAM/ListUserPoliciesResponse deleted file mode 100644 index 43501b54af3..00000000000 --- a/test/resources/IAM/ListUserPoliciesResponse +++ /dev/null @@ -1,22 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListUserPolicies -&UserName=Bob -&AUTHPARAMS - - - - - - - AllAccessPolicy - KeyPolicy - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListUsers b/test/resources/IAM/ListUsers deleted file mode 100644 index 3f6c76bf3fa..00000000000 --- a/test/resources/IAM/ListUsers +++ /dev/null @@ -1,35 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListUsers -&PathPrefix=/division_abc/subdivision_xyz/product_1234/engineering/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - - /division_abc/subdivision_xyz/engineering/ - Andrew - AID2MAB8DPLSRHEXAMPLE - arn:aws:iam::123456789012:user - /division_abc/subdivision_xyz/engineering/Andrew - - - /division_abc/subdivision_xyz/engineering/ - Jackie - AIDIODR4TAW7CSEXAMPLE - arn:aws:iam::123456789012:user - /division_abc/subdivision_xyz/engineering/Jackie - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListUsersResponse b/test/resources/IAM/ListUsersResponse deleted file mode 100644 index 3f6c76bf3fa..00000000000 --- a/test/resources/IAM/ListUsersResponse +++ /dev/null @@ -1,35 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ListUsers -&PathPrefix=/division_abc/subdivision_xyz/product_1234/engineering/ -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - - /division_abc/subdivision_xyz/engineering/ - Andrew - AID2MAB8DPLSRHEXAMPLE - arn:aws:iam::123456789012:user - /division_abc/subdivision_xyz/engineering/Andrew - - - /division_abc/subdivision_xyz/engineering/ - Jackie - AIDIODR4TAW7CSEXAMPLE - arn:aws:iam::123456789012:user - /division_abc/subdivision_xyz/engineering/Jackie - - - false - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ListVirtualMFADevices b/test/resources/IAM/ListVirtualMFADevices deleted file mode 100644 index 8ca52db25fd..00000000000 --- a/test/resources/IAM/ListVirtualMFADevices +++ /dev/null @@ -1,56 +0,0 @@ - - - -https://iam.amazonaws.com/ -?Action=ListVirtualMFADevices -&AssignmentStatus=Any -&AUTHPARAMS - - - - - - - false - - - - arn:aws:iam::123456789012:mfa/MFAdeviceName - - - - - arn:aws:iam::123456789012:mfa/RootMFAdeviceName - - 2011-10-20T20:49:03Z - - 123456789012 - arn:aws:iam::123456789012:root - 2009-10-13T22:00:36Z - - - - - arn:aws:iam:::mfa/ExampleUserMFAdeviceName - - 2011-10-31T20:45:02Z - - AIDEXAMPLE4EXAMPLEXYZ - / - ExampleUser - arn:aws:iam::111122223333:user/ExampleUser - 2011-07-01T17:23:07Z - - - - - - b61ce1b1-0401-11e1-b2f8-2dEXAMPLEbfc - - - diff --git a/test/resources/IAM/ListVirtualMFADevicesResponse b/test/resources/IAM/ListVirtualMFADevicesResponse deleted file mode 100644 index 8ca52db25fd..00000000000 --- a/test/resources/IAM/ListVirtualMFADevicesResponse +++ /dev/null @@ -1,56 +0,0 @@ - - - -https://iam.amazonaws.com/ -?Action=ListVirtualMFADevices -&AssignmentStatus=Any -&AUTHPARAMS - - - - - - - false - - - - arn:aws:iam::123456789012:mfa/MFAdeviceName - - - - - arn:aws:iam::123456789012:mfa/RootMFAdeviceName - - 2011-10-20T20:49:03Z - - 123456789012 - arn:aws:iam::123456789012:root - 2009-10-13T22:00:36Z - - - - - arn:aws:iam:::mfa/ExampleUserMFAdeviceName - - 2011-10-31T20:45:02Z - - AIDEXAMPLE4EXAMPLEXYZ - / - ExampleUser - arn:aws:iam::111122223333:user/ExampleUser - 2011-07-01T17:23:07Z - - - - - - b61ce1b1-0401-11e1-b2f8-2dEXAMPLEbfc - - - diff --git a/test/resources/IAM/PutGroupPolicy b/test/resources/IAM/PutGroupPolicy deleted file mode 100644 index 443aef7d955..00000000000 --- a/test/resources/IAM/PutGroupPolicy +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=PutGroupPolicy -&GroupName=Admins -&PolicyName=AdminRoot -&PolicyDocument={"Statement":[{"Effect":"Allow","Action":"*","Resource":"*"}]} -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/PutGroupPolicyResponse b/test/resources/IAM/PutGroupPolicyResponse deleted file mode 100644 index 443aef7d955..00000000000 --- a/test/resources/IAM/PutGroupPolicyResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=PutGroupPolicy -&GroupName=Admins -&PolicyName=AdminRoot -&PolicyDocument={"Statement":[{"Effect":"Allow","Action":"*","Resource":"*"}]} -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/PutRolePolicy b/test/resources/IAM/PutRolePolicy deleted file mode 100644 index 786832d45a4..00000000000 --- a/test/resources/IAM/PutRolePolicy +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=PutRolePolicy -&RoleName=S3Access -&PolicyName=S3AccessPolicy -&PolicyDocument={"Statement":[{"Effect":"Allow","Action":"s3:*","Resource":"*"}]} -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/PutRolePolicyResponse b/test/resources/IAM/PutRolePolicyResponse deleted file mode 100644 index 786832d45a4..00000000000 --- a/test/resources/IAM/PutRolePolicyResponse +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=PutRolePolicy -&RoleName=S3Access -&PolicyName=S3AccessPolicy -&PolicyDocument={"Statement":[{"Effect":"Allow","Action":"s3:*","Resource":"*"}]} -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/PutUserPolicy b/test/resources/IAM/PutUserPolicy deleted file mode 100644 index 5f0d9455a9b..00000000000 --- a/test/resources/IAM/PutUserPolicy +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=PutUserPolicy -&UserName=Bob -&PolicyName=AllAccessPolicy -&PolicyDocument={"Statement":[{"Effect":"Allow","Action":"*","Resource":"*"}]} -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/PutUserPolicyResponse b/test/resources/IAM/PutUserPolicyResponse deleted file mode 100644 index 5f0d9455a9b..00000000000 --- a/test/resources/IAM/PutUserPolicyResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=PutUserPolicy -&UserName=Bob -&PolicyName=AllAccessPolicy -&PolicyDocument={"Statement":[{"Effect":"Allow","Action":"*","Resource":"*"}]} -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/RemoveRoleFromInstanceProfile b/test/resources/IAM/RemoveRoleFromInstanceProfile deleted file mode 100644 index bd81fc10afe..00000000000 --- a/test/resources/IAM/RemoveRoleFromInstanceProfile +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=RemoveRoleFromInstanceProfile -&InstanceProfileName=Webserver -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 29f47818-99f5-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/RemoveRoleFromInstanceProfileResponse b/test/resources/IAM/RemoveRoleFromInstanceProfileResponse deleted file mode 100644 index bd81fc10afe..00000000000 --- a/test/resources/IAM/RemoveRoleFromInstanceProfileResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=RemoveRoleFromInstanceProfile -&InstanceProfileName=Webserver -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 29f47818-99f5-11e1-a4c3-27EXAMPLE804 - - - - diff --git a/test/resources/IAM/RemoveUserFromGroup b/test/resources/IAM/RemoveUserFromGroup deleted file mode 100644 index da3822059f5..00000000000 --- a/test/resources/IAM/RemoveUserFromGroup +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=RemoveUserFromGroup -&GroupName=Managers -&UserName=Bob -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/RemoveUserFromGroupResponse b/test/resources/IAM/RemoveUserFromGroupResponse deleted file mode 100644 index da3822059f5..00000000000 --- a/test/resources/IAM/RemoveUserFromGroupResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=RemoveUserFromGroup -&GroupName=Managers -&UserName=Bob -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ResyncMFADevice b/test/resources/IAM/ResyncMFADevice deleted file mode 100644 index 2b3ae4a23d1..00000000000 --- a/test/resources/IAM/ResyncMFADevice +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ResyncMFADevice -&UserName=Bob -&SerialNumber=R1234 -&AuthenticationCode1=234567 -&AuthenticationCode2=987654 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/ResyncMFADeviceResponse b/test/resources/IAM/ResyncMFADeviceResponse deleted file mode 100644 index 2b3ae4a23d1..00000000000 --- a/test/resources/IAM/ResyncMFADeviceResponse +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=ResyncMFADevice -&UserName=Bob -&SerialNumber=R1234 -&AuthenticationCode1=234567 -&AuthenticationCode2=987654 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateAccessKey b/test/resources/IAM/UpdateAccessKey deleted file mode 100644 index 303ce80beee..00000000000 --- a/test/resources/IAM/UpdateAccessKey +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateAccessKey -&UserName=Bob -&AccessKeyId=AKIAIOSFODNN7EXAMPLE -&Status=Inactive -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateAccessKeyResponse b/test/resources/IAM/UpdateAccessKeyResponse deleted file mode 100644 index 303ce80beee..00000000000 --- a/test/resources/IAM/UpdateAccessKeyResponse +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateAccessKey -&UserName=Bob -&AccessKeyId=AKIAIOSFODNN7EXAMPLE -&Status=Inactive -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateAccountPasswordPolicy b/test/resources/IAM/UpdateAccountPasswordPolicy deleted file mode 100644 index f8a299d09bf..00000000000 --- a/test/resources/IAM/UpdateAccountPasswordPolicy +++ /dev/null @@ -1,20 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateAccountPasswordPolicy -&MinimumPasswordLength=9 -&RequireSymbols=true -&RequireNumbers=false -&RequireUppercaseCharacters=true -&RequireLowercaseCharacters=true -&AllowUsersToChangePassword=true -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/UpdateAccountPasswordPolicyResponse b/test/resources/IAM/UpdateAccountPasswordPolicyResponse deleted file mode 100644 index f8a299d09bf..00000000000 --- a/test/resources/IAM/UpdateAccountPasswordPolicyResponse +++ /dev/null @@ -1,20 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateAccountPasswordPolicy -&MinimumPasswordLength=9 -&RequireSymbols=true -&RequireNumbers=false -&RequireUppercaseCharacters=true -&RequireLowercaseCharacters=true -&AllowUsersToChangePassword=true -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - diff --git a/test/resources/IAM/UpdateAssumeRolePolicy b/test/resources/IAM/UpdateAssumeRolePolicy deleted file mode 100644 index 9eccf4e3edb..00000000000 --- a/test/resources/IAM/UpdateAssumeRolePolicy +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateAssumeRolePolicy -&PolicyDocument={"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 309c1671-99ed-11e1-a4c3-270EXAMPLE04 - - - - diff --git a/test/resources/IAM/UpdateAssumeRolePolicyResponse b/test/resources/IAM/UpdateAssumeRolePolicyResponse deleted file mode 100644 index 9eccf4e3edb..00000000000 --- a/test/resources/IAM/UpdateAssumeRolePolicyResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateAssumeRolePolicy -&PolicyDocument={"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]} -&RoleName=S3Access -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 309c1671-99ed-11e1-a4c3-270EXAMPLE04 - - - - diff --git a/test/resources/IAM/UpdateGroup b/test/resources/IAM/UpdateGroup deleted file mode 100644 index d67b8e38efe..00000000000 --- a/test/resources/IAM/UpdateGroup +++ /dev/null @@ -1,26 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateGroup -&GroupName=Test -&NewGroupName=Test_1 -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - /division_abc/subdivision_xyz/product_1234/engineering/ - Test_1 - AGP2MAB8DPLSRHEXAMPLE - arn:aws:iam::123456789012:group/division_abc/subdivision_xyz/ - product_1234/engineering/Test_1 - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateGroupResponse b/test/resources/IAM/UpdateGroupResponse deleted file mode 100644 index d67b8e38efe..00000000000 --- a/test/resources/IAM/UpdateGroupResponse +++ /dev/null @@ -1,26 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateGroup -&GroupName=Test -&NewGroupName=Test_1 -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - /division_abc/subdivision_xyz/product_1234/engineering/ - Test_1 - AGP2MAB8DPLSRHEXAMPLE - arn:aws:iam::123456789012:group/division_abc/subdivision_xyz/ - product_1234/engineering/Test_1 - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateLoginProfile b/test/resources/IAM/UpdateLoginProfile deleted file mode 100644 index 45326b839c6..00000000000 --- a/test/resources/IAM/UpdateLoginProfile +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateLoginProfile -&UserName=Bob -&Password=NewPassword -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateLoginProfileResponse b/test/resources/IAM/UpdateLoginProfileResponse deleted file mode 100644 index 45326b839c6..00000000000 --- a/test/resources/IAM/UpdateLoginProfileResponse +++ /dev/null @@ -1,16 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateLoginProfile -&UserName=Bob -&Password=NewPassword -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateServerCertificate b/test/resources/IAM/UpdateServerCertificate deleted file mode 100644 index f31f09343e7..00000000000 --- a/test/resources/IAM/UpdateServerCertificate +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateServerCertificate -&ServerCertificateName=ProdServerCert -&NewServerCertificateName=ProdServerCertName -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateServerCertificateResponse b/test/resources/IAM/UpdateServerCertificateResponse deleted file mode 100644 index f31f09343e7..00000000000 --- a/test/resources/IAM/UpdateServerCertificateResponse +++ /dev/null @@ -1,17 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateServerCertificate -&ServerCertificateName=ProdServerCert -&NewServerCertificateName=ProdServerCertName -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateSigningCertificate b/test/resources/IAM/UpdateSigningCertificate deleted file mode 100644 index 5f09cfcf0a2..00000000000 --- a/test/resources/IAM/UpdateSigningCertificate +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateSigningCertificate -&UserName=Bob -&CertificateId=TA7SMP42TDN5Z26OBPJE7EXAMPLE -&Status=Inactive -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateSigningCertificateResponse b/test/resources/IAM/UpdateSigningCertificateResponse deleted file mode 100644 index 5f09cfcf0a2..00000000000 --- a/test/resources/IAM/UpdateSigningCertificateResponse +++ /dev/null @@ -1,18 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateSigningCertificate -&UserName=Bob -&CertificateId=TA7SMP42TDN5Z26OBPJE7EXAMPLE -&Status=Inactive -&Version=2010-05-08 -&AUTHPARAMS - - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateUser b/test/resources/IAM/UpdateUser deleted file mode 100644 index 25f95168397..00000000000 --- a/test/resources/IAM/UpdateUser +++ /dev/null @@ -1,26 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateUser -&UserName=Bob -&NewUserName=Robert -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - /division_abc/subdivision_xyz/ - Robert - AIDACKCEVSQ6C2EXAMPLE - arn:aws::123456789012:user/division_abc/subdivision_xyz/Robert - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UpdateUserResponse b/test/resources/IAM/UpdateUserResponse deleted file mode 100644 index 25f95168397..00000000000 --- a/test/resources/IAM/UpdateUserResponse +++ /dev/null @@ -1,26 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UpdateUser -&UserName=Bob -&NewUserName=Robert -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - /division_abc/subdivision_xyz/ - Robert - AIDACKCEVSQ6C2EXAMPLE - arn:aws::123456789012:user/division_abc/subdivision_xyz/Robert - - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UploadServerCertificate b/test/resources/IAM/UploadServerCertificate deleted file mode 100644 index c15d3f7f147..00000000000 --- a/test/resources/IAM/UploadServerCertificate +++ /dev/null @@ -1,54 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UploadServerCertificate -&ServerCertificateName=ProdServerCert -&Path=/company/servercerts/ -&CertificateBody=-----BEGIN CERTIFICATE----- -MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT -AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT -GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy -MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw -FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf -MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr -dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL -ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf -suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww -CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK -CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH -wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX -wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX -AEaHzTpmEXAMPLE= ------END CERTIFICATE----- -&PrivateKey=-----BEGIN DSA PRIVATE KEY----- -MIIBugIBTTKBgQD33xToSXPJ6hr37L3+KNi3/7DgywlBcvlFPPSHIw3ORuO/22mT -8Cy5fT89WwNvZ3BPKWU6OZ38TQv3eWjNc/3U3+oqVNG2poX5nCPOtO1b96HYX2mR -3FTdH6FRKbQEhpDzZ6tRrjTHjMX6sT3JRWkBd2c4bGu+HUHO1H7QvrCTeQIVTKMs -TCKCyrLiGhUWuUGNJUMU6y6zToGTHl84Tz7TPwDGDXuy/Dk5s4jTVr+xibROC/gS -Qrs4Dzz3T1ze6lvU8S1KT9UsOB5FUJNTTPCPey+Lo4mmK6b23XdTyCIT8e2fsm2j -jHHC1pIPiTkdLS3j6ZYjF8LY6TENFng+LDY/xwPOl7TJVoD3J/WXC2J9CEYq9o34 -kq6WWn3CgYTuo54nXUgnoCb3xdG8COFrg+oTbIkHTSzs3w5o/GGgKK7TDF3UlJjq -vHNyJQ6kWBrQRR1Xp5KYQ4c/Dm5kef+62mH53HpcCELguWVcffuVQpmq3EWL9Zp9 -jobTJQ2VHjb5IVxiO6HRSd27di3njyrzUuJCyHSDTqwLJmTThpd6OTIUTL3Tc4m2 -62TITdw53KWJEXAMPLE= ------END DSA PRIVATE KEY----- -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - ProdServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/ProdServerCert - 2010-05-08T01:02:03.004Z - ASCACKCEVSQ6C2EXAMPLE - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UploadServerCertificateResponse b/test/resources/IAM/UploadServerCertificateResponse deleted file mode 100644 index c15d3f7f147..00000000000 --- a/test/resources/IAM/UploadServerCertificateResponse +++ /dev/null @@ -1,54 +0,0 @@ - -https://iam.amazonaws.com/ -?Action=UploadServerCertificate -&ServerCertificateName=ProdServerCert -&Path=/company/servercerts/ -&CertificateBody=-----BEGIN CERTIFICATE----- -MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT -AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT -GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy -MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw -FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf -MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr -dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL -ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf -suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww -CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK -CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH -wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX -wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX -AEaHzTpmEXAMPLE= ------END CERTIFICATE----- -&PrivateKey=-----BEGIN DSA PRIVATE KEY----- -MIIBugIBTTKBgQD33xToSXPJ6hr37L3+KNi3/7DgywlBcvlFPPSHIw3ORuO/22mT -8Cy5fT89WwNvZ3BPKWU6OZ38TQv3eWjNc/3U3+oqVNG2poX5nCPOtO1b96HYX2mR -3FTdH6FRKbQEhpDzZ6tRrjTHjMX6sT3JRWkBd2c4bGu+HUHO1H7QvrCTeQIVTKMs -TCKCyrLiGhUWuUGNJUMU6y6zToGTHl84Tz7TPwDGDXuy/Dk5s4jTVr+xibROC/gS -Qrs4Dzz3T1ze6lvU8S1KT9UsOB5FUJNTTPCPey+Lo4mmK6b23XdTyCIT8e2fsm2j -jHHC1pIPiTkdLS3j6ZYjF8LY6TENFng+LDY/xwPOl7TJVoD3J/WXC2J9CEYq9o34 -kq6WWn3CgYTuo54nXUgnoCb3xdG8COFrg+oTbIkHTSzs3w5o/GGgKK7TDF3UlJjq -vHNyJQ6kWBrQRR1Xp5KYQ4c/Dm5kef+62mH53HpcCELguWVcffuVQpmq3EWL9Zp9 -jobTJQ2VHjb5IVxiO6HRSd27di3njyrzUuJCyHSDTqwLJmTThpd6OTIUTL3Tc4m2 -62TITdw53KWJEXAMPLE= ------END DSA PRIVATE KEY----- -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - ProdServerCert - /company/servercerts/ - arn:aws:iam::123456789012:server-certificate/company/servercerts/ProdServerCert - 2010-05-08T01:02:03.004Z - ASCACKCEVSQ6C2EXAMPLE - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UploadSigningCertificate b/test/resources/IAM/UploadSigningCertificate deleted file mode 100644 index ab5e13495fe..00000000000 --- a/test/resources/IAM/UploadSigningCertificate +++ /dev/null @@ -1,58 +0,0 @@ - -POST / HTTP/1.1 -Host: iam.amazonaws.com -Content-Type: application/x-www-form-urlencoded - -Action=UploadSigningCertificate -&UserName=Bob -&CertificateBody=-----BEGIN CERTIFICATE----- - MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT - AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT - GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy - MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw - FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf - MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr - dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL - ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf - suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww - CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK - CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH - wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX - wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX - AEaHzTpmEXAMPLE= - -----END CERTIFICATE----- -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - Bob - TA7SMP42TDN5Z26OBPJE7EXAMPLE - -----BEGIN CERTIFICATE----- - MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT - AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT - GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy - MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw - FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf - MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr - dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL - ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf - suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww - CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK - CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH - wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX - wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX - AEaHzTpmEXAMPLE= - -----END CERTIFICATE----- - Active - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/IAM/UploadSigningCertificateResponse b/test/resources/IAM/UploadSigningCertificateResponse deleted file mode 100644 index ab5e13495fe..00000000000 --- a/test/resources/IAM/UploadSigningCertificateResponse +++ /dev/null @@ -1,58 +0,0 @@ - -POST / HTTP/1.1 -Host: iam.amazonaws.com -Content-Type: application/x-www-form-urlencoded - -Action=UploadSigningCertificate -&UserName=Bob -&CertificateBody=-----BEGIN CERTIFICATE----- - MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT - AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT - GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy - MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw - FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf - MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr - dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL - ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf - suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww - CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK - CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH - wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX - wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX - AEaHzTpmEXAMPLE= - -----END CERTIFICATE----- -&Version=2010-05-08 -&AUTHPARAMS - - - - - - - Bob - TA7SMP42TDN5Z26OBPJE7EXAMPLE - -----BEGIN CERTIFICATE----- - MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT - AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT - GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy - MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw - FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf - MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr - dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL - ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf - suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww - CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK - CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH - wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX - wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX - AEaHzTpmEXAMPLE= - -----END CERTIFICATE----- - Active - - - - 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE - - - - diff --git a/test/resources/RDS/AddSourceIdentifierToSubscription b/test/resources/RDS/AddSourceIdentifierToSubscription deleted file mode 100644 index 198dc65ce29..00000000000 --- a/test/resources/RDS/AddSourceIdentifierToSubscription +++ /dev/null @@ -1,38 +0,0 @@ -https://rds.us-east-1.amazonaws.com/ - ?Action=AddSourceIdentifierToSubscription - ?SubscriptionName=EventSubscription01 - &SourceIdentifier=dbinstance01 - &Version=2013-01-10 - &SignatureVersion=4 - &SignatureMethod=HmacSHA256 - &Timestamp=20130128T011410Z - &AWSAccessKeyId= - &Signature= - - - - - - - true - 012345678901 - db-instance - modifying - - dbinstance01 - - 2013-01-28 00:29:23.736 - - creation - deletion - - EventSubscription01 - arn:aws:sns:us-east-1:012345678901:EventSubscription01 - - - - 05d0fd8a-68e8-11e2-8e4d-31f087d822e1 - - - - diff --git a/test/resources/RDS/AddTagsToResource b/test/resources/RDS/AddTagsToResource deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/RDS/AuthorizeDBSecurityGroupIngress b/test/resources/RDS/AuthorizeDBSecurityGroupIngress deleted file mode 100644 index 00ffc717b89..00000000000 --- a/test/resources/RDS/AuthorizeDBSecurityGroupIngress +++ /dev/null @@ -1,32 +0,0 @@ -https://rds.amazonaws.com/ - ?CIDRIP=192.168.1.1%2F24 - &DBSecurityGroupName=mydbsecuritygroup - &Version=2013-05-15 - &Action=AuthorizeDBSecurityGroupIngress - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T17%3A10%3A50.274Z - &AWSAccessKeyId= - &Signature= - - - - - - My new DBSecurityGroup - - - 192.168.1.1/24 - authorizing - - - 621567473609 - mydbsecuritygroup - vpc-1ab2c3d4 - - - - d9799197-bf2d-11de-b88d-993294bf1c81 - - - diff --git a/test/resources/RDS/CopyDBSnapshot b/test/resources/RDS/CopyDBSnapshot deleted file mode 100644 index e3dfacb4f6c..00000000000 --- a/test/resources/RDS/CopyDBSnapshot +++ /dev/null @@ -1,32 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=CopyDBSnapshot - &SourceDBSnapshotIdentifier=rds:simcoprod01-2012-04-02-00-01 - &TargetDBSnapshotIdentifier=mydbsnapshot - &Version=2013-05-15 - &SignatureVersion=2&SignatureMethod=HmacSHA256 - &Timestamp=2011-12-12T06%3A27%3A42.551Z - &AWSAccessKeyId= - &Signature= - - - - - 3306 - mysql - available - us-east-1a - general-public-license - 2011-05-23T06:06:43.110Z - 10 - simcoprod01 - 5.1.50 - mydbsnapshot - manual - master - - - - c4181d1d-8505-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/CreateDBInstance b/test/resources/RDS/CreateDBInstance deleted file mode 100644 index e2d57cae501..00000000000 --- a/test/resources/RDS/CreateDBInstance +++ /dev/null @@ -1,84 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=CreateDBInstance - &DBInstanceIdentifier=SimCoProd01 - &Engine=mysql - &MasterUserPassword=Password01 - &AllocatedStorage=10 - &MasterUsername=master - &Version=2013-05-15 - &DBInstanceClass=db.m1.large - &DBSubnetGroupName=dbSubnetgroup01 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-23T05%3A54%3A53.578Z - &AWSAccessKeyId= - &Signature= - - - - - - mysql - - **** - - 1 - false - general-public-license - - 990524496922 - Complete - description - subnet_grp1 - - - Active - subnet-7c5b4115 - - us-east-1c - - - - Active - subnet-7b5b4112 - - us-east-1b - - - - Active - subnet-3ea6bd57 - - us-east-1d - - - - - creating - 5.1.50 - simcoprod01 - - - in-sync - default.mysql5.1 - - - - - active - default - - - 00:00-00:30 - true - sat:07:30-sat:08:00 - 10 - db.m1.large - master - - - - 2e5d4270-8501-11e0-bd9b-a7b1ece36d51 - - - diff --git a/test/resources/RDS/CreateDBInstanceReadReplica b/test/resources/RDS/CreateDBInstanceReadReplica deleted file mode 100644 index c19f2853d18..00000000000 --- a/test/resources/RDS/CreateDBInstanceReadReplica +++ /dev/null @@ -1,49 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=CreateDBInstanceReadReplica - &DBInstanceIdentifier=myreadreplica - &SourceDBInstanceIdentifier=mydbinstance - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-15T23%3A35%3A07.325Z - &AWSAccessKeyId= - &Signature= - - - - - - mysql - - 0 - false - general-public-license - creating - 5.1.50 - myreadreplica - - - in-sync - default.mysql5.1 - - - mydbinstance - - - active - default - - - 23:00-01:00 - true - sun:05:00-sun:09:00 - 10 - db.m1.small - master - - - - 3e24c5cd-c6e2-11df-8463-4f0c49644cb7 - - - diff --git a/test/resources/RDS/CreateDBParameterGroup b/test/resources/RDS/CreateDBParameterGroup deleted file mode 100644 index ff88b593fde..00000000000 --- a/test/resources/RDS/CreateDBParameterGroup +++ /dev/null @@ -1,25 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=CreateDBParameterGroup - &DBParameterGroupName=mydbparametergroup3 - &DBParameterGroupFamily=MySQL5.1 - &Version=2013-05-15 - &Description=My%20new%20DBParameterGroup - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-11T18%3A09%3A29.793Z - &AWSAccessKeyId= - &Signature= - - - - - mysql5.1 - My new DBParameterGroup - mydbparametergroup3 - - - - 0b447b66-bf36-11de-a88b-7b5b3d23b3a7 - - - diff --git a/test/resources/RDS/CreateDBSecurityGroup b/test/resources/RDS/CreateDBSecurityGroup deleted file mode 100644 index 83e66627db1..00000000000 --- a/test/resources/RDS/CreateDBSecurityGroup +++ /dev/null @@ -1,28 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=CreateDBSecurityGroup - &DBSecurityGroupName=mydbsecuritygroup - &DBSecurityGroupDescription=My%20new%20DBSecurityGroup - &EC2VpcId=vpc-1a2b3c4d - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T18%3A14%3A49.482Z - &AWSAccessKeyId= - &Signature= - - - - - - My new DBSecurityGroup - - 565419523791 - mydbsecuritygroup - vpc-1a2b3c4d - - - - ed662948-a57b-11df-9e38-7ffab86c801f - - - diff --git a/test/resources/RDS/CreateDBSnapshot b/test/resources/RDS/CreateDBSnapshot deleted file mode 100644 index f3fafd18506..00000000000 --- a/test/resources/RDS/CreateDBSnapshot +++ /dev/null @@ -1,32 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=CreateDBSnapshot - &DBInstanceIdentifier=simcoprod01 - &DBSnapshotIdentifier=mydbsnapshot - &Version=2013-05-15 - &SignatureVersion=2&SignatureMethod=HmacSHA256 - &Timestamp=2011-05-23T06%3A27%3A42.551Z - &AWSAccessKeyId= - &Signature= - - - - - 3306 - mysql - creating - us-east-1a - general-public-license - 2011-05-23T06:06:43.110Z - 10 - simcoprod01 - 5.1.50 - mydbsnapshot - manual - master - - - - c4181d1d-8505-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/CreateDBSubnetGroup b/test/resources/RDS/CreateDBSubnetGroup deleted file mode 100644 index 283e6673c1b..00000000000 --- a/test/resources/RDS/CreateDBSubnetGroup +++ /dev/null @@ -1,48 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=CreateDBSubnetGroup - &DBSubnetGroupName=mydbsubnetgroup - &DBSubnetGroupDescription=My%20new%20DBSubnetGroup - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T18%3A14%3A49.482Z - &AWSAccessKeyId= - &Signature= - - - - - 990524496922 - Complete - My new DBSubnetGroup - mydbsubnetgroup - - - Active - subnet-7c5b4115 - - us-east-1c - - - - Active - subnet-7b5b4112 - - us-east-1b - - - - Active - subnet-3ea6bd57 - - us-east-1d - - - - - - - ed662948-a57b-11df-9e38-7ffab86c801f - - - diff --git a/test/resources/RDS/CreateEventSubscription b/test/resources/RDS/CreateEventSubscription deleted file mode 100644 index 2198fb65547..00000000000 --- a/test/resources/RDS/CreateEventSubscription +++ /dev/null @@ -1,72 +0,0 @@ -https://rds.us-east-1.amazonaws.com/ - ?Action=CreateEventSubscription - &SubscriptionName=EventSubscription02 - &Enabled=true - &SnsTopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A012345678901%3AEventSubscription01 - &Version=2013-01-10 - &SignatureVersion=4 - &SignatureMethod=HmacSHA256 - &Timestamp=20130128T002941Z - &AWSAccessKeyId= - &Signature= - https://rds.us-east-1.amazonaws.com/ - ?Action=CreateEventSubscription - &SubscriptionName=EventSubscription03 - &SourceType=db-instance - &EventCategories.member.1=creation - &EventCategories.member.2=deletion - &SourceIds.member.1=dbinstance01 - &SourceIds.member.2=dbinstance02 - &Enabled=true - &SnsTopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A012345678901%3AEventSubscription01 - &Version=2013-01-10 - &SignatureVersion=4 - &SignatureMethod=HmacSHA256 - &Timestamp=20130128T014117Z - &AWSAccessKeyId= - &Signature= - - - - - - true - 012345678901 - creating - Mon Jan 28 00:29:42 UTC 2013 - EventSubscription02 - arn:aws:sns:us-east-1:012345678901:EventSubscription01 - - - - cf3407aa-68e1-11e2-bd13-a92da73b3119 - - - - - - - true - 012345678901 - db-instance - creating - - dbinstance01 - dbinstance02 - - Mon Jan 28 01:41:19 UTC 2013 - - creation - deletion - - EventSubscription03 - arn:aws:sns:us-east-1:012345678901:EventSubscription01 - - - - d064b48c-68eb-11e2-ab10-11125abcb784 - - - - - diff --git a/test/resources/RDS/CreateOptionGroup b/test/resources/RDS/CreateOptionGroup deleted file mode 100644 index 62ecc95f56b..00000000000 --- a/test/resources/RDS/CreateOptionGroup +++ /dev/null @@ -1,22 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=CreateOptionGroup - &OptionGroupName=myoptiongroup - &EngineName=oracle-se1 - &MajorEngineVersion=11.2 - &OptionGroupDescription=Test option group - - - - - 11.2 - myoptiongroup - oracle-se1 - Test option group - - - - - b2416a8a-84c9-11e1-a264-0b23c28bc344 - - - diff --git a/test/resources/RDS/DeleteDBInstance b/test/resources/RDS/DeleteDBInstance deleted file mode 100644 index 4f6f8248506..00000000000 --- a/test/resources/RDS/DeleteDBInstance +++ /dev/null @@ -1,55 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DeleteDBInstance - &DBInstanceIdentifier=myrestoreddbinstance - &SkipFinalSnapshot=true - &Version=2013-05-15 - &Timestamp=2011-05-23T07%3A19%3A35.947Z - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &AWSAccessKeyId= - &Signature= - - - - - - 2011-05-23T07:15:00Z - mysql - - 1 - false - general-public-license - deleting - 5.1.50 - - 3306 -
myrestoreddbinstance.cu7u2t4uz396.us-east.rds.amazonaws.com
- - myrestoreddbinstance - - - in-sync - default.mysql5.1 - - - - - active - default - - - 00:00-00:30 - true - sat:07:30-sat:08:00 - us-east-1d - 2011-05-23T06:52:48.255Z - 10 - db.m1.large - master - - - - 03ea4ae8-850d-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/DeleteDBParameterGroup b/test/resources/RDS/DeleteDBParameterGroup deleted file mode 100644 index bfff40fb8f5..00000000000 --- a/test/resources/RDS/DeleteDBParameterGroup +++ /dev/null @@ -1,15 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DeleteDBParameterGroup - &DBParameterGroupName=mydbparametergroup - &Version=2013-05-15 - &SignatureVersion=2&SignatureMethod=HmacSHA256 - &Timestamp=2011-05-11T18%3A47%3A08.851Z - &AWSAccessKeyId= - &Signature= - - - - 4dc38be9-bf3b-11de-a88b-7b5b3d23b3a7 - - - diff --git a/test/resources/RDS/DeleteDBSecurityGroup b/test/resources/RDS/DeleteDBSecurityGroup deleted file mode 100644 index 9f96705e44d..00000000000 --- a/test/resources/RDS/DeleteDBSecurityGroup +++ /dev/null @@ -1,16 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DeleteDBSecurityGroup - &DBSecurityGroupName=mysecuritygroup - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T17%3A48%3A21.746Z - &AWSAccessKeyId= - &Signature= - - - - 5d013245-4172-11df-8520-e7e1e602a915 - - - diff --git a/test/resources/RDS/DeleteDBSnapshot b/test/resources/RDS/DeleteDBSnapshot deleted file mode 100644 index 3b07a1b836f..00000000000 --- a/test/resources/RDS/DeleteDBSnapshot +++ /dev/null @@ -1,32 +0,0 @@ -https://rds.amazon.com/ - &DBSnapshotIdentifier=mydbsnapshot - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-23T06%3A27%3A42.551Z - &AWSAccessKeyId= - &Signature= - - - - - 3306 - 2011-03-11T07:20:24.082Z - mysql - deleted - us-east-1d - general-public-license - 2010-07-16T00:06:59.107Z - 60 - simcoprod01 - 5.1.47 - mysnapshot2 - manual - master - - - - 627a43a1-8507-11e0-bd9b-a7b1ece36d51 - - - diff --git a/test/resources/RDS/DeleteDBSubnetGroup b/test/resources/RDS/DeleteDBSubnetGroup deleted file mode 100644 index 42983e871b1..00000000000 --- a/test/resources/RDS/DeleteDBSubnetGroup +++ /dev/null @@ -1,16 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DeleteDBSubnetGroup - &DBSubnetGroupName=mysubnetgroup - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T17%3A48%3A21.746Z - &AWSAccessKeyId= - &Signature= - - - - 5d013245-4172-11df-8520-e7e1e602a915 - - - diff --git a/test/resources/RDS/DeleteEventSubscription b/test/resources/RDS/DeleteEventSubscription deleted file mode 100644 index 43d4427cbe0..00000000000 --- a/test/resources/RDS/DeleteEventSubscription +++ /dev/null @@ -1,35 +0,0 @@ -https://rds.us-east-1.amazonaws.com/ - ?Action=DeleteEventSubscription - &SubscriptionName=EventSubscription01 - &Version=2013-01-10 - &SignatureVersion=4 - &SignatureMethod=HmacSHA256 - &Timestamp=20130128T012739Z - &AWSAccessKeyId= - &Signature= - - - - - - - true - 012345678901 - db-instance - deleting - 2013-01-28 00:29:23.736 - - creation - deletion - - EventSubscription01 - arn:aws:sns:us-east-1:012345678901:EventSubscription01 - - - - e7cf30ac-68e9-11e2-bd13-a92da73b3119 - - - - - diff --git a/test/resources/RDS/DeleteOptionGroup b/test/resources/RDS/DeleteOptionGroup deleted file mode 100644 index 41bfc0d1cf2..00000000000 --- a/test/resources/RDS/DeleteOptionGroup +++ /dev/null @@ -1,7 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DeleteOptionGroup - &OptionGroupName=myoptiongroup - - - - diff --git a/test/resources/RDS/DescribeDBEngineVersions b/test/resources/RDS/DescribeDBEngineVersions deleted file mode 100644 index 366229d51dd..00000000000 --- a/test/resources/RDS/DescribeDBEngineVersions +++ /dev/null @@ -1,166 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeDBEngineVersions - &MaxRecords=100 - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-23T07%3A34%3A17.435Z - &AWSAccessKeyId= - &Signature= - - - - - - mysql5.1 - mysql - 5.1.42 - - - mysql5.1 - mysql - Use instead of mysql5.1 - 5.1.45 - yaSSL Security Fixes - - - mysql5.1 - mysql - Use instead of mysql5.1 - 5.1.47 - MySQL 5.1.47.R1 with InnoDB Plugin 1.0.8 - - - mysql5.1 - mysql - Use instead of mysql5.1 - 5.1.48 - MySQL 5.1.47.R1 with InnoDB Plugin 1.0.8 - - - mysql5.1 - mysql - Use instead of mysql5.1 - 5.1.49 - MySQL 5.1.49-R1 with innodb plugin - - - mysql5.1 - mysql - Use instead of mysql5.1 - 5.1.50 - MySQL 5.1.50-R3 - - - mysql5.5 - mysql - Use instead of mysql5.1 - 5.5.7 - MySQL 5.5.7.R1 - - - oracle-ee-11.2 - oracle-ee - Oracle Database Server EE - 11.2.0.2 - Oracle EE release - - AL32UTF8 - Unicode 5.0 UTF-8 Universal character set - - - - oracle-ee-11.2 - oracle-ee - Oracle Database Server EE - 11.2.0.2.v2 - First Oracle Enterprise Edition One - DB Engine Version 11.2.0.2.v2 - - AL32UTF8 - Unicode 5.0 UTF-8 Universal character set - - - - oracle-ee-11.2 - oracle-ee - Oracle Database Server EE - 11.2.0.2.v3 - Oracle EE release - - AL32UTF8 - Unicode 5.0 UTF-8 Universal character set - - - - oracle-se-11.2 - oracle-se - Oracle Database Server SE - 11.2.0.2 - Oracle SE release - - AL32UTF8 - Unicode 5.0 UTF-8 Universal character set - - - - oracle-se-11.2 - oracle-se - Oracle Database Server SE - 11.2.0.2.v2 - Oracle SE release - - AL32UTF8 - Unicode 5.0 UTF-8 Universal character set - - - - oracle-se-11.2 - oracle-se - Oracle Database Server SE - 11.2.0.2.v3 - Oracle SE release - - AL32UTF8 - Unicode 5.0 UTF-8 Universal character set - - - - oracle-se1-11.2 - oracle-se1 - Oracle Database Server SE1 - 11.2.0.2 - Oracle SE1 release - - AL32UTF8 - Unicode 5.0 UTF-8 Universal character set - - - - oracle-se1-11.2 - oracle-se1 - Oracle Database Server SE1 - 11.2.0.2.v2 - Oracle SE1 release - - AL32UTF8 - Unicode 5.0 UTF-8 Universal character set - - - - oracle-se1-11.2 - oracle-se1 - Oracle Database Server SE1 - 11.2.0.2.v3 - Oracle SE1 release - - AL32UTF8 - Unicode 5.0 UTF-8 Universal character set - - - - - - 1162dc55-850f-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/DescribeDBInstances b/test/resources/RDS/DescribeDBInstances deleted file mode 100644 index 642088a5c19..00000000000 --- a/test/resources/RDS/DescribeDBInstances +++ /dev/null @@ -1,61 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeDBInstances - &Version=2013-05-15 - &MaxRecords=100 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-23T06%3A54%3A55.116Z - &AWSAccessKeyId=< Your AWS Access ID Key > - &Signature= < Your Signature > - - - - - - - 2011-05-23T06:50:00Z - mysql - - 1 - false - general-public-license - available - 5.1.50 - - 3306 -
simcoprod01.cu7u2t4uz396.us-east-1.rds.amazonaws.com
- - simcoprod01 - - - in-sync - default.mysql5.1 - - - - - active - default - - - 00:00-00:30 - true - sat:07:30-sat:08:00 - us-east-1a - 2011-05-23T06:06:43.110Z - 10 - - - default.mysql5.1 - in-sync - - - db.m1.large - master - - - - 9135fff3-8509-11e0-bd9b-a7b1ece36d51 - - - diff --git a/test/resources/RDS/DescribeDBLogFiles b/test/resources/RDS/DescribeDBLogFiles deleted file mode 100644 index 9d47a37c36c..00000000000 --- a/test/resources/RDS/DescribeDBLogFiles +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/test/resources/RDS/DescribeDBParameterGroups b/test/resources/RDS/DescribeDBParameterGroups deleted file mode 100644 index 19e44afa3b4..00000000000 --- a/test/resources/RDS/DescribeDBParameterGroups +++ /dev/null @@ -1,31 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeDBParameterGroups - &DBParameterGroupName=myparamsgroup - &MaxRecords=100 - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T17%3A54%3A32.899Z - &AWSAccessKeyId= - &Signature= - - - - - - mysql5.1 - Default parameter group for mysql5.1 - default.mysql5.1 - - - mysql5.1 - My DB Param Group - testdbparamgroup - - - - - cb8d9bb4-a02a-11df-bd60-c955b7d6e8e0 - - - diff --git a/test/resources/RDS/DescribeDBParameters b/test/resources/RDS/DescribeDBParameters deleted file mode 100644 index 01fde3e78a7..00000000000 --- a/test/resources/RDS/DescribeDBParameters +++ /dev/null @@ -1,41 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeDBParameters - &DBParameterGroupName=mydbparametergroup - &Source=system - &MaxRecords=100 - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-11T19%3A31%3A42.262Z - &AWSAccessKeyId= - &Signature= - - - - - - /rdsdbbin/mysql - string - system - false - The MySQL installation base directory. - static - basedir - - - 32768 - integer - system - true - The size of the cache to hold the SQL statements for the binary log during a transaction. - dynamic - 4096-9223372036854775807 - binlog_cache_size - - - - - 8743f2cf-bf41-11de-8c8e-49155882c409 - - - diff --git a/test/resources/RDS/DescribeDBSecurityGroups b/test/resources/RDS/DescribeDBSecurityGroups deleted file mode 100644 index dd7d1112005..00000000000 --- a/test/resources/RDS/DescribeDBSecurityGroups +++ /dev/null @@ -1,60 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeDBSecurityGroups - &Version=2013-05-15 - &MaxRecords=100 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T19%3A40%3A19.926Z - &AWSAccessKeyId= - &Signature= - - - - - - - - authorized - myec2securitygroup - 054794666394 - - - default - - - 127.0.0.1/30 - authorized - - - 621567473609 - default - vpc-1ab2c3d4 - - - - My new DBSecurityGroup - - - 192.168.1.1/24 - authorized - - - 621567473609 - mydbsecuritygroup - vpc-1ab2c3d5 - - - - My new DBSecurityGroup - - 621567473609 - mydbsecuritygroup4 - vpc-1ab2c3d6 - - - - - bbdad154-bf42-11de-86a4-97241dfaadff - - - diff --git a/test/resources/RDS/DescribeDBSnapshots b/test/resources/RDS/DescribeDBSnapshots deleted file mode 100644 index 22c76751ffd..00000000000 --- a/test/resources/RDS/DescribeDBSnapshots +++ /dev/null @@ -1,68 +0,0 @@ -https://rds.amazon.com/ - ?Action=DescribeDBSnapshots - &MaxRecords=100 - &Version=2013-05-15 - &Timestamp=2011-05-23T06%3A27%3A42.551Z - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &AWSAccessKeyId= - &Signature= - - - - - - 3306 - 2011-05-23T06:29:03.483Z - mysql - available - us-east-1a - general-public-license - 2011-05-23T06:06:43.110Z - 10 - simcoprod01 - 5.1.50 - mydbsnapshot - manual - master - myoptiongroupname - - - 3306 - 2011-03-11T07:20:24.082Z - mysql - available - us-east-1a - general-public-license - 2010-08-04T23:27:36.420Z - 50 - mydbinstance - 5.1.49 - mysnapshot1 - manual - sa - myoptiongroupname - - - 3306 - 2012-04-02T00:01:24.082Z - mysql - available - us-east-1d - general-public-license - 2010-07-16T00:06:59.107Z - 60 - simcoprod01 - 5.1.47 - rds:simcoprod01-2012-04-02-00-01 - automated - master - myoptiongroupname - - - - - c4191173-8506-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/DescribeDBSubnetGroups b/test/resources/RDS/DescribeDBSubnetGroups deleted file mode 100644 index 46c7e1ef3f8..00000000000 --- a/test/resources/RDS/DescribeDBSubnetGroups +++ /dev/null @@ -1,78 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeDBSubnetGroups - &Version=2013-05-15 - &MaxRecords=100 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T19%3A40%3A19.926Z - &AWSAccessKeyId= - &Signature= - - - - - - 990524496922 - Complete - description - subnet_grp1 - - - Active - subnet-7c5b4115 - - us-east-1c - - - - Active - subnet-7b5b4112 - - us-east-1b - - - - Active - subnet-3ea6bd57 - - us-east-1d - - - - - - 990524496922 - Complete - description - subnet_grp2 - - - Active - subnet-7c5b4115 - - us-east-1c - - - - Active - subnet-7b5b4112 - - us-east-1b - - - - Active - subnet-3ea6bd57 - - us-east-1d - - - - - - - - 31d0faee-229b-11e1-81f1-df3a2a803dad - - - diff --git a/test/resources/RDS/DescribeEngineDefaultParameters b/test/resources/RDS/DescribeEngineDefaultParameters deleted file mode 100644 index 5af7f3500b7..00000000000 --- a/test/resources/RDS/DescribeEngineDefaultParameters +++ /dev/null @@ -1,51 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeEngineDefaultParameters - &DBParameterGroupFamily=mysql5.1 - &Version=2013-05-15 - &MaxRecords=100 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T19%3A10%3A03.510Z - &AWSAccessKeyId= - &Signature= - - - - - bG93ZXJfY2FzZV90YWJsZV9uYW1lcw== - mysql5.1 - - - boolean - engine-default - false - Controls whether user-defined functions that have only an xxx symbol for the main function can be loaded - static - 0,1 - allow-suspicious-udfs - - - integer - engine-default - true - Intended for use with master-to-master replication, and can be used to control the operation of AUTO_INCREMENT columns - dynamic - 1-65535 - auto_increment_increment - - - integer - engine-default - true - Determines the starting point for the AUTO_INCREMENT column value - dynamic - 1-65535 - auto_increment_offset - - - - - 6c1341eb-a124-11df-bf5c-973b09643c5d - - - diff --git a/test/resources/RDS/DescribeEventCategories b/test/resources/RDS/DescribeEventCategories deleted file mode 100644 index 7b58d64defb..00000000000 --- a/test/resources/RDS/DescribeEventCategories +++ /dev/null @@ -1,40 +0,0 @@ -https://rds.us-east-1.amazonaws.com/ - ?Action=DescribeEventCategories - &SourceType=db-instance - &Version=2013-01-10 - &SignatureVersion=4 - &SignatureMethod=HmacSHA256 - &Timestamp=20130128T013452Z - &AWSAccessKeyId= - &Signature= - - - - - - - - db-instance - - failover - low storage - maintenance - recovery - restoration - deletion - configuration change - failover - availability - creation - backup - notification - - - - - - ea3bf54b-68ea-11e2-bd13-a92da73b3119 - - - - diff --git a/test/resources/RDS/DescribeEventSubscriptions b/test/resources/RDS/DescribeEventSubscriptions deleted file mode 100644 index 43f0500004e..00000000000 --- a/test/resources/RDS/DescribeEventSubscriptions +++ /dev/null @@ -1,38 +0,0 @@ -https://rds.us-east-1.amazonaws.com/ - ?Action=DescribeEventSubscriptions - &MaxRecords=100 - &Version=2013-01-10 - &SignatureVersion=4 - &SignatureMethod=HmacSHA256 - &Timestamp=20130128T004543Z - &AWSAccessKeyId= - &Signature= - - - - - - - true - 012345678901 - active - 2013-01-28 00:29:23.736 - EventSubscription01 - arn:aws:sns:us-east-1:012345678901:EventSubscription01 - - - true - 012345678901 - active - 2013-01-28 00:29:42.851 - EventSubscription02 - arn:aws:sns:us-east-1:012345678901:EventSubscription01 - - - - - 0ce48079-68e4-11e2-91fe-5daa8e68c7d4 - - - - diff --git a/test/resources/RDS/DescribeEvents b/test/resources/RDS/DescribeEvents deleted file mode 100644 index e44328cc80d..00000000000 --- a/test/resources/RDS/DescribeEvents +++ /dev/null @@ -1,51 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeEvents - &Duration=1440 - &MaxRecords=100 - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T20%3A00%3A44.420Z - &AWSAccessKeyId= - &Signature= - - - - - - Applied change to security group - db-security-group - 2010-08-11T17:12:52.860Z - mydbsecuritygroup - - - Database instance created - db-instance - 2010-08-11T18:10:15.269Z - mydbinstance3 - - - Backing up database instance - db-instance - 2010-08-11T18:10:34.690Z - mydbinstance3 - - - Backing up DB instance - db-instance - 2010-08-11T18:25:52.263Z - mynewdbinstance - - - Creating user snapshot - db-snapshot - 2010-08-11T18:25:52.263Z - mynewdbsnapshot3 - - - - - 95b948cd-bf45-11de-86a4-97241dfaadff - - - diff --git a/test/resources/RDS/DescribeOptionGroupOptions b/test/resources/RDS/DescribeOptionGroupOptions deleted file mode 100644 index 8890d98099b..00000000000 --- a/test/resources/RDS/DescribeOptionGroupOptions +++ /dev/null @@ -1,27 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeOptionGroupOptions - &EngineName=oracle-se1 - &MajorEngineVersion=11.2 - - - - - - 11.2 - true - - Oracle Enterprise Manager - 1158 - OEM - oracle-se1 - 0.2.v3 - false - false - - - - - d9c8f6a1-84c7-11e1-a264-0b23c28bc344 - - - diff --git a/test/resources/RDS/DescribeOptionGroups b/test/resources/RDS/DescribeOptionGroups deleted file mode 100644 index 7d6ef2a4c43..00000000000 --- a/test/resources/RDS/DescribeOptionGroups +++ /dev/null @@ -1,46 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeOptionGroups - &OptionGroupName=myoptiongroup - &MaxRecords=100 https://rds.amazonaws.com/ - ?Action=DescribeOptionGroups - &MaxRecords=100 - - - - - - 11.2 - myoptiongroup - oracle-se1 - Test option group - - - - - - 6088823d-84c8-11e1-a264-0b23c28bc344 - - - - - - 11.2 - myoptiongroup - oracle-se1 - Test option group - - - - 11.2 - default:oracle-se1-11-2 - oracle-se1 - Default option group. - - - - - - e4b234d9-84d5-11e1-87a6-71059839a52b - - - diff --git a/test/resources/RDS/DescribeOrderableDBInstanceOptions b/test/resources/RDS/DescribeOrderableDBInstanceOptions deleted file mode 100644 index 9a69deed4c3..00000000000 --- a/test/resources/RDS/DescribeOrderableDBInstanceOptions +++ /dev/null @@ -1,132 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeOrderableDBInstanceOptions - &Engine=mysql - &MaxRecords=100 - &Version=2013-05-15 - &Timestamp=2011-05-23T07%3A49%3A17.749Z - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &AWSAccessKeyId= - &Signature= - - - - - - - true - mysql - general-public-license - true - 5.1.45 - db.m1.large - - - us-east-1a - yes - - - us-east-1b - no - - - us-east-1d - yes - - - - - true - mysql - general-public-license - true - 5.1.45 - db.m1.small - - - us-east-1a - yes - - - us-east-1b - yes - - - us-east-1d - yes - - - - - true - mysql - general-public-license - true - 5.1.45 - db.m1.xlarge - - - us-east-1a - yes - - - us-east-1b - yes - - - us-east-1d - yes - - - - - true - mysql - general-public-license - true - 5.1.45 - db.m2.2xlarge - - - us-east-1a - yes - - - us-east-1b - yes - - - us-east-1d - yes - - - - - true - mysql - general-public-license - true - 5.1.45 - db.m2.4xlarge - - - us-east-1a - yes - - - us-east-1b - no - - - us-east-1d - no - - - - - - - 2a0406d7-8511-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/DescribeReservedDBInstances b/test/resources/RDS/DescribeReservedDBInstances deleted file mode 100644 index 9e951496492..00000000000 --- a/test/resources/RDS/DescribeReservedDBInstances +++ /dev/null @@ -1,34 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeReservedDBInstances - &ReservedDBInstanceId=customerSpecifiedID - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2012-12-18T18%3A31%3A36.118Z - &AWSAccessKeyId= - &Signature= - - - - - - Medium Utilization - USD - - mysql - 649fd0c8-cf6d-47a0-bfa6-060f8e75e95f - false - active - myreservationid - 1 - 2010-12-15T00:25:14.131Z - 31536000 - 227.5 - 0.046 - db.m1.small - - - - c695119b-2961-11e1-bd06-6fe008f046c3 - - - diff --git a/test/resources/RDS/DescribeReservedDBInstancesOfferings b/test/resources/RDS/DescribeReservedDBInstancesOfferings deleted file mode 100644 index a4d803aa384..00000000000 --- a/test/resources/RDS/DescribeReservedDBInstancesOfferings +++ /dev/null @@ -1,38 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=DescribeReservedDBInstancesOfferings - &ReservedDBInstancesOfferingId=438012d3-4052-4cc7-b2e3-8d3372e0e706 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-12-18T18%3A31%3A36.118Z - &AWSAccessKeyId= - &Signature= - - - - - - 31536000 - Heavy Utilization - USD - - - Hourly - 0.123 - - - 162.0 - mysql - 0.0 - false - SampleOfferingId - db.m1.small - - - - - 521b420a-2961-11e1-bd06-6fe008f046c3 - - - - diff --git a/test/resources/RDS/DownloadDBLogFilePortion b/test/resources/RDS/DownloadDBLogFilePortion deleted file mode 100644 index 96e33fcc76c..00000000000 --- a/test/resources/RDS/DownloadDBLogFilePortion +++ /dev/null @@ -1,52 +0,0 @@ -https://rds.amazonaws.com/ -?DBInstanceIdentifier=rra-mysql -&MaxRecords=100 -&Version=2013-05-15 -&Action=DescribeDBLogFiles -&SignatureVersion=4 -&SignatureMethod=HmacSHA256 -&Timestamp=20130327T173621Z -&X-Amz-Algorithm=AWS4-HMAC-SHA256 -&X-Amz-Date=20130327T173621Z -&X-Amz-SignedHeaders=Host -&X-Amz-Expires=20130327T173621Z -&X-Amz-Credential= -&X-Amz-Signature= - - - - - - - 1364403600000 - error/mysql-error-running.log - 0 - - - 1364338800000 - error/mysql-error-running.log.0 - 0 - - - 1364342400000 - error/mysql-error-running.log.1 - 0 - - - 1364371200000 - error/mysql-error-running.log.9 - 0 - - - 1364405700000 - error/mysql-error.log - 0 - - - - - d70fb3b3-9704-11e2-a0db-871552e0ef19 - - - - diff --git a/test/resources/RDS/ListTagsForResource b/test/resources/RDS/ListTagsForResource deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/RDS/ModifyDBInstance b/test/resources/RDS/ModifyDBInstance deleted file mode 100644 index 7923b4e33e7..00000000000 --- a/test/resources/RDS/ModifyDBInstance +++ /dev/null @@ -1,59 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=ModifyDBInstance - &DBInstanceIdentifier=simcoprod01 - &AllocatedStorage=50 - &Version=2013-05-15 - &ApplyImmediately=false - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-23T08%3A02%3A09.574Z - &AWSAccessKeyId= - &Signature= - - - - - - - 2011-05-23T08:00:00Z - mysql - - 50 - - 1 - false - general-public-license - available - 5.1.50 - - 3306 -
simcoprod01.cu7u2t4uz396.us-east-1.rds.amazonaws.com
- - simcoprod01 - - - in-sync - default.mysql5.1 - - - - - active - default - - - 00:00-00:30 - true - sat:07:30-sat:08:00 - us-east-1a - 2011-05-23T06:06:43.110Z - 10 - db.m1.large - master - - - - f61a020f-8512-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/ModifyDBParameterGroup b/test/resources/RDS/ModifyDBParameterGroup deleted file mode 100644 index 5deeb952680..00000000000 --- a/test/resources/RDS/ModifyDBParameterGroup +++ /dev/null @@ -1,25 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=ModifyDBParameterGroup - &DBParameterGroupName=mydbparametergroup - &Parameters.member.1.ParameterName=max_user_connections - &Parameters.member.1.ParameterValue=24 - &Parameters.member.1.ApplyMethod=pending-reboot - &Parameters.member.2.ParameterName=max_allowed_packet - &Parameters.member.2.ParameterValue=1024 - &Parameters.member.2.ApplyMethod=immediate - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-11T21%3A25%3A00.686Z - &AWSAccessKeyId= - &Signature= - - - - mydbparametergroup - - - 5ba91f97-bf51-11de-bf60-ef2e377db6f3 - - - diff --git a/test/resources/RDS/ModifyDBSubnetGroup b/test/resources/RDS/ModifyDBSubnetGroup deleted file mode 100644 index 7811a58bfbe..00000000000 --- a/test/resources/RDS/ModifyDBSubnetGroup +++ /dev/null @@ -1,48 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=ModifyDBSubnetGroup - &DBSubnetGroupName=mydbsubnetgroup - &DBSubnetGroupDescription=My%20modified%20DBSubnetGroup - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T18%3A14%3A49.482Z - &AWSAccessKeyId= - &Signature= - - - - - 990524496922 - Complete - My modified DBSubnetGroup - mydbsubnetgroup - - - Active - subnet-7c5b4115 - - us-east-1c - - - - Active - subnet-7b5b4112 - - us-east-1b - - - - Active - subnet-3ea6bd57 - - us-east-1d - - - - - - - ed662948-a57b-11df-9e38-7ffab86c801f - - - diff --git a/test/resources/RDS/ModifyEventSubscription b/test/resources/RDS/ModifyEventSubscription deleted file mode 100644 index 30bcbeec13f..00000000000 --- a/test/resources/RDS/ModifyEventSubscription +++ /dev/null @@ -1,38 +0,0 @@ -https://rds.us-east-1.amazonaws.com/ - ?Action=ModifyEventSubscription - &SubscriptionName=EventSubscription01 - &EventCategories.member.1=creation - &EventCategories.member.2=deletion - &SourceType=db-instance - &Enabled=true - &Version=2013-01-10 - &SignatureVersion=4 - &SignatureMethod=HmacSHA256 - &Timestamp=20130128T005359Z - &AWSAccessKeyId= - &Signature= - - - - - - - true - 012345678901 - db-instance - modifying - 2013-01-28 00:29:23.736 - - creation - deletion - - EventSubscription01 - arn:aws:sns:us-east-1:012345678901:EventSubscription01 - - - - 34907d48-68e5-11e2-98ef-2b071ac20a57 - - - - diff --git a/test/resources/RDS/ModifyOptionGroup b/test/resources/RDS/ModifyOptionGroup deleted file mode 100644 index d2b5fac5d10..00000000000 --- a/test/resources/RDS/ModifyOptionGroup +++ /dev/null @@ -1,49 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=ModifyOptionGroup - &OptionGroupName=myoptiongroup - &OptionsToInclude=OEM - &DBSecurityGroupMemberships=default - &ApplyImmediately=true https://rds.amazonaws.com/ - ?Action=ModifyOptionGroup - &OptionGroupName=myoptiongroup - &OptionsToRemove=OEM - &ApplyImmediately=true - - - - - myoptiongroup - Test option group - oracle-se1 - 11.2 - - - - - - - ed662948-a57b-11df-9e38-7ffab86c801f - - - - - myoptiongroup - Test option group - oracle-se1 - 11.2 - - - - - ed662948-a57b-11df-9e38-7ffab86c801f - - - diff --git a/test/resources/RDS/PromoteReadReplica b/test/resources/RDS/PromoteReadReplica deleted file mode 100644 index 0e11661e2f7..00000000000 --- a/test/resources/RDS/PromoteReadReplica +++ /dev/null @@ -1,56 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=PromoteReadReplica - &DBInstanceIdentifier=simcoprod01 - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2012-08-23T08%3A02%3A09.574Z - &AWSAccessKeyId= - &Signature= - - - - - - 2011-05-23T08:00:00Z - mysql - - 50 - - 1 - false - general-public-license - available - 5.1.50 - - 3306 -
simcoprod01.cu7u2t4uz396.us-east-1.rds.amazonaws.com
- - simcoprod01 - - - in-sync - default.mysql5.1 - - - - - active - default - - - 00:00-00:30 - true - sat:07:30-sat:08:00 - us-east-1a - 2011-05-23T06:06:43.110Z - 10 - db.m1.large - master - - - - f61a020f-8512-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/PurchaseReservedDBInstancesOffering b/test/resources/RDS/PurchaseReservedDBInstancesOffering deleted file mode 100644 index d735f74658d..00000000000 --- a/test/resources/RDS/PurchaseReservedDBInstancesOffering +++ /dev/null @@ -1,35 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=PurchaseReservedDBInstancesOffering - &ReservedDBInstanceId=myreservationID - &ReservedDBInstancesOfferingId=438012d3-4052-4cc7-b2e3-8d3372e0e706 - &DBInstanceCount=1 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-10T18%3A31%3A36.118Z - &AWSAccessKeyId= - &Signature= - - - - - Medium Utilization - USD - - mysql - 438012d3-4052-4cc7-b2e3-8d3372e0e706 - true - payment-pending - myreservationID - 10 - 2011-12-18T23:24:56.577Z - 31536000 - 123.0 - 0.123 - db.m1.small - - - - 7f099901-29cf-11e1-bd06-6fe008f046c3 - - - diff --git a/test/resources/RDS/RebootDBInstance b/test/resources/RDS/RebootDBInstance deleted file mode 100644 index a82842fc84e..00000000000 --- a/test/resources/RDS/RebootDBInstance +++ /dev/null @@ -1,54 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=RebootDBInstance - &DBInstanceIdentifier=simcoprod01 - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2011-05-23T06%3A10%3A31.216Z - &AWSAccessKeyId= - &Signature= - - - - - - 2011-05-23T06:07:38.831Z - mysql - - 1 - false - general-public-license - rebooting - 5.1.50 - - 3306 -
simcoprod01.cu7u2t4uz396.us-east-1.rds.amazonaws.com
- - simcoprod01 - - - in-sync - default.mysql5.1 - - - - - active - default - - - 00:00-00:30 - true - sat:07:30-sat:08:00 - us-east-1a - 2011-05-23T06:06:43.110Z - 10 - db.m1.large - master - - - - 5d5df758-8503-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/RemoveSourceIdentifierFromSubscription b/test/resources/RDS/RemoveSourceIdentifierFromSubscription deleted file mode 100644 index cb2bc655668..00000000000 --- a/test/resources/RDS/RemoveSourceIdentifierFromSubscription +++ /dev/null @@ -1,35 +0,0 @@ -https://rds.us-east-1.amazonaws.com/ - ?Action=RemoveSourceIdentifierFromSubscription - &SubscriptionName=EventSubscription01 - &SourceIdentifier=dbinstance01 - &Version=2013-01-10 - &SignatureVersion=4 - &SignatureMethod=HmacSHA256 - &Timestamp=20130128T012415Z - &AWSAccessKeyId= - &Signature= - - - - - - - true - 012345678901 - db-instance - modifying - 2013-01-28 00:29:23.736 - - creation - deletion - - EventSubscription01 - arn:aws:sns:us-east-1:012345678901:EventSubscription01 - - - - 6f0b82bf-68e9-11e2-b97b-43c6362ec60d - - - - diff --git a/test/resources/RDS/RemoveTagsFromResource b/test/resources/RDS/RemoveTagsFromResource deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/RDS/ResetDBParameterGroup b/test/resources/RDS/ResetDBParameterGroup deleted file mode 100644 index 60a5e28315f..00000000000 --- a/test/resources/RDS/ResetDBParameterGroup +++ /dev/null @@ -1,23 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=ResetDBParameterGroup - &DBParameterGroupName=mydbparametergroup - &Parameters.member.1.ParameterName=max_user_connections - &Parameters.member.1.ApplyMethod=pending-reboot - &Parameters.member.2.ParameterName=max_allowed_packet - &Parameters.member.2.ApplyMethod=immediate - &ResetAllParameters=false - &Version=2013-05-15 - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &AWSAccessKeyId= - &Signature= - - - - mydbparametergroup - - - 071e758f-bf57-11de-9f9f-53d6aee22de9 - - - diff --git a/test/resources/RDS/RestoreDBInstanceFromDBSnapshot b/test/resources/RDS/RestoreDBInstanceFromDBSnapshot deleted file mode 100644 index b042855ec91..00000000000 --- a/test/resources/RDS/RestoreDBInstanceFromDBSnapshot +++ /dev/null @@ -1,48 +0,0 @@ -https://rds.amazon.com/ - ?Action=RestoreDBInstanceFromDBSnapshot - &DBSnapshotIdentifier=mydbsnapshot - &DBInstanceIdentifier=myrestoreddbinstance - &Version=2013-05-15 - &Timestamp=2011-05-23T06%3A47%3A11.071Z - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &AWSAccessKeyId= - &Signature= - - - - - - mysql - - 1 - false - general-public-license - creating - 5.1.50 - myrestoreddbinstance - - - in-sync - default.mysql5.1 - - - - - active - default - - - 00:00-00:30 - true - sat:07:30-sat:08:00 - 10 - db.m1.large - master - - - - 7ca622e8-8508-11e0-bd9b-a7b1ece36d51 - - - diff --git a/test/resources/RDS/RestoreDBInstanceToPointInTime b/test/resources/RDS/RestoreDBInstanceToPointInTime deleted file mode 100644 index 93056ca5293..00000000000 --- a/test/resources/RDS/RestoreDBInstanceToPointInTime +++ /dev/null @@ -1,49 +0,0 @@ -https://rds.amazon.com/ - ?Action=RestoreDBInstanceToPointInTime - &TargetDBInstanceIdentifier=restored-db - &SourceDBInstanceIdentifier=simcoprod01 - &UseLatestRestorableTime=true - &Version=2013-05-15 - &Timestamp=2011-05-23T07%3A06%3A02.313Z - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &AWSAccessKeyId= - &Signature= - - - - - - mysql - - 1 - false - general-public-license - creating - 5.1.50 - restored-db - - - in-sync - default.mysql5.1 - - - - - active - default - - - 00:00-00:30 - true - sat:07:30-sat:08:00 - 10 - db.m1.large - master - - - - 1ef546bc-850b-11e0-90aa-eb648410240d - - - diff --git a/test/resources/RDS/RevokeDBSecurityGroupIngress b/test/resources/RDS/RevokeDBSecurityGroupIngress deleted file mode 100644 index 74963da6d24..00000000000 --- a/test/resources/RDS/RevokeDBSecurityGroupIngress +++ /dev/null @@ -1,31 +0,0 @@ -https://rds.amazonaws.com/ - ?Action=RevokeDBSecurityGroupIngress - &DBSecurityGroupName=mydbsecuritygroup - &CIDRIP=192.168.1.1%2F24 - &Version=2013-05-15 - &SignatureVersion=2&SignatureMethod=HmacSHA256 - &Timestamp=2011-02-15T22%3A32%3A12.515Z - &AWSAccessKeyId= - &Signature= - - - - - - My new DBSecurityGroup - - - 192.168.1.1/24 - revoking - - - 621567473609 - mydbsecuritygroup - vpc-1ab2c3d4 - - - - beecb8ac-bf5a-11de-9f9f-53d6aee22de9 - - - diff --git a/test/resources/Redshift/AuthorizeClusterSecurityGroupIngress b/test/resources/Redshift/AuthorizeClusterSecurityGroupIngress deleted file mode 100644 index 5d3ebbacbf7..00000000000 --- a/test/resources/Redshift/AuthorizeClusterSecurityGroupIngress +++ /dev/null @@ -1,29 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=AuthorizeClusterSecurityGroupIngress - &CIDRIP=192.168.40.3/32 - &ClusterSecurityGroupName=securitygroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T020649Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - - 192.168.40.3/32 - authorized - - - my security group - securitygroup1 - - - - 8c7cd4c8-6501-11e2-a8da-655adc216806 - - - diff --git a/test/resources/Redshift/AuthorizeClusterSecurityGroupIngressResponse b/test/resources/Redshift/AuthorizeClusterSecurityGroupIngressResponse deleted file mode 100644 index 5d3ebbacbf7..00000000000 --- a/test/resources/Redshift/AuthorizeClusterSecurityGroupIngressResponse +++ /dev/null @@ -1,29 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=AuthorizeClusterSecurityGroupIngress - &CIDRIP=192.168.40.3/32 - &ClusterSecurityGroupName=securitygroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T020649Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - - 192.168.40.3/32 - authorized - - - my security group - securitygroup1 - - - - 8c7cd4c8-6501-11e2-a8da-655adc216806 - - - diff --git a/test/resources/Redshift/AuthorizeSnapshotAccess b/test/resources/Redshift/AuthorizeSnapshotAccess deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/Redshift/AuthorizeSnapshotAccessResponse b/test/resources/Redshift/AuthorizeSnapshotAccessResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/Redshift/CopyClusterSnapshot b/test/resources/Redshift/CopyClusterSnapshot deleted file mode 100644 index 921bc89fd5b..00000000000 --- a/test/resources/Redshift/CopyClusterSnapshot +++ /dev/null @@ -1,33 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CopyClusterSnapshot - &SourceSnapshotIdentifier=cm:examplecluster-2013-01-22-19-27-58 - &TargetSnapshotIdentifier=my-snapshot-456 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T014618Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - 5439 - my-snapshot-456 - available - manual - 1.0 - 2013-01-22T19:27:58.931Z - 2 - dev - 2013-01-22T19:23:59.368Z - us-east-1c - dw.hs1.xlarge - examplecluster - adminuser - - - - aebb56f5-64fe-11e2-88c5-53eb05787dfb - - - diff --git a/test/resources/Redshift/CopyClusterSnapshotResponse b/test/resources/Redshift/CopyClusterSnapshotResponse deleted file mode 100644 index 921bc89fd5b..00000000000 --- a/test/resources/Redshift/CopyClusterSnapshotResponse +++ /dev/null @@ -1,33 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CopyClusterSnapshot - &SourceSnapshotIdentifier=cm:examplecluster-2013-01-22-19-27-58 - &TargetSnapshotIdentifier=my-snapshot-456 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T014618Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - 5439 - my-snapshot-456 - available - manual - 1.0 - 2013-01-22T19:27:58.931Z - 2 - dev - 2013-01-22T19:23:59.368Z - us-east-1c - dw.hs1.xlarge - examplecluster - adminuser - - - - aebb56f5-64fe-11e2-88c5-53eb05787dfb - - - diff --git a/test/resources/Redshift/CreateCluster b/test/resources/Redshift/CreateCluster deleted file mode 100644 index 6422b23a384..00000000000 --- a/test/resources/Redshift/CreateCluster +++ /dev/null @@ -1,100 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateCluster - &ClusterIdentifier=examplecluster - &MasterUsername=masteruser - &MasterUserPassword=12345678Aa - &NumberOfNodes=2 - &NodeType=dw.hs1.xlarge - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T000028Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - **** - - 1.0 - - creating - 2 - 1 - true - false - dev - sun:10:30-sun:11:00 - - - in-sync - default.redshift-1.0 - - - - - active - default - - - dw.hs1.xlarge - examplecluster - true - masteruser - - - - e69b1294-64ef-11e2-b07c-f7fbdd006c67 - - - -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateCluster -&ClusterIdentifier=exampleclusterinvpc -&MasterUsername=master -&MasterUserPassword=1234abcdA -&NodeType=dw.hs1.xlarge -&NumberOfNodes=2 -&ClusterSubnetGroupName=mysubnetgroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T000028Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - **** - - mysubnetgroup1 - 1.0 - - creating - 2 - 1 - false - false - dev - sat:08:30-sat:09:00 - - - in-sync - default.redshift-1.0 - - - vpc-796a5913 - - dw.hs1.xlarge - exampleclusterinvpc - true - master - - - - fa337bb4-6a4d-11e2-a12a-cb8076a904bd - - - diff --git a/test/resources/Redshift/CreateClusterParameterGroup b/test/resources/Redshift/CreateClusterParameterGroup deleted file mode 100644 index 39f0611a570..00000000000 --- a/test/resources/Redshift/CreateClusterParameterGroup +++ /dev/null @@ -1,24 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateClusterParameterGroup - &Description=description my parameter group - &ParameterGroupFamily=redshift-1.0 - &ParameterGroupName=parametergroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T002544Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - redshift-1.0 - description my parameter group - parametergroup1 - - - - 6d6df847-64f3-11e2-bea9-49e0ce183f07 - - - diff --git a/test/resources/Redshift/CreateClusterParameterGroupResponse b/test/resources/Redshift/CreateClusterParameterGroupResponse deleted file mode 100644 index 39f0611a570..00000000000 --- a/test/resources/Redshift/CreateClusterParameterGroupResponse +++ /dev/null @@ -1,24 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateClusterParameterGroup - &Description=description my parameter group - &ParameterGroupFamily=redshift-1.0 - &ParameterGroupName=parametergroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T002544Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - redshift-1.0 - description my parameter group - parametergroup1 - - - - 6d6df847-64f3-11e2-bea9-49e0ce183f07 - - - diff --git a/test/resources/Redshift/CreateClusterResponse b/test/resources/Redshift/CreateClusterResponse deleted file mode 100644 index 6422b23a384..00000000000 --- a/test/resources/Redshift/CreateClusterResponse +++ /dev/null @@ -1,100 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateCluster - &ClusterIdentifier=examplecluster - &MasterUsername=masteruser - &MasterUserPassword=12345678Aa - &NumberOfNodes=2 - &NodeType=dw.hs1.xlarge - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T000028Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - **** - - 1.0 - - creating - 2 - 1 - true - false - dev - sun:10:30-sun:11:00 - - - in-sync - default.redshift-1.0 - - - - - active - default - - - dw.hs1.xlarge - examplecluster - true - masteruser - - - - e69b1294-64ef-11e2-b07c-f7fbdd006c67 - - - -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateCluster -&ClusterIdentifier=exampleclusterinvpc -&MasterUsername=master -&MasterUserPassword=1234abcdA -&NodeType=dw.hs1.xlarge -&NumberOfNodes=2 -&ClusterSubnetGroupName=mysubnetgroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T000028Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - **** - - mysubnetgroup1 - 1.0 - - creating - 2 - 1 - false - false - dev - sat:08:30-sat:09:00 - - - in-sync - default.redshift-1.0 - - - vpc-796a5913 - - dw.hs1.xlarge - exampleclusterinvpc - true - master - - - - fa337bb4-6a4d-11e2-a12a-cb8076a904bd - - - diff --git a/test/resources/Redshift/CreateClusterSecurityGroup b/test/resources/Redshift/CreateClusterSecurityGroup deleted file mode 100644 index c0aa2537dae..00000000000 --- a/test/resources/Redshift/CreateClusterSecurityGroup +++ /dev/null @@ -1,24 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateClusterSecurityGroup - &ClusterSecurityGroupName=securitygroup1 - &Description=my security group - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T005817Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - my security group - securitygroup1 - - - - f9ee270f-64f7-11e2-a8da-655adc216806 - - - diff --git a/test/resources/Redshift/CreateClusterSecurityGroupResponse b/test/resources/Redshift/CreateClusterSecurityGroupResponse deleted file mode 100644 index c0aa2537dae..00000000000 --- a/test/resources/Redshift/CreateClusterSecurityGroupResponse +++ /dev/null @@ -1,24 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateClusterSecurityGroup - &ClusterSecurityGroupName=securitygroup1 - &Description=my security group - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T005817Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - my security group - securitygroup1 - - - - f9ee270f-64f7-11e2-a8da-655adc216806 - - - diff --git a/test/resources/Redshift/CreateClusterSnapshot b/test/resources/Redshift/CreateClusterSnapshot deleted file mode 100644 index 6c873219ac2..00000000000 --- a/test/resources/Redshift/CreateClusterSnapshot +++ /dev/null @@ -1,33 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateClusterSnapshot - &ClusterIdentifier=examplecluster - &SnapshotIdentifier=snapshot-1234 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T010824Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - 5439 - my-snapshot-123 - creating - manual - 1.0 - 2013-01-23T01:08:29.142Z - 2 - dev - 2013-01-22T19:23:59.368Z - us-east-1c - dw.hs1.xlarge - examplecluster - adminuser - - - - 65baef14-64f9-11e2-bea9-49e0ce183f07 - - - diff --git a/test/resources/Redshift/CreateClusterSnapshotResponse b/test/resources/Redshift/CreateClusterSnapshotResponse deleted file mode 100644 index 6c873219ac2..00000000000 --- a/test/resources/Redshift/CreateClusterSnapshotResponse +++ /dev/null @@ -1,33 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateClusterSnapshot - &ClusterIdentifier=examplecluster - &SnapshotIdentifier=snapshot-1234 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T010824Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - 5439 - my-snapshot-123 - creating - manual - 1.0 - 2013-01-23T01:08:29.142Z - 2 - dev - 2013-01-22T19:23:59.368Z - us-east-1c - dw.hs1.xlarge - examplecluster - adminuser - - - - 65baef14-64f9-11e2-bea9-49e0ce183f07 - - - diff --git a/test/resources/Redshift/CreateClusterSubnetGroup b/test/resources/Redshift/CreateClusterSubnetGroup deleted file mode 100644 index 982fe89092e..00000000000 --- a/test/resources/Redshift/CreateClusterSubnetGroup +++ /dev/null @@ -1,35 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateClusterSubnetGroup - &ClusterSubnetGroupName=mysubnetgroup1 - &Description=My subnet group 1 - &SubnetIds.member.1=subnet-756a591f - &SubnetIds.member.1=subnet-716a591b - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130129/us-east-1/redshift/aws4_request - &x-amz-date=20130129T192820Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - vpc-796a5913 - My subnet group 1 - mysubnetgroup1 - Complete - - - Active - subnet-756a591f - - us-east-1c - - - - - - - 0a60660f-6a4a-11e2-aad2-71d00c36728e - - - diff --git a/test/resources/Redshift/CreateClusterSubnetGroupResponse b/test/resources/Redshift/CreateClusterSubnetGroupResponse deleted file mode 100644 index 982fe89092e..00000000000 --- a/test/resources/Redshift/CreateClusterSubnetGroupResponse +++ /dev/null @@ -1,35 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=CreateClusterSubnetGroup - &ClusterSubnetGroupName=mysubnetgroup1 - &Description=My subnet group 1 - &SubnetIds.member.1=subnet-756a591f - &SubnetIds.member.1=subnet-716a591b - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130129/us-east-1/redshift/aws4_request - &x-amz-date=20130129T192820Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - vpc-796a5913 - My subnet group 1 - mysubnetgroup1 - Complete - - - Active - subnet-756a591f - - us-east-1c - - - - - - - 0a60660f-6a4a-11e2-aad2-71d00c36728e - - - diff --git a/test/resources/Redshift/DeleteCluster b/test/resources/Redshift/DeleteCluster deleted file mode 100644 index 1bd5b3ee091..00000000000 --- a/test/resources/Redshift/DeleteCluster +++ /dev/null @@ -1,52 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteCluster - &ClusterIdentifier=examplecluster2 - &SkipFinalClusterSnapshot=true - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T022400Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - - - 5439 -
examplecluster2.cobbanlpscsn.us-east-1.redshift.amazonaws.com
- - deleting - 2 - 1 - true - true - dev - sun:10:30-sun:11:00 - - - in-sync - default.redshift-1.0 - - - 2013-01-23T00:11:32.804Z - - - active - default - - - us-east-1a - dw.hs1.xlarge - examplecluster2 - true - masteruser - - - - f2e6b87e-6503-11e2-b343-393adc3f0a21 - - - diff --git a/test/resources/Redshift/DeleteClusterParameterGroup b/test/resources/Redshift/DeleteClusterParameterGroup deleted file mode 100644 index c3fc12410e6..00000000000 --- a/test/resources/Redshift/DeleteClusterParameterGroup +++ /dev/null @@ -1,15 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteClusterParameterGroup - &ParameterGroupName=parametergroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T015410Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - 29674ca0-40da-11e2-b679-dba6cf515770 - - - diff --git a/test/resources/Redshift/DeleteClusterParameterGroupResponse b/test/resources/Redshift/DeleteClusterParameterGroupResponse deleted file mode 100644 index c3fc12410e6..00000000000 --- a/test/resources/Redshift/DeleteClusterParameterGroupResponse +++ /dev/null @@ -1,15 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteClusterParameterGroup - &ParameterGroupName=parametergroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T015410Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - 29674ca0-40da-11e2-b679-dba6cf515770 - - - diff --git a/test/resources/Redshift/DeleteClusterResponse b/test/resources/Redshift/DeleteClusterResponse deleted file mode 100644 index 1bd5b3ee091..00000000000 --- a/test/resources/Redshift/DeleteClusterResponse +++ /dev/null @@ -1,52 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteCluster - &ClusterIdentifier=examplecluster2 - &SkipFinalClusterSnapshot=true - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T022400Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - - - 5439 -
examplecluster2.cobbanlpscsn.us-east-1.redshift.amazonaws.com
- - deleting - 2 - 1 - true - true - dev - sun:10:30-sun:11:00 - - - in-sync - default.redshift-1.0 - - - 2013-01-23T00:11:32.804Z - - - active - default - - - us-east-1a - dw.hs1.xlarge - examplecluster2 - true - masteruser - - - - f2e6b87e-6503-11e2-b343-393adc3f0a21 - - - diff --git a/test/resources/Redshift/DeleteClusterSecurityGroup b/test/resources/Redshift/DeleteClusterSecurityGroup deleted file mode 100644 index 20c972632ae..00000000000 --- a/test/resources/Redshift/DeleteClusterSecurityGroup +++ /dev/null @@ -1,15 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteClusterSecurityGroup - &ClusterSecurityGroupName=securitygroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T015926Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - e54e05dc-40da-11e2-955f-313c36e9e01d - - - diff --git a/test/resources/Redshift/DeleteClusterSecurityGroupResponse b/test/resources/Redshift/DeleteClusterSecurityGroupResponse deleted file mode 100644 index 20c972632ae..00000000000 --- a/test/resources/Redshift/DeleteClusterSecurityGroupResponse +++ /dev/null @@ -1,15 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteClusterSecurityGroup - &ClusterSecurityGroupName=securitygroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T015926Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - e54e05dc-40da-11e2-955f-313c36e9e01d - - - diff --git a/test/resources/Redshift/DeleteClusterSnapshot b/test/resources/Redshift/DeleteClusterSnapshot deleted file mode 100644 index 03a928d821b..00000000000 --- a/test/resources/Redshift/DeleteClusterSnapshot +++ /dev/null @@ -1,32 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteClusterSnapshot - &SnapshotIdentifier=snapshot-1234 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T005225Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - 2012-12-07T23:31:02.372Z - 5439 - snapshot-1234 - deleted - 2012-12-06T23:09:01.475Z - manual - 1.0 - us-east-1a - examplecluster - masteruser - dw.hs1.xlarge - mydb - 3 - - - - 88a31de4-40d1-11e2-8a25-eb010998df4e - - - diff --git a/test/resources/Redshift/DeleteClusterSnapshotResponse b/test/resources/Redshift/DeleteClusterSnapshotResponse deleted file mode 100644 index 03a928d821b..00000000000 --- a/test/resources/Redshift/DeleteClusterSnapshotResponse +++ /dev/null @@ -1,32 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteClusterSnapshot - &SnapshotIdentifier=snapshot-1234 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T005225Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - 2012-12-07T23:31:02.372Z - 5439 - snapshot-1234 - deleted - 2012-12-06T23:09:01.475Z - manual - 1.0 - us-east-1a - examplecluster - masteruser - dw.hs1.xlarge - mydb - 3 - - - - 88a31de4-40d1-11e2-8a25-eb010998df4e - - - diff --git a/test/resources/Redshift/DeleteClusterSubnetGroup b/test/resources/Redshift/DeleteClusterSubnetGroup deleted file mode 100644 index 555f4d5d9c1..00000000000 --- a/test/resources/Redshift/DeleteClusterSubnetGroup +++ /dev/null @@ -1,15 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteClusterSubnetGroup - &ClusterSubnetGroupName=my-subnet-group-2 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130130/us-east-1/redshift/aws4_request - &x-amz-date=20130130T154635Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - 3a63806b-6af4-11e2-b27b-4d850b1c672d - - - diff --git a/test/resources/Redshift/DeleteClusterSubnetGroupResponse b/test/resources/Redshift/DeleteClusterSubnetGroupResponse deleted file mode 100644 index 555f4d5d9c1..00000000000 --- a/test/resources/Redshift/DeleteClusterSubnetGroupResponse +++ /dev/null @@ -1,15 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DeleteClusterSubnetGroup - &ClusterSubnetGroupName=my-subnet-group-2 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130130/us-east-1/redshift/aws4_request - &x-amz-date=20130130T154635Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - 3a63806b-6af4-11e2-b27b-4d850b1c672d - - - diff --git a/test/resources/Redshift/DescribeClusterParameterGroups b/test/resources/Redshift/DescribeClusterParameterGroups deleted file mode 100644 index fe867932590..00000000000 --- a/test/resources/Redshift/DescribeClusterParameterGroups +++ /dev/null @@ -1,28 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterParameterGroups - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T004002Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - redshift-1.0 - Default parameter group for redshift-1.0 - default.redshift-1.0 - - - redshift-1.0 - description my parameter group - parametergroup1 - - - - - 6d28788b-64f5-11e2-b343-393adc3f0a21 - - - diff --git a/test/resources/Redshift/DescribeClusterParameterGroupsResponse b/test/resources/Redshift/DescribeClusterParameterGroupsResponse deleted file mode 100644 index fe867932590..00000000000 --- a/test/resources/Redshift/DescribeClusterParameterGroupsResponse +++ /dev/null @@ -1,28 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterParameterGroups - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T004002Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - redshift-1.0 - Default parameter group for redshift-1.0 - default.redshift-1.0 - - - redshift-1.0 - description my parameter group - parametergroup1 - - - - - 6d28788b-64f5-11e2-b343-393adc3f0a21 - - - diff --git a/test/resources/Redshift/DescribeClusterParameters b/test/resources/Redshift/DescribeClusterParameters deleted file mode 100644 index 48383eddb1e..00000000000 --- a/test/resources/Redshift/DescribeClusterParameters +++ /dev/null @@ -1,77 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterParameters - &ParameterGroupName=parametergroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T010408Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - ISO, MDY - string - engine-default - true - Sets the display format for date and time values. - datestyle - - - 0 - integer - engine-default - true - Sets the number of digits displayed for floating-point values - -15-2 - extra_float_digits - - - default - string - engine-default - true - This parameter applies a user-defined label to a group of queries that are run during the same session.. - query_group - - - false - boolean - engine-default - true - require ssl for all databaseconnections - true,false - require_ssl - - - $user, public - string - engine-default - true - Sets the schema search order for names that are not schema-qualified. - search_path - - - 0 - integer - engine-default - true - Aborts any statement that takes over the specified number of milliseconds. - statement_timeout - - - [{"query_concurrency":5}] - string - engine-default - true - wlm json configuration - wlm_json_configuration - - - - - 2ba35df4-40d3-11e2-82cf-0b45b05c0221 - - - diff --git a/test/resources/Redshift/DescribeClusterParametersResponse b/test/resources/Redshift/DescribeClusterParametersResponse deleted file mode 100644 index 48383eddb1e..00000000000 --- a/test/resources/Redshift/DescribeClusterParametersResponse +++ /dev/null @@ -1,77 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterParameters - &ParameterGroupName=parametergroup1 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T010408Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - ISO, MDY - string - engine-default - true - Sets the display format for date and time values. - datestyle - - - 0 - integer - engine-default - true - Sets the number of digits displayed for floating-point values - -15-2 - extra_float_digits - - - default - string - engine-default - true - This parameter applies a user-defined label to a group of queries that are run during the same session.. - query_group - - - false - boolean - engine-default - true - require ssl for all databaseconnections - true,false - require_ssl - - - $user, public - string - engine-default - true - Sets the schema search order for names that are not schema-qualified. - search_path - - - 0 - integer - engine-default - true - Aborts any statement that takes over the specified number of milliseconds. - statement_timeout - - - [{"query_concurrency":5}] - string - engine-default - true - wlm json configuration - wlm_json_configuration - - - - - 2ba35df4-40d3-11e2-82cf-0b45b05c0221 - - - diff --git a/test/resources/Redshift/DescribeClusterSecurityGroups b/test/resources/Redshift/DescribeClusterSecurityGroups deleted file mode 100644 index 37d21700187..00000000000 --- a/test/resources/Redshift/DescribeClusterSecurityGroups +++ /dev/null @@ -1,35 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterSecurityGroups - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T010237Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - - - 0.0.0.0/0 - authorized - - - default - default - - - - - my security group - securitygroup1 - - - - - 947a8305-64f8-11e2-bec0-17624ad140dd - - - diff --git a/test/resources/Redshift/DescribeClusterSecurityGroupsResponse b/test/resources/Redshift/DescribeClusterSecurityGroupsResponse deleted file mode 100644 index 37d21700187..00000000000 --- a/test/resources/Redshift/DescribeClusterSecurityGroupsResponse +++ /dev/null @@ -1,35 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterSecurityGroups - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T010237Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - - - 0.0.0.0/0 - authorized - - - default - default - - - - - my security group - securitygroup1 - - - - - 947a8305-64f8-11e2-bec0-17624ad140dd - - - diff --git a/test/resources/Redshift/DescribeClusterSnapshots b/test/resources/Redshift/DescribeClusterSnapshots deleted file mode 100644 index ee2603a80b5..00000000000 --- a/test/resources/Redshift/DescribeClusterSnapshots +++ /dev/null @@ -1,49 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterSnapshots - &ClusterIdentifier=examplecluster - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T011512Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 5439 - cm:examplecluster-2013-01-22-19-27-58 - available - automated - 1.0 - 2013-01-22T19:27:58.931Z - 2 - dev - 2013-01-22T19:23:59.368Z - us-east-1c - dw.hs1.xlarge - examplecluster - adminuser - - - 5439 - my-snapshot-123 - available - manual - 1.0 - 2013-01-23T01:09:03.149Z - 2 - dev - 2013-01-22T19:23:59.368Z - us-east-1c - dw.hs1.xlarge - examplecluster - adminuser - - - - - 56a9daf4-64fa-11e2-a8da-655adc216806 - - - diff --git a/test/resources/Redshift/DescribeClusterSnapshotsResponse b/test/resources/Redshift/DescribeClusterSnapshotsResponse deleted file mode 100644 index ee2603a80b5..00000000000 --- a/test/resources/Redshift/DescribeClusterSnapshotsResponse +++ /dev/null @@ -1,49 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterSnapshots - &ClusterIdentifier=examplecluster - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T011512Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 5439 - cm:examplecluster-2013-01-22-19-27-58 - available - automated - 1.0 - 2013-01-22T19:27:58.931Z - 2 - dev - 2013-01-22T19:23:59.368Z - us-east-1c - dw.hs1.xlarge - examplecluster - adminuser - - - 5439 - my-snapshot-123 - available - manual - 1.0 - 2013-01-23T01:09:03.149Z - 2 - dev - 2013-01-22T19:23:59.368Z - us-east-1c - dw.hs1.xlarge - examplecluster - adminuser - - - - - 56a9daf4-64fa-11e2-a8da-655adc216806 - - - diff --git a/test/resources/Redshift/DescribeClusterSubnetGroups b/test/resources/Redshift/DescribeClusterSubnetGroups deleted file mode 100644 index b0e9571382d..00000000000 --- a/test/resources/Redshift/DescribeClusterSubnetGroups +++ /dev/null @@ -1,40 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterSubnetGroups - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130130/us-east-1/redshift/aws4_request - &x-amz-date=20130130T153938Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - vpc-5d917a30 - my subnet group - my-subnet-group - Complete - - - Active - subnet-71c5091c - - us-east-1a - - - - Active - subnet-78de1215 - - us-east-1a - - - - - - - - 42024b68-6af3-11e2-a726-6368a468fa67 - - - diff --git a/test/resources/Redshift/DescribeClusterSubnetGroupsResponse b/test/resources/Redshift/DescribeClusterSubnetGroupsResponse deleted file mode 100644 index b0e9571382d..00000000000 --- a/test/resources/Redshift/DescribeClusterSubnetGroupsResponse +++ /dev/null @@ -1,40 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterSubnetGroups - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130130/us-east-1/redshift/aws4_request - &x-amz-date=20130130T153938Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - vpc-5d917a30 - my subnet group - my-subnet-group - Complete - - - Active - subnet-71c5091c - - us-east-1a - - - - Active - subnet-78de1215 - - us-east-1a - - - - - - - - 42024b68-6af3-11e2-a726-6368a468fa67 - - - diff --git a/test/resources/Redshift/DescribeClusterVersions b/test/resources/Redshift/DescribeClusterVersions deleted file mode 100644 index f2d0a25c73e..00000000000 --- a/test/resources/Redshift/DescribeClusterVersions +++ /dev/null @@ -1,23 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterVersions - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T230708Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - redshift-1.0 - Initial release of redshift - 1.0 - - - - - d39cd5e5-40c2-11e2-8a25-eb010998df4e - - - diff --git a/test/resources/Redshift/DescribeClusterVersionsResponse b/test/resources/Redshift/DescribeClusterVersionsResponse deleted file mode 100644 index f2d0a25c73e..00000000000 --- a/test/resources/Redshift/DescribeClusterVersionsResponse +++ /dev/null @@ -1,23 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusterVersions - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T230708Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - redshift-1.0 - Initial release of redshift - 1.0 - - - - - d39cd5e5-40c2-11e2-8a25-eb010998df4e - - - diff --git a/test/resources/Redshift/DescribeClusters b/test/resources/Redshift/DescribeClusters deleted file mode 100644 index b3bd142582b..00000000000 --- a/test/resources/Redshift/DescribeClusters +++ /dev/null @@ -1,49 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusters - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T000452Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - **** - - 1.0 - - creating - 2 - 1 - true - false - dev - sun:10:30-sun:11:00 - - - in-sync - default.redshift-1.0 - - - - - active - default - - - us-east-1a - dw.hs1.xlarge - examplecluster - true - masteruser - - - - - 837d45d6-64f0-11e2-b07c-f7fbdd006c67 - - - diff --git a/test/resources/Redshift/DescribeClustersResponse b/test/resources/Redshift/DescribeClustersResponse deleted file mode 100644 index b3bd142582b..00000000000 --- a/test/resources/Redshift/DescribeClustersResponse +++ /dev/null @@ -1,49 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeClusters - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T000452Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - **** - - 1.0 - - creating - 2 - 1 - true - false - dev - sun:10:30-sun:11:00 - - - in-sync - default.redshift-1.0 - - - - - active - default - - - us-east-1a - dw.hs1.xlarge - examplecluster - true - masteruser - - - - - 837d45d6-64f0-11e2-b07c-f7fbdd006c67 - - - diff --git a/test/resources/Redshift/DescribeDefaultClusterParameters b/test/resources/Redshift/DescribeDefaultClusterParameters deleted file mode 100644 index a6678d46840..00000000000 --- a/test/resources/Redshift/DescribeDefaultClusterParameters +++ /dev/null @@ -1,80 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeDefaultClusterParameters - &ParameterGroupFamily=redshift-1.0 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T231708Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - redshift-1.0 - - - ISO, MDY - string - engine-default - true - Sets the display format for date and time values. - datestyle - - - 0 - integer - engine-default - true - Sets the number of digits displayed for floating-point values - -15-2 - extra_float_digits - - - default - string - engine-default - true - This parameter applies a user-defined label to a group of queries that are run during the same session.. - query_group - - - false - boolean - engine-default - true - require ssl for all databaseconnections - true,false - require_ssl - - - $user, public - string - engine-default - true - Sets the schema search order for names that are not schema-qualified. - search_path - - - 0 - integer - engine-default - true - Aborts any statement that takes over the specified number of milliseconds. - statement_timeout - - - [{"query_concurrency":5}] - string - engine-default - true - wlm json configuration - wlm_json_configuration - - - - - - 396df00b-40c4-11e2-82cf-0b45b05c0221 - - - diff --git a/test/resources/Redshift/DescribeDefaultClusterParametersResponse b/test/resources/Redshift/DescribeDefaultClusterParametersResponse deleted file mode 100644 index a6678d46840..00000000000 --- a/test/resources/Redshift/DescribeDefaultClusterParametersResponse +++ /dev/null @@ -1,80 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeDefaultClusterParameters - &ParameterGroupFamily=redshift-1.0 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T231708Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - redshift-1.0 - - - ISO, MDY - string - engine-default - true - Sets the display format for date and time values. - datestyle - - - 0 - integer - engine-default - true - Sets the number of digits displayed for floating-point values - -15-2 - extra_float_digits - - - default - string - engine-default - true - This parameter applies a user-defined label to a group of queries that are run during the same session.. - query_group - - - false - boolean - engine-default - true - require ssl for all databaseconnections - true,false - require_ssl - - - $user, public - string - engine-default - true - Sets the schema search order for names that are not schema-qualified. - search_path - - - 0 - integer - engine-default - true - Aborts any statement that takes over the specified number of milliseconds. - statement_timeout - - - [{"query_concurrency":5}] - string - engine-default - true - wlm json configuration - wlm_json_configuration - - - - - - 396df00b-40c4-11e2-82cf-0b45b05c0221 - - - diff --git a/test/resources/Redshift/DescribeEvents b/test/resources/Redshift/DescribeEvents deleted file mode 100644 index a78ada25584..00000000000 --- a/test/resources/Redshift/DescribeEvents +++ /dev/null @@ -1,24 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeEvents - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T232427Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - Cluster security group securitygroup1 has been updated. Changes need to be applied to all clusters using this cluster security group. - cluster-security-group - 2012-12-07T23:05:02.660Z - securitygroup1 - - - - - 3eeb9efe-40c5-11e2-816a-1bba29fad1f5 - - - diff --git a/test/resources/Redshift/DescribeEventsResponse b/test/resources/Redshift/DescribeEventsResponse deleted file mode 100644 index a78ada25584..00000000000 --- a/test/resources/Redshift/DescribeEventsResponse +++ /dev/null @@ -1,24 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeEvents - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T232427Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - Cluster security group securitygroup1 has been updated. Changes need to be applied to all clusters using this cluster security group. - cluster-security-group - 2012-12-07T23:05:02.660Z - securitygroup1 - - - - - 3eeb9efe-40c5-11e2-816a-1bba29fad1f5 - - - diff --git a/test/resources/Redshift/DescribeOrderableClusterOptions b/test/resources/Redshift/DescribeOrderableClusterOptions deleted file mode 100644 index 7d4296e3d7a..00000000000 --- a/test/resources/Redshift/DescribeOrderableClusterOptions +++ /dev/null @@ -1,66 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeOrderableClusterOptions - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T225314Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - multi-node - dw.hs1.8xlarge - - - us-east-1a - - - us-east-1c - - - us-east-1d - - - - - 1.0 - multi-node - dw.hs1.xlarge - - - us-east-1a - - - us-east-1c - - - us-east-1d - - - - - 1.0 - single-node - dw.hs1.xlarge - - - us-east-1a - - - us-east-1c - - - us-east-1d - - - - - - - e37414cc-40c0-11e2-b6a0-df98b1a86860 - - - diff --git a/test/resources/Redshift/DescribeOrderableClusterOptionsResponse b/test/resources/Redshift/DescribeOrderableClusterOptionsResponse deleted file mode 100644 index 7d4296e3d7a..00000000000 --- a/test/resources/Redshift/DescribeOrderableClusterOptionsResponse +++ /dev/null @@ -1,66 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeOrderableClusterOptions - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T225314Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - multi-node - dw.hs1.8xlarge - - - us-east-1a - - - us-east-1c - - - us-east-1d - - - - - 1.0 - multi-node - dw.hs1.xlarge - - - us-east-1a - - - us-east-1c - - - us-east-1d - - - - - 1.0 - single-node - dw.hs1.xlarge - - - us-east-1a - - - us-east-1c - - - us-east-1d - - - - - - - e37414cc-40c0-11e2-b6a0-df98b1a86860 - - - diff --git a/test/resources/Redshift/DescribeReservedNodeOfferings b/test/resources/Redshift/DescribeReservedNodeOfferings deleted file mode 100644 index 95df945a887..00000000000 --- a/test/resources/Redshift/DescribeReservedNodeOfferings +++ /dev/null @@ -1,45 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeReservedNodeOfferings - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130117/us-east-1/redshift/aws4_request - &x-amz-date=20130117T232351Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - Heavy Utilization - 94608000 - - - Hourly - 0.21 - - - 12452.0 - 3a98bf7d-979a-49cc-b568-18f24315baf0 - 0.0 - dw.hs1.8xlarge - - - Heavy Utilization - 31536000 - - - Hourly - 0.09 - - - 1815.0 - d586503b-289f-408b-955b-9c95005d6908 - 0.0 - dw.hs1.xlarge - - - - f4a07e06-60fc-11e2-95d9-658e9466d117 - - - diff --git a/test/resources/Redshift/DescribeReservedNodeOfferingsResponse b/test/resources/Redshift/DescribeReservedNodeOfferingsResponse deleted file mode 100644 index 95df945a887..00000000000 --- a/test/resources/Redshift/DescribeReservedNodeOfferingsResponse +++ /dev/null @@ -1,45 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeReservedNodeOfferings - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130117/us-east-1/redshift/aws4_request - &x-amz-date=20130117T232351Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - Heavy Utilization - 94608000 - - - Hourly - 0.21 - - - 12452.0 - 3a98bf7d-979a-49cc-b568-18f24315baf0 - 0.0 - dw.hs1.8xlarge - - - Heavy Utilization - 31536000 - - - Hourly - 0.09 - - - 1815.0 - d586503b-289f-408b-955b-9c95005d6908 - 0.0 - dw.hs1.xlarge - - - - f4a07e06-60fc-11e2-95d9-658e9466d117 - - - diff --git a/test/resources/Redshift/DescribeReservedNodes b/test/resources/Redshift/DescribeReservedNodes deleted file mode 100644 index ac71eb0cb0d..00000000000 --- a/test/resources/Redshift/DescribeReservedNodes +++ /dev/null @@ -1,59 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeReservedNodes - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130125/us-east-1/redshift/aws4_request - &x-amz-date=20130125T202355Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 2013-01-22T18:46:48.600Z - Medium Utilization - 31536000 - - 800.0 - 0.158 - payment-pending - dw.hs1.xlarge - 1 - 4357912c-9266-469d-beb0-0f1b775e1bc9 - - - 2013-01-22T20:09:16.630Z - Heavy Utilization - 94608000 - - - Hourly - 0.21 - - - 12452.0 - 0.0 - payment-pending - dw.hs1.8xlarge - 2 - 93bbbca2-e88c-4b8b-a600-b64eaabf18a3 - - - 2013-01-23T21:49:32.517Z - Medium Utilization - 31536000 - - 800.0 - 0.158 - payment-pending - dw.hs1.xlarge - 1 - bbcd9749-f2ea-4d01-9b1b-b576f618eb4e - - - - - 24dc90c8-672d-11e2-b2e1-8f41f0379151 - - - diff --git a/test/resources/Redshift/DescribeReservedNodesResponse b/test/resources/Redshift/DescribeReservedNodesResponse deleted file mode 100644 index ac71eb0cb0d..00000000000 --- a/test/resources/Redshift/DescribeReservedNodesResponse +++ /dev/null @@ -1,59 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeReservedNodes - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130125/us-east-1/redshift/aws4_request - &x-amz-date=20130125T202355Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 2013-01-22T18:46:48.600Z - Medium Utilization - 31536000 - - 800.0 - 0.158 - payment-pending - dw.hs1.xlarge - 1 - 4357912c-9266-469d-beb0-0f1b775e1bc9 - - - 2013-01-22T20:09:16.630Z - Heavy Utilization - 94608000 - - - Hourly - 0.21 - - - 12452.0 - 0.0 - payment-pending - dw.hs1.8xlarge - 2 - 93bbbca2-e88c-4b8b-a600-b64eaabf18a3 - - - 2013-01-23T21:49:32.517Z - Medium Utilization - 31536000 - - 800.0 - 0.158 - payment-pending - dw.hs1.xlarge - 1 - bbcd9749-f2ea-4d01-9b1b-b576f618eb4e - - - - - 24dc90c8-672d-11e2-b2e1-8f41f0379151 - - - diff --git a/test/resources/Redshift/DescribeResize b/test/resources/Redshift/DescribeResize deleted file mode 100644 index 5203a01f255..00000000000 --- a/test/resources/Redshift/DescribeResize +++ /dev/null @@ -1,30 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeResize - &ClusterIdentifier=examplecluster - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T232427Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - multi-node - SUCCEEDED - - users - venue - sales - listing - event - date - category - - dw.hs1.xlarge - 2 - - - a6d59c61-a162-11e2-b2bc-fb54c9d11e09 - - - diff --git a/test/resources/Redshift/DescribeResizeResponse b/test/resources/Redshift/DescribeResizeResponse deleted file mode 100644 index 5203a01f255..00000000000 --- a/test/resources/Redshift/DescribeResizeResponse +++ /dev/null @@ -1,30 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=DescribeResize - &ClusterIdentifier=examplecluster - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121207/us-east-1/redshift/aws4_request - &x-amz-date=20121207T232427Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - multi-node - SUCCEEDED - - users - venue - sales - listing - event - date - category - - dw.hs1.xlarge - 2 - - - a6d59c61-a162-11e2-b2bc-fb54c9d11e09 - - - diff --git a/test/resources/Redshift/ModifyCluster b/test/resources/Redshift/ModifyCluster deleted file mode 100644 index d8d742da66e..00000000000 --- a/test/resources/Redshift/ModifyCluster +++ /dev/null @@ -1,55 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=ModifyCluster - &AllowVersionUpgrade=true - &AutomatedSnapshotRetentionPeriod=2 - &ClusterIdentifier=examplecluster - &ClusterParameterGroupName=parametergroup1 - &PreferredMaintenanceWindow=wed:07:30-wed:08:00 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T022911Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - - - 5439 -
examplecluster.coqoarplqhsn.us-east-1.redshift.amazonaws.com
- - available - 2 - 2 - true - false - dev - wed:07:30-wed:08:00 - - - applying - parametergroup1 - - - 2013-01-22T19:23:59.368Z - - - active - default - - - us-east-1c - dw.hs1.xlarge - examplecluster - true - adminuser - - - - acbc43d5-6504-11e2-bea9-49e0ce183f07 - - - diff --git a/test/resources/Redshift/ModifyClusterParameterGroup b/test/resources/Redshift/ModifyClusterParameterGroup deleted file mode 100644 index 5bdd80b604d..00000000000 --- a/test/resources/Redshift/ModifyClusterParameterGroup +++ /dev/null @@ -1,23 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=ModifyClusterParameterGroup - &ParameterGroupName=parametergroup1 - &Parameters.member.1.ParameterName=extra_float_digits - &Parameters.member.1.ParameterValue=2 - &Parameters.member.2.ParameterName=wlm_json_configuration - &Parameters.member.2.ParameterValue=[{"user_group":["example_user_group1"],"query_group":["example_query_group1"],"query_concurrency":7},{"query_concurrency":5}] - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T022525Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - Your parameter group has been updated but changes won't get applied until you reboot the associated Clusters. - parametergroup1 - - - 86e64043-40de-11e2-8a25-eb010998df4e - - - diff --git a/test/resources/Redshift/ModifyClusterParameterGroupResponse b/test/resources/Redshift/ModifyClusterParameterGroupResponse deleted file mode 100644 index 5bdd80b604d..00000000000 --- a/test/resources/Redshift/ModifyClusterParameterGroupResponse +++ /dev/null @@ -1,23 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=ModifyClusterParameterGroup - &ParameterGroupName=parametergroup1 - &Parameters.member.1.ParameterName=extra_float_digits - &Parameters.member.1.ParameterValue=2 - &Parameters.member.2.ParameterName=wlm_json_configuration - &Parameters.member.2.ParameterValue=[{"user_group":["example_user_group1"],"query_group":["example_query_group1"],"query_concurrency":7},{"query_concurrency":5}] - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T022525Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - Your parameter group has been updated but changes won't get applied until you reboot the associated Clusters. - parametergroup1 - - - 86e64043-40de-11e2-8a25-eb010998df4e - - - diff --git a/test/resources/Redshift/ModifyClusterResponse b/test/resources/Redshift/ModifyClusterResponse deleted file mode 100644 index d8d742da66e..00000000000 --- a/test/resources/Redshift/ModifyClusterResponse +++ /dev/null @@ -1,55 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=ModifyCluster - &AllowVersionUpgrade=true - &AutomatedSnapshotRetentionPeriod=2 - &ClusterIdentifier=examplecluster - &ClusterParameterGroupName=parametergroup1 - &PreferredMaintenanceWindow=wed:07:30-wed:08:00 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T022911Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - - - 5439 -
examplecluster.coqoarplqhsn.us-east-1.redshift.amazonaws.com
- - available - 2 - 2 - true - false - dev - wed:07:30-wed:08:00 - - - applying - parametergroup1 - - - 2013-01-22T19:23:59.368Z - - - active - default - - - us-east-1c - dw.hs1.xlarge - examplecluster - true - adminuser - - - - acbc43d5-6504-11e2-bea9-49e0ce183f07 - - - diff --git a/test/resources/Redshift/ModifyClusterSubnetGroup b/test/resources/Redshift/ModifyClusterSubnetGroup deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/Redshift/ModifyClusterSubnetGroupResponse b/test/resources/Redshift/ModifyClusterSubnetGroupResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/Redshift/PurchaseReservedNodeOffering b/test/resources/Redshift/PurchaseReservedNodeOffering deleted file mode 100644 index 47ad9c70b2f..00000000000 --- a/test/resources/Redshift/PurchaseReservedNodeOffering +++ /dev/null @@ -1,35 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=PurchaseReservedNodeOffering - &ReservedNodeOfferingId=3a98bf7d-979a-49cc-b568-18f24315baf0 - &NodeCount=2 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130117/us-east-1/redshift/aws4_request - &x-amz-date=20130117T232351Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - 2013-01-18T21:42:44.402Z - Heavy Utilization - 94608000 - - - Hourly - 0.21 - - - 12452.0 - 0.0 - payment-pending - dw.hs1.8xlarge - 2 - 1ba8e2e3-dacf-48d9-841f-cc675182a8a6 - - - - fcb117cc-61b7-11e2-b6e9-87e586e4ca38 - - - diff --git a/test/resources/Redshift/PurchaseReservedNodeOfferingResponse b/test/resources/Redshift/PurchaseReservedNodeOfferingResponse deleted file mode 100644 index 47ad9c70b2f..00000000000 --- a/test/resources/Redshift/PurchaseReservedNodeOfferingResponse +++ /dev/null @@ -1,35 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=PurchaseReservedNodeOffering - &ReservedNodeOfferingId=3a98bf7d-979a-49cc-b568-18f24315baf0 - &NodeCount=2 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130117/us-east-1/redshift/aws4_request - &x-amz-date=20130117T232351Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - 2013-01-18T21:42:44.402Z - Heavy Utilization - 94608000 - - - Hourly - 0.21 - - - 12452.0 - 0.0 - payment-pending - dw.hs1.8xlarge - 2 - 1ba8e2e3-dacf-48d9-841f-cc675182a8a6 - - - - fcb117cc-61b7-11e2-b6e9-87e586e4ca38 - - - diff --git a/test/resources/Redshift/RebootCluster b/test/resources/Redshift/RebootCluster deleted file mode 100644 index 2a3003009f7..00000000000 --- a/test/resources/Redshift/RebootCluster +++ /dev/null @@ -1,51 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=RebootCluster - &ClusterIdentifier=examplecluster - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T021951Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - - - 5439 -
examplecluster.cobaosmlqshn.us-east-1.redshift.amazonaws.com
- - rebooting - 2 - 1 - true - false - dev - sun:06:30-sun:07:00 - - - in-sync - default.redshift-1.0 - - - 2013-01-22T19:23:59.368Z - - - active - default - - - us-east-1c - dw.hs1.xlarge - examplecluster - true - adminuser - - - - 5edee79e-6503-11e2-9e70-918437dd236d - - - diff --git a/test/resources/Redshift/RebootClusterResponse b/test/resources/Redshift/RebootClusterResponse deleted file mode 100644 index 2a3003009f7..00000000000 --- a/test/resources/Redshift/RebootClusterResponse +++ /dev/null @@ -1,51 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=RebootCluster - &ClusterIdentifier=examplecluster - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T021951Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - - - 5439 -
examplecluster.cobaosmlqshn.us-east-1.redshift.amazonaws.com
- - rebooting - 2 - 1 - true - false - dev - sun:06:30-sun:07:00 - - - in-sync - default.redshift-1.0 - - - 2013-01-22T19:23:59.368Z - - - active - default - - - us-east-1c - dw.hs1.xlarge - examplecluster - true - adminuser - - - - 5edee79e-6503-11e2-9e70-918437dd236d - - - diff --git a/test/resources/Redshift/ResetClusterParameterGroup b/test/resources/Redshift/ResetClusterParameterGroup deleted file mode 100644 index d234e4dd467..00000000000 --- a/test/resources/Redshift/ResetClusterParameterGroup +++ /dev/null @@ -1,20 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=ResetClusterParameterGroup - &ParameterGroupName=parametergroup1 - &Parameters.member.1.ParameterName=extra_float_digits - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T020847Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - Your parameter group has been updated but changes won't get applied until you reboot the associated Clusters. - parametergroup1 - - - 625d23c1-40dc-11e2-8a25-eb010998df4e - - - diff --git a/test/resources/Redshift/ResetClusterParameterGroupResponse b/test/resources/Redshift/ResetClusterParameterGroupResponse deleted file mode 100644 index d234e4dd467..00000000000 --- a/test/resources/Redshift/ResetClusterParameterGroupResponse +++ /dev/null @@ -1,20 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=ResetClusterParameterGroup - &ParameterGroupName=parametergroup1 - &Parameters.member.1.ParameterName=extra_float_digits - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20121208/us-east-1/redshift/aws4_request - &x-amz-date=20121208T020847Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - Your parameter group has been updated but changes won't get applied until you reboot the associated Clusters. - parametergroup1 - - - 625d23c1-40dc-11e2-8a25-eb010998df4e - - - diff --git a/test/resources/Redshift/RestoreFromClusterSnapshot b/test/resources/Redshift/RestoreFromClusterSnapshot deleted file mode 100644 index 26ddd305414..00000000000 --- a/test/resources/Redshift/RestoreFromClusterSnapshot +++ /dev/null @@ -1,46 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=RestoreFromClusterSnapshot - &ClusterIdentifier=examplecluster-restored - &SnapshotIdentifier=cm:examplecluster-2013-01-22-19-27-58 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T023350Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - - creating - 2 - 1 - true - false - dev - sun:06:30-sun:07:00 - - - in-sync - default.redshift-1.0 - - - - - active - default - - - dw.hs1.xlarge - examplecluster-restored - true - adminuser - - - - 52a9aee8-6505-11e2-bec0-17624ad140dd - - - diff --git a/test/resources/Redshift/RestoreFromClusterSnapshotResponse b/test/resources/Redshift/RestoreFromClusterSnapshotResponse deleted file mode 100644 index 26ddd305414..00000000000 --- a/test/resources/Redshift/RestoreFromClusterSnapshotResponse +++ /dev/null @@ -1,46 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=RestoreFromClusterSnapshot - &ClusterIdentifier=examplecluster-restored - &SnapshotIdentifier=cm:examplecluster-2013-01-22-19-27-58 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T023350Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - 1.0 - - creating - 2 - 1 - true - false - dev - sun:06:30-sun:07:00 - - - in-sync - default.redshift-1.0 - - - - - active - default - - - dw.hs1.xlarge - examplecluster-restored - true - adminuser - - - - 52a9aee8-6505-11e2-bec0-17624ad140dd - - - diff --git a/test/resources/Redshift/RevokeClusterSecurityGroupIngress b/test/resources/Redshift/RevokeClusterSecurityGroupIngress deleted file mode 100644 index 1e817d9cedd..00000000000 --- a/test/resources/Redshift/RevokeClusterSecurityGroupIngress +++ /dev/null @@ -1,24 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=RevokeClusterSecurityGroupIngress - &ClusterSecurityGroupName=securitygroup1 - &CIDRIP=192.168.40.3/32 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T021606Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - my security group - securitygroup1 - - - - d8eff363-6502-11e2-a8da-655adc216806 - - - diff --git a/test/resources/Redshift/RevokeClusterSecurityGroupIngressResponse b/test/resources/Redshift/RevokeClusterSecurityGroupIngressResponse deleted file mode 100644 index 1e817d9cedd..00000000000 --- a/test/resources/Redshift/RevokeClusterSecurityGroupIngressResponse +++ /dev/null @@ -1,24 +0,0 @@ -https://redshift.us-east-1.amazonaws.com/ - ?Action=RevokeClusterSecurityGroupIngress - &ClusterSecurityGroupName=securitygroup1 - &CIDRIP=192.168.40.3/32 - &Version=2012-12-01 - &x-amz-algorithm=AWS4-HMAC-SHA256 - &x-amz-credential=AKIAIOSFODNN7EXAMPLE/20130123/us-east-1/redshift/aws4_request - &x-amz-date=20130123T021606Z - &x-amz-signedheaders=content-type;host;x-amz-date - - - - - - - my security group - securitygroup1 - - - - d8eff363-6502-11e2-a8da-655adc216806 - - - diff --git a/test/resources/Redshift/RevokeSnapshotAccess b/test/resources/Redshift/RevokeSnapshotAccess deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/Redshift/RevokeSnapshotAccessResponse b/test/resources/Redshift/RevokeSnapshotAccessResponse deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/resources/Route53/ChangeResourceRecordSets b/test/resources/Route53/ChangeResourceRecordSets deleted file mode 100644 index 7f3b049ba70..00000000000 --- a/test/resources/Route53/ChangeResourceRecordSets +++ /dev/null @@ -1,69 +0,0 @@ -POST /2012-12-12/hostedzone/{{ crrsZoneId }}/rrset -application/xml - - - {% if crrsChangeBatch %} - - {% if crrsChangeBatch.cbComment %} - {{ crrsChangeBatch.cbComment }} - {% endif %} - {% for c in crrsChangeBatch.cbChanges %} - {% if c.first %} - - {% endif %} - - {% case c.value.cAction %}{% when "CreateAction" %}CREATE{% when "DeleteAction" %}DELETE{% endcase %} - - {{ c.value.cResourceRecordSet.rrsName }} - {{ c.value.cResourceRecordSet.rrsType }} - {% if c.value.cResourceRecordSet.rrsSetIdentifier %} - {{ c.value.cResourceRecordSet.rrsSetIdentifier }} - {% endif %} - {% if c.value.cResourceRecordSet.rrsRegion %} - {{ c.value.cResourceRecordSet.rrsRegion }} - {% endif %} - {% if c.value.cResourceRecordSet.rrsWeight %} - {{ c.value.cResourceRecordSet.rrsWeight }} - {% endif %} - {% if c.value.cResourceRecordSet.rrsFailover %} - {{ c.value.cResourceRecordSet.rrsFailover }} - {% endif %} - {% if c.value.cResourceRecordSet.rrsTTL %} - {{ c.value.cResourceRecordSet.rrsTTL }} - {% endif %} - {% if c.value.cResourceRecordSet.rrsResourceRecords %} - {% for v in c.value.cResourceRecordSet.rrsResourceRecords.rrValues %} - {% if v.first %} - - {% endif %} - - {{ v.value }} - - {% if v.last %} - - {% endif %} - {% else %} - - {% endfor %} - {% endif %} - {% if c.value.cResourceRecordSet.rrsAliasTarget %} - - {{ c.value.cResourceRecordSet.rrsAliasTarget.atHostedZoneId }} - {{ c.value.cResourceRecordSet.rrsAliasTarget.atDNSName }} - {{ c.value.cResourceRecordSet.rrsAliasTarget.atEvaluateTargetHealth | show | lower}} - - {% endif %} - {% if c.value.cResourceRecordSet.rrsHealthCheckId %} - {{ c.value.cResourceRecordSet.rrsHealthCheckId }} - {% endif %} - - - {% if c.last %} - - {% endif %} - {% else %} - - {% endfor %} - - {% endif %} - diff --git a/test/resources/Route53/ChangeResourceRecordSetsResponse b/test/resources/Route53/ChangeResourceRecordSetsResponse deleted file mode 100644 index 3959b6c64f9..00000000000 --- a/test/resources/Route53/ChangeResourceRecordSetsResponse +++ /dev/null @@ -1,12 +0,0 @@ - - - {% if crrsrChangeInfo %} - - {{ crrsrChangeInfo.ciId }} - {{ crrsrChangeInfo.ciStatus }} - {{ crrsrChangeInfo.ciSubmittedAt }} - - {% else %} - - {% endif %} - diff --git a/test/resources/Route53/CreateHealthCheck b/test/resources/Route53/CreateHealthCheck deleted file mode 100644 index 4fe4fc0ee22..00000000000 --- a/test/resources/Route53/CreateHealthCheck +++ /dev/null @@ -1,15 +0,0 @@ -POST /2012-12-12/healthcheck -application/xml - - - {{ chcCallerReference }} - {% if chcHealthCheckConfig %} - - {{ chcHealthCheckConfig.hccIPAddress }} - {{ chcHealthCheckConfig.hccPort }} - {{ chcHealthCheckConfig.hccType }} - {{ chcHealthCheckConfig.hccResourcePath }} - {{ chcHealthCheckConfig.hccFullyQualifiedDomainName }} - - {% endif %} - diff --git a/test/resources/Route53/CreateHealthCheckResponse b/test/resources/Route53/CreateHealthCheckResponse deleted file mode 100644 index 8306ea72904..00000000000 --- a/test/resources/Route53/CreateHealthCheckResponse +++ /dev/null @@ -1,18 +0,0 @@ - - - {% if chcrHealthCheck %} - - {{ chcrHealthCheck.hcId }} - {{ chcrHealthCheck.hcCallerReference }} - {% if chcrHealthCheck.hcHealthCheckConfig %} - - {{ chcrHealthCheck.hcHealthCheckConfig.hccIPAddress }} - {{ chcrHealthCheck.hcHealthCheckConfig.hccPort }} - {{ chcrHealthCheck.hcHealthCheckConfig.hccType }} - {{ chcrHealthCheck.hcHealthCheckConfig.hccResourcePath }} - {{ chcrHealthCheck.hcHealthCheckConfig.hccFullyQualifiedDomainName }} - - {% endif %} - - {% endif %} - diff --git a/test/resources/Route53/CreateHostedZone b/test/resources/Route53/CreateHostedZone deleted file mode 100644 index 6291f9c7544..00000000000 --- a/test/resources/Route53/CreateHostedZone +++ /dev/null @@ -1,16 +0,0 @@ -POST /2012-12-12/hostedzone -application/xml - - - {{ chzName }} - {{ chzCallerReference }} - {% if chzHostedZoneConfig %} - {% if chzHostedZoneConfig.cComment %} - - {{ chzHostedZoneConfig.cComment }} - - {% else %} - - {% endif %} - {% endif %} - diff --git a/test/resources/Route53/CreateHostedZoneResponse b/test/resources/Route53/CreateHostedZoneResponse deleted file mode 100644 index cc2b4132515..00000000000 --- a/test/resources/Route53/CreateHostedZoneResponse +++ /dev/null @@ -1,32 +0,0 @@ - - - {% if chzrHostedZone %} - - {{ chzrHostedZone.hzId }} - {{ chzrHostedZone.hzName }} - {{ chzrHostedZone.hzCallerReference }} - {% if chzrHostedZone.hzConfig %} - - {{ chzrHostedZone.hzConfig.cComment }} - - {% endif %} - {{ chzrHostedZone.hzResourceRecordSetCount }} - - {% endif %} - {% if chzrChangeInfo %} - - {{ chzrChangeInfo.ciId }} - {{ chzrChangeInfo.ciStatus }} - {{ chzrChangeInfo.ciSubmittedAt }} - - {% endif %} - {% if chzrDelegationSet %} - - - {% for ns in chzrDelegationSet.dsNameServers %} - {{ ns.value }} - {% endfor %} - - - {% endif %} - diff --git a/test/resources/Route53/DeleteHealthCheck b/test/resources/Route53/DeleteHealthCheck deleted file mode 100644 index f99e4aca2d7..00000000000 --- a/test/resources/Route53/DeleteHealthCheck +++ /dev/null @@ -1 +0,0 @@ -DELETE /2012-12-12/healthcheck/{{ dhcId }} diff --git a/test/resources/Route53/DeleteHealthCheckResponse b/test/resources/Route53/DeleteHealthCheckResponse deleted file mode 100644 index 32941ea0e03..00000000000 --- a/test/resources/Route53/DeleteHealthCheckResponse +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/resources/Route53/DeleteHostedZone b/test/resources/Route53/DeleteHostedZone deleted file mode 100644 index 03a7151ebe2..00000000000 --- a/test/resources/Route53/DeleteHostedZone +++ /dev/null @@ -1 +0,0 @@ -DELETE /2012-12-12/hostedzone/{{ dhzId }} diff --git a/test/resources/Route53/DeleteHostedZoneResponse b/test/resources/Route53/DeleteHostedZoneResponse deleted file mode 100644 index 7f49885362d..00000000000 --- a/test/resources/Route53/DeleteHostedZoneResponse +++ /dev/null @@ -1,10 +0,0 @@ - - - {% if dhzrChangeInfo %} - - {{ dhzrChangeInfo.ciId }} - {{ dhzrChangeInfo.ciStatus }} - {{ dhzrChangeInfo.ciSubmittedAt }} - - {% endif %} - diff --git a/test/resources/Route53/GetChange b/test/resources/Route53/GetChange deleted file mode 100644 index 49b0552b1c5..00000000000 --- a/test/resources/Route53/GetChange +++ /dev/null @@ -1 +0,0 @@ -GET /2012-12-12/change/{{ gcId }} diff --git a/test/resources/Route53/GetChangeResponse b/test/resources/Route53/GetChangeResponse deleted file mode 100644 index c7eeeef4475..00000000000 --- a/test/resources/Route53/GetChangeResponse +++ /dev/null @@ -1,12 +0,0 @@ - - - {% if gcrChangeInfo %} - - {{ gcrChangeInfo.ciId }} - {{ gcrChangeInfo.ciStatus }} - {{ gcrChangeInfo.ciSubmittedAt }} - - {% else %} - - {% endif %} - diff --git a/test/resources/Route53/GetHealthCheck b/test/resources/Route53/GetHealthCheck deleted file mode 100644 index 27201e5fe05..00000000000 --- a/test/resources/Route53/GetHealthCheck +++ /dev/null @@ -1,2 +0,0 @@ -GET /2012-12-12/healthcheck/{{ ghcId }} - diff --git a/test/resources/Route53/GetHealthCheckResponse b/test/resources/Route53/GetHealthCheckResponse deleted file mode 100644 index e1909cb2ff5..00000000000 --- a/test/resources/Route53/GetHealthCheckResponse +++ /dev/null @@ -1,18 +0,0 @@ - - - {% if ghcrHealthCheck %} - - {{ ghcrHealthCheck.hcId }} - {{ ghcrHealthCheck.hcCallerReference }} - {% if ghcrHealthCheck.hcHealthCheckConfig %} - - {{ ghcrHealthCheck.hcHealthCheckConfig.hccIPAddress }} - {{ ghcrHealthCheck.hcHealthCheckConfig.hccPort }} - {{ ghcrHealthCheck.hcHealthCheckConfig.hccType }} - {{ ghcrHealthCheck.hcHealthCheckConfig.hccResourcePath }} - {{ ghcrHealthCheck.hcHealthCheckConfig.hccFullyQualifiedDomainName }} - - {% endif %} - - {% endif %} - diff --git a/test/resources/Route53/GetHostedZone b/test/resources/Route53/GetHostedZone deleted file mode 100644 index 97be66898a5..00000000000 --- a/test/resources/Route53/GetHostedZone +++ /dev/null @@ -1 +0,0 @@ -GET /2012-12-12/hostedzone/{{ ghzId }} diff --git a/test/resources/Route53/GetHostedZoneResponse b/test/resources/Route53/GetHostedZoneResponse deleted file mode 100644 index e2cac48aabf..00000000000 --- a/test/resources/Route53/GetHostedZoneResponse +++ /dev/null @@ -1,25 +0,0 @@ - - - {% if ghzrHostedZone %} - - {{ ghzrHostedZone.hzId }} - {{ ghzrHostedZone.hzName }} - {{ ghzrHostedZone.hzCallerReference }} - {% if ghzrHostedZone.hzConfig %} - - {{ ghzrHostedZone.hzConfig.cComment }} - - {% endif %} - {{ ghzrHostedZone.hzResourceRecordSetCount }} - - {% endif %} - {% if ghzrDelegationSet %} - - - {% for ns in ghzrDelegationSet.dsNameServers %} - {{ ns.value }} - {% endfor %} - - - {% endif %} - diff --git a/test/resources/Route53/ListHealthChecks b/test/resources/Route53/ListHealthChecks deleted file mode 100644 index 3fab743ff91..00000000000 --- a/test/resources/Route53/ListHealthChecks +++ /dev/null @@ -1,7 +0,0 @@ -GET /2012-12-12/healthcheck -{% if lhcMarker %} -marker={{ lhcMarker }} -{% endif %} -{% if lhcMaxItems %} -maxitems={{ lhcMaxItems }} -{% endif %} diff --git a/test/resources/Route53/ListHealthChecksResponse b/test/resources/Route53/ListHealthChecksResponse deleted file mode 100644 index 9311057f084..00000000000 --- a/test/resources/Route53/ListHealthChecksResponse +++ /dev/null @@ -1,28 +0,0 @@ - - - - {% for check in lhcrHealthChecks %} - - {{ check.value.hcId }} - {{ check.value.hcCallerReference }} - {% if check.value.hcHealthCheckConfig %} - - {{ check.value.hcHealthCheckConfig.hccIPAddress }} - {{ check.value.hcHealthCheckConfig.hccPort }} - {{ check.value.hcHealthCheckConfig.hccType }} - {{ check.value.hcHealthCheckConfig.hccResourcePath }} - {{ check.value.hcHealthCheckConfig.hccFullyQualifiedDomainName }} - - {% endif %} - - {% endfor %} - - {{ lhcrIsTruncated | show | lower }} - {% if lhcrMarker %} - {{ lhcrMarker }} - {% endif %} - {% if lhcrNextMarker %} - {{ lhcrNextMarker }} - {% endif %} - {{ lhcrMaxItems }} - diff --git a/test/resources/Route53/ListHostedZones b/test/resources/Route53/ListHostedZones deleted file mode 100644 index fdca16b9d41..00000000000 --- a/test/resources/Route53/ListHostedZones +++ /dev/null @@ -1,7 +0,0 @@ -GET /2012-12-12/hostedzone -{% if lhzMarker %} -marker={{ lhzMarker }} -{% endif %} -{% if lhzMaxItems %} -maxitems={{ lhzMaxItems }} -{% endif %} diff --git a/test/resources/Route53/ListHostedZonesResponse b/test/resources/Route53/ListHostedZonesResponse deleted file mode 100644 index e7c48d85bd2..00000000000 --- a/test/resources/Route53/ListHostedZonesResponse +++ /dev/null @@ -1,30 +0,0 @@ - - - - {% for zone in lhzrHostedZones %} - - {{ zone.value.hzId }} - {{ zone.value.hzName }} - {{ zone.value.hzCallerReference }} - {% if zone.value.hzConfig %} - {% if zone.value.hzConfig.cComment %} - - {{ zone.value.hzConfig.cComment }} - - {% else %} - - {% endif %} - {% endif %} - {{ zone.value.hzResourceRecordSetCount }} - - {% endfor %} - - {{ lhzrIsTruncated | show | lower }} - {% if lhzrMarker %} - {{ lhzrMarker }} - {% endif %} - {% if lhzrNextMarker %} - {{ lhzrNextMarker }} - {% endif %} - {{ lhzrMaxItems }} - diff --git a/test/resources/Route53/ListResourceRecordSets b/test/resources/Route53/ListResourceRecordSets deleted file mode 100644 index 03ef5462e91..00000000000 --- a/test/resources/Route53/ListResourceRecordSets +++ /dev/null @@ -1,17 +0,0 @@ -GET /2012-12-12/hostedzone/{{ lrrsZoneId }}/rrset -{% if lrrsIdentifier %} -identifier={{ lrrsIdentifier }} -{% endif %} -{% if lrrsMaxItems %} -maxitems={{ lrrsMaxItems }} -{% endif %} -{% if lrrsName %} -name={{ lrrsName }} -{% endif %} -{% if lrrsType %} -type={{ lrrsType }} -{% endif %} -{% if lrrsZoneId %} -zoneid={{ lrrsZoneId }} -{% endif %} - diff --git a/test/resources/Route53/ListResourceRecordSetsResponse b/test/resources/Route53/ListResourceRecordSetsResponse deleted file mode 100644 index 5a170c3887d..00000000000 --- a/test/resources/Route53/ListResourceRecordSetsResponse +++ /dev/null @@ -1,56 +0,0 @@ - - - - {% for rr in lrrsrResourceRecordSets %} - - {{ rr.value.rrsName }} - {{ rr.value.rrsType }} - {% if rr.value.rrsSetIdentifier %} - {{ rr.value.rrsSetIdentifier }} - {% endif %} - {% if rr.value.rrsFailover %} - {{ rr.value.rrsFailover }} - {% endif %} - {% if rr.value.rrsRegion %} - {{ rr.value.rrsRegion }} - {% endif %} - {% if rr.value.rrsWeight %} - {{ rr.value.rrsWeight }} - {% endif %} - {% if rr.value.rrsTTL %} - {{ rr.value.rrsTTL }} - {% endif %} - {% if rr.value.rrsResourceRecords %} - - {% for v in rr.value.rrsResourceRecords.rrValues %} - - {{ v.value }} - - {% endfor %} - - {% endif %} - {% if rr.value.rrsAliasTarget %} - - {{ rr.value.rrsAliasTarget.atHostedZoneId }} - {{ rr.value.rrsAliasTarget.atDNSName }} - {{ rr.value.rrsAliasTarget.atEvaluateTargetHealth | show | lower }} - - {% endif %} - {% if rr.value.rrsHealthCheckId %} - {{ rr.value.rrsHealthCheckId }} - {% endif %} - - {% endfor %} - - {{ lrrsrIsTruncated | show | lower }} - {{ lrrsrMaxItems }} - {% if lrrsrNextRecordName %} - {{ lrrsrNextRecordName }} - {% endif %} - {% if lrrsrNextRecordType %} - {{ lrrsrNextRecordType }} - {% endif %} - {% if lrrsrNextRecordIdentifier %} - {{ lrrsrNextRecordIdentifier }} - {% endif %} - diff --git a/test/resources/S3/GetService b/test/resources/S3/GetService deleted file mode 100644 index c6ee45096e4..00000000000 --- a/test/resources/S3/GetService +++ /dev/null @@ -1 +0,0 @@ -GET / diff --git a/test/resources/S3/GetServiceResponse b/test/resources/S3/GetServiceResponse deleted file mode 100644 index 58f6ec6c344..00000000000 --- a/test/resources/S3/GetServiceResponse +++ /dev/null @@ -1,21 +0,0 @@ - - - - {{ gsrOwner.oID }} - {{ gsrOwner.oDisplayName }} - - {% for b in gsrBuckets %} - {% if b.first %} - - {% endif %} - - {{ b.value.bName }} - {{ b.value.bCreationDate }} - - {% if b.last %} - - {% endif %} - {% else %} - - {% endfor %} - diff --git a/test/resources/S3/pending/BucketDELETE b/test/resources/S3/pending/BucketDELETE deleted file mode 100644 index fbee2c5ab12..00000000000 --- a/test/resources/S3/pending/BucketDELETE +++ /dev/null @@ -1,17 +0,0 @@ -DELETE / HTTP/1.1 -Host: BucketName.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE / HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 01 Mar 2006 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 204 No Content -x-amz-id-2: JuKZqmXuiwFeDQxhD7M8KtsKobSzWA1QEjLbTMTagkKdBX2z7Il/jGhDeJ3j6s80 -x-amz-request-id: 32FE2CEB32F5EE25 -Date: Wed, 01 Mar 2006 12:00:00 GMT -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketDELETEResponse b/test/resources/S3/pending/BucketDELETEResponse deleted file mode 100644 index fbee2c5ab12..00000000000 --- a/test/resources/S3/pending/BucketDELETEResponse +++ /dev/null @@ -1,17 +0,0 @@ -DELETE / HTTP/1.1 -Host: BucketName.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE / HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 01 Mar 2006 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 204 No Content -x-amz-id-2: JuKZqmXuiwFeDQxhD7M8KtsKobSzWA1QEjLbTMTagkKdBX2z7Il/jGhDeJ3j6s80 -x-amz-request-id: 32FE2CEB32F5EE25 -Date: Wed, 01 Mar 2006 12:00:00 GMT -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketDELETEcors b/test/resources/S3/pending/BucketDELETEcors deleted file mode 100644 index b15cc554e5c..00000000000 --- a/test/resources/S3/pending/BucketDELETEcors +++ /dev/null @@ -1,17 +0,0 @@ -DELETE /?cors HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE /?cors HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Date: Tue, 13 Dec 2011 19:14:42 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAAAAA= - -HTTP/1.1 204 No Content -x-amz-id-2: 0FmFIWsh/PpBuzZ0JFRC55ZGVmQW4SHJ7xVDqKwhEdJmf3q63RtrvH8ZuxW1Bol5 -x-amz-request-id: 0CF038E9BCF63097 -Date: Tue, 13 Dec 2011 19:14:42 GMT -Server: AmazonS3 -Content-Length: 0 - diff --git a/test/resources/S3/pending/BucketDELETEcorsResponse b/test/resources/S3/pending/BucketDELETEcorsResponse deleted file mode 100644 index b15cc554e5c..00000000000 --- a/test/resources/S3/pending/BucketDELETEcorsResponse +++ /dev/null @@ -1,17 +0,0 @@ -DELETE /?cors HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE /?cors HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Date: Tue, 13 Dec 2011 19:14:42 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAAAAA= - -HTTP/1.1 204 No Content -x-amz-id-2: 0FmFIWsh/PpBuzZ0JFRC55ZGVmQW4SHJ7xVDqKwhEdJmf3q63RtrvH8ZuxW1Bol5 -x-amz-request-id: 0CF038E9BCF63097 -Date: Tue, 13 Dec 2011 19:14:42 GMT -Server: AmazonS3 -Content-Length: 0 - diff --git a/test/resources/S3/pending/BucketDELETElifecycle b/test/resources/S3/pending/BucketDELETElifecycle deleted file mode 100644 index 5a2e96e494e..00000000000 --- a/test/resources/S3/pending/BucketDELETElifecycle +++ /dev/null @@ -1,17 +0,0 @@ -DELETE /?lifecycle HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Date: Wed, 14 Dec 2011 05:37:16 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:k3nL7gH3+PadhTEVn5EXAMPLE - -HTTP/1.1 204 No Content -x-amz-id-2: Uuag1LuByRx9e6j5OnimrSAMPLEtRPfTaOAa== -x-amz-request-id: 656c76696e672SAMPLE5657374 -Date: Wed, 14 Dec 2011 05:37:16 GMT -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketDELETElifecycleResponse b/test/resources/S3/pending/BucketDELETElifecycleResponse deleted file mode 100644 index 5a2e96e494e..00000000000 --- a/test/resources/S3/pending/BucketDELETElifecycleResponse +++ /dev/null @@ -1,17 +0,0 @@ -DELETE /?lifecycle HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Date: Wed, 14 Dec 2011 05:37:16 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:k3nL7gH3+PadhTEVn5EXAMPLE - -HTTP/1.1 204 No Content -x-amz-id-2: Uuag1LuByRx9e6j5OnimrSAMPLEtRPfTaOAa== -x-amz-request-id: 656c76696e672SAMPLE5657374 -Date: Wed, 14 Dec 2011 05:37:16 GMT -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketDELETEpolicy b/test/resources/S3/pending/BucketDELETEpolicy deleted file mode 100644 index 13637608b1f..00000000000 --- a/test/resources/S3/pending/BucketDELETEpolicy +++ /dev/null @@ -1,17 +0,0 @@ -DELETE /?policy HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE /?policy HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Tue, 04 Apr 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:k3nL7gH3+PadhTEVn5EXAMPLE - -HTTP/1.1 204 No Content -x-amz-id-2: Uuag1LuByRx9e6j5OnimrSAMPLEtRPfTaOFg== -x-amz-request-id: 656c76696e672SAMPLE5657374 -Date: Tue, 04 Apr 2010 20:34:56 GMT -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketDELETEpolicyResponse b/test/resources/S3/pending/BucketDELETEpolicyResponse deleted file mode 100644 index 13637608b1f..00000000000 --- a/test/resources/S3/pending/BucketDELETEpolicyResponse +++ /dev/null @@ -1,17 +0,0 @@ -DELETE /?policy HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE /?policy HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Tue, 04 Apr 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:k3nL7gH3+PadhTEVn5EXAMPLE - -HTTP/1.1 204 No Content -x-amz-id-2: Uuag1LuByRx9e6j5OnimrSAMPLEtRPfTaOFg== -x-amz-request-id: 656c76696e672SAMPLE5657374 -Date: Tue, 04 Apr 2010 20:34:56 GMT -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketDELETEtagging b/test/resources/S3/pending/BucketDELETEtagging deleted file mode 100644 index 5d584f497c2..00000000000 --- a/test/resources/S3/pending/BucketDELETEtagging +++ /dev/null @@ -1,15 +0,0 @@ -DELETE /?tagging HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE /?tagging HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Date: Wed, 14 Dec 2011 05:37:16 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:k3nL7gH3+PadhTEVn5EXAMPLE - -HTTP/1.1 204 No Content - Date: Wed, 25 Nov 2009 12:00:00 GMT - Connection: close - Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketDELETEtaggingResponse b/test/resources/S3/pending/BucketDELETEtaggingResponse deleted file mode 100644 index 5d584f497c2..00000000000 --- a/test/resources/S3/pending/BucketDELETEtaggingResponse +++ /dev/null @@ -1,15 +0,0 @@ -DELETE /?tagging HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE /?tagging HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Date: Wed, 14 Dec 2011 05:37:16 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:k3nL7gH3+PadhTEVn5EXAMPLE - -HTTP/1.1 204 No Content - Date: Wed, 25 Nov 2009 12:00:00 GMT - Connection: close - Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketDELETEwebsite b/test/resources/S3/pending/BucketDELETEwebsite deleted file mode 100644 index a4036b0153e..00000000000 --- a/test/resources/S3/pending/BucketDELETEwebsite +++ /dev/null @@ -1,16 +0,0 @@ -DELETE /?website HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE ?website HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - -HTTP/1.1 204 No Content -x-amz-id-2: aws-s3integ-s3ws-31008.sea31.amazon.com -x-amz-request-id: AF1DD829D3B49707 -Date: Thu, 03 Feb 2011 22:10:26 GMT -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketDELETEwebsiteResponse b/test/resources/S3/pending/BucketDELETEwebsiteResponse deleted file mode 100644 index a4036b0153e..00000000000 --- a/test/resources/S3/pending/BucketDELETEwebsiteResponse +++ /dev/null @@ -1,16 +0,0 @@ -DELETE /?website HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -DELETE ?website HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - -HTTP/1.1 204 No Content -x-amz-id-2: aws-s3integ-s3ws-31008.sea31.amazon.com -x-amz-request-id: AF1DD829D3B49707 -Date: Thu, 03 Feb 2011 22:10:26 GMT -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketGET b/test/resources/S3/pending/BucketGET deleted file mode 100644 index 09c0bd0114b..00000000000 --- a/test/resources/S3/pending/BucketGET +++ /dev/null @@ -1,136 +0,0 @@ -GET / HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET / HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain - - - - bucket - - - 1000 - false - - my-image.jpg - 2009-10-12T17:50:30.000Z - "fba9dede5f27731c9771645a39863328" - 434234 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-third-image.jpg - 2009-10-12T17:50:30.000Z - "1b2cf535f27731c974343645a3985328" - 64994 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - -GET /?prefix=N&marker=Ned&max-keys=40 HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: gyB+3jRPnrkN98ZajxHXr3u7EFM67bNgSAxexeEHndCX/7GRnfTXxReKUQF28IfP -x-amz-request-id: 3B3C7C725673C630 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Content-Type: application/xml -Content-Length: 302 -Connection: close -Server: AmazonS3 - - - - quotes - N - Ned - 40 - false - - Nelson - 2006-01-01T12:00:00.000Z - "828ef3fdfa96f00ad9f27c383fc9ac7f" - 5 - STANDARD - - bcaf161ca5fb16fd081034f - webfile - - - - Neo - 2006-01-01T12:00:00.000Z - "828ef3fdfa96f00ad9f27c383fc9ac7f" - 4 - STANDARD - - bcaf1ffd86a5fb16fd081034f - webfile - - - - -GET /?delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - example-bucket - - - 1000 - / - false - - sample.html - 2011-02-26T01:56:20.000Z - "bf1d737a4d46a19f3bced6905cc8b902" - 142863 - - canonical-user-id - display-name - - STANDARD - - - photos/ - - - -GET /?prefix=photos/2006/&delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - example-bucket - photos/2006/ - - 1000 - / - false - - - photos/2006/feb/ - - - photos/2006/jan/ - - - diff --git a/test/resources/S3/pending/BucketGETResponse b/test/resources/S3/pending/BucketGETResponse deleted file mode 100644 index 09c0bd0114b..00000000000 --- a/test/resources/S3/pending/BucketGETResponse +++ /dev/null @@ -1,136 +0,0 @@ -GET / HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET / HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain - - - - bucket - - - 1000 - false - - my-image.jpg - 2009-10-12T17:50:30.000Z - "fba9dede5f27731c9771645a39863328" - 434234 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-third-image.jpg - 2009-10-12T17:50:30.000Z - "1b2cf535f27731c974343645a3985328" - 64994 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - -GET /?prefix=N&marker=Ned&max-keys=40 HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: gyB+3jRPnrkN98ZajxHXr3u7EFM67bNgSAxexeEHndCX/7GRnfTXxReKUQF28IfP -x-amz-request-id: 3B3C7C725673C630 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Content-Type: application/xml -Content-Length: 302 -Connection: close -Server: AmazonS3 - - - - quotes - N - Ned - 40 - false - - Nelson - 2006-01-01T12:00:00.000Z - "828ef3fdfa96f00ad9f27c383fc9ac7f" - 5 - STANDARD - - bcaf161ca5fb16fd081034f - webfile - - - - Neo - 2006-01-01T12:00:00.000Z - "828ef3fdfa96f00ad9f27c383fc9ac7f" - 4 - STANDARD - - bcaf1ffd86a5fb16fd081034f - webfile - - - - -GET /?delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - example-bucket - - - 1000 - / - false - - sample.html - 2011-02-26T01:56:20.000Z - "bf1d737a4d46a19f3bced6905cc8b902" - 142863 - - canonical-user-id - display-name - - STANDARD - - - photos/ - - - -GET /?prefix=photos/2006/&delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - example-bucket - photos/2006/ - - 1000 - / - false - - - photos/2006/feb/ - - - photos/2006/jan/ - - - diff --git a/test/resources/S3/pending/BucketGETVersion b/test/resources/S3/pending/BucketGETVersion deleted file mode 100644 index 3010854e02f..00000000000 --- a/test/resources/S3/pending/BucketGETVersion +++ /dev/null @@ -1,317 +0,0 @@ -GET /?versions HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET /?versions HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - - bucket - my - - - 5 - false - - my-image.jpg - 3/L4kqtJl40Nr8X8gdRQBpUMLUo - true - 2009-10-12T17:50:30.000Z - "fba9dede5f27731c9771645a39863328" - 434234 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-second-image.jpg - 03jpff543dhffds434rfdsFDN943fdsFkdmqnh892 - true - 2009-11-12T17:50:30.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-second-image.jpg - QUpfdndhfd8438MNFDN93jdnJFkdmqnh893 - false - 2009-10-10T17:50:30.000Z - "9b2cf535f27731c974343645a3985328" - 166434 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-third-image.jpg - 03jpff543dhffds434rfdsFDN943fdsFkdmqnh892 - true - 2009-10-15T17:50:30.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-third-image.jpg - UIORUnfndfhnw89493jJFJ - false - 2009-10-11T12:50:30.000Z - "772cf535f27731c974343645a3985328" - 64 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - -GET /?versions&key-marker=key2 HTTP/1.1 -Host: s3.amazonaws.com -Pragma: no-cache -Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */* -Date: Thu, 10 Dec 2009 22:46:32 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:U1j5vNnJfzmiv3c1GnlG6MLVeZU= - - - - mtp-versioning-fresh - - key2 - - 1000 - false - - key3 - I5VhmK6CDDdQ5Pwfe1gcHZWmHDpcv7gfmfc29UBxsKU. - true - 2009-12-09T00:19:04.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - sourcekey - qDhprLU80sAlCFLu2DWgXAEDgKzWarn-HS_JU0TvYqs. - true - 2009-12-10T16:38:11.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - - - sourcekey - wxxQ7ezLaL5JN2Sislq66Syxxo0k7uHTUpb9qiiMxNg. - false - 2009-12-10T16:37:44.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - -GET /?versions&prefix=source HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - mtp-versioning-fresh - source - - - 1000 - false - - sourcekey - qDhprLU80sAlCFLu2DWgXAEDgKzWarn-HS_JU0TvYqs. - true - 2009-12-10T16:38:11.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - - - sourcekey - wxxQ7ezLaL5JN2Sislq66Syxxo0k7uHTUpb9qiiMxNg. - false - 2009-12-10T16:37:44.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - -GET /?versions&key-marker=key3&version-id-marker=t46ZenlYTZBnj HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - mtp-versioning-fresh - - key3 - t46ZenlYTZBnj - 1000 - false - - sourcekey - qDhprLU80sAlCFLu2DWgXAEDgKzWarn-HS_JU0TvYqs. - true - 2009-12-10T16:38:11.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - - - sourcekey - wxxQ7ezLaL5JN2Sislq66Syxxo0k7uHTUpb9qiiMxNg. - false - 2009-12-10T16:37:44.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - -GET /?versions&key-marker=key3&version-id-marker=t46Z0menlYTZBnj HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - mtp-versioning-fresh - - key3 - null - key3 - d-d309mfjFrUmoQ0DBsVqmcMV15OI. - 2 - true - - key3 - 8XECiENpj8pydEDJdd-_VRrvaGKAHOaGMNW7tg6UViI. - false - 2009-12-09T00:18:23.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - key3 - d-d309mfjFri40QYukDozqBt3UmoQ0DBsVqmcMV15OI. - false - 2009-12-09T00:18:08.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - -GET /?versions&delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Wed, 02 Feb 2011 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - mvbucketwithversionon1 - - - - 1000 - / - false - - - Sample.jpg - toxMzQlBsGyGCz1YuMWMp90cdXLzqOCH - true - 2011-02-02T18:46:20.000Z - "3305f2cfc46c0f04559748bb039d69ae" - 3191 - - 852b113e7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc - display-name - - STANDARD - - - - photos/ - - - videos/ - - - -GET /?versions&prefix=photos/2006/&delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Wed, 02 Feb 2011 19:34:02 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - example-bucket - photos/2006/ - - - 1000 - / - false - - photos/2006/ - 3U275dAA4gz8ZOqOPHtJCUOi60krpCdy - true - 2011-02-02T18:47:27.000Z - "d41d8cd98f00b204e9800998ecf8427e" - 0 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - display-name - - STANDARD - - - photos/2006/February/ - - - photos/2006/January/ - - - photos/2006/March/ - - - diff --git a/test/resources/S3/pending/BucketGETVersionResponse b/test/resources/S3/pending/BucketGETVersionResponse deleted file mode 100644 index 3010854e02f..00000000000 --- a/test/resources/S3/pending/BucketGETVersionResponse +++ /dev/null @@ -1,317 +0,0 @@ -GET /?versions HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET /?versions HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - - bucket - my - - - 5 - false - - my-image.jpg - 3/L4kqtJl40Nr8X8gdRQBpUMLUo - true - 2009-10-12T17:50:30.000Z - "fba9dede5f27731c9771645a39863328" - 434234 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-second-image.jpg - 03jpff543dhffds434rfdsFDN943fdsFkdmqnh892 - true - 2009-11-12T17:50:30.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-second-image.jpg - QUpfdndhfd8438MNFDN93jdnJFkdmqnh893 - false - 2009-10-10T17:50:30.000Z - "9b2cf535f27731c974343645a3985328" - 166434 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-third-image.jpg - 03jpff543dhffds434rfdsFDN943fdsFkdmqnh892 - true - 2009-10-15T17:50:30.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - my-third-image.jpg - UIORUnfndfhnw89493jJFJ - false - 2009-10-11T12:50:30.000Z - "772cf535f27731c974343645a3985328" - 64 - STANDARD - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - -GET /?versions&key-marker=key2 HTTP/1.1 -Host: s3.amazonaws.com -Pragma: no-cache -Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */* -Date: Thu, 10 Dec 2009 22:46:32 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:U1j5vNnJfzmiv3c1GnlG6MLVeZU= - - - - mtp-versioning-fresh - - key2 - - 1000 - false - - key3 - I5VhmK6CDDdQ5Pwfe1gcHZWmHDpcv7gfmfc29UBxsKU. - true - 2009-12-09T00:19:04.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - sourcekey - qDhprLU80sAlCFLu2DWgXAEDgKzWarn-HS_JU0TvYqs. - true - 2009-12-10T16:38:11.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - - - sourcekey - wxxQ7ezLaL5JN2Sislq66Syxxo0k7uHTUpb9qiiMxNg. - false - 2009-12-10T16:37:44.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - -GET /?versions&prefix=source HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - mtp-versioning-fresh - source - - - 1000 - false - - sourcekey - qDhprLU80sAlCFLu2DWgXAEDgKzWarn-HS_JU0TvYqs. - true - 2009-12-10T16:38:11.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - - - sourcekey - wxxQ7ezLaL5JN2Sislq66Syxxo0k7uHTUpb9qiiMxNg. - false - 2009-12-10T16:37:44.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - -GET /?versions&key-marker=key3&version-id-marker=t46ZenlYTZBnj HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - mtp-versioning-fresh - - key3 - t46ZenlYTZBnj - 1000 - false - - sourcekey - qDhprLU80sAlCFLu2DWgXAEDgKzWarn-HS_JU0TvYqs. - true - 2009-12-10T16:38:11.000Z - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - - - sourcekey - wxxQ7ezLaL5JN2Sislq66Syxxo0k7uHTUpb9qiiMxNg. - false - 2009-12-10T16:37:44.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - -GET /?versions&key-marker=key3&version-id-marker=t46Z0menlYTZBnj HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - mtp-versioning-fresh - - key3 - null - key3 - d-d309mfjFrUmoQ0DBsVqmcMV15OI. - 2 - true - - key3 - 8XECiENpj8pydEDJdd-_VRrvaGKAHOaGMNW7tg6UViI. - false - 2009-12-09T00:18:23.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - key3 - d-d309mfjFri40QYukDozqBt3UmoQ0DBsVqmcMV15OI. - false - 2009-12-09T00:18:08.000Z - "396fefef536d5ce46c7537ecf978a360" - 217 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - - STANDARD - - - -GET /?versions&delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Wed, 02 Feb 2011 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - mvbucketwithversionon1 - - - - 1000 - / - false - - - Sample.jpg - toxMzQlBsGyGCz1YuMWMp90cdXLzqOCH - true - 2011-02-02T18:46:20.000Z - "3305f2cfc46c0f04559748bb039d69ae" - 3191 - - 852b113e7a2f25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc - display-name - - STANDARD - - - - photos/ - - - videos/ - - - -GET /?versions&prefix=photos/2006/&delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Wed, 02 Feb 2011 19:34:02 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - example-bucket - photos/2006/ - - - 1000 - / - false - - photos/2006/ - 3U275dAA4gz8ZOqOPHtJCUOi60krpCdy - true - 2011-02-02T18:47:27.000Z - "d41d8cd98f00b204e9800998ecf8427e" - 0 - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - display-name - - STANDARD - - - photos/2006/February/ - - - photos/2006/January/ - - - photos/2006/March/ - - - diff --git a/test/resources/S3/pending/BucketGETacl b/test/resources/S3/pending/BucketGETacl deleted file mode 100644 index 35a0a355067..00000000000 --- a/test/resources/S3/pending/BucketGETacl +++ /dev/null @@ -1,37 +0,0 @@ -GET /?acl HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?acl HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -Content-Length: 124 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - CustomersName@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - CustomersName@amazon.com - - FULL_CONTROL - - - - diff --git a/test/resources/S3/pending/BucketGETaclResponse b/test/resources/S3/pending/BucketGETaclResponse deleted file mode 100644 index 35a0a355067..00000000000 --- a/test/resources/S3/pending/BucketGETaclResponse +++ /dev/null @@ -1,37 +0,0 @@ -GET /?acl HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?acl HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -Content-Length: 124 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - CustomersName@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - CustomersName@amazon.com - - FULL_CONTROL - - - - diff --git a/test/resources/S3/pending/BucketGETcors b/test/resources/S3/pending/BucketGETcors deleted file mode 100644 index ba4d83124b8..00000000000 --- a/test/resources/S3/pending/BucketGETcors +++ /dev/null @@ -1,26 +0,0 @@ -GET /?cors HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET /?cors HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Date: Tue, 13 Dec 2011 19:14:42 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAAAAA= - -HTTP/1.1 200 OK -x-amz-id-2: 0FmFIWsh/PpBuzZ0JFRC55ZGVmQW4SHJ7xVDqKwhEdJmf3q63RtrvH8ZuxW1Bol5 -x-amz-request-id: 0CF038E9BCF63097 -Date: Tue, 13 Dec 2011 19:14:42 GMT -Server: AmazonS3 -Content-Length: 280 - - - - http://www.example.com - GET - 3000 - x-amz-server-side-encryption - - - diff --git a/test/resources/S3/pending/BucketGETcorsResponse b/test/resources/S3/pending/BucketGETcorsResponse deleted file mode 100644 index ba4d83124b8..00000000000 --- a/test/resources/S3/pending/BucketGETcorsResponse +++ /dev/null @@ -1,26 +0,0 @@ -GET /?cors HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET /?cors HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Date: Tue, 13 Dec 2011 19:14:42 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAAAAA= - -HTTP/1.1 200 OK -x-amz-id-2: 0FmFIWsh/PpBuzZ0JFRC55ZGVmQW4SHJ7xVDqKwhEdJmf3q63RtrvH8ZuxW1Bol5 -x-amz-request-id: 0CF038E9BCF63097 -Date: Tue, 13 Dec 2011 19:14:42 GMT -Server: AmazonS3 -Content-Length: 280 - - - - http://www.example.com - GET - 3000 - x-amz-server-side-encryption - - - diff --git a/test/resources/S3/pending/BucketGETlifecycle b/test/resources/S3/pending/BucketGETlifecycle deleted file mode 100644 index 8ae99f3e5ba..00000000000 --- a/test/resources/S3/pending/BucketGETlifecycle +++ /dev/null @@ -1,33 +0,0 @@ -GET /?lifecycle HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Thu, 15 Nov 2012 00:17:21 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAAAAA= - -HTTP/1.1 200 OK -x-amz-id-2: ITnGT1y4RyTmXa3rPi4hklTXouTf0hccUjo0iCPjz6FnfIutBj3M7fPGlWO2SEWp -x-amz-request-id: 51991C342C575321 -Date: Thu, 15 Nov 2012 00:17:23 GMT -Server: AmazonS3 -Content-Length: 358 - - - - - Archive and then delete rule - projectdocs/ - Enabled - - 365 - GLACIER - - - 3650 - - - - diff --git a/test/resources/S3/pending/BucketGETlifecycleResponse b/test/resources/S3/pending/BucketGETlifecycleResponse deleted file mode 100644 index 8ae99f3e5ba..00000000000 --- a/test/resources/S3/pending/BucketGETlifecycleResponse +++ /dev/null @@ -1,33 +0,0 @@ -GET /?lifecycle HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Thu, 15 Nov 2012 00:17:21 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAAAAA= - -HTTP/1.1 200 OK -x-amz-id-2: ITnGT1y4RyTmXa3rPi4hklTXouTf0hccUjo0iCPjz6FnfIutBj3M7fPGlWO2SEWp -x-amz-request-id: 51991C342C575321 -Date: Thu, 15 Nov 2012 00:17:23 GMT -Server: AmazonS3 -Content-Length: 358 - - - - - Archive and then delete rule - projectdocs/ - Enabled - - 365 - GLACIER - - - 3650 - - - - diff --git a/test/resources/S3/pending/BucketGETlocation b/test/resources/S3/pending/BucketGETlocation deleted file mode 100644 index 3aa3c057cb3..00000000000 --- a/test/resources/S3/pending/BucketGETlocation +++ /dev/null @@ -1,15 +0,0 @@ -GET /?location HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - -GET /?location HTTP/1.1 -Host: myBucket.s3.amazonaws.com -Date: Tue, 09 Oct 2007 20:26:04 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:JUtd9kkJFjbKbkP9f6T/tAxozYY= - - -EU - diff --git a/test/resources/S3/pending/BucketGETlocationResponse b/test/resources/S3/pending/BucketGETlocationResponse deleted file mode 100644 index 3aa3c057cb3..00000000000 --- a/test/resources/S3/pending/BucketGETlocationResponse +++ /dev/null @@ -1,15 +0,0 @@ -GET /?location HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - -GET /?location HTTP/1.1 -Host: myBucket.s3.amazonaws.com -Date: Tue, 09 Oct 2007 20:26:04 +0000 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:JUtd9kkJFjbKbkP9f6T/tAxozYY= - - -EU - diff --git a/test/resources/S3/pending/BucketGETlogging b/test/resources/S3/pending/BucketGETlogging deleted file mode 100644 index 94d3198521e..00000000000 --- a/test/resources/S3/pending/BucketGETlogging +++ /dev/null @@ -1,40 +0,0 @@ -GET /?logging HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signature - -GET ?logging HTTP/1.1 -Host: mybucket.s3.amazonaws.com -Date: Wed, 25 Nov 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -Date: Wed, 25 Nov 2009 12:00:00 GMT -Connection: close -Server: AmazonS3 - - - - - mybucketlogs - mybucket-access_log-/ - - - - user@company.com - - READ - - - - - -HTTP/1.1 200 OK -Date: Wed, 25 Nov 2009 12:00:00 GMT -Connection: close -Server: AmazonS3 - - - - diff --git a/test/resources/S3/pending/BucketGETloggingResponse b/test/resources/S3/pending/BucketGETloggingResponse deleted file mode 100644 index 94d3198521e..00000000000 --- a/test/resources/S3/pending/BucketGETloggingResponse +++ /dev/null @@ -1,40 +0,0 @@ -GET /?logging HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signature - -GET ?logging HTTP/1.1 -Host: mybucket.s3.amazonaws.com -Date: Wed, 25 Nov 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -Date: Wed, 25 Nov 2009 12:00:00 GMT -Connection: close -Server: AmazonS3 - - - - - mybucketlogs - mybucket-access_log-/ - - - - user@company.com - - READ - - - - - -HTTP/1.1 200 OK -Date: Wed, 25 Nov 2009 12:00:00 GMT -Connection: close -Server: AmazonS3 - - - - diff --git a/test/resources/S3/pending/BucketGETnotification b/test/resources/S3/pending/BucketGETnotification deleted file mode 100644 index a700bdf7c26..00000000000 --- a/test/resources/S3/pending/BucketGETnotification +++ /dev/null @@ -1,25 +0,0 @@ -GET /?notification HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?notification HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 09 June 2010 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A02 -Date: Wed, 02 June 2010 12:00:00 GMT -Connection: close -Server: AmazonS3 - - - arn:aws:sns:us-east-1:123456789012:myTopic - s3:ReducedRedundancyLostObject - - - - diff --git a/test/resources/S3/pending/BucketGETnotificationResponse b/test/resources/S3/pending/BucketGETnotificationResponse deleted file mode 100644 index a700bdf7c26..00000000000 --- a/test/resources/S3/pending/BucketGETnotificationResponse +++ /dev/null @@ -1,25 +0,0 @@ -GET /?notification HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?notification HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 09 June 2010 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A02 -Date: Wed, 02 June 2010 12:00:00 GMT -Connection: close -Server: AmazonS3 - - - arn:aws:sns:us-east-1:123456789012:myTopic - s3:ReducedRedundancyLostObject - - - - diff --git a/test/resources/S3/pending/BucketGETpolicy b/test/resources/S3/pending/BucketGETpolicy deleted file mode 100644 index 437350b154f..00000000000 --- a/test/resources/S3/pending/BucketGETpolicy +++ /dev/null @@ -1,34 +0,0 @@ -GET /?policy HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?policy HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByru9pO4SAMPLEAtRPfTaOFg== -x-amz-request-id: 656c76696e67SAMPLE57374 -Date: Tue, 04 Apr 2010 20:34:56 GMT -Connection: keep-alive -Server: AmazonS3 - - -{ -"Version":"2008-10-17", -"Id":"aaaa-bbbb-cccc-dddd", -"Statement" : [ - { - "Effect":"Deny", - "Sid":"1", - "Principal" : { - "AWS":["111122223333","444455556666"] - }, - "Action":["s3:*"], - "Resource":"arn:aws:s3:::bucket/*" - } - ] -} - diff --git a/test/resources/S3/pending/BucketGETpolicyResponse b/test/resources/S3/pending/BucketGETpolicyResponse deleted file mode 100644 index 437350b154f..00000000000 --- a/test/resources/S3/pending/BucketGETpolicyResponse +++ /dev/null @@ -1,34 +0,0 @@ -GET /?policy HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?policy HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByru9pO4SAMPLEAtRPfTaOFg== -x-amz-request-id: 656c76696e67SAMPLE57374 -Date: Tue, 04 Apr 2010 20:34:56 GMT -Connection: keep-alive -Server: AmazonS3 - - -{ -"Version":"2008-10-17", -"Id":"aaaa-bbbb-cccc-dddd", -"Statement" : [ - { - "Effect":"Deny", - "Sid":"1", - "Principal" : { - "AWS":["111122223333","444455556666"] - }, - "Action":["s3:*"], - "Resource":"arn:aws:s3:::bucket/*" - } - ] -} - diff --git a/test/resources/S3/pending/BucketGETtagging b/test/resources/S3/pending/BucketGETtagging deleted file mode 100644 index d2887a1f995..00000000000 --- a/test/resources/S3/pending/BucketGETtagging +++ /dev/null @@ -1,28 +0,0 @@ -GET /?tagging HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?tagging HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -Date: Wed, 25 Nov 2009 12:00:00 GMT -Connection: close -Server: AmazonS3 - - - - - Project - Project One - - - User - jsmith - - - - diff --git a/test/resources/S3/pending/BucketGETtaggingResponse b/test/resources/S3/pending/BucketGETtaggingResponse deleted file mode 100644 index d2887a1f995..00000000000 --- a/test/resources/S3/pending/BucketGETtaggingResponse +++ /dev/null @@ -1,28 +0,0 @@ -GET /?tagging HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?tagging HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -Date: Wed, 25 Nov 2009 12:00:00 GMT -Connection: close -Server: AmazonS3 - - - - - Project - Project One - - - User - jsmith - - - - diff --git a/test/resources/S3/pending/BucketGETversioningStatus b/test/resources/S3/pending/BucketGETversioningStatus deleted file mode 100644 index d34b71ff2c7..00000000000 --- a/test/resources/S3/pending/BucketGETversioningStatus +++ /dev/null @@ -1,26 +0,0 @@ - - Enabled - - - - Suspended - - - - -GET /?versioning HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue - -GET /?versioning HTTP/1.1 -Host: myBucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain - - - Enabled - - diff --git a/test/resources/S3/pending/BucketGETversioningStatusResponse b/test/resources/S3/pending/BucketGETversioningStatusResponse deleted file mode 100644 index d34b71ff2c7..00000000000 --- a/test/resources/S3/pending/BucketGETversioningStatusResponse +++ /dev/null @@ -1,26 +0,0 @@ - - Enabled - - - - Suspended - - - - -GET /?versioning HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue - -GET /?versioning HTTP/1.1 -Host: myBucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain - - - Enabled - - diff --git a/test/resources/S3/pending/BucketGETwebsite b/test/resources/S3/pending/BucketGETwebsite deleted file mode 100644 index 87263b6f9a7..00000000000 --- a/test/resources/S3/pending/BucketGETwebsite +++ /dev/null @@ -1,29 +0,0 @@ -GET /?website HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?website HTTP/1.1 -Host: example-bucket.s3.amazon.com -Date: Thu, 27 Jan 2011 00:49:20 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:n0Nhek72Ufg/u7Sm5C1dqRLs8XX= - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 3848CD259D811111 -Date: Thu, 27 Jan 2011 00:49:26 GMT -Content-Length: 240 -Content-Type: application/xml -Transfer-Encoding: chunked -Server: AmazonS3 - - - - - index.html - - - 404.html - - - diff --git a/test/resources/S3/pending/BucketGETwebsiteResponse b/test/resources/S3/pending/BucketGETwebsiteResponse deleted file mode 100644 index 87263b6f9a7..00000000000 --- a/test/resources/S3/pending/BucketGETwebsiteResponse +++ /dev/null @@ -1,29 +0,0 @@ -GET /?website HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET ?website HTTP/1.1 -Host: example-bucket.s3.amazon.com -Date: Thu, 27 Jan 2011 00:49:20 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:n0Nhek72Ufg/u7Sm5C1dqRLs8XX= - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 3848CD259D811111 -Date: Thu, 27 Jan 2011 00:49:26 GMT -Content-Length: 240 -Content-Type: application/xml -Transfer-Encoding: chunked -Server: AmazonS3 - - - - - index.html - - - 404.html - - - diff --git a/test/resources/S3/pending/BucketHEAD b/test/resources/S3/pending/BucketHEAD deleted file mode 100644 index f94610e0a38..00000000000 --- a/test/resources/S3/pending/BucketHEAD +++ /dev/null @@ -1,17 +0,0 @@ -HEAD / HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -HEAD / HTTP/1.1 -Date: Fri, 10 Feb 2012 21:34:55 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Host: myawsbucket.s3.amazonaws.com -Connection: Keep-Alive - -HTTP/1.1 200 OK -x-amz-id-2: JuKZqmXuiwFeDQxhD7M8KtsKobSzWA1QEjLbTMTagkKdBX2z7Il/jGhDeJ3j6s80 -x-amz-request-id: 32FE2CEB32F5EE25 -Date: Fri, 10 2012 21:34:56 GMT -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketHEADResponse b/test/resources/S3/pending/BucketHEADResponse deleted file mode 100644 index f94610e0a38..00000000000 --- a/test/resources/S3/pending/BucketHEADResponse +++ /dev/null @@ -1,17 +0,0 @@ -HEAD / HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -HEAD / HTTP/1.1 -Date: Fri, 10 Feb 2012 21:34:55 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Host: myawsbucket.s3.amazonaws.com -Connection: Keep-Alive - -HTTP/1.1 200 OK -x-amz-id-2: JuKZqmXuiwFeDQxhD7M8KtsKobSzWA1QEjLbTMTagkKdBX2z7Il/jGhDeJ3j6s80 -x-amz-request-id: 32FE2CEB32F5EE25 -Date: Fri, 10 2012 21:34:56 GMT -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUT b/test/resources/S3/pending/BucketPUT deleted file mode 100644 index 71dc4ccd57a..00000000000 --- a/test/resources/S3/pending/BucketPUT +++ /dev/null @@ -1,75 +0,0 @@ -PUT / HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue - - - BucketRegion - - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -PUT / HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -Content-Length: 0 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT / HTTP/1.1 -Host: bucketName.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 124 - - - EU - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT / HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -Content-Length: 0 -x-amz-acl: private -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -x-amz-date: Sat, 07 Apr 2012 00:54:40 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -x-amz-grant-write: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -HTTP/1.1 200 OK - diff --git a/test/resources/S3/pending/BucketPUTResponse b/test/resources/S3/pending/BucketPUTResponse deleted file mode 100644 index 71dc4ccd57a..00000000000 --- a/test/resources/S3/pending/BucketPUTResponse +++ /dev/null @@ -1,75 +0,0 @@ -PUT / HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue - - - BucketRegion - - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -PUT / HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -Content-Length: 0 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT / HTTP/1.1 -Host: bucketName.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 124 - - - EU - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT / HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -Content-Length: 0 -x-amz-acl: private -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -x-amz-date: Sat, 07 Apr 2012 00:54:40 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -x-amz-grant-write: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -HTTP/1.1 200 OK - diff --git a/test/resources/S3/pending/BucketPUTVersioningStatus b/test/resources/S3/pending/BucketPUTVersioningStatus deleted file mode 100644 index d9bded60399..00000000000 --- a/test/resources/S3/pending/BucketPUTVersioningStatus +++ /dev/null @@ -1,67 +0,0 @@ -PUT /?versioning HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue -x-amz-mfa: [SerialNumber] [TokenCode] - - - VersioningState - MfaDeleteState - - -PUT /?versioning HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 01 Mar 2006 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 124 - - - Enabled - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2006 12:00:00 GMT - -PUT /?versioning HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 124 - - - Suspended - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2006 12:00:00 GMT - -PUT /?versioning HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -x-amz-mfa:[SerialNumber] [TokenCode] -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 124 - - - Enabled - Enabled - - -HTTPS/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2006 12:00:00 GMT - -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTVersioningStatusResponse b/test/resources/S3/pending/BucketPUTVersioningStatusResponse deleted file mode 100644 index d9bded60399..00000000000 --- a/test/resources/S3/pending/BucketPUTVersioningStatusResponse +++ /dev/null @@ -1,67 +0,0 @@ -PUT /?versioning HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue -x-amz-mfa: [SerialNumber] [TokenCode] - - - VersioningState - MfaDeleteState - - -PUT /?versioning HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 01 Mar 2006 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 124 - - - Enabled - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2006 12:00:00 GMT - -PUT /?versioning HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 124 - - - Suspended - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2006 12:00:00 GMT - -PUT /?versioning HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -x-amz-mfa:[SerialNumber] [TokenCode] -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 124 - - - Enabled - Enabled - - -HTTPS/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2006 12:00:00 GMT - -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTacl b/test/resources/S3/pending/BucketPUTacl deleted file mode 100644 index 4865320305d..00000000000 --- a/test/resources/S3/pending/BucketPUTacl +++ /dev/null @@ -1,105 +0,0 @@ -PUT /?acl HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - - ID - EmailAddress - - - - - ID - EmailAddress - - Permission - - ... - - - -x-amz-grant-write: uri="http://acs.amazonaws.com/groups/s3/LogDelivery", emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - - - ID - GranteesEmail - - - - Grantees@email.com - - - - http://acs.amazonaws.com/groups/global/AuthenticatedUsers - - -PUT ?acl HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Content-Length: 1660 -x-amz-date: Thu, 12 Apr 2012 20:04:21 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - - 852b113e7a2f25102679df27bb0ae12b3f85be6BucketOwnerCanonicalUserID - OwnerDisplayName - - - - - 852b113e7a2f25102679df27bb0ae12b3f85be6BucketOwnerCanonicalUserID - OwnerDisplayName - - FULL_CONTROL - - - - http://acs.amazonaws.com/groups/global/AllUsers - - READ - - - - http://acs.amazonaws.com/groups/s3/LogDelivery - - WRITE - - - - xyz@amazon.com - - WRITE_ACP - - - - f30716ab7115dcb44a5ef76e9d74b8e20567f63TestAccountCanonicalUserID - - READ_ACP - - - - -HTTP/1.1 200 OK -x-amz-id-2: NxqO3PNiMHXXGwjgv15LLgUoAmPVmG0xtZw2sxePXLhpIvcyouXDrcQUaWWXcOK0 -x-amz-request-id: C651BC9B4E1BD401 -Date: Thu, 12 Apr 2012 20:04:28 GMT -Content-Length: 0 -Server: AmazonS3 - -PUT ?acl HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Sun, 29 Apr 2012 22:00:57 GMT -x-amz-grant-write: uri="http://acs.amazonaws.com/groups/s3/LogDelivery", emailAddress="xyz@amazon.com" -x-amz-grant-read: uri="http://acs.amazonaws.com/groups/global/AllUsers" -Accept: */* -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: 0w9iImt23VF9s6QofOTDzelF7mrryz7d04Mw23FQCi4O205Zw28Zn+d340/RytoQ -x-amz-request-id: A6A8F01A38EC7138 -Date: Sun, 29 Apr 2012 22:01:10 GMT -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTaclResponse b/test/resources/S3/pending/BucketPUTaclResponse deleted file mode 100644 index 4865320305d..00000000000 --- a/test/resources/S3/pending/BucketPUTaclResponse +++ /dev/null @@ -1,105 +0,0 @@ -PUT /?acl HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - - ID - EmailAddress - - - - - ID - EmailAddress - - Permission - - ... - - - -x-amz-grant-write: uri="http://acs.amazonaws.com/groups/s3/LogDelivery", emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - - - ID - GranteesEmail - - - - Grantees@email.com - - - - http://acs.amazonaws.com/groups/global/AuthenticatedUsers - - -PUT ?acl HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Content-Length: 1660 -x-amz-date: Thu, 12 Apr 2012 20:04:21 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - - 852b113e7a2f25102679df27bb0ae12b3f85be6BucketOwnerCanonicalUserID - OwnerDisplayName - - - - - 852b113e7a2f25102679df27bb0ae12b3f85be6BucketOwnerCanonicalUserID - OwnerDisplayName - - FULL_CONTROL - - - - http://acs.amazonaws.com/groups/global/AllUsers - - READ - - - - http://acs.amazonaws.com/groups/s3/LogDelivery - - WRITE - - - - xyz@amazon.com - - WRITE_ACP - - - - f30716ab7115dcb44a5ef76e9d74b8e20567f63TestAccountCanonicalUserID - - READ_ACP - - - - -HTTP/1.1 200 OK -x-amz-id-2: NxqO3PNiMHXXGwjgv15LLgUoAmPVmG0xtZw2sxePXLhpIvcyouXDrcQUaWWXcOK0 -x-amz-request-id: C651BC9B4E1BD401 -Date: Thu, 12 Apr 2012 20:04:28 GMT -Content-Length: 0 -Server: AmazonS3 - -PUT ?acl HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Sun, 29 Apr 2012 22:00:57 GMT -x-amz-grant-write: uri="http://acs.amazonaws.com/groups/s3/LogDelivery", emailAddress="xyz@amazon.com" -x-amz-grant-read: uri="http://acs.amazonaws.com/groups/global/AllUsers" -Accept: */* -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: 0w9iImt23VF9s6QofOTDzelF7mrryz7d04Mw23FQCi4O205Zw28Zn+d340/RytoQ -x-amz-request-id: A6A8F01A38EC7138 -Date: Sun, 29 Apr 2012 22:01:10 GMT -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTcors b/test/resources/S3/pending/BucketPUTcors deleted file mode 100644 index adfbef0158d..00000000000 --- a/test/resources/S3/pending/BucketPUTcors +++ /dev/null @@ -1,88 +0,0 @@ - - - http://www.example.com - - PUT - POST - DELETE - - * - - - * - GET - - - - - - http://www.example.com - PUT - POST - DELETE - * - 3000 - x-amz-server-side-encryption - - - -PUT /?cors HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue -Content-MD5: MD5 - - - - Origin you want to allow cross-domain requests from - ... - ... - HTTP method - ... - ... - Time in seconds your browser to cache the pre-flight OPTIONS response for a resource - Headers that you want the browser to be allowed to send - ... - ... - Headers in the response that you want accessible from client application - ... - ... - - - ... - - ... - - -PUT /?cors HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Tue, 21 Aug 2012 17:54:50 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 216 - - - - http://www.example.com - PUT - POST - DELETE - * - 3000 - x-amz-server-side-encryption - - - * - GET - * - 3000 - - - -HTTP/1.1 200 OK -x-amz-id-2: CCshOvbOPfxzhwOADyC4qHj/Ck3F9Q0viXKw3rivZ+GcBoZSOOahvEJfPisZB7B -x-amz-request-id: BDC4B83DF5096BBE -Date: Tue, 21 Aug 2012 17:54:50 GMT -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTcorsResponse b/test/resources/S3/pending/BucketPUTcorsResponse deleted file mode 100644 index adfbef0158d..00000000000 --- a/test/resources/S3/pending/BucketPUTcorsResponse +++ /dev/null @@ -1,88 +0,0 @@ - - - http://www.example.com - - PUT - POST - DELETE - - * - - - * - GET - - - - - - http://www.example.com - PUT - POST - DELETE - * - 3000 - x-amz-server-side-encryption - - - -PUT /?cors HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue -Content-MD5: MD5 - - - - Origin you want to allow cross-domain requests from - ... - ... - HTTP method - ... - ... - Time in seconds your browser to cache the pre-flight OPTIONS response for a resource - Headers that you want the browser to be allowed to send - ... - ... - Headers in the response that you want accessible from client application - ... - ... - - - ... - - ... - - -PUT /?cors HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Tue, 21 Aug 2012 17:54:50 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 216 - - - - http://www.example.com - PUT - POST - DELETE - * - 3000 - x-amz-server-side-encryption - - - * - GET - * - 3000 - - - -HTTP/1.1 200 OK -x-amz-id-2: CCshOvbOPfxzhwOADyC4qHj/Ck3F9Q0viXKw3rivZ+GcBoZSOOahvEJfPisZB7B -x-amz-request-id: BDC4B83DF5096BBE -Date: Tue, 21 Aug 2012 17:54:50 GMT -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTlifecycle b/test/resources/S3/pending/BucketPUTlifecycle deleted file mode 100644 index 0efd56c9158..00000000000 --- a/test/resources/S3/pending/BucketPUTlifecycle +++ /dev/null @@ -1,109 +0,0 @@ -PUT /?lifecycle HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue -Content-MD5: MD5 - -Lifecycle configuration in the request body - - - - archive-objects-glacier-immediately-upon-creation - glacierobjects/ - Enabled - - 0 - GLACIER - - - - -PUT /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Tue, 16 Oct 2012 04:20:50 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 294 - - - - Transition-Immediately-Rule - glacierobjects/ - Enabled - - 0 - GLACIER - - - - -HTTP/1.1 200 OK -x-amz-id-2: cIC06kjwLCeh41RP7SVdOtPOBYRJdvCqFGf/GYCL4nXgpMqZaFlmrugH6/CFX2Zf4fCeCURX1s0= -x-amz-request-id: D92FE35006B77B4A -Date: Tue, 16 Oct 2012 04:20:37 GMT -Content-Length: 0 -Server: AmazonS3 - -PUT /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Wed, 17 Oct 2012 04:11:08 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 399 - - - - first-archive-then-expire - glacierobjects/ - Enabled - - 2012-12-31T00:00:00.000Z - GLACIER - - - 2022-10-12T00:00:00.000Z - - - - -PUT /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Wed, 17 Oct 2012 04:11:08 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 399 - - - - first-archive-then-expire - glacierobjects/ - Enabled - - 30 - GLACIER - - - 365 - - - - -PUT /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Tue, 13 Dec 2011 17:54:50 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 226 - - - - delete-all-10-years-after-creation - - Enabled - - 3650 - - - - diff --git a/test/resources/S3/pending/BucketPUTlifecycleResponse b/test/resources/S3/pending/BucketPUTlifecycleResponse deleted file mode 100644 index 0efd56c9158..00000000000 --- a/test/resources/S3/pending/BucketPUTlifecycleResponse +++ /dev/null @@ -1,109 +0,0 @@ -PUT /?lifecycle HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Content-Length: length -Date: date -Authorization: signatureValue -Content-MD5: MD5 - -Lifecycle configuration in the request body - - - - archive-objects-glacier-immediately-upon-creation - glacierobjects/ - Enabled - - 0 - GLACIER - - - - -PUT /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Tue, 16 Oct 2012 04:20:50 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 294 - - - - Transition-Immediately-Rule - glacierobjects/ - Enabled - - 0 - GLACIER - - - - -HTTP/1.1 200 OK -x-amz-id-2: cIC06kjwLCeh41RP7SVdOtPOBYRJdvCqFGf/GYCL4nXgpMqZaFlmrugH6/CFX2Zf4fCeCURX1s0= -x-amz-request-id: D92FE35006B77B4A -Date: Tue, 16 Oct 2012 04:20:37 GMT -Content-Length: 0 -Server: AmazonS3 - -PUT /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Wed, 17 Oct 2012 04:11:08 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 399 - - - - first-archive-then-expire - glacierobjects/ - Enabled - - 2012-12-31T00:00:00.000Z - GLACIER - - - 2022-10-12T00:00:00.000Z - - - - -PUT /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Wed, 17 Oct 2012 04:11:08 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 399 - - - - first-archive-then-expire - glacierobjects/ - Enabled - - 30 - GLACIER - - - 365 - - - - -PUT /?lifecycle HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-date: Tue, 13 Dec 2011 17:54:50 GMT -Content-MD5: 8dYiLewFWZyGgV2Q5FNI4W== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:z6mvnXscCWad60vdmB9xZVVZn46= -Content-Length: 226 - - - - delete-all-10-years-after-creation - - Enabled - - 3650 - - - - diff --git a/test/resources/S3/pending/BucketPUTlogging b/test/resources/S3/pending/BucketPUTlogging deleted file mode 100644 index a664312c4eb..00000000000 --- a/test/resources/S3/pending/BucketPUTlogging +++ /dev/null @@ -1,64 +0,0 @@ - - -PUT /?logging HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -Request elements vary depending on what you're setting. - - - ID - GranteesEmail - - - - Grantees@email.com - - - - http://acs.amazonaws.com/groups/global/AuthenticatedUsers - - -PUT ?logging HTTP/1.1 -Host: quotes.s3.amazonaws.com -Content-Length: 214 -Date: Wed, 25 Nov 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - - - mybucketlogs - mybucket-access_log-/ - - - - user@company.com - - READ - - - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - -PUT ?logging HTTP/1.1 -Host: quotes.s3.amazonaws.com -Content-Length: 214 -Date: Wed, 25 Nov 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - diff --git a/test/resources/S3/pending/BucketPUTloggingResponse b/test/resources/S3/pending/BucketPUTloggingResponse deleted file mode 100644 index a664312c4eb..00000000000 --- a/test/resources/S3/pending/BucketPUTloggingResponse +++ /dev/null @@ -1,64 +0,0 @@ - - -PUT /?logging HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -Request elements vary depending on what you're setting. - - - ID - GranteesEmail - - - - Grantees@email.com - - - - http://acs.amazonaws.com/groups/global/AuthenticatedUsers - - -PUT ?logging HTTP/1.1 -Host: quotes.s3.amazonaws.com -Content-Length: 214 -Date: Wed, 25 Nov 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - - - mybucketlogs - mybucket-access_log-/ - - - - user@company.com - - READ - - - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - -PUT ?logging HTTP/1.1 -Host: quotes.s3.amazonaws.com -Content-Length: 214 -Date: Wed, 25 Nov 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT - diff --git a/test/resources/S3/pending/BucketPUTnotification b/test/resources/S3/pending/BucketPUTnotification deleted file mode 100644 index 1fd62b75e0d..00000000000 --- a/test/resources/S3/pending/BucketPUTnotification +++ /dev/null @@ -1,57 +0,0 @@ -PUT /?notification HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - TopicARN - Event - - - -PUT ?notification HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 02 June 2010 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - arn:aws:sns:us-east-1:123456789012:myTopic - s3:ReducedRedundancyLostObject - - - -PUT ?notification HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 02 June 2010 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - arn:aws:sns:cn-north-1:123456789012:myTopic - s3:ReducedRedundancyLostObject - - - -PUT ?notification HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 02 June 2010 12:01:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -x-amz-sns-test-message-id: feeb1dff-cc96-449d-964c-f8a1890fd007 -Date: Wed, 02 June 2010 12:00:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A890524860101 -Date: Wed, 02 June 2010 12:01:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTnotificationResponse b/test/resources/S3/pending/BucketPUTnotificationResponse deleted file mode 100644 index 1fd62b75e0d..00000000000 --- a/test/resources/S3/pending/BucketPUTnotificationResponse +++ /dev/null @@ -1,57 +0,0 @@ -PUT /?notification HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - TopicARN - Event - - - -PUT ?notification HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 02 June 2010 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - arn:aws:sns:us-east-1:123456789012:myTopic - s3:ReducedRedundancyLostObject - - - -PUT ?notification HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 02 June 2010 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - arn:aws:sns:cn-north-1:123456789012:myTopic - s3:ReducedRedundancyLostObject - - - -PUT ?notification HTTP/1.1 -Host: quotes.s3.amazonaws.com -Date: Wed, 02 June 2010 12:01:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -x-amz-sns-test-message-id: feeb1dff-cc96-449d-964c-f8a1890fd007 -Date: Wed, 02 June 2010 12:00:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A890524860101 -Date: Wed, 02 June 2010 12:01:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTpolicy b/test/resources/S3/pending/BucketPUTpolicy deleted file mode 100644 index f54f0dfc519..00000000000 --- a/test/resources/S3/pending/BucketPUTpolicy +++ /dev/null @@ -1,35 +0,0 @@ -PUT /?policy HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -Policy written in JSON - -PUT /?policy HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Tue, 04 Apr 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -{ -"Version":"2008-10-17", -"Id":"aaaa-bbbb-cccc-dddd", -"Statement" : [ - { - "Effect":"Allow", - "Sid":"1", - "Principal" : { - "AWS":["111122223333","444455556666"] - }, - "Action":["s3:*"], - "Resource":"arn:aws:s3:::bucket/*" - } - ] -} - -HTTP/1.1 204 No Content -x-amz-id-2: Uuag1LuByR5Onimru9SAMPLEAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732SAMPLE7374 -Date: Tue, 04 Apr 2010 20:34:56 GMT -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTpolicyResponse b/test/resources/S3/pending/BucketPUTpolicyResponse deleted file mode 100644 index f54f0dfc519..00000000000 --- a/test/resources/S3/pending/BucketPUTpolicyResponse +++ /dev/null @@ -1,35 +0,0 @@ -PUT /?policy HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -Policy written in JSON - -PUT /?policy HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Tue, 04 Apr 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -{ -"Version":"2008-10-17", -"Id":"aaaa-bbbb-cccc-dddd", -"Statement" : [ - { - "Effect":"Allow", - "Sid":"1", - "Principal" : { - "AWS":["111122223333","444455556666"] - }, - "Action":["s3:*"], - "Resource":"arn:aws:s3:::bucket/*" - } - ] -} - -HTTP/1.1 204 No Content -x-amz-id-2: Uuag1LuByR5Onimru9SAMPLEAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732SAMPLE7374 -Date: Tue, 04 Apr 2010 20:34:56 GMT -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/BucketPUTtagging b/test/resources/S3/pending/BucketPUTtagging deleted file mode 100644 index 05336742527..00000000000 --- a/test/resources/S3/pending/BucketPUTtagging +++ /dev/null @@ -1,38 +0,0 @@ -PUT /?tagging HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - - - Tag Name - Tag Value - - - - -PUT ?tagging HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Content-Length: 1660 -x-amz-date: Thu, 12 Apr 2012 20:04:21 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - - - Project - Project One - - - User - jsmith - - - - -HTTP/1.1 204 No Content -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Oct 2012 12:00:00 GMT - diff --git a/test/resources/S3/pending/BucketPUTtaggingResponse b/test/resources/S3/pending/BucketPUTtaggingResponse deleted file mode 100644 index 05336742527..00000000000 --- a/test/resources/S3/pending/BucketPUTtaggingResponse +++ /dev/null @@ -1,38 +0,0 @@ -PUT /?tagging HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - - - Tag Name - Tag Value - - - - -PUT ?tagging HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Content-Length: 1660 -x-amz-date: Thu, 12 Apr 2012 20:04:21 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - - - Project - Project One - - - User - jsmith - - - - -HTTP/1.1 204 No Content -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Oct 2012 12:00:00 GMT - diff --git a/test/resources/S3/pending/BucketPUTwebsite b/test/resources/S3/pending/BucketPUTwebsite deleted file mode 100644 index d36ccf1c94f..00000000000 --- a/test/resources/S3/pending/BucketPUTwebsite +++ /dev/null @@ -1,123 +0,0 @@ -PUT /?website HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Content-Length: ContentLength -Authorization: signatureValue - - - - - -PUT ?website HTTP/1.1 -Host: example.com.s3.amazonaws.com -Content-Length: 256 -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - index.html - - - SomeErrorDocument.html - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 80CD4368BD211111 -Date: Thu, 27 Jan 2011 00:00:00 GMT -Content-Length: 0 -Server: AmazonS3 - -PUT ?website HTTP/1.1 -Host: www.example.com.s3.amazonaws.com -Content-Length: length-value -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - example.com - - - -PUT ?website HTTP/1.1 -Host: www.example.com.s3.amazonaws.com -Content-Length: length-value -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - index.html - - - Error.html - - - - - - docs/ - - - documents/ - - - - - -PUT ?website HTTP/1.1 -Host: www.example.com.s3.amazonaws.com -Content-Length: 580 -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - index.html - - - Error.html - - - - - - 404 - - - ec2-11-22-333-44.compute-1.amazonaws.com - report-404/ - - - - - -PUT ?website HTTP/1.1 -Host: www.example.com.s3.amazonaws.com -Content-Length: 481 -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - index.html - - - Error.html - - - - - - images/ - - - errorpage.html - - - - - diff --git a/test/resources/S3/pending/BucketPUTwebsiteResponse b/test/resources/S3/pending/BucketPUTwebsiteResponse deleted file mode 100644 index d36ccf1c94f..00000000000 --- a/test/resources/S3/pending/BucketPUTwebsiteResponse +++ /dev/null @@ -1,123 +0,0 @@ -PUT /?website HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Date: date -Content-Length: ContentLength -Authorization: signatureValue - - - - - -PUT ?website HTTP/1.1 -Host: example.com.s3.amazonaws.com -Content-Length: 256 -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - index.html - - - SomeErrorDocument.html - - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMgUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 80CD4368BD211111 -Date: Thu, 27 Jan 2011 00:00:00 GMT -Content-Length: 0 -Server: AmazonS3 - -PUT ?website HTTP/1.1 -Host: www.example.com.s3.amazonaws.com -Content-Length: length-value -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - example.com - - - -PUT ?website HTTP/1.1 -Host: www.example.com.s3.amazonaws.com -Content-Length: length-value -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - index.html - - - Error.html - - - - - - docs/ - - - documents/ - - - - - -PUT ?website HTTP/1.1 -Host: www.example.com.s3.amazonaws.com -Content-Length: 580 -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - index.html - - - Error.html - - - - - - 404 - - - ec2-11-22-333-44.compute-1.amazonaws.com - report-404/ - - - - - -PUT ?website HTTP/1.1 -Host: www.example.com.s3.amazonaws.com -Content-Length: 481 -Date: Thu, 27 Jan 2011 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:acxI7sWO+ugzxhf2AtcqRLgy70B= - - - - index.html - - - Error.html - - - - - - images/ - - - errorpage.html - - - - - diff --git a/test/resources/S3/pending/ObjectCOPY b/test/resources/S3/pending/ObjectCOPY deleted file mode 100644 index 811494a5984..00000000000 --- a/test/resources/S3/pending/ObjectCOPY +++ /dev/null @@ -1,69 +0,0 @@ -PUT /destinationObject HTTP/1.1 -Host: destinationBucket.s3.amazonaws.com -x-amz-copy-source: /source_bucket/sourceObject -x-amz-metadata-directive: metadata_directive -x-amz-copy-source-if-match: etag -x-amz-copy-source-if-none-match: etag -x-amz-copy-source-if-unmodified-since: time_stamp -x-amz-copy-source-if-modified-since: time_stamp - -Authorization: signatureValue -Date: date - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -PUT /my-second-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -x-amz-copy-source: /bucket/my-image.jpg -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-copy-source-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -x-amz-version-id: QUpfdndhfd8438MNFDN93jdnJFkdmqnh893 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Connection: close -Server: AmazonS3 - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - -PUT /my-second-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -x-amz-copy-source: /bucket/my-image.jpg?versionId=3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-version-id: QUpfdndhfd8438MNFDN93jdnJFkdmqnh893 - x-amz-copy-source-version-id: 09df8234529fjs0dfi0w52935029wefdj -Date: Wed, 28 Oct 2009 22:32:00 GMT -Connection: close -Server: AmazonS3 - - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-copy-source-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -Date: Wed, 28 Oct 2009 22:32:00 GMT -Connection: close -Server: AmazonS3 - - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - diff --git a/test/resources/S3/pending/ObjectCOPYResponse b/test/resources/S3/pending/ObjectCOPYResponse deleted file mode 100644 index 811494a5984..00000000000 --- a/test/resources/S3/pending/ObjectCOPYResponse +++ /dev/null @@ -1,69 +0,0 @@ -PUT /destinationObject HTTP/1.1 -Host: destinationBucket.s3.amazonaws.com -x-amz-copy-source: /source_bucket/sourceObject -x-amz-metadata-directive: metadata_directive -x-amz-copy-source-if-match: etag -x-amz-copy-source-if-none-match: etag -x-amz-copy-source-if-unmodified-since: time_stamp -x-amz-copy-source-if-modified-since: time_stamp - -Authorization: signatureValue -Date: date - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -PUT /my-second-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -x-amz-copy-source: /bucket/my-image.jpg -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-copy-source-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -x-amz-version-id: QUpfdndhfd8438MNFDN93jdnJFkdmqnh893 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Connection: close -Server: AmazonS3 - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - -PUT /my-second-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -x-amz-copy-source: /bucket/my-image.jpg?versionId=3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-version-id: QUpfdndhfd8438MNFDN93jdnJFkdmqnh893 - x-amz-copy-source-version-id: 09df8234529fjs0dfi0w52935029wefdj -Date: Wed, 28 Oct 2009 22:32:00 GMT -Connection: close -Server: AmazonS3 - - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-copy-source-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -Date: Wed, 28 Oct 2009 22:32:00 GMT -Connection: close -Server: AmazonS3 - - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - diff --git a/test/resources/S3/pending/ObjectDELETE b/test/resources/S3/pending/ObjectDELETE deleted file mode 100644 index 58457bba8ac..00000000000 --- a/test/resources/S3/pending/ObjectDELETE +++ /dev/null @@ -1,63 +0,0 @@ -DELETE /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Content-Length: length -Authorization: signatureValue - -DELETE /my-second-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain - -HTTP/1.1 204 NoContent -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -Date: Wed, 12 Oct 2009 17:50:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -DELETE /my-third-image.jpg?versionId=UIORUnfndfiufdisojhr398493jfdkjFJjkndnqUifhnw89493jJFJ HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 0 - -HTTP/1.1 204 NoContent -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: UIORUnfndfiufdisojhr398493jfdkjFJjkndnqUifhnw89493jJFJ -Date: Wed, 12 Oct 2009 17:50:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 204 NoContent -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -x-amz-delete-marker: true -Date: Wed, 12 Oct 2009 17:50:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -DELETE /my-third-image.jpg?versionId=UIORUnfndfiuf HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -x-amz-mfa:[SerialNumber] [AuthenticationCode] -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 0 - -HTTPS/1.1 204 NoContent -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: UIORUnfndfiuf -Date: Wed, 12 Oct 2009 17:50:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectDELETEResponse b/test/resources/S3/pending/ObjectDELETEResponse deleted file mode 100644 index 58457bba8ac..00000000000 --- a/test/resources/S3/pending/ObjectDELETEResponse +++ /dev/null @@ -1,63 +0,0 @@ -DELETE /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Content-Length: length -Authorization: signatureValue - -DELETE /my-second-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain - -HTTP/1.1 204 NoContent -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -Date: Wed, 12 Oct 2009 17:50:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -DELETE /my-third-image.jpg?versionId=UIORUnfndfiufdisojhr398493jfdkjFJjkndnqUifhnw89493jJFJ HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 0 - -HTTP/1.1 204 NoContent -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: UIORUnfndfiufdisojhr398493jfdkjFJjkndnqUifhnw89493jJFJ -Date: Wed, 12 Oct 2009 17:50:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 204 NoContent -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -x-amz-delete-marker: true -Date: Wed, 12 Oct 2009 17:50:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -DELETE /my-third-image.jpg?versionId=UIORUnfndfiuf HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -x-amz-mfa:[SerialNumber] [AuthenticationCode] -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 0 - -HTTPS/1.1 204 NoContent -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: UIORUnfndfiuf -Date: Wed, 12 Oct 2009 17:50:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectGET b/test/resources/S3/pending/ObjectGET deleted file mode 100644 index 0b040fb8caf..00000000000 --- a/test/resources/S3/pending/ObjectGET +++ /dev/null @@ -1,126 +0,0 @@ -GET /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue -Range:bytes=byte_range - -GET /my-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 -[434234 bytes of object data] - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Wed, 12 Oct 2009 17:50:00 GMT -x-amz-expiration: expiry-date="Fri, 23 Dec 2012 00:00:00 GMT", rule-id="picture-deletion-rule" -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 -[434234 bytes of object data] - -HTTP/1.1 403 Forbidden -x-amz-request-id: CD4BD8A1310A11B3 -x-amz-id-2: m9RDbQU0+RRBTjOUN1ChQ1eqMUnr9dv8b+KP6I2gHfRJZSTSrMCoRP8RtPRzX9mb -Content-Type: application/xml -Date: Mon, 12 Nov 2012 23:53:21 GMT -Server: AmazonS3 -Content-Length: 231 - - - InvalidObjectState - The operation is not valid for the object's storage class - 9FEFFF118E15B86F - WVQ5kzhiT+oiUfDCOiOYv8W4Tk9eNcxWi/MK+hTS/av34Xy4rBU3zsavf0aaaaa - - -HTTP/1.1 404 Not Found -x-amz-request-id: 318BC8BC148832E5 -x-amz-id-2: eftixk72aD6Ap51Tnqzj7UDNEHGran -x-amz-version-id: 3GL4kqtJlcpXroDTDm3vjVBH40Nr8X8g -x-amz-delete-marker: true -Date: Wed, 28 Oct 2009 22:32:00 GMT -Content-Type: text/plain -Connection: close -Server: AmazonS3 - -GET /myObject?versionId=3/L4kqtJlcpXroDTDmpUMLUo HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap54OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -x-amz-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3QBpUMLUo -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 -[434234 bytes of object data] - -GET /Junk3.txt?response-cache-control=No-cache&response-content-disposition=attachment%3B%20filename%3Dtesting.txt&response-content-encoding=x-gzip&response-content-language=mi%2C%20en&response-expires=Thu%2C%2001%20Dec%201994%2016:00:00%20GMT HTTP/1.1 -x-amz-date: Sun, 19 Dec 2010 01:53:44 GMT -Accept: */* -Authorization: AWS AKIAIOSFODNN7EXAMPLE:aaStE6nKnw8ihhiIdReoXYlMamW= - -HTTP/1.1 200 OK -x-amz-id-2: SIidWAK3hK+Il3/Qqiu1ZKEuegzLAAspwsgwnwygb9GgFseeFHL5CII8NXSrfWW2 -x-amz-request-id: 881B1CBD9DF17WA1 -Date: Sun, 19 Dec 2010 01:54:01 GMT -x-amz-meta-param1: value 1 -x-amz-meta-param2: value 2 -Cache-Control: No-cache -Content-Language: mi, en -Expires: Thu, 01 Dec 1994 16:00:00 GMT -Content-Disposition: attachment; filename=testing.txt -Content-Encoding: x-gzip -Last-Modified: Fri, 17 Dec 2010 18:10:41 GMT -ETag: "0332bee1a7bf845f176c5c0d1ae7cf07" -Accept-Ranges: bytes -Content-Type: text/plain -Content-Length: 22 -Server: AmazonS3 - -[object data not shown] - -GET /example-object HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -x-amz-date: Fri, 28 Jan 2011 21:32:02 GMT -Range: bytes=0-9 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:Yxg83MZaEgh3OZ3l0rLo5RTX11o= -Sample Response with Specified Range of the Object Bytes - -HTTP/1.1 206 Partial Content -x-amz-id-2: MzRISOwyjmnupCzjI1WC06l5TTAzm7/JypPGXLh0OVFGcJaaO3KW/hRAqKOpIEEp -x-amz-request-id: 47622117804B3E11 -Date: Fri, 28 Jan 2011 21:32:09 GMT -x-amz-meta-title: the title -Last-Modified: Fri, 28 Jan 2011 20:10:32 GMT -ETag: "b2419b1e3fd45d596ee22bdf62aaaa2f" -Accept-Ranges: bytes -Content-Range: bytes 0-9/443 -Content-Type: text/plain -Content-Length: 10 -Server: AmazonS3 - -[10 bytes of object data] - diff --git a/test/resources/S3/pending/ObjectGETResponse b/test/resources/S3/pending/ObjectGETResponse deleted file mode 100644 index 0b040fb8caf..00000000000 --- a/test/resources/S3/pending/ObjectGETResponse +++ /dev/null @@ -1,126 +0,0 @@ -GET /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue -Range:bytes=byte_range - -GET /my-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 -[434234 bytes of object data] - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Wed, 12 Oct 2009 17:50:00 GMT -x-amz-expiration: expiry-date="Fri, 23 Dec 2012 00:00:00 GMT", rule-id="picture-deletion-rule" -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 -[434234 bytes of object data] - -HTTP/1.1 403 Forbidden -x-amz-request-id: CD4BD8A1310A11B3 -x-amz-id-2: m9RDbQU0+RRBTjOUN1ChQ1eqMUnr9dv8b+KP6I2gHfRJZSTSrMCoRP8RtPRzX9mb -Content-Type: application/xml -Date: Mon, 12 Nov 2012 23:53:21 GMT -Server: AmazonS3 -Content-Length: 231 - - - InvalidObjectState - The operation is not valid for the object's storage class - 9FEFFF118E15B86F - WVQ5kzhiT+oiUfDCOiOYv8W4Tk9eNcxWi/MK+hTS/av34Xy4rBU3zsavf0aaaaa - - -HTTP/1.1 404 Not Found -x-amz-request-id: 318BC8BC148832E5 -x-amz-id-2: eftixk72aD6Ap51Tnqzj7UDNEHGran -x-amz-version-id: 3GL4kqtJlcpXroDTDm3vjVBH40Nr8X8g -x-amz-delete-marker: true -Date: Wed, 28 Oct 2009 22:32:00 GMT -Content-Type: text/plain -Connection: close -Server: AmazonS3 - -GET /myObject?versionId=3/L4kqtJlcpXroDTDmpUMLUo HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap54OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -x-amz-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3QBpUMLUo -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 -[434234 bytes of object data] - -GET /Junk3.txt?response-cache-control=No-cache&response-content-disposition=attachment%3B%20filename%3Dtesting.txt&response-content-encoding=x-gzip&response-content-language=mi%2C%20en&response-expires=Thu%2C%2001%20Dec%201994%2016:00:00%20GMT HTTP/1.1 -x-amz-date: Sun, 19 Dec 2010 01:53:44 GMT -Accept: */* -Authorization: AWS AKIAIOSFODNN7EXAMPLE:aaStE6nKnw8ihhiIdReoXYlMamW= - -HTTP/1.1 200 OK -x-amz-id-2: SIidWAK3hK+Il3/Qqiu1ZKEuegzLAAspwsgwnwygb9GgFseeFHL5CII8NXSrfWW2 -x-amz-request-id: 881B1CBD9DF17WA1 -Date: Sun, 19 Dec 2010 01:54:01 GMT -x-amz-meta-param1: value 1 -x-amz-meta-param2: value 2 -Cache-Control: No-cache -Content-Language: mi, en -Expires: Thu, 01 Dec 1994 16:00:00 GMT -Content-Disposition: attachment; filename=testing.txt -Content-Encoding: x-gzip -Last-Modified: Fri, 17 Dec 2010 18:10:41 GMT -ETag: "0332bee1a7bf845f176c5c0d1ae7cf07" -Accept-Ranges: bytes -Content-Type: text/plain -Content-Length: 22 -Server: AmazonS3 - -[object data not shown] - -GET /example-object HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -x-amz-date: Fri, 28 Jan 2011 21:32:02 GMT -Range: bytes=0-9 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:Yxg83MZaEgh3OZ3l0rLo5RTX11o= -Sample Response with Specified Range of the Object Bytes - -HTTP/1.1 206 Partial Content -x-amz-id-2: MzRISOwyjmnupCzjI1WC06l5TTAzm7/JypPGXLh0OVFGcJaaO3KW/hRAqKOpIEEp -x-amz-request-id: 47622117804B3E11 -Date: Fri, 28 Jan 2011 21:32:09 GMT -x-amz-meta-title: the title -Last-Modified: Fri, 28 Jan 2011 20:10:32 GMT -ETag: "b2419b1e3fd45d596ee22bdf62aaaa2f" -Accept-Ranges: bytes -Content-Range: bytes 0-9/443 -Content-Type: text/plain -Content-Length: 10 -Server: AmazonS3 - -[10 bytes of object data] - diff --git a/test/resources/S3/pending/ObjectGETacl b/test/resources/S3/pending/ObjectGETacl deleted file mode 100644 index 5984c60615a..00000000000 --- a/test/resources/S3/pending/ObjectGETacl +++ /dev/null @@ -1,70 +0,0 @@ -GET /ObjectName?acl HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue -Range:bytes=byte_range - -GET /my-image.jpg?acl HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-version-id: 4HL4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nrjfkd -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -Content-Length: 124 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - FULL_CONTROL - - - - -GET /my-image.jpg?versionId=3/L4kqtJlcpXroDVBH40Nr8X8gdRQBpUMLUo&acl HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -x-amz-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -Content-Length: 124 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mdtd@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mdtd@amazon.com - - FULL_CONTROL - - - - diff --git a/test/resources/S3/pending/ObjectGETaclResponse b/test/resources/S3/pending/ObjectGETaclResponse deleted file mode 100644 index 5984c60615a..00000000000 --- a/test/resources/S3/pending/ObjectGETaclResponse +++ /dev/null @@ -1,70 +0,0 @@ -GET /ObjectName?acl HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue -Range:bytes=byte_range - -GET /my-image.jpg?acl HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-version-id: 4HL4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nrjfkd -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -Content-Length: 124 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - FULL_CONTROL - - - - -GET /my-image.jpg?versionId=3/L4kqtJlcpXroDVBH40Nr8X8gdRQBpUMLUo&acl HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -x-amz-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -Content-Length: 124 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mdtd@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mdtd@amazon.com - - FULL_CONTROL - - - - diff --git a/test/resources/S3/pending/ObjectGETtorrent b/test/resources/S3/pending/ObjectGETtorrent deleted file mode 100644 index 4f8a60a8ab6..00000000000 --- a/test/resources/S3/pending/ObjectGETtorrent +++ /dev/null @@ -1,20 +0,0 @@ -GET /ObjectName?torrent HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET /quotes/Nelson?torrent HTTP/1.0 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-request-id: 7CD745EBB7AB5ED9 -Date: Wed, 25 Nov 2009 12:00:00 GMT -Content-Disposition: attachment; filename=Nelson.torrent; -Content-Type: application/x-bittorrent -Content-Length: 537 -Server: AmazonS3 - - - diff --git a/test/resources/S3/pending/ObjectGETtorrentResponse b/test/resources/S3/pending/ObjectGETtorrentResponse deleted file mode 100644 index 4f8a60a8ab6..00000000000 --- a/test/resources/S3/pending/ObjectGETtorrentResponse +++ /dev/null @@ -1,20 +0,0 @@ -GET /ObjectName?torrent HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -GET /quotes/Nelson?torrent HTTP/1.0 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-request-id: 7CD745EBB7AB5ED9 -Date: Wed, 25 Nov 2009 12:00:00 GMT -Content-Disposition: attachment; filename=Nelson.torrent; -Content-Type: application/x-bittorrent -Content-Length: 537 -Server: AmazonS3 - - - diff --git a/test/resources/S3/pending/ObjectHEAD b/test/resources/S3/pending/ObjectHEAD deleted file mode 100644 index 7fd82d15b4b..00000000000 --- a/test/resources/S3/pending/ObjectHEAD +++ /dev/null @@ -1,80 +0,0 @@ -HEAD /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Authorization: signatureValue -Date: date - -HEAD /my-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:02236Q3V0RonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: ef8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC143432E5 -x-amz-version-id: 3HL4kqtJlcpXroDTDmjVBH40Nrjfkd -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - -HTTP/1.1 200 OK -x-amz-id-2: azQRZtQJ2m1P8R+TIsG9h0VuC/DmiSJmjXUMq7snk+LKSJeurtmfzSlGhR46GzSJ -x-amz-request-id: 0EFF61CCE3F24A26 -Date: Mon, 17 Dec 2012 02:26:39 GMT -Last-Modified: Mon, 17 Dec 2012 02:14:10 GMT -x-amz-expiration: expiry-date="Fri, 21 Dec 2012 00:00:00 GMT", rule-id="Rule for testfile.txt" -ETag: "54b0c58c7ce9f2a8b551351102ee0938" -Accept-Ranges: bytes -Content-Type: text/plain -Content-Length: 14 -Server: AmazonS3 - -HEAD /my-image.jpg?versionId=3HL4kqCxf3vjVBH40Nrjfkd HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:02236Q3V0WpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8epIszj7UDNEHGran -x-amz-request-id: 318BC8BC143432E5 -x-amz-version-id: 3HL4kqtJlcpXrof3vjVBH40Nrjfkd -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - -HEAD /my-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: 13 Nov 2012 00:28:38 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:02236Q3V0RonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: FSVaTMjrmBp3Izs1NnwBZeu7M19iI8UbxMbi0A8AirHANJBo+hEftBuiESACOMJp -x-amz-request-id: E5CEFCB143EB505A -Date: Tue, 13 Nov 2012 00:28:38 GMT -Last-Modified: Mon, 15 Oct 2012 21:58:07 GMT -x-amz-restore: ongoing-request="false", expiry-date="Wed, 07 Nov 2012 00:00:00 GMT" -ETag: "1accb31fcf202eba0c0f41fa2f09b4d7" -Accept-Ranges: bytes -Content-Type: binary/octet-stream -Content-Length: 300 -Server: AmazonS3 - -HTTP/1.1 200 OK -x-amz-id-2: b+V2mDiMHTdy1myoUBpctvmJl95H9U/OSUm/jRtHxjh0+pCk5SvByL4xu2TDv4GM -x-amz-request-id: E2E7B6AEE4E9BD2B -Date: Tue, 13 Nov 2012 00:43:32 GMT -Last-Modified: Sat, 20 Oct 2012 21:28:27 GMT -x-amz-restore: ongoing-request="true" -ETag: "1accb31fcf202eba0c0f41fa2f09b4d7" -Accept-Ranges: bytes -Content-Type: binary/octet-stream -Content-Length: 300 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectHEADResponse b/test/resources/S3/pending/ObjectHEADResponse deleted file mode 100644 index 7fd82d15b4b..00000000000 --- a/test/resources/S3/pending/ObjectHEADResponse +++ /dev/null @@ -1,80 +0,0 @@ -HEAD /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Authorization: signatureValue -Date: date - -HEAD /my-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:02236Q3V0RonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: ef8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC143432E5 -x-amz-version-id: 3HL4kqtJlcpXroDTDmjVBH40Nrjfkd -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - -HTTP/1.1 200 OK -x-amz-id-2: azQRZtQJ2m1P8R+TIsG9h0VuC/DmiSJmjXUMq7snk+LKSJeurtmfzSlGhR46GzSJ -x-amz-request-id: 0EFF61CCE3F24A26 -Date: Mon, 17 Dec 2012 02:26:39 GMT -Last-Modified: Mon, 17 Dec 2012 02:14:10 GMT -x-amz-expiration: expiry-date="Fri, 21 Dec 2012 00:00:00 GMT", rule-id="Rule for testfile.txt" -ETag: "54b0c58c7ce9f2a8b551351102ee0938" -Accept-Ranges: bytes -Content-Type: text/plain -Content-Length: 14 -Server: AmazonS3 - -HEAD /my-image.jpg?versionId=3HL4kqCxf3vjVBH40Nrjfkd HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:02236Q3V0WpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51TnqcoF8epIszj7UDNEHGran -x-amz-request-id: 318BC8BC143432E5 -x-amz-version-id: 3HL4kqtJlcpXrof3vjVBH40Nrjfkd -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -ETag: "fba9dede5f27731c9771645a39863328" -Content-Length: 434234 -Content-Type: text/plain -Connection: close -Server: AmazonS3 - -HEAD /my-image.jpg HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: 13 Nov 2012 00:28:38 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:02236Q3V0RonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: FSVaTMjrmBp3Izs1NnwBZeu7M19iI8UbxMbi0A8AirHANJBo+hEftBuiESACOMJp -x-amz-request-id: E5CEFCB143EB505A -Date: Tue, 13 Nov 2012 00:28:38 GMT -Last-Modified: Mon, 15 Oct 2012 21:58:07 GMT -x-amz-restore: ongoing-request="false", expiry-date="Wed, 07 Nov 2012 00:00:00 GMT" -ETag: "1accb31fcf202eba0c0f41fa2f09b4d7" -Accept-Ranges: bytes -Content-Type: binary/octet-stream -Content-Length: 300 -Server: AmazonS3 - -HTTP/1.1 200 OK -x-amz-id-2: b+V2mDiMHTdy1myoUBpctvmJl95H9U/OSUm/jRtHxjh0+pCk5SvByL4xu2TDv4GM -x-amz-request-id: E2E7B6AEE4E9BD2B -Date: Tue, 13 Nov 2012 00:43:32 GMT -Last-Modified: Sat, 20 Oct 2012 21:28:27 GMT -x-amz-restore: ongoing-request="true" -ETag: "1accb31fcf202eba0c0f41fa2f09b4d7" -Accept-Ranges: bytes -Content-Type: binary/octet-stream -Content-Length: 300 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectOPTIONS b/test/resources/S3/pending/ObjectOPTIONS deleted file mode 100644 index e2b78de549d..00000000000 --- a/test/resources/S3/pending/ObjectOPTIONS +++ /dev/null @@ -1,22 +0,0 @@ -OPTIONS /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Origin: Origin -Access-Control-Request-Method: HTTPMethod -Access-Control-Request-Headers: RequestHeader - -OPTIONS /exampleobject HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Origin: http://www.example.com -Access-Control-Request-Method: PUT - -HTTP/1.1 200 OK -x-amz-id-2: 6SvaESv3VULYPLik5LLl7lSPPtSnBvDdGmnklX1HfUl7uS2m1DF6td6KWKNjYMXZ -x-amz-request-id: BDC4B83DF5096BBE -Date: Wed, 21 Aug 2012 23:09:55 GMT -Etag: "1f1a1af1f1111111111111c11aed1da1" -Access-Control-Allow-Origin: http://www.example.com -Access-Control-Allow-Methods: PUT -Access-Control-Expose-Headers: x-amz-request-id -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectOPTIONSResponse b/test/resources/S3/pending/ObjectOPTIONSResponse deleted file mode 100644 index e2b78de549d..00000000000 --- a/test/resources/S3/pending/ObjectOPTIONSResponse +++ /dev/null @@ -1,22 +0,0 @@ -OPTIONS /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Origin: Origin -Access-Control-Request-Method: HTTPMethod -Access-Control-Request-Headers: RequestHeader - -OPTIONS /exampleobject HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -Origin: http://www.example.com -Access-Control-Request-Method: PUT - -HTTP/1.1 200 OK -x-amz-id-2: 6SvaESv3VULYPLik5LLl7lSPPtSnBvDdGmnklX1HfUl7uS2m1DF6td6KWKNjYMXZ -x-amz-request-id: BDC4B83DF5096BBE -Date: Wed, 21 Aug 2012 23:09:55 GMT -Etag: "1f1a1af1f1111111111111c11aed1da1" -Access-Control-Allow-Origin: http://www.example.com -Access-Control-Allow-Methods: PUT -Access-Control-Expose-Headers: x-amz-request-id -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectPOST b/test/resources/S3/pending/ObjectPOST deleted file mode 100644 index f7c13803271..00000000000 --- a/test/resources/S3/pending/ObjectPOST +++ /dev/null @@ -1,89 +0,0 @@ -POST / HTTP/1.1 -Host: destinationBucket.s3.amazonaws.com -User-Agent: browser_data -Accept: file_types -Accept-Language: Regions -Accept-Encoding: encoding -Accept-Charset: character_set -Keep-Alive: 300 -Connection: keep-alive -Content-Type: multipart/form-data; boundary=9431149156168 -Content-Length: length - ---9431149156168 -Content-Disposition: form-data; name="key" - - - -acl ---9431149156168 -Content-Disposition: form-data; name="success_action_redirect" - -success_redirect ---9431149156168 -Content-Disposition: form-data; name="Content-Type" - -content_type ---9431149156168 -Content-Disposition: form-data; name="x-amz-meta-uuid" - -uuid ---9431149156168 -Content-Disposition: form-data; name="x-amz-meta-tag" - -metadata ---9431149156168 -Content-Disposition: form-data; name="AWSAccessKeyId" - -access-key-id ---9431149156168 -Content-Disposition: form-data; name="Policy" - -encoded_policy ---9431149156168 -Content-Disposition: form-data; name="Signature" - -signature= ---9431149156168 -Content-Disposition: form-data; name="file"; filename="MyFilename.jpg" -Content-Type: image/jpeg - -file_content ---9431149156168 -Content-Disposition: form-data; name="submit" - -Upload to Amazon S3 ---9431149156168-- - -POST /Neo HTTP/1.1 -Content-Length: 4 -Host: quotes.s3.amazonaws.com -Date: Wed, 01 Mar 2006 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Expect: the 100-continue HTTP status code - -ObjectContent - -HTTP/1.1 100 Continue -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: default -Date: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "1b2cf535f27731c974343645a3985328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 100 Continue -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: 43jfkodU8493jnFJD9fjj3HHNVfdsQUIFDNsidf038jfdsjGFDSIRp -Date: Wed, 01 Mar 2006 12:00:00 GMT -ETag: "828ef3fdfa96f00ad9f27c383fc9ac7f" -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectPOSTResponse b/test/resources/S3/pending/ObjectPOSTResponse deleted file mode 100644 index f7c13803271..00000000000 --- a/test/resources/S3/pending/ObjectPOSTResponse +++ /dev/null @@ -1,89 +0,0 @@ -POST / HTTP/1.1 -Host: destinationBucket.s3.amazonaws.com -User-Agent: browser_data -Accept: file_types -Accept-Language: Regions -Accept-Encoding: encoding -Accept-Charset: character_set -Keep-Alive: 300 -Connection: keep-alive -Content-Type: multipart/form-data; boundary=9431149156168 -Content-Length: length - ---9431149156168 -Content-Disposition: form-data; name="key" - - - -acl ---9431149156168 -Content-Disposition: form-data; name="success_action_redirect" - -success_redirect ---9431149156168 -Content-Disposition: form-data; name="Content-Type" - -content_type ---9431149156168 -Content-Disposition: form-data; name="x-amz-meta-uuid" - -uuid ---9431149156168 -Content-Disposition: form-data; name="x-amz-meta-tag" - -metadata ---9431149156168 -Content-Disposition: form-data; name="AWSAccessKeyId" - -access-key-id ---9431149156168 -Content-Disposition: form-data; name="Policy" - -encoded_policy ---9431149156168 -Content-Disposition: form-data; name="Signature" - -signature= ---9431149156168 -Content-Disposition: form-data; name="file"; filename="MyFilename.jpg" -Content-Type: image/jpeg - -file_content ---9431149156168 -Content-Disposition: form-data; name="submit" - -Upload to Amazon S3 ---9431149156168-- - -POST /Neo HTTP/1.1 -Content-Length: 4 -Host: quotes.s3.amazonaws.com -Date: Wed, 01 Mar 2006 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Expect: the 100-continue HTTP status code - -ObjectContent - -HTTP/1.1 100 Continue -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: default -Date: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "1b2cf535f27731c974343645a3985328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 100 Continue -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: 43jfkodU8493jnFJD9fjj3HHNVfdsQUIFDNsidf038jfdsjGFDSIRp -Date: Wed, 01 Mar 2006 12:00:00 GMT -ETag: "828ef3fdfa96f00ad9f27c383fc9ac7f" -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectPOSTrestore b/test/resources/S3/pending/ObjectPOSTrestore deleted file mode 100644 index 3655822d096..00000000000 --- a/test/resources/S3/pending/ObjectPOSTrestore +++ /dev/null @@ -1,27 +0,0 @@ -POST /ObjectName?restore HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue -Content-MD5: MD5 - - - NumberOfDays - - -POST /photo1.jpg?restore HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Mon, 22 Oct 2012 01:49:52 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Length: 53 - - - 2 - - -HTTP/1.1 202 Accepted -x-amz-id-2: GFihv3y6+kE7KG11GEkQhU7/2/cHR3Yb2fCb2S04nxI423Dqwg2XiQ0B/UZlzYQvPiBlZNRcovw= -x-amz-request-id: 9F341CD3C4BA79E0 -Date: Sat, 20 Oct 2012 23:54:05 GMT -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectPOSTrestoreResponse b/test/resources/S3/pending/ObjectPOSTrestoreResponse deleted file mode 100644 index 3655822d096..00000000000 --- a/test/resources/S3/pending/ObjectPOSTrestoreResponse +++ /dev/null @@ -1,27 +0,0 @@ -POST /ObjectName?restore HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue -Content-MD5: MD5 - - - NumberOfDays - - -POST /photo1.jpg?restore HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Mon, 22 Oct 2012 01:49:52 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Length: 53 - - - 2 - - -HTTP/1.1 202 Accepted -x-amz-id-2: GFihv3y6+kE7KG11GEkQhU7/2/cHR3Yb2fCb2S04nxI423Dqwg2XiQ0B/UZlzYQvPiBlZNRcovw= -x-amz-request-id: 9F341CD3C4BA79E0 -Date: Sat, 20 Oct 2012 23:54:05 GMT -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectPUT b/test/resources/S3/pending/ObjectPUT deleted file mode 100644 index f40ca790847..00000000000 --- a/test/resources/S3/pending/ObjectPUT +++ /dev/null @@ -1,112 +0,0 @@ -PUT /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -PUT /my-image.jpg HTTP/1.1 -Host: myBucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 11434 -Expect: 100-continue -[11434 bytes of object data] - -HTTP/1.1 100 Continue - -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -Date: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "1b2cf535f27731c974343645a3985328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 100 Continue - -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -Date: Wed, 12 Oct 2009 17:50:00 GMT -x-amz-expiration: expiry-date="Fri, 23 Dec 2012 00:00:00 GMT", rule-id="1" -ETag: "1b2cf535f27731c974343645a3985328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 100 Continue - -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: 43jfkodU8493jnFJD9fjj3HHNVfdsQUIFDNsidf038jfdsjGFDSIRp -Date: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "fbacf535f27731c9771645a39863328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT /my-image.jpg HTTP/1.1 -Host: myBucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: image/jpeg -Content-Length: 11434 -Expect: 100-continue -x-amz-storage-class: REDUCED_REDUNDANCY - -HTTP/1.1 100 Continue - -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -Date: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "1b2cf535f27731c974343645a3985328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT TestObject.txt HTTP/1.1 -Host: myBucket.s3.amazonaws.com -x-amz-date: Fri, 13 Apr 2012 05:40:14 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -x-amz-grant-write-acp: id=8a6925ce4adf588a4532142d3f74dd8c71fa124ExampleCanonicalUserID -x-amz-grant-full-control: emailAddress="ExampleUser@amazon.com" -x-amz-grant-write: emailAddress="ExampleUser1@amazon.com", emailAddress="ExampleUser2@amazon.com" -Content-Length: 300 -Expect: 100-continue -Connection: Keep-Alive - -...Object data in the body... - -HTTP/1.1 200 OK -x-amz-id-2: RUxG2sZJUfS+ezeAS2i0Xj6w/ST6xqF/8pFNHjTjTrECW56SCAUWGg+7QLVoj1GH -x-amz-request-id: 8D017A90827290BA -Date: Fri, 13 Apr 2012 05:40:25 GMT -ETag: "dd038b344cf9553547f8b395a814b274" -Content-Length: 0 -Server: AmazonS3 - -...Object data in the body... -PUT TestObject.txt HTTP/1.1 -Host: myBucket.s3.amazonaws.com -x-amz-date: Fri, 13 Apr 2012 05:54:57 GMT -x-amz-acl: public-read -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Length: 300 -Expect: 100-continue -Connection: Keep-Alive - -...Object data in the body... - -HTTP/1.1 200 OK -x-amz-id-2: Yd6PSJxJFQeTYJ/3dDO7miqJfVMXXW0S2Hijo3WFs4bz6oe2QCVXasxXLZdMfASd -x-amz-request-id: 80DF413BB3D28A25 -Date: Fri, 13 Apr 2012 05:54:59 GMT -ETag: "dd038b344cf9553547f8b395a814b274" -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectPUTResponse b/test/resources/S3/pending/ObjectPUTResponse deleted file mode 100644 index f40ca790847..00000000000 --- a/test/resources/S3/pending/ObjectPUTResponse +++ /dev/null @@ -1,112 +0,0 @@ -PUT /ObjectName HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -PUT /my-image.jpg HTTP/1.1 -Host: myBucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: text/plain -Content-Length: 11434 -Expect: 100-continue -[11434 bytes of object data] - -HTTP/1.1 100 Continue - -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -Date: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "1b2cf535f27731c974343645a3985328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 100 Continue - -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -Date: Wed, 12 Oct 2009 17:50:00 GMT -x-amz-expiration: expiry-date="Fri, 23 Dec 2012 00:00:00 GMT", rule-id="1" -ETag: "1b2cf535f27731c974343645a3985328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -HTTP/1.1 100 Continue - -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -x-amz-version-id: 43jfkodU8493jnFJD9fjj3HHNVfdsQUIFDNsidf038jfdsjGFDSIRp -Date: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "fbacf535f27731c9771645a39863328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT /my-image.jpg HTTP/1.1 -Host: myBucket.s3.amazonaws.com -Date: Wed, 12 Oct 2009 17:50:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Type: image/jpeg -Content-Length: 11434 -Expect: 100-continue -x-amz-storage-class: REDUCED_REDUNDANCY - -HTTP/1.1 100 Continue - -HTTP/1.1 200 OK -x-amz-id-2: LriYPLdmOdAiIfgSm/F1YsViT1LW94/xUQxMsF7xiEb1a0wiIOIxl+zbwZ163pt7 -x-amz-request-id: 0A49CE4060975EAC -Date: Wed, 12 Oct 2009 17:50:00 GMT -ETag: "1b2cf535f27731c974343645a3985328" -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT TestObject.txt HTTP/1.1 -Host: myBucket.s3.amazonaws.com -x-amz-date: Fri, 13 Apr 2012 05:40:14 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -x-amz-grant-write-acp: id=8a6925ce4adf588a4532142d3f74dd8c71fa124ExampleCanonicalUserID -x-amz-grant-full-control: emailAddress="ExampleUser@amazon.com" -x-amz-grant-write: emailAddress="ExampleUser1@amazon.com", emailAddress="ExampleUser2@amazon.com" -Content-Length: 300 -Expect: 100-continue -Connection: Keep-Alive - -...Object data in the body... - -HTTP/1.1 200 OK -x-amz-id-2: RUxG2sZJUfS+ezeAS2i0Xj6w/ST6xqF/8pFNHjTjTrECW56SCAUWGg+7QLVoj1GH -x-amz-request-id: 8D017A90827290BA -Date: Fri, 13 Apr 2012 05:40:25 GMT -ETag: "dd038b344cf9553547f8b395a814b274" -Content-Length: 0 -Server: AmazonS3 - -...Object data in the body... -PUT TestObject.txt HTTP/1.1 -Host: myBucket.s3.amazonaws.com -x-amz-date: Fri, 13 Apr 2012 05:54:57 GMT -x-amz-acl: public-read -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Length: 300 -Expect: 100-continue -Connection: Keep-Alive - -...Object data in the body... - -HTTP/1.1 200 OK -x-amz-id-2: Yd6PSJxJFQeTYJ/3dDO7miqJfVMXXW0S2Hijo3WFs4bz6oe2QCVXasxXLZdMfASd -x-amz-request-id: 80DF413BB3D28A25 -Date: Fri, 13 Apr 2012 05:54:59 GMT -ETag: "dd038b344cf9553547f8b395a814b274" -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectPUTacl b/test/resources/S3/pending/ObjectPUTacl deleted file mode 100644 index 057b8ef2437..00000000000 --- a/test/resources/S3/pending/ObjectPUTacl +++ /dev/null @@ -1,116 +0,0 @@ -PUT /ObjectName?acl HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - - ID - EmailAddress - - - - - ID - EmailAddress - - Permission - - ... - - - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - - - ID - GranteesEmail - - - - Grantees@email.com - - - - http://acs.amazonaws.com/groups/global/AuthenticatedUsers - - -PUT /my-image.jpg?acl HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Length: 124 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - CustomersName@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeeExampleCanonicalUserID - CustomerName@amazon.com - - FULL_CONTROL - - - - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51T9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-version-id: 3/L4kqtJlcpXrof3vjVBH40Nr8X8gdRQBpUMLUo -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT /my-image.jpg?acl&versionId=3HL4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nrjfkd HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Length: 124 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - FULL_CONTROL - - - - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51u8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-version-id: 3/L4kqtJlcpXro3vjVBH40Nr8X8gdRQBpUMLUo -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT ExampleObject.txt?acl HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-acl: public-read -Accept: */* -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Host: s3.amazonaws.com -Connection: Keep-Alive - -HTTP/1.1 200 OK -x-amz-id-2: w5YegkbG6ZDsje4WK56RWPxNQHIQ0CjrjyRVFZhEJI9E3kbabXnBO9w5G7Dmxsgk -x-amz-request-id: C13B2827BD8455B1 -Date: Sun, 29 Apr 2012 23:24:12 GMT -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/ObjectPUTaclResponse b/test/resources/S3/pending/ObjectPUTaclResponse deleted file mode 100644 index 057b8ef2437..00000000000 --- a/test/resources/S3/pending/ObjectPUTaclResponse +++ /dev/null @@ -1,116 +0,0 @@ -PUT /ObjectName?acl HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - - - - ID - EmailAddress - - - - - ID - EmailAddress - - Permission - - ... - - - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - - - ID - GranteesEmail - - - - Grantees@email.com - - - - http://acs.amazonaws.com/groups/global/AuthenticatedUsers - - -PUT /my-image.jpg?acl HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Length: 124 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - CustomersName@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeeExampleCanonicalUserID - CustomerName@amazon.com - - FULL_CONTROL - - - - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51T9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-version-id: 3/L4kqtJlcpXrof3vjVBH40Nr8X8gdRQBpUMLUo -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT /my-image.jpg?acl&versionId=3HL4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nrjfkd HTTP/1.1 -Host: bucket.s3.amazonaws.com -Date: Wed, 28 Oct 2009 22:32:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Content-Length: 124 - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - mtd@amazon.com - - FULL_CONTROL - - - - -HTTP/1.1 200 OK -x-amz-id-2: eftixk72aD6Ap51u8yU9AS1ed4OpIszj7UDNEHGran -x-amz-request-id: 318BC8BC148832E5 -x-amz-version-id: 3/L4kqtJlcpXro3vjVBH40Nr8X8gdRQBpUMLUo -Date: Wed, 28 Oct 2009 22:32:00 GMT -Last-Modified: Sun, 1 Jan 2006 12:00:00 GMT -Content-Length: 0 -Connection: close -Server: AmazonS3 - -PUT ExampleObject.txt?acl HTTP/1.1 -Host: examplebucket.s3.amazonaws.com -x-amz-acl: public-read -Accept: */* -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= -Host: s3.amazonaws.com -Connection: Keep-Alive - -HTTP/1.1 200 OK -x-amz-id-2: w5YegkbG6ZDsje4WK56RWPxNQHIQ0CjrjyRVFZhEJI9E3kbabXnBO9w5G7Dmxsgk -x-amz-request-id: C13B2827BD8455B1 -Date: Sun, 29 Apr 2012 23:24:12 GMT -Content-Length: 0 -Server: AmazonS3 - diff --git a/test/resources/S3/pending/mpUploadAbort b/test/resources/S3/pending/mpUploadAbort deleted file mode 100644 index 336602375b7..00000000000 --- a/test/resources/S3/pending/mpUploadAbort +++ /dev/null @@ -1,18 +0,0 @@ -DELETE /ObjectName?uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Authorization: Signature - -DELETE /example-object?uploadId=VXBsb2FkIElEIGZvciBlbHZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf3/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 204 OK -x-amz-id-2: Weag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 996c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 0 -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/mpUploadAbortResponse b/test/resources/S3/pending/mpUploadAbortResponse deleted file mode 100644 index 336602375b7..00000000000 --- a/test/resources/S3/pending/mpUploadAbortResponse +++ /dev/null @@ -1,18 +0,0 @@ -DELETE /ObjectName?uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Authorization: Signature - -DELETE /example-object?uploadId=VXBsb2FkIElEIGZvciBlbHZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf3/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 204 OK -x-amz-id-2: Weag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 996c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 0 -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/mpUploadComplete b/test/resources/S3/pending/mpUploadComplete deleted file mode 100644 index c94385d69b8..00000000000 --- a/test/resources/S3/pending/mpUploadComplete +++ /dev/null @@ -1,82 +0,0 @@ -POST /ObjectName?uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Content-Length: Size -Authorization: Signature - - - - PartNumber - ETag - - ... - - -POST /example-object?uploadId=AAAsb2FkIElEIGZvciBlbHZpbmcncyWeeS1tb3ZpZS5tMnRzIRRwbG9hZA HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 391 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - 1 - "a54357aff0632cce46d942af68356b38" - - - 2 - "0c78aef83f66abc1fa1e8477f296d394" - - - 3 - "acbd18db4cc2f85cedef654fccc4a4d8" - - - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Connection: close -Server: AmazonS3 - - - - http://Example-Bucket.s3.amazonaws.com/Example-Object - Example-Bucket - Example-Object - "3858f62230ac3c915f300c664312c11f-9" - - -HTTP/1.1 403 Forbidden -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 237 -Connection: keep-alive -Server: AmazonS3 - - - - AccessDenied - Access Denied - 656c76696e6727732072657175657374 - Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== - - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Connection: close -Server: AmazonS3 - - - - - InternalError - We encountered an internal error. Please try again. - 656c76696e6727732072657175657374 - Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== - - diff --git a/test/resources/S3/pending/mpUploadCompleteResponse b/test/resources/S3/pending/mpUploadCompleteResponse deleted file mode 100644 index c94385d69b8..00000000000 --- a/test/resources/S3/pending/mpUploadCompleteResponse +++ /dev/null @@ -1,82 +0,0 @@ -POST /ObjectName?uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Content-Length: Size -Authorization: Signature - - - - PartNumber - ETag - - ... - - -POST /example-object?uploadId=AAAsb2FkIElEIGZvciBlbHZpbmcncyWeeS1tb3ZpZS5tMnRzIRRwbG9hZA HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 391 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - 1 - "a54357aff0632cce46d942af68356b38" - - - 2 - "0c78aef83f66abc1fa1e8477f296d394" - - - 3 - "acbd18db4cc2f85cedef654fccc4a4d8" - - - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Connection: close -Server: AmazonS3 - - - - http://Example-Bucket.s3.amazonaws.com/Example-Object - Example-Bucket - Example-Object - "3858f62230ac3c915f300c664312c11f-9" - - -HTTP/1.1 403 Forbidden -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 237 -Connection: keep-alive -Server: AmazonS3 - - - - AccessDenied - Access Denied - 656c76696e6727732072657175657374 - Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== - - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Connection: close -Server: AmazonS3 - - - - - InternalError - We encountered an internal error. Please try again. - 656c76696e6727732072657175657374 - Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== - - diff --git a/test/resources/S3/pending/mpUploadInitiate b/test/resources/S3/pending/mpUploadInitiate deleted file mode 100644 index 763d23f270e..00000000000 --- a/test/resources/S3/pending/mpUploadInitiate +++ /dev/null @@ -1,27 +0,0 @@ -POST /ObjectName?uploads HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -POST /example-object?uploads HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 197 -Connection: keep-alive -Server: AmazonS3 - - - - example-bucket - example-object - VXBsb2FkIElEIGZvciA2aWWpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZA - - diff --git a/test/resources/S3/pending/mpUploadInitiateResponse b/test/resources/S3/pending/mpUploadInitiateResponse deleted file mode 100644 index 763d23f270e..00000000000 --- a/test/resources/S3/pending/mpUploadInitiateResponse +++ /dev/null @@ -1,27 +0,0 @@ -POST /ObjectName?uploads HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Authorization: signatureValue - -x-amz-grant-read: emailAddress="xyz@amazon.com", emailAddress="abc@amazon.com" - -POST /example-object?uploads HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 197 -Connection: keep-alive -Server: AmazonS3 - - - - example-bucket - example-object - VXBsb2FkIElEIGZvciA2aWWpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZA - - diff --git a/test/resources/S3/pending/mpUploadListMPUpload b/test/resources/S3/pending/mpUploadListMPUpload deleted file mode 100644 index 62236fd7223..00000000000 --- a/test/resources/S3/pending/mpUploadListMPUpload +++ /dev/null @@ -1,135 +0,0 @@ -GET /?uploads HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Authorization: Signature - -GET /?uploads&max-uploads=3 HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 1330 -Connection: keep-alive -Server: AmazonS3 - - - - bucket - - - my-movie.m2ts - YW55IGlkZWEgd2h5IGVsdmluZydzIHVwbG9hZCBmYWlsZWQ - 3 - true - - my-divisor - XMgbGlrZSBlbHZpbmcncyBub3QgaGF2aW5nIG11Y2ggbHVjaw - - arn:aws:iam::111122223333:user/user1-11111a31-17b5-4fb7-9df5-b111111f13de - user1-11111a31-17b5-4fb7-9df5-b111111f13de - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - OwnerDisplayName - - STANDARD - 2010-11-10T20:48:33.000Z - - - my-movie.m2ts - VXBsb2FkIElEIGZvciBlbHZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZA - - b1d16700c70b0b05597d7acd6a3f92be - InitiatorDisplayName - - - b1d16700c70b0b05597d7acd6a3f92be - OwnerDisplayName - - STANDARD - 2010-11-10T20:48:33.000Z - - - my-movie.m2ts - YW55IGlkZWEgd2h5IGVsdmluZydzIHVwbG9hZCBmYWlsZWQ - - arn:aws:iam::444455556666:user/user1-22222a31-17b5-4fb7-9df5-b222222f13de - user1-22222a31-17b5-4fb7-9df5-b222222f13de - - - b1d16700c70b0b05597d7acd6a3f92be - OwnerDisplayName - - STANDARD - 2010-11-10T20:49:33.000Z - - - -GET /?uploads&delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - example-bucket - - - sample.jpg - Xgw4MJT6ZPAVxpY0SAuGN7q4uWJJM22ZYg1W99trdp4tpO88.PT6.MhO0w2E17eutfAvQfQWoajgE_W2gpcxQw-- - / - - 1000 - false - - sample.jpg - Agw4MJT6ZPAVxpY0SAuGN7q4uWJJM22ZYg1N99trdp4tpO88.PT6.MhO0w2E17eutfAvQfQWoajgE_W2gpcxQw-- - - 314133b66967d86f031c7249d1d9a80249109428335cd0ef1cdc487b4566cb1b - s3-nickname - - - 314133b66967d86f031c7249d1d9a80249109428335cd0ef1cdc487b4566cb1b - s3-nickname - - STANDARD - 2010-11-26T19:24:17.000Z - - - photos/ - - - videos/ - - - -GET /?uploads&delimiter=/&prefix=photos/2006/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - example-bucket - - - - - / - photos/2006/ - 1000 - false - - photos/2006/February/ - - - photos/2006/January/ - - - photos/2006/March/ - - - diff --git a/test/resources/S3/pending/mpUploadListMPUploadResponse b/test/resources/S3/pending/mpUploadListMPUploadResponse deleted file mode 100644 index 62236fd7223..00000000000 --- a/test/resources/S3/pending/mpUploadListMPUploadResponse +++ /dev/null @@ -1,135 +0,0 @@ -GET /?uploads HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Authorization: Signature - -GET /?uploads&max-uploads=3 HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 1330 -Connection: keep-alive -Server: AmazonS3 - - - - bucket - - - my-movie.m2ts - YW55IGlkZWEgd2h5IGVsdmluZydzIHVwbG9hZCBmYWlsZWQ - 3 - true - - my-divisor - XMgbGlrZSBlbHZpbmcncyBub3QgaGF2aW5nIG11Y2ggbHVjaw - - arn:aws:iam::111122223333:user/user1-11111a31-17b5-4fb7-9df5-b111111f13de - user1-11111a31-17b5-4fb7-9df5-b111111f13de - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - OwnerDisplayName - - STANDARD - 2010-11-10T20:48:33.000Z - - - my-movie.m2ts - VXBsb2FkIElEIGZvciBlbHZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZA - - b1d16700c70b0b05597d7acd6a3f92be - InitiatorDisplayName - - - b1d16700c70b0b05597d7acd6a3f92be - OwnerDisplayName - - STANDARD - 2010-11-10T20:48:33.000Z - - - my-movie.m2ts - YW55IGlkZWEgd2h5IGVsdmluZydzIHVwbG9hZCBmYWlsZWQ - - arn:aws:iam::444455556666:user/user1-22222a31-17b5-4fb7-9df5-b222222f13de - user1-22222a31-17b5-4fb7-9df5-b222222f13de - - - b1d16700c70b0b05597d7acd6a3f92be - OwnerDisplayName - - STANDARD - 2010-11-10T20:49:33.000Z - - - -GET /?uploads&delimiter=/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - example-bucket - - - sample.jpg - Xgw4MJT6ZPAVxpY0SAuGN7q4uWJJM22ZYg1W99trdp4tpO88.PT6.MhO0w2E17eutfAvQfQWoajgE_W2gpcxQw-- - / - - 1000 - false - - sample.jpg - Agw4MJT6ZPAVxpY0SAuGN7q4uWJJM22ZYg1N99trdp4tpO88.PT6.MhO0w2E17eutfAvQfQWoajgE_W2gpcxQw-- - - 314133b66967d86f031c7249d1d9a80249109428335cd0ef1cdc487b4566cb1b - s3-nickname - - - 314133b66967d86f031c7249d1d9a80249109428335cd0ef1cdc487b4566cb1b - s3-nickname - - STANDARD - 2010-11-26T19:24:17.000Z - - - photos/ - - - videos/ - - - -GET /?uploads&delimiter=/&prefix=photos/2006/ HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - - - - example-bucket - - - - - / - photos/2006/ - 1000 - false - - photos/2006/February/ - - - photos/2006/January/ - - - photos/2006/March/ - - - diff --git a/test/resources/S3/pending/mpUploadListParts b/test/resources/S3/pending/mpUploadListParts deleted file mode 100644 index 8b570d22b28..00000000000 --- a/test/resources/S3/pending/mpUploadListParts +++ /dev/null @@ -1,50 +0,0 @@ -GET /ObjectName?uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Authorization: Signature - -GET /example-object?uploadId=XXBsb2FkIElEIGZvciBlbHZpbmcncyVcdS1tb3ZpZS5tMnRzEEEwbG9hZA&max-parts=2&part-number-marker=1 HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 985 -Connection: keep-alive -Server: AmazonS3 - - - - example-bucket - example-object - XXBsb2FkIElEIGZvciBlbHZpbmcncyVcdS1tb3ZpZS5tMnRzEEEwbG9hZA - - arn:aws:iam::111122223333:user/some-user-11116a31-17b5-4fb7-9df5-b288870f11xx - umat-user-11116a31-17b5-4fb7-9df5-b288870f11xx - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - someName - - STANDARD - 1 - 3 - 2 - true - - 2 - 2010-11-10T20:48:34.000Z - "7778aef83f66abc1fa1e8477f296d394" - 10485760 - - - 3 - 2010-11-10T20:48:33.000Z - "aaaa18db4cc2f85cedef654fccc4a4x8" - 10485760 - - - diff --git a/test/resources/S3/pending/mpUploadListPartsResponse b/test/resources/S3/pending/mpUploadListPartsResponse deleted file mode 100644 index 8b570d22b28..00000000000 --- a/test/resources/S3/pending/mpUploadListPartsResponse +++ /dev/null @@ -1,50 +0,0 @@ -GET /ObjectName?uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Authorization: Signature - -GET /example-object?uploadId=XXBsb2FkIElEIGZvciBlbHZpbmcncyVcdS1tb3ZpZS5tMnRzEEEwbG9hZA&max-parts=2&part-number-marker=1 HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:0RQf4/cRonhpaBX5sCYVf1bNRuU= - -HTTP/1.1 200 OK -x-amz-id-2: Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 985 -Connection: keep-alive -Server: AmazonS3 - - - - example-bucket - example-object - XXBsb2FkIElEIGZvciBlbHZpbmcncyVcdS1tb3ZpZS5tMnRzEEEwbG9hZA - - arn:aws:iam::111122223333:user/some-user-11116a31-17b5-4fb7-9df5-b288870f11xx - umat-user-11116a31-17b5-4fb7-9df5-b288870f11xx - - - 75aa57f09aa0c8caeab4f8c24e99d10f8e7faeebf76c078efc7c6caea54ba06a - someName - - STANDARD - 1 - 3 - 2 - true - - 2 - 2010-11-10T20:48:34.000Z - "7778aef83f66abc1fa1e8477f296d394" - 10485760 - - - 3 - 2010-11-10T20:48:33.000Z - "aaaa18db4cc2f85cedef654fccc4a4x8" - 10485760 - - - diff --git a/test/resources/S3/pending/mpUploadUploadPart b/test/resources/S3/pending/mpUploadUploadPart deleted file mode 100644 index 86ee3b6c8b8..00000000000 --- a/test/resources/S3/pending/mpUploadUploadPart +++ /dev/null @@ -1,24 +0,0 @@ -PUT /ObjectName?partNumber=PartNumber&uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Content-Length: Size -Authorization: Signature - -PUT /my-movie.m2ts?partNumber=1&uploadId=VCVsb2FkIElEIGZvciBlbZZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZR HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 10485760 -Content-MD5: pUNXr/BjKK5G2UKvaRRrOA== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:VGhpcyBtZXNzYWdlIHNpZ25lZGGieSRlbHZpbmc= - -***part data omitted*** - -HTTP/1.1 200 OK -x-amz-id-2: Vvag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -ETag: "b54357faf0632cce46e942fa68356b38" -Content-Length: 0 -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/mpUploadUploadPartCopy b/test/resources/S3/pending/mpUploadUploadPartCopy deleted file mode 100644 index ecda36760da..00000000000 --- a/test/resources/S3/pending/mpUploadUploadPartCopy +++ /dev/null @@ -1,57 +0,0 @@ -PUT /ObjectName?partNumber=PartNumber&uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -x-amz-copy-source: /source_bucket/sourceObject -x-amz-copy-source-range:bytes=first-last -x-amz-copy-source-if-match: etag -x-amz-copy-source-if-none-match: etag -x-amz-copy-source-if-unmodified-since: time_stamp -x-amz-copy-source-if-modified-since: time_stamp -Date: date -Authorization: Signature - -x-amz-copy-source: /bucket/object?versionId=version id - -PUT /newobject?partNumber=2&uploadId=VCVsb2FkIElEIGZvciBlbZZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZR HTTP/1.1 -Host: target-bucket.s3.amazonaws.com -Date: Mon, 11 Apr 2011 20:34:56 GMT -x-amz-copy-source: /source-bucket/sourceobject -x-amz-copy-source-range:bytes=500-6291456 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:VGhpcyBtZXNzYWdlIHNpZ25lZGGieSRlbHZpbmc= - -HTTP/1.1 200 OK -x-amz-id-2: Vvag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 11 Apr 2011 20:34:56 GMT -Server: AmazonS3 - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - -PUT /newobject?partNumber=2&uploadId=VCVsb2FkIElEIGZvciBlbZZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZR HTTP/1.1 -Host: target-bucket.s3.amazonaws.com -Date: Mon, 11 Apr 2011 20:34:56 GMT -x-amz-copy-source: /source-bucket/sourceobject -Authorization: AWS AKIAIOSFODNN7EXAMPLE:VGhpcyBtZXNzYWdlIHNpZ25lZGGieSRlbHZpbmc= -Sample Response - -PUT /newobject?partNumber=2&uploadId=VCVsb2FkIElEIGZvciBlbZZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZR HTTP/1.1 -Host: target-bucket.s3.amazonaws.com -Date: Mon, 11 Apr 2011 20:34:56 GMT -x-amz-copy-source: /source-bucket/sourceobject?versionId=3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -x-amz-copy-source-range:bytes=500-6291456 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:VGhpcyBtZXNzYWdlIHNpZ25lZGGieSRlbHZpbmc= - -HTTP/1.1 200 OK -x-amz-id-2: Vvag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -x-amz-copy-source-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -Date: Mon, 11 Apr 2011 20:34:56 GMT -Server: AmazonS3 - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - diff --git a/test/resources/S3/pending/mpUploadUploadPartCopyResponse b/test/resources/S3/pending/mpUploadUploadPartCopyResponse deleted file mode 100644 index ecda36760da..00000000000 --- a/test/resources/S3/pending/mpUploadUploadPartCopyResponse +++ /dev/null @@ -1,57 +0,0 @@ -PUT /ObjectName?partNumber=PartNumber&uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -x-amz-copy-source: /source_bucket/sourceObject -x-amz-copy-source-range:bytes=first-last -x-amz-copy-source-if-match: etag -x-amz-copy-source-if-none-match: etag -x-amz-copy-source-if-unmodified-since: time_stamp -x-amz-copy-source-if-modified-since: time_stamp -Date: date -Authorization: Signature - -x-amz-copy-source: /bucket/object?versionId=version id - -PUT /newobject?partNumber=2&uploadId=VCVsb2FkIElEIGZvciBlbZZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZR HTTP/1.1 -Host: target-bucket.s3.amazonaws.com -Date: Mon, 11 Apr 2011 20:34:56 GMT -x-amz-copy-source: /source-bucket/sourceobject -x-amz-copy-source-range:bytes=500-6291456 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:VGhpcyBtZXNzYWdlIHNpZ25lZGGieSRlbHZpbmc= - -HTTP/1.1 200 OK -x-amz-id-2: Vvag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 11 Apr 2011 20:34:56 GMT -Server: AmazonS3 - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - -PUT /newobject?partNumber=2&uploadId=VCVsb2FkIElEIGZvciBlbZZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZR HTTP/1.1 -Host: target-bucket.s3.amazonaws.com -Date: Mon, 11 Apr 2011 20:34:56 GMT -x-amz-copy-source: /source-bucket/sourceobject -Authorization: AWS AKIAIOSFODNN7EXAMPLE:VGhpcyBtZXNzYWdlIHNpZ25lZGGieSRlbHZpbmc= -Sample Response - -PUT /newobject?partNumber=2&uploadId=VCVsb2FkIElEIGZvciBlbZZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZR HTTP/1.1 -Host: target-bucket.s3.amazonaws.com -Date: Mon, 11 Apr 2011 20:34:56 GMT -x-amz-copy-source: /source-bucket/sourceobject?versionId=3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -x-amz-copy-source-range:bytes=500-6291456 -Authorization: AWS AKIAIOSFODNN7EXAMPLE:VGhpcyBtZXNzYWdlIHNpZ25lZGGieSRlbHZpbmc= - -HTTP/1.1 200 OK -x-amz-id-2: Vvag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -x-amz-copy-source-version-id: 3/L4kqtJlcpXroDTDmJ+rmSpXd3dIbrHY+MTRCxf3vjVBH40Nr8X8gdRQBpUMLUo -Date: Mon, 11 Apr 2011 20:34:56 GMT -Server: AmazonS3 - - - 2009-10-28T22:32:00 - "9b2cf535f27731c974343645a3985328" - - diff --git a/test/resources/S3/pending/mpUploadUploadPartResponse b/test/resources/S3/pending/mpUploadUploadPartResponse deleted file mode 100644 index 86ee3b6c8b8..00000000000 --- a/test/resources/S3/pending/mpUploadUploadPartResponse +++ /dev/null @@ -1,24 +0,0 @@ -PUT /ObjectName?partNumber=PartNumber&uploadId=UploadId HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: date -Content-Length: Size -Authorization: Signature - -PUT /my-movie.m2ts?partNumber=1&uploadId=VCVsb2FkIElEIGZvciBlbZZpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZR HTTP/1.1 -Host: example-bucket.s3.amazonaws.com -Date: Mon, 1 Nov 2010 20:34:56 GMT -Content-Length: 10485760 -Content-MD5: pUNXr/BjKK5G2UKvaRRrOA== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:VGhpcyBtZXNzYWdlIHNpZ25lZGGieSRlbHZpbmc= - -***part data omitted*** - -HTTP/1.1 200 OK -x-amz-id-2: Vvag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg== -x-amz-request-id: 656c76696e6727732072657175657374 -Date: Mon, 1 Nov 2010 20:34:56 GMT -ETag: "b54357faf0632cce46e942fa68356b38" -Content-Length: 0 -Connection: keep-alive -Server: AmazonS3 - diff --git a/test/resources/S3/pending/multiobjectdeleteapi b/test/resources/S3/pending/multiobjectdeleteapi deleted file mode 100644 index 46e8dede583..00000000000 --- a/test/resources/S3/pending/multiobjectdeleteapi +++ /dev/null @@ -1,176 +0,0 @@ -POST /?delete HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Authorization: Signature -Content-Length: Size -Content-MD5: MD5 - - - - true - - Key - VersionId - - - Key - - ... - - -POST /?delete HTTP/1.1 -Host: bucketname.S3.amazonaws.com -Accept: */* -x-amz-date: Wed, 30 Nov 2011 03:39:05 GMT -Content-MD5: p5/WA/oEr30qrEEl21PAqw== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:W0qPYCLe6JwkZAD1ei6hp9XZIee= -Content-Length: 125 -Connection: Keep-Alive - - - - sample1.txt - - - sample2.txt - - - -HTTP/1.1 200 OK -x-amz-id-2: 5h4FxSNCUS7wP5z92eGCWDshNpMnRuXvETa4HH3LvvH6VAIr0jU7tH9kM7X+njXx -x-amz-request-id: A437B3B641629AEE -Date: Fri, 02 Dec 2011 01:53:42 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 251 - - - - - sample1.txt - - - sample2.txt - AccessDenied - Access Denied - - - -POST /?delete HTTP/1.1 -Host: bucketname.S3.amazonaws.com -Accept: */* -x-amz-date: Wed, 30 Nov 2011 03:39:05 GMT -Content-MD5: p5/WA/oEr30qrEEl21PAqw== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:W0qPYCLe6JwkZAD1ei6hp9XZIee= -Content-Length: 79 -Connection: Keep-Alive - - - - SampleDocument.txt - - - -HTTP/1.1 200 OK -x-amz-id-2: P3xqrhuhYxlrefdw3rEzmJh8z5KDtGzb+/FB7oiQaScI9Yaxd8olYXc7d1111ab+ -x-amz-request-id: 264A17BF16E9E80A -Date: Wed, 30 Nov 2011 03:39:32 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 276 - - - - - SampleDocument.txt - true - NeQt5xeFTfgPJD8B4CGWnkSLtluMr11s - - - -POST /?delete HTTP/1.1 -Host: bucketname.S3.amazonaws.com -Accept: */* -x-amz-date: Wed, 30 Nov 2011 03:39:05 GMT -Content-MD5: p5/WA/oEr30qrEEl21PAqw== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:W0qPYCLe6JwkZAD1ei6hp9XZIxx= -Content-Length: 140 -Connection: Keep-Alive - - - - SampleDocument.txt - OYcLXagmS.WaD..oyH4KRguB95_YhLs7 - - - -HTTP/1.1 200 OK -x-amz-id-2: P3xqrhuhYxlrefdw3rEzmJh8z5KDtGzb+/FB7oiQaScI9Yaxd8olYXc7d1111xx+ -x-amz-request-id: 264A17BF16E9E80A -Date: Wed, 30 Nov 2011 03:39:32 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 219 - - - - - SampleDocument.txt - OYcLXagmS.WaD..oyH4KRguB95_YhLs7 - - - -HTTP/1.1 200 OK -x-amz-id-2: IIPUZrtolxDEmWsKOae9JlSZe6yWfTye3HQ3T2iAe0ZE4XHa6NKvAJcPp51zZaBr -x-amz-request-id: D6B284CEC9B05E4E -Date: Wed, 30 Nov 2011 03:43:25 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 331 - - - - - SampleDocument.txt - NeQt5xeFTfgPJD8B4CGWnkSLtluMr11s - true - NeQt5xeFTfgPJD8B4CGWnkSLtluMr11s - - - -true -NeQt5xeFTfgPJD8B4CGWnkSLtluMr11s - -POST /?delete HTTP/1.1 -Host: bucketname.S3.amazonaws.com -Accept: */* -x-amz-date: Wed, 30 Nov 2011 03:39:05 GMT -Content-MD5: p5/WA/oEr30qrEEl21PAqw== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:W0qPYCLe6JwkZAD1ei6hp9XZIee= -Content-Length: 104 -Connection: Keep-Alive - - - - 404.txt - - - a.txt - - -HTTP/1.1 200 OK -x-amz-id-2: P3xqrhuhYxlrefdw3rEzmJh8z5KDtGzb+/FB7oiQaScI9Yaxd8olYXc7d1111ab+ -x-amz-request-id: 264A17BF16E9E80A -Date: Wed, 30 Nov 2011 03:39:32 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 207 - - - - MalformedXML - The XML you provided was not well-formed or did not - validate against our published schema - 91F27FB5811111F - LCiQK7KbXyJ1t+tncmjRwmNoeeRNW1/ktJ61IC8kN32SFXJx7UBhOzseJCixAbcD - - diff --git a/test/resources/S3/pending/multiobjectdeleteapiResponse b/test/resources/S3/pending/multiobjectdeleteapiResponse deleted file mode 100644 index 46e8dede583..00000000000 --- a/test/resources/S3/pending/multiobjectdeleteapiResponse +++ /dev/null @@ -1,176 +0,0 @@ -POST /?delete HTTP/1.1 -Host: bucketname.s3.amazonaws.com -Authorization: Signature -Content-Length: Size -Content-MD5: MD5 - - - - true - - Key - VersionId - - - Key - - ... - - -POST /?delete HTTP/1.1 -Host: bucketname.S3.amazonaws.com -Accept: */* -x-amz-date: Wed, 30 Nov 2011 03:39:05 GMT -Content-MD5: p5/WA/oEr30qrEEl21PAqw== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:W0qPYCLe6JwkZAD1ei6hp9XZIee= -Content-Length: 125 -Connection: Keep-Alive - - - - sample1.txt - - - sample2.txt - - - -HTTP/1.1 200 OK -x-amz-id-2: 5h4FxSNCUS7wP5z92eGCWDshNpMnRuXvETa4HH3LvvH6VAIr0jU7tH9kM7X+njXx -x-amz-request-id: A437B3B641629AEE -Date: Fri, 02 Dec 2011 01:53:42 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 251 - - - - - sample1.txt - - - sample2.txt - AccessDenied - Access Denied - - - -POST /?delete HTTP/1.1 -Host: bucketname.S3.amazonaws.com -Accept: */* -x-amz-date: Wed, 30 Nov 2011 03:39:05 GMT -Content-MD5: p5/WA/oEr30qrEEl21PAqw== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:W0qPYCLe6JwkZAD1ei6hp9XZIee= -Content-Length: 79 -Connection: Keep-Alive - - - - SampleDocument.txt - - - -HTTP/1.1 200 OK -x-amz-id-2: P3xqrhuhYxlrefdw3rEzmJh8z5KDtGzb+/FB7oiQaScI9Yaxd8olYXc7d1111ab+ -x-amz-request-id: 264A17BF16E9E80A -Date: Wed, 30 Nov 2011 03:39:32 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 276 - - - - - SampleDocument.txt - true - NeQt5xeFTfgPJD8B4CGWnkSLtluMr11s - - - -POST /?delete HTTP/1.1 -Host: bucketname.S3.amazonaws.com -Accept: */* -x-amz-date: Wed, 30 Nov 2011 03:39:05 GMT -Content-MD5: p5/WA/oEr30qrEEl21PAqw== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:W0qPYCLe6JwkZAD1ei6hp9XZIxx= -Content-Length: 140 -Connection: Keep-Alive - - - - SampleDocument.txt - OYcLXagmS.WaD..oyH4KRguB95_YhLs7 - - - -HTTP/1.1 200 OK -x-amz-id-2: P3xqrhuhYxlrefdw3rEzmJh8z5KDtGzb+/FB7oiQaScI9Yaxd8olYXc7d1111xx+ -x-amz-request-id: 264A17BF16E9E80A -Date: Wed, 30 Nov 2011 03:39:32 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 219 - - - - - SampleDocument.txt - OYcLXagmS.WaD..oyH4KRguB95_YhLs7 - - - -HTTP/1.1 200 OK -x-amz-id-2: IIPUZrtolxDEmWsKOae9JlSZe6yWfTye3HQ3T2iAe0ZE4XHa6NKvAJcPp51zZaBr -x-amz-request-id: D6B284CEC9B05E4E -Date: Wed, 30 Nov 2011 03:43:25 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 331 - - - - - SampleDocument.txt - NeQt5xeFTfgPJD8B4CGWnkSLtluMr11s - true - NeQt5xeFTfgPJD8B4CGWnkSLtluMr11s - - - -true -NeQt5xeFTfgPJD8B4CGWnkSLtluMr11s - -POST /?delete HTTP/1.1 -Host: bucketname.S3.amazonaws.com -Accept: */* -x-amz-date: Wed, 30 Nov 2011 03:39:05 GMT -Content-MD5: p5/WA/oEr30qrEEl21PAqw== -Authorization: AWS AKIAIOSFODNN7EXAMPLE:W0qPYCLe6JwkZAD1ei6hp9XZIee= -Content-Length: 104 -Connection: Keep-Alive - - - - 404.txt - - - a.txt - - -HTTP/1.1 200 OK -x-amz-id-2: P3xqrhuhYxlrefdw3rEzmJh8z5KDtGzb+/FB7oiQaScI9Yaxd8olYXc7d1111ab+ -x-amz-request-id: 264A17BF16E9E80A -Date: Wed, 30 Nov 2011 03:39:32 GMT -Content-Type: application/xml -Server: AmazonS3 -Content-Length: 207 - - - - MalformedXML - The XML you provided was not well-formed or did not - validate against our published schema - 91F27FB5811111F - LCiQK7KbXyJ1t+tncmjRwmNoeeRNW1/ktJ61IC8kN32SFXJx7UBhOzseJCixAbcD - - diff --git a/test/resources/S3/pending/requestPaymentGET b/test/resources/S3/pending/requestPaymentGET deleted file mode 100644 index 17c4552ecd3..00000000000 --- a/test/resources/S3/pending/requestPaymentGET +++ /dev/null @@ -1,24 +0,0 @@ -GET ?requestPayment HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Authorization: Signature - -GET ?requestPayment HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Content-Type: [type] -Content-Length: 0 -Connection: close -Server: AmazonS3 - - - - Requester - - diff --git a/test/resources/S3/pending/requestPaymentGETResponse b/test/resources/S3/pending/requestPaymentGETResponse deleted file mode 100644 index 17c4552ecd3..00000000000 --- a/test/resources/S3/pending/requestPaymentGETResponse +++ /dev/null @@ -1,24 +0,0 @@ -GET ?requestPayment HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Date: Date -Authorization: Signature - -GET ?requestPayment HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Content-Type: [type] -Content-Length: 0 -Connection: close -Server: AmazonS3 - - - - Requester - - diff --git a/test/resources/S3/pending/requestPaymentPUT b/test/resources/S3/pending/requestPaymentPUT deleted file mode 100644 index 17e229c857d..00000000000 --- a/test/resources/S3/pending/requestPaymentPUT +++ /dev/null @@ -1,29 +0,0 @@ -PUT ?requestPayment HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Content-Length: length -Date: date -Authorization:signatureValue - - - payer - - -PUT ?requestPayment HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -Content-Length: 173 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - Requester - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/S3/pending/requestPaymentPUTResponse b/test/resources/S3/pending/requestPaymentPUTResponse deleted file mode 100644 index 17e229c857d..00000000000 --- a/test/resources/S3/pending/requestPaymentPUTResponse +++ /dev/null @@ -1,29 +0,0 @@ -PUT ?requestPayment HTTP/1.1 -Host: BucketName.s3.amazonaws.com -Content-Length: length -Date: date -Authorization:signatureValue - - - payer - - -PUT ?requestPayment HTTP/1.1 -Host: colorpictures.s3.amazonaws.com -Content-Length: 173 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Authorization: AWS AKIAIOSFODNN7EXAMPLE:xQE0diMbLRepdf3YB+FIEXAMPLE= - - - Requester - - -HTTP/1.1 200 OK -x-amz-id-2: YgIPIfBiKa2bj0KMg95r/0zo3emzU4dzsD4rcKCHQUAdQkf3ShJTOOpXUueF6QKo -x-amz-request-id: 236A8905248E5A01 -Date: Wed, 01 Mar 2009 12:00:00 GMT -Location: /colorpictures -Content-Length: 0 -Connection: close -Server: AmazonS3 - diff --git a/test/resources/SES/DeleteIdentity b/test/resources/SES/DeleteIdentity deleted file mode 100644 index b49c53002e8..00000000000 --- a/test/resources/SES/DeleteIdentity +++ /dev/null @@ -1,30 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:25:58 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=w943pl3zIvtszwzZxypi+LsgjzquvhYhnG42S6b2WLo=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 135 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=DeleteIdentity -&Identity=domain.com -&Timestamp=2012-05-12T05%3A25%3A58.000Z -&Version=2010-12-01 - - - - - - - - - d96bd874-9bf2-11e1-8ee7-c98a0037a2b6 - - - - - diff --git a/test/resources/SES/DeleteIdentityResponse b/test/resources/SES/DeleteIdentityResponse deleted file mode 100644 index b49c53002e8..00000000000 --- a/test/resources/SES/DeleteIdentityResponse +++ /dev/null @@ -1,30 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:25:58 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=w943pl3zIvtszwzZxypi+LsgjzquvhYhnG42S6b2WLo=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 135 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=DeleteIdentity -&Identity=domain.com -&Timestamp=2012-05-12T05%3A25%3A58.000Z -&Version=2010-12-01 - - - - - - - - - d96bd874-9bf2-11e1-8ee7-c98a0037a2b6 - - - - - diff --git a/test/resources/SES/DeleteVerifiedEmailAddress b/test/resources/SES/DeleteVerifiedEmailAddress deleted file mode 100644 index 50e317ea84d..00000000000 --- a/test/resources/SES/DeleteVerifiedEmailAddress +++ /dev/null @@ -1,28 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:20:50 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=Rxzyd6cQe/YjkV4yoQAZ243OzzNjFgrsclizTKwRIRc=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 142 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=DeleteVerifiedEmailAddress -&EmailAddress=user%40example.com -&Timestamp=2011-08-18T22%3A20%3A50.000Z - - - - - - - - 5634af08-c865-11e0-8986-3f99a698f914 - - - - - diff --git a/test/resources/SES/DeleteVerifiedEmailAddressResponse b/test/resources/SES/DeleteVerifiedEmailAddressResponse deleted file mode 100644 index 50e317ea84d..00000000000 --- a/test/resources/SES/DeleteVerifiedEmailAddressResponse +++ /dev/null @@ -1,28 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:20:50 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=Rxzyd6cQe/YjkV4yoQAZ243OzzNjFgrsclizTKwRIRc=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 142 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=DeleteVerifiedEmailAddress -&EmailAddress=user%40example.com -&Timestamp=2011-08-18T22%3A20%3A50.000Z - - - - - - - - 5634af08-c865-11e0-8986-3f99a698f914 - - - - - diff --git a/test/resources/SES/GetIdentityDkimAttributes b/test/resources/SES/GetIdentityDkimAttributes deleted file mode 100644 index 88c11f15f0f..00000000000 --- a/test/resources/SES/GetIdentityDkimAttributes +++ /dev/null @@ -1,45 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 29 Jun 2012 22:41:32 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=MJdhrIAt3c4BRC6jdzueMM+AJLEx17bnIHjZwlSenyk=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 165 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetIdentityDkimAttributes -&Identities.member.1=example.com -&Timestamp=2012-06-29T22%3A41%3A32.000Z -&Version=2010-12-01 - - - - - - - - - - amazon.com - - true - Success - - vvjuipp74whm76gqoni7qmwwn4w4qusjiainivf6f - 3frqe7jn4obpuxjpwpolz6ipb3k5nvt2nhjpik2oy - wrqplteh7oodxnad7hsl4mixg2uavzneazxv5sxi2 - - - - - - - bb5a105d-c468-11e1-82eb-dff885ccc06a - - - - - diff --git a/test/resources/SES/GetIdentityDkimAttributesResponse b/test/resources/SES/GetIdentityDkimAttributesResponse deleted file mode 100644 index 88c11f15f0f..00000000000 --- a/test/resources/SES/GetIdentityDkimAttributesResponse +++ /dev/null @@ -1,45 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 29 Jun 2012 22:41:32 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=MJdhrIAt3c4BRC6jdzueMM+AJLEx17bnIHjZwlSenyk=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 165 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetIdentityDkimAttributes -&Identities.member.1=example.com -&Timestamp=2012-06-29T22%3A41%3A32.000Z -&Version=2010-12-01 - - - - - - - - - - amazon.com - - true - Success - - vvjuipp74whm76gqoni7qmwwn4w4qusjiainivf6f - 3frqe7jn4obpuxjpwpolz6ipb3k5nvt2nhjpik2oy - wrqplteh7oodxnad7hsl4mixg2uavzneazxv5sxi2 - - - - - - - bb5a105d-c468-11e1-82eb-dff885ccc06a - - - - - diff --git a/test/resources/SES/GetIdentityNotificationAttributes b/test/resources/SES/GetIdentityNotificationAttributes deleted file mode 100644 index f252ff8f01c..00000000000 --- a/test/resources/SES/GetIdentityNotificationAttributes +++ /dev/null @@ -1,41 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 15 Jun 2012 20:51:42 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=ee9aH6tUW5wBPoh01Tz3w4H+z4avrMmvmRYbfORC7OI=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 173 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetIdentityNotificationAttributes -&Identities.member.1=user%40example.com -&Timestamp=2012-06-15T20%3A51%3A42.000Z -&Version=2010-12-01 - - - - - - - - - - user@example.com - - true - arn:aws:sns:us-east-1:123456789012:example - arn:aws:sns:us-east-1:123456789012:example - - - - - - e038e509-b72a-11e1-901f-1fbd90e8104f - - - - - diff --git a/test/resources/SES/GetIdentityNotificationAttributesResponse b/test/resources/SES/GetIdentityNotificationAttributesResponse deleted file mode 100644 index f252ff8f01c..00000000000 --- a/test/resources/SES/GetIdentityNotificationAttributesResponse +++ /dev/null @@ -1,41 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 15 Jun 2012 20:51:42 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=ee9aH6tUW5wBPoh01Tz3w4H+z4avrMmvmRYbfORC7OI=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 173 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetIdentityNotificationAttributes -&Identities.member.1=user%40example.com -&Timestamp=2012-06-15T20%3A51%3A42.000Z -&Version=2010-12-01 - - - - - - - - - - user@example.com - - true - arn:aws:sns:us-east-1:123456789012:example - arn:aws:sns:us-east-1:123456789012:example - - - - - - e038e509-b72a-11e1-901f-1fbd90e8104f - - - - - diff --git a/test/resources/SES/GetIdentityVerificationAttributes b/test/resources/SES/GetIdentityVerificationAttributes deleted file mode 100644 index 3e823bac8a1..00000000000 --- a/test/resources/SES/GetIdentityVerificationAttributes +++ /dev/null @@ -1,47 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:27:54 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=3+KQ4VHx991T7Kb41HmFcZJxuHz4/6mf2H5FxY+tuLc=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 203 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetIdentityVerificationAttributes -&Identities.member.1=user%40domain.com -&Identities.member.2=domain.com -&Timestamp=2012-05-12T05%3A27%3A54.000Z -&Version=2010-12-01 - - - - - - - - - - domain.com - - Pending - QTKknzFg2J4ygwa+XvHAxUl1hyHoY0gVfZdfjIedHZ0= - - - - user@domain.com - - Pending - - - - - - 1d0c29f1-9bf3-11e1-8ee7-c98a0037a2b6 - - - - - diff --git a/test/resources/SES/GetIdentityVerificationAttributesResponse b/test/resources/SES/GetIdentityVerificationAttributesResponse deleted file mode 100644 index 3e823bac8a1..00000000000 --- a/test/resources/SES/GetIdentityVerificationAttributesResponse +++ /dev/null @@ -1,47 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:27:54 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=3+KQ4VHx991T7Kb41HmFcZJxuHz4/6mf2H5FxY+tuLc=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 203 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetIdentityVerificationAttributes -&Identities.member.1=user%40domain.com -&Identities.member.2=domain.com -&Timestamp=2012-05-12T05%3A27%3A54.000Z -&Version=2010-12-01 - - - - - - - - - - domain.com - - Pending - QTKknzFg2J4ygwa+XvHAxUl1hyHoY0gVfZdfjIedHZ0= - - - - user@domain.com - - Pending - - - - - - 1d0c29f1-9bf3-11e1-8ee7-c98a0037a2b6 - - - - - diff --git a/test/resources/SES/GetSendQuota b/test/resources/SES/GetSendQuota deleted file mode 100644 index e7ca2bb0d13..00000000000 --- a/test/resources/SES/GetSendQuota +++ /dev/null @@ -1,32 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:22:36 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=W1YdiNOtf0jN3t7Lv63qhz7UZc3RrcmQpkGbopvnj/Y=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 94 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetSendQuota -&Timestamp=2011-08-18T22%3A22%3A36.000Z - - - - - - - - 127.0 - 200.0 - 1.0 - - - 273021c6-c866-11e0-b926-699e21c3af9e - - - - - diff --git a/test/resources/SES/GetSendQuotaResponse b/test/resources/SES/GetSendQuotaResponse deleted file mode 100644 index e7ca2bb0d13..00000000000 --- a/test/resources/SES/GetSendQuotaResponse +++ /dev/null @@ -1,32 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:22:36 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=W1YdiNOtf0jN3t7Lv63qhz7UZc3RrcmQpkGbopvnj/Y=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 94 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetSendQuota -&Timestamp=2011-08-18T22%3A22%3A36.000Z - - - - - - - - 127.0 - 200.0 - 1.0 - - - 273021c6-c866-11e0-b926-699e21c3af9e - - - - - diff --git a/test/resources/SES/GetSendStatistics b/test/resources/SES/GetSendStatistics deleted file mode 100644 index 1c76227f561..00000000000 --- a/test/resources/SES/GetSendStatistics +++ /dev/null @@ -1,48 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:23:01 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=kwuk4eraA9HSfHySflgDKR6xK0JXjATIE7Uu5/FB4x4=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 99 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetSendStatistics -&Timestamp=2011-08-18T22%3A23%3A01.000Z - - - - - - - - - - 8 - 2011-08-03T19:23:00Z - 0 - 0 - 0 - - - 7 - 2011-08-03T06:53:00Z - 0 - 0 - 0 - - . - . - . - . - - - c2b66ee5-c866-11e0-b17f-cddb0ab334db - - - - - diff --git a/test/resources/SES/GetSendStatisticsResponse b/test/resources/SES/GetSendStatisticsResponse deleted file mode 100644 index 1c76227f561..00000000000 --- a/test/resources/SES/GetSendStatisticsResponse +++ /dev/null @@ -1,48 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:23:01 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=kwuk4eraA9HSfHySflgDKR6xK0JXjATIE7Uu5/FB4x4=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 99 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=GetSendStatistics -&Timestamp=2011-08-18T22%3A23%3A01.000Z - - - - - - - - - - 8 - 2011-08-03T19:23:00Z - 0 - 0 - 0 - - - 7 - 2011-08-03T06:53:00Z - 0 - 0 - 0 - - . - . - . - . - - - c2b66ee5-c866-11e0-b17f-cddb0ab334db - - - - - diff --git a/test/resources/SES/ListIdentities b/test/resources/SES/ListIdentities deleted file mode 100644 index 67bf43da623..00000000000 --- a/test/resources/SES/ListIdentities +++ /dev/null @@ -1,34 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:18:45 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=OruiFNV26DCZicLDaQmULHGbjbU8MbC/c5aIo/MMIuM=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 115 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=ListIdentities -&Timestamp=2012-05-12T05%3A18%3A45.000Z& -Version=2010-12-01 - - - - - - - - - example.com - user@example.com - - - - cacecf23-9bf1-11e1-9279-0100e8cf109a - - - - - diff --git a/test/resources/SES/ListIdentitiesResponse b/test/resources/SES/ListIdentitiesResponse deleted file mode 100644 index 67bf43da623..00000000000 --- a/test/resources/SES/ListIdentitiesResponse +++ /dev/null @@ -1,34 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:18:45 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=OruiFNV26DCZicLDaQmULHGbjbU8MbC/c5aIo/MMIuM=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 115 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=ListIdentities -&Timestamp=2012-05-12T05%3A18%3A45.000Z& -Version=2010-12-01 - - - - - - - - - example.com - user@example.com - - - - cacecf23-9bf1-11e1-9279-0100e8cf109a - - - - - diff --git a/test/resources/SES/ListVerifiedEmailAddresses b/test/resources/SES/ListVerifiedEmailAddresses deleted file mode 100644 index e68fa99be35..00000000000 --- a/test/resources/SES/ListVerifiedEmailAddresses +++ /dev/null @@ -1,32 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:05:09 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=II0+vvDKGMv71vToBwzR6vZ1hxe/VUE8tWEFUNTUqgE=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 108 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=ListVerifiedEmailAddresses -&Timestamp=2011-08-18T22%3A05%3A09.000Z% - - - - - - - - - example@amazon.com - - - - 3dd50e97-c865-11e0-b235-099eb63d928d - - - - - diff --git a/test/resources/SES/ListVerifiedEmailAddressesResponse b/test/resources/SES/ListVerifiedEmailAddressesResponse deleted file mode 100644 index e68fa99be35..00000000000 --- a/test/resources/SES/ListVerifiedEmailAddressesResponse +++ /dev/null @@ -1,32 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:05:09 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=II0+vvDKGMv71vToBwzR6vZ1hxe/VUE8tWEFUNTUqgE=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 108 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=ListVerifiedEmailAddresses -&Timestamp=2011-08-18T22%3A05%3A09.000Z% - - - - - - - - - example@amazon.com - - - - 3dd50e97-c865-11e0-b235-099eb63d928d - - - - - diff --git a/test/resources/SES/SendEmail b/test/resources/SES/SendEmail deleted file mode 100644 index 7322f0e60da..00000000000 --- a/test/resources/SES/SendEmail +++ /dev/null @@ -1,33 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:25:27 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=yXx/wM1bESLuDErJ6HpZg9JK8Gjau7EUe4FWEfmhodo=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 230 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SendEmail -&Destination.ToAddresses.member.1=allan%40example.com -&Message.Body.Text.Data=body -&Message.Subject.Data=Example&Source=user%40example.com -&Timestamp=2011-08-18T22%3A25%3A27.000Z - - - - - - - - 00000131d51d2292-159ad6eb-077c-46e6-ad09-ae7c05925ed4-000000 - - - d5964849-c866-11e0-9beb-01a62d68c57f - - - - - diff --git a/test/resources/SES/SendEmailResponse b/test/resources/SES/SendEmailResponse deleted file mode 100644 index 7322f0e60da..00000000000 --- a/test/resources/SES/SendEmailResponse +++ /dev/null @@ -1,33 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:25:27 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=yXx/wM1bESLuDErJ6HpZg9JK8Gjau7EUe4FWEfmhodo=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 230 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SendEmail -&Destination.ToAddresses.member.1=allan%40example.com -&Message.Body.Text.Data=body -&Message.Subject.Data=Example&Source=user%40example.com -&Timestamp=2011-08-18T22%3A25%3A27.000Z - - - - - - - - 00000131d51d2292-159ad6eb-077c-46e6-ad09-ae7c05925ed4-000000 - - - d5964849-c866-11e0-9beb-01a62d68c57f - - - - - diff --git a/test/resources/SES/SendRawEmail b/test/resources/SES/SendRawEmail deleted file mode 100644 index e4cd5456408..00000000000 --- a/test/resources/SES/SendRawEmail +++ /dev/null @@ -1,37 +0,0 @@ - - -POST / HTTP/1.1 -Date: Wed, 17 Aug 2011 00:21:38 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=uN0lHIf14tmMBzwnkHzaWBLrBFvJAvyXCsfSYAvwLuc=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 230 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SendRawEmail -&RawMessage.Data=U3ViamVjdDogRXhhbXBsZQpGcm9tOiBleGFtcGxlQGFtYXpvbi5jb20KVG8 -6IGV4YW1wbGVAYW1h%0Aem9uLmNvbQpDb250ZW50LVR5cGU6IG11bHRpcGFydC9hbHRlcm5hdGl2 -ZTsgYm91bmRhcnk9MDAx%0ANmU2OGY5ZDkyOWNiMDk2MDRhYWE4MzA0MgoKLS0wMDE2ZTY4ZjlkO -TI5Y2IwOTYwNGFhYTgzMDQy%0ACkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1JU0 -8tODg1OS0xCgpCb2R5LgoKLS0w%0AMDE2ZTY4ZjlkOTI5Y2IwOTYwNGFhYTgzMDQyCkNvbnRlbnQ -tVHlwZTogdGV4dC9odG1sOyBjaGFy%0Ac2V0PUlTTy04ODU5LTEKCkJvZHkuPGJyPgoKLS0wMDE2 -ZTY4ZjlkOTI5Y2IwOTYwNGFhYTgzMDQy%0ALS0%3D%0A -&Timestamp=2011-08-17T00%3A21%3A38.000Z - - - - - - - - 00000131d51d6b36-1d4f9293-0aee-4503-b573-9ae4e70e9e38-000000 - - - e0abcdfa-c866-11e0-b6d0-273d09173b49 - - - - - diff --git a/test/resources/SES/SendRawEmailResponse b/test/resources/SES/SendRawEmailResponse deleted file mode 100644 index e4cd5456408..00000000000 --- a/test/resources/SES/SendRawEmailResponse +++ /dev/null @@ -1,37 +0,0 @@ - - -POST / HTTP/1.1 -Date: Wed, 17 Aug 2011 00:21:38 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=uN0lHIf14tmMBzwnkHzaWBLrBFvJAvyXCsfSYAvwLuc=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 230 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SendRawEmail -&RawMessage.Data=U3ViamVjdDogRXhhbXBsZQpGcm9tOiBleGFtcGxlQGFtYXpvbi5jb20KVG8 -6IGV4YW1wbGVAYW1h%0Aem9uLmNvbQpDb250ZW50LVR5cGU6IG11bHRpcGFydC9hbHRlcm5hdGl2 -ZTsgYm91bmRhcnk9MDAx%0ANmU2OGY5ZDkyOWNiMDk2MDRhYWE4MzA0MgoKLS0wMDE2ZTY4ZjlkO -TI5Y2IwOTYwNGFhYTgzMDQy%0ACkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1JU0 -8tODg1OS0xCgpCb2R5LgoKLS0w%0AMDE2ZTY4ZjlkOTI5Y2IwOTYwNGFhYTgzMDQyCkNvbnRlbnQ -tVHlwZTogdGV4dC9odG1sOyBjaGFy%0Ac2V0PUlTTy04ODU5LTEKCkJvZHkuPGJyPgoKLS0wMDE2 -ZTY4ZjlkOTI5Y2IwOTYwNGFhYTgzMDQy%0ALS0%3D%0A -&Timestamp=2011-08-17T00%3A21%3A38.000Z - - - - - - - - 00000131d51d6b36-1d4f9293-0aee-4503-b573-9ae4e70e9e38-000000 - - - e0abcdfa-c866-11e0-b6d0-273d09173b49 - - - - - diff --git a/test/resources/SES/SetIdentityDkimEnabled b/test/resources/SES/SetIdentityDkimEnabled deleted file mode 100644 index 53ac77380ed..00000000000 --- a/test/resources/SES/SetIdentityDkimEnabled +++ /dev/null @@ -1,30 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 29 Jun 2012 22:42:08 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=u/hDNhYm87AV7LAPzouTBz6HJxUEuE5k96sLzYHjR24=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 168 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SetIdentityDkimEnabled -&DkimEnabled=true&Identity=user%40example.com -&Timestamp=2012-06-29T22%3A42%3A08.000Z -&Version=2010-12-01 - - - - - - - - - 7aa61362-c469-11e1-aee5-6bbb4608fbcc - - - - - diff --git a/test/resources/SES/SetIdentityDkimEnabledResponse b/test/resources/SES/SetIdentityDkimEnabledResponse deleted file mode 100644 index 53ac77380ed..00000000000 --- a/test/resources/SES/SetIdentityDkimEnabledResponse +++ /dev/null @@ -1,30 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 29 Jun 2012 22:42:08 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=u/hDNhYm87AV7LAPzouTBz6HJxUEuE5k96sLzYHjR24=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 168 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SetIdentityDkimEnabled -&DkimEnabled=true&Identity=user%40example.com -&Timestamp=2012-06-29T22%3A42%3A08.000Z -&Version=2010-12-01 - - - - - - - - - 7aa61362-c469-11e1-aee5-6bbb4608fbcc - - - - - diff --git a/test/resources/SES/SetIdentityFeedbackForwardingEnabled b/test/resources/SES/SetIdentityFeedbackForwardingEnabled deleted file mode 100644 index 714673391b1..00000000000 --- a/test/resources/SES/SetIdentityFeedbackForwardingEnabled +++ /dev/null @@ -1,32 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 15 Jun 2012 20:31:21 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=juNpmD6UJaN+r7gcLa2ZNZpO3AmF1ZfOkD6PgxgNhRA=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 188 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SetIdentityFeedbackForwardingEnabled -&ForwardingEnabled=true -&Identity=user%40example.com -&Timestamp=2012-06-15T20%3A31%3A21.000Z -&Version=2010-12-01 - - - - - - - - - - 299f4af4-b72a-11e1-901f-1fbd90e8104f - - - - - diff --git a/test/resources/SES/SetIdentityFeedbackForwardingEnabledResponse b/test/resources/SES/SetIdentityFeedbackForwardingEnabledResponse deleted file mode 100644 index 714673391b1..00000000000 --- a/test/resources/SES/SetIdentityFeedbackForwardingEnabledResponse +++ /dev/null @@ -1,32 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 15 Jun 2012 20:31:21 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=juNpmD6UJaN+r7gcLa2ZNZpO3AmF1ZfOkD6PgxgNhRA=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 188 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SetIdentityFeedbackForwardingEnabled -&ForwardingEnabled=true -&Identity=user%40example.com -&Timestamp=2012-06-15T20%3A31%3A21.000Z -&Version=2010-12-01 - - - - - - - - - - 299f4af4-b72a-11e1-901f-1fbd90e8104f - - - - - diff --git a/test/resources/SES/SetIdentityNotificationTopic b/test/resources/SES/SetIdentityNotificationTopic deleted file mode 100644 index 74f8aed6254..00000000000 --- a/test/resources/SES/SetIdentityNotificationTopic +++ /dev/null @@ -1,31 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:27:54 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=3+KQ4VHx991T7Kb41HmFcZJxuHz4/6mf2H5FxY+tuLc=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 203 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SetIdentityNotificationTopic -&Identity=user@example.com -&SnsTopic=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3Aexample -&NotificationType=Bounce -&Timestamp=2012-05-12T05%3A27%3A54.000Z&Version=2010-12-01 - - - - - - - - - 299f4af4-b72a-11e1-901f-1fbd90e8104f - - - - - diff --git a/test/resources/SES/SetIdentityNotificationTopicResponse b/test/resources/SES/SetIdentityNotificationTopicResponse deleted file mode 100644 index 74f8aed6254..00000000000 --- a/test/resources/SES/SetIdentityNotificationTopicResponse +++ /dev/null @@ -1,31 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:27:54 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=3+KQ4VHx991T7Kb41HmFcZJxuHz4/6mf2H5FxY+tuLc=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 203 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=SetIdentityNotificationTopic -&Identity=user@example.com -&SnsTopic=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3Aexample -&NotificationType=Bounce -&Timestamp=2012-05-12T05%3A27%3A54.000Z&Version=2010-12-01 - - - - - - - - - 299f4af4-b72a-11e1-901f-1fbd90e8104f - - - - - diff --git a/test/resources/SES/VerifyDomainDkim b/test/resources/SES/VerifyDomainDkim deleted file mode 100644 index f998b4a1313..00000000000 --- a/test/resources/SES/VerifyDomainDkim +++ /dev/null @@ -1,36 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 29 Jun 2012 22:43:30 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=roXhd+JhEjeBBo5tSERhrptRHSw4XHz6Ra4BXyHIduk=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 136 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=VerifyDomainDkim -&Domain=example.com -&Timestamp=2012-06-29T22%3A43%3A30.000Z -&Version=2010-12-01 - - - - - - - - - vvjuipp74whm76gqoni7qmwwn4w4qusjiainivf6sf - 3frqe7jn4obpuxjpwpolz6ipb3k5nvt2nhjpik2oy - wrqplteh7oodxnad7hsl4mixg2uavzneazxv5sxi2 - - - - 9662c15b-c469-11e1-99d1-797d6ecd6414 - - - - - diff --git a/test/resources/SES/VerifyDomainDkimResponse b/test/resources/SES/VerifyDomainDkimResponse deleted file mode 100644 index f998b4a1313..00000000000 --- a/test/resources/SES/VerifyDomainDkimResponse +++ /dev/null @@ -1,36 +0,0 @@ - - -POST / HTTP/1.1 -Date: Fri, 29 Jun 2012 22:43:30 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=roXhd+JhEjeBBo5tSERhrptRHSw4XHz6Ra4BXyHIduk=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 136 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=VerifyDomainDkim -&Domain=example.com -&Timestamp=2012-06-29T22%3A43%3A30.000Z -&Version=2010-12-01 - - - - - - - - - vvjuipp74whm76gqoni7qmwwn4w4qusjiainivf6sf - 3frqe7jn4obpuxjpwpolz6ipb3k5nvt2nhjpik2oy - wrqplteh7oodxnad7hsl4mixg2uavzneazxv5sxi2 - - - - 9662c15b-c469-11e1-99d1-797d6ecd6414 - - - - - diff --git a/test/resources/SES/VerifyDomainIdentity b/test/resources/SES/VerifyDomainIdentity deleted file mode 100644 index 681df890832..00000000000 --- a/test/resources/SES/VerifyDomainIdentity +++ /dev/null @@ -1,32 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:24:02 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=Wr+6RCfV+QgjLki2dtIrlecMK9+RrsDaTG5uWneDAu8=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 139 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=VerifyDomainIdentity -&Domain=domain.com -&Timestamp=2012-05-12T05%3A24%3A02.000Z -&Version=2010-12-01 - - - - - - - - QTKknzFg2J4ygwa+XvHAxUl1hyHoY0gVfZdfjIedHZ0= - - - 94f6368e-9bf2-11e1-8ee7-c98a0037a2b6 - - - - - diff --git a/test/resources/SES/VerifyDomainIdentityResponse b/test/resources/SES/VerifyDomainIdentityResponse deleted file mode 100644 index 681df890832..00000000000 --- a/test/resources/SES/VerifyDomainIdentityResponse +++ /dev/null @@ -1,32 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:24:02 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=Wr+6RCfV+QgjLki2dtIrlecMK9+RrsDaTG5uWneDAu8=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 139 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=VerifyDomainIdentity -&Domain=domain.com -&Timestamp=2012-05-12T05%3A24%3A02.000Z -&Version=2010-12-01 - - - - - - - - QTKknzFg2J4ygwa+XvHAxUl1hyHoY0gVfZdfjIedHZ0= - - - 94f6368e-9bf2-11e1-8ee7-c98a0037a2b6 - - - - - diff --git a/test/resources/SES/VerifyEmailAddress b/test/resources/SES/VerifyEmailAddress deleted file mode 100644 index fe9b120a462..00000000000 --- a/test/resources/SES/VerifyEmailAddress +++ /dev/null @@ -1,28 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:28:27 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=o9NK68jraFg5BnaTQiQhpxj2x1dGONOEFHHgsM6o5as=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 132 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=VerifyEmailAddress -&EmailAddress=user%40example.com -&Timestamp=2011-08-18T22%3A28%3A27.000Z - - - - - - - - 8edd7eb2-c864-11e0-9f8f-3da8fc215a7e - - - - - diff --git a/test/resources/SES/VerifyEmailAddressResponse b/test/resources/SES/VerifyEmailAddressResponse deleted file mode 100644 index fe9b120a462..00000000000 --- a/test/resources/SES/VerifyEmailAddressResponse +++ /dev/null @@ -1,28 +0,0 @@ - - -POST / HTTP/1.1 -Date: Thu, 18 Aug 2011 22:28:27 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=o9NK68jraFg5BnaTQiQhpxj2x1dGONOEFHHgsM6o5as=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 132 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=VerifyEmailAddress -&EmailAddress=user%40example.com -&Timestamp=2011-08-18T22%3A28%3A27.000Z - - - - - - - - 8edd7eb2-c864-11e0-9f8f-3da8fc215a7e - - - - - diff --git a/test/resources/SES/VerifyEmailIdentity b/test/resources/SES/VerifyEmailIdentity deleted file mode 100644 index 64249654c1b..00000000000 --- a/test/resources/SES/VerifyEmailIdentity +++ /dev/null @@ -1,30 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:21:58 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=hQJj2pxypqJHQgU/BW1EZGUiNIYGhkQDf7tI6UgQ2qw=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 151 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=VerifyEmailIdentity -&EmailAddress=user%40domain.com -&Timestamp=2012-05-12T05%3A21%3A58.000Z -&Version=2010-12-01 - - - - - - - - - 47e0ef1a-9bf2-11e1-9279-0100e8cf109a - - - - - diff --git a/test/resources/SES/VerifyEmailIdentityResponse b/test/resources/SES/VerifyEmailIdentityResponse deleted file mode 100644 index 64249654c1b..00000000000 --- a/test/resources/SES/VerifyEmailIdentityResponse +++ /dev/null @@ -1,30 +0,0 @@ - - -POST / HTTP/1.1 -Date: Sat, 12 May 2012 05:21:58 GMT -Host: email.us-east-1.amazonaws.com -Content-Type: application/x-www-form-urlencoded -X-Amzn-Authorization: AWS3 AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE, - Signature=hQJj2pxypqJHQgU/BW1EZGUiNIYGhkQDf7tI6UgQ2qw=, - Algorithm=HmacSHA256, SignedHeaders=Date;Host -Content-Length: 151 - -AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Action=VerifyEmailIdentity -&EmailAddress=user%40domain.com -&Timestamp=2012-05-12T05%3A21%3A58.000Z -&Version=2010-12-01 - - - - - - - - - 47e0ef1a-9bf2-11e1-9279-0100e8cf109a - - - - - diff --git a/test/resources/SNS/AddPermission b/test/resources/SNS/AddPermission deleted file mode 100644 index 9edaf3618ef..00000000000 --- a/test/resources/SNS/AddPermission +++ /dev/null @@ -1,28 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Test - &ActionName.member.1=Publish - &ActionName.member.2=GetTopicAttributes - &Label=NewPermission - &AWSAccountId.member.1=987654321000 - &AWSAccountId.member.2=876543210000 - &Action=AddPermission - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=k%2FAU%2FKp13pjndwJ7rr1sZszy6MZMlOhRBCHx1ZaZFiw%3D - - - - - - - - 6a213e4e-33a8-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/AddPermissionResponse b/test/resources/SNS/AddPermissionResponse deleted file mode 100644 index 9edaf3618ef..00000000000 --- a/test/resources/SNS/AddPermissionResponse +++ /dev/null @@ -1,28 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Test - &ActionName.member.1=Publish - &ActionName.member.2=GetTopicAttributes - &Label=NewPermission - &AWSAccountId.member.1=987654321000 - &AWSAccountId.member.2=876543210000 - &Action=AddPermission - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=k%2FAU%2FKp13pjndwJ7rr1sZszy6MZMlOhRBCHx1ZaZFiw%3D - - - - - - - - 6a213e4e-33a8-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/ConfirmSubscription b/test/resources/SNS/ConfirmSubscription deleted file mode 100644 index 7491d308eee..00000000000 --- a/test/resources/SNS/ConfirmSubscription +++ /dev/null @@ -1,27 +0,0 @@ - - - https://sns.us-east-1.amazonaws.com/ - ?Action=ConfirmSubscription - &TopicArn=arn:aws:sns:us-east-1:123456789012:My-Topic - &Token=51b2ff3edb475b7d91550e0ab6edf0c1de2a34e6ebaf6 - c2262a001bcb7e051c43aa00022ceecce70bd2a67b2042da8d8 - eb47fef7a4e4e942d23e7fa56146b9ee35da040b4b8af564cc4 - 184a7391c834cb75d75c22981f776ad1ce8805e9bab29da2329 - 985337bb8095627907b46c8577c8440556b6f86582a95475802 - 6f41fc62041c4b3f67b0f5921232b5dae5aaca1 - - - - - - - - arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca - - - 7a50221f-3774-11df-a9b7-05d48da6f042 - - - - - diff --git a/test/resources/SNS/ConfirmSubscriptionResponse b/test/resources/SNS/ConfirmSubscriptionResponse deleted file mode 100644 index 7491d308eee..00000000000 --- a/test/resources/SNS/ConfirmSubscriptionResponse +++ /dev/null @@ -1,27 +0,0 @@ - - - https://sns.us-east-1.amazonaws.com/ - ?Action=ConfirmSubscription - &TopicArn=arn:aws:sns:us-east-1:123456789012:My-Topic - &Token=51b2ff3edb475b7d91550e0ab6edf0c1de2a34e6ebaf6 - c2262a001bcb7e051c43aa00022ceecce70bd2a67b2042da8d8 - eb47fef7a4e4e942d23e7fa56146b9ee35da040b4b8af564cc4 - 184a7391c834cb75d75c22981f776ad1ce8805e9bab29da2329 - 985337bb8095627907b46c8577c8440556b6f86582a95475802 - 6f41fc62041c4b3f67b0f5921232b5dae5aaca1 - - - - - - - - arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca - - - 7a50221f-3774-11df-a9b7-05d48da6f042 - - - - - diff --git a/test/resources/SNS/CreatePlatformApplication b/test/resources/SNS/CreatePlatformApplication deleted file mode 100644 index 2a0bc02fddf..00000000000 --- a/test/resources/SNS/CreatePlatformApplication +++ /dev/null @@ -1,35 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Attributes.entry.2.key=PlatformPrincipal -&SignatureMethod=HmacSHA256 -&Attributes.entry.1.value=AIzaSyClE2lcV2zEKTLYYo645zfk2jhQPFeyxDo -&Attributes.entry.2.value=There+is+no+principal+for+GCM -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Signature=82sHzg1Wfbgisw3i%2BHA2OgBmRktsqUKFinknkq3u%2FQ4%3D -&Timestamp=2013-07-01T15%3A49%3A50.354Z -&Name=gcmpushapp -&Attributes.entry.1.key=PlatformCredential -&Action=CreatePlatformApplication -&Version=2010-03-31 -&SignatureVersion=2 -&Platform=GCM - - - - - -HTTP/1.1 200 OK -... - - - arn:aws:sns:us-west-2:123456789012:app/GCM/gcmpushapp - - - b6f0e78b-e9d4-5a0e-b973-adc04e8a4ff9 - - - - - diff --git a/test/resources/SNS/CreatePlatformApplicationResponse b/test/resources/SNS/CreatePlatformApplicationResponse deleted file mode 100644 index 2a0bc02fddf..00000000000 --- a/test/resources/SNS/CreatePlatformApplicationResponse +++ /dev/null @@ -1,35 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Attributes.entry.2.key=PlatformPrincipal -&SignatureMethod=HmacSHA256 -&Attributes.entry.1.value=AIzaSyClE2lcV2zEKTLYYo645zfk2jhQPFeyxDo -&Attributes.entry.2.value=There+is+no+principal+for+GCM -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Signature=82sHzg1Wfbgisw3i%2BHA2OgBmRktsqUKFinknkq3u%2FQ4%3D -&Timestamp=2013-07-01T15%3A49%3A50.354Z -&Name=gcmpushapp -&Attributes.entry.1.key=PlatformCredential -&Action=CreatePlatformApplication -&Version=2010-03-31 -&SignatureVersion=2 -&Platform=GCM - - - - - -HTTP/1.1 200 OK -... - - - arn:aws:sns:us-west-2:123456789012:app/GCM/gcmpushapp - - - b6f0e78b-e9d4-5a0e-b973-adc04e8a4ff9 - - - - - diff --git a/test/resources/SNS/CreatePlatformEndpoint b/test/resources/SNS/CreatePlatformEndpoint deleted file mode 100644 index e98c67092f9..00000000000 --- a/test/resources/SNS/CreatePlatformEndpoint +++ /dev/null @@ -1,32 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=CreatePlatformEndpoint -&SignatureMethod=HmacSHA256 -&CustomUserData=UserId%3D27576823 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Token=APA91bGi7fFachkC1xjlqT66VYEucGHochmf1VQAr9k...jsM0PKPxKhddCzx6paEsyay9Zn3D4wNUJb8m6HZrBEXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=Rg5vXBS6OfgPtWkt1u32p1w14uiGh%2BKOicvXNWTEz2w%3D -&Timestamp=2013-07-01T15%3A49%3A50.598Z - - - - - -HTTP/1.1 200 OK -... - - - arn:aws:sns:us-west-2:123456789012:endpoint/GCM/gcmpushapp/5e3e9847-3183-3f18-a7e8-671c3a57d4b3 - - - 6613341d-3e15-53f7-bf3c-7e56994ba278 - - - - - diff --git a/test/resources/SNS/CreatePlatformEndpointResponse b/test/resources/SNS/CreatePlatformEndpointResponse deleted file mode 100644 index e98c67092f9..00000000000 --- a/test/resources/SNS/CreatePlatformEndpointResponse +++ /dev/null @@ -1,32 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=CreatePlatformEndpoint -&SignatureMethod=HmacSHA256 -&CustomUserData=UserId%3D27576823 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&Token=APA91bGi7fFachkC1xjlqT66VYEucGHochmf1VQAr9k...jsM0PKPxKhddCzx6paEsyay9Zn3D4wNUJb8m6HZrBEXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=Rg5vXBS6OfgPtWkt1u32p1w14uiGh%2BKOicvXNWTEz2w%3D -&Timestamp=2013-07-01T15%3A49%3A50.598Z - - - - - -HTTP/1.1 200 OK -... - - - arn:aws:sns:us-west-2:123456789012:endpoint/GCM/gcmpushapp/5e3e9847-3183-3f18-a7e8-671c3a57d4b3 - - - 6613341d-3e15-53f7-bf3c-7e56994ba278 - - - - - diff --git a/test/resources/SNS/CreateTopic b/test/resources/SNS/CreateTopic deleted file mode 100644 index afebe68407d..00000000000 --- a/test/resources/SNS/CreateTopic +++ /dev/null @@ -1,26 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?Name=My-Topic - &Action=CreateTopic - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=gfzIF53exFVdpSNb8AiwN3Lv%2FNYXh6S%2Br3yySK70oX4%3D - - - - - - - - arn:aws:sns:us-east-1:123456789012:My-Topic - - - a8dec8b3-33a4-11df-8963-01868b7c937a - - - - - diff --git a/test/resources/SNS/CreateTopicResponse b/test/resources/SNS/CreateTopicResponse deleted file mode 100644 index afebe68407d..00000000000 --- a/test/resources/SNS/CreateTopicResponse +++ /dev/null @@ -1,26 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?Name=My-Topic - &Action=CreateTopic - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=gfzIF53exFVdpSNb8AiwN3Lv%2FNYXh6S%2Br3yySK70oX4%3D - - - - - - - - arn:aws:sns:us-east-1:123456789012:My-Topic - - - a8dec8b3-33a4-11df-8963-01868b7c937a - - - - - diff --git a/test/resources/SNS/DeleteEndpoint b/test/resources/SNS/DeleteEndpoint deleted file mode 100644 index 6d82aac3742..00000000000 --- a/test/resources/SNS/DeleteEndpoint +++ /dev/null @@ -1,27 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Action=DeleteEndpoint -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&EndpointArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aendpoint%2FGCM%2Fgcmpushapp%2F5e3e9847-3183-3f18-a7e8-671c3a57d4b3 -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=LIc6GI3JbNhmHBEDmSxzZp648XPe5CMeFny%2BTQFtomQ%3D -&Timestamp=2013-07-01T23%3A00%3A12.456Z - - - - - -HTTP/1.1 200 OK -... - - - c1d2b191-353c-5a5f-8969-fbdd3900afa8 - - - - - diff --git a/test/resources/SNS/DeleteEndpointResponse b/test/resources/SNS/DeleteEndpointResponse deleted file mode 100644 index 6d82aac3742..00000000000 --- a/test/resources/SNS/DeleteEndpointResponse +++ /dev/null @@ -1,27 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Action=DeleteEndpoint -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&EndpointArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aendpoint%2FGCM%2Fgcmpushapp%2F5e3e9847-3183-3f18-a7e8-671c3a57d4b3 -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=LIc6GI3JbNhmHBEDmSxzZp648XPe5CMeFny%2BTQFtomQ%3D -&Timestamp=2013-07-01T23%3A00%3A12.456Z - - - - - -HTTP/1.1 200 OK -... - - - c1d2b191-353c-5a5f-8969-fbdd3900afa8 - - - - - diff --git a/test/resources/SNS/DeletePlatformApplication b/test/resources/SNS/DeletePlatformApplication deleted file mode 100644 index dd73f1aca7f..00000000000 --- a/test/resources/SNS/DeletePlatformApplication +++ /dev/null @@ -1,27 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=DeletePlatformApplication -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=Mh7X%2BQo%2BGpcm5B1IpkovBaRiJCJOqvFlIOYzL62SGrg%3D -&Timestamp=2013-07-01T23%3A02%3A03.872Z - - - - - -HTTP/1.1 200 OK -... - - - 097dac18-7a77-5823-a8dd-e65476dcb037 - - - - - diff --git a/test/resources/SNS/DeletePlatformApplicationResponse b/test/resources/SNS/DeletePlatformApplicationResponse deleted file mode 100644 index dd73f1aca7f..00000000000 --- a/test/resources/SNS/DeletePlatformApplicationResponse +++ /dev/null @@ -1,27 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=DeletePlatformApplication -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=Mh7X%2BQo%2BGpcm5B1IpkovBaRiJCJOqvFlIOYzL62SGrg%3D -&Timestamp=2013-07-01T23%3A02%3A03.872Z - - - - - -HTTP/1.1 200 OK -... - - - 097dac18-7a77-5823-a8dd-e65476dcb037 - - - - - diff --git a/test/resources/SNS/DeleteTopic b/test/resources/SNS/DeleteTopic deleted file mode 100644 index aab4df3f7c5..00000000000 --- a/test/resources/SNS/DeleteTopic +++ /dev/null @@ -1,21 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - &TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &Action=DeleteTopic - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=mQA3nJI%2BcmAIY7r8HCArGElSqPX5JG4UGzF4yo0RygE%3D - - - - - - - f3aa9ac9-3c3d-11df-8235-9dab105e9c32 - - - - diff --git a/test/resources/SNS/DeleteTopicResponse b/test/resources/SNS/DeleteTopicResponse deleted file mode 100644 index aab4df3f7c5..00000000000 --- a/test/resources/SNS/DeleteTopicResponse +++ /dev/null @@ -1,21 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - &TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &Action=DeleteTopic - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=mQA3nJI%2BcmAIY7r8HCArGElSqPX5JG4UGzF4yo0RygE%3D - - - - - - - f3aa9ac9-3c3d-11df-8235-9dab105e9c32 - - - - diff --git a/test/resources/SNS/GetEndpointAttributes b/test/resources/SNS/GetEndpointAttributes deleted file mode 100644 index e6356451cc5..00000000000 --- a/test/resources/SNS/GetEndpointAttributes +++ /dev/null @@ -1,43 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Action=GetEndpointAttributes -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&EndpointArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aendpoint%2FGCM%2Fgcmpushapp%2F5e3e9847-3183-3f18-a7e8-671c3a57d4b3 -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=%2B2egbEoT4npw3p5H3wiIdzZBoTn4KI3UWmMFyBsHH9c%3D -&Timestamp=2013-07-01T22%3A44%3A56.515Z - - - - - -HTTP/1.1 200 OK -... - - - - - Enabled - true - - - CustomUserData - UserId=01234567 - - - Token - APA91bGi7fFachkC1xjlqT66VYEucGHochmf1VQAr9k...jsM0PKPxKhddCzx6paEsyay9Zn3D4wNUJb8m6HZrBEXAMPLE - - - - - 6c725a19-a142-5b77-94f9-1055a9ea04e7 - - - - - diff --git a/test/resources/SNS/GetEndpointAttributesResponse b/test/resources/SNS/GetEndpointAttributesResponse deleted file mode 100644 index e6356451cc5..00000000000 --- a/test/resources/SNS/GetEndpointAttributesResponse +++ /dev/null @@ -1,43 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Action=GetEndpointAttributes -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&EndpointArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aendpoint%2FGCM%2Fgcmpushapp%2F5e3e9847-3183-3f18-a7e8-671c3a57d4b3 -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=%2B2egbEoT4npw3p5H3wiIdzZBoTn4KI3UWmMFyBsHH9c%3D -&Timestamp=2013-07-01T22%3A44%3A56.515Z - - - - - -HTTP/1.1 200 OK -... - - - - - Enabled - true - - - CustomUserData - UserId=01234567 - - - Token - APA91bGi7fFachkC1xjlqT66VYEucGHochmf1VQAr9k...jsM0PKPxKhddCzx6paEsyay9Zn3D4wNUJb8m6HZrBEXAMPLE - - - - - 6c725a19-a142-5b77-94f9-1055a9ea04e7 - - - - - diff --git a/test/resources/SNS/GetPlatformApplicationAttributes b/test/resources/SNS/GetPlatformApplicationAttributes deleted file mode 100644 index 363b217cd97..00000000000 --- a/test/resources/SNS/GetPlatformApplicationAttributes +++ /dev/null @@ -1,35 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=GetPlatformApplicationAttributes -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=UGMaCq8CCJGSYXO9Ehr2VuHIBYSe6WbxkqgMKRslTK4%3D -&Timestamp=2013-07-01T22%3A40%3A50.643Z - - - - - -HTTP/1.1 200 OK -... - - - - - AllowEndpointPolicies - false - - - - - 74848df2-87f6-55ed-890c-c7be80442462 - - - - - diff --git a/test/resources/SNS/GetPlatformApplicationAttributesResponse b/test/resources/SNS/GetPlatformApplicationAttributesResponse deleted file mode 100644 index 363b217cd97..00000000000 --- a/test/resources/SNS/GetPlatformApplicationAttributesResponse +++ /dev/null @@ -1,35 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=GetPlatformApplicationAttributes -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=UGMaCq8CCJGSYXO9Ehr2VuHIBYSe6WbxkqgMKRslTK4%3D -&Timestamp=2013-07-01T22%3A40%3A50.643Z - - - - - -HTTP/1.1 200 OK -... - - - - - AllowEndpointPolicies - false - - - - - 74848df2-87f6-55ed-890c-c7be80442462 - - - - - diff --git a/test/resources/SNS/GetSubscriptionAttributes b/test/resources/SNS/GetSubscriptionAttributes deleted file mode 100644 index e7507ee222b..00000000000 --- a/test/resources/SNS/GetSubscriptionAttributes +++ /dev/null @@ -1,39 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?SubscriptionArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic%3A80289ba6-0fd4-4079-afb4-ce8c8260f0ca - &Action=GetSubscriptionAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=92lBGRVq0%2BxhaACaBGqtdemy%2Bi9isfgyTljCbJM80Yk%3D - - - - - - - - - - Owner - 123456789012 - - - DeliveryPolicy - {"healthyRetryPolicy":{"numRetries":10}} - - - SubscriptionArn - arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca - - - - - 057f074c-33a7-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/GetSubscriptionAttributesResponse b/test/resources/SNS/GetSubscriptionAttributesResponse deleted file mode 100644 index e7507ee222b..00000000000 --- a/test/resources/SNS/GetSubscriptionAttributesResponse +++ /dev/null @@ -1,39 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?SubscriptionArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic%3A80289ba6-0fd4-4079-afb4-ce8c8260f0ca - &Action=GetSubscriptionAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=92lBGRVq0%2BxhaACaBGqtdemy%2Bi9isfgyTljCbJM80Yk%3D - - - - - - - - - - Owner - 123456789012 - - - DeliveryPolicy - {"healthyRetryPolicy":{"numRetries":10}} - - - SubscriptionArn - arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca - - - - - 057f074c-33a7-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/GetTopicAttributes b/test/resources/SNS/GetTopicAttributes deleted file mode 100644 index 2379473ce79..00000000000 --- a/test/resources/SNS/GetTopicAttributes +++ /dev/null @@ -1,40 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &Action=GetTopicAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=92lBGRVq0%2BxhaACaBGqtdemy%2Bi9isfgyTljCbJM80Yk%3D - - - - - - - - - - Owner - 123456789012 - - - Policy - { -"Version":"2008-10-17","Id":"us-east-1/698519295917/test__default_policy_ID","Statement" : [{"Effect":"Allow","Sid":"us-east-1/698519295917/test__default_statement_ID","Principal" : {"AWS": "*"},"Action":["SNS:GetTopicAttributes","SNS:SetTopicAttributes","SNS:AddPermission","SNS:RemovePermission","SNS:DeleteTopic","SNS:Subscribe","SNS:ListSubscriptionsByTopic","SNS:Publish","SNS:Receive"],"Resource":"arn:aws:sns:us-east-1:698519295917:test","Condition" : {"StringLike" : {"AWS:SourceArn": "arn:aws:*:*:698519295917:*"}}}]} - - - TopicArn - arn:aws:sns:us-east-1:123456789012:My-Topic - - - - - 057f074c-33a7-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/GetTopicAttributesResponse b/test/resources/SNS/GetTopicAttributesResponse deleted file mode 100644 index 2379473ce79..00000000000 --- a/test/resources/SNS/GetTopicAttributesResponse +++ /dev/null @@ -1,40 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &Action=GetTopicAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=92lBGRVq0%2BxhaACaBGqtdemy%2Bi9isfgyTljCbJM80Yk%3D - - - - - - - - - - Owner - 123456789012 - - - Policy - { -"Version":"2008-10-17","Id":"us-east-1/698519295917/test__default_policy_ID","Statement" : [{"Effect":"Allow","Sid":"us-east-1/698519295917/test__default_statement_ID","Principal" : {"AWS": "*"},"Action":["SNS:GetTopicAttributes","SNS:SetTopicAttributes","SNS:AddPermission","SNS:RemovePermission","SNS:DeleteTopic","SNS:Subscribe","SNS:ListSubscriptionsByTopic","SNS:Publish","SNS:Receive"],"Resource":"arn:aws:sns:us-east-1:698519295917:test","Condition" : {"StringLike" : {"AWS:SourceArn": "arn:aws:*:*:698519295917:*"}}}]} - - - TopicArn - arn:aws:sns:us-east-1:123456789012:My-Topic - - - - - 057f074c-33a7-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/ListEndpointsByPlatformApplication b/test/resources/SNS/ListEndpointsByPlatformApplication deleted file mode 100644 index b7205bff2a0..00000000000 --- a/test/resources/SNS/ListEndpointsByPlatformApplication +++ /dev/null @@ -1,48 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=ListEndpointsByPlatformApplication -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=e6H4sJSCRBBlh%2BaigB%2FtYgp4%2Bjl7dikAQ6WKf%2BMTwNM%3D -&Timestamp=2013-07-01T23%3A00%3A52.515Z - - - - - -HTTP/1.1 200 OK -... - - - - - arn:aws:sns:us-west-2:123456789012:endpoint/GCM/gcmpushapp/5e3e9847-3183-3f18-a7e8-671c3a57d4b3 - - - Enabled - true - - - CustomUserData - UserId=27576823 - - - Token - APA91bGi7fFachkC1xjlqT66VYEucGHochmf1VQAr9k...jsM0PKPxKhddCzx6paEsyay9Zn3D4wNUJb8m6HZrBEXAMPLE - - - - - - - 9a48768c-dac8-5a60-aec0-3cc27ea08d96 - - - - - diff --git a/test/resources/SNS/ListEndpointsByPlatformApplicationResponse b/test/resources/SNS/ListEndpointsByPlatformApplicationResponse deleted file mode 100644 index b7205bff2a0..00000000000 --- a/test/resources/SNS/ListEndpointsByPlatformApplicationResponse +++ /dev/null @@ -1,48 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=ListEndpointsByPlatformApplication -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=e6H4sJSCRBBlh%2BaigB%2FtYgp4%2Bjl7dikAQ6WKf%2BMTwNM%3D -&Timestamp=2013-07-01T23%3A00%3A52.515Z - - - - - -HTTP/1.1 200 OK -... - - - - - arn:aws:sns:us-west-2:123456789012:endpoint/GCM/gcmpushapp/5e3e9847-3183-3f18-a7e8-671c3a57d4b3 - - - Enabled - true - - - CustomUserData - UserId=27576823 - - - Token - APA91bGi7fFachkC1xjlqT66VYEucGHochmf1VQAr9k...jsM0PKPxKhddCzx6paEsyay9Zn3D4wNUJb8m6HZrBEXAMPLE - - - - - - - 9a48768c-dac8-5a60-aec0-3cc27ea08d96 - - - - - diff --git a/test/resources/SNS/ListPlatformApplications b/test/resources/SNS/ListPlatformApplications deleted file mode 100644 index 3d6455e95d6..00000000000 --- a/test/resources/SNS/ListPlatformApplications +++ /dev/null @@ -1,48 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Action=ListPlatformApplications -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=drVbTuyR5N9e88WJMNPzBOjNFNvawkCaMfZI0xa9kIQ%3D -&Timestamp=2013-07-01T22%3A33%3A55.618Z - - - - - -HTTP/1.1 200 OK -... - - - - - arn:aws:sns:us-west-2:123456789012:app/APNS_SANDBOX/apnspushapp - - - AllowEndpointPolicies - false - - - - - arn:aws:sns:us-west-2:123456789012:app/GCM/gcmpushapp - - - AllowEndpointPolicies - false - - - - - - - 315a335e-85d8-52df-9349-791283cbb529 - - - - - diff --git a/test/resources/SNS/ListPlatformApplicationsResponse b/test/resources/SNS/ListPlatformApplicationsResponse deleted file mode 100644 index 3d6455e95d6..00000000000 --- a/test/resources/SNS/ListPlatformApplicationsResponse +++ /dev/null @@ -1,48 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Action=ListPlatformApplications -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=drVbTuyR5N9e88WJMNPzBOjNFNvawkCaMfZI0xa9kIQ%3D -&Timestamp=2013-07-01T22%3A33%3A55.618Z - - - - - -HTTP/1.1 200 OK -... - - - - - arn:aws:sns:us-west-2:123456789012:app/APNS_SANDBOX/apnspushapp - - - AllowEndpointPolicies - false - - - - - arn:aws:sns:us-west-2:123456789012:app/GCM/gcmpushapp - - - AllowEndpointPolicies - false - - - - - - - 315a335e-85d8-52df-9349-791283cbb529 - - - - - diff --git a/test/resources/SNS/ListSubscriptions b/test/resources/SNS/ListSubscriptions deleted file mode 100644 index 4413d0a4ed7..00000000000 --- a/test/resources/SNS/ListSubscriptions +++ /dev/null @@ -1,33 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - &Action=ListSubscriptions - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=SZmBxEPqfs9R7xxhSt6C1b7PnOEvg%2BSVyyMYJfLRFCA%3D - - - - - - - - - - arn:aws:sns:us-east-1:698519295917:My-Topic - email - arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca - 123456789012 - example@amazon.com - - - - - 384ac68d-3775-11df-8963-01868b7c937a - - - - - diff --git a/test/resources/SNS/ListSubscriptionsByTopic b/test/resources/SNS/ListSubscriptionsByTopic deleted file mode 100644 index 33ac10c43bf..00000000000 --- a/test/resources/SNS/ListSubscriptionsByTopic +++ /dev/null @@ -1,34 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &Action=ListSubscriptionsByTopic - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=SZmBxEPqfs9R7xxhSt6C1b7PnOEvg%2BSVyyMYJfLRFCA%3D - - - - - - - - - - arn:aws:sns:us-east-1:123456789012:My-Topic - email - arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca - 123456789012 - example@amazon.com - - - - - b9275252-3774-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/ListSubscriptionsByTopicResponse b/test/resources/SNS/ListSubscriptionsByTopicResponse deleted file mode 100644 index 33ac10c43bf..00000000000 --- a/test/resources/SNS/ListSubscriptionsByTopicResponse +++ /dev/null @@ -1,34 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &Action=ListSubscriptionsByTopic - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=SZmBxEPqfs9R7xxhSt6C1b7PnOEvg%2BSVyyMYJfLRFCA%3D - - - - - - - - - - arn:aws:sns:us-east-1:123456789012:My-Topic - email - arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca - 123456789012 - example@amazon.com - - - - - b9275252-3774-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/ListSubscriptionsResponse b/test/resources/SNS/ListSubscriptionsResponse deleted file mode 100644 index 4413d0a4ed7..00000000000 --- a/test/resources/SNS/ListSubscriptionsResponse +++ /dev/null @@ -1,33 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - &Action=ListSubscriptions - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=SZmBxEPqfs9R7xxhSt6C1b7PnOEvg%2BSVyyMYJfLRFCA%3D - - - - - - - - - - arn:aws:sns:us-east-1:698519295917:My-Topic - email - arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca - 123456789012 - example@amazon.com - - - - - 384ac68d-3775-11df-8963-01868b7c937a - - - - - diff --git a/test/resources/SNS/ListTopics b/test/resources/SNS/ListTopics deleted file mode 100644 index 3c2b055d209..00000000000 --- a/test/resources/SNS/ListTopics +++ /dev/null @@ -1,29 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?Action=ListTopics - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=tPg1qKNTNVPydnL3Yx5Fqm2O9GxCr9vh3EF5r9%2F5%2BJs%3D - - - - - - - - - - arn:aws:sns:us-east-1:123456789012:My-Topic - - - - - 3f1478c7-33a9-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/ListTopicsResponse b/test/resources/SNS/ListTopicsResponse deleted file mode 100644 index 3c2b055d209..00000000000 --- a/test/resources/SNS/ListTopicsResponse +++ /dev/null @@ -1,29 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?Action=ListTopics - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=tPg1qKNTNVPydnL3Yx5Fqm2O9GxCr9vh3EF5r9%2F5%2BJs%3D - - - - - - - - - - arn:aws:sns:us-east-1:123456789012:My-Topic - - - - - 3f1478c7-33a9-11df-9540-99d0768312d3 - - - - - diff --git a/test/resources/SNS/Publish b/test/resources/SNS/Publish deleted file mode 100644 index dd72f79e809..00000000000 --- a/test/resources/SNS/Publish +++ /dev/null @@ -1,70 +0,0 @@ - - - The following example publishes the same message to all protocols: - - http://sns.us-east-1.amazonaws.com/ - ?Subject=My%20first%20message - &TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A698519295917%3AMy-Topic - &Message=Hello%20world%21 - &Action=Publish - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE - &Signature=9GZysQ4Jpnz%2BHklqM7VFTvEcjR2LIUtn6jW47054xxE%3D - - Use the following JSON object format for the Message parameter to send different messages to each protocol (linebreaks added for readability): - { - "default" : "some message", - "email" : "some email message", - "email-json" : "some email-json message", - "http" : "some http message", - "https" : "some https message", - "sqs" : "some sqs message" - } - - - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Action=Publish -&Message=%7B%22default%22%3A%22This+is+the+default+Message%22%2C%22APNS_SANDBOX%22%3A%22%7B+%5C%22aps%5C%22+%3A+%7B+%5C%22alert%5C%22+%3A+%5C%22You+have+got+email.%5C%22%2C+%5C%22badge%5C%22+%3A+9%2C%5C%22sound%5C%22+%3A%5C%22default%5C%22%7D%7D%22%7D -&TargetArn=arn%3Aaws%3Asns%3Aus-west-2%3A803981987763%3Aendpoint%2FAPNS_SANDBOX%2Fpushapp%2F98e9ced9-f136-3893-9d60-776547eafebb -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=vmqc4XRupKAxsDAdN4j4Ayw5LQljXMps3kss4bkDfCk%3D -&Timestamp=2013-07-18T22%3A44%3A09.452Z -&MessageStructure=json - - - - - - - - - 94f20ce6-13c5-43a0-9a9e-ca52d816e90b - - - f187a3c1-376f-11df-8963-01868b7c937a - - - - - -HTTP/1.1 200 OK -... - - - 567910cd-659e-55d4-8ccb-5aaf14679dc0 - - - d74b8436-ae13-5ab4-a9ff-ce54dfea72a0 - - - - - diff --git a/test/resources/SNS/PublishResponse b/test/resources/SNS/PublishResponse deleted file mode 100644 index dd72f79e809..00000000000 --- a/test/resources/SNS/PublishResponse +++ /dev/null @@ -1,70 +0,0 @@ - - - The following example publishes the same message to all protocols: - - http://sns.us-east-1.amazonaws.com/ - ?Subject=My%20first%20message - &TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A698519295917%3AMy-Topic - &Message=Hello%20world%21 - &Action=Publish - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE - &Signature=9GZysQ4Jpnz%2BHklqM7VFTvEcjR2LIUtn6jW47054xxE%3D - - Use the following JSON object format for the Message parameter to send different messages to each protocol (linebreaks added for readability): - { - "default" : "some message", - "email" : "some email message", - "email-json" : "some email-json message", - "http" : "some http message", - "https" : "some https message", - "sqs" : "some sqs message" - } - - - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Action=Publish -&Message=%7B%22default%22%3A%22This+is+the+default+Message%22%2C%22APNS_SANDBOX%22%3A%22%7B+%5C%22aps%5C%22+%3A+%7B+%5C%22alert%5C%22+%3A+%5C%22You+have+got+email.%5C%22%2C+%5C%22badge%5C%22+%3A+9%2C%5C%22sound%5C%22+%3A%5C%22default%5C%22%7D%7D%22%7D -&TargetArn=arn%3Aaws%3Asns%3Aus-west-2%3A803981987763%3Aendpoint%2FAPNS_SANDBOX%2Fpushapp%2F98e9ced9-f136-3893-9d60-776547eafebb -&SignatureMethod=HmacSHA256 -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=vmqc4XRupKAxsDAdN4j4Ayw5LQljXMps3kss4bkDfCk%3D -&Timestamp=2013-07-18T22%3A44%3A09.452Z -&MessageStructure=json - - - - - - - - - 94f20ce6-13c5-43a0-9a9e-ca52d816e90b - - - f187a3c1-376f-11df-8963-01868b7c937a - - - - - -HTTP/1.1 200 OK -... - - - 567910cd-659e-55d4-8ccb-5aaf14679dc0 - - - d74b8436-ae13-5ab4-a9ff-ce54dfea72a0 - - - - - diff --git a/test/resources/SNS/RemovePermission b/test/resources/SNS/RemovePermission deleted file mode 100644 index a925c8609e4..00000000000 --- a/test/resources/SNS/RemovePermission +++ /dev/null @@ -1,24 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Test - &Label=NewPermission - &Action=RemovePermission - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=N1abwRY9i7zaSQmbAlm71pPf9EEFOqNbQL1alzw2yCg%3D - - - - - - - - d170b150-33a8-11df-995a-2d6fbe836cc1 - - - - - diff --git a/test/resources/SNS/RemovePermissionResponse b/test/resources/SNS/RemovePermissionResponse deleted file mode 100644 index a925c8609e4..00000000000 --- a/test/resources/SNS/RemovePermissionResponse +++ /dev/null @@ -1,24 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Test - &Label=NewPermission - &Action=RemovePermission - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=N1abwRY9i7zaSQmbAlm71pPf9EEFOqNbQL1alzw2yCg%3D - - - - - - - - d170b150-33a8-11df-995a-2d6fbe836cc1 - - - - - diff --git a/test/resources/SNS/SetEndpointAttributes b/test/resources/SNS/SetEndpointAttributes deleted file mode 100644 index c6ae88932e6..00000000000 --- a/test/resources/SNS/SetEndpointAttributes +++ /dev/null @@ -1,29 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Attributes.entry.1.key=CustomUserData -&Action=SetEndpointAttributes -&SignatureMethod=HmacSHA256 -&Attributes.entry.1.value=My+custom+userdata -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&EndpointArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aendpoint%2FGCM%2Fgcmpushapp%2F5e3e9847-3183-3f18-a7e8-671c3a57d4b3 -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=CFTGfGOS5vgSU3%2FZgv2h%2FJdWgr2JQdDJSrUU9k38wSM%3D -&Timestamp=2013-07-01T22%3A56%3A45.582Z - - - - - -HTTP/1.1 200 OK -... - - - 2fe0bfc7-3e85-5ee5-a9e2-f58b35e85f6a - - - - - diff --git a/test/resources/SNS/SetEndpointAttributesResponse b/test/resources/SNS/SetEndpointAttributesResponse deleted file mode 100644 index c6ae88932e6..00000000000 --- a/test/resources/SNS/SetEndpointAttributesResponse +++ /dev/null @@ -1,29 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Attributes.entry.1.key=CustomUserData -&Action=SetEndpointAttributes -&SignatureMethod=HmacSHA256 -&Attributes.entry.1.value=My+custom+userdata -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&EndpointArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aendpoint%2FGCM%2Fgcmpushapp%2F5e3e9847-3183-3f18-a7e8-671c3a57d4b3 -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=CFTGfGOS5vgSU3%2FZgv2h%2FJdWgr2JQdDJSrUU9k38wSM%3D -&Timestamp=2013-07-01T22%3A56%3A45.582Z - - - - - -HTTP/1.1 200 OK -... - - - 2fe0bfc7-3e85-5ee5-a9e2-f58b35e85f6a - - - - - diff --git a/test/resources/SNS/SetPlatformApplicationAttributes b/test/resources/SNS/SetPlatformApplicationAttributes deleted file mode 100644 index 17ad0f78661..00000000000 --- a/test/resources/SNS/SetPlatformApplicationAttributes +++ /dev/null @@ -1,28 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Attributes.entry.1.key=EventEndpointCreated&PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=SetPlatformApplicationAttributes -&SignatureMethod=HmacSHA256 -&Attributes.entry.1.value=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Atopicarn -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=06L2TsW3jiH%2FGKDYuT8w4NojSrTf4Ig2GKqGeJPhPT4%3D -&Timestamp=2013-07-01T22%3A53%3A17.800Z - - - - - -HTTP/1.1 200 OK -... - - - cf577bcc-b3dc-5463-88f1-3180b9412395 - - - - - diff --git a/test/resources/SNS/SetPlatformApplicationAttributesResponse b/test/resources/SNS/SetPlatformApplicationAttributesResponse deleted file mode 100644 index 17ad0f78661..00000000000 --- a/test/resources/SNS/SetPlatformApplicationAttributesResponse +++ /dev/null @@ -1,28 +0,0 @@ - - -POST http://sns.us-west-2.amazonaws.com/ HTTP/1.1 -... -Attributes.entry.1.key=EventEndpointCreated&PlatformApplicationArn=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Aapp%2FGCM%2Fgcmpushapp -&Action=SetPlatformApplicationAttributes -&SignatureMethod=HmacSHA256 -&Attributes.entry.1.value=arn%3Aaws%3Asns%3Aus-west-2%3A123456789012%3Atopicarn -&AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE -&SignatureVersion=2 -&Version=2010-03-31 -&Signature=06L2TsW3jiH%2FGKDYuT8w4NojSrTf4Ig2GKqGeJPhPT4%3D -&Timestamp=2013-07-01T22%3A53%3A17.800Z - - - - - -HTTP/1.1 200 OK -... - - - cf577bcc-b3dc-5463-88f1-3180b9412395 - - - - - diff --git a/test/resources/SNS/SetSubscriptionAttributes b/test/resources/SNS/SetSubscriptionAttributes deleted file mode 100644 index c69b0ff1dab..00000000000 --- a/test/resources/SNS/SetSubscriptionAttributes +++ /dev/null @@ -1,42 +0,0 @@ - - -The following example sets the delivery policy to 5 total retries - - http://sns.us-east-1.amazonaws.com/ - ?AttributeValue={"healthyRetryPolicy":{"numRetries":5}} - &SubscriptionArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic%3A80289ba6-0fd4-4079-afb4-ce8c8260f0ca - &AttributeName=DeliveryPolicy - &Action=SetSubscriptionAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=mQA3nJI%2BcmAIY7r8HCArGElSqPX5JG4UGzF4yo0RygE%3D - -The JSON format for the DeliveryPolicy AttributeValue (linebreaks added for readability): -{ - "healthyRetryPolicy": - { - "minDelayTarget": , - "maxDelayTarget": , - "numRetries": , - "numMaxDelayRetries": , - "backoffFunction": "" - }, - "throttlePolicy": - { - "maxReceivesPerSecond": - } -} - - - - - - - a8763b99-33a7-11df-a9b7-05d48da6f042 - - - - - diff --git a/test/resources/SNS/SetSubscriptionAttributesResponse b/test/resources/SNS/SetSubscriptionAttributesResponse deleted file mode 100644 index c69b0ff1dab..00000000000 --- a/test/resources/SNS/SetSubscriptionAttributesResponse +++ /dev/null @@ -1,42 +0,0 @@ - - -The following example sets the delivery policy to 5 total retries - - http://sns.us-east-1.amazonaws.com/ - ?AttributeValue={"healthyRetryPolicy":{"numRetries":5}} - &SubscriptionArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic%3A80289ba6-0fd4-4079-afb4-ce8c8260f0ca - &AttributeName=DeliveryPolicy - &Action=SetSubscriptionAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=mQA3nJI%2BcmAIY7r8HCArGElSqPX5JG4UGzF4yo0RygE%3D - -The JSON format for the DeliveryPolicy AttributeValue (linebreaks added for readability): -{ - "healthyRetryPolicy": - { - "minDelayTarget": , - "maxDelayTarget": , - "numRetries": , - "numMaxDelayRetries": , - "backoffFunction": "" - }, - "throttlePolicy": - { - "maxReceivesPerSecond": - } -} - - - - - - - a8763b99-33a7-11df-a9b7-05d48da6f042 - - - - - diff --git a/test/resources/SNS/SetTopicAttributes b/test/resources/SNS/SetTopicAttributes deleted file mode 100644 index 972566330fe..00000000000 --- a/test/resources/SNS/SetTopicAttributes +++ /dev/null @@ -1,56 +0,0 @@ - -The following example sets the DisplayName attribute to MyTopicName - - http://sns.us-east-1.amazonaws.com/ - ?AttributeValue=MyTopicName - &TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &AttributeName=DisplayName - &Action=SetTopicAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=mQA3nJI%2BcmAIY7r8HCArGElSqPX5JG4UGzF4yo0RygE%3D - -The following example sets the delivery policy to 5 total retries - - http://sns.us-east-1.amazonaws.com/ - ?AttributeValue={"http":{"defaultHealthyRetryPolicy":{"numRetries":5}}} - &TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &AttributeName=DeliveryPolicy - &Action=SetTopicAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=mQA3nJI%2BcmAIY7r8HCArGElSqPX5JG4UGzF4yo0RygE%3D - -The JSON format for the DeliveryPolicy AttributeValue (linebreaks added for readability): -{ - "http": { - "defaultHealthyRetryPolicy": - { - "minDelayTarget": , - "maxDelayTarget": , - "numRetries": , - "numMaxDelayRetries": , - "backoffFunction": "" - }, - "disableSubscriptionOverrides": , - "defaultThrottlePolicy": - { - "maxReceivesPerSecond": - } - } - - - - - - - a8763b99-33a7-11df-a9b7-05d48da6f042 - - - - - diff --git a/test/resources/SNS/SetTopicAttributesResponse b/test/resources/SNS/SetTopicAttributesResponse deleted file mode 100644 index 972566330fe..00000000000 --- a/test/resources/SNS/SetTopicAttributesResponse +++ /dev/null @@ -1,56 +0,0 @@ - -The following example sets the DisplayName attribute to MyTopicName - - http://sns.us-east-1.amazonaws.com/ - ?AttributeValue=MyTopicName - &TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &AttributeName=DisplayName - &Action=SetTopicAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=mQA3nJI%2BcmAIY7r8HCArGElSqPX5JG4UGzF4yo0RygE%3D - -The following example sets the delivery policy to 5 total retries - - http://sns.us-east-1.amazonaws.com/ - ?AttributeValue={"http":{"defaultHealthyRetryPolicy":{"numRetries":5}}} - &TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &AttributeName=DeliveryPolicy - &Action=SetTopicAttributes - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key Id) - &Signature=mQA3nJI%2BcmAIY7r8HCArGElSqPX5JG4UGzF4yo0RygE%3D - -The JSON format for the DeliveryPolicy AttributeValue (linebreaks added for readability): -{ - "http": { - "defaultHealthyRetryPolicy": - { - "minDelayTarget": , - "maxDelayTarget": , - "numRetries": , - "numMaxDelayRetries": , - "backoffFunction": "" - }, - "disableSubscriptionOverrides": , - "defaultThrottlePolicy": - { - "maxReceivesPerSecond": - } - } - - - - - - - a8763b99-33a7-11df-a9b7-05d48da6f042 - - - - - diff --git a/test/resources/SNS/Subscribe b/test/resources/SNS/Subscribe deleted file mode 100644 index a17ea9820c5..00000000000 --- a/test/resources/SNS/Subscribe +++ /dev/null @@ -1,28 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &Endpoint=example%40amazon.com - &Protocol=email - &Action=Subscribe - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=1%2FeGaDphxXq%2Fa89x6HvKh%2Fc1yLGXzuhS7vS2MslToDM%3D - - - - - - - - pending confirmation - - - a169c740-3766-11df-8963-01868b7c937a - - - - - diff --git a/test/resources/SNS/SubscribeResponse b/test/resources/SNS/SubscribeResponse deleted file mode 100644 index a17ea9820c5..00000000000 --- a/test/resources/SNS/SubscribeResponse +++ /dev/null @@ -1,28 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?TopicArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic - &Endpoint=example%40amazon.com - &Protocol=email - &Action=Subscribe - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=1%2FeGaDphxXq%2Fa89x6HvKh%2Fc1yLGXzuhS7vS2MslToDM%3D - - - - - - - - pending confirmation - - - a169c740-3766-11df-8963-01868b7c937a - - - - - diff --git a/test/resources/SNS/Unsubscribe b/test/resources/SNS/Unsubscribe deleted file mode 100644 index cd57ca448df..00000000000 --- a/test/resources/SNS/Unsubscribe +++ /dev/null @@ -1,23 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?SubscriptionArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic%3A80289ba6-0fd4-4079-afb4-ce8c8260f0ca - &Action=Unsubscribe - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=e8IwhPzuWeMvPDVrN7jUVxasd3Wv2LuO8x6rE23VCv8%3D - - - - - - - - 18e0ac39-3776-11df-84c0-b93cc1666b84 - - - - - diff --git a/test/resources/SNS/UnsubscribeResponse b/test/resources/SNS/UnsubscribeResponse deleted file mode 100644 index cd57ca448df..00000000000 --- a/test/resources/SNS/UnsubscribeResponse +++ /dev/null @@ -1,23 +0,0 @@ - - - http://sns.us-east-1.amazonaws.com/ - ?SubscriptionArn=arn%3Aaws%3Asns%3Aus-east-1%3A123456789012%3AMy-Topic%3A80289ba6-0fd4-4079-afb4-ce8c8260f0ca - &Action=Unsubscribe - &SignatureVersion=2 - &SignatureMethod=HmacSHA256 - &Timestamp=2010-03-31T12%3A00%3A00.000Z - &AWSAccessKeyId=(AWS Access Key ID) - &Signature=e8IwhPzuWeMvPDVrN7jUVxasd3Wv2LuO8x6rE23VCv8%3D - - - - - - - - 18e0ac39-3776-11df-84c0-b93cc1666b84 - - - - - diff --git a/test/resources/SigningVersion4/get-header-key-duplicate.authz b/test/resources/SigningVersion4/get-header-key-duplicate.authz deleted file mode 100644 index ac05e355f34..00000000000 --- a/test/resources/SigningVersion4/get-header-key-duplicate.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;zoo, Signature=54afcaaf45b331f81cd2edb974f7b824ff4dd594cbbaa945ed636b48477368ed \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-header-key-duplicate.creq b/test/resources/SigningVersion4/get-header-key-duplicate.creq deleted file mode 100644 index 57e086200bc..00000000000 --- a/test/resources/SigningVersion4/get-header-key-duplicate.creq +++ /dev/null @@ -1,9 +0,0 @@ -POST -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -zoo:foobar,zoobar,zoobar - -date;host;zoo -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-header-key-duplicate.req b/test/resources/SigningVersion4/get-header-key-duplicate.req deleted file mode 100644 index eb3a42948a2..00000000000 --- a/test/resources/SigningVersion4/get-header-key-duplicate.req +++ /dev/null @@ -1,7 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -ZOO:zoobar -zoo:foobar -zoo:zoobar - diff --git a/test/resources/SigningVersion4/get-header-key-duplicate.sreq b/test/resources/SigningVersion4/get-header-key-duplicate.sreq deleted file mode 100644 index 5c464f38db1..00000000000 --- a/test/resources/SigningVersion4/get-header-key-duplicate.sreq +++ /dev/null @@ -1,8 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -ZOO:zoobar -zoo:foobar -zoo:zoobar -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;zoo, Signature=54afcaaf45b331f81cd2edb974f7b824ff4dd594cbbaa945ed636b48477368ed - diff --git a/test/resources/SigningVersion4/get-header-key-duplicate.sts b/test/resources/SigningVersion4/get-header-key-duplicate.sts deleted file mode 100644 index 7b11b51032f..00000000000 --- a/test/resources/SigningVersion4/get-header-key-duplicate.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -3c52f0eaae2b61329c0a332e3fa15842a37bc5812cf4d80eb64784308850e313 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-header-value-multiline.req b/test/resources/SigningVersion4/get-header-value-multiline.req deleted file mode 100644 index 6d1e44e8e43..00000000000 --- a/test/resources/SigningVersion4/get-header-value-multiline.req +++ /dev/null @@ -1,7 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -p:a - b - c - diff --git a/test/resources/SigningVersion4/get-header-value-order.authz b/test/resources/SigningVersion4/get-header-value-order.authz deleted file mode 100644 index c80262a698d..00000000000 --- a/test/resources/SigningVersion4/get-header-value-order.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;p, Signature=d2973954263943b11624a11d1c963ca81fb274169c7868b2858c04f083199e3d \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-header-value-order.creq b/test/resources/SigningVersion4/get-header-value-order.creq deleted file mode 100644 index 9b61ef55f06..00000000000 --- a/test/resources/SigningVersion4/get-header-value-order.creq +++ /dev/null @@ -1,9 +0,0 @@ -POST -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -p:a,a,p,z - -date;host;p -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-header-value-order.req b/test/resources/SigningVersion4/get-header-value-order.req deleted file mode 100644 index ea30500f198..00000000000 --- a/test/resources/SigningVersion4/get-header-value-order.req +++ /dev/null @@ -1,8 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -p:z -p:a -p:p -p:a - diff --git a/test/resources/SigningVersion4/get-header-value-order.sreq b/test/resources/SigningVersion4/get-header-value-order.sreq deleted file mode 100644 index 536ab04099d..00000000000 --- a/test/resources/SigningVersion4/get-header-value-order.sreq +++ /dev/null @@ -1,9 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -p:z -p:a -p:p -p:a -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;p, Signature=d2973954263943b11624a11d1c963ca81fb274169c7868b2858c04f083199e3d - diff --git a/test/resources/SigningVersion4/get-header-value-order.sts b/test/resources/SigningVersion4/get-header-value-order.sts deleted file mode 100644 index d80190ae193..00000000000 --- a/test/resources/SigningVersion4/get-header-value-order.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -94c0389fefe0988cbbedc8606f0ca0b485b48da010d09fc844b45b697c8924fe \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-header-value-trim.authz b/test/resources/SigningVersion4/get-header-value-trim.authz deleted file mode 100644 index 2d870cc079c..00000000000 --- a/test/resources/SigningVersion4/get-header-value-trim.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;p, Signature=debf546796015d6f6ded8626f5ce98597c33b47b9164cf6b17b4642036fcb592 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-header-value-trim.creq b/test/resources/SigningVersion4/get-header-value-trim.creq deleted file mode 100644 index 43b4a85d1b6..00000000000 --- a/test/resources/SigningVersion4/get-header-value-trim.creq +++ /dev/null @@ -1,9 +0,0 @@ -POST -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -p:phfft - -date;host;p -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-header-value-trim.req b/test/resources/SigningVersion4/get-header-value-trim.req deleted file mode 100644 index e1483637440..00000000000 --- a/test/resources/SigningVersion4/get-header-value-trim.req +++ /dev/null @@ -1,5 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -p: phfft - diff --git a/test/resources/SigningVersion4/get-header-value-trim.sreq b/test/resources/SigningVersion4/get-header-value-trim.sreq deleted file mode 100644 index ab33a910dfb..00000000000 --- a/test/resources/SigningVersion4/get-header-value-trim.sreq +++ /dev/null @@ -1,6 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -p: phfft -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;p, Signature=debf546796015d6f6ded8626f5ce98597c33b47b9164cf6b17b4642036fcb592 - diff --git a/test/resources/SigningVersion4/get-header-value-trim.sts b/test/resources/SigningVersion4/get-header-value-trim.sts deleted file mode 100644 index 7b7ead8f76b..00000000000 --- a/test/resources/SigningVersion4/get-header-value-trim.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -dddd1902add08da1ac94782b05f9278c08dc7468db178a84f8950d93b30b1f35 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-relative-relative.authz b/test/resources/SigningVersion4/get-relative-relative.authz deleted file mode 100644 index 06bd81300e6..00000000000 --- a/test/resources/SigningVersion4/get-relative-relative.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-relative-relative.creq b/test/resources/SigningVersion4/get-relative-relative.creq deleted file mode 100644 index 851992333cb..00000000000 --- a/test/resources/SigningVersion4/get-relative-relative.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-relative-relative.req b/test/resources/SigningVersion4/get-relative-relative.req deleted file mode 100644 index dab95bba3c6..00000000000 --- a/test/resources/SigningVersion4/get-relative-relative.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /foo/bar/../.. http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-relative-relative.sreq b/test/resources/SigningVersion4/get-relative-relative.sreq deleted file mode 100644 index b0d1c56113a..00000000000 --- a/test/resources/SigningVersion4/get-relative-relative.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /foo/bar/../.. http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 - diff --git a/test/resources/SigningVersion4/get-relative-relative.sts b/test/resources/SigningVersion4/get-relative-relative.sts deleted file mode 100644 index c7bcc678b84..00000000000 --- a/test/resources/SigningVersion4/get-relative-relative.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -366b91fb121d72a00f46bbe8d395f53a102b06dfb7e79636515208ed3fa606b1 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-relative.authz b/test/resources/SigningVersion4/get-relative.authz deleted file mode 100644 index 06bd81300e6..00000000000 --- a/test/resources/SigningVersion4/get-relative.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-relative.creq b/test/resources/SigningVersion4/get-relative.creq deleted file mode 100644 index 851992333cb..00000000000 --- a/test/resources/SigningVersion4/get-relative.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-relative.req b/test/resources/SigningVersion4/get-relative.req deleted file mode 100644 index 18344ee0158..00000000000 --- a/test/resources/SigningVersion4/get-relative.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /foo/.. http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-relative.sreq b/test/resources/SigningVersion4/get-relative.sreq deleted file mode 100644 index 2fc762077b8..00000000000 --- a/test/resources/SigningVersion4/get-relative.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /foo/.. http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 - diff --git a/test/resources/SigningVersion4/get-relative.sts b/test/resources/SigningVersion4/get-relative.sts deleted file mode 100644 index c7bcc678b84..00000000000 --- a/test/resources/SigningVersion4/get-relative.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -366b91fb121d72a00f46bbe8d395f53a102b06dfb7e79636515208ed3fa606b1 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slash-dot-slash.authz b/test/resources/SigningVersion4/get-slash-dot-slash.authz deleted file mode 100644 index 06bd81300e6..00000000000 --- a/test/resources/SigningVersion4/get-slash-dot-slash.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slash-dot-slash.creq b/test/resources/SigningVersion4/get-slash-dot-slash.creq deleted file mode 100644 index 851992333cb..00000000000 --- a/test/resources/SigningVersion4/get-slash-dot-slash.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slash-dot-slash.req b/test/resources/SigningVersion4/get-slash-dot-slash.req deleted file mode 100644 index 00ffac6b3e0..00000000000 --- a/test/resources/SigningVersion4/get-slash-dot-slash.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /./ http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-slash-dot-slash.sreq b/test/resources/SigningVersion4/get-slash-dot-slash.sreq deleted file mode 100644 index 4b0e2853097..00000000000 --- a/test/resources/SigningVersion4/get-slash-dot-slash.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /./ http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 - diff --git a/test/resources/SigningVersion4/get-slash-dot-slash.sts b/test/resources/SigningVersion4/get-slash-dot-slash.sts deleted file mode 100644 index c7bcc678b84..00000000000 --- a/test/resources/SigningVersion4/get-slash-dot-slash.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -366b91fb121d72a00f46bbe8d395f53a102b06dfb7e79636515208ed3fa606b1 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slash-pointless-dot.authz b/test/resources/SigningVersion4/get-slash-pointless-dot.authz deleted file mode 100644 index ffa78cf7f44..00000000000 --- a/test/resources/SigningVersion4/get-slash-pointless-dot.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=910e4d6c9abafaf87898e1eb4c929135782ea25bb0279703146455745391e63a \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slash-pointless-dot.creq b/test/resources/SigningVersion4/get-slash-pointless-dot.creq deleted file mode 100644 index 280cc1e8a33..00000000000 --- a/test/resources/SigningVersion4/get-slash-pointless-dot.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/foo - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slash-pointless-dot.req b/test/resources/SigningVersion4/get-slash-pointless-dot.req deleted file mode 100644 index 0953f6137e0..00000000000 --- a/test/resources/SigningVersion4/get-slash-pointless-dot.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /./foo http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-slash-pointless-dot.sreq b/test/resources/SigningVersion4/get-slash-pointless-dot.sreq deleted file mode 100644 index aae53b39ddc..00000000000 --- a/test/resources/SigningVersion4/get-slash-pointless-dot.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /./foo http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=910e4d6c9abafaf87898e1eb4c929135782ea25bb0279703146455745391e63a - diff --git a/test/resources/SigningVersion4/get-slash-pointless-dot.sts b/test/resources/SigningVersion4/get-slash-pointless-dot.sts deleted file mode 100644 index 0c3394b28a9..00000000000 --- a/test/resources/SigningVersion4/get-slash-pointless-dot.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -8021a97572ee460f87ca67f4e8c0db763216d84715f5424a843a5312a3321e2d \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slash.authz b/test/resources/SigningVersion4/get-slash.authz deleted file mode 100644 index 06bd81300e6..00000000000 --- a/test/resources/SigningVersion4/get-slash.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slash.creq b/test/resources/SigningVersion4/get-slash.creq deleted file mode 100644 index 851992333cb..00000000000 --- a/test/resources/SigningVersion4/get-slash.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slash.req b/test/resources/SigningVersion4/get-slash.req deleted file mode 100644 index 2dcd49c7803..00000000000 --- a/test/resources/SigningVersion4/get-slash.req +++ /dev/null @@ -1,4 +0,0 @@ -GET // http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-slash.sreq b/test/resources/SigningVersion4/get-slash.sreq deleted file mode 100644 index 85dfc7133a8..00000000000 --- a/test/resources/SigningVersion4/get-slash.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET // http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 - diff --git a/test/resources/SigningVersion4/get-slash.sts b/test/resources/SigningVersion4/get-slash.sts deleted file mode 100644 index c7bcc678b84..00000000000 --- a/test/resources/SigningVersion4/get-slash.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -366b91fb121d72a00f46bbe8d395f53a102b06dfb7e79636515208ed3fa606b1 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slashes.authz b/test/resources/SigningVersion4/get-slashes.authz deleted file mode 100644 index 9c720f34744..00000000000 --- a/test/resources/SigningVersion4/get-slashes.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b00392262853cfe3201e47ccf945601079e9b8a7f51ee4c3d9ee4f187aa9bf19 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slashes.creq b/test/resources/SigningVersion4/get-slashes.creq deleted file mode 100644 index 759b0c396fb..00000000000 --- a/test/resources/SigningVersion4/get-slashes.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/foo/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-slashes.req b/test/resources/SigningVersion4/get-slashes.req deleted file mode 100644 index e326c43691a..00000000000 --- a/test/resources/SigningVersion4/get-slashes.req +++ /dev/null @@ -1,4 +0,0 @@ -GET //foo// http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-slashes.sreq b/test/resources/SigningVersion4/get-slashes.sreq deleted file mode 100644 index f2c5eef8817..00000000000 --- a/test/resources/SigningVersion4/get-slashes.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET //foo// http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b00392262853cfe3201e47ccf945601079e9b8a7f51ee4c3d9ee4f187aa9bf19 - diff --git a/test/resources/SigningVersion4/get-slashes.sts b/test/resources/SigningVersion4/get-slashes.sts deleted file mode 100644 index e6c6f141fad..00000000000 --- a/test/resources/SigningVersion4/get-slashes.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -6bb4476ee8745730c9cb79f33a0c70baa6d8af29c0077fa12e4e8f1dd17e7098 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-space.authz b/test/resources/SigningVersion4/get-space.authz deleted file mode 100644 index 4f8ec5e5ad5..00000000000 --- a/test/resources/SigningVersion4/get-space.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=f309cfbd10197a230c42dd17dbf5cca8a0722564cb40a872d25623cfa758e374 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-space.creq b/test/resources/SigningVersion4/get-space.creq deleted file mode 100644 index e34ff1a504d..00000000000 --- a/test/resources/SigningVersion4/get-space.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/%20/foo - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-space.req b/test/resources/SigningVersion4/get-space.req deleted file mode 100644 index 0c644465660..00000000000 --- a/test/resources/SigningVersion4/get-space.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /%20/foo http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-space.sreq b/test/resources/SigningVersion4/get-space.sreq deleted file mode 100644 index 3fde5d23560..00000000000 --- a/test/resources/SigningVersion4/get-space.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /%20/foo http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=f309cfbd10197a230c42dd17dbf5cca8a0722564cb40a872d25623cfa758e374 - diff --git a/test/resources/SigningVersion4/get-space.sts b/test/resources/SigningVersion4/get-space.sts deleted file mode 100644 index 48b7200d024..00000000000 --- a/test/resources/SigningVersion4/get-space.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -69c45fb9fe3fd76442b5086e50b2e9fec8298358da957b293ef26e506fdfb54b \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-unreserved.authz b/test/resources/SigningVersion4/get-unreserved.authz deleted file mode 100644 index 99d20161032..00000000000 --- a/test/resources/SigningVersion4/get-unreserved.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=830cc36d03f0f84e6ee4953fbe701c1c8b71a0372c63af9255aa364dd183281e \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-unreserved.creq b/test/resources/SigningVersion4/get-unreserved.creq deleted file mode 100644 index a0c0c2bef42..00000000000 --- a/test/resources/SigningVersion4/get-unreserved.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-unreserved.req b/test/resources/SigningVersion4/get-unreserved.req deleted file mode 100644 index d88a5d7fa97..00000000000 --- a/test/resources/SigningVersion4/get-unreserved.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-unreserved.sreq b/test/resources/SigningVersion4/get-unreserved.sreq deleted file mode 100644 index 8e9280be16f..00000000000 --- a/test/resources/SigningVersion4/get-unreserved.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=830cc36d03f0f84e6ee4953fbe701c1c8b71a0372c63af9255aa364dd183281e - diff --git a/test/resources/SigningVersion4/get-unreserved.sts b/test/resources/SigningVersion4/get-unreserved.sts deleted file mode 100644 index c02109b25a0..00000000000 --- a/test/resources/SigningVersion4/get-unreserved.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -df63ee3247c0356c696a3b21f8d8490b01fa9cd5bc6550ef5ef5f4636b7b8901 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-utf8.authz b/test/resources/SigningVersion4/get-utf8.authz deleted file mode 100644 index a8b8492ba0e..00000000000 --- a/test/resources/SigningVersion4/get-utf8.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=8d6634c189aa8c75c2e51e106b6b5121bed103fdb351f7d7d4381c738823af74 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-utf8.creq b/test/resources/SigningVersion4/get-utf8.creq deleted file mode 100644 index 65946cbf7b7..00000000000 --- a/test/resources/SigningVersion4/get-utf8.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/%E1%88%B4 - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-utf8.req b/test/resources/SigningVersion4/get-utf8.req deleted file mode 100644 index 83291e81c4c..00000000000 --- a/test/resources/SigningVersion4/get-utf8.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /%E1%88%B4 http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-utf8.sreq b/test/resources/SigningVersion4/get-utf8.sreq deleted file mode 100644 index 1d69c23764a..00000000000 --- a/test/resources/SigningVersion4/get-utf8.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /%E1%88%B4 http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=8d6634c189aa8c75c2e51e106b6b5121bed103fdb351f7d7d4381c738823af74 - diff --git a/test/resources/SigningVersion4/get-utf8.sts b/test/resources/SigningVersion4/get-utf8.sts deleted file mode 100644 index 63871e50df8..00000000000 --- a/test/resources/SigningVersion4/get-utf8.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -27ba31df5dbc6e063d8f87d62eb07143f7f271c5330a917840586ac1c85b6f6b \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-empty-query-key.authz b/test/resources/SigningVersion4/get-vanilla-empty-query-key.authz deleted file mode 100644 index cb7a1cc7d55..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-empty-query-key.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=56c054473fd260c13e4e7393eb203662195f5d4a1fada5314b8b52b23f985e9f \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-empty-query-key.creq b/test/resources/SigningVersion4/get-vanilla-empty-query-key.creq deleted file mode 100644 index 1efbecfebad..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-empty-query-key.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ -foo=bar -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-empty-query-key.req b/test/resources/SigningVersion4/get-vanilla-empty-query-key.req deleted file mode 100644 index fac34913c68..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-empty-query-key.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /?foo=bar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-vanilla-empty-query-key.sreq b/test/resources/SigningVersion4/get-vanilla-empty-query-key.sreq deleted file mode 100644 index 71d54631b67..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-empty-query-key.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /?foo=bar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=56c054473fd260c13e4e7393eb203662195f5d4a1fada5314b8b52b23f985e9f - diff --git a/test/resources/SigningVersion4/get-vanilla-empty-query-key.sts b/test/resources/SigningVersion4/get-vanilla-empty-query-key.sts deleted file mode 100644 index 785c7e5df95..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-empty-query-key.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -0846c2945b0832deb7a463c66af5c4f8bd54ec28c438e67a214445b157c9ddf8 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.authz b/test/resources/SigningVersion4/get-vanilla-query-order-key-case.authz deleted file mode 100644 index 10fe960b7dd..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=be7148d34ebccdc6423b19085378aa0bee970bdc61d144bd1a8c48c33079ab09 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.creq b/test/resources/SigningVersion4/get-vanilla-query-order-key-case.creq deleted file mode 100644 index f1e99d154ed..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ -foo=Zoo&foo=aha -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.req b/test/resources/SigningVersion4/get-vanilla-query-order-key-case.req deleted file mode 100644 index d5e81df7795..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /?foo=Zoo&foo=aha http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.sreq b/test/resources/SigningVersion4/get-vanilla-query-order-key-case.sreq deleted file mode 100644 index a438d93f83e..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /?foo=Zoo&foo=aha http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=be7148d34ebccdc6423b19085378aa0bee970bdc61d144bd1a8c48c33079ab09 - diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.sts b/test/resources/SigningVersion4/get-vanilla-query-order-key-case.sts deleted file mode 100644 index 4d255cc6732..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key-case.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -e25f777ba161a0f1baf778a87faf057187cf5987f17953320e3ca399feb5f00d \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key.authz b/test/resources/SigningVersion4/get-vanilla-query-order-key.authz deleted file mode 100644 index bc5463ef535..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=0dc122f3b28b831ab48ba65cb47300de53fbe91b577fe113edac383730254a3b \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key.creq b/test/resources/SigningVersion4/get-vanilla-query-order-key.creq deleted file mode 100644 index 46b1c0f1600..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ -a=foo&b=foo -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key.req b/test/resources/SigningVersion4/get-vanilla-query-order-key.req deleted file mode 100644 index f1b75b13178..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /?a=foo&b=foo http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key.sreq b/test/resources/SigningVersion4/get-vanilla-query-order-key.sreq deleted file mode 100644 index 7cb251953a2..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /?a=foo&b=foo http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=0dc122f3b28b831ab48ba65cb47300de53fbe91b577fe113edac383730254a3b - diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-key.sts b/test/resources/SigningVersion4/get-vanilla-query-order-key.sts deleted file mode 100644 index e7913515519..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-key.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -2f23d14fe13caebf6dfda346285c6d9c14f49eaca8f5ec55c627dd7404f7a727 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-value.authz b/test/resources/SigningVersion4/get-vanilla-query-order-value.authz deleted file mode 100644 index 9b96017e1b1..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-value.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=feb926e49e382bec75c9d7dcb2a1b6dc8aa50ca43c25d2bc51143768c0875acc \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-value.creq b/test/resources/SigningVersion4/get-vanilla-query-order-value.creq deleted file mode 100644 index 3c0d516e554..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-value.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ -foo=a&foo=b -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-value.req b/test/resources/SigningVersion4/get-vanilla-query-order-value.req deleted file mode 100644 index 004f1537a54..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-value.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /?foo=b&foo=a http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-value.sreq b/test/resources/SigningVersion4/get-vanilla-query-order-value.sreq deleted file mode 100644 index 61bd549daa9..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-value.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /?foo=b&foo=a http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=feb926e49e382bec75c9d7dcb2a1b6dc8aa50ca43c25d2bc51143768c0875acc - diff --git a/test/resources/SigningVersion4/get-vanilla-query-order-value.sts b/test/resources/SigningVersion4/get-vanilla-query-order-value.sts deleted file mode 100644 index 95becb246ea..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-order-value.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -33dffc220e89131f8f6157a35c40903daa658608d9129ff9489e5cf5bbd9b11b \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-unreserved.authz b/test/resources/SigningVersion4/get-vanilla-query-unreserved.authz deleted file mode 100644 index bc28668dfd3..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-unreserved.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=f1498ddb4d6dae767d97c466fb92f1b59a2c71ca29ac954692663f9db03426fb \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-unreserved.creq b/test/resources/SigningVersion4/get-vanilla-query-unreserved.creq deleted file mode 100644 index 4a436703f2e..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-unreserved.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ --._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz=-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query-unreserved.req b/test/resources/SigningVersion4/get-vanilla-query-unreserved.req deleted file mode 100644 index 72f617338bf..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-unreserved.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /?-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz=-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-vanilla-query-unreserved.sreq b/test/resources/SigningVersion4/get-vanilla-query-unreserved.sreq deleted file mode 100644 index a18d65326ec..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-unreserved.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /?-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz=-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=f1498ddb4d6dae767d97c466fb92f1b59a2c71ca29ac954692663f9db03426fb - diff --git a/test/resources/SigningVersion4/get-vanilla-query-unreserved.sts b/test/resources/SigningVersion4/get-vanilla-query-unreserved.sts deleted file mode 100644 index b45438750e5..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query-unreserved.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -d2578f3156d4c9d180713d1ff20601d8a3eed0dd35447d24603d7d67414bd6b5 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query.authz b/test/resources/SigningVersion4/get-vanilla-query.authz deleted file mode 100644 index 06bd81300e6..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query.creq b/test/resources/SigningVersion4/get-vanilla-query.creq deleted file mode 100644 index 851992333cb..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-query.req b/test/resources/SigningVersion4/get-vanilla-query.req deleted file mode 100644 index 77b339a8b48..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query.req +++ /dev/null @@ -1,4 +0,0 @@ -GET / http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-vanilla-query.sreq b/test/resources/SigningVersion4/get-vanilla-query.sreq deleted file mode 100644 index bd1f8f2fe5c..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET / http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 - diff --git a/test/resources/SigningVersion4/get-vanilla-query.sts b/test/resources/SigningVersion4/get-vanilla-query.sts deleted file mode 100644 index c7bcc678b84..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-query.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -366b91fb121d72a00f46bbe8d395f53a102b06dfb7e79636515208ed3fa606b1 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-ut8-query.authz b/test/resources/SigningVersion4/get-vanilla-ut8-query.authz deleted file mode 100644 index 8e925e3f026..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-ut8-query.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=6fb359e9a05394cc7074e0feb42573a2601abc0c869a953e8c5c12e4e01f1a8c \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-ut8-query.creq b/test/resources/SigningVersion4/get-vanilla-ut8-query.creq deleted file mode 100644 index 9e4be3c45d4..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-ut8-query.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ -%E1%88%B4=bar -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla-ut8-query.req b/test/resources/SigningVersion4/get-vanilla-ut8-query.req deleted file mode 100644 index 581e3354054..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-ut8-query.req +++ /dev/null @@ -1,4 +0,0 @@ -GET /?ሴ=bar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-vanilla-ut8-query.sreq b/test/resources/SigningVersion4/get-vanilla-ut8-query.sreq deleted file mode 100644 index 4f108da421d..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-ut8-query.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET /?ሴ=bar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=6fb359e9a05394cc7074e0feb42573a2601abc0c869a953e8c5c12e4e01f1a8c - diff --git a/test/resources/SigningVersion4/get-vanilla-ut8-query.sts b/test/resources/SigningVersion4/get-vanilla-ut8-query.sts deleted file mode 100644 index d14eedfdc30..00000000000 --- a/test/resources/SigningVersion4/get-vanilla-ut8-query.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -de5065ff39c131e6c2e2bd19cd9345a794bf3b561eab20b8d97b2093fc2a979e \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla.authz b/test/resources/SigningVersion4/get-vanilla.authz deleted file mode 100644 index 06bd81300e6..00000000000 --- a/test/resources/SigningVersion4/get-vanilla.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla.creq b/test/resources/SigningVersion4/get-vanilla.creq deleted file mode 100644 index 851992333cb..00000000000 --- a/test/resources/SigningVersion4/get-vanilla.creq +++ /dev/null @@ -1,8 +0,0 @@ -GET -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/get-vanilla.req b/test/resources/SigningVersion4/get-vanilla.req deleted file mode 100644 index 77b339a8b48..00000000000 --- a/test/resources/SigningVersion4/get-vanilla.req +++ /dev/null @@ -1,4 +0,0 @@ -GET / http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/get-vanilla.sreq b/test/resources/SigningVersion4/get-vanilla.sreq deleted file mode 100644 index bd1f8f2fe5c..00000000000 --- a/test/resources/SigningVersion4/get-vanilla.sreq +++ /dev/null @@ -1,5 +0,0 @@ -GET / http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470 - diff --git a/test/resources/SigningVersion4/get-vanilla.sts b/test/resources/SigningVersion4/get-vanilla.sts deleted file mode 100644 index c7bcc678b84..00000000000 --- a/test/resources/SigningVersion4/get-vanilla.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -366b91fb121d72a00f46bbe8d395f53a102b06dfb7e79636515208ed3fa606b1 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-header-key-case.authz b/test/resources/SigningVersion4/post-header-key-case.authz deleted file mode 100644 index a6a7cbbf1c2..00000000000 --- a/test/resources/SigningVersion4/post-header-key-case.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=22902d79e148b64e7571c3565769328423fe276eae4b26f83afceda9e767f726 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-header-key-case.creq b/test/resources/SigningVersion4/post-header-key-case.creq deleted file mode 100644 index a1c8480e233..00000000000 --- a/test/resources/SigningVersion4/post-header-key-case.creq +++ /dev/null @@ -1,8 +0,0 @@ -POST -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-header-key-case.req b/test/resources/SigningVersion4/post-header-key-case.req deleted file mode 100644 index 67d74a3d9d7..00000000000 --- a/test/resources/SigningVersion4/post-header-key-case.req +++ /dev/null @@ -1,4 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - diff --git a/test/resources/SigningVersion4/post-header-key-case.sreq b/test/resources/SigningVersion4/post-header-key-case.sreq deleted file mode 100644 index 97875f9a08d..00000000000 --- a/test/resources/SigningVersion4/post-header-key-case.sreq +++ /dev/null @@ -1,5 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=22902d79e148b64e7571c3565769328423fe276eae4b26f83afceda9e767f726 - diff --git a/test/resources/SigningVersion4/post-header-key-case.sts b/test/resources/SigningVersion4/post-header-key-case.sts deleted file mode 100644 index 30fb98a91ff..00000000000 --- a/test/resources/SigningVersion4/post-header-key-case.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -05da62cee468d24ae84faff3c39f1b85540de60243c1bcaace39c0a2acc7b2c4 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-header-key-sort.authz b/test/resources/SigningVersion4/post-header-key-sort.authz deleted file mode 100644 index fdcbdd95e5e..00000000000 --- a/test/resources/SigningVersion4/post-header-key-sort.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;zoo, Signature=b7a95a52518abbca0964a999a880429ab734f35ebbf1235bd79a5de87756dc4a \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-header-key-sort.creq b/test/resources/SigningVersion4/post-header-key-sort.creq deleted file mode 100644 index 7cea8ea6733..00000000000 --- a/test/resources/SigningVersion4/post-header-key-sort.creq +++ /dev/null @@ -1,9 +0,0 @@ -POST -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -zoo:zoobar - -date;host;zoo -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-header-key-sort.req b/test/resources/SigningVersion4/post-header-key-sort.req deleted file mode 100644 index 61c73de8e52..00000000000 --- a/test/resources/SigningVersion4/post-header-key-sort.req +++ /dev/null @@ -1,5 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -ZOO:zoobar - diff --git a/test/resources/SigningVersion4/post-header-key-sort.sreq b/test/resources/SigningVersion4/post-header-key-sort.sreq deleted file mode 100644 index a645b453cb8..00000000000 --- a/test/resources/SigningVersion4/post-header-key-sort.sreq +++ /dev/null @@ -1,6 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -ZOO:zoobar -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;zoo, Signature=b7a95a52518abbca0964a999a880429ab734f35ebbf1235bd79a5de87756dc4a - diff --git a/test/resources/SigningVersion4/post-header-key-sort.sts b/test/resources/SigningVersion4/post-header-key-sort.sts deleted file mode 100644 index 3cf1dd705d9..00000000000 --- a/test/resources/SigningVersion4/post-header-key-sort.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -34e1bddeb99e76ee01d63b5e28656111e210529efeec6cdfd46a48e4c734545d \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-header-value-case.authz b/test/resources/SigningVersion4/post-header-value-case.authz deleted file mode 100644 index 651c954bdbf..00000000000 --- a/test/resources/SigningVersion4/post-header-value-case.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;zoo, Signature=273313af9d0c265c531e11db70bbd653f3ba074c1009239e8559d3987039cad7 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-header-value-case.creq b/test/resources/SigningVersion4/post-header-value-case.creq deleted file mode 100644 index e97491d3b45..00000000000 --- a/test/resources/SigningVersion4/post-header-value-case.creq +++ /dev/null @@ -1,9 +0,0 @@ -POST -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -zoo:ZOOBAR - -date;host;zoo -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-header-value-case.req b/test/resources/SigningVersion4/post-header-value-case.req deleted file mode 100644 index f6872305a49..00000000000 --- a/test/resources/SigningVersion4/post-header-value-case.req +++ /dev/null @@ -1,5 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -zoo:ZOOBAR - diff --git a/test/resources/SigningVersion4/post-header-value-case.sreq b/test/resources/SigningVersion4/post-header-value-case.sreq deleted file mode 100644 index 5f95618fdc3..00000000000 --- a/test/resources/SigningVersion4/post-header-value-case.sreq +++ /dev/null @@ -1,6 +0,0 @@ -POST / http/1.1 -DATE:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com -zoo:ZOOBAR -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host;zoo, Signature=273313af9d0c265c531e11db70bbd653f3ba074c1009239e8559d3987039cad7 - diff --git a/test/resources/SigningVersion4/post-header-value-case.sts b/test/resources/SigningVersion4/post-header-value-case.sts deleted file mode 100644 index e67301c2915..00000000000 --- a/test/resources/SigningVersion4/post-header-value-case.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -3aae6d8274b8c03e2cc96fc7d6bda4b9bd7a0a184309344470b2c96953e124aa \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-empty-query-value.authz b/test/resources/SigningVersion4/post-vanilla-empty-query-value.authz deleted file mode 100644 index acfa0fe218f..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-empty-query-value.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b6e3b79003ce0743a491606ba1035a804593b0efb1e20a11cba83f8c25a57a92 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-empty-query-value.creq b/test/resources/SigningVersion4/post-vanilla-empty-query-value.creq deleted file mode 100644 index f46634dbd1a..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-empty-query-value.creq +++ /dev/null @@ -1,8 +0,0 @@ -POST -/ -foo=bar -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-empty-query-value.req b/test/resources/SigningVersion4/post-vanilla-empty-query-value.req deleted file mode 100644 index 1351de5f6d4..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-empty-query-value.req +++ /dev/null @@ -1,4 +0,0 @@ -POST /?foo=bar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/post-vanilla-empty-query-value.sreq b/test/resources/SigningVersion4/post-vanilla-empty-query-value.sreq deleted file mode 100644 index 662dd6b6688..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-empty-query-value.sreq +++ /dev/null @@ -1,5 +0,0 @@ -POST /?foo=bar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b6e3b79003ce0743a491606ba1035a804593b0efb1e20a11cba83f8c25a57a92 - diff --git a/test/resources/SigningVersion4/post-vanilla-empty-query-value.sts b/test/resources/SigningVersion4/post-vanilla-empty-query-value.sts deleted file mode 100644 index fddcbb71478..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-empty-query-value.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -cd4f39132d8e60bb388831d734230460872b564871c47f5de62e62d1a68dbe1e \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.authz b/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.authz deleted file mode 100644 index e97bdaa1dc1..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=28675d93ac1d686ab9988d6617661da4dffe7ba848a2285cb75eac6512e861f9 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.creq b/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.creq deleted file mode 100644 index 48b903f7b3b..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.creq +++ /dev/null @@ -1,8 +0,0 @@ -POST -/ -%20=%2F%2C%3F%3E%3C%60%22%3B%3A%5C%7C%5D%5B%7B%7D&%40%23%24%25%5E= -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.req b/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.req deleted file mode 100644 index 1821438e937..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.req +++ /dev/null @@ -1,4 +0,0 @@ -POST /?@#$%^&+=/,?><`";:\|][{} =@#$%^&+=/,?><`";:\|][{} http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.sreq b/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.sreq deleted file mode 100644 index 0b53fd732a7..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.sreq +++ /dev/null @@ -1,5 +0,0 @@ -POST /?@#$%^&+=/,?><`";:\|][{} =@#$%^&+=/,?><`";:\|][{} http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=28675d93ac1d686ab9988d6617661da4dffe7ba848a2285cb75eac6512e861f9 - diff --git a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.sts b/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.sts deleted file mode 100644 index 0df239b9429..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-nonunreserved.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -eb3f16b23b20c91e1b5d6f3cd1c1f8c32a6ddcae6024e44bcfa980fbf8561f6c \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-query-space.authz b/test/resources/SigningVersion4/post-vanilla-query-space.authz deleted file mode 100644 index 59ccfcbc5d9..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-space.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b7eb653abe5f846e7eee4d1dba33b15419dc424aaf215d49b1240732b10cc4ca \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-query-space.creq b/test/resources/SigningVersion4/post-vanilla-query-space.creq deleted file mode 100644 index 0cb49e54de1..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-space.creq +++ /dev/null @@ -1,8 +0,0 @@ -POST -/ -f= -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-query-space.req b/test/resources/SigningVersion4/post-vanilla-query-space.req deleted file mode 100644 index fca4e4a0927..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-space.req +++ /dev/null @@ -1,4 +0,0 @@ -POST /?f oo=b ar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/post-vanilla-query-space.sreq b/test/resources/SigningVersion4/post-vanilla-query-space.sreq deleted file mode 100644 index f9d2f735a36..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-space.sreq +++ /dev/null @@ -1,5 +0,0 @@ -POST /?f oo=b ar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b7eb653abe5f846e7eee4d1dba33b15419dc424aaf215d49b1240732b10cc4ca - diff --git a/test/resources/SigningVersion4/post-vanilla-query-space.sts b/test/resources/SigningVersion4/post-vanilla-query-space.sts deleted file mode 100644 index bff0d26c262..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query-space.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -0d5f8ed88e9cd0a2a093e1719fff945e3718d30a6b240b9de994cdf9442c89f5 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-query.authz b/test/resources/SigningVersion4/post-vanilla-query.authz deleted file mode 100644 index acfa0fe218f..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b6e3b79003ce0743a491606ba1035a804593b0efb1e20a11cba83f8c25a57a92 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-query.creq b/test/resources/SigningVersion4/post-vanilla-query.creq deleted file mode 100644 index f46634dbd1a..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query.creq +++ /dev/null @@ -1,8 +0,0 @@ -POST -/ -foo=bar -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla-query.req b/test/resources/SigningVersion4/post-vanilla-query.req deleted file mode 100644 index 1351de5f6d4..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query.req +++ /dev/null @@ -1,4 +0,0 @@ -POST /?foo=bar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/post-vanilla-query.sreq b/test/resources/SigningVersion4/post-vanilla-query.sreq deleted file mode 100644 index 662dd6b6688..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query.sreq +++ /dev/null @@ -1,5 +0,0 @@ -POST /?foo=bar http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b6e3b79003ce0743a491606ba1035a804593b0efb1e20a11cba83f8c25a57a92 - diff --git a/test/resources/SigningVersion4/post-vanilla-query.sts b/test/resources/SigningVersion4/post-vanilla-query.sts deleted file mode 100644 index fddcbb71478..00000000000 --- a/test/resources/SigningVersion4/post-vanilla-query.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -cd4f39132d8e60bb388831d734230460872b564871c47f5de62e62d1a68dbe1e \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla.authz b/test/resources/SigningVersion4/post-vanilla.authz deleted file mode 100644 index a6a7cbbf1c2..00000000000 --- a/test/resources/SigningVersion4/post-vanilla.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=22902d79e148b64e7571c3565769328423fe276eae4b26f83afceda9e767f726 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla.creq b/test/resources/SigningVersion4/post-vanilla.creq deleted file mode 100644 index a1c8480e233..00000000000 --- a/test/resources/SigningVersion4/post-vanilla.creq +++ /dev/null @@ -1,8 +0,0 @@ -POST -/ - -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -date;host -e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-vanilla.req b/test/resources/SigningVersion4/post-vanilla.req deleted file mode 100644 index b072b839bc4..00000000000 --- a/test/resources/SigningVersion4/post-vanilla.req +++ /dev/null @@ -1,4 +0,0 @@ -POST / http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - diff --git a/test/resources/SigningVersion4/post-vanilla.sreq b/test/resources/SigningVersion4/post-vanilla.sreq deleted file mode 100644 index f2f199a6549..00000000000 --- a/test/resources/SigningVersion4/post-vanilla.sreq +++ /dev/null @@ -1,5 +0,0 @@ -POST / http/1.1 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=22902d79e148b64e7571c3565769328423fe276eae4b26f83afceda9e767f726 - diff --git a/test/resources/SigningVersion4/post-vanilla.sts b/test/resources/SigningVersion4/post-vanilla.sts deleted file mode 100644 index 30fb98a91ff..00000000000 --- a/test/resources/SigningVersion4/post-vanilla.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -05da62cee468d24ae84faff3c39f1b85540de60243c1bcaace39c0a2acc7b2c4 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.authz b/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.authz deleted file mode 100644 index 438b01c2858..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=content-type;date;host, Signature=b105eb10c6d318d2294de9d49dd8b031b55e3c3fe139f2e637da70511e9e7b71 \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.creq b/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.creq deleted file mode 100644 index 56a9b2699f6..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.creq +++ /dev/null @@ -1,9 +0,0 @@ -POST -/ - -content-type:application/x-www-form-urlencoded; charset=utf8 -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -content-type;date;host -3ba8907e7a252327488df390ed517c45b96dead033600219bdca7107d1d3f88a \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.req b/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.req deleted file mode 100644 index b537b643b78..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.req +++ /dev/null @@ -1,6 +0,0 @@ -POST / http/1.1 -Content-Type:application/x-www-form-urlencoded; charset=utf8 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - -foo=bar \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.sreq b/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.sreq deleted file mode 100644 index 4c351ddb854..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.sreq +++ /dev/null @@ -1,7 +0,0 @@ -POST / http/1.1 -Content-Type:application/x-www-form-urlencoded; charset=utf8 -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=content-type;date;host, Signature=b105eb10c6d318d2294de9d49dd8b031b55e3c3fe139f2e637da70511e9e7b71 - -foo=bar \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.sts b/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.sts deleted file mode 100644 index df165ed973c..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded-parameters.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -c4115f9e54b5cecf192b1eaa23b8e88ed8dc5391bd4fde7b3fff3d9c9fe0af1f \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded.authz b/test/resources/SigningVersion4/post-x-www-form-urlencoded.authz deleted file mode 100644 index 73b64780a40..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded.authz +++ /dev/null @@ -1 +0,0 @@ -AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=content-type;date;host, Signature=5a15b22cf462f047318703b92e6f4f38884e4a7ab7b1d6426ca46a8bd1c26cbc \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded.creq b/test/resources/SigningVersion4/post-x-www-form-urlencoded.creq deleted file mode 100644 index e4c5127cc08..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded.creq +++ /dev/null @@ -1,9 +0,0 @@ -POST -/ - -content-type:application/x-www-form-urlencoded -date:Mon, 09 Sep 2011 23:36:00 GMT -host:host.foo.com - -content-type;date;host -3ba8907e7a252327488df390ed517c45b96dead033600219bdca7107d1d3f88a \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded.req b/test/resources/SigningVersion4/post-x-www-form-urlencoded.req deleted file mode 100644 index fd58d79861b..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded.req +++ /dev/null @@ -1,6 +0,0 @@ -POST / http/1.1 -Content-Type:application/x-www-form-urlencoded -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com - -foo=bar \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded.sreq b/test/resources/SigningVersion4/post-x-www-form-urlencoded.sreq deleted file mode 100644 index 3c66800743a..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded.sreq +++ /dev/null @@ -1,7 +0,0 @@ -POST / http/1.1 -Content-Type:application/x-www-form-urlencoded -Date:Mon, 09 Sep 2011 23:36:00 GMT -Host:host.foo.com -Authorization: AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=content-type;date;host, Signature=5a15b22cf462f047318703b92e6f4f38884e4a7ab7b1d6426ca46a8bd1c26cbc - -foo=bar \ No newline at end of file diff --git a/test/resources/SigningVersion4/post-x-www-form-urlencoded.sts b/test/resources/SigningVersion4/post-x-www-form-urlencoded.sts deleted file mode 100644 index b6661a30934..00000000000 --- a/test/resources/SigningVersion4/post-x-www-form-urlencoded.sts +++ /dev/null @@ -1,4 +0,0 @@ -AWS4-HMAC-SHA256 -20110909T233600Z -20110909/us-east-1/host/aws4_request -4c5c6e4b52fb5fb947a8733982a8a5a61b14f04345cbfe6e739236c76dd48f74 \ No newline at end of file diff --git a/test/resources/SimpleDB/BatchDeleteAttributes b/test/resources/SimpleDB/BatchDeleteAttributes deleted file mode 100644 index 3861de27086..00000000000 --- a/test/resources/SimpleDB/BatchDeleteAttributes +++ /dev/null @@ -1,31 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=BatchDeleteAttributes -&Item.1.ItemName=JumboFez -&Item.1.Attribute.1.name=color& -&Item.1.Attribute.1.value=red& -&Item.1.Attribute.2.name=color& -&Item.1.Attribute.2.value=brick& -&Item.1.Attribute.3.name=color& -&Item.1.Attribute.3.value=garnet& -&Item.2.ItemName=PetiteFez -&Item.2.Attribute.1.name=color& -&Item.2.Attribute.1.value=pink& -&Item.2.Attribute.2.name=color& -&Item.2.Attribute.2.value=fuscia& -&AWSAccessKeyId=[valid access key id] -&DomainName=MyDomain -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A03%3A07-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - 05ae667c-cfac-41a8-ab37-a9c897c4c3ca - 0.0000219907 - - - diff --git a/test/resources/SimpleDB/BatchPutAttributes b/test/resources/SimpleDB/BatchPutAttributes deleted file mode 100644 index 4962f7b89f4..00000000000 --- a/test/resources/SimpleDB/BatchPutAttributes +++ /dev/null @@ -1,34 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=BatchPutAttributes -&Item.1.ItemName=Shirt1 -&Item.1.Attribute.1.Name=Color -&Item.1.Attribute.1.Value=Blue -&Item.1.Attribute.2.Name=Size -&Item.1.Attribute.2.Value=Med -&Item.1.Attribute.3.Name=Price -&Item.1.Attribute.3.Value=0014.99 -&Item.1.Attribute.3.Replace=true -&Item.2.ItemName=Shirt2 -&Item.2.Attribute.1.Name=Color -&Item.2.Attribute.1.Value=Red -&Item.2.Attribute.2.Name=Size -&Item.2.Attribute.2.Value=Large -&Item.2.Attribute.3.Name=Price -&Item.2.Attribute.3.Value=0019.99 -&AWSAccessKeyId=[valid access key id] -&DomainName=MyDomain -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2009-01-12T15%3A03%3A05-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - 490206ce-8292-456c-a00f-61b335eb202b - 0.0000219907 - - - diff --git a/test/resources/SimpleDB/CreateDomain b/test/resources/SimpleDB/CreateDomain deleted file mode 100644 index 9bed48df522..00000000000 --- a/test/resources/SimpleDB/CreateDomain +++ /dev/null @@ -1,19 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=CreateDomain -&AWSAccessKeyId=[valid access key id] -&DomainName=MyDomain -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A01%3A28-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - 2a1305a2-ed1c-43fc-b7c4-e6966b5e2727 - 0.0000219907 - - - diff --git a/test/resources/SimpleDB/DeleteAttributes b/test/resources/SimpleDB/DeleteAttributes deleted file mode 100644 index 2649fe11790..00000000000 --- a/test/resources/SimpleDB/DeleteAttributes +++ /dev/null @@ -1,46 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=DeleteAttributes -&Attribute.1.Name=color -&Attribute.1.Value=red -&Attribute.2.Name=color -&Attribute.2.Value=brick -&Attribute.3.Name=color -&Attribute.3.Value=garnet -&AWSAccessKeyId=[valid access key id] -&DomainName=MyDomain -&ItemName=JumboFez -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A03%3A07-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - 05ae667c-cfac-41a8-ab37-a9c897c4c3ca - 0.0000219907 - - - - -https://sdb.amazonaws.com/ -?Action=DeleteAttributes -&ItemName=MicroFez -Expected.1.Name=quantity -Expected.1.Value=0 -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A03%3A07-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - 05ae667c-cfac-41a8-ab37-a9c897c4c3ca - 0.0000219907 - - - diff --git a/test/resources/SimpleDB/DeleteDomain b/test/resources/SimpleDB/DeleteDomain deleted file mode 100644 index 6e4b39c9eb0..00000000000 --- a/test/resources/SimpleDB/DeleteDomain +++ /dev/null @@ -1,19 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=DeleteDomain -&AWSAccessKeyId=[valid access key id] -&DomainName=MyDomain -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A02%3A20-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - c522638b-31a2-4d69-b376-8c5428744704 - 0.0000219907 - - - diff --git a/test/resources/SimpleDB/DomainMetadata b/test/resources/SimpleDB/DomainMetadata deleted file mode 100644 index 6040ed9f2f4..00000000000 --- a/test/resources/SimpleDB/DomainMetadata +++ /dev/null @@ -1,28 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=DomainMetadata -&AWSAccessKeyId=[valid access key id] -&DomainName=MyDomain -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A03%3A07-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - 195078 - 2586634 - 12 - 120 - 3690416 - 50149756 - 1225486466 - - - b1e8f1f7-42e9-494c-ad09-2674e557526d - 0.0000219907 - - - diff --git a/test/resources/SimpleDB/GetAttributes b/test/resources/SimpleDB/GetAttributes deleted file mode 100644 index bcdeb5c282f..00000000000 --- a/test/resources/SimpleDB/GetAttributes +++ /dev/null @@ -1,52 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=GetAttributes -&AWSAccessKeyId=[valid access key id] -&DomainName=MyDomain -&ItemName=Item123 -&ConsistentRead=true -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A03%3A07-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - ColorBlue - SizeMed - Price14 - - - b1e8f1f7-42e9-494c-ad09-2674e557526d - 0.0000219907 - - - - -https://sdb.amazonaws.com/ -?Action=GetAttributes -&AWSAccessKeyId=[valid access key id] -&DomainName=MyDomain -&ItemName=Item123 -&AttributeName.0=Color -&AttributeName.1=Size -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A03%3A07-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - ColorBlue - SizeMed - - - b1e8f1f7-42e9-494c-ad09-2674e557526d - 0.0000219907 - - - diff --git a/test/resources/SimpleDB/ListDomains b/test/resources/SimpleDB/ListDomains deleted file mode 100644 index b4482d192bd..00000000000 --- a/test/resources/SimpleDB/ListDomains +++ /dev/null @@ -1,25 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=ListDomains -&AWSAccessKeyId=[valid access key id] -&MaxNumberOfDomains=2 -&NextToken=[valid next token] -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A02%3A19-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - Domain1-200706011651 - Domain2-200706011652 - TWV0ZXJpbmdUZXN0RG9tYWluMS0yMDA3MDYwMTE2NTY= - - - eb13162f-1b95-4511-8b12-489b86acfd28 - 0.0000219907 - - - diff --git a/test/resources/SimpleDB/PutAttributes b/test/resources/SimpleDB/PutAttributes deleted file mode 100644 index 1c9248f6a58..00000000000 --- a/test/resources/SimpleDB/PutAttributes +++ /dev/null @@ -1,52 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=PutAttributes -&Attribute.1.Name=Color -&Attribute.1.Value=Blue -&Attribute.2.Name=Size -&Attribute.2.Value=Med -&Attribute.3.Name=Price -&Attribute.3.Value=0014.99 -&Attribute.3.Replace=true -&AWSAccessKeyId=[valid access key id] -&DomainName=MyDomain -&ItemName=Item123 -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A03%3A05-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - 490206ce-8292-456c-a00f-61b335eb202b - 0.0000219907 - - - - -https://sdb.amazonaws.com/ -?Action=PutAttributes -&DomainName=MyDomain -&ItemName=JumboFez -&Attribute.1.Name=quantity -&Attribute.1.Value=14 -&Attribute.1.Replace=true -&Expected.1.Name=quantity -&Expected.1.Value=15 -&AWSAccessKeyId=[valid access key id] -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A03%3A05-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - 490206ce-8292-456c-a00f-61b335eb202b - 0.0000219907 - - - diff --git a/test/resources/SimpleDB/Select b/test/resources/SimpleDB/Select deleted file mode 100644 index bcbda105b4a..00000000000 --- a/test/resources/SimpleDB/Select +++ /dev/null @@ -1,43 +0,0 @@ - -https://sdb.amazonaws.com/ -?Action=Select -&AWSAccessKeyId=[valid access key id] -&NextToken=[valid next token] -&SelectExpression=select%20Color%20from%20MyDomain%20where%20Color%20like%20%27Blue%25%27 -&ConsistentRead=true -&SignatureVersion=2 -&SignatureMethod=HmacSHA256 -&Timestamp=2010-01-25T15%3A03%3A09-07%3A00 -&Version=2009-04-15 -&Signature=[valid signature] - - - - - - - Item_03 - CategoryClothes - SubcategoryPants - NameSweatpants - ColorBlue - ColorYellow - ColorPink - SizeLarge - - - Item_06 - CategoryMotorcycle Parts - SubcategoryBodywork - NameFender Eliminator - ColorBlue - MakeYamaha - ModelR1 - - - - b1e8f1f7-42e9-494c-ad09-2674e557526d - 0.0000219907 - - -