awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor

Browse Source
This commit is contained in:
quinton
2023-11-25 10:11:53 +00:00
parent b212681d09
commit 46c76e3984
2 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
cli/packages/cmd/folder.go
View File

@@ -20,9 +20,12 @@ var folderCmd = &cobra.Command{
}
var getCmd = &cobra.Command{
Use: "get",
Short: "Get folders in a directory",
DisableFlagsInUseLine: true,
Use: "get",
Short: "Get folders in a directory",
PersistentPreRun: func(cmd *cobra.Command, args []string) {
util.RequireLocalWorkspaceFile()
util.RequireLogin()
},
Run: func(cmd *cobra.Command, args []string) {
environmentName, _ := cmd.Flags().GetString("env")
@@ -54,11 +57,13 @@ var getCmd = &cobra.Command{
}
var createCmd = &cobra.Command{
Use: "create",
Short: "Create a folder",
DisableFlagsInUseLine: true,
Run: func(cmd *cobra.Command, args []string) {
Use: "create",
Short: "Create a folder",
PersistentPreRun: func(cmd *cobra.Command, args []string) {
util.RequireLogin()
util.RequireLocalWorkspaceFile()
},
Run: func(cmd *cobra.Command, args []string) {
environmentName, _ := cmd.Flags().GetString("env")
if !cmd.Flags().Changed("env") {
environmentFromWorkspace := util.GetEnvFromWorkspaceFile()
@@ -67,11 +72,6 @@ var createCmd = &cobra.Command{
}
}
infisicalToken, err := cmd.Flags().GetString("token")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
folderPath, err := cmd.Flags().GetString("path")
if err != nil {
util.HandleError(err, "Unable to parse flag")
@@ -92,11 +92,11 @@ var createCmd = &cobra.Command{
}
params := models.CreateFolderParameters{
FolderName: folderName,
WorkspaceId: workspaceFile.WorkspaceId,
Environment: environmentName,
FolderPath: folderPath,
InfisicalToken: infisicalToken}
FolderName: folderName,
WorkspaceId: workspaceFile.WorkspaceId,
Environment: environmentName,
FolderPath: folderPath,
}
folder, err := util.CreateFolder(params)
if err != nil {
@@ -112,8 +112,11 @@ var createCmd = &cobra.Command{
var deleteCmd = &cobra.Command{
Use: "delete",
Short: "Delete a folder",
Run: func(cmd *cobra.Command, args []string) {
PersistentPreRun: func(cmd *cobra.Command, args []string) {
util.RequireLogin()
util.RequireLocalWorkspaceFile()
},
Run: func(cmd *cobra.Command, args []string) {
environmentName, _ := cmd.Flags().GetString("env")
if !cmd.Flags().Changed("env") {
@@ -123,11 +126,6 @@ var deleteCmd = &cobra.Command{
}
}
infisicalToken, err := cmd.Flags().GetString("token")
if err != nil {
util.HandleError(err, "Unable to parse flag")
}
folderPath, err := cmd.Flags().GetString("path")
if err != nil {
util.HandleError(err, "Unable to parse flag")
@@ -148,11 +146,10 @@ var deleteCmd = &cobra.Command{
}
params := models.DeleteFolderParameters{
FolderName: folderName,
WorkspaceId: workspaceFile.WorkspaceId,
Environment: environmentName,
FolderPath: folderPath,
InfisicalToken: infisicalToken,
FolderName: folderName,
WorkspaceId: workspaceFile.WorkspaceId,
Environment: environmentName,
FolderPath: folderPath,
}
folders, err := util.DeleteFolder(params)
@@ -176,13 +173,11 @@ func init() {
// Add createCmd flags here
createCmd.Flags().StringP("path", "p", "/", "Path to the directory where the folder will be created")
createCmd.Flags().StringP("token", "t", "", "Create folder using the infisical token")
createCmd.Flags().StringP("name", "n", "", "Name of the folder to be created")
folderCmd.AddCommand(createCmd)
// Add deleteCmd flags here
deleteCmd.Flags().StringP("path", "p", "/", "Path to the directory where the folder will be deleted")
deleteCmd.Flags().StringP("token", "t", "", "Delete folder using the infisical token")
deleteCmd.Flags().StringP("name", "n", "", "Name of the folder to be deleted")
folderCmd.AddCommand(deleteCmd)

8
cli/packages/util/folders.go
View File

@@ -17,17 +17,11 @@ func GetAllFolders(params models.GetAllFoldersParameters) ([]models.SingleFolder
params.InfisicalToken = os.Getenv(INFISICAL_TOKEN_NAME)
}
isConnected := CheckIsConnectedToInternet()
var foldersToReturn []models.SingleFolder
var folderErr error
if params.InfisicalToken == "" {
if isConnected {
log.Debug().Msg("GetAllFolders: Connected to internet, checking logged in creds")
RequireLocalWorkspaceFile()
RequireLogin()
}
log.Debug().Msg("GetAllEnvironmentVariables: Trying to fetch secrets using logged in details")
log.Debug().Msg("GetAllFolders: Trying to fetch folders using logged in details")
loggedInUserDetails, err := GetCurrentLoggedInUserDetails()
if err != nil {