Skip to content

Fix restore label parameter #1

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.

Sign up for GitHub

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

Open
Badlybear wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix restore label parameter #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion openshift-guardian-ui/src/pages/Restores/CreateRestore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ const CreateRestore = ({ darkMode }) => {
namespaces: selectedNamespace,
backup_name: selectedBackup,
included_resources: selectedResources,
match_lables: matchLabelsObj,
// send match label selectors
match_labels: matchLabelsObj,
}),
});
if (!response.ok) throw new Error('Failed to create restore');
Expand Down
4 changes: 2 additions & 2 deletions openshift-guardian-ui/src/pages/Restores/ViewRestores.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ const ViewRestores = ({ darkMode }) => {
<br />
<strong>Match Labels:</strong>
<ul>
{restore.match_lables ? (
Object.entries(restore.match_lables).map(([key, value]) => (
{restore.match_labels ? (
Object.entries(restore.match_labels).map(([key, value]) => (
<li key={key}>{key}: {value}</li>
))
) : (
Expand Down
6 changes: 4 additions & 2 deletions openshift-guardian2/API/oadp-api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,11 @@ async def create_restore(request: Request, user: dict = Depends(get_current_user
"Time Created": "2025-03-13T",
"status": "Completed",
"namespace": params["namespaces"],
"backup_name": f"{params['namespaces']}-restore",
# Track which backup this restore references
"backup_name": params.get("backup_name"),
"included_resources": params["included_resources"],
"match_labels": params["match_lables"],
# Accept match_labels from request payload
"match_labels": params.get("match_labels", {}),
}
restores["restores"].append(restore)
return {"message": "Created restore successfully"}
Expand Down
3 changes: 2 additions & 1 deletion openshift-guardian2/openshift-guardian/src/pages/Restores/CreateRestore.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ const CreateRestore = ({ darkMode }) => {
namespaces: selectedNamespace,
backup_name: selectedBackup,
included_resources: selectedResources,
match_lables: matchLabelsObj,
// send match label selectors
match_labels: matchLabelsObj,
}),
});
if (!response.ok) throw new Error('Failed to create restore');
Expand Down
4 changes: 2 additions & 2 deletions openshift-guardian2/openshift-guardian/src/pages/Restores/ViewRestores.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ const ViewRestores = ({ darkMode }) => {
<br />
<strong>Match Labels:</strong>
<ul>
{restore.match_lables ? (
Object.entries(restore.match_lables).map(([key, value]) => (
{restore.match_labels ? (
Object.entries(restore.match_labels).map(([key, value]) => (
<li key={key}>{key}: {value}</li>
))
) : (
Expand Down