Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dan/per 12033 cherrypick changes from pdp 070 #245

Merged
merged 21 commits into from
Mar 20, 2025

Conversation

danyi1212
Copy link
Contributor

No description provided.

danyi1212 and others added 21 commits March 20, 2025 14:43
(cherry picked from commit 0073bae)
(cherry picked from commit c44c215)
(cherry picked from commit 1744bc6)
* update helm chart version

* workflow change

(cherry picked from commit 89cb8f7)
* Fixed state file deadlock

* Fixed pre-commit

(cherry picked from commit f00a665)
* update pdp api example on ecs

* check ecs

* final - update our internal pdp

(cherry picked from commit 08eab87)
(cherry picked from commit e27a27a)
Reimplementation of #232
(cherry picked from commit fffb1c0)
* Added upgrade pip to docker image

* Updated OPAL to v0.8.0rc1

(cherry picked from commit 3a74fdf)
@danyi1212 danyi1212 self-assigned this Mar 20, 2025
@danyi1212 danyi1212 merged commit ddb998d into main Mar 20, 2025
10 of 13 checks passed
@danyi1212 danyi1212 deleted the dan/per-12033-cherrypick-changes-from-pdp-070 branch March 20, 2025 18:31
mapping_rules_json = []
else:
mapping_rules_json = data_result.get("all")
mapping_rules_json = data_result.get("all", []) if data_result is not None else []
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if data_result is

{
    "all": null
}

then the mapping_rules_json will be None

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a discussion about it back then, I can't remember what the understanding was.
#226 (comment)

What would you suggest doing to make it clearer?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess if we already talked about it then it's redundant to talk again

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Comment on lines +161 to +166
except Exception as e:
raise RelayAPIError(
"relay-api",
response.status,
f"Server responded to token request with a bad status: {text}",
) from e
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[CHANGE] this isn't exactly the same behavior, before the change it always raised, not it doesn't always raise

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

horizon/state.py Outdated
Comment on lines 214 to 217
if sdk not in self._state.seen_sdks:
# ensure_future is expensive, only call it if actually needed
asyncio.ensure_future(self._report_seen_sdk(sdk))
async with self._write_lock:
self._tasks.append(asyncio.create_task(self._report_seen_sdk(sdk)))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wasn't this later removed or somehting like that ? in favor of simply calling the report_seen_sdk

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct
b02efbb

@@ -1,10 +1,4 @@
import os

from opal_common.logger import logger
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

580d471

The code was removed but the import remained

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants