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

Merged AccountService into CredentialsService #242

Merged
merged 1 commit into from
Jun 6, 2016

Conversation

ttomsu
Copy link
Member

@ttomsu ttomsu commented Jun 3, 2016

getAccounts will now return all anonymous accounts. A new, overloaded method is introduced to get all anonymous accounts + all accounts the user has access to if the method is provided with the user's roles.

Based on #241 to be merged first. Review second commit only. Tests won't pass until spinnaker/kork#40 is merged and released.

@ajordens @cfieber @jtk54 @duftler PTAL

@@ -0,0 +1,7 @@
#!/bin/bash
Copy link

Choose a reason for hiding this comment

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

Accidentally included this file.

Copy link
Member Author

Choose a reason for hiding this comment

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

Reverted.

@duftler
Copy link

duftler commented Jun 6, 2016

LOTM. Not sure if someone else wants to have a look too.

@ttomsu ttomsu force-pushed the google-merged-services branch from 7d8f345 to 825c0f6 Compare June 6, 2016 15:29
@Autowired
CredentialsService credentialsService

List<String> anonymousAllowedAccounts = []
Copy link
Contributor

Choose a reason for hiding this comment

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

concurrent collection this

Copy link
Member Author

Choose a reason for hiding this comment

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

It will get pulled in once this PR has been rebased on the other one.

@jtk54
Copy link
Contributor

jtk54 commented Jun 6, 2016

LGTM after merge with upstream.

.disable()
}

@Scheduled(initialDelay = 30000L, fixedDelay = 60000L)
Copy link
Contributor

Choose a reason for hiding this comment

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

Anything bad happen to the scheduler if an exception is raised? Might want to wrap in a try/catch.

Copy link
Member Author

@ttomsu ttomsu Jun 6, 2016

Choose a reason for hiding this comment

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

Done. Also removed initial delay - it isn't necessary if clouddriver is already up.

Edit: Made the change in the other PR, where this block was introduced.

@ttomsu ttomsu force-pushed the google-merged-services branch from 825c0f6 to 12707d4 Compare June 6, 2016 19:06
@ttomsu ttomsu merged commit 67be92d into spinnaker:master Jun 6, 2016
@ttomsu ttomsu deleted the google-merged-services branch June 6, 2016 19:12
danielpeach pushed a commit to danielpeach/gate that referenced this pull request May 24, 2018
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.

5 participants