aws-sdk-core 2.9.12 → 2.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0555466f36199c64564e61c733a1cbc3dd0d61a4
-  data.tar.gz: a23ae604659de77bb4e4bb8bf42a08e032d0de8c
+  metadata.gz: f095cfbd82edc470a8441bf20d13e5cba8246d2b
+  data.tar.gz: 24f914b30ef32bc48849a5c8c8c73a0ac22d4c09
 SHA512:
-  metadata.gz: 0d6e8411299e0184c5a95ce3342c3f10b0e147fee859784ea29244a28d3e020f0f6d99e67341b0bf0e1a8fe8416088b309ac07710d6fb59aff21be15a4b0adf0
-  data.tar.gz: 0c90112dc164a872f2e6faea2cb740e024b834e618a682105d88e0a74785106eefc4c25024357a9a032b89f13df2425298e44fbacc5b93d62fee8c1b9f2f64af
+  metadata.gz: 646993b102e266b672bf9704ba86d188c163ba31208582ea04c9d3e7a4d9542c2734de092ca96578a56436185d2afc2ace88828209ada474b91d59b3715083b9
+  data.tar.gz: 8dc2d4b4f4353c9042522edfb473d93f6a8a6b5385e5ddb7ec43b7f2f0a63f8ef77a457400eaf34dacad6193025f889a823b61fc894634bc8b769e7b477e5c9f

data/apis/cloudformation/2010-05-15/api-2.json

@@ -16,7 +16,10 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{"shape":"CancelUpdateStackInput"}
+      "input":{"shape":"CancelUpdateStackInput"},
+      "errors":[
+        {"shape":"TokenAlreadyExistsException"}
+      ]
     },
     "ContinueUpdateRollback":{
       "name":"ContinueUpdateRollback",
@@ -28,7 +31,10 @@
       "output":{
         "shape":"ContinueUpdateRollbackOutput",
         "resultWrapper":"ContinueUpdateRollbackResult"
-      }
+      },
+      "errors":[
+        {"shape":"TokenAlreadyExistsException"}
+      ]
     },
     "CreateChangeSet":{
       "name":"CreateChangeSet",
@@ -61,6 +67,7 @@
       "errors":[
         {"shape":"LimitExceededException"},
         {"shape":"AlreadyExistsException"},
+        {"shape":"TokenAlreadyExistsException"},
         {"shape":"InsufficientCapabilitiesException"}
       ]
     },
@@ -85,7 +92,10 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{"shape":"DeleteStackInput"}
+      "input":{"shape":"DeleteStackInput"},
+      "errors":[
+        {"shape":"TokenAlreadyExistsException"}
+      ]
     },
     "DescribeAccountLimits":{
       "name":"DescribeAccountLimits",
@@ -188,7 +198,8 @@
       "errors":[
         {"shape":"InvalidChangeSetStatusException"},
         {"shape":"ChangeSetNotFoundException"},
-        {"shape":"InsufficientCapabilitiesException"}
+        {"shape":"InsufficientCapabilitiesException"},
+        {"shape":"TokenAlreadyExistsException"}
       ]
     },
     "GetStackPolicy":{
@@ -318,7 +329,8 @@
         "resultWrapper":"UpdateStackResult"
       },
       "errors":[
-        {"shape":"InsufficientCapabilitiesException"}
+        {"shape":"InsufficientCapabilitiesException"},
+        {"shape":"TokenAlreadyExistsException"}
       ]
     },
     "ValidateTemplate":{
@@ -366,7 +378,8 @@
       "type":"structure",
       "required":["StackName"],
       "members":{
-        "StackName":{"shape":"StackName"}
+        "StackName":{"shape":"StackName"},
+        "ClientRequestToken":{"shape":"ClientRequestToken"}
       }
     },
     "Capabilities":{
@@ -479,6 +492,12 @@
       "type":"list",
       "member":{"shape":"Change"}
     },
+    "ClientRequestToken":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-zA-Z][-a-zA-Z0-9]*"
+    },
     "ClientToken":{
       "type":"string",
       "max":128,
@@ -490,7 +509,8 @@
       "members":{
         "StackName":{"shape":"StackNameOrId"},
         "RoleARN":{"shape":"RoleARN"},
-        "ResourcesToSkip":{"shape":"ResourcesToSkip"}
+        "ResourcesToSkip":{"shape":"ResourcesToSkip"},
+        "ClientRequestToken":{"shape":"ClientRequestToken"}
       }
     },
     "ContinueUpdateRollbackOutput":{
@@ -545,7 +565,8 @@
         "OnFailure":{"shape":"OnFailure"},
         "StackPolicyBody":{"shape":"StackPolicyBody"},
         "StackPolicyURL":{"shape":"StackPolicyURL"},
-        "Tags":{"shape":"Tags"}
+        "Tags":{"shape":"Tags"},
+        "ClientRequestToken":{"shape":"ClientRequestToken"}
       }
     },
     "CreateStackOutput":{
@@ -574,7 +595,8 @@
       "members":{
         "StackName":{"shape":"StackName"},
         "RetainResources":{"shape":"RetainResources"},
-        "RoleARN":{"shape":"RoleARN"}
+        "RoleARN":{"shape":"RoleARN"},
+        "ClientRequestToken":{"shape":"ClientRequestToken"}
       }
     },
     "DeletionTime":{"type":"timestamp"},
@@ -712,7 +734,8 @@
       "required":["ChangeSetName"],
       "members":{
         "ChangeSetName":{"shape":"ChangeSetNameOrId"},
-        "StackName":{"shape":"StackNameOrId"}
+        "StackName":{"shape":"StackNameOrId"},
+        "ClientRequestToken":{"shape":"ClientRequestToken"}
       }
     },
     "ExecuteChangeSetOutput":{
@@ -1167,7 +1190,8 @@
         "Timestamp":{"shape":"Timestamp"},
         "ResourceStatus":{"shape":"ResourceStatus"},
         "ResourceStatusReason":{"shape":"ResourceStatusReason"},
-        "ResourceProperties":{"shape":"ResourceProperties"}
+        "ResourceProperties":{"shape":"ResourceProperties"},
+        "ClientRequestToken":{"shape":"ClientRequestToken"}
       }
     },
     "StackEvents":{
@@ -1372,6 +1396,17 @@
       "min":1
     },
     "Timestamp":{"type":"timestamp"},
+    "TokenAlreadyExistsException":{
+      "type":"structure",
+      "members":{
+      },
+      "error":{
+        "code":"TokenAlreadyExistsException",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "TransformName":{"type":"string"},
     "TransformsList":{
       "type":"list",
@@ -1394,7 +1429,8 @@
         "StackPolicyBody":{"shape":"StackPolicyBody"},
         "StackPolicyURL":{"shape":"StackPolicyURL"},
         "NotificationARNs":{"shape":"NotificationARNs"},
-        "Tags":{"shape":"Tags"}
+        "Tags":{"shape":"Tags"},
+        "ClientRequestToken":{"shape":"ClientRequestToken"}
       }
     },
     "UpdateStackOutput":{

data/apis/cloudformation/2010-05-15/examples-1.json

@@ -1,158 +1,5 @@
 {
   "version": "1.0",
   "examples": {
-    "CancelUpdateStack": [
-      {
-        "input": {
-          "StackName": "MyStack"
-        },
-        "comments": {
-          "input": {
-          },
-          "output": {
-          }
-        },
-        "description": "This example cancels an update of the specified stack.",
-        "id": "to-cancel-a-stack-update-that-is-in-progress-1472747085196",
-        "title": "To cancel a stack update in progress"
-      }
-    ],
-    "UpdateStack": [
-      {
-        "input": {
-          "NotificationARNs": [
-
-          ],
-          "Parameters": [
-            {
-              "ParameterKey": "KeyPairName",
-              "ParameterValue": "ExampleKeyPair"
-            },
-            {
-              "ParameterKey": "SubnetIDs",
-              "ParameterValue": "ExampleSubnetID1, ExampleSubnetID2"
-            }
-          ],
-          "ResourceTypes": [
-
-          ],
-          "StackName": "MyStack",
-          "Tags": [
-
-          ],
-          "TemplateURL": "https://s3.amazonaws.com/example/updated.template"
-        },
-        "output": {
-          "StackId": ""
-        },
-        "comments": {
-          "input": {
-          },
-          "output": {
-          }
-        },
-        "description": "This example updates the template and input parameters for the specified stack.",
-        "id": "to-update-an-aws-cloudformation-stack-1472841931621",
-        "title": "To update an AWS CloudFormation stack"
-      },
-      {
-        "input": {
-          "NotificationARNs": [
-
-          ],
-          "Parameters": [
-            {
-              "ParameterKey": "KeyPairName",
-              "UsePreviousValue": true
-            },
-            {
-              "ParameterKey": "SubnetIDs",
-              "ParameterValue": "SampleSubnetID1, UpdatedSampleSubnetID2"
-            }
-          ],
-          "ResourceTypes": [
-
-          ],
-          "StackName": "MyStack",
-          "Tags": [
-
-          ],
-          "TemplateURL": "https://s3.amazonaws.com/example/updated.template"
-        },
-        "output": {
-          "StackId": ""
-        },
-        "comments": {
-          "input": {
-          },
-          "output": {
-          }
-        },
-        "description": "This example updates only the the specified parameter value for the specified stack. If you don't specify a parameter value, AWS CloudFormation uses the default value from the template.",
-        "id": "to-update-an-aws-cloudformation-stack-1472841931621",
-        "title": "To update an AWS CloudFormation stack"
-      },
-      {
-        "input": {
-          "Capabilities": [
-
-          ],
-          "NotificationARNs": [
-            "arn:aws:sns:use-east-1:123456789012:mytopic1",
-            "arn:aws:sns:us-east-1:123456789012:mytopic2"
-          ],
-          "Parameters": [
-
-          ],
-          "ResourceTypes": [
-
-          ],
-          "StackName": "MyStack",
-          "Tags": [
-
-          ],
-          "TemplateURL": "https://s3.amazonaws.com/example/updated.template",
-          "UsePreviousTemplate": true
-        },
-        "output": {
-          "StackId": ""
-        },
-        "comments": {
-          "input": {
-          },
-          "output": {
-          }
-        },
-        "description": "This example adds two stack notification topics to the specified stack.",
-        "id": "to-update-an-aws-cloudformation-stack-1472841931621",
-        "title": "To update an AWS CloudFormation stack"
-      }
-    ],
-    "ValidateTemplate": [
-      {
-        "input": {
-          "TemplateBody": "MyTemplate.json"
-        },
-        "output": {
-          "Capabilities": [
-
-          ],
-          "CapabilitiesReason": "",
-          "Description": "AWS CloudFormation Example Template S3_Bucket: An example template that shows how to create a publicly-accessible S3 bucket. IMPORTANT: This template creates an S3 bucket. You will be billed for the AWS resources used if you create a stack from this template.",
-          "Parameters": [
-
-          ]
-        },
-        "comments": {
-          "input": {
-          },
-          "output": {
-          }
-        },
-        "description": "This example validates the specified template.",
-        "id": "to-validate-an-aws-cloudformation-template-1472839072307",
-        "title": "To validate an AWS CloudFormation template"
-      }
-    ]
   }
 }

data/apis/cloudformation/2010-05-15/paginators-1.json

@@ -13,16 +13,6 @@
       "output_token": "NextToken",
       "result_key": "Stacks"
     },
-    "ListExports": {
-      "input_token": "NextToken",
-      "output_token": "NextToken",
-      "result_key": "Exports"
-    },
-    "ListImports": {
-      "input_token": "NextToken",
-      "output_token": "NextToken",
-      "result_key": "Imports"
-    },
     "ListStackResources": {
       "input_token": "NextToken",
       "output_token": "NextToken",

data/apis/cloudformation/2010-05-15/waiters-2.json

@@ -152,31 +152,6 @@
           "state": "failure"
         }
       ]
-    },
-    "ChangeSetCreateComplete": {
-      "delay": 30,
-      "operation": "DescribeChangeSet",
-      "maxAttempts": 120,
-      "description": "Wait until change set status is CREATE_COMPLETE.",
-      "acceptors": [
-        {
-          "argument": "Status",
-          "expected": "CREATE_COMPLETE",
-          "matcher": "path",
-          "state": "success"
-        },
-        {
-          "argument": "Status",
-          "expected": "FAILED",
-          "matcher": "path",
-          "state": "failure"
-        },
-        {
-          "expected": "ValidationError",
-          "matcher": "error",
-          "state": "failure"
-        }
-      ]
     }
   }
 }

data/apis/rds/2014-10-31/api-2.json

@@ -2334,6 +2334,7 @@
         "StorageEncrypted":{"shape":"Boolean"},
         "KmsKeyId":{"shape":"String"},
         "DBClusterSnapshotArn":{"shape":"String"},
+        "SourceDBClusterSnapshotArn":{"shape":"String"},
         "IAMDatabaseAuthenticationEnabled":{"shape":"Boolean"}
       },
       "wrapper":true

data/apis/rds/2014-10-31/examples-1.json

@@ -8,6 +8,8 @@
           "SubscriptionName": "mymysqleventsubscription"
         },
         "output": {
+          "EventSubscription": {
+          }
         },
         "comments": {
           "input": {
@@ -50,6 +52,8 @@
           "ResourceIdentifier": "arn:aws:rds:us-east-1:992648334831:db:mymysqlinstance"
         },
         "output": {
+          "ResourcePendingMaintenanceActions": {
+          }
         },
         "comments": {
           "input": {
@@ -69,6 +73,8 @@
           "DBSecurityGroupName": "mydbsecuritygroup"
         },
         "output": {
+          "DBSecurityGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -89,6 +95,8 @@
           "TargetDBClusterParameterGroupIdentifier": "mydbclusterparametergroup-copy"
         },
         "output": {
+          "DBClusterParameterGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -108,6 +116,8 @@
           "TargetDBClusterSnapshotIdentifier": "cluster-snapshot-copy-1"
         },
         "output": {
+          "DBClusterSnapshot": {
+          }
         },
         "comments": {
           "input": {
@@ -128,6 +138,8 @@
           "TargetDBParameterGroupIdentifier": "mymysqlparametergroup-copy"
         },
         "output": {
+          "DBParameterGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -147,6 +159,8 @@
           "TargetDBSnapshotIdentifier": "mydbsnapshot-copy"
         },
         "output": {
+          "DBSnapshot": {
+          }
         },
         "comments": {
           "input": {
@@ -167,6 +181,8 @@
           "TargetOptionGroupIdentifier": "mymysqloptiongroup-copy"
         },
         "output": {
+          "OptionGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -197,6 +213,8 @@
           "StorageEncrypted": true
         },
         "output": {
+          "DBCluster": {
+          }
         },
         "comments": {
           "input": {
@@ -217,6 +235,8 @@
           "Description": "My DB cluster parameter group"
         },
         "output": {
+          "DBClusterParameterGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -236,6 +256,8 @@
           "DBClusterSnapshotIdentifier": "mydbclustersnapshot"
         },
         "output": {
+          "DBClusterSnapshot": {
+          }
         },
         "comments": {
           "input": {
@@ -259,6 +281,8 @@
           "MasterUsername": "MyUser"
         },
         "output": {
+          "DBInstance": {
+          }
         },
         "comments": {
           "input": {
@@ -289,6 +313,8 @@
           ]
         },
         "output": {
+          "DBInstance": {
+          }
         },
         "comments": {
           "input": {
@@ -309,6 +335,8 @@
           "Description": "My MySQL parameter group"
         },
         "output": {
+          "DBParameterGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -328,6 +356,8 @@
           "DBSecurityGroupName": "mydbsecuritygroup"
         },
         "output": {
+          "DBSecurityGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -347,6 +377,8 @@
           "DBSnapshotIdentifier": "mydbsnapshot"
         },
         "output": {
+          "DBSnapshot": {
+          }
         },
         "comments": {
           "input": {
@@ -370,6 +402,8 @@
           ]
         },
         "output": {
+          "DBSubnetGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -397,6 +431,8 @@
           "SubscriptionName": "mymysqleventsubscription"
         },
         "output": {
+          "EventSubscription": {
+          }
         },
         "comments": {
           "input": {
@@ -418,6 +454,8 @@
           "OptionGroupName": "mymysqloptiongroup"
         },
         "output": {
+          "OptionGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -437,6 +475,8 @@
           "SkipFinalSnapshot": true
         },
         "output": {
+          "DBCluster": {
+          }
         },
         "comments": {
           "input": {
@@ -471,6 +511,8 @@
           "DBClusterSnapshotIdentifier": "mydbclustersnapshot"
         },
         "output": {
+          "DBClusterSnapshot": {
+          }
         },
         "comments": {
           "input": {
@@ -490,6 +532,8 @@
           "SkipFinalSnapshot": true
         },
         "output": {
+          "DBInstance": {
+          }
         },
         "comments": {
           "input": {
@@ -540,6 +584,8 @@
           "DBSnapshotIdentifier": "mydbsnapshot"
         },
         "output": {
+          "DBSnapshot": {
+          }
         },
         "comments": {
           "input": {
@@ -574,6 +620,8 @@
           "SubscriptionName": "myeventsubscription"
         },
         "output": {
+          "EventSubscription": {
+          }
         },
         "comments": {
           "input": {
@@ -681,6 +729,8 @@
           "DBClusterSnapshotIdentifier": "mydbclustersnapshot"
         },
         "output": {
+          "DBClusterSnapshotAttributesResult": {
+          }
         },
         "comments": {
           "input": {
@@ -853,6 +903,8 @@
           "DBSnapshotIdentifier": "mydbsnapshot"
         },
         "output": {
+          "DBSnapshotAttributesResult": {
+          }
         },
         "comments": {
           "input": {
@@ -910,6 +962,8 @@
           "DBParameterGroupFamily": "aurora5.6"
         },
         "output": {
+          "EngineDefaults": {
+          }
         },
         "comments": {
           "input": {
@@ -928,6 +982,8 @@
           "DBParameterGroupFamily": "mysql5.6"
         },
         "output": {
+          "EngineDefaults": {
+          }
         },
         "comments": {
           "input": {
@@ -1212,6 +1268,8 @@
           "TargetDBInstanceIdentifier": "myaurorareplica"
         },
         "output": {
+          "DBCluster": {
+          }
         },
         "comments": {
           "input": {
@@ -1253,6 +1311,8 @@
           "PreferredMaintenanceWindow": "Tue:05:00-Tue:05:30"
         },
         "output": {
+          "DBCluster": {
+          }
         },
         "comments": {
           "input": {
@@ -1304,6 +1364,8 @@
           ]
         },
         "output": {
+          "DBClusterSnapshotAttributesResult": {
+          }
         },
         "comments": {
           "input": {
@@ -1329,6 +1391,8 @@
           "PreferredMaintenanceWindow": "Tue:05:00-Tue:05:30"
         },
         "output": {
+          "DBInstance": {
+          }
         },
         "comments": {
           "input": {
@@ -1376,6 +1440,8 @@
           ]
         },
         "output": {
+          "DBSnapshotAttributesResult": {
+          }
         },
         "comments": {
           "input": {
@@ -1398,6 +1464,8 @@
           ]
         },
         "output": {
+          "DBSubnetGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -1422,6 +1490,8 @@
           "SubscriptionName": "mymysqleventsubscription"
         },
         "output": {
+          "EventSubscription": {
+          }
         },
         "comments": {
           "input": {
@@ -1449,6 +1519,8 @@
           ]
         },
         "output": {
+          "OptionGroup": {
+          }
         },
         "comments": {
           "input": {
@@ -1469,6 +1541,8 @@
           "PreferredBackupWindow": "03:30-04:00"
         },
         "output": {
+          "DBInstance": {
+          }
         },
         "comments": {
           "input": {
@@ -1488,6 +1562,8 @@
           "ReservedDBInstancesOfferingId": "fb29428a-646d-4390-850e-5fe89926e727"
         },
         "output": {
+          "ReservedDBInstance": {
+          }
         },
         "comments": {
           "input": {
@@ -1507,6 +1583,8 @@
           "ForceFailover": false
         },
         "output": {
+          "DBInstance": {
+          }
         },
         "comments": {
           "input": {
@@ -1526,6 +1604,8 @@
           "SubscriptionName": "myeventsubscription"
         },
         "output": {
+          "EventSubscription": {
+          }
         },
         "comments": {
           "input": {
@@ -1603,6 +1683,8 @@
           "SnapshotIdentifier": "sample-cluster-snapshot1"
         },
         "output": {
+          "DBCluster": {
+          }
         },
         "comments": {
           "input": {
@@ -1623,6 +1705,8 @@
           "SourceDBClusterIdentifier": "sample-cluster1"
         },
         "output": {
+          "DBCluster": {
+          }
         },
         "comments": {
           "input": {
@@ -1642,88 +1726,90 @@
           "DBSnapshotIdentifier": "rds:mysqldb-2014-04-22-08-15"
         },
         "output": {
-          "AllocatedStorage": 200,
-          "AutoMinorVersionUpgrade": true,
-          "AvailabilityZone": "us-west-2b",
-          "BackupRetentionPeriod": 7,
-          "CACertificateIdentifier": "rds-ca-2015",
-          "CopyTagsToSnapshot": false,
-          "DBInstanceArn": "arn:aws:rds:us-west-2:123456789012:db:mysqldb-restored",
-          "DBInstanceClass": "db.t2.small",
-          "DBInstanceIdentifier": "mysqldb-restored",
-          "DBInstanceStatus": "available",
-          "DBName": "sample",
-          "DBParameterGroups": [
-            {
-              "DBParameterGroupName": "default.mysql5.6",
-              "ParameterApplyStatus": "in-sync"
-            }
-          ],
-          "DBSecurityGroups": [
-
-          ],
-          "DBSubnetGroup": {
-            "DBSubnetGroupDescription": "default",
-            "DBSubnetGroupName": "default",
-            "SubnetGroupStatus": "Complete",
-            "Subnets": [
+          "DBInstance": {
+            "AllocatedStorage": 200,
+            "AutoMinorVersionUpgrade": true,
+            "AvailabilityZone": "us-west-2b",
+            "BackupRetentionPeriod": 7,
+            "CACertificateIdentifier": "rds-ca-2015",
+            "CopyTagsToSnapshot": false,
+            "DBInstanceArn": "arn:aws:rds:us-west-2:123456789012:db:mysqldb-restored",
+            "DBInstanceClass": "db.t2.small",
+            "DBInstanceIdentifier": "mysqldb-restored",
+            "DBInstanceStatus": "available",
+            "DBName": "sample",
+            "DBParameterGroups": [
               {
-                "SubnetAvailabilityZone": {
-                  "Name": "us-west-2a"
+                "DBParameterGroupName": "default.mysql5.6",
+                "ParameterApplyStatus": "in-sync"
+              }
+            ],
+            "DBSecurityGroups": [
+
+            ],
+            "DBSubnetGroup": {
+              "DBSubnetGroupDescription": "default",
+              "DBSubnetGroupName": "default",
+              "SubnetGroupStatus": "Complete",
+              "Subnets": [
+                {
+                  "SubnetAvailabilityZone": {
+                    "Name": "us-west-2a"
+                  },
+                  "SubnetIdentifier": "subnet-77e8db03",
+                  "SubnetStatus": "Active"
                 },
-                "SubnetIdentifier": "subnet-77e8db03",
-                "SubnetStatus": "Active"
-              },
-              {
-                "SubnetAvailabilityZone": {
-                  "Name": "us-west-2b"
+                {
+                  "SubnetAvailabilityZone": {
+                    "Name": "us-west-2b"
+                  },
+                  "SubnetIdentifier": "subnet-c39989a1",
+                  "SubnetStatus": "Active"
                 },
-                "SubnetIdentifier": "subnet-c39989a1",
-                "SubnetStatus": "Active"
-              },
+                {
+                  "SubnetAvailabilityZone": {
+                    "Name": "us-west-2c"
+                  },
+                  "SubnetIdentifier": "subnet-4b267b0d",
+                  "SubnetStatus": "Active"
+                }
+              ],
+              "VpcId": "vpc-c1c5b3a3"
+            },
+            "DbInstancePort": 0,
+            "DbiResourceId": "db-VNZUCCBTEDC4WR7THXNJO72HVQ",
+            "DomainMemberships": [
+
+            ],
+            "Engine": "mysql",
+            "EngineVersion": "5.6.27",
+            "LicenseModel": "general-public-license",
+            "MasterUsername": "mymasteruser",
+            "MonitoringInterval": 0,
+            "MultiAZ": false,
+            "OptionGroupMemberships": [
               {
-                "SubnetAvailabilityZone": {
-                  "Name": "us-west-2c"
-                },
-                "SubnetIdentifier": "subnet-4b267b0d",
-                "SubnetStatus": "Active"
+                "OptionGroupName": "default:mysql-5-6",
+                "Status": "in-sync"
               }
             ],
-            "VpcId": "vpc-c1c5b3a3"
-          },
-          "DbInstancePort": 0,
-          "DbiResourceId": "db-VNZUCCBTEDC4WR7THXNJO72HVQ",
-          "DomainMemberships": [
-
-          ],
-          "Engine": "mysql",
-          "EngineVersion": "5.6.27",
-          "LicenseModel": "general-public-license",
-          "MasterUsername": "mymasteruser",
-          "MonitoringInterval": 0,
-          "MultiAZ": false,
-          "OptionGroupMemberships": [
-            {
-              "OptionGroupName": "default:mysql-5-6",
-              "Status": "in-sync"
-            }
-          ],
-          "PendingModifiedValues": {
-          },
-          "PreferredBackupWindow": "12:58-13:28",
-          "PreferredMaintenanceWindow": "tue:10:16-tue:10:46",
-          "PubliclyAccessible": true,
-          "ReadReplicaDBInstanceIdentifiers": [
+            "PendingModifiedValues": {
+            },
+            "PreferredBackupWindow": "12:58-13:28",
+            "PreferredMaintenanceWindow": "tue:10:16-tue:10:46",
+            "PubliclyAccessible": true,
+            "ReadReplicaDBInstanceIdentifiers": [
 
-          ],
-          "StorageEncrypted": false,
-          "StorageType": "gp2",
-          "VpcSecurityGroups": [
-            {
-              "Status": "active",
-              "VpcSecurityGroupId": "sg-e5e5b0d2"
-            }
-          ]
+            ],
+            "StorageEncrypted": false,
+            "StorageType": "gp2",
+            "VpcSecurityGroups": [
+              {
+                "Status": "active",
+                "VpcSecurityGroupId": "sg-e5e5b0d2"
+              }
+            ]
+          }
         },
         "comments": {
           "input": {
@@ -1744,88 +1830,90 @@
           "TargetDBInstanceIdentifier": "mysql-sample-restored"
         },
         "output": {
-          "AllocatedStorage": 200,
-          "AutoMinorVersionUpgrade": true,
-          "AvailabilityZone": "us-west-2b",
-          "BackupRetentionPeriod": 7,
-          "CACertificateIdentifier": "rds-ca-2015",
-          "CopyTagsToSnapshot": false,
-          "DBInstanceArn": "arn:aws:rds:us-west-2:123456789012:db:mysql-sample-restored",
-          "DBInstanceClass": "db.t2.small",
-          "DBInstanceIdentifier": "mysql-sample-restored",
-          "DBInstanceStatus": "available",
-          "DBName": "sample",
-          "DBParameterGroups": [
-            {
-              "DBParameterGroupName": "default.mysql5.6",
-              "ParameterApplyStatus": "in-sync"
-            }
-          ],
-          "DBSecurityGroups": [
-
-          ],
-          "DBSubnetGroup": {
-            "DBSubnetGroupDescription": "default",
-            "DBSubnetGroupName": "default",
-            "SubnetGroupStatus": "Complete",
-            "Subnets": [
+          "DBInstance": {
+            "AllocatedStorage": 200,
+            "AutoMinorVersionUpgrade": true,
+            "AvailabilityZone": "us-west-2b",
+            "BackupRetentionPeriod": 7,
+            "CACertificateIdentifier": "rds-ca-2015",
+            "CopyTagsToSnapshot": false,
+            "DBInstanceArn": "arn:aws:rds:us-west-2:123456789012:db:mysql-sample-restored",
+            "DBInstanceClass": "db.t2.small",
+            "DBInstanceIdentifier": "mysql-sample-restored",
+            "DBInstanceStatus": "available",
+            "DBName": "sample",
+            "DBParameterGroups": [
               {
-                "SubnetAvailabilityZone": {
-                  "Name": "us-west-2a"
+                "DBParameterGroupName": "default.mysql5.6",
+                "ParameterApplyStatus": "in-sync"
+              }
+            ],
+            "DBSecurityGroups": [
+
+            ],
+            "DBSubnetGroup": {
+              "DBSubnetGroupDescription": "default",
+              "DBSubnetGroupName": "default",
+              "SubnetGroupStatus": "Complete",
+              "Subnets": [
+                {
+                  "SubnetAvailabilityZone": {
+                    "Name": "us-west-2a"
+                  },
+                  "SubnetIdentifier": "subnet-77e8db03",
+                  "SubnetStatus": "Active"
                 },
-                "SubnetIdentifier": "subnet-77e8db03",
-                "SubnetStatus": "Active"
-              },
-              {
-                "SubnetAvailabilityZone": {
-                  "Name": "us-west-2b"
+                {
+                  "SubnetAvailabilityZone": {
+                    "Name": "us-west-2b"
+                  },
+                  "SubnetIdentifier": "subnet-c39989a1",
+                  "SubnetStatus": "Active"
                 },
-                "SubnetIdentifier": "subnet-c39989a1",
-                "SubnetStatus": "Active"
-              },
+                {
+                  "SubnetAvailabilityZone": {
+                    "Name": "us-west-2c"
+                  },
+                  "SubnetIdentifier": "subnet-4b267b0d",
+                  "SubnetStatus": "Active"
+                }
+              ],
+              "VpcId": "vpc-c1c5b3a3"
+            },
+            "DbInstancePort": 0,
+            "DbiResourceId": "db-VNZUCCBTEDC4WR7THXNJO72HVQ",
+            "DomainMemberships": [
+
+            ],
+            "Engine": "mysql",
+            "EngineVersion": "5.6.27",
+            "LicenseModel": "general-public-license",
+            "MasterUsername": "mymasteruser",
+            "MonitoringInterval": 0,
+            "MultiAZ": false,
+            "OptionGroupMemberships": [
               {
-                "SubnetAvailabilityZone": {
-                  "Name": "us-west-2c"
-                },
-                "SubnetIdentifier": "subnet-4b267b0d",
-                "SubnetStatus": "Active"
+                "OptionGroupName": "default:mysql-5-6",
+                "Status": "in-sync"
               }
             ],
-            "VpcId": "vpc-c1c5b3a3"
-          },
-          "DbInstancePort": 0,
-          "DbiResourceId": "db-VNZUCCBTEDC4WR7THXNJO72HVQ",
-          "DomainMemberships": [
-
-          ],
-          "Engine": "mysql",
-          "EngineVersion": "5.6.27",
-          "LicenseModel": "general-public-license",
-          "MasterUsername": "mymasteruser",
-          "MonitoringInterval": 0,
-          "MultiAZ": false,
-          "OptionGroupMemberships": [
-            {
-              "OptionGroupName": "default:mysql-5-6",
-              "Status": "in-sync"
-            }
-          ],
-          "PendingModifiedValues": {
-          },
-          "PreferredBackupWindow": "12:58-13:28",
-          "PreferredMaintenanceWindow": "tue:10:16-tue:10:46",
-          "PubliclyAccessible": true,
-          "ReadReplicaDBInstanceIdentifiers": [
+            "PendingModifiedValues": {
+            },
+            "PreferredBackupWindow": "12:58-13:28",
+            "PreferredMaintenanceWindow": "tue:10:16-tue:10:46",
+            "PubliclyAccessible": true,
+            "ReadReplicaDBInstanceIdentifiers": [
 
-          ],
-          "StorageEncrypted": false,
-          "StorageType": "gp2",
-          "VpcSecurityGroups": [
-            {
-              "Status": "active",
-              "VpcSecurityGroupId": "sg-e5e5b0d2"
-            }
-          ]
+            ],
+            "StorageEncrypted": false,
+            "StorageType": "gp2",
+            "VpcSecurityGroups": [
+              {
+                "Status": "active",
+                "VpcSecurityGroupId": "sg-e5e5b0d2"
+              }
+            ]
+          }
         },
         "comments": {
           "input": {
@@ -1845,6 +1933,8 @@
           "DBSecurityGroupName": "mydbsecuritygroup"
         },
         "output": {
+          "DBSecurityGroup": {
+          }
         },
         "comments": {
           "input": {