@enplug/scripts 1.11.6 → 1.11.7-dev1

package/bin/functions/createS3Client.js

@@ -1,10 +1,45 @@
+const path = require('path');
+const fs = require('fs');
+const chalk = require('chalk');
+const rootPath = process.cwd();
 const AWS = require('aws-sdk');
 
+function getAwsPrivateFile() {
+  const fileName = 'aws.private.json';
+  let prefix = '';
+  let file = null;
+  let maxDepth = 2;
+  do {
+    file = path.resolve(rootPath, prefix + fileName);
+    prefix += '../';
+  } while (!fs.existsSync(file) && maxDepth--);
+
+  return file;
+}
+
 function createS3Client(pkg) {
+  let creds;
   const s3Options = Object.assign({}, pkg.config.aws.s3);
+  const credsFile = getAwsPrivateFile();
+
+  try {
+    creds = JSON.parse(fs.readFileSync(credsFile, 'utf8'));
+  } catch (e) {
+    console.error(`Error finding/parsing ${chalk.default.cyan(credsFile)}`);
+    return;
+  }
+
+  if (creds.accessKeyId == null || creds.secretAccessKey == null) {
+    console.error(`Error could not fine accessKeyId or secretAccessKey in ${chalk.default.cyan(credsFile)} file.`);
+    return;
+  }
 
-  const credentials = new AWS.SharedIniFileCredentials({ profile: pkg.config.aws.profile });
-  AWS.config.credentials = credentials;
+  // Setting up the credentials globally
+  AWS.config.update({
+    accessKeyId: creds.accessKeyId,
+    secretAccessKey: creds.secretAccessKey,
+    maxRetries: 3,
+  });
 
   return new AWS.S3(s3Options);
 }

package/bin/functions/translations/translations.js

@@ -35,6 +35,7 @@ async function validateTranslations() {
 async function syncTranslations(s3Client, bucket) {
   let credentials, config;
   const isProduction = determineEnv(bucket) === 'production';
+  const isStaging = determineEnv(bucket) === 'staging'
 
   if (!s3Client) { s3Client = createS3Client(getPackageJson()); }
 
@@ -50,7 +51,7 @@ async function syncTranslations(s3Client, bucket) {
   }
   
   if (credentials && config) {
-    const { confirmUpload } = await promptUpload(config.crowdinPath, isProduction);
+    const { confirmUpload } = await promptUpload(config.crowdinPath, isProduction || isStaging);
    
     if (confirmUpload) {
       const s3EnPath = path.join('/i18n/', config.crowdinPath);
@@ -60,7 +61,7 @@ async function syncTranslations(s3Client, bucket) {
 
       await uploadTranslationToS3(s3Client, bucket, s3EnPath, enTranslation);
 
-      if (isProduction) {
+      if (isProduction || isStaging) {
         const crowdinPath = config.crowdinPath.startsWith('/') ? config.crowdinPath.substr(1) : config.crowdinPath;
         const crowdinPathSections = crowdinPath.split('/');
         const appName = crowdinPathSections[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enplug/scripts",
-  "version": "1.11.6",
+  "version": "1.11.7-dev1",
   "description": "Enplug scripts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -27,7 +27,7 @@
     "check-packages": "bin/check-packages.js"
   },
   "dependencies": {
-    "aws-sdk": "2.1692.0",
+    "aws-sdk": "^2.474.0",
     "axios": "^0.19.2",
     "chalk": "2.4.1",
     "command-line-args": "5.0.2",