fix: Move FlowControlSettings to types (#53)

* fix: Move FlowControlSettings to types * fix: import
googleapis · Oct 26, 2020 · 457a74d · 457a74d
1 parent e4199ff
commit 457a74d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/google/cloud/pubsublite/cloudpubsub/internal/single_partition_subscriber.py b/google/cloud/pubsublite/cloudpubsub/internal/single_partition_subscriber.py
@@ -6,9 +6,7 @@
 from google.cloud.pubsub_v1.subscriber.message import Message
 from google.pubsub_v1 import PubsubMessage
 
-from google.cloud.pubsublite.cloudpubsub.flow_control_settings import (
-    FlowControlSettings,
-)
+from google.cloud.pubsublite.types import FlowControlSettings
 from google.cloud.pubsublite.cloudpubsub.internal.ack_set_tracker import AckSetTracker
 from google.cloud.pubsublite.cloudpubsub.message_transformer import MessageTransformer
 from google.cloud.pubsublite.cloudpubsub.nack_handler import NackHandler

diff --git a/google/cloud/pubsublite/cloudpubsub/make_subscriber.py b/google/cloud/pubsublite/cloudpubsub/make_subscriber.py
@@ -5,9 +5,7 @@
 from google.api_core.client_options import ClientOptions
 from google.auth.credentials import Credentials
 from google.cloud.pubsub_v1.subscriber.futures import StreamingPullFuture
-from google.cloud.pubsublite.cloudpubsub.flow_control_settings import (
-    FlowControlSettings,
-)
+from google.cloud.pubsublite.types import FlowControlSettings
 from google.cloud.pubsublite.cloudpubsub.internal.ack_set_tracker_impl import (
     AckSetTrackerImpl,
 )

diff --git a/google/cloud/pubsublite/types/__init__.py b/google/cloud/pubsublite/types/__init__.py
@@ -2,3 +2,4 @@
 from .partition import Partition
 from .paths import LocationPath, TopicPath, SubscriptionPath
 from .publish_metadata import PublishMetadata
+from .flow_control_settings import FlowControlSettings, DISABLED_FLOW_CONTROL
diff --git a/...lite/cloudpubsub/flow_control_settings.py → ...pubsublite/types/flow_control_settings.py b/...lite/cloudpubsub/flow_control_settings.py → ...pubsublite/types/flow_control_settings.py
diff --git a/tests/unit/pubsublite/cloudpubsub/internal/single_partition_subscriber_test.py b/tests/unit/pubsublite/cloudpubsub/internal/single_partition_subscriber_test.py
@@ -7,9 +7,7 @@
 from google.cloud.pubsub_v1.subscriber.message import Message
 from google.pubsub_v1 import PubsubMessage
 
-from google.cloud.pubsublite.cloudpubsub.flow_control_settings import (
-    FlowControlSettings,
-)
+from google.cloud.pubsublite.types import FlowControlSettings
 from google.cloud.pubsublite.cloudpubsub.internal.ack_set_tracker import AckSetTracker
 from google.cloud.pubsublite.cloudpubsub.internal.single_partition_subscriber import (
     SinglePartitionSubscriber,