Change: GET /work, POST /worker use access token to identify worker

1 files changed, 22 insertions, 12 deletions

diff --git a/ick2/workapi_tests.py b/ick2/workapi_tests.py
index d2d9df6..1c08a61 100644
--- a/ick2/workapi_tests.py
+++ b/ick2/workapi_tests.py
@@ -58,10 +58,13 @@ class WorkAPITests(unittest.TestCase):
 
     def create_worker_api(self):
         worker = {
-            'worker': 'asterix',
+            'this': 'that',
+        }
+        claims = {
+            'aud': 'asterix',
         }
         api = ick2.WorkerAPI(self.state)
-        api.create(worker)
+        api.create(worker, claims=claims)
         return api
 
     def create_work_api(self):
@@ -71,7 +74,8 @@ class WorkAPITests(unittest.TestCase):
         self.create_project_api()
         self.create_worker_api()
         work = self.create_work_api()
-        self.assertEqual(work.get_work('asterix'), {})
+        claims = {'aud': 'asterix'}
+        self.assertEqual(work.get_work(claims=claims), {})
 
     def test_worker_gets_work_when_a_pipeline_is_triggered(self):
         projects = self.create_project_api()
@@ -92,10 +96,12 @@ class WorkAPITests(unittest.TestCase):
             },
             'log': '/logs/foo/1',
         }
-        self.assertEqual(work.get_work('asterix'), expected)
+        claims = {'aud': 'asterix'}
+        self.assertEqual(work.get_work(claims=claims), expected)
 
         # Check we get the same thing twice.
-        self.assertEqual(work.get_work('asterix'), expected)
+        claims = {'aud': 'asterix'}
+        self.assertEqual(work.get_work(claims=claims), expected)
 
     def test_worker_manager_posts_work_updates(self):
         projects = self.create_project_api()
@@ -118,7 +124,8 @@ class WorkAPITests(unittest.TestCase):
             },
             'log': '/logs/foo/1',
         }
-        self.assertEqual(work.get_work('asterix'), expected)
+        claims = {'aud': 'asterix'}
+        self.assertEqual(work.get_work(claims=claims), expected)
 
         # Post a partial update.
         done = {
@@ -134,7 +141,8 @@ class WorkAPITests(unittest.TestCase):
 
         # Ask for work again. We didn't finish the previous step, so
         # should get same thing.
-        self.assertEqual(work.get_work('asterix'), expected)
+        claims = {'aud': 'asterix'}
+        self.assertEqual(work.get_work(claims=claims), expected)
 
         # Finish the step.
         done['exit_code'] = 0
@@ -142,7 +150,7 @@ class WorkAPITests(unittest.TestCase):
 
         # We should get the next step now.
         expected['step'] = {'shell': 'step-1', 'where': 'host'}
-        self.assertEqual(work.get_work('asterix'), expected)
+        self.assertEqual(work.get_work(claims=claims), expected)
 
         # Finish the step.
         done['exit_code'] = 0
@@ -150,14 +158,14 @@ class WorkAPITests(unittest.TestCase):
 
         # We should get the next step now.
         expected['step'] = {'shell': 'step-2', 'where': 'host'}
-        self.assertEqual(work.get_work('asterix'), expected)
+        self.assertEqual(work.get_work(claims=claims), expected)
 
         # Finish the step.
         done['exit_code'] = 0
         work.update_work(done)
 
         # We now get nothing further to do.
-        self.assertEqual(work.get_work('asterix'), {})
+        self.assertEqual(work.get_work(claims=claims), {})
 
         # An pipeline status has changed.
         self.assertEqual(
@@ -185,7 +193,8 @@ class WorkAPITests(unittest.TestCase):
             },
             'log': '/logs/foo/1',
         }
-        self.assertEqual(work.get_work('asterix'), expected)
+        claims = {'aud': 'asterix'}
+        self.assertEqual(work.get_work(claims=claims), expected)
 
         # Post a partial update.
         done = {
@@ -200,7 +209,8 @@ class WorkAPITests(unittest.TestCase):
         work.update_work(done)
 
         # Ask for work again.
-        self.assertEqual(work.get_work('asterix'), {})
+        claims = {'aud': 'asterix'}
+        self.assertEqual(work.get_work(claims=claims), {})
 
         # And project status has changed.
         self.assertEqual(