Skip to content

Update deps #4276

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

Merged
istio-testing merged 5 commits into from
Dec 14, 2022
Merged

Update deps #4276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f5e9d8
Update deps
jacob-delgado Dec 10, 2022
5032e2f
Update dep
jacob-delgado Dec 14, 2022
9f63deb
Update imports
jacob-delgado Dec 14, 2022
3b9de71
Update deps
jacob-delgado Dec 14, 2022
66883b9
go conventions
jacob-delgado Dec 14, 2022
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
31 changes: 17 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,30 @@ module istio.io/proxy
go 1.19

require (
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4
Copy link
Copy Markdown
Contributor Author

@jacob-delgado jacob-delgado Dec 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go get said to use github.com/cncf/xds/go instead

cloud.google.com/go/logging v1.6.1
cloud.google.com/go/monitoring v1.9.0
cloud.google.com/go/trace v1.4.0
github.com/cncf/xds/go v0.0.0-20221128185840-c261a164b73d
github.com/d4l3k/messagediff v1.2.2-0.20180726183240-b9e99b2f9263
github.com/envoyproxy/go-control-plane v0.10.3
github.com/envoyproxy/go-control-plane v0.10.3-0.20221213161420-c99aac2a2f43
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.7
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.9.1
google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7
google.golang.org/grpc v1.45.0
google.golang.org/protobuf v1.28.0
github.com/google/go-cmp v0.5.9
github.com/prometheus/client_model v0.3.0
github.com/prometheus/common v0.38.0
google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37
google.golang.org/grpc v1.51.0
google.golang.org/protobuf v1.28.1
gopkg.in/yaml.v2 v2.4.0
sigs.k8s.io/yaml v1.3.0
)

require (
cloud.google.com/go/longrunning v0.3.0 // indirect
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc // indirect
github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/stretchr/testify v1.8.1 // indirect
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
golang.org/x/text v0.4.0 // indirect
)
102 changes: 40 additions & 62 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/envoye2e/driver/envoy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"strings"
"time"

_ "github.com/cncf/udpa/go/udpa/type/v1" // Preload proto definitions
bootstrap_v3 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3"
_ "github.com/cncf/xds/go/udpa/type/v1" // Preload proto definitions
bootstrapv3 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3"
core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3" // Preload proto definitions
_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/http_inspector/v3"
Expand Down Expand Up @@ -174,7 +174,7 @@ func (e *Envoy) Cleanup() {
}

func getAdminPortAndNode(bootstrap string) (port uint32, node string, err error) {
pb := &bootstrap_v3.Bootstrap{}
pb := &bootstrapv3.Bootstrap{}
if err = ReadYAML(bootstrap, pb); err != nil {
return
}
Expand Down
2 changes: 1 addition & 1 deletion test/envoye2e/driver/extensionserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/envoyproxy/go-control-plane/pkg/cache/v3"
"github.com/envoyproxy/go-control-plane/pkg/server/v3"
"google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
"google.golang.org/grpc/status"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions test/envoye2e/driver/xds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"log"
"net"

cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
listenerv3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
tls "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
extensionservice "github.com/envoyproxy/go-control-plane/envoy/service/extension/v3"
Expand Down Expand Up @@ -109,7 +109,7 @@ func (u *Update) Run(p *Params) error {

clusters := make([]types.Resource, 0, len(u.Clusters))
for _, cluster := range u.Clusters {
out := &cluster_v3.Cluster{}
out := &clusterv3.Cluster{}
if err := p.FillYAML(cluster, out); err != nil {
return err
}
Expand All @@ -118,7 +118,7 @@ func (u *Update) Run(p *Params) error {

listeners := make([]types.Resource, 0, len(u.Listeners))
for _, listener := range u.Listeners {
out := &listener_v3.Listener{}
out := &listenerv3.Listener{}
if err := p.FillYAML(listener, out); err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion test/envoye2e/inventory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package envoye2e

import (
env "istio.io/proxy/test/envoye2e/env"
"istio.io/proxy/test/envoye2e/env"
)

var ProxyE2ETests *env.TestInventory
Expand Down
52 changes: 26 additions & 26 deletions test/envoye2e/stackdriver_plugin/fake_stackdriver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ import (
"sync"
"time"

jsonpb "github.com/golang/protobuf/jsonpb"
empty "github.com/golang/protobuf/ptypes/empty"
"cloud.google.com/go/logging/apiv2/loggingpb"
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
cloudtracev1 "cloud.google.com/go/trace/apiv1/tracepb"
cloudtracev2 "cloud.google.com/go/trace/apiv2/tracepb"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/genproto/googleapis/api/metric"
"google.golang.org/genproto/googleapis/api/monitoredres"
cloudtracev1 "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
cloudtracev2 "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
logging "google.golang.org/genproto/googleapis/logging/v2"
monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/metadata"
Expand All @@ -43,23 +43,23 @@ import (
"istio.io/proxy/test/envoye2e/driver"
)

// MetricServer is a fake stackdriver server which implements all of monitoring v3 service method.
// MetricServer is a fake stackdriver server which implements all monitoring v3 service methods.
type MetricServer struct {
delay time.Duration
listTSResp monitoringpb.ListTimeSeriesResponse
RcvMetricReq chan *monitoringpb.CreateTimeSeriesRequest
mux sync.Mutex
}

// LoggingServer is a fake stackdriver server which implements all of logging v2 service method.
// LoggingServer is a fake stackdriver server which implements all logging v2 service methods.
type LoggingServer struct {
delay time.Duration
listLogEntryResp logging.ListLogEntriesResponse
RcvLoggingReq chan *logging.WriteLogEntriesRequest
listLogEntryResp loggingpb.ListLogEntriesResponse
RcvLoggingReq chan *loggingpb.WriteLogEntriesRequest
mux sync.Mutex
}

// TracesServer is a fake stackdriver server which implements all of cloudtrace v1 service method.
// TracesServer is a fake stackdriver server which implements all cloudtrace v1 service methods.
type TracesServer struct {
delay time.Duration
listTracesResp cloudtracev1.ListTracesResponse
Expand Down Expand Up @@ -133,18 +133,18 @@ func (s *MetricServer) CreateServiceTimeSeries(ctx context.Context, request *mon
}

// DeleteLog implements DeleteLog method.
func (s *LoggingServer) DeleteLog(context.Context, *logging.DeleteLogRequest) (*empty.Empty, error) {
func (s *LoggingServer) DeleteLog(context.Context, *loggingpb.DeleteLogRequest) (*empty.Empty, error) {
return &empty.Empty{}, nil
}

// WriteLogEntries implements WriteLogEntries method.
func (s *LoggingServer) WriteLogEntries(ctx context.Context, req *logging.WriteLogEntriesRequest) (*logging.WriteLogEntriesResponse, error) {
func (s *LoggingServer) WriteLogEntries(ctx context.Context, req *loggingpb.WriteLogEntriesRequest) (*loggingpb.WriteLogEntriesResponse, error) {
log.Printf("receive WriteLogEntriesRequest %v", req.String())
s.mux.Lock()
defer s.mux.Unlock()
for _, entry := range req.Entries {
// Add the general labels to every log entry in list logentries response.
tmpEntry := proto.Clone(entry).(*logging.LogEntry)
tmpEntry := proto.Clone(entry).(*loggingpb.LogEntry)
for k, v := range req.Labels {
tmpEntry.Labels[k] = v
}
Expand All @@ -154,30 +154,30 @@ func (s *LoggingServer) WriteLogEntries(ctx context.Context, req *logging.WriteL
}
s.RcvLoggingReq <- req
time.Sleep(s.delay)
return &logging.WriteLogEntriesResponse{}, nil
return &loggingpb.WriteLogEntriesResponse{}, nil
}

// ListLogEntries implements ListLogEntries method.
func (s *LoggingServer) ListLogEntries(context.Context, *logging.ListLogEntriesRequest) (*logging.ListLogEntriesResponse, error) {
func (s *LoggingServer) ListLogEntries(context.Context, *loggingpb.ListLogEntriesRequest) (*loggingpb.ListLogEntriesResponse, error) {
s.mux.Lock()
defer s.mux.Unlock()
return &s.listLogEntryResp, nil
}

// ListLogs implements ListLogs method.
func (s *LoggingServer) ListLogs(context.Context, *logging.ListLogsRequest) (*logging.ListLogsResponse, error) {
return &logging.ListLogsResponse{}, nil
func (s *LoggingServer) ListLogs(context.Context, *loggingpb.ListLogsRequest) (*loggingpb.ListLogsResponse, error) {
return &loggingpb.ListLogsResponse{}, nil
}

// ListMonitoredResourceDescriptors immplements ListMonitoredResourceDescriptors method.
func (s *LoggingServer) ListMonitoredResourceDescriptors(
context.Context, *logging.ListMonitoredResourceDescriptorsRequest) (
*logging.ListMonitoredResourceDescriptorsResponse, error,
context.Context, *loggingpb.ListMonitoredResourceDescriptorsRequest) (
*loggingpb.ListMonitoredResourceDescriptorsResponse, error,
) {
return &logging.ListMonitoredResourceDescriptorsResponse{}, nil
return &loggingpb.ListMonitoredResourceDescriptorsResponse{}, nil
}

func (s *LoggingServer) TailLogEntries(server logging.LoggingServiceV2_TailLogEntriesServer) error {
func (s *LoggingServer) TailLogEntries(server loggingpb.LoggingServiceV2_TailLogEntriesServer) error {
panic("TailLogEntries: implement me")
}

Expand Down Expand Up @@ -391,15 +391,15 @@ func NewFakeStackdriver(port uint16, delay time.Duration,
}
fsdls := &LoggingServer{
delay: delay,
RcvLoggingReq: make(chan *logging.WriteLogEntriesRequest, 2),
RcvLoggingReq: make(chan *loggingpb.WriteLogEntriesRequest, 2),
}
traceSvc := &TracesServer{
delay: delay,
RcvTracesReq: make(chan *cloudtracev2.BatchWriteSpansRequest, 2),
traceMap: make(map[string]*cloudtracev1.Trace),
}
monitoringpb.RegisterMetricServiceServer(grpcServer, fsdms)
logging.RegisterLoggingServiceV2Server(grpcServer, fsdls)
loggingpb.RegisterLoggingServiceV2Server(grpcServer, fsdls)
cloudtracev1.RegisterTraceServiceServer(grpcServer, traceSvc)
cloudtracev2.RegisterTraceServiceServer(grpcServer, traceSvc)

Expand All @@ -422,7 +422,7 @@ func RunFakeStackdriver(port uint16) error {
RcvMetricReq: make(chan *monitoringpb.CreateTimeSeriesRequest, 100),
}
fsdls := &LoggingServer{
RcvLoggingReq: make(chan *logging.WriteLogEntriesRequest, 100),
RcvLoggingReq: make(chan *loggingpb.WriteLogEntriesRequest, 100),
}
traceSvc := &TracesServer{
RcvTracesReq: make(chan *cloudtracev2.BatchWriteSpansRequest, 100),
Expand All @@ -445,7 +445,7 @@ func RunFakeStackdriver(port uint16) error {
}()

monitoringpb.RegisterMetricServiceServer(grpcServer, fsdms)
logging.RegisterLoggingServiceV2Server(grpcServer, fsdls)
loggingpb.RegisterLoggingServiceV2Server(grpcServer, fsdls)
cloudtracev1.RegisterTraceServiceServer(grpcServer, traceSvc)
cloudtracev2.RegisterTraceServiceServer(grpcServer, traceSvc)

Expand Down
20 changes: 10 additions & 10 deletions test/envoye2e/stackdriver_plugin/stackdriver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"sync"
"time"

"cloud.google.com/go/logging/apiv2/loggingpb"
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
"github.com/google/go-cmp/cmp"
logging "google.golang.org/genproto/googleapis/logging/v2"
monitoring "google.golang.org/genproto/googleapis/monitoring/v3"
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/testing/protocmp"

Expand All @@ -41,7 +41,7 @@ type Stackdriver struct {
Delay time.Duration

done chan error
tsReq []*monitoring.CreateTimeSeriesRequest
tsReq []*monitoringpb.CreateTimeSeriesRequest
ts map[string]int64
ls map[string]struct{}
}
Expand All @@ -58,7 +58,7 @@ func (sd *Stackdriver) Run(p *driver.Params) error {
sd.done = make(chan error, 1)
sd.ls = make(map[string]struct{})
sd.ts = make(map[string]int64)
sd.tsReq = make([]*monitoring.CreateTimeSeriesRequest, 0, 20)
sd.tsReq = make([]*monitoringpb.CreateTimeSeriesRequest, 0, 20)
metrics, logging, _, _ := NewFakeStackdriver(sd.Port, sd.Delay, true, ExpectedBearer)

go func() {
Expand All @@ -74,7 +74,7 @@ func (sd *Stackdriver) Run(p *driver.Params) error {
strings.HasSuffix(ts.Metric.Type, "request_bytes") ||
strings.HasSuffix(ts.Metric.Type, "received_bytes_count") {
// clear the timestamps for comparison
var key = prototext.Format(&monitoring.TimeSeries{
var key = prototext.Format(&monitoringpb.TimeSeries{
Metric: ts.Metric,
Resource: ts.Resource,
Metadata: ts.Metadata,
Expand Down Expand Up @@ -130,7 +130,7 @@ func (sd *Stackdriver) Check(p *driver.Params, tsFiles []string, lsFiles []SDLog
// check as sets of strings by marshaling to proto
twant := make(map[string]int64)
for _, t := range tsFiles {
pb := &monitoring.TimeSeries{}
pb := &monitoringpb.TimeSeries{}
p.LoadTestProto(t, pb)
if len(pb.Points) != 1 || pb.Points[0].Value.GetInt64Value() == 0 {
log.Fatal("malformed metric golden")
Expand All @@ -141,11 +141,11 @@ func (sd *Stackdriver) Check(p *driver.Params, tsFiles []string, lsFiles []SDLog
}
lwant := make(map[string]struct{})
for _, l := range lsFiles {
pb := &logging.WriteLogEntriesRequest{}
pb := &loggingpb.WriteLogEntriesRequest{}
p.LoadTestProto(l.LogBaseFile, pb)
for i := 0; i < l.LogEntryCount; i++ {
for _, logEntryFile := range l.LogEntryFile {
e := &logging.LogEntry{}
e := &loggingpb.LogEntry{}
p.LoadTestProto(logEntryFile, e)
pb.Entries = append(pb.Entries, e)
}
Expand Down Expand Up @@ -173,7 +173,7 @@ func (r *resetStackdriver) Run(p *driver.Params) error {
defer r.sd.Unlock()
r.sd.ls = make(map[string]struct{})
r.sd.ts = make(map[string]int64)
r.sd.tsReq = make([]*monitoring.CreateTimeSeriesRequest, 0, 20)
r.sd.tsReq = make([]*monitoringpb.CreateTimeSeriesRequest, 0, 20)
return nil
}

Expand Down Expand Up @@ -258,7 +258,7 @@ func (s *checkStackdriver) Run(p *driver.Params) error {
func (s *checkStackdriver) Cleanup() {}

// Check that response latency is within a reasonable range (less than 256 milliseconds).
func verifyResponseLatency(got *monitoring.CreateTimeSeriesRequest) (bool, error) {
func verifyResponseLatency(got *monitoringpb.CreateTimeSeriesRequest) (bool, error) {
for _, t := range got.TimeSeries {
if t.Metric.Type != ResponseLatencyMetricName {
continue
Expand Down