Skip to content

Conversation

@dk1844
Copy link
Contributor

@dk1844 dk1844 commented Apr 15, 2021

This is essentially merging develop into develop-ver3.0, but since it was non-trivial, this PR was created.

benedeki and others added 7 commits March 16, 2021 01:37
* Create license_check.yml
* Add e2e tests into examples

* Fix style

* Examples - Fix comments

* Apply suggestions from code review

Co-authored-by: veprokendlo <[email protected]>

* Update vars in test jasons and other small fixes

* new test for MappingCR and other small fixes

* repair key address

* typo remove

* add recordId conf into test jasons and update readme

Co-authored-by: veprokendlo <[email protected]>
Co-authored-by: Veronika Huvarova <[email protected]>
Co-authored-by: Veronika <[email protected]>
* 1648 GroupExplode and Broadcast working with multiple outputs
* #1648 Multiple outputs in UI and additional output encoding
% Conflicts:
%	data-model/src/main/scala/META-INF/MANIFEST.MF
%	menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/targetSchemaFieldSelector.fragment.xml
%	menas/ui/index.html
@dk1844 dk1844 self-assigned this Apr 15, 2021
@dk1844 dk1844 added the PR:tested Only for PR - PR was tested by a tester (person) label Apr 15, 2021
@benedeki
Copy link
Collaborator

benedeki commented Apr 15, 2021

Non-trivial 😞
Then I would wait the develop to be updated to the expected (hopefully) version - e.g. merge of #1740

//@dk1844 replying: that's also an option. I felt that there was a lot of added value of creating merge in the first place, hopefully the #1740 addition won't be easier.

Comment on lines +14 to +17
ARG DOCKER_BASE_ARTIFACT=nginx
ARG DOCKER_BASE_TAG=1-alpine

FROM ${DOCKER_BASE_ARTIFACT}:${DOCKER_BASE_TAG}
Copy link
Contributor

Choose a reason for hiding this comment

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

I know this is a new feature that people are excited about, but I think it was mainly created for multi staged builds.

What does it give us here? What are the pros of this approach? I honestly see only possible problems here + the extra (undeclared) properties in Maven.

Choose a reason for hiding this comment

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

if DOCKER_BASE_ARTIFACT and DOCKER_BASE_TAG empty, will be using default values in Dockerfile .
I use these ARG in CodeBuild
DOCKER_BASE_ARTIFACT = ECR/bigdatarnd_tomcat
DOCKER_BASE_TAG = needed version
instead of pulling tomcat from DockerHub , I use an image from ECR. Also it the way to avoid an error about "dockerhub limits" https://docs.docker.com/docker-hub/download-rate-limit/ (In Codebuild I meet the error pretty often )

Copy link
Contributor

Choose a reason for hiding this comment

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

I would put a comment in there above the ARGVs as to why it is like that.

AdrianOlosutean and others added 6 commits April 19, 2021 15:42
…d from SparkJobs on execution (#1740)

#1702: Different verification of Dataset properties from setup API and from SparkJobs on execution
* Essentiality Mandatory received a boolean parameter allowRun
* Dataset validation enhanced to support the Mandatory essentiality based on its boolean parameter
* Created ValidationKind enumeration with its Spring converter from Spring too
* Added query params to dataset validation API to specify how strict the validation should be
* Spring RestExceptionHandler changed to return 400 on wrong Query param conversion from string
* Essentiality changed to look little more as an enumeration of case objects
* String implicits: emptyOrElse, coalesce
* UTs
* Small code changes
* fixed `RunRepositoryIntegrationSuite` not to be local time zone dependent
Co-authored-by: Daniel K <[email protected]>
…velop-ver.30

# Conflicts:
#	menas/src/main/scala/za/co/absa/enceladus/menas/MvcConfig.scala
@dk1844
Copy link
Contributor Author

dk1844 commented Apr 20, 2021

#1740 merged into develop, updated this PR/branch by merging develop into it.

Zejnilovic
Zejnilovic previously approved these changes Apr 20, 2021
Copy link
Contributor

@Zejnilovic Zejnilovic left a comment

Choose a reason for hiding this comment

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

I only went over Docker stuff

benedeki and others added 2 commits April 20, 2021 10:40
…pace trimming (#1761)

#1757: Updating Windows Helper scripts for DRA default and CSV whitespace trimming
* Windows Helper scripts support CSV whitespace trimming
* Windows Helper scripts use DRA as default
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.

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

No Coverage information No Coverage information
20.6% 20.6% Duplication

@dk1844 dk1844 merged commit da03de0 into develop-ver-3.0 Apr 20, 2021
@dk1844 dk1844 deleted the feature/merging-develop-ver.30 branch April 20, 2021 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

PR:tested Only for PR - PR was tested by a tester (person)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants