Skip to content

Commit

Permalink
Merge branch 'release-1.26.0'
Browse files Browse the repository at this point in the history
* release-1.26.0:
  Bumping version to 1.26.0
  Add changelog entries from botocore
  Update changelog based on model updates
  Update signing handler and tests for MRAP (#7358)
  • Loading branch information
aws-sdk-python-automation committed Oct 24, 2022
2 parents 8f637f6 + eaa2ef4 commit 7ab8f9c
Show file tree
Hide file tree
Showing 10 changed files with 64 additions and 9 deletions.
27 changes: 27 additions & 0 deletions .changes/1.26.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[
{
"category": "``acm-pca``",
"description": "AWS Private Certificate Authority (AWS Private CA) now offers usage modes which are combination of features to address specific use cases.",
"type": "api-change"
},
{
"category": "``batch``",
"description": "This release adds support for AWS Batch on Amazon EKS.",
"type": "api-change"
},
{
"category": "``datasync``",
"description": "Added support for self-signed certificates when using object storage locations; added BytesCompressed to the TaskExecution response.",
"type": "api-change"
},
{
"category": "``sagemaker``",
"description": "SageMaker Inference Recommender now supports a new API ListInferenceRecommendationJobSteps to return the details of all the benchmark we create for an inference recommendation job.",
"type": "api-change"
},
{
"category": "Endpoints",
"description": "Implemented new endpoint ruleset system to dynamically derive endpoints and settings for services",
"type": "feature"
}
]
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
CHANGELOG
=========

1.26.0
======

* api-change:``acm-pca``: AWS Private Certificate Authority (AWS Private CA) now offers usage modes which are combination of features to address specific use cases.
* api-change:``batch``: This release adds support for AWS Batch on Amazon EKS.
* api-change:``datasync``: Added support for self-signed certificates when using object storage locations; added BytesCompressed to the TaskExecution response.
* api-change:``sagemaker``: SageMaker Inference Recommender now supports a new API ListInferenceRecommendationJobSteps to return the details of all the benchmark we create for an inference recommendation job.
* feature:Endpoints: Implemented new endpoint ruleset system to dynamically derive endpoints and settings for services


1.25.97
=======

Expand Down
2 changes: 1 addition & 1 deletion awscli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"""
import os

__version__ = '1.25.97'
__version__ = '1.26.0'

#
# Get our data path to be added to botocore's search path
Expand Down
7 changes: 5 additions & 2 deletions awscli/customizations/globalargs.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,11 @@ def no_sign_request(parsed_args, session, **kwargs):
if not parsed_args.sign_request:
# In order to make signing disabled for all requests
# we need to use botocore's ``disable_signing()`` handler.
session.register(
'choose-signer', disable_signing, unique_id='disable-signing')
# Register this first to override other handlers.
emitter = session.get_component('event_emitter')
emitter.register_first(
'choose-signer', disable_signing, unique_id='disable-signing',
)


def resolve_cli_connect_timeout(parsed_args, session, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
version = '1.25.'
version = '1.26'
# The full version, including alpha/beta/rc tags.
release = '1.25.97'
release = '1.26.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ universal = 0

[metadata]
requires_dist =
botocore==1.27.96
botocore==1.28.0
docutils>=0.10,<0.17
s3transfer>=0.6.0,<0.7.0
PyYAML>=3.10,<5.5
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def find_version(*file_paths):


install_requires = [
'botocore==1.27.96',
'botocore==1.28.0',
'docutils>=0.10,<0.17',
's3transfer>=0.6.0,<0.7.0',
'PyYAML>=3.10,<5.5',
Expand Down
13 changes: 12 additions & 1 deletion tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import copy
import os
import sys
import unittest

# Both nose and py.test will add the first parent directory it
# encounters that does not have a __init__.py to the sys.path. In
Expand All @@ -27,7 +28,7 @@
import botocore.model
import botocore.serialize
import botocore.validate

from botocore.compat import HAS_CRT

# A shared loader to use for classes in this module. This allows us to
# load models outside of influence of a session and take advantage of
Expand Down Expand Up @@ -323,3 +324,13 @@ def copy(self):

def __repr__(self):
return str(dict(self.items()))


def requires_crt(reason=None):
if reason is None:
reason = "Test requires awscrt to be installed"

def decorator(func):
return unittest.skipIf(not HAS_CRT, reason)(func)

return decorator
3 changes: 3 additions & 0 deletions tests/functional/s3/test_cp_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from awscli.testutils import mock
from awscli.compat import six
from tests.functional.s3 import BaseS3TransferCommandTest
from tests import requires_crt


class BufferedBytesIO(six.BytesIO):
Expand Down Expand Up @@ -1147,6 +1148,7 @@ def test_recursive_copy(self):
]
)

@requires_crt()
def test_accepts_mrap_arns(self):
mrap_arn = (
'arn:aws:s3::123456789012:accesspoint:mfzwi23gnjvgw.mrap'
Expand All @@ -1162,6 +1164,7 @@ def test_accepts_mrap_arns(self):
]
)

@requires_crt()
def test_accepts_mrap_arns_with_slash(self):
mrap_arn = (
'arn:aws:s3::123456789012:accesspoint/mfzwi23gnjvgw.mrap'
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/customizations/test_globalargs.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ def test_no_sign_request_if_option_specified(self):
session = mock.Mock()

globalargs.no_sign_request(args, session)
session.register.assert_called_with(
emitter = session.get_component('event_emitter')
emitter.register_first.assert_called_with(
'choose-signer', disable_signing, unique_id='disable-signing')

def test_request_signed_by_default(self):
Expand Down

0 comments on commit 7ab8f9c

Please sign in to comment.