Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Analytics to pb #69

Merged
merged 14 commits into from
Nov 12, 2024
Merged

Add Analytics to pb #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4198ab0
add analytics
AdheipSingh Nov 7, 2024
aff301e
remove about, client from cmd
AdheipSingh Nov 7, 2024
7182079
cleanup
AdheipSingh Nov 7, 2024
d635047
lint checks fixed
AdheipSingh Nov 7, 2024
7a4220a
add events to user cmd
AdheipSingh Nov 9, 2024
4e857b8
streams
AdheipSingh Nov 9, 2024
5149d83
add analytics for cmds
AdheipSingh Nov 10, 2024
2e2d91d
streamline pre runs
AdheipSingh Nov 10, 2024
da867ac
make veriferis, add wait sync groups
AdheipSingh Nov 10, 2024
ea97e09
disable analytics via env
AdheipSingh Nov 10, 2024
1a8b523
handle null in query list json
AdheipSingh Nov 10, 2024
1eb2d4d
tweaks to server url, stream name and args
AdheipSingh Nov 11, 2024
5f57e34
remove profile
AdheipSingh Nov 11, 2024
e517b0a
update analytics to /pb
AdheipSingh Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 0 additions & 82 deletions cmd/about.go
View file
Open in desktop

This file was deleted.

187 changes: 107 additions & 80 deletions cmd/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ import (
"errors"
"fmt"
"net/url"
"os"
"pb/pkg/config"
"pb/pkg/model/credential"
"pb/pkg/model/defaultprofile"
"time"

tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
"github.com/muesli/termenv"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -60,11 +58,12 @@ var outputFormat string

// Initialize flags
func init() {
AddProfileCmd.Flags().StringVarP(&outputFormat, "output", "o", "text", "Output format (text|json)")
RemoveProfileCmd.Flags().StringVarP(&outputFormat, "output", "o", "text", "Output format (text|json)")
DefaultProfileCmd.Flags().StringVarP(&outputFormat, "output", "o", "text", "Output format (text|json)")
ListProfileCmd.Flags().StringVarP(&outputFormat, "output", "o", "text", "Output format (text|json)")
AddProfileCmd.Flags().StringVarP(&outputFormat, "output", "o", "", "Output format (text|json)")
RemoveProfileCmd.Flags().StringVarP(&outputFormat, "output", "o", "", "Output format (text|json)")
DefaultProfileCmd.Flags().StringVarP(&outputFormat, "output", "o", "", "Output format (text|json)")
ListProfileCmd.Flags().StringVarP(&outputFormat, "output", "o", "", "Output format (text|json)")
}

func outputResult(v interface{}) error {
if outputFormat == "json" {
jsonData, err := json.MarshalIndent(v, "", " ")
Expand All @@ -89,68 +88,67 @@ var AddProfileCmd = &cobra.Command{
}
return cobra.MaximumNArgs(4)(cmd, args)
},
RunE: func(_ *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, args []string) error {
if cmd.Annotations == nil {
cmd.Annotations = make(map[string]string)
}
startTime := time.Now()
var commandError error

// Parsing input and handling errors
name := args[0]
url, err := url.Parse(args[1])
if err != nil {
return err
commandError = fmt.Errorf("error parsing URL: %s", err)
cmd.Annotations["error"] = commandError.Error()
return commandError
}

var username string
var password string

var username, password string
if len(args) < 4 {
_m, err := tea.NewProgram(credential.New()).Run()
if err != nil {
fmt.Printf("Alas, there's been an error: %v", err)
os.Exit(1)
commandError = fmt.Errorf("error reading credentials: %s", err)
cmd.Annotations["error"] = commandError.Error()
return commandError
}
m := _m.(credential.Model)

username, password = m.Values()
} else {
username = args[2]
password = args[3]
}

profile := config.Profile{
URL: url.String(),
Username: username,
Password: password,
}

profile := config.Profile{URL: url.String(), Username: username, Password: password}
fileConfig, err := config.ReadConfigFromFile()
if err != nil {
// create new file
newConfig := config.Config{
Profiles: map[string]config.Profile{
name: profile,
},
Profiles: map[string]config.Profile{name: profile},
DefaultProfile: name,
}
err = config.WriteConfigToFile(&newConfig)
return err
}
if fileConfig.Profiles == nil {
fileConfig.Profiles = make(map[string]config.Profile)
}
fileConfig.Profiles[name] = profile
if fileConfig.DefaultProfile == "" {
fileConfig.DefaultProfile = name
commandError = err
} else {
if fileConfig.Profiles == nil {
fileConfig.Profiles = make(map[string]config.Profile)
}
fileConfig.Profiles[name] = profile
if fileConfig.DefaultProfile == "" {
fileConfig.DefaultProfile = name
}
commandError = config.WriteConfigToFile(fileConfig)
}

err = config.WriteConfigToFile(fileConfig)
if err != nil {
fmt.Printf("add profile %s failed\n, err: %v\n", StyleBold.Render(name), err)
return err
cmd.Annotations["executionTime"] = time.Since(startTime).String()
if commandError != nil {
cmd.Annotations["error"] = commandError.Error()
return commandError
}
fmt.Printf("Added profile %s\n", StyleBold.Render(name))

if outputFormat == "json" {
return outputResult(profile)
}
fmt.Printf("Profile %s added successfully\n", name)

return nil
},
}
Expand All @@ -161,29 +159,43 @@ var RemoveProfileCmd = &cobra.Command{
Example: " pb profile remove local_parseable",
Args: cobra.ExactArgs(1),
Short: "Delete a profile",
RunE: func(_ *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, args []string) error {
if cmd.Annotations == nil {
cmd.Annotations = make(map[string]string)
}
startTime := time.Now()

name := args[0]
fileConfig, err := config.ReadConfigFromFile()
if err != nil {
return nil
cmd.Annotations["error"] = fmt.Sprintf("error reading config: %s", err)
return err
}

_, exists := fileConfig.Profiles[name]
if exists {
delete(fileConfig.Profiles, name)
if len(fileConfig.Profiles) == 0 {
fileConfig.DefaultProfile = ""
}
if !exists {
msg := fmt.Sprintf("No profile found with the name: %s", name)
cmd.Annotations["error"] = msg
fmt.Println(msg)
return nil
}

config.WriteConfigToFile(fileConfig)
if outputFormat == "json" {
return outputResult(fmt.Sprintf("Deleted profile %s", name))
}
fmt.Printf("Deleted profile %s\n", StyleBold.Render(name))
} else {
fmt.Printf("No profile found with the name: %s", StyleBold.Render(name))
delete(fileConfig.Profiles, name)
if len(fileConfig.Profiles) == 0 {
fileConfig.DefaultProfile = ""
}

commandError := config.WriteConfigToFile(fileConfig)
cmd.Annotations["executionTime"] = time.Since(startTime).String()
if commandError != nil {
cmd.Annotations["error"] = commandError.Error()
return commandError
}

if outputFormat == "json" {
return outputResult(fmt.Sprintf("Deleted profile %s", name))
}
fmt.Printf("Deleted profile %s\n", name)
return nil
},
}
Expand All @@ -193,46 +205,54 @@ var DefaultProfileCmd = &cobra.Command{
Args: cobra.MaximumNArgs(1),
Short: "Set default profile to use with all commands",
Example: " pb profile default local_parseable",
RunE: func(_ *cobra.Command, args []string) error {
var name string
RunE: func(cmd *cobra.Command, args []string) error {
if cmd.Annotations == nil {
cmd.Annotations = make(map[string]string)
}
startTime := time.Now()

fileConfig, err := config.ReadConfigFromFile()
if err != nil {
return nil
cmd.Annotations["error"] = fmt.Sprintf("error reading config: %s", err)
return err
}

var name string
if len(args) > 0 {
name = args[0]
} else {
model := defaultprofile.New(fileConfig.Profiles)
_m, err := tea.NewProgram(model).Run()
if err != nil {
fmt.Printf("Alas, there's been an error: %v", err)
os.Exit(1)
cmd.Annotations["error"] = fmt.Sprintf("error selecting default profile: %s", err)
return err
}
m := _m.(defaultprofile.Model)
termenv.DefaultOutput().ClearLines(lipgloss.Height(model.View()) - 1)
if m.Success {
name = m.Choice
} else {
if !m.Success {
return nil
}
name = m.Choice
}

_, exists := fileConfig.Profiles[name]
if exists {
fileConfig.DefaultProfile = name
} else {
name = lipgloss.NewStyle().Bold(true).Render(name)
err := fmt.Sprintf("profile %s does not exist", StyleBold.Render(name))
return errors.New(err)
if !exists {
commandError := fmt.Sprintf("profile %s does not exist", name)
cmd.Annotations["error"] = commandError
return errors.New(commandError)
}

fileConfig.DefaultProfile = name
commandError := config.WriteConfigToFile(fileConfig)
cmd.Annotations["executionTime"] = time.Since(startTime).String()
if commandError != nil {
cmd.Annotations["error"] = commandError.Error()
return commandError
}

config.WriteConfigToFile(fileConfig)
if outputFormat == "json" {
return outputResult(fmt.Sprintf("%s is now set as default profile", name))
}
fmt.Printf("%s is now set as default profile\n", StyleBold.Render(name))
fmt.Printf("%s is now set as default profile\n", name)
return nil
},
}
Expand All @@ -241,27 +261,34 @@ var ListProfileCmd = &cobra.Command{
Use: "list profiles",
Short: "List all added profiles",
Example: " pb profile list",
RunE: func(_ *cobra.Command, _ []string) error {
fileConfig, err := config.ReadConfigFromFile()
if err != nil {
return nil
RunE: func(cmd *cobra.Command, _ []string) error {
if cmd.Annotations == nil {
cmd.Annotations = make(map[string]string)
}
startTime := time.Now()

if len(fileConfig.Profiles) != 0 {
println()
fileConfig, err := config.ReadConfigFromFile()
if err != nil {
cmd.Annotations["error"] = fmt.Sprintf("error reading config: %s", err)
return err
}

if outputFormat == "json" {
return outputResult(fileConfig.Profiles)
commandError := outputResult(fileConfig.Profiles)
cmd.Annotations["executionTime"] = time.Since(startTime).String()
if commandError != nil {
cmd.Annotations["error"] = commandError.Error()
return commandError
}
return nil
}

row := 0
for key, value := range fileConfig.Profiles {
item := ProfileListItem{key, value.URL, value.Username}
fmt.Println(item.Render(fileConfig.DefaultProfile == key))
row++
fmt.Println()
fmt.Println() // Add a blank line after each profile
}
cmd.Annotations["executionTime"] = time.Since(startTime).String()
return nil
},
}
Expand Down
Loading
Loading