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

Reintroduce grpc* packages #4612

Merged
merged 1 commit into from
Jan 13, 2022

Conversation

aknuds1
Copy link
Contributor

@aknuds1 aknuds1 commented Jan 12, 2022

What this PR does:
Revert usage of grafana/dskit/grpc* packages. I've copied the current corresponding code from dskit.

Which issue(s) this PR fixes:

Checklist

  • Tests updated
  • [na] Documentation added
  • [na] CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@@ -0,0 +1,87 @@
package tls
Copy link
Contributor

Choose a reason for hiding this comment

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

You should replace imports of "github.com/grafana/dskit/crypto/tls" with this one.

Copy link
Contributor Author

@aknuds1 aknuds1 Jan 13, 2022

Choose a reason for hiding this comment

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

@pracucci dskit/crypto/tls is actually only imported within dskit itself though, within the dskit/kv package. They will go away when the kv package is reintroduced into Cortex :)

Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

LGTM (modulo addressing the comment)

Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

LGTM

@pstibrany
Copy link
Contributor

This also needs to be rebased now :-(

This reverts commit 19f3802.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
@aknuds1
Copy link
Contributor Author

aknuds1 commented Jan 13, 2022

This also needs to be rebased now :-(

@pstibrany done.

@pstibrany
Copy link
Contributor

Thank you.

@pstibrany pstibrany enabled auto-merge (squash) January 13, 2022 09:13
@pstibrany pstibrany merged commit a71ff2a into cortexproject:master Jan 13, 2022
@aknuds1 aknuds1 deleted the chore/reintroduce-grpc branch January 13, 2022 09:39
alvinlin123 pushed a commit to ac1214/cortex that referenced this pull request Jan 14, 2022
)

This reverts commit 19f3802.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Alvin Lin <alvinlin@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants