Skip to content

Hotfix sso list #199

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
merged 3 commits into from
Jan 25, 2021
Merged

Hotfix sso list #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7de656
sso login list null check
vikramdevtron Jan 25, 2021
f102882
cloude provider check fix
vikramdevtron Jan 25, 2021
23bf44d
acd cm default name and namespace env variable
vikramdevtron Jan 25, 2021
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
2 changes: 1 addition & 1 deletion pkg/pipeline/CiConfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func GetCiConfig() (*CiConfig, error) {
cfg.NodeLabel[kv[0]] = kv[1]
}
//validation for supported cloudproviders
if !(cfg.CloudProvider != CLOUD_PROVIDER_AWS && cfg.CloudProvider != CLOUD_PROVIDER_AZURE) {
if cfg.CloudProvider != CLOUD_PROVIDER_AWS && cfg.CloudProvider != CLOUD_PROVIDER_AZURE {
return nil, fmt.Errorf("unsupported cloudprovider: %s", cfg.CloudProvider)
}
return cfg, err
Expand Down
13 changes: 7 additions & 6 deletions pkg/sso/SSOLoginService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,16 +288,17 @@ func (impl SSOLoginServiceImpl) GetById(id int32) (*bean.SSOLoginDto, error) {
}

func (impl SSOLoginServiceImpl) GetAll() ([]*bean.SSOLoginDto, error) {
ssoConfigs := make([]*bean.SSOLoginDto, 0)

models, err := impl.ssoLoginRepository.GetAll()
if err != nil {
if err != nil && err != pg.ErrNoRows {
impl.logger.Errorw("error in update new sso login config", "error", err)
return nil, err
}

var ssoLoginDtos []*bean.SSOLoginDto
if err == pg.ErrNoRows {
return ssoConfigs, nil
}
for _, model := range models {

var config json.RawMessage
err = json.Unmarshal([]byte(model.Config), &config)
if err != nil {
Expand All @@ -311,9 +312,9 @@ func (impl SSOLoginServiceImpl) GetAll() ([]*bean.SSOLoginDto, error) {
Active: model.Active,
//Config: config,
}
ssoLoginDtos = append(ssoLoginDtos, ssoLoginDto)
ssoConfigs = append(ssoConfigs, ssoLoginDto)
}
return ssoLoginDtos, nil
return ssoConfigs, nil
}

func (impl SSOLoginServiceImpl) GetByName(name string) (*bean.SSOLoginDto, error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/user/TokenCache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ func (impl *TokenCache) BuildACDSynchContext() (acdContext context.Context, err
type ACDAuthConfig struct {
ACDUsername string `env:"ACD_USERNAME" `
ACDPassword string `env:"ACD_PASSWORD" `
ACDConfigMapName string `env:"ACD_CM" `
ACDConfigMapNamespace string `env:"ACD_NAMESPACE" `
ACDConfigMapName string `env:"ACD_CM" envDefault:"argocd-cm"`
ACDConfigMapNamespace string `env:"ACD_NAMESPACE" envDefault:"devtroncd"`
}

func GetACDAuthConfig() (*ACDAuthConfig, error) {
Expand Down