Skip to content

Commit

Permalink
deps: upgrade go and npm deps
Browse files Browse the repository at this point in the history 
Signed-off-by: Dmitry Kharitonov <[email protected]>
  • Loading branch information
@geakstr
geakstr committed Apr 26, 2022
1 parent c4dbea6 commit bfefef2
Show file tree
Hide file tree
Showing 122 changed files with 3,819 additions and 4,261 deletions.
26 changes: 15 additions & 11 deletions backend/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ module github.com/cilium/hubble-ui/backend
go 1.18

require (
github.com/cilium/cilium v1.11.3
github.com/cilium/cilium v1.11.4
github.com/cilium/hubble v0.9.0
github.com/golang/protobuf v1.5.2
github.com/google/gops v0.3.22
github.com/improbable-eng/grpc-web v0.15.0
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
google.golang.org/grpc v1.45.0
google.golang.org/grpc v1.46.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
google.golang.org/protobuf v1.28.0
k8s.io/api v0.23.5
Expand All @@ -23,7 +23,8 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-logr/logr v1.2.1 // indirect
github.com/gin-gonic/gin v1.7.7 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand All @@ -32,9 +33,9 @@ require (
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/klauspost/compress v1.11.7 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/mapstructure v1.4.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
Expand All @@ -48,27 +49,30 @@ require (
github.com/spf13/viper v1.9.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
golang.org/x/sys v0.0.0-20211103184734-ae416a5f93c7 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/ini.v1 v1.64.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20211203121628-587287796c64 // indirect
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
nhooyr.io/websocket v1.8.6 // indirect
sigs.k8s.io/json v0.0.0-20211122195132-35920ff0ca7e // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

// Fix for https://github.com/advisories/GHSA-h395-qcrw-5vmq
replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.7

// Replace directives from github.com/cilium/cilium. Keep in sync when updating Cilium!
replace (
github.com/miekg/dns => github.com/cilium/dns v1.1.4-0.20190417235132-8e25ec9a0ff3
Expand Down
51 changes: 23 additions & 28 deletions backend/go.sum
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions backend/proto/observer/observer_grpc_web_pb.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ export class ObserverClient {
getNodes(
request: observer_observer_pb.GetNodesRequest,
metadata: grpcWeb.Metadata | undefined,
callback: (err: grpcWeb.Error,
callback: (err: grpcWeb.RpcError,
response: observer_observer_pb.GetNodesResponse) => void
): grpcWeb.ClientReadableStream<observer_observer_pb.GetNodesResponse>;

serverStatus(
request: observer_observer_pb.ServerStatusRequest,
metadata: grpcWeb.Metadata | undefined,
callback: (err: grpcWeb.Error,
callback: (err: grpcWeb.RpcError,
response: observer_observer_pb.ServerStatusResponse) => void
): grpcWeb.ClientReadableStream<observer_observer_pb.ServerStatusResponse>;

Expand Down
123 changes: 14 additions & 109 deletions backend/proto/observer/observer_grpc_web_pb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ proto.observer = require('./observer_pb.js');
/**
* @param {string} hostname
* @param {?Object} credentials
* @param {?Object} options
* @param {?grpc.web.ClientOptions} options
* @constructor
* @struct
* @final
*/
proto.observer.ObserverClient =
function(hostname, credentials, options) {
if (!options) options = {};
options['format'] = 'text';
options.format = 'text';

/**
* @private @const {!grpc.web.GrpcWebClientBase} The client
Expand All @@ -55,15 +55,15 @@ proto.observer.ObserverClient =
/**
* @param {string} hostname
* @param {?Object} credentials
* @param {?Object} options
* @param {?grpc.web.ClientOptions} options
* @constructor
* @struct
* @final
*/
proto.observer.ObserverPromiseClient =
function(hostname, credentials, options) {
if (!options) options = {};
options['format'] = 'text';
options.format = 'text';

/**
* @private @const {!grpc.web.GrpcWebClientBase} The client
Expand Down Expand Up @@ -100,28 +100,9 @@ const methodDescriptor_Observer_GetFlows = new grpc.web.MethodDescriptor(
);


/**
* @const
* @type {!grpc.web.AbstractClientBase.MethodInfo<
* !proto.observer.GetFlowsRequest,
* !proto.observer.GetFlowsResponse>}
*/
const methodInfo_Observer_GetFlows = new grpc.web.AbstractClientBase.MethodInfo(
proto.observer.GetFlowsResponse,
/**
* @param {!proto.observer.GetFlowsRequest} request
* @return {!Uint8Array}
*/
function(request) {
return request.serializeBinary();
},
proto.observer.GetFlowsResponse.deserializeBinary
);


/**
* @param {!proto.observer.GetFlowsRequest} request The request proto
* @param {?Object<string, string>} metadata User defined
* @param {?Object<string, string>=} metadata User defined
* call metadata
* @return {!grpc.web.ClientReadableStream<!proto.observer.GetFlowsResponse>}
* The XHR Node Readable Stream
Expand All @@ -138,7 +119,7 @@ proto.observer.ObserverClient.prototype.getFlows =

/**
* @param {!proto.observer.GetFlowsRequest} request The request proto
* @param {?Object<string, string>} metadata User defined
* @param {?Object<string, string>=} metadata User defined
* call metadata
* @return {!grpc.web.ClientReadableStream<!proto.observer.GetFlowsResponse>}
* The XHR Node Readable Stream
Expand Down Expand Up @@ -175,28 +156,9 @@ const methodDescriptor_Observer_GetAgentEvents = new grpc.web.MethodDescriptor(
);


/**
* @const
* @type {!grpc.web.AbstractClientBase.MethodInfo<
* !proto.observer.GetAgentEventsRequest,
* !proto.observer.GetAgentEventsResponse>}
*/
const methodInfo_Observer_GetAgentEvents = new grpc.web.AbstractClientBase.MethodInfo(
proto.observer.GetAgentEventsResponse,
/**
* @param {!proto.observer.GetAgentEventsRequest} request
* @return {!Uint8Array}
*/
function(request) {
return request.serializeBinary();
},
proto.observer.GetAgentEventsResponse.deserializeBinary
);


/**
* @param {!proto.observer.GetAgentEventsRequest} request The request proto
* @param {?Object<string, string>} metadata User defined
* @param {?Object<string, string>=} metadata User defined
* call metadata
* @return {!grpc.web.ClientReadableStream<!proto.observer.GetAgentEventsResponse>}
* The XHR Node Readable Stream
Expand All @@ -213,7 +175,7 @@ proto.observer.ObserverClient.prototype.getAgentEvents =

/**
* @param {!proto.observer.GetAgentEventsRequest} request The request proto
* @param {?Object<string, string>} metadata User defined
* @param {?Object<string, string>=} metadata User defined
* call metadata
* @return {!grpc.web.ClientReadableStream<!proto.observer.GetAgentEventsResponse>}
* The XHR Node Readable Stream
Expand Down Expand Up @@ -250,28 +212,9 @@ const methodDescriptor_Observer_GetDebugEvents = new grpc.web.MethodDescriptor(
);


/**
* @const
* @type {!grpc.web.AbstractClientBase.MethodInfo<
* !proto.observer.GetDebugEventsRequest,
* !proto.observer.GetDebugEventsResponse>}
*/
const methodInfo_Observer_GetDebugEvents = new grpc.web.AbstractClientBase.MethodInfo(
proto.observer.GetDebugEventsResponse,
/**
* @param {!proto.observer.GetDebugEventsRequest} request
* @return {!Uint8Array}
*/
function(request) {
return request.serializeBinary();
},
proto.observer.GetDebugEventsResponse.deserializeBinary
);


/**
* @param {!proto.observer.GetDebugEventsRequest} request The request proto
* @param {?Object<string, string>} metadata User defined
* @param {?Object<string, string>=} metadata User defined
* call metadata
* @return {!grpc.web.ClientReadableStream<!proto.observer.GetDebugEventsResponse>}
* The XHR Node Readable Stream
Expand All @@ -288,7 +231,7 @@ proto.observer.ObserverClient.prototype.getDebugEvents =

/**
* @param {!proto.observer.GetDebugEventsRequest} request The request proto
* @param {?Object<string, string>} metadata User defined
* @param {?Object<string, string>=} metadata User defined
* call metadata
* @return {!grpc.web.ClientReadableStream<!proto.observer.GetDebugEventsResponse>}
* The XHR Node Readable Stream
Expand Down Expand Up @@ -325,31 +268,12 @@ const methodDescriptor_Observer_GetNodes = new grpc.web.MethodDescriptor(
);


/**
* @const
* @type {!grpc.web.AbstractClientBase.MethodInfo<
* !proto.observer.GetNodesRequest,
* !proto.observer.GetNodesResponse>}
*/
const methodInfo_Observer_GetNodes = new grpc.web.AbstractClientBase.MethodInfo(
proto.observer.GetNodesResponse,
/**
* @param {!proto.observer.GetNodesRequest} request
* @return {!Uint8Array}
*/
function(request) {
return request.serializeBinary();
},
proto.observer.GetNodesResponse.deserializeBinary
);


/**
* @param {!proto.observer.GetNodesRequest} request The
* request proto
* @param {?Object<string, string>} metadata User defined
* call metadata
* @param {function(?grpc.web.Error, ?proto.observer.GetNodesResponse)}
* @param {function(?grpc.web.RpcError, ?proto.observer.GetNodesResponse)}
* callback The callback function(error, response)
* @return {!grpc.web.ClientReadableStream<!proto.observer.GetNodesResponse>|undefined}
* The XHR Node Readable Stream
Expand All @@ -368,7 +292,7 @@ proto.observer.ObserverClient.prototype.getNodes =
/**
* @param {!proto.observer.GetNodesRequest} request The
* request proto
* @param {?Object<string, string>} metadata User defined
* @param {?Object<string, string>=} metadata User defined
* call metadata
* @return {!Promise<!proto.observer.GetNodesResponse>}
* Promise that resolves to the response
Expand Down Expand Up @@ -405,31 +329,12 @@ const methodDescriptor_Observer_ServerStatus = new grpc.web.MethodDescriptor(
);


/**
* @const
* @type {!grpc.web.AbstractClientBase.MethodInfo<
* !proto.observer.ServerStatusRequest,
* !proto.observer.ServerStatusResponse>}
*/
const methodInfo_Observer_ServerStatus = new grpc.web.AbstractClientBase.MethodInfo(
proto.observer.ServerStatusResponse,
/**
* @param {!proto.observer.ServerStatusRequest} request
* @return {!Uint8Array}
*/
function(request) {
return request.serializeBinary();
},
proto.observer.ServerStatusResponse.deserializeBinary
);


/**
* @param {!proto.observer.ServerStatusRequest} request The
* request proto
* @param {?Object<string, string>} metadata User defined
* call metadata
* @param {function(?grpc.web.Error, ?proto.observer.ServerStatusResponse)}
* @param {function(?grpc.web.RpcError, ?proto.observer.ServerStatusResponse)}
* callback The callback function(error, response)
* @return {!grpc.web.ClientReadableStream<!proto.observer.ServerStatusResponse>|undefined}
* The XHR Node Readable Stream
Expand All @@ -448,7 +353,7 @@ proto.observer.ObserverClient.prototype.serverStatus =
/**
* @param {!proto.observer.ServerStatusRequest} request The
* request proto
* @param {?Object<string, string>} metadata User defined
* @param {?Object<string, string>=} metadata User defined
* call metadata
* @return {!Promise<!proto.observer.ServerStatusResponse>}
* Promise that resolves to the response
Expand Down
4 changes: 2 additions & 2 deletions backend/proto/ui/ui_grpc_web_pb.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as grpcWeb from 'grpc-web';

import * as ui_status_pb from '../ui/status_pb';
import * as ui_ui_pb from '../ui/ui_pb';
import * as ui_status_pb from '../ui/status_pb';


export class UIClient {
Expand All @@ -17,7 +17,7 @@ export class UIClient {
getStatus(
request: ui_status_pb.GetStatusRequest,
metadata: grpcWeb.Metadata | undefined,
callback: (err: grpcWeb.Error,
callback: (err: grpcWeb.RpcError,
response: ui_status_pb.GetStatusResponse) => void
): grpcWeb.ClientReadableStream<ui_status_pb.GetStatusResponse>;

Expand Down
Loading

0 comments on commit bfefef2

Please sign in to comment.