- gcp 削除

- keyFilename 読み込み

src/server/service/file-uploader/gcp.js

@@ -1,98 +0,0 @@
-const logger = require('@alias/logger')('growi:service:fileUploaderAws');
-
-const urljoin = require('url-join');
-const { Storage } = require('@google-cloud/storage');
-
-
-module.exports = function(crowi) {
-  const Uploader = require('./uploader');
-  const { configManager } = crowi;
-  const lib = new Uploader(configManager);
-
-  function getGcsBucket() {
-    return configManager.getConfig('crowi', 'gcs:bucket');
-  }
-
-  function getGcsInstance(isUploadable) {
-    if (!isUploadable) {
-      throw new Error('GCP is not configured.');
-    }
-    if (this.gcsInstance == null) {
-      this.gcsInstance = new Storage();
-    }
-    return this.gcsInstance;
-  }
-
-  function getFilePathOnStorage(attachment) {
-    const dirName = (attachment.page != null)
-      ? 'attachment'
-      : 'user';
-    const filePath = urljoin(dirName, attachment.fileName);
-
-    return filePath;
-  }
-
-  lib.deleteFile = async function(attachment) {
-    const filePath = getFilePathOnStorage(attachment);
-    return lib.deleteFileByFilePath(filePath);
-  };
-
-  lib.deleteFileByFilePath = async function(filePath) {
-    const gcs = getGcsInstance(this.getIsUploadable());
-    const myBucket = gcs.bucket(getGcsBucket());
-
-    // TODO: ensure not to throw error even when the file does not exist
-
-    return myBucket.file(filePath).delete();
-  };
-
-  lib.uploadFile = function(fileStream, attachment) {
-    logger.debug(`File uploading: fileName=${attachment.fileName}`);
-
-    const gcs = getGcsInstance(this.getIsUploadable());
-    const myBucket = gcs.bucket(getGcsBucket());
-    const filePath = getFilePathOnStorage(attachment);
-    const options = {
-      destination: filePath,
-    };
-
-    return myBucket.upload(fileStream.path, options);
-  };
-
-  /**
-   * Find data substance
-   *
-   * @param {Attachment} attachment
-   * @return {stream.Readable} readable stream
-   */
-  lib.findDeliveryFile = async function(attachment) {
-    const gcs = getGcsInstance(this.getIsUploadable());
-    const myBucket = gcs.bucket(getGcsBucket());
-    const filePath = getFilePathOnStorage(attachment);
-
-    let stream;
-    try {
-      stream = myBucket.file(filePath).createReadStream();
-    }
-    catch (err) {
-      logger.error(err);
-      throw new Error(`Coudn't get file from AWS for the Attachment (${attachment._id.toString()})`);
-    }
-
-    // return stream.Readable
-    return stream;
-  };
-
-  /**
-   * check the file size limit
-   *
-   * In detail, the followings are checked.
-   * - per-file size limit (specified by MAX_FILE_SIZE)
-   */
-  lib.checkLimit = async(uploadFileSize) => {
-    const maxFileSize = crowi.configManager.getConfig('crowi', 'app:maxFileSize');
-    return { isUploadable: uploadFileSize <= maxFileSize, errorMessage: 'File size exceeds the size limit per file' };
-  };
-
-  return lib;
-};

src/server/service/file-uploader/gcs.js

@@ -15,10 +15,11 @@ module.exports = function(crowi) {
 
   function getGcsInstance(isUploadable) {
     if (!isUploadable) {
-      throw new Error('GCP is not configured.');
+      throw new Error('GCS is not configured.');
     }
     if (this.gcsInstance == null) {
-      this.gcsInstance = new Storage();
+      const keyFilename = configManager.getConfig('crowi', 'gcs:apiKeyJsonPath');
+      this.gcsInstance = new Storage({ keyFilename });
     }
     return this.gcsInstance;
   }