Commit 32cd8d6b authored by ysaito1001's avatar ysaito1001
Browse files

Make doc examples revision optional in tooling

parent 2016a67a

aws/sdk/build.gradle.kts

+0 −2
Original line number Diff line number Diff line
@@ -405,8 +405,6 @@ tasks.register<ExecRustBuildTool>("generateVersionManifest") { 
        outputDir.asFile.absolutePath,

        "--smithy-build",

        layout.buildDirectory.file("smithy-build.json").get().asFile.normalize().absolutePath,

        "--examples-revision",

        properties.get("aws.sdk.examples.revision") ?: "missing",

    ).apply {

        getPreviousReleaseVersionManifestPath()?.let { manifestPath ->

            add("--previous-release-versions")

buildSrc/src/main/kotlin/aws/sdk/VersionsManifest.kt

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ data class CrateVersion( 
/** Kotlin representation of aws-sdk-rust's `versions.toml` file */

data class VersionsManifest(

    val smithyRsRevision: String,

    val awsDocSdkExamplesRevision: String,

    val crates: Map<String, CrateVersion>,

) {

    companion object {
@@ -31,7 +30,6 @@ data class VersionsManifest( 
            val toml = Toml().read(value)

            return VersionsManifest(

                smithyRsRevision = toml.getString("smithy_rs_revision"),

                awsDocSdkExamplesRevision = toml.getString("aws_doc_sdk_examples_revision"),

                crates =

                    toml.getTable("crates").entrySet().map { entry ->

                        val crate = (entry.value as Toml)

buildSrc/src/test/kotlin/aws/sdk/IndependentCrateVersionerTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ class IndependentCrateVersionerTest { 
            IndependentCrateVersioner(

                VersionsManifest(

                    smithyRsRevision = "smithy-rs-1",

                    awsDocSdkExamplesRevision = "dontcare",

                    crates =

                        mapOf(

                            "aws-sdk-dynamodb" to
@@ -93,7 +92,6 @@ class IndependentCrateVersionerTest { 
            IndependentCrateVersioner(

                VersionsManifest(

                    smithyRsRevision = "smithy-rs-1",

                    awsDocSdkExamplesRevision = "dontcare",

                    crates =

                        mapOf(

                            "aws-sdk-dynamodb" to
@@ -161,7 +159,6 @@ class IndependentCrateVersionerTest { 
            IndependentCrateVersioner(

                VersionsManifest(

                    smithyRsRevision = "smithy-rs-1",

                    awsDocSdkExamplesRevision = "dontcare",

                    crates =

                        mapOf(

                            "aws-sdk-dynamodb" to
@@ -211,7 +208,6 @@ class IndependentCrateVersionerTest { 
            IndependentCrateVersioner(

                VersionsManifest(

                    smithyRsRevision = "smithy-rs-1",

                    awsDocSdkExamplesRevision = "dontcare",

                    crates =

                        mapOf(

                            "aws-sdk-dynamodb" to

buildSrc/src/test/kotlin/aws/sdk/VersionsManifestTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ class VersionsManifestTest { 
            VersionsManifest.fromString(

                """

                smithy_rs_revision = 'some-smithy-rs-revision'

                aws_doc_sdk_examples_revision = 'some-doc-revision'



                [crates.aws-config]

                category = 'AwsRuntime'
@@ -31,7 +30,6 @@ class VersionsManifestTest { 
            )



        assertEquals("some-smithy-rs-revision", manifest.smithyRsRevision)

        assertEquals("some-doc-revision", manifest.awsDocSdkExamplesRevision)

        assertEquals(

            mapOf(

                "aws-config" to

tools/ci-build/changelogger/tests/e2e_test.rs

+0 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ const SDK_MODEL_SOURCE_TOML: &str = r#" 


const VERSIONS_TOML: &str = r#"

    smithy_rs_revision = '41ca31b85b4ba8c0ad680fe62a230266cc52cc44'

    aws_doc_sdk_examples_revision = '97a177aab8c3d2fef97416cb66e4b4d0da840138'



    [manual_interventions]

    crates_to_remove = []
@@ -383,7 +382,6 @@ fn render_aws_sdk() { 
        &previous_versions_manifest_path,

        format!(

            "smithy_rs_revision = '{last_release_commit}'

                 aws_doc_sdk_examples_revision = 'not-relevant'

                 [crates]",

        ),

    )