Merge pull request #1494 from aws/release

Release v1.10.34
aws · Aug 29, 2017 · d0fb36b · d0fb36b
2 parents 3afc215 + 5b4d64c
commit d0fb36b
Show file tree

Hide file tree

Showing 8 changed files with 292 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+Release v1.10.34 (2017-08-29)
+===
+
+### Service Client Updates
+* `service/config`: Updates service API and documentation
+* `service/ec2`: Updates service API and documentation
+  * Provides capability to add secondary CIDR blocks to a VPC.
+
+### SDK Bugs
+* `aws/signer/v4`: Fix Signing Unordered Multi Value Query Parameters ([#1491](https://github.com/aws/aws-sdk-go/pull/1491))
+  * Removes sorting of query string values when calculating v4 signing as this is not part of the spec. The spec only requires the keys, not values, to be sorted which is achieved by Query.Encode().
 Release v1.10.33 (2017-08-25)
 ===
 

diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -3,5 +3,3 @@
 ### SDK Enhancements
 
 ### SDK Bugs
-* `aws/signer/v4`: Fix Signing Unordered Multi Value Query Parameters ([#1491](https://github.com/aws/aws-sdk-go/pull/1491))
-  * Removes sorting of query string values when calculating v4 signing as this is not part of the spec. The spec only requires the keys, not values, to be sorted which is achieved by Query.Encode().
diff --git a/aws/version.go b/aws/version.go
@@ -5,4 +5,4 @@ package aws
 const SDKName = "aws-sdk-go"
 
 // SDKVersion is the version of this SDK
-const SDKVersion = "1.10.33"
+const SDKVersion = "1.10.34"
diff --git a/models/apis/config/2014-11-12/api-2.json b/models/apis/config/2014-11-12/api-2.json
@@ -373,6 +373,11 @@
     "AllSupported":{"type":"boolean"},
     "AvailabilityZone":{"type":"string"},
     "AwsRegion":{"type":"string"},
+    "BaseResourceId":{
+      "type":"string",
+      "max":768,
+      "min":1
+    },
     "Boolean":{"type":"boolean"},
     "ChannelName":{
       "type":"string",
@@ -408,7 +413,7 @@
       "type":"structure",
       "members":{
         "ResourceType":{"shape":"StringWithCharLimit256"},
-        "ResourceId":{"shape":"StringWithCharLimit256"},
+        "ResourceId":{"shape":"BaseResourceId"},
         "Compliance":{"shape":"Compliance"}
       }
     },
@@ -721,7 +726,7 @@
       "type":"structure",
       "members":{
         "ResourceType":{"shape":"StringWithCharLimit256"},
-        "ResourceId":{"shape":"StringWithCharLimit256"},
+        "ResourceId":{"shape":"BaseResourceId"},
         "ComplianceTypes":{"shape":"ComplianceTypes"},
         "Limit":{"shape":"Limit"},
         "NextToken":{"shape":"NextToken"}
@@ -827,7 +832,7 @@
       ],
       "members":{
         "ComplianceResourceType":{"shape":"StringWithCharLimit256"},
-        "ComplianceResourceId":{"shape":"StringWithCharLimit256"},
+        "ComplianceResourceId":{"shape":"BaseResourceId"},
         "ComplianceType":{"shape":"ComplianceType"},
         "Annotation":{"shape":"StringWithCharLimit256"},
         "OrderingTimestamp":{"shape":"OrderingTimestamp"}
@@ -856,7 +861,7 @@
       "members":{
         "ConfigRuleName":{"shape":"StringWithCharLimit64"},
         "ResourceType":{"shape":"StringWithCharLimit256"},
-        "ResourceId":{"shape":"StringWithCharLimit256"}
+        "ResourceId":{"shape":"BaseResourceId"}
       }
     },
     "EvaluationResults":{
@@ -898,7 +903,7 @@
       ],
       "members":{
         "ResourceType":{"shape":"StringWithCharLimit256"},
-        "ResourceId":{"shape":"StringWithCharLimit256"},
+        "ResourceId":{"shape":"BaseResourceId"},
         "ComplianceTypes":{"shape":"ComplianceTypes"},
         "NextToken":{"shape":"String"}
       }
@@ -1362,7 +1367,7 @@
         "ComplianceResourceTypes":{"shape":"ComplianceResourceTypes"},
         "TagKey":{"shape":"StringWithCharLimit128"},
         "TagValue":{"shape":"StringWithCharLimit256"},
-        "ComplianceResourceId":{"shape":"StringWithCharLimit256"}
+        "ComplianceResourceId":{"shape":"BaseResourceId"}
       }
     },
     "Source":{

diff --git a/models/apis/config/2014-11-12/docs-2.json b/models/apis/config/2014-11-12/docs-2.json
@@ -61,6 +61,17 @@
         "ConfigurationItem$awsRegion": "<p>The region where the resource resides.</p>"
       }
     },
+    "BaseResourceId": {
+      "base": null,
+      "refs": {
+        "ComplianceByResource$ResourceId": "<p>The ID of the AWS resource that was evaluated.</p>",
+        "DescribeComplianceByResourceRequest$ResourceId": "<p>The ID of the AWS resource for which you want compliance information. You can specify only one resource ID. If you specify a resource ID, you must also specify a type for <code>ResourceType</code>.</p>",
+        "Evaluation$ComplianceResourceId": "<p>The ID of the AWS resource that was evaluated.</p>",
+        "EvaluationResultQualifier$ResourceId": "<p>The ID of the evaluated AWS resource.</p>",
+        "GetComplianceDetailsByResourceRequest$ResourceId": "<p>The ID of the AWS resource for which you want compliance information.</p>",
+        "Scope$ComplianceResourceId": "<p>The IDs of the only AWS resource that you want to trigger an evaluation for the rule. If you specify a resource ID, you must specify one resource type for <code>ComplianceResourceTypes</code>.</p>"
+      }
+    },
     "Boolean": {
       "base": null,
       "refs": {
@@ -1082,22 +1093,16 @@
       "base": null,
       "refs": {
         "ComplianceByResource$ResourceType": "<p>The type of the AWS resource that was evaluated.</p>",
-        "ComplianceByResource$ResourceId": "<p>The ID of the AWS resource that was evaluated.</p>",
         "ComplianceResourceTypes$member": null,
         "ComplianceSummaryByResourceType$ResourceType": "<p>The type of AWS resource.</p>",
         "DescribeComplianceByResourceRequest$ResourceType": "<p>The types of AWS resources for which you want compliance information; for example, <code>AWS::EC2::Instance</code>. For this action, you can specify that the resource type is an AWS account by specifying <code>AWS::::Account</code>.</p>",
-        "DescribeComplianceByResourceRequest$ResourceId": "<p>The ID of the AWS resource for which you want compliance information. You can specify only one resource ID. If you specify a resource ID, you must also specify a type for <code>ResourceType</code>.</p>",
         "Evaluation$ComplianceResourceType": "<p>The type of AWS resource that was evaluated.</p>",
-        "Evaluation$ComplianceResourceId": "<p>The ID of the AWS resource that was evaluated.</p>",
         "Evaluation$Annotation": "<p>Supplementary information about how the evaluation determined the compliance.</p>",
         "EvaluationResult$Annotation": "<p>Supplementary information about how the evaluation determined the compliance.</p>",
         "EvaluationResultQualifier$ResourceType": "<p>The type of AWS resource that was evaluated.</p>",
-        "EvaluationResultQualifier$ResourceId": "<p>The ID of the evaluated AWS resource.</p>",
         "GetComplianceDetailsByResourceRequest$ResourceType": "<p>The type of the AWS resource for which you want compliance information.</p>",
-        "GetComplianceDetailsByResourceRequest$ResourceId": "<p>The ID of the AWS resource for which you want compliance information.</p>",
         "ResourceTypes$member": null,
         "Scope$TagValue": "<p>The tag value applied to only those AWS resources that you want to trigger an evaluation for the rule. If you specify a value for <code>TagValue</code>, you must also specify a value for <code>TagKey</code>.</p>",
-        "Scope$ComplianceResourceId": "<p>The IDs of the only AWS resource that you want to trigger an evaluation for the rule. If you specify a resource ID, you must specify one resource type for <code>ComplianceResourceTypes</code>.</p>",
         "Source$SourceIdentifier": "<p>For AWS Config managed rules, a predefined identifier from a list. For example, <code>IAM_PASSWORD_POLICY</code> is a managed rule. To reference a managed rule, see <a href=\"http://docs.aws.amazon.com/config/latest/developerguide/evaluate-config_use-managed-rules.html\">Using AWS Managed Config Rules</a>.</p> <p>For custom rules, the identifier is the Amazon Resource Name (ARN) of the rule's AWS Lambda function, such as <code>arn:aws:lambda:us-east-2:123456789012:function:custom_rule_name</code>.</p>"
       }
     },

diff --git a/models/apis/ec2/2016-11-15/api-2.json b/models/apis/ec2/2016-11-15/api-2.json
@@ -2529,6 +2529,7 @@
           "shape":"Boolean",
           "locationName":"amazonProvidedIpv6CidrBlock"
         },
+        "CidrBlock":{"shape":"String"},
         "VpcId":{
           "shape":"String",
           "locationName":"vpcId"
@@ -2542,6 +2543,10 @@
           "shape":"VpcIpv6CidrBlockAssociation",
           "locationName":"ipv6CidrBlockAssociation"
         },
+        "CidrBlockAssociation":{
+          "shape":"VpcCidrBlockAssociation",
+          "locationName":"cidrBlockAssociation"
+        },
         "VpcId":{
           "shape":"String",
           "locationName":"vpcId"
@@ -3277,6 +3282,22 @@
         "locationName":"item"
       }
     },
+    "CidrBlock":{
+      "type":"structure",
+      "members":{
+        "CidrBlock":{
+          "shape":"String",
+          "locationName":"cidrBlock"
+        }
+      }
+    },
+    "CidrBlockSet":{
+      "type":"list",
+      "member":{
+        "shape":"CidrBlock",
+        "locationName":"item"
+      }
+    },
     "ClassicLinkDnsSupport":{
       "type":"structure",
       "members":{
@@ -7170,6 +7191,10 @@
           "shape":"VpcIpv6CidrBlockAssociation",
           "locationName":"ipv6CidrBlockAssociation"
         },
+        "CidrBlockAssociation":{
+          "shape":"VpcCidrBlockAssociation",
+          "locationName":"cidrBlockAssociation"
+        },
         "VpcId":{
           "shape":"String",
           "locationName":"vpcId"
@@ -15502,6 +15527,10 @@
           "shape":"VpcIpv6CidrBlockAssociationSet",
           "locationName":"ipv6CidrBlockAssociationSet"
         },
+        "CidrBlockAssociationSet":{
+          "shape":"VpcCidrBlockAssociationSet",
+          "locationName":"cidrBlockAssociationSet"
+        },
         "IsDefault":{
           "shape":"Boolean",
           "locationName":"isDefault"
@@ -15539,6 +15568,30 @@
         "enableDnsHostnames"
       ]
     },
+    "VpcCidrBlockAssociation":{
+      "type":"structure",
+      "members":{
+        "AssociationId":{
+          "shape":"String",
+          "locationName":"associationId"
+        },
+        "CidrBlock":{
+          "shape":"String",
+          "locationName":"cidrBlock"
+        },
+        "CidrBlockState":{
+          "shape":"VpcCidrBlockState",
+          "locationName":"cidrBlockState"
+        }
+      }
+    },
+    "VpcCidrBlockAssociationSet":{
+      "type":"list",
+      "member":{
+        "shape":"VpcCidrBlockAssociation",
+        "locationName":"item"
+      }
+    },
     "VpcCidrBlockState":{
       "type":"structure",
       "members":{
@@ -15763,6 +15816,10 @@
           "shape":"Ipv6CidrBlockSet",
           "locationName":"ipv6CidrBlockSet"
         },
+        "CidrBlockSet":{
+          "shape":"CidrBlockSet",
+          "locationName":"cidrBlockSet"
+        },
         "OwnerId":{
           "shape":"String",
           "locationName":"ownerId"