From 6d0c1ff3d0e846774751695a56ced8bc1f7cace0 Mon Sep 17 00:00:00 2001 From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:54:05 -0400 Subject: [PATCH 1/2] Cherry-pick 03af0cd001d21cfad3ae4fff0c0ad34af77411cd with conflicts --- examples/common/scripts/vtadmin-up.sh | 2 +- web/vtadmin/package-lock.json | 12 ++++++++++-- web/vtadmin/package.json | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/examples/common/scripts/vtadmin-up.sh b/examples/common/scripts/vtadmin-up.sh index 356f6ac3880..499c6ea6204 100755 --- a/examples/common/scripts/vtadmin-up.sh +++ b/examples/common/scripts/vtadmin-up.sh @@ -43,7 +43,7 @@ vtadmin \ --alsologtostderr \ --rbac \ --rbac-config="${script_dir}/../vtadmin/rbac.yaml" \ - --cluster "id=${cluster_name},name=${cluster_name},discovery=staticfile,discovery-staticfile-path=${script_dir}/../vtadmin/discovery.json,tablet-fqdn-tmpl=http://{{ .Tablet.Hostname }}:15{{ .Tablet.Alias.Uid }}" \ + --cluster "id=${cluster_name},name=${cluster_name},discovery=staticfile,discovery-staticfile-path=${script_dir}/../vtadmin/discovery.json,tablet-fqdn-tmpl=http://{{ .Tablet.Hostname }}:15{{ .Tablet.Alias.Uid }},schema-cache-default-expiration=1m" \ > "${log_dir}/vtadmin-api.out" 2>&1 & vtadmin_api_pid=$! diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json index 8eecffede43..d67fd51afc7 100644 --- a/web/vtadmin/package-lock.json +++ b/web/vtadmin/package-lock.json @@ -20,6 +20,7 @@ "highcharts-react-official": "^3.1.0", "history": "^5.3.0", "lodash-es": "^4.17.21", + "path-to-regexp": "^8.1.0", "postcss-flexbugs-fixes": "^5.0.2", "postcss-preset-env": "^8.0.1", "query-string": "^7.1.3", @@ -13874,7 +13875,6 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.1.0.tgz", "integrity": "sha512-Bqn3vc8CMHty6zuD+tG23s6v2kwxslHEhTj4eYaVKGIEB+YX/2wd0/rgXLFD9G9id9KCtbVy/3ZgmvZjpa0UdQ==", - "dev": true, "engines": { "node": ">=16" } @@ -15689,7 +15689,7 @@ "mime-types": "2.1.18", "minimatch": "3.1.2", "path-is-inside": "1.0.2", - "path-to-regexp": "^8.0.0", + "path-to-regexp": "^3.3.0", "range-parser": "1.2.0" } }, @@ -15724,6 +15724,7 @@ "node": ">= 0.6" } }, +<<<<<<< HEAD "node_modules/serve-handler/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -15735,6 +15736,13 @@ "engines": { "node": "*" } +======= + "node_modules/serve-handler/node_modules/path-to-regexp": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz", + "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==", + "dev": true +>>>>>>> 03af0cd001 (VTAdmin: Fix serve-handler's path-to-regexp dep and add default schema refresh (#16778)) }, "node_modules/serve/node_modules/ajv": { "version": "8.12.0", diff --git a/web/vtadmin/package.json b/web/vtadmin/package.json index 5a0f01e48c8..ea068f2bafb 100644 --- a/web/vtadmin/package.json +++ b/web/vtadmin/package.json @@ -19,6 +19,7 @@ "highcharts-react-official": "^3.1.0", "history": "^5.3.0", "lodash-es": "^4.17.21", + "path-to-regexp": "^8.1.0", "postcss-flexbugs-fixes": "^5.0.2", "postcss-preset-env": "^8.0.1", "query-string": "^7.1.3", From ba029810ecb2a17842243bd7270d211cd480527a Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Fri, 13 Sep 2024 19:52:43 -0400 Subject: [PATCH 2/2] Fix conflict Signed-off-by: Matt Lord --- web/vtadmin/package-lock.json | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json index d67fd51afc7..08622d94e81 100644 --- a/web/vtadmin/package-lock.json +++ b/web/vtadmin/package-lock.json @@ -15724,7 +15724,6 @@ "node": ">= 0.6" } }, -<<<<<<< HEAD "node_modules/serve-handler/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -15736,13 +15735,12 @@ "engines": { "node": "*" } -======= + }, "node_modules/serve-handler/node_modules/path-to-regexp": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz", "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==", "dev": true ->>>>>>> 03af0cd001 (VTAdmin: Fix serve-handler's path-to-regexp dep and add default schema refresh (#16778)) }, "node_modules/serve/node_modules/ajv": { "version": "8.12.0", @@ -27292,8 +27290,7 @@ "path-to-regexp": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.1.0.tgz", - "integrity": "sha512-Bqn3vc8CMHty6zuD+tG23s6v2kwxslHEhTj4eYaVKGIEB+YX/2wd0/rgXLFD9G9id9KCtbVy/3ZgmvZjpa0UdQ==", - "dev": true + "integrity": "sha512-Bqn3vc8CMHty6zuD+tG23s6v2kwxslHEhTj4eYaVKGIEB+YX/2wd0/rgXLFD9G9id9KCtbVy/3ZgmvZjpa0UdQ==" }, "path-type": { "version": "4.0.0", @@ -28527,7 +28524,7 @@ "mime-types": "2.1.18", "minimatch": "3.1.2", "path-is-inside": "1.0.2", - "path-to-regexp": "^8.0.0", + "path-to-regexp": "^3.3.0", "range-parser": "1.2.0" }, "dependencies": { @@ -28564,6 +28561,12 @@ "requires": { "brace-expansion": "^1.1.7" } + }, + "path-to-regexp": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz", + "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==", + "dev": true } } },