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

upgrades fiat to boot2 and new BOM dependency management #388

Merged
merged 35 commits into from
Apr 24, 2019
Merged

Conversation

cfieber
Copy link
Contributor

@cfieber cfieber commented Apr 24, 2019

gradle 5.4, spring-boot 2 dependencies, and kork-bom as the source of version opinions

robzienert and others added 30 commits March 27, 2019 10:39
merge master into boot2 branch
* gradle 5.x

* somebody set up us the BOM
* fix(dependencies): dependency cleanup

* removes lots of cargo-culted dependency declarations
* trims dependencies in fiat-core and fiat-api to minimize the
  impact consuming projects
* guava caches -> caffeine

* fix(api): cleanup FiatAuthenticationConfig WebSecurityConfigurerAdapter
@spinnakerbot
Copy link
Contributor

The following commits need their title changed:

Please format your commit title into the form:

<type>(<scope>): <subject>, e.g. fix(kubernetes): address NPE in status check

This allows us to easily generate changelogs & determine semantic version numbers when cutting releases. You can read more about commit conventions here.

build.gradle Outdated Show resolved Hide resolved
compileOnly spinnaker.dependency("retrofit")
compileOnly spinnaker.dependency("retrofitJackson")
compileOnly spinnaker.dependency("spectatorApi")
implementation "org.springframework:spring-aop"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

these all are actually runtime dependencies. With BOM based dependency opinions we won't run into problems on version alignment so it is safe to make these implementation rather than compileOnly

@@ -98,40 +96,16 @@ FiatWebSecurityConfigurerAdapter fiatSecurityConfig(FiatStatus fiatStatus) {
private final FiatStatus fiatStatus;

private FiatWebSecurityConfigurerAdapter(FiatStatus fiatStatus) {
super(true);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this disables defaults, our auth filter chain for fiat is mostly about having the FiatAuthenticationFilter in there and falling back to anonymous

@@ -152,15 +141,16 @@ public Builder add(Authorization a, List<String> groups) {
}

public Permissions build() {
ImmutableMap.Builder<Authorization, List<String>> builder = ImmutableMap.builder();
final Map<Authorization, List<String>> perms = new HashMap<>();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

unguava's this

}
String singular = StringUtils.removeEnd(pluralOrKey, "s");
public static ResourceType parse(@Nonnull String pluralOrKey) {
pluralOrKey = pluralOrKey.substring(pluralOrKey.lastIndexOf(':') + 1);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

un commons-langs this

throw new IllegalArgumentException("name cannot be null or empty");
public Role setName(@Nonnull String name) {
if (name.isEmpty()) {
throw new IllegalArgumentException("name cannot be empty");
Copy link
Contributor Author

Choose a reason for hiding this comment

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

lombok will catch the null case via @Nonnull annotation

@cfieber cfieber merged commit bb8a3b6 into master Apr 24, 2019
@cfieber cfieber deleted the boot2 branch April 24, 2019 21:35
org.gradle.parallel=false
Copy link
Member

Choose a reason for hiding this comment

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

This should probably be true?

dibyom pushed a commit to dibyom/fiat that referenced this pull request Apr 26, 2019
* refactor(boot2): Mostly working... one transient test failure

* chore(boot2): Bump to spin-deps rc.17, add spring properties migrator

* chore(boot2): spin-dep rc.18

* fix(boot2): spin-dep rc.21; fixed failing test

* fix(boot2): Fix transient test?

* chore(boot2): Why cant I get this transient failure to happen on my laptop

* fix(boot2): Im sure this will not solve it

* chore(boot2): Cleanup of some speculative test output

* chore(boot2): Disable parallel gradle execution

* refactor(boot2): Mostly working... one transient test failure

* chore(boot2): Bump to spin-deps rc.17, add spring properties migrator

* chore(boot2): spin-dep rc.18

* fix(boot2): spin-dep rc.21; fixed failing test

* chore(boot2): Why cant I get this transient failure to happen on my laptop

* chore(boot2): Cleanup of some speculative test output

* Add back JSON module. Fiat now boots up.

* Fix tests

* Fix case

* chore(deps): latest spinnaker-dependencies

* supply property placeholder for igor

* update to kork bom (spinnaker#376)

* gradle 5.x

* somebody set up us the BOM

* fix(dependencies): dependency cleanup (spinnaker#377)

* fix(dependencies): dependency cleanup

* removes lots of cargo-culted dependency declarations
* trims dependencies in fiat-core and fiat-api to minimize the
  impact consuming projects
* guava caches -> caffeine

* fix(api): cleanup FiatAuthenticationConfig WebSecurityConfigurerAdapter

* chore(dependencies): kork 4.1.0-rc.5-springBoot2

* chore(build): spinnaker-gradle-project 6.0.0

* chore(dependencies): kork 4.1.0-rc.11+springBoot2

* chore(build): remove useLastTag from non release travis buildscripts

* chore(dependencies): kork 4.1.0-rc.13+springBoot2

* chore(dependencies): update to kork 5.0.0

* chore(build): remove unnecessary gradle config for jvm version
clanesf pushed a commit to clanesf/fiat that referenced this pull request Jul 12, 2019
* refactor(boot2): Mostly working... one transient test failure

* chore(boot2): Bump to spin-deps rc.17, add spring properties migrator

* chore(boot2): spin-dep rc.18

* fix(boot2): spin-dep rc.21; fixed failing test

* fix(boot2): Fix transient test?

* chore(boot2): Why cant I get this transient failure to happen on my laptop

* fix(boot2): Im sure this will not solve it

* chore(boot2): Cleanup of some speculative test output

* chore(boot2): Disable parallel gradle execution

* refactor(boot2): Mostly working... one transient test failure

* chore(boot2): Bump to spin-deps rc.17, add spring properties migrator

* chore(boot2): spin-dep rc.18

* fix(boot2): spin-dep rc.21; fixed failing test

* chore(boot2): Why cant I get this transient failure to happen on my laptop

* chore(boot2): Cleanup of some speculative test output

* Add back JSON module. Fiat now boots up.

* Fix tests

* Fix case

* chore(deps): latest spinnaker-dependencies

* supply property placeholder for igor

* update to kork bom (spinnaker#376)

* gradle 5.x

* somebody set up us the BOM

* fix(dependencies): dependency cleanup (spinnaker#377)

* fix(dependencies): dependency cleanup

* removes lots of cargo-culted dependency declarations
* trims dependencies in fiat-core and fiat-api to minimize the
  impact consuming projects
* guava caches -> caffeine

* fix(api): cleanup FiatAuthenticationConfig WebSecurityConfigurerAdapter

* chore(dependencies): kork 4.1.0-rc.5-springBoot2

* chore(build): spinnaker-gradle-project 6.0.0

* chore(dependencies): kork 4.1.0-rc.11+springBoot2

* chore(build): remove useLastTag from non release travis buildscripts

* chore(dependencies): kork 4.1.0-rc.13+springBoot2

* chore(dependencies): update to kork 5.0.0

* chore(build): remove unnecessary gradle config for jvm version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants