implement rm command for subsystems #242

cmd/subsyStems.go

@@ -64,21 +64,20 @@ func NewSubSystemsCommand() *cmdr.Command {
 	)
 
 	// Rm subcommand
-	/*
-		rmCmd := cmdr.NewCommand(
-			"rm",
-			apx.Trans("rmSubSystem.long"),
-			apx.Trans("rmSubSystem.short"),
-			rmSubSystem,
-		)
-		rmCmd.Example = "apx subsystems rm --name my-subsystem"
-		rmCmd.Args = cobra.ExactArgs(1)
-	*/
+
+	rmCmd := cmdr.NewCommand(
+		"rm",
+		apx.Trans("rmSubSystem.long"),
+		apx.Trans("rmSubSystem.short"),
+		rmSubSystem,
+	)
+	rmCmd.Example = "apx subsystems rm --name my-subsystem"
+	rmCmd.Args = cobra.ExactArgs(1)
 
 	// Add subcommands to subsystems
 	cmd.AddCommand(listCmd)
 	cmd.AddCommand(newCmd)
-	// cmd.AddCommand(rmCmd, rmCmd)
+	cmd.AddCommand(rmCmd, rmCmd)
 
 	return cmd
 }
@@ -156,7 +155,6 @@ func newSubSystem(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-/*
 func rmSubSystem(cmd *cobra.Command, args []string) error {
 	subSystemName := args[0]
 
@@ -174,4 +172,3 @@ func rmSubSystem(cmd *cobra.Command, args []string) error {
 
 	return nil
 }
-*/

core/dbox.go

@@ -173,6 +173,29 @@ func (d *dbox) ListContainers() ([]dboxContainer, error) {
 	return containers, nil
 }
 
+func (d *dbox) GetContainer(name string) (*dboxContainer, error) {
+	containers, err := d.ListContainers()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, container := range containers {
+		if container.Name == name {
+			return &container, nil
+		}
+	}
+
+	return nil, errors.New("container not found")
+}
+
+func (d *dbox) ContainerDelete(name string) error {
+	_, err := d.RunCommand("rm", []string{
+		"--name", name,
+		"--force",
+	}, []string{}, false, false)
+	return err
+}
+
 func (d *dbox) CreateContainer(name string, image string, additionalPackages []string, labels map[string]string) error {
 	args := []string{
 		"--image", image,

core/subSystem.go

@@ -51,6 +51,30 @@ func (s *SubSystem) Create() error {
 	return nil
 }
 
+func LoadSubSystem(name string) (*SubSystem, error) {
+	dbox, err := NewDbox()
+	if err != nil {
+		return nil, err
+	}
+
+	container, err := dbox.GetContainer(fmt.Sprintf("apx-%s", name))
+	if err != nil {
+		return nil, err
+	}
+
+	stack, err := LoadStack(container.Labels["stack"])
+	if err != nil {
+		return nil, err
+	}
+
+	return &SubSystem{
+		InternalName: container.Name,
+		Name:         container.Labels["name"],
+		Stack:        stack,
+		Status:       container.Status,
+	}, nil
+}
+
 func ListSubSystems() ([]*SubSystem, error) {
 	dbox, err := NewDbox()
 	if err != nil {
@@ -105,3 +129,12 @@ func (s *SubSystem) Enter() error {
 
 	return dbox.ContainerEnter(s.InternalName)
 }
+
+func (s *SubSystem) Remove() error {
+	dbox, err := NewDbox()
+	if err != nil {
+		return err
+	}
+
+	return dbox.ContainerDelete(s.InternalName)
+}