Skip to content

Commit

Permalink
removed logzero
Browse files Browse the repository at this point in the history
Signed-off-by: Sylvain Hellegouarch <sh@defuze.org>
  • Loading branch information
Lawouach committed Mar 26, 2024
1 parent 0dde83a commit 0830e16
Show file tree
Hide file tree
Showing 24 changed files with 62 additions and 33 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
away from pycodestyle and pylama
* bumped GitHub workflows to use more recent versions of each actions
* using the Trusted publishing workflow for publishing to PyPI
* removed dependency on logzero for logging

[157]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/issues/157

Expand Down
3 changes: 2 additions & 1 deletion chaosazure/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

"""Top-level package for chaostoolkit-azure."""

import logging
import os
from typing import List

Expand All @@ -28,7 +29,6 @@
Discovery,
Secrets,
)
from logzero import logger

from chaosazure.auth import auth
from chaosazure.common.config import load_configuration, load_secrets
Expand All @@ -45,6 +45,7 @@
"init_storage_management_client",
]
__version__ = "0.16.0"
logger = logging.getLogger("chaostoolkit")


def discover(discover_system: bool = True) -> Discovery:
Expand Down
3 changes: 2 additions & 1 deletion chaosazure/aks/actions.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import logging
import random

from chaoslib.exceptions import FailedActivity
from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure import init_containerservice_management_client
from chaosazure.aks.constants import RES_TYPE_AKS
Expand All @@ -23,6 +23,7 @@
"delete_managed_clusters",
"stop_managed_clusters",
]
logger = logging.getLogger("chaostoolkit")


def delete_node(
Expand Down
4 changes: 3 additions & 1 deletion chaosazure/aks/probes.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# -*- coding: utf-8 -*-
import logging

from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure.aks.constants import RES_TYPE_AKS
from chaosazure.common.resources.graph import fetch_resources

__all__ = ["describe_managed_clusters", "count_managed_clusters"]
logger = logging.getLogger("chaostoolkit")


def describe_managed_clusters(
Expand Down
6 changes: 3 additions & 3 deletions chaosazure/application_gateway/actions.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# -*- coding: utf-8 -*-
import logging
import re

from chaoslib.exceptions import FailedActivity
from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure import init_network_management_client
from chaosazure.common import cleanse
from chaosazure.application_gateway.constants import RES_TYPE_SRV_AG
from chaosazure.common.resources.graph import fetch_resources
from chaosazure.vmss.records import Records

__all__ = [
"delete_application_gateways",
"start_application_gateways",
"stop_application_gateways",
"delete_routes",
]

from chaosazure.vmss.records import Records
logger = logging.getLogger("chaostoolkit")


def delete_application_gateways(
Expand Down
3 changes: 2 additions & 1 deletion chaosazure/application_gateway/probes.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
import logging
import re

from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure.application_gateway.constants import RES_TYPE_SRV_AG
from chaosazure.application_gateway.actions import __network_mgmt_client
Expand All @@ -13,6 +13,7 @@
"count_application_gateways",
"describe_routes",
]
logger = logging.getLogger("chaostoolkit")


def describe_application_gateways(
Expand Down
5 changes: 4 additions & 1 deletion chaosazure/common/cloud.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import logging

from chaoslib.exceptions import InterruptExecution
from logzero import logger
from msrestazure import azure_cloud

logger = logging.getLogger("chaostoolkit")

AZURE_CHINA_CLOUD = "AZURE_CHINA_CLOUD"
AZURE_GERMAN_CLOUD = "AZURE_GERMAN_CLOUD"
AZURE_PUBLIC_CLOUD = "AZURE_PUBLIC_CLOUD"
Expand Down
3 changes: 2 additions & 1 deletion chaosazure/common/compute/command.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import logging
import os

from chaoslib.exceptions import FailedActivity, InterruptExecution
from logzero import logger

from chaosazure import init_compute_management_client
from chaosazure.machine.constants import OS_LINUX, OS_WINDOWS, RES_TYPE_VM
from chaosazure.vmss.constants import RES_TYPE_VMSS_VM

UNSUPPORTED_WINDOWS_SCRIPTS = ["network_latency", "burn_io"]
logger = logging.getLogger("chaostoolkit")


def prepare_path(machine: dict, path: str):
Expand Down
4 changes: 3 additions & 1 deletion chaosazure/common/config.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import io
import logging
import json
import os

from chaoslib.types import Configuration, Secrets
from logzero import logger
from msrestazure import azure_cloud

from chaosazure.common import cloud

logger = logging.getLogger("chaostoolkit")


def load_secrets(experiment_secrets: Secrets):
"""Load secrets from experiments or azure credential file.
Expand Down
6 changes: 3 additions & 3 deletions chaosazure/machine/actions.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# -*- coding: utf-8 -*-
import logging

from chaoslib.exceptions import FailedActivity
from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure import init_compute_management_client
from chaosazure.common import cleanse
from chaosazure.common.compute import command
from chaosazure.machine.constants import RES_TYPE_VM
from chaosazure.common.resources.graph import fetch_resources
from chaosazure.vmss.records import Records

__all__ = [
"delete_machines",
Expand All @@ -20,8 +21,7 @@
"network_latency",
"burn_io",
]

from chaosazure.vmss.records import Records
logger = logging.getLogger("chaostoolkit")


def delete_machines(
Expand Down
4 changes: 3 additions & 1 deletion chaosazure/machine/probes.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# -*- coding: utf-8 -*-
import logging

from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure.machine.constants import RES_TYPE_VM
from chaosazure.common.resources.graph import fetch_resources

__all__ = ["describe_machines", "count_machines"]
logger = logging.getLogger("chaostoolkit")


def describe_machines(
Expand Down
6 changes: 3 additions & 3 deletions chaosazure/netapp/actions.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# -*- coding: utf-8 -*-
import logging
import re

from chaoslib.exceptions import FailedActivity
from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure import init_netapp_management_client
from chaosazure.common import cleanse
from chaosazure.netapp.constants import RES_TYPE_SRV_NV
from chaosazure.common.resources.graph import fetch_resources
from chaosazure.vmss.records import Records

__all__ = ["delete_netapp_volumes"]

from chaosazure.vmss.records import Records
logger = logging.getLogger("chaostoolkit")


def delete_netapp_volumes(
Expand Down
3 changes: 2 additions & 1 deletion chaosazure/netapp/probes.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# -*- coding: utf-8 -*-
import logging
from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure.netapp.constants import RES_TYPE_SRV_NV
from chaosazure.common.resources.graph import fetch_resources

__all__ = ["describe_netapp_volumes", "count_netapp_volumes"]
logger = logging.getLogger("chaostoolkit")


def describe_netapp_volumes(
Expand Down
6 changes: 3 additions & 3 deletions chaosazure/postgresql/actions.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# -*- coding: utf-8 -*-
import logging
import re

from chaoslib.exceptions import FailedActivity
from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure import init_postgresql_management_client
from chaosazure.common import cleanse
from chaosazure.postgresql.constants import RES_TYPE_SRV_PG
from azure.mgmt.rdbms.postgresql.models import Database
from chaosazure.common.resources.graph import fetch_resources
from chaosazure.vmss.records import Records

__all__ = [
"delete_servers",
"restart_servers",
"delete_databases",
"create_databases",
]

from chaosazure.vmss.records import Records
logger = logging.getLogger("chaostoolkit")


def delete_servers(
Expand Down
3 changes: 2 additions & 1 deletion chaosazure/postgresql/probes.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# -*- coding: utf-8 -*-
import logging
import re

from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure.postgresql.constants import RES_TYPE_SRV_PG
from chaosazure.postgresql.actions import __postgresql_mgmt_client
from chaosazure.common.resources.graph import fetch_resources

__all__ = ["describe_servers", "count_servers", "describe_databases"]
logger = logging.getLogger("chaostoolkit")


def describe_servers(
Expand Down
3 changes: 2 additions & 1 deletion chaosazure/postgresql_flexible/actions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
import logging
import random
import re
from typing import List
Expand All @@ -9,7 +10,6 @@

from chaoslib.exceptions import FailedActivity
from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure import init_postgresql_flexible_management_client
from chaosazure.common import cleanse
Expand All @@ -27,6 +27,7 @@
"create_databases",
"delete_tables",
]
logger = logging.getLogger("chaostoolkit")


def delete_servers(
Expand Down
3 changes: 2 additions & 1 deletion chaosazure/postgresql_flexible/probes.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
import logging
import re

from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure.postgresql_flexible.constants import RES_TYPE_SRV_PG_FLEX
from chaosazure.postgresql_flexible.actions import (
Expand All @@ -11,6 +11,7 @@
from chaosazure.common.resources.graph import fetch_resources

__all__ = ["describe_servers", "count_servers", "describe_databases"]
logger = logging.getLogger("chaostoolkit")


def describe_servers(
Expand Down
6 changes: 3 additions & 3 deletions chaosazure/storage/actions.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# -*- coding: utf-8 -*-
import logging
import re
import random

from chaoslib.exceptions import FailedActivity
from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure import init_storage_management_client
from chaosazure.common import cleanse
from chaosazure.storage.constants import RES_TYPE_SRV_SA
from chaosazure.common.resources.graph import fetch_resources
from chaosazure.vmss.records import Records

__all__ = ["delete_storage_accounts", "delete_blob_containers"]

from chaosazure.vmss.records import Records
logger = logging.getLogger("chaostoolkit")


def delete_storage_accounts(
Expand Down
4 changes: 3 additions & 1 deletion chaosazure/storage/probes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import logging

from chaoslib.types import Configuration, Secrets
from logzero import logger

from chaosazure.storage.constants import RES_TYPE_SRV_SA
from chaosazure.common.resources.graph import fetch_resources
Expand All @@ -11,6 +12,7 @@
"count_storage_accounts",
"count_blob_containers",
]
logger = logging.getLogger("chaostoolkit")


def describe_storage_accounts(
Expand Down
3 changes: 2 additions & 1 deletion chaosazure/vmss/actions.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
from typing import Iterable, Mapping

from chaoslib import Configuration, Secrets
from logzero import logger

from chaosazure import init_compute_management_client
from chaosazure.common import cleanse
Expand All @@ -19,6 +19,7 @@
"network_latency",
"stress_vmss_instance_cpu",
]
logger = logging.getLogger("chaostoolkit")


def delete_vmss(
Expand Down
4 changes: 3 additions & 1 deletion chaosazure/vmss/fetcher.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import logging
import random
from typing import Any, Dict, Iterable, Mapping, List

from chaoslib import Configuration, Secrets
from chaoslib.exceptions import FailedActivity
from logzero import logger

from chaosazure import init_compute_management_client
from chaosazure.common.resources.graph import fetch_resources
from chaosazure.vmss.constants import RES_TYPE_VMSS

logger = logging.getLogger("chaostoolkit")


def fetch_instances(
scale_set, instance_criteria, configuration, secrets
Expand Down
Loading

0 comments on commit 0830e16

Please sign in to comment.