From 2ba527fe9d41f93d428043537245f82aedd34af2 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Mon, 30 Oct 2023 16:01:31 -0400 Subject: [PATCH 01/16] wip(feat): Separate OS logic into secrets_core crate Signed-off-by: Trae Yelovich --- packages/secrets/core/Cargo.lock | 622 ++++++++++++++++++ packages/secrets/core/Cargo.toml | 31 + packages/secrets/core/src/lib.rs | 1 + .../{src/keyring => core}/src/os/error.rs | 0 .../{src/keyring => core}/src/os/mac/error.rs | 0 .../{src/keyring => core}/src/os/mac/ffi.rs | 0 .../keyring => core}/src/os/mac/keychain.rs | 0 .../src/os/mac/keychain_item.rs | 0 .../src/os/mac/keychain_search.rs | 0 .../{src/keyring => core}/src/os/mac/misc.rs | 0 .../{src/keyring => core}/src/os/mac/mod.rs | 0 .../{src/keyring => core}/src/os/mod.rs | 0 .../{src/keyring => core}/src/os/unix.rs | 0 .../{src/keyring => core}/src/os/win.rs | 0 packages/secrets/src/keyring/Cargo.lock | 27 +- packages/secrets/src/keyring/Cargo.toml | 24 +- packages/secrets/src/keyring/src/lib.rs | 3 +- packages/secrets/src/keyring/src/workers.rs | 2 +- 18 files changed, 675 insertions(+), 35 deletions(-) create mode 100644 packages/secrets/core/Cargo.lock create mode 100644 packages/secrets/core/Cargo.toml create mode 100644 packages/secrets/core/src/lib.rs rename packages/secrets/{src/keyring => core}/src/os/error.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/mac/error.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/mac/ffi.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/mac/keychain.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/mac/keychain_item.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/mac/keychain_search.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/mac/misc.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/mac/mod.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/mod.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/unix.rs (100%) rename packages/secrets/{src/keyring => core}/src/os/win.rs (100%) diff --git a/packages/secrets/core/Cargo.lock b/packages/secrets/core/Cargo.lock new file mode 100644 index 0000000000..fa08d20324 --- /dev/null +++ b/packages/secrets/core/Cargo.lock @@ -0,0 +1,622 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "cfg-expr" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gio" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57052f84e8e5999b258e8adf8f5f2af0ac69033864936b8b6838321db2f759b1" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libsecret" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac6fae6ebe590e06ef9d01b125e46b7d4c05ccbd5961f12b4aefe2ecd010220f" +dependencies = [ + "gio", + "glib", + "libc", + "libsecret-sys", +] + +[[package]] +name = "libsecret-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b716fc5e1c82eb0d28665882628382ab0e0a156a6d73580e33f0ac6ac8d2540" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[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 1.0.109", + "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.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "secrets_core" +version = "0.1.0" +dependencies = [ + "cfg-if", + "core-foundation", + "core-foundation-sys", + "gio", + "glib", + "glib-sys", + "libsecret", + "libsecret-sys", + "thiserror", + "windows-sys", +] + +[[package]] +name = "serde" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "toml" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.7", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[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" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +dependencies = [ + "memchr", +] diff --git a/packages/secrets/core/Cargo.toml b/packages/secrets/core/Cargo.toml new file mode 100644 index 0000000000..b178909c50 --- /dev/null +++ b/packages/secrets/core/Cargo.toml @@ -0,0 +1,31 @@ +[package] +name = "secrets_core" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +cfg-if = "1.0" +thiserror = "1.0.38" + +[target.'cfg(target_os = "windows")'.dependencies.windows-sys] +features = [ + "Win32_Foundation", + "Win32_Security_Credentials", + "Win32_System_Diagnostics_Debug", + "Win32_System_Memory", + "Win32_System_WindowsProgramming", +] +version = "0.48.0" + +[target.'cfg(target_os = "macos")'.dependencies] +core-foundation = "0.9.3" +core-foundation-sys = "0.8.4" + +[target.'cfg(any(target_os = "freebsd", target_os = "linux"))'.dependencies] +glib = "0.18.2" +glib-sys = "0.18.1" +gio = "0.18.2" +libsecret = "0.4.0" +libsecret-sys = "0.4.0" \ No newline at end of file diff --git a/packages/secrets/core/src/lib.rs b/packages/secrets/core/src/lib.rs new file mode 100644 index 0000000000..dda20c3432 --- /dev/null +++ b/packages/secrets/core/src/lib.rs @@ -0,0 +1 @@ +pub mod os; \ No newline at end of file diff --git a/packages/secrets/src/keyring/src/os/error.rs b/packages/secrets/core/src/os/error.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/error.rs rename to packages/secrets/core/src/os/error.rs diff --git a/packages/secrets/src/keyring/src/os/mac/error.rs b/packages/secrets/core/src/os/mac/error.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/mac/error.rs rename to packages/secrets/core/src/os/mac/error.rs diff --git a/packages/secrets/src/keyring/src/os/mac/ffi.rs b/packages/secrets/core/src/os/mac/ffi.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/mac/ffi.rs rename to packages/secrets/core/src/os/mac/ffi.rs diff --git a/packages/secrets/src/keyring/src/os/mac/keychain.rs b/packages/secrets/core/src/os/mac/keychain.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/mac/keychain.rs rename to packages/secrets/core/src/os/mac/keychain.rs diff --git a/packages/secrets/src/keyring/src/os/mac/keychain_item.rs b/packages/secrets/core/src/os/mac/keychain_item.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/mac/keychain_item.rs rename to packages/secrets/core/src/os/mac/keychain_item.rs diff --git a/packages/secrets/src/keyring/src/os/mac/keychain_search.rs b/packages/secrets/core/src/os/mac/keychain_search.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/mac/keychain_search.rs rename to packages/secrets/core/src/os/mac/keychain_search.rs diff --git a/packages/secrets/src/keyring/src/os/mac/misc.rs b/packages/secrets/core/src/os/mac/misc.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/mac/misc.rs rename to packages/secrets/core/src/os/mac/misc.rs diff --git a/packages/secrets/src/keyring/src/os/mac/mod.rs b/packages/secrets/core/src/os/mac/mod.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/mac/mod.rs rename to packages/secrets/core/src/os/mac/mod.rs diff --git a/packages/secrets/src/keyring/src/os/mod.rs b/packages/secrets/core/src/os/mod.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/mod.rs rename to packages/secrets/core/src/os/mod.rs diff --git a/packages/secrets/src/keyring/src/os/unix.rs b/packages/secrets/core/src/os/unix.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/unix.rs rename to packages/secrets/core/src/os/unix.rs diff --git a/packages/secrets/src/keyring/src/os/win.rs b/packages/secrets/core/src/os/win.rs similarity index 100% rename from packages/secrets/src/keyring/src/os/win.rs rename to packages/secrets/core/src/os/win.rs diff --git a/packages/secrets/src/keyring/Cargo.lock b/packages/secrets/src/keyring/Cargo.lock index ca9f2a105d..d9831cad04 100644 --- a/packages/secrets/src/keyring/Cargo.lock +++ b/packages/secrets/src/keyring/Cargo.lock @@ -259,19 +259,10 @@ dependencies = [ name = "keyring" version = "1.0.0" dependencies = [ - "cfg-if", - "core-foundation", - "core-foundation-sys", - "gio", - "glib", - "glib-sys", - "libsecret", - "libsecret-sys", "napi", "napi-build", "napi-derive", - "thiserror", - "windows-sys", + "secrets_core", ] [[package]] @@ -484,6 +475,22 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +[[package]] +name = "secrets_core" +version = "0.1.0" +dependencies = [ + "cfg-if", + "core-foundation", + "core-foundation-sys", + "gio", + "glib", + "glib-sys", + "libsecret", + "libsecret-sys", + "thiserror", + "windows-sys", +] + [[package]] name = "semver" version = "1.0.18" diff --git a/packages/secrets/src/keyring/Cargo.toml b/packages/secrets/src/keyring/Cargo.toml index 24829da005..5d87355361 100644 --- a/packages/secrets/src/keyring/Cargo.toml +++ b/packages/secrets/src/keyring/Cargo.toml @@ -10,32 +10,10 @@ repository = "https://github.com/zowe/zowe-cli" crate-type = ["cdylib"] [dependencies] -cfg-if = "1.0" # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix napi = {version = "2", default-features = false, features = ["napi4"]} napi-derive = "2" -thiserror = "1.0.38" - -[target.'cfg(target_os = "windows")'.dependencies.windows-sys] -features = [ - "Win32_Foundation", - "Win32_Security_Credentials", - "Win32_System_Diagnostics_Debug", - "Win32_System_Memory", - "Win32_System_WindowsProgramming", -] -version = "0.48.0" - -[target.'cfg(target_os = "macos")'.dependencies] -core-foundation = "0.9.3" -core-foundation-sys = "0.8.4" - -[target.'cfg(any(target_os = "freebsd", target_os = "linux"))'.dependencies] -glib = "0.18.2" -glib-sys = "0.18.1" -gio = "0.18.2" -libsecret = "0.4.0" -libsecret-sys = "0.4.0" +secrets_core = {path = "../../core/"} [build-dependencies] napi-build = "2" diff --git a/packages/secrets/src/keyring/src/lib.rs b/packages/secrets/src/keyring/src/lib.rs index 2965de8389..152d8f26d7 100644 --- a/packages/secrets/src/keyring/src/lib.rs +++ b/packages/secrets/src/keyring/src/lib.rs @@ -2,7 +2,8 @@ use napi::bindgen_prelude::AsyncTask; use napi_derive::napi; use workers::{DeletePassword, FindCredentials, FindPassword, GetPassword, SetPassword}; -mod os; +extern crate secrets_core; + mod workers; #[napi] diff --git a/packages/secrets/src/keyring/src/workers.rs b/packages/secrets/src/keyring/src/workers.rs index 88ee339d1f..12b23c0bac 100644 --- a/packages/secrets/src/keyring/src/workers.rs +++ b/packages/secrets/src/keyring/src/workers.rs @@ -1,7 +1,7 @@ use napi::{Env, Error, JsBoolean, JsUnknown, Result, Task}; use napi_derive::napi; -use crate::os; +use secrets_core::os; pub struct SetPassword { pub service: String, From 02b7885a1092d2f05ad9883cf25aa25c464d8ba9 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Tue, 31 Oct 2023 08:34:08 -0400 Subject: [PATCH 02/16] fix: temp npmignore to ignore core folder Signed-off-by: Trae Yelovich --- packages/secrets/.npmignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 packages/secrets/.npmignore diff --git a/packages/secrets/.npmignore b/packages/secrets/.npmignore new file mode 100644 index 0000000000..f35164bcb9 --- /dev/null +++ b/packages/secrets/.npmignore @@ -0,0 +1 @@ +core/ \ No newline at end of file From a56f4c616c85cdf07a629ad1bf11b8c501f77b82 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 31 Oct 2023 12:10:44 -0400 Subject: [PATCH 03/16] Fix mutable variable in Win/Mac keyring implementation Signed-off-by: Timothy Johnson --- packages/secrets/core/src/os/mac/mod.rs | 2 +- packages/secrets/core/src/os/win.rs | 52 ++++++++++++------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/secrets/core/src/os/mac/mod.rs b/packages/secrets/core/src/os/mac/mod.rs index 3ff763774c..8e4554d06e 100644 --- a/packages/secrets/core/src/os/mac/mod.rs +++ b/packages/secrets/core/src/os/mac/mod.rs @@ -35,7 +35,7 @@ impl From for KeyringError { pub fn set_password( service: &String, account: &String, - password: &mut String, + password: &String, ) -> Result { let keychain = SecKeychain::default().unwrap(); match keychain.set_password(service.as_str(), account.as_str(), password.as_bytes()) { diff --git a/packages/secrets/core/src/os/win.rs b/packages/secrets/core/src/os/win.rs index a0d2742d26..a66b03ab6f 100644 --- a/packages/secrets/core/src/os/win.rs +++ b/packages/secrets/core/src/os/win.rs @@ -22,10 +22,10 @@ impl From for KeyringError { /// /// Helper function to convert the last Win32 error into a human-readable error message. -/// -/// Returns: +/// +/// Returns: /// A `String` object containing the error message -/// +/// fn win32_error_as_string(error: WIN32_ERROR) -> String { let buffer: PWSTR = std::ptr::null_mut(); @@ -62,22 +62,22 @@ fn win32_error_as_string(error: WIN32_ERROR) -> String { /// /// Helper function to encode a string as a null-terminated UTF-16 string for use w/ credential APIs. -/// +/// /// Returns: /// - `Some(val)` if the string was successfully converted to UTF-16, or `None` otherwise. -/// +/// fn encode_utf16(str: &str) -> Vec { let mut chars: Vec = str.encode_utf16().collect(); chars.push(0); chars } -/// +/// /// Attempts to set a password for a given service and account. -/// +/// /// - `service`: The service name for the new credential /// - `account`: The account name for the new credential -/// +/// /// Returns: /// - `true` if the credential was stored successfully /// - A `KeyringError` if there were any issues interacting with the credential vault @@ -85,7 +85,7 @@ fn encode_utf16(str: &str) -> Vec { pub fn set_password( service: &String, account: &String, - password: &mut String, + password: &String, ) -> Result { // Build WinAPI strings and object parameters from arguments let target_bytes = encode_utf16(format!("{}/{}", service, account).as_str()); @@ -120,16 +120,16 @@ pub fn set_password( Ok(true) } -/// +/// /// Returns a password contained in the given service and account, if found. -/// +/// /// - `service`: The service name that matches the credential of interest /// - `account`: The account name that matches the credential of interest -/// +/// /// Returns: /// - `Some(password)` if a matching credential was found; `None` otherwise /// - A `KeyringError` if there were any issues interacting with the credential vault -/// +/// pub fn get_password(service: &String, account: &String) -> Result, KeyringError> { let mut cred: *mut CREDENTIALW = std::ptr::null_mut::(); let target_name = encode_utf16(format!("{}/{}", service, account).as_str()); @@ -173,16 +173,16 @@ pub fn get_password(service: &String, account: &String) -> Result } } -/// +/// /// Attempts to delete the password associated with a given service and account. -/// +/// /// - `service`: The service name of the credential to delete /// - `account`: The account name of the credential to delete -/// +/// /// Returns: /// - `true` if a matching credential was deleted; `false` otherwise /// - A `KeyringError` if there were any issues interacting with the credential vault -/// +/// pub fn delete_password(service: &String, account: &String) -> Result { let target_name = encode_utf16(format!("{}/{}", service, account).as_str()); @@ -204,15 +204,15 @@ pub fn delete_password(service: &String, account: &String) -> Result Result, KeyringError> { let filter = encode_utf16(format!("{}*", service).as_str()); @@ -257,16 +257,16 @@ pub fn find_password(service: &String) -> Result, KeyringError> { } } -/// +/// /// Builds a vector of all credentials matching the given service pattern. -/// +/// /// - `service`: The service pattern that matches the credential(s) of interest -/// - `credentials`: The vector consisting of (username, password) pairs for each credential that matches -/// +/// - `credentials`: The vector consisting of (username, password) pairs for each credential that matches +/// /// Returns: /// - `true` if at least 1 credential was found, `false` otherwise /// - A `KeyringError` if there were any issues interacting with the credential vault -/// +/// pub fn find_credentials( service: &String, credentials: &mut Vec<(String, String)>, From e177bfb5ef6b979c8bc4757dce8fc7d702486d20 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Wed, 1 Nov 2023 10:44:00 -0400 Subject: [PATCH 04/16] secrets: Add unit tests to rust core Signed-off-by: Trae Yelovich --- packages/secrets/core/src/lib.rs | 3 +- packages/secrets/core/src/tests.rs | 45 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 packages/secrets/core/src/tests.rs diff --git a/packages/secrets/core/src/lib.rs b/packages/secrets/core/src/lib.rs index dda20c3432..0604537006 100644 --- a/packages/secrets/core/src/lib.rs +++ b/packages/secrets/core/src/lib.rs @@ -1 +1,2 @@ -pub mod os; \ No newline at end of file +pub mod os; +mod tests; \ No newline at end of file diff --git a/packages/secrets/core/src/tests.rs b/packages/secrets/core/src/tests.rs new file mode 100644 index 0000000000..bd880a04fa --- /dev/null +++ b/packages/secrets/core/src/tests.rs @@ -0,0 +1,45 @@ +#[cfg(test)] +mod tests { + use crate::os::*; + + const CREDENTIALS: [(&str, &str); 5] = [ + ("TestASCII", "ASCII string"), + ("TestUTF8", "ᚻᛖ ᚳᚹᚫᚦ ᚦᚫᛏ ᚻᛖ ᛒᚢᛞᛖ ᚩᚾ ᚦᚫᛗ ᛚᚪᚾᛞᛖ ᚾᚩᚱᚦᚹᛖᚪᚱᛞᚢᛗ ᚹᛁᚦ ᚦᚪ ᚹᛖᛥᚫ"), + ("TestCharSet", "I 💔 ASCII"), + ("TestUTF16", "🌞🌙🌟🌴"), + ("TestCJK", "「こんにちは世界」"), + ]; + const SERVICE: &str = "TestKeyring"; + + #[test] + fn test_get_and_set() { + let service = SERVICE.to_owned(); + CREDENTIALS.iter().for_each(|cred| { + let acc = cred.0.to_string(); + let pw = cred.1.to_string(); + set_password(&service, &acc, &pw).unwrap(); + assert_eq!(get_password(&service, &acc).unwrap_or(Some("".to_owned())), Some(pw)); + }); + } + + #[test] + fn test_query() { + let service = SERVICE.to_owned(); + let mut creds: Vec<(String, String)> = vec![]; + let _res = find_credentials(&service, &mut creds); + assert_eq!(creds.len(), CREDENTIALS.len()); + for cred in creds.iter() { + assert_eq!(CREDENTIALS.contains(&(cred.0.as_ref(), cred.1.as_ref())), true); + } + } + + #[test] + fn test_remove_creds() { + let service = SERVICE.to_owned(); + CREDENTIALS.iter().for_each(|cred| { + let acc = cred.0.to_string(); + delete_password(&service, &acc).unwrap(); + assert_eq!(get_password(&service, &acc).unwrap(), None); + }); + } +} \ No newline at end of file From 38ddb1fc6076ab550ea2d18b5b32a1c6ddf958fe Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Mon, 6 Nov 2023 18:27:48 -0500 Subject: [PATCH 05/16] fix: remove npmignore for core folder Signed-off-by: Trae Yelovich --- packages/secrets/.npmignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 packages/secrets/.npmignore diff --git a/packages/secrets/.npmignore b/packages/secrets/.npmignore deleted file mode 100644 index f35164bcb9..0000000000 --- a/packages/secrets/.npmignore +++ /dev/null @@ -1 +0,0 @@ -core/ \ No newline at end of file From 29ff44a225d04faa50091512ccf354c1300997d8 Mon Sep 17 00:00:00 2001 From: anaxceron Date: Mon, 13 Nov 2023 13:30:59 -0500 Subject: [PATCH 06/16] Update README.md added info re: Zowe project structure and governance Signed-off-by: anaxceron --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 31d2a40de8..828d5fca79 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ This repository also contains the Zowe Node Client SDK. The SDK lets you leverag - [Zowe Node Client SDK](#zowe-node-client-sdk) - [Running System Tests](#running-system-tests) - [FAQs](#frequently-asked-questions) + - [Project structure and governance](#project-structure-and-governance)
@@ -202,3 +203,9 @@ npm run test:system
Don't see what you're looking for? Browse questions from the community or ask your own in the [Q&A section](https://github.com/zowe/zowe-cli/discussions/categories/q-a) of our repo. + +## **Project structure and governance** + +Zowe CLI is a component of the Zowe Open Mainframe Project, part of the Linux Foundation. + +To learn more about how Zowe is structured and governed, see the [Technical Steering Committee Strucutre and Governance documentation](https://github.com/zowe/community/blob/master/Technical-Steering-Committee/tsc-governance.md). From d775c374aeb1f34e77a97ae9cf730ad9aadb1f80 Mon Sep 17 00:00:00 2001 From: anaxceron Date: Mon, 13 Nov 2023 15:29:32 -0500 Subject: [PATCH 07/16] Update README.md Adding capitalization to Structure and Governance headers Signed-off-by: anaxceron --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 828d5fca79..1c90fe8cf6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This repository also contains the Zowe Node Client SDK. The SDK lets you leverag - [Zowe Node Client SDK](#zowe-node-client-sdk) - [Running System Tests](#running-system-tests) - [FAQs](#frequently-asked-questions) - - [Project structure and governance](#project-structure-and-governance) + - [Project Structure and Governance](#project-structure-and-governance)
@@ -204,7 +204,7 @@ npm run test:system Don't see what you're looking for? Browse questions from the community or ask your own in the [Q&A section](https://github.com/zowe/zowe-cli/discussions/categories/q-a) of our repo. -## **Project structure and governance** +## **Project Structure and Governance** Zowe CLI is a component of the Zowe Open Mainframe Project, part of the Linux Foundation. From 80eadb6a740f1690dd445eac854aa8541200ac72 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 13 Nov 2023 18:20:41 -0500 Subject: [PATCH 08/16] Deprecate AbstractCommandYargs.getBrightYargsResponse Signed-off-by: Gene Johnston --- .../src/cmd/src/yargs/AbstractCommandYargs.ts | 20 ++++++++++++++----- .../src/cmd/src/yargs/CommandYargs.ts | 6 +++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/packages/imperative/src/cmd/src/yargs/AbstractCommandYargs.ts b/packages/imperative/src/cmd/src/yargs/AbstractCommandYargs.ts index 18cf7ab4d6..9edb11cd0b 100644 --- a/packages/imperative/src/cmd/src/yargs/AbstractCommandYargs.ts +++ b/packages/imperative/src/cmd/src/yargs/AbstractCommandYargs.ts @@ -240,6 +240,16 @@ export abstract class AbstractCommandYargs { */ public abstract defineCommandToYargs(commandExecuted: YargsCommandCompleted): void; + /** + * @deprecated Use `getZoweYargsResponse` instead + */ + protected getBrightYargsResponse(successful: boolean, responseMessage: string, + action: ImperativeYargsCommandAction, + responses?: ICommandResponse[]): IYargsResponse + { + return this.getZoweYargsResponse(successful, responseMessage, action, responses); + } + /** * Build The Bright Yargs response for the callback. Includes the Bright command response and status info. * @param {boolean} successful: True if the command succeeded @@ -248,7 +258,7 @@ export abstract class AbstractCommandYargs { * @param {ICommandResponse[]} responses * @return {IYargsResponse} */ - protected getBrightYargsResponse(successful: boolean, responseMessage: string, + protected getZoweYargsResponse(successful: boolean, responseMessage: string, action: ImperativeYargsCommandAction, responses?: ICommandResponse[]): IYargsResponse { let exitCode: number; @@ -309,7 +319,7 @@ export abstract class AbstractCommandYargs { stream: ImperativeConfig.instance.daemonContext?.stream })); } catch (helpErr) { - const errorResponse: IYargsResponse = this.getBrightYargsResponse(false, + const errorResponse: IYargsResponse = this.getZoweYargsResponse(false, `The help for ${this.definition.name} was invoked and failed.`, "help invoked"); errorResponse.causeErrors = helpErr; @@ -318,7 +328,7 @@ export abstract class AbstractCommandYargs { } if (!invoked) { - commandExecuted(args, this.getBrightYargsResponse(true, + commandExecuted(args, this.getZoweYargsResponse(true, `The help for ${this.definition.name} was invoked.`, "help invoked", [response])); } @@ -423,7 +433,7 @@ export abstract class AbstractCommandYargs { }) ); } catch (helpErr) { - const errorResponse: IYargsResponse = this.getBrightYargsResponse(false, + const errorResponse: IYargsResponse = this.getZoweYargsResponse(false, `The web help for ${this.definition.name} was invoked and failed.`, "help invoked"); errorResponse.causeErrors = helpErr; @@ -432,7 +442,7 @@ export abstract class AbstractCommandYargs { } if (!invoked) { - commandExecuted(args, this.getBrightYargsResponse(true, + commandExecuted(args, this.getZoweYargsResponse(true, `The web help for ${this.definition.name} was invoked.`, "help invoked", [response])); } diff --git a/packages/imperative/src/cmd/src/yargs/CommandYargs.ts b/packages/imperative/src/cmd/src/yargs/CommandYargs.ts index 0ce2044268..fb5909a284 100644 --- a/packages/imperative/src/cmd/src/yargs/CommandYargs.ts +++ b/packages/imperative/src/cmd/src/yargs/CommandYargs.ts @@ -137,13 +137,13 @@ export class CommandYargs extends AbstractCommandYargs { */ this.invokeHandlers(handlerDefinition, 0, argsForHandler, responses) .then((successResponses) => { - commandExecuted(argsForHandler, this.getBrightYargsResponse(true, + commandExecuted(argsForHandler, this.getZoweYargsResponse(true, `${successResponses.length} command handlers invoked.`, "command handler invoked", successResponses)); }) .catch((errorResponses) => { - const response: IYargsResponse = this.getBrightYargsResponse(false, + const response: IYargsResponse = this.getZoweYargsResponse(false, `Error in command ${this.definition.name}`, "command handler invoked", errorResponses); this.log.error(`Error in command ${this.definition.name}`); @@ -155,7 +155,7 @@ export class CommandYargs extends AbstractCommandYargs { * No handlers were present - Respond with an error - this condition should not occur if the * definition was validated against the schema. */ - const response: IYargsResponse = this.getBrightYargsResponse(false, + const response: IYargsResponse = this.getZoweYargsResponse(false, `No handlers provided for ${this.definition.name}`, "command handler invoked"); commandExecuted(argsForHandler, response); From eb6224ff6062f55456e3dd881ae213d905145f24 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 13 Nov 2023 18:28:36 -0500 Subject: [PATCH 09/16] Add changelog entry Signed-off-by: Gene Johnston --- packages/imperative/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 5094bdb5a0..e41ecd8b6a 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Imperative package will be documented in this file. +## Recent Changes + +- Enhancement: Deprecated function AbstractCommandYargs.getBrightYargsResponse in favor of AbstractCommandYargs.getZoweYargsResponse + ## `5.18.4` - BugFix: Removed out of date `Perf-Timing` performance timing package. From ef02b480ff87c67ff2bf2f249e57ec25371ea5fd Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 14 Nov 2023 10:27:28 -0500 Subject: [PATCH 10/16] Add changelog for deprecating 'bright' command. Signed-off-by: Gene Johnston --- packages/imperative/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index e41ecd8b6a..a5ef4fc4f6 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to the Imperative package will be documented in this file. ## Recent Changes - Enhancement: Deprecated function AbstractCommandYargs.getBrightYargsResponse in favor of AbstractCommandYargs.getZoweYargsResponse +- Enhancement: Deprecated the 'bright' command as an alias for the 'zowe' command. The 'bright' command will be removed in Zowe V3. ## `5.18.4` From 2014fc32323980592b56a4a2953f9bd7df7bd798 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 14 Nov 2023 19:16:02 +0000 Subject: [PATCH 11/16] Bump version to 7.19.0 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 206 +++++++++--------- packages/cli/package.json | 26 +-- packages/core/package.json | 6 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 2 +- packages/provisioning/package.json | 8 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/package.json | 8 +- packages/zostso/package.json | 10 +- packages/zosuss/package.json | 6 +- 16 files changed, 163 insertions(+), 163 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 4b5569fdc3..63e6aa46e3 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "7.18.11", + "version": "7.19.0", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.18.5" + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/lerna.json b/lerna.json index eed10e27aa..564a2db19c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.18.11", + "version": "7.19.0", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 1080210895..368842a656 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -51,7 +51,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -62,7 +62,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.18.5" + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24704,21 +24704,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.18.11", + "version": "7.19.0", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", - "@zowe/provisioning-for-zowe-sdk": "7.18.11", - "@zowe/zos-console-for-zowe-sdk": "7.18.11", - "@zowe/zos-files-for-zowe-sdk": "7.18.11", - "@zowe/zos-jobs-for-zowe-sdk": "7.18.11", - "@zowe/zos-logs-for-zowe-sdk": "7.18.11", - "@zowe/zos-tso-for-zowe-sdk": "7.18.11", - "@zowe/zos-uss-for-zowe-sdk": "7.18.11", - "@zowe/zos-workflows-for-zowe-sdk": "7.18.11", - "@zowe/zosmf-for-zowe-sdk": "7.18.11", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", + "@zowe/provisioning-for-zowe-sdk": "7.19.0", + "@zowe/zos-console-for-zowe-sdk": "7.19.0", + "@zowe/zos-files-for-zowe-sdk": "7.19.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.19.0", + "@zowe/zos-logs-for-zowe-sdk": "7.19.0", + "@zowe/zos-tso-for-zowe-sdk": "7.19.0", + "@zowe/zos-uss-for-zowe-sdk": "7.19.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.19.0", + "@zowe/zosmf-for-zowe-sdk": "7.19.0", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -24733,7 +24733,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.18.11", + "@zowe/cli-test-utils": "7.19.0", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -24766,15 +24766,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "dependencies": { "comment-json": "4.1.1", "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24782,7 +24782,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "5.18.5", + "version": "5.19.0", "license": "EPL-2.0", "dependencies": { "@types/yargs": "13.0.4", @@ -25130,16 +25130,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "dependencies": { "js-yaml": "4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25161,15 +25161,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.18.11" + "@zowe/zos-files-for-zowe-sdk": "7.19.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25178,12 +25178,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25192,17 +25192,17 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "dependencies": { "get-stream": "6.0.1", "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", - "@zowe/zos-uss-for-zowe-sdk": "7.18.11" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", + "@zowe/zos-uss-for-zowe-sdk": "7.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25230,15 +25230,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.18.11" + "@zowe/zos-files-for-zowe-sdk": "7.19.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25247,12 +25247,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25261,12 +25261,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25275,15 +25275,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.18.11" + "@zowe/zosmf-for-zowe-sdk": "7.19.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25292,15 +25292,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "license": "EPL-2.0", "dependencies": { "ssh2": "1.11.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" @@ -31974,19 +31974,19 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", - "@zowe/provisioning-for-zowe-sdk": "7.18.11", + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", + "@zowe/provisioning-for-zowe-sdk": "7.19.0", "@zowe/secrets-for-zowe-sdk": "7.18.6", - "@zowe/zos-console-for-zowe-sdk": "7.18.11", - "@zowe/zos-files-for-zowe-sdk": "7.18.11", - "@zowe/zos-jobs-for-zowe-sdk": "7.18.11", - "@zowe/zos-logs-for-zowe-sdk": "7.18.11", - "@zowe/zos-tso-for-zowe-sdk": "7.18.11", - "@zowe/zos-uss-for-zowe-sdk": "7.18.11", - "@zowe/zos-workflows-for-zowe-sdk": "7.18.11", - "@zowe/zosmf-for-zowe-sdk": "7.18.11", + "@zowe/zos-console-for-zowe-sdk": "7.19.0", + "@zowe/zos-files-for-zowe-sdk": "7.19.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.19.0", + "@zowe/zos-logs-for-zowe-sdk": "7.19.0", + "@zowe/zos-tso-for-zowe-sdk": "7.19.0", + "@zowe/zos-uss-for-zowe-sdk": "7.19.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.19.0", + "@zowe/zosmf-for-zowe-sdk": "7.19.0", "comment-json": "^4.1.1", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -32020,7 +32020,7 @@ "requires": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.18.5", + "@zowe/imperative": "5.19.0", "find-up": "^5.0.0", "js-yaml": "^4.0.0", "rimraf": "^3.0.2", @@ -32040,8 +32040,8 @@ "@zowe/core-for-zowe-sdk": { "version": "file:packages/core", "requires": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/imperative": "5.18.5", + "@zowe/cli-test-utils": "7.19.0", + "@zowe/imperative": "5.19.0", "comment-json": "4.1.1", "string-width": "4.2.3" } @@ -32300,9 +32300,9 @@ "version": "file:packages/provisioning", "requires": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", "js-yaml": "4.1.0" } }, @@ -32316,18 +32316,18 @@ "@zowe/zos-console-for-zowe-sdk": { "version": "file:packages/zosconsole", "requires": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" } }, "@zowe/zos-files-for-zowe-sdk": { "version": "file:packages/zosfiles", "requires": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", - "@zowe/zos-uss-for-zowe-sdk": "7.18.11", + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", + "@zowe/zos-uss-for-zowe-sdk": "7.19.0", "get-stream": "6.0.1", "minimatch": "5.0.1" }, @@ -32353,53 +32353,53 @@ "@zowe/zos-jobs-for-zowe-sdk": { "version": "file:packages/zosjobs", "requires": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", - "@zowe/zos-files-for-zowe-sdk": "7.18.11" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", + "@zowe/zos-files-for-zowe-sdk": "7.19.0" } }, "@zowe/zos-logs-for-zowe-sdk": { "version": "file:packages/zoslogs", "requires": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" } }, "@zowe/zos-tso-for-zowe-sdk": { "version": "file:packages/zostso", "requires": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", - "@zowe/zosmf-for-zowe-sdk": "7.18.11" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", + "@zowe/zosmf-for-zowe-sdk": "7.19.0" } }, "@zowe/zos-uss-for-zowe-sdk": { "version": "file:packages/zosuss", "requires": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.18.11", - "@zowe/imperative": "5.18.5", + "@zowe/cli-test-utils": "7.19.0", + "@zowe/imperative": "5.19.0", "ssh2": "1.11.0" } }, "@zowe/zos-workflows-for-zowe-sdk": { "version": "file:packages/workflows", "requires": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", - "@zowe/zos-files-for-zowe-sdk": "7.18.11" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", + "@zowe/zos-files-for-zowe-sdk": "7.19.0" } }, "@zowe/zosmf-for-zowe-sdk": { "version": "file:packages/zosmf", "requires": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" } }, "abbrev": { diff --git a/packages/cli/package.json b/packages/cli/package.json index e247fdba23..b3d70ae14c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.", "author": "Zowe", "license": "EPL-2.0", @@ -57,17 +57,17 @@ "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", - "@zowe/provisioning-for-zowe-sdk": "7.18.11", - "@zowe/zos-console-for-zowe-sdk": "7.18.11", - "@zowe/zos-files-for-zowe-sdk": "7.18.11", - "@zowe/zos-jobs-for-zowe-sdk": "7.18.11", - "@zowe/zos-logs-for-zowe-sdk": "7.18.11", - "@zowe/zos-tso-for-zowe-sdk": "7.18.11", - "@zowe/zos-uss-for-zowe-sdk": "7.18.11", - "@zowe/zos-workflows-for-zowe-sdk": "7.18.11", - "@zowe/zosmf-for-zowe-sdk": "7.18.11", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", + "@zowe/provisioning-for-zowe-sdk": "7.19.0", + "@zowe/zos-console-for-zowe-sdk": "7.19.0", + "@zowe/zos-files-for-zowe-sdk": "7.19.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.19.0", + "@zowe/zos-logs-for-zowe-sdk": "7.19.0", + "@zowe/zos-tso-for-zowe-sdk": "7.19.0", + "@zowe/zos-uss-for-zowe-sdk": "7.19.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.19.0", + "@zowe/zosmf-for-zowe-sdk": "7.19.0", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -78,7 +78,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.18.11", + "@zowe/cli-test-utils": "7.19.0", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" diff --git a/packages/core/package.json b/packages/core/package.json index bebb2061d7..6c8c9c5b58 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index a5ef4fc4f6..7dbc271cb1 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Imperative package will be documented in this file. -## Recent Changes +## `5.19.0` - Enhancement: Deprecated function AbstractCommandYargs.getBrightYargsResponse in favor of AbstractCommandYargs.getZoweYargsResponse - Enhancement: Deprecated the 'bright' command as an alias for the 'zowe' command. The 'bright' command will be removed in Zowe V3. diff --git a/packages/imperative/package.json b/packages/imperative/package.json index 461254e26d..fa237bd701 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "5.18.5", + "version": "5.19.0", "description": "framework for building configurable CLIs", "author": "Zowe", "license": "EPL-2.0", diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json index daed622045..488d9569ad 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index eab903b1f5..142d335dab 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe SDK to interact with the z/OS workflows APIs", "author": "Zowe", "license": "EPL-2.0", @@ -45,12 +45,12 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.18.11" + "@zowe/zos-files-for-zowe-sdk": "7.19.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index cf5ea2a22b..883c8330c7 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 7a8526bd5c..f43d0b82ad 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -50,10 +50,10 @@ "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5", - "@zowe/zos-uss-for-zowe-sdk": "7.18.11" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0", + "@zowe/zos-uss-for-zowe-sdk": "7.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index b0c77e264d..45bad21ee4 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe SDK to interact with jobs on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -46,12 +46,12 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.18.11" + "@zowe/zos-files-for-zowe-sdk": "7.19.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index f77f3aae53..ad7a24ef2d 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 4e4f92054f..d95113e273 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 467189020e..844a90d049 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe SDK to interact with TSO on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -45,12 +45,12 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.18.11" + "@zowe/zosmf-for-zowe-sdk": "7.19.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.18.11", - "@zowe/core-for-zowe-sdk": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index 06dd8ab920..5aab8bb993 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.18.11", + "version": "7.19.0", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.18.11", - "@zowe/imperative": "5.18.5" + "@zowe/cli-test-utils": "7.19.0", + "@zowe/imperative": "5.19.0" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" From 709b358adfa212e61cd7fdb62f25efe23337fd59 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Wed, 15 Nov 2023 14:45:36 +0000 Subject: [PATCH 12/16] Update flagged code since prefix should never be null Signed-off-by: Andrew W. Harn --- packages/cli/src/zosjobs/delete/old-jobs/OldJobs.handler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/zosjobs/delete/old-jobs/OldJobs.handler.ts b/packages/cli/src/zosjobs/delete/old-jobs/OldJobs.handler.ts index 5bbd6c7c55..066db5f477 100644 --- a/packages/cli/src/zosjobs/delete/old-jobs/OldJobs.handler.ts +++ b/packages/cli/src/zosjobs/delete/old-jobs/OldJobs.handler.ts @@ -45,7 +45,7 @@ export default class OldJobsHandler extends ZosmfBaseHandler { // Handle no jobs if (jobs.length === 0) { let notFoundMessage: string = "No jobs found"; - if (prefix != null && prefix.length > 0) { + if (prefix.length > 0) { notFoundMessage += ` with prefix ${prefix}`; } this.console.log(notFoundMessage); From 224b3e6084c365f7f060c06539e6bb6ba24fc2b5 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 17 Nov 2023 16:21:52 +0000 Subject: [PATCH 13/16] Unpin SDK dependency versions, retain CLI pins Signed-off-by: Andrew W. Harn --- npm-shrinkwrap.json | 176 ++++++++++++++--------------- packages/core/package.json | 4 +- packages/imperative/package.json | 70 ++++++------ packages/provisioning/package.json | 2 +- packages/workflows/package.json | 2 +- packages/zosfiles/package.json | 4 +- packages/zosjobs/package.json | 2 +- packages/zostso/package.json | 2 +- packages/zosuss/package.json | 2 +- 9 files changed, 132 insertions(+), 132 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 368842a656..8e0642c9f5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -24769,8 +24769,8 @@ "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "comment-json": "4.1.1", - "string-width": "4.2.3" + "comment-json": "^4.1.1", + "string-width": "^4.2.3" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", @@ -24785,42 +24785,42 @@ "version": "5.19.0", "license": "EPL-2.0", "dependencies": { - "@types/yargs": "13.0.4", - "chalk": "2.4.2", - "cli-table3": "0.6.2", - "comment-json": "4.1.1", - "cross-spawn": "7.0.3", - "dataobject-parser": "1.2.1", - "deepmerge": "4.2.2", - "diff": "5.1.0", + "@types/yargs": "^13.0.4", + "chalk": "^2.4.2", + "cli-table3": "^0.6.2", + "comment-json": "^4.1.1", + "cross-spawn": "^7.0.3", + "dataobject-parser": "^1.2.1", + "deepmerge": "^4.2.2", + "diff": "^5.1.0", "diff2html": "3.4.20-usewontache.1.60e7a2e", - "fast-glob": "3.2.7", - "fastest-levenshtein": "1.0.12", - "find-up": "4.1.0", - "fs-extra": "8.1.0", - "jest-diff": "27.0.6", - "js-yaml": "4.1.0", - "jsonfile": "4.0.0", - "jsonschema": "1.1.1", - "lodash": "4.17.21", - "lodash-deep": "2.0.0", - "log4js": "6.4.6", - "markdown-it": "12.3.2", - "mustache": "2.3.0", - "npm-package-arg": "9.1.0", - "opener": "1.5.2", - "pacote": "11.1.4", - "prettyjson": "1.2.2", - "progress": "2.0.3", - "read": "1.0.7", - "readline-sync": "1.4.10", - "semver": "7.5.2", - "stack-trace": "0.0.10", - "strip-ansi": "6.0.1", - "which": "3.0.0", - "wrap-ansi": "7.0.0", - "yamljs": "0.3.0", - "yargs": "15.3.1" + "fast-glob": "^3.2.7", + "fastest-levenshtein": "^1.0.12", + "find-up": "^4.1.0", + "fs-extra": "^8.1.0", + "jest-diff": "^27.0.6", + "js-yaml": "^4.1.0", + "jsonfile": "^4.0.0", + "jsonschema": "^1.1.1", + "lodash": "^4.17.21", + "lodash-deep": "^2.0.0", + "log4js": "^6.4.6", + "markdown-it": "^12.3.2", + "mustache": "^2.3.0", + "npm-package-arg": "^9.1.0", + "opener": "^1.5.2", + "pacote": "^11.1.4", + "prettyjson": "^1.2.2", + "progress": "^2.0.3", + "read": "^1.0.7", + "readline-sync": "^1.4.10", + "semver": "^7.5.2", + "stack-trace": "^0.0.10", + "strip-ansi": "^6.0.1", + "which": "^3.0.0", + "wrap-ansi": "^7.0.0", + "yamljs": "^0.3.0", + "yargs": "^15.3.1" }, "devDependencies": { "@types/cross-spawn": "^6.0.2", @@ -25133,7 +25133,7 @@ "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "js-yaml": "4.1.0" + "js-yaml": "^4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", @@ -25164,7 +25164,7 @@ "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "^7.19.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", @@ -25195,8 +25195,8 @@ "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "get-stream": "6.0.1", - "minimatch": "5.0.1" + "get-stream": "^6.0.1", + "minimatch": "^5.0.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", @@ -25233,7 +25233,7 @@ "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "^7.19.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", @@ -25278,7 +25278,7 @@ "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.19.0" + "@zowe/zosmf-for-zowe-sdk": "^7.19.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", @@ -25295,7 +25295,7 @@ "version": "7.19.0", "license": "EPL-2.0", "dependencies": { - "ssh2": "1.11.0" + "ssh2": "^1.11.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", @@ -32042,8 +32042,8 @@ "requires": { "@zowe/cli-test-utils": "7.19.0", "@zowe/imperative": "5.19.0", - "comment-json": "4.1.1", - "string-width": "4.2.3" + "comment-json": "^4.1.1", + "string-width": "^4.2.3" } }, "@zowe/imperative": { @@ -32064,52 +32064,52 @@ "@types/readline-sync": "^1.4.3", "@types/rimraf": "^3.0.2", "@types/stack-trace": "^0.0.29", - "@types/yargs": "13.0.4", + "@types/yargs": "^13.0.4", "@zowe/secrets-for-zowe-sdk": "^7.18.0", - "chalk": "2.4.2", - "cli-table3": "0.6.2", - "comment-json": "4.1.1", + "chalk": "^2.4.2", + "cli-table3": "^0.6.2", + "comment-json": "^4.1.1", "concurrently": "^7.5.0", "cowsay": "^1.2.1", - "cross-spawn": "7.0.3", - "dataobject-parser": "1.2.1", + "cross-spawn": "^7.0.3", + "dataobject-parser": "^1.2.1", "deep-diff": "^0.3.8", - "deepmerge": "4.2.2", - "diff": "5.1.0", + "deepmerge": "^4.2.2", + "diff": "^5.1.0", "diff2html": "3.4.20-usewontache.1.60e7a2e", - "fast-glob": "3.2.7", - "fastest-levenshtein": "1.0.12", - "find-up": "4.1.0", - "fs-extra": "8.1.0", + "fast-glob": "^3.2.7", + "fastest-levenshtein": "^1.0.12", + "find-up": "^4.1.0", + "fs-extra": "^8.1.0", "get-function-arguments": "^1.0.0", - "jest-diff": "27.0.6", - "js-yaml": "4.1.0", - "jsonfile": "4.0.0", - "jsonschema": "1.1.1", - "lodash": "4.17.21", - "lodash-deep": "2.0.0", - "log4js": "6.4.6", - "markdown-it": "12.3.2", - "mustache": "2.3.0", - "npm-package-arg": "9.1.0", - "opener": "1.5.2", - "pacote": "11.1.4", - "prettyjson": "1.2.2", - "progress": "2.0.3", - "read": "1.0.7", - "readline-sync": "1.4.10", - "semver": "7.5.2", + "jest-diff": "^27.0.6", + "js-yaml": "^4.1.0", + "jsonfile": "^4.0.0", + "jsonschema": "^1.1.1", + "lodash": "^4.17.21", + "lodash-deep": "^2.0.0", + "log4js": "^6.4.6", + "markdown-it": "^12.3.2", + "mustache": "^2.3.0", + "npm-package-arg": "^9.1.0", + "opener": "^1.5.2", + "pacote": "^11.1.4", + "prettyjson": "^1.2.2", + "progress": "^2.0.3", + "read": "^1.0.7", + "readline-sync": "^1.4.10", + "semver": "^7.5.2", "serve": "^12.0.1", - "stack-trace": "0.0.10", + "stack-trace": "^0.0.10", "stream-to-string": "^1.2.0", - "strip-ansi": "6.0.1", + "strip-ansi": "^6.0.1", "tsc-watch": "^5.0.3", "uuid": "^3.3.2", "web-help": "file:web-help", - "which": "3.0.0", - "wrap-ansi": "7.0.0", - "yamljs": "0.3.0", - "yargs": "15.3.1", + "which": "^3.0.0", + "wrap-ansi": "^7.0.0", + "yamljs": "^0.3.0", + "yargs": "^15.3.1", "yargs-parser": "^18.1.2" }, "dependencies": { @@ -32303,7 +32303,7 @@ "@zowe/cli-test-utils": "7.19.0", "@zowe/core-for-zowe-sdk": "7.19.0", "@zowe/imperative": "5.19.0", - "js-yaml": "4.1.0" + "js-yaml": "^4.1.0" } }, "@zowe/secrets-for-zowe-sdk": { @@ -32328,8 +32328,8 @@ "@zowe/core-for-zowe-sdk": "7.19.0", "@zowe/imperative": "5.19.0", "@zowe/zos-uss-for-zowe-sdk": "7.19.0", - "get-stream": "6.0.1", - "minimatch": "5.0.1" + "get-stream": "^6.0.1", + "minimatch": "^5.0.1" }, "dependencies": { "brace-expansion": { @@ -32356,7 +32356,7 @@ "@zowe/cli-test-utils": "7.19.0", "@zowe/core-for-zowe-sdk": "7.19.0", "@zowe/imperative": "5.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "^7.19.0" } }, "@zowe/zos-logs-for-zowe-sdk": { @@ -32373,7 +32373,7 @@ "@zowe/cli-test-utils": "7.19.0", "@zowe/core-for-zowe-sdk": "7.19.0", "@zowe/imperative": "5.19.0", - "@zowe/zosmf-for-zowe-sdk": "7.19.0" + "@zowe/zosmf-for-zowe-sdk": "^7.19.0" } }, "@zowe/zos-uss-for-zowe-sdk": { @@ -32382,7 +32382,7 @@ "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.19.0", "@zowe/imperative": "5.19.0", - "ssh2": "1.11.0" + "ssh2": "^1.11.0" } }, "@zowe/zos-workflows-for-zowe-sdk": { @@ -32391,7 +32391,7 @@ "@zowe/cli-test-utils": "7.19.0", "@zowe/core-for-zowe-sdk": "7.19.0", "@zowe/imperative": "5.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "^7.19.0" } }, "@zowe/zosmf-for-zowe-sdk": { diff --git a/packages/core/package.json b/packages/core/package.json index 6c8c9c5b58..4c06378045 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -45,8 +45,8 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "comment-json": "4.1.1", - "string-width": "4.2.3" + "comment-json": "^4.1.1", + "string-width": "^4.2.3" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", diff --git a/packages/imperative/package.json b/packages/imperative/package.json index fa237bd701..06cf53dc66 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -43,42 +43,42 @@ "clean": "rimraf lib tsconfig.tsbuildinfo" }, "dependencies": { - "@types/yargs": "13.0.4", - "chalk": "2.4.2", - "cli-table3": "0.6.2", - "comment-json": "4.1.1", - "cross-spawn": "7.0.3", - "dataobject-parser": "1.2.1", - "deepmerge": "4.2.2", - "diff": "5.1.0", + "@types/yargs": "^13.0.4", + "chalk": "^2.4.2", + "cli-table3": "^0.6.2", + "comment-json": "^4.1.1", + "cross-spawn": "^7.0.3", + "dataobject-parser": "^1.2.1", + "deepmerge": "^4.2.2", + "diff": "^5.1.0", "diff2html": "3.4.20-usewontache.1.60e7a2e", - "fast-glob": "3.2.7", - "fastest-levenshtein": "1.0.12", - "find-up": "4.1.0", - "fs-extra": "8.1.0", - "jest-diff": "27.0.6", - "js-yaml": "4.1.0", - "jsonfile": "4.0.0", - "jsonschema": "1.1.1", - "lodash": "4.17.21", - "lodash-deep": "2.0.0", - "log4js": "6.4.6", - "markdown-it": "12.3.2", - "mustache": "2.3.0", - "npm-package-arg": "9.1.0", - "opener": "1.5.2", - "pacote": "11.1.4", - "prettyjson": "1.2.2", - "progress": "2.0.3", - "read": "1.0.7", - "readline-sync": "1.4.10", - "semver": "7.5.2", - "stack-trace": "0.0.10", - "strip-ansi": "6.0.1", - "which": "3.0.0", - "wrap-ansi": "7.0.0", - "yamljs": "0.3.0", - "yargs": "15.3.1" + "fast-glob": "^3.2.7", + "fastest-levenshtein": "^1.0.12", + "find-up": "^4.1.0", + "fs-extra": "^8.1.0", + "jest-diff": "^27.0.6", + "js-yaml": "^4.1.0", + "jsonfile": "^4.0.0", + "jsonschema": "^1.1.1", + "lodash": "^4.17.21", + "lodash-deep": "^2.0.0", + "log4js": "^6.4.6", + "markdown-it": "^12.3.2", + "mustache": "^2.3.0", + "npm-package-arg": "^9.1.0", + "opener": "^1.5.2", + "pacote": "^11.1.4", + "prettyjson": "^1.2.2", + "progress": "^2.0.3", + "read": "^1.0.7", + "readline-sync": "^1.4.10", + "semver": "^7.5.2", + "stack-trace": "^0.0.10", + "strip-ansi": "^6.0.1", + "which": "^3.0.0", + "wrap-ansi": "^7.0.0", + "yamljs": "^0.3.0", + "yargs": "^15.3.1" }, "devDependencies": { "@types/cross-spawn": "^6.0.2", diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json index 488d9569ad..de3a82a6e5 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -45,7 +45,7 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "js-yaml": "4.1.0" + "js-yaml": "^4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 142d335dab..3ad69fa8c3 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -45,7 +45,7 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "^7.19.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index f43d0b82ad..5608209884 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -46,8 +46,8 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "get-stream": "6.0.1", - "minimatch": "5.0.1" + "get-stream": "^6.0.1", + "minimatch": "^5.0.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 45bad21ee4..4374616c74 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -46,7 +46,7 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "^7.19.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 844a90d049..0b80145625 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -45,7 +45,7 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.19.0" + "@zowe/zosmf-for-zowe-sdk": "^7.19.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index 5aab8bb993..cac92452c1 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -45,7 +45,7 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "ssh2": "1.11.0" + "ssh2": "^1.11.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", From 992d5f31e7c3ab0de46c6b6e6850f2e7fba2baff Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 28 Nov 2023 14:43:10 +0000 Subject: [PATCH 14/16] Update changelogs Signed-off-by: Andrew W. Harn --- packages/core/CHANGELOG.md | 4 ++++ packages/imperative/CHANGELOG.md | 4 ++++ packages/provisioning/CHANGELOG.md | 4 ++++ packages/zosfiles/CHANGELOG.md | 4 ++++ packages/zosuss/CHANGELOG.md | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 2a983d7dce..de42f17a19 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe core SDK package will be documented in this file. +## Recent Changes + +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies + ## `8.0.0-next.202311132045` - Breaking: First major version bump for V3 diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index f5739226b5..7541462058 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Imperative package will be documented in this file. +## Recent Changes + +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies + ## `8.0.0-next.202311141903` - LTS Breaking: Removed the following previously deprecated items: diff --git a/packages/provisioning/CHANGELOG.md b/packages/provisioning/CHANGELOG.md index 2cb8635343..11ec50761e 100644 --- a/packages/provisioning/CHANGELOG.md +++ b/packages/provisioning/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe provisioning SDK package will be documented in this file. +## Recent Changes + +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies + ## `8.0.0-next.202311132045` - Breaking: First major version bump for V3 diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index 068b25d4c0..9fe2468a18 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe z/OS files SDK package will be documented in this file. +## Recent Changes + +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies + ## `8.0.0-next.202311132045` - Breaking: First major version bump for V3 diff --git a/packages/zosuss/CHANGELOG.md b/packages/zosuss/CHANGELOG.md index 311656a7ea..29976f615f 100644 --- a/packages/zosuss/CHANGELOG.md +++ b/packages/zosuss/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe z/OS USS SDK package will be documented in this file. +## Recent Changes + +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies + ## `8.0.0-next.202311132045` - Breaking: First major version bump for V3 From 838663caf9b358c0441678d553ac9444aead2754 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 28 Nov 2023 14:44:57 +0000 Subject: [PATCH 15/16] Update changelogs again Signed-off-by: Andrew W. Harn --- packages/core/CHANGELOG.md | 2 +- packages/imperative/CHANGELOG.md | 2 +- packages/provisioning/CHANGELOG.md | 2 +- packages/zosfiles/CHANGELOG.md | 2 +- packages/zosuss/CHANGELOG.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index de42f17a19..5ee34a1896 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe core SDK package will be documented in this file ## Recent Changes -- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies [#1968](https://github.com/zowe/zowe-cli/issues/1968) ## `8.0.0-next.202311132045` diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 7541462058..561a3648c1 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Imperative package will be documented in this file. ## Recent Changes -- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies [#1968](https://github.com/zowe/zowe-cli/issues/1968) ## `8.0.0-next.202311141903` diff --git a/packages/provisioning/CHANGELOG.md b/packages/provisioning/CHANGELOG.md index 11ec50761e..78b40ae5dd 100644 --- a/packages/provisioning/CHANGELOG.md +++ b/packages/provisioning/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe provisioning SDK package will be documented in t ## Recent Changes -- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies [#1968](https://github.com/zowe/zowe-cli/issues/1968) ## `8.0.0-next.202311132045` diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index 9fe2468a18..93fe1fe139 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe z/OS files SDK package will be documented in thi ## Recent Changes -- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies [#1968](https://github.com/zowe/zowe-cli/issues/1968) ## `8.0.0-next.202311132045` diff --git a/packages/zosuss/CHANGELOG.md b/packages/zosuss/CHANGELOG.md index 29976f615f..104e6abced 100644 --- a/packages/zosuss/CHANGELOG.md +++ b/packages/zosuss/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe z/OS USS SDK package will be documented in this ## Recent Changes -- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies +- Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies [#1968](https://github.com/zowe/zowe-cli/issues/1968) ## `8.0.0-next.202311132045` From be20e28211f0813e1e6abe39dd8d22acdf83e67e Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 28 Nov 2023 18:06:40 +0000 Subject: [PATCH 16/16] Fix typo in Readme Signed-off-by: Andrew W. Harn --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c90fe8cf6..32abd3e9dc 100644 --- a/README.md +++ b/README.md @@ -208,4 +208,4 @@ Don't see what you're looking for? Browse questions from the community or ask yo Zowe CLI is a component of the Zowe Open Mainframe Project, part of the Linux Foundation. -To learn more about how Zowe is structured and governed, see the [Technical Steering Committee Strucutre and Governance documentation](https://github.com/zowe/community/blob/master/Technical-Steering-Committee/tsc-governance.md). +To learn more about how Zowe is structured and governed, see the [Technical Steering Committee Structure and Governance documentation](https://github.com/zowe/community/blob/master/Technical-Steering-Committee/tsc-governance.md).