Release 1.33.x#1
Open
guido9j wants to merge 56 commits into
Open
Conversation
…ker#1699) * fix(cachingFilter: Allow disabling the content caching filter * fix(cachingFilter: Allow disabling the content caching filter
Co-authored-by: root <root@a56c90295f1d>
…ng boot 2.4+ (spinnaker#1709) For spring boot 2.4+, config file processing of profile specific document will consider `spring.config.activate.on-profile` property. As described in this blog: https://spring.io/blog/2020/08/14/config-file-processing-in-spring-boot-2-4
…icit mocks (spinnaker#1710) Used assetThat() to cleanup junit4 linkages. Introduced explicit mocks to reduce dependence on `spockframework`/`groovy` transformations using these tests under same package. Test coverage remain same before and after refactor (Tests executed 268).
Co-authored-by: root <root@bead69e1d3ab>
… while upgrading groovy 3.x (spinnaker#1712) With groovy 2.5.15 and spockframework 1.3-groovy-2.5, groovy-json appear as transitive dependency of [spockframework](https://mvnrepository.com/artifact/org.spockframework/spock-core/1.3-groovy-2.5) as shown below: ``` $ ./gradlew gate-web:dI --dependency groovy-json --configuration testCompileClasspath > Task :gate-web:dependencyInsight org.codehaus.groovy:groovy-json:2.5.15 Variant compile: | Attribute Name | Provided | Requested | |--------------------------------|----------|-------------------| | org.gradle.status | release | | | org.gradle.category | library | library | | org.gradle.libraryelements | jar | classes+resources | | org.gradle.usage | java-api | java-api | | org.gradle.dependency.bundling | | external | | org.gradle.jvm.environment | | standard-jvm | | org.gradle.jvm.version | | 11 | Selection reasons: - By constraint - Forced org.codehaus.groovy:groovy-json:2.5.15 \--- io.spinnaker.kork:kork-bom:7.190.0 \--- testCompileClasspath org.codehaus.groovy:groovy-json:2.5.4 -> 2.5.15 +--- org.spockframework:spock-core:1.3-groovy-2.5 | +--- testCompileClasspath (requested org.spockframework:spock-core) | +--- io.spinnaker.kork:kork-bom:7.190.0 | | \--- testCompileClasspath | \--- org.spockframework:spock-spring:1.3-groovy-2.5 | +--- testCompileClasspath (requested org.spockframework:spock-spring) | \--- io.spinnaker.kork:kork-bom:7.190.0 (*) \--- org.spockframework:spock-spring:1.3-groovy-2.5 (*) ``` While upgrading groovy 3.0.10 and spockframework 2.0-groovy-3.0, groovy-json is not part of [spockframework](https://mvnrepository.com/artifact/org.spockframework/spock-core/2.0-groovy-3.0) and and encounter below error during test compilation: ``` > Task :gate-web:compileTestGroovy FAILED startup failed: /gate/gate-web/src/test/groovy/com/netflix/spinnaker/gate/controllers/ApplicationControllerSpec.groovy: 22: unable to resolve class groovy.json.JsonSlurper @ line 22, column 1. import groovy.json.JsonSlurper ^ /gate/gate-web/src/test/groovy/com/netflix/spinnaker/gate/controllers/BuildControllerSpec.groovy: 23: unable to resolve class groovy.json.JsonSlurper @ line 23, column 1. import groovy.json.JsonSlurper ^ /gate/gate-web/src/test/groovy/com/netflix/spinnaker/gate/controllers/EcsClusterControllerSpec.groovy: 22: unable to resolve class groovy.json.JsonSlurper @ line 22, column 1. import groovy.json.JsonSlurper ^ 3 errors ``` So, adding explicit dependency of groovy-json in gate-web.gradle
* refactor(core): Move managed delivery model classes * refactor(core): Remove unused Eureka leftovers * refactor(core): Migrate remaining Groovy code to Java --------- Co-authored-by: Jason <jason.mcintosh@armory.io> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: root <root@79235d6bc01c>
* fix(java17): refactor test fixture to not mock static class * fix(java17): add Jackson converters to RestAdapters to avoid GSON * feat(java17): add configuration to build JRE 17 images and run tests with JRE 17
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v2...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: root <root@997746f94e50>
Co-authored-by: root <root@7a34ebc50f11>
Co-authored-by: root <root@0c89bc74b80c>
…with upgrade of groovy 3 (spinnaker#1724)
Co-authored-by: root <root@2622b4f2d1ae>
Co-authored-by: root <root@2f91e8016c3c>
Co-authored-by: root <root@b43cc05aaab3>
…versions during upgrade to springboot 2.5.15 (spinnaker#1730) While upgrading springboot 2.5.15, encounter below error in gate-web module: ``` startup failed: /gate/gate-web/src/main/groovy/com/netflix/spinnaker/gate/config/GateConfig.groovy: 231: [Static type checking] - Cannot call com.netflix.spinnaker.kork.web.selector.SelectableService#<init>(java.util.List <com.netflix.spinnaker.kork.web.selector.ServiceSelector>) with arguments [java.util.List <? extends com.netflix.spinnaker.kork.web.selector.ServiceSelector>] @ line 231, column 9. new SelectableService(selectors + defaultSelector), dynamicConfigService, contextProvider) ^ /gate/gate-web/src/main/groovy/com/netflix/spinnaker/gate/config/GateConfig.groovy: 322: [Static type checking] - Cannot find matching method java.lang.Object#configure(com.fasterxml.jackson.databind.SerializationFeature, boolean). Please check if the declared type is correct and if the method exists. @ line 322, column 7. objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); ^ /gate/gate-web/src/main/groovy/com/netflix/spinnaker/gate/config/GateConfig.groovy: 324: [Static type checking] - Cannot find matching method com.netflix.spinnaker.kork.client.ServiceClientProvider#getService(java.lang.Class <T>, com.netflix.spinnaker.config.DefaultServiceEndpoint, T). Please check if the declared type is correct and if the method exists. @ line 324, column 5. serviceClientProvider.getService(type, new DefaultServiceEndpoint(serviceName, endpoint.url), objectMapper) ^ 3 errors > Task :gate-web:compileGroovy FAILED ``` To fix this, explicitly mentioned the type of object reference as `ServiceSelector defaultSelector` and typecasted the object `objectMapperBuilder.build() as ObjectMapper`.
Co-authored-by: root <root@ed8952ab89fc>
to use the hostname and JedisPool from EmbeddedRedis
Co-authored-by: root <root@1d3c5d772f3e>
Co-authored-by: root <root@d2232a6b7721>
This fixes a regression from when PermissionService was converted from Groovy to Java. Ideally, we'd remove the extra parameter from FiatService directly, but that requires patching Fiat first, something that'll be easier to do when we migrate to the monorepo.
Co-authored-by: root <root@d6fbaf65e488>
Co-authored-by: root <root@140f03da0671>
Co-authored-by: root <root@b9d4fd4a0e9b>
Co-authored-by: root <root@37eec47d8cd2>
Co-authored-by: root <root@18f17eebc378>
Co-authored-by: root <root@d877509078f3>
) Bumps [google-github-actions/auth](https://github.com/google-github-actions/auth) from 1 to 2. - [Release notes](https://github.com/google-github-actions/auth/releases) - [Changelog](https://github.com/google-github-actions/auth/blob/main/CHANGELOG.md) - [Commits](google-github-actions/auth@v1...v2) --- updated-dependencies: - dependency-name: google-github-actions/auth dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: root <root@daf8138033e1>
Co-authored-by: root <root@8a6694798af0>
… when creating the echo retrofit service (spinnaker#1756) (spinnaker#1758) * fix: Fix git trigger issue caused by a misconfig of the object mapper when creating the echo retrofit service Because of the misconfiguration echo was failing with GitEventHandler : Github Digest mismatch! Pipeline NOT triggered Closes spinnaker/spinnaker#6886 * fix: Fix git trigger issue caused by a misconfig of the object mapper when creating the echo retrofit service Because of the misconfiguration echo was failing with GitEventHandler : Github Digest mismatch! Pipeline NOT triggered Closes spinnaker/spinnaker#6886 * test: Add test verifying that the payload being sent to Echo is not ordered alphabetically Closes spinnaker/spinnaker#6886 * fix: Apply spotless checks to the test * fix: Fix failing test (cherry picked from commit 4aae98d) Co-authored-by: ovidiupopa07 <105648914+ovidiupopa07@users.noreply.github.com>
Co-authored-by: root <root@075a7bb17710>
Co-authored-by: root <root@06c17b836b61>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We prefer small, well tested pull requests.
Please refer to Contributing to Spinnaker.
When filling out a pull request, please consider the following:
Note that we are unlikely to accept pull requests that add features without prior discussion. The best way to propose a feature is to open an issue first and discuss your ideas there before implementing them.