openshift-python-wrapper 11.0.18__tar.gz → 11.0.19__tar.gz

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openshift-python-wrapper
-Version: 11.0.18
+Version: 11.0.19
 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.18 → openshift_python_wrapper-11.0.19}/class_generator/manifests/class_generator_template.j2

@@ -79,7 +79,7 @@ class {{ kind }}({{ base_class }}):
           {# Add optional args under `self.res` #}
           {% for arg in fields %}
           {% if arg["required"] == False %}
-            if self.{{ arg["name-for-class-arg"] }}{% if arg["type-for-docstring"] == "bool" %} is not None{% endif %}:
+            if self.{{ arg["name-for-class-arg"] }} is not None:
                 self.res["{{ arg["property-name"] }}"] = self.{{ arg["name-for-class-arg"] }}
 
           {% endif %}
@@ -88,7 +88,7 @@ class {{ kind }}({{ base_class }}):
           {# Add optional args under `_spec` #}
           {% for arg in spec %}
           {% if arg["required"] == False %}
-            if self.{{ arg["name-for-class-arg"] }}{% if arg["type-for-docstring"] == "bool" %} is not None{% endif %}:
+            if self.{{ arg["name-for-class-arg"] }} is not None:
                 _spec["{{ arg["property-name"] }}"] = self.{{ arg["name-for-class-arg"] }}
 
           {% endif %}

openshift_python_wrapper-11.0.19/class_generator/scripts/tests/test_scripts.py

@@ -0,0 +1,7 @@
+from class_generator.scripts.tools import get_generated_files
+
+
+def test_get_generated_files():
+    _files: dict[str, dict[str, str]] = get_generated_files()
+    for _key in ("with_end_comment", "without_end_comment", "not_generated"):
+        assert _files.get(_key), f"{_key} is missing in generated files"

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/scripts/tools.py

@@ -1,12 +1,12 @@
-import os
-from typing import Dict, List
 import ast
+import os
+
 import click
 
 from class_generator.class_generator import class_generator
 
 
-def get_generated_files() -> Dict[str, Dict[str, str]]:
+def get_generated_files() -> dict[str, dict[str, str]]:
     """
     This function returns a dictionary containing three keys:
         - `with_end_comment`: A dictionary containing the kind of resources that have the end comment in their file.
@@ -17,10 +17,10 @@ def get_generated_files() -> Dict[str, Dict[str, str]]:
         "# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md"
     )
     end_comment: str = "# End of generated code"
-    resources_with_end_comment: Dict[str, str] = {}
-    resources_without_end_comment: Dict[str, str] = {}
-    resources_not_generated: Dict[str, str] = {}
-    exclude_files: List[str] = ["resource.py", "__init__.py", "__pycache__"]
+    resources_with_end_comment: dict[str, str] = {}
+    resources_without_end_comment: dict[str, str] = {}
+    resources_not_generated: dict[str, str] = {}
+    exclude_files: list[str] = ["resource.py", "__init__.py", "__pycache__"]
     for root, _, files in os.walk("ocp_resources"):
         for _file in files:
             _kind: str = ""
@@ -58,7 +58,7 @@ def get_generated_files() -> Dict[str, Dict[str, str]]:
     }
 
 
-def generate_resource(kinds: List[str], yes: bool) -> None:
+def generate_resource(kinds: list[str], yes: bool) -> None:
     for _kind in kinds:
         _generate = "y" if yes else click.prompt(f"Do you want to generate {_kind} resource? (y/n) ")
 
@@ -73,7 +73,7 @@ def generate_resource(kinds: List[str], yes: bool) -> None:
 @click.option(
     "--list-generated_file",
     is_flag=True,
-    help="List all generated files by `class_generator` under `ocp_resources` directory",
+    help="list all generated files by `class_generator` under `ocp_resources` directory",
 )
 @click.option("--yes", is_flag=True, help="Answer yes to all prompts")
 @click.option(
@@ -81,8 +81,30 @@ def generate_resource(kinds: List[str], yes: bool) -> None:
     is_flag=True,
     help="Generate missing end comment for all resources under `ocp_resources` directory",
 )
-def main(list_generated_file: bool, generated_missing_end_comment: bool, yes: bool) -> None:
+@click.option("--regenerate-generated-files", is_flag=True, help="Regenerate all generated files")
+def main(
+    list_generated_file: bool, generated_missing_end_comment: bool, yes: bool, regenerate_generated_files: bool
+) -> None:
     res = get_generated_files()
+
+    if regenerate_generated_files:
+        click.echo("Regenerating files...")
+        failed_kinds = []
+        for kind in res["with_end_comment"].keys():
+            try:
+                click.echo(f"Regenerating {kind}...")
+                if not class_generator(kind=kind, called_from_cli=False, overwrite=True):
+                    failed_kinds.append(kind)
+
+            except Exception as exc:
+                click.echo(f"Failed to regenerate {kind}: {exc}", err=True)
+                failed_kinds.append(kind)
+
+        if failed_kinds:
+            click.echo(f"Failed to regenerate: {', '.join(failed_kinds)}", err=True)
+        else:
+            click.echo("All files regenerated successfully!")
+
     if generated_missing_end_comment:
         generate_resource(kinds=list(res["without_end_comment"].keys()), yes=yes)
 

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/APIServer/api_server.py

@@ -78,22 +78,22 @@ class APIServer(Resource):
             self.res["spec"] = {}
             _spec = self.res["spec"]
 
-            if self.additional_cors_allowed_origins:
+            if self.additional_cors_allowed_origins is not None:
                 _spec["additionalCORSAllowedOrigins"] = self.additional_cors_allowed_origins
 
-            if self.audit:
+            if self.audit is not None:
                 _spec["audit"] = self.audit
 
-            if self.client_ca:
+            if self.client_ca is not None:
                 _spec["clientCA"] = self.client_ca
 
-            if self.encryption:
+            if self.encryption is not None:
                 _spec["encryption"] = self.encryption
 
-            if self.serving_certs:
+            if self.serving_certs is not None:
                 _spec["servingCerts"] = self.serving_certs
 
-            if self.tls_security_profile:
+            if self.tls_security_profile is not None:
                 _spec["tlsSecurityProfile"] = self.tls_security_profile
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/ConfigMap/config_map.py

@@ -51,10 +51,10 @@ class ConfigMap(NamespacedResource):
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:
-            if self.binary_data:
+            if self.binary_data is not None:
                 self.res["binaryData"] = self.binary_data
 
-            if self.data:
+            if self.data is not None:
                 self.res["data"] = self.data
 
             if self.immutable is not None:

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/DNS/dns_config_openshift_io.py

@@ -61,16 +61,16 @@ class DNS(Resource):
             self.res["spec"] = {}
             _spec = self.res["spec"]
 
-            if self.base_domain:
+            if self.base_domain is not None:
                 _spec["baseDomain"] = self.base_domain
 
-            if self.platform:
+            if self.platform is not None:
                 _spec["platform"] = self.platform
 
-            if self.private_zone:
+            if self.private_zone is not None:
                 _spec["privateZone"] = self.private_zone
 
-            if self.public_zone:
+            if self.public_zone is not None:
                 _spec["publicZone"] = self.public_zone
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/DNS/dns_operator_openshift_io.py

@@ -100,25 +100,25 @@ class DNS(Resource):
             self.res["spec"] = {}
             _spec = self.res["spec"]
 
-            if self.cache:
+            if self.cache is not None:
                 _spec["cache"] = self.cache
 
-            if self.log_level:
+            if self.log_level is not None:
                 _spec["logLevel"] = self.log_level
 
-            if self.management_state:
+            if self.management_state is not None:
                 _spec["managementState"] = self.management_state
 
-            if self.node_placement:
+            if self.node_placement is not None:
                 _spec["nodePlacement"] = self.node_placement
 
-            if self.operator_log_level:
+            if self.operator_log_level is not None:
                 _spec["operatorLogLevel"] = self.operator_log_level
 
-            if self.servers:
+            if self.servers is not None:
                 _spec["servers"] = self.servers
 
-            if self.upstream_resolvers:
+            if self.upstream_resolvers is not None:
                 _spec["upstreamResolvers"] = self.upstream_resolvers
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/Deployment/deployment.py

@@ -87,22 +87,22 @@ class Deployment(NamespacedResource):
             _spec["selector"] = self.selector
             _spec["template"] = self.template
 
-            if self.min_ready_seconds:
+            if self.min_ready_seconds is not None:
                 _spec["minReadySeconds"] = self.min_ready_seconds
 
             if self.paused is not None:
                 _spec["paused"] = self.paused
 
-            if self.progress_deadline_seconds:
+            if self.progress_deadline_seconds is not None:
                 _spec["progressDeadlineSeconds"] = self.progress_deadline_seconds
 
-            if self.replicas:
+            if self.replicas is not None:
                 _spec["replicas"] = self.replicas
 
-            if self.revision_history_limit:
+            if self.revision_history_limit is not None:
                 _spec["revisionHistoryLimit"] = self.revision_history_limit
 
-            if self.strategy:
+            if self.strategy is not None:
                 _spec["strategy"] = self.strategy
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/Image/image_config_openshift_io.py

@@ -70,16 +70,16 @@ class Image(Resource):
             self.res["spec"] = {}
             _spec = self.res["spec"]
 
-            if self.additional_trusted_ca:
+            if self.additional_trusted_ca is not None:
                 _spec["additionalTrustedCA"] = self.additional_trusted_ca
 
-            if self.allowed_registries_for_import:
+            if self.allowed_registries_for_import is not None:
                 _spec["allowedRegistriesForImport"] = self.allowed_registries_for_import
 
-            if self.external_registry_hostnames:
+            if self.external_registry_hostnames is not None:
                 _spec["externalRegistryHostnames"] = self.external_registry_hostnames
 
-            if self.registry_sources:
+            if self.registry_sources is not None:
                 _spec["registrySources"] = self.registry_sources
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/Image/image_image_openshift_io.py

@@ -103,34 +103,34 @@ class Image(Resource):
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:
-            if self.docker_image_config:
+            if self.docker_image_config is not None:
                 self.res["dockerImageConfig"] = self.docker_image_config
 
-            if self.docker_image_layers:
+            if self.docker_image_layers is not None:
                 self.res["dockerImageLayers"] = self.docker_image_layers
 
-            if self.docker_image_manifest:
+            if self.docker_image_manifest is not None:
                 self.res["dockerImageManifest"] = self.docker_image_manifest
 
-            if self.docker_image_manifest_media_type:
+            if self.docker_image_manifest_media_type is not None:
                 self.res["dockerImageManifestMediaType"] = self.docker_image_manifest_media_type
 
-            if self.docker_image_manifests:
+            if self.docker_image_manifests is not None:
                 self.res["dockerImageManifests"] = self.docker_image_manifests
 
-            if self.docker_image_metadata:
+            if self.docker_image_metadata is not None:
                 self.res["dockerImageMetadata"] = self.docker_image_metadata
 
-            if self.docker_image_metadata_version:
+            if self.docker_image_metadata_version is not None:
                 self.res["dockerImageMetadataVersion"] = self.docker_image_metadata_version
 
-            if self.docker_image_reference:
+            if self.docker_image_reference is not None:
                 self.res["dockerImageReference"] = self.docker_image_reference
 
-            if self.docker_image_signatures:
+            if self.docker_image_signatures is not None:
                 self.res["dockerImageSignatures"] = self.docker_image_signatures
 
-            if self.signatures:
+            if self.signatures is not None:
                 self.res["signatures"] = self.signatures
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/ImageContentSourcePolicy/image_content_source_policy.py

@@ -55,7 +55,7 @@ class ImageContentSourcePolicy(Resource):
             self.res["spec"] = {}
             _spec = self.res["spec"]
 
-            if self.repository_digest_mirrors:
+            if self.repository_digest_mirrors is not None:
                 _spec["repositoryDigestMirrors"] = self.repository_digest_mirrors
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/Machine/machine.py

@@ -74,19 +74,19 @@ class Machine(NamespacedResource):
             self.res["spec"] = {}
             _spec = self.res["spec"]
 
-            if self.lifecycle_hooks:
+            if self.lifecycle_hooks is not None:
                 _spec["lifecycleHooks"] = self.lifecycle_hooks
 
-            if self.metadata:
+            if self.metadata is not None:
                 _spec["metadata"] = self.metadata
 
-            if self.provider_id:
+            if self.provider_id is not None:
                 _spec["providerID"] = self.provider_id
 
-            if self.provider_spec:
+            if self.provider_spec is not None:
                 _spec["providerSpec"] = self.provider_spec
 
-            if self.taints:
+            if self.taints is not None:
                 _spec["taints"] = self.taints
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/NMState/nm_state.py

@@ -75,25 +75,25 @@ class NMState(Resource):
             self.res["spec"] = {}
             _spec = self.res["spec"]
 
-            if self.affinity:
+            if self.affinity is not None:
                 _spec["affinity"] = self.affinity
 
-            if self.infra_affinity:
+            if self.infra_affinity is not None:
                 _spec["infraAffinity"] = self.infra_affinity
 
-            if self.infra_node_selector:
+            if self.infra_node_selector is not None:
                 _spec["infraNodeSelector"] = self.infra_node_selector
 
-            if self.infra_tolerations:
+            if self.infra_tolerations is not None:
                 _spec["infraTolerations"] = self.infra_tolerations
 
-            if self.node_selector:
+            if self.node_selector is not None:
                 _spec["nodeSelector"] = self.node_selector
 
-            if self.self_sign_configuration:
+            if self.self_sign_configuration is not None:
                 _spec["selfSignConfiguration"] = self.self_sign_configuration
 
-            if self.tolerations:
+            if self.tolerations is not None:
                 _spec["tolerations"] = self.tolerations
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/OAuth/oauth.py

@@ -48,13 +48,13 @@ class OAuth(Resource):
             self.res["spec"] = {}
             _spec = self.res["spec"]
 
-            if self.identity_providers:
+            if self.identity_providers is not None:
                 _spec["identityProviders"] = self.identity_providers
 
-            if self.templates:
+            if self.templates is not None:
                 _spec["templates"] = self.templates
 
-            if self.token_config:
+            if self.token_config is not None:
                 _spec["tokenConfig"] = self.token_config
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/Pod/pod.py

@@ -344,28 +344,28 @@ class Pod(NamespacedResource):
 
             _spec["containers"] = self.containers
 
-            if self.active_deadline_seconds:
+            if self.active_deadline_seconds is not None:
                 _spec["activeDeadlineSeconds"] = self.active_deadline_seconds
 
-            if self.affinity:
+            if self.affinity is not None:
                 _spec["affinity"] = self.affinity
 
             if self.automount_service_account_token is not None:
                 _spec["automountServiceAccountToken"] = self.automount_service_account_token
 
-            if self.dns_config:
+            if self.dns_config is not None:
                 _spec["dnsConfig"] = self.dns_config
 
-            if self.dns_policy:
+            if self.dns_policy is not None:
                 _spec["dnsPolicy"] = self.dns_policy
 
             if self.enable_service_links is not None:
                 _spec["enableServiceLinks"] = self.enable_service_links
 
-            if self.ephemeral_containers:
+            if self.ephemeral_containers is not None:
                 _spec["ephemeralContainers"] = self.ephemeral_containers
 
-            if self.host_aliases:
+            if self.host_aliases is not None:
                 _spec["hostAliases"] = self.host_aliases
 
             if self.host_ipc is not None:
@@ -380,61 +380,61 @@ class Pod(NamespacedResource):
             if self.host_users is not None:
                 _spec["hostUsers"] = self.host_users
 
-            if self.hostname:
+            if self.hostname is not None:
                 _spec["hostname"] = self.hostname
 
-            if self.image_pull_secrets:
+            if self.image_pull_secrets is not None:
                 _spec["imagePullSecrets"] = self.image_pull_secrets
 
-            if self.init_containers:
+            if self.init_containers is not None:
                 _spec["initContainers"] = self.init_containers
 
-            if self.node_name:
+            if self.node_name is not None:
                 _spec["nodeName"] = self.node_name
 
-            if self.node_selector:
+            if self.node_selector is not None:
                 _spec["nodeSelector"] = self.node_selector
 
-            if self.os:
+            if self.os is not None:
                 _spec["os"] = self.os
 
-            if self.overhead:
+            if self.overhead is not None:
                 _spec["overhead"] = self.overhead
 
-            if self.preemption_policy:
+            if self.preemption_policy is not None:
                 _spec["preemptionPolicy"] = self.preemption_policy
 
-            if self.priority:
+            if self.priority is not None:
                 _spec["priority"] = self.priority
 
-            if self.priority_class_name:
+            if self.priority_class_name is not None:
                 _spec["priorityClassName"] = self.priority_class_name
 
-            if self.readiness_gates:
+            if self.readiness_gates is not None:
                 _spec["readinessGates"] = self.readiness_gates
 
-            if self.resource_claims:
+            if self.resource_claims is not None:
                 _spec["resourceClaims"] = self.resource_claims
 
-            if self.restart_policy:
+            if self.restart_policy is not None:
                 _spec["restartPolicy"] = self.restart_policy
 
-            if self.runtime_class_name:
+            if self.runtime_class_name is not None:
                 _spec["runtimeClassName"] = self.runtime_class_name
 
-            if self.scheduler_name:
+            if self.scheduler_name is not None:
                 _spec["schedulerName"] = self.scheduler_name
 
-            if self.scheduling_gates:
+            if self.scheduling_gates is not None:
                 _spec["schedulingGates"] = self.scheduling_gates
 
-            if self.security_context:
+            if self.security_context is not None:
                 _spec["securityContext"] = self.security_context
 
-            if self.service_account:
+            if self.service_account is not None:
                 _spec["serviceAccount"] = self.service_account
 
-            if self.service_account_name:
+            if self.service_account_name is not None:
                 _spec["serviceAccountName"] = self.service_account_name
 
             if self.set_hostname_as_fqdn is not None:
@@ -443,19 +443,19 @@ class Pod(NamespacedResource):
             if self.share_process_namespace is not None:
                 _spec["shareProcessNamespace"] = self.share_process_namespace
 
-            if self.subdomain:
+            if self.subdomain is not None:
                 _spec["subdomain"] = self.subdomain
 
-            if self.termination_grace_period_seconds:
+            if self.termination_grace_period_seconds is not None:
                 _spec["terminationGracePeriodSeconds"] = self.termination_grace_period_seconds
 
-            if self.tolerations:
+            if self.tolerations is not None:
                 _spec["tolerations"] = self.tolerations
 
-            if self.topology_spread_constraints:
+            if self.topology_spread_constraints is not None:
                 _spec["topologySpreadConstraints"] = self.topology_spread_constraints
 
-            if self.volumes:
+            if self.volumes is not None:
                 _spec["volumes"] = self.volumes
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/Secret/secret.py

@@ -56,16 +56,16 @@ class Secret(NamespacedResource):
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:
-            if self.data:
+            if self.data is not None:
                 self.res["data"] = self.data
 
             if self.immutable is not None:
                 self.res["immutable"] = self.immutable
 
-            if self.string_data:
+            if self.string_data is not None:
                 self.res["stringData"] = self.string_data
 
-            if self.type:
+            if self.type is not None:
                 self.res["type"] = self.type
 
     # End of generated code

{openshift_python_wrapper-11.0.18 → openshift_python_wrapper-11.0.19}/class_generator/tests/manifests/ServingRuntime/serving_runtime.py

@@ -107,55 +107,55 @@ class ServingRuntime(NamespacedResource):
 
             _spec["containers"] = self.containers
 
-            if self.affinity:
+            if self.affinity is not None:
                 _spec["affinity"] = self.affinity
 
-            if self.spec_annotations:
+            if self.spec_annotations is not None:
                 _spec["annotations"] = self.spec_annotations
 
-            if self.built_in_adapter:
+            if self.built_in_adapter is not None:
                 _spec["builtInAdapter"] = self.built_in_adapter
 
             if self.disabled is not None:
                 _spec["disabled"] = self.disabled
 
-            if self.grpc_data_endpoint:
+            if self.grpc_data_endpoint is not None:
                 _spec["grpcDataEndpoint"] = self.grpc_data_endpoint
 
-            if self.grpc_endpoint:
+            if self.grpc_endpoint is not None:
                 _spec["grpcEndpoint"] = self.grpc_endpoint
 
-            if self.http_data_endpoint:
+            if self.http_data_endpoint is not None:
                 _spec["httpDataEndpoint"] = self.http_data_endpoint
 
-            if self.image_pull_secrets:
+            if self.image_pull_secrets is not None:
                 _spec["imagePullSecrets"] = self.image_pull_secrets
 
-            if self.spec_labels:
+            if self.spec_labels is not None:
                 _spec["labels"] = self.spec_labels
 
             if self.multi_model is not None:
                 _spec["multiModel"] = self.multi_model
 
-            if self.node_selector:
+            if self.node_selector is not None:
                 _spec["nodeSelector"] = self.node_selector
 
-            if self.protocol_versions:
+            if self.protocol_versions is not None:
                 _spec["protocolVersions"] = self.protocol_versions
 
-            if self.replicas:
+            if self.replicas is not None:
                 _spec["replicas"] = self.replicas
 
-            if self.storage_helper:
+            if self.storage_helper is not None:
                 _spec["storageHelper"] = self.storage_helper
 
-            if self.supported_model_formats:
+            if self.supported_model_formats is not None:
                 _spec["supportedModelFormats"] = self.supported_model_formats
 
-            if self.tolerations:
+            if self.tolerations is not None:
                 _spec["tolerations"] = self.tolerations
 
-            if self.volumes:
+            if self.volumes is not None:
                 _spec["volumes"] = self.volumes
 
     # End of generated code