Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into platform/brick/13161-update-sub…
Browse files Browse the repository at this point in the history
…mission-received-event
  • Loading branch information
brick-green committed Sep 24, 2024
2 parents fa93fa0 + e5cd452 commit 4421fed
Show file tree
Hide file tree
Showing 119 changed files with 1,906 additions and 5,796 deletions.
33 changes: 18 additions & 15 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
# Normal text let sit to auto
*.htm text
*.html text
*.css text
*.js text

## Declare files that will always have LF (aka \n aka 10 aka 0x0a) line endings on checkout.
*.sh text eol=lf
*.md text eol=lf
*.json text eol=lf
*.yml text eol=lf
*.csv text eol=lf
*.hl7 text eol=lf
.environment/sftp-conf/ssh_host_*_key text eol=lf

# Normal text let sit to auto
*.htm text
*.html text
*.css text
*.js text

## Declare files that will always have LF (aka \n aka 10 aka 0x0a) line endings on checkout.
*.sh text eol=lf
*.md text eol=lf
*.json text eol=lf
*.yml text eol=lf
*.csv text eol=lf
*.hl7 text eol=lf
.environment/sftp-conf/ssh_host_*_key text eol=lf
* text=auto
*.gradle text eol=lf


11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,17 @@ updates:
timezone: "US/Eastern"
rebase-strategy: "disabled"

# auth
- package-ecosystem: "gradle"
directory: "/auth"
open-pull-requests-limit: 100
schedule:
interval: "weekly"
day: "sunday"
time: "04:17"
timezone: "US/Eastern"
rebase-strategy: "disabled"

# Backend
- package-ecosystem: "gradle"
directory: "/prime-router"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scan_action_logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
id: scan
with:
github-token: ${{ secrets.RUNLEAKS_TOKEN }}
run-limit: 500
run-limit: 300
min-days-old: 0
max-days-old: 2
max-days-old: 1
patterns-path: ".github/runleaks/patterns.txt"
exclusions-path: ".github/runleaks/exclusions.txt"
fail-on-leak: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate_terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

- name: Run Checkov action
uses: bridgecrewio/checkov-action@15c964c5bee933376cc576908ccfad6687718c8e
uses: bridgecrewio/checkov-action@d0e41abbcc8c1103c6ae7e451681d071f05e1c20
with:
directory: operations/app/terraform
skip_check: CKV_AZURE_139,CKV_AZURE_137,CKV_AZURE_103,CKV_AZURE_104,CKV_AZURE_102,CKV_AZURE_130,CKV_AZURE_121,CKV_AZURE_67,CKV_AZURE_56,CKV_AZURE_17,CKV_AZURE_63,CKV_AZURE_18,CKV_AZURE_88,CKV_AZURE_65,CKV_AZURE_13,CKV_AZURE_66,CKV_AZURE_33,CKV_AZURE_35,CKV_AZURE_36,CKV_AZURE_98,CKV2_AZURE_1,CKV2_AZURE_15,CKV2_AZURE_21,CKV_AZURE_213,CKV_AZURE_59,CKV2_AZURE_33,CKV2_AZURE_32,CKV2_AZURE_28,CKV_AZURE_206,CKV_AZURE_42,CKV_AZURE_110,CKV_AZURE_109,CKV_AZURE_166,CKV2_AZURE_38,CKV2_AZURE_40,CKV2_AZURE_41,CKV_AZURE_235
skip_check: CKV_AZURE_139,CKV_AZURE_137,CKV_AZURE_103,CKV_AZURE_104,CKV_AZURE_102,CKV_AZURE_130,CKV_AZURE_121,CKV_AZURE_67,CKV_AZURE_56,CKV_AZURE_17,CKV_AZURE_63,CKV_AZURE_18,CKV_AZURE_88,CKV_AZURE_65,CKV_AZURE_13,CKV_AZURE_66,CKV_AZURE_33,CKV_AZURE_35,CKV_AZURE_36,CKV_AZURE_98,CKV2_AZURE_1,CKV2_AZURE_15,CKV2_AZURE_21,CKV_AZURE_213,CKV_AZURE_59,CKV2_AZURE_33,CKV2_AZURE_32,CKV2_AZURE_28,CKV_AZURE_206,CKV_AZURE_42,CKV_AZURE_110,CKV_AZURE_109,CKV_AZURE_166,CKV2_AZURE_38,CKV2_AZURE_40,CKV2_AZURE_41,CKV_AZURE_235,CKV_AZURE_244
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "operations/slack-boltjs-app"]
path = operations/slack-boltjs-app
url = https://github.com/JosiahSiegel/slack-boltjs-app
url = https://github.com/focusconsulting/slack-boltjs-app
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ kotlin {
}

dependencies {
val kotlinVersion by System.getProperties()
val kotlinVersion = KotlinVersion.CURRENT.toString()
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:12.1.1")
}
Loading

0 comments on commit 4421fed

Please sign in to comment.