Skip to content

Commit

Permalink
Add SSO to the list of circular dep supressions (#1089)
Browse files Browse the repository at this point in the history
* Add SSO to the list of circular dep supressions

* Update CHANGELOG.next.toml

Co-authored-by: John DiSanti <[email protected]>

Co-authored-by: John DiSanti <[email protected]>
  • Loading branch information
rcoh and jdisanti authored Jan 19, 2022
1 parent da214d9 commit 3e15e4a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.next.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@
# references = ["smithy-rs#920"]
# meta = { "breaking" = false, "tada" = false, "bug" = false }
# author = "rcoh"

[[aws-sdk-rust]]
message = "Fix dev-dependency cycle between aws-sdk-sso and aws-config"
meta = { "breaking" = false, "tada" = false, "bug" = true }
references = ["smithy-rs#1089"]
author = "rcoh"
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private class AwsFluentClientDocs(codegenContext: CodegenContext) : FluentClient
// Usage docs on STS must be suppressed—aws-config cannot be added as a dev-dependency because it would create
// a circular dependency
private fun suppressUsageDocs(): Boolean =
serviceShape.id == ShapeId.from("com.amazonaws.sts#AWSSecurityTokenServiceV20110615")
setOf(ShapeId.from("com.amazonaws.sts#AWSSecurityTokenServiceV20110615"), ShapeId.from("com.amazonaws.sso#SWBPortalService")).contains(serviceShape.id)

override fun section(section: FluentClientSection): Writable {
return when (section) {
Expand Down
1 change: 1 addition & 0 deletions tools/publisher/src/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ fn dependency_order_visit(
return Ok(());
}
if stack.contains(package_handle) {
tracing::error!(stack = ?stack, handle = ?package_handle, "dependency cycle!");
return Err(Error::DependencyCycle);
}
stack.insert(package_handle.clone());
Expand Down

0 comments on commit 3e15e4a

Please sign in to comment.