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

Merge/release 2.24 into develop ver 3 #1928

Merged
merged 23 commits into from
Oct 21, 2021

Conversation

AdrianOlosutean
Copy link
Contributor

@AdrianOlosutean AdrianOlosutean commented Sep 22, 2021

No description provided.

benedeki and others added 18 commits August 21, 2021 10:20
…1873)

* 1868 statistics with missing counts and datasets missing proprties
* 1843 Home page with properties,  side panel with missing counts and summary page for properties with tab containing datasets missing that particular property
* #1603 serde tests for CR and MT DataFrameFilters
(mongo-bson-based serde tests for CR and MT DataFrameFilters, mongo-bson-based serde tests extended for CR with a blank mappingTableFilter)
Project config and management updates
* poc issue template
* CODEOWNERS update
* developers update
* Badges to README.md
1881 HyperConformance enceladus_info_version from payload
#1887 defaultTimestampTimeZone can be source type specific
* `DefaultsByFormat` extends the `Defaults` trait, being able to read defaults from configuration files
* `DefaultsByFormat` offers further granularity by first checking the format specific setting only then taking the global one
* Basic `GlobalDefaults` are not configuration dependent anymore
* Standardization now user `DefaultsByFormat` for its defaults, where rawFormat is used for format parameter
* Switched to configuration path to be `enceladus.defaultTimestampTimeZone.default` and `enceladus.defaultTimestampTimeZone.[rawFormat]` respectively
* `defaultTimestampTimeZone` is still supported/read as an obsolete fallback
Co-authored-by: Daniel K <dk1844@gmail.com>
#1887 defaultTimestampTimeZone can be source type specific
* rename of the configuration prefix from `enceladus.` to `standardization.`
* Upgrade of Atum to 3.6.0
* Writing the default time zones for timestamps and dates into _INFO file
…1912)

* #1894 Spline S3 support via custom persistence factory `HadoopFsPersistenceFactory`.
Co-authored-by: David Benedeki <14905969+benedeki@users.noreply.github.com>
…into-develop-ver-3

# Conflicts:
#	dao/pom.xml
#	data-model/pom.xml
#	examples/pom.xml
#	menas/pom.xml
#	migrations-cli/pom.xml
#	migrations/pom.xml
#	plugins-api/pom.xml
#	plugins-builtin/pom.xml
#	pom.xml
#	rest-api/src/main/scala/za/co/absa/enceladus/rest_api/controllers/LandingPageController.scala
#	rest-api/src/main/scala/za/co/absa/enceladus/rest_api/controllers/StatisticsController.scala
#	rest-api/src/main/scala/za/co/absa/enceladus/rest_api/services/DatasetService.scala
#	rest-api/src/main/scala/za/co/absa/enceladus/rest_api/services/PropertyDefinitionService.scala
#	rest-api/src/main/scala/za/co/absa/enceladus/rest_api/services/StatisticsService.scala
#	rest-api/src/main/scala/za/co/absa/enceladus/rest_api/utils/implicits/package.scala
#	rest-api/src/test/scala/za/co/absa/enceladus/rest_api/integration/controllers/DatasetApiIntegrationSuite.scala
#	rest-api/src/test/scala/za/co/absa/enceladus/rest_api/integration/repositories/DatasetRepositoryIntegrationSuite.scala
#	rest-api/src/test/scala/za/co/absa/enceladus/rest_api/integration/repositories/StatisticsIntegrationSuite.scala
#	spark-jobs/pom.xml
#	spark-jobs/src/main/resources/spline.properties.template
#	spark-jobs/src/main/scala/za/co/absa/enceladus/conformance/ConformanceExecution.scala
#	spark-jobs/src/main/scala/za/co/absa/enceladus/standardization/StandardizationExecution.scala
#	spark-jobs/src/main/scala/za/co/absa/enceladus/standardization/interpreter/StandardizationInterpreter.scala
#	spark-jobs/src/test/scala/za/co/absa/enceladus/conformance/interpreter/InterpreterSuite.scala
#	spark-jobs/src/test/scala/za/co/absa/enceladus/standardization/StandardizationExecutionSuite.scala
#	utils/pom.xml
@AdrianOlosutean AdrianOlosutean force-pushed the merge/release-2.24-into-develop-ver-3 branch from 444072a to 58d247e Compare September 23, 2021 14:00
dk1844
dk1844 previously approved these changes Sep 29, 2021
Copy link
Contributor

@dk1844 dk1844 left a comment

Choose a reason for hiding this comment

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

LGTM (just read the code), but so did the previous versions of release 2.24 -> develop-ver-3. So what changed that it now works?

@@ -263,7 +290,6 @@ class DatasetApiIntegrationSuite extends BaseRestApiTest with BeforeAndAfterAll

assert(headers2.getFirst("Location").contains("/api/dataset/dataset/2"))
assert(body2.version == 2)
assert(body2.properties == expectedPropertiesSet)
Copy link
Contributor

Choose a reason for hiding this comment

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

Ahaaa, this is most probably the key change that "made it work" 😸

Copy link
Contributor Author

@AdrianOlosutean AdrianOlosutean Oct 18, 2021

Choose a reason for hiding this comment

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

@benedeki, I created #1949 , thus I propose to merge this PR and tackle that issue when working for Enceladus 3

Copy link
Collaborator

Choose a reason for hiding this comment

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

OK let's merge it this way and finally merge. Just please add a // TODO DatasetApiIntegrationSuite failing test on merge to Enceladus 3 #1949

@AdrianOlosutean AdrianOlosutean self-assigned this Oct 19, 2021
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 3 Code Smells

No Coverage information No Coverage information
0.1% 0.1% Duplication

Copy link
Contributor

@dk1844 dk1844 left a comment

Choose a reason for hiding this comment

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

Still LGTM.

@benedeki benedeki added the PR:no testing needed Only for PR - PR doesn't need to be tested by a tester (person) label Oct 21, 2021
@AdrianOlosutean AdrianOlosutean merged commit facb46a into develop-ver-3.0 Oct 21, 2021
@AdrianOlosutean AdrianOlosutean deleted the merge/release-2.24-into-develop-ver-3 branch October 21, 2021 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR:no testing needed Only for PR - PR doesn't need to be tested by a tester (person)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants