From cc3a946e3081281d0bf0bc065222d4fc2aa78471 Mon Sep 17 00:00:00 2001 From: Jeffrey Chien Date: Fri, 20 Oct 2023 11:00:30 -0400 Subject: [PATCH] Comply with CheckApi --- .github/CODEOWNERS | 2 +- extension/awsmiddleware/config.go | 2 +- extension/awsmiddleware/middleware.go | 8 ++++---- extension/awsmiddleware/middleware_test.go | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 41a6c72f218d..63c8d5a5888b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -89,7 +89,7 @@ exporter/tencentcloudlogserviceexporter/ @open-telemetry/collect exporter/zipkinexporter/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1 extension/asapauthextension/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy -extension/awsmiddleware @open-telemetry/collector-contrib-approvers @jefchien +extension/awsmiddleware/ @open-telemetry/collector-contrib-approvers @jefchien extension/awsproxy/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia extension/basicauthextension/ @open-telemetry/collector-contrib-approvers @jpkrohling @svrakitin @frzifus extension/bearertokenauthextension/ @open-telemetry/collector-contrib-approvers @jpkrohling @pavankrish123 @frzifus diff --git a/extension/awsmiddleware/config.go b/extension/awsmiddleware/config.go index 88c399a437fe..52f2face2ac3 100644 --- a/extension/awsmiddleware/config.go +++ b/extension/awsmiddleware/config.go @@ -29,5 +29,5 @@ func GetConfigurer(extensions map[component.ID]component.Component, middlewareID if err != nil { return nil, err } - return NewConfigurer(middleware.Handlers()), nil + return newConfigurer(middleware.Handlers()), nil } diff --git a/extension/awsmiddleware/middleware.go b/extension/awsmiddleware/middleware.go index 391bc156aa54..1d0154358754 100644 --- a/extension/awsmiddleware/middleware.go +++ b/extension/awsmiddleware/middleware.go @@ -113,8 +113,8 @@ type Configurer struct { responseHandlers []ResponseHandler } -// NewConfigurer sets the request/response handlers. -func NewConfigurer(requestHandlers []RequestHandler, responseHandlers []ResponseHandler) *Configurer { +// newConfigurer sets the request/response handlers. +func newConfigurer(requestHandlers []RequestHandler, responseHandlers []ResponseHandler) *Configurer { return &Configurer{requestHandlers: requestHandlers, responseHandlers: responseHandlers} } @@ -122,7 +122,7 @@ func NewConfigurer(requestHandlers []RequestHandler, responseHandlers []Response // Build handler list and response handlers are added to the ValidateResponse handler list. // Build will only be run once per request, but if there are errors, ValidateResponse will // be run again for each configured retry. -func (c *Configurer) ConfigureSDKv1(handlers *request.Handlers) error { +func (c Configurer) ConfigureSDKv1(handlers *request.Handlers) error { var errs error for _, handler := range c.requestHandlers { if err := appendHandler(&handlers.Build, namedRequestHandler(handler), handler.Position()); err != nil { @@ -139,7 +139,7 @@ func (c *Configurer) ConfigureSDKv1(handlers *request.Handlers) error { // ConfigureSDKv2 adds middleware to the AWS SDK v2. Request handlers are added to the // Build step and response handlers are added to the Deserialize step. -func (c *Configurer) ConfigureSDKv2(config *aws.Config) error { +func (c Configurer) ConfigureSDKv2(config *aws.Config) error { var errs error for _, handler := range c.requestHandlers { relativePosition, err := toRelativePosition(handler.Position()) diff --git a/extension/awsmiddleware/middleware_test.go b/extension/awsmiddleware/middleware_test.go index 132b52d2ca6c..0ac775c42252 100644 --- a/extension/awsmiddleware/middleware_test.go +++ b/extension/awsmiddleware/middleware_test.go @@ -113,7 +113,7 @@ func TestInvalidHandlers(t *testing.T) { handler.On("Position").Return(HandlerPosition(-1)) middleware := new(MockMiddlewareExtension) middleware.On("Handlers").Return([]RequestHandler{handler}, []ResponseHandler{handler}) - c := NewConfigurer(middleware.Handlers()) + c := newConfigurer(middleware.Handlers()) // v1 client := awstesting.NewClient() err := c.ConfigureSDKv1(&client.Handlers) @@ -186,7 +186,7 @@ func TestAppendOrder(t *testing.T) { requestHandlers, []ResponseHandler{handler}, ) - c := NewConfigurer(middleware.Handlers()) + c := newConfigurer(middleware.Handlers()) // v1 client := awstesting.NewClient(&awsv1.Config{ Region: awsv1.String("mock-region"), @@ -223,7 +223,7 @@ func TestConfigureSDKv1(t *testing.T) { }) require.Equal(t, 3, client.Handlers.Build.Len()) require.Equal(t, 1, client.Handlers.ValidateResponse.Len()) - assert.NoError(t, NewConfigurer(middleware.Handlers()).ConfigureSDKv1(&client.Handlers)) + assert.NoError(t, newConfigurer(middleware.Handlers()).ConfigureSDKv1(&client.Handlers)) assert.Equal(t, 5, client.Handlers.Build.Len()) assert.Equal(t, 2, client.Handlers.ValidateResponse.Len()) s3Client := &s3v1.S3{Client: client} @@ -238,7 +238,7 @@ func TestConfigureSDKv2(t *testing.T) { middleware, recorder, server := setup(t) defer server.Close() cfg := awsv2.Config{Region: "us-east-1", RetryMaxAttempts: 0} - assert.NoError(t, NewConfigurer(middleware.Handlers()).ConfigureSDKv2(&cfg)) + assert.NoError(t, newConfigurer(middleware.Handlers()).ConfigureSDKv2(&cfg)) s3Client := s3v2.NewFromConfig(cfg, func(options *s3v2.Options) { options.BaseEndpoint = awsv2.String(server.URL) })