Skip to content

Commit

Permalink
CONCD-924 merge main in to feature branch (#2568)
Browse files Browse the repository at this point in the history 
* changed db instance type to one compatible withpostgresql v15.5 (#2522)

* CONCD-929 Improve show what I can work on UI (#2523)

* CONCD-929 Change radio button text

* CONCD-929 Align text to right edge of filter

* Bump cryptography in the pip group across 1 directory (#2519)

Bumps the pip group with 1 update in the / directory: [cryptography](https://github.com/pyca/cryptography).


Updates `cryptography` from 43.0.0 to 43.0.1
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@43.0.0...43.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CONCD-919 Change transcription box message on reserved asset pages (#2524)

* Add new service update for test deployments (#2525)

* add feature branch to codeql workflow (#2527)

* Cloudflare Turnstile implementation (#2526)

* initial commit for turnstile module approach

* start integrating turnstile into concordia forms and views

* Update the url for Originally from reference.

* First attempt at adding form widget to form and view and template.

* settings is now passing TURN values, moved view to save transcription - still not the right place....

* clean up - still stuck

* Basic implementation of turnstile to transcription form

* Added turnstile to forms that previously used captcha. Removed captcha from codebase. Updated tests to correctly handle Turnstile. Fixed issue with caching and tests that only appeared when running tests multiple times in the same environment more often than once per hour. Updated docs to include Turnstile info

* Updated error message for when a user fails Turnstile validation

---------

Co-authored-by: Jen Kuenning <jkue@loc.gov>

* Added additional cases for other secret manager errors (#2529)

* CONCD-919 language tweak + padding (#2528)

* CONCD-919 2nd line of text (#2530)

* Added Turnstile URLs to settings. Moved context processor and removed redundant processor (#2532)

* Added logging for errors from Turnstile (#2533)

* CONCD-928 Implement show what I can work on for all users (#2536)

* CONCD-951 User activity alert email iteration (#2537)

* Updated service letter signature (#2538)

* Updated reservation tombstones to be applied after 24 hours, then deleted after another 24 hours (#2539)

* CONCD-956 alert email: header row (#2540)

* Added ability to undo an OCR transcription even if it's the first transcription on an asset (#2541)

* CONCD-955 Add new column with total lifetime numbers (#2542)

* Added resetting to the turnstile widget after form submission (#2543)

* Added resetting to the turnstile widget after form submission. Changed turnstile to only display a widget when interaction is required

* Added storing of validation for anonymous users. Timeout set to the same as captcha, one day

* Reordered service letter signature (#2544)

* CONCD-955 numbers don't look correct (#2545)

* CONCD-956 update the headers, descriptive text (#2546)

* CONCD-939 (#2547)

* CONCD-939 move guide up

* CONCD-939 needs to be dynamic (to accomodate transcriptions with different statuses)

* CONCD-943 Make button corners consistent (#2548)

* Re-create CodeQL configuration

* Reset CodeQL configuration

* Recreate codeql.yml

* Reset CodeQL configuration

* Resync CodeQL with the default template

Codeql started running two separate workflows beginning on Sept 23 for reasons unknown.  a second workflow instance of CodeQL showed up in the workflows giving error, "
Code Scanning could not process the submitted SARIF file: CodeQL analyses from advanced configurations cannot be processed when the default setup is enabled". Attempts to turn off CodeqL or set to advance forced the creation of this workflow.

This tries to port the old configuration logic to the new structure used by GitHub's default template which splits analysis by language.


---------

Co-authored-by: Chris Adams <cadams@loc.gov>

* GitHub Actions: adjust CodeQL trigger conditions

* CONCD-939 we can make this more responsive by actually using bootstrap's grid (#2551)

* CONCD-943 ui2 will use bootstrap default, we should too (#2552)

* CONCD-939 we don't necesarily want the button to fill its container (#2553)

* CONCD-939 changes based on Ki's feedback (#2554)

* Added logic to determine whether the user needs to be validated by Turnstile, and get rid of the extraneous scripts and checks if not (#2555)

* CONCD-928 trying to fix a bug on the campaign detail page (#2556)

* Added next transcription/review field to campaign list view. Removed unlisted and renamed display on homepage columsn. (#2557)

* CONCD-939 vertically align elements (#2558)

* add update for 2nd service when test environment (#2562)

* CONCD-939 remove left padding (#2564)

* CONCD-924 yet more fixes

* Changed abbreviations in the campaign list. Switched abbreviations to model field verbose_name to allow the fields to be list editable. (#2566)

* Updated Pipfile.lock

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jennifer Kuenning <72825410+jkueloc@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Josh Stegmaier <104993387+joshuastegmaier@users.noreply.github.com>
Co-authored-by: Jen Kuenning <jkue@loc.gov>
Co-authored-by: Chris Adams <cadams@loc.gov>
Co-authored-by: joshuastegmaier <jstegmaier@loc.gov>
  • Loading branch information
@rasarkar @jkueloc
@dependabot @joshuastegmaier @acdha
7 people authored Oct 18, 2024
1 parent b73c134 commit 5eb1269
Show file tree
Hide file tree
Showing 37 changed files with 1,366 additions and 1,150 deletions.
51 changes: 18 additions & 33 deletions .github/workflows/codeql-analysis.yml → .github/workflows/codeql.yml
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,21 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******* NOTE *******
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: 'CodeQL'
name: 'CodeQL Advanced'

on:
workflow_dispatch:
push:
branches: [release]
branches: [main, release, 'feature-*']
paths-ignore:
- docs/**
- README.md
- .github/**
- cloudformation/**
- db_scripts/**
- jenkins/**
- kibana-proxy/**
- postgresql/**
pull_request:
branches: [main]
branches: [main, release, 'feature-*']
paths-ignore:
- docs/**
- README.md
- .github/**
- cloudformation/**
- db_scripts/**
- jenkins/**
Expand All @@ -40,20 +26,23 @@ on:

jobs:
analyze:
name: Analyze
name: Analyze (${{ matrix.language }})
runs-on: ubuntu-latest

permissions:
actions: read
contents: read
security-events: write
packages: read

strategy:
fail-fast: false
matrix:
language: ['javascript', 'python']
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
include:
- language: javascript-typescript
build-mode: none
- language: python
build-mode: none

steps:
- name: Install system packages
Expand All @@ -65,7 +54,8 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup python
- if: matrix.language == 'python'
name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.10'
Expand All @@ -75,21 +65,16 @@ jobs:
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3
build-mode: ${{ matrix.build-mode }}

- run: |
- if: matrix.language == 'python'
run: |
pip install -U packaging
pip install -U setuptools
pip install pipenv
pipenv install --dev --deploy
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: '/language:${{matrix.language}}'
2 changes: 2 additions & 0 deletions .github/workflows/test-main-deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
IMAGE_TAG: ${{ secrets.IMAGE_TAG }}
CLUSTER: ${{ secrets.CLUSTER }}
TARGET_SERVICE: ${{ secrets.TARGET_SERVICE }}
TARGET_SERVICE_B: ${{ secrets.TARGET_SERVICE_B }}
run: |
docker pull $REGISTRY/concordia:$IMAGE_TAG_PULL
docker pull $REGISTRY/concordia/importer:$IMAGE_TAG_PULL
Expand All @@ -51,3 +52,4 @@ jobs:
docker push $REGISTRY/concordia/celerybeat:$IMAGE_TAG
aws ecs update-service --region ${{ env.AWS_REGION }} --force-new-deployment --cluster $CLUSTER --service $TARGET_SERVICE
aws ecs update-service --region ${{ env.AWS_REGION }} --force-new-deployment --cluster $CLUSTER --service $TARGET_SERVICE_B
1 change: 0 additions & 1 deletion Pipfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ requests = "*"
Django = ">=4.2.14, <5.0"
bagit = "*"
django-registration = "*"
django-simple-captcha = "*"
django-tinymce = "*"
elasticsearch = "<7.14.0"
django-elasticsearch-dsl = "==7.3"
Expand Down
Loading

0 comments on commit 5eb1269

Please sign in to comment.