quadlet/main: add missing extensions

cmd/quadlet: add common.AutocompleteQuadlets

Signed-off-by: flouthoc <[email protected]>

Author: flouthoc

cmd/podman/common/completion.go

@@ -173,6 +173,28 @@ func getPods(cmd *cobra.Command, toComplete string, cType completeType, statuses
 	return suggestions, cobra.ShellCompDirectiveNoFileComp
 }
 
+func getQuadlets(cmd *cobra.Command, toComplete string) ([]string, cobra.ShellCompDirective) {
+	suggestions := []string{}
+	lsOpts := entities.QuadletListOptions{}
+	engine, err := setupContainerEngine(cmd)
+	if err != nil {
+		cobra.CompErrorln(err.Error())
+		return nil, cobra.ShellCompDirectiveNoFileComp
+	}
+	quadlets, err := engine.QuadletList(registry.Context(), lsOpts)
+	if err != nil {
+		cobra.CompErrorln(err.Error())
+		return nil, cobra.ShellCompDirectiveNoFileComp
+	}
+
+	for _, q := range quadlets {
+		if strings.HasPrefix(q.Name, toComplete) {
+			suggestions = append(suggestions, q.Name)
+		}
+	}
+	return suggestions, cobra.ShellCompDirectiveNoFileComp
+}
+
 func getVolumes(cmd *cobra.Command, toComplete string) ([]string, cobra.ShellCompDirective) {
 	suggestions := []string{}
 	lsOpts := entities.VolumeListOptions{}
@@ -730,6 +752,14 @@ func AutocompleteImages(cmd *cobra.Command, args []string, toComplete string) ([
 	return getImages(cmd, toComplete)
 }
 
+// AutocompleteQuadlets - Autocomplete quadlets.
+func AutocompleteQuadlets(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	if !validCurrentCmdLine(cmd, args, toComplete) {
+		return nil, cobra.ShellCompDirectiveNoFileComp
+	}
+	return getQuadlets(cmd, toComplete)
+}
+
 // AutocompleteManifestListAndMember - Autocomplete names of manifest lists and digests of items in them.
 func AutocompleteManifestListAndMember(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	if !validCurrentCmdLine(cmd, args, toComplete) {

cmd/podman/quadlet/install.go

@@ -25,8 +25,7 @@ var (
 			}
 			return nil
 		},
-		// TODO: Autocomplete valid extensions only
-		ValidArgsFunction: completion.AutocompleteDefault,
+		ValidArgsFunction: completion.AutocompleteNone,
 		Example: `podman quadlet install /path/to/myquadlet.container
 podman quadlet install https://github.com/containers/podman/blob/main/test/e2e/quadlet/basic.container
 podman quadlet install oci-artifact://my-artifact:latest`,

cmd/podman/quadlet/print.go

@@ -3,6 +3,7 @@ package quadlet
 import (
 	"fmt"
 
+	"github.com/containers/podman/v5/cmd/podman/common"
 	"github.com/containers/podman/v5/cmd/podman/registry"
 	"github.com/spf13/cobra"
 )
@@ -11,12 +12,12 @@ var (
 	quadletPrintDescription = `Print the contents of a Quadlet, displaying the file including all comments`
 
 	quadletPrintCmd = &cobra.Command{
-		Use:   "print [options] QUADLET",
-		Short: "Display the contents of a quadlet",
-		Long:  quadletPrintDescription,
-		RunE:  print,
-		// TODO: Autocomplete
-		Args: cobra.ExactArgs(1),
+		Use:               "print [options] QUADLET",
+		Short:             "Display the contents of a quadlet",
+		Long:              quadletPrintDescription,
+		RunE:              print,
+		ValidArgsFunction: common.AutocompleteQuadlets,
+		Args:              cobra.ExactArgs(1),
 		Example: `podman quadlet print myquadlet.container
 podman quadlet print mypod.pod
 podman quadlet print myimage.build`,

cmd/podman/quadlet/remove.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/containers/podman/v5/cmd/podman/common"
 	"github.com/containers/podman/v5/cmd/podman/registry"
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/sirupsen/logrus"
@@ -14,11 +15,11 @@ var (
 	quadletRmDescription = `Remove one or more installed Quadlets from the current user`
 
 	quadletRmCmd = &cobra.Command{
-		Use:   "rm [options] QUADLET [QUADLET...]",
-		Short: "Remove Quadlets",
-		Long:  quadletRmDescription,
-		RunE:  rm,
-		// TODO: Arg validation plus completion
+		Use:               "rm [options] QUADLET [QUADLET...]",
+		Short:             "Remove Quadlets",
+		Long:              quadletRmDescription,
+		RunE:              rm,
+		ValidArgsFunction: common.AutocompleteQuadlets,
 		Example: `podman quadlet rm test.container
 podman quadlet rm --force mysql.container
 podman quadlet rm --all --reload-systemd=false`,

cmd/quadlet/main.go

@@ -386,6 +386,14 @@ func generateUnitsInfoMap(units []*parser.UnitFile) map[string]*quadlet.UnitInfo
 			// Prefill resouceNames for .pod files.
 			// This is requires for referencing the pod from .container files
 			resourceName = quadlet.GetPodResourceName(unit)
+		case strings.HasSuffix(unit.Filename, ".volume"):
+			serviceName = quadlet.GetVolumeServiceName(unit)
+		case strings.HasSuffix(unit.Filename, ".kube"):
+			serviceName = quadlet.GetKubeServiceName(unit)
+		case strings.HasSuffix(unit.Filename, ".network"):
+			serviceName = quadlet.GetNetworkServiceName(unit)
+		case strings.HasSuffix(unit.Filename, ".image"):
+			serviceName = quadlet.GetImageServiceName(unit)
 		default:
 			Logf("Unsupported file type %q", unit.Filename)
 			continue