Skip to content
This repository has been archived by the owner on Dec 7, 2022. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Slynova-Org/flydrive
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: gamfi/flydrive
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 4 commits
  • 40 files changed
  • 2 contributors

Commits on Dec 10, 2019

  1. feat: Add azure block blob storage support

    Krzysztof Chrapka committed Dec 10, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d62c44c View commit details

Commits on Dec 13, 2019

  1. Fix local file system allowing path traversal

    fixes #126
    Krzysztof Chrapka committed Dec 13, 2019
    Copy the full SHA
    57179e0 View commit details

Commits on Dec 18, 2019

  1. Complete API refactor

     - add flatList method to all storages, listing files with given prefix
     - remove unique features from storages - append, prepend
     - add metadata and headers support to all storages - getProperties, and
    properties are returned along getBuffer
     - remove getString - use getBuffer as safer alternative
     - remove getStat
     - use single test suit to test all storages
     - use jest instead of japa for testing
     - always test with real s3, remove docker tests
     - consistent class/variable naming, storage is always storage
     - local: clean-up empty directories left, when files are deleted
     - local: store data in root/data/ directory and metadata in root/meta/ directory
     - manager: don't treat built-in and "extended" storage any different
    Krzysztof Chrapka committed Dec 18, 2019
    Copy the full SHA
    b2474cf View commit details
  2. Merge pull request #1 from gamfi/feature/api-cleanup

    Feature/api cleanup
    OJezu authored Dec 18, 2019
    Copy the full SHA
    e2f8e9c View commit details
1 change: 0 additions & 1 deletion .dockerignore

This file was deleted.

19 changes: 0 additions & 19 deletions .env.docker

This file was deleted.

8 changes: 8 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
GCS_KEYFILENAME=your_own_custom_key
GCS_BUCKET=your_own_custom_bucket

S3_KEY=s3_key_for_testing
S3_SECRET=s3_secret_for_testing
S3_BUCKET=s3_bucket_for_testing
S3_REGION=s3_region_for_testing
S3_ENDPOINT=

AZURE_TEST_CONNECTION_STRING=your_own_connection_string
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
/node_modules
/build
/coverage
/node_modules
/var
!/var/.gittrack

.env


18 changes: 0 additions & 18 deletions Dockerfile

This file was deleted.

27 changes: 0 additions & 27 deletions docker-compose.yml

This file was deleted.

8 changes: 0 additions & 8 deletions docker-test.sh

This file was deleted.

17 changes: 0 additions & 17 deletions japaFile.js

This file was deleted.

11 changes: 11 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = {
moduleFileExtensions: ["js", "json", "ts"],
rootDir: ".",
forceCoverageMatch: ['src/**/*.ts'],
setupFiles: ['dotenv/config'],
testEnvironment: "node",
testRegex: ".spec.ts$",
transform: {
"^.+\\.(t|j)s$": "ts-jest"
},
};
25 changes: 17 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -19,42 +19,51 @@
"author": "Romain Lanz <romain.lanz@slynova.ch>",
"contributors": [
"Harminder Virk <virk@adonisjs.com>",
"Michaël Zasso <targos@pm.me>"
"Michaël Zasso <targos@pm.me>",
"Krzysztof Chrapka <krzysztof.chrapka gamfi pl>"
],
"files": [
"build"
],
"scripts": {
"build": "npm run clean && npm run tsc",
"clean": "rimraf build",
"lint": "eslint --ext js,ts src test japaFile.js",
"lint": "eslint --ext js,ts src test jest.config.js",
"prepublishOnly": "npm run build",
"test": "npm run test:local && npm run test:docker",
"test:local": "node japaFile",
"test:docker": "./docker-test.sh",
"test": "npm run test:local",
"test:local": "jest",
"tsc": "tsc"
},
"engines": {
"node": ">10.10.0"
},
"dependencies": {
"fs-extra": "^8.1.0",
"node-exceptions": "^4.0.1"
},
"devDependencies": {
"@azure/storage-blob": "^12.0.1",
"@google-cloud/storage": "^4.0.0",
"@types/fs-extra": "^8.0.1",
"@types/node": "10.0.0",
"@types/jest": "^24.0.23",
"@types/node": "^10.10.0",
"@typescript-eslint/eslint-plugin": "^2.5.0",
"@typescript-eslint/parser": "^2.5.0",
"aws-sdk": "^2.553.0",
"dotenv": "^8.2.0",
"eslint": "^6.5.1",
"eslint-config-prettier": "^6.4.0",
"japa": "^3.0.1",
"jest": "^24.9.0",
"node-fetch": "^2.6.0",
"np": "^5.1.1",
"prettier": "1.18.2",
"random-bytes-readable-stream": "^2.1.0",
"rimraf": "^3.0.0",
"ts-jest": "^24.2.0",
"ts-node": "^8.4.1",
"typescript": "^3.6.4",
"uuid": "^3.3.3"
"uuid": "^3.3.3",
"yargs": "^15.0.2"
},
"repository": "git@github.com:Slynova-Org/flydrive.git",
"bugs": {
Loading