Merge branch 'release-1.35.5'

* release-1.35.5:
  Bumping version to 1.35.5
  Update changelog based on model updates
  Merge customizations for EMR

.changes/1.35.5.json

@@ -0,0 +1,27 @@
+[
+  {
+    "category": "``appflow``",
+    "description": "Doc only updates for clarification around OAuth2GrantType for Salesforce.",
+    "type": "api-change"
+  },
+  {
+    "category": "``elbv2``",
+    "description": "Add zonal_shift.config.enabled attribute. Add new AdministrativeOverride construct in the describe-target-health API response to include information about the override status applied to a target.",
+    "type": "api-change"
+  },
+  {
+    "category": "``emr``",
+    "description": "This release provides new parameter \"Context\" in instance fleet clusters.",
+    "type": "api-change"
+  },
+  {
+    "category": "``guardduty``",
+    "description": "Added a new field for network connection details.",
+    "type": "api-change"
+  },
+  {
+    "category": "``robomaker``",
+    "description": "Documentation update: added support notices to each API action.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+1.35.5
+======
+
+* api-change:``appflow``: Doc only updates for clarification around OAuth2GrantType for Salesforce.
+* api-change:``elbv2``: Add zonal_shift.config.enabled attribute. Add new AdministrativeOverride construct in the describe-target-health API response to include information about the override status applied to a target.
+* api-change:``emr``: This release provides new parameter "Context" in instance fleet clusters.
+* api-change:``guardduty``: Added a new field for network connection details.
+* api-change:``robomaker``: Documentation update: added support notices to each API action.
+
+
 1.35.4
 ======
 

awscli/__init__.py

@@ -18,7 +18,7 @@
 
 import os
 
-__version__ = '1.35.4'
+__version__ = '1.35.5'
 
 #
 # Get our data path to be added to botocore's search path

awscli/customizations/emr/argumentschema.py

@@ -499,6 +499,10 @@
                         }
                     }
                 }
+            },
+            "Context": {
+                "type": "string",
+                "description": "Reserved."
             }
         }
     }

awscli/customizations/emr/instancefleetsutils.py

@@ -65,6 +65,9 @@ def validate_and_build_instance_fleets(parsed_instance_fleets):
             if 'OnDemandResizeSpecification' in instanceFleetResizeSpecifications:
                 instance_fleet_config['ResizeSpecifications']['OnDemandResizeSpecification'] = \
                     instanceFleetResizeSpecifications['OnDemandResizeSpecification']
+
+        if 'Context' in keys:
+            instance_fleet_config['Context'] = instance_fleet['Context']
 
         instance_fleets.append(instance_fleet_config)
     return instance_fleets

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.35'
 # The full version, including alpha/beta/rc tags.
-release = '1.35.4'
+release = '1.35.5'
 
 # 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.35.38
+        botocore==1.35.39
         docutils>=0.10,<0.17
         s3transfer>=0.10.0,<0.11.0
         PyYAML>=3.10,<6.1

setup.py

@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.35.38',
+    'botocore==1.35.39',
     'docutils>=0.10,<0.17',
     's3transfer>=0.10.0,<0.11.0',
     'PyYAML>=3.10,<6.1',

tests/unit/customizations/emr/test_constants_instance_fleets.py

@@ -91,7 +91,7 @@
     'capacity-optimized-prioritized},OnDemandSpecification={AllocationStrategy=prioritized}}')
 
 TASK_INSTANCE_FLEET_WITH_RESIZE_ALLOCATION_STRATEGY_SPOT_AND_OD = (
-    'InstanceFleetType=TASK,TargetSpotCapacity=100,InstanceTypeConfigs=[{InstanceType=d2.xlarge,'
+    'InstanceFleetType=TASK,TargetSpotCapacity=100,Context=testContext,InstanceTypeConfigs=[{InstanceType=d2.xlarge,'
     'BidPrice=0.5,WeightedCapacity=1},{InstanceType=m3.2xlarge,BidPrice=0.2,WeightedCapacity=2},'
     '{InstanceType=m3.4xlarge,BidPrice=0.4,WeightedCapacity=4}],LaunchSpecifications={'
     'SpotSpecification={TimeoutDurationMinutes=77,TimeoutAction=TERMINATE_CLUSTER,'
@@ -119,7 +119,7 @@
 
 MODIFY_INSTANCE_FLEET_WITH_INSTANCE_TYPE_CONFIGS = (
     f'InstanceFleetId={DEFAULT_INSTANCE_FLEET_NAME},'
-    f'InstanceTypeConfigs=[{{InstanceType=d2.xlarge}}]')
+    f'InstanceTypeConfigs=[{{InstanceType=d2.xlarge}}],Context=testContext')
 
 MODIFY_INSTANCE_FLEET_WITH_SPOT_AND_OD_RESIZE_SPECIFICATIONS = (
     f'InstanceFleetId={DEFAULT_INSTANCE_FLEET_NAME},ResizeSpecifications={{SpotResizeSpecification='
@@ -512,6 +512,7 @@
       },
       "TargetSpotCapacity": 100,
       "InstanceFleetType": "TASK",
+      "Context": "testContext",
       "Name": "TASK"
     }
   ]
@@ -558,7 +559,8 @@
       }
     },
     "TargetSpotCapacity": 100,
-    "InstanceFleetType": "TASK"
+    "InstanceFleetType": "TASK",
+    "Context": "testContext"
   }
 
 RES_MODIFY_INSTANCE_FLEET_WITH_INSTANCE_TYPE_CONFIGS = \
@@ -568,7 +570,8 @@
         "InstanceFleetId": DEFAULT_INSTANCE_FLEET_NAME,
         "InstanceTypeConfigs": [
           {"InstanceType": "d2.xlarge"}
-        ]
+        ],
+        "Context": "testContext"
       }
     }
 

tests/unit/customizations/emr/test_describe_cluster.py

@@ -194,6 +194,7 @@
             "InstanceFleetType": "MASTER",
             "InstanceType": "m1.large",
             "Id": "if-ABCD",
+            "Context": "testContext"
         }
     ]
 }
@@ -359,6 +360,7 @@
                 "InstanceFleetType": "MASTER",
                 "InstanceType": "m1.large",
                 "Id": "if-ABCD",
+                "Context": "testContext"
             }
         ],
         "RequestedAmiVersion": "2.4.2",