client: API/Command to drop imports

node/impl/client/client.go

@@ -262,29 +262,36 @@ func (a *API) makeRetrievalQuery(ctx context.Context, rp rm.RetrievalPeer, paylo
 	}
 }
 
-func (a *API) ClientImport(ctx context.Context, ref api.FileRef) (cid.Cid, error) {
+func (a *API) ClientImport(ctx context.Context, ref api.FileRef) (*api.ImportRes, error) {
 	id, st, err := a.imgr().NewStore()
 	if err != nil {
-		return cid.Undef, err
+		return nil, err
 	}
 	if err := a.imgr().AddLabel(id, importmgr.LSource, "import"); err != nil {
-		return cid.Undef, err
+		return nil, err
 	}
 
 	if err := a.imgr().AddLabel(id, importmgr.LFileName, ref.Path); err != nil {
-		return cid.Undef, err
+		return nil, err
 	}
 
 	nd, err := a.clientImport(ctx, ref, st)
 	if err != nil {
-		return cid.Undef, err
+		return nil, err
 	}
 
 	if err := a.imgr().AddLabel(id, importmgr.LRootCid, nd.String()); err != nil {
-		return cid.Undef, err
+		return nil, err
 	}
 
-	return nd, nil
+	return &api.ImportRes{
+		Root:     nd,
+		ImportID: id,
+	}, nil
+}
+
+func (a *API) ClientRemoveImport(ctx context.Context, importID int64) error {
+	return a.imgr().Remove(importID)
 }
 
 func (a *API) ClientImportLocal(ctx context.Context, f io.Reader) (cid.Cid, error) {

node/repo/fsrepo_ds.go

@@ -226,6 +226,8 @@ func (fsr *fsLockedRepo) DeleteDatastore(ns string) error {
 		return xerrors.Errorf("no multi-datastore with at index (namespace %s)", ns)
 	}
 
+	delete(mds, idx)
+
 	if err := ds.Close(); err != nil {
 		return xerrors.Errorf("closing datastore: %w", err)
 	}

node/repo/importmgr/mgr.go

@@ -99,5 +99,14 @@ func (m *Mgr) Info(id int64) (*StoreMeta, error) {
 	return &sm, nil
 }
 
-// m.Info
-// m.Delete
+func (m *Mgr) Remove(id int64) error {
+	if err := m.mds.Delete(id); err != nil {
+		return xerrors.Errorf("removing import: %w", err)
+	}
+
+	if err := m.ds.Delete(datastore.NewKey(fmt.Sprintf("%d", id))); err != nil {
+		return xerrors.Errorf("removing import metadata: %w", err)
+	}
+
+	return nil
+}