Skip to content

Commit 439c287

Browse files
fulghumfulghum
committed
'Version 1.3.26 of the AWS Java SDK'
1 parent e348de5 commit 439c287

20 files changed

Lines changed: 1895 additions & 169 deletions

‎META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: AWS SDK for Java
44
Bundle-SymbolicName: com.amazonaws.sdk;singleton:=true
5-
Bundle-Version: 1.3.25
5+
Bundle-Version: 1.3.26
66
Bundle-Vendor: Amazon Technologies, Inc
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
88
Require-Bundle: org.apache.commons.codec;bundle-version="1.3.0",

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>aws-java-sdk</artifactId>
77
<packaging>jar</packaging>
88
<name>AWS SDK for Java</name>
9-
<version>1.3.25</version>
9+
<version>1.3.26</version>
1010
<description>The Amazon Web Services SDK for Java provides Java APIs for building software on AWS’ cost-effective, scalable, and reliable infrastructure products. The AWS Java SDK allows developers to code against APIs for all of Amazon's infrastructure web services (Amazon S3, Amazon EC2, Amazon SQS, Amazon Relational Database Service, Amazon AutoScaling, etc).</description>
1111
<url>http://aws.amazon.com/sdkforjava</url>
1212

‎src/main/java/com/amazonaws/services/autoscaling/model/CreateLaunchConfigurationRequest.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ public class CreateLaunchConfigurationRequest extends AmazonWebServiceRequest {
171171
*/
172172
private String iamInstanceProfile;
173173

174+
private Boolean ebsOptimized;
175+
174176
/**
175177
* The name of the launch configuration to create.
176178
* <p>
@@ -1038,6 +1040,49 @@ public CreateLaunchConfigurationRequest withIamInstanceProfile(String iamInstanc
10381040
}
10391041

10401042

1043+
/**
1044+
* Returns the value of the EbsOptimized property for this object.
1045+
*
1046+
* @return The value of the EbsOptimized property for this object.
1047+
*/
1048+
public Boolean isEbsOptimized() {
1049+
return ebsOptimized;
1050+
}
1051+
1052+
/**
1053+
* Sets the value of the EbsOptimized property for this object.
1054+
*
1055+
* @param ebsOptimized The new value for the EbsOptimized property for this object.
1056+
*/
1057+
public void setEbsOptimized(Boolean ebsOptimized) {
1058+
this.ebsOptimized = ebsOptimized;
1059+
}
1060+
1061+
/**
1062+
* Sets the value of the EbsOptimized property for this object.
1063+
* <p>
1064+
* Returns a reference to this object so that method calls can be chained together.
1065+
*
1066+
* @param ebsOptimized The new value for the EbsOptimized property for this object.
1067+
*
1068+
* @return A reference to this updated object so that method calls can be chained
1069+
* together.
1070+
*/
1071+
public CreateLaunchConfigurationRequest withEbsOptimized(Boolean ebsOptimized) {
1072+
this.ebsOptimized = ebsOptimized;
1073+
return this;
1074+
}
1075+
1076+
1077+
/**
1078+
* Returns the value of the EbsOptimized property for this object.
1079+
*
1080+
* @return The value of the EbsOptimized property for this object.
1081+
*/
1082+
public Boolean getEbsOptimized() {
1083+
return ebsOptimized;
1084+
}
1085+
10411086
/**
10421087
* Returns a string representation of this object; useful for testing and
10431088
* debugging.
@@ -1062,6 +1107,7 @@ public String toString() {
10621107
if (instanceMonitoring != null) sb.append("InstanceMonitoring: " + instanceMonitoring + ", ");
10631108
if (spotPrice != null) sb.append("SpotPrice: " + spotPrice + ", ");
10641109
if (iamInstanceProfile != null) sb.append("IamInstanceProfile: " + iamInstanceProfile + ", ");
1110+
if (ebsOptimized != null) sb.append("EbsOptimized: " + ebsOptimized + ", ");
10651111
sb.append("}");
10661112
return sb.toString();
10671113
}
@@ -1083,6 +1129,7 @@ public int hashCode() {
10831129
hashCode = prime * hashCode + ((getInstanceMonitoring() == null) ? 0 : getInstanceMonitoring().hashCode());
10841130
hashCode = prime * hashCode + ((getSpotPrice() == null) ? 0 : getSpotPrice().hashCode());
10851131
hashCode = prime * hashCode + ((getIamInstanceProfile() == null) ? 0 : getIamInstanceProfile().hashCode());
1132+
hashCode = prime * hashCode + ((isEbsOptimized() == null) ? 0 : isEbsOptimized().hashCode());
10861133
return hashCode;
10871134
}
10881135

@@ -1118,6 +1165,8 @@ public boolean equals(Object obj) {
11181165
if (other.getSpotPrice() != null && other.getSpotPrice().equals(this.getSpotPrice()) == false) return false;
11191166
if (other.getIamInstanceProfile() == null ^ this.getIamInstanceProfile() == null) return false;
11201167
if (other.getIamInstanceProfile() != null && other.getIamInstanceProfile().equals(this.getIamInstanceProfile()) == false) return false;
1168+
if (other.isEbsOptimized() == null ^ this.isEbsOptimized() == null) return false;
1169+
if (other.isEbsOptimized() != null && other.isEbsOptimized().equals(this.isEbsOptimized()) == false) return false;
11211170
return true;
11221171
}
11231172

‎src/main/java/com/amazonaws/services/autoscaling/model/LaunchConfiguration.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ public class LaunchConfiguration {
136136
*/
137137
private java.util.Date createdTime;
138138

139+
private Boolean ebsOptimized;
140+
139141
/**
140142
* Specifies the name of the launch configuration.
141143
* <p>
@@ -839,6 +841,49 @@ public LaunchConfiguration withCreatedTime(java.util.Date createdTime) {
839841
}
840842

841843

844+
/**
845+
* Returns the value of the EbsOptimized property for this object.
846+
*
847+
* @return The value of the EbsOptimized property for this object.
848+
*/
849+
public Boolean isEbsOptimized() {
850+
return ebsOptimized;
851+
}
852+
853+
/**
854+
* Sets the value of the EbsOptimized property for this object.
855+
*
856+
* @param ebsOptimized The new value for the EbsOptimized property for this object.
857+
*/
858+
public void setEbsOptimized(Boolean ebsOptimized) {
859+
this.ebsOptimized = ebsOptimized;
860+
}
861+
862+
/**
863+
* Sets the value of the EbsOptimized property for this object.
864+
* <p>
865+
* Returns a reference to this object so that method calls can be chained together.
866+
*
867+
* @param ebsOptimized The new value for the EbsOptimized property for this object.
868+
*
869+
* @return A reference to this updated object so that method calls can be chained
870+
* together.
871+
*/
872+
public LaunchConfiguration withEbsOptimized(Boolean ebsOptimized) {
873+
this.ebsOptimized = ebsOptimized;
874+
return this;
875+
}
876+
877+
878+
/**
879+
* Returns the value of the EbsOptimized property for this object.
880+
*
881+
* @return The value of the EbsOptimized property for this object.
882+
*/
883+
public Boolean getEbsOptimized() {
884+
return ebsOptimized;
885+
}
886+
842887
/**
843888
* Returns a string representation of this object; useful for testing and
844889
* debugging.
@@ -865,6 +910,7 @@ public String toString() {
865910
if (spotPrice != null) sb.append("SpotPrice: " + spotPrice + ", ");
866911
if (iamInstanceProfile != null) sb.append("IamInstanceProfile: " + iamInstanceProfile + ", ");
867912
if (createdTime != null) sb.append("CreatedTime: " + createdTime + ", ");
913+
if (ebsOptimized != null) sb.append("EbsOptimized: " + ebsOptimized + ", ");
868914
sb.append("}");
869915
return sb.toString();
870916
}
@@ -888,6 +934,7 @@ public int hashCode() {
888934
hashCode = prime * hashCode + ((getSpotPrice() == null) ? 0 : getSpotPrice().hashCode());
889935
hashCode = prime * hashCode + ((getIamInstanceProfile() == null) ? 0 : getIamInstanceProfile().hashCode());
890936
hashCode = prime * hashCode + ((getCreatedTime() == null) ? 0 : getCreatedTime().hashCode());
937+
hashCode = prime * hashCode + ((isEbsOptimized() == null) ? 0 : isEbsOptimized().hashCode());
891938
return hashCode;
892939
}
893940

@@ -927,6 +974,8 @@ public boolean equals(Object obj) {
927974
if (other.getIamInstanceProfile() != null && other.getIamInstanceProfile().equals(this.getIamInstanceProfile()) == false) return false;
928975
if (other.getCreatedTime() == null ^ this.getCreatedTime() == null) return false;
929976
if (other.getCreatedTime() != null && other.getCreatedTime().equals(this.getCreatedTime()) == false) return false;
977+
if (other.isEbsOptimized() == null ^ this.isEbsOptimized() == null) return false;
978+
if (other.isEbsOptimized() != null && other.isEbsOptimized().equals(this.isEbsOptimized()) == false) return false;
930979
return true;
931980
}
932981

‎src/main/java/com/amazonaws/services/autoscaling/model/transform/CreateLaunchConfigurationRequestMarshaller.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ public Request<CreateLaunchConfigurationRequest> marshall(CreateLaunchConfigurat
110110
if (createLaunchConfigurationRequest.getIamInstanceProfile() != null) {
111111
request.addParameter("IamInstanceProfile", StringUtils.fromString(createLaunchConfigurationRequest.getIamInstanceProfile()));
112112
}
113+
if (createLaunchConfigurationRequest.isEbsOptimized() != null) {
114+
request.addParameter("EbsOptimized", StringUtils.fromBoolean(createLaunchConfigurationRequest.isEbsOptimized()));
115+
}
113116

114117

115118
return request;

‎src/main/java/com/amazonaws/services/autoscaling/model/transform/LaunchConfigurationStaxUnmarshaller.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ public LaunchConfiguration unmarshall(StaxUnmarshallerContext context) throws Ex
102102
launchConfiguration.setCreatedTime(DateStaxUnmarshaller.getInstance().unmarshall(context));
103103
continue;
104104
}
105+
if (context.testExpression("EbsOptimized", targetDepth)) {
106+
launchConfiguration.setEbsOptimized(BooleanStaxUnmarshaller.getInstance().unmarshall(context));
107+
continue;
108+
}
105109
} else if (xmlEvent.isEndElement()) {
106110
if (context.getCurrentDepth() < originalDepth) {
107111
return launchConfiguration;

‎src/main/java/com/amazonaws/services/securitytoken/AWSSecurityTokenService.java‎

Lines changed: 75 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ public interface AWSSecurityTokenService {
7878
* an AWS account or IAM user. The credentials consist of an Access Key
7979
* ID, a Secret Access Key, and a security token. These credentials are
8080
* valid for the specified duration only. The session duration for IAM
81-
* users can be between one and 36 hours, with a default of 12 hours. The
82-
* session duration for AWS account owners is restricted to one hour.
83-
* Providing the AWS Multi-Factor Authentication (MFA) device serial
84-
* number and the token code is optional.
81+
* users can be between 15 minutes and 36 hours, with a default of 12
82+
* hours. The session duration for AWS account owners is restricted to a
83+
* maximum of one hour. Providing the AWS Multi-Factor Authentication
84+
* (MFA) device serial number and the token code is optional.
8585
* </p>
8686
* <p>
8787
* For more information about using GetSessionToken to create temporary
@@ -116,8 +116,9 @@ public GetSessionTokenResult getSessionToken(GetSessionTokenRequest getSessionTo
116116
* for a federated user with the user name and policy specified in the
117117
* request. The credentials consist of an Access Key ID, a Secret Access
118118
* Key, and a security token. Credentials created by IAM users are valid
119-
* for the specified duration, between one and 36 hours; credentials
120-
* created using account credentials last one hour.
119+
* for the specified duration, between 15 minutes and 36 hours;
120+
* credentials created using account credentials have a maximum duration
121+
* of one hour.
121122
* </p>
122123
* <p>
123124
* The federated user who holds these credentials has any permissions
@@ -127,12 +128,12 @@ public GetSessionTokenResult getSessionToken(GetSessionTokenRequest getSessionTo
127128
* Amazon Resource Name (ARN). For more information about how token
128129
* permissions work, see <a
129130
* ocs.amazonwebservices.com/IAM/latest/UserGuide/TokenPermissions.html">
130-
* Controlling Permissions in Temporary Credentials </a> in <i>Using AWS
131-
* Identity and Access Management</i> . For information about using
132-
* GetFederationToken to create temporary credentials, see <a
131+
* Controlling Permissions in Temporary Credentials </a> in <i>Using
132+
* IAM</i> . For information about using GetFederationToken to create
133+
* temporary credentials, see <a
133134
* cs.amazonwebservices.com/IAM/latest/UserGuide/CreatingFedTokens.html">
134135
* Creating Temporary Credentials to Enable Access for Federated Users
135-
* </a> in <i>Using AWS Identity and Access Management</i> .
136+
* </a> in <i>Using IAM</i> .
136137
* </p>
137138
*
138139
* @param getFederationTokenRequest Container for the necessary
@@ -156,16 +157,76 @@ public GetSessionTokenResult getSessionToken(GetSessionTokenRequest getSessionTo
156157
public GetFederationTokenResult getFederationToken(GetFederationTokenRequest getFederationTokenRequest)
157158
throws AmazonServiceException, AmazonClientException;
158159

160+
/**
161+
* <p>
162+
* The <code>AssumeRole</code> action returns a set of temporary
163+
* security credentials that you can use to access resources that are
164+
* defined in the role's policy. The returned credentials consist of an
165+
* Access Key ID, a Secret Access Key, and a security token.
166+
* </p>
167+
* <p>
168+
* <b>Important:</b> Only IAM users can assume a role. If you use AWS
169+
* account credentials to call AssumeRole, access is denied.
170+
* </p>
171+
* <p>
172+
* The credentials are valid for the duration that you specified when
173+
* calling <code>AssumeRole</code> , which can be from 15 minutes to 1
174+
* hour.
175+
* </p>
176+
* <p>
177+
* When you assume a role, you have the privileges that are defined in
178+
* the role. You can further restrict the privileges by passing a policy
179+
* when calling <code>AssumeRole</code> .
180+
*
181+
* </p>
182+
* <p>
183+
* To assume a role, you must be an IAM user from a trusted entity and
184+
* have permission to call <code>AssumeRole</code> .
185+
* Trusted entites are defined when the IAM role is created.
186+
* Permission to call <code>AssumeRole</code> is defined in your or your
187+
* group's IAM policy.
188+
* </p>
189+
* <p>
190+
* </p>
191+
* <p>
192+
* </p>
193+
* <p>
194+
* </p>
195+
* <p>
196+
* </p>
197+
* <p>
198+
* </p>
199+
*
200+
* @param assumeRoleRequest Container for the necessary parameters to
201+
* execute the AssumeRole service method on AWSSecurityTokenService.
202+
*
203+
* @return The response from the AssumeRole service method, as returned
204+
* by AWSSecurityTokenService.
205+
*
206+
* @throws PackedPolicyTooLargeException
207+
* @throws MalformedPolicyDocumentException
208+
*
209+
* @throws AmazonClientException
210+
* If any internal errors are encountered inside the client while
211+
* attempting to make the request or handle the response. For example
212+
* if a network connection is not available.
213+
* @throws AmazonServiceException
214+
* If an error response is returned by AWSSecurityTokenService indicating
215+
* either a problem with the data in the request, or a server side issue.
216+
*/
217+
public AssumeRoleResult assumeRole(AssumeRoleRequest assumeRoleRequest)
218+
throws AmazonServiceException, AmazonClientException;
219+
159220
/**
160221
* <p>
161222
* The GetSessionToken action returns a set of temporary credentials for
162223
* an AWS account or IAM user. The credentials consist of an Access Key
163224
* ID, a Secret Access Key, and a security token. These credentials are
164225
* valid for the specified duration only. The session duration for IAM
165-
* users can be between one and 36 hours, with a default of 12 hours. The
166-
* session duration for AWS account owners is restricted to one hour.
167-
* Providing the AWS Multi-Factor Authentication (MFA) device serial
168-
* number and the token code is optional.
226+
* users can be between 15 minutes and 36 hours, with a default of 12
227+
* hours. The session duration for AWS account owners is restricted to a
228+
* maximum of one hour. Providing the AWS Multi-Factor Authentication
229+
* (MFA) device serial number and the token code is optional.
169230
* </p>
170231
* <p>
171232
* For more information about using GetSessionToken to create temporary

0 commit comments

Comments
 (0)