Unverified Commit b828dc80 authored by Zelda Hessler's avatar Zelda Hessler Committed by GitHub
Browse files

add: tool to sync aws-sdk-rust/next with smithy-rs (#1004) 



* add: tool to sync aws-sdk-rust/next with smithy-rs

* fix: lint issues

* Update tools/smithy-rs-sync/src/main.rs

Co-authored-by: default avatardavid-perez <d@vidp.dev>

* refactor: simplify commands by using a helper fn
update: use eprintln instead of println
update: note number of successfully mirrored commits in success message
update: use fs::read_to_string
update: use .display() instead of .to_string_lossy() for displaying paths
update: ensure absolute paths in fn copy_sdk
update: use iters instead of for loop in fn commits_to_be_applied

* add: fn for deleting files/ folders not in allowlist

* add: missing copyright header
remove: TODO

* refactor: handwritten to work with gitignore
add: check we're not generating files marked as handwritten
add: fn to list handwritten files
add: test for find_handwritten_files_and_folders
fix: clippy lint
add: timer for SDK cleanout
remove: once_cell dep
sort: deps in Cargo.toml

* fix: set smithyrs-githash per mirror commit
update: set bot as committer

* refactor: HandwrittenFiles to return iters

* add: Russell's error hint

Co-authored-by: default avatardavid-perez <d@vidp.dev>
Co-authored-by: default avatarAWS SDK Rust Bot <aws-sdk-rust-primary@amazon.com>
parent cbd61ab1

tools/smithy-rs-sync/Cargo.lock

0 → 100644
+514 −0
Original line number Diff line number Diff line 
# This file is automatically @generated by Cargo.

# It is not intended for manual editing.

version = 3



[[package]]

name = "ansi_term"

version = "0.12.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"

dependencies = [

 "winapi",

]



[[package]]

name = "anyhow"

version = "1.0.51"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"



[[package]]

name = "autocfg"

version = "1.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"



[[package]]

name = "bitflags"

version = "1.3.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"



[[package]]

name = "cc"

version = "1.0.72"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"

dependencies = [

 "jobserver",

]



[[package]]

name = "cfg-if"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"



[[package]]

name = "clap"

version = "2.34.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"

dependencies = [

 "bitflags",

 "textwrap",

 "unicode-width",

]



[[package]]

name = "ctor"

version = "0.1.21"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa"

dependencies = [

 "quote",

 "syn",

]



[[package]]

name = "diff"

version = "0.1.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"



[[package]]

name = "form_urlencoded"

version = "1.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"

dependencies = [

 "matches",

 "percent-encoding",

]



[[package]]

name = "fuchsia-cprng"

version = "0.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"



[[package]]

name = "git2"

version = "0.13.25"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6"

dependencies = [

 "bitflags",

 "libc",

 "libgit2-sys",

 "log",

 "openssl-probe",

 "openssl-sys",

 "url",

]



[[package]]

name = "gitignore"

version = "1.0.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "78aa90e4620c1498ac434c06ba6e521b525794bbdacf085d490cc794b4a2f9a4"

dependencies = [

 "glob",

]



[[package]]

name = "glob"

version = "0.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"



[[package]]

name = "heck"

version = "0.3.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"

dependencies = [

 "unicode-segmentation",

]



[[package]]

name = "idna"

version = "0.2.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"

dependencies = [

 "matches",

 "unicode-bidi",

 "unicode-normalization",

]



[[package]]

name = "jobserver"

version = "0.1.24"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"

dependencies = [

 "libc",

]



[[package]]

name = "lazy_static"

version = "1.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"



[[package]]

name = "libc"

version = "0.2.112"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"



[[package]]

name = "libgit2-sys"

version = "0.12.26+1.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494"

dependencies = [

 "cc",

 "libc",

 "libssh2-sys",

 "libz-sys",

 "openssl-sys",

 "pkg-config",

]



[[package]]

name = "libssh2-sys"

version = "0.2.23"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"

dependencies = [

 "cc",

 "libc",

 "libz-sys",

 "openssl-sys",

 "pkg-config",

 "vcpkg",

]



[[package]]

name = "libz-sys"

version = "1.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"

dependencies = [

 "cc",

 "libc",

 "pkg-config",

 "vcpkg",

]



[[package]]

name = "log"

version = "0.4.14"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"

dependencies = [

 "cfg-if",

]



[[package]]

name = "matches"

version = "0.1.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"



[[package]]

name = "openssl-probe"

version = "0.1.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"



[[package]]

name = "openssl-sys"

version = "0.9.72"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"

dependencies = [

 "autocfg",

 "cc",

 "libc",

 "pkg-config",

 "vcpkg",

]



[[package]]

name = "output_vt100"

version = "0.1.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"

dependencies = [

 "winapi",

]



[[package]]

name = "percent-encoding"

version = "2.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"



[[package]]

name = "pkg-config"

version = "0.3.24"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"



[[package]]

name = "pretty_assertions"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ec0cfe1b2403f172ba0f234e500906ee0a3e493fb81092dac23ebefe129301cc"

dependencies = [

 "ansi_term",

 "ctor",

 "diff",

 "output_vt100",

]



[[package]]

name = "proc-macro-error"

version = "1.0.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"

dependencies = [

 "proc-macro-error-attr",

 "proc-macro2",

 "quote",

 "syn",

 "version_check",

]



[[package]]

name = "proc-macro-error-attr"

version = "1.0.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"

dependencies = [

 "proc-macro2",

 "quote",

 "version_check",

]



[[package]]

name = "proc-macro2"

version = "1.0.34"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1"

dependencies = [

 "unicode-xid",

]



[[package]]

name = "quote"

version = "1.0.10"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"

dependencies = [

 "proc-macro2",

]



[[package]]

name = "rand"

version = "0.4.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"

dependencies = [

 "fuchsia-cprng",

 "libc",

 "rand_core 0.3.1",

 "rdrand",

 "winapi",

]



[[package]]

name = "rand_core"

version = "0.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"

dependencies = [

 "rand_core 0.4.2",

]



[[package]]

name = "rand_core"

version = "0.4.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"



[[package]]

name = "rdrand"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"

dependencies = [

 "rand_core 0.3.1",

]



[[package]]

name = "remove_dir_all"

version = "0.5.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"

dependencies = [

 "winapi",

]



[[package]]

name = "smithy-rs-sync"

version = "0.1.0"

dependencies = [

 "anyhow",

 "git2",

 "gitignore",

 "pretty_assertions",

 "structopt",

 "tempdir",

]



[[package]]

name = "structopt"

version = "0.3.25"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"

dependencies = [

 "clap",

 "lazy_static",

 "structopt-derive",

]



[[package]]

name = "structopt-derive"

version = "0.4.18"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"

dependencies = [

 "heck",

 "proc-macro-error",

 "proc-macro2",

 "quote",

 "syn",

]



[[package]]

name = "syn"

version = "1.0.82"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"

dependencies = [

 "proc-macro2",

 "quote",

 "unicode-xid",

]



[[package]]

name = "tempdir"

version = "0.3.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"

dependencies = [

 "rand",

 "remove_dir_all",

]



[[package]]

name = "textwrap"

version = "0.11.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"

dependencies = [

 "unicode-width",

]



[[package]]

name = "tinyvec"

version = "1.5.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"

dependencies = [

 "tinyvec_macros",

]



[[package]]

name = "tinyvec_macros"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"



[[package]]

name = "unicode-bidi"

version = "0.3.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"



[[package]]

name = "unicode-normalization"

version = "0.1.19"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"

dependencies = [

 "tinyvec",

]



[[package]]

name = "unicode-segmentation"

version = "1.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"



[[package]]

name = "unicode-width"

version = "0.1.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"



[[package]]

name = "unicode-xid"

version = "0.2.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"



[[package]]

name = "url"

version = "2.2.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"

dependencies = [

 "form_urlencoded",

 "idna",

 "matches",

 "percent-encoding",

]



[[package]]

name = "vcpkg"

version = "0.2.15"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"



[[package]]

name = "version_check"

version = "0.9.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"



[[package]]

name = "winapi"

version = "0.3.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"

dependencies = [

 "winapi-i686-pc-windows-gnu",

 "winapi-x86_64-pc-windows-gnu",

]



[[package]]

name = "winapi-i686-pc-windows-gnu"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"



[[package]]

name = "winapi-x86_64-pc-windows-gnu"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

tools/smithy-rs-sync/Cargo.toml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
[package]

name = "smithy-rs-sync"

version = "0.1.0"

edition = "2018"

description = "A CLI tool to replay commits from smithy-rs, generate code, and commit that code to aws-rust-sdk"

authors = ["Zelda Hessler <zhessler@amazon.com>"]



# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html



# Having this here prevents this tool from being included in a higher-level workspace

[workspace]



[dependencies]

anyhow = "1"

git2 = "0.13"

gitignore = "1"

structopt = { version = "0.3", default-features = false }



[dev-dependencies]

pretty_assertions = "1"

tempdir = "0.3"

tools/smithy-rs-sync/src/fs.rs

0 → 100644
+329 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/smithy-rs-sync/src/main.rs

0 → 100644
+417 −0

File added.

Preview size limit exceeded, changes collapsed.