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

go.mod: golang.org/x/oauth2 v0.1.0 #10592

Merged
merged 1 commit into from
May 22, 2023
Merged

Conversation

thaJeztah
Copy link
Member

docker/docker already depends on oauth2 v0.1.0, which differs only in dependencies;

golang/oauth2@6fdb5e3...v0.1.0

The replace rule is still needed to help with some dependency hell when resolving the version to use;

go mod tidy
go: downloading cloud.google.com/go v0.75.0
github.com/docker/compose/v2/pkg/compose imports
    github.com/moby/buildkit/client imports
    go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc tested by
    go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc.test imports
    google.golang.org/grpc/interop imports
    golang.org/x/oauth2/google imports
    cloud.google.com/go/compute/metadata: ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules:
    cloud.google.com/go v0.75.0 (/Users/thajeztah/go/pkg/mod/cloud.google.com/go@v0.75.0/compute/metadata)
    cloud.google.com/go/compute/metadata v0.2.1 (/Users/thajeztah/go/pkg/mod/cloud.google.com/go/compute/metadata@v0.2.1)

What I did

Related issue

(not mandatory) A picture of a cute animal, if possible in relation to what you did

docker/docker already depends on oauth2 v0.1.0, which differs only in
dependencies;

golang/oauth2@6fdb5e3...v0.1.0

The replace rule is still needed to help with some dependency hell when
resolving the version to use;

    go mod tidy
    go: downloading cloud.google.com/go v0.75.0
    github.com/docker/compose/v2/pkg/compose imports
        github.com/moby/buildkit/client imports
        go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc tested by
        go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc.test imports
        google.golang.org/grpc/interop imports
        golang.org/x/oauth2/google imports
        cloud.google.com/go/compute/metadata: ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules:
        cloud.google.com/go v0.75.0 (/Users/thajeztah/go/pkg/mod/cloud.google.com/go@v0.75.0/compute/metadata)
        cloud.google.com/go/compute/metadata v0.2.1 (/Users/thajeztah/go/pkg/mod/cloud.google.com/go/compute/metadata@v0.2.1)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov
Copy link

codecov bot commented May 22, 2023

Codecov Report

Patch coverage has no change and project coverage change: -40.17 ⚠️

Comparison is base (70953b1) 59.48% compared to head (ec2b493) 19.31%.

Additional details and impacted files
@@             Coverage Diff             @@
##               v2   #10592       +/-   ##
===========================================
- Coverage   59.48%   19.31%   -40.17%     
===========================================
  Files         107      104        -3     
  Lines        9359     9262       -97     
===========================================
- Hits         5567     1789     -3778     
- Misses       3216     7280     +4064     
+ Partials      576      193      -383     

see 81 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ndeloof ndeloof merged commit 34bd41c into docker:v2 May 22, 2023
@thaJeztah thaJeztah deleted the bump_oauth2_0.1.0 branch May 22, 2023 13:45
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.

2 participants