From cfe07b10ec893d7e4685eccc278afaa31b2f14ef Mon Sep 17 00:00:00 2001 From: Nan Zhong Date: Mon, 15 May 2023 15:13:25 -0400 Subject: [PATCH 1/2] Update dev dependencies --- flake.lock | 32 ++++++++++++++++---------------- flake.nix | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index f2ae8c6a..d2349821 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "dbmate": { "flake": false, "locked": { - "lastModified": 1666482592, - "narHash": "sha256-6M7ruiBjvXO6LTdZNuGwUIVwa3QzdBQo0Y34UslCGAE=", + "lastModified": 1683876671, + "narHash": "sha256-bWmRdrULXXVIaO5f3rntsVURnyojYFbhbZ43WvGzoZk=", "owner": "amacneil", "repo": "dbmate", - "rev": "649e03f59925de17177b3aa966418c60e2cf65bc", + "rev": "f4610da0b9bc55d0298ac3be0bbc41a4f988d4c8", "type": "github" }, "original": { "owner": "amacneil", - "ref": "v1.16.0", + "ref": "v2.3.0", "repo": "dbmate", "type": "github" } @@ -35,16 +35,16 @@ "grpc-gateway": { "flake": false, "locked": { - "lastModified": 1668551680, - "narHash": "sha256-lnNdsDCpeSHtl2lC1IhUw11t3cnGF+37qSM7HDvKLls=", + "lastModified": 1677265818, + "narHash": "sha256-0fpVSFo+o+M7vwwHIrYQZcAjdZjASdWz/cKXnPr6Je8=", "owner": "grpc-ecosystem", "repo": "grpc-gateway", - "rev": "fb3f4344d4f1d8c813694275c0448a0eacb125d6", + "rev": "0eb17c3d70415c44406b0f02265ceaad570d6fa3", "type": "github" }, "original": { "owner": "grpc-ecosystem", - "ref": "v2.14.0", + "ref": "v2.15.2", "repo": "grpc-gateway", "type": "github" } @@ -100,16 +100,16 @@ "overmind": { "flake": false, "locked": { - "lastModified": 1659100928, - "narHash": "sha256-vmmSsg0JneMseFCcx/no2x/Ghppmyiod8ZAIb4JWW9I=", + "lastModified": 1674829061, + "narHash": "sha256-cpsTytV1TbvdR7XUKkp4GPD1qyt1qnmY6qOsge01swE=", "owner": "DarthSim", "repo": "overmind", - "rev": "8a5f4e2270b66c37055a7968d9909b00af859494", + "rev": "401322180d78cc2cf077b90c92fec5e767b796fd", "type": "github" }, "original": { "owner": "DarthSim", - "ref": "v2.3.0", + "ref": "v2.4.0", "repo": "overmind", "type": "github" } @@ -146,16 +146,16 @@ "sqlc": { "flake": false, "locked": { - "lastModified": 1667968843, - "narHash": "sha256-YxGMfGhcPT3Pcyxu1hAkadkJnEBMX26fE/rGfGSTsyc=", + "lastModified": 1682617748, + "narHash": "sha256-5MC7D9+33x/l76j186FCnzo0Hnx0wY6BPdneW7E7MpE=", "owner": "kyleconroy", "repo": "sqlc", - "rev": "89922d459cc11e2051ef3c37979e6b2223565271", + "rev": "e4b1c1873690a5b1006436024f0e6c25166bed76", "type": "github" }, "original": { "owner": "kyleconroy", - "ref": "v1.16.0", + "ref": "v1.18.0", "repo": "sqlc", "type": "github" } diff --git a/flake.nix b/flake.nix index f194bdc0..c81509a2 100644 --- a/flake.nix +++ b/flake.nix @@ -5,19 +5,19 @@ flake-utils.url = "github:numtide/flake-utils"; nix-npm-buildpackage.url = "github:serokell/nix-npm-buildpackage"; sqlc = { - url = "github:kyleconroy/sqlc/v1.16.0"; + url = "github:kyleconroy/sqlc/v1.18.0"; flake = false; }; dbmate = { - url = "github:amacneil/dbmate/v1.16.0"; + url = "github:amacneil/dbmate/v2.3.0"; flake = false; }; overmind = { - url = "github:DarthSim/overmind/v2.3.0"; + url = "github:DarthSim/overmind/v2.4.0"; flake = false; }; grpc-gateway = { - url = "github:grpc-ecosystem/grpc-gateway/v2.14.0"; + url = "github:grpc-ecosystem/grpc-gateway/v2.15.2"; flake = false; }; protoc-gen-grpc-gateway-ts = { @@ -62,7 +62,7 @@ src = sqlc; subPackages = [ "cmd/sqlc" ]; doCheck = false; - vendorSha256 = "sha256-cMYTQ8rATCXOquSxc4iZ2MvxIaMO3RG8PZkpOwwntyc="; + vendorSha256 = "sha256-gDePB+IZSyVIILDAj+O0Q8hgL0N/0Mwp1Xsrlh3B914="; proxyVendor = true; buildInputs = [ pkgs.xxHash @@ -74,13 +74,13 @@ name = "dbmate"; src = dbmate; doCheck = false; - vendorSha256 = "sha256-DwQUrNBfKZaVIpqI8yI/C9CQF5Ok/sApOrsLeIxt3hM="; + vendorSha256 = "sha256-m1Nbu1bE04iOXnxW5kJfI9W95FU87eRKkOzg+YVvRsg="; }; overmind = pkgs.buildGoModule { name = "overmind"; src = overmind; doCheck = false; - vendorSha256 = "sha256-QIKyLknPvmt8yiUCSCIqha8h9ozDGeQnKSM9Vwus0uY="; + vendorSha256 = "sha256-ndgnFBGtVFc++h+EnA37aY9+zNsO5GDrTECA4TEWPN4=="; }; grpc-gateway = pkgs.buildGoModule { name = "grpc-gateway"; @@ -90,7 +90,7 @@ "protoc-gen-grpc-gateway" "protoc-gen-openapiv2" ]; - vendorSha256 = "sha256-dGdnDuRbwg8fU7uB5GaHEWa/zI3w06onqjturvooJQA="; + vendorSha256 = "sha256-WHwZ0EAJIz7mZr27x+Z7PKLLAiw1z2rQvvNynpMJQDw="; }; protoc-gen-grpc-gateway-ts = pkgs.buildGoModule { name = "protoc-gen-grpc-gateway-ts"; From 0a13ab504af5b674032eee17bcffb69ea14b6460 Mon Sep 17 00:00:00 2001 From: Nan Zhong Date: Mon, 15 May 2023 16:36:20 -0400 Subject: [PATCH 2/2] Regenerate code --- api/admin/v1/admin.swagger.json | 2 ++ api/common/v1/common.swagger.json | 1 + api/control/v1/control.swagger.json | 3 +++ api/data/v1/data.pb.gw.go | 2 +- api/data/v1/data.swagger.json | 11 +++++++++++ api/identity/v1/identity.pb.gw.go | 2 +- api/identity/v1/identity.swagger.json | 1 + api/runner/v1/runner.swagger.json | 2 ++ api/validate/validate.swagger.json | 1 + db/access_tokens.sql.go | 2 +- db/db.go | 2 +- db/models.go | 6 +++--- db/querier.go | 2 +- db/runners.sql.go | 2 +- db/runs.sql.go | 2 +- db/schema.sql | 2 +- db/tests.sql.go | 2 +- 17 files changed, 33 insertions(+), 12 deletions(-) diff --git a/api/admin/v1/admin.swagger.json b/api/admin/v1/admin.swagger.json index 40c06e41..b0b25217 100644 --- a/api/admin/v1/admin.swagger.json +++ b/api/admin/v1/admin.swagger.json @@ -50,6 +50,7 @@ "details": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/protobufAny" } } @@ -123,6 +124,7 @@ "accessTokens": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/v1AccessToken" }, "title": "required" diff --git a/api/common/v1/common.swagger.json b/api/common/v1/common.swagger.json index cc61ab0f..1d32805d 100644 --- a/api/common/v1/common.swagger.json +++ b/api/common/v1/common.swagger.json @@ -34,6 +34,7 @@ "details": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/protobufAny" } } diff --git a/api/control/v1/control.swagger.json b/api/control/v1/control.swagger.json index ad10ab82..2cd0dde6 100644 --- a/api/control/v1/control.swagger.json +++ b/api/control/v1/control.swagger.json @@ -126,6 +126,7 @@ "details": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/protobufAny" } } @@ -176,6 +177,7 @@ "logs": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/RunLog" } }, @@ -206,6 +208,7 @@ "runs": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/v1Run" }, "title": "required" diff --git a/api/data/v1/data.pb.gw.go b/api/data/v1/data.pb.gw.go index 7a23fdeb..4352f77f 100644 --- a/api/data/v1/data.pb.gw.go +++ b/api/data/v1/data.pb.gw.go @@ -518,7 +518,7 @@ func RegisterDataServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux // RegisterDataServiceHandlerFromEndpoint is same as RegisterDataServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterDataServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/api/data/v1/data.swagger.json b/api/data/v1/data.swagger.json index b7980808..8e92fc14 100644 --- a/api/data/v1/data.swagger.json +++ b/api/data/v1/data.swagger.json @@ -394,6 +394,7 @@ "resultCount": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/IntervalStatsResultBreakdown" } } @@ -471,12 +472,14 @@ "resultCount": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/IntervalStatsResultBreakdown" } }, "testCount": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/IntervalStatsTestBreakdown" } } @@ -542,6 +545,7 @@ "details": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/protobufAny" } } @@ -564,6 +568,7 @@ "runSummaries": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/v1RunSummary" } } @@ -578,6 +583,7 @@ "runSummaries": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/v1RunSummary" } } @@ -589,6 +595,7 @@ "runners": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/v1Runner" } } @@ -600,6 +607,7 @@ "runs": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/v1Run" } } @@ -611,6 +619,7 @@ "tests": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/v1Test" } } @@ -649,6 +658,7 @@ "logs": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/RunLog" } }, @@ -767,6 +777,7 @@ "intervalStats": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/SummarizeRunsResponseIntervalStats" } } diff --git a/api/identity/v1/identity.pb.gw.go b/api/identity/v1/identity.pb.gw.go index f9d93384..75bf28b4 100644 --- a/api/identity/v1/identity.pb.gw.go +++ b/api/identity/v1/identity.pb.gw.go @@ -86,7 +86,7 @@ func RegisterIdentityServiceHandlerServer(ctx context.Context, mux *runtime.Serv // RegisterIdentityServiceHandlerFromEndpoint is same as RegisterIdentityServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterIdentityServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/api/identity/v1/identity.swagger.json b/api/identity/v1/identity.swagger.json index b03ccd63..9531dd75 100644 --- a/api/identity/v1/identity.swagger.json +++ b/api/identity/v1/identity.swagger.json @@ -73,6 +73,7 @@ "details": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/protobufAny" } } diff --git a/api/runner/v1/runner.swagger.json b/api/runner/v1/runner.swagger.json index 33ba3a2c..8a0db0c2 100644 --- a/api/runner/v1/runner.swagger.json +++ b/api/runner/v1/runner.swagger.json @@ -104,6 +104,7 @@ "details": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/protobufAny" } } @@ -160,6 +161,7 @@ "logs": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/RunLog" } }, diff --git a/api/validate/validate.swagger.json b/api/validate/validate.swagger.json index a9530c5b..44c55943 100644 --- a/api/validate/validate.swagger.json +++ b/api/validate/validate.swagger.json @@ -34,6 +34,7 @@ "details": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/protobufAny" } } diff --git a/db/access_tokens.sql.go b/db/access_tokens.sql.go index 5228636d..af35662a 100644 --- a/db/access_tokens.sql.go +++ b/db/access_tokens.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.18.0 // source: access_tokens.sql package db diff --git a/db/db.go b/db/db.go index 4c43a75d..72752f7e 100644 --- a/db/db.go +++ b/db/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.18.0 package db diff --git a/db/models.go b/db/models.go index 62924a56..bce996d9 100644 --- a/db/models.go +++ b/db/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.18.0 package db @@ -54,7 +54,7 @@ func (ns NullAccessTokenScope) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.AccessTokenScope, nil + return string(ns.AccessTokenScope), nil } type RunResult string @@ -98,7 +98,7 @@ func (ns NullRunResult) Value() (driver.Value, error) { if !ns.Valid { return nil, nil } - return ns.RunResult, nil + return string(ns.RunResult), nil } type AccessToken struct { diff --git a/db/querier.go b/db/querier.go index f5fd4a32..d96903f0 100644 --- a/db/querier.go +++ b/db/querier.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.18.0 package db diff --git a/db/runners.sql.go b/db/runners.sql.go index 4cfb63e3..29da44fe 100644 --- a/db/runners.sql.go +++ b/db/runners.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.18.0 // source: runners.sql package db diff --git a/db/runs.sql.go b/db/runs.sql.go index 07f543fa..c6828769 100644 --- a/db/runs.sql.go +++ b/db/runs.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.18.0 // source: runs.sql package db diff --git a/db/schema.sql b/db/schema.sql index 317a5d27..63daa6f5 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -107,7 +107,7 @@ CREATE TABLE public.runs ( -- CREATE TABLE public.schema_migrations ( - version character varying(255) NOT NULL + version character varying(128) NOT NULL ); diff --git a/db/tests.sql.go b/db/tests.sql.go index 3e370b03..618964bc 100644 --- a/db/tests.sql.go +++ b/db/tests.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.18.0 // source: tests.sql package db