Skip to content

Commit 3983d99

Browse files
authored
feat(aws-android-sdk-core): update models to latest (#3282)
1 parent 106a729 commit 3983d99

File tree

9 files changed

+299
-318
lines changed

9 files changed

+299
-318
lines changed

aws-android-sdk-core/src/main/java/com/amazonaws/services/securitytoken/AWSSecurityTokenService.java

Lines changed: 103 additions & 109 deletions
Large diffs are not rendered by default.

aws-android-sdk-core/src/main/java/com/amazonaws/services/securitytoken/AWSSecurityTokenServiceClient.java

Lines changed: 103 additions & 109 deletions
Large diffs are not rendered by default.

aws-android-sdk-core/src/main/java/com/amazonaws/services/securitytoken/model/AssumeRoleRequest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@
6262
* >Session Policies</a> in the <i>IAM User Guide</i>.
6363
* </p>
6464
* <p>
65-
* When you create a role, you create two policies: A role trust policy that
66-
* specifies <i>who</i> can assume the role and a permissions policy that
65+
* When you create a role, you create two policies: a role trust policy that
66+
* specifies <i>who</i> can assume the role, and a permissions policy that
6767
* specifies <i>what</i> can be done with the role. You specify the trusted
68-
* principal who is allowed to assume the role in the role trust policy.
68+
* principal that is allowed to assume the role in the role trust policy.
6969
* </p>
7070
* <p>
7171
* To assume a role from a different account, your Amazon Web Services account
@@ -75,7 +75,7 @@
7575
* </p>
7676
* <p>
7777
* A user who wants to access a role in a different account must also have
78-
* permissions that are delegated from the user account administrator. The
78+
* permissions that are delegated from the account administrator. The
7979
* administrator must attach a policy that allows the user to call
8080
* <code>AssumeRole</code> for the ARN of the role in the other account.
8181
* </p>

aws-android-sdk-core/src/main/java/com/amazonaws/services/securitytoken/model/AssumeRoleWithSAMLResult.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public class AssumeRoleWithSAMLResult implements Serializable {
125125
* </ul>
126126
* <p>
127127
* The combination of <code>NameQualifier</code> and <code>Subject</code>
128-
* can be used to uniquely identify a federated user.
128+
* can be used to uniquely identify a user.
129129
* </p>
130130
* <p>
131131
* The following pseudocode shows how the hash value is calculated:
@@ -680,7 +680,7 @@ public AssumeRoleWithSAMLResult withAudience(String audience) {
680680
* </ul>
681681
* <p>
682682
* The combination of <code>NameQualifier</code> and <code>Subject</code>
683-
* can be used to uniquely identify a federated user.
683+
* can be used to uniquely identify a user.
684684
* </p>
685685
* <p>
686686
* The following pseudocode shows how the hash value is calculated:
@@ -712,8 +712,7 @@ public AssumeRoleWithSAMLResult withAudience(String audience) {
712712
* </ul>
713713
* <p>
714714
* The combination of <code>NameQualifier</code> and
715-
* <code>Subject</code> can be used to uniquely identify a federated
716-
* user.
715+
* <code>Subject</code> can be used to uniquely identify a user.
717716
* </p>
718717
* <p>
719718
* The following pseudocode shows how the hash value is calculated:
@@ -749,7 +748,7 @@ public String getNameQualifier() {
749748
* </ul>
750749
* <p>
751750
* The combination of <code>NameQualifier</code> and <code>Subject</code>
752-
* can be used to uniquely identify a federated user.
751+
* can be used to uniquely identify a user.
753752
* </p>
754753
* <p>
755754
* The following pseudocode shows how the hash value is calculated:
@@ -781,8 +780,7 @@ public String getNameQualifier() {
781780
* </ul>
782781
* <p>
783782
* The combination of <code>NameQualifier</code> and
784-
* <code>Subject</code> can be used to uniquely identify a
785-
* federated user.
783+
* <code>Subject</code> can be used to uniquely identify a user.
786784
* </p>
787785
* <p>
788786
* The following pseudocode shows how the hash value is
@@ -819,7 +817,7 @@ public void setNameQualifier(String nameQualifier) {
819817
* </ul>
820818
* <p>
821819
* The combination of <code>NameQualifier</code> and <code>Subject</code>
822-
* can be used to uniquely identify a federated user.
820+
* can be used to uniquely identify a user.
823821
* </p>
824822
* <p>
825823
* The following pseudocode shows how the hash value is calculated:
@@ -854,8 +852,7 @@ public void setNameQualifier(String nameQualifier) {
854852
* </ul>
855853
* <p>
856854
* The combination of <code>NameQualifier</code> and
857-
* <code>Subject</code> can be used to uniquely identify a
858-
* federated user.
855+
* <code>Subject</code> can be used to uniquely identify a user.
859856
* </p>
860857
* <p>
861858
* The following pseudocode shows how the hash value is

aws-android-sdk-core/src/main/java/com/amazonaws/services/securitytoken/model/AssumeRoleWithWebIdentityRequest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@
4141
* </p>
4242
* <p>
4343
* To learn more about Amazon Cognito, see <a href=
44-
* "https://docs.aws.amazon.com/mobile/sdkforandroid/developerguide/cognito-auth.html#d0e840"
45-
* >Amazon Cognito Overview</a> in <i>Amazon Web Services SDK for Android
46-
* Developer Guide</i> and <a href=
47-
* "https://docs.aws.amazon.com/mobile/sdkforios/developerguide/cognito-auth.html#d0e664"
48-
* >Amazon Cognito Overview</a> in the <i>Amazon Web Services SDK for iOS
49-
* Developer Guide</i>.
44+
* "https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-identity.html"
45+
* >Amazon Cognito identity pools</a> in <i>Amazon Cognito Developer Guide</i>.
5046
* </p>
5147
* </note>
5248
* <p>

aws-android-sdk-core/src/main/java/com/amazonaws/services/securitytoken/model/GetCallerIdentityRequest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@
2727
* <note>
2828
* <p>
2929
* No permissions are required to perform this operation. If an administrator
30-
* adds a policy to your IAM user or role that explicitly denies access to the
30+
* attaches a policy to your identity that explicitly denies access to the
3131
* <code>sts:GetCallerIdentity</code> action, you can still perform this
3232
* operation. Permissions are not required because the same information is
33-
* returned when an IAM user or role is denied access. To view an example
34-
* response, see <a href=
33+
* returned when access is denied. To view an example response, see <a href=
3534
* "https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_access-denied-delete-mfa"
3635
* >I Am Not Authorized to Perform: iam:DeleteVirtualMFADevice</a> in the <i>IAM
3736
* User Guide</i>.

aws-android-sdk-core/src/main/java/com/amazonaws/services/securitytoken/model/GetFederationTokenRequest.java

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
/**
2323
* <p>
2424
* Returns a set of temporary security credentials (consisting of an access key
25-
* ID, a secret access key, and a security token) for a federated user. A
26-
* typical use is in a proxy application that gets temporary security
27-
* credentials on behalf of distributed applications inside a corporate network.
25+
* ID, a secret access key, and a security token) for a user. A typical use is
26+
* in a proxy application that gets temporary security credentials on behalf of
27+
* distributed applications inside a corporate network.
28+
* </p>
29+
* <p>
2830
* You must call the <code>GetFederationToken</code> operation using the
2931
* long-term security credentials of an IAM user. As a result, this call is
30-
* appropriate in contexts where those credentials can be safely stored, usually
32+
* appropriate in contexts where those credentials can be safeguarded, usually
3133
* in a server-based application. For a comparison of
3234
* <code>GetFederationToken</code> with the other API operations that produce
3335
* temporary credentials, see <a href=
@@ -37,6 +39,15 @@
3739
* >Comparing the Amazon Web Services STS API operations</a> in the <i>IAM User
3840
* Guide</i>.
3941
* </p>
42+
* <p>
43+
* Although it is possible to call <code>GetFederationToken</code> using the
44+
* security credentials of an Amazon Web Services account root user rather than
45+
* an IAM user that you create for the purpose of a proxy application, we do not
46+
* recommend it. For more information, see <a href=
47+
* "https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#lock-away-credentials"
48+
* >Safeguard your root user credentials and don't use them for everyday
49+
* tasks</a> in the <i>IAM User Guide</i>.
50+
* </p>
4051
* <note>
4152
* <p>
4253
* You can create a mobile-based or browser-based app that can authenticate
@@ -50,24 +61,14 @@
5061
* </p>
5162
* </note>
5263
* <p>
53-
* You can also call <code>GetFederationToken</code> using the security
54-
* credentials of an Amazon Web Services account root user, but we do not
55-
* recommend it. Instead, we recommend that you create an IAM user for the
56-
* purpose of the proxy application. Then attach a policy to the IAM user that
57-
* limits federated users to only the actions and resources that they need to
58-
* access. For more information, see <a
59-
* href="https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html"
60-
* >IAM Best Practices</a> in the <i>IAM User Guide</i>.
61-
* </p>
62-
* <p>
6364
* <b>Session duration</b>
6465
* </p>
6566
* <p>
6667
* The temporary credentials are valid for the specified duration, from 900
6768
* seconds (15 minutes) up to a maximum of 129,600 seconds (36 hours). The
6869
* default session duration is 43,200 seconds (12 hours). Temporary credentials
69-
* obtained by using the Amazon Web Services account root user credentials have
70-
* a maximum duration of 3,600 seconds (1 hour).
70+
* obtained by using the root user credentials have a maximum duration of 3,600
71+
* seconds (1 hour).
7172
* </p>
7273
* <p>
7374
* <b>Permissions</b>
@@ -305,10 +306,10 @@ public class GetFederationTokenRequest extends AmazonWebServiceRequest implement
305306
* The duration, in seconds, that the session should last. Acceptable
306307
* durations for federation sessions range from 900 seconds (15 minutes) to
307308
* 129,600 seconds (36 hours), with 43,200 seconds (12 hours) as the
308-
* default. Sessions obtained using Amazon Web Services account root user
309-
* credentials are restricted to a maximum of 3,600 seconds (one hour). If
310-
* the specified duration is longer than one hour, the session obtained by
311-
* using root user credentials defaults to one hour.
309+
* default. Sessions obtained using root user credentials are restricted to
310+
* a maximum of 3,600 seconds (one hour). If the specified duration is
311+
* longer than one hour, the session obtained by using root user credentials
312+
* defaults to one hour.
312313
* </p>
313314
* <p>
314315
* <b>Constraints:</b><br/>
@@ -1351,10 +1352,10 @@ public GetFederationTokenRequest withPolicyArns(
13511352
* The duration, in seconds, that the session should last. Acceptable
13521353
* durations for federation sessions range from 900 seconds (15 minutes) to
13531354
* 129,600 seconds (36 hours), with 43,200 seconds (12 hours) as the
1354-
* default. Sessions obtained using Amazon Web Services account root user
1355-
* credentials are restricted to a maximum of 3,600 seconds (one hour). If
1356-
* the specified duration is longer than one hour, the session obtained by
1357-
* using root user credentials defaults to one hour.
1355+
* default. Sessions obtained using root user credentials are restricted to
1356+
* a maximum of 3,600 seconds (one hour). If the specified duration is
1357+
* longer than one hour, the session obtained by using root user credentials
1358+
* defaults to one hour.
13581359
* </p>
13591360
* <p>
13601361
* <b>Constraints:</b><br/>
@@ -1364,11 +1365,11 @@ public GetFederationTokenRequest withPolicyArns(
13641365
* The duration, in seconds, that the session should last.
13651366
* Acceptable durations for federation sessions range from 900
13661367
* seconds (15 minutes) to 129,600 seconds (36 hours), with 43,200
1367-
* seconds (12 hours) as the default. Sessions obtained using Amazon
1368-
* Web Services account root user credentials are restricted to a
1369-
* maximum of 3,600 seconds (one hour). If the specified duration is
1370-
* longer than one hour, the session obtained by using root user
1371-
* credentials defaults to one hour.
1368+
* seconds (12 hours) as the default. Sessions obtained using root
1369+
* user credentials are restricted to a maximum of 3,600 seconds
1370+
* (one hour). If the specified duration is longer than one hour,
1371+
* the session obtained by using root user credentials defaults to
1372+
* one hour.
13721373
* </p>
13731374
*/
13741375
public Integer getDurationSeconds() {
@@ -1380,10 +1381,10 @@ public Integer getDurationSeconds() {
13801381
* The duration, in seconds, that the session should last. Acceptable
13811382
* durations for federation sessions range from 900 seconds (15 minutes) to
13821383
* 129,600 seconds (36 hours), with 43,200 seconds (12 hours) as the
1383-
* default. Sessions obtained using Amazon Web Services account root user
1384-
* credentials are restricted to a maximum of 3,600 seconds (one hour). If
1385-
* the specified duration is longer than one hour, the session obtained by
1386-
* using root user credentials defaults to one hour.
1384+
* default. Sessions obtained using root user credentials are restricted to
1385+
* a maximum of 3,600 seconds (one hour). If the specified duration is
1386+
* longer than one hour, the session obtained by using root user credentials
1387+
* defaults to one hour.
13871388
* </p>
13881389
* <p>
13891390
* <b>Constraints:</b><br/>
@@ -1394,10 +1395,10 @@ public Integer getDurationSeconds() {
13941395
* Acceptable durations for federation sessions range from 900
13951396
* seconds (15 minutes) to 129,600 seconds (36 hours), with
13961397
* 43,200 seconds (12 hours) as the default. Sessions obtained
1397-
* using Amazon Web Services account root user credentials are
1398-
* restricted to a maximum of 3,600 seconds (one hour). If the
1399-
* specified duration is longer than one hour, the session
1400-
* obtained by using root user credentials defaults to one hour.
1398+
* using root user credentials are restricted to a maximum of
1399+
* 3,600 seconds (one hour). If the specified duration is longer
1400+
* than one hour, the session obtained by using root user
1401+
* credentials defaults to one hour.
14011402
* </p>
14021403
*/
14031404
public void setDurationSeconds(Integer durationSeconds) {
@@ -1409,10 +1410,10 @@ public void setDurationSeconds(Integer durationSeconds) {
14091410
* The duration, in seconds, that the session should last. Acceptable
14101411
* durations for federation sessions range from 900 seconds (15 minutes) to
14111412
* 129,600 seconds (36 hours), with 43,200 seconds (12 hours) as the
1412-
* default. Sessions obtained using Amazon Web Services account root user
1413-
* credentials are restricted to a maximum of 3,600 seconds (one hour). If
1414-
* the specified duration is longer than one hour, the session obtained by
1415-
* using root user credentials defaults to one hour.
1413+
* default. Sessions obtained using root user credentials are restricted to
1414+
* a maximum of 3,600 seconds (one hour). If the specified duration is
1415+
* longer than one hour, the session obtained by using root user credentials
1416+
* defaults to one hour.
14161417
* </p>
14171418
* <p>
14181419
* Returns a reference to this object so that method calls can be chained
@@ -1426,10 +1427,10 @@ public void setDurationSeconds(Integer durationSeconds) {
14261427
* Acceptable durations for federation sessions range from 900
14271428
* seconds (15 minutes) to 129,600 seconds (36 hours), with
14281429
* 43,200 seconds (12 hours) as the default. Sessions obtained
1429-
* using Amazon Web Services account root user credentials are
1430-
* restricted to a maximum of 3,600 seconds (one hour). If the
1431-
* specified duration is longer than one hour, the session
1432-
* obtained by using root user credentials defaults to one hour.
1430+
* using root user credentials are restricted to a maximum of
1431+
* 3,600 seconds (one hour). If the specified duration is longer
1432+
* than one hour, the session obtained by using root user
1433+
* credentials defaults to one hour.
14331434
* </p>
14341435
* @return A reference to this updated object so that method calls can be
14351436
* chained together.

0 commit comments

Comments
 (0)