Add an option to specify the EKS cluster name

Author: christophetd

cmd/managed-kubernetes-auditing-toolkit/eks/main.go

@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var ignoreEksHostnameCheck bool
+var skipEksHostnameCheck bool
 
 func BuildEksSubcommand() *cobra.Command {
 	eksCommand := &cobra.Command{
@@ -18,7 +18,7 @@ func BuildEksSubcommand() *cobra.Command {
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 			figure.NewFigure("mkat", "", true).Print()
 			println()
-			if !ignoreEksHostnameCheck && !utils.IsEKS() {
+			if !skipEksHostnameCheck && !utils.IsEKS() {
 				return errors.New("you do not seem to be connected to an EKS cluster. Connect to an EKS cluster and try again")
 			}
 			clusterName := utils.GetEKSClusterName()
@@ -29,7 +29,7 @@ func BuildEksSubcommand() *cobra.Command {
 		},
 	}
 
-	eksCommand.PersistentFlags().BoolVarP(&ignoreEksHostnameCheck, "skip-eks-hostname-check", "", false, "Don't check that the hostname of your current API server ends with .eks.amazonaws.com")
+	eksCommand.PersistentFlags().BoolVarP(&skipEksHostnameCheck, "skip-eks-hostname-check", "", false, "Don't check that the hostname of your current API server ends with .eks.amazonaws.com")
 	eksCommand.AddCommand(buildEksRoleRelationshipsCommand())
 	eksCommand.AddCommand(buildEksFindSecretsCommand())
 	eksCommand.AddCommand(buildTestImdsAccessCommand())

cmd/managed-kubernetes-auditing-toolkit/eks/role_relationships.go

@@ -21,6 +21,7 @@ import (
 // Command-line arguments
 var outputFormat string
 var outputFile string
+var eksClusterName string
 
 // Output formats
 const (
@@ -48,6 +49,10 @@ func buildEksRoleRelationshipsCommand() *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cluster := utils.GetEKSClusterName()
+			if cluster == "" {
+				// If we cannot determine the EKS cluster name automatically, give the user a chance to specify it on the CLI
+				cluster = eksClusterName
+			}
 			if cluster == "" {
 				return errors.New("unable to determine your current EKS cluster name")
 			}
@@ -57,6 +62,8 @@ func buildEksRoleRelationshipsCommand() *cobra.Command {
 
 	eksRoleRelationshipsCommand.Flags().StringVarP(&outputFormat, "output-format", "f", DefaultOutputFormat, "Output format. Supported formats: "+strings.Join(availableOutputFormats, ", "))
 	eksRoleRelationshipsCommand.Flags().StringVarP(&outputFile, "output-file", "o", "", "Output file. If not specified, output will be printed to stdout.")
+	eksRoleRelationshipsCommand.Flags().StringVarP(&eksClusterName, "eks-cluster-name", "", "", "When the EKS cluster name cannot be automatically detected from your KubeConfig, specify this argument to pass the EKS cluster name of your current kubectl context")
+	
 	return eksRoleRelationshipsCommand
 }