Skip to content

Fix AbstractAssociateAtlassianHostUserActionRefiner #97

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
tbinna merged 1 commit into from
Mar 4, 2026
Merged

Fix AbstractAssociateAtlassianHostUserActionRefiner #97

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
8 changes: 5 additions & 3 deletions ...oolsplus/atlassian/connect/play/actions/asymmetric/AssociateAtlassianHostUserAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ trait AbstractAssociateAtlassianHostUserActionRefiner[R[A] <: WrappedRequest[A]]
.findByClientKey(installation.clientKey)
.map(hostSearchResultToActionResult(_, request))
case None =>
logger.error(
s"Failed to associate Connect host to Forge Remote Compute invocation: No host mapping for installation id $installationId found"
logger.info(
s"Could not associate Connect host to Forge Remote Compute invocation: No host mapping for installation id $installationId found. This is probably a pure Forge installation"
)
Future.successful(
hostSearchResultToActionResult(None, request)
)
Future.successful(Left(BadRequest(s"Missing Connect mapping")))
})
}
}
Expand Down
23 changes: 14 additions & 9 deletions ...plus/atlassian/connect/play/actions/asymmetric/AssociateAtlassianHostUserActionSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class AssociateAtlassianHostUserActionSpec
ForgeRemoteContext(
fakeForgeInvocationContext,
forgeRemoteCredentials.traceId,
forgeRemoteCredentials.spanId,
forgeRemoteCredentials.spanId
),
forgeRemoteRequest
)
Expand Down Expand Up @@ -176,7 +176,7 @@ class AssociateAtlassianHostUserActionSpec
ForgeRemoteContext(
fakeForgeInvocationContext,
forgeRemoteCredentials.traceId,
forgeRemoteCredentials.spanId,
forgeRemoteCredentials.spanId
),
forgeRemoteRequest
)
Expand All @@ -188,7 +188,7 @@ class AssociateAtlassianHostUserActionSpec
val result = await {
refiner.refine(forgeRemoteContextRequest)
}
result mustBe Left(BadRequest(s"Missing Connect mapping"))
result mustBe Left(BadRequest("Missing Connect installation"))
}
}

Expand All @@ -212,7 +212,7 @@ class AssociateAtlassianHostUserActionSpec
ForgeRemoteContext(
fakeForgeInvocationContext,
forgeRemoteCredentials.traceId,
forgeRemoteCredentials.spanId,
forgeRemoteCredentials.spanId
),
forgeRemoteRequest
)
Expand Down Expand Up @@ -267,7 +267,7 @@ class AssociateAtlassianHostUserActionSpec
ForgeRemoteContext(
fakeForgeInvocationContext,
forgeRemoteCredentials.traceId,
forgeRemoteCredentials.spanId,
forgeRemoteCredentials.spanId
),
forgeRemoteRequest
)
Expand Down Expand Up @@ -304,7 +304,7 @@ class AssociateAtlassianHostUserActionSpec
}
}

"fail to refine if no Connect mapping exists" in {
"successfully refine to ForgeRemoteAssociateMaybeAtlassianHostUserRequest if no Connect mapping exists" in {
forAll(
forgeInvocationTokenGen(fakeForgeInvocationContext, keyId, privateKey)
) { invocationToken =>
Expand All @@ -324,7 +324,7 @@ class AssociateAtlassianHostUserActionSpec
ForgeRemoteContext(
fakeForgeInvocationContext,
forgeRemoteCredentials.traceId,
forgeRemoteCredentials.spanId,
forgeRemoteCredentials.spanId
),
forgeRemoteRequest
)
Expand All @@ -336,7 +336,12 @@ class AssociateAtlassianHostUserActionSpec
val result = await {
refiner.refine(forgeRemoteContextRequest)
}
result mustBe Left(BadRequest(s"Missing Connect mapping"))
result mustBe Right(
ForgeRemoteAssociateMaybeAtlassianHostUserRequest(
None,
forgeRemoteContextRequest
)
)
}
}

Expand All @@ -360,7 +365,7 @@ class AssociateAtlassianHostUserActionSpec
ForgeRemoteContext(
fakeForgeInvocationContext,
forgeRemoteCredentials.traceId,
forgeRemoteCredentials.spanId,
forgeRemoteCredentials.spanId
),
forgeRemoteRequest
)
Expand Down