diff --git a/.github/workflows/cdk-deploy.yml b/.github/workflows/cdk-deploy.yml index 184aac6d5..d904bc7c9 100644 --- a/.github/workflows/cdk-deploy.yml +++ b/.github/workflows/cdk-deploy.yml @@ -25,7 +25,7 @@ jobs: role-to-assume: ${{ secrets.TEST_FW_ASSUMABLE_ROLE_ARN }} aws-region: us-west-2 role-duration-seconds: 21600 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 16 - name: Get npm cache directory diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index ee1ceb6fa..a568f4732 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -54,7 +54,7 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 16 - name: Get npm cache directory diff --git a/.github/workflows/update-test-images.yml b/.github/workflows/update-test-images.yml index 665c4faf2..1d487b89a 100644 --- a/.github/workflows/update-test-images.yml +++ b/.github/workflows/update-test-images.yml @@ -40,7 +40,7 @@ jobs: with: arguments: build - name: Set up terraform - uses: hashicorp/setup-terraform@v2 + uses: hashicorp/setup-terraform@v3 - name: run imagebuild working-directory: terraform/imagebuild run: | diff --git a/adot-testbed/app/src/test/java/software/amazon/adot/testbed/LogsTests.java b/adot-testbed/app/src/test/java/software/amazon/adot/testbed/LogsTests.java index 72bf72b57..0bb727bdb 100644 --- a/adot-testbed/app/src/test/java/software/amazon/adot/testbed/LogsTests.java +++ b/adot-testbed/app/src/test/java/software/amazon/adot/testbed/LogsTests.java @@ -49,7 +49,6 @@ class LogsTests extends CollectorSetup { void testSyslog() throws Exception { String logStreamName = "rfcsyslog-logstream-" + uniqueID; collector = createAndStartCollectorForLogs("/configurations/config-rfcsyslog.yaml", logStreamName); - List inputStreams = new ArrayList<>(); InputStream inputStream = getClass().getResourceAsStream("/logs/RFC5424.log"); inputStreams.add(inputStream); @@ -63,7 +62,6 @@ void testSyslog() throws Exception { void testLog4j() throws Exception { String logStreamName = "log4j-logstream-" + uniqueID; collector = createAndStartCollectorForLogs("/configurations/config-log4j.yaml", logStreamName); - List inputStreams = new ArrayList<>(); InputStream inputStream = getClass().getResourceAsStream("/logs/log4j.log"); inputStreams.add(inputStream); @@ -76,7 +74,6 @@ void testLog4j() throws Exception { void testJson() throws Exception { String logStreamName = "json-logstream-" + uniqueID; collector = createAndStartCollectorForLogs("/configurations/config-json.yaml", logStreamName); - List inputStreams = new ArrayList<>(); InputStream inputStream = getClass().getResourceAsStream("/logs/testingJSON.log"); inputStreams.add(inputStream); diff --git a/build.gradle b/build.gradle index 6000411d3..6340b9500 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { // Apply the java plugin to add support for Java id 'java' - id 'com.github.ben-manes.versions' version '0.49.0' + id 'com.github.ben-manes.versions' version '0.50.0' id 'se.patrikerdes.use-latest-versions' version '0.2.18' } diff --git a/cdk_infra/package-lock.json b/cdk_infra/package-lock.json index 6535eccbb..7aaa4e170 100644 --- a/cdk_infra/package-lock.json +++ b/cdk_infra/package-lock.json @@ -20,27 +20,27 @@ "@aws-cdk/lambda-layer-kubectl-v25": "^2.0.4", "@aws-cdk/lambda-layer-kubectl-v26": "^2.0.1", "@aws-cdk/lambda-layer-kubectl-v27": "^2.0.0", - "aws-cdk-lib": "^2.100.0", + "aws-cdk-lib": "^2.110.0", "constructs": "^10.3.0", "js-yaml": "^4.1.0", "source-map-support": "^0.5.21" }, "devDependencies": { - "@types/jest": "^29.5.5", - "@types/js-yaml": "^4.0.6", - "@types/node": "20.8.4", + "@types/jest": "^29.5.9", + "@types/js-yaml": "^4.0.9", + "@types/node": "20.9.3", "@types/prettier": "3.0.0", - "@typescript-eslint/eslint-plugin": "^6.7.5", - "@typescript-eslint/parser": "^6.7.5", + "@typescript-eslint/eslint-plugin": "^6.12.0", + "@typescript-eslint/parser": "^6.12.0", "ajv": "^8.12.0", "ajv-errors": "^3.0.0", - "aws-cdk": "^2.100.0", - "eslint": "^8.51.0", + "aws-cdk": "^2.110.0", + "eslint": "^8.54.0", "jest": "^29.7.0", - "prettier": "^3.0.3", + "prettier": "^3.1.0", "ts-jest": "^29.1.1", "ts-node": "^10.9.1", - "typescript": "~5.2.2", + "typescript": "~5.3.2", "yaml-schema-validator": "^1.2.3" } }, @@ -67,9 +67,9 @@ } }, "node_modules/@aws-cdk/asset-awscli-v1": { - "version": "2.2.200", - "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.200.tgz", - "integrity": "sha512-Kf5J8DfJK4wZFWT2Myca0lhwke7LwHcHBo+4TvWOGJrFVVKVuuiLCkzPPRBQQVDj0Vtn2NBokZAz8pfMpAqAKg==" + "version": "2.2.201", + "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.201.tgz", + "integrity": "sha512-INZqcwDinNaIdb5CtW3ez5s943nX5stGBQS6VOP2JDlOFP81hM3fds/9NDknipqfUkZM43dx+HgVvkXYXXARCQ==" }, "node_modules/@aws-cdk/asset-kubectl-v20": { "version": "2.1.2", @@ -1488,17 +1488,89 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", - "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/code-frame/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/compat-data": { "version": "7.22.3", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.3.tgz", @@ -1554,12 +1626,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.3.tgz", - "integrity": "sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "dependencies": { - "@babel/types": "^7.22.3", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -1597,34 +1669,34 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.1", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz", - "integrity": "sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", - "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/template": "^7.20.7", - "@babel/types": "^7.21.0" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1683,30 +1755,30 @@ } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz", - "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" @@ -1736,13 +1808,13 @@ } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -1821,9 +1893,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.4.tgz", - "integrity": "sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -2010,33 +2082,33 @@ } }, "node_modules/@babel/template": { - "version": "7.21.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.21.9.tgz", - "integrity": "sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.21.4", - "@babel/parser": "^7.21.9", - "@babel/types": "^7.21.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.4.tgz", - "integrity": "sha512-Tn1pDsjIcI+JcLKq1AVlZEr4226gpuAQTsLMorsYg9tuS/kG7nuwwJ4AB8jfQuEgb/COBwR/DqJxmoiYFu5/rQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.21.4", - "@babel/generator": "^7.22.3", - "@babel/helper-environment-visitor": "^7.22.1", - "@babel/helper-function-name": "^7.21.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.22.4", - "@babel/types": "^7.22.4", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -2054,13 +2126,13 @@ } }, "node_modules/@babel/types": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz", - "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.21.5", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -2120,9 +2192,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", - "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", + "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -2165,21 +2237,21 @@ "dev": true }, "node_modules/@eslint/js": { - "version": "8.51.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz", - "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", - "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -2201,9 +2273,9 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "node_modules/@istanbuljs/load-nyc-config": { @@ -2820,9 +2892,9 @@ } }, "node_modules/@types/jest": { - "version": "29.5.5", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.5.tgz", - "integrity": "sha512-ebylz2hnsWR9mYvmBFbXJXr+33UPc4+ZdxyDXh5w0FlPBTfCVN3wPL+kuOiQt3xvrK419v7XWeAs+AeOksafXg==", + "version": "29.5.9", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.9.tgz", + "integrity": "sha512-zJeWhqBwVoPm83sP8h1/SVntwWTu5lZbKQGCvBjxQOyEWnKnsaomt2y7SlV4KfwlrHAHHAn00Sh4IAWaIsGOgQ==", "dev": true, "dependencies": { "expect": "^29.0.0", @@ -2830,24 +2902,24 @@ } }, "node_modules/@types/js-yaml": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.6.tgz", - "integrity": "sha512-ACTuifTSIIbyksx2HTon3aFtCKWcID7/h3XEmRpDYdMCXxPbl+m9GteOJeaAkiAta/NJaSFuA7ahZ0NkwajDSw==", + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz", + "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==", "dev": true }, "node_modules/@types/json-schema": { - "version": "7.0.13", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", - "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==", + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, "node_modules/@types/node": { - "version": "20.8.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.4.tgz", - "integrity": "sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A==", + "version": "20.9.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.3.tgz", + "integrity": "sha512-nk5wXLAXGBKfrhLB0cyHGbSqopS+nz0BUgZkUQqSHSSgdee0kssp1IAqlQOu333bW+gMNs2QREx7iynm19Abxw==", "dev": true, "dependencies": { - "undici-types": "~5.25.1" + "undici-types": "~5.26.4" } }, "node_modules/@types/prettier": { @@ -2861,9 +2933,9 @@ } }, "node_modules/@types/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==", + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, "node_modules/@types/stack-utils": { @@ -2888,16 +2960,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.5.tgz", - "integrity": "sha512-JhtAwTRhOUcP96D0Y6KYnwig/MRQbOoLGXTON2+LlyB/N35SP9j1boai2zzwXb7ypKELXMx3DVk9UTaEq1vHEw==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz", + "integrity": "sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.7.5", - "@typescript-eslint/type-utils": "6.7.5", - "@typescript-eslint/utils": "6.7.5", - "@typescript-eslint/visitor-keys": "6.7.5", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/type-utils": "6.12.0", + "@typescript-eslint/utils": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -2923,15 +2995,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.5.tgz", - "integrity": "sha512-bIZVSGx2UME/lmhLcjdVc7ePBwn7CLqKarUBL4me1C5feOd663liTGjMBGVcGr+BhnSLeP4SgwdvNnnkbIdkCw==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.12.0.tgz", + "integrity": "sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.7.5", - "@typescript-eslint/types": "6.7.5", - "@typescript-eslint/typescript-estree": "6.7.5", - "@typescript-eslint/visitor-keys": "6.7.5", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/typescript-estree": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4" }, "engines": { @@ -2951,13 +3023,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.5.tgz", - "integrity": "sha512-GAlk3eQIwWOJeb9F7MKQ6Jbah/vx1zETSDw8likab/eFcqkjSD7BI75SDAeC5N2L0MmConMoPvTsmkrg71+B1A==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz", + "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.7.5", - "@typescript-eslint/visitor-keys": "6.7.5" + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2968,13 +3040,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.5.tgz", - "integrity": "sha512-Gs0qos5wqxnQrvpYv+pf3XfcRXW6jiAn9zE/K+DlmYf6FcpxeNYN0AIETaPR7rHO4K2UY+D0CIbDP9Ut0U4m1g==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz", + "integrity": "sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.7.5", - "@typescript-eslint/utils": "6.7.5", + "@typescript-eslint/typescript-estree": "6.12.0", + "@typescript-eslint/utils": "6.12.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -2995,9 +3067,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.5.tgz", - "integrity": "sha512-WboQBlOXtdj1tDFPyIthpKrUb+kZf2VroLZhxKa/VlwLlLyqv/PwUNgL30BlTVZV1Wu4Asu2mMYPqarSO4L5ZQ==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz", + "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -3008,13 +3080,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.5.tgz", - "integrity": "sha512-NhJiJ4KdtwBIxrKl0BqG1Ur+uw7FiOnOThcYx9DpOGJ/Abc9z2xNzLeirCG02Ig3vkvrc2qFLmYSSsaITbKjlg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz", + "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.7.5", - "@typescript-eslint/visitor-keys": "6.7.5", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3035,17 +3107,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.5.tgz", - "integrity": "sha512-pfRRrH20thJbzPPlPc4j0UNGvH1PjPlhlCMq4Yx7EGjV7lvEeGX0U6MJYe8+SyFutWgSHsdbJ3BXzZccYggezA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.12.0.tgz", + "integrity": "sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.7.5", - "@typescript-eslint/types": "6.7.5", - "@typescript-eslint/typescript-estree": "6.7.5", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/typescript-estree": "6.12.0", "semver": "^7.5.4" }, "engines": { @@ -3060,12 +3132,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.5.tgz", - "integrity": "sha512-3MaWdDZtLlsexZzDSdQWsFQ9l9nL8B80Z4fImSpyllFC/KLqWQRdEcB+gGGO+N3Q2uL40EsG66wZLsohPxNXvg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz", + "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.7.5", + "@typescript-eslint/types": "6.12.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -3076,6 +3148,12 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/acorn": { "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", @@ -3207,9 +3285,9 @@ } }, "node_modules/aws-cdk": { - "version": "2.100.0", - "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.100.0.tgz", - "integrity": "sha512-Gt/4wPuEiBYw2tl0+cN0EbLxxJEvltcJxSQAcVHgNbqvDj49KUJ/oCbZ335dF0gK/hrVVb70xfNiYbBSPOsmvg==", + "version": "2.110.0", + "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.110.0.tgz", + "integrity": "sha512-ods6/Lh5hWv9qOMmifgg6ur/M6020Yi5mFXUolVSy/0gjzo9wFRcPAxKmQ3++Yz+rf5dadUZmmpc53evvUgR4A==", "dev": true, "bin": { "cdk": "bin/cdk" @@ -3222,9 +3300,9 @@ } }, "node_modules/aws-cdk-lib": { - "version": "2.100.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.100.0.tgz", - "integrity": "sha512-oWDPcbdqD69wDIUvcGdbDxmKcDfkCg515wf8JkiQLnhAI/AFyKAVTEWhbSUi00lvJQNUjX8Mal2lbKlCRA4hjQ==", + "version": "2.110.0", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.110.0.tgz", + "integrity": "sha512-4IxjdtaoGjQPqtFyYXG6kOs9t/UTAh06tlGyCPpvhTZNoKNFUkku3H6MArlazpiKtm+dThdF+p5lQLB/kIu/qw==", "bundleDependencies": [ "@balena/dockerignore", "case", @@ -3238,7 +3316,7 @@ "yaml" ], "dependencies": { - "@aws-cdk/asset-awscli-v1": "^2.2.200", + "@aws-cdk/asset-awscli-v1": "^2.2.201", "@aws-cdk/asset-kubectl-v20": "^2.1.2", "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1", "@balena/dockerignore": "^1.0.2", @@ -3247,7 +3325,7 @@ "ignore": "^5.2.4", "jsonschema": "^1.4.1", "minimatch": "^3.1.2", - "punycode": "^2.3.0", + "punycode": "^2.3.1", "semver": "^7.5.4", "table": "^6.8.1", "yaml": "1.10.2" @@ -3448,7 +3526,7 @@ } }, "node_modules/aws-cdk-lib/node_modules/punycode": { - "version": "2.3.0", + "version": "2.3.1", "inBundle": true, "license": "MIT", "engines": { @@ -3533,7 +3611,7 @@ } }, "node_modules/aws-cdk-lib/node_modules/universalify": { - "version": "2.0.0", + "version": "2.0.1", "inBundle": true, "license": "MIT", "engines": { @@ -4102,18 +4180,19 @@ } }, "node_modules/eslint": { - "version": "8.51.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz", - "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.51.0", - "@humanwhocodes/config-array": "^0.11.11", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.54.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -4546,9 +4625,9 @@ } }, "node_modules/globals": { - "version": "13.21.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", - "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -5939,9 +6018,9 @@ } }, "node_modules/prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", + "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -6571,9 +6650,9 @@ "dev": true }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", + "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -6584,9 +6663,9 @@ } }, "node_modules/undici-types": { - "version": "5.25.3", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", - "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, "node_modules/update-browserslist-db": { @@ -6918,9 +6997,9 @@ } }, "@aws-cdk/asset-awscli-v1": { - "version": "2.2.200", - "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.200.tgz", - "integrity": "sha512-Kf5J8DfJK4wZFWT2Myca0lhwke7LwHcHBo+4TvWOGJrFVVKVuuiLCkzPPRBQQVDj0Vtn2NBokZAz8pfMpAqAKg==" + "version": "2.2.201", + "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.201.tgz", + "integrity": "sha512-INZqcwDinNaIdb5CtW3ez5s943nX5stGBQS6VOP2JDlOFP81hM3fds/9NDknipqfUkZM43dx+HgVvkXYXXARCQ==" }, "@aws-cdk/asset-kubectl-v20": { "version": "2.1.2", @@ -7791,12 +7870,71 @@ "integrity": "sha512-lPkYJNoN4Gjlf0Fdfgcd1RTm5RD9qtfaFMwVvTn2KGTr7ZqmFskGQ9FqIcd5vd6GmsbAL8OrFOToLr1AHDuOiQ==" }, "@babel/code-frame": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", - "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "requires": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "@babel/compat-data": { @@ -7843,12 +7981,12 @@ } }, "@babel/generator": { - "version": "7.22.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.3.tgz", - "integrity": "sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "requires": { - "@babel/types": "^7.22.3", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -7876,28 +8014,28 @@ } }, "@babel/helper-environment-visitor": { - "version": "7.22.1", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz", - "integrity": "sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true }, "@babel/helper-function-name": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", - "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "requires": { - "@babel/template": "^7.20.7", - "@babel/types": "^7.21.0" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" } }, "@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-module-imports": { @@ -7941,24 +8079,24 @@ } }, "@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-string-parser": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz", - "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "dev": true }, "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true }, "@babel/helper-validator-option": { @@ -7979,13 +8117,13 @@ } }, "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "dependencies": { @@ -8048,9 +8186,9 @@ } }, "@babel/parser": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.4.tgz", - "integrity": "sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true }, "@babel/plugin-syntax-async-generators": { @@ -8180,30 +8318,30 @@ } }, "@babel/template": { - "version": "7.21.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.21.9.tgz", - "integrity": "sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "requires": { - "@babel/code-frame": "^7.21.4", - "@babel/parser": "^7.21.9", - "@babel/types": "^7.21.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" } }, "@babel/traverse": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.4.tgz", - "integrity": "sha512-Tn1pDsjIcI+JcLKq1AVlZEr4226gpuAQTsLMorsYg9tuS/kG7nuwwJ4AB8jfQuEgb/COBwR/DqJxmoiYFu5/rQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.21.4", - "@babel/generator": "^7.22.3", - "@babel/helper-environment-visitor": "^7.22.1", - "@babel/helper-function-name": "^7.21.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.22.4", - "@babel/types": "^7.22.4", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -8217,13 +8355,13 @@ } }, "@babel/types": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz", - "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.21.5", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } }, @@ -8270,9 +8408,9 @@ "dev": true }, "@eslint/eslintrc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", - "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", + "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -8307,18 +8445,18 @@ } }, "@eslint/js": { - "version": "8.51.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz", - "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true }, "@humanwhocodes/config-array": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", - "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "requires": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" } @@ -8330,9 +8468,9 @@ "dev": true }, "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "@istanbuljs/load-nyc-config": { @@ -8849,9 +8987,9 @@ } }, "@types/jest": { - "version": "29.5.5", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.5.tgz", - "integrity": "sha512-ebylz2hnsWR9mYvmBFbXJXr+33UPc4+ZdxyDXh5w0FlPBTfCVN3wPL+kuOiQt3xvrK419v7XWeAs+AeOksafXg==", + "version": "29.5.9", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.9.tgz", + "integrity": "sha512-zJeWhqBwVoPm83sP8h1/SVntwWTu5lZbKQGCvBjxQOyEWnKnsaomt2y7SlV4KfwlrHAHHAn00Sh4IAWaIsGOgQ==", "dev": true, "requires": { "expect": "^29.0.0", @@ -8859,24 +8997,24 @@ } }, "@types/js-yaml": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.6.tgz", - "integrity": "sha512-ACTuifTSIIbyksx2HTon3aFtCKWcID7/h3XEmRpDYdMCXxPbl+m9GteOJeaAkiAta/NJaSFuA7ahZ0NkwajDSw==", + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz", + "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==", "dev": true }, "@types/json-schema": { - "version": "7.0.13", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", - "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==", + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, "@types/node": { - "version": "20.8.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.4.tgz", - "integrity": "sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A==", + "version": "20.9.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.3.tgz", + "integrity": "sha512-nk5wXLAXGBKfrhLB0cyHGbSqopS+nz0BUgZkUQqSHSSgdee0kssp1IAqlQOu333bW+gMNs2QREx7iynm19Abxw==", "dev": true, "requires": { - "undici-types": "~5.25.1" + "undici-types": "~5.26.4" } }, "@types/prettier": { @@ -8889,9 +9027,9 @@ } }, "@types/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==", + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, "@types/stack-utils": { @@ -8916,16 +9054,16 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.5.tgz", - "integrity": "sha512-JhtAwTRhOUcP96D0Y6KYnwig/MRQbOoLGXTON2+LlyB/N35SP9j1boai2zzwXb7ypKELXMx3DVk9UTaEq1vHEw==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz", + "integrity": "sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==", "dev": true, "requires": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.7.5", - "@typescript-eslint/type-utils": "6.7.5", - "@typescript-eslint/utils": "6.7.5", - "@typescript-eslint/visitor-keys": "6.7.5", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/type-utils": "6.12.0", + "@typescript-eslint/utils": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -8935,54 +9073,54 @@ } }, "@typescript-eslint/parser": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.5.tgz", - "integrity": "sha512-bIZVSGx2UME/lmhLcjdVc7ePBwn7CLqKarUBL4me1C5feOd663liTGjMBGVcGr+BhnSLeP4SgwdvNnnkbIdkCw==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.12.0.tgz", + "integrity": "sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "6.7.5", - "@typescript-eslint/types": "6.7.5", - "@typescript-eslint/typescript-estree": "6.7.5", - "@typescript-eslint/visitor-keys": "6.7.5", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/typescript-estree": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.5.tgz", - "integrity": "sha512-GAlk3eQIwWOJeb9F7MKQ6Jbah/vx1zETSDw8likab/eFcqkjSD7BI75SDAeC5N2L0MmConMoPvTsmkrg71+B1A==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz", + "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==", "dev": true, "requires": { - "@typescript-eslint/types": "6.7.5", - "@typescript-eslint/visitor-keys": "6.7.5" + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0" } }, "@typescript-eslint/type-utils": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.5.tgz", - "integrity": "sha512-Gs0qos5wqxnQrvpYv+pf3XfcRXW6jiAn9zE/K+DlmYf6FcpxeNYN0AIETaPR7rHO4K2UY+D0CIbDP9Ut0U4m1g==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz", + "integrity": "sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "6.7.5", - "@typescript-eslint/utils": "6.7.5", + "@typescript-eslint/typescript-estree": "6.12.0", + "@typescript-eslint/utils": "6.12.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" } }, "@typescript-eslint/types": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.5.tgz", - "integrity": "sha512-WboQBlOXtdj1tDFPyIthpKrUb+kZf2VroLZhxKa/VlwLlLyqv/PwUNgL30BlTVZV1Wu4Asu2mMYPqarSO4L5ZQ==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz", + "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.5.tgz", - "integrity": "sha512-NhJiJ4KdtwBIxrKl0BqG1Ur+uw7FiOnOThcYx9DpOGJ/Abc9z2xNzLeirCG02Ig3vkvrc2qFLmYSSsaITbKjlg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz", + "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==", "dev": true, "requires": { - "@typescript-eslint/types": "6.7.5", - "@typescript-eslint/visitor-keys": "6.7.5", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -8991,30 +9129,36 @@ } }, "@typescript-eslint/utils": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.5.tgz", - "integrity": "sha512-pfRRrH20thJbzPPlPc4j0UNGvH1PjPlhlCMq4Yx7EGjV7lvEeGX0U6MJYe8+SyFutWgSHsdbJ3BXzZccYggezA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.12.0.tgz", + "integrity": "sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.7.5", - "@typescript-eslint/types": "6.7.5", - "@typescript-eslint/typescript-estree": "6.7.5", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/typescript-estree": "6.12.0", "semver": "^7.5.4" } }, "@typescript-eslint/visitor-keys": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.5.tgz", - "integrity": "sha512-3MaWdDZtLlsexZzDSdQWsFQ9l9nL8B80Z4fImSpyllFC/KLqWQRdEcB+gGGO+N3Q2uL40EsG66wZLsohPxNXvg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz", + "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==", "dev": true, "requires": { - "@typescript-eslint/types": "6.7.5", + "@typescript-eslint/types": "6.12.0", "eslint-visitor-keys": "^3.4.1" } }, + "@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "acorn": { "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", @@ -9107,20 +9251,20 @@ "dev": true }, "aws-cdk": { - "version": "2.100.0", - "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.100.0.tgz", - "integrity": "sha512-Gt/4wPuEiBYw2tl0+cN0EbLxxJEvltcJxSQAcVHgNbqvDj49KUJ/oCbZ335dF0gK/hrVVb70xfNiYbBSPOsmvg==", + "version": "2.110.0", + "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.110.0.tgz", + "integrity": "sha512-ods6/Lh5hWv9qOMmifgg6ur/M6020Yi5mFXUolVSy/0gjzo9wFRcPAxKmQ3++Yz+rf5dadUZmmpc53evvUgR4A==", "dev": true, "requires": { "fsevents": "2.3.2" } }, "aws-cdk-lib": { - "version": "2.100.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.100.0.tgz", - "integrity": "sha512-oWDPcbdqD69wDIUvcGdbDxmKcDfkCg515wf8JkiQLnhAI/AFyKAVTEWhbSUi00lvJQNUjX8Mal2lbKlCRA4hjQ==", + "version": "2.110.0", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.110.0.tgz", + "integrity": "sha512-4IxjdtaoGjQPqtFyYXG6kOs9t/UTAh06tlGyCPpvhTZNoKNFUkku3H6MArlazpiKtm+dThdF+p5lQLB/kIu/qw==", "requires": { - "@aws-cdk/asset-awscli-v1": "^2.2.200", + "@aws-cdk/asset-awscli-v1": "^2.2.201", "@aws-cdk/asset-kubectl-v20": "^2.1.2", "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1", "@balena/dockerignore": "^1.0.2", @@ -9129,7 +9273,7 @@ "ignore": "^5.2.4", "jsonschema": "^1.4.1", "minimatch": "^3.1.2", - "punycode": "^2.3.0", + "punycode": "^2.3.1", "semver": "^7.5.4", "table": "^6.8.1", "yaml": "1.10.2" @@ -9259,7 +9403,7 @@ } }, "punycode": { - "version": "2.3.0", + "version": "2.3.1", "bundled": true }, "require-from-string": { @@ -9310,7 +9454,7 @@ } }, "universalify": { - "version": "2.0.0", + "version": "2.0.1", "bundled": true }, "uri-js": { @@ -9715,18 +9859,19 @@ "dev": true }, "eslint": { - "version": "8.51.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz", - "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.51.0", - "@humanwhocodes/config-array": "^0.11.11", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.54.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -10049,9 +10194,9 @@ } }, "globals": { - "version": "13.21.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", - "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -11103,9 +11248,9 @@ "dev": true }, "prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", + "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", "dev": true }, "pretty-format": { @@ -11514,15 +11659,15 @@ "dev": true }, "typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", + "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", "dev": true }, "undici-types": { - "version": "5.25.3", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", - "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, "update-browserslist-db": { diff --git a/cdk_infra/package.json b/cdk_infra/package.json index 698a4bfeb..812786999 100644 --- a/cdk_infra/package.json +++ b/cdk_infra/package.json @@ -10,21 +10,21 @@ "prettier-format": "prettier --config .prettierrc 'lib/**/*.ts' 'test/**/*.ts' --write" }, "devDependencies": { - "@types/jest": "^29.5.5", - "@types/js-yaml": "^4.0.6", - "@types/node": "20.8.4", + "@types/jest": "^29.5.9", + "@types/js-yaml": "^4.0.9", + "@types/node": "20.9.3", "@types/prettier": "3.0.0", - "@typescript-eslint/eslint-plugin": "^6.7.5", - "@typescript-eslint/parser": "^6.7.5", + "@typescript-eslint/eslint-plugin": "^6.12.0", + "@typescript-eslint/parser": "^6.12.0", "ajv": "^8.12.0", "ajv-errors": "^3.0.0", - "aws-cdk": "^2.100.0", - "eslint": "^8.51.0", + "aws-cdk": "^2.110.0", + "eslint": "^8.54.0", "jest": "^29.7.0", - "prettier": "^3.0.3", + "prettier": "^3.1.0", "ts-jest": "^29.1.1", "ts-node": "^10.9.1", - "typescript": "~5.2.2", + "typescript": "~5.3.2", "yaml-schema-validator": "^1.2.3" }, "dependencies": { @@ -40,7 +40,7 @@ "@aws-cdk/lambda-layer-kubectl-v25": "^2.0.4", "@aws-cdk/lambda-layer-kubectl-v26": "^2.0.1", "@aws-cdk/lambda-layer-kubectl-v27": "^2.0.0", - "aws-cdk-lib": "^2.100.0", + "aws-cdk-lib": "^2.110.0", "constructs": "^10.3.0", "js-yaml": "^4.1.0", "source-map-support": "^0.5.21" diff --git a/load-generator/build.gradle b/load-generator/build.gradle index 86a40eb6d..db3826067 100644 --- a/load-generator/build.gradle +++ b/load-generator/build.gradle @@ -28,12 +28,12 @@ dependencies { // This dependency is used by the application. implementation "com.google.guava:guava:32.1.3-jre" - implementation "io.grpc:grpc-bom:1.58.0" - implementation "io.grpc:grpc-api:1.58.0" + implementation "io.grpc:grpc-bom:1.59.0" + implementation "io.grpc:grpc-api:1.59.0" - implementation "io.grpc:grpc-netty-shaded:1.58.0" + implementation "io.grpc:grpc-netty-shaded:1.59.0" - implementation platform("io.opentelemetry:opentelemetry-bom:1.31.0") + implementation platform("io.opentelemetry:opentelemetry-bom:1.32.0") implementation "io.opentelemetry:opentelemetry-api" implementation "io.opentelemetry:opentelemetry-sdk" implementation "io.opentelemetry:opentelemetry-exporter-otlp" @@ -51,8 +51,8 @@ dependencies { compileOnly 'info.picocli:picocli-codegen:4.7.5' // log - implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.20.0' - implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.20.0' + implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.22.0' + implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.22.0' implementation project(":trace-java-client") } diff --git a/mocked_servers/grpc_metrics/go.mod b/mocked_servers/grpc_metrics/go.mod index aa6f964fc..89623ab35 100644 --- a/mocked_servers/grpc_metrics/go.mod +++ b/mocked_servers/grpc_metrics/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( go.opentelemetry.io/proto/otlp v1.0.0 - google.golang.org/grpc v1.58.2 + google.golang.org/grpc v1.59.0 ) require ( @@ -13,7 +13,7 @@ require ( golang.org/x/net v0.17.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/mocked_servers/grpc_metrics/go.sum b/mocked_servers/grpc_metrics/go.sum index 9a5df368d..3426fbde5 100644 --- a/mocked_servers/grpc_metrics/go.sum +++ b/mocked_servers/grpc_metrics/go.sum @@ -1,4 +1,4 @@ -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -15,13 +15,13 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWotvtrwxFNrNE9CUAGtplaDK5NNI/g= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= -google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/mocked_servers/grpc_trace/go.mod b/mocked_servers/grpc_trace/go.mod index 57ab09e6d..7dded7df8 100644 --- a/mocked_servers/grpc_trace/go.mod +++ b/mocked_servers/grpc_trace/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( go.opentelemetry.io/proto/otlp v1.0.0 - google.golang.org/grpc v1.58.3 + google.golang.org/grpc v1.59.0 ) require ( @@ -13,7 +13,7 @@ require ( golang.org/x/net v0.17.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/mocked_servers/grpc_trace/go.sum b/mocked_servers/grpc_trace/go.sum index 4edde33a5..3426fbde5 100644 --- a/mocked_servers/grpc_trace/go.sum +++ b/mocked_servers/grpc_trace/go.sum @@ -1,4 +1,4 @@ -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -15,13 +15,13 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWotvtrwxFNrNE9CUAGtplaDK5NNI/g= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= -google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/mocked_servers/https/certificates/private.key b/mocked_servers/https/certificates/private.key index 5a54a6dd6..6b29cda1b 100644 --- a/mocked_servers/https/certificates/private.key +++ b/mocked_servers/https/certificates/private.key @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -dwiiAAxBpA6L6XXf/NnFH3XvBw9Es78= +MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQCWwnN1hpQQKrye +LQDDtfvnH/NVPoGo+BFuchpmmX8XU/8ydKCyEKH9DKuCp/PIhjLrQOE5tRKZVNQh +8ih5Cc1+Tin7x+1XPGwOFsv+rZXKYxixMPyj0Be8OZr1lj+SNbgBCtG8n/cx0H/X +eIvmAEIcwRGe28DXmR3O3nOnF++ip3RPthCMrROmvXS4zeA3ItcuWCOOSQOz2PgT +nZDFX64a2iMe9TAYo0+sEBRjtm9zCF8tqEXNXSb0tGbJsg4sUHPkhrGQyKT+sDjH +fuy8nI5wKSVmaDUPQlKCqnEKdIwlmCog1SU3KyAPTetlsewf00oQ9jPCTnPVcFIS +zZifOaEpgTFhojfOEIoK+l9FeGKpiXypYU2kNLWpsfPfbyK+9GNJOQWgsmQnuNs/ +zsSPjmrL1c24M/0lG2uixRr5bQ9cSiU1210MafEl8cXdrp7JABdKvE15xxBjSihY +ITRYRuXEaH5CEMHbozWppApbvk/YmC9N8IF8fe+UeyScJJr5DYnVdvha/+J7dKli +2H/qUIJrPc1liY2gtyrHLUKEiDac2MlUivgDu/Dyxm0xAVRZMRaxhPkoG1+ZvrZa +hWXG5g6YOmcafOUEqOpTeC94fv1U2w63BVxO1ZpVQaLkFdBl4yVn0w1xdOtfyHYx +w/gpA4KYbE6tPdXfXiBvMQvlsJZrbwIDAQABAoICACFEBPAQ4wjyNS595aZJuKzW +Kv5LTZb4Lfh96v9qrVV7bls2yuKfsu7AZfPtlWhQ3Fl2tnviTZlR04EuCuoyVIqj +OrZY9jECnyE4vIiUyvGejitDEOwglawt1diM77gWbGSme4MwlP4D8MGd0tjMg8oO +fBHekZ3BJoeoJELhkDoG0y5nkR1Jb4WiVmgU3X2tDWgngKj7yXpczNifMvuqUiOQ +sKE7HwLAvmrMHYOnFM6AMWhEsipPfLIQQIIO7PuwQPJTGklFTMr6HX0/r4Mq1G9B +VQRUyCh2zPgSHeFduDLvcZRPE+gpduiJnACTkvOuzrARc3hTkVGueB24Cg5QTBQi +uplHUg/G+whEthoem9tf0Svuu3tLrOZcYVxtxCBNum7ukZsiUD5h3dabZS6u/H4T +xq932Nwjweu4EGFox9Capc8vfW5o0Y8O8cUZkJumSDEkYU2xic7NQze+0iU0FOZX +NrbgobNuVghjUPX0IkY09Vnsfca6HQGQpRnSp5EFSGIFRjmCNi+sPuM4mheqNobr +zJ+J3wW3G5SK4ScpxbAz621OC+3KQnj1+880ztR9QQ2wp4ihUmZBj1UQ4kO5wvzA +vS78rNidlC3y/5vWkZXi3uN89jCGFYVDeeZFAQ08lsnAQoCWA98HbaohOTKTm2ah +ZS0MrR3DFzn9ucxAE4wZAoIBAQDI00XPIqxJB2ssS3oOZsVHlAheI9CqIHi/8hDY +HjgoDpPdCHSA1SSMItGAIgirnizJ1gAfJ59v4YkvxhMs86LXthgie+e/LVDt5ObD +1/WZ11EyyuzTXf4KBcSbj8FMtTJoPtY4o00XEi+knkHWg+1c/vTNXZRjbSSKIvbi +iXCc+3ON2TGGUbJeDkDVgS2ohEEaUDWRzC1xScLG6Ei9DsD5S0SRFAvQ4IVSiv6X +DwQgIFKJaEQ3awUniMUeJyZ9vLQEhYAQeBHqNHSam1ePq34y0zi4PqwvidcQJFwm +cr6JPXmKST9EESFIlaaVU54/v+GUap+Oy3nWL+pNxVyDwVSNAoIBAQDALeLbwDpH +fLB8TTUs8fXuPFUIoE+C3GQjB+9/RLczPenLgcoal2iuNmC5mU1m6X5PPhDMXuno +95DGxhUo8vc9P1/oWPCUvkaNSnRjdjQYDztB6XkpvA4iRSZQGAwBpAnCILAHe1YF +kk0Gx8v+aqvi8sMk84VlD4i/zHC8/WAP8eb0AS1lrEw0iA8GkMMzaqUYrkDmjmuk +COzq86UpcYC++p2AZGMoipKn5f/qdMC3JYO4nC32IrirZuTnFpuFZJgcbP/zltz/ +mEMc/3IiZwVLwcxNZ5tQnL73x8EU0boEK8MJFcFqOBqBI7K7ceXd32N3gKmBnMFn +odQpZma6TIbrAoIBABkgljN8myHoE7jPGM6EfVqfYwykXo9q0LDzkLf5z/zzFf0p ++anFAXWnRZ9KotsWR3RZmlpLkt9k0M1xcyTEtzNWTV7DMhPxj5a0dUs70jcVgcth +KJCpygdnAVqVehIm+c+hTRx5EkQ4uk1Wn9Y/W4uvOuIXO2HVXiUKiul9WOHLdIHj +ExdDUZYDIomUSCo1og+wyYMckPMDz6MjnTZKikqm6EVexLu12/if+4rbDiEW6jzX +FvH4KgTwT/md3GsPGVcXfRaSb2tmdNCDb0lCo9+oHgivjsvD62zRn9YPtVdmobZz +w764hfmW/+jfNYW0dH0leiFbxDrQc/iXISQ7JGECggEAK2wyziRpBq4N0og/c6BY +STQoooJWdOMHXUL1wnPsUQ+0O99foxKC/Joc0NLqwk4P1CfZ89OeVp1ZgRBQx6fe +ZWBkc0NlWLaFindARRj4PFd0tDfkwKFVMDkfpwlH7Tb7XXm1THt5vFiKPvX2Cc5g +eC8SGM9NXMBdzbiL4Kf/hJrL7GY3s7lynov/mSQsdvmpxCHbWDzl5XJ+1benoe2b +gYtu+wuzu/1TlcxKPteSk89OK/BeEjdWMqRVJEHfcgyAsiuOyaNU3AuzXmH5j/xn +He70EqlOVrCUFbh00BdzSG3665qW0UFL+9HtGJ1rqu5Gs0HHCxo4OQo/vfr9Syrv +cQKCAQBjuD6HeiBXtqxeSQup1AcVozgwLMelNBxEZL1qABEpt/QkeACWmabyYERa +Ef3fBzhu0OpLWpKTna6HkaLsq+kJDDxhKpxwn6cmDDtiC5eujjyEg+howV7At30Q +DYr0CwcZgcd9z+rBOcH0grmuSEMWITQ2lpXajZ0cokBV5dZf9V004ti+lYXD3wty +nGn+be9tXJP3AC9P/Q5eobhzf1TV/GBmY8Sp/nOQtF1aDGwamIP91eYBxg61ahcg +0QMetoWE/6DFWViV06mY4O1uENx0PyPMpvEigtRxA1SacBkqDnNQBkY30vnHjcc9 +FnTPP9p1YjFK3qgMYpdxnjdz3Jye -----END PRIVATE KEY----- diff --git a/mocked_servers/https/certificates/ssl/ca-bundle.crt b/mocked_servers/https/certificates/ssl/ca-bundle.crt index 2e3975dd7..a5238397e 100644 --- a/mocked_servers/https/certificates/ssl/ca-bundle.crt +++ b/mocked_servers/https/certificates/ssl/ca-bundle.crt @@ -3807,37 +3807,38 @@ MdRAGmI0Nj81Aa6sY6A= # mocked_servers -----BEGIN CERTIFICATE----- -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 -7DO0FrOkej+PfRyyTYUFWB/3eA== +MIIGOTCCBCGgAwIBAgIUfh1CjUYQ7z/ijTtG3uBAkVgEDzQwDQYJKoZIhvcNAQEL +BQAwgaAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYDVQQH +DAdTZWF0dGxlMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxFjAUBgNVBAsMDUlU +IERlcGFydG1lbnQxIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20x +FDASBgNVBAMMC2V4YW1wbGUuY29tMB4XDTIzMTExNjIwNDMzM1oXDTI0MTExNTIw +NDMzM1owgaAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYD +VQQHDAdTZWF0dGxlMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxFjAUBgNVBAsM +DUlUIERlcGFydG1lbnQxIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5j +b20xFDASBgNVBAMMC2V4YW1wbGUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A +MIICCgKCAgEAlsJzdYaUECq8ni0Aw7X75x/zVT6BqPgRbnIaZpl/F1P/MnSgshCh +/QyrgqfzyIYy60DhObUSmVTUIfIoeQnNfk4p+8ftVzxsDhbL/q2VymMYsTD8o9AX +vDma9ZY/kjW4AQrRvJ/3MdB/13iL5gBCHMERntvA15kdzt5zpxfvoqd0T7YQjK0T +pr10uM3gNyLXLlgjjkkDs9j4E52QxV+uGtojHvUwGKNPrBAUY7ZvcwhfLahFzV0m +9LRmybIOLFBz5IaxkMik/rA4x37svJyOcCklZmg1D0JSgqpxCnSMJZgqINUlNysg +D03rZbHsH9NKEPYzwk5z1XBSEs2YnzmhKYExYaI3zhCKCvpfRXhiqYl8qWFNpDS1 +qbHz328ivvRjSTkFoLJkJ7jbP87Ej45qy9XNuDP9JRtrosUa+W0PXEolNdtdDGnx +JfHF3a6eyQAXSrxNeccQY0ooWCE0WEblxGh+QhDB26M1qaQKW75P2JgvTfCBfH3v +lHsknCSa+Q2J1Xb4Wv/ie3SpYth/6lCCaz3NZYmNoLcqxy1ChIg2nNjJVIr4A7vw +8sZtMQFUWTEWsYT5KBtfmb62WoVlxuYOmDpnGnzlBKjqU3gveH79VNsOtwVcTtWa +VUGi5BXQZeMlZ9MNcXTrX8h2McP4KQOCmGxOrT3V314gbzEL5bCWa28CAwEAAaNp +MGcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwLgYDVR0RBCcwJYIJbG9jYWxob3N0 +ggkxMjcuMC4wLjGCDW1vY2tlZC1zZXJ2ZXIwHQYDVR0OBBYEFNyh1L9EidPDmnHF +brpV6nn2TsqIMA0GCSqGSIb3DQEBCwUAA4ICAQBCieFXGDwaKkrCVaS+K0cDh2cH +gbGzhHQpuGLYHl9PR3MvSCWHgakLQjXMF3fCimHEgsUtBpvyJUqCKv6wR1RU20t/ +on/JABj8/ULgPkgEo0pQlS3mEJKgbK1grytKbVRMALW12BMTE6dHkopEW2sW3N1S +PTNnq5xdYKYyQ9bJIrDorh8nQ6Hg6MG0d6wK/1Tj2t02MQSw9HNBJ8TLGls+s5wJ +v0JKDPkhSd9MQ/hX26A7Gc6zzSclypMgDQvzx4YtAgCEfGVfq/J1LB+1h/PDjeKi +y9PJ0cj4bzhn6/y8G/SAnJDxhOdE2X6hox7tHungJeC36XLuxl+6qwVbG35Q5oXn +7NFe5q+wM9S94/v9E50t2Ib16cyDc/QSJ96YxIDUCMSYwtUDlwbE/Pqw1oiHbsV3 +DX4iTjQFtfZ2QS1QXMUe4ME6AYhMwu4S3Vj+9aDCQRBZRa8hcIPJ1XoqC7gDw600 +njksyHZuZjTGBqQSl5uwuyy9PMVswjywtdVT+/tqsHl9VrU4NY/F3dfZlvFetbgP +cxjefZv4+oAzKueNQr8t0d/wnJxUyYbzxiXuGzjQ9yUFjXJDidpQNcYhGB8fcYJn +gsAPJJDhJCzQE9RJnQc4Ul+9X2gbRhZ2ZQUp8WHCK7MzBgPBg8U83D0RSGuoeT2F +ytHr0UPUg2n2rDIJCA== -----END CERTIFICATE----- diff --git a/mocked_servers/https/certificates/ssl/certificate.crt b/mocked_servers/https/certificates/ssl/certificate.crt index cd24dde3f..b8d9bfdd6 100644 --- a/mocked_servers/https/certificates/ssl/certificate.crt +++ b/mocked_servers/https/certificates/ssl/certificate.crt @@ -1,35 +1,36 @@ -----BEGIN CERTIFICATE----- -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 -7DO0FrOkej+PfRyyTYUFWB/3eA== +MIIGOTCCBCGgAwIBAgIUfh1CjUYQ7z/ijTtG3uBAkVgEDzQwDQYJKoZIhvcNAQEL +BQAwgaAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYDVQQH +DAdTZWF0dGxlMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxFjAUBgNVBAsMDUlU +IERlcGFydG1lbnQxIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20x +FDASBgNVBAMMC2V4YW1wbGUuY29tMB4XDTIzMTExNjIwNDMzM1oXDTI0MTExNTIw +NDMzM1owgaAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYD +VQQHDAdTZWF0dGxlMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxFjAUBgNVBAsM +DUlUIERlcGFydG1lbnQxIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5j +b20xFDASBgNVBAMMC2V4YW1wbGUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A +MIICCgKCAgEAlsJzdYaUECq8ni0Aw7X75x/zVT6BqPgRbnIaZpl/F1P/MnSgshCh +/QyrgqfzyIYy60DhObUSmVTUIfIoeQnNfk4p+8ftVzxsDhbL/q2VymMYsTD8o9AX +vDma9ZY/kjW4AQrRvJ/3MdB/13iL5gBCHMERntvA15kdzt5zpxfvoqd0T7YQjK0T +pr10uM3gNyLXLlgjjkkDs9j4E52QxV+uGtojHvUwGKNPrBAUY7ZvcwhfLahFzV0m +9LRmybIOLFBz5IaxkMik/rA4x37svJyOcCklZmg1D0JSgqpxCnSMJZgqINUlNysg +D03rZbHsH9NKEPYzwk5z1XBSEs2YnzmhKYExYaI3zhCKCvpfRXhiqYl8qWFNpDS1 +qbHz328ivvRjSTkFoLJkJ7jbP87Ej45qy9XNuDP9JRtrosUa+W0PXEolNdtdDGnx +JfHF3a6eyQAXSrxNeccQY0ooWCE0WEblxGh+QhDB26M1qaQKW75P2JgvTfCBfH3v +lHsknCSa+Q2J1Xb4Wv/ie3SpYth/6lCCaz3NZYmNoLcqxy1ChIg2nNjJVIr4A7vw +8sZtMQFUWTEWsYT5KBtfmb62WoVlxuYOmDpnGnzlBKjqU3gveH79VNsOtwVcTtWa +VUGi5BXQZeMlZ9MNcXTrX8h2McP4KQOCmGxOrT3V314gbzEL5bCWa28CAwEAAaNp +MGcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwLgYDVR0RBCcwJYIJbG9jYWxob3N0 +ggkxMjcuMC4wLjGCDW1vY2tlZC1zZXJ2ZXIwHQYDVR0OBBYEFNyh1L9EidPDmnHF +brpV6nn2TsqIMA0GCSqGSIb3DQEBCwUAA4ICAQBCieFXGDwaKkrCVaS+K0cDh2cH +gbGzhHQpuGLYHl9PR3MvSCWHgakLQjXMF3fCimHEgsUtBpvyJUqCKv6wR1RU20t/ +on/JABj8/ULgPkgEo0pQlS3mEJKgbK1grytKbVRMALW12BMTE6dHkopEW2sW3N1S +PTNnq5xdYKYyQ9bJIrDorh8nQ6Hg6MG0d6wK/1Tj2t02MQSw9HNBJ8TLGls+s5wJ +v0JKDPkhSd9MQ/hX26A7Gc6zzSclypMgDQvzx4YtAgCEfGVfq/J1LB+1h/PDjeKi +y9PJ0cj4bzhn6/y8G/SAnJDxhOdE2X6hox7tHungJeC36XLuxl+6qwVbG35Q5oXn +7NFe5q+wM9S94/v9E50t2Ib16cyDc/QSJ96YxIDUCMSYwtUDlwbE/Pqw1oiHbsV3 +DX4iTjQFtfZ2QS1QXMUe4ME6AYhMwu4S3Vj+9aDCQRBZRa8hcIPJ1XoqC7gDw600 +njksyHZuZjTGBqQSl5uwuyy9PMVswjywtdVT+/tqsHl9VrU4NY/F3dfZlvFetbgP +cxjefZv4+oAzKueNQr8t0d/wnJxUyYbzxiXuGzjQ9yUFjXJDidpQNcYhGB8fcYJn +gsAPJJDhJCzQE9RJnQc4Ul+9X2gbRhZ2ZQUp8WHCK7MzBgPBg8U83D0RSGuoeT2F +ytHr0UPUg2n2rDIJCA== -----END CERTIFICATE----- diff --git a/mocked_servers/https/go.mod b/mocked_servers/https/go.mod index efc4280bd..ea6b26cbf 100644 --- a/mocked_servers/https/go.mod +++ b/mocked_servers/https/go.mod @@ -2,4 +2,4 @@ module github.com/aws-observability/aws-otel-test-framework/mockedservers/https go 1.19 -require github.com/gorilla/mux v1.8.0 +require github.com/gorilla/mux v1.8.1 diff --git a/mocked_servers/https/go.sum b/mocked_servers/https/go.sum index 535028803..712833743 100644 --- a/mocked_servers/https/go.sum +++ b/mocked_servers/https/go.sum @@ -1,2 +1,2 @@ -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= diff --git a/sample-apps/jaeger-zipkin-sample-app/build.gradle b/sample-apps/jaeger-zipkin-sample-app/build.gradle index 36e76d6b5..469891720 100644 --- a/sample-apps/jaeger-zipkin-sample-app/build.gradle +++ b/sample-apps/jaeger-zipkin-sample-app/build.gradle @@ -36,10 +36,10 @@ application { dependencies { implementation "com.sparkjava:spark-core:2.9.4" - implementation "com.squareup.okhttp3:okhttp:4.11.0" - implementation "software.amazon.awssdk:s3:2.20.162" - implementation "io.grpc:grpc-api:1.58.0" - implementation "io.grpc:grpc-netty-shaded:1.58.0" + implementation "com.squareup.okhttp3:okhttp:4.12.0" + implementation "software.amazon.awssdk:s3:2.21.27" + implementation "io.grpc:grpc-api:1.59.0" + implementation "io.grpc:grpc-netty-shaded:1.59.0" implementation "org.slf4j:slf4j-simple:2.0.9" implementation project(":trace-java-client") diff --git a/terraform/ec2/amis.tf b/terraform/ec2/amis.tf index e6162878d..299846841 100644 --- a/terraform/ec2/amis.tf +++ b/terraform/ec2/amis.tf @@ -248,6 +248,34 @@ while sudo fuser {/var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock,/var/lib/d done sudo dpkg -i amazon-ssm-agent.deb sudo systemctl enable amazon-ssm-agent +EOF + } + #AL3 + amazonlinux3 = { + os_family = "amazon_linux" + ami_search_pattern = "al2023-ami-2023*" + ami_owner = "amazon" + ami_product_code = [] + family = "linux" + arch = "amd64" + login_user = "ec2-user" + user_data = < validationConfigList = new ConfigLoadHelper().loadConfigFromFile(configPath); - // run validation validate(context, validationConfigList); - Instant endTime = Instant.now(); Duration duration = Duration.between(startTime, endTime); log.info("Validation has completed in {} minutes.", duration.toMinutes()); diff --git a/validator/src/main/java/com/amazon/aoc/exception/ExceptionCode.java b/validator/src/main/java/com/amazon/aoc/exception/ExceptionCode.java index 76f4554d9..0b8ca4cdf 100644 --- a/validator/src/main/java/com/amazon/aoc/exception/ExceptionCode.java +++ b/validator/src/main/java/com/amazon/aoc/exception/ExceptionCode.java @@ -37,6 +37,7 @@ public enum ExceptionCode { NOT_ENOUGH_SPANS(50010, "not enough spans in the trace"), COLLECTOR_ID_NOT_MATCHED(50011, "span collector-id attribute does not match"), NULL_VAR(50012, "variable is null"), + EXPECTED_LOG_NOT_FOUND(50013, "expected log not found"), // build validator VALIDATION_TYPE_NOT_EXISTED(60001, "validation type not existed"), diff --git a/validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java b/validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java index e4819066e..b7d04723c 100644 --- a/validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java +++ b/validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java @@ -77,6 +77,7 @@ public enum PredefinedExpectedTemplate implements FileConfig { CONTAINER_INSIGHT_ECS_LOG("/expected-data-template/container-insight/ecs/ecs-instance"), CONTAINER_INSIGHT_ECS_PROMETHEUS_LOG("/expected-data-template/container-insight/ecs/prometheus"), CONTAINER_INSIGHT_FARGATE_EKS_LOG("/expected-data-template/container-insight/eks/fargate"), + DEFAULT_EXPECTED_LOG("/expected-data-template/otlp/otlp-log.json"), ; private String path; diff --git a/validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java b/validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java new file mode 100644 index 000000000..f6ac3193e --- /dev/null +++ b/validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java @@ -0,0 +1,139 @@ +package com.amazon.aoc.validators; + +import com.amazon.aoc.callers.ICaller; +import com.amazon.aoc.exception.BaseException; +import com.amazon.aoc.exception.ExceptionCode; +import com.amazon.aoc.fileconfigs.FileConfig; +import com.amazon.aoc.helpers.MustacheHelper; +import com.amazon.aoc.helpers.RetryHelper; +import com.amazon.aoc.models.Context; +import com.amazon.aoc.models.ValidationConfig; +import com.amazon.aoc.services.CloudWatchService; +import com.amazonaws.services.logs.model.OutputLogEvent; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.fge.jsonschema.main.JsonSchema; +import com.github.fge.jsonschema.main.JsonSchemaFactory; +import com.github.fge.jsonschema.report.ListReportProvider; +import com.github.fge.jsonschema.report.LogLevel; +import com.github.fge.jsonschema.report.ProcessingReport; +import com.github.fge.jsonschema.util.JsonLoader; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.*; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +public class CWLogValidator implements IValidator { + + protected String logStreamName = "otlp-logs"; + + private static final String LOGGROUPPATH = "/aws/ecs/otlp/%s/logs"; + + protected CloudWatchService cloudWatchService; + private static final int CHECK_INTERVAL_IN_MILLI = 30 * 1000; + private static final int CHECK_DURATION_IN_SECONDS = 2 * 60; + private static int MAX_RETRY_COUNT = 12; + private static final int QUERY_LIMIT = 100; + private JsonSchema schema; + protected String logGroupName; + + private ICaller caller; + + private Context context; + private String templateInput; + + private ProcessingReport processingReport = null; + + protected final ObjectMapper mapper = new ObjectMapper(); + + @Override + public void init( + Context context, + ValidationConfig validationConfig, + ICaller caller, + FileConfig expectedDataTemplate) + throws Exception { + this.context = context; + this.caller = caller; + cloudWatchService = new CloudWatchService(context.getRegion()); + logGroupName = String.format(LOGGROUPPATH, context.getTestingId()); + MustacheHelper mustacheHelper = new MustacheHelper(); + this.templateInput = mustacheHelper.render(expectedDataTemplate, context); + JsonNode jsonNode = JsonLoader.fromString(templateInput); + JsonSchemaFactory jsonSchemaFactory = + JsonSchemaFactory.newBuilder() + .setReportProvider(new ListReportProvider(LogLevel.INFO, LogLevel.FATAL)) + .freeze(); + JsonSchema jsonSchema = jsonSchemaFactory.getJsonSchema(jsonNode); + this.schema = jsonSchema; + } + + @Override + public void validate() throws Exception { + if (caller != null) { + caller.callSampleApp(); + } + RetryHelper.retry( + getMaxRetryCount(), + CHECK_INTERVAL_IN_MILLI, + true, + () -> { + Instant startTime = + Instant.now().minusSeconds(CHECK_DURATION_IN_SECONDS).truncatedTo(ChronoUnit.MINUTES); + fetchAndValidateLogs(startTime); + }); + } + + protected void fetchAndValidateLogs(Instant startTime) throws Exception { + List logEvents = + cloudWatchService.getLogs( + logGroupName, logStreamName, startTime.toEpochMilli(), QUERY_LIMIT); + if (logEvents.isEmpty()) { + throw new BaseException( + ExceptionCode.LOG_FORMAT_NOT_MATCHED, + String.format( + "[StructuredLogValidator] no logs found under log stream %s" + " in log group %s", + logStreamName, logGroupName)); + } + for (OutputLogEvent logEvent : logEvents) { + if (logEvent.getMessage().contains("Executing outgoing-http-call")) { + validateJsonSchema(logEvent.getMessage()); + } + } + if (processingReport == null || !processingReport.isSuccess()) { + throw new BaseException(ExceptionCode.EXPECTED_LOG_NOT_FOUND); + } + } + + protected void validateJsonSchema(String logEventMsg) throws Exception { + JsonNode logEventNode = mapper.readTree(logEventMsg); + if (schema != null) { + processingReport = schema.validate(JsonLoader.fromString(logEventNode.toString())); + if (processingReport.isSuccess()) { + log.info("Report was a success"); + } else { + log.info("[StructuredLogValidator] failed to validate schema \n"); + log.info(processingReport.toString() + "\n"); + log.info(("Actual Message: " + logEventMsg)); + log.info("Expected Schema: " + templateInput); + } + } + } + + protected int getMaxRetryCount() { + return MAX_RETRY_COUNT; + } + + protected ProcessingReport getProcessingReport() { + return processingReport; + } + + public void setCloudWatchService(CloudWatchService cloudWatchService) { + this.cloudWatchService = cloudWatchService; + } + + public void setMaxRetryCount(int maxRetryCount) { + this.MAX_RETRY_COUNT = maxRetryCount; + } +} diff --git a/validator/src/main/java/com/amazon/aoc/validators/ValidatorFactory.java b/validator/src/main/java/com/amazon/aoc/validators/ValidatorFactory.java index e0da615c8..872697432 100644 --- a/validator/src/main/java/com/amazon/aoc/validators/ValidatorFactory.java +++ b/validator/src/main/java/com/amazon/aoc/validators/ValidatorFactory.java @@ -54,6 +54,10 @@ public IValidator launchValidator(ValidationConfig validationConfig) throws Exce validator = new CWMetricValidator(); expectedData = validationConfig.getExpectedMetricTemplate(); break; + case "cw-logs": + validator = new CWLogValidator(); + expectedData = validationConfig.getExpectedLogStructureTemplate(); + break; case "ecs-describe-task": validator = new ECSHealthCheckValidator(new TaskService(), 10); expectedData = validationConfig.getExpectedMetricTemplate(); diff --git a/validator/src/main/resources/expected-data-template/otlp/otlp-log.json b/validator/src/main/resources/expected-data-template/otlp/otlp-log.json new file mode 100644 index 000000000..09340eab0 --- /dev/null +++ b/validator/src/main/resources/expected-data-template/otlp/otlp-log.json @@ -0,0 +1,32 @@ +{ + "title": "structured log schema", + "description": "json schema for the container insights receiver ECS EC2 structured log", + "type": "object", + + "properties": { + "body": {}, + "severity_number": {}, + "severity_text": {}, + "flags": {}, + "trace_id": {}, + "span_id": {}, + "resource": { + "properties": { + "service.name": {} + }, + "required": [ + "service.name" + ] + } + }, + "required": [ + "body", + "severity_number", + "severity_text", + "flags", + "trace_id", + "span_id", + "resource" + ], + "additionalProperties": true +} diff --git a/validator/src/main/resources/validations/spark-otel-log-validation.yml b/validator/src/main/resources/validations/spark-otel-log-validation.yml new file mode 100644 index 000000000..41a9f52af --- /dev/null +++ b/validator/src/main/resources/validations/spark-otel-log-validation.yml @@ -0,0 +1,6 @@ +- + validationType: "cw-logs" + httpPath: "/outgoing-http-call" + httpMethod: "get" + callingType: "http" + expectedLogStructureTemplate: "DEFAULT_EXPECTED_LOG" diff --git a/validator/src/test/java/com/amazon/aoc/validators/CWLogValidatorTest.java b/validator/src/test/java/com/amazon/aoc/validators/CWLogValidatorTest.java new file mode 100644 index 000000000..e217a3205 --- /dev/null +++ b/validator/src/test/java/com/amazon/aoc/validators/CWLogValidatorTest.java @@ -0,0 +1,148 @@ +package com.amazon.aoc.validators; + +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import com.amazon.aoc.callers.HttpCaller; +import com.amazon.aoc.exception.BaseException; +import com.amazon.aoc.exception.ExceptionCode; +import com.amazon.aoc.models.CloudWatchContext; +import com.amazon.aoc.models.Context; +import com.amazon.aoc.models.SampleAppResponse; +import com.amazon.aoc.models.ValidationConfig; +import com.amazon.aoc.services.CloudWatchService; +import com.amazonaws.services.logs.model.OutputLogEvent; +import java.util.ArrayList; +import java.util.List; +import org.junit.Test; + +public class CWLogValidatorTest { + @Test + public void testSuccessfullLogMessage() throws Exception { + ValidationConfig validationConfig = new ValidationConfig(); + validationConfig.setCallingType("http"); + validationConfig.setExpectedLogStructureTemplate( + "file://" + + System.getProperty("user.dir") + + "/src/main/resources/expected-data-template/otlp/otlp-log.json"); + Context context = initContext(); + + String message = + "{\n" + + " \"body\": \"Executing outgoing-http-call\",\n" + + " \"severity_number\": 9,\n" + + " \"severity_text\": \"INFO\",\n" + + " \"flags\": 1,\n" + + " \"trace_id\": \"6541324dc3026f11c99345889da1a47d\",\n" + + " \"span_id\": \"c6f853c5f487c5e6\",\n" + + " \"resource\": {\n" + + " \"service.name\": \"aws-otel-integ-test\"}}"; + + OutputLogEvent outputLogEvent = new OutputLogEvent(); + outputLogEvent.setMessage(message); + List eventList = new ArrayList<>(); + eventList.add(outputLogEvent); + runValidation(validationConfig, context, eventList); + } + + @Test + public void testFailedNoTraceId() throws Exception { + ValidationConfig validationConfig = new ValidationConfig(); + validationConfig.setCallingType("http"); + validationConfig.setExpectedLogStructureTemplate( + "file://" + + System.getProperty("user.dir") + + "/src/main/resources/expected-data-template/otlp/otlp-log.json"); + Context context = initContext(); + + String message = + "{\n" + + " \"body\": \"Executing outgoing-http-call\",\n" + + " \"severity_number\": 9,\n" + + " \"severity_text\": \"INFO\",\n" + + " \"flags\": 1,\n" + + " \"span_id\": \"c6f853c5f487c5e6\",\n" + + " \"resource\": {\n" + + " \"service.name\": \"aws-otel-integ-test\"}}"; + + OutputLogEvent outputLogEvent = new OutputLogEvent(); + outputLogEvent.setMessage(message); + List eventList = new ArrayList<>(); + eventList.add(outputLogEvent); + BaseException e = + assertThrows( + BaseException.class, () -> runValidation(validationConfig, context, eventList)); + assertEquals(e.getCode(), ExceptionCode.EXPECTED_LOG_NOT_FOUND.getCode()); + } + + @Test + public void testFailedNullReport() throws Exception { + ValidationConfig validationConfig = new ValidationConfig(); + validationConfig.setCallingType("http"); + validationConfig.setExpectedLogStructureTemplate( + "file://" + + System.getProperty("user.dir") + + "/src/main/resources/expected-data-template/otlp/otlp-log.json"); + Context context = initContext(); + + String message = + "{\n" + + " \"body\": \"bad-body\",\n" + + " \"severity_number\": 9,\n" + + " \"severity_text\": \"INFO\",\n" + + " \"flags\": 1,\n" + + " \"trace_id\": \"6541324dc3026f11c99345889da1a47d\",\n" + + " \"span_id\": \"c6f853c5f487c5e6\",\n" + + " \"resource\": {\n" + + " \"service.name\": \"aws-otel-integ-test\"}}"; + + OutputLogEvent outputLogEvent = new OutputLogEvent(); + outputLogEvent.setMessage(message); + List eventList = new ArrayList<>(); + eventList.add(outputLogEvent); + BaseException e = + assertThrows( + BaseException.class, () -> runValidation(validationConfig, context, eventList)); + assertEquals(e.getCode(), ExceptionCode.EXPECTED_LOG_NOT_FOUND.getCode()); + } + + private Context initContext() { + // fake vars + String namespace = "fakednamespace"; + String testingId = "fakedTesingId"; + String region = "us-west-2"; + + // faked context + Context context = new Context(testingId, region, false, true); + context.setMetricNamespace(namespace); + context.setCloudWatchContext(new CloudWatchContext()); + context.getCloudWatchContext().setIgnoreEmptyDimSet(false); + return context; + } + + private CWLogValidator runValidation( + ValidationConfig validationConfig, Context context, List mockActualEvents) + throws Exception { + // fake and mock a http caller + String traceId = "fakedtraceid"; + HttpCaller httpCaller = mock(HttpCaller.class); + SampleAppResponse sampleAppResponse = new SampleAppResponse(); + sampleAppResponse.setTraceId(traceId); + when(httpCaller.callSampleApp()).thenReturn(sampleAppResponse); + + CloudWatchService cloudWatchService = mock(CloudWatchService.class); + + when(cloudWatchService.getLogs(any(), any(), anyLong(), anyInt())).thenReturn(mockActualEvents); + + // start validation + CWLogValidator validator = new CWLogValidator(); + validator.init( + context, validationConfig, httpCaller, validationConfig.getExpectedLogStructureTemplate()); + validator.setCloudWatchService(cloudWatchService); + validator.setMaxRetryCount(1); + validator.validate(); + return validator; + } +}