Skip to content

Commit 461a87a

Browse files
committed
Use helmchart name for pact identifier.
Prefer helmchart name as the pacticipant identifier: * `bpm-provider` -> `bpm` * `bpm-consumer` -> `bpm` * `sam-provider` -> `sam` * See [thread](https://broadinstitute.slack.com/archives/C043YJ40719/p1698068076950019) discussing the `-consumer` and `-provider` suffix anti-pattern. * See [thread](https://broadinstitute.slack.com/archives/C043YJ40719/p1698241095600099) discussing the recommendation to use the helm chart name. Unblocks: * broadinstitute/rawls#2610 * DataBiosphere/terra-workspace-manager#1511 * broadinstitute/sam#1234
1 parent 59bceb8 commit 461a87a

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

Diff for: .github/workflows/consumer_contract_tests.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- name: Output consumer contract as non-breaking base64 string
7373
id: encode-pact
7474
run: |
75-
NON_BREAKING_B64=$(cat service/build/pacts/bpm-consumer-sam-provider.json | base64 -w 0)
75+
NON_BREAKING_B64=$(cat service/build/pacts/bpm-sam.json | base64 -w 0)
7676
echo "pact-b64=${NON_BREAKING_B64}" >> $GITHUB_OUTPUT
7777
7878
publish-contracts:
@@ -100,5 +100,4 @@ jobs:
100100
# repo: broadinstitute/terra-github-workflows
101101
# ref: refs/heads/main
102102
# token: ${{ secrets.BROADBOT_TOKEN }} # github token for access to kick off a job in the private repo
103-
# inputs: '{ "pacticipant": "bpm-consumer", "version": "${{ needs.init-github-context.outputs.repo-version }}" }'
104-
103+
# inputs: '{ "pacticipant": "bpm", "version": "${{ needs.init-github-context.outputs.repo-version }}" }'

Diff for: .github/workflows/verify_consumer_pacts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,4 +212,4 @@ jobs:
212212
repo: broadinstitute/terra-github-workflows
213213
ref: refs/heads/main
214214
token: ${{ secrets.BROADBOT_TOKEN }} # github token for access to kick off a job in the private repo
215-
inputs: '{ "pacticipant": "bpm-provider", "version": "${{ needs.verify-consumer-pact.outputs.provider-sha }}" }'
215+
inputs: '{ "pacticipant": "bpm", "version": "${{ needs.verify-consumer-pact.outputs.provider-sha }}" }'

Diff for: service/src/test/java/bio/terra/profile/pact/SamServiceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@PactConsumerTest
2020
public class SamServiceTest {
2121

22-
@Pact(consumer = "bpm-consumer", provider = "sam-provider")
22+
@Pact(consumer = "bpm", provider = "sam")
2323
public RequestResponsePact statusApiPact(PactDslWithProvider builder) {
2424
return builder
2525
.given("Sam is ok")
@@ -32,7 +32,7 @@ public RequestResponsePact statusApiPact(PactDslWithProvider builder) {
3232
.toPact();
3333
}
3434

35-
@Pact(consumer = "bpm-consumer", provider = "sam-provider")
35+
@Pact(consumer = "bpm", provider = "sam")
3636
public RequestResponsePact userStatusPact(PactDslWithProvider builder) {
3737
var userResponseShape =
3838
new PactDslJsonBody()

Diff for: service/src/test/java/bio/terra/profile/pact/provider/BPMProviderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
6060

6161
@Tag("provider-test")
62-
@Provider("bpm-provider")
62+
@Provider("bpm")
6363
@PactBroker
6464
// for local testing, put any test pacts in the service/pacts folder.
6565
// then comment out the above line, and uncomment the following line

0 commit comments

Comments
 (0)