diff --git a/CHANGELOG.next.toml b/CHANGELOG.next.toml index 72d79628e7..755b6ffbd5 100644 --- a/CHANGELOG.next.toml +++ b/CHANGELOG.next.toml @@ -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" diff --git a/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsFluentClientDecorator.kt b/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsFluentClientDecorator.kt index 0d5629287e..ad9bb634c4 100644 --- a/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsFluentClientDecorator.kt +++ b/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsFluentClientDecorator.kt @@ -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) { diff --git a/tools/publisher/src/sort.rs b/tools/publisher/src/sort.rs index 017e21006d..4c6e5a03d0 100644 --- a/tools/publisher/src/sort.rs +++ b/tools/publisher/src/sort.rs @@ -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());