Skip to content
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

AJ-1369 verify pet token pact #1205

Merged
merged 4 commits into from
Oct 19, 2023
Merged

AJ-1369 verify pet token pact #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a417a48
pet token pact
calypsomatic Oct 12, 2023
51cf57c
Merge branch 'develop' into aj-1369-token-pact
calypsomatic Oct 13, 2023
6c87b4c
Fix webhook logic.
ichengchang Oct 17, 2023
74e1e6b
Merge branch 'develop' into aj-1369-token-pact
ichengchang Oct 18, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/verify_consumer_pacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,16 @@ jobs:
fi
git fetch
if [[ ! -z "${{ env.CHECKOUT_BRANCH }}" ]] && [[ ! -z "${{ env.CHECKOUT_SHA }}" ]]; then
echo "git checkout ${{ env.CHECKOUT_BRANCH }} ${{ env.CHECKOUT_SHA }}"
git checkout ${{ env.CHECKOUT_BRANCH }} ${{ env.CHECKOUT_SHA }}
echo "git checkout -b ${{ env.CHECKOUT_BRANCH }} ${{ env.CHECKOUT_SHA }}"
git checkout -b ${{ env.CHECKOUT_BRANCH }} ${{ env.CHECKOUT_SHA }} || echo "already in ${{ env.CHECKOUT_BRANCH }}"
echo "git branch"
git branch
else
if [[ "${{ github.event_name }}" == "push" ]]; then
if [[ "${{ github.event_name }}" == "push" ]] || [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
echo "git checkout ${{ env.CURRENT_BRANCH }}"
git checkout ${{ env.CURRENT_BRANCH }}
else
echo "git checkout ${{ env.CURRENT_BRANCH }} ${{ env.CURRENT_SHA }}"
echo "git checkout -b ${{ env.CURRENT_BRANCH }} ${{ env.CURRENT_SHA }}"
git checkout -b ${{ env.CURRENT_BRANCH }} ${{ env.CURRENT_SHA }}
fi
fi
Expand Down
12 changes: 11 additions & 1 deletion pact4s/src/test/scala/org/broadinstitute/dsde/workbench/sam/provider/SamProviderSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,16 @@ class SamProviderSpec
})
} yield ()

private def mockGetArbitraryPetServiceAccountToken(): IO[Unit] = for {
_ <- IO(
when {
googleExt.getArbitraryPetServiceAccountToken(any[SamUser], any[Set[String]], any[SamRequestContext])
} thenReturn {
Future.successful("aToken")
}
)
} yield ()

private def mockResourceActionPermission(action: ResourceAction, hasPermission: Boolean): IO[Unit] = for {
_ <- IO(
lenient()
Expand All @@ -142,7 +152,7 @@ class SamProviderSpec

private val providerStatesHandler: StateManagementFunction = StateManagementFunction {
case ProviderState(States.UserExists, _) =>
logger.debug(States.UserExists)
mockGetArbitraryPetServiceAccountToken().unsafeRunSync()
case ProviderState(States.SamOK, _) =>
mockCriticalSubsystemsStatus(true).unsafeRunSync()
case ProviderState(States.SamNotOK, _) =>
Expand Down
Loading