feat: detect self update using the container sm-plugin type

Author: reubenmiller

.goreleaser.yaml

@@ -107,12 +107,6 @@ nfpms:
         dst: /etc/tedge/sm-plugins/container-group
         type: symlink
 
-      # apk only (used for self updates)
-      - src: /usr/bin/tedge-container
-        dst: /etc/tedge/sm-plugins/self
-        type: symlink
-        packager: apk
-
       # Config
       - src: ./packaging/config.toml
         dst: /etc/tedge/plugins/tedge-container-plugin.toml

cli/self/check.go

@@ -106,10 +106,14 @@ func (c *CheckCommand) RunE(cmd *cobra.Command, args []string) error {
 					match.ContainerName = item.Name
 					match.Image = item.Version
 					includesSelfUpdate = true
-					break
+				} else if item.Action == SoftwareManagementActionRemove {
+					return cli.ExitCodeError{
+						Code:   ExitError,
+						Err:    fmt.Errorf("tedge's own container cannot be removed. name=%s, version=%s, containerId=%s", item.Name, item.Version, selfContainerID),
+						Silent: true,
+					}
 				}
 			}
-			break
 		} else if module.Type == SoftwareManagementTypeContainer {
 			// container update
 			// Filter non self-updated modules
@@ -119,7 +123,11 @@ func (c *CheckCommand) RunE(cmd *cobra.Command, args []string) error {
 				if selfContainerName == item.Name {
 					if item.Action == SoftwareManagementActionRemove {
 						// Protect against the user deleting the tedge container itself
-						return fmt.Errorf("tedge's own container cannot be removed. name=%s, version=%s, containerId=%s", item.Name, item.Version, selfContainerID)
+						return cli.ExitCodeError{
+							Code:   ExitError,
+							Err:    fmt.Errorf("tedge's own container cannot be removed. name=%s, version=%s, containerId=%s", item.Name, item.Version, selfContainerID),
+							Silent: true,
+						}
 					} else if item.Action == SoftwareManagementActionInstall {
 						// install
 						match.ContainerName = item.Name

tests/self.robot

@@ -10,7 +10,11 @@ Test Tags    docker    podman
 
 *** Test Cases ***
 
-Self Update Is Present
+Self Update Is Present Using Self Type
+    ${output}=    DeviceLibrary.Execute Command    cmd=tedge-container self check '[{"type":"self","modules":[{"name":"tedge","action":"install","version":"123"}]},{"type":"container","modules":[{"name":"foo","version":"bar:1.0.0","action":"install"}]}]' --container tedge    strip=${True}
+    Should Contain    ${output}    {"containerName":"tedge","image":"123","updateList":[{"type":"container","modules":[{"name":"foo","version":"bar:1.0.0","action":"install"}]}]}
+
+Self Update Is Present Using Container Type
     ${output}=    DeviceLibrary.Execute Command    cmd=tedge-container self check '[{"type":"container","modules":[{"name":"tedge","action":"install","version":"123"},{"name":"foo","action":"install","version":"bar:latest","url":"https://foobar.com/example"}]}]' --container tedge    strip=${True}
     Should Contain    ${output}    {"containerName":"tedge","image":"123","updateList":[{"type":"container","modules":[{"name":"foo","version":"bar:latest","url":"https://foobar.com/example","action":"install"}]}]}