Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: methods incorrect type and update deprecated targets #23935

Merged
merged 2 commits into from
May 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions superset/advanced_data_type/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class AdvancedDataTypeRestApi(BaseSupersetApi):

@protect()
@safe
@expose("/convert", methods=["GET"])
@expose("/convert", methods=("GET",))
@permission_name("read")
@event_logger.log_this_with_context(
action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get",
Expand Down Expand Up @@ -111,7 +111,7 @@ def get(self, **kwargs: Any) -> Response:

@protect()
@safe
@expose("/types", methods=["GET"])
@expose("/types", methods=("GET",))
@permission_name("read")
@event_logger.log_this_with_context(
action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get",
Expand Down
12 changes: 6 additions & 6 deletions superset/annotation_layers/annotations/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def _apply_layered_relation_to_rison( # pylint: disable=invalid-name
{"col": "layer", "opr": "rel_o_m", "value": layer_id}
)

@expose("/<int:pk>/annotation/", methods=["GET"])
@expose("/<int:pk>/annotation/", methods=("GET",))
@protect()
@safe
@permission_name("get")
Expand Down Expand Up @@ -196,7 +196,7 @@ def get_list( # pylint: disable=arguments-differ
self._apply_layered_relation_to_rison(pk, kwargs["rison"])
return self.get_list_headless(**kwargs)

@expose("/<int:pk>/annotation/<int:annotation_id>", methods=["GET"])
@expose("/<int:pk>/annotation/<int:annotation_id>", methods=("GET",))
@protect()
@safe
@permission_name("get")
Expand Down Expand Up @@ -253,7 +253,7 @@ def get( # pylint: disable=arguments-differ
self._apply_layered_relation_to_rison(pk, kwargs["rison"])
return self.get_headless(annotation_id, **kwargs)

@expose("/<int:pk>/annotation/", methods=["POST"])
@expose("/<int:pk>/annotation/", methods=("POST",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -321,7 +321,7 @@ def post(self, pk: int) -> Response: # pylint: disable=arguments-differ
)
return self.response_422(message=str(ex))

@expose("/<int:pk>/annotation/<int:annotation_id>", methods=["PUT"])
@expose("/<int:pk>/annotation/<int:annotation_id>", methods=("PUT",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -396,7 +396,7 @@ def put( # pylint: disable=arguments-differ
)
return self.response_422(message=str(ex))

@expose("/<int:pk>/annotation/<int:annotation_id>", methods=["DELETE"])
@expose("/<int:pk>/annotation/<int:annotation_id>", methods=("DELETE",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -451,7 +451,7 @@ def delete( # pylint: disable=arguments-differ
)
return self.response_422(message=str(ex))

@expose("/<int:pk>/annotation/", methods=["DELETE"])
@expose("/<int:pk>/annotation/", methods=("DELETE",))
@protect()
@safe
@statsd_metrics
Expand Down
8 changes: 4 additions & 4 deletions superset/annotation_layers/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class AnnotationLayerRestApi(BaseSupersetModelRestApi):
openapi_spec_tag = "Annotation Layers"
openapi_spec_methods = openapi_spec_methods_override

@expose("/<int:pk>", methods=["DELETE"])
@expose("/<int:pk>", methods=("DELETE",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -166,7 +166,7 @@ def delete(self, pk: int) -> Response:
)
return self.response_422(message=str(ex))

@expose("/", methods=["POST"])
@expose("/", methods=("POST",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -231,7 +231,7 @@ def post(self) -> Response:
)
return self.response_422(message=str(ex))

@expose("/<int:pk>", methods=["PUT"])
@expose("/<int:pk>", methods=("PUT",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -303,7 +303,7 @@ def put(self, pk: int) -> Response:
)
return self.response_422(message=str(ex))

@expose("/", methods=["DELETE"])
@expose("/", methods=("DELETE",))
@protect()
@safe
@statsd_metrics
Expand Down
2 changes: 1 addition & 1 deletion superset/async_events/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class AsyncEventsRestApi(BaseSupersetApi):
resource_name = "async_event"
allow_browser_login = True

@expose("/", methods=["GET"])
@expose("/", methods=("GET",))
@event_logger.log_this
@protect()
@safe
Expand Down
2 changes: 1 addition & 1 deletion superset/available_domains/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class AvailableDomainsRestApi(BaseSupersetApi):
openapi_spec_tag = "Available Domains"
openapi_spec_component_schemas = (AvailableDomainsSchema,)

@expose("/", methods=["GET"])
@expose("/", methods=("GET",))
@protect()
@safe
@statsd_metrics
Expand Down
2 changes: 1 addition & 1 deletion superset/cachekeys/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class CacheRestApi(BaseSupersetModelRestApi):

openapi_spec_component_schemas = (CacheInvalidationRequestSchema,)

@expose("/invalidate", methods=["POST"])
@expose("/invalidate", methods=("POST",))
@protect()
@safe
@statsd_metrics
Expand Down
24 changes: 12 additions & 12 deletions superset/charts/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:

allowed_rel_fields = {"owners", "created_by"}

@expose("/", methods=["POST"])
@expose("/", methods=("POST",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -339,7 +339,7 @@ def post(self) -> Response:
)
return self.response_422(message=str(ex))

@expose("/<pk>", methods=["PUT"])
@expose("/<pk>", methods=("PUT",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -416,7 +416,7 @@ def put(self, pk: int) -> Response:

return response

@expose("/<pk>", methods=["DELETE"])
@expose("/<pk>", methods=("DELETE",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -472,7 +472,7 @@ def delete(self, pk: int) -> Response:
)
return self.response_422(message=str(ex))

@expose("/", methods=["DELETE"])
@expose("/", methods=("DELETE",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -531,7 +531,7 @@ def bulk_delete(self, **kwargs: Any) -> Response:
except ChartBulkDeleteFailedError as ex:
return self.response_422(message=str(ex))

@expose("/<pk>/cache_screenshot/", methods=["GET"])
@expose("/<pk>/cache_screenshot/", methods=("GET",))
@protect()
@rison(screenshot_query_schema)
@safe
Expand Down Expand Up @@ -605,7 +605,7 @@ def trigger_celery() -> WerkzeugResponse:

return trigger_celery()

@expose("/<pk>/screenshot/<digest>/", methods=["GET"])
@expose("/<pk>/screenshot/<digest>/", methods=("GET",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -659,7 +659,7 @@ def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
# TODO: return an empty image
return self.response_404()

@expose("/<pk>/thumbnail/<digest>/", methods=["GET"])
@expose("/<pk>/thumbnail/<digest>/", methods=("GET",))
@protect()
@rison(thumbnail_query_schema)
@safe
Expand Down Expand Up @@ -746,7 +746,7 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
FileWrapper(screenshot), mimetype="image/png", direct_passthrough=True
)

@expose("/export/", methods=["GET"])
@expose("/export/", methods=("GET",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -811,7 +811,7 @@ def export(self, **kwargs: Any) -> Response:
response.set_cookie(token, "done", max_age=600)
return response

@expose("/favorite_status/", methods=["GET"])
@expose("/favorite_status/", methods=("GET",))
@protect()
@safe
@rison(get_fav_star_ids_schema)
Expand Down Expand Up @@ -861,7 +861,7 @@ def favorite_status(self, **kwargs: Any) -> Response:
]
return self.response(200, result=res)

@expose("/<pk>/favorites/", methods=["POST"])
@expose("/<pk>/favorites/", methods=("POST",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -905,7 +905,7 @@ def add_favorite(self, pk: int) -> Response:
ChartDAO.add_favorite(chart)
return self.response(200, result="OK")

@expose("/<pk>/favorites/", methods=["DELETE"])
@expose("/<pk>/favorites/", methods=("DELETE",))
@protect()
@safe
@statsd_metrics
Expand Down Expand Up @@ -949,7 +949,7 @@ def remove_favorite(self, pk: int) -> Response:
ChartDAO.remove_favorite(chart)
return self.response(200, result="OK")

@expose("/import/", methods=["POST"])
@expose("/import/", methods=("POST",))
@protect()
@statsd_metrics
@event_logger.log_this_with_context(
Expand Down
6 changes: 3 additions & 3 deletions superset/charts/data/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
class ChartDataRestApi(ChartRestApi):
include_route_methods = {"get_data", "data", "data_from_cache"}

@expose("/<int:pk>/data/", methods=["GET"])
@expose("/<int:pk>/data/", methods=("GET",))
@protect()
@statsd_metrics
@event_logger.log_this_with_context(
Expand Down Expand Up @@ -171,7 +171,7 @@ def get_data(self, pk: int) -> Response:
command=command, form_data=form_data, datasource=query_context.datasource
)

@expose("/data", methods=["POST"])
@expose("/data", methods=("POST",))
@protect()
@statsd_metrics
@event_logger.log_this_with_context(
Expand Down Expand Up @@ -257,7 +257,7 @@ def data(self) -> Response:
command, form_data=form_data, datasource=query_context.datasource
)

@expose("/data/<cache_key>", methods=["GET"])
@expose("/data/<cache_key>", methods=("GET",))
@protect()
@statsd_metrics
@event_logger.log_this_with_context(
Expand Down
8 changes: 7 additions & 1 deletion superset/connectors/sqla/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,13 @@ def post_update(self, item: "TableModelView") -> None:
def _delete(self, pk: int) -> None:
DeleteMixin._delete(self, pk)

@expose("/edit/<pk>", methods=["GET", "POST"])
@expose(
"/edit/<pk>",
methods=(
"GET",
"POST",
),
)
@has_access
def edit(self, pk: str) -> FlaskResponse:
"""Simple hack to redirect to explore view after saving"""
Expand Down
2 changes: 1 addition & 1 deletion superset/css_templates/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class CssTemplateRestApi(BaseSupersetModelRestApi):
openapi_spec_tag = "CSS Templates"
openapi_spec_methods = openapi_spec_methods_override

@expose("/", methods=["DELETE"])
@expose("/", methods=("DELETE",))
@protect()
@safe
@statsd_metrics
Expand Down
Loading