From 3a06b1b6040865483a09514e2bf7dc5fae24560e Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Thu, 11 May 2023 21:02:12 +0000 Subject: [PATCH] [focal] Fix requests.body attribute deprecation This PS updates calls to body attribute of requests module with new text attribute. Change-Id: I696d57ed48cf28a06784c94fbdafc2644e94633c --- ChangeLog | 2 ++ deckhand/control/revision_deepdiffing.py | 2 +- deckhand/control/revision_diffing.py | 2 +- deckhand/control/revision_documents.py | 4 ++-- deckhand/control/revision_tags.py | 6 +++--- deckhand/control/revisions.py | 4 ++-- deckhand/control/rollback.py | 2 +- deckhand/control/validations.py | 6 +++--- deckhand/control/versions.py | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index da2ee233..ef7422a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ CHANGES ======= +* Update airskiff deployment gate +* Deckhand updates * Removing egg-info folder * Sync requirements with shipyard * [focal] Deckhand project updates diff --git a/deckhand/control/revision_deepdiffing.py b/deckhand/control/revision_deepdiffing.py index 6fe6c24e..8e4824d0 100644 --- a/deckhand/control/revision_deepdiffing.py +++ b/deckhand/control/revision_deepdiffing.py @@ -51,4 +51,4 @@ class RevisionDeepDiffingResource(api_base.BaseResource): LOG.exception(message) resp.status = falcon.HTTP_200 - resp.body = resp_body + resp.text = resp_body diff --git a/deckhand/control/revision_diffing.py b/deckhand/control/revision_diffing.py index c8f8047d..e25685d1 100644 --- a/deckhand/control/revision_diffing.py +++ b/deckhand/control/revision_diffing.py @@ -50,4 +50,4 @@ class RevisionDiffingResource(api_base.BaseResource): LOG.exception(message) resp.status = falcon.HTTP_200 - resp.body = resp_body + resp.text = resp_body diff --git a/deckhand/control/revision_documents.py b/deckhand/control/revision_documents.py index 5a4fc014..e08fe233 100644 --- a/deckhand/control/revision_documents.py +++ b/deckhand/control/revision_documents.py @@ -81,7 +81,7 @@ class RevisionDocumentsResource(api_base.BaseResource): documents = documents[:limit] resp.status = falcon.HTTP_200 - resp.body = self.view_builder.list(documents) + resp.text = self.view_builder.list(documents) class RenderedDocumentsResource(api_base.BaseResource): @@ -156,4 +156,4 @@ class RenderedDocumentsResource(api_base.BaseResource): rendered_documents = rendered_documents[:limit] resp.status = falcon.HTTP_200 - resp.body = self.view_builder.list(rendered_documents) + resp.text = self.view_builder.list(rendered_documents) diff --git a/deckhand/control/revision_tags.py b/deckhand/control/revision_tags.py index 9a1f837b..3a159923 100644 --- a/deckhand/control/revision_tags.py +++ b/deckhand/control/revision_tags.py @@ -44,7 +44,7 @@ class RevisionTagsResource(api_base.BaseResource): resp_body = revision_tag_view.ViewBuilder().show(resp_tag) resp.status = falcon.HTTP_201 - resp.body = resp_body + resp.text = resp_body def on_get(self, req, resp, revision_id, tag=None): """Show tag details or list all tags for a revision.""" @@ -66,7 +66,7 @@ class RevisionTagsResource(api_base.BaseResource): resp_body = revision_tag_view.ViewBuilder().show(resp_tag) resp.status = falcon.HTTP_200 - resp.body = resp_body + resp.text = resp_body @policy.authorize('deckhand:list_tags') def _list_all_tags(self, req, resp, revision_id): @@ -80,7 +80,7 @@ class RevisionTagsResource(api_base.BaseResource): resp_body = revision_tag_view.ViewBuilder().list(resp_tags) resp.status = falcon.HTTP_200 - resp.body = resp_body + resp.text = resp_body def on_delete(self, req, resp, revision_id, tag=None): """Deletes a single tag or deletes all tags for a revision.""" diff --git a/deckhand/control/revisions.py b/deckhand/control/revisions.py index cbb35a40..702cc434 100644 --- a/deckhand/control/revisions.py +++ b/deckhand/control/revisions.py @@ -61,7 +61,7 @@ class RevisionsResource(api_base.BaseResource): revision_resp = self.view_builder.show(revision) resp.status = falcon.HTTP_200 - resp.body = revision_resp + resp.text = revision_resp @policy.authorize('deckhand:list_revisions') @common.sanitize_params(['tag', 'order', 'sort']) @@ -74,7 +74,7 @@ class RevisionsResource(api_base.BaseResource): revisions = utils.multisort(revisions, sort_by, order_by) resp.status = falcon.HTTP_200 - resp.body = self.view_builder.list(revisions) + resp.text = self.view_builder.list(revisions) def _delete_all_barbican_secrets(self): filters = {'metadata.storagePolicy': 'encrypted'} diff --git a/deckhand/control/rollback.py b/deckhand/control/rollback.py index c60878b9..b1408cd2 100644 --- a/deckhand/control/rollback.py +++ b/deckhand/control/rollback.py @@ -55,4 +55,4 @@ class RollbackResource(api_base.BaseResource): revision_resp = self.view_builder.show(rollback_revision) resp.status = falcon.HTTP_201 - resp.body = revision_resp + resp.text = revision_resp diff --git a/deckhand/control/validations.py b/deckhand/control/validations.py index 30a8fefc..6d6a4891 100644 --- a/deckhand/control/validations.py +++ b/deckhand/control/validations.py @@ -50,7 +50,7 @@ class ValidationsResource(api_base.BaseResource): LOG.exception(message) resp.status = falcon.HTTP_201 - resp.body = self.view_builder.show(resp_body) + resp.text = self.view_builder.show(resp_body) def on_get(self, req, resp, revision_id, validation_name=None, entry_id=None): @@ -64,7 +64,7 @@ class ValidationsResource(api_base.BaseResource): resp_body = self._list_all_validations(req, resp, revision_id) resp.status = falcon.HTTP_200 - resp.body = resp_body + resp.text = resp_body @policy.authorize('deckhand:show_validation') def _show_validation_entry(self, req, resp, revision_id, validation_name, @@ -128,4 +128,4 @@ class ValidationsDetailsResource(api_base.BaseResource): raise falcon.HTTPNotFound(description=e.format_message()) resp.status = falcon.HTTP_200 - resp.body = self.view_builder.detail(entries) + resp.text = self.view_builder.detail(entries) diff --git a/deckhand/control/versions.py b/deckhand/control/versions.py index f64cdb61..da3db46e 100644 --- a/deckhand/control/versions.py +++ b/deckhand/control/versions.py @@ -26,7 +26,7 @@ class VersionsResource(api_base.BaseResource): no_authentication_methods = ['GET'] def on_get(self, req, resp): - resp.body = { + resp.text = { 'v1.0': { 'path': '/api/v1.0', 'status': 'stable'