Merge branch 'release-1.25.21'

* release-1.25.21:
  Bumping version to 1.25.21
  Update changelog based on model updates
  Update EMR add-steps API to accept ExecutionRoleArn

.changes/1.25.21.json

@@ -0,0 +1,47 @@
+[
+ {
+ "category": "``athena``",
+ "description": "This feature introduces the API support for Athena's parameterized query and BatchGetPreparedStatement API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``customer-profiles``",
+ "description": "This release adds the optional MinAllowedConfidenceScoreForMerging parameter to the CreateDomain, UpdateDomain, and GetAutoMergingPreview APIs in Customer Profiles. This parameter is used as a threshold to influence the profile auto-merging step of the Identity Resolution process.",
+ "type": "api-change"
+ },
+ {
+ "category": "``emr``",
+ "description": "Update emr command to latest version",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "This release adds tag as an input of CreateDatabase",
+ "type": "api-change"
+ },
+ {
+ "category": "``kendra``",
+ "description": "Amazon Kendra now provides a data source connector for alfresco",
+ "type": "api-change"
+ },
+ {
+ "category": "``mwaa``",
+ "description": "Documentation updates for Amazon Managed Workflows for Apache Airflow.",
+ "type": "api-change"
+ },
+ {
+ "category": "``pricing``",
+ "description": "Documentation update for GetProducts Response.",
+ "type": "api-change"
+ },
+ {
+ "category": "``wellarchitected``",
+ "description": "Added support for UpdateGlobalSettings API. Added status filter to ListWorkloadShares and ListLensShares.",
+ "type": "api-change"
+ },
+ {
+ "category": "``workmail``",
+ "description": "This release adds support for managing user availability configurations in Amazon WorkMail.",
+ "type": "api-change"
+ }
+]

CHANGELOG.rst

@@ -2,6 +2,20 @@
 CHANGELOG
 =========
 
+1.25.21
+=======
+
+* api-change:``athena``: This feature introduces the API support for Athena's parameterized query and BatchGetPreparedStatement API.
+* api-change:``customer-profiles``: This release adds the optional MinAllowedConfidenceScoreForMerging parameter to the CreateDomain, UpdateDomain, and GetAutoMergingPreview APIs in Customer Profiles. This parameter is used as a threshold to influence the profile auto-merging step of the Identity Resolution process.
+* api-change:``emr``: Update emr command to latest version
+* api-change:``glue``: This release adds tag as an input of CreateDatabase
+* api-change:``kendra``: Amazon Kendra now provides a data source connector for alfresco
+* api-change:``mwaa``: Documentation updates for Amazon Managed Workflows for Apache Airflow.
+* api-change:``pricing``: Documentation update for GetProducts Response.
+* api-change:``wellarchitected``: Added support for UpdateGlobalSettings API. Added status filter to ListWorkloadShares and ListLensShares.
+* api-change:``workmail``: This release adds support for managing user availability configurations in Amazon WorkMail.
+
+
 1.25.20
 =======
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.25.20'
+__version__ = '1.25.21'
 
 #
 # Get our data path to be added to botocore's search path

awscli/customizations/emr/addsteps.py

@@ -30,6 +30,10 @@ class AddSteps(Command):
  'nargs': '+',
  'schema': argumentschema.STEPS_SCHEMA,
  'help_text': helptext.STEPS
+ },
+ {'name': 'execution-role-arn',
+ 'required': False,
+ 'help_text': helptext.EXECUTION_ROLE_ARN
  }
  ]
 
@@ -48,6 +52,9 @@ def _run_main_command(self, parsed_args, parsed_globals):
  'Steps': step_list
  }
 
+ if parsed_args.execution_role_arn is not None:
+ parameters['ExecutionRoleArn'] = parsed_args.execution_role_arn
+
  emrutils.call_and_display_response(self._session, 'AddJobFlowSteps',
  parameters, parsed_globals)
  return 0

awscli/customizations/emr/helptext.py

@@ -506,3 +506,9 @@
  'The configuration specifies the termination idle timeout'
  'threshold for an cluster.</p> '
 )
+
+EXECUTION_ROLE_ARN = (
+ '<p>You must grant the execution role the permissions needed '
+ 'to access the same IAM resources that the step can access. '
+ 'The execution role can be a cross-account IAM Role.</p> '
+)

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.25.'
 # The full version, including alpha/beta/rc tags.
-release = '1.25.20'
+release = '1.25.21'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.cfg

@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
- botocore==1.27.20
+ botocore==1.27.21
  docutils>=0.10,<0.17
  s3transfer>=0.6.0,<0.7.0
  PyYAML>=3.10,<5.5

setup.py

@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
- 'botocore==1.27.20',
+ 'botocore==1.27.21',
  'docutils>=0.10,<0.17',
  's3transfer>=0.6.0,<0.7.0',
  'PyYAML>=3.10,<5.5',

tests/unit/customizations/emr/test_add_steps.py

@@ -255,6 +255,27 @@ def test_streaming_step_with_default_fields(self):
  cmd=cmd, expected_result=expected_result,
  expected_result_release=expected_result_release)
 
+ def test_step_with_execution_role_arn(self):
+ cmd = self.prefix + 'Type=Streaming,' + self.STREAMING_ARGS
+ cmd += ' --execution-role-arn arn:aws:iam::123456789010:role/sample '
+ expected_result = {
+ 'ExecutionRoleArn': 'arn:aws:iam::123456789010:role/sample',
+ 'JobFlowId': 'j-ABC',
+ 'Steps': [
+ {'Name': 'Streaming program',
+ 'ActionOnFailure': 'CONTINUE',
+ 'HadoopJarStep': self.STREAMING_HADOOP_SCRIPT_RUNNER_STEP
+ }
+ ]
+ }
+ expected_result_release = copy.deepcopy(expected_result)
+ expected_result_release['Steps'][0]['HadoopJarStep'] = \
+ self.STREAMING_HADOOP_COMMAND_RUNNER_STEP
+
+ self.assert_params_for_ami_and_release_based_clusters(
+ cmd=cmd, expected_result=expected_result,
+ expected_result_release=expected_result_release)
+
  def test_streaming_step_missing_args(self):
  cmd = self.prefix + 'Type=Streaming'
  expected_error_msg = '\naws: error: The following ' + \