Skip to content

PDI-2104: UAT Fixes for Various Bugs #31

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

Merged
erikostien-pingidentity merged 12 commits into from
Nov 13, 2024
Merged

PDI-2104: UAT Fixes for Various Bugs #31

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
80f0f5c
Update Dependencies
erikostien-pingidentity Nov 12, 2024
b2b2860
Remove --profile-name flag from get/set/unset config commands
erikostien-pingidentity Nov 12, 2024
4b82c3c
Disable TestNotificationTemplateContentExport for Issue #29
erikostien-pingidentity Nov 12, 2024
35ae868
Default viper keys on profile add creation
erikostien-pingidentity Nov 12, 2024
cd21f04
Make both parent key validation and key validation use EqualFold for …
erikostien-pingidentity Nov 12, 2024
e98d89d
Make output-format=json always output the message and avoid nil deref…
erikostien-pingidentity Nov 12, 2024
503d8df
Make set and unset output in one json object. Add spacing
erikostien-pingidentity Nov 12, 2024
60c579e
Save access token to user-specified profile if exists
erikostien-pingidentity Nov 12, 2024
9919220
golanglint-ci fixes
erikostien-pingidentity Nov 12, 2024
5a4c90f
Remove ActiveProfile struct, and add ability to get a profile's viper…
erikostien-pingidentity Nov 13, 2024
5511236
Fix regex capture group on custom request testing
erikostien-pingidentity Nov 13, 2024
a08908d
PR review changes
erikostien-pingidentity Nov 13, 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
3 changes: 0 additions & 3 deletions cmd/config/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package config
import (
"github.com/pingidentity/pingcli/cmd/common"
config_internal "github.com/pingidentity/pingcli/internal/commands/config"
"github.com/pingidentity/pingcli/internal/configuration/options"
"github.com/pingidentity/pingcli/internal/logger"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -32,8 +31,6 @@ func NewConfigGetCommand() *cobra.Command {
Use: "get [flags] key",
}

cmd.Flags().AddFlag(options.ConfigGetProfileOption.Flag)

return cmd
}

Expand Down
5 changes: 4 additions & 1 deletion cmd/config/list_profiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ func configListProfilesRunE(cmd *cobra.Command, args []string) error {
l := logger.Get()
l.Debug().Msgf("Config list-profiles Subcommand Called.")

config_internal.RunInternalConfigListProfiles()
err := config_internal.RunInternalConfigListProfiles()
if err != nil {
return err
}

return nil
}
3 changes: 0 additions & 3 deletions cmd/config/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package config
import (
"github.com/pingidentity/pingcli/cmd/common"
config_internal "github.com/pingidentity/pingcli/internal/commands/config"
"github.com/pingidentity/pingcli/internal/configuration/options"
"github.com/pingidentity/pingcli/internal/logger"
"github.com/spf13/cobra"
)
Expand All @@ -29,8 +28,6 @@ func NewConfigSetCommand() *cobra.Command {
Use: "set [flags] key=value",
}

cmd.Flags().AddFlag(options.ConfigSetProfileOption.Flag)

return cmd
}
func configSetRunE(cmd *cobra.Command, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func TestConfigSetCmd_CheckViperConfig(t *testing.T) {
testutils.CheckExpectedError(t, err, nil)

mainViper := profiles.GetMainConfig().ViperInstance()
profileViperKey := profiles.GetMainConfig().ActiveProfile().Name() + "." + viperKey
profileViperKey := "default." + viperKey

viperNewValue := mainViper.GetString(profileViperKey)
if viperNewValue != viperNewUUID {
Expand Down
3 changes: 0 additions & 3 deletions cmd/config/unset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package config
import (
"github.com/pingidentity/pingcli/cmd/common"
config_internal "github.com/pingidentity/pingcli/internal/commands/config"
"github.com/pingidentity/pingcli/internal/configuration/options"
"github.com/pingidentity/pingcli/internal/logger"
"github.com/spf13/cobra"
)
Expand All @@ -29,8 +28,6 @@ func NewConfigUnsetCommand() *cobra.Command {
Use: "unset [flags] key",
}

cmd.Flags().AddFlag(options.ConfigUnsetProfileOption.Flag)

return cmd
}
func configUnsetRunE(cmd *cobra.Command, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/unset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestConfigUnsetCmd_CheckViperConfig(t *testing.T) {
testutils.CheckExpectedError(t, err, nil)

mainViper := profiles.GetMainConfig().ViperInstance()
profileViperKey := profiles.GetMainConfig().ActiveProfile().Name() + "." + viperKey
profileViperKey := "default." + viperKey
viperNewValue := mainViper.GetString(profileViperKey)
if viperOldValue == viperNewValue {
t.Errorf("Expected viper configuration value to be updated. Old: %s, New: %s", viperOldValue, viperNewValue)
Expand Down
4 changes: 3 additions & 1 deletion cmd/request/request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ func TestRequestCmd_Execute(t *testing.T) {
t.Fatalf("Failed to read from pipe: %v", err)
}

t.Log(string(pipeReaderOut))

// Capture response json body
captureGroupName := "BodyJSON"
re := regexp.MustCompile(fmt.Sprintf(`(?s)^.*response: (?P<%s>\{.*\}).*status: .*$`, captureGroupName))
re := regexp.MustCompile(fmt.Sprintf(`(?s)^.*response:\s+(?P<%s>\{.*\}).*$`, captureGroupName))
matchData := re.FindSubmatch(pipeReaderOut)

for index, name := range re.SubexpNames() {
Expand Down
18 changes: 3 additions & 15 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,9 @@ func initMainViper(cfgFile string) {
loadMainViperConfig(cfgFile)
}

// For each profile, if a viper key from an option doesn't exist, set it to the default value
for _, pName := range profiles.GetMainConfig().ProfileNames() {
subViper := profiles.GetMainConfig().ViperInstance().Sub(pName)
for _, opt := range options.Options() {
if opt.ViperKey == "" || opt.ViperKey == options.RootActiveProfileOption.ViperKey {
continue
}
if !subViper.IsSet(opt.ViperKey) {
subViper.Set(opt.ViperKey, opt.DefaultValue)
}
}
err := profiles.GetMainConfig().SaveProfile(pName, subViper)
if err != nil {
output.SystemError(fmt.Sprintf("Failed to save profile '%s': %v", pName, err), nil)
}
err := profiles.GetMainConfig().DefaultMissingViperKeys()
if err != nil {
output.SystemError(err.Error(), nil)
}
}

Expand Down
34 changes: 18 additions & 16 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.23.2

require (
github.com/fatih/color v1.18.0
github.com/golangci/golangci-lint v1.61.0
github.com/golangci/golangci-lint v1.62.0
github.com/hashicorp/go-uuid v1.0.3
github.com/manifoldco/promptui v0.9.0
github.com/patrickcping/pingone-go-sdk-v2 v0.12.3
Expand Down Expand Up @@ -62,7 +62,7 @@ require (
github.com/ettle/strcase v0.2.0 // indirect
github.com/fatih/structtag v1.2.0 // indirect
github.com/firefart/nonamedreturns v1.0.5 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fzipp/gocyclo v0.6.0 // indirect
github.com/ghostiam/protogetter v0.3.8 // indirect
github.com/go-critic/go-critic v0.11.5 // indirect
Expand All @@ -78,6 +78,7 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/gofrs/flock v0.12.1 // indirect
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
github.com/golangci/go-printf-func-name v0.1.0 // indirect
github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
github.com/golangci/misspell v0.6.0 // indirect
github.com/golangci/modinfo v0.3.4 // indirect
Expand All @@ -96,7 +97,6 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jgautheron/goconst v1.7.1 // indirect
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
github.com/jjti/go-spancheck v0.6.2 // indirect
github.com/julz/importas v0.1.0 // indirect
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
Expand All @@ -106,11 +106,10 @@ require (
github.com/kulti/thelper v0.6.3 // indirect
github.com/kunwardeep/paralleltest v1.0.10 // indirect
github.com/kyoh86/exportloopref v0.1.11 // indirect
github.com/lasiar/canonicalheader v1.1.1 // indirect
github.com/lasiar/canonicalheader v1.1.2 // indirect
github.com/ldez/gomoddirectives v0.2.4 // indirect
github.com/ldez/tagliatelle v0.5.0 // indirect
github.com/leonklingele/grouper v1.1.2 // indirect
github.com/lufeee/execinquery v1.2.1 // indirect
github.com/macabu/inamedparam v0.1.3 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/maratori/testableexamples v1.0.0 // indirect
Expand All @@ -119,15 +118,15 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/mgechev/revive v1.4.0 // indirect
github.com/mgechev/revive v1.5.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moricho/tparallel v0.3.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nakabonne/nestif v0.3.1 // indirect
github.com/nishanths/exhaustive v0.12.0 // indirect
github.com/nishanths/predeclared v0.2.2 // indirect
github.com/nunnatsa/ginkgolinter v0.17.0 // indirect
github.com/nunnatsa/ginkgolinter v0.18.2 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/patrickcping/pingone-go-sdk-v2/authorize v0.6.0 // indirect
github.com/patrickcping/pingone-go-sdk-v2/credentials v0.9.0 // indirect
Expand All @@ -144,7 +143,9 @@ require (
github.com/quasilyte/gogrep v0.5.0 // indirect
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
github.com/raeperd/recvcheck v0.1.2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/ryancurrah/gomodguard v1.3.5 // indirect
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
Expand Down Expand Up @@ -177,24 +178,25 @@ require (
github.com/ultraware/funlen v0.1.0 // indirect
github.com/ultraware/whitespace v0.1.1 // indirect
github.com/uudashr/gocognit v1.1.3 // indirect
github.com/uudashr/iface v1.2.0 // indirect
github.com/xen0n/gosmopolitan v1.2.2 // indirect
github.com/yagipy/maintidx v1.0.0 // indirect
github.com/yeya24/promlinter v0.3.0 // indirect
github.com/ykadowak/zerologlint v0.1.5 // indirect
gitlab.com/bosi/decorder v0.4.2 // indirect
go-simpler.org/musttag v0.12.2 // indirect
go-simpler.org/musttag v0.13.0 // indirect
go-simpler.org/sloglint v0.7.2 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
golang.org/x/exp/typeparams v0.0.0-20241009180824-f66d83c29e7c // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/tools v0.26.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/tools v0.27.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading