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

Update proxy behavior #99

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Update proxy behavior #99

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
6475751
update proxy job to set env vars for the Redis host and password
markdboyd Nov 5, 2024
d9f0e1a
update proxy blob to v0.0.4
markdboyd Nov 5, 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
24 changes: 12 additions & 12 deletions config/blobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ auth-proxy/Jinja2-3.1.3-py3-none-any.whl:
size: 133236
object_id: 2a7e8da4-a944-42c8-4af4-6089dcf7c668
sha: sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa
auth-proxy/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl:
size: 28462
? auth-proxy/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
: size: 28462
object_id: e1188548-8f03-4579-6b7d-17c8dc9c1ccb
sha: sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5
auth-proxy/PyJWT-2.8.0-py3-none-any.whl:
Expand All @@ -18,8 +18,8 @@ auth-proxy/certifi-2024.2.2-py3-none-any.whl:
size: 163774
object_id: 4247a681-66fd-4fc6-4779-0c0b54d348df
sha: sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1
auth-proxy/cffi-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl:
size: 477578
? auth-proxy/cffi-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
: size: 477578
object_id: a721d918-212d-4868-61a8-e32fe07a851f
sha: sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969
auth-proxy/charset_normalizer-3.3.2-py3-none-any.whl:
Expand All @@ -30,8 +30,8 @@ auth-proxy/click-8.1.7-py3-none-any.whl:
size: 97941
object_id: fcbee8e4-d45f-4ae5-5200-4aa80094dc92
sha: sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28
auth-proxy/cryptography-42.0.8-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl:
size: 3841968
? auth-proxy/cryptography-42.0.8-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
: size: 3841968
object_id: 1d39487e-a109-41cf-622a-2ab91dcdfdac
sha: sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70
auth-proxy/dnspython-2.5.0-py3-none-any.whl:
Expand All @@ -54,8 +54,8 @@ auth-proxy/flit_core-3.8.0.tar.gz:
size: 41224
object_id: 940bcba2-17b3-4d77-5153-89d703f40ff8
sha: sha256:b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3
auth-proxy/greenlet-3.0.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl:
size: 670455
? auth-proxy/greenlet-3.0.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
: size: 670455
object_id: 4ad2a93a-a23c-4b5e-7bec-8e46bbefc9e3
sha: sha256:881b7db1ebff4ba09aaaeae6aa491daeb226c8150fc20e836ad00041bcb11230
auth-proxy/gunicorn-21.2.0-py3-none-any.whl:
Expand Down Expand Up @@ -258,10 +258,10 @@ opensearch-dashboards-2.17.1-linux-x64.tar.gz:
size: 329739658
object_id: b2ba0996-a7af-434f-6468-aada02e39ac8
sha: sha256:c66d39cc9b283f6dc2ebd043cb096ffe523cc95221ae73c555270411ac2f4146
opensearch-dashboards-cf-auth-proxy-0.0.3.tar.gz:
size: 33370
object_id: 14b67a0f-63f5-4a11-400a-eddf55837e40
sha: sha256:1d31d7e16484d8b56fa6fa279788473d7bdb08d0cc0a0723baf54b03e48458e3
opensearch-dashboards-cf-auth-proxy-0.0.4.tar.gz:
size: 34545
object_id: f6c6ab97-61a6-4b6e-641c-7ebeb6b75251
sha: sha256:3f1fb3c5c62f5f50992affd37622d22f2f0cc8a18feeb5bdf8a5146c9ab5a04e
requests/certifi-2023.11.17-py3-none-any.whl:
size: 162530
object_id: f2afff72-e415-4390-61c1-eb8010ed4e4a
Expand Down
4 changes: 4 additions & 0 deletions jobs/opensearch-dashboards-cf-auth-proxy/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,7 @@ properties:
opensearch-dashboards-cf-auth-proxy.gunicorn.worker_class:
descrition: "gunicorn worker class to use. See https://docs.gunicorn.org/en/stable/settings.html#worker-class"
default: "eventlet"
opensearch-dashboards-cf-auth-proxy.redis.host:
descrition: "Host of Redis backend used for session data storage"
opensearch-dashboards-cf-auth-proxy.redis.password:
descrition: "Password to access Redis backend used for session data storage"
4 changes: 3 additions & 1 deletion jobs/opensearch-dashboards-cf-auth-proxy/templates/config/.env.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ export UAA_AUTH_URL=<%= p('opensearch-dashboards-cf-auth-proxy.uaa.auth_url') %>
export UAA_BASE_URL=<%= p('opensearch-dashboards-cf-auth-proxy.uaa.base_url') %>
export UAA_CLIENT_ID=<%= p('opensearch-dashboards-cf-auth-proxy.uaa.client.id') %>
export UAA_CLIENT_SECRET=<%= p('opensearch-dashboards-cf-auth-proxy.uaa.client.secret') %>
export UAA_JWKS='<%= p('opensearch-dashboards-cf-auth-proxy.uaa.jwks') %>'
export UAA_JWKS='<%= p('opensearch-dashboards-cf-auth-proxy.uaa.jwks') %>'
export REDIS_HOST='<%= p('opensearch-dashboards-cf-auth-proxy.redis.host') %>'
export REDIS_PASSWORD='<%= p('opensearch-dashboards-cf-auth-proxy.redis.password') %>'
2 changes: 1 addition & 1 deletion packages/opensearch-dashboards-cf-auth-proxy/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ export LD_LIBRARY_PATH="/var/vcap/packages/python3/lib:${LD_LIBRARY_PATH}"
export C_INCLUDE_PATH="/var/vcap/packages/python3/include:${C_INCLUDE_PATH}"

python3 -m pip install "--prefix=${BOSH_INSTALL_TARGET}" --no-index auth-proxy/*.whl
tar xzvf opensearch-dashboards-cf-auth-proxy-0.0.3.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
tar xzvf opensearch-dashboards-cf-auth-proxy-0.0.4.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
2 changes: 1 addition & 1 deletion packages/opensearch-dashboards-cf-auth-proxy/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ dependencies:
- python3

files:
- opensearch-dashboards-cf-auth-proxy-0.0.3.tar.gz
- opensearch-dashboards-cf-auth-proxy-0.0.4.tar.gz
- auth-proxy/*