feat(oracle): add config option for region and profile

VERSION

@@ -1 +1 @@
-1!7.7.4
+1!7.8.0

pycloudlib.toml.template

@@ -71,6 +71,8 @@ domain_name = ""
 config_path = "~/.oci/config"
 availability_domain = ""  # Likely in ~/.oci/oci_cli_rc
 compartment_id = ""  # Likely in ~/.oci/oci_cli_rc
+# region = "us-phoenix-1"  # will use region from oci config file if not specified
+# profile = "DEFAULT" # will use default profile from oci config file if not specified 
 # public_key_path = "~/.ssh/id_rsa.pub"
 # private_key_path = ""  # Defaults to 'public_key_path' without the '.pub'
 # key_name = ""  # Defaults to your username if not set

pycloudlib/oci/cloud.py

@@ -36,10 +36,12 @@ def __init__(
         availability_domain: Optional[str] = None,
         compartment_id: Optional[str] = None,
         config_path: Optional[str] = None,
-        config_dict: Optional[str] = None,
+        config_dict: Optional[dict] = None,
         vcn_name: Optional[str] = None,
         fault_domain: Optional[str] = None,
-    ):
+        profile: Optional[str] = None,
+        region: Optional[str] = None,
+    ):  # pylint: disable-msg=too-many-locals
         """
         Initialize the connection to OCI.
 
@@ -95,6 +97,10 @@ def __init__(
             try:
                 oci.config.validate_config(config_dict)
                 self.oci_config = config_dict
+                if profile:
+                    self._log.warning(
+                        "Profile name is ignored when using config_dict"
+                    )
             except oci.exceptions.InvalidConfig as e:
                 raise ValueError(
                     "Config dict is invalid. Pass a valid config dict. "
@@ -112,11 +118,21 @@ def __init__(
                     "{} is not a valid config file. Pass a valid config "
                     "file.".format(config_path)
                 )
-            self.oci_config = oci.config.from_file(config_path)
+            profile = profile or self.config.get("profile")
+            if profile:
+                self.oci_config = oci.config.from_file(
+                    config_path, profile_name=profile
+                )
+            else:
+                self.oci_config = oci.config.from_file(config_path)
+
+        self.oci_config["region"] = (
+            region or self.config.get("region") or self.oci_config["region"]
+        )
+        self.region = self.oci_config["region"]
 
         self.vcn_name = vcn_name
         self.fault_domain = fault_domain
-
         self._log.debug("Logging into OCI")
         self.compute_client = oci.core.ComputeClient(self.oci_config)  # noqa: E501
         self.network_client = oci.core.VirtualNetworkClient(self.oci_config)  # noqa: E501