Skip to content

Commit

Permalink
Nuke the blobstore code, replace with cloud_blobstore library. (#567)
Browse files Browse the repository at this point in the history
Need the blobstore code elsewhere, so it makes sense to library-ize it.
  • Loading branch information
ttung authored Oct 19, 2017
1 parent f3c1bab commit d8caedc
Show file tree
Hide file tree
Showing 22 changed files with 27 additions and 810 deletions.
2 changes: 1 addition & 1 deletion dss/api/bundles.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import iso8601
import requests
from cloud_blobstore import BlobNotFoundError
from flask import jsonify, make_response

from .. import DSSException, dss_handler
from ..blobstore import BlobNotFoundError
from ..config import Config
from ..hcablobstore import BundleFileMetadata, BundleMetadata, FileMetadata
from ..util import UrlBuilder
Expand Down
8 changes: 3 additions & 5 deletions dss/api/files.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@
import json
import re
import typing

import chainedawslambda.aws
from enum import Enum, auto

import iso8601
import requests

import chainedawslambda.aws
from cloud_blobstore import BlobAlreadyExistsError, BlobNotFoundError, BlobStore
from cloud_blobstore.s3 import S3BlobStore
from flask import jsonify, make_response, redirect, request
from werkzeug.exceptions import BadRequest

from .. import DSSException, dss_handler
from ..blobstore import BlobAlreadyExistsError, BlobNotFoundError, BlobStore
from ..blobstore.s3 import S3BlobStore
from ..config import Config
from ..events.chunkedtask import s3copyclient
from ..hcablobstore import FileMetadata, HCABlobStore
Expand Down
2 changes: 1 addition & 1 deletion dss/api/subscriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
import iso8601
import requests

from cloud_blobstore import BlobNotFoundError
from elasticsearch import Elasticsearch
from elasticsearch.exceptions import ElasticsearchException, NotFoundError
from elasticsearch_dsl import Search
from flask import jsonify, make_response, redirect, request
from werkzeug.exceptions import BadRequest

from .. import Config, Replica, ESIndexType, ESDocType, get_logger
from ..blobstore import BlobNotFoundError
from ..error import DSSException, dss_handler
from ..hcablobstore import FileMetadata, HCABlobStore
from ..util.es import ElasticsearchClient, get_elasticsearch_index
Expand Down
119 changes: 0 additions & 119 deletions dss/blobstore/__init__.py

This file was deleted.

126 changes: 0 additions & 126 deletions dss/blobstore/gs.py

This file was deleted.

Loading

0 comments on commit d8caedc

Please sign in to comment.