fix: publishing doesn't work (#533)

diplodoc-platform · Aug 14, 2023 · 3cf4bc1 · 3cf4bc1
1 parent 4d4b195
commit 3cf4bc1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/src/cmd/build/index.ts b/src/cmd/build/index.ts
@@ -252,16 +252,24 @@ async function handler(args: Arguments<any>) {
             if (publish) {
                 const DEFAULT_PREFIX = process.env.YFM_STORAGE_PREFIX ?? '';
                 const {
-                    output,
                     ignore = [],
+                    storageRegion,
                     storageEndpoint: endpoint,
                     storageBucket: bucket,
                     storagePrefix: prefix = DEFAULT_PREFIX,
                     storageKeyId: accessKeyId,
                     storageSecretKey: secretAccessKey,
                 } = ArgvService.getConfig();
+
                 await publishFilesToS3({
-                    output, ignore, endpoint, bucket, prefix, accessKeyId, secretAccessKey,
+                    input: userOutputFolder,
+                    region: storageRegion,
+                    ignore,
+                    endpoint,
+                    bucket,
+                    prefix,
+                    accessKeyId,
+                    secretAccessKey,
                 });
             }
         }

diff --git a/src/cmd/publish/upload.ts b/src/cmd/publish/upload.ts
@@ -7,7 +7,18 @@ import mime from 'mime-types';
 import {convertBackSlashToSlash, logger} from '../../utils';
 import {asyncify, mapLimit} from 'async';
 
-export async function upload(props): Promise<void> {
+interface UploadProps {
+    input: string;
+    ignore: string[];
+    endpoint: string;
+    bucket: string;
+    prefix: string;
+    accessKeyId: string;
+    secretAccessKey: string;
+    region: string;
+}
+
+export async function upload(props: UploadProps): Promise<void> {
     const {
         input,
         ignore = [],

diff --git a/src/models.ts b/src/models.ts
@@ -52,6 +52,7 @@ export interface YfmArgv extends YfmConfig {
     storagePrefix: string;
     storageKeyId: string;
     storageSecretKey: string;
+    storageRegion: string;
     contributors: boolean;
     ignoreAuthorPatterns: string;
     addSystemMeta: boolean;

diff --git a/src/validator.ts b/src/validator.ts
@@ -38,6 +38,11 @@ const validators: Record<string, ConnectorValidatorProps> = {
         validateFn: notEmptyStringValidator,
         defaultValue: process.env.YFM_STORAGE_SECRET_KEY,
     },
+    'storageRegion': {
+        errorMessage: 'Region of S3 storage must be provided when publishes.',
+        validateFn: notEmptyStringValidator,
+        defaultValue: 'eu-central-1',
+    },
 };
 
 interface Redirect {