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.

Sign up for GitHub

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

[chore] Remove usages of extensionauthtest.MockClient #38401

Merged
merged 2 commits into from
Mar 5, 2025
Merged

[chore] Remove usages of extensionauthtest.MockClient #38401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21214a3
[chore] Remove usages of extensionauthtest.MockClient
mx-psi Mar 5, 2025
d39e7fd
Merge branch 'main' into mx-psi/remove-uses-of-authtestmockclient
atoulme Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions exporter/elasticsearchexporter/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"go.opentelemetry.io/collector/exporter/exporterbatcher"
"go.opentelemetry.io/collector/exporter/exportertest"
"go.opentelemetry.io/collector/exporter/xexporter"
"go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest"
"go.opentelemetry.io/collector/extension/extensionauth"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
Expand All @@ -40,6 +40,13 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter/internal/metadata"
)

func build[T any, O any](t *testing.T, f func(...O) (T, error), opts ...O) T {
t.Helper()
v, err := f(opts...)
require.NoError(t, err)
return v
}

func TestExporterLogs(t *testing.T) {
t.Run("publish with success", func(t *testing.T) {
rec := newBulkRecorder()
Expand Down Expand Up @@ -2086,15 +2093,17 @@ func TestExporterAuth(t *testing.T) {
})
err := exporter.Start(context.Background(), &mockHost{
extensions: map[component.ID]component.Component{
testauthID: &extensionauthtest.MockClient{
ResultRoundTripper: roundTripperFunc(func(*http.Request) (*http.Response, error) {
select {
case done <- struct{}{}:
default:
}
return nil, errors.New("nope")
testauthID: build(t, extensionauth.NewClient,
extensionauth.WithClientRoundTripper(func(http.RoundTripper) (http.RoundTripper, error) {
return roundTripperFunc(func(*http.Request) (*http.Response, error) {
select {
case done <- struct{}{}:
default:
}
return nil, errors.New("nope")
}), nil
}),
},
),
},
})
require.NoError(t, err)
Expand All @@ -2120,12 +2129,14 @@ func TestExporterBatcher(t *testing.T) {
})
err := exporter.Start(context.Background(), &mockHost{
extensions: map[component.ID]component.Component{
testauthID: &extensionauthtest.MockClient{
ResultRoundTripper: roundTripperFunc(func(req *http.Request) (*http.Response, error) {
requests = append(requests, req)
return nil, errors.New("nope")
testauthID: build(t, extensionauth.NewClient,
extensionauth.WithClientRoundTripper(func(http.RoundTripper) (http.RoundTripper, error) {
return roundTripperFunc(func(req *http.Request) (*http.Response, error) {
requests = append(requests, req)
return nil, errors.New("nope")
}), nil
}),
},
),
},
})
require.NoError(t, err)
Expand Down
3 changes: 1 addition & 2 deletions exporter/elasticsearchexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.121.0
go.opentelemetry.io/collector/exporter/exportertest v0.121.0
go.opentelemetry.io/collector/exporter/xexporter v0.121.0
go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.121.0
go.opentelemetry.io/collector/extension/extensionauth v0.121.0
go.opentelemetry.io/collector/pdata v1.27.0
go.opentelemetry.io/collector/pdata/pprofile v0.121.0
go.opentelemetry.io/collector/semconv v0.121.0
Expand Down Expand Up @@ -84,7 +84,6 @@ require (
go.opentelemetry.io/collector/consumer/consumertest v0.121.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.121.0 // indirect
go.opentelemetry.io/collector/extension v1.27.0 // indirect
go.opentelemetry.io/collector/extension/extensionauth v0.121.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.121.0 // indirect
go.opentelemetry.io/collector/featuregate v1.27.0 // indirect
go.opentelemetry.io/collector/pipeline v0.121.0 // indirect
Expand Down
3 changes: 1 addition & 2 deletions receiver/sshcheckreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
go.opentelemetry.io/collector/consumer v1.27.0
go.opentelemetry.io/collector/consumer/consumertest v0.121.0
go.opentelemetry.io/collector/extension v1.27.0
go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.121.0
go.opentelemetry.io/collector/extension/extensionauth v0.121.0
go.opentelemetry.io/collector/filter v0.121.0
go.opentelemetry.io/collector/pdata v1.27.0
go.opentelemetry.io/collector/receiver v0.121.0
Expand Down Expand Up @@ -43,7 +43,6 @@ require (
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.121.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.121.0 // indirect
go.opentelemetry.io/collector/extension/extensionauth v0.121.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.121.0 // indirect
go.opentelemetry.io/collector/pipeline v0.121.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.121.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions receiver/sshcheckreceiver/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions receiver/sshcheckreceiver/internal/configssh/configssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest"
"go.opentelemetry.io/collector/extension/extensionauth"
"golang.org/x/crypto/ssh"
)

Expand All @@ -21,10 +21,16 @@ type mockHost struct {
ext map[component.ID]extension.Extension
}

func nopClient(t *testing.T) extensionauth.Client {
client, err := extensionauth.NewClient()
assert.NoError(t, err)
return client
}

func TestAllSSHClientSettings(t *testing.T) {
host := &mockHost{
ext: map[component.ID]extension.Extension{
component.MustNewID("testauth"): &extensionauthtest.MockClient{},
component.MustNewID("testauth"): nopClient(t),
},
}

Expand Down Expand Up @@ -127,7 +133,7 @@ func TestAllSSHClientSettings(t *testing.T) {
func Test_Client_Dial(t *testing.T) {
host := &mockHost{
ext: map[component.ID]extension.Extension{
component.MustNewID("testauth"): &extensionauthtest.MockClient{},
component.MustNewID("testauth"): nopClient(t),
},
}

Expand Down Expand Up @@ -201,7 +207,7 @@ func Test_Client_Dial(t *testing.T) {
func Test_Client_ToSFTPClient(t *testing.T) {
host := &mockHost{
ext: map[component.ID]extension.Extension{
component.MustNewID("testauth"): &extensionauthtest.MockClient{},
component.MustNewID("testauth"): nopClient(t),
},
}

Expand Down
3 changes: 1 addition & 2 deletions receiver/tcpcheckreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
go.opentelemetry.io/collector/consumer v1.27.0
go.opentelemetry.io/collector/consumer/consumertest v0.121.0
go.opentelemetry.io/collector/extension v1.27.0
go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250224010654-18e18b21da7a
go.opentelemetry.io/collector/extension/extensionauth v0.121.0
go.opentelemetry.io/collector/pdata v1.27.0
go.opentelemetry.io/collector/receiver v0.121.0
go.opentelemetry.io/collector/receiver/receivertest v0.121.0
Expand Down Expand Up @@ -48,7 +48,6 @@ require (
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.121.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.121.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250224010654-18e18b21da7a // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.121.0 // indirect
go.opentelemetry.io/collector/pipeline v0.121.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.121.0 // indirect
Expand Down
6 changes: 2 additions & 4 deletions receiver/tcpcheckreceiver/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions receiver/tcpcheckreceiver/internal/configtcp/configtcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import (
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/extension/auth/authtest"
"go.opentelemetry.io/collector/extension/extensionauth"
)

type mockHost struct {
Expand All @@ -20,9 +21,11 @@ type mockHost struct {
}

func TestAllTCPClientSettings(t *testing.T) {
client, err := extensionauth.NewClient()
require.NoError(t, err)
host := &mockHost{
ext: map[component.ID]extension.Extension{
component.MustNewID("testauth"): &authtest.MockClient{},
component.MustNewID("testauth"): client,
},
}

Expand Down