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

Jump to bottom

refactor(install): revamp the git auth configuration and make the organization selectable for environment repositories #2474

Merged
merged 12 commits into from
Dec 11, 2018
Merged

refactor(install): revamp the git auth configuration and make the organization selectable for environment repositories #2474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
421ebe7
refactor(install): rename the method to be more consistent
ccojocar Dec 10, 2018
9107f47
refactor(install): rework how the git local and pipeline is configure…
ccojocar Dec 10, 2018
8d91cf5
fix(install): select the organization where the environment repositor…
ccojocar Dec 10, 2018
e6c225b
fix(install): set the git user auth config into the config in case a …
ccojocar Dec 11, 2018
ca9f8bb
fix(install): configure the current git server in the configuration
ccojocar Dec 11, 2018
3046d29
fix(install): wait a bit for Jenkins service to be ready after instal…
ccojocar Dec 11, 2018
c8127ca
fix(install): handle the error if the git repository options cannot b…
ccojocar Dec 11, 2018
2b05f0b
fix(config): set the current server and default user name in all case…
ccojocar Dec 11, 2018
ed4a7b8
fix(install): use a single select in the environment repository survey
ccojocar Dec 11, 2018
5620509
chore(install): fix some promt messages
ccojocar Dec 11, 2018
d92c76a
fix(install): use the git auth user name in batch mode for environemn…
ccojocar Dec 11, 2018
88c17bb
fix(install): fix the log method name
ccojocar Dec 11, 2018
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
24 changes: 23 additions & 1 deletion pkg/auth/auth_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,15 @@ func (c *AuthConfig) SetUserAuth(url string, auth *UserAuth) {
if a.Username == auth.Username {
c.Servers[i].Users[j] = auth
c.Servers[i].CurrentUser = username
c.DefaultUsername = username
c.CurrentServer = url
return
}
}
c.Servers[i].Users = append(c.Servers[i].Users, auth)
c.Servers[i].CurrentUser = username
c.DefaultUsername = username
c.CurrentServer = url
return
}
}
Expand All @@ -91,6 +95,9 @@ func (c *AuthConfig) SetUserAuth(url string, auth *UserAuth) {
Users: []*UserAuth{auth},
CurrentUser: username,
})
c.DefaultUsername = username
c.CurrentServer = url

}

func urlsEqual(url1, url2 string) bool {
Expand Down Expand Up @@ -143,12 +150,20 @@ func (c *AuthConfig) DeleteServer(url string) {
}

func (c *AuthConfig) CurrentUser(server *AuthServer, inCluster bool) *UserAuth {
if server == nil {
return nil
}
if urlsEqual(c.PipeLineServer, server.URL) && inCluster {
return server.GetUserAuth(c.PipeLineUsername)
}
return server.CurrentAuth()
}

// CurrentAuthServer returns the current AuthServer configured in the configuration
func (c *AuthConfig) CurrentAuthServer() *AuthServer {
return c.GetServer(c.CurrentServer)
}

func (c *AuthConfig) GetOrCreateServer(url string) *AuthServer {
name := ""
kind := ""
Expand Down Expand Up @@ -303,7 +318,7 @@ func (c *AuthConfig) PickServerUserAuth(server *AuthServer, message string, batc
}
answer := m[username]
if answer == nil {
return nil, fmt.Errorf("no username chosen")
return &UserAuth{}, fmt.Errorf("no username chosen")
}
return answer, nil
}
Expand Down Expand Up @@ -429,3 +444,10 @@ func (c *AuthConfig) UpdatePipelineServer(server *AuthServer, user *UserAuth) {
c.PipeLineServer = server.URL
c.PipeLineUsername = user.Username
}

// GetPipelineAuth returns the current pipline server and user authentication
func (c *AuthConfig) GetPipelineAuth() (*AuthServer, *UserAuth) {
server := c.GetServer(c.PipeLineServer)
user := server.GetUserAuth(c.PipeLineUsername)
return server, user
}
Loading