Add some ACL and Dictionary functionalities

Author: wilkmaia

fastly/__init__.py

@@ -967,7 +967,72 @@ def delete_wordpress(self, service_id, version_number, name):
 	def delete_version(self, service_id, version_number):
 		content = self._fetch("/service/%s/version/%d" % (service_id, version_number), method="DELETE")
 		return self._status(content)
-	
+
+	# ACL related methods
+	def get_acl(self, service_id, version_number, name):
+		content = self._fetch("/service/{}/version/{}/acl/{}".format(service_id, version_number, name))
+		return FastlyACL(self, content)
+
+	def create_acl(self, service_id, version_number, name):
+		body = self._formdata({
+			"name": name,
+		}, ["name"])
+
+		content = self._fetch("/service/{}/version/{}/acl".format(service_id, version_number), method="POST", body=body)
+		return FastlyACL(self, content)
+
+	def create_acl_entry(self, service_id, acl_id, ip, subnet=None):
+		body = self._formdata({
+			"ip": ip,
+			"subnet": subnet,
+		}, ["ip", "subnet"])
+
+		content = self._fetch("/service/{}/acl/{}/entry".format(service_id, acl_id), method="POST", body=body)
+		return FastlyACLEntry(self, content)
+
+	def get_acl_entries(self, service_id, acl_id):
+		content = self._fetch("/service/{}/acl/{}/entries".format(service_id, acl_id))
+		result = []
+		for el in content:
+			result.append(FastlyACLEntry(self, el))
+
+		return result
+
+	def delete_acl_entry(self, service_id, acl_id, id):
+		content = self._fetch("/service/{}/acl/{}/entry/{}".format(service_id, acl_id, id), method="DELETE")
+		return self._status(content)
+
+	# Dictionary related methods
+	def get_dic(self, service_id, version_number, name):
+		content = self._fetch("/service/{}/version/{}/dictionary/{}".format(service_id, version_number, name))
+		return FastlyDictionary(self, content)
+
+	def create_dic(self, service_id, version_number, name):
+		body = self._formdata({
+			"name": name,
+		}, ["name"])
+
+		content = self._fetch("/service/{}/version/{}/dictionary".format(service_id, version_number), method="POST", body=body)
+		return FastlyDictionary(self, content)
+
+	def create_dic_item(self, service_id, dic_id, key, value):
+		body = self._formdata({
+			"item_key": key,
+			"item_value": value,
+		}, ["item_key", "item_value"])
+
+		content = self._fetch("/service/{}/dictionary/{}/item".format(service_id, dic_id), method="POST", body=body)
+		return FastlyDictionaryItem(self, content)
+
+	def get_dic_item(self, service_id, dic_id, key):
+		content = self._fetch("/service/{}/dictionary/{}/item/{}".format(service_id, dic_id, key))
+		return FastlyDictionaryItem(self, content)
+
+	def delete_dic_item(self, service_id, dic_id, key):
+		key = urllib.parse.quote(key, safe='')
+		content = self._fetch("/service/{}/dictionary/{}/item/{}".format(service_id, dic_id, key), method="DELETE")
+		return self._status(content)
+
 	def _status(self, status):
 		if not isinstance(status, FastlyStatus):
 			status = FastlyStatus(self, status)
@@ -990,7 +1055,6 @@ def _fetch(self, url, method="GET", body=None, headers={}):
 		hdrs = {}
 		hdrs.update(headers)
 
-		print("Fetch: %s %s" % (method, url))
 		if body:
 			print("Body: %s" % body)
 		hdrs["Fastly-Key"] = self._token
@@ -1532,6 +1596,63 @@ class FastlyWordpress(FastlyObject, IServiceVersionObject):
 	]
 
 
+class FastlyACL(FastlyObject, object):
+	"""An ACL is a named access control list for matching against a client's IP address during VCL processing"""
+	FIELDS = [
+		"id",
+		"name",
+		"version",
+		"service_id",
+		"created_at",
+		"updated_at",
+		"deleted_at",
+	]
+
+
+class FastlyACLEntry(FastlyObject, object):
+	"""An ACL entry holds an IP address with optional subnet to make up an entry in an ACL"""
+	FIELDS = [
+		"ip",
+		"subnet",
+		"acl_id",
+		"negated",
+		"comment",
+		"id",
+		"service_id",
+	]
+
+
+class FastlyDictionary(FastlyObject, object):
+	"""A Dictionary is a table that stores key value pairs accessible to VCL functions during VCL processing"""
+	FIELDS = [
+		"id",
+		"name",
+		"version",
+		"service_id",
+		"created_at",
+		"updated_at",
+		"deleted_at",
+	]
+
+
+class FastlyDictionaryItem(FastlyObject, object):
+	"""A DictionaryItem holds a key and value that make up an entry in a Dictionary"""
+	FIELDS = [
+		"item_key",
+		"item_value",
+		"dictionary_id",
+		"service_id",
+	]
+
+	@property
+	def key(self):
+		return self.item_key
+
+	@property
+	def value(self):
+		return self.item_value
+
+
 def connect(token):
 	conn = FastlyConnection(token)
 	return conn

fastly/version.py

@@ -1 +1 @@
-__version__ = '1.0.5'
+__version__ = '1.1.0'

setup.py

@@ -6,7 +6,7 @@ def read(fname):
 
 setup(
 	name="fastly-python",
-	version="1.0.5",
+	version="1.1.0",
 	author="Chris Zacharias",
 	author_email="chris@imgix.com",
 	description=("A Python client libary for the Fastly API."),