From e39c2abf6f29595a00c9882cc044b5efdff46ebd Mon Sep 17 00:00:00 2001 From: Nick Hinsch Date: Thu, 1 Apr 2021 16:06:40 -0400 Subject: [PATCH 1/2] Use shared deployment bucket --- tests/integration/package.json | 1 + tests/integration/serverless.yml | 6 ++++ tests/integration/yarn.lock | 52 ++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/tests/integration/package.json b/tests/integration/package.json index 9dcad1b4..2de4c256 100644 --- a/tests/integration/package.json +++ b/tests/integration/package.json @@ -1,5 +1,6 @@ { "devDependencies": { + "serverless-deployment-bucket": "^1.4.1", "serverless-plugin-datadog": "^2.18.0" } } diff --git a/tests/integration/serverless.yml b/tests/integration/serverless.yml index 08dfb444..b510b87d 100644 --- a/tests/integration/serverless.yml +++ b/tests/integration/serverless.yml @@ -12,10 +12,16 @@ provider: DD_API_KEY: ${env:DD_API_KEY} lambdaHashingVersion: 20201221 timeout: 15 + deploymentBucket: + name: integration-tests-deployment-bucket iam: # IAM permissions require that all functions are deployed with this role role: "arn:aws:iam::601427279990:role/serverless-integration-test-lambda-role" +custom: + deploymentBucket: + blockPublicAccess: true + layers: python27: package: diff --git a/tests/integration/yarn.lock b/tests/integration/yarn.lock index 867a90ab..d950d629 100644 --- a/tests/integration/yarn.lock +++ b/tests/integration/yarn.lock @@ -2,7 +2,59 @@ # yarn lockfile v1 +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +serverless-deployment-bucket@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/serverless-deployment-bucket/-/serverless-deployment-bucket-1.4.1.tgz#86546d93ae7bdd18772275a0de8561a2a41ab682" + integrity sha512-Tc9I3wavtfQqlT5SR3wAFNnerw/EVt9x/uMWV12eEzG7PAWmbxhKZtasqYjpoDOOf53k7JkOwJ7ggd7VzC7OEA== + dependencies: + chalk "^2.4.2" + serverless-plugin-datadog@^2.18.0: version "2.18.0" resolved "https://registry.yarnpkg.com/serverless-plugin-datadog/-/serverless-plugin-datadog-2.18.0.tgz#8af9903f0867eaac4789c3908e100f4c0e11c578" integrity sha512-RUdCNjUk+uUKQYgQBjK0WNeYJ7lM2/RScqg/LjVSfv5EACeJ3iIUPz1c4bS2jtiH05al8qXudNb6QDkv9zxG7w== + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" From 8d739fd9be6c7bc0a3a0477b6072631e9c259331 Mon Sep 17 00:00:00 2001 From: Nick Hinsch Date: Thu, 1 Apr 2021 16:14:00 -0400 Subject: [PATCH 2/2] Remove plugin --- tests/integration/package.json | 1 - tests/integration/serverless.yml | 4 --- tests/integration/yarn.lock | 52 -------------------------------- 3 files changed, 57 deletions(-) diff --git a/tests/integration/package.json b/tests/integration/package.json index 2de4c256..9dcad1b4 100644 --- a/tests/integration/package.json +++ b/tests/integration/package.json @@ -1,6 +1,5 @@ { "devDependencies": { - "serverless-deployment-bucket": "^1.4.1", "serverless-plugin-datadog": "^2.18.0" } } diff --git a/tests/integration/serverless.yml b/tests/integration/serverless.yml index b510b87d..7c659a27 100644 --- a/tests/integration/serverless.yml +++ b/tests/integration/serverless.yml @@ -18,10 +18,6 @@ provider: # IAM permissions require that all functions are deployed with this role role: "arn:aws:iam::601427279990:role/serverless-integration-test-lambda-role" -custom: - deploymentBucket: - blockPublicAccess: true - layers: python27: package: diff --git a/tests/integration/yarn.lock b/tests/integration/yarn.lock index d950d629..867a90ab 100644 --- a/tests/integration/yarn.lock +++ b/tests/integration/yarn.lock @@ -2,59 +2,7 @@ # yarn lockfile v1 -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -serverless-deployment-bucket@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/serverless-deployment-bucket/-/serverless-deployment-bucket-1.4.1.tgz#86546d93ae7bdd18772275a0de8561a2a41ab682" - integrity sha512-Tc9I3wavtfQqlT5SR3wAFNnerw/EVt9x/uMWV12eEzG7PAWmbxhKZtasqYjpoDOOf53k7JkOwJ7ggd7VzC7OEA== - dependencies: - chalk "^2.4.2" - serverless-plugin-datadog@^2.18.0: version "2.18.0" resolved "https://registry.yarnpkg.com/serverless-plugin-datadog/-/serverless-plugin-datadog-2.18.0.tgz#8af9903f0867eaac4789c3908e100f4c0e11c578" integrity sha512-RUdCNjUk+uUKQYgQBjK0WNeYJ7lM2/RScqg/LjVSfv5EACeJ3iIUPz1c4bS2jtiH05al8qXudNb6QDkv9zxG7w== - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0"