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

lakefs new repositories with import branch as parent branch by default #810

Merged
merged 10 commits into from
Oct 15, 2020

Conversation

nopcoder
Copy link
Contributor

@nopcoder nopcoder commented Oct 13, 2020

Closes #787

  1. Remove import UI and API
  2. Create repository will create import branch
  3. lakefs import will verify that the import branch was created and not create a branch for you - it means that only new repositories will be valid for import
  4. The new repositories will have the default (master) branch be a child branch of the import branch, so merge from the parent will be performed on merge from import.

@nopcoder nopcoder requested a review from johnnyaug October 13, 2020 12:57
@codecov-io
Copy link

codecov-io commented Oct 13, 2020

Codecov Report

Merging #810 into master will increase coverage by 0.27%.
The diff coverage is 70.58%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #810      +/-   ##
==========================================
+ Coverage   41.88%   42.15%   +0.27%     
==========================================
  Files         133      134       +1     
  Lines       10422    10402      -20     
==========================================
+ Hits         4365     4385      +20     
+ Misses       5477     5432      -45     
- Partials      580      585       +5     
Impacted Files Coverage Δ
catalog/cataloger.go 68.14% <ø> (ø)
catalog/cataloger_set_default_branch.go 55.55% <55.55%> (ø)
catalog/cataloger_create_repository.go 62.16% <86.66%> (+5.01%) ⬆️
api/api_controller.go 37.47% <100.00%> (+1.34%) ⬆️
catalog/cataloger_commit.go 78.78% <0.00%> (-3.04%) ⬇️
onboard/import.go 62.74% <0.00%> (-2.57%) ⬇️
onboard/catalog_actions.go 67.85% <0.00%> (-2.28%) ⬇️
block/s3/inventory_iterator.go 85.50% <0.00%> (+0.89%) ⬆️

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 ee09a87...f87b2c7. Read the comment docs.

@nopcoder nopcoder marked this pull request as ready for review October 13, 2020 13:22
catalog/cataloger_create_repository.go Show resolved Hide resolved
catalog/cataloger_set_default_branch.go Outdated Show resolved Hide resolved
cmd/lakefs/cmd/import.go Outdated Show resolved Hide resolved
cmd/lakefs/cmd/import.go Outdated Show resolved Hide resolved
@nopcoder nopcoder requested a review from johnnyaug October 13, 2020 14:47
@nopcoder nopcoder self-assigned this Oct 13, 2020
@nopcoder nopcoder changed the title lakefs import with create repository as import branch as parent lakefs new repositories with import branch as parent branch by default Oct 15, 2020
cmd/lakefs/cmd/import.go Outdated Show resolved Hide resolved
@nopcoder nopcoder requested a review from johnnyaug October 15, 2020 11:17
@nopcoder nopcoder merged commit 4a51df8 into master Oct 15, 2020
@nopcoder nopcoder deleted the feature/import-as-parent branch October 15, 2020 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consider removing import tool from the UI, leaving only the CLI
3 participants