@onivoro/onix 20.5.22 → 20.5.23

package/executors.json

@@ -35,6 +35,11 @@
       "schema": "./src/executors/deploy-s3-react/schema.json",
       "description": "deploy-s3-react"
     },
+    "deploy-s3-sync": {
+      "implementation": "./src/executors/deploy-s3-sync/executor",
+      "schema": "./src/executors/deploy-s3-sync/schema.json",
+      "description": "deploy-s3-sync"
+    },
     "deploy-s3-vite": {
       "implementation": "./src/executors/deploy-s3-vite/executor",
       "schema": "./src/executors/deploy-s3-vite/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onivoro/onix",
-  "version": "20.5.22",
+  "version": "20.5.23",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

package/src/executors/deploy-s3-react/executor.js

@@ -40,7 +40,7 @@ exports.default = (0, executor_factory_function_1.executorFactory)((options, con
     const ACL = omitAcl ? undefined : 'public-read';
     const s3Client = new client_s3_1.S3Client({ region, credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
     yield Promise.all(fileMappings.map((_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ contentType, original, key }) {
-        yield new Promise(resolve => setTimeout(resolve, 2000));
+        yield new Promise(resolve => setTimeout(resolve, 4000));
         yield s3Client.send(new client_s3_1.PutObjectCommand({
             Bucket: bucket,
             ContentType: contentType,

package/src/executors/deploy-s3-sync/executor.d.ts

@@ -0,0 +1,3 @@
+import { ExecutorSchema } from './schema';
+declare const _default: import("@nx/devkit").PromiseExecutor<ExecutorSchema>;
+export default _default;

package/src/executors/deploy-s3-sync/executor.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const extract_project_build_outputs_function_1 = require("../../functions/extract-project-build-outputs.function");
+const pmx_function_1 = require("../../functions/pmx.function");
+const executor_factory_function_1 = require("../../functions/executor-factory.function");
+const path_1 = require("path");
+const client_s3_1 = require("@aws-sdk/client-s3");
+const resolve_aws_credentials_function_1 = require("../../functions/resolve-aws-credentials.function");
+const s3_sync_directory_function_1 = require("../../functions/s3-sync-directory.function");
+const assetsFolder = 'assets';
+exports.default = (0, executor_factory_function_1.executorFactory)((options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const { region, bucket, omitAcl, profile, localDirectory } = options;
+    const [projectOutput] = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, context.projectName);
+    const app = context.projectName;
+    (0, pmx_function_1.pmxSpawn)(context, `nx build ${app}`);
+    const resolvedLocalDirectory = (0, path_1.resolve)(projectOutput, localDirectory);
+    const ACL = omitAcl ? undefined : 'public-read';
+    const s3Client = new client_s3_1.S3Client({ region, credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
+    yield (0, s3_sync_directory_function_1.s3SyncDirectory)({ s3Client, bucket, localDirectory: resolvedLocalDirectory, ACL });
+}));
+//# sourceMappingURL=executor.js.map

package/src/executors/deploy-s3-sync/executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-s3-sync/executor.ts"],"names":[],"mappings":";;;AAEA,mHAAoG;AACpG,+DAAwD;AACxD,yFAA4E;AAC5E,+BAA+B;AAC/B,kDAA8C;AAC9C,uGAAyF;AACzF,2FAA6E;AAE7E,MAAM,YAAY,GAAG,QAAQ,CAAA;AAE7B,kBAAe,IAAA,2CAAe,EAAC,CAC7B,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IACrE,MAAM,CAAC,aAAa,CAAC,GAAG,IAAA,mEAA0B,EAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAEjF,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;IAEhC,IAAA,uBAAQ,EAAC,OAAO,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC;IAErC,MAAM,sBAAsB,GAAG,IAAA,cAAO,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAEtE,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC;IAEhD,MAAM,QAAQ,GAAG,IAAI,oBAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAE7F,MAAM,IAAA,4CAAe,EAAC,EAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;AAC1F,CAAC,CAAA,CAAC,CAAC"}

package/src/executors/deploy-s3-sync/schema.d.ts

@@ -0,0 +1,7 @@
+export interface ExecutorSchema {
+    bucket: string,
+    region: string,
+    omitAcl?: boolean,
+    profile?: string,
+    localDirectory: string,
+}

package/src/executors/deploy-s3-sync/schema.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "version": 2,
+  "title": "Deploy S3 executor",
+  "description": "",
+  "type": "object",
+  "properties": {
+    "bucket": {
+      "type": "string",
+      "description": "Name of the S3 bucket to use for uploading artifacts"
+    },
+    "profile": {
+      "type": "string",
+      "description": "AWS profile name (which must be defined in the ~/.aws/credentials file) if AWS keys aren't defined as env vars"
+    },
+    "region": {
+      "type": "string",
+      "description": "AWS region"
+    },
+    "omitAcl": {
+      "type": "boolean",
+      "description": "Whether to use acl public-read for S3 push"
+    },
+    "localDirectory": {
+      "type": "string",
+      "description": "Local directory to upload to S3"
+    }
+  },
+  "required": [
+    "bucket",
+    "localDirectory",
+    "region"
+  ]
+}

package/src/functions/s3-sync-directory.function.d.ts

@@ -0,0 +1,8 @@
+import { ObjectCannedACL, S3Client } from '@aws-sdk/client-s3';
+export declare function s3SyncDirectory({ s3Client, bucket, localDirectory, s3Prefix, ACL }: {
+    s3Client: S3Client;
+    bucket: string;
+    localDirectory: string;
+    s3Prefix?: string;
+    ACL?: ObjectCannedACL;
+}): Promise<void>;

package/src/functions/s3-sync-directory.function.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.s3SyncDirectory = s3SyncDirectory;
+const tslib_1 = require("tslib");
+const client_s3_1 = require("@aws-sdk/client-s3");
+const devkit_1 = require("@nx/devkit");
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+function s3SyncDirectory(_a) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* ({ s3Client, bucket, localDirectory, s3Prefix = '', ACL }) {
+        function walk(dir) {
+            return tslib_1.__awaiter(this, void 0, void 0, function* () {
+                const entries = yield (0, promises_1.readdir)(dir, { withFileTypes: true });
+                const files = yield Promise.all(entries.map((entry) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    const res = (0, path_1.join)(dir, entry.name);
+                    return entry.isDirectory() ? yield walk(res) : res;
+                })));
+                return files.flat();
+            });
+        }
+        const files = yield walk(localDirectory);
+        for (const filePath of files) {
+            const fileContent = yield (0, promises_1.readFile)(filePath);
+            const key = path_1.posix.join(s3Prefix, (0, path_1.relative)(localDirectory, filePath).split('\\').join('/'));
+            yield s3Client.send(new client_s3_1.PutObjectCommand({
+                Bucket: bucket,
+                Key: key,
+                Body: fileContent,
+                ACL
+            }));
+            devkit_1.logger.info(`Uploaded ${filePath} to s3://${bucket}/${key}`);
+        }
+    });
+}
+//# sourceMappingURL=s3-sync-directory.function.js.map

package/src/functions/s3-sync-directory.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3-sync-directory.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/s3-sync-directory.function.ts"],"names":[],"mappings":";;AAKA,0CAuCC;;AA5CD,kDAAiF;AACjF,uCAAoC;AACpC,0CAAsD;AACtD,+BAA6C;AAE7C,SAAsB,eAAe;iEAAC,EACpC,QAAQ,EACR,MAAM,EACN,cAAc,EACd,QAAQ,GAAG,EAAE,EACb,GAAG,EAOJ;QACC,SAAe,IAAI,CAAC,GAAW;;gBAC7B,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAO,EAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAM,KAAK,EAAC,EAAE;oBACxD,MAAM,GAAG,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBAClC,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;gBACrD,CAAC,CAAA,CAAC,CAAC,CAAC;gBACJ,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;SAAA;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,CAAC;QAEzC,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YAC7B,MAAM,WAAW,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,YAAK,CAAC,IAAI,CACpB,QAAQ,EACR,IAAA,eAAQ,EAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACzD,CAAC;YACF,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,4BAAgB,CAAC;gBACvC,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,WAAW;gBACjB,GAAG;aACJ,CAAC,CAAC,CAAC;YAEJ,eAAM,CAAC,IAAI,CAAC,YAAY,QAAQ,YAAY,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CAAA"}

package/src/index.d.ts

@@ -15,6 +15,7 @@ export * from './functions/pm.function';
 export * from './functions/pmx.function';
 export * from './functions/resolve-aws-credentials.function';
 export * from './functions/restart-ecs-service.function';
+export * from './functions/s3-sync-directory.function';
 export * from './functions/to-cdn-path.function';
 export * from './functions/upload-directory-to-s3.function';
 export * from './inference/add-docker-target.function';

package/src/index.js

@@ -18,6 +18,7 @@ tslib_1.__exportStar(require("./functions/pm.function"), exports);
 tslib_1.__exportStar(require("./functions/pmx.function"), exports);
 tslib_1.__exportStar(require("./functions/resolve-aws-credentials.function"), exports);
 tslib_1.__exportStar(require("./functions/restart-ecs-service.function"), exports);
+tslib_1.__exportStar(require("./functions/s3-sync-directory.function"), exports);
 tslib_1.__exportStar(require("./functions/to-cdn-path.function"), exports);
 tslib_1.__exportStar(require("./functions/upload-directory-to-s3.function"), exports);
 tslib_1.__exportStar(require("./inference/add-docker-target.function"), exports);

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../onix/src/index.ts"],"names":[],"mappings":";;;AAAA,oEAA0C;AAC1C,wEAA8C;AAC9C,sEAA4C;AAE5C,mEAAyC;AAEzC,2DAAiC;AAEjC,6EAAmD;AACnD,gFAAsD;AACtD,6FAAmE;AACnE,6FAAmE;AACnE,6FAAmE;AACnE,sFAA4D;AAC5D,6EAAmD;AACnD,qFAA2D;AAC3D,kEAAwC;AACxC,mEAAyC;AACzC,uFAA6D;AAC7D,mFAAyD;AACzD,2EAAiD;AACjD,sFAA4D;AAE5D,iFAAuD;AACvD,kFAAwD;AACxD,gFAAsD;AACtD,iFAAuD;AACvD,kFAAwD;AACxD,kFAAwD;AACxD,sFAA4D;AAE5D,uFAA6D;AAC7D,gFAAsD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../onix/src/index.ts"],"names":[],"mappings":";;;AAAA,oEAA0C;AAC1C,wEAA8C;AAC9C,sEAA4C;AAE5C,mEAAyC;AAEzC,2DAAiC;AAEjC,6EAAmD;AACnD,gFAAsD;AACtD,6FAAmE;AACnE,6FAAmE;AACnE,6FAAmE;AACnE,sFAA4D;AAC5D,6EAAmD;AACnD,qFAA2D;AAC3D,kEAAwC;AACxC,mEAAyC;AACzC,uFAA6D;AAC7D,mFAAyD;AACzD,iFAAuD;AACvD,2EAAiD;AACjD,sFAA4D;AAE5D,iFAAuD;AACvD,kFAAwD;AACxD,gFAAsD;AACtD,iFAAuD;AACvD,kFAAwD;AACxD,kFAAwD;AACxD,sFAA4D;AAE5D,uFAA6D;AAC7D,gFAAsD"}