Merge pull request #12499 from monstermunchkin/misc/lxc-delete

lxc/delete: Include instance name in error message
canonical · Nov 7, 2023 · 49c1fd4 · 49c1fd4
2 parents c135fa3 + 091045c
commit 49c1fd4
Show file tree

Hide file tree

Showing 41 changed files with 527 additions and 122 deletions.
diff --git a/lxc/delete.go b/lxc/delete.go
@@ -92,6 +92,11 @@ func (c *cmdDelete) Run(cmd *cobra.Command, args []string) error {
 
 	// Process with deletion.
 	for _, resource := range resources {
+		connInfo, err := resource.server.GetConnectionInfo()
+		if err != nil {
+			return err
+		}
+
 		if c.flagInteractive {
 			err := c.promptDelete(resource.name)
 			if err != nil {
@@ -102,7 +107,7 @@ func (c *cmdDelete) Run(cmd *cobra.Command, args []string) error {
 		if shared.IsSnapshot(resource.name) {
 			err := c.doDelete(resource.server, resource.name)
 			if err != nil {
-				return err
+				return fmt.Errorf(i18n.G("Failed deleting instance snapshot %q in project %q: %w"), resource.name, connInfo.Project, err)
 			}
 
 			continue
@@ -160,7 +165,7 @@ func (c *cmdDelete) Run(cmd *cobra.Command, args []string) error {
 
 		err = c.doDelete(resource.server, resource.name)
 		if err != nil {
-			return err
+			return fmt.Errorf(i18n.G("Failed deleting instance %q in project %q: %w"), resource.name, connInfo.Project, err)
 		}
 	}
 	return nil

diff --git a/po/ar.po b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxd@lists.canonical.com\n"
-"POT-Creation-Date: 2023-11-05 22:14+0000\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -2061,6 +2061,16 @@ msgstr ""
 msgid "Failed converting token operation to certificate add token: %w"
 msgstr ""
 
+#: lxc/delete.go:168
+#, c-format
+msgid "Failed deleting instance %q in project %q: %w"
+msgstr ""
+
+#: lxc/delete.go:110
+#, c-format
+msgid "Failed deleting instance snapshot %q in project %q: %w"
+msgstr ""
+
 #: lxc/file.go:1174
 #, c-format
 msgid "Failed generating SSH host key: %w"
@@ -5230,7 +5240,7 @@ msgstr ""
 msgid "Stopping instance failed!"
 msgstr ""
 
-#: lxc/delete.go:134
+#: lxc/delete.go:139
 #, c-format
 msgid "Stopping the instance failed: %s"
 msgstr ""
@@ -5394,7 +5404,7 @@ msgstr ""
 msgid "The direction argument must be one of: ingress, egress"
 msgstr ""
 
-#: lxc/delete.go:118
+#: lxc/delete.go:123
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 

diff --git a/po/ber.po b/po/ber.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxd@lists.canonical.com\n"
-"POT-Creation-Date: 2023-11-05 22:14+0000\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
 "PO-Revision-Date: 2022-03-10 15:10+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Berber <https://hosted.weblate.org/projects/linux-containers/"
@@ -2064,6 +2064,16 @@ msgstr ""
 msgid "Failed converting token operation to certificate add token: %w"
 msgstr ""
 
+#: lxc/delete.go:168
+#, c-format
+msgid "Failed deleting instance %q in project %q: %w"
+msgstr ""
+
+#: lxc/delete.go:110
+#, c-format
+msgid "Failed deleting instance snapshot %q in project %q: %w"
+msgstr ""
+
 #: lxc/file.go:1174
 #, c-format
 msgid "Failed generating SSH host key: %w"
@@ -5233,7 +5243,7 @@ msgstr ""
 msgid "Stopping instance failed!"
 msgstr ""
 
-#: lxc/delete.go:134
+#: lxc/delete.go:139
 #, c-format
 msgid "Stopping the instance failed: %s"
 msgstr ""
@@ -5397,7 +5407,7 @@ msgstr ""
 msgid "The direction argument must be one of: ingress, egress"
 msgstr ""
 
-#: lxc/delete.go:118
+#: lxc/delete.go:123
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 

diff --git a/po/bg.po b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxd@lists.canonical.com\n"
-"POT-Creation-Date: 2023-11-05 22:14+0000\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
 "PO-Revision-Date: 2022-03-10 15:09+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/linux-"
@@ -2064,6 +2064,16 @@ msgstr ""
 msgid "Failed converting token operation to certificate add token: %w"
 msgstr ""
 
+#: lxc/delete.go:168
+#, c-format
+msgid "Failed deleting instance %q in project %q: %w"
+msgstr ""
+
+#: lxc/delete.go:110
+#, c-format
+msgid "Failed deleting instance snapshot %q in project %q: %w"
+msgstr ""
+
 #: lxc/file.go:1174
 #, c-format
 msgid "Failed generating SSH host key: %w"
@@ -5233,7 +5243,7 @@ msgstr ""
 msgid "Stopping instance failed!"
 msgstr ""
 
-#: lxc/delete.go:134
+#: lxc/delete.go:139
 #, c-format
 msgid "Stopping the instance failed: %s"
 msgstr ""
@@ -5397,7 +5407,7 @@ msgstr ""
 msgid "The direction argument must be one of: ingress, egress"
 msgstr ""
 
-#: lxc/delete.go:118
+#: lxc/delete.go:123
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 

diff --git a/po/ca.po b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxd@lists.canonical.com\n"
-"POT-Creation-Date: 2023-11-05 22:14+0000\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
 "PO-Revision-Date: 2022-03-10 15:10+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/linux-containers/"
@@ -2064,6 +2064,16 @@ msgstr ""
 msgid "Failed converting token operation to certificate add token: %w"
 msgstr ""
 
+#: lxc/delete.go:168
+#, c-format
+msgid "Failed deleting instance %q in project %q: %w"
+msgstr ""
+
+#: lxc/delete.go:110
+#, c-format
+msgid "Failed deleting instance snapshot %q in project %q: %w"
+msgstr ""
+
 #: lxc/file.go:1174
 #, c-format
 msgid "Failed generating SSH host key: %w"
@@ -5233,7 +5243,7 @@ msgstr ""
 msgid "Stopping instance failed!"
 msgstr ""
 
-#: lxc/delete.go:134
+#: lxc/delete.go:139
 #, c-format
 msgid "Stopping the instance failed: %s"
 msgstr ""
@@ -5397,7 +5407,7 @@ msgstr ""
 msgid "The direction argument must be one of: ingress, egress"
 msgstr ""
 
-#: lxc/delete.go:118
+#: lxc/delete.go:123
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 

diff --git a/po/cs.po b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxd@lists.canonical.com\n"
-"POT-Creation-Date: 2023-11-05 22:14+0000\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
 "PO-Revision-Date: 2022-03-10 15:11+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/linux-containers/"
@@ -2064,6 +2064,16 @@ msgstr ""
 msgid "Failed converting token operation to certificate add token: %w"
 msgstr ""
 
+#: lxc/delete.go:168
+#, c-format
+msgid "Failed deleting instance %q in project %q: %w"
+msgstr ""
+
+#: lxc/delete.go:110
+#, c-format
+msgid "Failed deleting instance snapshot %q in project %q: %w"
+msgstr ""
+
 #: lxc/file.go:1174
 #, c-format
 msgid "Failed generating SSH host key: %w"
@@ -5233,7 +5243,7 @@ msgstr ""
 msgid "Stopping instance failed!"
 msgstr ""
 
-#: lxc/delete.go:134
+#: lxc/delete.go:139
 #, c-format
 msgid "Stopping the instance failed: %s"
 msgstr ""
@@ -5397,7 +5407,7 @@ msgstr ""
 msgid "The direction argument must be one of: ingress, egress"
 msgstr ""
 
-#: lxc/delete.go:118
+#: lxc/delete.go:123
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 

diff --git a/po/de.po b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: lxd@lists.canonical.com\n"
-"POT-Creation-Date: 2023-11-05 22:14+0000\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
 "PO-Revision-Date: 2022-03-10 15:06+0000\n"
 "Last-Translator: Krombel <krombel@krombel.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -2437,6 +2437,16 @@ msgstr "kann nicht zum selben Container Namen kopieren"
 msgid "Failed converting token operation to certificate add token: %w"
 msgstr ""
 
+#: lxc/delete.go:168
+#, fuzzy, c-format
+msgid "Failed deleting instance %q in project %q: %w"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
+#: lxc/delete.go:110
+#, fuzzy, c-format
+msgid "Failed deleting instance snapshot %q in project %q: %w"
+msgstr "kann nicht zum selben Container Namen kopieren"
+
 #: lxc/file.go:1174
 #, fuzzy, c-format
 msgid "Failed generating SSH host key: %w"
@@ -5831,7 +5841,7 @@ msgstr ""
 msgid "Stopping instance failed!"
 msgstr "Anhalten des Containers fehlgeschlagen!"
 
-#: lxc/delete.go:134
+#: lxc/delete.go:139
 #, fuzzy, c-format
 msgid "Stopping the instance failed: %s"
 msgstr "Anhalten des Containers fehlgeschlagen!"
@@ -6005,7 +6015,7 @@ msgstr "entfernte Instanz %s existiert bereits"
 msgid "The direction argument must be one of: ingress, egress"
 msgstr ""
 
-#: lxc/delete.go:118
+#: lxc/delete.go:123
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 

diff --git a/po/el.po b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxd@lists.canonical.com\n"
-"POT-Creation-Date: 2023-11-05 22:14+0000\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
 "PO-Revision-Date: 2022-03-10 15:06+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -2084,6 +2084,16 @@ msgstr "  Χρήση δικτύου:"
 msgid "Failed converting token operation to certificate add token: %w"
 msgstr ""
 
+#: lxc/delete.go:168
+#, fuzzy, c-format
+msgid "Failed deleting instance %q in project %q: %w"
+msgstr "  Χρήση δικτύου:"
+
+#: lxc/delete.go:110
+#, fuzzy, c-format
+msgid "Failed deleting instance snapshot %q in project %q: %w"
+msgstr "  Χρήση δικτύου:"
+
 #: lxc/file.go:1174
 #, c-format
 msgid "Failed generating SSH host key: %w"
@@ -5317,7 +5327,7 @@ msgstr ""
 msgid "Stopping instance failed!"
 msgstr ""
 
-#: lxc/delete.go:134
+#: lxc/delete.go:139
 #, c-format
 msgid "Stopping the instance failed: %s"
 msgstr ""
@@ -5481,7 +5491,7 @@ msgstr ""
 msgid "The direction argument must be one of: ingress, egress"
 msgstr ""
 
-#: lxc/delete.go:118
+#: lxc/delete.go:123
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""
 

diff --git a/po/eo.po b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: lxd@lists.canonical.com\n"
-"POT-Creation-Date: 2023-11-05 22:14+0000\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
 "PO-Revision-Date: 2022-03-10 15:11+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/linux-"
@@ -2064,6 +2064,16 @@ msgstr ""
 msgid "Failed converting token operation to certificate add token: %w"
 msgstr ""
 
+#: lxc/delete.go:168
+#, c-format
+msgid "Failed deleting instance %q in project %q: %w"
+msgstr ""
+
+#: lxc/delete.go:110
+#, c-format
+msgid "Failed deleting instance snapshot %q in project %q: %w"
+msgstr ""
+
 #: lxc/file.go:1174
 #, c-format
 msgid "Failed generating SSH host key: %w"
@@ -5233,7 +5243,7 @@ msgstr ""
 msgid "Stopping instance failed!"
 msgstr ""
 
-#: lxc/delete.go:134
+#: lxc/delete.go:139
 #, c-format
 msgid "Stopping the instance failed: %s"
 msgstr ""
@@ -5397,7 +5407,7 @@ msgstr ""
 msgid "The direction argument must be one of: ingress, egress"
 msgstr ""
 
-#: lxc/delete.go:118
+#: lxc/delete.go:123
 msgid "The instance is currently running, stop it first or pass --force"
 msgstr ""