Merge pull request #13 from urbanairship/fix-resume-offset

Release 1.0.2

Author: aschuman0

.github/workflows/on_push_test_runner.yaml

@@ -5,7 +5,7 @@ on: [push]
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: ["3.6", "3.7", "3.8", "3.9"]

.pre-commit-config.yaml

@@ -1,22 +1,22 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.4.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
     -   id: no-commit-to-branch
         args: ["--branch", "master", "--branch", "main"]
 -   repo: https://github.com/psf/black
-    rev: 21.12b0
+    rev: 22.12.0
     hooks:
     -   id: black
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.1.0
+    rev: v2.2.2
     hooks:
       - id: codespell
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.931
+  rev: v0.991
   hooks:
     - id: mypy
-      additional_dependencies: [types-requests, types-urllib3, types-mock]
+      additional_dependencies: [types-requests, types-urllib3, types-mock]

CHANGELOG

@@ -1,5 +1,9 @@
 # uaconnect changelog
 
+## 1.0.2
+
+- Fixes bug where `resume_offset` could not be set as expected in `Consumer.connect()`
+
 ## 1.0.1
 
 - Fixes bug to allow reading offset values from recorder if no explicit `start` or `resume_offset` is passed when calling `Consumer.connect()`

requirements.txt

@@ -3,4 +3,4 @@ mock
 types-requests
 types-redis
 mypy
-black
+black==22.3.0

uaconnect/__about__.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.0.2"

uaconnect/consumer.py

@@ -226,10 +226,16 @@ def connect(
                         cookies=self.cookies,
                     )
                 else:
+                    if self.app_key and self.master_secret:
+                        auth = (self.app_key, self.master_secret)
+                    else:
+                        raise InvalidParametersError(
+                            "Both app_key and master_secret must be included if authenticating with key and secret"
+                        )
                     self._conn = requests.post(
                         self.url,
                         data=self.body,
-                        auth=(self.app_key, self.master_secret),
+                        auth=auth,
                         headers=self._headers(),
                         stream=True,
                         cookies=self.cookies,
@@ -361,13 +367,13 @@ def connect(
         if start and resume_offset:
             logging.error("Request can only have start or resume_offset parameter")
             raise InvalidParametersError
+        elif resume_offset:
+            self.offset = resume_offset
         elif start not in possible_start_values:
             logging.error("Start can only be one of EARLIEST or LATEST")
             raise InvalidParametersError
         elif start in possible_start_values:
             self.start = start
-        elif resume_offset:
-            self.offset = resume_offset
         else:
             logging.info(
                 "Neither start nor resume_offset was provided. Attempting to read offset from recorder."