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

TACKLE-271: case insensitive headers now allowed in import csv file #82

Merged
merged 1 commit into from
Aug 12, 2021

Conversation

m-brophy
Copy link
Contributor

@m-brophy m-brophy requested a review from mrizzi June 29, 2021 15:24
@codecov
Copy link

codecov bot commented Jun 29, 2021

Codecov Report

Merging #82 (c1c860f) into main (0833e85) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##               main      #82      +/-   ##
============================================
+ Coverage     96.81%   96.82%   +0.01%     
  Complexity      218      218              
============================================
  Files            25       25              
  Lines           439      441       +2     
  Branches         21       21              
============================================
+ Hits            425      427       +2     
  Misses           11       11              
  Partials          3        3              
Impacted Files Coverage Δ
...e/applicationinventory/services/ImportService.java 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0833e85...c1c860f. Read the comment docs.

Copy link
Contributor

@carlosthe19916 carlosthe19916 left a comment

Choose a reason for hiding this comment

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

This PR looks good to me

@carlosthe19916 carlosthe19916 merged commit 6de2025 into migtools:main Aug 12, 2021
carlosthe19916 added a commit to carlosthe19916/tackle-application-inventory that referenced this pull request Aug 23, 2021
* TACKLE-271: case insensitive headers now allowed in import csv file (migtools#82)

* TACKLE-290 importer native image tests (migtools#88)

* TACKLE-290 importer native image tests

* TACKLE-290: removed userTransactions in tests

* TACKLE-290: convert to use endpoints

* TACKLE-290: convert to use endpoints so NativeImageTests don't fail

* TACKLE-290:inititialise mocks

* TACKLE-290: initialise mocks

* TACKLE-290: add wiremock http server to enable native image tests to call out to remote rest api

* TACKLE-290: tidy up importer test code

* TACKLE-290: increase test coverage for importer

* TACKLE-290: added extra test

* TACKLE-290: test coverage

* TACKLE-290: fix problem with controls services query parameters not being picked up

* TACKLE-290: remove status field from ApplicationImport

* Tackle 290 - Fix native tests (migtools#6)

* Comment tests

* Restart changes

* comment test

* comment test

* comment test

* Working tests

* build tests inside own gh account

* fix ImportServiceTest

* Remove comments

* restore gh workflow

* restore gh workflow

* TACKLE-290: fix merged test to be native-compliant

* TACKLE-290 Removed 'baseUri' and changed 'mp-rest/uri' props (migtools#7)

* TACKLE-290: alter order of ImportServiceTest methods

* TACKLE-290: alter test method ordering

* TACKLE-290 Refactored some tests and WireMock (migtools#8)

Co-authored-by: Carlos E. Feria Vila <[email protected]>
Co-authored-by: Marco Rizzi <[email protected]>

* Maven pom.xml(deps-dev): Bump mockito-core from 3.8.0 to 3.12.0 (migtools#117)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.8.0 to 3.12.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.8.0...v3.12.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump wiremock-jre8 from 2.29.0 to 2.30.1 (migtools#120)

Bumps [wiremock-jre8](https://github.com/tomakehurst/wiremock) from 2.29.0 to 2.30.1.
- [Release notes](https://github.com/tomakehurst/wiremock/releases)
- [Commits](wiremock/wiremock@2.29.0...2.30.1)

---
updated-dependencies:
- dependency-name: com.github.tomakehurst:wiremock-jre8
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump assertj-core from 2.6.0 to 3.20.2 (migtools#76)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 2.6.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](assertj/assertj@assertj-core-2.6.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump postgresql from 1.15.2 to 1.16.0 (migtools#96)

Bumps [postgresql](https://github.com/testcontainers/testcontainers-java) from 1.15.2 to 1.16.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.15.2...1.16.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump mockito-core from 3.12.0 to 3.12.1 (migtools#121)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.12.0...v3.12.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* TACKLE-268 Properly clean data inserted during test execution ('Import-app-8')

Co-authored-by: Mark Brophy <[email protected]>
Co-authored-by: Carlos E. Feria Vila <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
mrizzi added a commit that referenced this pull request Aug 23, 2021
…file (#107)

* add container image generation

* Add hibernate-validation and tests

* Fix test

* Mock controls endpoints

* Properly clean data inserted during test execution (#2)

* TACKLE-271: case insensitive headers now allowed in import csv file (#82)

* TACKLE-290 importer native image tests (#88)

* TACKLE-290 importer native image tests

* TACKLE-290: removed userTransactions in tests

* TACKLE-290: convert to use endpoints

* TACKLE-290: convert to use endpoints so NativeImageTests don't fail

* TACKLE-290:inititialise mocks

* TACKLE-290: initialise mocks

* TACKLE-290: add wiremock http server to enable native image tests to call out to remote rest api

* TACKLE-290: tidy up importer test code

* TACKLE-290: increase test coverage for importer

* TACKLE-290: added extra test

* TACKLE-290: test coverage

* TACKLE-290: fix problem with controls services query parameters not being picked up

* TACKLE-290: remove status field from ApplicationImport

* Tackle 290 - Fix native tests (#6)

* Comment tests

* Restart changes

* comment test

* comment test

* comment test

* Working tests

* build tests inside own gh account

* fix ImportServiceTest

* Remove comments

* restore gh workflow

* restore gh workflow

* TACKLE-290: fix merged test to be native-compliant

* TACKLE-290 Removed 'baseUri' and changed 'mp-rest/uri' props (#7)

* TACKLE-290: alter order of ImportServiceTest methods

* TACKLE-290: alter test method ordering

* TACKLE-290 Refactored some tests and WireMock (#8)

Co-authored-by: Carlos E. Feria Vila <[email protected]>
Co-authored-by: Marco Rizzi <[email protected]>

* Maven pom.xml(deps-dev): Bump mockito-core from 3.8.0 to 3.12.0 (#117)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.8.0 to 3.12.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.8.0...v3.12.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump wiremock-jre8 from 2.29.0 to 2.30.1 (#120)

Bumps [wiremock-jre8](https://github.com/tomakehurst/wiremock) from 2.29.0 to 2.30.1.
- [Release notes](https://github.com/tomakehurst/wiremock/releases)
- [Commits](wiremock/wiremock@2.29.0...2.30.1)

---
updated-dependencies:
- dependency-name: com.github.tomakehurst:wiremock-jre8
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump assertj-core from 2.6.0 to 3.20.2 (#76)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 2.6.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](assertj/assertj@assertj-core-2.6.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump postgresql from 1.15.2 to 1.16.0 (#96)

Bumps [postgresql](https://github.com/testcontainers/testcontainers-java) from 1.15.2 to 1.16.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.15.2...1.16.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump mockito-core from 3.12.0 to 3.12.1 (#121)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.12.0...v3.12.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* TACKLE-268 Properly clean data inserted during test execution ('Import-app-8')

Co-authored-by: Mark Brophy <[email protected]>
Co-authored-by: Carlos E. Feria Vila <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* TACKLE-268 Enhancements after the review

* TACKLE-268 Removed temporary stub in ImportServiceTest

Co-authored-by: Marco Rizzi <[email protected]>
Co-authored-by: Mark Brophy <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mrizzi <[email protected]>
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.

2 participants