Only set GSI provisioned throughput for provisioned billing modes. Fixes

 #1017 (#1018)

pynamodb/indexes.py

@@ -8,7 +8,7 @@
 from pynamodb.constants import (
     INCLUDE, ALL, KEYS_ONLY, ATTR_NAME, ATTR_TYPE, KEY_TYPE, KEY_SCHEMA,
     ATTR_DEFINITIONS, PROJECTION_TYPE, NON_KEY_ATTRIBUTES,
-    PAY_PER_REQUEST_BILLING_MODE, READ_CAPACITY_UNITS, WRITE_CAPACITY_UNITS,
+    READ_CAPACITY_UNITS, WRITE_CAPACITY_UNITS,
 )
 from pynamodb.attributes import Attribute
 from pynamodb.expressions.condition import Condition
@@ -176,11 +176,12 @@ class GlobalSecondaryIndex(Index[_M]):
     @classmethod
     def _get_schema(cls) -> Dict:
         schema = super()._get_schema()
-        if getattr(cls.Meta, 'billing_mode', None) != PAY_PER_REQUEST_BILLING_MODE:
-            schema['provisioned_throughput'] = {
-                READ_CAPACITY_UNITS: cls.Meta.read_capacity_units,
-                WRITE_CAPACITY_UNITS: cls.Meta.write_capacity_units
-            }
+        provisioned_throughput = {}
+        if hasattr(cls.Meta, 'read_capacity_units'):
+            provisioned_throughput[READ_CAPACITY_UNITS] = cls.Meta.read_capacity_units
+        if hasattr(cls.Meta, 'write_capacity_units'):
+            provisioned_throughput[WRITE_CAPACITY_UNITS] = cls.Meta.write_capacity_units
+        schema['provisioned_throughput'] = provisioned_throughput
         return schema
 
 

pynamodb/models.py

@@ -879,6 +879,8 @@ def _get_schema(cls) -> Dict[str, Any]:
         for index in cls._indexes.values():
             index_schema = index._get_schema()
             if isinstance(index, GlobalSecondaryIndex):
+                if getattr(cls.Meta, 'billing_mode', None) == PAY_PER_REQUEST_BILLING_MODE:
+                    index_schema.pop('provisioned_throughput', None)
                 schema['global_secondary_indexes'].append(index_schema)
             else:
                 schema['local_secondary_indexes'].append(index_schema)