From cef3b52a104e620e88a24caf70ed2bb1297c268f Mon Sep 17 00:00:00 2001 From: Bryan Strassner Date: Thu, 1 Mar 2018 20:36:40 -0600 Subject: [PATCH] DH Client urls remove api/v1.0 Since the chart is set up to register the endpoint for deckhand to end with api/v1.0, the urls in the client won't work if the api/v1.0 is included in the url pattern. Change-Id: If73cc5596634ae259c9e93978a7d0010cceb2e61 --- deckhand/client/buckets.py | 2 +- deckhand/client/revisions.py | 14 +++++++------- deckhand/client/tags.py | 10 +++++----- deckhand/client/validations.py | 10 ++++------ 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/deckhand/client/buckets.py b/deckhand/client/buckets.py index 5ce320f0..db7b22e0 100644 --- a/deckhand/client/buckets.py +++ b/deckhand/client/buckets.py @@ -34,5 +34,5 @@ class BucketManager(base.Manager): :returns: The created documents along with their associated bucket and revision. """ - url = '/api/v1.0/buckets/%s/documents' % bucket_name + url = '/buckets/%s/documents' % bucket_name return self._update(url, documents) diff --git a/deckhand/client/revisions.py b/deckhand/client/revisions.py index 195221dd..ff6ce654 100644 --- a/deckhand/client/revisions.py +++ b/deckhand/client/revisions.py @@ -34,25 +34,25 @@ class RevisionManager(base.Manager): def list(self, **filters): """Get a list of revisions.""" - url = '/api/v1.0/revisions' + url = '/revisions' # Call `_get` instead of `_list` because the response from the server # is a dict of form `{"count": n, "results": []}`. return self._get(url, filters=filters) def get(self, revision_id): """Get details for a revision.""" - url = '/api/v1.0/revisions/%s' % revision_id + url = '/revisions/%s' % revision_id return self._get(url) def diff(self, revision_id, comparison_revision_id): """Get revision diff between two revisions.""" - url = '/api/v1.0/revisions/%s/diff/%s' % ( + url = '/revisions/%s/diff/%s' % ( revision_id, comparison_revision_id) return self._get(url) def rollback(self, revision_id): """Rollback to a previous revision, effectively creating a new one.""" - url = '/api/v1.0/rollback/%s' % revision_id + url = '/rollback/%s' % revision_id return self._post(url) def documents(self, revision_id, rendered=True, **filters): @@ -66,9 +66,9 @@ class RevisionManager(base.Manager): :rtype: list[:class:`Revision`] """ if rendered: - url = '/api/v1.0/revisions/%s/rendered-documents' % revision_id + url = '/revisions/%s/rendered-documents' % revision_id else: - url = '/api/v1.0/revisions/%s/documents' % revision_id + url = '/revisions/%s/documents' % revision_id return self._list(url, filters=filters) def delete_all(self): @@ -78,5 +78,5 @@ class RevisionManager(base.Manager): Effectively the same as purging the entire database. """ - url = '/api/v1.0/revisions' + url = '/revisions' return self._delete(url) diff --git a/deckhand/client/tags.py b/deckhand/client/tags.py index f8cf0939..b0e33d45 100644 --- a/deckhand/client/tags.py +++ b/deckhand/client/tags.py @@ -30,25 +30,25 @@ class RevisionTagManager(base.Manager): def list(self, revision_id): """Get list of revision tags.""" - url = '/api/v1.0/revisions/%s/tags' % revision_id + url = '/revisions/%s/tags' % revision_id return self._list(url) def get(self, revision_id, tag): """Get details for a revision tag.""" - url = '/api/v1.0/revisions/%s/tags/%s' % (revision_id, tag) + url = '/revisions/%s/tags/%s' % (revision_id, tag) return self._get(url) def create(self, revision_id, tag, data=None): """Create a revision tag.""" - url = '/api/v1.0/revisions/%s/tags/%s' % (revision_id, tag) + url = '/revisions/%s/tags/%s' % (revision_id, tag) return self._create(url, data=data) def delete(self, revision_id, tag): """Delete a revision tag.""" - url = '/api/v1.0/revisions/%s/tags/%s' % (revision_id, tag) + url = '/revisions/%s/tags/%s' % (revision_id, tag) return self._delete(url) def delete_all(self, revision_id): """Delete all revision tags.""" - url = '/api/v1.0/revisions/%s/tags' % revision_id + url = '/revisions/%s/tags' % revision_id return self._delete(url) diff --git a/deckhand/client/validations.py b/deckhand/client/validations.py index 8720a239..54140808 100644 --- a/deckhand/client/validations.py +++ b/deckhand/client/validations.py @@ -27,25 +27,23 @@ class ValidationManager(base.Manager): def list(self, revision_id): """Get list of revision validations.""" - url = '/api/v1.0/revisions/%s/validations' % revision_id + url = '/revisions/%s/validations' % revision_id return self._list(url) def list_entries(self, revision_id, validation_name): """Get list of entries for a validation.""" - url = '/api/v1.0/revisions/%s/validations/%s' % (revision_id, - validation_name) + url = '/revisions/%s/validations/%s' % (revision_id, validation_name) # Call `_get` instead of `_list` because the response from the server # is a dict of form `{"count": n, "results": []}`. return self._get(url) def get_entry(self, revision_id, validation_name, entry_id): """Get entry details for a validation.""" - url = '/api/v1.0/revisions/%s/validations/%s/entries/%s' % ( + url = '/revisions/%s/validations/%s/entries/%s' % ( revision_id, validation_name, entry_id) return self._get(url) def create(self, revision_id, validation_name, data): """Associate a validation with a revision.""" - url = '/api/v1.0/revisions/%s/validations/%s' % (revision_id, - validation_name) + url = '/revisions/%s/validations/%s' % (revision_id, validation_name) return self._create(url, data=data)