Fix merge conflicts

Author: lgarber-akamai

.github/workflows/e2e-test.yml

@@ -232,7 +232,7 @@ jobs:
     steps:
       - name: Notify Slack
         id: main_message
-        uses: slackapi/slack-github-action@v2.0.0
+        uses: slackapi/slack-github-action@v2.1.0
         with:
           method: chat.postMessage
           token: ${{ secrets.SLACK_BOT_TOKEN }}
@@ -264,7 +264,7 @@ jobs:
 
       - name: Test summary thread
         if: success()
-        uses: slackapi/slack-github-action@v2.0.0
+        uses: slackapi/slack-github-action@v2.1.0
         with:
           method: chat.postMessage
           token: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/nightly-smoke-tests.yml

@@ -45,7 +45,7 @@ jobs:
 
       - name: Notify Slack
         if: always() && github.repository == 'linode/linode_api4-python'
-        uses: slackapi/slack-github-action@v2.0.0
+        uses: slackapi/slack-github-action@v2.1.0
         with:
           method: chat.postMessage
           token: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/publish-pypi.yaml

@@ -5,7 +5,11 @@ on:
     types: [ published ]
 jobs:
   pypi-release:
+    permissions:
+      # IMPORTANT: this permission is mandatory for trusted publishing
+      id-token: write
     runs-on: ubuntu-latest
+    environment: pypi-release
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -25,5 +29,3 @@ jobs:
 
       - name: Publish the release artifacts to PyPI
         uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # pin@release/v1.12.4
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/release-notify-slack.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Notify Slack - Main Message
         id: main_message
-        uses: slackapi/slack-github-action@v2.0.0
+        uses: slackapi/slack-github-action@v2.1.0
         with:
           method: chat.postMessage
           token: ${{ secrets.SLACK_BOT_TOKEN }}

linode_api4/groups/database.py

@@ -1,3 +1,9 @@
+from typing import Any, Dict, Union
+
+from linode_api4 import (
+    MySQLDatabaseConfigOptions,
+    PostgreSQLDatabaseConfigOptions,
+)
 from linode_api4.errors import UnexpectedResponseError
 from linode_api4.groups import Group
 from linode_api4.objects import (
@@ -63,6 +69,26 @@ def engines(self, *filters):
         """
         return self.client._get_and_filter(DatabaseEngine, *filters)
 
+    def mysql_config_options(self):
+        """
+        Returns a detailed list of all the configuration options for MySQL Databases.
+
+        API Documentation: https://techdocs.akamai.com/linode-api/reference/get-databases-mysql-config
+
+        :returns: The JSON configuration options for MySQL Databases.
+        """
+        return self.client.get("/databases/mysql/config", model=self)
+
+    def postgresql_config_options(self):
+        """
+        Returns a detailed list of all the configuration options for PostgreSQL Databases.
+
+        API Documentation: https://techdocs.akamai.com/linode-api/reference/get-databases-postgresql-config
+
+        :returns: The JSON configuration options for PostgreSQL Databases.
+        """
+        return self.client.get("/databases/postgresql/config", model=self)
+
     def instances(self, *filters):
         """
         Returns a list of Managed Databases active on this account.
@@ -93,7 +119,15 @@ def mysql_instances(self, *filters):
         """
         return self.client._get_and_filter(MySQLDatabase, *filters)
 
-    def mysql_create(self, label, region, engine, ltype, **kwargs):
+    def mysql_create(
+        self,
+        label,
+        region,
+        engine,
+        ltype,
+        engine_config: Union[MySQLDatabaseConfigOptions, Dict[str, Any]] = None,
+        **kwargs,
+    ):
         """
         Creates an :any:`MySQLDatabase` on this account with
         the given label, region, engine, and node type.  For example::
@@ -123,13 +157,16 @@ def mysql_create(self, label, region, engine, ltype, **kwargs):
         :type engine: str or Engine
         :param ltype: The Linode Type to use for this cluster
         :type ltype: str or Type
+        :param engine_config: The configuration options for this MySQL cluster
+        :type engine_config: Dict[str, Any] or MySQLDatabaseConfigOptions
         """
 
         params = {
             "label": label,
             "region": region,
             "engine": engine,
             "type": ltype,
+            "engine_config": engine_config,
         }
         params.update(kwargs)
 
@@ -216,7 +253,17 @@ def postgresql_instances(self, *filters):
         """
         return self.client._get_and_filter(PostgreSQLDatabase, *filters)
 
-    def postgresql_create(self, label, region, engine, ltype, **kwargs):
+    def postgresql_create(
+        self,
+        label,
+        region,
+        engine,
+        ltype,
+        engine_config: Union[
+            PostgreSQLDatabaseConfigOptions, Dict[str, Any]
+        ] = None,
+        **kwargs,
+    ):
         """
         Creates an :any:`PostgreSQLDatabase` on this account with
         the given label, region, engine, and node type.  For example::
@@ -246,13 +293,16 @@ def postgresql_create(self, label, region, engine, ltype, **kwargs):
         :type engine: str or Engine
         :param ltype: The Linode Type to use for this cluster
         :type ltype: str or Type
+        :param engine_config: The configuration options for this PostgreSQL cluster
+        :type engine_config: Dict[str, Any] or PostgreSQLDatabaseConfigOptions
         """
 
         params = {
             "label": label,
             "region": region,
             "engine": engine,
             "type": ltype,
+            "engine_config": engine_config,
         }
         params.update(kwargs)
 

linode_api4/groups/linode.py

@@ -1,13 +1,11 @@
 import base64
 import os
-from collections.abc import Iterable
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from linode_api4.common import load_and_validate_keys
 from linode_api4.errors import UnexpectedResponseError
 from linode_api4.groups import Group
 from linode_api4.objects import (
-    ConfigInterface,
     Firewall,
     Instance,
     InstanceDiskEncryptionType,
@@ -21,8 +19,13 @@
 from linode_api4.objects.linode import (
     Backup,
     InstancePlacementGroupAssignment,
+    InterfaceGeneration,
+    NetworkInterface,
     _expand_placement_group_assignment,
 )
+from linode_api4.objects.linode_interfaces import (
+    LinodeInterfaceOptions,
+)
 from linode_api4.util import drop_null_keys
 
 
@@ -153,6 +156,13 @@ def instance_create(
                 int,
             ]
         ] = None,
+        interfaces: Optional[
+            List[
+                Union[LinodeInterfaceOptions, NetworkInterface, Dict[str, Any]],
+            ]
+        ] = None,
+        interface_generation: Optional[Union[InterfaceGeneration, str]] = None,
+        network_helper: Optional[bool] = None,
         **kwargs,
     ):
         """
@@ -230,6 +240,30 @@ def instance_create(
                "us-east",
                backup=snapshot)
 
+        **Create an Instance with explicit interfaces:**
+
+        To create a new Instance with explicit interfaces, provide list of
+        LinodeInterfaceOptions objects or dicts to the "interfaces" field::
+
+        linode, password = client.linode.instance_create(
+            "g6-standard-1",
+            "us-mia",
+            image="linode/ubuntu24.04",
+
+            # This can be configured as an account-wide default
+            interface_generation=InterfaceGeneration.LINODE,
+
+            interfaces=[
+                LinodeInterfaceOptions(
+                    default_route=LinodeInterfaceDefaultRouteOptions(
+                        ipv4=True,
+                        ipv6=True
+                    ),
+                    public=LinodeInterfacePublicOptions
+                )
+            ]
+        )
+
         **Create an empty Instance**
 
         If you want to create an empty Instance that you will configure manually,
@@ -293,9 +327,13 @@ def instance_create(
         :type disk_encryption: InstanceDiskEncryptionType or str
         :param interfaces: An array of Network Interfaces to add to this Linode’s Configuration Profile.
                            At least one and up to three Interface objects can exist in this array.
-        :type interfaces: list[ConfigInterface] or list[dict[str, Any]]
+        :type interfaces: List[LinodeInterfaceOptions], List[NetworkInterface], or List[dict[str, Any]]
         :param placement_group: A Placement Group to create this Linode under.
         :type placement_group: Union[InstancePlacementGroupAssignment, PlacementGroup, Dict[str, Any], int]
+        :param interface_generation: The generation of network interfaces this Linode uses.
+        :type interface_generation: InterfaceGeneration or str
+        :param network_helper: Whether this instance should have Network Helper enabled.
+        :type network_helper: bool
 
         :returns: A new Instance object, or a tuple containing the new Instance and
                   the generated password.
@@ -311,13 +349,6 @@ def instance_create(
             ret_pass = Instance.generate_root_password()
             kwargs["root_pass"] = ret_pass
 
-        interfaces = kwargs.get("interfaces", None)
-        if interfaces is not None and isinstance(interfaces, Iterable):
-            kwargs["interfaces"] = [
-                i._serialize() if isinstance(i, ConfigInterface) else i
-                for i in interfaces
-            ]
-
         params = {
             "type": ltype,
             "region": region,
@@ -336,6 +367,9 @@ def instance_create(
                 if placement_group
                 else None
             ),
+            "interfaces": interfaces,
+            "interface_generation": interface_generation,
+            "network_helper": network_helper,
         }
 
         params.update(kwargs)