Skip to content

Use helmchart name for pact identifier. #310

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

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Use helmchart name for pact identifier. #310

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
5 changes: 2 additions & 3 deletions .github/workflows/consumer_contract_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Output consumer contract as non-breaking base64 string
id: encode-pact
run: |
NON_BREAKING_B64=$(cat service/build/pacts/bpm-consumer-sam-provider.json | base64 -w 0)
NON_BREAKING_B64=$(cat service/build/pacts/bpm-sam.json | base64 -w 0)
echo "pact-b64=${NON_BREAKING_B64}" >> $GITHUB_OUTPUT

publish-contracts:
Expand Down Expand Up @@ -100,5 +100,4 @@ jobs:
# repo: broadinstitute/terra-github-workflows
# ref: refs/heads/main
# token: ${{ secrets.BROADBOT_TOKEN }} # github token for access to kick off a job in the private repo
# inputs: '{ "pacticipant": "bpm-consumer", "version": "${{ needs.init-github-context.outputs.repo-version }}" }'

# inputs: '{ "pacticipant": "bpm", "version": "${{ needs.init-github-context.outputs.repo-version }}" }'
2 changes: 1 addition & 1 deletion .github/workflows/verify_consumer_pacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,4 @@ jobs:
repo: broadinstitute/terra-github-workflows
ref: refs/heads/main
token: ${{ secrets.BROADBOT_TOKEN }} # github token for access to kick off a job in the private repo
inputs: '{ "pacticipant": "bpm-provider", "version": "${{ needs.verify-consumer-pact.outputs.provider-sha }}" }'
inputs: '{ "pacticipant": "bpm", "version": "${{ needs.verify-consumer-pact.outputs.provider-sha }}" }'
4 changes: 2 additions & 2 deletions service/src/test/java/bio/terra/profile/pact/SamServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@PactConsumerTest
public class SamServiceTest {

@Pact(consumer = "bpm-consumer", provider = "sam-provider")
@Pact(consumer = "bpm", provider = "sam")
public RequestResponsePact statusApiPact(PactDslWithProvider builder) {
return builder
.given("Sam is ok")
Expand All @@ -32,7 +32,7 @@ public RequestResponsePact statusApiPact(PactDslWithProvider builder) {
.toPact();
}

@Pact(consumer = "bpm-consumer", provider = "sam-provider")
@Pact(consumer = "bpm", provider = "sam")
public RequestResponsePact userStatusPact(PactDslWithProvider builder) {
var userResponseShape =
new PactDslJsonBody()
Expand Down
2 changes: 1 addition & 1 deletion service/src/test/java/bio/terra/profile/pact/provider/BPMProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;

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