Skip to content

Stabilize CI runtime dependencies #298

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
krowvin wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −24
Open

Stabilize CI runtime dependencies #298

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
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set Up Python
uses: actions/setup-python@v6
with:
python-version: '3.x'
python-version: '3.12'

# Unlike the code-check workflow, this job requires the dev dependencies to be
# installed to make sure we have the necessary, tools, stub files, etc.
Expand All @@ -25,7 +25,7 @@ jobs:
uses: actions/cache@v5
with:
path: ./.venv
key: venv-${{ hashFiles('poetry.lock') }}
key: ${{ runner.os }}-py3.12-venv-${{ hashFiles('poetry.lock') }}

- name: Install Dependencies
run: poetry install
Expand Down
3 changes: 3 additions & 0 deletions compose_files/togglz/features.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
AUTH_RE_ENABLE_NON_HASH_KEY_SUPPORT=true

@krowvin krowvin Jul 7, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should make it so we don't need to hash the keys locally and our old keys keep working

@Enovotny Enovotny Jul 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is easy to add the hashed keys I will set that up.

@krowvin krowvin Jul 7, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Want to PR off this or make a separate PR for that?

If you are busy we could merge this in now so the old keys keep working then your PR can use the new ones?

INCLUDE_ERROR_STACK_TRACES=true
USE_OBJECT_STORAGE_BLOBS=false
11 changes: 6 additions & 5 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- ORACLE_PASSWORD=badSYSpassword
- CWMS_PASSWORD=simplecwmspasswD1
- OFFICE_ID=HQ
- OFFICE_EROC=s0
- OFFICE_EROC=q0
ports: ["1526:1521"]
healthcheck:
test: ["CMD", "tnsping", "FREEPDB1"]
Expand All @@ -27,7 +27,7 @@ services:
- SYS_PASSWORD=badSYSpassword
# set to HQ/q0 for any national system work
- OFFICE_ID=HQ
- OFFICE_EROC=s0
- OFFICE_EROC=q0
- INSTALLONCE=1
- QUIET=1
command: >
Expand All @@ -52,15 +52,17 @@ services:
condition: service_completed_successfully
traefik:
condition: service_healthy
image: ${CWMS_DATA_API_IMAGE:-ghcr.io/usace/cwms-data-api:latest}
image: ${CWMS_DATA_API_IMAGE:-ghcr.io/usace/cwms-data-api:develop-2026.05.30}

@krowvin krowvin Jul 7, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still am not 100% sure on if we want to lock the versions in.

If we add a new parameter, for example, we would then need to make sure this gets updated to match.

And it maybe confusing to determine that was the cause/need from the logs alone.

cwmsjs is getting around this by being generated as CDA updates

@Enovotny Enovotny Jul 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no and definitely should not be that version. that is behind what is in production.

@krowvin krowvin Jul 7, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if the latest image is getting updated frequent enough? @MikeNeilson

Should we target the current production version 2026.05.12-f? If a develop version is targeted for the tests then things might pass that are not on prod yet.

I was trying to target something around this.

restart: unless-stopped
volumes:
- ./compose_files/pki/certs:/conf/
- ./compose_files/togglz/features.properties:/conf/features.properties:ro
- ./compose_files/tomcat/logging.properties:/usr/local/tomcat/conf/logging.properties:ro
environment:
- JAVA_OPTS=-Dproperties.file=/conf/features.properties
- CDA_JDBC_DRIVER=oracle.jdbc.driver.OracleDriver
- CDA_JDBC_URL=jdbc:oracle:thin:@db/FREEPDB1
- CDA_JDBC_USERNAME=s0webtest
- CDA_JDBC_USERNAME=q0webtest
- CDA_JDBC_PASSWORD=simplecwmspasswD1
- CDA_POOL_INIT_SIZE=5
- CDA_POOL_MAX_ACTIVE=10
Expand Down Expand Up @@ -140,4 +142,3 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.traefik.rule=PathPrefix(`/traefik`)"
- "traefik.http.routers.traefik.service=api@internal"

20 changes: 3 additions & 17 deletions tests/cda/timeseries/timeseries_groups_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,24 +155,10 @@ def test_update_timeseries_groups():

def test_delete_timeseries_group():

# update with no timeseries in the group first
df = pd.DataFrame(columns=["timeseries-id", "office-id", "alias"])

json_dict = tg.timeseries_group_df_to_json(
data=df,
# delete the group
tg.delete_timeseries_group(
group_id=TEST_GROUP_ID,
group_office_id=TEST_OFFICE,
category_office_id=TEST_OFFICE,
category_id=TEST_CATEGORY_ID,
)
tg.update_timeseries_groups(
group_id=TEST_GROUP_ID,
office_id=TEST_OFFICE,
replace_assigned_ts=True,
data=json_dict,
)

# delete the group
tg.delete_timeseries_group(
group_id=TEST_GROUP_ID, category_id=TEST_CATEGORY_ID, office_id=TEST_OFFICE
cascade_delete=True,
)
Loading