From nobody Thu May 15 03:01:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1515767946848585.6938675486842; Fri, 12 Jan 2018 06:39:06 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF63861D0F; Fri, 12 Jan 2018 14:38:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6456B17185; Fri, 12 Jan 2018 14:38:59 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 42D9B410B5; Fri, 12 Jan 2018 14:38:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0CEcA7A025691 for ; Fri, 12 Jan 2018 09:38:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id B8F82176C9; Fri, 12 Jan 2018 14:38:10 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F98165609 for ; Fri, 12 Jan 2018 14:38:07 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 12 Jan 2018 15:37:41 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 7/8] virsh: Introduce virshSecretUUIDCompleter X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 12 Jan 2018 14:39:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is a slight change from previous patches since virSecret does not have a name only UUID strings. Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- tools/virsh-completer.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-secret.c | 15 ++++++++++----- 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 9e6f086c0..7332fa97a 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -438,3 +438,49 @@ virshNWFilterNameCompleter(vshControl *ctl, VIR_FREE(ret); return NULL; } + + +char ** +virshSecretUUIDCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv =3D ctl->privData; + virSecretPtr *secrets =3D NULL; + int nsecrets =3D 0; + size_t i =3D 0; + char **ret =3D NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <=3D 0) + return NULL; + + if ((nsecrets =3D virConnectListAllSecrets(priv->conn, &secrets, flags= )) < 0) + return NULL; + + if (VIR_ALLOC_N(ret, nsecrets + 1) < 0) + goto error; + + for (i =3D 0; i < nsecrets; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + + if (virSecretGetUUIDString(secrets[i], uuid) < 0 || + VIR_STRDUP(ret[i], uuid) < 0) + goto error; + + virSecretFree(secrets[i]); + } + VIR_FREE(secrets); + + return ret; + + error: + for (; i < nsecrets; i++) + virSecretFree(secrets[i]); + VIR_FREE(secrets); + for (i =3D 0; i < nsecrets; i++) + VIR_FREE(ret[i]); + VIR_FREE(ret); + return NULL; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 3c3b17f1e..0e518873c 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -62,4 +62,8 @@ char ** virshNWFilterNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); =20 +char ** virshSecretUUIDCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + #endif diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 52f067652..9e4ec61a8 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -132,7 +132,8 @@ static const vshCmdOptDef opts_secret_dumpxml[] =3D { {.name =3D "secret", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, - .help =3D N_("secret UUID") + .help =3D N_("secret UUID"), + .completer =3D virshSecretUUIDCompleter, }, {.name =3D NULL} }; @@ -177,7 +178,8 @@ static const vshCmdOptDef opts_secret_set_value[] =3D { {.name =3D "secret", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, - .help =3D N_("secret UUID") + .help =3D N_("secret UUID"), + .completer =3D virshSecretUUIDCompleter, }, {.name =3D "base64", .type =3D VSH_OT_DATA, @@ -245,7 +247,8 @@ static const vshCmdOptDef opts_secret_get_value[] =3D { {.name =3D "secret", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, - .help =3D N_("secret UUID") + .help =3D N_("secret UUID"), + .completer =3D virshSecretUUIDCompleter, }, {.name =3D NULL} }; @@ -297,7 +300,8 @@ static const vshCmdOptDef opts_secret_undefine[] =3D { {.name =3D "secret", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, - .help =3D N_("secret UUID") + .help =3D N_("secret UUID"), + .completer =3D virshSecretUUIDCompleter, }, {.name =3D NULL} }; @@ -667,7 +671,8 @@ static const vshCmdInfo info_secret_event[] =3D { static const vshCmdOptDef opts_secret_event[] =3D { {.name =3D "secret", .type =3D VSH_OT_STRING, - .help =3D N_("filter by secret name or uuid") + .help =3D N_("filter by secret name or uuid"), + .completer =3D virshSecretUUIDCompleter, }, {.name =3D "event", .type =3D VSH_OT_STRING, --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list