Skip to content

Commit 261c016

Browse files
committed
fixed lint and formatting issue
1 parent 60398c8 commit 261c016

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

confmap/provider/googlesecretmanagerprovider/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
cloud.google.com/go/secretmanager v1.14.7
77
github.com/googleapis/gax-go/v2 v2.14.1
88
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/collector/confmap v1.30.0
9+
go.opentelemetry.io/collector/confmap v1.31.1-0.20250505152726-56c7da210783
1010
go.uber.org/goleak v1.3.0
1111
google.golang.org/grpc v1.71.1
1212
)
@@ -31,7 +31,7 @@ require (
3131
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3232
github.com/pmezard/go-difflib v1.0.0 // indirect
3333
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
34-
go.opentelemetry.io/collector/featuregate v1.30.0 // indirect
34+
go.opentelemetry.io/collector/featuregate v1.31.1-0.20250505152726-56c7da210783 // indirect
3535
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
3636
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
3737
go.opentelemetry.io/otel v1.35.0 // indirect

confmap/provider/googlesecretmanagerprovider/provider.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ import (
1212
"strings"
1313

1414
secretmanager "cloud.google.com/go/secretmanager/apiv1"
15+
"cloud.google.com/go/secretmanager/apiv1/secretmanagerpb"
1516
gax "github.com/googleapis/gax-go/v2"
1617
"github.com/googleapis/gax-go/v2/apierror"
1718
"go.opentelemetry.io/collector/confmap"
18-
19-
"cloud.google.com/go/secretmanager/apiv1/secretmanagerpb"
2019
)
2120

2221
type secretsManagerClient interface {

confmap/provider/googlesecretmanagerprovider/provider_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package googlesecretmanagerprovider
55

66
import (
77
"context"
8-
"errors"
98
"fmt"
109
"testing"
1110

@@ -22,7 +21,7 @@ type mockSecretsManagerClient struct {
2221
clientClosed bool
2322
}
2423

25-
func (m *mockSecretsManagerClient) AccessSecretVersion(ctx context.Context, req *secretmanagerpb.AccessSecretVersionRequest, opts ...gax.CallOption) (*secretmanagerpb.AccessSecretVersionResponse, error) {
24+
func (m *mockSecretsManagerClient) AccessSecretVersion(_ context.Context, req *secretmanagerpb.AccessSecretVersionRequest, opts ...gax.CallOption) (*secretmanagerpb.AccessSecretVersionResponse, error) {
2625
secretString, ok := m.validSecrets[req.Name]
2726
if !ok {
2827
return nil, fmt.Errorf("secrets entry does not exist, error code: %v", codes.NotFound)
@@ -100,7 +99,7 @@ func TestProvider_Retrieve_Failure(t *testing.T) {
10099
}
101100
_, err := testProvider.Retrieve(context.Background(), tc.uri, nil)
102101
require.Error(t, err)
103-
require.True(t, errors.Is(err, tc.wantError))
102+
require.ErrorIs(t, err, tc.wantError)
104103
})
105104
}
106105
}
@@ -117,6 +116,7 @@ func TestShutdown(t *testing.T) {
117116
client: secretManager,
118117
}
119118
require.False(t, secretManager.clientClosed)
120-
testProvider.Shutdown(context.Background())
119+
err := testProvider.Shutdown(context.Background())
120+
require.Nil(t, err)
121121
require.True(t, secretManager.clientClosed)
122122
}

0 commit comments

Comments
 (0)