openshift-python-wrapper 11.0.9__tar.gz → 11.0.11__tar.gz

{openshift_python_wrapper-11.0.9 → openshift_python_wrapper-11.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openshift-python-wrapper
-Version: 11.0.9
+Version: 11.0.11
 Summary: Wrapper around https://github.com/kubernetes-client/python
 Project-URL: homepage, https://github.com/RedHatQE/openshift-python-wrapper
 Project-URL: documentation, https://openshift-python-wrapper.readthedocs.io/en/latest/

{openshift_python_wrapper-11.0.9 → openshift_python_wrapper-11.0.11}/class_generator/class_generator.py

@@ -12,7 +12,7 @@ import shutil
 from tempfile import gettempdir
 
 import textwrap
-from typing import Any, Dict, List, Tuple
+from typing import Any
 import click
 import re
 from concurrent.futures import Future, ThreadPoolExecutor, as_completed
@@ -39,8 +39,8 @@ MISSING_DESCRIPTION_STR: str = "No field description from API; please add descri
 
 
 def _is_kind_and_namespaced(
-    client: str, _key: str, _data: Dict[str, Any], kind: str, group: str, version: str
-) -> Dict[str, Any]:
+    client: str, _key: str, _data: dict[str, Any], kind: str, group: str, version: str
+) -> dict[str, Any]:
     _group_and_version = f"{group}/{version}" if group else version
     not_resource_dict = {"is_kind": False, "kind": _key}
 
@@ -86,7 +86,7 @@ def map_kind_to_namespaced(client: str, newer_cluster_version: bool, schema_defi
     with open(schema_definition_file) as fd:
         _definitions_json_data = json.load(fd)
 
-    _kind_data_futures: List[Future] = []
+    _kind_data_futures: list[Future] = []
     with ThreadPoolExecutor() as executor:
         for _key, _data in _definitions_json_data["definitions"].items():
             if not _data.get("x-kubernetes-group-version-kind"):
@@ -116,7 +116,7 @@ def map_kind_to_namespaced(client: str, newer_cluster_version: bool, schema_defi
                 )
             )
 
-    _temp_resources_mappings: Dict[Any, Any] = {}
+    _temp_resources_mappings: dict[Any, Any] = {}
     for res in as_completed(_kind_data_futures):
         _res = res.result()
         # _res["kind"] is group.version.kind, set only kind as key in the final dict
@@ -137,7 +137,7 @@ def map_kind_to_namespaced(client: str, newer_cluster_version: bool, schema_defi
         fd.writelines("\n".join(not_kind_list))
 
 
-def read_resources_mapping_file() -> Dict[Any, Any]:
+def read_resources_mapping_file() -> dict[Any, Any]:
     try:
         with open(RESOURCES_MAPPING_FILE) as fd:
             return json.load(fd)
@@ -339,7 +339,7 @@ def convert_camel_case_to_snake_case(string_: str) -> str:
     return formatted_str
 
 
-def render_jinja_template(template_dict: Dict[Any, Any], template_dir: str, template_name: str) -> str:
+def render_jinja_template(template_dict: dict[Any, Any], template_dir: str, template_name: str) -> str:
     env = Environment(
         loader=FileSystemLoader(template_dir),
         trim_blocks=True,
@@ -358,28 +358,34 @@ def render_jinja_template(template_dict: Dict[Any, Any], template_dir: str, temp
     return rendered
 
 
-def parse_user_code_from_file(file_path: str) -> str:
+def parse_user_code_from_file(file_path: str) -> tuple[str, str]:
     with open(file_path) as fd:
         data = fd.read()
 
-    line = "    # End of generated code"
-    if line in data:
-        _end_of_generated_code_index = data.index(line)
-        _user_code = data[_end_of_generated_code_index + len(line) :]
-        return _user_code
+    end_of_generated_code_line = "    # End of generated code"
+    user_code: str = ""
+    user_imports: str = ""
 
-    return ""
+    if end_of_generated_code_line in data:
+        _end_of_generated_code_index = data.index(end_of_generated_code_line)
+        user_code = data[_end_of_generated_code_index + len(end_of_generated_code_line) :]
+
+    for _line in data.splitlines():
+        if _line.startswith("import") or _line.startswith("from"):
+            user_imports += f"{_line}\n"
+
+    return user_code, user_imports
 
 
 def generate_resource_file_from_dict(
-    resource_dict: Dict[str, Any],
+    resource_dict: dict[str, Any],
     overwrite: bool = False,
     dry_run: bool = False,
     output_file: str = "",
     add_tests: bool = False,
     output_file_suffix: str = "",
     output_dir: str = "",
-) -> Tuple[str, str]:
+) -> tuple[str, str]:
     base_dir = output_dir or "ocp_resources"
     if not os.path.exists(base_dir):
         os.makedirs(base_dir)
@@ -390,6 +396,7 @@ def generate_resource_file_from_dict(
         template_name="class_generator_template.j2",
     )
 
+    output = "# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md\n\nfrom __future__ import annotations\n"
     formatted_kind_str = convert_camel_case_to_snake_case(string_=resource_dict["kind"])
     _file_suffix: str = f"{'_' + output_file_suffix if output_file_suffix else ''}"
 
@@ -409,9 +416,10 @@ def generate_resource_file_from_dict(
 
     _output_file_exists: bool = os.path.exists(_output_file)
     _user_code: str = ""
+    _user_imports: str = ""
 
-    if _output_file_exists:
-        _user_code = parse_user_code_from_file(file_path=_output_file)
+    if _output_file_exists and not add_tests:
+        _user_code, _user_imports = parse_user_code_from_file(file_path=_output_file)
 
     orig_filename = _output_file
     if _output_file_exists:
@@ -423,19 +431,22 @@ def generate_resource_file_from_dict(
             LOGGER.warning(f"{_output_file} already exists, using {temp_output_file}")
             _output_file = temp_output_file
 
+    if _user_code or _user_imports:
+        output += f"{_user_imports}{rendered}{_user_code}"
+    else:
+        output += rendered
+
     if dry_run:
-        if _user_code:
-            rendered += _user_code
-        _code = Syntax(code=rendered, lexer="python", line_numbers=True)
+        _code = Syntax(code=output, lexer="python", line_numbers=True)
         Console().print(_code)
 
     else:
-        write_and_format_rendered(filepath=_output_file, data=rendered, user_code=_user_code)
+        write_and_format_rendered(filepath=_output_file, output=output)
 
     return orig_filename, _output_file
 
 
-def types_generator(key_dict: Dict[str, Any]) -> Dict[str, str]:
+def types_generator(key_dict: dict[str, Any]) -> dict[str, str]:
     type_for_docstring: str = "Any"
     type_from_dict_for_init: str = ""
     # A resource field may be defined with `x-kubernetes-preserve-unknown-fields`. In this case, `type` is not provided.
@@ -443,11 +454,11 @@ def types_generator(key_dict: Dict[str, Any]) -> Dict[str, str]:
 
     # All fields must be set with Optional since resource can have yaml_file to cover all args.
     if resource_type == "array":
-        type_for_docstring = "List[Any]"
+        type_for_docstring = "list[Any]"
 
     elif resource_type == "string":
         type_for_docstring = "str"
-        type_from_dict_for_init = f'Optional[{type_for_docstring}] = ""'
+        type_from_dict_for_init = f"{type_for_docstring} | None = None"
 
     elif resource_type == "boolean":
         type_for_docstring = "bool"
@@ -456,15 +467,15 @@ def types_generator(key_dict: Dict[str, Any]) -> Dict[str, str]:
         type_for_docstring = "int"
 
     elif resource_type == "object":
-        type_for_docstring = "Dict[str, Any]"
+        type_for_docstring = "dict[str, Any]"
 
     if not type_from_dict_for_init:
-        type_from_dict_for_init = f"Optional[{type_for_docstring}] = None"
+        type_from_dict_for_init = f"{type_for_docstring} | None = None"
 
     return {"type-for-init": type_from_dict_for_init, "type-for-doc": type_for_docstring}
 
 
-def get_property_schema(property_: Dict[str, Any]) -> Dict[str, Any]:
+def get_property_schema(property_: dict[str, Any]) -> dict[str, Any]:
     if _ref := property_.get("$ref"):
         with open(f"{SCHEMA_DIR}/{_ref.rsplit('.')[-1].lower()}.json") as fd:
             return json.load(fd)
@@ -481,12 +492,12 @@ def format_description(description: str) -> str:
 
 
 def prepare_property_dict(
-    schema: Dict[str, Any],
-    required: List[str],
-    resource_dict: Dict[str, Any],
+    schema: dict[str, Any],
+    required: list[str],
+    resource_dict: dict[str, Any],
     dict_key: str,
-) -> Dict[str, Any]:
-    keys_to_ignore: List[str] = ["kind", "apiVersion", "status", SPEC_STR.lower()]
+) -> dict[str, Any]:
+    keys_to_ignore: list[str] = ["kind", "apiVersion", "status", SPEC_STR.lower()]
     keys_to_rename: set[str] = {"annotations", "labels"}
     if dict_key != SPEC_STR.lower():
         keys_to_ignore.append("metadata")
@@ -512,21 +523,21 @@ def prepare_property_dict(
 
 def parse_explain(
     kind: str,
-) -> List[Dict[str, Any]]:
+) -> list[dict[str, Any]]:
     _schema_definition = read_resources_mapping_file()
-    _resources: List[Dict[str, Any]] = []
+    _resources: list[dict[str, Any]] = []
 
     _kinds_schema = _schema_definition[kind.lower()]
     for _kind_schema in _kinds_schema:
         namespaced = _kind_schema["namespaced"]
-        resource_dict: Dict[str, Any] = {
+        resource_dict: dict[str, Any] = {
             "base_class": "NamespacedResource" if namespaced else "Resource",
             "description": _kind_schema.get("description", MISSING_DESCRIPTION_STR),
             "fields": [],
             "spec": [],
         }
 
-        schema_properties: Dict[str, Any] = _kind_schema.get("properties", {})
+        schema_properties: dict[str, Any] = _kind_schema.get("properties", {})
         fields_required = _kind_schema.get("required", [])
 
         resource_dict.update(extract_group_kind_version(_kind_schema=_kind_schema))
@@ -585,8 +596,8 @@ def parse_explain(
     return _resources
 
 
-def extract_group_kind_version(_kind_schema: Dict[str, Any]) -> Dict[str, str]:
-    group_kind_versions: List[Dict[str, str]] = _kind_schema["x-kubernetes-group-version-kind"]
+def extract_group_kind_version(_kind_schema: dict[str, Any]) -> dict[str, str]:
+    group_kind_versions: list[dict[str, str]] = _kind_schema["x-kubernetes-group-version-kind"]
     group_kind_version = group_kind_versions[0]
 
     for group_kind_version in group_kind_versions:
@@ -604,7 +615,7 @@ def class_generator(
     output_dir: str = "",
     add_tests: bool = False,
     called_from_cli: bool = True,
-) -> List[str]:
+) -> list[str]:
     """
     Generates a class for a given Kind.
     """
@@ -622,7 +633,7 @@ def class_generator(
     resources = parse_explain(kind=kind)
 
     use_output_file_suffix: bool = len(resources) > 1
-    generated_files: List[str] = []
+    generated_files: list[str] = []
     for resource_dict in resources:
         output_file_suffix = resource_dict["group"].lower() if use_output_file_suffix else ""
 
@@ -652,12 +663,9 @@ def class_generator(
     return generated_files
 
 
-def write_and_format_rendered(filepath: str, data: str, user_code: str = "") -> None:
+def write_and_format_rendered(filepath: str, output: str) -> None:
     with open(filepath, "w") as fd:
-        fd.write(data)
-
-        if user_code:
-            fd.write(user_code)
+        fd.write(output)
 
     for op in ("format", "check"):
         run_command(
@@ -668,8 +676,8 @@ def write_and_format_rendered(filepath: str, data: str, user_code: str = "") ->
 
 
 def generate_class_generator_tests() -> None:
-    tests_info: Dict[str, List[Dict[str, str]]] = {"template": []}
-    dirs_to_ignore: List[str] = ["__pycache__"]
+    tests_info: dict[str, list[dict[str, str]]] = {"template": []}
+    dirs_to_ignore: list[str] = ["__pycache__"]
 
     for _dir in os.listdir(TESTS_MANIFESTS_DIR):
         if _dir in dirs_to_ignore:
@@ -693,7 +701,7 @@ def generate_class_generator_tests() -> None:
 
     write_and_format_rendered(
         filepath=os.path.join(Path(TESTS_MANIFESTS_DIR).parent, "test_class_generator.py"),
-        data=rendered,
+        output=rendered,
     )
 
 
@@ -756,15 +764,15 @@ def main(
     if update_schema:
         return update_kind_schema()
 
-    _kwargs: Dict[str, Any] = {
+    _kwargs: dict[str, Any] = {
         "overwrite": overwrite,
         "dry_run": dry_run,
         "output_file": output_file,
         "add_tests": add_tests,
     }
 
-    kinds: List[str] = kind.split(",")
-    futures: List[Future] = []
+    kinds: list[str] = kind.split(",")
+    futures: list[Future] = []
 
     with ThreadPoolExecutor() as executor:
         for _kind in kinds:

{openshift_python_wrapper-11.0.9 → openshift_python_wrapper-11.0.11}/class_generator/manifests/class_generator_template.j2

@@ -6,9 +6,8 @@
   {% set _ = all_names_types_for_docstring.append(arg["name-for-class-arg"] + " (" + arg["type-for-docstring"] + "): " +  arg["description"]|indent(10)|safe ) %}
   {% set _ = all_required_args.append(arg["name-for-class-arg"]) if arg["required"] == True %}
 {% endfor %}
-# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
-from typing import Any, Dict, List, Optional
+from typing import Any
 from ocp_resources.resource import {{ base_class }}, MissingRequiredArgumentError
 
 

{openshift_python_wrapper-11.0.9 → openshift_python_wrapper-11.0.11}/class_generator/tests/manifests/APIServer/api_server.py

@@ -1,6 +1,8 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
-from typing import Any, Dict, List, Optional
+from __future__ import annotations
+
+from typing import Any
 from ocp_resources.resource import Resource
 
 
@@ -17,27 +19,27 @@ class APIServer(Resource):
 
     def __init__(
         self,
-        additional_cors_allowed_origins: Optional[List[Any]] = None,
-        audit: Optional[Dict[str, Any]] = None,
-        client_ca: Optional[Dict[str, Any]] = None,
-        encryption: Optional[Dict[str, Any]] = None,
-        serving_certs: Optional[Dict[str, Any]] = None,
-        tls_security_profile: Optional[Dict[str, Any]] = None,
+        additional_cors_allowed_origins: list[Any] | None = None,
+        audit: dict[str, Any] | None = None,
+        client_ca: dict[str, Any] | None = None,
+        encryption: dict[str, Any] | None = None,
+        serving_certs: dict[str, Any] | None = None,
+        tls_security_profile: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
         """
         Args:
-            additional_cors_allowed_origins (List[Any]): additionalCORSAllowedOrigins lists additional, user-defined regular
+            additional_cors_allowed_origins (list[Any]): additionalCORSAllowedOrigins lists additional, user-defined regular
               expressions describing hosts for which the API server allows
               access using the CORS headers. This may be needed to access the
               API and the integrated OAuth server from JavaScript applications.
               The values are regular expressions that correspond to the Golang
               regular expression language.
 
-            audit (Dict[str, Any]): audit specifies the settings for audit configuration to be applied to
+            audit (dict[str, Any]): audit specifies the settings for audit configuration to be applied to
               all OpenShift-provided API servers in the cluster.
 
-            client_ca (Dict[str, Any]): clientCA references a ConfigMap containing a certificate bundle for
+            client_ca (dict[str, Any]): clientCA references a ConfigMap containing a certificate bundle for
               the signers that will be recognized for incoming client
               certificates in addition to the operator managed signers. If this
               is empty, then only operator managed signers are valid. You
@@ -46,14 +48,14 @@ class APIServer(Resource):
               openshift-config namespace and contain the following required
               fields: - ConfigMap.Data["ca-bundle.crt"] - CA bundle.
 
-            encryption (Dict[str, Any]): encryption allows the configuration of encryption of resources at the
+            encryption (dict[str, Any]): encryption allows the configuration of encryption of resources at the
               datastore layer.
 
-            serving_certs (Dict[str, Any]): servingCert is the TLS cert info for serving secure traffic. If not
+            serving_certs (dict[str, Any]): servingCert is the TLS cert info for serving secure traffic. If not
               specified, operator managed certificates will be used for serving
               secure traffic.
 
-            tls_security_profile (Dict[str, Any]): tlsSecurityProfile specifies settings for TLS connections for
+            tls_security_profile (dict[str, Any]): tlsSecurityProfile specifies settings for TLS connections for
               externally exposed servers.  If unset, a default (which may change
               between releases) is chosen. Note that only Old, Intermediate and
               Custom profiles are currently supported, and the maximum available

{openshift_python_wrapper-11.0.9 → openshift_python_wrapper-11.0.11}/class_generator/tests/manifests/ClusterOperator/cluster_operator.py

@@ -1,5 +1,7 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
+from __future__ import annotations
+
 from typing import Any
 from ocp_resources.resource import Resource
 

{openshift_python_wrapper-11.0.9 → openshift_python_wrapper-11.0.11}/class_generator/tests/manifests/ConfigMap/config_map.py

@@ -1,6 +1,8 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
-from typing import Any, Dict, Optional
+from __future__ import annotations
+
+from typing import Any
 from ocp_resources.resource import NamespacedResource
 
 
@@ -13,21 +15,21 @@ class ConfigMap(NamespacedResource):
 
     def __init__(
         self,
-        binary_data: Optional[Dict[str, Any]] = None,
-        data: Optional[Dict[str, Any]] = None,
-        immutable: Optional[bool] = None,
+        binary_data: dict[str, Any] | None = None,
+        data: dict[str, Any] | None = None,
+        immutable: bool | None = None,
         **kwargs: Any,
     ) -> None:
         """
         Args:
-            binary_data (Dict[str, Any]): BinaryData contains the binary data. Each key must consist of
+            binary_data (dict[str, Any]): BinaryData contains the binary data. Each key must consist of
               alphanumeric characters, '-', '_' or '.'. BinaryData can contain
               byte sequences that are not in the UTF-8 range. The keys stored in
               BinaryData must not overlap with the ones in the Data field, this
               is enforced during validation process. Using this field will
               require 1.10+ apiserver and kubelet.
 
-            data (Dict[str, Any]): Data contains the configuration data. Each key must consist of
+            data (dict[str, Any]): Data contains the configuration data. Each key must consist of
               alphanumeric characters, '-', '_' or '.'. Values with non-UTF-8
               byte sequences must use the BinaryData field. The keys stored in
               Data must not overlap with the keys in the BinaryData field, this

{openshift_python_wrapper-11.0.9 → openshift_python_wrapper-11.0.11}/class_generator/tests/manifests/DNS/dns_config_openshift_io.py

@@ -1,6 +1,8 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
-from typing import Any, Dict, Optional
+from __future__ import annotations
+
+from typing import Any
 from ocp_resources.resource import Resource
 
 
@@ -15,10 +17,10 @@ class DNS(Resource):
 
     def __init__(
         self,
-        base_domain: Optional[str] = "",
-        platform: Optional[Dict[str, Any]] = None,
-        private_zone: Optional[Dict[str, Any]] = None,
-        public_zone: Optional[Dict[str, Any]] = None,
+        base_domain: str | None = None,
+        platform: dict[str, Any] | None = None,
+        private_zone: dict[str, Any] | None = None,
+        public_zone: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
         """
@@ -29,17 +31,17 @@ class DNS(Resource):
               created for `cluster-api.openshift.example.com`.  Once set, this
               field cannot be changed.
 
-            platform (Dict[str, Any]): platform holds configuration specific to the underlying infrastructure
+            platform (dict[str, Any]): platform holds configuration specific to the underlying infrastructure
               provider for DNS. When omitted, this means the user has no opinion
               and the platform is left to choose reasonable defaults. These
               defaults are subject to change over time.
 
-            private_zone (Dict[str, Any]): privateZone is the location where all the DNS records that are only
+            private_zone (dict[str, Any]): privateZone is the location where all the DNS records that are only
               available internally to the cluster exist.  If this field is nil,
               no private records should be created.  Once set, this field cannot
               be changed.
 
-            public_zone (Dict[str, Any]): publicZone is the location where all the DNS records that are publicly
+            public_zone (dict[str, Any]): publicZone is the location where all the DNS records that are publicly
               accessible to the internet exist.  If this field is nil, no public
               records should be created.  Once set, this field cannot be
               changed.

{openshift_python_wrapper-11.0.9/ocp_resources → openshift_python_wrapper-11.0.11/class_generator/tests/manifests/DNS}/dns_operator_openshift_io.py

@@ -1,6 +1,8 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
-from typing import Any, Dict, List, Optional
+from __future__ import annotations
+
+from typing import Any
 from ocp_resources.resource import Resource
 
 
@@ -16,18 +18,18 @@ class DNS(Resource):
 
     def __init__(
         self,
-        cache: Optional[Dict[str, Any]] = None,
-        log_level: Optional[str] = "",
-        management_state: Optional[str] = "",
-        node_placement: Optional[Dict[str, Any]] = None,
-        operator_log_level: Optional[str] = "",
-        servers: Optional[List[Any]] = None,
-        upstream_resolvers: Optional[Dict[str, Any]] = None,
+        cache: dict[str, Any] | None = None,
+        log_level: str | None = None,
+        management_state: str | None = None,
+        node_placement: dict[str, Any] | None = None,
+        operator_log_level: str | None = None,
+        servers: list[Any] | None = None,
+        upstream_resolvers: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
         """
         Args:
-            cache (Dict[str, Any]): cache describes the caching configuration that applies to all server
+            cache (dict[str, Any]): cache describes the caching configuration that applies to all server
               blocks listed in the Corefile. This field allows a cluster admin
               to optionally configure: * positiveTTL which is a duration for
               which positive responses should be cached. * negativeTTL which is
@@ -48,7 +50,7 @@ class DNS(Resource):
             management_state (str): managementState indicates whether the DNS operator should manage
               cluster DNS
 
-            node_placement (Dict[str, Any]): nodePlacement provides explicit control over the scheduling of DNS
+            node_placement (dict[str, Any]): nodePlacement provides explicit control over the scheduling of DNS
               pods.   Generally, it is useful to run a DNS pod on every node so
               that DNS queries are always handled by a local DNS pod instead of
               going over the network to a DNS pod on another node.  However,
@@ -66,7 +68,7 @@ class DNS(Resource):
               setting operatorLogLevel: Trace will produce extremely verbose
               logs.
 
-            servers (List[Any]): servers is a list of DNS resolvers that provide name query delegation
+            servers (list[Any]): servers is a list of DNS resolvers that provide name query delegation
               for one or more subdomains outside the scope of the cluster
               domain. If servers consists of more than one Server, longest
               suffix match will be used to determine the Server.   For example,
@@ -75,7 +77,7 @@ class DNS(Resource):
               routed to the Server with Zone "a.foo.com".   If this field is
               nil, no servers are created.
 
-            upstream_resolvers (Dict[str, Any]): upstreamResolvers defines a schema for configuring CoreDNS to proxy
+            upstream_resolvers (dict[str, Any]): upstreamResolvers defines a schema for configuring CoreDNS to proxy
               DNS messages to upstream resolvers for the case of the default
               (".") server   If this field is not specified, the upstream used
               will default to /etc/resolv.conf, with policy "sequential"

{openshift_python_wrapper-11.0.9 → openshift_python_wrapper-11.0.11}/class_generator/tests/manifests/Deployment/deployment.py

@@ -1,6 +1,8 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
-from typing import Any, Dict, Optional
+from __future__ import annotations
+
+from typing import Any
 from ocp_resources.resource import NamespacedResource, MissingRequiredArgumentError
 
 
@@ -13,14 +15,14 @@ class Deployment(NamespacedResource):
 
     def __init__(
         self,
-        min_ready_seconds: Optional[int] = None,
-        paused: Optional[bool] = None,
-        progress_deadline_seconds: Optional[int] = None,
-        replicas: Optional[int] = None,
-        revision_history_limit: Optional[int] = None,
-        selector: Optional[Dict[str, Any]] = None,
-        strategy: Optional[Dict[str, Any]] = None,
-        template: Optional[Dict[str, Any]] = None,
+        min_ready_seconds: int | None = None,
+        paused: bool | None = None,
+        progress_deadline_seconds: int | None = None,
+        replicas: int | None = None,
+        revision_history_limit: int | None = None,
+        selector: dict[str, Any] | None = None,
+        strategy: dict[str, Any] | None = None,
+        template: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
         """
@@ -46,15 +48,15 @@ class Deployment(NamespacedResource):
               pointer to distinguish between explicit zero and not specified.
               Defaults to 10.
 
-            selector (Dict[str, Any]): A label selector is a label query over a set of resources. The result
+            selector (dict[str, Any]): A label selector is a label query over a set of resources. The result
               of matchLabels and matchExpressions are ANDed. An empty label
               selector matches all objects. A null label selector matches no
               objects.
 
-            strategy (Dict[str, Any]): DeploymentStrategy describes how to replace existing pods with new
+            strategy (dict[str, Any]): DeploymentStrategy describes how to replace existing pods with new
               ones.
 
-            template (Dict[str, Any]): PodTemplateSpec describes the data a pod should have when created from
+            template (dict[str, Any]): PodTemplateSpec describes the data a pod should have when created from
               a template
 
         """

{openshift_python_wrapper-11.0.9 → openshift_python_wrapper-11.0.11}/class_generator/tests/manifests/Image/image_config_openshift_io.py

@@ -1,6 +1,8 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
-from typing import Any, Dict, List, Optional
+from __future__ import annotations
+
+from typing import Any
 from ocp_resources.resource import Resource
 
 
@@ -20,20 +22,20 @@ class Image(Resource):
 
     def __init__(
         self,
-        additional_trusted_ca: Optional[Dict[str, Any]] = None,
-        allowed_registries_for_import: Optional[List[Any]] = None,
-        external_registry_hostnames: Optional[List[Any]] = None,
-        registry_sources: Optional[Dict[str, Any]] = None,
+        additional_trusted_ca: dict[str, Any] | None = None,
+        allowed_registries_for_import: list[Any] | None = None,
+        external_registry_hostnames: list[Any] | None = None,
+        registry_sources: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
         """
         Args:
-            additional_trusted_ca (Dict[str, Any]): additionalTrustedCA is a reference to a ConfigMap containing
+            additional_trusted_ca (dict[str, Any]): additionalTrustedCA is a reference to a ConfigMap containing
               additional CAs that should be trusted during imagestream import,
               pod image pull, build image pull, and imageregistry pullthrough.
               The namespace for this config map is openshift-config.
 
-            allowed_registries_for_import (List[Any]): allowedRegistriesForImport limits the container image registries that
+            allowed_registries_for_import (list[Any]): allowedRegistriesForImport limits the container image registries that
               normal users may import images from. Set this list to the
               registries that you trust to contain valid Docker images and that
               you want applications to be able to import from. Users with
@@ -41,13 +43,13 @@ class Image(Resource):
               not affected by this policy - typically only administrators or
               system integrations will have those permissions.
 
-            external_registry_hostnames (List[Any]): externalRegistryHostnames provides the hostnames for the default
+            external_registry_hostnames (list[Any]): externalRegistryHostnames provides the hostnames for the default
               external image registry. The external hostname should be set only
               when the image registry is exposed externally. The first value is
               used in 'publicDockerImageRepository' field in ImageStreams. The
               value must be in "hostname[:port]" format.
 
-            registry_sources (Dict[str, Any]): registrySources contains configuration that determines how the
+            registry_sources (dict[str, Any]): registrySources contains configuration that determines how the
               container runtime should treat individual registries when
               accessing images for builds+pods. (e.g. whether or not to allow
               insecure access).  It does not contain configuration for the