add shoot target check when target.Stack() length > 3

gardener-attic · May 19, 2020 · f3c3cf6 · f3c3cf6
1 parent 152b113
commit f3c3cf6
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 7 deletions.
diff --git a/pkg/cmd/aliyun.go b/pkg/cmd/aliyun.go
@@ -28,7 +28,7 @@ func NewAliyunCmd(targetReader TargetReader) *cobra.Command {
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			target := targetReader.ReadTarget(pathTarget)
-			if len(target.Stack()) < 3 {
+			if !CheckShootIsTargeted(target) {
 				return errors.New("no shoot targeted")
 			}
 

diff --git a/pkg/cmd/aws.go b/pkg/cmd/aws.go
@@ -28,7 +28,7 @@ func NewAwsCmd(targetReader TargetReader) *cobra.Command {
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			target := targetReader.ReadTarget(pathTarget)
-			if len(target.Stack()) < 3 {
+			if !CheckShootIsTargeted(target) {
 				return errors.New("no shoot targeted")
 			}
 

diff --git a/pkg/cmd/az.go b/pkg/cmd/az.go
@@ -28,7 +28,7 @@ func NewAzCmd(targetReader TargetReader) *cobra.Command {
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			target := targetReader.ReadTarget(pathTarget)
-			if len(target.Stack()) < 3 {
+			if !CheckShootIsTargeted(target) {
 				return errors.New("no shoot targeted")
 			}
 

diff --git a/pkg/cmd/gcloud.go b/pkg/cmd/gcloud.go
@@ -28,7 +28,7 @@ func NewGcloudCmd(targetReader TargetReader) *cobra.Command {
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			target := targetReader.ReadTarget(pathTarget)
-			if len(target.Stack()) < 3 {
+			if !CheckShootIsTargeted(target) {
 				return errors.New("no shoot targeted")
 			}
 

diff --git a/pkg/cmd/get.go b/pkg/cmd/get.go
@@ -236,7 +236,7 @@ func getSeed(name string, targetReader TargetReader, ioStreams IOStreams) error
 func getShoot(name string, targetReader TargetReader, kubeconfigWriter KubeconfigWriter, ioStreams IOStreams) error {
 	target := targetReader.ReadTarget(pathTarget)
 	if name == "" {
-		if len(target.Stack()) < 3 {
+		if !CheckShootIsTargeted(target) {
 			return errors.New("no shoot targeted")
 		}
 	} else if name != "" {

diff --git a/pkg/cmd/openstack.go b/pkg/cmd/openstack.go
@@ -28,7 +28,7 @@ func NewOpenstackCmd(targetReader TargetReader) *cobra.Command {
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			target := targetReader.ReadTarget(pathTarget)
-			if len(target.Stack()) < 3 {
+			if !CheckShootIsTargeted(target) {
 				return errors.New("no shoot targeted")
 			}
 

diff --git a/pkg/cmd/ssh.go b/pkg/cmd/ssh.go
@@ -44,7 +44,7 @@ func NewSSHCmd(reader TargetReader, ioStreams IOStreams) *cobra.Command {
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			target := reader.ReadTarget(pathTarget)
-			if len(target.Stack()) < 3 {
+			if !CheckShootIsTargeted(target) {
 				return errors.New("no shoot targeted")
 			}
 

diff --git a/pkg/cmd/utils.go b/pkg/cmd/utils.go
@@ -227,3 +227,11 @@ func TidyKubeconfigWithHomeDir(pathToKubeconfig string) string {
 	}
 	return pathToKubeconfig
 }
+
+//CheckShootIsTargeted check if current target has shoot targeted
+func CheckShootIsTargeted(target TargetInterface) bool {
+	if (len(target.Stack()) < 3) || (target.Stack()[len(target.Stack())-1].Kind == "namespace" && target.Stack()[len(target.Stack())-2].Kind != "shoot") {
+		return false
+	}
+	return true
+}