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.

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

[WIP] debug jwt v2 #2164

Closed
wants to merge 2 commits into from
Closed

[WIP] debug jwt v2 #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1cc1b0
Use dab checkout.
jctanner Jun 10, 2024
eb18e03
Re-add dab to installed apps by default.
jctanner Jun 10, 2024
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
2 changes: 1 addition & 1 deletion dev/oci_env_integration/oci_env_configs/community.compose.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
COMPOSE_PROFILE=galaxy_ng/base:galaxy_ng/community:pminio
COMPOSE_PROJECT_NAME=ci-community

DEV_SOURCE_PATH=galaxy_ng
DEV_SOURCE_PATH=galaxy_ng:django-ansible-base
COMPOSE_BINARY=docker
SETUP_TEST_DATA=1
UPDATE_UI=0
Expand Down
2 changes: 1 addition & 1 deletion dev/oci_env_integration/oci_env_configs/dab.compose.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
COMPOSE_PROFILE=galaxy_ng/base:galaxy_ng/dab
COMPOSE_PROJECT_NAME=ci-dab

DEV_SOURCE_PATH=galaxy_ng
DEV_SOURCE_PATH=galaxy_ng:django-ansible-base
COMPOSE_BINARY=docker
SETUP_TEST_DATA=1
UPDATE_UI=0
Expand Down
2 changes: 1 addition & 1 deletion dev/oci_env_integration/oci_env_configs/dab_jwt.compose.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
COMPOSE_PROFILE=galaxy_ng/base:galaxy_ng/dab_jwt
COMPOSE_PROJECT_NAME=ci-dab-proxy

DEV_SOURCE_PATH=galaxy_ng
DEV_SOURCE_PATH=galaxy_ng:django-ansible-base
COMPOSE_BINARY=docker
SETUP_TEST_DATA=0
UPDATE_UI=0
Expand Down
2 changes: 1 addition & 1 deletion dev/oci_env_integration/oci_env_configs/standalone.compose.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
COMPOSE_PROFILE=galaxy_ng/base
COMPOSE_PROJECT_NAME=ci-standalone

DEV_SOURCE_PATH=galaxy_ng
DEV_SOURCE_PATH=galaxy_ng:django-ansible-base
COMPOSE_BINARY=docker
SETUP_TEST_DATA=1
UPDATE_UI=0
Expand Down
3 changes: 1 addition & 2 deletions galaxy_ng/app/dynaconf_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,11 @@ def configure_dab_resource_registry(settings: Dynaconf) -> Dict[str, Any]:

data = {}
if flags["dab_resource_registry"]:
data["INSTALLED_APPS"] = ['ansible_base.resource_registry', 'dynaconf_merge']
data["ANSIBLE_BASE_RESOURCE_CONFIG_MODULE"] = "galaxy_ng.app.api.resource_api"

# this always needs social_django installed ...
if "social_django" not in settings.INSTALLED_APPS:
data["INSTALLED_APPS"].append("social_django")
data["INSTALLED_APPS"] = ["social_django"]

return data

Expand Down
1 change: 1 addition & 0 deletions galaxy_ng/app/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
'rest_framework.authtoken',
'crum',
'dynaconf_merge',
'ansible_base.resource_registry',
]


Expand Down
Loading