From a7ae09072cd99e3999034bbc9ee35acd232fafca Mon Sep 17 00:00:00 2001 From: Abhishek Pandey Date: Fri, 30 Jun 2023 02:23:19 -0700 Subject: [PATCH] Minor cleanup --- src/pkg/extensions/extensions.go | 4 +- src/pkg/extensions/extensions_test.go | 62 +-------------------------- 2 files changed, 3 insertions(+), 63 deletions(-) diff --git a/src/pkg/extensions/extensions.go b/src/pkg/extensions/extensions.go index 9d14c649c..01901f4c8 100644 --- a/src/pkg/extensions/extensions.go +++ b/src/pkg/extensions/extensions.go @@ -30,7 +30,7 @@ type loggerExtension struct { extInfo *details.ExtensionInfo } -func NewMonitoringExtension( +func NewLoggerExtension( ctx context.Context, rc io.ReadCloser, info details.ItemInfo, @@ -99,7 +99,7 @@ func (eh *ItemExtensionHandler) AddItemExtensions( return nil, nil, clues.New("no extensions supplied") } - factories = append(factories, NewMonitoringExtension) + factories = append(factories, NewLoggerExtension) ctx = clues.Add(ctx, "num_extensions", len(factories)) extInfo := &details.ExtensionInfo{ diff --git a/src/pkg/extensions/extensions_test.go b/src/pkg/extensions/extensions_test.go index 49eb28476..debe08623 100644 --- a/src/pkg/extensions/extensions_test.go +++ b/src/pkg/extensions/extensions_test.go @@ -280,64 +280,4 @@ func (suite *ExtensionsUnitSuite) TestAddItemExtensions() { } // TODO: tests for loggerExtension - -// { -// name: "read_failure", -// factories: []CorsoItemExtensionFactory{ -// func( -// ctx context.Context, -// rc io.ReadCloser, -// info details.ItemInfo, -// extInfo *details.ExtensionInfo, -// ) (CorsoItemExtension, error) { -// mockExt, _ := NewMockExtension(ctx, rc, info, extInfo) -// mockExt.failOnRead = true -// return mockExt, nil -// }, -// }, -// payload: []byte("some data"), -// expectedErr: require.Error, -// rc: io.NopCloser(bytes.NewReader([]byte("some data"))), -// }, -// { -// name: "close_failure", -// factories: []CorsoItemExtensionFactory{ -// func( -// ctx context.Context, -// rc io.ReadCloser, -// info details.ItemInfo, -// extInfo *details.ExtensionInfo, -// ) (CorsoItemExtension, error) { -// mockExt, _ := NewMockExtension(ctx, rc, info, extInfo) -// mockExt.failOnClose = true -// return mockExt, nil -// }, -// }, -// payload: []byte("some data"), -// expectedErr: require.Error, -// rc: io.NopCloser(bytes.NewReader([]byte("some data"))), -// }, - -// for _, test := range table { -// suite.Run(test.name, func() { -// t := suite.T() -// ctx, flush := tester.NewContext(t) -// defer flush() - -// extRc, extInfo, err := AddItemExtensions( -// ctx, -// test.rc, -// details.ItemInfo{}, -// test.factories) -// require.NoError(suite.T(), err) - -// err = readFrom(extRc) -// require.NoError(suite.T(), err) - -// require.Equal(suite.T(), len(test.payload), extInfo.Data["numBytes"]) - -// // verify crc32 -// c := extInfo.Data["crc32"].(uint32) -// require.Equal(suite.T(), c, crc32.ChecksumIEEE(test.payload)) -// }) -// } +// TODO: Tests to verify RC wrapper ordering by AddItemExtensioner