From d2c2fbbe6ee4b8380bd32456baba25d24c6ebacf Mon Sep 17 00:00:00 2001 From: Christophe Tafani-Dereeper Date: Mon, 17 Apr 2023 09:40:00 +0200 Subject: [PATCH] Imports formatting --- .../eks/find_secrets.go | 3 ++- cmd/managed-kubernetes-auditing-toolkit/eks/imds.go | 3 ++- cmd/managed-kubernetes-auditing-toolkit/eks/main.go | 3 ++- .../eks/role_relationships.go | 7 ++++--- internal/utils/aws.go | 3 ++- internal/utils/kubernetes.go | 9 +++++---- .../eks/role_relationships/roles_resolver.go | 9 +++++---- .../eks/role_relationships/roles_resolver_test.go | 3 ++- pkg/managed-kubernetes-auditing-toolkit/eks/utils.go | 1 - 9 files changed, 24 insertions(+), 17 deletions(-) diff --git a/cmd/managed-kubernetes-auditing-toolkit/eks/find_secrets.go b/cmd/managed-kubernetes-auditing-toolkit/eks/find_secrets.go index d445b47..090728e 100644 --- a/cmd/managed-kubernetes-auditing-toolkit/eks/find_secrets.go +++ b/cmd/managed-kubernetes-auditing-toolkit/eks/find_secrets.go @@ -1,12 +1,13 @@ package eks import ( + "log" + "github.com/datadog/managed-kubernetes-auditing-toolkit/internal/utils" "github.com/datadog/managed-kubernetes-auditing-toolkit/pkg/managed-kubernetes-auditing-toolkit/eks/secrets" "github.com/fatih/color" "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" - "log" ) func buildEksFindSecretsCommand() *cobra.Command { diff --git a/cmd/managed-kubernetes-auditing-toolkit/eks/imds.go b/cmd/managed-kubernetes-auditing-toolkit/eks/imds.go index 34f0ea5..d74a798 100644 --- a/cmd/managed-kubernetes-auditing-toolkit/eks/imds.go +++ b/cmd/managed-kubernetes-auditing-toolkit/eks/imds.go @@ -1,11 +1,12 @@ package eks import ( + "log" + "github.com/datadog/managed-kubernetes-auditing-toolkit/internal/utils" "github.com/datadog/managed-kubernetes-auditing-toolkit/pkg/managed-kubernetes-auditing-toolkit/eks/imds" "github.com/fatih/color" "github.com/spf13/cobra" - "log" ) func buildTestImdsAccessCommand() *cobra.Command { diff --git a/cmd/managed-kubernetes-auditing-toolkit/eks/main.go b/cmd/managed-kubernetes-auditing-toolkit/eks/main.go index 1182017..e259686 100644 --- a/cmd/managed-kubernetes-auditing-toolkit/eks/main.go +++ b/cmd/managed-kubernetes-auditing-toolkit/eks/main.go @@ -2,10 +2,11 @@ package eks import ( "errors" + "log" + "github.com/common-nighthawk/go-figure" "github.com/datadog/managed-kubernetes-auditing-toolkit/internal/utils" "github.com/spf13/cobra" - "log" ) func BuildEksSubcommand() *cobra.Command { diff --git a/cmd/managed-kubernetes-auditing-toolkit/eks/role_relationships.go b/cmd/managed-kubernetes-auditing-toolkit/eks/role_relationships.go index 1784a77..a333489 100644 --- a/cmd/managed-kubernetes-auditing-toolkit/eks/role_relationships.go +++ b/cmd/managed-kubernetes-auditing-toolkit/eks/role_relationships.go @@ -3,6 +3,10 @@ package eks import ( "errors" "fmt" + "log" + "os" + "strings" + "github.com/awalterschulze/gographviz" "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/datadog/managed-kubernetes-auditing-toolkit/internal/utils" @@ -13,9 +17,6 @@ import ( "github.com/spf13/cobra" "golang.org/x/exp/slices" "golang.org/x/term" - "log" - "os" - "strings" ) // Command-line arguments diff --git a/internal/utils/aws.go b/internal/utils/aws.go index adc0cda..d56b68b 100644 --- a/internal/utils/aws.go +++ b/internal/utils/aws.go @@ -2,9 +2,10 @@ package utils import ( "context" + "log" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/config" - "log" ) func AWSClient() *aws.Config { diff --git a/internal/utils/kubernetes.go b/internal/utils/kubernetes.go index e2356a9..71bb33a 100644 --- a/internal/utils/kubernetes.go +++ b/internal/utils/kubernetes.go @@ -1,14 +1,15 @@ package utils import ( - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" - "k8s.io/client-go/tools/clientcmd" - "k8s.io/client-go/util/homedir" "log" "os" "path/filepath" "strings" + + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" + "k8s.io/client-go/tools/clientcmd" + "k8s.io/client-go/util/homedir" ) func getKubeConfigPath() string { diff --git a/pkg/managed-kubernetes-auditing-toolkit/eks/role_relationships/roles_resolver.go b/pkg/managed-kubernetes-auditing-toolkit/eks/role_relationships/roles_resolver.go index ad4ee2d..94e458a 100644 --- a/pkg/managed-kubernetes-auditing-toolkit/eks/role_relationships/roles_resolver.go +++ b/pkg/managed-kubernetes-auditing-toolkit/eks/role_relationships/roles_resolver.go @@ -4,6 +4,11 @@ import ( "context" "encoding/json" "fmt" + "log" + "net/url" + "path/filepath" + "strconv" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/eks" @@ -11,10 +16,6 @@ import ( eks2 "github.com/datadog/managed-kubernetes-auditing-toolkit/pkg/managed-kubernetes-auditing-toolkit/eks" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "log" - "net/url" - "path/filepath" - "strconv" ) type EKSClusterRolesResolver struct { diff --git a/pkg/managed-kubernetes-auditing-toolkit/eks/role_relationships/roles_resolver_test.go b/pkg/managed-kubernetes-auditing-toolkit/eks/role_relationships/roles_resolver_test.go index e4c4b27..997cd7c 100644 --- a/pkg/managed-kubernetes-auditing-toolkit/eks/role_relationships/roles_resolver_test.go +++ b/pkg/managed-kubernetes-auditing-toolkit/eks/role_relationships/roles_resolver_test.go @@ -1,8 +1,9 @@ package role_relationships import ( - "github.com/datadog/managed-kubernetes-auditing-toolkit/pkg/managed-kubernetes-auditing-toolkit/eks" "testing" + + "github.com/datadog/managed-kubernetes-auditing-toolkit/pkg/managed-kubernetes-auditing-toolkit/eks" ) func TestRoleCanBeAssumedByServiceAccount(t *testing.T) { diff --git a/pkg/managed-kubernetes-auditing-toolkit/eks/utils.go b/pkg/managed-kubernetes-auditing-toolkit/eks/utils.go index 784e8f9..cc9616b 100644 --- a/pkg/managed-kubernetes-auditing-toolkit/eks/utils.go +++ b/pkg/managed-kubernetes-auditing-toolkit/eks/utils.go @@ -1,2 +1 @@ package eks -