add tests for all updates with token update fn

Author: abaez

consulate/api/acl.py

@@ -237,6 +237,45 @@ def create_token(self,
                                roles=roles,
                                service_identities=service_identities)))
 
+    def update_token(self,
+                     accessor_id,
+                     description=None,
+                     expiration_time=None,
+                     expiration_ttl=None,
+                     local=False,
+                     policies=None,
+                     roles=None,
+                     secret_id=None,
+                     service_identities=None):
+        """Create a token from the roles, policies, and service identities
+        provided.
+
+        :param str accessor_id: A UUID for accessing the token.
+        :param str description: A human-readable description of the token.
+        :param str expiration_time: The amount of time till the token expires.
+        :param str expiration_ttl: Sets expiration_time to creation time +
+        expiration_ttl value.
+        :param bool local: Whether the token is only locally available in the
+        current datacenter or to all datacenters defined.
+        :param PolicyLinks policies: A PolicyLink array.
+        :param RoleLinks roles: A RoleLink array.
+        :param str secret_id: A UUID for making requests to consul.
+        :param ServiceIdentities service_identities: A ServiceIdentity array.
+        :param rtype: dict
+
+        """
+        return self._put_response_body(
+            ["token", accessor_id], {},
+            dict(
+                model.ACLToken(accessor_id=accessor_id,
+                               description=description,
+                               expiration_time=expiration_time,
+                               expiration_ttl=expiration_ttl,
+                               local=local,
+                               policies=policies,
+                               roles=roles,
+                               service_identities=service_identities)))
+
     def delete_token(self, accessor_id):
         """Delete an existing token with the given AcccessorID.
 

tests/acl_tests.py

@@ -28,10 +28,23 @@
 }
 """
 
+ACL_NEW_UPDATE_RULES = """key_prefix "" {
+    policy = "deny"
+}
+key "foo/" {
+    policy = "read"
+}
+"""
+
 POLICYLINKS_SAMPLE = [
     dict(ID="783beef3-783f-f41f-7422-7087dc272765"),
 ]
 
+POLICYLINKS_UPDATE_SAMPLE = [
+    dict(ID="783beef3-783f-f41f-7422-7087dc272765"),
+    dict(Name="some_policy_name")
+]
+
 SERVICE_IDENTITIES_SAMPLE = [dict(ServiceName="db", Datacenters=["dc1"])]
 
 ROLELINKS_SAMPLE = [dict(Name="some_role_name")]
@@ -162,6 +175,14 @@ def test_create_and_read_policy(self):
         result = self.consul.acl.read_policy(value["ID"])
         self.assertEqual(result['Rules'], ACL_NEW_RULES)
 
+    def test_create_and_update_policy(self):
+        value = self.consul.acl.create_policy("unittest_read_policy",
+                                              rules=ACL_NEW_RULES)
+        result = self.consul.acl.update_policy(value["ID"],
+                                               value["Name"],
+                                               policy=ACL_NEW_UPDATE_RULES)
+        self.assertGreater(result["ModifyIndex"], result["CreateIndex"])
+
     def test_create_and_delete_policy(self):
         value = self.consul.acl.create_policy("unittest_delete_policy",
                                               rules=ACL_NEW_RULES)
@@ -190,6 +211,15 @@ def test_create_and_read_role(self):
         self.assertEqual(result['Policies'][0]['ID'],
                          POLICYLINKS_SAMPLE[0]["ID"])
 
+    def test_create_and_update_role(self):
+        value = self.consul.acl.create_role(
+            "unittest_read_role",
+            policies=POLICYLINKS_SAMPLE,
+            service_identities=SERVICE_IDENTITIES_SAMPLE)
+        result = self.consul.acl.update_role(
+            value["ID"], policies=POLICYLINKS_UPDATE_SAMPLE)
+        self.assertGreater(result["ModifyIndex"], result["CreateIndex"])
+
     def test_create_and_delete_role(self):
         value = self.consul.acl.create_role(
             "unittest_delete_role",
@@ -227,6 +257,19 @@ def test_create_and_read_token(self):
         result = self.consul.acl.read_token(value["AccessorID"])
         self.assertEqual(result['AccessorID'], accessor_id)
 
+    def test_create_and_update_token(self):
+        secret_id = self.uuidv4()
+        accessor_id = self.uuidv4()
+        value = self.consul.acl.create_token(
+            accessor_id=accessor_id,
+            secret_id=secret_id,
+            roles=ROLELINKS_SAMPLE,
+            policies=POLICYLINKS_SAMPLE,
+            service_identities=SERVICE_IDENTITIES_SAMPLE)
+        result = self.consul.acl.update_token(
+            value["AccessorID"], policies=POLICYLINKS_UPDATE_SAMPLE)
+        self.assertGreater(result["ModifyIndex"], result["CreateIndex"])
+
     def test_create_and_delete_token(self):
         secret_id = self.uuidv4()
         accessor_id = self.uuidv4()