Skip to content

Fix deleting tags on remote registries #403

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.

Sign up for GitHub

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

Merged
mildbyte merged 1 commit into from
Mar 9, 2021
Merged

Fix deleting tags on remote registries #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions splitgraph/core/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ def get_parent_children(self) -> Tuple[Optional[str], List[str]]:
parent = self.parent_id

children = self.engine.run_sql(
SQL(
"""SELECT image_hash FROM {}.images
WHERE namespace = %s AND repository = %s AND parent_id = %s"""
).format(Identifier(SPLITGRAPH_META_SCHEMA)),
SQL("SELECT image_hash FROM {}.get_images(%s,%s) WHERE parent_id = %s").format(
Identifier(SPLITGRAPH_API_SCHEMA)
),
(self.repository.namespace, self.repository.repository, self.image_hash),
return_shape=ResultShape.MANY_ONE,
)
Expand Down Expand Up @@ -261,9 +260,7 @@ def delete_tag(self, tag: str) -> None:
self.repository.images.by_tag(tag)

self.engine.run_sql(
SQL("DELETE FROM {}.tags WHERE namespace = %s AND repository = %s AND tag = %s").format(
Identifier(SPLITGRAPH_META_SCHEMA)
),
select("delete_tag", table_args="(%s,%s,%s)", schema=SPLITGRAPH_API_SCHEMA),
(self.repository.namespace, self.repository.repository, tag),
return_shape=None,
)
Expand Down
18 changes: 18 additions & 0 deletions splitgraph/resources/static/splitgraph_api.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,24 @@ $$
LANGUAGE plpgsql
SECURITY DEFINER SET search_path = splitgraph_meta, pg_temp;

CREATE OR REPLACE FUNCTION splitgraph_api.delete_tag (
_namespace varchar,
_repository varchar,
_tag varchar
)
RETURNS void
AS $$
BEGIN
PERFORM splitgraph_api.check_privilege (_namespace);
DELETE FROM splitgraph_meta.tags
WHERE namespace = _namespace
AND repository = _repository
AND tag = _tag;
END
$$
LANGUAGE plpgsql
SECURITY DEFINER SET search_path = splitgraph_meta, pg_temp;

-- delete_repository(namespace, repository)
CREATE OR REPLACE FUNCTION splitgraph_api.delete_repository (
_namespace varchar,
Expand Down