This repository has been archived by the owner on Jan 14, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 15
Add option for new AAA backend #89
Open
StephenCoady
wants to merge
5
commits into
fedora-infra:develop
Choose a base branch
from
StephenCoady:add-freeipa-backend
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
26d7af5
Add option for new AAA backend
StephenCoady fa5a766
add check for result
StephenCoady 07ca162
fixed api. updated vagrant box and CI.
StephenCoady 3bf605d
rename config var
StephenCoady 5f53446
fix and remove already included package
StephenCoady File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,12 @@ | ||
import logging | ||
import operator | ||
import os | ||
|
||
import bs4 | ||
import requests | ||
|
||
from fasjson_client import Client | ||
|
||
import pdcupdater.handlers.compose | ||
import pdcupdater.utils | ||
|
||
|
@@ -72,13 +75,19 @@ def old_composes(base_url): | |
|
||
|
||
@pdcupdater.utils.with_ridiculous_timeout | ||
def fas_persons(base_url, username, password): | ||
def fas_persons(base_url, username, password, fasjson): | ||
""" Return the list of users in the Fedora Account System. """ | ||
|
||
log.info("Connecting to Account System at %r" % base_url) | ||
if fasjson: | ||
client = Client(url=base_url) | ||
response = client.list_users().result | ||
people = response.get('result', []) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm no you don't need that I think. The data is directly available in the |
||
return people | ||
abompard marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
import fedora.client | ||
import fedora.client.fas2 | ||
|
||
log.info("Connecting to FAS at %r" % base_url) | ||
fasclient = fedora.client.fas2.AccountSystem( | ||
base_url=base_url, username=username, password=password) | ||
|
||
|
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,7 @@ | |
'pdc-client', | ||
'six', | ||
'modulemd', | ||
'fasjson-client', | ||
] | ||
|
||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😱