Merge pull request #61 from monken/fix_cft_utils_aws_cdk_dependencies

fix: moved cft-utils out to @znemz/cft-utils to seperate concerns
monken · May 28, 2024 · 8b02176 · 8b02176
2 parents 7ce3611 + 80f1c7b
commit 8b02176
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 274 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -26,7 +26,7 @@ module.exports = {
   },
   overrides: [
     {
-      files: ['t/**/*.js', 'workspaces/**/*.test.js'],
+      files: ['t/**/*.js'],
       plugins: ['mocha'],
       env: {
         mocha: true,

diff --git a/index.js b/index.js
@@ -10,12 +10,12 @@ const { addProxyToClient } = require('aws-sdk-v3-proxy');
 
 const pathParse = require('path-parse');
 const deepMerge = require('deepmerge');
-const { isTaggableResource } = require('@cfn-include/utils/src/resources/taggable');
+const { isTaggableResource } = require('@znemz/cft-utils/src/resources/taggable');
 
 const request = require('./lib/request');
 const PromiseExt = require('./lib/promise');
 
-const S3 = (opts = {}) => addProxyToClient(new S3Client(opts));
+const S3 = (opts = {}) => addProxyToClient(new S3Client(opts), { throwOnNoProxy: false });
 
 const s3 = S3();
 const yaml = require('./lib/yaml');

diff --git a/package.json b/package.json
@@ -30,23 +30,20 @@
     "bin/",
     "lib/"
   ],
-  "workspaces": [
-    "workspaces/*"
-  ],
   "scripts": {
     "better-audit": "better-npm-audit audit",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "prepare": "sort-package-json",
     "serve": "serve ./t/fixtures -l 9999",
-    "test": "npm run test:this && npm run test --workspaces",
+    "test": "npm run test:this",
     "test:this": "run-p -r serve test:run",
     "test:run": "sleep 1 && mocha --timeout 20000 --bail t/include.js t/cli.js t/replaceEnv.js"
   },
   "dependencies": {
     "@aws-sdk/client-cloudformation": "^3",
     "@aws-sdk/client-s3": "^3",
-    "@cfn-include/utils": "0.0.4",
+    "@znemz/cft-utils": "0.1.0",
     "@znemz/sort-object": "^3.0.4",
     "aws-sdk-v3-proxy": "2.1.2",
     "bluebird": "^3.7.2",

diff --git a/t/tests/applyTags.yml b/t/tests/applyTags.yml
@@ -38,7 +38,7 @@ applyTags:
               Url: https://example.com
               ClientIdList:
                 - !Ref RoleOne
-    # NOTE: This test could fail in future updates to @cfn-include/utils and aws-cdk-lib
+    # NOTE: This test could fail in future updates to @znemz/cft-utils and aws-cdk-lib
     # Where resources become taggable upon aws-cdk-lib updates. If it becomes taggable and it wasn't
     # thats a good thing.
     output:
@@ -127,7 +127,7 @@ applyTags:
               Url: https://example.com
               ClientIdList:
                 - !Ref RoleOne
-    # NOTE: This test could fail in future updates to @cfn-include/utils and aws-cdk-lib
+    # NOTE: This test could fail in future updates to @znemz/cft-utils and aws-cdk-lib
     # Where resources become taggable upon aws-cdk-lib updates. If it becomes taggable and it wasn't
     # thats a good thing.
     output:

diff --git a/workspaces/utils/README.md b/workspaces/utils/README.md
diff --git a/workspaces/utils/bin/taggableResourceMap.js b/workspaces/utils/bin/taggableResourceMap.js
diff --git a/workspaces/utils/bin/taggableResources.js b/workspaces/utils/bin/taggableResources.js
diff --git a/workspaces/utils/debug.js b/workspaces/utils/debug.js
diff --git a/workspaces/utils/package.json b/workspaces/utils/package.json
diff --git a/workspaces/utils/src/index.js b/workspaces/utils/src/index.js
diff --git a/workspaces/utils/src/resources/index.js b/workspaces/utils/src/resources/index.js
diff --git a/workspaces/utils/src/resources/taggable.js b/workspaces/utils/src/resources/taggable.js
diff --git a/workspaces/utils/src/resources/taggable.test.js b/workspaces/utils/src/resources/taggable.test.js