Skip to content

Commit c37ff4f

Browse files
Merge branch 'dev' into LNK-4551-new
2 parents b4afba0 + 8200ee6 commit c37ff4f

12 files changed

Lines changed: 179 additions & 77 deletions

File tree

.github/workflows/pr-title-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
} else {
3131
core.setFailed('Cannot determine PR title for validation.')
3232
}
33-
const prTitleExpectedPattern = /(^LNK-\d+:\s)|(^TECH_DEBT:\s)|(^DOCS:\s)/g
34-
const prTitleMismatchError = 'Invalid PR title "' + prTitle + '"! Must begin with LNK-nnnn:<space> or TECH_DEBT:<space> or DOCS:<space>, e.g. LNK-1234: My PR title, or TECH_DEBT: My PR title or DOCS: My PR title'
33+
const prTitleExpectedPattern = /(^LNK-\d+:\s)|(^TECH_DEBT:\s)|(^DOCS:\s)|(^SNYK:\s)/g
34+
const prTitleMismatchError = 'Invalid PR title "' + prTitle + '"! Must begin with LNK-nnnn:<space> or TECH_DEBT:<space> or DOCS:<space> or SNYK:<space>, e.g. LNK-1234: My PR title, or TECH_DEBT: My PR title or DOCS: My PR title or [Snyk] My PR title'
3535
if (!prTitleExpectedPattern.test(prTitle)) {
3636
// Fail the workflow
3737
console.log(prTitleMismatchError)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
title: "SNYK: {{ snyk_pull_request_type }} for {{ package_name }}"
2+
description: |
3+
{{ #is_upgrade_pr }}
4+
This PR has been opened by Snyk to make sure our repositories are kept up-to-date.
5+
It updates **{{ package_name }}** from version {{ package_from }} to version {{ package_to }}.
6+
Review relevant docs for possible breaking changes.
7+
{{ /is_upgrade_pr }}
8+
9+
{{ #is_fix_pr }}
10+
This PR applies a fix for a vulnerability in **{{ package_name }}**.
11+
{{ /is_fix_pr }}
12+
13+
**Issues Fixed:** {{ issue_count }}

Java/measureeval/src/main/java/com/lantanagroup/link/measureeval/controllers/MeasureDefinitionController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
@RestController
3333
@RequestMapping("/api/measureeval/measure-definition")
34-
@PreAuthorize("hasRole('LinkUser')")
34+
@PreAuthorize("hasAnyRole('LinkUser', 'LinkAdministrator')")
3535
public class MeasureDefinitionController {
3636

3737
private final Logger _logger = LoggerFactory.getLogger(MeasureDefinitionController.class);

Java/measureeval/src/main/java/com/lantanagroup/link/measureeval/controllers/PatientController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@RestController
1515
@RequestMapping("/api/measureeval/patient")
16-
@PreAuthorize("hasRole('LinkUser')")
16+
@PreAuthorize("hasAnyRole('LinkUser', 'LinkAdministrator')")
1717
public class PatientController {
1818
private final PatientReportingEvaluationStatusRepository patientReportingEvaluationStatusRepository;
1919
private final PatientStatusBundler patientStatusBundler;

Java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<dependency>
149149
<groupId>com.azure</groupId>
150150
<artifactId>azure-storage-blob</artifactId>
151-
<version>12.30.0</version>
151+
<version>12.32.0</version>
152152
</dependency>
153153
</dependencies>
154154
</dependencyManagement>

Java/validation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<dependency>
149149
<groupId>io.opentelemetry</groupId>
150150
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
151-
<version>1.38.0</version>
151+
<version>1.56.0</version>
152152
</dependency>
153153
<dependency>
154154
<groupId>io.opentelemetry</groupId>

Scripts/should-run-smoke-test.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ if [[ -z "${DIFF_RANGE}" ]]; then
2020
fi
2121
fi
2222

23+
echo "Checking changes in range: ${DIFF_RANGE}" >&2
24+
2325
# Folders where changes ALONE should NOT trigger the job
2426
ALLOWED_PREFIXES=(
2527
"Azure_Pipelines/"
2628
"docs/"
2729
"Scripts/"
2830
".github/"
29-
"Web/"
3031
)
3132

3233
# Collect changed files (added/changed/renamed)
@@ -37,6 +38,7 @@ run_job="false"
3738

3839
if ((${#FILES[@]} == 0)); then
3940
# no changes → skip
41+
echo "No changes detected in range ${DIFF_RANGE}." >&2
4042
echo "run_job=${run_job}"
4143
exit 0
4244
fi
@@ -47,14 +49,20 @@ for file in "${FILES[@]}"; do
4749
for prefix in "${ALLOWED_PREFIXES[@]}"; do
4850
if [[ "${file}" == ${prefix}* ]]; then
4951
allowed="true"
52+
echo "File '${file}' is in allowed prefix '${prefix}'. It does not trigger the job." >&2
5053
break
5154
fi
5255
done
5356

5457
if [[ "${allowed}" == "false" ]]; then
58+
echo "File '${file}' is NOT in any allowed prefix. Job must run." >&2
5559
run_job="true"
5660
break
5761
fi
5862
done
5963

64+
if [[ "${run_job}" == "false" ]]; then
65+
echo "All changed files are in allowed prefixes. Skipping job." >&2
66+
fi
67+
6068
echo "run_job=${run_job}"

0 commit comments

Comments
 (0)