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

Remove v1 client lib #2763

Merged

Conversation

sinkingpoint
Copy link
Contributor

This is confusing as it sits in the root of the repo. Considering we
have a v2 client lib at (https://github.com/prometheus/alertmanager/blob/main/api/v2/client/alertmanager_client.go) this commit removes the v1 one to try and avoid
that confusion

Solves #2762

@sinkingpoint sinkingpoint force-pushed the sinkingpoint/remove_v1_client branch 4 times, most recently from 24b6cc9 to effada6 Compare November 9, 2021 22:47
@sinkingpoint
Copy link
Contributor Author

sinkingpoint commented Nov 9, 2021

Erk... This seems to be more ingrained than I anticipated. Not sure whether we want to do this @roidelapluie considering this might have a bit of an impact

@roidelapluie
Copy link
Member

This is indeed used in the acceptance tests.

What about we move client and client_test.go inside test/with_api_v1/acceptance.go and merge them into a file called helper_test.go ?

test/with_api_v1/acceptance.go
35: "github.com/prometheus/alertmanager/client"

@sinkingpoint
Copy link
Contributor Author

Sounds reasonable. The source of this confusion comes from the prominence of this lib in the repo, so moving this out of that location makes sense

@sinkingpoint
Copy link
Contributor Author

Build error looks transient?

error pulling image configuration: Get https://docker-images-prod.s3.dualstack.us-east-1.amazonaws.com/registry-...: dial tcp 52.217.66.96:443: i/o timeout

Copy link
Member

@roidelapluie roidelapluie left a comment

Choose a reason for hiding this comment

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

I think only the client part shold go to helper.go, acceptance should stay in acceptance.go

@sinkingpoint sinkingpoint force-pushed the sinkingpoint/remove_v1_client branch 2 times, most recently from 96e4575 to d182c98 Compare November 11, 2021 00:27
This commit moves the stuff formerly in /client into /test/with_api_v1
so that we can discourage use of the v1 client without breaking things

Signed-off-by: sinkingpoint <colin@quirl.co.nz>
@sinkingpoint
Copy link
Contributor Author

Fixed this. Yet again, the build failures appear to be docker pull timeouts which is weird

@roidelapluie roidelapluie merged commit e2a1011 into prometheus:main Nov 16, 2021
@roidelapluie
Copy link
Member

Thanks!

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.

None yet

2 participants