Skip to content

Commit

Permalink
Upgrade insta dependency
Browse files Browse the repository at this point in the history
Update insta, and updates a failing test due to breaking serialization
change. Issue for the serialization change: mitsuhiko/insta#290
  • Loading branch information
psFried committed Sep 25, 2022
1 parent 2aea116 commit 1e40a58
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 95 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ zstd = "0.11.2"
# Used exclusively as dev-dependencies
assert_cmd = "2.0"
# TODO: upgrade insta. Version 1.15 seems to contain a breaking change to the serialization of RawValue, so holding off until I can confirm that's all it is.
insta = { version = "1.14.0", features = ["redactions"]}
insta = { version = "1.20", features = ["redactions", "json", "yaml"]}
criterion = "0.3"
glob = "0.3"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ expression: resolved
[
{
"catalog_name": "aliceCo/First/Thing",
"draft_spec": 2,
"draft_spec": {
"$serde_json::private::RawValue": "2"
},
"draft_spec_id": "1100000000000000",
"draft_type": "Collection",
"expect_pub_id": null,
"last_build_id": "bbbbbbbbbbbbbbbb",
"last_pub_id": "bbbbbbbbbbbbbbbb",
"live_spec": 1,
"live_spec": {
"$serde_json::private::RawValue": "1"
},
"live_spec_id": "<redacted>",
"live_type": "Collection",
"spec_capabilities": [
Expand Down Expand Up @@ -41,7 +45,9 @@ expression: resolved
"expect_pub_id": null,
"last_build_id": "bbbbbbbbbbbbbbbb",
"last_pub_id": "bbbbbbbbbbbbbbbb",
"live_spec": 1,
"live_spec": {
"$serde_json::private::RawValue": "1"
},
"live_spec_id": "<redacted>",
"live_type": "Collection",
"spec_capabilities": [
Expand All @@ -65,13 +71,17 @@ expression: resolved
},
{
"catalog_name": "aliceCo/Test/Fixture",
"draft_spec": 2,
"draft_spec": {
"$serde_json::private::RawValue": "2"
},
"draft_spec_id": "5500000000000000",
"draft_type": "Test",
"expect_pub_id": null,
"last_build_id": "bbbbbbbbbbbbbbbb",
"last_pub_id": "bbbbbbbbbbbbbbbb",
"live_spec": 1,
"live_spec": {
"$serde_json::private::RawValue": "1"
},
"live_spec_id": "<redacted>",
"live_type": "Test",
"spec_capabilities": [
Expand All @@ -95,7 +105,9 @@ expression: resolved
},
{
"catalog_name": "aliceCo/New/Thing",
"draft_spec": 2,
"draft_spec": {
"$serde_json::private::RawValue": "2"
},
"draft_spec_id": "3300000000000000",
"draft_type": "Collection",
"expect_pub_id": null,
Expand Down Expand Up @@ -125,7 +137,9 @@ expression: resolved
},
{
"catalog_name": "otherCo/Not/AliceCo",
"draft_spec": 2,
"draft_spec": {
"$serde_json::private::RawValue": "2"
},
"draft_spec_id": "4400000000000000",
"draft_type": "Collection",
"expect_pub_id": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ expression: catalog
"endpoint": {
"connector": {
"image": "ghcr.io/foo/bar/source-potato:v1.2.3",
"config": {"some":"config"}
"config": {
"$serde_json::private::RawValue": "{\"some\":\"config\"}"
}
}
},
"bindings": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,7 @@
---
source: crates/connector_proxy/src/libs/network_tunnel.rs
assertion_line: 156
expression: "NetworkTunnel::extend_endpoint_schema(schema).unwrap()"
---
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Generic Database Connection Spec",
"type": "object",
"required": [
"credentials",
"hostname"
],
"properties": {
"credentials": {
"description": "Some login credentials or something.",
"type": "string",
"secret": true
},
"hostname": {
"title": "Server Hostname",
"description": "The hostname at which the server can be reached.",
"type": "string"
}
}
"$serde_json::private::RawValue": "{\n \"$schema\": \"http://json-schema.org/draft-04/schema#\",\n \"title\": \"Generic Database Connection Spec\",\n \"type\": \"object\",\n \"required\": [\n \"credentials\",\n \"hostname\"\n ],\n \"properties\": {\n \"credentials\": {\n \"description\": \"Some login credentials or something.\",\n \"type\": \"string\",\n \"secret\": true\n },\n \"hostname\": {\n \"title\": \"Server Hostname\",\n \"description\": \"The hostname at which the server can be reached.\",\n \"type\": \"string\"\n }\n }\n}"
}
Original file line number Diff line number Diff line change
@@ -1,65 +1,7 @@
---
source: crates/connector_proxy/src/libs/network_tunnel.rs
assertion_line: 160
expression: "NetworkTunnel::extend_endpoint_schema(schema).unwrap()"
---
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Generic Database Connection Spec",
"type": "object",
"required": [
"address",
"credentials"
],
"properties": {
"address": {
"title": "Server Address",
"description": "The host or host:port at which the database can be reached.",
"type": "string"
},
"credentials": {
"description": "Some login credentials or something.",
"type": "string",
"secret": true
},
"networkTunnel": {
"title": "Network Tunneling",
"description": "Setup a network tunnel to access systems on a private network",
"oneOf": [
{
"title": "SSH Forwarding",
"type": "object",
"properties": {
"sshForwarding": {
"title": "SSH Tunnel",
"description": "Connect to your system through an SSH server that acts as a bastion host for your network.",
"type": "object",
"required": [
"privateKey",
"sshEndpoint"
],
"properties": {
"privateKey": {
"title": "SSH Private Key",
"description": "Private key to connect to the remote SSH server.",
"type": "string",
"multiline": true,
"secret": true
},
"sshEndpoint": {
"description": "Endpoint of the remote SSH server that supports tunneling, in the form of ssh://user@hostname[:port]",
"type": "string"
}
}
}
}
},
{
"title": "Disabled",
"type": "null"
}
],
"advanced": true
}
}
"$serde_json::private::RawValue": "{\n \"$schema\": \"http://json-schema.org/draft-04/schema#\",\n \"title\": \"Generic Database Connection Spec\",\n \"type\": \"object\",\n \"required\": [\n \"address\",\n \"credentials\"\n ],\n \"properties\": {\n \"address\": {\n \"title\": \"Server Address\",\n \"description\": \"The host or host:port at which the database can be reached.\",\n \"type\": \"string\"\n },\n \"credentials\": {\n \"description\": \"Some login credentials or something.\",\n \"type\": \"string\",\n \"secret\": true\n },\n \"networkTunnel\": {\n \"title\": \"Network Tunneling\",\n \"description\": \"Setup a network tunnel to access systems on a private network\",\n \"oneOf\": [\n {\n \"title\": \"SSH Forwarding\",\n \"type\": \"object\",\n \"properties\": {\n \"sshForwarding\": {\n \"title\": \"SSH Tunnel\",\n \"description\": \"Connect to your system through an SSH server that acts as a bastion host for your network.\",\n \"type\": \"object\",\n \"required\": [\n \"privateKey\",\n \"sshEndpoint\"\n ],\n \"properties\": {\n \"privateKey\": {\n \"title\": \"SSH Private Key\",\n \"description\": \"Private key to connect to the remote SSH server.\",\n \"type\": \"string\",\n \"multiline\": true,\n \"secret\": true\n },\n \"sshEndpoint\": {\n \"description\": \"Endpoint of the remote SSH server that supports tunneling, in the form of ssh://user@hostname[:port]\",\n \"type\": \"string\"\n }\n }\n }\n }\n },\n {\n \"title\": \"Disabled\",\n \"type\": \"null\"\n }\n ],\n \"advanced\": true\n }\n }\n}"
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
---
source: crates/derive/src/pipeline/mod.rs
assertion_line: 590
expression: actual
---
- input: {}
update:
output:
docs: 6
bytes: 1000
totalSeconds: 3.0
totalSeconds: 3
publish:
output: {}
- input: {}
Expand All @@ -25,5 +24,5 @@ expression: actual
output:
docs: 3
bytes: 8192
totalSeconds: 3.0
totalSeconds: 3

0 comments on commit 1e40a58

Please sign in to comment.