Skip to content

Commit

Permalink
Merge pull request #118 from chicagopcdc/pcdc_dev
Browse files Browse the repository at this point in the history
Pcdc dev
  • Loading branch information
grugna authored Aug 27, 2024
2 parents d81e579 + 6cd11fc commit 2060cca
Show file tree
Hide file tree
Showing 89 changed files with 3,338 additions and 1,722 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/buildpipeline.yaml → .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
name: CI

on:
push:
pull_request:
types: [opened, reopened]

push:
pull_request:
types: [opened, reopened]
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true


jobs:
Security:
name: Security Pipeline
uses: uc-cdis/.github/.github/workflows/securitypipeline.yaml@master
secrets: inherit

UnitTest:
name: Python Unit Test with Postgres
uses: uc-cdis/.github/.github/workflows/python_unit_test.yaml@master
with:
python-version: '3.9'
test-script: 'tests/ci_commands_script.sh'
run-coveralls: true
ci:
name: Build Image and Push
# TODO Add this line back once we update to Python 3.9 from 3.6
# TODO Uncomment after PXP-9212
# needs: Security
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
secrets:
Expand Down
41 changes: 34 additions & 7 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@
}
],
"results": {
".github/workflows/buildpipeline.yaml": [
".github/workflows/ci.yaml": [
{
"type": "Secret Keyword",
"filename": ".github/workflows/buildpipeline.yaml",
"filename": ".github/workflows/ci.yaml",
"hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
"is_verified": false,
"line_number": 17
"line_number": 13
}
],
"deployment/scripts/postgresql/postgresql_init.sql": [
Expand Down Expand Up @@ -210,13 +210,22 @@
"line_number": 137
}
],
"fence/resources/storage/storageclient/cleversafe.py": [
{
"type": "Secret Keyword",
"filename": "fence/resources/storage/storageclient/cleversafe.py",
"hashed_secret": "7cb6efb98ba5972a9b5090dc2e517fe14d12cb04",
"is_verified": false,
"line_number": 274
}
],
"fence/utils.py": [
{
"type": "Secret Keyword",
"filename": "fence/utils.py",
"hashed_secret": "8318df9ecda039deac9868adf1944a29a95c7114",
"is_verified": false,
"line_number": 128
"line_number": 129
}
],
"migrations/versions/a04a70296688_non_unique_client_name.py": [
Expand Down Expand Up @@ -259,14 +268,14 @@
"filename": "tests/conftest.py",
"hashed_secret": "1348b145fa1a555461c1b790a2f66614781091e9",
"is_verified": false,
"line_number": 1559
"line_number": 1569
},
{
"type": "Base64 High Entropy String",
"filename": "tests/conftest.py",
"hashed_secret": "227dea087477346785aefd575f91dd13ab86c108",
"is_verified": false,
"line_number": 1582
"line_number": 1593
}
],
"tests/credentials/google/test_credentials.py": [
Expand Down Expand Up @@ -385,6 +394,24 @@
"line_number": 300
}
],
"tests/storageclient/storage_client_mock.py": [
{
"type": "Secret Keyword",
"filename": "tests/storageclient/storage_client_mock.py",
"hashed_secret": "37bbea9557f9efd1eeadb25dda9ab6514f08fde9",
"is_verified": false,
"line_number": 158
}
],
"tests/storageclient/test_cleversafe_api_client.py": [
{
"type": "Secret Keyword",
"filename": "tests/storageclient/test_cleversafe_api_client.py",
"hashed_secret": "f683c485d521c2e45830146dd570111770baea29",
"is_verified": false,
"line_number": 130
}
],
"tests/test-fence-config.yaml": [
{
"type": "Basic Auth Credentials",
Expand All @@ -395,5 +422,5 @@
}
]
},
"generated_at": "2023-11-16T21:15:57Z"
"generated_at": "2024-07-25T17:19:58Z"
}
53 changes: 0 additions & 53 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit 2060cca

Please sign in to comment.