chore: Remove reference to envid

Author: keelerm84

ldclient/impl/datasourcev2/polling.py

@@ -157,7 +157,6 @@ def sync(self, ss: SelectorStore) -> Generator[Update, None, None]:
                 yield Update(
                     state=DataSourceState.VALID,
                     change_set=change_set,
-                    environment_id=headers.get("X-LD-EnvID"),
                 )
 
             if self._event.wait(self._poll_interval):
@@ -192,16 +191,11 @@ def _poll(self, ss: SelectorStore) -> BasisResult:
                     exception=result.exception,
                 )
 
-            (change_set, headers) = result.value
-
-            env_id = headers.get("X-LD-EnvID")
-            if not isinstance(env_id, str):
-                env_id = None
+            (change_set, _) = result.value
 
             basis = Basis(
                 change_set=change_set,
                 persist=change_set.selector is not None,
-                environment_id=env_id,
             )
 
             return _Success(value=basis)

ldclient/impl/datasourcev2/streaming.py

@@ -181,7 +181,6 @@ def sync(self, ss: SelectorStore) -> Generator[Update, None, None]:
                         DataSourceErrorKind.UNKNOWN, 0, time(), str(e)
                     ),
                     revert_to_fdv1=False,
-                    environment_id=None,  # TODO(sdk-1410)
                 )
 
             # TODO(sdk-1408)
@@ -227,7 +226,6 @@ def _process_message(
                 change_set_builder.expect_changes()
                 return Update(
                     state=DataSourceState.VALID,
-                    environment_id=None,  # TODO(sdk-1410)
                 )
             return None
 
@@ -273,7 +271,6 @@ def _process_message(
             return Update(
                 state=DataSourceState.VALID,
                 change_set=change_set,
-                environment_id=None,  # TODO(sdk-1410)
             )
 
         log.info("Unexpected event found in stream: %s", msg.event)
@@ -303,7 +300,6 @@ def _handle_error(self, error: Exception) -> Tuple[Optional[Update], bool]:
                     DataSourceErrorKind.INVALID_DATA, 0, time(), str(error)
                 ),
                 revert_to_fdv1=False,
-                environment_id=None,  # TODO(sdk-1410)
             )
             return (update, True)
 
@@ -329,7 +325,6 @@ def _handle_error(self, error: Exception) -> Tuple[Optional[Update], bool]:
                 ),
                 error=error_info,
                 revert_to_fdv1=False,
-                environment_id=None,  # TODO(sdk-1410)
             )
 
             if not is_recoverable:
@@ -348,7 +343,6 @@ def _handle_error(self, error: Exception) -> Tuple[Optional[Update], bool]:
                 DataSourceErrorKind.UNKNOWN, 0, time(), str(error)
             ),
             revert_to_fdv1=False,
-            environment_id=None,  # TODO(sdk-1410)
         )
         # no stacktrace here because, for a typical connection error, it'll
         # just be a lengthy tour of urllib3 internals

ldclient/impl/datasystem/__init__.py

@@ -201,7 +201,6 @@ class Update:
     change_set: Optional[ChangeSet] = None
     error: Optional[DataSourceErrorInfo] = None
     revert_to_fdv1: bool = False
-    environment_id: Optional[str] = None
 
 
 class Synchronizer(Protocol):  # pylint: disable=too-few-public-methods

ldclient/impl/datasystem/protocolv2.py

@@ -490,7 +490,6 @@ class Basis:
 
     change_set: ChangeSet
     persist: bool
-    environment_id: Optional[str] = None
 
 
 class Synchronizer(Protocol):

ldclient/impl/integrations/test_datav2/test_data_sourcev2.py

@@ -83,7 +83,6 @@ def fetch(self, ss: SelectorStore) -> BasisResult:
                 basis = Basis(
                     change_set=change_set,
                     persist=False,
-                    environment_id=None
                 )
 
                 return _Success(basis)

ldclient/testing/impl/datasourcev2/test_polling_synchronizer.py

@@ -109,7 +109,6 @@ def test_handles_no_changes():
     assert valid.state == DataSourceState.VALID
     assert valid.error is None
     assert valid.revert_to_fdv1 is False
-    assert valid.environment_id is None
     assert valid.change_set is not None
     assert valid.change_set.intent_code == IntentCode.TRANSFER_NONE
     assert len(valid.change_set.changes) == 0
@@ -130,7 +129,6 @@ def test_handles_empty_changeset():
     assert valid.state == DataSourceState.VALID
     assert valid.error is None
     assert valid.revert_to_fdv1 is False
-    assert valid.environment_id is None
 
     assert valid.change_set is not None
     assert len(valid.change_set.changes) == 0
@@ -158,7 +156,6 @@ def test_handles_put_objects():
     assert valid.state == DataSourceState.VALID
     assert valid.error is None
     assert valid.revert_to_fdv1 is False
-    assert valid.environment_id is None
 
     assert valid.change_set is not None
     assert len(valid.change_set.changes) == 1
@@ -189,7 +186,6 @@ def test_handles_delete_objects():
     assert valid.state == DataSourceState.VALID
     assert valid.error is None
     assert valid.revert_to_fdv1 is False
-    assert valid.environment_id is None
 
     assert valid.change_set is not None
     assert len(valid.change_set.changes) == 1
@@ -227,7 +223,6 @@ def test_generic_error_interrupts_and_recovers():
     assert interrupted.error.status_code == 0
     assert interrupted.error.message == "error for test"
     assert interrupted.revert_to_fdv1 is False
-    assert interrupted.environment_id is None
 
     assert valid.change_set is not None
     assert len(valid.change_set.changes) == 1
@@ -260,12 +255,10 @@ def test_recoverable_error_continues():
     assert interrupted.error.kind == DataSourceErrorKind.ERROR_RESPONSE
     assert interrupted.error.status_code == 408
     assert interrupted.revert_to_fdv1 is False
-    assert interrupted.environment_id is None
 
     assert valid.state == DataSourceState.VALID
     assert valid.error is None
     assert valid.revert_to_fdv1 is False
-    assert valid.environment_id is None
 
     assert valid.change_set is not None
     assert len(valid.change_set.changes) == 1
@@ -296,7 +289,6 @@ def test_unrecoverable_error_shuts_down():
     assert off.error.kind == DataSourceErrorKind.ERROR_RESPONSE
     assert off.error.status_code == 401
     assert off.revert_to_fdv1 is False
-    assert off.environment_id is None
     assert off.change_set is None
 
     try:

ldclient/testing/impl/datasourcev2/test_streaming_synchronizer.py

@@ -177,7 +177,6 @@ def test_handles_no_changes():
     assert updates[0].state == DataSourceState.VALID
     assert updates[0].error is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
     assert updates[0].change_set is None
 
 
@@ -197,7 +196,6 @@ def test_handles_empty_changeset(events):  # pylint: disable=redefined-outer-nam
     assert updates[0].state == DataSourceState.VALID
     assert updates[0].error is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
 
     assert updates[0].change_set is not None
     assert len(updates[0].change_set.changes) == 0
@@ -224,7 +222,6 @@ def test_handles_put_objects(events):  # pylint: disable=redefined-outer-name
     assert updates[0].state == DataSourceState.VALID
     assert updates[0].error is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
 
     assert updates[0].change_set is not None
     assert len(updates[0].change_set.changes) == 1
@@ -256,7 +253,6 @@ def test_handles_delete_objects(events):  # pylint: disable=redefined-outer-name
     assert updates[0].state == DataSourceState.VALID
     assert updates[0].error is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
 
     assert updates[0].change_set is not None
     assert len(updates[0].change_set.changes) == 1
@@ -287,7 +283,6 @@ def test_swallows_goodbye(events):  # pylint: disable=redefined-outer-name
     assert updates[0].state == DataSourceState.VALID
     assert updates[0].error is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
 
     assert updates[0].change_set is not None
     assert len(updates[0].change_set.changes) == 0
@@ -314,7 +309,6 @@ def test_swallows_heartbeat(events):  # pylint: disable=redefined-outer-name
     assert updates[0].state == DataSourceState.VALID
     assert updates[0].error is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
 
     assert updates[0].change_set is not None
     assert len(updates[0].change_set.changes) == 0
@@ -343,7 +337,6 @@ def test_error_resets(events):  # pylint: disable=redefined-outer-name
     assert updates[0].state == DataSourceState.VALID
     assert updates[0].error is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
 
     assert updates[0].change_set is not None
     assert len(updates[0].change_set.changes) == 1
@@ -367,7 +360,6 @@ def test_handles_out_of_order(events):  # pylint: disable=redefined-outer-name
     assert updates[0].state == DataSourceState.INTERRUPTED
     assert updates[0].change_set is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
 
     assert updates[0].error is not None
     assert updates[0].error.kind == DataSourceErrorKind.UNKNOWN
@@ -398,7 +390,6 @@ def test_invalid_json_decoding(events):  # pylint: disable=redefined-outer-name
     assert updates[0].state == DataSourceState.INTERRUPTED
     assert updates[0].change_set is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
 
     assert updates[0].error is not None
     assert updates[0].error.kind == DataSourceErrorKind.INVALID_DATA
@@ -431,7 +422,6 @@ def test_stops_on_unrecoverable_status_code(
     assert updates[0].state == DataSourceState.OFF
     assert updates[0].change_set is None
     assert updates[0].revert_to_fdv1 is False
-    assert updates[0].environment_id is None
 
     assert updates[0].error is not None
     assert updates[0].error.kind == DataSourceErrorKind.ERROR_RESPONSE

ldclient/testing/integrations/test_test_data_sourcev2.py

@@ -29,7 +29,6 @@ def test_creates_valid_initializer():
 
     basis = result.value
     assert not basis.persist
-    assert basis.environment_id is None
     assert basis.change_set.intent_code == IntentCode.TRANSFER_FULL
     assert len(basis.change_set.changes) == 0  # No flags added yet