Fixing broken dependencies

- Upped the version to 1.0.2
- Updated the `tests/starfleet_included_plugins/account_index_generator/generatedIndex.json` file to account for newer regions
- Reformatted to latest standards

Author: Mike Grima

pyproject.toml

@@ -8,7 +8,7 @@ authors = [
     {name = "Gemini", email = "[email protected]"},
     {name = "Mike Grima", email = "[email protected]"},
 ]
-version = "1.0.1"
+version = "1.0.2"
 dynamic = ["dependencies"]
 
 [tool.setuptools]

setup.py

@@ -7,6 +7,7 @@
 :Module: setup
 :Author: Mike Grima <[email protected]>
 """
+
 from setuptools import setup
 
 setup()

src/requirements.txt

@@ -1,13 +1,13 @@
+iambic-core==0.11.97
 cloudaux-lite==1.0.0
 click==8.1.7
 PyYAML==6.0.1
-marshmallow==3.20.1
+marshmallow==3.21.1
 retry==0.9.2
 pyjwt==2.8.0
 requests==2.31.0
-cryptography==41.0.7
-botocore==1.34.11
-boto3==1.34.11
-slack-sdk==3.26.1
+# cryptography==42.0.5  Handled by iambic-core
+botocore==1.34.71
+boto3==1.34.71
+slack-sdk==3.27.1
 deepdiff==6.7.1
-iambic-core==0.11.97

src/starfleet/account_index/loader.py

@@ -9,6 +9,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import starfleet.account_index.plugins
 from starfleet.account_index.schematics import AccountIndex, AccountIndexInstance
 from starfleet.utils.configuration import STARFLEET_CONFIGURATION

src/starfleet/account_index/plugins/starfleet_default_index/__init__.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from starfleet.account_index.plugins.starfleet_default_index.ship import StarfleetDefaultAccountIndex
 
 ACCOUNT_INDEX_PLUGINS = [StarfleetDefaultAccountIndex]

src/starfleet/account_index/plugins/starfleet_default_index/ship.py

@@ -8,6 +8,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 # pylint: disable=too-many-locals,too-many-statements
 import json
 from typing import Any, Dict, Optional, Set

src/starfleet/account_index/resolvers.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from typing import Any, Dict, Set
 
 from starfleet.account_index.loader import ACCOUNT_INDEX

src/starfleet/account_index/schematics.py

@@ -8,6 +8,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from typing import Set, Dict, Optional, TypeVar
 
 

src/starfleet/cli/components.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from typing import Any, List
 
 import click

src/starfleet/starbase/entrypoints.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import json
 from typing import Any, Dict
 

src/starfleet/starbase/main.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import json
 from typing import Any, Dict, Tuple, Optional
 from urllib.parse import unquote_plus

src/starfleet/starbase/utils.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import json
 from typing import Any, Dict, List, Type, Generator
 

src/starfleet/startup.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from starfleet.utils.logging import LOGGER  # noqa pylint: disable=W0611
 from starfleet.utils.configuration import STARFLEET_CONFIGURATION
 from starfleet.account_index.loader import ACCOUNT_INDEX

src/starfleet/utils/config_schema.py

@@ -8,6 +8,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from typing import Any, Dict
 
 from marshmallow import Schema, fields, INCLUDE, validate, validates_schema, ValidationError

src/starfleet/utils/configuration.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import logging
 import os
 from typing import Any, Dict

src/starfleet/utils/logging.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import logging
 
 LOGGER = logging.getLogger("starfleet")

src/starfleet/utils/niceties.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from typing import Set
 
 import boto3

src/starfleet/utils/plugin_loader.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 # from importlib.metadata import entry_points
 import importlib
 from pkgutil import iter_modules

src/starfleet/utils/secrets.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import json
 from typing import Any, Dict
 

src/starfleet/utils/slack.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from typing import Any, Dict, List
 
 from slack_sdk import WebClient

src/starfleet/worker_ships/base_payload_schemas.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from typing import List, Any, Dict, TypeVar
 
 from marshmallow import Schema, fields, INCLUDE, validates, ValidationError, validate, validates_schema

src/starfleet/worker_ships/cli_utils.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from io import TextIOWrapper
 from typing import Dict, Any
 

src/starfleet/worker_ships/lambda_utils.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import os
 from functools import wraps
 from typing import Callable, Dict, Type, Any

src/starfleet/worker_ships/loader.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from typing import Dict
 
 import starfleet.worker_ships.plugins
@@ -53,7 +54,9 @@ def load_all_plugins(self):
                         # If there is a configuration entry, then we need to validate the correct configuration:
                         errors = plugin.configuration_template_class().validate(worker_ship_config)  # noqa
                         if errors:
-                            raise BadConfigurationError(f"[💥] Worker ship: {plugin.get_worker_ship_name()} has an invalid configuration. {str(errors)}")  # noqa
+                            raise BadConfigurationError(
+                                f"[💥] Worker ship: {plugin.get_worker_ship_name()} has an invalid configuration. {str(errors)}"
+                            )  # noqa
 
                         # Check that the worker ship is enabled:
                         if not worker_ship_config["Enabled"]:

src/starfleet/worker_ships/niceties.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import datetime
 import json
 from typing import Any

src/starfleet/worker_ships/plugins/account_index_generator/__init__.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from starfleet.worker_ships.plugins.account_index_generator.ship import AccountIndexGeneratorShip, account_inventory
 
 WORKER_SHIP_PLUGINS = [AccountIndexGeneratorShip]

src/starfleet/worker_ships/plugins/account_index_generator/ship.py

@@ -8,6 +8,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from datetime import datetime
 import json
 from typing import Dict, Any, TypeVar

src/starfleet/worker_ships/plugins/account_index_generator/utils.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import asyncio
 from asyncio import AbstractEventLoop
 from concurrent.futures import ThreadPoolExecutor

src/starfleet/worker_ships/plugins/aws_config/__init__.py

@@ -9,6 +9,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from starfleet.worker_ships.plugins.aws_config.ship import AwsConfigWorkerShip, aws_config
 
 WORKER_SHIP_PLUGINS = [AwsConfigWorkerShip]

src/starfleet/worker_ships/plugins/aws_config/logic.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import json
 from difflib import Differ
 from enum import Enum

src/starfleet/worker_ships/plugins/aws_config/schemas.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from enum import Enum
 from typing import Any, Dict
 

src/starfleet/worker_ships/plugins/aws_config/ship.py

@@ -8,6 +8,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import json
 import traceback
 from typing import Dict, Any, TypeVar

src/starfleet/worker_ships/plugins/github_sync/__init__.py

@@ -10,6 +10,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from starfleet.worker_ships.plugins.github_sync.ship import GitHubSyncWorkerShip, sync_github
 
 WORKER_SHIP_PLUGINS = [GitHubSyncWorkerShip]

src/starfleet/worker_ships/plugins/github_sync/auth.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from datetime import datetime, timezone
 from functools import wraps
 from typing import Dict, Any, Callable

src/starfleet/worker_ships/plugins/github_sync/ship.py

@@ -10,6 +10,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 # pylint: disable=too-many-locals,too-many-statements
 import json
 import tempfile

src/starfleet/worker_ships/plugins/github_sync/utils.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import hashlib
 import os
 import re

src/starfleet/worker_ships/plugins/iam/__init__.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import click
 
 from starfleet.worker_ships.plugins.iam.role_ship import IamRoleWorkerShip, role

src/starfleet/worker_ships/plugins/iam/iambic_imports.py

@@ -5,6 +5,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 # pylint: disable=unused-import,wrong-import-position,wrong-import-order
 from unittest import mock
 

src/starfleet/worker_ships/plugins/iam/role_ship.py

@@ -8,6 +8,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 # pylint: disable=too-many-locals,too-many-statements,too-many-branches
 import asyncio
 import json
@@ -64,7 +65,7 @@ def render_iambic_template(self, commit: bool = False) -> Dict[str, Any]:
         """This will render the iambic template and return it back out."""
         return render_iambic_template(self.payload, IambicTemplateTypes.IAM_ROLE, commit)
 
-    def prepare_iambic_template(self, rendered_template: Dict[str, Any]) -> "AwsIamRoleTemplate":
+    def prepare_iambic_template(self, rendered_template: Dict[str, Any]) -> "AwsIamRoleTemplate":  # noqa
         """This will perform the additional validation that is needed to load and generate the iambic template."""
         from starfleet.worker_ships.plugins.iam.iambic_imports import AwsIamRoleTemplate
 

src/starfleet/worker_ships/plugins/iam/schemas.py

@@ -5,6 +5,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 import copy
 from enum import Enum
 from typing import Any, Dict, List
@@ -68,7 +69,7 @@ def render_iambic_template(template: Dict[str, Any], template_type: IambicTempla
     return rendered_template
 
 
-def make_iambic_variables(template_variables: List[Dict[str, str]]) -> List["Variable"]:
+def make_iambic_variables(template_variables: List[Dict[str, str]]) -> List["Variable"]:  # noqa
     """This will make the iambic variable objects from the Starfleet template variables."""
     from starfleet.worker_ships.plugins.iam.iambic_imports import Variable
 
@@ -79,7 +80,7 @@ def make_iambic_variables(template_variables: List[Dict[str, str]]) -> List["Var
     return iambic_variables
 
 
-def render_iambic_stanza(template_stanza: Any) -> Any:  # pylint: disable=too-many-branches
+def render_iambic_stanza(template_stanza: Any) -> Any:  # noqa  # pylint: disable=too-many-branches
     """This is going to recursively iterate over the iambic template and render out the stanzas as appropriate."""
     # Is this a dictionary?
     if isinstance(template_stanza, dict):

src/starfleet/worker_ships/ship_schematics.py

@@ -11,6 +11,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 from enum import Enum
 from typing import Any, Dict, Type, TypeVar
 

tests/account_index/conftest.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 # pylint: disable=unused-argument
 from typing import Generator, Any, Dict
 

tests/account_index/test_account_index_components.py

@@ -7,6 +7,7 @@
 :License: See the LICENSE file for details
 :Author: Mike Grima <[email protected]>
 """
+
 # pylint: disable=unused-argument
 from typing import Any, Dict
 from unittest import mock