diff --git a/src/plugin/docs/assorted/@sls-closedsource-dynamodb.md b/src/plugin/docs/assorted/@sls-closedsource-dynamodb.md index df30a9a7..257300f5 100644 --- a/src/plugin/docs/assorted/@sls-closedsource-dynamodb.md +++ b/src/plugin/docs/assorted/@sls-closedsource-dynamodb.md @@ -15,6 +15,7 @@ - :clipboard: `serverless/test-sls-cf-stack` - :clipboard: `serverless/test-dynamodb-dy` - :clipboard: `serverless/src-dynamodb-dy` + - :clipboard: `serverless/src-core-aws-cjs` - :clipboard: `serverless/src-core-aws` - :clipboard: `serverless/serverless-data` - :clipboard: `serverless/serverless-compile` @@ -107,6 +108,7 @@ Manage various configuration files for serverless project with the option of run │     └─ random-deploy-hash.cjs
├─ src
│  ├─ core
+│  │  ├─ aws.cjs
│  │  └─ aws.js
│  └─ dynamodb
│     └─ dy.js
@@ -405,6 +407,7 @@ Manage serverless configuration for deployment to AWS. │     └─ random-deploy-hash.cjs
├─ src
│  ├─ core
+│  │  ├─ aws.cjs
│  │  └─ aws.js
│  └─ dynamodb
│     └─ dy.js
@@ -676,6 +679,36 @@ _Updating src/ +### :clipboard: serverless/src-core-aws-cjs (`index`) + +_Updating src/core/aws.cjs using overwrite._ + +- Create aws sdk require file. + + + + + + + + + + + + +
TargetsRequires
+
    +project
    +└─ src
    +   └─ core
    +      └─ aws.cjs
    +
+ 		+ +
+ ### :clipboard: serverless/src-core-aws (`index`) _Updating src/core/aws.js using create-only._ @@ -2279,6 +2312,16 @@ Execute all configured js-gardener tasks. *Wrapper to access defined DynamoDB models.* +### src/core/aws.cjs + +:small_red_triangle: aws-sdk-wrap, aws + +:small_blue_diamond: `other` + +*Configuration file for aws-sdk require.* + +AWS SDK initialization file. + ### src/core/aws.js :small_red_triangle: aws-sdk-wrap, aws diff --git a/src/plugin/docs/assorted/@sls-closedsource.md b/src/plugin/docs/assorted/@sls-closedsource.md index 792e9c52..f4d2eb82 100644 --- a/src/plugin/docs/assorted/@sls-closedsource.md +++ b/src/plugin/docs/assorted/@sls-closedsource.md @@ -11,6 +11,8 @@ - :clipboard: `serverless/test-sls-cfg` - :clipboard: `serverless/test-sls-cf-stack-routes` - :clipboard: `serverless/test-sls-cf-stack` + - :clipboard: `serverless/src-core-aws-cjs` + - :clipboard: `serverless/src-core-aws` - :clipboard: `serverless/serverless-data` - :clipboard: `serverless/serverless-compile` - :clipboard: `serverless/serverless-base-resolver-js` @@ -100,6 +102,10 @@ Manage various configuration files for serverless project. │  ├─ data.yml
│  └─ api
│     └─ random-deploy-hash.cjs
+├─ src
+│  └─ core
+│     ├─ aws.cjs
+│     └─ aws.js
└─ test
   ├─ 0-sls-cf-stack.spec.js
   ├─ 5-sls-cfg.spec.js
@@ -387,6 +393,10 @@ Manage serverless configuration for deployment to AWS. │  ├─ data.yml
│  └─ api
│     └─ random-deploy-hash.cjs
+├─ src
+│  └─ core
+│     ├─ aws.cjs
+│     └─ aws.js
└─ test
   ├─ 0-sls-cf-stack.spec.js
   ├─ 5-sls-cfg.spec.js
@@ -531,6 +541,66 @@ _Updating serverless/src-core-aws-cjs (`index`) + +_Updating src/core/aws.cjs using overwrite._ + +- Create aws sdk require file. + + + + + + + + + + + + +
TargetsRequires
+
    +project
    +└─ src
    +   └─ core
    +      └─ aws.cjs
    +
+ 		+ +
+ +### :clipboard: serverless/src-core-aws (`index`) + +_Updating src/core/aws.js using create-only._ + +- Create aws sdk initialization file. + + + + + + + + + + + + +
TargetsRequires
+
    +project
    +└─ src
    +   └─ core
    +      └─ aws.js
    +
+ 		+ +
+ ### :clipboard: serverless/serverless-data (`index`) _Updating serverless/data.yml using create-only._ @@ -2045,6 +2115,26 @@ Execute all configured js-gardener tasks. *Test for visualizing serverless cf stack definitions.* +### src/core/aws.cjs + +:small_red_triangle: aws-sdk-wrap, aws + +:small_blue_diamond: `other` + +*Configuration file for aws-sdk require.* + +AWS SDK initialization file. + +### src/core/aws.js + +:small_red_triangle: aws-sdk-wrap, aws + +:small_blue_diamond: `other` + +*Configuration file for aws-sdk initiation.* + +AWS SDK initialization file. + ### serverless/data.yml :small_red_triangle: serverless, javascript diff --git a/src/plugin/targets/src/core/aws.cjs.json b/src/plugin/targets/src/core/aws.cjs.json new file mode 100644 index 00000000..63c672b0 --- /dev/null +++ b/src/plugin/targets/src/core/aws.cjs.json @@ -0,0 +1,7 @@ +{ + "description": "Configuration file for aws-sdk require.", + "details": ["AWS SDK initialization file."], + "formats": ["other"], + "requires": ["aws-sdk-wrap", "aws"], + "website": null +} diff --git a/src/plugin/tasks/serverless/#two-stack-dynamodb.json b/src/plugin/tasks/serverless/#two-stack-dynamodb.json index d19d1719..0403ea0c 100644 --- a/src/plugin/tasks/serverless/#two-stack-dynamodb.json +++ b/src/plugin/tasks/serverless/#two-stack-dynamodb.json @@ -4,8 +4,6 @@ "test-sls-tags", "test-sls-cf-stack-routes", "test-sls-cfg", - "test-sls-dynamodb-local", - "test-sls-dynamodb-cfg", "serverless-base-resolver", "serverless-base-resolver-js", "serverless-base-api", @@ -16,6 +14,9 @@ "serverless-data", "serverless-compile", "src-core-aws", + "src-core-aws-cjs", + "test-sls-dynamodb-local", + "test-sls-dynamodb-cfg", "src-dynamodb-dy", "test-dynamodb-dy" ], diff --git a/src/plugin/tasks/serverless/#two-stack.json b/src/plugin/tasks/serverless/#two-stack.json index 66ddc7b0..8df0c692 100644 --- a/src/plugin/tasks/serverless/#two-stack.json +++ b/src/plugin/tasks/serverless/#two-stack.json @@ -12,7 +12,9 @@ "serverless-api", "serverless-api-random-deploy-hash", "serverless-data", - "serverless-compile" + "serverless-compile", + "src-core-aws", + "src-core-aws-cjs" ], "description": "Manage serverless configuration for deployment to AWS." } diff --git a/src/plugin/tasks/serverless/snippets/serverless/src/core/aws.cjs b/src/plugin/tasks/serverless/snippets/serverless/src/core/aws.cjs new file mode 100644 index 00000000..60d3839f --- /dev/null +++ b/src/plugin/tasks/serverless/snippets/serverless/src/core/aws.cjs @@ -0,0 +1 @@ +module.exports = require('aws-sdk'); diff --git a/src/plugin/tasks/serverless/snippets/serverless/src/core/aws.js b/src/plugin/tasks/serverless/snippets/serverless/src/core/aws.js index 5f9f0b2a..34a12192 100644 --- a/src/plugin/tasks/serverless/snippets/serverless/src/core/aws.js +++ b/src/plugin/tasks/serverless/snippets/serverless/src/core/aws.js @@ -1,4 +1,11 @@ -const { logger } = require('lambda-monitor-logger'); -const aws = require('aws-sdk-wrap')({ logger }); +import { logger } from 'lambda-monitor-logger'; +import AwsSdkWrap from 'aws-sdk-wrap'; +import AWS from './aws.cjs'; -module.exports = aws; +export default AwsSdkWrap({ + logger, + configService: { dynamodb: { endpoint: process.env.DYNAMODB_ENDPOINT } }, + services: { + S3: AWS.S3 + } +}); diff --git a/src/plugin/tasks/serverless/src-core-aws-cjs.json b/src/plugin/tasks/serverless/src-core-aws-cjs.json new file mode 100644 index 00000000..0b2a4431 --- /dev/null +++ b/src/plugin/tasks/serverless/src-core-aws-cjs.json @@ -0,0 +1,14 @@ +{ + "target": "src/core/aws.cjs", + "format": "txt", + "strategy": "overwrite", + "snippets": [ + "serverless/src/core/aws.cjs" + ], + "requires": [ + "javascript" + ], + "purpose": [ + "Create aws sdk require file." + ] +} diff --git a/test/projects/assorted/@sls-closedsource-dynamodb/CONFDOCS.md b/test/projects/assorted/@sls-closedsource-dynamodb/CONFDOCS.md index 4223c312..1b71a4fb 100644 --- a/test/projects/assorted/@sls-closedsource-dynamodb/CONFDOCS.md +++ b/test/projects/assorted/@sls-closedsource-dynamodb/CONFDOCS.md @@ -17,6 +17,7 @@ - :clipboard: `serverless/test-sls-cf-stack` - :clipboard: `serverless/test-dynamodb-dy` - :clipboard: `serverless/src-dynamodb-dy` + - :clipboard: `serverless/src-core-aws-cjs` - :clipboard: `serverless/src-core-aws` - :clipboard: `serverless/serverless-data` - :clipboard: `serverless/serverless-compile` @@ -109,6 +110,7 @@ Manage various configuration files for serverless project with the option of run │     └─ random-deploy-hash.cjs
├─ src
│  ├─ core
+│  │  ├─ aws.cjs
│  │  └─ aws.js
│  └─ dynamodb
│     └─ dy.js
@@ -407,6 +409,7 @@ Manage serverless configuration for deployment to AWS. │     └─ random-deploy-hash.cjs
├─ src
│  ├─ core
+│  │  ├─ aws.cjs
│  │  └─ aws.js
│  └─ dynamodb
│     └─ dy.js
@@ -678,6 +681,36 @@ _Updating src/ +##### :clipboard: serverless/src-core-aws-cjs (`index`) + +_Updating src/core/aws.cjs using overwrite._ + +- Create aws sdk require file. + + + + + + + + + + + + +
TargetsRequires
+
    +project
    +└─ src
    +   └─ core
    +      └─ aws.cjs
    +
+ 		+ +
+ ##### :clipboard: serverless/src-core-aws (`index`) _Updating src/core/aws.js using create-only._ @@ -2281,6 +2314,16 @@ Execute all configured js-gardener tasks. *Wrapper to access defined DynamoDB models.* +### src/core/aws.cjs + +:small_red_triangle: aws-sdk-wrap, aws + +:small_blue_diamond: `other` + +*Configuration file for aws-sdk require.* + +AWS SDK initialization file. + ### src/core/aws.js :small_red_triangle: aws-sdk-wrap, aws diff --git a/test/projects/assorted/@sls-closedsource-dynamodb/src/core/aws.cjs b/test/projects/assorted/@sls-closedsource-dynamodb/src/core/aws.cjs new file mode 100644 index 00000000..60d3839f --- /dev/null +++ b/test/projects/assorted/@sls-closedsource-dynamodb/src/core/aws.cjs @@ -0,0 +1 @@ +module.exports = require('aws-sdk'); diff --git a/test/projects/assorted/@sls-closedsource/CONFDOCS.md b/test/projects/assorted/@sls-closedsource/CONFDOCS.md index e23b34d2..d371c3a1 100644 --- a/test/projects/assorted/@sls-closedsource/CONFDOCS.md +++ b/test/projects/assorted/@sls-closedsource/CONFDOCS.md @@ -13,6 +13,8 @@ - :clipboard: `serverless/test-sls-cfg` - :clipboard: `serverless/test-sls-cf-stack-routes` - :clipboard: `serverless/test-sls-cf-stack` + - :clipboard: `serverless/src-core-aws-cjs` + - :clipboard: `serverless/src-core-aws` - :clipboard: `serverless/serverless-data` - :clipboard: `serverless/serverless-compile` - :clipboard: `serverless/serverless-base-resolver-js` @@ -102,6 +104,10 @@ Manage various configuration files for serverless project. │  ├─ data.yml
│  └─ api
│     └─ random-deploy-hash.cjs
+├─ src
+│  └─ core
+│     ├─ aws.cjs
+│     └─ aws.js
└─ test
   ├─ 0-sls-cf-stack.spec.js
   ├─ 5-sls-cfg.spec.js
@@ -389,6 +395,10 @@ Manage serverless configuration for deployment to AWS. │  ├─ data.yml
│  └─ api
│     └─ random-deploy-hash.cjs
+├─ src
+│  └─ core
+│     ├─ aws.cjs
+│     └─ aws.js
└─ test
   ├─ 0-sls-cf-stack.spec.js
   ├─ 5-sls-cfg.spec.js
@@ -533,6 +543,66 @@ _Updating serverless/src-core-aws-cjs (`index`) + +_Updating src/core/aws.cjs using overwrite._ + +- Create aws sdk require file. + + + + + + + + + + + + +
TargetsRequires
+
    +project
    +└─ src
    +   └─ core
    +      └─ aws.cjs
    +
+ 		+ +
+ +##### :clipboard: serverless/src-core-aws (`index`) + +_Updating src/core/aws.js using create-only._ + +- Create aws sdk initialization file. + + + + + + + + + + + + +
TargetsRequires
+
    +project
    +└─ src
    +   └─ core
    +      └─ aws.js
    +
+ 		+ +
+ ##### :clipboard: serverless/serverless-data (`index`) _Updating serverless/data.yml using create-only._ @@ -2047,6 +2117,26 @@ Execute all configured js-gardener tasks. *Test for visualizing serverless cf stack definitions.* +### src/core/aws.cjs + +:small_red_triangle: aws-sdk-wrap, aws + +:small_blue_diamond: `other` + +*Configuration file for aws-sdk require.* + +AWS SDK initialization file. + +### src/core/aws.js + +:small_red_triangle: aws-sdk-wrap, aws + +:small_blue_diamond: `other` + +*Configuration file for aws-sdk initiation.* + +AWS SDK initialization file. + ### serverless/data.yml :small_red_triangle: serverless, javascript diff --git a/test/projects/assorted/@sls-closedsource/src/core/aws.cjs b/test/projects/assorted/@sls-closedsource/src/core/aws.cjs new file mode 100644 index 00000000..60d3839f --- /dev/null +++ b/test/projects/assorted/@sls-closedsource/src/core/aws.cjs @@ -0,0 +1 @@ +module.exports = require('aws-sdk'); diff --git a/test/projects/assorted/@sls-closedsource/src/core/aws.js b/test/projects/assorted/@sls-closedsource/src/core/aws.js new file mode 100644 index 00000000..34a12192 --- /dev/null +++ b/test/projects/assorted/@sls-closedsource/src/core/aws.js @@ -0,0 +1,11 @@ +import { logger } from 'lambda-monitor-logger'; +import AwsSdkWrap from 'aws-sdk-wrap'; +import AWS from './aws.cjs'; + +export default AwsSdkWrap({ + logger, + configService: { dynamodb: { endpoint: process.env.DYNAMODB_ENDPOINT } }, + services: { + S3: AWS.S3 + } +});