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

Feature/2385/config #2401

Merged
merged 5 commits into from Apr 23, 2019
Merged

Feature/2385/config #2401

merged 5 commits into from Apr 23, 2019

Conversation

coverbeck
Copy link
Contributor

Expose configuration information for consumption by the API.

In doing so, change githubClientId and githubClientSecret to be String -- they were List<String> for legacy reasons for the migration from ui1 to ui2.

Because of that change I needed to update dockstoreTest.yml, which was specifying those values as arrays, and hence the secret archive, even though nothing secret in the secret archive changed.

The Google Tag Manager id is not in here; I will need to think about that one separately.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 75.495% when pulling 72a6c96 on feature/2385/config into 84d3e8b on develop.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 75.495% when pulling 72a6c96 on feature/2385/config into 84d3e8b on develop.

@coveralls
Copy link

coveralls commented Apr 17, 2019

Coverage Status

Coverage increased (+0.05%) to 75.449% when pulling 39784cb on feature/2385/config into f4b6bf6 on develop.

gitlabRedirectPath: /auth/gitlab.com
gitlabScope: api

googleScope: profile email
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

space separated?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's how it is in dockstore.model.ts

import io.swagger.annotations.ApiModel;
import org.apache.commons.beanutils.BeanUtils;

@ApiModel("Config")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems a bit generic

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, but I'm having a hard time thinking of anything better. Any ideas?

UIConfig? Configuration? UIConfiguration? Those aren't really any better, but I'm drawing a blank.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kept the name but added a description.

Copy link
Member

@denis-yuen denis-yuen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On fixed build

#2385

Adds a new endpoint, /metadata/config to retrieve information to
be used by the UI.

As part of this, make githubClientID and githubClientSecret
simple strings -- they were List<String>. The List was to
support the transition from ui1 to ui2, but now that the UI will soon
be retrieving the client id from the web service, it no longer
makes sense.
Missed checking in yaml files
Add a description to Config
@dockstore dockstore deleted a comment Apr 23, 2019
@coverbeck coverbeck merged commit 26870ae into develop Apr 23, 2019
@coverbeck coverbeck deleted the feature/2385/config branch April 23, 2019 23:43
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.

None yet

5 participants