Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(infra): remove logging stack as that is now handled internally #1701

Merged
merged 1 commit into from
Jun 25, 2021
Merged

feat(infra): remove logging stack as that is now handled internally #1701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/_infra/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"@aws-cdk/core": ">=1.100.0",
"@basemaps/lambda-tiler": "^6.2.0",
"@basemaps/shared": "^6.1.0",
"@linzjs/cdk-elastic-shipper": "^0.6.2",
"aws-cdk": "^1.100.0"
}
}
3 changes: 0 additions & 3 deletions packages/_infra/src/deploy.env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,4 @@ export const DeployEnv = {

/** TLS certificate to use with Cloudfront */
CloudFrontTlsCertArn: 'CLOUDFRONT_CERTIFICATE_ARN',

/** Allow another account to write logs into our bucket */
LogAccountId: 'LOG_ACCOUNT_ID',
};
3 changes: 0 additions & 3 deletions packages/_infra/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { CogBuilderStack } from './cogify';
import { BaseMapsRegion } from './config';
import { DeployEnv } from './deploy.env';
import { EdgeStack } from './edge';
import { LoggingStack } from './log';
import { getEdgeParameters } from './parameters';
import { ServeStack } from './serve';

Expand All @@ -15,8 +14,6 @@ async function main(): Promise<void> {
/** Using VPC lookups requires a hard coded AWS "account" */
const account = Env.get(DeployEnv.CdkAccount);

new LoggingStack(basemaps, 'Logging', { env: { region: BaseMapsRegion, account } });

/**
* Because we are using Lambda@Edge the edge stack has to be deployed into us-east-1,
* The dynamoDb table needs to be close to our users that has to be deployed in ap-southeast-2
Expand Down
13 changes: 0 additions & 13 deletions packages/_infra/src/log/__test__/log.filter.test.ts
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions packages/_infra/src/log/index.ts
View file
Open in desktop

This file was deleted.

69 changes: 9 additions & 60 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
# yarn lockfile v1


"@acuris/aws-es-connection@^1.1.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@acuris/aws-es-connection/-/aws-es-connection-1.1.2.tgz#97a80cb074b72918838e7e28ecd63405b6f4d9ec"
integrity sha512-WbRVFKepjhhQjo21raAaa/Ijdw+eyNzaTrVqtBQGY71ZABlP5ZLUHjupl7CErKLKdlD7Mkg/b3pFAEovzkCaJQ==
dependencies:
aws4 "^1.8.0"

"@aws-cdk/assets@1.100.0":
version "1.100.0"
resolved "https://registry.yarnpkg.com/@aws-cdk/assets/-/assets-1.100.0.tgz#7911072a9314730168c6b5d81ed927dfd0ff6558"
Expand Down Expand Up @@ -230,7 +223,7 @@
"@aws-cdk/custom-resources" "1.100.0"
constructs "^3.3.69"

"@aws-cdk/aws-ec2@1.100.0", "@aws-cdk/aws-ec2@> 1.53.0":
"@aws-cdk/aws-ec2@1.100.0":
version "1.100.0"
resolved "https://registry.yarnpkg.com/@aws-cdk/aws-ec2/-/aws-ec2-1.100.0.tgz#4d0e41a5a219e4295365f9c2e8572f013a65eaa1"
integrity sha512-TFD8aA+xoMI6nlolSjE2NkjZRq529Qzb4lCgmzjAx64Ar7cAF4PK5x3E0gDQaJm5zCWYmJAxh3ps73Z1hqmQqw==
Expand Down Expand Up @@ -434,7 +427,7 @@
"@aws-cdk/cx-api" "1.100.0"
constructs "^3.3.69"

"@aws-cdk/aws-lambda-event-sources@> 1.53.0", "@aws-cdk/aws-lambda-event-sources@>=1.100.0":
"@aws-cdk/aws-lambda-event-sources@>=1.100.0":
version "1.100.0"
resolved "https://registry.yarnpkg.com/@aws-cdk/aws-lambda-event-sources/-/aws-lambda-event-sources-1.100.0.tgz#9ed29f429a01e0e08a0444a9701855de8ee608f4"
integrity sha512-ym71s1fH25vQCkWgZGK39WIYNbpJ4hQpQ1xxSnEXUkrhMQd+jtCg7OlC/65YlRdZyPLpY0Uo3QkBIWXgmn3mQg==
Expand All @@ -455,7 +448,7 @@
"@aws-cdk/core" "1.100.0"
constructs "^3.3.69"

"@aws-cdk/aws-lambda@1.100.0", "@aws-cdk/aws-lambda@> 1.53.0":
"@aws-cdk/aws-lambda@1.100.0":
version "1.100.0"
resolved "https://registry.yarnpkg.com/@aws-cdk/aws-lambda/-/aws-lambda-1.100.0.tgz#d4a77a8fd5511e4e0136de34030a22510808fe98"
integrity sha512-v+CwVunBqL/kmhNtu4UrZtP45PnvhZNUEu72DGwyrTyd6vGn7CnOF9l8uO9G2YfI5oSvQGFkdAT6NBLQzfTZ4Q==
Expand Down Expand Up @@ -549,7 +542,7 @@
"@aws-cdk/core" "1.100.0"
constructs "^3.3.69"

"@aws-cdk/aws-s3@1.100.0", "@aws-cdk/aws-s3@> 1.53.0", "@aws-cdk/aws-s3@>=1.100.0":
"@aws-cdk/aws-s3@1.100.0", "@aws-cdk/aws-s3@>=1.100.0":
version "1.100.0"
resolved "https://registry.yarnpkg.com/@aws-cdk/aws-s3/-/aws-s3-1.100.0.tgz#072fa0a3e6e3a8dd5cd4e087dd9ec128bd94c8ae"
integrity sha512-gbdRpgnl2mw2Gl3LVmJaTVdQaCqbXYDN9P0DCAl4zXACOdNsHHP8jNYcJfh8wDDWDpJTLm/V2sKHOY01e1xH+w==
Expand Down Expand Up @@ -689,7 +682,7 @@
string-width "^4.2.2"
table "^6.1.0"

"@aws-cdk/core@1.100.0", "@aws-cdk/core@> 1.53.0", "@aws-cdk/core@>=1.100.0":
"@aws-cdk/core@1.100.0", "@aws-cdk/core@>=1.100.0":
version "1.100.0"
resolved "https://registry.yarnpkg.com/@aws-cdk/core/-/core-1.100.0.tgz#f8de9d03b0c85f4b077e48e023fb467e970f51b2"
integrity sha512-QnjFTqi5WX5k6qIakM0rVpNPYFIrGNIuJddph0wF1P0bb3a31YKLYO7lAHdPQXH3kIlO7+TjpRaalGhqT/8wJA==
Expand Down Expand Up @@ -779,11 +772,6 @@
resolved "https://registry.yarnpkg.com/@balena/dockerignore/-/dockerignore-1.0.2.tgz#9ffe4726915251e8eb69f44ef3547e0da2c03e0d"
integrity sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==

"@basemaps/metrics@^4.11.1":
version "4.11.1"
resolved "https://registry.yarnpkg.com/@basemaps/metrics/-/metrics-4.11.1.tgz#675d53a8758642f1c388036fc9cad7ae53726a75"
integrity sha512-wNESKjUcMCgceXqE+drdTQkDpvqUzCN/R4koAa4Hyq3jgV8C7D6DcD6l5Yz4v21Wo3Ef0W0FLwUsvHqcoFV8lQ==

"@cogeotiff/chunk@^4.3.0":
version "4.3.0"
resolved "https://registry.yarnpkg.com/@cogeotiff/chunk/-/chunk-4.3.0.tgz#3372ccec11a7f17afafd704d6a11e1068fb1c56e"
Expand Down Expand Up @@ -1513,27 +1501,6 @@
npmlog "^4.1.2"
write-file-atomic "^3.0.3"

"@linzjs/cdk-elastic-shipper@^0.6.2":
version "0.6.2"
resolved "https://registry.yarnpkg.com/@linzjs/cdk-elastic-shipper/-/cdk-elastic-shipper-0.6.2.tgz#67432224c4a0c0e9a741743053948e4e1720080f"
integrity sha512-5FcPy+RWjkTFRrRia44vWOFUn1lIb2WnTHStuLxivSRd9EP9pSl/54QuziPOVlcY8i2ZzEIXmUIVDlMVBssOgQ==
dependencies:
"@acuris/aws-es-connection" "^1.1.1"
"@aws-cdk/aws-ec2" "> 1.53.0"
"@aws-cdk/aws-lambda" "> 1.53.0"
"@aws-cdk/aws-lambda-event-sources" "> 1.53.0"
"@aws-cdk/aws-s3" "> 1.53.0"
"@aws-cdk/core" "> 1.53.0"
"@basemaps/metrics" "^4.11.1"
aws-sdk "^2.547.0"
jsondiffpatch "^0.4.1"
minimatch "^3.0.4"
pino "^6.4.1"
pretty-json-log "^0.3.1"
source-map-support "^0.5.16"
ulid "^2.3.0"
zod "^1.10.0"

"@linzjs/lui@^2.5.1":
version "2.6.16"
resolved "https://registry.yarnpkg.com/@linzjs/lui/-/lui-2.6.16.tgz#3ee941285b22da79c4613a7e9434408a57523e2d"
Expand Down Expand Up @@ -2429,7 +2396,7 @@ aws-cdk@^1.100.0:
yaml "1.10.2"
yargs "^16.2.0"

aws-sdk@^2.547.0, aws-sdk@^2.848.0, aws-sdk@^2.890.0:
aws-sdk@^2.848.0, aws-sdk@^2.890.0:
version "2.890.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.890.0.tgz#95b6a2dc36d324a40ef4c9462bde111d1ff7c234"
integrity sha512-39rVXw0aJVnBpVSbZ6ZBaNop8VwkNKx9n+auxQdNnAJtJ9dftgWo4AZYXg0a5lMxIL7AmnlPXWAVPOWHvCeuJg==
Expand Down Expand Up @@ -2665,7 +2632,7 @@ cdk-assets@1.100.0:
glob "^7.1.6"
yargs "^16.2.0"

chalk@^2.0.0, chalk@^2.3.0:
chalk@^2.0.0:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
Expand Down Expand Up @@ -3235,11 +3202,6 @@ dezalgo@^1.0.0:
asap "^2.0.0"
wrappy "1"

diff-match-patch@^1.0.0:
version "1.0.5"
resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==

diff@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
Expand Down Expand Up @@ -4660,14 +4622,6 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=

jsondiffpatch@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz#9fb085036767f03534ebd46dcd841df6070c5773"
integrity sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==
dependencies:
chalk "^2.3.0"
diff-match-patch "^1.0.0"

jsonfile@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
Expand Down Expand Up @@ -5992,7 +5946,7 @@ pino-std-serializers@^3.1.0:
resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-3.1.0.tgz#fe62d339aeef359d9d7bdf61f4e4b2d7be8c73d4"
integrity sha512-Fk1pxhX6tuW4ozRDFw5Mz/IHQV5wXYXZwjG/gOpTNPCbYEMeNW9VnKAEu1428CwAQVupFruOr1vkC/ufmcwedA==

pino@^6.2.1, pino@^6.4.1:
pino@^6.2.1:
version "6.11.3"
resolved "https://registry.yarnpkg.com/pino/-/pino-6.11.3.tgz#0c02eec6029d25e6794fdb6bbea367247d74bc29"
integrity sha512-drPtqkkSf0ufx2gaea3TryFiBHdNIdXKf5LN0hTM82SXI4xVIve2wLwNg92e1MT6m3jASLu6VO7eGY6+mmGeyw==
Expand Down Expand Up @@ -6914,7 +6868,7 @@ sort-object@^0.3.2:
sort-asc "^0.1.0"
sort-desc "^0.1.1"

source-map-support@^0.5.16, source-map-support@^0.5.19:
source-map-support@^0.5.19:
version "0.5.19"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
Expand Down Expand Up @@ -7841,11 +7795,6 @@ zip-stream@^4.1.0:
compress-commons "^4.1.0"
readable-stream "^3.6.0"

zod@^1.10.0:
version "1.11.17"
resolved "https://registry.yarnpkg.com/zod/-/zod-1.11.17.tgz#2aae9e91fc66128116ae9844e8f416a95f453f8e"
integrity sha512-UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA==

zod@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/zod/-/zod-3.2.0.tgz#4f06fac3c74e56902eae43a47a1687bf49c9b70b"
Expand Down