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

internal: Update contour package to xdscache and rename imports #2941

Closed

Conversation

stevesloka
Copy link
Member

Renames the contour package to xdscache and fixes up all the imports
to make them consistent across the project.

Fixes #2938
Fixes #2939

Signed-off-by: Steve Sloka slokas@vmware.com

@stevesloka stevesloka added this to the 1.9.0 milestone Sep 24, 2020
@codecov
Copy link

codecov bot commented Sep 24, 2020

Codecov Report

Merging #2941 into main will not change coverage.
The diff coverage is 85.63%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2941   +/-   ##
=======================================
  Coverage   74.91%   74.91%           
=======================================
  Files          87       87           
  Lines        5604     5604           
=======================================
  Hits         4198     4198           
  Misses       1315     1315           
  Partials       91       91           
Impacted Files Coverage Δ
cmd/contour/contour.go 0.00% <0.00%> (ø)
cmd/contour/ingressstatus.go 33.33% <0.00%> (ø)
cmd/contour/serve.go 1.83% <0.00%> (ø)
internal/k8s/informers.go 0.00% <0.00%> (ø)
internal/xdscache/cond.go 100.00% <ø> (ø)
internal/xdscache/observer.go 0.00% <ø> (ø)
internal/xdscache/resources.go 100.00% <ø> (ø)
internal/xdscache/snapshot.go 10.00% <ø> (ø)
internal/k8s/status.go 81.81% <85.71%> (ø)
internal/featuretests/featuretests.go 92.81% <88.23%> (ø)
... and 21 more

Copy link
Member

@skriss skriss left a comment

Choose a reason for hiding this comment

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

This looks reasonable to me. It'd be helpful to document this standard, perhaps in https://github.com/projectcontour/contour/blob/main/CONTRIBUTING.md -- I'd like to see us document a few more of the conventions and standards that we use there, it's helpful for new contributors.

@skriss
Copy link
Member

skriss commented Sep 24, 2020

Also, this is probably going to conflict with a few open PRs...not sure what order we want to go in.

Renames the `contour` package to `xdscache` and fixes up all the imports
to make them consistent across the project.

Fixes projectcontour#2938
Fixes projectcontour#2939

Signed-off-by: Steve Sloka <slokas@vmware.com>
@youngnick
Copy link
Member

Ah, oops, I forgot to check. The status change should be straightforward to fix. I won't merge anything more until this one is done - I think this should go next.

@skriss
Copy link
Member

skriss commented Sep 25, 2020

I merged the CORS PR, this is now ready for a rebase.

@jpeach
Copy link
Contributor

jpeach commented Sep 28, 2020

Both of the linked issues seem reasonable to be, but can we make separate PRs for them? Is there a good reason that we need to combine both large changes?

@stevesloka
Copy link
Member Author

Is there a good reason that we need to combine both large changes?

Nope no real reason other than making the review easier. The rename touches the same number of files as the package move, so the attempt was to make it easier on the reviewer to only validate the alias import changes.

@stevesloka
Copy link
Member Author

The merge conflicts got to me trying to resolve, it will be easier to just do the work again from scratch. I'll split into two as well for @jpeach.

@stevesloka stevesloka closed this Sep 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants