|
|
@@ -9,8 +9,16 @@
|
|
|
import logging
|
|
|
|
|
|
import oci
|
|
|
+from AnsjerPush.config import CONFIG_EUR
|
|
|
|
|
|
-from AnsjerPush.config import OCI_CONFIG, OCI_NAMESPACE_NAME
|
|
|
+from django.conf import settings
|
|
|
+
|
|
|
+OCI_USER = settings.OCI_USER
|
|
|
+OCI_FINGERPRINT = settings.OCI_FINGERPRINT
|
|
|
+OCI_TENANCY = settings.OCI_TENANCY
|
|
|
+OCI_REGION = settings.OCI_REGION
|
|
|
+OCI_KEY_FILE = settings.OCI_KEY_FILE
|
|
|
+OCI_NAMESPACE_NAME = settings.OCI_NAMESPACE_NAME
|
|
|
|
|
|
LOGGER = logging.getLogger('time')
|
|
|
|
|
|
@@ -24,7 +32,14 @@ class OCIObjectStorage:
|
|
|
|
|
|
def __init__(self, region):
|
|
|
# Initialize service client with default oci_config file
|
|
|
- self.object_storage_client = oci.object_storage.ObjectStorageClient(OCI_CONFIG[region])
|
|
|
+ oci_config = {
|
|
|
+ 'user': OCI_USER,
|
|
|
+ 'fingerprint': OCI_FINGERPRINT,
|
|
|
+ 'tenancy': OCI_TENANCY,
|
|
|
+ 'region': OCI_REGION[1] if region == CONFIG_EUR else OCI_REGION[0],
|
|
|
+ 'key_file': OCI_KEY_FILE
|
|
|
+ }
|
|
|
+ self.object_storage_client = oci.object_storage.ObjectStorageClient(oci_config)
|
|
|
|
|
|
def create_ereauthenticated_request(self, bucket_name, name, object_name, time_expires):
|
|
|
"""
|