aws-sdk-core 2.11.554 → 2.11.555

data/apis/guardduty/2017-11-28/api-2.json

@@ -432,6 +432,20 @@
         {"shape":"InternalServerErrorException"}
       ]
     },
+    "GetMemberDetectors":{
+      "name":"GetMemberDetectors",
+      "http":{
+        "method":"POST",
+        "requestUri":"/detector/{detectorId}/member/detector/get",
+        "responseCode":200
+      },
+      "input":{"shape":"GetMemberDetectorsRequest"},
+      "output":{"shape":"GetMemberDetectorsResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerErrorException"}
+      ]
+    },
     "GetMembers":{
       "name":"GetMembers",
       "http":{
@@ -740,6 +754,20 @@
         {"shape":"InternalServerErrorException"}
       ]
     },
+    "UpdateMemberDetectors":{
+      "name":"UpdateMemberDetectors",
+      "http":{
+        "method":"POST",
+        "requestUri":"/detector/{detectorId}/member/detector/update",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateMemberDetectorsRequest"},
+      "output":{"shape":"UpdateMemberDetectorsResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerErrorException"}
+      ]
+    },
     "UpdateOrganizationConfiguration":{
       "name":"UpdateOrganizationConfiguration",
       "http":{
@@ -1071,6 +1099,16 @@
       "max":64,
       "min":0
     },
+    "CloudTrailConfigurationResult":{
+      "type":"structure",
+      "required":["Status"],
+      "members":{
+        "Status":{
+          "shape":"DataSourceStatus",
+          "locationName":"status"
+        }
+      }
+    },
     "Condition":{
       "type":"structure",
       "members":{
@@ -1165,6 +1203,10 @@
           "shape":"FindingPublishingFrequency",
           "locationName":"findingPublishingFrequency"
         },
+        "DataSources":{
+          "shape":"DataSourceConfigurations",
+          "locationName":"dataSources"
+        },
         "Tags":{
           "shape":"TagMap",
           "locationName":"tags"
@@ -1429,6 +1471,61 @@
       "key":{"shape":"String"},
       "value":{"shape":"Condition"}
     },
+    "DNSLogsConfigurationResult":{
+      "type":"structure",
+      "required":["Status"],
+      "members":{
+        "Status":{
+          "shape":"DataSourceStatus",
+          "locationName":"status"
+        }
+      }
+    },
+    "DataSourceConfigurations":{
+      "type":"structure",
+      "members":{
+        "S3Logs":{
+          "shape":"S3LogsConfiguration",
+          "locationName":"s3Logs"
+        }
+      }
+    },
+    "DataSourceConfigurationsResult":{
+      "type":"structure",
+      "required":[
+        "CloudTrail",
+        "DNSLogs",
+        "FlowLogs",
+        "S3Logs"
+      ],
+      "members":{
+        "CloudTrail":{
+          "shape":"CloudTrailConfigurationResult",
+          "locationName":"cloudTrail"
+        },
+        "DNSLogs":{
+          "shape":"DNSLogsConfigurationResult",
+          "locationName":"dnsLogs"
+        },
+        "FlowLogs":{
+          "shape":"FlowLogsConfigurationResult",
+          "locationName":"flowLogs"
+        },
+        "S3Logs":{
+          "shape":"S3LogsConfigurationResult",
+          "locationName":"s3Logs"
+        }
+      }
+    },
+    "DataSourceStatus":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ],
+      "max":300,
+      "min":1
+    },
     "DeclineInvitationsRequest":{
       "type":"structure",
       "required":["AccountIds"],
@@ -1647,6 +1744,10 @@
         "MemberAccountLimitReached":{
           "shape":"Boolean",
           "locationName":"memberAccountLimitReached"
+        },
+        "DataSources":{
+          "shape":"OrganizationDataSourceConfigurationsResult",
+          "locationName":"dataSources"
         }
       }
     },
@@ -2059,6 +2160,16 @@
       "max":50,
       "min":0
     },
+    "FlowLogsConfigurationResult":{
+      "type":"structure",
+      "required":["Status"],
+      "members":{
+        "Status":{
+          "shape":"DataSourceStatus",
+          "locationName":"status"
+        }
+      }
+    },
     "GeoLocation":{
       "type":"structure",
       "members":{
@@ -2110,6 +2221,10 @@
           "shape":"String",
           "locationName":"updatedAt"
         },
+        "DataSources":{
+          "shape":"DataSourceConfigurationsResult",
+          "locationName":"dataSources"
+        },
         "Tags":{
           "shape":"TagMap",
           "locationName":"tags"
@@ -2318,6 +2433,41 @@
         }
       }
     },
+    "GetMemberDetectorsRequest":{
+      "type":"structure",
+      "required":[
+        "DetectorId",
+        "AccountIds"
+      ],
+      "members":{
+        "DetectorId":{
+          "shape":"DetectorId",
+          "location":"uri",
+          "locationName":"detectorId"
+        },
+        "AccountIds":{
+          "shape":"AccountIds",
+          "locationName":"accountIds"
+        }
+      }
+    },
+    "GetMemberDetectorsResponse":{
+      "type":"structure",
+      "required":[
+        "MemberDataSourceConfigurations",
+        "UnprocessedAccounts"
+      ],
+      "members":{
+        "MemberDataSourceConfigurations":{
+          "shape":"MemberDataSourceConfigurations",
+          "locationName":"members"
+        },
+        "UnprocessedAccounts":{
+          "shape":"UnprocessedAccounts",
+          "locationName":"unprocessedAccounts"
+        }
+      }
+    },
     "GetMembersRequest":{
       "type":"structure",
       "required":[
@@ -3012,6 +3162,29 @@
         }
       }
     },
+    "MemberDataSourceConfiguration":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "DataSources"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "locationName":"accountId"
+        },
+        "DataSources":{
+          "shape":"DataSourceConfigurationsResult",
+          "locationName":"dataSources"
+        }
+      }
+    },
+    "MemberDataSourceConfigurations":{
+      "type":"list",
+      "member":{"shape":"MemberDataSourceConfiguration"},
+      "max":50,
+      "min":1
+    },
     "Members":{
       "type":"list",
       "member":{"shape":"Member"},
@@ -3141,6 +3314,45 @@
         }
       }
     },
+    "OrganizationDataSourceConfigurations":{
+      "type":"structure",
+      "members":{
+        "S3Logs":{
+          "shape":"OrganizationS3LogsConfiguration",
+          "locationName":"s3Logs"
+        }
+      }
+    },
+    "OrganizationDataSourceConfigurationsResult":{
+      "type":"structure",
+      "required":["S3Logs"],
+      "members":{
+        "S3Logs":{
+          "shape":"OrganizationS3LogsConfigurationResult",
+          "locationName":"s3Logs"
+        }
+      }
+    },
+    "OrganizationS3LogsConfiguration":{
+      "type":"structure",
+      "required":["AutoEnable"],
+      "members":{
+        "AutoEnable":{
+          "shape":"Boolean",
+          "locationName":"autoEnable"
+        }
+      }
+    },
+    "OrganizationS3LogsConfigurationResult":{
+      "type":"structure",
+      "required":["AutoEnable"],
+      "members":{
+        "AutoEnable":{
+          "shape":"Boolean",
+          "locationName":"autoEnable"
+        }
+      }
+    },
     "Owner":{
       "type":"structure",
       "members":{
@@ -3355,6 +3567,26 @@
       "type":"list",
       "member":{"shape":"S3BucketDetail"}
     },
+    "S3LogsConfiguration":{
+      "type":"structure",
+      "required":["Enable"],
+      "members":{
+        "Enable":{
+          "shape":"Boolean",
+          "locationName":"enable"
+        }
+      }
+    },
+    "S3LogsConfigurationResult":{
+      "type":"structure",
+      "required":["Status"],
+      "members":{
+        "Status":{
+          "shape":"DataSourceStatus",
+          "locationName":"status"
+        }
+      }
+    },
     "SecurityGroup":{
       "type":"structure",
       "members":{
@@ -3691,6 +3923,10 @@
         "FindingPublishingFrequency":{
           "shape":"FindingPublishingFrequency",
           "locationName":"findingPublishingFrequency"
+        },
+        "DataSources":{
+          "shape":"DataSourceConfigurations",
+          "locationName":"dataSources"
         }
       }
     },
@@ -3812,6 +4048,38 @@
       "members":{
       }
     },
+    "UpdateMemberDetectorsRequest":{
+      "type":"structure",
+      "required":[
+        "DetectorId",
+        "AccountIds"
+      ],
+      "members":{
+        "DetectorId":{
+          "shape":"DetectorId",
+          "location":"uri",
+          "locationName":"detectorId"
+        },
+        "AccountIds":{
+          "shape":"AccountIds",
+          "locationName":"accountIds"
+        },
+        "DataSources":{
+          "shape":"DataSourceConfigurations",
+          "locationName":"dataSources"
+        }
+      }
+    },
+    "UpdateMemberDetectorsResponse":{
+      "type":"structure",
+      "required":["UnprocessedAccounts"],
+      "members":{
+        "UnprocessedAccounts":{
+          "shape":"UnprocessedAccounts",
+          "locationName":"unprocessedAccounts"
+        }
+      }
+    },
     "UpdateOrganizationConfigurationRequest":{
       "type":"structure",
       "required":[
@@ -3827,6 +4095,10 @@
         "AutoEnable":{
           "shape":"Boolean",
           "locationName":"autoEnable"
+        },
+        "DataSources":{
+          "shape":"OrganizationDataSourceConfigurations",
+          "locationName":"dataSources"
         }
       }
     },

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"}
       }
     },