Merge pull request #1974 from aws/staging/73f1806e-8a55-47f9-82f0-38cad6539c58

Pull request: release <- staging/73f1806e-8a55-47f9-82f0-38cad6539c58

Author: aws-sdk-java-automation

.changes/2.17.159.json

@@ -0,0 +1,48 @@
+{
+    "version": "2.17.159",
+    "date": "2022-03-29",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Include SDK user-agent in container credential provider calls."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Use the client's profile file and name for instance profile credentials when the default credentials provider is not overridden."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Improve resilience of instance profile credentials provider to short-term outages. Credentials that are close to expiration or expired can still be used to sign calls when the instance metadata service appears to be having issues. Services are now responsible for determining whether the credentials have actually expired."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Moved HttpCredentialsProvider (base class of ContainerCredentialsProvider and InstanceProfileCredentialsProvider) from private to public. This fixes an issue where public classes extended an internal class. Some components of this type were modified to allow it to be public."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Allow services to model structures with mutually exclusive fields (union types). Such structures have additional static constructors and the ability to query for which field is populated. Services which support this feature at launch: accessanalyzer, appconfig, appconfigdata, appmesh, connect, emrcontainers, evidently, grafana, groundstation, healthlake, inspector2, iottwinmaker, migrationhubstrategy, nimble, panorama, proton, rdsdata, redshiftdata, s3control, snowdevicemanagement, ssmincidents, transcribe, wisdom."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Allow specifying the profile file and name used by the instance profile credentials provider."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Organizations",
+            "contributor": "",
+            "description": "This release provides the new CloseAccount API that enables principals in the management account to close any member account within an organization."
+        }
+    ]
+}

.idea/inspectionProfiles/AWS_Java_SDK_2_0.xml

@@ -1,3 +1,19 @@
+# __2.17.159__ __2022-03-29__
+## __AWS Organizations__
+  - ### Features
+    - This release provides the new CloseAccount API that enables principals in the management account to close any member account within an organization.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Allow services to model structures with mutually exclusive fields (union types). Such structures have additional static constructors and the ability to query for which field is populated. Services which support this feature at launch: accessanalyzer, appconfig, appconfigdata, appmesh, connect, emrcontainers, evidently, grafana, groundstation, healthlake, inspector2, iottwinmaker, migrationhubstrategy, nimble, panorama, proton, rdsdata, redshiftdata, s3control, snowdevicemanagement, ssmincidents, transcribe, wisdom.
+    - Allow specifying the profile file and name used by the instance profile credentials provider.
+    - Improve resilience of instance profile credentials provider to short-term outages. Credentials that are close to expiration or expired can still be used to sign calls when the instance metadata service appears to be having issues. Services are now responsible for determining whether the credentials have actually expired.
+    - Include SDK user-agent in container credential provider calls.
+    - Use the client's profile file and name for instance profile credentials when the default credentials provider is not overridden.
+
+  - ### Bugfixes
+    - Moved HttpCredentialsProvider (base class of ContainerCredentialsProvider and InstanceProfileCredentialsProvider) from private to public. This fixes an issue where public classes extended an internal class. Some components of this type were modified to allow it to be public.
+
 # __2.17.158__ __2022-03-28__
 ## __AWS Certificate Manager Private Certificate Authority__
   - ### Features

CHANGELOG.md

@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.17.158</version>
+      <version>2.17.159</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.17.158</version>
+  <version>2.17.159</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.17.158</version>
+  <version>2.17.159</version>
 </dependency>
 ```
 
@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.17.158</version>
+  <version>2.17.159</version>
 </dependency>
 ```
 

README.md

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-tools/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

archetypes/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

aws-sdk-java/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom-internal/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bom/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

bundle/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite-maven-plugin/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-lite/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen-maven-plugin/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.17.158</version>
+        <version>2.17.159</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

codegen/pom.xml

@@ -84,6 +84,7 @@ protected final ShapeModel generateShapeModel(String javaClassName, String shape
         shapeModel.withIsEventStream(shape.isEventstream());
         shapeModel.withIsEvent(shape.isEvent());
         shapeModel.withXmlNamespace(shape.getXmlNamespace());
+        shapeModel.withIsUnion(shape.isUnion());
 
         boolean hasHeaderMember = false;
         boolean hasStatusCodeMember = false;
@@ -188,6 +189,8 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
         memberModel.setEventHeader(c2jMemberDefinition.isEventheader());
         memberModel.setEndpointDiscoveryId(c2jMemberDefinition.isEndpointdiscoveryid());
         memberModel.setXmlAttribute(c2jMemberDefinition.isXmlAttribute());
+        memberModel.setUnionEnumTypeName(namingStrategy.getUnionEnumTypeName(memberModel));
+
 
         // Pass the xmlNameSpace from the member reference
         if (c2jMemberDefinition.getXmlNamespace() != null) {

codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java

@@ -84,6 +84,8 @@ public class MemberModel extends DocumentationModel {
 
     private String beanStyleSetterName;
 
+    private String unionEnumTypeName;
+
     private boolean isJsonValue;
 
     private String timestampFormat;
@@ -481,7 +483,7 @@ public String getDeprecatedSetterDocumentation() {
     public String getDefaultConsumerFluentSetterDocumentation() {
         return (StringUtils.isNotBlank(documentation) ? documentation : defaultSetter().replace("%s", name) + "\n")
                + LF
-               + "This is a convenience that creates an instance of the {@link "
+               + "This is a convenience method that creates an instance of the {@link "
                + variable.getSimpleType()
                + ".Builder} avoiding the need to create one manually via {@link "
                + variable.getSimpleType()
@@ -509,6 +511,13 @@ public String getDefaultConsumerFluentSetterDocumentation() {
                + ")";
     }
 
+    public String getUnionConstructorDocumentation() {
+        return "Create an instance of this class with {@link #" + this.getFluentGetterMethodName() +
+               "()} initialized to the given value." +
+               LF + LF +
+               getSetterDocumentation();
+    }
+
     private String getParamDoc() {
         return LF
                + "@param "
@@ -726,4 +735,12 @@ public String getDeprecatedBeanStyleSetterMethodName() {
     public void setDeprecatedBeanStyleSetterMethodName(String deprecatedBeanStyleSetterMethodName) {
         this.deprecatedBeanStyleSetterMethodName = deprecatedBeanStyleSetterMethodName;
     }
+
+    public String getUnionEnumTypeName() {
+        return unionEnumTypeName;
+    }
+
+    public void setUnionEnumTypeName(String unionEnumTypeName) {
+        this.unionEnumTypeName = unionEnumTypeName;
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.codegen.model.intermediate;
 
+import static software.amazon.awssdk.codegen.internal.Constant.LF;
 import static software.amazon.awssdk.codegen.internal.Constant.REQUEST_CLASS_SUFFIX;
 import static software.amazon.awssdk.codegen.internal.Constant.RESPONSE_CLASS_SUFFIX;
 import static software.amazon.awssdk.codegen.internal.DocumentationUtils.removeFromEnd;
@@ -71,6 +72,8 @@ public class ShapeModel extends DocumentationModel implements HasDeprecation {
 
     private boolean document;
 
+    private boolean union;
+
     public ShapeModel() {
     }
 
@@ -526,6 +529,16 @@ public String getDocumentationShapeName() {
         }
     }
 
+    public String getUnionTypeGetterDocumentation() {
+        return "Retrieve an enum value representing which member of this object is populated. "
+               + LF + LF
+               + "When this class is returned in a service response, this will be {@link Type#UNKNOWN_TO_SDK_VERSION} if the "
+               + "service returned a member that is only known to a newer SDK version."
+               + LF + LF
+               + "When this class is created directly in your code, this will be {@link Type#UNKNOWN_TO_SDK_VERSION} if zero "
+               + "members are set, and {@code null} if more than one member is set.";
+    }
+
     @Override
     public String toString() {
         return shapeName;
@@ -617,4 +630,12 @@ public ShapeModel withIsDocument(boolean document) {
         this.document = document;
         return this;
     }
+
+    public boolean isUnion() {
+        return union;
+    }
+
+    public void withIsUnion(boolean union) {
+        this.union = union;
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java

@@ -74,6 +74,8 @@ public class Shape {
 
     private boolean document;
 
+    private boolean union;
+
     public boolean isFault() {
         return fault;
     }
@@ -318,4 +320,11 @@ public void setDocument(boolean document) {
         this.document = document;
     }
 
+    public boolean isUnion() {
+        return union;
+    }
+
+    public void setUnion(boolean union) {
+        this.union = union;
+    }
 }