Merge branch 'main' into feat-disableimdsv1config

CHANGELOG.md

@@ -1,3 +1,32 @@
+Release v1.47.1 (2023-11-01)
+===
+
+### Service Client Updates
+* `service/connect`: Updates service API, documentation, and paginators
+* `service/globalaccelerator`: Updates service API, documentation, and paginators
+* `service/rds`: Updates service API, documentation, waiters, paginators, and examples
+  * This release adds support for customized networking resources to Amazon RDS Custom.
+* `service/redshift`: Updates service API and documentation
+  * Added support for Multi-AZ deployments for Provisioned RA3 clusters that provide 99.99% SLA availability.
+* `service/sagemaker`: Updates service API and documentation
+  * Support for batch transform input in Model dashboard
+
+Release v1.47.0 (2023-10-31)
+===
+
+### Service Client Updates
+* `service/amplify`: Updates service API, documentation, and paginators
+* `service/application-insights`: Updates service API and documentation
+* `service/ec2`: Updates service API, documentation, and paginators
+  * Capacity Blocks for ML are a new EC2 purchasing option for reserving GPU instances on a future date to support short duration machine learning (ML) workloads. Capacity Blocks automatically place instances close together inside Amazon EC2 UltraClusters for low-latency, high-throughput networking.
+* `service/m2`: Updates service API and documentation
+* `service/neptunedata`: Updates service API and documentation
+* `service/translate`: Updates service API and documentation
+
+### SDK Features
+* `aws`: Bump minimum go version to 1.19.
+  * See https://aws.amazon.com/blogs/developer/aws-sdk-for-go-aligns-with-go-release-policy-on-supported-runtimes/.
+
 Release v1.46.7 (2023-10-30)
 ===
 

CHANGELOG_PENDING.md

@@ -1,6 +1,4 @@
 ### SDK Features
-* `aws`: Bump minimum go version to 1.19.
-  * See https://aws.amazon.com/blogs/developer/aws-sdk-for-go-aligns-with-go-release-policy-on-supported-runtimes/.
 
 ### SDK Enhancements
 * `aws/ec2metadata`: Added environment and shared config support for disabling IMDSv1 fallback.

aws/version.go

@@ -5,4 +5,4 @@ package aws
 const SDKName = "aws-sdk-go"
 
 // SDKVersion is the version of this SDK
-const SDKVersion = "1.46.7"
+const SDKVersion = "1.47.1"

example/aws/credentials/plugincreds/plugin/plugin.go

@@ -5,9 +5,8 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"os"
-
-	"github.com/pkg/errors"
 )
 
 // Example plugin that will retrieve credentials from a JSON file that the
@@ -41,7 +40,7 @@ type provider struct {
 func (p *provider) Retrieve() (key, secret, token string, err error) {
 	f, err := os.Open(p.Filename)
 	if err != nil {
-		return "", "", "", errors.Wrapf(err, "failed to open credentials file, %q", p.Filename)
+		return "", "", "", fmt.Errorf("failed to open credentials file, %q: %w", p.Filename, err)
 	}
 	decoder := json.NewDecoder(f)
 
@@ -50,7 +49,7 @@ func (p *provider) Retrieve() (key, secret, token string, err error) {
 	}{}
 
 	if err := decoder.Decode(&creds); err != nil {
-		return "", "", "", errors.Wrap(err, "failed to decode credentials file")
+		return "", "", "", fmt.Errorf("failed to decode credentials file: %w", err)
 	}
 
 	p.loaded = true

go.mod

@@ -4,8 +4,7 @@ go 1.19
 
 require (
 	github.com/jmespath/go-jmespath v0.4.0
-	github.com/pkg/errors v0.9.1
-	golang.org/x/net v0.1.0
+	golang.org/x/net v0.17.0
 )
 
-require golang.org/x/text v0.4.0 // indirect
+require golang.org/x/text v0.13.0 // indirect

go.sum

@@ -4,15 +4,13 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

models/apis/amplify/2017-07-25/api-2.json

@@ -735,6 +735,12 @@
       "max":1000,
       "pattern":"^$|^arn:aws:iam::\\d{12}:role.+"
     },
+    "Backend":{
+      "type":"structure",
+      "members":{
+        "stackArn":{"shape":"StackArn"}
+      }
+    },
     "BackendEnvironment":{
       "type":"structure",
       "required":[
@@ -824,7 +830,8 @@
         "pullRequestEnvironmentName":{"shape":"PullRequestEnvironmentName"},
         "destinationBranch":{"shape":"BranchName"},
         "sourceBranch":{"shape":"BranchName"},
-        "backendEnvironmentArn":{"shape":"BackendEnvironmentArn"}
+        "backendEnvironmentArn":{"shape":"BackendEnvironmentArn"},
+        "backend":{"shape":"Backend"}
       }
     },
     "BranchArn":{
@@ -957,7 +964,8 @@
         "displayName":{"shape":"DisplayName"},
         "enablePullRequestPreview":{"shape":"EnablePullRequestPreview"},
         "pullRequestEnvironmentName":{"shape":"PullRequestEnvironmentName"},
-        "backendEnvironmentArn":{"shape":"BackendEnvironmentArn"}
+        "backendEnvironmentArn":{"shape":"BackendEnvironmentArn"},
+        "backend":{"shape":"Backend"}
       }
     },
     "CreateBranchResult":{
@@ -2010,6 +2018,12 @@
       "max":3000,
       "pattern":"(?s).*"
     },
+    "StackArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"^arn:aws:cloudformation:[a-z0-9-]+:\\d{12}:stack/.+/.+$"
+    },
     "StackName":{
       "type":"string",
       "max":255,
@@ -2370,7 +2384,8 @@
         "displayName":{"shape":"DisplayName"},
         "enablePullRequestPreview":{"shape":"EnablePullRequestPreview"},
         "pullRequestEnvironmentName":{"shape":"PullRequestEnvironmentName"},
-        "backendEnvironmentArn":{"shape":"BackendEnvironmentArn"}
+        "backendEnvironmentArn":{"shape":"BackendEnvironmentArn"},
+        "backend":{"shape":"Backend"}
       }
     },
     "UpdateBranchResult":{