Skip to content

Commit

Permalink
hotfix for 'REQ6259167' (no login required) (#144)
Browse files Browse the repository at this point in the history
* hotfix for 'REQ6259167' (no login required)

* update 3rd party poetry installer to latest

* another poetry related dependency update

* fix docker paths

* [Bot] Update version to 2.2.4

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
goulter and github-actions[bot] authored Oct 10, 2022
1 parent 098c9d4 commit dc0383f
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
with:
gcloud-token: ${{ secrets.GCR_TOKEN }}
- name: Install poetry
uses: abatilo/[email protected].0
uses: abatilo/[email protected].6
- run: |
sudo apt-get -y install jq
poetry run pip install uw-it-build-fingerprinter tox
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
input_cluster: ${{ github.event.inputs.cluster }}
steps:
- uses: actions/checkout@v3
- uses: abatilo/[email protected].4
- uses: abatilo/[email protected].6
- run: |
sudo apt-get -y install jq
poetry install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
new-version: ${{ steps.update-version.outputs.new-version }}
steps:
- name: Python Poetry Action
uses: abatilo/[email protected].4
uses: abatilo/[email protected].6

- uses: uwit-iam/actions/[email protected]
id: guidance
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- uses: uwit-iam/actions/[email protected]
- uses: uwit-iam/actions/[email protected].16
with:
github-token: ${{ env.GITHUB_TOKEN }}
version-guidance: ${{ steps.guidance.outputs.guidance }}
Expand All @@ -49,7 +49,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.ref }}

- uses: abatilo/[email protected].4
- uses: abatilo/[email protected].6
- run: |
sudo apt-get -y install jq
poetry run pip install tox uw-it-build-fingerprinter
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: abatilo/[email protected].3
- uses: abatilo/[email protected].6
- uses: UWIT-IAM/actions/[email protected]
with:
gcloud-token: ${{ secrets.GCR_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose.app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ services:
-c "/app/husky_directory/gunicorn.conf.py"
"husky_directory.app:create_app()"
volumes:
- ${UWCA_CERT_PATH}:/app/certificates:ro
- ${PWD}/husky_directory:/app/husky_directory
- ${UWCA_CERT_PATH}/:/app/certificates:ro
- ${PWD}/husky_directory/:/app/husky_directory
redis:
image: redis:latest
command: redis-server --user uw-directory on +@all -@dangerous ~uw-directory:* >supersecret
Expand All @@ -35,4 +35,4 @@ services:
command:
- '--config.file=/etc/prometheus/prometheus.yml'
volumes:
- ${PWD}/docker/prometheus:/etc/prometheus/
- ${PWD}/docker/prometheus/:/etc/prometheus/
6 changes: 3 additions & 3 deletions docker/docker-compose.selenium.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
# We want for test files to available on the selenium
# container because tests may have files the test browser
# needs to serve.
- ../selenium-tests:/selenium-tests
- ../selenium-tests/:/selenium-tests

test-runner:
build:
Expand All @@ -34,8 +34,8 @@ services:
uw_directory_url: ${uw_directory_url}
USE_TEST_IDP: 'True'
volumes:
- ../webdriver-report:/webdriver-report
- ../selenium-tests:/selenium-tests
- ../webdriver-report/:/webdriver-report
- ../selenium-tests/:/selenium-tests
depends_on:
- selenium
entrypoint: /selenium-tests/entrypoint.sh
Expand Down
2 changes: 1 addition & 1 deletion husky_directory/settings/base.dotenv
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ SAML_ACS_PATH=/saml/login
PROMETHEUS_METRIC_PREFIX=uw_directory
SHOW_EXPERIMENTAL_FEATURES=False
SESSION_FILE_DIR=/tmp/flask_session
USE_TEST_IDP=True
USE_TEST_IDP=False
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "uw-husky-directory"
version = "2.2.3"
version = "2.2.4"
description = "An updated version of the UW Directory"
authors = ["Thomas Thorogood <[email protected]>"]
license = "MIT"
Expand Down

0 comments on commit dc0383f

Please sign in to comment.