This repository has been archived by the owner on May 16, 2023. It is now read-only.
Feature/merge master into federation #829
Merged
hilmarf
merged 36 commits into
feature/federation
from
feature/merge-master-into-federation
Oct 1, 2020
Merged
Feature/merge master into federation #829
hilmarf
merged 36 commits into
feature/federation
from
feature/merge-master-into-federation
Oct 1, 2020
Conversation
This file contains 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
* Bump spring parent version * Liveness health indicator according to. spring-projects/spring-boot#22107
* Add integration test for future submission payload debugging * Added more test cases around invalid temp key parameter scenarios * Add support for printing the submission payload during tests * Enhance debug test with sql statements generation * Update services/submission/src/test/java/app/coronawarn/server/services/submission/integration/SubmissionPersistenceIT.java Co-authored-by: Michael Frey <michael.frey@gmx.ch> Co-authored-by: Hilmar Falkenberg <hilmar.falkenberg@sap.com> Co-authored-by: Michael Frey <michael.frey@gmx.ch>
Set current version to 1.3.0-SNAPSHOT Co-authored-by: Hilmar Falkenberg <hilmar.falkenberg@sap.com>
* Add app features in configuration file Adjust tests * Rename env variable for plausible deniability active. Remove env name for app feature label. * Adjust test application.yaml * Change active type from boolean to integer * Change app feature 'active' property to 'value'
* fix retention policy of stored diagnosis keys * fix typo * fix failing test case due to previously injected time * refactor method names
* Updated the validation for the submission service in SUMBISSION.md to match the new rules for TEK's * markdownlint fixes * Update docs/SUBMISSION.md Co-authored-by: Sorin Stefan Iovita <sorin.stefan.iovita@sap.com> Co-authored-by: Ioan Gut <ioan.gut@sap.com> Co-authored-by: ioangut <67064882+ioangut@users.noreply.github.com> Co-authored-by: Sorin Stefan Iovita <sorin.stefan.iovita@sap.com>
* -initial draft commit * updated checkDuplicateStartIntervalNumberLimit wip * updated checkDuplicateStartIntervalNumberLimit * -fix test broke after solved conflict * changed checkDuplicateStartIntervalNumberLimit to use HashMap * -fix checklist reports * add env variables for submission service * review update add more tests * solved code smells * rename attribute maxRollingPeriod * renamed getter getMaxRollingPeriod * Update ValidSubmissionPayload.java * refactor implementation for consistency * fix checkstyle errors modify the Violation text accordingly * fix code smell * Update ValidSubmissionPayload.java * Change validation for payloads based on rolling period * Capture more test scenarios * add checkstyle indentation * create test data generation class * add header to the new class * resolved review conversation * fixed checkstyle errors * resolved code smell * fix compile error * create valid TEK, fix test failing Co-authored-by: Emmet <emmet.power@sap.com> Co-authored-by: Eugen M <eugen.madean@sap.com> Co-authored-by: Pit Humke <pithumke@users.noreply.github.com>
* Added supported countries to app config with application.yaml parameter * Fixed Test failures * Remove unused code * Added app version parameters to application.yaml * Added tests for app version parameters * Refacted country list implementation Co-authored-by: Hilmar Falkenberg <hilmar.falkenberg@sap.com>
* Replaced possible variable rolling period with constant value * Add tests for flexible rolling period * apply sugested review changes * Add javaDoc comments for changed getExpiryDateTime * Fix midnight check in SubmissionPayload Validator Co-authored-by: Michael Burwig <michael.burwig@sap.com>
* Update risk-score-classification.yaml Problem in iOS 13.7 --> Unbekanntes Risiko bei Risikobegegnung * Adjust tests Co-authored-by: Hilmar Falkenberg <hilmar.falkenberg@sap.com> Co-authored-by: Michael Burwig <michael.burwig@sap.com>
patch transmission as requested by Thomas Augsten Co-authored-by: Hilmar Falkenberg <hilmar.falkenberg@sap.com>
* RC 1.4.0 * mitigate CVE-2020-5421 by switching to newer spring-boot-starter-parent (#796) * Release/1.4 log submission keys (#797) * Implement the changes from PR #783 * Add check and logs for missing key with TRL 6 or having a key TRL 6 from today midnight * Fix code smell * ensure usage of latest guava version 29.0-jre (#806) Co-authored-by: Michael <66735191+mibrasap@users.noreply.github.com>
* Update CODEOWNERS file * Add additional team members to codeowners file Co-authored-by: Michael Burwig <michael.burwig@sap.com>
# Conflicts: # common/persistence/pom.xml # common/persistence/src/main/java/app/coronawarn/server/common/persistence/domain/DiagnosisKeyBuilder.java # common/persistence/src/test/java/app/coronawarn/server/common/persistence/domain/DiagnosisKeyBuilderTest.java # common/persistence/src/test/java/app/coronawarn/server/common/persistence/domain/DiagnosisKeyServiceMockedRepositoryTest.java # common/persistence/src/test/java/app/coronawarn/server/common/persistence/service/DiagnosisKeyServiceTest.java # services/distribution/src/main/java/app/coronawarn/server/services/distribution/assembly/diagnosiskeys/ProdDiagnosisKeyBundler.java # services/distribution/src/main/java/app/coronawarn/server/services/distribution/config/DistributionServiceConfig.java # services/distribution/src/main/java/app/coronawarn/server/services/distribution/runner/TestDataGeneration.java # services/distribution/src/main/resources/application.yaml # services/distribution/src/test/java/app/coronawarn/server/services/distribution/assembly/appconfig/validation/ApplicationVersionConfigurationValidatorTest.java # services/distribution/src/test/java/app/coronawarn/server/services/distribution/runner/TestDataGenerationTest.java # services/distribution/src/test/resources/application.yaml # services/pom.xml # services/submission/src/main/java/app/coronawarn/server/services/submission/validation/ValidSubmissionPayload.java # services/submission/src/main/resources/application.yaml # services/submission/src/test/java/app/coronawarn/server/services/submission/assertions/SubmissionAssertions.java # services/submission/src/test/java/app/coronawarn/server/services/submission/controller/PayloadValidationTest.java # services/submission/src/test/java/app/coronawarn/server/services/submission/controller/RequestExecutor.java # services/submission/src/test/java/app/coronawarn/server/services/submission/controller/SubmissionControllerTest.java # services/submission/src/test/java/app/coronawarn/server/services/submission/controller/TEKDatasetGeneration.java
…pp/cwa-server into feature/federation
ioangut
requested review from
emmetsap,
EugenM-SAP,
EvgeniiSkrebtcov,
fredrb and
hilmarf
as code owners
September 30, 2020 11:35
ioangut
requested review from
JonasZeitzem-sap,
KevponSAP,
kilbphilippSAP,
mibrasap and
sorin-iovita
as code owners
September 30, 2020 11:35
hilmarf
suggested changes
Sep 30, 2020
...test/java/app/coronawarn/server/services/submission/controller/SubmissionControllerTest.java
Outdated
Show resolved
Hide resolved
hilmarf
reviewed
Sep 30, 2020
.../coronawarn/server/services/distribution/assembly/diagnosiskeys/ProdDiagnosisKeyBundler.java
Outdated
Show resolved
Hide resolved
EugenM-SAP
reviewed
Oct 1, 2020
...sion/src/test/java/app/coronawarn/server/services/submission/controller/RequestExecutor.java
Outdated
Show resolved
Hide resolved
…r-into-federation # Conflicts: # services/submission/src/main/java/app/coronawarn/server/services/submission/validation/ValidSubmissionPayload.java
EugenM-SAP
approved these changes
Oct 1, 2020
sorin-iovita
approved these changes
Oct 1, 2020
fredrb
approved these changes
Oct 1, 2020
hilmarf
approved these changes
Oct 1, 2020
Kudos, SonarCloud Quality Gate passed! 0 Bugs No Coverage information |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Checklist
mvn install
runs for the whole project and, if you touched any code in the respective service, submission and distribution service can be run withspring-boot:run
Description
Merge master into federation branch.