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.

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

Retrieve cluster details for user context #3515

Merged
merged 4 commits into from
Apr 7, 2020

Conversation

kimlisa
Copy link
Contributor

@kimlisa kimlisa commented Apr 3, 2020

resolves #3480

Description

  • Change GuessProxyHost to GuessProxyHostAndVersion, to also return the selected proxy's version
  • Add ProxyVersion to Cluster struct
  • Add Cluster field in userContext struct for cluster detail to also be returned when getting user context info
  • Separated getting/setting Cluster details for each cluster in NewClusters for reuse
  • Unit test GuessProxyHostAndVersion and GetClusterDetails

Manual Testing

retrieving clusters:
Screenshot from 2020-04-03 16-47-11

retrieving user context:
Screenshot from 2020-04-03 16-47-28

Related PR

ui part of issue: gravitational/webapps#63

@kimlisa kimlisa force-pushed the lisa/update-get-user-context branch from 39df236 to ff25c47 Compare April 3, 2020 23:57
@kimlisa kimlisa changed the title Lisa/update get user context Retrieve cluster details for user context Apr 4, 2020
@kimlisa
Copy link
Contributor Author

kimlisa commented Apr 7, 2020

retest this please

@kimlisa kimlisa merged commit 647c19c into hornet Apr 7, 2020
@kimlisa kimlisa deleted the lisa/update-get-user-context branch April 7, 2020 17:14
alex-kovoy pushed a commit that referenced this pull request Apr 14, 2020
* Let GuessProxyHost also return proxy's version
* Unit test GuessProxyHostAndVersion & GetClusterDetails
alex-kovoy pushed a commit that referenced this pull request Apr 15, 2020
* Let GuessProxyHost also return proxy's version
* Unit test GuessProxyHostAndVersion & GetClusterDetails
alex-kovoy added a commit that referenced this pull request Apr 15, 2020
* Add monorepo

* Add reset/passwd capability for local users (#3287)

* Add UserTokens to allow password resets

* Pass context down through ChangePasswordWithToken

* Rename UserToken to ResetPasswordToken

* Add auto formatting for proto files

* Add common Marshaller interfaces to reset password token

* Allow enterprise "tctl" reuse OSS user methods (#3344)

* Pass localAuthEnabled flag to UI (#3412)

* Added LocalAuthEnabled prop to WebConfigAuthSetting struct in webconfig.go
* Added LocalAuthEnabled state as part of webCfg in  apiserver.go

* update e-refs

* Fix a regression bug after merge

* Update tctl CLI output msgs (#3442)

* Use local user client when resolving user roles

* Update webapps ref

* Add and retrieve fields from Cluster struct (#3476)

* Set Teleport versions for node, auth, proxy init heartbeat
* Add and retrieve fields NodeCount, PublicURL, AuthVersion from Clusters
* Remove debug logging to avoid log pollution when getting public_addr of proxy
* Create helper func GuessProxyHost to get the public_addr of a proxy host
* Refactor newResetPasswordToken to use GuessProxyHost and remove publicUrl func

* Remove webapps submodule

* Add webassets submodule

* Replace webapps sub-module reference with webassets

* Update webassets path in Makefile

* Update webassets

1b11b26 Simplify and clean up Makefile (#62) gravitational/webapps@1b11b26

* Retrieve cluster details for user context (#3515)

* Let GuessProxyHost also return proxy's version
* Unit test GuessProxyHostAndVersion & GetClusterDetails

* Update webassets

4dfef4e Fix build pipeline (#66) gravitational/webapps@4dfef4e

* Update e-ref

* Update webassets

0647568 Fix OSS redirects gravitational/webapps@0647568

* update e-ref

* Update webassets

e0f4189 Address security audit warnings Updates  "minimist" package which is used by 7y old "optimist". gravitational/webapps@e0f4189

* Add new attr to Session struct (#3574)

* Add fields ServerHostname and ServerAddr
* Set these fields on newSession

* Ensure webassets submodule during build

* Update e-ref

* Ensure webassets before running unit-tests

* Update E-ref

Co-authored-by: Lisa Kim <lisa@gravitational.com>
Co-authored-by: Pierre Beaucamp <pierre@gravitational.com>
Co-authored-by: Jenkins <jenkins@gravitational.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants