changes to work with Oracle OCI

Author: will

custom_components/s3/__init__.py

@@ -16,6 +16,7 @@
 CONF_REGION = "region_name"
 CONF_ACCESS_KEY_ID = "aws_access_key_id"
 CONF_SECRET_ACCESS_KEY = "aws_secret_access_key"
+CONF_ENDPOINT_URL = "endpoint_url"
 
 DOMAIN = "s3"
 COPY_SERVICE = "copy"
@@ -49,6 +50,7 @@
     "ap-northeast-1",
     "ap-south-1",
     "sa-east-1",
+    "us-phoenix-1",
 ]
 
 STORAGE_CLASSES = [
@@ -68,6 +70,7 @@
         vol.Optional(CONF_REGION, default=DEFAULT_REGION): vol.In(SUPPORTED_REGIONS),
         vol.Required(CONF_ACCESS_KEY_ID): cv.string,
         vol.Required(CONF_SECRET_ACCESS_KEY): cv.string,
+        vol.Required(CONF_ENDPOINT_URL): cv.string,
     }
 )
 
@@ -142,7 +145,7 @@ def copy_file(call):
         if s3_client is None:
             _LOGGER.error("S3 client instance not found")
             return
-        
+
         copy_source = {
             'Bucket': bucket_source,
             'Key': key_source
@@ -191,6 +194,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
         CONF_REGION: entry.data[CONF_REGION],
         CONF_ACCESS_KEY_ID: entry.data[CONF_ACCESS_KEY_ID],
         CONF_SECRET_ACCESS_KEY: entry.data[CONF_SECRET_ACCESS_KEY],
+	CONF_ENDPOINT_URL: entry.data[CONF_ENDPOINT_URL],
     }
     client = boto3.client("s3", **aws_config)  # Will not raise error.
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = client
@@ -202,4 +206,4 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
 
     if not hass.data[DOMAIN]:
         hass.services.async_remove(DOMAIN, PUT_SERVICE)
-    return True
+    return True

custom_components/s3/config_flow.py

@@ -6,6 +6,7 @@
     CONF_REGION,
     CONF_ACCESS_KEY_ID,
     CONF_SECRET_ACCESS_KEY,
+    CONF_ENDPOINT_URL,
     DEFAULT_REGION,
     SUPPORTED_REGIONS,
 )
@@ -19,14 +20,15 @@ async def async_step_user(self, user_input=None):
         if user_input is not None:
             await self.async_set_unique_id(user_input[CONF_ACCESS_KEY_ID])
             self._abort_if_unique_id_configured()
-            
+
             return self.async_create_entry(title=user_input[CONF_ACCESS_KEY_ID], data=user_input)
 
         data_schema = vol.Schema(
             {
                 vol.Optional(CONF_REGION, default=DEFAULT_REGION): vol.In(SUPPORTED_REGIONS),
+                vol.Required(CONF_ENDPOINT_URL): str,
                 vol.Required(CONF_ACCESS_KEY_ID): str,
                 vol.Required(CONF_SECRET_ACCESS_KEY): str,
             }
         )
-        return self.async_show_form(step_id="user", data_schema=data_schema)
+        return self.async_show_form(step_id="user", data_schema=data_schema)

custom_components/s3/strings.json

@@ -8,7 +8,8 @@
                 "data": {
                     "region_name": "AWS bucket Region",
                     "aws_access_key_id": "AWS Access Key",
-                    "aws_secret_access_key": "AWS Secret Access Key"
+                    "aws_secret_access_key": "AWS Secret Access Key",
+                    "endpoint_url": "Endpoint URL"
                 }
             }
         },

custom_components/s3/translations/en.json

@@ -9,7 +9,8 @@
                     "bucket": "Bucket Name",
                     "region_name": "Bucket Region",
                     "aws_access_key_id": "AWS Access Key",
-                    "aws_secret_access_key": "AWS Secret Access Key"
+                    "aws_secret_access_key": "AWS Secret Access Key",
+                    "endpoint_url": "Endpoint URL"
                 }
             }
         },