aws-sdk-core 2.11.551 → 2.11.556

data/apis/monitoring/2010-08-01/api-2.json

@@ -1361,7 +1361,8 @@
         "Namespace":{"shape":"Namespace"},
         "MetricName":{"shape":"MetricName"},
         "Dimensions":{"shape":"DimensionFilters"},
-        "NextToken":{"shape":"NextToken"}
+        "NextToken":{"shape":"NextToken"},
+        "RecentlyActive":{"shape":"RecentlyActive"}
       }
     },
     "ListMetricsOutput":{
@@ -1739,6 +1740,10 @@
         "EndTime"
       ]
     },
+    "RecentlyActive":{
+      "type":"string",
+      "enum":["PT3H"]
+    },
     "ResourceId":{"type":"string"},
     "ResourceList":{
       "type":"list",

data/apis/mq/2017-11-27/api-2.json

@@ -515,6 +515,10 @@
     }
   },
   "shapes" : {
+    "AuthenticationStrategy" : {
+      "type" : "string",
+      "enum" : [ "SIMPLE", "LDAP" ]
+    },
     "AvailabilityZone" : {
       "type" : "structure",
       "members" : {
@@ -686,6 +690,10 @@
           "shape" : "__string",
           "locationName" : "arn"
         },
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "Created" : {
           "shape" : "__timestampIso8601",
           "locationName" : "created"
@@ -787,6 +795,10 @@
     "CreateBrokerInput" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "AutoMinorVersionUpgrade" : {
           "shape" : "__boolean",
           "locationName" : "autoMinorVersionUpgrade"
@@ -824,6 +836,10 @@
           "shape" : "__string",
           "locationName" : "hostInstanceType"
         },
+        "LdapServerMetadata" : {
+          "shape" : "LdapServerMetadataInput",
+          "locationName" : "ldapServerMetadata"
+        },
         "Logs" : {
           "shape" : "Logs",
           "locationName" : "logs"
@@ -874,6 +890,10 @@
     "CreateBrokerRequest" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "AutoMinorVersionUpgrade" : {
           "shape" : "__boolean",
           "locationName" : "autoMinorVersionUpgrade"
@@ -911,6 +931,10 @@
           "shape" : "__string",
           "locationName" : "hostInstanceType"
         },
+        "LdapServerMetadata" : {
+          "shape" : "LdapServerMetadataInput",
+          "locationName" : "ldapServerMetadata"
+        },
         "Logs" : {
           "shape" : "Logs",
           "locationName" : "logs"
@@ -961,6 +985,10 @@
     "CreateConfigurationInput" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "EngineType" : {
           "shape" : "EngineType",
           "locationName" : "engineType"
@@ -986,6 +1014,10 @@
           "shape" : "__string",
           "locationName" : "arn"
         },
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "Created" : {
           "shape" : "__timestampIso8601",
           "locationName" : "created"
@@ -1007,6 +1039,10 @@
     "CreateConfigurationRequest" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "EngineType" : {
           "shape" : "EngineType",
           "locationName" : "engineType"
@@ -1032,6 +1068,10 @@
           "shape" : "__string",
           "locationName" : "arn"
         },
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "Created" : {
           "shape" : "__timestampIso8601",
           "locationName" : "created"
@@ -1274,6 +1314,10 @@
     "DescribeBrokerOutput" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "AutoMinorVersionUpgrade" : {
           "shape" : "__boolean",
           "locationName" : "autoMinorVersionUpgrade"
@@ -1326,6 +1370,10 @@
           "shape" : "__string",
           "locationName" : "hostInstanceType"
         },
+        "LdapServerMetadata" : {
+          "shape" : "LdapServerMetadataOutput",
+          "locationName" : "ldapServerMetadata"
+        },
         "Logs" : {
           "shape" : "LogsSummary",
           "locationName" : "logs"
@@ -1334,6 +1382,10 @@
           "shape" : "WeeklyStartTime",
           "locationName" : "maintenanceWindowStartTime"
         },
+        "PendingAuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "pendingAuthenticationStrategy"
+        },
         "PendingEngineVersion" : {
           "shape" : "__string",
           "locationName" : "pendingEngineVersion"
@@ -1342,6 +1394,10 @@
           "shape" : "__string",
           "locationName" : "pendingHostInstanceType"
         },
+        "PendingLdapServerMetadata" : {
+          "shape" : "LdapServerMetadataOutput",
+          "locationName" : "pendingLdapServerMetadata"
+        },
         "PendingSecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "pendingSecurityGroups"
@@ -1386,6 +1442,10 @@
     "DescribeBrokerResponse" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "AutoMinorVersionUpgrade" : {
           "shape" : "__boolean",
           "locationName" : "autoMinorVersionUpgrade"
@@ -1438,6 +1498,10 @@
           "shape" : "__string",
           "locationName" : "hostInstanceType"
         },
+        "LdapServerMetadata" : {
+          "shape" : "LdapServerMetadataOutput",
+          "locationName" : "ldapServerMetadata"
+        },
         "Logs" : {
           "shape" : "LogsSummary",
           "locationName" : "logs"
@@ -1446,6 +1510,10 @@
           "shape" : "WeeklyStartTime",
           "locationName" : "maintenanceWindowStartTime"
         },
+        "PendingAuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "pendingAuthenticationStrategy"
+        },
         "PendingEngineVersion" : {
           "shape" : "__string",
           "locationName" : "pendingEngineVersion"
@@ -1454,6 +1522,10 @@
           "shape" : "__string",
           "locationName" : "pendingHostInstanceType"
         },
+        "PendingLdapServerMetadata" : {
+          "shape" : "LdapServerMetadataOutput",
+          "locationName" : "pendingLdapServerMetadata"
+        },
         "PendingSecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "pendingSecurityGroups"
@@ -1502,6 +1574,10 @@
           "shape" : "__string",
           "locationName" : "arn"
         },
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "Created" : {
           "shape" : "__timestampIso8601",
           "locationName" : "created"
@@ -1734,6 +1810,100 @@
         "httpStatusCode" : 500
       }
     },
+    "LdapServerMetadataInput" : {
+      "type" : "structure",
+      "members" : {
+        "Hosts" : {
+          "shape" : "__listOf__string",
+          "locationName" : "hosts"
+        },
+        "RoleBase" : {
+          "shape" : "__string",
+          "locationName" : "roleBase"
+        },
+        "RoleName" : {
+          "shape" : "__string",
+          "locationName" : "roleName"
+        },
+        "RoleSearchMatching" : {
+          "shape" : "__string",
+          "locationName" : "roleSearchMatching"
+        },
+        "RoleSearchSubtree" : {
+          "shape" : "__boolean",
+          "locationName" : "roleSearchSubtree"
+        },
+        "ServiceAccountPassword" : {
+          "shape" : "__string",
+          "locationName" : "serviceAccountPassword"
+        },
+        "ServiceAccountUsername" : {
+          "shape" : "__string",
+          "locationName" : "serviceAccountUsername"
+        },
+        "UserBase" : {
+          "shape" : "__string",
+          "locationName" : "userBase"
+        },
+        "UserRoleName" : {
+          "shape" : "__string",
+          "locationName" : "userRoleName"
+        },
+        "UserSearchMatching" : {
+          "shape" : "__string",
+          "locationName" : "userSearchMatching"
+        },
+        "UserSearchSubtree" : {
+          "shape" : "__boolean",
+          "locationName" : "userSearchSubtree"
+        }
+      }
+    },
+    "LdapServerMetadataOutput" : {
+      "type" : "structure",
+      "members" : {
+        "Hosts" : {
+          "shape" : "__listOf__string",
+          "locationName" : "hosts"
+        },
+        "RoleBase" : {
+          "shape" : "__string",
+          "locationName" : "roleBase"
+        },
+        "RoleName" : {
+          "shape" : "__string",
+          "locationName" : "roleName"
+        },
+        "RoleSearchMatching" : {
+          "shape" : "__string",
+          "locationName" : "roleSearchMatching"
+        },
+        "RoleSearchSubtree" : {
+          "shape" : "__boolean",
+          "locationName" : "roleSearchSubtree"
+        },
+        "ServiceAccountUsername" : {
+          "shape" : "__string",
+          "locationName" : "serviceAccountUsername"
+        },
+        "UserBase" : {
+          "shape" : "__string",
+          "locationName" : "userBase"
+        },
+        "UserRoleName" : {
+          "shape" : "__string",
+          "locationName" : "userRoleName"
+        },
+        "UserSearchMatching" : {
+          "shape" : "__string",
+          "locationName" : "userSearchMatching"
+        },
+        "UserSearchSubtree" : {
+          "shape" : "__boolean",
+          "locationName" : "userSearchSubtree"
+        }
+      }
+    },
     "ListBrokersOutput" : {
       "type" : "structure",
       "members" : {
@@ -2108,6 +2278,10 @@
     "UpdateBrokerInput" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "AutoMinorVersionUpgrade" : {
           "shape" : "__boolean",
           "locationName" : "autoMinorVersionUpgrade"
@@ -2124,6 +2298,10 @@
           "shape" : "__string",
           "locationName" : "hostInstanceType"
         },
+        "LdapServerMetadata" : {
+          "shape" : "LdapServerMetadataInput",
+          "locationName" : "ldapServerMetadata"
+        },
         "Logs" : {
           "shape" : "Logs",
           "locationName" : "logs"
@@ -2137,6 +2315,10 @@
     "UpdateBrokerOutput" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "AutoMinorVersionUpgrade" : {
           "shape" : "__boolean",
           "locationName" : "autoMinorVersionUpgrade"
@@ -2157,6 +2339,10 @@
           "shape" : "__string",
           "locationName" : "hostInstanceType"
         },
+        "LdapServerMetadata" : {
+          "shape" : "LdapServerMetadataOutput",
+          "locationName" : "ldapServerMetadata"
+        },
         "Logs" : {
           "shape" : "Logs",
           "locationName" : "logs"
@@ -2170,6 +2356,10 @@
     "UpdateBrokerRequest" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "AutoMinorVersionUpgrade" : {
           "shape" : "__boolean",
           "locationName" : "autoMinorVersionUpgrade"
@@ -2191,6 +2381,10 @@
           "shape" : "__string",
           "locationName" : "hostInstanceType"
         },
+        "LdapServerMetadata" : {
+          "shape" : "LdapServerMetadataInput",
+          "locationName" : "ldapServerMetadata"
+        },
         "Logs" : {
           "shape" : "Logs",
           "locationName" : "logs"
@@ -2205,6 +2399,10 @@
     "UpdateBrokerResponse" : {
       "type" : "structure",
       "members" : {
+        "AuthenticationStrategy" : {
+          "shape" : "AuthenticationStrategy",
+          "locationName" : "authenticationStrategy"
+        },
         "AutoMinorVersionUpgrade" : {
           "shape" : "__boolean",
           "locationName" : "autoMinorVersionUpgrade"
@@ -2225,6 +2423,10 @@
           "shape" : "__string",
           "locationName" : "hostInstanceType"
         },
+        "LdapServerMetadata" : {
+          "shape" : "LdapServerMetadataOutput",
+          "locationName" : "ldapServerMetadata"
+        },
         "Logs" : {
           "shape" : "Logs",
           "locationName" : "logs"

data/apis/mq/2017-11-27/paginators-1.json

@@ -1,3 +1,10 @@
 {
-  "pagination" : { }
+  "pagination": {
+    "ListBrokers": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "BrokerSummaries"
+    }
+  }
 }

data/apis/resource-groups/2017-11-27/api-2.json

@@ -31,8 +31,8 @@
     "DeleteGroup":{
       "name":"DeleteGroup",
       "http":{
-        "method":"DELETE",
-        "requestUri":"/groups/{GroupName}"
+        "method":"POST",
+        "requestUri":"/delete-group"
       },
       "input":{"shape":"DeleteGroupInput"},
       "output":{"shape":"DeleteGroupOutput"},
@@ -48,8 +48,8 @@
     "GetGroup":{
       "name":"GetGroup",
       "http":{
-        "method":"GET",
-        "requestUri":"/groups/{GroupName}"
+        "method":"POST",
+        "requestUri":"/get-group"
       },
       "input":{"shape":"GetGroupInput"},
       "output":{"shape":"GetGroupOutput"},
@@ -62,11 +62,28 @@
         {"shape":"InternalServerErrorException"}
       ]
     },
+    "GetGroupConfiguration":{
+      "name":"GetGroupConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/get-group-configuration"
+      },
+      "input":{"shape":"GetGroupConfigurationInput"},
+      "output":{"shape":"GetGroupConfigurationOutput"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"MethodNotAllowedException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InternalServerErrorException"}
+      ]
+    },
     "GetGroupQuery":{
       "name":"GetGroupQuery",
       "http":{
-        "method":"GET",
-        "requestUri":"/groups/{GroupName}/query"
+        "method":"POST",
+        "requestUri":"/get-group-query"
       },
       "input":{"shape":"GetGroupQueryInput"},
       "output":{"shape":"GetGroupQueryOutput"},
@@ -96,11 +113,28 @@
         {"shape":"InternalServerErrorException"}
       ]
     },
+    "GroupResources":{
+      "name":"GroupResources",
+      "http":{
+        "method":"POST",
+        "requestUri":"/group-resources"
+      },
+      "input":{"shape":"GroupResourcesInput"},
+      "output":{"shape":"GroupResourcesOutput"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"MethodNotAllowedException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InternalServerErrorException"}
+      ]
+    },
     "ListGroupResources":{
       "name":"ListGroupResources",
       "http":{
         "method":"POST",
-        "requestUri":"/groups/{GroupName}/resource-identifiers-list"
+        "requestUri":"/list-group-resources"
       },
       "input":{"shape":"ListGroupResourcesInput"},
       "output":{"shape":"ListGroupResourcesOutput"},
@@ -164,6 +198,23 @@
         {"shape":"InternalServerErrorException"}
       ]
     },
+    "UngroupResources":{
+      "name":"UngroupResources",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ungroup-resources"
+      },
+      "input":{"shape":"UngroupResourcesInput"},
+      "output":{"shape":"UngroupResourcesOutput"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"MethodNotAllowedException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InternalServerErrorException"}
+      ]
+    },
     "Untag":{
       "name":"Untag",
       "http":{
@@ -184,8 +235,8 @@
     "UpdateGroup":{
       "name":"UpdateGroup",
       "http":{
-        "method":"PUT",
-        "requestUri":"/groups/{GroupName}"
+        "method":"POST",
+        "requestUri":"/update-group"
       },
       "input":{"shape":"UpdateGroupInput"},
       "output":{"shape":"UpdateGroupOutput"},
@@ -201,8 +252,8 @@
     "UpdateGroupQuery":{
       "name":"UpdateGroupQuery",
       "http":{
-        "method":"PUT",
-        "requestUri":"/groups/{GroupName}/query"
+        "method":"POST",
+        "requestUri":"/update-group-query"
       },
       "input":{"shape":"UpdateGroupQueryInput"},
       "output":{"shape":"UpdateGroupQueryOutput"},
@@ -227,15 +278,13 @@
     },
     "CreateGroupInput":{
       "type":"structure",
-      "required":[
-        "Name",
-        "ResourceQuery"
-      ],
+      "required":["Name"],
       "members":{
         "Name":{"shape":"GroupName"},
-        "Description":{"shape":"GroupDescription"},
+        "Description":{"shape":"Description"},
         "ResourceQuery":{"shape":"ResourceQuery"},
-        "Tags":{"shape":"Tags"}
+        "Tags":{"shape":"Tags"},
+        "Configuration":{"shape":"GroupConfigurationList"}
       }
     },
     "CreateGroupOutput":{
@@ -243,18 +292,19 @@
       "members":{
         "Group":{"shape":"Group"},
         "ResourceQuery":{"shape":"ResourceQuery"},
-        "Tags":{"shape":"Tags"}
+        "Tags":{"shape":"Tags"},
+        "GroupConfiguration":{"shape":"GroupConfiguration"}
       }
     },
     "DeleteGroupInput":{
       "type":"structure",
-      "required":["GroupName"],
       "members":{
         "GroupName":{
           "shape":"GroupName",
-          "location":"uri",
-          "locationName":"GroupName"
-        }
+          "deprecated":true,
+          "deprecatedMessage":"This field is deprecated, use Group instead."
+        },
+        "Group":{"shape":"GroupString"}
       }
     },
     "DeleteGroupOutput":{
@@ -263,11 +313,33 @@
         "Group":{"shape":"Group"}
       }
     },
+    "Description":{
+      "type":"string",
+      "max":512,
+      "pattern":"[\\sa-zA-Z0-9_\\.-]*"
+    },
+    "ErrorCode":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
     "ErrorMessage":{
       "type":"string",
       "max":1024,
       "min":1
     },
+    "FailedResource":{
+      "type":"structure",
+      "members":{
+        "ResourceArn":{"shape":"ResourceArn"},
+        "ErrorMessage":{"shape":"ErrorMessage"},
+        "ErrorCode":{"shape":"ErrorCode"}
+      }
+    },
+    "FailedResourceList":{
+      "type":"list",
+      "member":{"shape":"FailedResource"}
+    },
     "ForbiddenException":{
       "type":"structure",
       "members":{
@@ -276,15 +348,27 @@
       "error":{"httpStatusCode":403},
       "exception":true
     },
+    "GetGroupConfigurationInput":{
+      "type":"structure",
+      "members":{
+        "Group":{"shape":"GroupString"}
+      }
+    },
+    "GetGroupConfigurationOutput":{
+      "type":"structure",
+      "members":{
+        "GroupConfiguration":{"shape":"GroupConfiguration"}
+      }
+    },
     "GetGroupInput":{
       "type":"structure",
-      "required":["GroupName"],
       "members":{
         "GroupName":{
           "shape":"GroupName",
-          "location":"uri",
-          "locationName":"GroupName"
-        }
+          "deprecated":true,
+          "deprecatedMessage":"This field is deprecated, use Group instead."
+        },
+        "Group":{"shape":"GroupString"}
       }
     },
     "GetGroupOutput":{
@@ -295,13 +379,13 @@
     },
     "GetGroupQueryInput":{
       "type":"structure",
-      "required":["GroupName"],
       "members":{
         "GroupName":{
           "shape":"GroupName",
-          "location":"uri",
-          "locationName":"GroupName"
-        }
+          "deprecated":true,
+          "deprecatedMessage":"This field is deprecated, use Group instead."
+        },
+        "Group":{"shape":"GroupString"}
       }
     },
     "GetGroupQueryOutput":{
@@ -337,19 +421,74 @@
       "members":{
         "GroupArn":{"shape":"GroupArn"},
         "Name":{"shape":"GroupName"},
-        "Description":{"shape":"GroupDescription"}
+        "Description":{"shape":"Description"}
       }
     },
     "GroupArn":{
       "type":"string",
       "max":1600,
       "min":12,
-      "pattern":"arn:aws(-[a-z]+)*:resource-groups:[a-z]{2}-[a-z]+-\\d{1}:[0-9]{12}:group/[a-zA-Z0-9_\\.-]{1,128}"
+      "pattern":"arn:aws(-[a-z]+)*:resource-groups:[a-z]{2}(-[a-z]+)+-\\d{1}:[0-9]{12}:group/[a-zA-Z0-9_\\.-]{1,128}"
+    },
+    "GroupConfiguration":{
+      "type":"structure",
+      "members":{
+        "Configuration":{"shape":"GroupConfigurationList"},
+        "ProposedConfiguration":{"shape":"GroupConfigurationList"},
+        "Status":{"shape":"GroupConfigurationStatus"},
+        "FailureReason":{"shape":"GroupConfigurationFailureReason"}
+      }
+    },
+    "GroupConfigurationFailureReason":{"type":"string"},
+    "GroupConfigurationItem":{
+      "type":"structure",
+      "required":["Type"],
+      "members":{
+        "Type":{"shape":"GroupConfigurationType"},
+        "Parameters":{"shape":"GroupParameterList"}
+      }
+    },
+    "GroupConfigurationList":{
+      "type":"list",
+      "member":{"shape":"GroupConfigurationItem"},
+      "max":2
     },
-    "GroupDescription":{
+    "GroupConfigurationParameter":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "Name":{"shape":"GroupConfigurationParameterName"},
+        "Values":{"shape":"GroupConfigurationParameterValueList"}
+      }
+    },
+    "GroupConfigurationParameterName":{
       "type":"string",
-      "max":512,
-      "pattern":"[\\sa-zA-Z0-9_\\.-]*"
+      "max":40,
+      "min":1,
+      "pattern":"[a-z-]+"
+    },
+    "GroupConfigurationParameterValue":{
+      "type":"string",
+      "max":40,
+      "min":1,
+      "pattern":"[a-zA-Z0-9:]+"
+    },
+    "GroupConfigurationParameterValueList":{
+      "type":"list",
+      "member":{"shape":"GroupConfigurationParameterValue"}
+    },
+    "GroupConfigurationStatus":{
+      "type":"string",
+      "enum":[
+        "UPDATING",
+        "UPDATE_COMPLETE",
+        "UPDATE_FAILED"
+      ]
+    },
+    "GroupConfigurationType":{
+      "type":"string",
+      "max":40,
+      "pattern":"AWS::[a-zA-Z0-9]+::[a-zA-Z0-9]+"
     },
     "GroupFilter":{
       "type":"structure",
@@ -368,7 +507,10 @@
     },
     "GroupFilterName":{
       "type":"string",
-      "enum":["resource-type"]
+      "enum":[
+        "resource-type",
+        "configuration-type"
+      ]
     },
     "GroupFilterValue":{
       "type":"string",
@@ -403,6 +545,10 @@
       "min":1,
       "pattern":"[a-zA-Z0-9_\\.-]+"
     },
+    "GroupParameterList":{
+      "type":"list",
+      "member":{"shape":"GroupConfigurationParameter"}
+    },
     "GroupQuery":{
       "type":"structure",
       "required":[
@@ -414,6 +560,30 @@
         "ResourceQuery":{"shape":"ResourceQuery"}
       }
     },
+    "GroupResourcesInput":{
+      "type":"structure",
+      "required":[
+        "Group",
+        "ResourceArns"
+      ],
+      "members":{
+        "Group":{"shape":"GroupString"},
+        "ResourceArns":{"shape":"ResourceArnList"}
+      }
+    },
+    "GroupResourcesOutput":{
+      "type":"structure",
+      "members":{
+        "Succeeded":{"shape":"ResourceArnList"},
+        "Failed":{"shape":"FailedResourceList"}
+      }
+    },
+    "GroupString":{
+      "type":"string",
+      "max":1600,
+      "min":1,
+      "pattern":"(arn:aws(-[a-z]+)*:resource-groups:[a-z]{2}(-[a-z]+)+-\\d{1}:[0-9]{12}:group/)?[a-zA-Z0-9_\\.-]{1,128}"
+    },
     "InternalServerErrorException":{
       "type":"structure",
       "members":{
@@ -424,24 +594,16 @@
     },
     "ListGroupResourcesInput":{
       "type":"structure",
-      "required":["GroupName"],
       "members":{
         "GroupName":{
           "shape":"GroupName",
-          "location":"uri",
-          "locationName":"GroupName"
+          "deprecated":true,
+          "deprecatedMessage":"This field is deprecated, use Group instead."
         },
+        "Group":{"shape":"GroupString"},
         "Filters":{"shape":"ResourceFilterList"},
-        "MaxResults":{
-          "shape":"MaxResults",
-          "location":"querystring",
-          "locationName":"maxResults"
-        },
-        "NextToken":{
-          "shape":"NextToken",
-          "location":"querystring",
-          "locationName":"nextToken"
-        }
+        "MaxResults":{"shape":"MaxResults"},
+        "NextToken":{"shape":"NextToken"}
       }
     },
     "ListGroupResourcesOutput":{
@@ -543,7 +705,13 @@
     },
     "ResourceArn":{
       "type":"string",
-      "pattern":"arn:aws(-[a-z]+)*:[a-z0-9\\-]*:([a-z]{2}-[a-z]+-\\d{1})?:([0-9]{12})?:.+"
+      "pattern":"arn:aws(-[a-z]+)*:[a-z0-9\\-]*:([a-z]{2}(-[a-z]+)+-\\d{1})?:([0-9]{12})?:.+"
+    },
+    "ResourceArnList":{
+      "type":"list",
+      "member":{"shape":"ResourceArn"},
+      "max":10,
+      "min":1
     },
     "ResourceFilter":{
       "type":"structure",
@@ -678,6 +846,24 @@
       "error":{"httpStatusCode":401},
       "exception":true
     },
+    "UngroupResourcesInput":{
+      "type":"structure",
+      "required":[
+        "Group",
+        "ResourceArns"
+      ],
+      "members":{
+        "Group":{"shape":"GroupString"},
+        "ResourceArns":{"shape":"ResourceArnList"}
+      }
+    },
+    "UngroupResourcesOutput":{
+      "type":"structure",
+      "members":{
+        "Succeeded":{"shape":"ResourceArnList"},
+        "Failed":{"shape":"FailedResourceList"}
+      }
+    },
     "UntagInput":{
       "type":"structure",
       "required":[
@@ -702,14 +888,14 @@
     },
     "UpdateGroupInput":{
       "type":"structure",
-      "required":["GroupName"],
       "members":{
         "GroupName":{
           "shape":"GroupName",
-          "location":"uri",
-          "locationName":"GroupName"
+          "deprecated":true,
+          "deprecatedMessage":"This field is deprecated, use Group instead."
         },
-        "Description":{"shape":"GroupDescription"}
+        "Group":{"shape":"GroupString"},
+        "Description":{"shape":"Description"}
       }
     },
     "UpdateGroupOutput":{
@@ -720,16 +906,14 @@
     },
     "UpdateGroupQueryInput":{
       "type":"structure",
-      "required":[
-        "GroupName",
-        "ResourceQuery"
-      ],
+      "required":["ResourceQuery"],
       "members":{
         "GroupName":{
           "shape":"GroupName",
-          "location":"uri",
-          "locationName":"GroupName"
+          "deprecated":true,
+          "deprecatedMessage":"This field is deprecated, use Group instead."
         },
+        "Group":{"shape":"GroupString"},
         "ResourceQuery":{"shape":"ResourceQuery"}
       }
     },