Skip to content

Look for solr credential during prerun tests #11

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
pkernevez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Look for solr credential during prerun tests #11

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
10 changes: 9 additions & 1 deletion ckan-2.10/base/setup/prerun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
import psycopg2
try:
from urllib.request import urlopen
from urllib.request import Request
from urllib.error import URLError
except ImportError:
from urllib2 import urlopen
from urllib2 import Request
from urllib2 import URLError

import time
Expand Down Expand Up @@ -74,9 +76,15 @@ def check_solr_connection(retry=None):

url = os.environ.get("CKAN_SOLR_URL", "")
search_url = '{url}/schema/name?wt=json'.format(url=url)
request = Request(search_url)
if os.environ.get("CKAN_SOLR_URL"):
username = os.environ.get("CKAN_SOLR_USER")
password = os.environ.get("CKAN_SOLR_PASSWORD")
base64string = base64.b64encode(f'{username}:{password}'.encode("ascii")).decode("ascii")
request.add_header("Authorization", "Basic %s" % base64string)

try:
connection = urlopen(search_url)
connection = urlopen(request)
except URLError as e:
print(str(e))
print("[prerun] Unable to connect to solr, waiting...")
Expand Down
10 changes: 9 additions & 1 deletion ckan-2.9/base/setup/prerun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
import psycopg2
try:
from urllib.request import urlopen
from urllib.request import Request
from urllib.error import URLError
except ImportError:
from urllib2 import urlopen
from urllib2 import Request
from urllib2 import URLError

import time
Expand Down Expand Up @@ -74,9 +76,15 @@ def check_solr_connection(retry=None):

url = os.environ.get("CKAN_SOLR_URL", "")
search_url = '{url}/schema/name?wt=json'.format(url=url)
request = Request(search_url)
if os.environ.get("CKAN_SOLR_URL"):
username = os.environ.get("CKAN_SOLR_USER")
password = os.environ.get("CKAN_SOLR_PASSWORD")
base64string = base64.b64encode(f'{username}:{password}'.encode("ascii")).decode("ascii")
request.add_header("Authorization", "Basic %s" % base64string)

try:
connection = urlopen(search_url)
connection = urlopen(request)
except URLError as e:
print(str(e))
print("[prerun] Unable to connect to solr, waiting...")
Expand Down