Fix AttributeError in fix_route53_ids when Route53 ID parameter is not a string

.changes/next-release/bugfix-Route53-3033.json

@@ -0,0 +1,5 @@
+{
+  "type": "bugfix",
+  "category": "Route53",
+  "description": "Fixed AttributeError in fix_route53_ids when a Route53 resource ID parameter (e.g. HostedZoneId) is None. Non-string values are now passed through to normal parameter validation."
+}

botocore/handlers.py

@@ -694,7 +694,7 @@ def fix_route53_ids(params, model, **kwargs):
     ]
 
     for name in members:
-        if name in params:
+        if name in params and isinstance(params[name], str):
             orig_value = params[name]
             params[name] = orig_value.split('/')[-1]
             logger.debug('%s %s -> %s', name, orig_value, params[name])

tests/unit/test_handlers.py

@@ -585,6 +585,29 @@ def test_route53_resource_id_missing_input_shape(self):
 
         self.assertEqual(params['HostedZoneId'], '/hostedzone/ABC123')
 
+    def test_route53_resource_id_non_string_left_alone(self):
+        event = 'before-parameter-build.route53.GetHostedZone'
+        params = {'HostedZoneId': None}
+        operation_def = {
+            'name': 'GetHostedZone',
+            'input': {'shape': 'GetHostedZoneInput'},
+        }
+        service_def = {
+            'metadata': {},
+            'shapes': {
+                'GetHostedZoneInput': {
+                    'type': 'structure',
+                    'members': {
+                        'HostedZoneId': {'shape': 'ResourceId'},
+                    },
+                },
+                'ResourceId': {'type': 'string'},
+            },
+        }
+        model = OperationModel(operation_def, ServiceModel(service_def))
+        self.session.emit(event, params=params, model=model)
+        self.assertIsNone(params['HostedZoneId'])
+
     def test_run_instances_userdata(self):
         user_data = 'This is a test'
         b64_user_data = base64.b64encode(user_data.encode('latin-1')).decode(