Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/pkg/clientpool/stats_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package clientpool
import (
"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
v1 "code.cloudfoundry.org/loggregator-agent-release/src/pkg/plumbing"
"golang.org/x/net/context"
"context"

"google.golang.org/grpc/stats"
)
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/clientpool/v1/mocks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"

"code.cloudfoundry.org/loggregator-agent-release/src/pkg/plumbing"
"golang.org/x/net/context"
"context"
"google.golang.org/grpc/metadata"
)

Expand Down
2 changes: 1 addition & 1 deletion src/pkg/clientpool/v2/sender_fetcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
metricsHelpers "code.cloudfoundry.org/go-metric-registry/testhelpers"
v2 "code.cloudfoundry.org/loggregator-agent-release/src/pkg/clientpool/v2"
"golang.org/x/net/context"
"context"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

Expand Down
2 changes: 1 addition & 1 deletion src/pkg/egress/diode_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package egress
import (
"io"

"golang.org/x/net/context"
"context"

gendiodes "code.cloudfoundry.org/go-diodes"
"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/egress/diode_writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync/atomic"
"time"

"golang.org/x/net/context"
"context"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
3 changes: 2 additions & 1 deletion src/pkg/egress/syslog/https_batch_retryer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import (
"sync"
"time"

"context"

"code.cloudfoundry.org/loggregator-agent-release/src/pkg/egress/syslog"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"golang.org/x/net/context"
)

var _ = Describe("Retryer", func() {
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/egress/syslog/retry_writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
v2 "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
"code.cloudfoundry.org/loggregator-agent-release/src/pkg/egress"
"code.cloudfoundry.org/loggregator-agent-release/src/pkg/egress/syslog"
"golang.org/x/net/context"
"context"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/egress/syslog/syslog_connector.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

"golang.org/x/net/context"
"context"

metrics "code.cloudfoundry.org/go-metric-registry"

Expand Down
17 changes: 12 additions & 5 deletions src/pkg/egress/syslog/syslog_connector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ package syslog_test
import (
"errors"
"fmt"
"io"
"sync/atomic"
"time"

"golang.org/x/net/context"
"context"

"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
metricsHelpers "code.cloudfoundry.org/go-metric-registry/testhelpers"
Expand All @@ -21,18 +20,23 @@ import (
var _ = Describe("SyslogConnector", func() {
var (
ctx context.Context
cancel context.CancelFunc
spyWaitGroup *SpyWaitGroup
writerFactory *stubWriterFactory
sm *metricsHelpers.SpyMetricsRegistry
)

BeforeEach(func() {
sm = metricsHelpers.NewMetricsRegistry()
ctx, _ = context.WithCancel(context.Background())
ctx, cancel = context.WithCancel(context.Background())
spyWaitGroup = &SpyWaitGroup{}
writerFactory = &stubWriterFactory{}
})

AfterEach(func() {
cancel()
})

It("connects to the passed syslog protocol", func() {
writerFactory.writer = &SleepWriterCloser{metric: func(uint64) {}}
connector := syslog.NewSyslogConnector(
Expand Down Expand Up @@ -283,8 +287,7 @@ func (f *stubWriterFactory) NewWriter(

type SleepWriterCloser struct {
duration time.Duration
io.Closer
metric func(uint64)
metric func(uint64)
}

func (c *SleepWriterCloser) Write(*loggregator_v2.Envelope) error {
Expand All @@ -293,6 +296,10 @@ func (c *SleepWriterCloser) Write(*loggregator_v2.Envelope) error {
return nil
}

func (c *SleepWriterCloser) Close() error {
return nil
}

type SpyWaitGroup struct {
addInput int64
doneCalled int64
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/ingress/v2/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
metrics "code.cloudfoundry.org/go-metric-registry"

"code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2"
"golang.org/x/net/context"
"context"
)

type DataSetter interface {
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/plumbing/tls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var _ = Describe("TLS", func() {
"doppler",
)
Expect(err).ToNot(HaveOccurred())
Expect(creds.Info().ServerName).To(Equal("doppler"))
Expect(creds).ToNot(BeNil())
})

It("returns an error with invalid certs", func() {
Expand Down
Loading