From 6247986f6a87b20f6ef788faea9ee96bbf454a8e Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Tue, 16 Jul 2024 15:39:59 -0700 Subject: [PATCH] Fix to GA deploy, fresh yarn install, also remove serverless.yml --- arSam/package.json | 4 +- arSam/yarn.lock | 22 +-- serverless.yml | 411 --------------------------------------------- 3 files changed, 13 insertions(+), 424 deletions(-) delete mode 100644 serverless.yml diff --git a/arSam/package.json b/arSam/package.json index 54ffab7..182ee0c 100644 --- a/arSam/package.json +++ b/arSam/package.json @@ -36,10 +36,10 @@ "luxon": "^3.2.1" }, "dependencies": { - "@aws-sdk/client-dynamodb": "^3.529.1", + "@aws-sdk/client-dynamodb": "^3.614.0", "@aws-sdk/client-lambda": "^3.568.0", "@aws-sdk/client-s3": "^3.568.0", - "@aws-sdk/util-dynamodb": "^3.529.1", + "@aws-sdk/util-dynamodb": "^3.614.0", "@aws-sdk/s3-request-presigner": "^3.568.0", "@babel/traverse": "7.23.2", "axios": "^1.4.0", diff --git a/arSam/yarn.lock b/arSam/yarn.lock index 648540d..ecc4ba4 100644 --- a/arSam/yarn.lock +++ b/arSam/yarn.lock @@ -231,7 +231,7 @@ "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-dynamodb@^3.529.1": +"@aws-sdk/client-dynamodb@^3.614.0": version "3.614.0" resolved "https://registry.yarnpkg.com/@aws-sdk/client-dynamodb/-/client-dynamodb-3.614.0.tgz#b1650d227fd856bf0747633fdde31014b1626bc2" integrity sha512-/Qhpim9Y6GfsZ4tcHgXo+YrBR44WGU6ON1PuT8X8D31aIb1mmtcHCF1c86QQ97sGkgmnCcaTWhQYjLNiJOZkbA== @@ -951,7 +951,7 @@ dependencies: tslib "^2.6.2" -"@aws-sdk/util-dynamodb@^3.529.1": +"@aws-sdk/util-dynamodb@^3.614.0": version "3.614.0" resolved "https://registry.yarnpkg.com/@aws-sdk/util-dynamodb/-/util-dynamodb-3.614.0.tgz#a06860a2d86a38fd489b1445933d593e6ae5df26" integrity sha512-ce0HZGiM2KxG5Wa07ykxZt4iQCUAj/n/ZhnXKo7ZUU1T2qPZVl65zAnCgF7VXH/l3CO638ENWHG25aXEYfM5Bg== @@ -2721,9 +2721,9 @@ integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w== "@types/node@*": - version "20.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.10.tgz#a1a218290f1b6428682e3af044785e5874db469a" - integrity sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ== + version "20.14.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.11.tgz#09b300423343460455043ddd4d0ded6ac579b74b" + integrity sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA== dependencies: undici-types "~5.26.4" @@ -6765,9 +6765,9 @@ node-jose@^2.2.0: uuid "^9.0.0" node-releases@^2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" - integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== + version "2.0.17" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.17.tgz#d74bc4fec38d839eec5db2a3c9c963d4f33cb366" + integrity sha512-Ww6ZlOiEQfPfXM45v17oabk77Z7mg5bOt7AjDyzy7RjK9OrLrLC8dyZQoAPEOtFX9SaNf1Tdvr5gRJWdTJj7GA== node-schedule@^2.1.0: version "2.1.1" @@ -7587,9 +7587,9 @@ semver@^6.3.0, semver@^6.3.1: integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== semver@^7.1.1, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.2: - version "7.6.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" - integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== + version "7.6.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" + integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== serialize-javascript@^6.0.1: version "6.0.2" diff --git a/serverless.yml b/serverless.yml deleted file mode 100644 index f82c1e2..0000000 --- a/serverless.yml +++ /dev/null @@ -1,411 +0,0 @@ -service: bcparks-ar-api - -frameworkVersion: "3" - -provider: - name: aws - runtime: nodejs14.x - stage: api - region: ca-central-1 - -package: - individually: true - exclude: - - "**/*" - -plugins: - - serverless-offline - - serverless-plugin-include-dependencies - - serverless-dotenv-plugin - - serverless-webpack - -custom: - webpack: - webpackConfig: 'webpack.config.js' # Name of webpack configuration file - -functions: - ########### - # readConfig - ########### - readConfig: - handler: lambda/readConfig/index.handler - package: - include: - - lambda/readConfig/** - - node_modules/** - - lambda/*.js - events: - - http: - method: GET - path: /config - - ########### - # Park - ########### - parkGet: - handler: lambda/park/GET/index.handler - package: - include: - - lambda/park/GET/** - - node_modules/** - - lambda/*.js - events: - - http: - method: GET - path: /park - cors: true - - parkPost: - handler: lambda/park/POST/index.handler - package: - include: - - lambda/park/POST/** - - node_modules/** - - lambda/*.js - events: - - http: - method: POST - path: /park - cors: true - - parkPut: - handler: lambda/park/PUT/index.handler - package: - include: - - lambda/park/PUT/** - - node_modules/** - - lambda/*.js - events: - - http: - method: PUT - path: /park - cors: true - - # ########### - # # SubArea - # ########### - subAreaGet: - handler: lambda/subArea/GET/index.handler - package: - include: - - lambda/subArea/GET/** - - node_modules/** - - lambda/*.js - events: - - http: - method: GET - path: /subArea - cors: true - - subAreaPost: - handler: lambda/subArea/POST/index.handler - package: - include: - - lambda/subArea/POST/** - - node_modules/** - - lambda/*.js - events: - - http: - method: POST - path: /subArea - cors: true - - subAreaPut: - handler: lambda/subArea/PUT/index.handler - package: - include: - - lambda/subArea/PUT/** - - node_modules/** - - lambda/*.js - events: - - http: - method: PUT - path: /subArea - cors: true - - subAreaDelete: - handler: lambda/subArea/DELETE/index.handler - package: - include: - - lambda/subArea/DELETE/** - - node_modules/** - - lambda/*.js - events: - - http: - method: DELETE - path: /subArea - cors: true - - ########### - # Activity - ########### - activityGet: - handler: lambda/activity/GET/index.handler - package: - include: - - lambda/activity/GET/** - - node_modules/** - - lambda/*.js - events: - - http: - method: GET - path: /activity - cors: true - - activityPost: - handler: lambda/activity/POST/index.handlePost - package: - include: - - lambda/activity/POST/** - - node_modules/** - - lambda/*.js - events: - - http: - method: POST - path: /activity - cors: true - - activityPut: - handler: lambda/activity/PUT/index.handler - package: - include: - - lambda/activity/PUT/** - - node_modules/** - - lambda/*.js - events: - - http: - method: PUT - path: /activity - cors: true - - activityDelete: - handler: lambda/activity/DELETE/index.handler - package: - include: - - lambda/activity/DELETE/** - - node_modules/** - - lambda/*.js - events: - - http: - method: DELETE - path: /activity - cors: true - - activityRecordLock: - handler: lambda/activity/POST/index.handleLock - package: - include: - - lambda/activity/POST/** - - node_modules/** - - lambda/*.js - events: - - http: - method: POST - path: /activity/lock - cors: true - - activityRecordUnlock: - handler: lambda/activity/POST/index.handleUnlock - package: - include: - - lambda/activity/POST/** - - node_modules/** - - lambda/*.js - events: - - http: - method: POST - path: /activity/unlock - cors: true - - ########### - # Cloudwatch Alarm - ########### - cloudwatchAlarm: - handler: lambda/cloudwatchAlarm/index.handler - package: - include: - - lambda/cloudwatchAlarm/** - - node_modules/** - - lambda/*.js - - ########### - # Cloudwatch Alarm - ########### - nameUpdate: - handler: lambda/nameUpdate/index.handler - package: - include: - - lambda/nameUpdate/** - - node_modules/** - - lambda/*.js - - ########### - # Export - ########### - exportInvokable: - handler: lambda/export/invokable/index.handler - package: - include: - - lambda/export/invokable/** - - node_modules/** - - lambda/*.js - timeout: 300 - exportGet: - handler: lambda/export/GET/index.handler - package: - include: - - lambda/export/GET/** - - node_modules/** - - lambda/*.js - timeout: 300 - events: - - http: - method: GET - path: /export - cors: true - varianceExportInvokable: - handler: lambda/export-variance/invokable/index.handler - package: - include: - - lambda/export-variance/invokable/** - - node_modules/** - - lambda/*.js - timeout: 300 - varianceExportGet: - handler: lambda/export-variance/GET/index.handler - package: - include: - - lambda/export-variance/GET/** - - node_modules/** - - lambda/*.js - timeout: 300 - events: - - http: - method: GET - path: /export-variance - cors: true - - ########### - # Fiscal Year End - ########### - fiscalYearEndGet: - handler: lambda/fiscalYearEnd/GET/index.handler - package: - include: - - lambda/fiscalYearEnd/GET/** - - node_modules/** - - lambda/*.js - events: - - http: - method: GET - path: /fiscalYearEnd - cors: true - - fiscalYearEndLock: - handler: lambda/fiscalYearEnd/POST/index.lockFiscalYear - package: - include: - - lambda/fiscalYearEnd/POST/** - - node_modules/** - - lambda/*.js - events: - - http: - method: POST - path: /fiscalYearEnd/lock - cors: true - - fiscalYearEndUnlock: - handler: lambda/fiscalYearEnd/POST/index.unlockFiscalYear - package: - include: - - lambda/fiscalYearEnd/POST/** - - node_modules/** - - lambda/*.js - events: - - http: - method: POST - path: /fiscalYearEnd/unlock - cors: true - - ########### - # Variance - ########### - varianceGet: - handler: lambda/variance/GET/index.handler - package: - include: - - lambda/variance/GET/** - - node_modules/** - - lambda/*.js - events: - - http: - method: GET - path: /variance - cors: true - - variancePost: - handler: lambda/variance/POST/index.handlePost - package: - include: - - lambda/variance/POST/** - - node_modules/** - - lambda/*.js - events: - - http: - method: POST - path: /variance - cors: true - - variancePut: - handler: lambda/variance/PUT/index.handler - package: - include: - - lambda/variance/PUT/** - - node_modules/** - - lambda/*.js - events: - - http: - method: PUT - path: /variance - cors: true - -resources: - Resources: - databaseTable: - Type: "AWS::DynamoDB::Table" - DeletionPolicy: Retain - Properties: - TableName: arTable - AttributeDefinitions: - - AttributeName: pk - AttributeType: S - - AttributeName: sk - AttributeType: S - KeySchema: - - AttributeName: pk - KeyType: HASH - - AttributeName: sk - KeyType: RANGE - BillingMode: PAY_PER_REQUEST - GlobalSecondaryIndexes: - - IndexName: orcs-index - KeySchema: - - AttributeName: orcs - KeyType: HASH - Projection: - ProjectionType: ALL - ProvisionedThroughput: - ReadCapacityUnits: 1 - WriteCapacityUnits: 1 - nameCacheTable: - Type: "AWS::DynamoDB::Table" - DeletionPolicy: Retain - Properties: - TableName: nameCache - AttributeDefinitions: - - AttributeName: pk - AttributeType: S - KeySchema: - - AttributeName: pk - KeyType: HASH - BillingMode: PAY_PER_REQUEST