From 3e87dd9d8c37df36468bcb9ae8b2cfeed80213af Mon Sep 17 00:00:00 2001
From: Dmitriy Kalinin <cppforlife@gmail.com>
Date: Fri, 3 Jan 2020 12:19:07 -0500
Subject: [PATCH] require non-empty group name for app-group commands

---
 pkg/kapp/cmd/appgroup/delete.go | 6 ++++++
 pkg/kapp/cmd/appgroup/deploy.go | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/pkg/kapp/cmd/appgroup/delete.go b/pkg/kapp/cmd/appgroup/delete.go
index 1a0a25cda..d4172121e 100644
--- a/pkg/kapp/cmd/appgroup/delete.go
+++ b/pkg/kapp/cmd/appgroup/delete.go
@@ -1,6 +1,8 @@
 package appgroup
 
 import (
+	"fmt"
+
 	"github.com/cppforlife/go-cli-ui/ui"
 	cmdapp "github.com/k14s/kapp/pkg/kapp/cmd/app"
 	cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core"
@@ -45,6 +47,10 @@ func NewDeleteCmd(o *DeleteOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
 }
 
 func (o *DeleteOptions) Run() error {
+	if len(o.AppGroupFlags.Name) == 0 {
+		return fmt.Errorf("Expected group name to be non-empty")
+	}
+
 	supportObjs, err := cmdapp.AppFactoryClients(o.depsFactory, o.AppGroupFlags.NamespaceFlags, cmdapp.ResourceTypesFlags{}, o.logger)
 	if err != nil {
 		return err
diff --git a/pkg/kapp/cmd/appgroup/deploy.go b/pkg/kapp/cmd/appgroup/deploy.go
index cd7f15e34..9a085a2a9 100644
--- a/pkg/kapp/cmd/appgroup/deploy.go
+++ b/pkg/kapp/cmd/appgroup/deploy.go
@@ -54,6 +54,10 @@ func NewDeployCmd(o *DeployOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
 }
 
 func (o *DeployOptions) Run() error {
+	if len(o.AppGroupFlags.Name) == 0 {
+		return fmt.Errorf("Expected group name to be non-empty")
+	}
+
 	// TODO what if app is renamed? currently it
 	// will have conflicting resources with new-named app
 	updatedApps, err := o.appsToUpdate()