openshift-python-wrapper 4.20.1__tar.gz → 4.20.3__tar.gz

openshift_python_wrapper-4.20.3/.git

@@ -0,0 +1 @@
+gitdir: /tmp/github-webhook-openshift-python-wrapper-plyozzj_/.git/worktrees/github-webhook-openshift-python-wrapper-plyozzj_-worktree-4d3c5771-9d20-4b4a-a8e3-32c7e09400a2

{openshift_python_wrapper-4.20.1 → openshift_python_wrapper-4.20.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openshift-python-wrapper
-Version: 4.20.1
+Version: 4.20.3
 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-4.20.1 → openshift_python_wrapper-4.20.3}/ocp_resources/project_request.py

@@ -2,8 +2,11 @@
 
 from typing import Any
 
+from kubernetes.dynamic.exceptions import ForbiddenError
+
 from ocp_resources.project_project_openshift_io import Project
 from ocp_resources.resource import Resource
+from ocp_resources.utils.constants import DEFAULT_CLUSTER_RETRY_EXCEPTIONS, PROTOCOL_ERROR_EXCEPTION_DICT
 
 
 class ProjectRequest(Resource):
@@ -54,7 +57,14 @@ class ProjectRequest(Resource):
             teardown=self.teardown,
             delete_timeout=self.delete_timeout,
         )
-        project.wait_for_status(status=project.Status.ACTIVE)
+
+        # When a ProjectRequest is created, the project is created and the user is added to the project.
+        # RBAC binding may not have propagated yet, causing transient 403 Forbidden errors, so we need to retry
+        # on ForbiddenError as well.
+        project.wait_for_status(
+            status=project.Status.ACTIVE,
+            exceptions_dict=PROTOCOL_ERROR_EXCEPTION_DICT | DEFAULT_CLUSTER_RETRY_EXCEPTIONS | {ForbiddenError: []},
+        )
 
         return project
 

{openshift_python_wrapper-4.20.1 → openshift_python_wrapper-4.20.3}/ocp_resources/resource.py

@@ -953,7 +953,13 @@ class Resource(ResourceConstants):
         return kubernetes.client.CoreV1Api(api_client=self.client.client)
 
     def wait_for_status(
-        self, status: str, timeout: int = TIMEOUT_4MINUTES, stop_status: str | None = None, sleep: int = 1
+        self,
+        status: str,
+        timeout: int = TIMEOUT_4MINUTES,
+        stop_status: str | None = None,
+        sleep: int = 1,
+        exceptions_dict: dict[type[Exception], list[str]] = PROTOCOL_ERROR_EXCEPTION_DICT
+        | DEFAULT_CLUSTER_RETRY_EXCEPTIONS,
     ) -> None:
         """
         Wait for resource to be in status
@@ -962,6 +968,7 @@ class Resource(ResourceConstants):
             status (str): Expected status.
             timeout (int): Time to wait for the resource.
             stop_status (str): Status which should stop the wait and failed.
+            exceptions_dict (dict[type[Exception], list[str]]): Dictionary of exceptions to retry on.
 
         Raises:
             TimeoutExpiredError: If resource in not in desire status.
@@ -971,10 +978,7 @@ class Resource(ResourceConstants):
         samples = TimeoutSampler(
             wait_timeout=timeout,
             sleep=sleep,
-            exceptions_dict={
-                **PROTOCOL_ERROR_EXCEPTION_DICT,
-                **DEFAULT_CLUSTER_RETRY_EXCEPTIONS,
-            },
+            exceptions_dict=exceptions_dict,
             func=lambda: self.exists,
         )
         current_status = None
@@ -1000,15 +1004,21 @@ class Resource(ResourceConstants):
                 self.logger.error(f"Status of {self.kind} {self.name} is {current_status}")
             raise
 
-    def create(self, wait: bool = False) -> ResourceInstance | None:
+    def create(
+        self,
+        wait: bool = False,
+        exceptions_dict: dict[type[Exception], list[str]] = DEFAULT_CLUSTER_RETRY_EXCEPTIONS
+        | PROTOCOL_ERROR_EXCEPTION_DICT,
+    ) -> ResourceInstance | None:
         """
         Create resource.
 
         Args:
             wait (bool) : True to wait for resource status.
+            exceptions_dict (dict[type[Exception], list[str]]): Dictionary of exceptions to retry on.
 
         Returns:
-            bool: True if create succeeded, False otherwise.
+            ResourceInstance | None: Created resource instance or None if create failed.
         """
         self.to_dict()
 
@@ -1020,10 +1030,13 @@ class Resource(ResourceConstants):
         self.logger.info(f"Create {self.kind} {self.name}")
         self.logger.info(f"Posting {hashed_res}")
         self.logger.debug(f"\n{yaml.dump(hashed_res)}")
-        resource_kwargs = {"body": self.res, "namespace": self.namespace}
+        resource_kwargs: dict[str, Any] = {"body": self.res, "namespace": self.namespace}
         if self.dry_run:
             resource_kwargs["dry_run"] = "All"
-        resource_ = self.api.create(**resource_kwargs)
+
+        resource_ = Resource.retry_cluster_exceptions(
+            func=self.api.create, exceptions_dict=exceptions_dict, **resource_kwargs
+        )
         with contextlib.suppress(ForbiddenError, AttributeError, NotFoundError):
             # some resources do not support get() (no instance) or the client do not have permissions
             self.initial_resource_version = self.instance.metadata.resourceVersion

{openshift_python_wrapper-4.20.1 → openshift_python_wrapper-4.20.3}/pyproject.toml

@@ -65,7 +65,7 @@ include = [
 [project]
 requires-python = ">=3.10"
 name = "openshift-python-wrapper"
-version = "4.20.1"
+version = "4.20.3"
 description = "Wrapper around https://github.com/kubernetes-client/python"
 readme = "README.md"
 license = "Apache-2.0"

{openshift_python_wrapper-4.20.1 → openshift_python_wrapper-4.20.3}/uv.lock

@@ -1202,7 +1202,7 @@ wheels = [
 
 [[package]]
 name = "openshift-python-wrapper"
-version = "4.20.1"
+version = "4.20.3"
 source = { editable = "." }
 dependencies = [
     { name = "cloup" },

openshift_python_wrapper-4.20.1/.github/workflows/code-check.yml.old

@@ -1,25 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: code-check
-on:
-  pull_request:
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install tox
-      - name: Run tox
-        run: |
-          tox -e code-check,unittests,validate-resources

openshift_python_wrapper-4.20.1/.tests_coverage/.gitignore

@@ -1,2 +0,0 @@
-# Created by coverage.py
-*

openshift_python_wrapper-4.20.1/.tests_coverage/class_index.html

@@ -1,244 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Coverage report</title>
-    <link rel="icon" sizes="32x32" href="favicon_32_cb_58284776.png">
-    <link rel="stylesheet" href="style_cb_8e611ae1.css" type="text/css">
-    <script src="coverage_html_cb_6fb7b396.js" defer></script>
-</head>
-<body class="indexfile">
-<header>
-    <div class="content">
-        <h1>Coverage report:
-            <span class="pc_cov">27%</span>
-        </h1>
-        <aside id="help_panel_wrapper">
-            <input id="help_panel_state" type="checkbox">
-            <label for="help_panel_state">
-                <img id="keyboard_icon" src="keybd_closed_cb_ce680311.png" alt="Show/hide keyboard shortcuts">
-            </label>
-            <div id="help_panel">
-                <p class="legend">Shortcuts on this page</p>
-                <div class="keyhelp">
-                    <p>
-                        <kbd>f</kbd>
-                        <kbd>n</kbd>
-                        <kbd>s</kbd>
-                        <kbd>m</kbd>
-                        <kbd>x</kbd>
-                        <kbd>c</kbd>
-                        &nbsp; change column sorting
-                    </p>
-                    <p>
-                        <kbd>[</kbd>
-                        <kbd>]</kbd>
-                        &nbsp; prev/next file
-                    </p>
-                    <p>
-                        <kbd>?</kbd> &nbsp; show/hide this help
-                    </p>
-                </div>
-            </div>
-        </aside>
-        <form id="filter_container">
-            <input id="filter" type="text" value="" placeholder="filter...">
-            <div>
-                <input id="hide100" type="checkbox" >
-                <label for="hide100">hide covered</label>
-            </div>
-        </form>
-        <h2>
-                <a class="button" href="index.html">Files</a>
-                <a class="button" href="function_index.html">Functions</a>
-                <a class="button current">Classes</a>
-        </h2>
-        <p class="text">
-            <a class="nav" href="https://coverage.readthedocs.io/en/7.6.10">coverage.py v7.6.10</a>,
-            created at 2025-02-12 18:11 +0200
-        </p>
-    </div>
-</header>
-<main id="index">
-    <table class="index" data-sortable>
-        <thead>
-            <tr class="tablehead" title="Click to sort">
-                <th id="file" class="name left" aria-sort="none" data-shortcut="f">File<span class="arrows"></span></th>
-                <th id="region" class="name left" aria-sort="none" data-default-sort-order="ascending" data-shortcut="n">class<span class="arrows"></span></th>
-                <th id="statements" aria-sort="none" data-default-sort-order="descending" data-shortcut="s">statements<span class="arrows"></span></th>
-                <th id="missing" aria-sort="none" data-default-sort-order="descending" data-shortcut="m">missing<span class="arrows"></span></th>
-                <th id="excluded" aria-sort="none" data-default-sort-order="descending" data-shortcut="x">excluded<span class="arrows"></span></th>
-                <th id="coverage" class="right" aria-sort="none" data-shortcut="c">coverage<span class="arrows"></span></th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr class="region">
-                <td class="name left"><a href="z_427be826a39fd312_class_generator_py.html">class_generator/class_generator.py</a></td>
-                <td class="name left"><a href="z_427be826a39fd312_class_generator_py.html"><data value=''><span class='no-noun'>(no class)</span></data></a></td>
-                <td>397</td>
-                <td>397</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 397">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t5">ocp_resources/exceptions.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t5"><data value='MissingRequiredArgumentError'>MissingRequiredArgumentError</data></a></td>
-                <td>2</td>
-                <td>2</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 2">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t13">ocp_resources/exceptions.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t13"><data value='MissingResourceError'>MissingResourceError</data></a></td>
-                <td>2</td>
-                <td>2</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 2">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t21">ocp_resources/exceptions.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t21"><data value='MissingResourceResError'>MissingResourceResError</data></a></td>
-                <td>3</td>
-                <td>3</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 3">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t34">ocp_resources/exceptions.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t34"><data value='MissingTemplateVariables'>MissingTemplateVariables</data></a></td>
-                <td>3</td>
-                <td>3</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 3">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t43">ocp_resources/exceptions.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t43"><data value='ExecOnPodError'>ExecOnPodError</data></a></td>
-                <td>5</td>
-                <td>5</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 5">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t58">ocp_resources/exceptions.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html#t58"><data value='ResourceTeardownError'>ResourceTeardownError</data></a></td>
-                <td>2</td>
-                <td>2</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 2">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html">ocp_resources/exceptions.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_exceptions_py.html"><data value=''><span class='no-noun'>(no class)</span></data></a></td>
-                <td>22</td>
-                <td>0</td>
-                <td>0</td>
-                <td class="right" data-ratio="22 22">100%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t239">ocp_resources/resource.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t239"><data value='KubeAPIVersion'>KubeAPIVersion</data></a></td>
-                <td>28</td>
-                <td>28</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 28">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t293">ocp_resources/resource.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t293"><data value='ClassProperty'>ClassProperty</data></a></td>
-                <td>2</td>
-                <td>1</td>
-                <td>0</td>
-                <td class="right" data-ratio="1 2">50%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t301">ocp_resources/resource.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t301"><data value='Resource'>Resource</data></a></td>
-                <td>272</td>
-                <td>272</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 272">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t1294">ocp_resources/resource.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t1294"><data value='NamespacedResource'>NamespacedResource</data></a></td>
-                <td>30</td>
-                <td>30</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 30">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t1407">ocp_resources/resource.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html#t1407"><data value='ResourceEditor'>ResourceEditor</data></a></td>
-                <td>75</td>
-                <td>75</td>
-                <td>0</td>
-                <td class="right" data-ratio="0 75">0%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html">ocp_resources/resource.py</a></td>
-                <td class="name left"><a href="z_f68db28afc5f7ebd_resource_py.html"><data value=''><span class='no-noun'>(no class)</span></data></a></td>
-                <td>279</td>
-                <td>49</td>
-                <td>0</td>
-                <td class="right" data-ratio="230 279">82%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_1bcaa03a7ef87e06_constants_py.html">ocp_resources/utils/constants.py</a></td>
-                <td class="name left"><a href="z_1bcaa03a7ef87e06_constants_py.html"><data value=''><span class='no-noun'>(no class)</span></data></a></td>
-                <td>15</td>
-                <td>0</td>
-                <td>0</td>
-                <td class="right" data-ratio="15 15">100%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_1bcaa03a7ef87e06_resource_constants_py.html">ocp_resources/utils/resource_constants.py</a></td>
-                <td class="name left"><a href="z_1bcaa03a7ef87e06_resource_constants_py.html"><data value=''><span class='no-noun'>(no class)</span></data></a></td>
-                <td>63</td>
-                <td>0</td>
-                <td>0</td>
-                <td class="right" data-ratio="63 63">100%</td>
-            </tr>
-            <tr class="region">
-                <td class="name left"><a href="z_1bcaa03a7ef87e06_utils_py.html">ocp_resources/utils/utils.py</a></td>
-                <td class="name left"><a href="z_1bcaa03a7ef87e06_utils_py.html"><data value=''><span class='no-noun'>(no class)</span></data></a></td>
-                <td>22</td>
-                <td>18</td>
-                <td>0</td>
-                <td class="right" data-ratio="4 22">18%</td>
-            </tr>
-        </tbody>
-        <tfoot>
-            <tr class="total">
-                <td class="name left">Total</td>
-                <td class="name left">&nbsp;</td>
-                <td>1222</td>
-                <td>887</td>
-                <td>0</td>
-                <td class="right" data-ratio="335 1222">27%</td>
-            </tr>
-        </tfoot>
-    </table>
-    <p id="no_rows">
-        No items found using the specified filter.
-    </p>
-        <p>14 empty classes skipped.</p>
-</main>
-<footer>
-    <div class="content">
-        <p>
-            <a class="nav" href="https://coverage.readthedocs.io/en/7.6.10">coverage.py v7.6.10</a>,
-            created at 2025-02-12 18:11 +0200
-        </p>
-    </div>
-    <aside class="hidden">
-        <a id="prevFileLink" class="nav" href=""></a>
-        <a id="nextFileLink" class="nav" href=""></a>
-        <button type="button" class="button_prev_file" data-shortcut="["></button>
-        <button type="button" class="button_next_file" data-shortcut="]"></button>
-        <button type="button" class="button_show_hide_help" data-shortcut="?"></button>
-    </aside>
-</footer>
-</body>
-</html>