Adds support for s3 and s3control vpc interface endpoints

.changes/next-release/example.service.s3.usingPrivateLink-feature-1612549025484475000.json

@@ -0,0 +1,9 @@
+{
+ "ID": "example.service.s3.usingPrivateLink-feature-1612549025484475000",
+ "SchemaVersion": 1,
+ "Module": "example/service/s3/usingPrivateLink",
+ "Type": "feature",
+ "Description": "adds example to use s3 vpc endpoint interface",
+ "MinVersion": "",
+ "AffectedModules": null
+}

.changes/next-release/sdk-feature-1612548857119143000.json

@@ -0,0 +1,9 @@
+{
+ "ID": "sdk-feature-1612548857119143000",
+ "SchemaVersion": 1,
+ "Module": "/",
+ "Type": "feature",
+ "Description": "support to add endpoint source on context. Adds getter/setter for the same",
+ "MinVersion": "",
+ "AffectedModules": null
+}

.changes/next-release/service.internal.s3shared-feature-1612556486110454000.json

@@ -0,0 +1,9 @@
+{
+ "ID": "service.internal.s3shared-feature-1612556486110454000",
+ "SchemaVersion": 1,
+ "Module": "service/internal/s3shared",
+ "Type": "feature",
+ "Description": "adds support for s3 vpc endpoint interface",
+ "MinVersion": "",
+ "AffectedModules": null
+}

.changes/next-release/service.s3-feature-1612549083735299000.json

@@ -0,0 +1,9 @@
+{
+ "ID": "service.s3-feature-1612549083735299000",
+ "SchemaVersion": 1,
+ "Module": "service/s3",
+ "Type": "feature",
+ "Description": "adds support for s3 vpc endpoint interface",
+ "MinVersion": "",
+ "AffectedModules": null
+}

.changes/next-release/service.s3control-feature-1612549100705399000.json

@@ -0,0 +1,9 @@
+{
+ "ID": "service.s3control-feature-1612549100705399000",
+ "SchemaVersion": 1,
+ "Module": "service/s3control",
+ "Type": "feature",
+ "Description": "adds support for s3 vpc endpoint interface",
+ "MinVersion": "",
+ "AffectedModules": null
+}

aws/middleware/metadata.go

@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"context"
+	"github.com/aws/aws-sdk-go-v2/aws"
 
 	"github.com/aws/smithy-go/middleware"
 )
@@ -150,3 +151,17 @@ func setOperationName(ctx context.Context, value string) context.Context {
 func SetPartitionID(ctx context.Context, value string) context.Context {
 	return middleware.WithStackValue(ctx, partitionIDKey{}, value)
 }
+
+// EndpointSource key
+type endpointSourceKey struct{}
+
+// GetEndpointSource returns an endpoint source if set on context
+func GetEndpointSource(ctx context.Context) (v aws.EndpointSource) {
+	v, _ = middleware.GetStackValue(ctx, endpointSourceKey{}).(aws.EndpointSource)
+	return v
+}
+
+// SetEndpointSource sets endpoint source on context
+func SetEndpointSource(ctx context.Context, value aws.EndpointSource) context.Context {
+	return middleware.WithStackValue(ctx, endpointSourceKey{}, value)
+}

codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointGenerator.java

@@ -297,6 +297,10 @@ private void generateMiddlewareResolverBody(GoStackStepMiddlewareGenerator g, Go
             });
             w.write("ctx = awsmiddleware.SetSigningName(ctx, signingName)");
         });
+
+        // set endoint source on context
+        w.write("ctx = awsmiddleware.SetEndpointSource(ctx, endpoint.Source)");
+        // set host-name immutable on context
         w.write("ctx = smithyhttp.SetHostnameImmutable(ctx, endpoint.HostnameImmutable)");
         // set signing region on context
         w.write("ctx = awsmiddleware.SetSigningRegion(ctx, endpoint.SigningRegion)");

example/service/s3/usingPrivateLink/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

example/service/s3/usingPrivateLink/README.md

@@ -0,0 +1,42 @@
+# Example
+
+This example demonstrates how you can use the AWS SDK for Go V2's Amazon S3 client 
+to use AWS PrivateLink for Amazon S3.
+
+# Usage
+
+## How to build vpc endpoint url
+
+To access S3 bucket data using the s3 interface endpoints, prefix the vpc
+endpoint with `bucket`. For eg, use endpoint url as `https://bucket.vpce-0xxxxxxx-xxx8xxg.s3.us-west-2.vpce.amazonaws.com`
+to access S3 bucket data via the associated vpc endpoint. 
+
+To access S3 access point data using the s3 interface endpoints, prefix the vpc
+endpoint with `accesspoint`. For eg, use endpoint url as `https://accesspoint.vpce-0xxxxxxx-xxxx8xxg.s3.us-west-2.vpce.amazonaws.com`
+to access S3 access point data via the associated vpc endpoint.
+
+To work with S3 control using the s3 interface endpoints, prefix the vpc endpoint
+with `control`. For eg, use endpoint url as `https://control.vpce-0xxxxxxx-xxx8xxg.s3.us-west-2.vpce.amazonaws.com`
+to use S3 Control operations with the associated vpc endpoint. 
+
+## How to use the built vpc endpoint url
+
+Provide the vpc endpoint url (built as per instructions above) to the SDK by providing a custom endpoint resolver on 
+client config or as a part of request options. The VPC endpoint url should be provided as a custom endpoint, 
+which means the Endpoint source should be set as EndpointSourceCustom. 
+
+You can use client's `EndpointResolverFromURL` utility which by default sets the Endpoint source as Custom source.
+Note that the SDK may mutate the vpc endpoint as per the input provided to work with ARNs, unless you explicitly set
+HostNameImmutable property for the endpoint.
+
+The example will create s3 client's that use appropriate vpc endpoint url. The example 
+will then create a bucket of the name provided in code. Replace the value of
+the `accountID` const with the account ID for your AWS account. The
+`vpcBucketEndpointUrl`, `vpcAccesspointEndpoint`, `vpcControlEndpoint`, `bucket`,
+`keyName`, and `accessPoint` const variables need to be updated to match the name
+of the appropriate vpc endpoint, Bucket, Object Key, and Access Point that will be
+created by the example.
+
+```sh
+ AWS_REGION=<region> go run usingPrivateLink.go
+ ```

example/service/s3/usingPrivateLink/go.mod

@@ -0,0 +1,30 @@
+module github.com/aws/aws-sdk-go-v2/example/service/s3/usingPrivateLink
+
+go 1.15
+
+require (
+	github.com/aws/aws-sdk-go-v2 v1.1.0
+	github.com/aws/aws-sdk-go-v2/config v1.0.0
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.0.0
+	github.com/aws/aws-sdk-go-v2/service/s3control v1.0.0
+)
+
+replace github.com/aws/aws-sdk-go-v2/config => ../../../../config/
+
+replace github.com/aws/aws-sdk-go-v2/service/s3 => ../../../../service/s3/
+
+replace github.com/aws/aws-sdk-go-v2/service/s3control => ../../../../service/s3control/
+
+replace github.com/aws/aws-sdk-go-v2 => ../../../../
+
+replace github.com/aws/aws-sdk-go-v2/credentials => ../../../../credentials/
+
+replace github.com/aws/aws-sdk-go-v2/feature/ec2/imds => ../../../../feature/ec2/imds/
+
+replace github.com/aws/aws-sdk-go-v2/service/sts => ../../../../service/sts/
+
+replace github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding => ../../../../service/internal/accept-encoding/
+
+replace github.com/aws/aws-sdk-go-v2/service/internal/s3shared => ../../../../service/internal/s3shared/
+
+replace github.com/aws/aws-sdk-go-v2/service/internal/presigned-url => ../../../../service/internal/presigned-url/