This is an automated email from the ASF dual-hosted git repository.
pankaj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 9ee14a01ac Bump azure-mgmt-containerinstance (#34738)
9ee14a01ac is described below
commit 9ee14a01ac15a1d7fd0edc0a9f64ccadd1d3db36
Author: Pankaj Singh <98807258+pankajas...@users.noreply.github.com>
AuthorDate: Tue Oct 10 12:57:53 2023 +0530
Bump azure-mgmt-containerinstance (#34738)
* Bump azure-mgmt-containerinstance
* Apply review suggestions
---
airflow/providers/microsoft/azure/CHANGELOG.rst | 9 +++-
.../microsoft/azure/hooks/container_instance.py | 48 +++++++++-------------
.../azure/operators/container_instances.py | 10 +----
airflow/providers/microsoft/azure/provider.yaml | 4 +-
generated/provider_dependencies.json | 2 +-
.../azure/hooks/test_azure_container_instance.py | 5 ++-
6 files changed, 35 insertions(+), 43 deletions(-)
diff --git a/airflow/providers/microsoft/azure/CHANGELOG.rst
b/airflow/providers/microsoft/azure/CHANGELOG.rst
index b355c60f81..dc637f98ac 100644
--- a/airflow/providers/microsoft/azure/CHANGELOG.rst
+++ b/airflow/providers/microsoft/azure/CHANGELOG.rst
@@ -34,8 +34,9 @@ Breaking changes
~~~~~~~~~~~~~~~~
.. warning::
- AzureDataFactoryHook methods and AzureDataFactoryRunPipelineOperator
arguments resource_group_name and factory_name is
- now required instead of kwargs
+ In this version of the provider, we have removed network_profile param from
AzureContainerInstancesOperator and
+ AzureDataFactoryHook methods and AzureDataFactoryRunPipelineOperator
arguments resource_group_name and factory_name
+ is now required instead of kwargs
* resource_group_name and factory_name is now required argument in
AzureDataFactoryHook method get_factory, update_factory,
create_factory, delete_factory, get_linked_service, delete_linked_service,
get_dataset, delete_dataset, get_dataflow,
@@ -44,6 +45,10 @@ Breaking changes
stop_trigger, get_adf_pipeline_run_status, cancel_pipeline_run
* resource_group_name and factory_name is now required in
AzureDataFactoryRunPipelineOperator
* Remove class ``PipelineRunInfo`` from
``airflow.providers.microsoft.azure.hooks.data_factory``
+* Remove ``network_profile`` param from ``AzureContainerInstancesOperator``
+* Remove deprecated ``extra__azure__tenantId`` from azure_container_instance
connection extras
+* Remove deprecated ``extra__azure__subscriptionId`` from
azure_container_instance connection extras
+
7.0.0
.....
diff --git a/airflow/providers/microsoft/azure/hooks/container_instance.py
b/airflow/providers/microsoft/azure/hooks/container_instance.py
index cdebe7a241..34edbf74bb 100644
--- a/airflow/providers/microsoft/azure/hooks/container_instance.py
+++ b/airflow/providers/microsoft/azure/hooks/container_instance.py
@@ -19,18 +19,22 @@ from __future__ import annotations
import warnings
from functools import cached_property
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
from azure.common.client_factory import get_client_from_auth_file,
get_client_from_json_dict
-from azure.common.credentials import ServicePrincipalCredentials
-from azure.identity import DefaultAzureCredential
+from azure.identity import ClientSecretCredential, DefaultAzureCredential
from azure.mgmt.containerinstance import ContainerInstanceManagementClient
from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.providers.microsoft.azure.hooks.base_azure import AzureBaseHook
if TYPE_CHECKING:
- from azure.mgmt.containerinstance.models import ContainerGroup
+ from azure.mgmt.containerinstance.models import (
+ ContainerGroup,
+ ContainerPropertiesInstanceView,
+ ContainerState,
+ Event,
+ )
class AzureContainerInstanceHook(AzureBaseHook):
@@ -67,23 +71,6 @@ class AzureContainerInstanceHook(AzureBaseHook):
"""
conn = self.get_connection(self.conn_id)
tenant = conn.extra_dejson.get("tenantId")
- if not tenant and conn.extra_dejson.get("extra__azure__tenantId"):
- warnings.warn(
- "`extra__azure__tenantId` is deprecated in azure connection
extra, "
- "please use `tenantId` instead",
- AirflowProviderDeprecationWarning,
- stacklevel=2,
- )
- tenant = conn.extra_dejson.get("extra__azure__tenantId")
- subscription_id = conn.extra_dejson.get("subscriptionId")
- if not subscription_id and
conn.extra_dejson.get("extra__azure__subscriptionId"):
- warnings.warn(
- "`extra__azure__subscriptionId` is deprecated in azure
connection extra, "
- "please use `subscriptionId` instead",
- AirflowProviderDeprecationWarning,
- stacklevel=2,
- )
- subscription_id =
conn.extra_dejson.get("extra__azure__subscriptionId")
key_path = conn.extra_dejson.get("key_path")
if key_path:
@@ -97,16 +84,17 @@ class AzureContainerInstanceHook(AzureBaseHook):
self.log.info("Getting connection using a JSON config.")
return get_client_from_json_dict(client_class=self.sdk_client,
config_dict=key_json)
- credential: ServicePrincipalCredentials | DefaultAzureCredential
+ credential: ClientSecretCredential | DefaultAzureCredential
if all([conn.login, conn.password, tenant]):
self.log.info("Getting connection using specific credentials and
subscription_id.")
- credential = ServicePrincipalCredentials(
- client_id=conn.login, secret=conn.password, tenant=tenant
+ credential = ClientSecretCredential(
+ client_id=conn.login, client_secret=conn.password,
tenant_id=cast(str, tenant)
)
else:
self.log.info("Using DefaultAzureCredential as credential")
credential = DefaultAzureCredential()
+ subscription_id = cast(str, conn.extra_dejson.get("subscriptionId"))
return ContainerInstanceManagementClient(
credential=credential,
subscription_id=subscription_id,
@@ -137,8 +125,10 @@ class AzureContainerInstanceHook(AzureBaseHook):
stacklevel=2,
)
cg_state = self.get_state(resource_group, name)
- c_state = cg_state.containers[0].instance_view.current_state
- return (c_state.state, c_state.exit_code, c_state.detail_status)
+ container = cg_state.containers[0]
+ instance_view: ContainerPropertiesInstanceView =
container.instance_view # type: ignore[assignment]
+ c_state: ContainerState = instance_view.current_state # type:
ignore[assignment]
+ return c_state.state, c_state.exit_code, c_state.detail_status
def get_messages(self, resource_group: str, name: str) -> list:
"""
@@ -154,8 +144,10 @@ class AzureContainerInstanceHook(AzureBaseHook):
stacklevel=2,
)
cg_state = self.get_state(resource_group, name)
- instance_view = cg_state.containers[0].instance_view
- return [event.message for event in instance_view.events]
+ container = cg_state.containers[0]
+ instance_view: ContainerPropertiesInstanceView =
container.instance_view # type: ignore[assignment]
+ events: list[Event] = instance_view.events # type: ignore[assignment]
+ return [event.message for event in events]
def get_state(self, resource_group: str, name: str) -> ContainerGroup:
"""
diff --git a/airflow/providers/microsoft/azure/operators/container_instances.py
b/airflow/providers/microsoft/azure/operators/container_instances.py
index c104995aff..1cee34076e 100644
--- a/airflow/providers/microsoft/azure/operators/container_instances.py
+++ b/airflow/providers/microsoft/azure/operators/container_instances.py
@@ -25,12 +25,12 @@ from typing import TYPE_CHECKING, Any, Sequence
from azure.mgmt.containerinstance.models import (
Container,
ContainerGroup,
- ContainerGroupNetworkProfile,
ContainerPort,
EnvironmentVariable,
IpAddress,
ResourceRequests,
ResourceRequirements,
+ Volume as _AzureVolume,
VolumeMount,
)
from msrestazure.azure_exceptions import CloudError
@@ -44,13 +44,11 @@ from
airflow.providers.microsoft.azure.hooks.container_volume import AzureContai
if TYPE_CHECKING:
from airflow.utils.context import Context
-
Volume = namedtuple(
"Volume",
["conn_id", "account_name", "share_name", "mount_path", "read_only"],
)
-
DEFAULT_ENVIRONMENT_VARIABLES: dict[str, str] = {}
DEFAULT_SECURED_VARIABLES: Sequence[str] = []
DEFAULT_VOLUMES: Sequence[Volume] = []
@@ -90,7 +88,6 @@ class AzureContainerInstancesOperator(BaseOperator):
:param restart_policy: Restart policy for all containers within the
container group.
Possible values include: 'Always', 'OnFailure', 'Never'
:param ip_address: The IP address type of the container group.
- :param network_profile: The network profile information for a container
group.
**Example**::
@@ -145,7 +142,6 @@ class AzureContainerInstancesOperator(BaseOperator):
restart_policy: str = "Never",
ip_address: IpAddress | None = None,
ports: list[ContainerPort] | None = None,
- network_profile: ContainerGroupNetworkProfile | None = None,
**kwargs,
) -> None:
super().__init__(**kwargs)
@@ -183,7 +179,6 @@ class AzureContainerInstancesOperator(BaseOperator):
)
self.ip_address = ip_address
self.ports = ports
- self.network_profile = network_profile
def execute(self, context: Context) -> int:
# Check name again in case it was templated.
@@ -212,7 +207,7 @@ class AzureContainerInstancesOperator(BaseOperator):
e = EnvironmentVariable(name=key, value=value)
environment_variables.append(e)
- volumes: list[Volume | Volume] = []
+ volumes: list[_AzureVolume] = []
volume_mounts: list[VolumeMount | VolumeMount] = []
for conn_id, account_name, share_name, mount_path, read_only in
self.volumes:
hook = AzureContainerVolumeHook(conn_id)
@@ -256,7 +251,6 @@ class AzureContainerInstancesOperator(BaseOperator):
os_type=self.os_type,
tags=self.tags,
ip_address=self.ip_address,
- network_profile=self.network_profile,
)
self._ci_hook.create_or_update(self.resource_group, self.name,
container_group)
diff --git a/airflow/providers/microsoft/azure/provider.yaml
b/airflow/providers/microsoft/azure/provider.yaml
index d01ee268ef..14a9d36ea0 100644
--- a/airflow/providers/microsoft/azure/provider.yaml
+++ b/airflow/providers/microsoft/azure/provider.yaml
@@ -84,9 +84,7 @@ dependencies:
- azure-kusto-data>=4.1.0
- azure-mgmt-datafactory>=2.0.0
- azure-mgmt-containerregistry>=8.0.0
- # TODO: upgrade to newer versions of all the below libraries.
- # See issue https://github.com/apache/airflow/issues/30199
- - azure-mgmt-containerinstance>=7.0.0,<9.0.0
+ - azure-mgmt-containerinstance>=9.0.0
integrations:
- integration-name: Microsoft Azure Batch
diff --git a/generated/provider_dependencies.json
b/generated/provider_dependencies.json
index 5fc8ed0df0..3185f825ab 100644
--- a/generated/provider_dependencies.json
+++ b/generated/provider_dependencies.json
@@ -555,7 +555,7 @@
"azure-identity>=1.3.1",
"azure-keyvault-secrets>=4.1.0",
"azure-kusto-data>=4.1.0",
- "azure-mgmt-containerinstance>=7.0.0,<9.0.0",
+ "azure-mgmt-containerinstance>=9.0.0",
"azure-mgmt-containerregistry>=8.0.0",
"azure-mgmt-cosmosdb",
"azure-mgmt-datafactory>=2.0.0",
diff --git
a/tests/providers/microsoft/azure/hooks/test_azure_container_instance.py
b/tests/providers/microsoft/azure/hooks/test_azure_container_instance.py
index 7c7359fa56..aabd729177 100644
--- a/tests/providers/microsoft/azure/hooks/test_azure_container_instance.py
+++ b/tests/providers/microsoft/azure/hooks/test_azure_container_instance.py
@@ -52,7 +52,10 @@ class TestAzureContainerInstanceHook:
conn_type="azure_container_instances",
login="login",
password="key",
- extra={"tenantId": "tenant_id", "subscriptionId":
"subscription_id"},
+ extra={
+ "tenantId": "63e85d06-62e4-11ee-8c99-0242ac120002",
+ "subscriptionId": "63e85d06-62e4-11ee-8c99-0242ac120003",
+ },
)
)
self.resources =
ResourceRequirements(requests=ResourceRequests(memory_in_gb="4", cpu="1"))
