diff --git a/cmd/common.go b/cmd/common.go index cf6673f8e..7f84bf8c3 100644 --- a/cmd/common.go +++ b/cmd/common.go @@ -12,8 +12,8 @@ import ( "github.com/kubeshark/kubeshark/errormessage" "github.com/kubeshark/kubeshark/internal/connect" "github.com/kubeshark/kubeshark/kubernetes" - "github.com/kubeshark/kubeshark/kubeshark" - "github.com/kubeshark/kubeshark/kubeshark/fsUtils" + "github.com/kubeshark/kubeshark/misc" + "github.com/kubeshark/kubeshark/misc/fsUtils" "github.com/kubeshark/kubeshark/resources" "github.com/rs/zerolog/log" ) @@ -105,7 +105,7 @@ func dumpLogsIfNeeded(ctx context.Context, kubernetesProvider *kubernetes.Provid if !config.Config.DumpLogs { return } - kubesharkDir := kubeshark.GetKubesharkFolderPath() + kubesharkDir := misc.GetDotFolderPath() filePath := path.Join(kubesharkDir, fmt.Sprintf("kubeshark_logs_%s.zip", time.Now().Format("2006_01_02__15_04_05"))) if err := fsUtils.DumpLogs(ctx, kubernetesProvider, filePath); err != nil { log.Error().Err(err).Msg("Failed to dump logs.") diff --git a/cmd/logs.go b/cmd/logs.go index ee09f6eee..3b8e8c65b 100644 --- a/cmd/logs.go +++ b/cmd/logs.go @@ -7,7 +7,7 @@ import ( "github.com/kubeshark/kubeshark/config" "github.com/kubeshark/kubeshark/config/configStructs" "github.com/kubeshark/kubeshark/errormessage" - "github.com/kubeshark/kubeshark/kubeshark/fsUtils" + "github.com/kubeshark/kubeshark/misc/fsUtils" "github.com/rs/zerolog/log" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index a696d9afa..d55adaf97 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -6,7 +6,7 @@ import ( "time" "github.com/kubeshark/kubeshark/config" - "github.com/kubeshark/kubeshark/kubeshark" + "github.com/kubeshark/kubeshark/misc" "github.com/rs/zerolog/log" "github.com/spf13/cobra" ) @@ -15,16 +15,16 @@ var versionCmd = &cobra.Command{ Use: "version", Short: "Print version info", RunE: func(cmd *cobra.Command, args []string) error { - timeStampInt, _ := strconv.ParseInt(kubeshark.BuildTimestamp, 10, 0) + timeStampInt, _ := strconv.ParseInt(misc.BuildTimestamp, 10, 0) if config.DebugMode { log.Info(). - Str("version", kubeshark.Ver). - Str("branch", kubeshark.Branch). - Str("commit-hash", kubeshark.GitCommitHash). + Str("version", misc.Ver). + Str("branch", misc.Branch). + Str("commit-hash", misc.GitCommitHash). Time("build-time", time.Unix(timeStampInt, 0)). Send() } else { - fmt.Println(kubeshark.Ver) + fmt.Println(misc.Ver) } return nil }, diff --git a/config/config.go b/config/config.go index c96060532..f5acd350a 100644 --- a/config/config.go +++ b/config/config.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/creasty/defaults" - "github.com/kubeshark/kubeshark/kubeshark/version" + "github.com/kubeshark/kubeshark/misc/version" "github.com/kubeshark/kubeshark/utils" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/config/configStruct.go b/config/configStruct.go index 068b13c6e..4f0a533bb 100644 --- a/config/configStruct.go +++ b/config/configStruct.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/kubeshark/kubeshark/config/configStructs" - "github.com/kubeshark/kubeshark/kubeshark" + "github.com/kubeshark/kubeshark/misc" v1 "k8s.io/api/core/v1" "k8s.io/client-go/util/homedir" ) @@ -38,7 +38,7 @@ type ConfigStruct struct { } func (config *ConfigStruct) SetDefaults() { - config.ConfigFilePath = path.Join(kubeshark.GetKubesharkFolderPath(), "config.yaml") + config.ConfigFilePath = path.Join(misc.GetDotFolderPath(), "config.yaml") } func (config *ConfigStruct) ImagePullPolicy() v1.PullPolicy { diff --git a/kubeshark/consts.go b/misc/consts.go similarity index 88% rename from kubeshark/consts.go rename to misc/consts.go index d431dcdb9..11a7cb7bd 100644 --- a/kubeshark/consts.go +++ b/misc/consts.go @@ -1,4 +1,4 @@ -package kubeshark +package misc import ( "os" @@ -14,7 +14,7 @@ var ( Platform = "" ) -func GetKubesharkFolderPath() string { +func GetDotFolderPath() string { home, homeDirErr := os.UserHomeDir() if homeDirErr != nil { return "" diff --git a/kubeshark/fsUtils/dirUtils.go b/misc/fsUtils/dirUtils.go similarity index 100% rename from kubeshark/fsUtils/dirUtils.go rename to misc/fsUtils/dirUtils.go diff --git a/kubeshark/fsUtils/kubesharkLogsUtils.go b/misc/fsUtils/kubesharkLogsUtils.go similarity index 100% rename from kubeshark/fsUtils/kubesharkLogsUtils.go rename to misc/fsUtils/kubesharkLogsUtils.go diff --git a/kubeshark/fsUtils/zipUtils.go b/misc/fsUtils/zipUtils.go similarity index 100% rename from kubeshark/fsUtils/zipUtils.go rename to misc/fsUtils/zipUtils.go diff --git a/kubeshark/version/versionCheck.go b/misc/version/versionCheck.go similarity index 86% rename from kubeshark/version/versionCheck.go rename to misc/version/versionCheck.go index f619ba2f0..33a9a9498 100644 --- a/kubeshark/version/versionCheck.go +++ b/misc/version/versionCheck.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/kubeshark/kubeshark/kubeshark" + "github.com/kubeshark/kubeshark/misc" "github.com/kubeshark/kubeshark/pkg/version" "github.com/kubeshark/kubeshark/utils" "github.com/rs/zerolog/log" @@ -54,18 +54,18 @@ func CheckNewerVersion() { gitHubVersion := string(data) gitHubVersion = gitHubVersion[:len(gitHubVersion)-1] - greater, err := version.GreaterThen(gitHubVersion, kubeshark.Ver) + greater, err := version.GreaterThen(gitHubVersion, misc.Ver) if err != nil { log.Error(). Str("upstream-version", gitHubVersion). - Str("local-version", kubeshark.Ver). + Str("local-version", misc.Ver). Msg("Version is invalid!") return } log.Debug(). Str("upstream-version", gitHubVersion). - Str("local-version", kubeshark.Ver). + Str("local-version", misc.Ver). Dur("elapsed-time", time.Since(start)). Msg("Finished version validation.") @@ -76,7 +76,7 @@ func CheckNewerVersion() { } else { downloadCommand = "sh <(curl -Ls https://kubeshark.co/install)" } - msg := fmt.Sprintf("Update available! %v -> %v run:", kubeshark.Ver, gitHubVersion) + msg := fmt.Sprintf("Update available! %v -> %v run:", misc.Ver, gitHubVersion) log.Warn().Str("command", downloadCommand).Msg(fmt.Sprintf(utils.Yellow, msg)) } } diff --git a/resources/createResources.go b/resources/createResources.go index 7302569bb..35d6fcab6 100644 --- a/resources/createResources.go +++ b/resources/createResources.go @@ -7,7 +7,7 @@ import ( "github.com/kubeshark/kubeshark/docker" "github.com/kubeshark/kubeshark/errormessage" "github.com/kubeshark/kubeshark/kubernetes" - "github.com/kubeshark/kubeshark/kubeshark" + "github.com/kubeshark/kubeshark/misc" "github.com/rs/zerolog/log" core "k8s.io/api/core/v1" ) @@ -84,11 +84,11 @@ func createSelfNamespace(ctx context.Context, kubernetesProvider *kubernetes.Pro func createRBACIfNecessary(ctx context.Context, kubernetesProvider *kubernetes.Provider, isNsRestrictedMode bool, selfNamespace string, resources []string) (bool, error) { if !isNsRestrictedMode { - if err := kubernetesProvider.CreateKubesharkRBAC(ctx, selfNamespace, kubernetes.ServiceAccountName, kubernetes.ClusterRoleName, kubernetes.ClusterRoleBindingName, kubeshark.RBACVersion, resources); err != nil { + if err := kubernetesProvider.CreateKubesharkRBAC(ctx, selfNamespace, kubernetes.ServiceAccountName, kubernetes.ClusterRoleName, kubernetes.ClusterRoleBindingName, misc.RBACVersion, resources); err != nil { return false, err } } else { - if err := kubernetesProvider.CreateKubesharkRBACNamespaceRestricted(ctx, selfNamespace, kubernetes.ServiceAccountName, kubernetes.RoleName, kubernetes.RoleBindingName, kubeshark.RBACVersion); err != nil { + if err := kubernetesProvider.CreateKubesharkRBACNamespaceRestricted(ctx, selfNamespace, kubernetes.ServiceAccountName, kubernetes.RoleName, kubernetes.RoleBindingName, misc.RBACVersion); err != nil { return false, err } }