Skip to content

Commit 5b1a267

Browse files
aws-sdk-python-automationaws-sdk-python-automation
committed
Merge branch 'develop' into 'update-v2'
2 parents 0848464 + 2c2c0c4 commit 5b1a267

File tree

10 files changed

+190
-24
lines changed

10 files changed

+190
-24
lines changed

‎.changes/1.27.97.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[
2+
{
3+
"category": "``iam``",
4+
"description": "Documentation updates for AWS Identity and Access Management (IAM).",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``iottwinmaker``",
9+
"description": "This release adds support of adding metadata when creating a new scene or updating an existing scene.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``networkmanager``",
14+
"description": "This release includes an update to create-transit-gateway-route-table-attachment, showing example usage for TransitGatewayRouteTableArn.",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``pipes``",
19+
"description": "This release improves validation on the ARNs in the API model",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "``resiliencehub``",
24+
"description": "This release provides customers with the ability to import resources from within an EKS cluster and assess the resiliency of EKS cluster workloads.",
25+
"type": "api-change"
26+
},
27+
{
28+
"category": "``ssm``",
29+
"description": "This Patch Manager release supports creating, updating, and deleting Patch Baselines for AmazonLinux2023, AlmaLinux.",
30+
"type": "api-change"
31+
}
32+
]

‎.changes/1.27.98.json

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
[
2+
{
3+
"category": "eks",
4+
"description": "Add user-alias argument to update-kubeconfig command. Implements `#5164 <https://github.com/aws/aws-cli/issues/5164>`__",
5+
"type": "enhancement"
6+
},
7+
{
8+
"category": "``batch``",
9+
"description": "This feature allows Batch to support configuration of ephemeral storage size for jobs running on FARGATE",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``chime-sdk-identity``",
14+
"description": "AppInstanceBots can be used to add a bot powered by Amazon Lex to chat channels. ExpirationSettings provides automatic resource deletion for AppInstanceUsers.",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``chime-sdk-media-pipelines``",
19+
"description": "This release adds Amazon Chime SDK call analytics. Call analytics include voice analytics, which provides speaker search and voice tone analysis. These capabilities can be used with Amazon Transcribe and Transcribe Call Analytics to generate machine-learning-powered insights from real-time audio.",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "``chime-sdk-messaging``",
24+
"description": "ExpirationSettings provides automatic resource deletion for Channels.",
25+
"type": "api-change"
26+
},
27+
{
28+
"category": "``chime-sdk-voice``",
29+
"description": "This release adds Amazon Chime SDK call analytics. Call analytics include voice analytics, which provides speaker search and voice tone analysis. These capabilities can be used with Amazon Transcribe and Transcribe Call Analytics to generate machine-learning-powered insights from real-time audio.",
30+
"type": "api-change"
31+
},
32+
{
33+
"category": "``codeartifact``",
34+
"description": "Repository CreationTime is added to the CreateRepository and ListRepositories API responses.",
35+
"type": "api-change"
36+
},
37+
{
38+
"category": "``guardduty``",
39+
"description": "Adds AutoEnableOrganizationMembers attribute to DescribeOrganizationConfiguration and UpdateOrganizationConfiguration APIs.",
40+
"type": "api-change"
41+
},
42+
{
43+
"category": "``ivs-realtime``",
44+
"description": "Initial release of the Amazon Interactive Video Service RealTime API.",
45+
"type": "api-change"
46+
},
47+
{
48+
"category": "``mediaconvert``",
49+
"description": "AWS Elemental MediaConvert SDK now supports passthrough of ID3v2 tags for audio inputs to audio-only HLS outputs.",
50+
"type": "api-change"
51+
},
52+
{
53+
"category": "``sagemaker``",
54+
"description": "Amazon SageMaker Autopilot adds two new APIs - CreateAutoMLJobV2 and DescribeAutoMLJobV2. Amazon SageMaker Notebook Instances now supports the ml.geospatial.interactive instance type.",
55+
"type": "api-change"
56+
},
57+
{
58+
"category": "``servicediscovery``",
59+
"description": "Reverted the throttling exception RequestLimitExceeded for AWS Cloud Map APIs introduced in SDK version 1.12.424 2023-03-09 to previous exception specified in the ErrorCode.",
60+
"type": "api-change"
61+
},
62+
{
63+
"category": "``textract``",
64+
"description": "The AnalyzeDocument - Tables feature adds support for new elements in the API: table titles, footers, section titles, summary cells/tables, and table type.",
65+
"type": "api-change"
66+
}
67+
]

‎CHANGELOG.rst

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5072,6 +5072,35 @@ CHANGELOG
50725072
* feature:wizard: Added support for AWS CLI Wizards. See `#3752 <https://github.com/aws/aws-cli/issues/3752>`__.
50735073

50745074

5075+
1.27.98
5076+
=======
5077+
5078+
* enhancement:eks: Add user-alias argument to update-kubeconfig command. Implements `#5164 <https://github.com/aws/aws-cli/issues/5164>`__
5079+
* api-change:``batch``: This feature allows Batch to support configuration of ephemeral storage size for jobs running on FARGATE
5080+
* api-change:``chime-sdk-identity``: AppInstanceBots can be used to add a bot powered by Amazon Lex to chat channels. ExpirationSettings provides automatic resource deletion for AppInstanceUsers.
5081+
* api-change:``chime-sdk-media-pipelines``: This release adds Amazon Chime SDK call analytics. Call analytics include voice analytics, which provides speaker search and voice tone analysis. These capabilities can be used with Amazon Transcribe and Transcribe Call Analytics to generate machine-learning-powered insights from real-time audio.
5082+
* api-change:``chime-sdk-messaging``: ExpirationSettings provides automatic resource deletion for Channels.
5083+
* api-change:``chime-sdk-voice``: This release adds Amazon Chime SDK call analytics. Call analytics include voice analytics, which provides speaker search and voice tone analysis. These capabilities can be used with Amazon Transcribe and Transcribe Call Analytics to generate machine-learning-powered insights from real-time audio.
5084+
* api-change:``codeartifact``: Repository CreationTime is added to the CreateRepository and ListRepositories API responses.
5085+
* api-change:``guardduty``: Adds AutoEnableOrganizationMembers attribute to DescribeOrganizationConfiguration and UpdateOrganizationConfiguration APIs.
5086+
* api-change:``ivs-realtime``: Initial release of the Amazon Interactive Video Service RealTime API.
5087+
* api-change:``mediaconvert``: AWS Elemental MediaConvert SDK now supports passthrough of ID3v2 tags for audio inputs to audio-only HLS outputs.
5088+
* api-change:``sagemaker``: Amazon SageMaker Autopilot adds two new APIs - CreateAutoMLJobV2 and DescribeAutoMLJobV2. Amazon SageMaker Notebook Instances now supports the ml.geospatial.interactive instance type.
5089+
* api-change:``servicediscovery``: Reverted the throttling exception RequestLimitExceeded for AWS Cloud Map APIs introduced in SDK version 1.12.424 2023-03-09 to previous exception specified in the ErrorCode.
5090+
* api-change:``textract``: The AnalyzeDocument - Tables feature adds support for new elements in the API: table titles, footers, section titles, summary cells/tables, and table type.
5091+
5092+
5093+
1.27.97
5094+
=======
5095+
5096+
* api-change:``iam``: Documentation updates for AWS Identity and Access Management (IAM).
5097+
* api-change:``iottwinmaker``: This release adds support of adding metadata when creating a new scene or updating an existing scene.
5098+
* api-change:``networkmanager``: This release includes an update to create-transit-gateway-route-table-attachment, showing example usage for TransitGatewayRouteTableArn.
5099+
* api-change:``pipes``: This release improves validation on the ARNs in the API model
5100+
* api-change:``resiliencehub``: This release provides customers with the ability to import resources from within an EKS cluster and assess the resiliency of EKS cluster workloads.
5101+
* api-change:``ssm``: This Patch Manager release supports creating, updating, and deleting Patch Baselines for AmazonLinux2023, AlmaLinux.
5102+
5103+
50755104
1.27.96
50765105
=======
50775106

‎awscli/customizations/eks/update_kubeconfig.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@ class UpdateKubeconfigCommand(BasicCommand):
9898
'help_text': ("Alias for the cluster context name. "
9999
"Defaults to match cluster ARN."),
100100
'required': False
101+
},
102+
{
103+
'name': 'user-alias',
104+
'help_text': ("Alias for the generated user name. "
105+
"Defaults to match cluster ARN."),
106+
'required': False
101107
}
102108
]
103109

@@ -119,7 +125,7 @@ def _run_main(self, parsed_args, parsed_globals):
119125
parsed_args.role_arn,
120126
parsed_globals)
121127
new_cluster_dict = client.get_cluster_entry()
122-
new_user_dict = client.get_user_entry()
128+
new_user_dict = client.get_user_entry(user_alias=parsed_args.user_alias)
123129

124130
config_selector = KubeconfigSelector(
125131
os.environ.get("KUBECONFIG", ""),
@@ -285,7 +291,7 @@ def get_cluster_entry(self):
285291
("name", arn)
286292
])
287293

288-
def get_user_entry(self):
294+
def get_user_entry(self, user_alias=None):
289295
"""
290296
Return a user entry generated using
291297
the previously obtained description.
@@ -303,7 +309,7 @@ def get_user_entry(self):
303309
cluster_identification_value = cluster_description.get("id")
304310

305311
generated_user = OrderedDict([
306-
("name", self._get_cluster_description().get("arn", "")),
312+
("name", user_alias or self._get_cluster_description().get("arn", "")),
307313
("user", OrderedDict([
308314
("exec", OrderedDict([
309315
("apiVersion", API_VERSION),

‎doc/source/_templates/layout.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{%- extends "!layout.html" %}
22

33
{%- block nav_links %}
4-
<li><a href="{{ pathto(master_doc) }}">Home</a></li>
5-
<li><a href="https://docs.aws.amazon.com/cli/latest/userguide/">User Guide</a></li>
6-
<li><a href="https://forums.aws.amazon.com/forum.jspa?forumID=150">Forum</a></li>
7-
<li><a href="https://github.com/aws/aws-cli">GitHub</a></li>
4+
<li><a class="nav-link" href="{{ pathto(master_doc) }}">Home</a></li>
5+
<li><a class="nav-link" href="https://docs.aws.amazon.com/cli/latest/userguide/">User Guide</a></li>
6+
<li><a class="nav-link" href="https://forums.aws.amazon.com/forum.jspa?forumID=150">Forum</a></li>
7+
<li><a class="nav-link" href="https://github.com/aws/aws-cli">GitHub</a></li>
88
{%- endblock %}
99

1010
{% block ga %}

‎doc/source/_templates/sidebarlogo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p class="logo left-bar-other">
22
<a href="{{ pathto(master_doc) }}">
3-
<img class="logo" src="{{ pathto('_static/logo.png', 1) }}" alt="Logo" height="63" />
3+
<img class="logo" src="{{ pathto('_static/logo.png', 1) }}" alt="Amazon Web Services logo" height="63" />
44
</a>
55
</p>

‎doc/source/guzzle_sphinx_theme/guzzle_sphinx_theme/layout.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
{%- if theme_github_user and theme_github_repo %}
5757
<div class="pull-right" id="github-stars">
5858
<iframe src="https://ghbtns.com/github-btn.html?user={{ theme_github_user }}&repo={{ theme_github_repo }}&type=watch&count=true&size=small"
59-
allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px" sandbox="allow-scripts"></iframe>
59+
allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px" sandbox="allow-scripts"
60+
title="GitHub button showing the number of project stars."></iframe>
6061
</div>
6162
{%- endif %}
6263
</div>

‎doc/source/guzzle_sphinx_theme/guzzle_sphinx_theme/searchbox.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<div id="searchbox" style="display: none">
33
<h3>{{ _('Quick search') }}</h3>
44
<form class="form-search margin-top-1em" action="{{ pathto('search') }}" method="get">
5-
<input type="text" name="q" style="width: 105px" class="input-small search-query" />
5+
<label for="searchbox">Search box</label>
6+
<input id="searchbox" type="search" name="q" style="width: 105px" class="input-small search-query" autocomplete="off" />
67
<button type="submit" class="btn btn-small">Search</button>
78
<input type="hidden" name="check_keywords" value="yes" />
89
<input type="hidden" name="area" value="default" />

‎doc/source/guzzle_sphinx_theme/guzzle_sphinx_theme/static/guzzle.css_t

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,30 @@ div.document {
2222
}
2323

2424
.body {
25-
width: 713px;
25+
width: 74%;
2626
float: right;
27+
word-wrap: break-word;
2728
}
2829

2930
div.related {
3031
display: none;
3132
}
3233

34+
a:link,
35+
a:hover,
36+
a:active {
37+
color: #106C9B;
38+
}
39+
40+
a:visited {
41+
color: #6a329f;
42+
}
43+
3344
a.headerlink {
34-
visibility: hidden;
35-
color: #ddd;
36-
padding: 0 4px;
45+
color: #106C9B;
46+
padding: 0 6px;
3747
text-decoration: none;
48+
font-size: 18px;
3849
}
3950

4051
h1:hover > a.headerlink,
@@ -43,9 +54,6 @@ h3:hover > a.headerlink,
4354
h4:hover > a.headerlink,
4455
h5:hover > a.headerlink,
4556
h6:hover > a.headerlink,
46-
dt:hover > a.headerlink {
47-
visibility: visible;
48-
}
4957

5058
a.headerlink:hover {
5159
color: #444;
@@ -92,6 +100,7 @@ code, pre {
92100
color: #333333;
93101
line-height: 23px;
94102
margin: 20px 0;
103+
white-space: pre-wrap;
95104
}
96105

97106
div.highlight {
@@ -102,6 +111,10 @@ div.highlight {
102111
font-weight: bold;
103112
}
104113

114+
.navbar .nav .nav-link {
115+
color: #000000;
116+
}
117+
105118
[class^="icon-"],
106119
[class*=" icon-"] {
107120
background-image: url("../_static/glyphicons-halflings.png");
@@ -131,6 +144,10 @@ a.internal em {
131144
font-style: normal;
132145
}
133146

147+
label {
148+
width:135px;
149+
}
150+
134151
/* Sphinx sidebar
135152
-------------------------------------------------- */
136153

@@ -200,7 +217,7 @@ div.sphinxsidebar ul ul {
200217
}
201218

202219
div.sphinxsidebar input {
203-
border: 1px solid #ccc;
220+
border: 1px solid #6C6C6C;
204221
font-family: Helvetica, arial, freesans, clean, sans-serif;
205222
font-size: 1em;
206223
}
@@ -261,10 +278,6 @@ table.two-column {
261278
background-color: #fff;
262279
}
263280

264-
.top-links a {
265-
opacity: 0.7;
266-
}
267-
268281
.footer-links {
269282
border-top: 1px solid #ccc;
270283
padding-top: 12px;
@@ -498,8 +511,8 @@ dd div.admonition {
498511
}
499512

500513
div.admonition p.admonition-title {
501-
font-weight: normal;
502-
font-size: 22px;
514+
font-weight: bold;
515+
font-size: 15px;
503516
margin: 0 0 10px 0;
504517
padding: 0;
505518
line-height: 1;

‎tests/unit/customizations/eks/test_update_kubeconfig.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,3 +308,20 @@ def test_profile(self):
308308
name="ExampleCluster"
309309
)
310310
self._session.create_client.assert_called_once_with("eks")
311+
312+
def test_create_user_with_alias(self):
313+
self._correct_user_entry["name"] = "alias"
314+
self.assertEqual(self._client.get_user_entry(user_alias="alias"),
315+
self._correct_user_entry)
316+
self._mock_client.describe_cluster.assert_called_once_with(
317+
name="ExampleCluster"
318+
)
319+
self._session.create_client.assert_called_once_with("eks")
320+
321+
def test_create_user_without_alias(self):
322+
self.assertEqual(self._client.get_user_entry(),
323+
self._correct_user_entry)
324+
self._mock_client.describe_cluster.assert_called_once_with(
325+
name="ExampleCluster"
326+
)
327+
self._session.create_client.assert_called_once_with("eks")

0 commit comments

Comments
 (0)