Decouple workflows for importing refs and commits

closes #19

Author: lubosmj

CHANGES/19.feature

@@ -0,0 +1,3 @@
+Decoupled workflows for importing all refs and commits. To import everything from a tarball, one
+should use the ``import-all`` command. When importing commits assigned to a specific ref, it is
+recommended to use the ``import-commits`` command.

pulpcore/cli/ostree/context.py

@@ -98,13 +98,22 @@ class PulpOstreeRepositoryContext(PulpRepositoryContext):
     DELETE_ID = "repositories_ostree_ostree_delete"
     SYNC_ID = "repositories_ostree_ostree_sync"
     MODIFY_ID = "repositories_ostree_ostree_modify"
-    IMPORT_ID: ClassVar[str] = "repositories_ostree_ostree_import_commits"
+    IMPORT_ALL_ID: ClassVar[str] = "repositories_ostree_ostree_import_all"
+    IMPORT_COMMITS_ID: ClassVar[str] = "repositories_ostree_ostree_import_commits"
     VERSION_CONTEXT = PulpOstreeRepositoryVersionContext
     CAPABILITIES = {
         "sync": [PluginRequirement("ostree")],
+        "import_all": [PluginRequirement("ostree", min="2.0.0a6.dev")],
         "import_commits": [PluginRequirement("ostree")],
     }
 
+    def import_all(self, href: str, artifact: str, repository_name: str) -> Any:
+        body: Dict[str, Any] = {
+            "artifact": artifact,
+            "repository_name": repository_name,
+        }
+        return self.pulp_ctx.call(self.IMPORT_ALL_ID, parameters={self.HREF: href}, body=body)
+
     def import_commits(
         self,
         href: str,
@@ -124,7 +133,7 @@ def import_commits(
             body["parent_commit"] = parent_commit
 
         return self.pulp_ctx.call(
-            self.IMPORT_ID,
+            self.IMPORT_COMMITS_ID,
             parameters={self.HREF: href},
             body=body,
         )

pulpcore/cli/ostree/repository.py

@@ -186,7 +186,36 @@ def sync(
     repository_ctx.sync(href=repository_href, body=body)
 
 
-@repository.command()
+@repository.command(help=_("Import all refs and commits from a tarball"))
+@click.option("--file", type=click.File("rb"), required=True)
+@chunk_size_option
+@name_option
+@click.option(
+    "--repository_name",
+    type=str,
+    required=True,
+    help=_("Name of a repository which contains the imported commits"),
+)
+@pass_repository_context
+@pass_pulp_context
+def import_all(
+    pulp_ctx: PulpContext,
+    repository_ctx: PulpOstreeRepositoryContext,
+    file: IO[bytes],
+    chunk_size: int,
+    repository_name: str,
+) -> None:
+    repository_href = repository_ctx.pulp_href
+    artifact_href = PulpArtifactContext(pulp_ctx).upload(file, chunk_size)
+    kwargs = {
+        "href": repository_href,
+        "artifact": artifact_href,
+        "repository_name": repository_name,
+    }
+    repository_ctx.import_all(**kwargs)
+
+
+@repository.command(help=_("Import commits from a tarball to a specific ref"))
 @click.option("--file", type=click.File("rb"), required=True)
 @chunk_size_option
 @name_option

tests/scripts/pulp_ostree/test_import_publish.sh

@@ -14,9 +14,17 @@ wget --no-parent -r "$OSTREE_REMOTE_URL"
 tar --exclude="index.html" -cvf "fixtures_small_repo.tar" -C "$OSTREE_DOWNLOADED_REPO_PATH" "small"
 
 expect_succ pulp ostree repository create --name "cli_test_ostree_repository"
-expect_succ pulp ostree repository import-commits --name "cli_test_ostree_repository" \
-  --file "fixtures_small_repo.tar" \
-  --repository_name "small"
+
+if pulp debug has-plugin --name "ostree" --min-version "2.0.0a6.dev"
+then
+  expect_succ pulp ostree repository import-all --name "cli_test_ostree_repository" \
+    --file "fixtures_small_repo.tar" \
+    --repository_name "small"
+else
+  expect_succ pulp ostree repository import-commits --name "cli_test_ostree_repository" \
+    --file "fixtures_small_repo.tar" \
+    --repository_name "small"
+fi
 
 tar -xvf fixtures_small_repo.tar
 # extract the latest commit checksum from the ref 'stable'