May 2021 - Arch-excludes - Fedora Mailing-Lists

Architecture specific change in rpms/arm-none-eabi-binutils-cs.git

by githook-noreply＠fedoraproject.org

The package rpms/arm-none-eabi-binutils-cs.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/arm-none-eabi-binutils-cs.git/com.... Change: +%ifnarch s390x Thanks. Full change: ============ commit 9094c53220fc3d6e2a43c088a5ab90ab86ce71ac Author: Michal Hlavinka <mhlavink(a)redhat.com> Date: Tue May 4 23:22:59 2021 +0200 updated to 2.36.1 diff --git a/.gitignore b/.gitignore index 8d35598..9e5b4cd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /binutils-2.30.tar.xz /binutils-2.32.tar.xz /binutils-2.35.tar.xz +/binutils-2.36.tar.xz +/binutils-2.36.1.tar.xz diff --git a/arm-none-eabi-binutils-cs.spec b/arm-none-eabi-binutils-cs.spec index ddc8580..2a8fc5b 100644 --- a/arm-none-eabi-binutils-cs.spec +++ b/arm-none-eabi-binutils-cs.spec @@ -3,7 +3,7 @@ Name: %{target}-binutils-cs Epoch: 1 -Version: 2.35 +Version: 2.36.1 Release: 1%{?dist} Summary: GNU Binutils for cross-compilation for %{target} target # Most of the sources are licensed under GPLv3+ with these exceptions: @@ -19,8 +19,10 @@ Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{version}.tar.xz Source1: README.fedora Patch7: binutils-2.24-dirtravel.patch Patch8: binutils-config.patch -BuildRequires: gcc flex bison ppl-devel cloog autoconf +BuildRequires: gcc flex bison ppl-devel cloog +BuildRequires: autoconf = 2.69 BuildRequires: texinfo texinfo-tex perl-podlators +BuildRequires: make Provides: %{target}-binutils = %{version} %description @@ -77,14 +79,18 @@ popd make %{?_smp_mflags} %check -make check +%ifnarch s390x +make check +%endif +echo "completed" %install -make install DESTDIR=%{buildroot} +make install DESTDIR=$RPM_BUILD_ROOT # these are for win targets only -rm %{buildroot}%{_mandir}/man1/%{target}-{dlltool,windres}.1 +rm $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-{dlltool,windres}.1 # we don't want these as we are a cross version -rm -r %{buildroot}%{_infodir} +rm -r $RPM_BUILD_ROOT%{_infodir} +rm $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libdir}/bfd-plugins/libdep* ||: %files @@ -96,6 +102,21 @@ rm -r %{buildroot}%{_infodir} %changelog +* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36.1-1 +- updated to 2.36.1 + +* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36-1 +- updated to 2.36 + +* Mon May 03 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-4 +- bump release for rebuild + +* Mon Apr 12 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-3 +- add explicit requirement for autoconf 2.69 + +* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Nov 04 2020 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-1 - updated to 2.35 diff --git a/sources b/sources index e0a77b1..959daa6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (binutils-2.35.tar.xz) = 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786 +SHA512 (binutils-2.36.1.tar.xz) = cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9

2 years, 11 months

1
0
0 / 0

Architecture specific change in rpms/ocaml-bisect-ppx.git

by githook-noreply＠fedoraproject.org

The package rpms/ocaml-bisect-ppx.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ocaml-bisect-ppx.git/commit/?id=6.... Change: -%ifarch %{ocaml_native_compiler} Thanks. Full change: ============ commit 6926e9067de9d466a803a6d2bae770487c197124 Author: Jerry James <loganjerry(a)gmail.com> Date: Tue May 4 15:26:07 2021 -0600 Version 2.6.1. diff --git a/ocaml-bisect-ppx.spec b/ocaml-bisect-ppx.spec index b5df7b3..f522a9a 100644 --- a/ocaml-bisect-ppx.spec +++ b/ocaml-bisect-ppx.spec @@ -15,7 +15,7 @@ %bcond_with odoc Name: ocaml-%{srcname} -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: Code coverage for OCaml and Reason @@ -95,11 +95,6 @@ rm -fr %{buildroot}%{_prefix}/doc # We do not want the ml files find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete -%ifarch %{ocaml_native_compiler} -# Add missing executable bits -find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod 0755 {} \+ -%endif - %if %{with tests} %check dune runtest -p bisect_ppx --force --no-buffer -j 1 @@ -164,6 +159,9 @@ dune runtest -p bisect_ppx --force --no-buffer -j 1 %endif %changelog +* Tue May 4 2021 Jerry James <loganjerry(a)gmail.com> - 2.6.1-1 +- Version 2.6.1 + * Sat Feb 20 2021 Jerry James <loganjerry(a)gmail.com> - 2.6.0-1 - Version 2.6.0 diff --git a/sources b/sources index d758581..09c423d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bisect_ppx-2.6.0.tar.gz) = 39b82d4c806b59956b1eb8ba8d15ced8fd7ac47db226f4e41aa4a9540fc7a00fc0c3f3ebe1c1283fcbe22715b8f4a8acaf54025cfa6d7b817b7ccc84cb6281a9 +SHA512 (bisect_ppx-2.6.1.tar.gz) = 090556a996e829434c9bd080ff782ce2713188cef5d0f4ad7b462ab0e78411e561a9a42cf3f2b6fbf65af494dc9ca9f89c861f70057070a7476d5b9334b009e5

2 years, 11 months

1
0
0 / 0

Architecture specific change in rpms/avr-binutils.git

by githook-noreply＠fedoraproject.org

The package rpms/avr-binutils.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/avr-binutils.git/commit/?id=17a94.... Change: +%ifnarch s390x Thanks. Full change: ============ commit 17a94a10b8bd06a363bc6f077e4ee9a6b0fd4e15 Author: Michal Hlavinka <mhlavink(a)redhat.com> Date: Tue May 4 23:31:21 2021 +0200 updated to 2.36.1 diff --git a/.gitignore b/.gitignore index 0a5783f..8c8d123 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ binutils-2.20.tar.bz2 /binutils-2.30.tar.xz /binutils-2.32.tar.xz /binutils-2.35.tar.xz +/binutils-2.36.tar.xz +/binutils-2.36.1.tar.xz diff --git a/avr-binutils.spec b/avr-binutils.spec index 404106e..1ddb548 100644 --- a/avr-binutils.spec +++ b/avr-binutils.spec @@ -1,8 +1,8 @@ %define target avr Name: %{target}-binutils -Version: 2.35 -Release: 3%{?dist} +Version: 2.36.1 +Release: 1%{?dist} Epoch: 1 Summary: Cross Compiling GNU binutils targeted at %{target} License: GPLv2+ @@ -15,7 +15,8 @@ Patch2: avr-binutils-config.patch BuildRequires: gawk texinfo gcc #for autoreconf: -BuildRequires: gettext-devel autoconf automake +BuildRequires: gettext-devel automake +BuildRequires: autoconf = 2.69 BuildRequires: make Provides: bundled(libiberty) @@ -57,7 +58,10 @@ popd %check cd build +%ifnarch s390x make check +%endif +echo "completed" %install rm -rf $RPM_BUILD_ROOT @@ -68,9 +72,7 @@ popd rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-{dlltool,windres}.1 # we don't want these as we are a cross version rm -r $RPM_BUILD_ROOT%{_infodir} -rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||: - - +rm $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libdir}/bfd-plugins/libdep* ||: %files %license binutils-%{version}/COPYING binutils-%{version}/COPYING.LIB @@ -81,6 +83,18 @@ rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||: %changelog +* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36.1-1 +- updated to 2.36.1 + +* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36-1 +- updated to 2.36 + +* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-5 +- bump release for rebuild + +* Sun Apr 11 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-4 +- add explicit requirement for autoconf 2.69 + * Tue Feb 02 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-3 - fix --format=avr option (#1907907) @@ -88,7 +102,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a ||: - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Mon Nov 09 2020 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-1 -- updated to 2.3 +- updated to 2.35 * Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.32-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index e0a77b1..959daa6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (binutils-2.35.tar.xz) = 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786 +SHA512 (binutils-2.36.1.tar.xz) = cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9

2 years, 11 months

1
0
0 / 0

Architecture specific change in rpms/arm-none-eabi-binutils-cs.git

by githook-noreply＠fedoraproject.org

The package rpms/arm-none-eabi-binutils-cs.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/arm-none-eabi-binutils-cs.git/com.... Change: +%ifnarch s390x Thanks. Full change: ============ commit 257b61b63c23bf20f800201c7e6f594736418756 Author: Michal Hlavinka <mhlavink(a)redhat.com> Date: Tue May 4 23:22:43 2021 +0200 updated to 2.36.1 diff --git a/.gitignore b/.gitignore index 8d35598..9e5b4cd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /binutils-2.30.tar.xz /binutils-2.32.tar.xz /binutils-2.35.tar.xz +/binutils-2.36.tar.xz +/binutils-2.36.1.tar.xz diff --git a/arm-none-eabi-binutils-cs.spec b/arm-none-eabi-binutils-cs.spec index 0fa8fce..2a8fc5b 100644 --- a/arm-none-eabi-binutils-cs.spec +++ b/arm-none-eabi-binutils-cs.spec @@ -3,8 +3,8 @@ Name: %{target}-binutils-cs Epoch: 1 -Version: 2.35 -Release: 2%{?dist} +Version: 2.36.1 +Release: 1%{?dist} Summary: GNU Binutils for cross-compilation for %{target} target # Most of the sources are licensed under GPLv3+ with these exceptions: # LGPLv2+ bfd/hosts/x86-64linux.h, include/demangle.h, include/xregex2.h, @@ -19,9 +19,10 @@ Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{version}.tar.xz Source1: README.fedora Patch7: binutils-2.24-dirtravel.patch Patch8: binutils-config.patch -BuildRequires: gcc flex bison ppl-devel cloog autoconf +BuildRequires: gcc flex bison ppl-devel cloog +BuildRequires: autoconf = 2.69 BuildRequires: texinfo texinfo-tex perl-podlators -BuildRequires: make +BuildRequires: make Provides: %{target}-binutils = %{version} %description @@ -78,14 +79,18 @@ popd make %{?_smp_mflags} %check -make check +%ifnarch s390x +make check +%endif +echo "completed" %install -make install DESTDIR=%{buildroot} +make install DESTDIR=$RPM_BUILD_ROOT # these are for win targets only -rm %{buildroot}%{_mandir}/man1/%{target}-{dlltool,windres}.1 +rm $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-{dlltool,windres}.1 # we don't want these as we are a cross version -rm -r %{buildroot}%{_infodir} +rm -r $RPM_BUILD_ROOT%{_infodir} +rm $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libdir}/bfd-plugins/libdep* ||: %files @@ -97,6 +102,18 @@ rm -r %{buildroot}%{_infodir} %changelog +* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36.1-1 +- updated to 2.36.1 + +* Tue May 04 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.36-1 +- updated to 2.36 + +* Mon May 03 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-4 +- bump release for rebuild + +* Mon Apr 12 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.35-3 +- add explicit requirement for autoconf 2.69 + * Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.35-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index e0a77b1..959daa6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (binutils-2.35.tar.xz) = 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786 +SHA512 (binutils-2.36.1.tar.xz) = cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9

2 years, 11 months

1
0
0 / 0

Architecture specific change in rpms/rust-vmm-sys-util.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-vmm-sys-util.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-vmm-sys-util.git/commit/?id=... https://src.fedoraproject.org/cgit/rpms/rust-vmm-sys-util.git/commit/?id=.... Change: +ExclusiveArch: x86_64 aarch64 ppc64le +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit ea4331f01aed3715ce86a42180e9e391960e4aaa Author: Sergio Lopez <slp(a)redhat.com> Date: Mon May 3 16:10:36 2021 +0200 Exclude unsupported arches diff --git a/rust-vmm-sys-util.spec b/rust-vmm-sys-util.spec index 4476c28..a249d4f 100644 --- a/rust-vmm-sys-util.spec +++ b/rust-vmm-sys-util.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helpers and utilities used by multiple rust-vmm components and VMMs # Upstream license specification: Apache-2.0 AND BSD-3-Clause @@ -19,7 +19,7 @@ Patch0: vmm-sys-util-fix-metadata.diff # Omit tests that require access to "/dev/kvm" Patch1: vmm-sys-util-omit-ioctl-tests.diff -ExclusiveArch: %{rust_arches} +ExclusiveArch: x86_64 aarch64 ppc64le %if %{__cargo_skip_build} BuildArch: noarch %endif @@ -112,5 +112,8 @@ which use "with-serde" feature of "%{crate}" crate. %endif %changelog +* Mon May 03 2021 Sergio Lopez <slp(a)redhat.com> - 0.8.0-2 +- Exclude unsupported arches + * Tue Mar 23 2021 Sergio Lopez <slp(a)redhat.com> - 0.8.0-1 - Initial package commit 92304de0ca2f757b9d641f85e07c2164379cd36a Author: Sergio Lopez <slp(a)redhat.com> Date: Mon May 3 15:33:07 2021 +0200 Initial import (#1942392). diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0adda59 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/vmm-sys-util-0.8.0.crate diff --git a/rust-vmm-sys-util.spec b/rust-vmm-sys-util.spec new file mode 100644 index 0000000..4476c28 --- /dev/null +++ b/rust-vmm-sys-util.spec @@ -0,0 +1,116 @@ +# Generated by rust2rpm 17 +%bcond_without check +%global debug_package %{nil} + +%global crate vmm-sys-util + +Name: rust-%{crate} +Version: 0.8.0 +Release: 1%{?dist} +Summary: Helpers and utilities used by multiple rust-vmm components and VMMs + +# Upstream license specification: Apache-2.0 AND BSD-3-Clause +License: ASL 2.0 and BSD +URL: https://crates.io/crates/vmm-sys-util +Source: %{crates_source} +# Initial patched metadata +# * Exclude unneeded files +Patch0: vmm-sys-util-fix-metadata.diff +# Omit tests that require access to "/dev/kvm" +Patch1: vmm-sys-util-omit-ioctl-tests.diff + +ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif + +BuildRequires: rust-packaging + +%global _description %{expand: +Helpers and utilities used by multiple rust-vmm components and VMMs.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE-APACHE LICENSE-BSD-3-Clause +%doc README.md +%{cargo_registry}/%{crate}-%{version_no_tilde}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+serde-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde-devel %{_description} + +This package contains library source intended for building other packages +which use "serde" feature of "%{crate}" crate. + +%files -n %{name}+serde-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+serde_derive-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde_derive-devel %{_description} + +This package contains library source intended for building other packages +which use "serde_derive" feature of "%{crate}" crate. + +%files -n %{name}+serde_derive-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+with-serde-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+with-serde-devel %{_description} + +This package contains library source intended for building other packages +which use "with-serde" feature of "%{crate}" crate. + +%files -n %{name}+with-serde-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Tue Mar 23 2021 Sergio Lopez <slp(a)redhat.com> - 0.8.0-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..b901dee --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (vmm-sys-util-0.8.0.crate) = 8354ef27082ccc04515255cb48ed50963eeb84ad31a096d6a942294a260b586583fb45699cb3b790a904389aac90a04d01ee15dd930d7ea178a0c2444464872c diff --git a/vmm-sys-util-fix-metadata.diff b/vmm-sys-util-fix-metadata.diff new file mode 100644 index 0000000..0702c3d --- /dev/null +++ b/vmm-sys-util-fix-metadata.diff @@ -0,0 +1,12 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 4254378..737b9e0 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -20,6 +20,7 @@ readme = "README.md" + keywords = ["utils"] + license = "Apache-2.0 AND BSD-3-Clause" + repository = "https://github.com/rust-vmm/vmm-sys-util" ++exclude = ["rust-vmm-ci/*", "/coverage_config_*"] + [dependencies.libc] + version = ">=0.2.39" + diff --git a/vmm-sys-util-omit-ioctl-tests.diff b/vmm-sys-util-omit-ioctl-tests.diff new file mode 100644 index 0000000..8a4add3 --- /dev/null +++ b/vmm-sys-util-omit-ioctl-tests.diff @@ -0,0 +1,22 @@ +diff --git a/src/linux/ioctl.rs b/src/linux/ioctl.rs +index c50e01e..07e2b6c 100644 +--- a/src/linux/ioctl.rs ++++ b/src/linux/ioctl.rs +@@ -221,7 +221,7 @@ type IoctlRequest = c_ulong; + /// + /// # Examples + /// +-/// ``` ++/// ```ignore + /// # extern crate libc; + /// #[macro_use] extern crate vmm_sys_util; + /// # +@@ -263,7 +263,7 @@ pub unsafe fn ioctl<F: AsRawFd>(fd: &F, req: c_ulong) -> c_int { + /// + /// # Examples + /// +-/// ``` ++/// ```ignore + /// # extern crate libc; + /// #[macro_use] extern crate vmm_sys_util; + /// # use libc::{open, O_CLOEXEC, O_RDWR};

2 years, 11 months

1
0
0 / 0

[Report] Packages Restricting Arches

by root

New package excluding arches (2) ============================ - rust-derive_builder_core0.9 ExclusiveArch: %{rust_arches} - rust-vmm-sys-util ExclusiveArch: x86_64 aarch64 ppc64le List of packages currently excluding arches (1974) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - 90-Second-Portraits ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - GoldenCheetah ExclusiveArch: %{qt5_qtwebengine_arches} - GtkAda ExclusiveArch: %{GPRbuild_arches} - GtkAda3 ExclusiveArch: %{GPRbuild_arches} - OpenImageIO ExclusiveArch: x86_64 ppc64le - PragmARC ExclusiveArch: %{GPRbuild_arches} - R-V8 ExclusiveArch: %{nodejs_arches} - RdRand ExclusiveArch: %{ix86} x86_64 - RediSearch ExclusiveArch: x86_64 - SLOF ExclusiveArch: ppc64le - YafaRay ExclusiveArch: %{ix86} x86_64 - aboot ExclusiveArch: alpha - accel-config ExclusiveArch: %{ix86} x86_64 - acpid ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 - ahven ExclusiveArch: %{GPRbuild_arches} - algobox ExclusiveArch: %{qt5_qtwebengine_arches} - alleyoop ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64 - american-fuzzy-lop ExclusiveArch: %{ix86} x86_64 - anet ExclusiveArch: %{GPRbuild_arches} - anki ExclusiveArch: %{qt5_qtwebengine_arches} noarch - apmd ExclusiveArch: %{ix86} - appstream-generator ExclusiveArch: %{ldc_arches} - arduino ExclusiveArch: %{go_arches} - arm-trusted-firmware ExclusiveArch: aarch64 - aunit ExclusiveArch: %GPRbuild_arches - avgtime ExclusiveArch: %{ldc_arches} - aws ExclusiveArch: %GPRbuild_arches - bcal ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x - bcc ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl - bcm283x-firmware ExclusiveArch: %{arm} aarch64 - berusky2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} - biosdevname ExclusiveArch: %{ix86} x86_64 - blender ExclusiveArch: x86_64 aarch64 ppc64le - bless ExclusiveArch: %mono_arches - bpftrace ExclusiveArch: x86_64 %{power64} aarch64 s390x - calamares ExclusiveArch: %{ix86} x86_64 - calibre ExclusiveArch: %{qt5_qtwebengine_arches} - ccdciel ExclusiveArch: %{fpc_arches} - cdcollect ExclusiveArch: %{mono_arches} - ceph ExclusiveArch: x86_64 aarch64 ppc64le s390x - chromium ExclusiveArch: x86_64 i686 ExclusiveArch: x86_64 i686 aarch64 - cjdns ExclusiveArch: %{nodejs_arches} - clevis-pin-tpm2 ExclusiveArch: %{rust_arches} - cmospwd ExclusiveArch: %{ix86} x86_64 - cmrt ExclusiveArch: %{ix86} x86_64 ia64 - coffee-script ExclusiveArch: %{nodejs_arches} noarch - colorful ExclusiveArch: %{fpc_arches} - cpu-x ExclusiveArch: i686 x86_64 - cpufetch ExclusiveArch: %{arm} aarch64 x86_64 - cpuid ExclusiveArch: %{ix86} x86_64 - cqrlog ExclusiveArch: %{fpc_arches} - crash ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - crash-gcore-command ExclusiveArch: aarch64 ppc64le x86_64 - crash-trace-command ExclusiveArch: aarch64 ppc64le s390x x86_64 - criu ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - cryptlib ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le - cryptobone ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64 - daq ExclusiveArch: x86_64 aarch64 - darktable ExclusiveArch: x86_64 aarch64 ExclusiveArch: x86_64 ppc64le - dbus-parsec ExclusiveArch: %{rust_arches} - dbus-sharp ExclusiveArch: %mono_arches - dbus-sharp-glib ExclusiveArch: %mono_arches - dbxtool ExclusiveArch: i386 x86_64 aarch64 - deepin-daemon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-desktop-schemas ExclusiveArch: %{go_arches} - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - dmtcp ExclusiveArch: x86_64 aarch64 - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dolphin-emu ExclusiveArch: x86_64 aarch64 ppc64le - dotnet-build-reference-packages ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64 - dotnet3.1 ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64 - dotnet5.0 ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64 - dotnet5.0-build-reference-packages ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64 - doublecmd ExclusiveArch: %{ix86} x86_64 - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dssi-vst ExclusiveArch: %{ix86} x86_64 - dyninst ExclusiveArch: %{ix86} x86_64 ppc64le aarch64 - e3 ExclusiveArch: %{ix86} x86_64 - edk2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: x86_64 aarch64 - efibootmgr ExclusiveArch: %{efi} - efifs ExclusiveArch: %{efi} - efitools ExclusiveArch: %{efi} - efivar ExclusiveArch: %{efi} - elk ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - emacs-slime ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - embree ExclusiveArch: x86_64 - enki ExclusiveArch: %{qt5_qtwebengine_arches} noarch - envytools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - eric ExclusiveArch: %{qt5_qtwebengine_arches} noarch - eth-tools ExclusiveArch: x86_64 - extlinux-bootloader ExclusiveArch: %{arm} aarch64 - fcitx-libpinyin ExclusiveArch: %{qt5_qtwebengine_arches} - fedora-dockerfiles ExclusiveArch: %{go_arches} - fes ExclusiveArch: %{ix86} x86_64 - flannel ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - florist ExclusiveArch: %{GPRbuild_arches} - fpc ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le - frescobaldi ExclusiveArch: %{qt5_qtwebengine_arches} - frysk ExclusiveArch: %{ix86} x86_64 ppc64 - fwts ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64} - fwupd-efi ExclusiveArch: x86_64 aarch64 - fx ExclusiveArch: %{nodejs_arches} noarch - ga ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - gbrainy ExclusiveArch: %mono_arches - gdata-sharp ExclusiveArch: %mono_arches - gdb-exploitable ExclusiveArch: x86_64 i386 ExclusiveArch: x86_64 noarch - gearhead1 ExclusiveArch: %{fpc_arches} - gela-asis ExclusiveArch: %GPRbuild_arches - ghdl ExclusiveArch: %{GNAT_arches} - ghostwriter ExclusiveArch: %{qt5_qtwebengine_arches} - gio-sharp ExclusiveArch: %mono_arches - gir-to-d ExclusiveArch: %{ldc_arches} - git-octopus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - gitqlient ExclusiveArch: %{qt5_qtwebengine_arches} - giver ExclusiveArch: %{mono_arches} - gkeyfile-sharp ExclusiveArch: %mono_arches - glibc32 ExclusiveArch: x86_64 - glibd ExclusiveArch: %{ldc_arches} - gmqcc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - gnatcoll ExclusiveArch: %{GPRbuild_arches} - gnatcoll-bindings ExclusiveArch: %{GPRbuild_arches} - gnatcoll-db ExclusiveArch: %{GPRbuild_arches} - gnome-boxes ExclusiveArch: x86_64 - gnome-desktop-sharp ExclusiveArch: %mono_arches - gnome-do ExclusiveArch: %mono_arches - gnome-guitar ExclusiveArch: %{mono_arches} - gnome-keyring-sharp ExclusiveArch: %mono_arches - gnome-rdp ExclusiveArch: %{mono_arches} - gnome-sharp ExclusiveArch: %mono_arches - gnome-subtitles ExclusiveArch: %mono_arches - gnu-efi ExclusiveArch: %{efi} - go-bindata ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - go-compilers ExclusiveArch: %{go_arches} - go-rpm-macros ExclusiveArch: %{golang_arches} %{gccgo_arches} - godep ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang ExclusiveArch: %{golang_arches} - gomtree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gotun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: x86_64 - goverlay ExclusiveArch: %{fpc_arches} - gprbuild ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch} - gprolog ExclusiveArch: x86_64 %{ix86} ppc alpha - grafana ExclusiveArch: %{grafana_arches} - grafana-pcp ExclusiveArch: %{grafanapcp_arches} - gtk-sharp-beans ExclusiveArch: %mono_arches - gtk-sharp2 ExclusiveArch: %mono_arches - gtk-sharp3 ExclusiveArch: %{mono_arches} - gtkd ExclusiveArch: %{ldc_arches} - gudev-sharp ExclusiveArch: %mono_arches - guestfs-tools ExclusiveArch: %{kernel_arches} - hedgewars ExclusiveArch: %{fpc_arches} - hsakmt ExclusiveArch: x86_64 aarch64 - hyena ExclusiveArch: %{mono_arches} - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 - i3status-rs ExclusiveArch: %{rust_arches} - icaro ExclusiveArch: %{ix86} x86_64 noarch - ignition ExclusiveArch: %{go_arches} - imvirt ExclusiveArch: %{ix86} x86_64 ia64 - indistarter ExclusiveArch: %{fpc_arches} - infinipath-psm ExclusiveArch: x86_64 - intel-cmt-cat ExclusiveArch: x86_64 i686 i586 ExclusiveArch: x86_64 i686 i586 - intel-gmmlib ExclusiveArch: x86_64 i686 - intel-ipp-crypto-mb ExclusiveArch: x86_64 ExclusiveArch: x86_64 - intel-ipsec-mb ExclusiveArch: x86_64 ExclusiveArch: x86_64 - intel-mediasdk ExclusiveArch: x86_64 - intel-undervolt ExclusiveArch: i386 x86_64 - ioport ExclusiveArch: %{ix86} x86_64 - ipmctl ExclusiveArch: x86_64 - ipw2100-firmware ExclusiveArch: noarch i386 x86_64 - ipw2200-firmware ExclusiveArch: noarch i386 x86_64 - ispc ExclusiveArch: x86_64 aarch64 - iucode-tool ExclusiveArch: %{ix86} x86_64 - iyfct ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - java-1.8.0-openjdk-aarch32 ExclusiveArch: %{arm} - keepass ExclusiveArch: %{mono_arches} - kernel ExclusiveArch: x86_64 s390x %{arm} aarch64 ppc64le ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le - keyring-ima-signer ExclusiveArch: %{rust_arches} - kf5-akonadi-search ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-audiocd-kio ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kalarmcal ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kblog ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kcalendarcore ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kcalendarutils ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kitinerary ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kmailtransport ExclusiveArch: x86_64 %{arm} - kf5-ktnef ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-libkdcraw ExclusiveArch: x86_64 ppc64le %{arm} - kicad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - kiwix-desktop ExclusiveArch: %{qt5_qtwebengine_arches} - knot-resolver ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - knotes ExclusiveArch: x86_64 %{arm} - kompose ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x - kubernetes ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm} - lazarus ExclusiveArch: %{fpc_arches} - lazpaint ExclusiveArch: %{fpc_arches} - ldc ExclusiveArch: %{ldc_arches} - libbsr ExclusiveArch: %{power64} - libclc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - libcxl ExclusiveArch: %{power64} - libdfp ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64 - libdispatch ExclusiveArch: x86_64 aarch64 - libguestfs ExclusiveArch: %{kernel_arches} - libica ExclusiveArch: s390 s390x - libipt ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - libnxz ExclusiveArch: ppc64le - libocxl ExclusiveArch: ppc64le - libpmemobj-cpp ExclusiveArch: x86_64 - libpsm2 ExclusiveArch: x86_64 - libquentier ExclusiveArch: %{qt5_qtwebengine_arches} - libretro-desmume2015 ExclusiveArch: i686 x86_64 - librtas ExclusiveArch: %{power64} - libservicelog ExclusiveArch: ppc %{power64} - libsmbios ExclusiveArch: x86_64 %{ix86} - libunwind ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 - libva-intel-hybrid-driver ExclusiveArch: %{ix86} x86_64 ia64 - libvma ExclusiveArch: x86_64 ppc64le ppc64 aarch64 - libvmi ExclusiveArch: x86_64 - libvpd ExclusiveArch: %{power64} - libxsmm ExclusiveArch: x86_64 - libzfcphbaapi ExclusiveArch: s390 s390x - lightdm ExclusiveArch: x86_64 ppc64le - log4net ExclusiveArch: %mono_arches - lrmi ExclusiveArch: %{ix86} - lsvpd ExclusiveArch: %{power64} - luajit ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 s390x ppc64le - luxcorerender ExclusiveArch: x86_64 - mactel-boot ExclusiveArch: x86_64 - manifest-tool ExclusiveArch: x86_64 aarch64 ppc64le s390x - mantle ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - matreshka ExclusiveArch: %GPRbuild_arches - maxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - mbpfan ExclusiveArch: x86_64 - mcelog ExclusiveArch: i686 x86_64 - mediaconch ExclusiveArch: %{qt5_qtwebengine_arches} - mellowplayer ExclusiveArch: %{qt5_qtwebengine_arches} - memkind ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 - memtest86+ ExclusiveArch: %{ix86} x86_64 - mesos ExclusiveArch: x86_64 - microcode_ctl ExclusiveArch: %{ix86} x86_64 - micropython ExclusiveArch: %{arm} %{ix86} x86_64 - mine_detector ExclusiveArch: %{GPRbuild_arches} - minetest ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mingw-wine-gecko ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - mirrorlist-server ExclusiveArch: %{rust_arches} - mkbootdisk ExclusiveArch: %{ix86} sparc sparc64 x86_64 - mod_mono ExclusiveArch: %mono_arches - module-build-service ExclusiveArch: %{ix86} x86_64 noarch - mokutil ExclusiveArch: %{ix86} x86_64 aarch64 %{arm} - mono ExclusiveArch: %mono_arches - mono-addins ExclusiveArch: %mono_arches - mono-basic ExclusiveArch: %{mono_arches} - mono-bouncycastle ExclusiveArch: %mono_arches - mono-cecil ExclusiveArch: %mono_arches - mono-cecil-flowanalysis ExclusiveArch: %mono_arches - mono-reflection ExclusiveArch: %mono_arches - mono-tools ExclusiveArch: %mono_arches - mono-zeroconf ExclusiveArch: %mono_arches - monobristol ExclusiveArch: %{mono_arches} - monodevelop ExclusiveArch: %mono_arches - monodevelop-debugger-gdb ExclusiveArch: %{mono_arches} - monosim ExclusiveArch: %mono_arches - mrrescue ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - msr-tools ExclusiveArch: %{ix86} x86_64 - mustache-d ExclusiveArch: %{ldc_arches} - mysql-connector-net ExclusiveArch: %{mono_arches} - nant ExclusiveArch: %mono_arches - nativejit ExclusiveArch: x86_64 - nbc ExclusiveArch: %{fpc_arches} - nbdkit ExclusiveArch: x86_64 - ndesk-dbus ExclusiveArch: %{mono_arches} - ndesk-dbus-glib ExclusiveArch: %{mono_arches} - newsflash ExclusiveArch: %{rust_arches} - newtonsoft-json ExclusiveArch: %{mono_arches} - nispor ExclusiveArch: %{rust_arches} - nodejs ExclusiveArch: %{nodejs_arches} - nodejs-acorn-object-spread ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-backbone ExclusiveArch: %{nodejs_arches} noarch - nodejs-buble ExclusiveArch: %{nodejs_arches} noarch - nodejs-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-generic-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-linefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nodemon ExclusiveArch: %{nodejs_arches} noarch - nodejs-packaging ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace-require-self ExclusiveArch: %{nodejs_arches} noarch - nodejs-supervisor ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-tape ExclusiveArch: %{nodejs_arches} noarch - nodejs-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-underscore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - notify-sharp ExclusiveArch: %{mono_arches} - notify-sharp3 ExclusiveArch: %{mono_arches} - npm-name-cli ExclusiveArch: %{nodejs_arches} noarch - nuget ExclusiveArch: %{mono_arches} - numatop ExclusiveArch: x86_64 ppc64le - nunit ExclusiveArch: %{mono_arches} - nunit2 ExclusiveArch: %{mono_arches} - nvml ExclusiveArch: x86_64 ppc64le - nwchem ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - obs-service-rust2rpm ExclusiveArch: %{rust_arches} noarch - oci-kvm-hook ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-seccomp-bpf-hook ExclusiveArch: x86_64 %%{power64} aarch64 s390x armv7hl - oci-umount ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - oidn ExclusiveArch: x86_64 - olpc-kbdshim ExclusiveArch: %{ix86} %{arm} - olpc-netutils ExclusiveArch: %{ix86} %{arm} - olpc-utils ExclusiveArch: %{ix86} %{arm} - onednn ExclusiveArch: x86_64 aarch64 ppc64le - onedrive ExclusiveArch: %{ldc_arches} - opae ExclusiveArch: x86_64 - opal-prd ExclusiveArch: ppc64le - open-vm-tools ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 - openblas ExclusiveArch: %{openblas_arches} - openjfx ExclusiveArch: x86_64 - openjfx8 ExclusiveArch: x86_64 - openlibm ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64} - openni ExclusiveArch: %{ix86} x86_64 %{arm} - openni-primesense ExclusiveArch: %{ix86} x86_64 %{arm} - openshadinglanguage ExclusiveArch: x86_64 aarch64 ppc64le s390x - openssl-ibmca ExclusiveArch: s390 s390x - origin ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - orion ExclusiveArch: %{qt5_qtwebengine_arches} - orthorobot ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - paflib ExclusiveArch: ppc %{power64} - parsec ExclusiveArch: %{rust_arches} - parsec-tool ExclusiveArch: %{rust_arches} - pcc ExclusiveArch: %{ix86} x86_64 - pcmciautils ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} - pdbg ExclusiveArch: ppc64le - pdfmod ExclusiveArch: %mono_arches - perl-Dumbbench ExclusiveArch: %{ix86} x86_64 noarch - perl-Parse-DMIDecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - pesign ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm} - pesign-test-app ExclusiveArch: x86_64 - pinta ExclusiveArch: %mono_arches - pioneer ExclusiveArch: %{ix86} x86_64 - playonlinux ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - pmdk-convert ExclusiveArch: x86_64 - pmemkv ExclusiveArch: x86_64 - poppler-sharp ExclusiveArch: %mono_arches - popub ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - powerpc-utils ExclusiveArch: ppc %{power64} - ppc64-diag ExclusiveArch: ppc %{power64} - psi-plus ExclusiveArch: %{qt5_qtwebengine_arches} - pveclib ExclusiveArch: ppc %{power64} - pvs-sbcl ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - pyqtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - python-cryptography ExclusiveArch: %{rust_arches} - python-etcd ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - python-healpy ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-javabridge ExclusiveArch: i686 x86_64 - python-openoffice ExclusiveArch: noarch x86_64 - python-pymoc ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-rpi-gpio ExclusiveArch: %{arm} aarch64 - python-setuptools-rust ExclusiveArch: %{rust_arches} - q4wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - qcint ExclusiveArch: x86_64 - qclib ExclusiveArch: s390 s390x - qemu-sanity-check ExclusiveArch: %{kernel_arches} - qevercloud ExclusiveArch: %{qt5_qtwebengine_arches} - qmapshack ExclusiveArch: %{qt5_qtwebengine_arches} - qt4pas ExclusiveArch: %{fpc_arches} - qt5-qtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - quantum-espresso ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} - quentier ExclusiveArch: %{qt5_qtwebengine_arches} - rear ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 - redhat-lsb ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - renderdoc ExclusiveArch: x86_64 - reptyr ExclusiveArch: %{ix86} x86_64 %{arm} - rescene ExclusiveArch: %{mono_arches} - restsharp ExclusiveArch: %{mono_arches} - rhythmbox-alternative-toolbar ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le - rmd ExclusiveArch: %{ix86} x86_64 - rocm-runtime ExclusiveArch: x86_64 aarch64 - rocminfo ExclusiveArch: x86_64 aarch64 - rpm-ostree ExclusiveArch: %{rust_arches} - rr ExclusiveArch: %{ix86} x86_64 - rssguard ExclusiveArch: %{qt5_qtwebengine_arches} - rubygem-childprocess ExclusiveArch: %{ix86} x86_64 noarch - runc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x - rust ExclusiveArch: %{rust_arches} - rust-ab_glyph_rasterizer ExclusiveArch: %{rust_arches} - rust-abomonation ExclusiveArch: %{rust_arches} - rust-actix ExclusiveArch: %{rust_arches} - rust-actix-codec ExclusiveArch: %{rust_arches} - rust-actix-connect ExclusiveArch: %{rust_arches} - rust-actix-files ExclusiveArch: %{rust_arches} - rust-actix-http ExclusiveArch: %{rust_arches} - rust-actix-macros ExclusiveArch: %{rust_arches} - rust-actix-router ExclusiveArch: %{rust_arches} - rust-actix-rt ExclusiveArch: %{rust_arches} - rust-actix-server ExclusiveArch: %{rust_arches} - rust-actix-server-config ExclusiveArch: %{rust_arches} - rust-actix-service ExclusiveArch: %{rust_arches} - rust-actix-testing ExclusiveArch: %{rust_arches} - rust-actix-threadpool ExclusiveArch: %{rust_arches} - rust-actix-tls ExclusiveArch: %{rust_arches} - rust-actix-utils ExclusiveArch: %{rust_arches} - rust-actix-web ExclusiveArch: %{rust_arches} - rust-actix-web-codegen ExclusiveArch: %{rust_arches} - rust-actix_derive ExclusiveArch: %{rust_arches} - rust-addr2line ExclusiveArch: %{rust_arches} - rust-adler ExclusiveArch: %{rust_arches} - rust-adler32 ExclusiveArch: %{rust_arches} - rust-aead ExclusiveArch: %{rust_arches} - rust-aes ExclusiveArch: %{rust_arches} - rust-aes-gcm ExclusiveArch: %{rust_arches} - rust-aes-soft ExclusiveArch: %{rust_arches} - rust-afterburn ExclusiveArch: %{rust_arches} - rust-ahash ExclusiveArch: %{rust_arches} - rust-ahash0.4 ExclusiveArch: %{rust_arches} - rust-aho-corasick ExclusiveArch: %{rust_arches} - rust-alacritty ExclusiveArch: %{rust_arches} - rust-alacritty_config_derive ExclusiveArch: %{rust_arches} - rust-alacritty_terminal ExclusiveArch: %{rust_arches} - rust-alga ExclusiveArch: %{rust_arches} - rust-alga_derive ExclusiveArch: %{rust_arches} - rust-alloc-no-stdlib ExclusiveArch: %{rust_arches} - rust-alloc-stdlib ExclusiveArch: %{rust_arches} - rust-alphanumeric-sort ExclusiveArch: %{rust_arches} - rust-ammonia ExclusiveArch: %{rust_arches} - rust-andrew ExclusiveArch: %{rust_arches} - rust-ansi_colours ExclusiveArch: %{rust_arches} - rust-ansi_term ExclusiveArch: %{rust_arches} - rust-ansi_term0.11 ExclusiveArch: %{rust_arches} - rust-antidote ExclusiveArch: %{rust_arches} - rust-anyhow ExclusiveArch: %{rust_arches} - rust-anymap ExclusiveArch: %{rust_arches} - rust-aom-sys ExclusiveArch: %{rust_arches} - rust-app_dirs ExclusiveArch: %{rust_arches} - rust-approx ExclusiveArch: %{rust_arches} - rust-arbitrary ExclusiveArch: %{rust_arches} - rust-arbitrary0.4 ExclusiveArch: %{rust_arches} - rust-arc-swap ExclusiveArch: %{rust_arches} - rust-arg_enum_proc_macro ExclusiveArch: %{rust_arches} - rust-argparse ExclusiveArch: %{rust_arches} - rust-array-init ExclusiveArch: %{rust_arches} - rust-arraydeque ExclusiveArch: %{rust_arches} - rust-arrayref ExclusiveArch: %{rust_arches} - rust-arrayvec ExclusiveArch: %{rust_arches} - rust-article_scraper ExclusiveArch: %{rust_arches} - rust-ascii ExclusiveArch: %{rust_arches} - rust-ascii-canvas ExclusiveArch: %{rust_arches} - rust-askalono ExclusiveArch: %{rust_arches} - rust-askalono-cli ExclusiveArch: %{rust_arches} - rust-askama ExclusiveArch: %{rust_arches} - rust-askama_derive ExclusiveArch: %{rust_arches} - rust-askama_escape ExclusiveArch: %{rust_arches} - rust-askama_shared ExclusiveArch: %{rust_arches} - rust-assert-json-diff ExclusiveArch: %{rust_arches} - rust-assert_approx_eq ExclusiveArch: %{rust_arches} - rust-assert_cli ExclusiveArch: %{rust_arches} - rust-assert_cmd ExclusiveArch: %{rust_arches} - rust-assert_fs ExclusiveArch: %{rust_arches} - rust-assert_matches ExclusiveArch: %{rust_arches} - rust-assign ExclusiveArch: %{rust_arches} - rust-async-attributes ExclusiveArch: %{rust_arches} - rust-async-compression ExclusiveArch: %{rust_arches} - rust-async-io ExclusiveArch: %{rust_arches} - rust-async-task ExclusiveArch: %{rust_arches} - rust-async-trait ExclusiveArch: %{rust_arches} - rust-asyncgit ExclusiveArch: %{rust_arches} - rust-atk ExclusiveArch: %{rust_arches} - rust-atk-sys ExclusiveArch: %{rust_arches} - rust-atom ExclusiveArch: %{rust_arches} - rust-atomicwrites ExclusiveArch: %{rust_arches} - rust-attohttpc ExclusiveArch: %{rust_arches} - rust-atty ExclusiveArch: %{rust_arches} - rust-autocfg ExclusiveArch: %{rust_arches} - rust-av-metrics ExclusiveArch: %{rust_arches} - rust-average ExclusiveArch: %{rust_arches} - rust-awc ExclusiveArch: %{rust_arches} - rust-backtrace ExclusiveArch: %{rust_arches} - rust-backtrace-sys ExclusiveArch: %{rust_arches} - rust-base100 ExclusiveArch: %{rust_arches} - rust-base64 ExclusiveArch: %{rust_arches} - rust-base64-0.10 ExclusiveArch: %{rust_arches} - rust-base64-0.11 ExclusiveArch: %{rust_arches} - rust-base64_0.12 ExclusiveArch: %{rust_arches} - rust-bat ExclusiveArch: %{rust_arches} - rust-battery ExclusiveArch: %{rust_arches} - rust-bencher ExclusiveArch: %{rust_arches} - rust-better-panic ExclusiveArch: %{rust_arches} - rust-bincode ExclusiveArch: %{rust_arches} - rust-bincode0.8 ExclusiveArch: %{rust_arches} - rust-bindgen ExclusiveArch: %{rust_arches} - rust-binfarce ExclusiveArch: %{rust_arches} - rust-biscuit ExclusiveArch: %{rust_arches} - rust-bit-set ExclusiveArch: %{rust_arches} - rust-bit-vec ExclusiveArch: %{rust_arches} - rust-bitfield ExclusiveArch: %{rust_arches} - rust-bitflags ExclusiveArch: %{rust_arches} - rust-bitmaps ExclusiveArch: %{rust_arches} - rust-bitstream-io ExclusiveArch: %{rust_arches} - rust-bitvec ExclusiveArch: %{rust_arches} - rust-blake2 ExclusiveArch: %{rust_arches} - rust-blobby ExclusiveArch: %{rust_arches} - rust-blobby0.1 ExclusiveArch: %{rust_arches} - rust-block-buffer ExclusiveArch: %{rust_arches} - rust-block-buffer0.7 ExclusiveArch: %{rust_arches} - rust-block-modes ExclusiveArch: %{rust_arches} - rust-block-padding ExclusiveArch: %{rust_arches} - rust-blsctl ExclusiveArch: %{rust_arches} - rust-bodhi ExclusiveArch: %{rust_arches} - rust-bodhi-cli ExclusiveArch: %{rust_arches} - rust-bootupd ExclusiveArch: x86_64 aarch64 - rust-box_drawing ExclusiveArch: %{rust_arches} - rust-brev ExclusiveArch: %{rust_arches} - rust-brotli ExclusiveArch: %{rust_arches} - rust-brotli-decompressor ExclusiveArch: %{rust_arches} - rust-brotli-sys ExclusiveArch: %{rust_arches} - rust-brotli2 ExclusiveArch: %{rust_arches} - rust-bstr ExclusiveArch: %{rust_arches} - rust-buf-min ExclusiveArch: %{rust_arches} - rust-buf_redux ExclusiveArch: %{rust_arches} - rust-buffered-reader ExclusiveArch: %{rust_arches} - rust-bufsize ExclusiveArch: %{rust_arches} - rust-bufstream ExclusiveArch: %{rust_arches} - rust-build-env ExclusiveArch: %{rust_arches} - rust-build_const ExclusiveArch: %{rust_arches} - rust-bumpalo ExclusiveArch: %{rust_arches} - rust-byte-tools ExclusiveArch: %{rust_arches} - rust-byte-unit ExclusiveArch: %{rust_arches} - rust-byte-unit3 ExclusiveArch: %{rust_arches} - rust-bytecount ExclusiveArch: %{rust_arches} - rust-bytelines ExclusiveArch: %{rust_arches} - rust-bytemuck ExclusiveArch: %{rust_arches} - rust-bytemuck_derive ExclusiveArch: %{rust_arches} - rust-byteorder ExclusiveArch: %{rust_arches} - rust-bytes ExclusiveArch: %{rust_arches} - rust-bytes0.4 ExclusiveArch: %{rust_arches} - rust-bytes0.5 ExclusiveArch: %{rust_arches} - rust-bytes0.6 ExclusiveArch: %{rust_arches} - rust-bytesize ExclusiveArch: %{rust_arches} - rust-bytestring ExclusiveArch: %{rust_arches} - rust-bzip2 ExclusiveArch: %{rust_arches} - rust-bzip2-sys ExclusiveArch: %{rust_arches} - rust-c_vec ExclusiveArch: %{rust_arches} - rust-cache-padded ExclusiveArch: %{rust_arches} - rust-cairo-rs ExclusiveArch: %{rust_arches} - rust-cairo-sys-rs ExclusiveArch: %{rust_arches} - rust-calloop ExclusiveArch: %{rust_arches} - rust-capnp ExclusiveArch: %{rust_arches} - rust-capnp-futures ExclusiveArch: %{rust_arches} - rust-capnp-rpc ExclusiveArch: %{rust_arches} - rust-caps ExclusiveArch: %{rust_arches} - rust-cargo ExclusiveArch: %{rust_arches} - rust-cargo-bloat ExclusiveArch: %{rust_arches} - rust-cargo-c ExclusiveArch: %{rust_arches} - rust-cargo-husky ExclusiveArch: %{rust_arches} - rust-cargo-insta ExclusiveArch: %{rust_arches} - rust-cargo-platform ExclusiveArch: %{rust_arches} - rust-cargo-readme ExclusiveArch: %{rust_arches} - rust-cargo_metadata ExclusiveArch: %{rust_arches} - rust-case ExclusiveArch: %{rust_arches} - rust-cassowary ExclusiveArch: %{rust_arches} - rust-cast ExclusiveArch: %{rust_arches} - rust-cbindgen ExclusiveArch: %{rust_arches} - rust-cc ExclusiveArch: %{rust_arches} - rust-cedarwood ExclusiveArch: %{rust_arches} - rust-cexpr ExclusiveArch: %{rust_arches} - rust-cfg-if ExclusiveArch: %{rust_arches} - rust-cfg-if0.1 ExclusiveArch: %{rust_arches} - rust-chainerror ExclusiveArch: %{rust_arches} - rust-charset ExclusiveArch: %{rust_arches} - rust-chbs ExclusiveArch: %{rust_arches} - rust-checked_int_cast ExclusiveArch: %{rust_arches} - rust-choosier ExclusiveArch: %{rust_arches} - rust-chrono ExclusiveArch: %{rust_arches} - rust-chrono-humanize ExclusiveArch: %{rust_arches} - rust-chrono-tz ExclusiveArch: %{rust_arches} - rust-chunked_transfer ExclusiveArch: %{rust_arches} - rust-cipher ExclusiveArch: %{rust_arches} - rust-clang-sys ExclusiveArch: %{rust_arches} - rust-clap ExclusiveArch: %{rust_arches} - rust-clap2 ExclusiveArch: %{rust_arches} - rust-clap_derive ExclusiveArch: %{rust_arches} - rust-clicolors-control ExclusiveArch: %{rust_arches} - rust-cmake ExclusiveArch: %{rust_arches} - rust-codespan-reporting ExclusiveArch: %{rust_arches} - rust-codicon ExclusiveArch: %{rust_arches} - rust-color-backtrace ExclusiveArch: %{rust_arches} - rust-color_quant ExclusiveArch: %{rust_arches} - rust-colored ExclusiveArch: %{rust_arches} - rust-colored1 ExclusiveArch: %{rust_arches} - rust-colored_json ExclusiveArch: %{rust_arches} - rust-colorful ExclusiveArch: %{rust_arches} - rust-compiletest_rs ExclusiveArch: %{rust_arches} - rust-comrak ExclusiveArch: %{rust_arches} - rust-concurrent-queue ExclusiveArch: %{rust_arches} - rust-config ExclusiveArch: %{rust_arches} - rust-configparser ExclusiveArch: %{rust_arches} - rust-confy ExclusiveArch: %{rust_arches} - rust-console ExclusiveArch: %{rust_arches} - rust-console0.11 ExclusiveArch: %{rust_arches} - rust-console0.12 ExclusiveArch: %{rust_arches} - rust-console0.13 ExclusiveArch: %{rust_arches} - rust-console0.9 ExclusiveArch: %{rust_arches} - rust-const-cstr ExclusiveArch: %{rust_arches} - rust-const-random ExclusiveArch: %{rust_arches} - rust-const-random-macro ExclusiveArch: %{rust_arches} - rust-const_fn ExclusiveArch: %{rust_arches} - rust-content_inspector ExclusiveArch: %{rust_arches} - rust-conv ExclusiveArch: %{rust_arches} - rust-cookie ExclusiveArch: %{rust_arches} - rust-cookie_store ExclusiveArch: %{rust_arches} - rust-copydeps ExclusiveArch: %{rust_arches} - rust-copyless ExclusiveArch: %{rust_arches} - rust-copypasta ExclusiveArch: %{rust_arches} - rust-coreos-installer ExclusiveArch: %{rust_arches} - rust-cpio ExclusiveArch: %{rust_arches} - rust-cpp_demangle ExclusiveArch: %{rust_arches} - rust-cpuid-bool ExclusiveArch: %{rust_arches} - rust-cpython ExclusiveArch: %{rust_arches} - rust-crates-io ExclusiveArch: %{rust_arches} - rust-crc ExclusiveArch: %{rust_arches} - rust-crc-any ExclusiveArch: %{rust_arches} - rust-crc-core ExclusiveArch: %{rust_arches} - rust-crc32fast ExclusiveArch: %{rust_arches} - rust-criterion ExclusiveArch: %{rust_arches} - rust-criterion-plot ExclusiveArch: %{rust_arches} - rust-crossbeam ExclusiveArch: %{rust_arches} - rust-crossbeam-channel ExclusiveArch: %{rust_arches} - rust-crossbeam-channel0.4 ExclusiveArch: %{rust_arches} - rust-crossbeam-deque ExclusiveArch: %{rust_arches} - rust-crossbeam-deque0.7 ExclusiveArch: %{rust_arches} - rust-crossbeam-epoch ExclusiveArch: %{rust_arches} - rust-crossbeam-epoch0.8 ExclusiveArch: %{rust_arches} - rust-crossbeam-queue ExclusiveArch: %{rust_arches} - rust-crossbeam-queue0.2 ExclusiveArch: %{rust_arches} - rust-crossbeam-utils ExclusiveArch: %{rust_arches} - rust-crossbeam-utils0.7 ExclusiveArch: %{rust_arches} - rust-crossbeam0.7 ExclusiveArch: %{rust_arches} - rust-crossfont ExclusiveArch: %{rust_arches} - rust-crossterm ExclusiveArch: %{rust_arches} - rust-crossterm0.17 ExclusiveArch: %{rust_arches} - rust-crossterm0.18 ExclusiveArch: %{rust_arches} - rust-crosstermion ExclusiveArch: %{rust_arches} - rust-crunchy ExclusiveArch: %{rust_arches} - rust-crypto-hash ExclusiveArch: %{rust_arches} - rust-crypto-mac ExclusiveArch: %{rust_arches} - rust-crypto-mac0.8 ExclusiveArch: %{rust_arches} - rust-cryptoki ExclusiveArch: %{rust_arches} - rust-cryptoki-sys ExclusiveArch: %{rust_arches} - rust-cryptovec ExclusiveArch: %{rust_arches} - rust-cssparser ExclusiveArch: %{rust_arches} - rust-cssparser-macros ExclusiveArch: %{rust_arches} - rust-cstr-argument ExclusiveArch: %{rust_arches} - rust-csv ExclusiveArch: %{rust_arches} - rust-csv-core ExclusiveArch: %{rust_arches} - rust-ctor ExclusiveArch: %{rust_arches} - rust-ctr ExclusiveArch: %{rust_arches} - rust-ctrlc ExclusiveArch: %{rust_arches} - rust-cty ExclusiveArch: %{rust_arches} - rust-curl ExclusiveArch: %{rust_arches} - rust-curl-sys ExclusiveArch: %{rust_arches} - rust-custom_derive ExclusiveArch: %{rust_arches} - rust-cxx ExclusiveArch: %{rust_arches} - rust-cxx-build ExclusiveArch: %{rust_arches} - rust-cxx-gen ExclusiveArch: %{rust_arches} - rust-cxxbridge-flags ExclusiveArch: %{rust_arches} - rust-cxxbridge-macro ExclusiveArch: %{rust_arches} - rust-darling ExclusiveArch: %{rust_arches} - rust-darling_core ExclusiveArch: %{rust_arches} - rust-darling_macro ExclusiveArch: %{rust_arches} - rust-dashmap ExclusiveArch: %{rust_arches} - rust-dashmap3 ExclusiveArch: %{rust_arches} - rust-data-encoding ExclusiveArch: %{rust_arches} - rust-data-url ExclusiveArch: %{rust_arches} - rust-datetime ExclusiveArch: %{rust_arches} - rust-dav1d-sys ExclusiveArch: %{rust_arches} - rust-dbus ExclusiveArch: %{rust_arches} - rust-dbus-codegen ExclusiveArch: %{rust_arches} - rust-dbus-crossroads ExclusiveArch: %{rust_arches} - rust-dbus-tokio ExclusiveArch: %{rust_arches} - rust-dbus-tree ExclusiveArch: %{rust_arches} - rust-dbus0.8 ExclusiveArch: %{rust_arches} - rust-debug-helper ExclusiveArch: %{rust_arches} - rust-decimal ExclusiveArch: %{rust_arches} - rust-deflate ExclusiveArch: %{rust_arches} - rust-defmac ExclusiveArch: %{rust_arches} - rust-delta_e ExclusiveArch: %{rust_arches} - rust-derivative ExclusiveArch: %{rust_arches} - rust-derive-new ExclusiveArch: %{rust_arches} - rust-derive_arbitrary ExclusiveArch: %{rust_arches} - rust-derive_arbitrary0.4 ExclusiveArch: %{rust_arches} - rust-derive_builder ExclusiveArch: %{rust_arches} - rust-derive_builder_core ExclusiveArch: %{rust_arches} - rust-derive_builder_core0.9 ExclusiveArch: %{rust_arches} - rust-derive_more ExclusiveArch: %{rust_arches} - rust-des ExclusiveArch: %{rust_arches} - rust-desed ExclusiveArch: %{rust_arches} - rust-deunicode ExclusiveArch: %{rust_arches} - rust-devicemapper ExclusiveArch: %{rust_arches} - rust-dialoguer ExclusiveArch: %{rust_arches} - rust-diesel ExclusiveArch: %{rust_arches} - rust-diesel_derives ExclusiveArch: %{rust_arches} - rust-diesel_migrations ExclusiveArch: %{rust_arches} - rust-diff ExclusiveArch: %{rust_arches} - rust-difference ExclusiveArch: %{rust_arches} - rust-diffus ExclusiveArch: %{rust_arches} - rust-diffus-derive ExclusiveArch: %{rust_arches} - rust-digest ExclusiveArch: %{rust_arches} - rust-digest0.8 ExclusiveArch: %{rust_arches} - rust-directories ExclusiveArch: %{rust_arches} - rust-dirs ExclusiveArch: %{rust_arches} - rust-dirs-next ExclusiveArch: %{rust_arches} - rust-dirs-sys ExclusiveArch: %{rust_arches} - rust-dirs-sys-next ExclusiveArch: %{rust_arches} - rust-dirs2 ExclusiveArch: %{rust_arches} - rust-diskonaut ExclusiveArch: %{rust_arches} - rust-dissimilar ExclusiveArch: %{rust_arches} - rust-dlib ExclusiveArch: %{rust_arches} - rust-dlv-list ExclusiveArch: %{rust_arches} - rust-dns-lookup ExclusiveArch: %{rust_arches} - rust-dns-parser ExclusiveArch: %{rust_arches} - rust-doc-comment ExclusiveArch: %{rust_arches} - rust-docmatic ExclusiveArch: %{rust_arches} - rust-docopt ExclusiveArch: %{rust_arches} - rust-dotenv ExclusiveArch: %{rust_arches} - rust-downcast-rs ExclusiveArch: %{rust_arches} - rust-dtoa ExclusiveArch: %{rust_arches} - rust-dtoa-short ExclusiveArch: %{rust_arches} - rust-dua-cli ExclusiveArch: %{rust_arches} - rust-duct ExclusiveArch: %{rust_arches} - rust-dummy ExclusiveArch: %{rust_arches} - rust-dunce ExclusiveArch: %{rust_arches} - rust-dutree ExclusiveArch: %{rust_arches} - rust-dyn-clone ExclusiveArch: %{rust_arches} - rust-easy-parallel ExclusiveArch: %{rust_arches} - rust-edit-distance ExclusiveArch: %{rust_arches} - rust-either ExclusiveArch: %{rust_arches} - rust-elasticlunr-rs ExclusiveArch: %{rust_arches} - rust-ena ExclusiveArch: %{rust_arches} - rust-encode_unicode ExclusiveArch: %{rust_arches} - rust-encoding ExclusiveArch: %{rust_arches} - rust-encoding-index-japanese ExclusiveArch: %{rust_arches} - rust-encoding-index-korean ExclusiveArch: %{rust_arches} - rust-encoding-index-simpchinese ExclusiveArch: %{rust_arches} - rust-encoding-index-singlebyte ExclusiveArch: %{rust_arches} - rust-encoding-index-tradchinese ExclusiveArch: %{rust_arches} - rust-encoding_index_tests ExclusiveArch: %{rust_arches} - rust-encoding_rs ExclusiveArch: %{rust_arches} - rust-encoding_rs_io ExclusiveArch: %{rust_arches} - rust-entities ExclusiveArch: %{rust_arches} - rust-enum-as-inner ExclusiveArch: %{rust_arches} - rust-enum-repr ExclusiveArch: %{rust_arches} - rust-enum_primitive ExclusiveArch: %{rust_arches} - rust-enumflags2 ExclusiveArch: %{rust_arches} - rust-enumflags2_derive ExclusiveArch: %{rust_arches} - rust-env_logger ExclusiveArch: %{rust_arches} - rust-env_logger0.4 ExclusiveArch: %{rust_arches} - rust-env_logger0.5 ExclusiveArch: %{rust_arches} - rust-env_logger0.6 ExclusiveArch: %{rust_arches} - rust-env_logger0.7 ExclusiveArch: %{rust_arches} - rust-environment ExclusiveArch: %{rust_arches} - rust-envsubst ExclusiveArch: %{rust_arches} - rust-erased-serde ExclusiveArch: %{rust_arches} - rust-err-derive ExclusiveArch: %{rust_arches} - rust-errln ExclusiveArch: %{rust_arches} - rust-errno ExclusiveArch: %{rust_arches} - rust-error-chain ExclusiveArch: %{rust_arches} - rust-escaper ExclusiveArch: %{rust_arches} - rust-escargot ExclusiveArch: %{rust_arches} - rust-euclid ExclusiveArch: %{rust_arches} - rust-exa ExclusiveArch: %{rust_arches} - rust-expat-sys ExclusiveArch: %{rust_arches} - rust-extend ExclusiveArch: %{rust_arches} - rust-extprim ExclusiveArch: %{rust_arches} - rust-extprim_literals_macros ExclusiveArch: %{rust_arches} - rust-fail ExclusiveArch: %{rust_arches} - rust-failure ExclusiveArch: %{rust_arches} - rust-failure-tools ExclusiveArch: %{rust_arches} - rust-failure_derive ExclusiveArch: %{rust_arches} - rust-fake ExclusiveArch: %{rust_arches} - rust-fake-simd ExclusiveArch: %{rust_arches} - rust-fake_clock ExclusiveArch: %{rust_arches} - rust-fallible-iterator ExclusiveArch: %{rust_arches} - rust-fallible-streaming-iterator ExclusiveArch: %{rust_arches} - rust-fastrand ExclusiveArch: %{rust_arches} - rust-fbthrift_codegen_includer_proc_macro ExclusiveArch: %{rust_arches} - rust-fd-find ExclusiveArch: %{rust_arches} - rust-fdlimit ExclusiveArch: %{rust_arches} - rust-fedora ExclusiveArch: %{rust_arches} - rust-fedora-coreos-pinger ExclusiveArch: %{rust_arches} - rust-fedora-update-feedback ExclusiveArch: %{rust_arches} - rust-feed-rs ExclusiveArch: %{rust_arches} - rust-feedbin_api ExclusiveArch: %{rust_arches} - rust-feedly_api ExclusiveArch: %{rust_arches} - rust-fern ExclusiveArch: %{rust_arches} - rust-fever_api ExclusiveArch: %{rust_arches} - rust-ffsend ExclusiveArch: %{rust_arches} - rust-ffsend-api ExclusiveArch: %{rust_arches} - rust-filesize ExclusiveArch: %{rust_arches} - rust-filetime ExclusiveArch: %{rust_arches} - rust-findshlibs ExclusiveArch: %{rust_arches} - rust-fixedbitset ExclusiveArch: %{rust_arches} - rust-flame ExclusiveArch: %{rust_arches} - rust-flate2 ExclusiveArch: %{rust_arches} - rust-float-cmp ExclusiveArch: %{rust_arches} - rust-float-cmp0.6 ExclusiveArch: %{rust_arches} - rust-float-ord ExclusiveArch: %{rust_arches} - rust-flume ExclusiveArch: %{rust_arches} - rust-fnv ExclusiveArch: %{rust_arches} - rust-font-kit ExclusiveArch: %{rust_arches} - rust-foreign-types ExclusiveArch: %{rust_arches} - rust-foreign-types-macros ExclusiveArch: %{rust_arches} - rust-foreign-types-shared ExclusiveArch: %{rust_arches} - rust-foreign-types-shared0.1 ExclusiveArch: %{rust_arches} - rust-foreign-types0.3 ExclusiveArch: %{rust_arches} - rust-form_urlencoded ExclusiveArch: %{rust_arches} - rust-fragile ExclusiveArch: %{rust_arches} - rust-freetype ExclusiveArch: %{rust_arches} - rust-freetype-rs ExclusiveArch: %{rust_arches} - rust-freetype-sys ExclusiveArch: %{rust_arches} - rust-fs2 ExclusiveArch: %{rust_arches} - rust-fs_extra ExclusiveArch: %{rust_arches} - rust-funty ExclusiveArch: %{rust_arches} - rust-fuse ExclusiveArch: %{rust_arches} - rust-futf ExclusiveArch: %{rust_arches} - rust-futures ExclusiveArch: %{rust_arches} - rust-futures-channel ExclusiveArch: %{rust_arches} - rust-futures-core ExclusiveArch: %{rust_arches} - rust-futures-cpupool ExclusiveArch: %{rust_arches} - rust-futures-executor ExclusiveArch: %{rust_arches} - rust-futures-io ExclusiveArch: %{rust_arches} - rust-futures-lite ExclusiveArch: %{rust_arches} - rust-futures-macro ExclusiveArch: %{rust_arches} - rust-futures-sink ExclusiveArch: %{rust_arches} - rust-futures-task ExclusiveArch: %{rust_arches} - rust-futures-timer ExclusiveArch: %{rust_arches} - rust-futures-util ExclusiveArch: %{rust_arches} - rust-futures0.1 ExclusiveArch: %{rust_arches} - rust-fuzzy-matcher ExclusiveArch: %{rust_arches} - rust-fxhash ExclusiveArch: %{rust_arches} - rust-gcsf ExclusiveArch: %{rust_arches} - rust-gdk ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf-sys ExclusiveArch: %{rust_arches} - rust-gdk-sys ExclusiveArch: %{rust_arches} - rust-generic-array ExclusiveArch: %{rust_arches} - rust-generic-array0.12 ExclusiveArch: %{rust_arches} - rust-getch ExclusiveArch: %{rust_arches} - rust-gethostname ExclusiveArch: %{rust_arches} - rust-getopts ExclusiveArch: %{rust_arches} - rust-getrandom ExclusiveArch: %{rust_arches} - rust-getrandom0.1 ExclusiveArch: %{rust_arches} - rust-gettext-rs ExclusiveArch: %{rust_arches} - rust-gettext-sys ExclusiveArch: %{rust_arches} - rust-ghash ExclusiveArch: %{rust_arches} - rust-ghost ExclusiveArch: %{rust_arches} - rust-gif ExclusiveArch: %{rust_arches} - rust-gif0.10 ExclusiveArch: %{rust_arches} - rust-gimli ExclusiveArch: %{rust_arches} - rust-gio ExclusiveArch: %{rust_arches} - rust-gio-sys ExclusiveArch: %{rust_arches} - rust-gir-format-check ExclusiveArch: %{rust_arches} - rust-git-delta ExclusiveArch: %{rust_arches} - rust-git2 ExclusiveArch: %{rust_arches} - rust-git2-curl ExclusiveArch: %{rust_arches} - rust-gitui ExclusiveArch: %{rust_arches} - rust-gl_generator ExclusiveArch: %{rust_arches} - rust-glib ExclusiveArch: %{rust_arches} - rust-glib-macros ExclusiveArch: %{rust_arches} - rust-glib-sys ExclusiveArch: %{rust_arches} - rust-glob ExclusiveArch: %{rust_arches} - rust-globset ExclusiveArch: %{rust_arches} - rust-globwalk ExclusiveArch: %{rust_arches} - rust-glutin ExclusiveArch: %{rust_arches} - rust-glutin_egl_sys ExclusiveArch: %{rust_arches} - rust-glutin_glx_sys ExclusiveArch: %{rust_arches} - rust-gobject-sys ExclusiveArch: %{rust_arches} - rust-goblin ExclusiveArch: %{rust_arches} - rust-google-drive3-fork ExclusiveArch: %{rust_arches} - rust-gptman ExclusiveArch: %{rust_arches} - rust-grep ExclusiveArch: %{rust_arches} - rust-grep-cli ExclusiveArch: %{rust_arches} - rust-grep-matcher ExclusiveArch: %{rust_arches} - rust-grep-pcre2 ExclusiveArch: %{rust_arches} - rust-grep-printer ExclusiveArch: %{rust_arches} - rust-grep-regex ExclusiveArch: %{rust_arches} - rust-grep-searcher ExclusiveArch: %{rust_arches} - rust-groupable ExclusiveArch: %{rust_arches} - rust-gspell ExclusiveArch: %{rust_arches} - rust-gspell-sys ExclusiveArch: %{rust_arches} - rust-gstreamer ExclusiveArch: %{rust_arches} - rust-gstreamer-audio ExclusiveArch: %{rust_arches} - rust-gstreamer-audio-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-base ExclusiveArch: %{rust_arches} - rust-gstreamer-base-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-editing-services ExclusiveArch: %{rust_arches} - rust-gstreamer-editing-services-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-pbutils ExclusiveArch: %{rust_arches} - rust-gstreamer-pbutils-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-player ExclusiveArch: %{rust_arches} - rust-gstreamer-player-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-video ExclusiveArch: %{rust_arches} - rust-gstreamer-video-sys ExclusiveArch: %{rust_arches} - rust-gtk ExclusiveArch: %{rust_arches} - rust-gtk-macros ExclusiveArch: %{rust_arches} - rust-gtk-rs-lgpl-docs ExclusiveArch: %{rust_arches} - rust-gtk-source-sys ExclusiveArch: %{rust_arches} - rust-gtk-sys ExclusiveArch: %{rust_arches} - rust-gzip-header ExclusiveArch: %{rust_arches} - rust-h2 ExclusiveArch: %{rust_arches} - rust-h2_0.2 ExclusiveArch: %{rust_arches} - rust-half ExclusiveArch: %{rust_arches} - rust-hamcrest ExclusiveArch: %{rust_arches} - rust-handlebars ExclusiveArch: %{rust_arches} - rust-hashbrown ExclusiveArch: %{rust_arches} - rust-hashlink ExclusiveArch: %{rust_arches} - rust-headers ExclusiveArch: %{rust_arches} - rust-headers-core ExclusiveArch: %{rust_arches} - rust-headers-derive ExclusiveArch: %{rust_arches} - rust-heapsize ExclusiveArch: %{rust_arches} - rust-heatseeker ExclusiveArch: %{rust_arches} - rust-heck ExclusiveArch: %{rust_arches} - rust-hex ExclusiveArch: %{rust_arches} - rust-hex-literal ExclusiveArch: %{rust_arches} - rust-hex-literal-impl ExclusiveArch: %{rust_arches} - rust-hex-literal0.2 ExclusiveArch: %{rust_arches} - rust-hexyl ExclusiveArch: %{rust_arches} - rust-hkdf ExclusiveArch: %{rust_arches} - rust-hmac ExclusiveArch: %{rust_arches} - rust-home ExclusiveArch: %{rust_arches} - rust-horrorshow ExclusiveArch: %{rust_arches} - rust-hostname ExclusiveArch: %{rust_arches} - rust-hostname-validator ExclusiveArch: %{rust_arches} - rust-html2pango ExclusiveArch: %{rust_arches} - rust-html5ever ExclusiveArch: %{rust_arches} - rust-http ExclusiveArch: %{rust_arches} - rust-http-body ExclusiveArch: %{rust_arches} - rust-http-body0.3 ExclusiveArch: %{rust_arches} - rust-http0.1 ExclusiveArch: %{rust_arches} - rust-httparse ExclusiveArch: %{rust_arches} - rust-httpdate ExclusiveArch: %{rust_arches} - rust-human-sort ExclusiveArch: %{rust_arches} - rust-humansize ExclusiveArch: %{rust_arches} - rust-humantime ExclusiveArch: %{rust_arches} - rust-humantime-serde ExclusiveArch: %{rust_arches} - rust-humantime1 ExclusiveArch: %{rust_arches} - rust-hyper ExclusiveArch: %{rust_arches} - rust-hyper-native-tls ExclusiveArch: %{rust_arches} - rust-hyper-staticfile ExclusiveArch: %{rust_arches} - rust-hyper-tls ExclusiveArch: %{rust_arches} - rust-hyper-tls0.4 ExclusiveArch: %{rust_arches} - rust-hyper0.10 ExclusiveArch: %{rust_arches} - rust-hyper0.13 ExclusiveArch: %{rust_arches} - rust-hyperfine ExclusiveArch: %{rust_arches} - rust-i3ipc ExclusiveArch: %{rust_arches} - rust-id_tree ExclusiveArch: %{rust_arches} - rust-ident_case ExclusiveArch: %{rust_arches} - rust-idna ExclusiveArch: %{rust_arches} - rust-idna0.1 ExclusiveArch: %{rust_arches} - rust-ignore ExclusiveArch: %{rust_arches} - rust-im-rc ExclusiveArch: %{rust_arches} - rust-image ExclusiveArch: %{rust_arches} - rust-imgref ExclusiveArch: %{rust_arches} - rust-indexmap ExclusiveArch: %{rust_arches} - rust-indicatif ExclusiveArch: %{rust_arches} - rust-indoc ExclusiveArch: %{rust_arches} - rust-inflate ExclusiveArch: %{rust_arches} - rust-inotify ExclusiveArch: %{rust_arches} - rust-inotify-sys ExclusiveArch: %{rust_arches} - rust-input_buffer ExclusiveArch: %{rust_arches} - rust-insta ExclusiveArch: %{rust_arches} - rust-instant ExclusiveArch: %{rust_arches} - rust-interpolate_name ExclusiveArch: %{rust_arches} - rust-intervaltree ExclusiveArch: %{rust_arches} - rust-invalidstring ExclusiveArch: %{rust_arches} - rust-inventory ExclusiveArch: %{rust_arches} - rust-inventory-impl ExclusiveArch: %{rust_arches} - rust-iocuddle ExclusiveArch: %{rust_arches} - rust-iovec ExclusiveArch: %{rust_arches} - rust-ipnet ExclusiveArch: %{rust_arches} - rust-ipnetwork ExclusiveArch: %{rust_arches} - rust-iron ExclusiveArch: %{rust_arches} - rust-isahc ExclusiveArch: %{rust_arches} - rust-iso8601 ExclusiveArch: %{rust_arches} - rust-iter-read ExclusiveArch: %{rust_arches} - rust-itertools ExclusiveArch: %{rust_arches} - rust-itertools-num ExclusiveArch: %{rust_arches} - rust-itertools0.8 ExclusiveArch: %{rust_arches} - rust-itertools0.9 ExclusiveArch: %{rust_arches} - rust-itoa ExclusiveArch: %{rust_arches} - rust-ivf ExclusiveArch: %{rust_arches} - rust-javascriptcore-rs ExclusiveArch: %{rust_arches} - rust-javascriptcore-rs-sys ExclusiveArch: %{rust_arches} - rust-jetscii ExclusiveArch: %{rust_arches} - rust-jieba-rs ExclusiveArch: %{rust_arches} - rust-jobserver ExclusiveArch: %{rust_arches} - rust-jpeg-decoder ExclusiveArch: %{rust_arches} - rust-jql ExclusiveArch: %{rust_arches} - rust-js-sys ExclusiveArch: %{rust_arches} - rust-js_int ExclusiveArch: %{rust_arches} - rust-json ExclusiveArch: %{rust_arches} - rust-jwalk ExclusiveArch: %{rust_arches} - rust-keccak ExclusiveArch: %{rust_arches} - rust-khronos_api ExclusiveArch: %{rust_arches} - rust-kstring ExclusiveArch: %{rust_arches} - rust-kv-log-macro ExclusiveArch: %{rust_arches} - rust-lab ExclusiveArch: %{rust_arches} - rust-lalrpop ExclusiveArch: %{rust_arches} - rust-lalrpop-util ExclusiveArch: %{rust_arches} - rust-language-tags ExclusiveArch: %{rust_arches} - rust-lazy-init ExclusiveArch: %{rust_arches} - rust-lazy_static ExclusiveArch: %{rust_arches} - rust-lazycell ExclusiveArch: %{rust_arches} - rust-leb128 ExclusiveArch: %{rust_arches} - rust-letter-avatar ExclusiveArch: %{rust_arches} - rust-lexical-core ExclusiveArch: %{rust_arches} - rust-libc ExclusiveArch: %{rust_arches} - rust-libcryptsetup-rs ExclusiveArch: %{rust_arches} - rust-libcryptsetup-rs-sys ExclusiveArch: %{rust_arches} - rust-libdbus-sys ExclusiveArch: %{rust_arches} - rust-libflate ExclusiveArch: %{rust_arches} - rust-libflate_lz77 ExclusiveArch: %{rust_arches} - rust-libgit2-sys ExclusiveArch: %{rust_arches} - rust-libhandy ExclusiveArch: %{rust_arches} - rust-libhandy-sys ExclusiveArch: %{rust_arches} - rust-libloading ExclusiveArch: %{rust_arches} - rust-libloading0.6 ExclusiveArch: %{rust_arches} - rust-libm ExclusiveArch: %{rust_arches} - rust-libmount ExclusiveArch: %{rust_arches} - rust-libnotcurses-sys ExclusiveArch: %{rust_arches} - rust-liboverdrop ExclusiveArch: %{rust_arches} - rust-libpulse-binding ExclusiveArch: %{rust_arches} - rust-libpulse-sys ExclusiveArch: %{rust_arches} - rust-libslirp ExclusiveArch: %{rust_arches} - rust-libslirp-sys ExclusiveArch: %{rust_arches} - rust-libsqlite3-sys ExclusiveArch: %{rust_arches} - rust-libssh2-sys ExclusiveArch: %{rust_arches} - rust-libsystemd ExclusiveArch: %{rust_arches} - rust-libsystemd-sys ExclusiveArch: %{rust_arches} - rust-libudev ExclusiveArch: %{rust_arches} - rust-libudev-sys ExclusiveArch: %{rust_arches} - rust-libxml ExclusiveArch: %{rust_arches} - rust-libz-sys ExclusiveArch: %{rust_arches} - rust-line-wrap ExclusiveArch: %{rust_arches} - rust-line_drawing ExclusiveArch: %{rust_arches} - rust-link-cplusplus ExclusiveArch: %{rust_arches} - rust-linked-hash-map ExclusiveArch: %{rust_arches} - rust-linkify ExclusiveArch: %{rust_arches} - rust-lipsum ExclusiveArch: %{rust_arches} - rust-liquid ExclusiveArch: %{rust_arches} - rust-liquid-core ExclusiveArch: %{rust_arches} - rust-liquid-derive ExclusiveArch: %{rust_arches} - rust-liquid-lib ExclusiveArch: %{rust_arches} - rust-listenfd ExclusiveArch: %{rust_arches} - rust-lmdb ExclusiveArch: %{rust_arches} - rust-lmdb-sys ExclusiveArch: %{rust_arches} - rust-locale ExclusiveArch: %{rust_arches} - rust-locale_config ExclusiveArch: %{rust_arches} - rust-lock_api ExclusiveArch: %{rust_arches} - rust-lockfree ExclusiveArch: %{rust_arches} - rust-log ExclusiveArch: %{rust_arches} - rust-log-mdc ExclusiveArch: %{rust_arches} - rust-log-panics ExclusiveArch: %{rust_arches} - rust-log0.3 ExclusiveArch: %{rust_arches} - rust-log4rs ExclusiveArch: %{rust_arches} - rust-loggerv ExclusiveArch: %{rust_arches} - rust-loopdev ExclusiveArch: %{rust_arches} - rust-lru-cache ExclusiveArch: %{rust_arches} - rust-lru_time_cache ExclusiveArch: %{rust_arches} - rust-lscolors ExclusiveArch: %{rust_arches} - rust-lsd ExclusiveArch: %{rust_arches} - rust-lzma-sys ExclusiveArch: %{rust_arches} - rust-lzw ExclusiveArch: %{rust_arches} - rust-mac ExclusiveArch: %{rust_arches} - rust-macro-attr ExclusiveArch: %{rust_arches} - rust-magic-crypt ExclusiveArch: %{rust_arches} - rust-maildir ExclusiveArch: %{rust_arches} - rust-mailparse ExclusiveArch: %{rust_arches} - rust-man ExclusiveArch: %{rust_arches} - rust-maplit ExclusiveArch: %{rust_arches} - rust-markup5ever ExclusiveArch: %{rust_arches} - rust-markup5ever_rcdom ExclusiveArch: %{rust_arches} - rust-match_cfg ExclusiveArch: %{rust_arches} - rust-matches ExclusiveArch: %{rust_arches} - rust-matrixmultiply ExclusiveArch: %{rust_arches} - rust-maxminddb ExclusiveArch: %{rust_arches} - rust-maybe-uninit ExclusiveArch: %{rust_arches} - rust-mbox ExclusiveArch: %{rust_arches} - rust-mbrman ExclusiveArch: %{rust_arches} - rust-md-5 ExclusiveArch: %{rust_arches} - rust-md5 ExclusiveArch: %{rust_arches} - rust-mdl ExclusiveArch: %{rust_arches} - rust-memchr ExclusiveArch: %{rust_arches} - rust-memmap ExclusiveArch: %{rust_arches} - rust-memmap2 ExclusiveArch: %{rust_arches} - rust-memoffset ExclusiveArch: %{rust_arches} - rust-memoffset0.5 ExclusiveArch: %{rust_arches} - rust-memsec ExclusiveArch: %{rust_arches} - rust-metadeps ExclusiveArch: %{rust_arches} - rust-migrations_internals ExclusiveArch: %{rust_arches} - rust-migrations_macros ExclusiveArch: %{rust_arches} - rust-mime ExclusiveArch: %{rust_arches} - rust-mime-sniffer ExclusiveArch: %{rust_arches} - rust-mime0.2 ExclusiveArch: %{rust_arches} - rust-mime_guess ExclusiveArch: %{rust_arches} - rust-mime_guess1 ExclusiveArch: %{rust_arches} - rust-miniflux_api ExclusiveArch: %{rust_arches} - rust-minify-html ExclusiveArch: %{rust_arches} - rust-miniz-sys ExclusiveArch: %{rust_arches} - rust-miniz_oxide ExclusiveArch: %{rust_arches} - rust-miniz_oxide0.3 ExclusiveArch: %{rust_arches} - rust-miniz_oxide_c_api ExclusiveArch: %{rust_arches} - rust-mint ExclusiveArch: %{rust_arches} - rust-mio ExclusiveArch: %{rust_arches} - rust-mio-extras ExclusiveArch: %{rust_arches} - rust-mio-uds ExclusiveArch: %{rust_arches} - rust-mio0.6 ExclusiveArch: %{rust_arches} - rust-mktemp ExclusiveArch: %{rust_arches} - rust-mnt ExclusiveArch: %{rust_arches} - rust-mockito ExclusiveArch: %{rust_arches} - rust-modifier ExclusiveArch: %{rust_arches} - rust-more-asserts ExclusiveArch: %{rust_arches} - rust-muldiv ExclusiveArch: %{rust_arches} - rust-multimap ExclusiveArch: %{rust_arches} - rust-multipart ExclusiveArch: %{rust_arches} - rust-mustache ExclusiveArch: %{rust_arches} - rust-nasm-rs ExclusiveArch: %{rust_arches} - rust-native-tls ExclusiveArch: %{rust_arches} - rust-natord ExclusiveArch: %{rust_arches} - rust-nb-connect ExclusiveArch: %{rust_arches} - rust-net2 ExclusiveArch: %{rust_arches} - rust-netlink-packet-core ExclusiveArch: %{rust_arches} - rust-netlink-packet-route ExclusiveArch: %{rust_arches} - rust-netlink-packet-utils ExclusiveArch: %{rust_arches} - rust-netlink-proto ExclusiveArch: %{rust_arches} - rust-netlink-sys ExclusiveArch: %{rust_arches} - rust-netmap_sys ExclusiveArch: %{rust_arches} - rust-nettle ExclusiveArch: %{rust_arches} - rust-nettle-sys ExclusiveArch: %{rust_arches} - rust-new_debug_unreachable ExclusiveArch: %{rust_arches} - rust-news-flash ExclusiveArch: %{rust_arches} - rust-newsblur_api ExclusiveArch: %{rust_arches} - rust-newtype_derive ExclusiveArch: %{rust_arches} - rust-nickel ExclusiveArch: %{rust_arches} - rust-nix ExclusiveArch: %{rust_arches} - rust-nix0.14 ExclusiveArch: %{rust_arches} - rust-nix0.17 ExclusiveArch: %{rust_arches} - rust-nix0.18 ExclusiveArch: %{rust_arches} - rust-no-panic ExclusiveArch: %{rust_arches} - rust-nodrop ExclusiveArch: %{rust_arches} - rust-nom ExclusiveArch: %{rust_arches} - rust-nom4 ExclusiveArch: %{rust_arches} - rust-nom5 ExclusiveArch: %{rust_arches} - rust-noop_proc_macro ExclusiveArch: %{rust_arches} - rust-normalize-line-endings ExclusiveArch: %{rust_arches} - rust-notify ExclusiveArch: %{rust_arches} - rust-notify-rust ExclusiveArch: %{rust_arches} - rust-num ExclusiveArch: %{rust_arches} - rust-num-bigint ExclusiveArch: %{rust_arches} - rust-num-bigint-dig ExclusiveArch: %{rust_arches} - rust-num-complex ExclusiveArch: %{rust_arches} - rust-num-derive ExclusiveArch: %{rust_arches} - rust-num-integer ExclusiveArch: %{rust_arches} - rust-num-iter ExclusiveArch: %{rust_arches} - rust-num-rational ExclusiveArch: %{rust_arches} - rust-num-traits ExclusiveArch: %{rust_arches} - rust-num-traits0.1 ExclusiveArch: %{rust_arches} - rust-num_cpus ExclusiveArch: %{rust_arches} - rust-number_prefix ExclusiveArch: %{rust_arches} - rust-numtoa ExclusiveArch: %{rust_arches} - rust-oauth2 ExclusiveArch: %{rust_arches} - rust-obfstr ExclusiveArch: %{rust_arches} - rust-object ExclusiveArch: %{rust_arches} - rust-odds ExclusiveArch: %{rust_arches} - rust-oid ExclusiveArch: %{rust_arches} - rust-once_cell ExclusiveArch: %{rust_arches} - rust-onig ExclusiveArch: %{rust_arches} - rust-onig_sys ExclusiveArch: %{rust_arches} - rust-oorandom ExclusiveArch: %{rust_arches} - rust-opaque-debug ExclusiveArch: %{rust_arches} - rust-open ExclusiveArch: %{rust_arches} - rust-openat ExclusiveArch: %{rust_arches} - rust-openat-ext ExclusiveArch: %{rust_arches} - rust-opener ExclusiveArch: %{rust_arches} - rust-openssh-keys ExclusiveArch: %{rust_arches} - rust-openssl ExclusiveArch: %{rust_arches} - rust-openssl-probe ExclusiveArch: %{rust_arches} - rust-openssl-sys ExclusiveArch: %{rust_arches} - rust-ord_subset ExclusiveArch: %{rust_arches} - rust-ordered-float ExclusiveArch: %{rust_arches} - rust-ordered-multimap ExclusiveArch: %{rust_arches} - rust-os_info ExclusiveArch: %{rust_arches} - rust-os_pipe ExclusiveArch: %{rust_arches} - rust-os_str_bytes ExclusiveArch: %{rust_arches} - rust-osmesa-sys ExclusiveArch: %{rust_arches} - rust-osstrtools ExclusiveArch: %{rust_arches} - rust-ostree ExclusiveArch: %{rust_arches} - rust-ostree-sys ExclusiveArch: %{rust_arches} - rust-owned-alloc ExclusiveArch: %{rust_arches} - rust-owned_ttf_parser ExclusiveArch: %{rust_arches} - rust-owning_ref ExclusiveArch: %{rust_arches} - rust-packaging ExclusiveArch: %{rust_arches} - rust-pad ExclusiveArch: %{rust_arches} - rust-pager ExclusiveArch: %{rust_arches} - rust-palette ExclusiveArch: %{rust_arches} - rust-palette_derive ExclusiveArch: %{rust_arches} - rust-pango ExclusiveArch: %{rust_arches} - rust-pango-sys ExclusiveArch: %{rust_arches} - rust-pangocairo ExclusiveArch: %{rust_arches} - rust-pangocairo-sys ExclusiveArch: %{rust_arches} - rust-parity-wasm ExclusiveArch: %{rust_arches} - rust-parking ExclusiveArch: %{rust_arches} - rust-parking_lot ExclusiveArch: %{rust_arches} - rust-parking_lot_core ExclusiveArch: %{rust_arches} - rust-parse-zoneinfo ExclusiveArch: %{rust_arches} - rust-parse_cfg ExclusiveArch: %{rust_arches} - rust-parsec-client ExclusiveArch: %{rust_arches} - rust-parsec-interface ExclusiveArch: %{rust_arches} - rust-partial-io ExclusiveArch: %{rust_arches} - rust-paste ExclusiveArch: %{rust_arches} - rust-paste-impl ExclusiveArch: %{rust_arches} - rust-path-absolutize ExclusiveArch: %{rust_arches} - rust-path-dedot ExclusiveArch: %{rust_arches} - rust-path-slash ExclusiveArch: %{rust_arches} - rust-pathdiff ExclusiveArch: %{rust_arches} - rust-pathfinder_geometry ExclusiveArch: %{rust_arches} - rust-pathfinder_simd ExclusiveArch: %{rust_arches} - rust-pbr ExclusiveArch: %{rust_arches} - rust-pcap ExclusiveArch: %{rust_arches} - rust-pcre2 ExclusiveArch: %{rust_arches} - rust-pcre2-sys ExclusiveArch: %{rust_arches} - rust-peeking_take_while ExclusiveArch: %{rust_arches} - rust-peg ExclusiveArch: %{rust_arches} - rust-peg-macros ExclusiveArch: %{rust_arches} - rust-peg-runtime ExclusiveArch: %{rust_arches} - rust-peg0.5 ExclusiveArch: %{rust_arches} - rust-pem ExclusiveArch: %{rust_arches} - rust-percent-encoding ExclusiveArch: %{rust_arches} - rust-percent-encoding1 ExclusiveArch: %{rust_arches} - rust-peresil ExclusiveArch: %{rust_arches} - rust-permutate ExclusiveArch: %{rust_arches} - rust-permutohedron ExclusiveArch: %{rust_arches} - rust-pest ExclusiveArch: %{rust_arches} - rust-pest_derive ExclusiveArch: %{rust_arches} - rust-pest_generator ExclusiveArch: %{rust_arches} - rust-pest_meta ExclusiveArch: %{rust_arches} - rust-petgraph ExclusiveArch: %{rust_arches} - rust-phf ExclusiveArch: %{rust_arches} - rust-phf0.7 ExclusiveArch: %{rust_arches} - rust-phf_codegen ExclusiveArch: %{rust_arches} - rust-phf_codegen0.7 ExclusiveArch: %{rust_arches} - rust-phf_generator ExclusiveArch: %{rust_arches} - rust-phf_generator0.7 ExclusiveArch: %{rust_arches} - rust-phf_macros ExclusiveArch: %{rust_arches} - rust-phf_macros0.7 ExclusiveArch: %{rust_arches} - rust-phf_shared ExclusiveArch: %{rust_arches} - rust-phf_shared0.7 ExclusiveArch: %{rust_arches} - rust-picky-asn1 ExclusiveArch: %{rust_arches} - rust-picky-asn1-der ExclusiveArch: %{rust_arches} - rust-picky-asn1-x509 ExclusiveArch: %{rust_arches} - rust-pico-args ExclusiveArch: %{rust_arches} - rust-pin-project ExclusiveArch: %{rust_arches} - rust-pin-project-internal ExclusiveArch: %{rust_arches} - rust-pin-project-internal0.4 ExclusiveArch: %{rust_arches} - rust-pin-project-lite ExclusiveArch: %{rust_arches} - rust-pin-project-lite0.1 ExclusiveArch: %{rust_arches} - rust-pin-project0.4 ExclusiveArch: %{rust_arches} - rust-pin-utils ExclusiveArch: %{rust_arches} - rust-pipe ExclusiveArch: %{rust_arches} - rust-piper ExclusiveArch: %{rust_arches} - rust-pkcs11 ExclusiveArch: %{rust_arches} - rust-pkg-config ExclusiveArch: %{rust_arches} - rust-plain ExclusiveArch: %{rust_arches} - rust-platform-dirs ExclusiveArch: %{rust_arches} - rust-platforms ExclusiveArch: %{rust_arches} - rust-plist ExclusiveArch: %{rust_arches} - rust-plotters ExclusiveArch: %{rust_arches} - rust-plugin ExclusiveArch: %{rust_arches} - rust-pnet_base ExclusiveArch: %{rust_arches} - rust-pnet_datalink ExclusiveArch: %{rust_arches} - rust-pnet_sys ExclusiveArch: %{rust_arches} - rust-png ExclusiveArch: %{rust_arches} - rust-podio ExclusiveArch: %{rust_arches} - rust-polling ExclusiveArch: %{rust_arches} - rust-polyval ExclusiveArch: %{rust_arches} - rust-pommes ExclusiveArch: %{rust_arches} - rust-ppv-lite86 ExclusiveArch: %{rust_arches} - rust-pq-sys ExclusiveArch: %{rust_arches} - rust-precomputed-hash ExclusiveArch: %{rust_arches} - rust-predicates ExclusiveArch: %{rust_arches} - rust-predicates-core ExclusiveArch: %{rust_arches} - rust-predicates-tree ExclusiveArch: %{rust_arches} - rust-pretty-git-prompt ExclusiveArch: %{rust_arches} - rust-pretty-hex ExclusiveArch: %{rust_arches} - rust-pretty_assertions ExclusiveArch: %{rust_arches} - rust-pretty_assertions0.6 ExclusiveArch: %{rust_arches} - rust-pretty_env_logger ExclusiveArch: %{rust_arches} - rust-prettytable-rs ExclusiveArch: %{rust_arches} - rust-proc-macro-crate ExclusiveArch: %{rust_arches} - rust-proc-macro-error ExclusiveArch: %{rust_arches} - rust-proc-macro-error-attr ExclusiveArch: %{rust_arches} - rust-proc-macro-hack ExclusiveArch: %{rust_arches} - rust-proc-macro-nested ExclusiveArch: %{rust_arches} - rust-proc-macro2 ExclusiveArch: %{rust_arches} - rust-proc-macro2-0.4 ExclusiveArch: %{rust_arches} - rust-proc-quote ExclusiveArch: %{rust_arches} - rust-proc-quote-impl ExclusiveArch: %{rust_arches} - rust-procedural-masquerade ExclusiveArch: %{rust_arches} - rust-process_path ExclusiveArch: %{rust_arches} - rust-procfs ExclusiveArch: %{rust_arches} - rust-procfs0.8 ExclusiveArch: %{rust_arches} - rust-procs ExclusiveArch: %{rust_arches} - rust-progress-streams ExclusiveArch: %{rust_arches} - rust-prometheus ExclusiveArch: %{rust_arches} - rust-proptest ExclusiveArch: %{rust_arches} - rust-proptest-derive ExclusiveArch: %{rust_arches} - rust-prost ExclusiveArch: %{rust_arches} - rust-prost-build ExclusiveArch: %{rust_arches} - rust-prost-derive ExclusiveArch: %{rust_arches} - rust-prost-types ExclusiveArch: %{rust_arches} - rust-protobuf ExclusiveArch: %{rust_arches} - rust-protobuf-codegen ExclusiveArch: %{rust_arches} - rust-protobuf-codegen-pure ExclusiveArch: %{rust_arches} - rust-protoc ExclusiveArch: %{rust_arches} - rust-protoc-rust ExclusiveArch: %{rust_arches} - rust-psa-crypto ExclusiveArch: %{rust_arches} - rust-psa-crypto-sys ExclusiveArch: %{rust_arches} - rust-psm ExclusiveArch: %{rust_arches} - rust-psutil ExclusiveArch: %{rust_arches} - rust-publicsuffix ExclusiveArch: %{rust_arches} - rust-pulldown-cmark ExclusiveArch: %{rust_arches} - rust-pulse ExclusiveArch: %{rust_arches} - rust-pure-rust-locales ExclusiveArch: %{rust_arches} - rust-pyo3 ExclusiveArch: %{rust_arches} - rust-pyo3-macros ExclusiveArch: %{rust_arches} - rust-pyo3-macros-backend ExclusiveArch: %{rust_arches} - rust-python3-sys ExclusiveArch: %{rust_arches} - rust-qr2term ExclusiveArch: %{rust_arches} - rust-qrcode ExclusiveArch: %{rust_arches} - rust-qstring ExclusiveArch: %{rust_arches} - rust-quick-error ExclusiveArch: %{rust_arches} - rust-quick-error1 ExclusiveArch: %{rust_arches} - rust-quick-xml ExclusiveArch: %{rust_arches} - rust-quickcheck ExclusiveArch: %{rust_arches} - rust-quickcheck0.6 ExclusiveArch: %{rust_arches} - rust-quickcheck0.9 ExclusiveArch: %{rust_arches} - rust-quickcheck_macros ExclusiveArch: %{rust_arches} - rust-quickersort ExclusiveArch: %{rust_arches} - rust-quote ExclusiveArch: %{rust_arches} - rust-quote0.3 ExclusiveArch: %{rust_arches} - rust-quote0.6 ExclusiveArch: %{rust_arches} - rust-quoted_printable ExclusiveArch: %{rust_arches} - rust-r2d2 ExclusiveArch: %{rust_arches} - rust-radium ExclusiveArch: %{rust_arches} - rust-rand ExclusiveArch: %{rust_arches} - rust-rand0.4 ExclusiveArch: %{rust_arches} - rust-rand0.5 ExclusiveArch: %{rust_arches} - rust-rand0.6 ExclusiveArch: %{rust_arches} - rust-rand0.7 ExclusiveArch: %{rust_arches} - rust-rand_chacha ExclusiveArch: %{rust_arches} - rust-rand_chacha0.1 ExclusiveArch: %{rust_arches} - rust-rand_chacha0.2 ExclusiveArch: %{rust_arches} - rust-rand_core ExclusiveArch: %{rust_arches} - rust-rand_core0.3 ExclusiveArch: %{rust_arches} - rust-rand_core0.4 ExclusiveArch: %{rust_arches} - rust-rand_core0.5 ExclusiveArch: %{rust_arches} - rust-rand_distr ExclusiveArch: %{rust_arches} - rust-rand_distr0.2 ExclusiveArch: %{rust_arches} - rust-rand_hc ExclusiveArch: %{rust_arches} - rust-rand_hc0.1 ExclusiveArch: %{rust_arches} - rust-rand_isaac ExclusiveArch: %{rust_arches} - rust-rand_isaac0.1 ExclusiveArch: %{rust_arches} - rust-rand_jitter ExclusiveArch: %{rust_arches} - rust-rand_jitter0.1 ExclusiveArch: %{rust_arches} - rust-rand_os ExclusiveArch: %{rust_arches} - rust-rand_os0.1 ExclusiveArch: %{rust_arches} - rust-rand_pcg ExclusiveArch: %{rust_arches} - rust-rand_pcg0.1 ExclusiveArch: %{rust_arches} - rust-rand_pcg0.2 ExclusiveArch: %{rust_arches} - rust-rand_xorshift ExclusiveArch: %{rust_arches} - rust-rand_xorshift0.1 ExclusiveArch: %{rust_arches} - rust-rand_xoshiro ExclusiveArch: %{rust_arches} - rust-random-fast-rng ExclusiveArch: %{rust_arches} - rust-random-trait ExclusiveArch: %{rust_arches} - rust-randomize ExclusiveArch: %{rust_arches} - rust-rav1e ExclusiveArch: %{rust_arches} - rust-raw-window-handle ExclusiveArch: %{rust_arches} - rust-rawpointer ExclusiveArch: %{rust_arches} - rust-rawslice ExclusiveArch: %{rust_arches} - rust-rayon ExclusiveArch: %{rust_arches} - rust-rayon-core ExclusiveArch: %{rust_arches} - rust-readability-fork ExclusiveArch: %{rust_arches} - rust-readwrite ExclusiveArch: %{rust_arches} - rust-recycler ExclusiveArch: %{rust_arches} - rust-ref-cast ExclusiveArch: %{rust_arches} - rust-ref-cast-impl ExclusiveArch: %{rust_arches} - rust-regex ExclusiveArch: %{rust_arches} - rust-regex-automata ExclusiveArch: %{rust_arches} - rust-regex-syntax ExclusiveArch: %{rust_arches} - rust-region ExclusiveArch: %{rust_arches} - rust-relative-path ExclusiveArch: %{rust_arches} - rust-relay ExclusiveArch: %{rust_arches} - rust-remove_dir_all ExclusiveArch: %{rust_arches} - rust-reqwest ExclusiveArch: %{rust_arches} - rust-reqwest0.10 ExclusiveArch: %{rust_arches} - rust-resize ExclusiveArch: %{rust_arches} - rust-resolv-conf ExclusiveArch: %{rust_arches} - rust-restson ExclusiveArch: %{rust_arches} - rust-retry ExclusiveArch: %{rust_arches} - rust-rgb ExclusiveArch: %{rust_arches} - rust-ring ExclusiveArch: %{rust_arches} - rust-ripgrep ExclusiveArch: %{rust_arches} - rust-rle-decode-fast ExclusiveArch: %{rust_arches} - rust-rmp ExclusiveArch: %{rust_arches} - rust-rmp-serde ExclusiveArch: %{rust_arches} - rust-roff ExclusiveArch: %{rust_arches} - rust-ron ExclusiveArch: %{rust_arches} - rust-roxmltree ExclusiveArch: %{rust_arches} - rust-rpassword ExclusiveArch: %{rust_arches} - rust-rpick ExclusiveArch: %{rust_arches} - rust-rsa ExclusiveArch: %{rust_arches} - rust-rspec ExclusiveArch: %{rust_arches} - rust-rtnetlink ExclusiveArch: %{rust_arches} - rust-ruma ExclusiveArch: %{rust_arches} - rust-ruma-api ExclusiveArch: %{rust_arches} - rust-ruma-api-macros ExclusiveArch: %{rust_arches} - rust-ruma-appservice-api ExclusiveArch: %{rust_arches} - rust-ruma-client-api ExclusiveArch: %{rust_arches} - rust-ruma-common ExclusiveArch: %{rust_arches} - rust-ruma-events ExclusiveArch: %{rust_arches} - rust-ruma-events-macros ExclusiveArch: %{rust_arches} - rust-ruma-federation-api ExclusiveArch: %{rust_arches} - rust-ruma-identifiers ExclusiveArch: %{rust_arches} - rust-ruma-identifiers-macros ExclusiveArch: %{rust_arches} - rust-ruma-identifiers-validation ExclusiveArch: %{rust_arches} - rust-ruma-identity-service-api ExclusiveArch: %{rust_arches} - rust-ruma-push-gateway-api ExclusiveArch: %{rust_arches} - rust-ruma-serde ExclusiveArch: %{rust_arches} - rust-ruma-serde-macros ExclusiveArch: %{rust_arches} - rust-ruma-signatures ExclusiveArch: %{rust_arches} - rust-rusqlite ExclusiveArch: %{rust_arches} - rust-rust-embed ExclusiveArch: %{rust_arches} - rust-rust-embed-impl ExclusiveArch: %{rust_arches} - rust-rust-embed-utils ExclusiveArch: %{rust_arches} - rust-rust-ini ExclusiveArch: %{rust_arches} - rust-rust-stemmers ExclusiveArch: %{rust_arches} - rust-rust_decimal ExclusiveArch: %{rust_arches} - rust-rust_hawktracer ExclusiveArch: %{rust_arches} - rust-rust_hawktracer_normal_macro ExclusiveArch: %{rust_arches} - rust-rust_hawktracer_proc_macro ExclusiveArch: %{rust_arches} - rust-rust_hawktracer_sys ExclusiveArch: %{rust_arches} - rust-rustc-demangle ExclusiveArch: %{rust_arches} - rust-rustc-hash ExclusiveArch: %{rust_arches} - rust-rustc-serialize ExclusiveArch: %{rust_arches} - rust-rustc-test ExclusiveArch: %{rust_arches} - rust-rustc_tools_util ExclusiveArch: %{rust_arches} - rust-rustc_version ExclusiveArch: %{rust_arches} - rust-rustdoc-stripper ExclusiveArch: %{rust_arches} - rust-rustfilt ExclusiveArch: %{rust_arches} - rust-rustfix ExclusiveArch: %{rust_arches} - rust-rustio ExclusiveArch: %{rust_arches} - rust-rusttype ExclusiveArch: %{rust_arches} - rust-rustversion ExclusiveArch: %{rust_arches} - rust-rusty-fork ExclusiveArch: %{rust_arches} - rust-rustyline ExclusiveArch: %{rust_arches} - rust-rustyline-derive ExclusiveArch: %{rust_arches} - rust-ryu ExclusiveArch: %{rust_arches} - rust-safe-transmute ExclusiveArch: %{rust_arches} - rust-safemem ExclusiveArch: %{rust_arches} - rust-same-file ExclusiveArch: %{rust_arches} - rust-sass-rs ExclusiveArch: %{rust_arches} - rust-sass-sys ExclusiveArch: %{rust_arches} - rust-scan_fmt ExclusiveArch: %{rust_arches} - rust-scheduled-thread-pool ExclusiveArch: %{rust_arches} - rust-scoped-tls ExclusiveArch: %{rust_arches} - rust-scoped-tls-hkt ExclusiveArch: %{rust_arches} - rust-scoped_threadpool ExclusiveArch: %{rust_arches} - rust-scopeguard ExclusiveArch: %{rust_arches} - rust-scopetime ExclusiveArch: %{rust_arches} - rust-scratch ExclusiveArch: %{rust_arches} - rust-scroll ExclusiveArch: %{rust_arches} - rust-scroll_derive ExclusiveArch: %{rust_arches} - rust-sct ExclusiveArch: %{rust_arches} - rust-sd ExclusiveArch: %{rust_arches} - rust-sd-notify ExclusiveArch: %{rust_arches} - rust-seahash ExclusiveArch: %{rust_arches} - rust-seahash3 ExclusiveArch: %{rust_arches} - rust-secrecy ExclusiveArch: %{rust_arches} - rust-secret-service ExclusiveArch: %{rust_arches} - rust-semver ExclusiveArch: %{rust_arches} - rust-semver-parser ExclusiveArch: %{rust_arches} - rust-semver-parser0.7 ExclusiveArch: %{rust_arches} - rust-semver-parser0.9 ExclusiveArch: %{rust_arches} - rust-semver0.10 ExclusiveArch: %{rust_arches} - rust-semver0.9 ExclusiveArch: %{rust_arches} - rust-sequoia-autocrypt ExclusiveArch: %{rust_arches} - rust-sequoia-ipc ExclusiveArch: %{rust_arches} - rust-sequoia-keyring-linter ExclusiveArch: %{rust_arches} - rust-sequoia-net ExclusiveArch: %{rust_arches} - rust-sequoia-octopus-librnp ExclusiveArch: %{rust_arches} - rust-sequoia-openpgp ExclusiveArch: %{rust_arches} - rust-sequoia-sop ExclusiveArch: %{rust_arches} - rust-sequoia-sq ExclusiveArch: %{rust_arches} - rust-sequoia-sqv ExclusiveArch: %{rust_arches} - rust-serde ExclusiveArch: %{rust_arches} - rust-serde-big-array ExclusiveArch: %{rust_arches} - rust-serde-pickle ExclusiveArch: %{rust_arches} - rust-serde-value ExclusiveArch: %{rust_arches} - rust-serde-xml-rs ExclusiveArch: %{rust_arches} - rust-serde_bytes ExclusiveArch: %{rust_arches} - rust-serde_cbor ExclusiveArch: %{rust_arches} - rust-serde_derive ExclusiveArch: %{rust_arches} - rust-serde_ignored ExclusiveArch: %{rust_arches} - rust-serde_json ExclusiveArch: %{rust_arches} - rust-serde_repr ExclusiveArch: %{rust_arches} - rust-serde_stacker ExclusiveArch: %{rust_arches} - rust-serde_test ExclusiveArch: %{rust_arches} - rust-serde_url_params ExclusiveArch: %{rust_arches} - rust-serde_urlencoded ExclusiveArch: %{rust_arches} - rust-serde_urlencoded0.6 ExclusiveArch: %{rust_arches} - rust-serde_with_macros ExclusiveArch: %{rust_arches} - rust-serde_yaml ExclusiveArch: %{rust_arches} - rust-serial_test ExclusiveArch: %{rust_arches} - rust-serial_test_derive ExclusiveArch: %{rust_arches} - rust-servo-fontconfig ExclusiveArch: %{rust_arches} - rust-servo-fontconfig-sys ExclusiveArch: %{rust_arches} - rust-sev ExclusiveArch: %{rust_arches} - rust-sevctl ExclusiveArch: %{rust_arches} - rust-sha-1 ExclusiveArch: %{rust_arches} - rust-sha1 ExclusiveArch: %{rust_arches} - rust-sha1collisiondetection ExclusiveArch: %{rust_arches} - rust-sha2 ExclusiveArch: %{rust_arches} - rust-sha3 ExclusiveArch: %{rust_arches} - rust-shared_child ExclusiveArch: %{rust_arches} - rust-shared_library ExclusiveArch: %{rust_arches} - rust-shell-escape ExclusiveArch: %{rust_arches} - rust-shell-words ExclusiveArch: %{rust_arches} - rust-shellexpand ExclusiveArch: %{rust_arches} - rust-shlex ExclusiveArch: %{rust_arches} - rust-signal-hook ExclusiveArch: %{rust_arches} - rust-signal-hook-registry ExclusiveArch: %{rust_arches} - rust-signal-hook0.1 ExclusiveArch: %{rust_arches} - rust-silver ExclusiveArch: %{rust_arches} - rust-simd_helpers ExclusiveArch: %{rust_arches} - rust-simple_asn1 ExclusiveArch: %{rust_arches} - rust-simple_logger ExclusiveArch: %{rust_arches} - rust-simplelog ExclusiveArch: %{rust_arches} - rust-siphasher ExclusiveArch: %{rust_arches} - rust-size ExclusiveArch: %{rust_arches} - rust-sized-chunks ExclusiveArch: %{rust_arches} - rust-skeptic ExclusiveArch: %{rust_arches} - rust-skim ExclusiveArch: %{rust_arches} - rust-slab ExclusiveArch: %{rust_arches} - rust-slash-formatter ExclusiveArch: %{rust_arches} - rust-slice-deque ExclusiveArch: %{rust_arches} - rust-slog ExclusiveArch: %{rust_arches} - rust-slog-async ExclusiveArch: %{rust_arches} - rust-slog-scope ExclusiveArch: %{rust_arches} - rust-slog-term ExclusiveArch: %{rust_arches} - rust-slotmap ExclusiveArch: %{rust_arches} - rust-slug ExclusiveArch: %{rust_arches} - rust-sluice ExclusiveArch: %{rust_arches} - rust-smallvec ExclusiveArch: %{rust_arches} - rust-smart-default ExclusiveArch: %{rust_arches} - rust-smawk ExclusiveArch: %{rust_arches} - rust-smithay-client-toolkit ExclusiveArch: %{rust_arches} - rust-smithay-clipboard ExclusiveArch: %{rust_arches} - rust-snafu ExclusiveArch: %{rust_arches} - rust-snafu-derive ExclusiveArch: %{rust_arches} - rust-snake_case ExclusiveArch: %{rust_arches} - rust-snowflake ExclusiveArch: %{rust_arches} - rust-socket2 ExclusiveArch: %{rust_arches} - rust-socket2_0.3 ExclusiveArch: %{rust_arches} - rust-soup-sys ExclusiveArch: %{rust_arches} - rust-sourceview ExclusiveArch: %{rust_arches} - rust-spin ExclusiveArch: %{rust_arches} - rust-spin_on ExclusiveArch: %{rust_arches} - rust-spinning_top ExclusiveArch: %{rust_arches} - rust-spmc ExclusiveArch: %{rust_arches} - rust-ssh-key-dir ExclusiveArch: %{rust_arches} - rust-stable_deref_trait ExclusiveArch: %{rust_arches} - rust-stacker ExclusiveArch: %{rust_arches} - rust-standback ExclusiveArch: %{rust_arches} - rust-starship ExclusiveArch: %{rust_arches} - rust-starship_module_config_derive ExclusiveArch: %{rust_arches} - rust-static_assertions ExclusiveArch: %{rust_arches} - rust-statistical ExclusiveArch: %{rust_arches} - rust-stb_truetype ExclusiveArch: %{rust_arches} - rust-streaming-stats ExclusiveArch: %{rust_arches} - rust-string ExclusiveArch: %{rust_arches} - rust-string_cache ExclusiveArch: %{rust_arches} - rust-string_cache_codegen ExclusiveArch: %{rust_arches} - rust-string_cache_shared ExclusiveArch: %{rust_arches} - rust-strings ExclusiveArch: %{rust_arches} - rust-strip-ansi-escapes ExclusiveArch: %{rust_arches} - rust-strsim ExclusiveArch: %{rust_arches} - rust-structopt ExclusiveArch: %{rust_arches} - rust-structopt-derive ExclusiveArch: %{rust_arches} - rust-structopt-derive0.2 ExclusiveArch: %{rust_arches} - rust-structopt0.2 ExclusiveArch: %{rust_arches} - rust-strum ExclusiveArch: %{rust_arches} - rust-strum_macros ExclusiveArch: %{rust_arches} - rust-subtle ExclusiveArch: %{rust_arches} - rust-sudo_plugin ExclusiveArch: %{rust_arches} - rust-sudo_plugin-sys ExclusiveArch: %{rust_arches} - rust-sval ExclusiveArch: %{rust_arches} - rust-sval_derive ExclusiveArch: %{rust_arches} - rust-svg_metadata ExclusiveArch: %{rust_arches} - rust-sxd-document ExclusiveArch: %{rust_arches} - rust-syn ExclusiveArch: %{rust_arches} - rust-syn-mid ExclusiveArch: %{rust_arches} - rust-syn0.15 ExclusiveArch: %{rust_arches} - rust-synom ExclusiveArch: %{rust_arches} - rust-synstructure ExclusiveArch: %{rust_arches} - rust-syntect ExclusiveArch: %{rust_arches} - rust-sys-info ExclusiveArch: %{rust_arches} - rust-sysinfo ExclusiveArch: %{rust_arches} - rust-system-deps ExclusiveArch: %{rust_arches} - rust-systemd ExclusiveArch: %{rust_arches} - rust-tabwriter ExclusiveArch: %{rust_arches} - rust-take ExclusiveArch: %{rust_arches} - rust-take_mut ExclusiveArch: %{rust_arches} - rust-tap ExclusiveArch: %{rust_arches} - rust-tar ExclusiveArch: %{rust_arches} - rust-target-lexicon ExclusiveArch: %{rust_arches} - rust-tealdeer ExclusiveArch: %{rust_arches} - rust-teloxide ExclusiveArch: %{rust_arches} - rust-teloxide-macros ExclusiveArch: %{rust_arches} - rust-tempdir ExclusiveArch: %{rust_arches} - rust-tempfile ExclusiveArch: %{rust_arches} - rust-tendril ExclusiveArch: %{rust_arches} - rust-tera ExclusiveArch: %{rust_arches} - rust-term ExclusiveArch: %{rust_arches} - rust-term_grid ExclusiveArch: %{rust_arches} - rust-term_size ExclusiveArch: %{rust_arches} - rust-termcolor ExclusiveArch: %{rust_arches} - rust-terminal_size ExclusiveArch: %{rust_arches} - rust-terminfo ExclusiveArch: %{rust_arches} - rust-termion ExclusiveArch: %{rust_arches} - rust-termios ExclusiveArch: %{rust_arches} - rust-test-assembler ExclusiveArch: %{rust_arches} - rust-tester ExclusiveArch: %{rust_arches} - rust-testing_logger ExclusiveArch: %{rust_arches} - rust-textwrap ExclusiveArch: %{rust_arches} - rust-textwrap0.11 ExclusiveArch: %{rust_arches} - rust-textwrap0.12 ExclusiveArch: %{rust_arches} - rust-thiserror ExclusiveArch: %{rust_arches} - rust-thiserror-impl ExclusiveArch: %{rust_arches} - rust-thread-id ExclusiveArch: %{rust_arches} - rust-thread-scoped ExclusiveArch: %{rust_arches} - rust-thread_local ExclusiveArch: %{rust_arches} - rust-threadpool ExclusiveArch: %{rust_arches} - rust-tiff ExclusiveArch: %{rust_arches} - rust-tiger-digest ExclusiveArch: %{rust_arches} - rust-time ExclusiveArch: %{rust_arches} - rust-time-macros ExclusiveArch: %{rust_arches} - rust-time-macros-impl ExclusiveArch: %{rust_arches} - rust-time0.1 ExclusiveArch: %{rust_arches} - rust-timebomb ExclusiveArch: %{rust_arches} - rust-timer ExclusiveArch: %{rust_arches} - rust-timerfd ExclusiveArch: %{rust_arches} - rust-tiny-keccak ExclusiveArch: %{rust_arches} - rust-tiny_http ExclusiveArch: %{rust_arches} - rust-tinytemplate ExclusiveArch: %{rust_arches} - rust-tinyvec ExclusiveArch: %{rust_arches} - rust-tinyvec_macros ExclusiveArch: %{rust_arches} - rust-tokei ExclusiveArch: %{rust_arches} - rust-tokio ExclusiveArch: %{rust_arches} - rust-tokio-codec ExclusiveArch: %{rust_arches} - rust-tokio-core ExclusiveArch: %{rust_arches} - rust-tokio-current-thread ExclusiveArch: %{rust_arches} - rust-tokio-executor ExclusiveArch: %{rust_arches} - rust-tokio-fs ExclusiveArch: %{rust_arches} - rust-tokio-io ExclusiveArch: %{rust_arches} - rust-tokio-io-pool ExclusiveArch: %{rust_arches} - rust-tokio-macros ExclusiveArch: %{rust_arches} - rust-tokio-macros0.2 ExclusiveArch: %{rust_arches} - rust-tokio-mock-task ExclusiveArch: %{rust_arches} - rust-tokio-native-tls ExclusiveArch: %{rust_arches} - rust-tokio-openssl ExclusiveArch: %{rust_arches} - rust-tokio-openssl0.4 ExclusiveArch: %{rust_arches} - rust-tokio-reactor ExclusiveArch: %{rust_arches} - rust-tokio-socks ExclusiveArch: %{rust_arches} - rust-tokio-socks0.3 ExclusiveArch: %{rust_arches} - rust-tokio-stream ExclusiveArch: %{rust_arches} - rust-tokio-sync ExclusiveArch: %{rust_arches} - rust-tokio-tcp ExclusiveArch: %{rust_arches} - rust-tokio-test ExclusiveArch: %{rust_arches} - rust-tokio-threadpool ExclusiveArch: %{rust_arches} - rust-tokio-timer ExclusiveArch: %{rust_arches} - rust-tokio-tls ExclusiveArch: %{rust_arches} - rust-tokio-tls0.2 ExclusiveArch: %{rust_arches} - rust-tokio-tungstenite ExclusiveArch: %{rust_arches} - rust-tokio-udp ExclusiveArch: %{rust_arches} - rust-tokio-uds ExclusiveArch: %{rust_arches} - rust-tokio-util ExclusiveArch: %{rust_arches} - rust-tokio-util0.2 ExclusiveArch: %{rust_arches} - rust-tokio-util0.3 ExclusiveArch: %{rust_arches} - rust-tokio0.1 ExclusiveArch: %{rust_arches} - rust-tokio0.2 ExclusiveArch: %{rust_arches} - rust-toml ExclusiveArch: %{rust_arches} - rust-toml0.4 ExclusiveArch: %{rust_arches} - rust-tower-layer ExclusiveArch: %{rust_arches} - rust-tower-service ExclusiveArch: %{rust_arches} - rust-tower-test ExclusiveArch: %{rust_arches} - rust-tower-util ExclusiveArch: %{rust_arches} - rust-tpm2-policy ExclusiveArch: %{rust_arches} - rust-tracing ExclusiveArch: %{rust_arches} - rust-tracing-attributes ExclusiveArch: %{rust_arches} - rust-tracing-core ExclusiveArch: %{rust_arches} - rust-tracing-futures ExclusiveArch: %{rust_arches} - rust-traitobject ExclusiveArch: %{rust_arches} - rust-treebitmap ExclusiveArch: %{rust_arches} - rust-treeline ExclusiveArch: %{rust_arches} - rust-trust-dns-native-tls ExclusiveArch: %{rust_arches} - rust-trust-dns-native-tls0.19 ExclusiveArch: %{rust_arches} - rust-trust-dns-openssl ExclusiveArch: %{rust_arches} - rust-trust-dns-openssl0.19 ExclusiveArch: %{rust_arches} - rust-trust-dns-proto ExclusiveArch: %{rust_arches} - rust-trust-dns-proto0.19 ExclusiveArch: %{rust_arches} - rust-trust-dns-resolver ExclusiveArch: %{rust_arches} - rust-trust-dns-resolver0.19 ExclusiveArch: %{rust_arches} - rust-try-lock ExclusiveArch: %{rust_arches} - rust-try_from ExclusiveArch: %{rust_arches} - rust-try_or ExclusiveArch: %{rust_arches} - rust-trybuild ExclusiveArch: %{rust_arches} - rust-tss-esapi ExclusiveArch: %{rust_arches} - rust-tss-esapi-sys ExclusiveArch: %{rust_arches} - rust-ttf-parser ExclusiveArch: %{rust_arches} - rust-tui ExclusiveArch: %{rust_arches} - rust-tui-react ExclusiveArch: %{rust_arches} - rust-tui0.11 ExclusiveArch: %{rust_arches} - rust-tui0.9 ExclusiveArch: %{rust_arches} - rust-tuikit ExclusiveArch: %{rust_arches} - rust-tungstenite ExclusiveArch: %{rust_arches} - rust-twoway ExclusiveArch: %{rust_arches} - rust-typeable ExclusiveArch: %{rust_arches} - rust-typed-arena ExclusiveArch: %{rust_arches} - rust-typemap ExclusiveArch: %{rust_arches} - rust-typenum ExclusiveArch: %{rust_arches} - rust-typetag-impl ExclusiveArch: %{rust_arches} - rust-ucd-parse ExclusiveArch: %{rust_arches} - rust-ucd-trie ExclusiveArch: %{rust_arches} - rust-ucd-util ExclusiveArch: %{rust_arches} - rust-unchecked-index ExclusiveArch: %{rust_arches} - rust-unescape ExclusiveArch: %{rust_arches} - rust-unic-char-property ExclusiveArch: %{rust_arches} - rust-unic-char-range ExclusiveArch: %{rust_arches} - rust-unic-common ExclusiveArch: %{rust_arches} - rust-unic-segment ExclusiveArch: %{rust_arches} - rust-unic-ucd-category ExclusiveArch: %{rust_arches} - rust-unic-ucd-common ExclusiveArch: %{rust_arches} - rust-unic-ucd-segment ExclusiveArch: %{rust_arches} - rust-unic-ucd-version ExclusiveArch: %{rust_arches} - rust-unicase ExclusiveArch: %{rust_arches} - rust-unicase1 ExclusiveArch: %{rust_arches} - rust-unicode-bidi ExclusiveArch: %{rust_arches} - rust-unicode-normalization ExclusiveArch: %{rust_arches} - rust-unicode-segmentation ExclusiveArch: %{rust_arches} - rust-unicode-width ExclusiveArch: %{rust_arches} - rust-unicode-xid ExclusiveArch: %{rust_arches} - rust-unicode-xid0.1 ExclusiveArch: %{rust_arches} - rust-unicode_categories ExclusiveArch: %{rust_arches} - rust-unindent ExclusiveArch: %{rust_arches} - rust-universal-hash ExclusiveArch: %{rust_arches} - rust-unix_socket ExclusiveArch: %{rust_arches} - rust-unreachable ExclusiveArch: %{rust_arches} - rust-unsafe-any ExclusiveArch: %{rust_arches} - rust-untrusted ExclusiveArch: %{rust_arches} - rust-uom ExclusiveArch: %{rust_arches} - rust-url ExclusiveArch: %{rust_arches} - rust-url1 ExclusiveArch: %{rust_arches} - rust-url_serde ExclusiveArch: %{rust_arches} - rust-urlencoding ExclusiveArch: %{rust_arches} - rust-urlocator ExclusiveArch: %{rust_arches} - rust-urlshortener ExclusiveArch: %{rust_arches} - rust-users ExclusiveArch: %{rust_arches} - rust-users0.10 ExclusiveArch: %{rust_arches} - rust-utf-8 ExclusiveArch: %{rust_arches} - rust-utf8-cstr ExclusiveArch: %{rust_arches} - rust-utf8-ranges ExclusiveArch: %{rust_arches} - rust-utf8-width ExclusiveArch: %{rust_arches} - rust-utf8parse ExclusiveArch: %{rust_arches} - rust-uuid ExclusiveArch: %{rust_arches} - rust-uuid0.7 ExclusiveArch: %{rust_arches} - rust-v_escape ExclusiveArch: %{rust_arches} - rust-v_escape_derive ExclusiveArch: %{rust_arches} - rust-v_frame ExclusiveArch: %{rust_arches} - rust-v_htmlescape ExclusiveArch: %{rust_arches} - rust-varlink ExclusiveArch: %{rust_arches} - rust-varlink-cli ExclusiveArch: %{rust_arches} - rust-varlink_generator ExclusiveArch: %{rust_arches} - rust-varlink_parser ExclusiveArch: %{rust_arches} - rust-varlink_stdinterfaces ExclusiveArch: %{rust_arches} - rust-vec-arena ExclusiveArch: %{rust_arches} - rust-vec_map ExclusiveArch: %{rust_arches} - rust-vergen ExclusiveArch: %{rust_arches} - rust-version ExclusiveArch: %{rust_arches} - rust-version-compare ExclusiveArch: %{rust_arches} - rust-version-sync ExclusiveArch: %{rust_arches} - rust-version-sync0.8 ExclusiveArch: %{rust_arches} - rust-version_check ExclusiveArch: %{rust_arches} - rust-vmm-sys-util ExclusiveArch: x86_64 aarch64 ppc64le - rust-vmw_backdoor ExclusiveArch: %{rust_arches} - rust-void ExclusiveArch: %{rust_arches} - rust-vte ExclusiveArch: %{rust_arches} - rust-vte0.3 ExclusiveArch: %{rust_arches} - rust-vte_generate_state_changes ExclusiveArch: %{rust_arches} - rust-wait-timeout ExclusiveArch: %{rust_arches} - rust-waker-fn ExclusiveArch: %{rust_arches} - rust-walkdir ExclusiveArch: %{rust_arches} - rust-want ExclusiveArch: %{rust_arches} - rust-warp ExclusiveArch: %{rust_arches} - rust-warp0.2 ExclusiveArch: %{rust_arches} - rust-wasm-bindgen ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-backend ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-macro ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-macro-support ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-shared ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-test-macro ExclusiveArch: %{rust_arches} - rust-wayland-client ExclusiveArch: %{rust_arches} - rust-wayland-commons ExclusiveArch: %{rust_arches} - rust-wayland-cursor ExclusiveArch: %{rust_arches} - rust-wayland-egl ExclusiveArch: %{rust_arches} - rust-wayland-protocols ExclusiveArch: %{rust_arches} - rust-wayland-scanner ExclusiveArch: %{rust_arches} - rust-wayland-server ExclusiveArch: %{rust_arches} - rust-wayland-sys ExclusiveArch: %{rust_arches} - rust-web-sys ExclusiveArch: %{rust_arches} - rust-webbrowser ExclusiveArch: %{rust_arches} - rust-webkit2gtk ExclusiveArch: %{rust_arches} - rust-webkit2gtk-sys ExclusiveArch: %{rust_arches} - rust-websocket ExclusiveArch: %{rust_arches} - rust-websocket-base ExclusiveArch: %{rust_arches} - rust-weezl ExclusiveArch: %{rust_arches} - rust-which ExclusiveArch: %{rust_arches} - rust-wild ExclusiveArch: %{rust_arches} - rust-wildmatch ExclusiveArch: %{rust_arches} - rust-winit ExclusiveArch: %{rust_arches} - rust-ws ExclusiveArch: %{rust_arches} - rust-wyz ExclusiveArch: %{rust_arches} - rust-x11 ExclusiveArch: %{rust_arches} - rust-x11-clipboard ExclusiveArch: %{rust_arches} - rust-x11-dl ExclusiveArch: %{rust_arches} - rust-xattr ExclusiveArch: %{rust_arches} - rust-xcb ExclusiveArch: %{rust_arches} - rust-xcursor ExclusiveArch: %{rust_arches} - rust-xdg ExclusiveArch: %{rust_arches} - rust-xkbcommon ExclusiveArch: %{rust_arches} - rust-xml-rs ExclusiveArch: %{rust_arches} - rust-xml5ever ExclusiveArch: %{rust_arches} - rust-xmlparser ExclusiveArch: %{rust_arches} - rust-xz2 ExclusiveArch: %{rust_arches} - rust-y4m ExclusiveArch: %{rust_arches} - rust-yaml-rust ExclusiveArch: %{rust_arches} - rust-yaml-rust0.3 ExclusiveArch: %{rust_arches} - rust-ybaas ExclusiveArch: %{rust_arches} - rust-ytop ExclusiveArch: %{rust_arches} - rust-yubibomb ExclusiveArch: %{rust_arches} - rust-yup-oauth2 ExclusiveArch: %{rust_arches} - rust-zbase32 ExclusiveArch: %{rust_arches} - rust-zbus ExclusiveArch: %{rust_arches} - rust-zbus_macros ExclusiveArch: %{rust_arches} - rust-zeroize ExclusiveArch: %{rust_arches} - rust-zeroize_derive ExclusiveArch: %{rust_arches} - rust-zincati ExclusiveArch: %{rust_arches} - rust-zip ExclusiveArch: %{rust_arches} - rust-zoneinfo_compiled ExclusiveArch: %{rust_arches} - rust-zoxide ExclusiveArch: %{rust_arches} - rust-zram-generator ExclusiveArch: %{rust_arches} - rust-zstd ExclusiveArch: %{rust_arches} - rust-zstd-safe ExclusiveArch: %{rust_arches} - rust-zstd-sys ExclusiveArch: %{rust_arches} - rust-zvariant ExclusiveArch: %{rust_arches} - rust-zvariant_derive ExclusiveArch: %{rust_arches} - s390utils ExclusiveArch: s390 s390x - safetyblanket ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - sagemath ExclusiveArch: aarch64 %{ix86} x86_64 ppc sparcv9 - sbcl ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - sbd ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le - sbsigntools ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - seabios ExclusiveArch: x86_64 - seadrive-gui ExclusiveArch: %{qt5_qtwebengine_arches} - seafile-client ExclusiveArch: %{qt5_qtwebengine_arches} - seamonkey ExclusiveArch: x86_64 - seqan3 ExclusiveArch: %{power64} x86_64 aarch64 - servicelog ExclusiveArch: ppc %{power64} - sgabios ExclusiveArch: %{ix86} x86_64 - sharpfont ExclusiveArch: %mono_arches - sharpziplib ExclusiveArch: %{mono_arches} - shim ExclusiveArch: %{efi} - shim-unsigned-aarch64 ExclusiveArch: aarch64 - shim-unsigned-x64 ExclusiveArch: x86_64 - sigul ExclusiveArch: x86_64 - skychart ExclusiveArch: %{fpc_arches} - snapd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - soup-sharp ExclusiveArch: %{mono_arches} - sparkleshare ExclusiveArch: %{mono_arches} - spicctrl ExclusiveArch: %{ix86} x86_64 - spice ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - springlobby ExclusiveArch: %{ix86} x86_64 - squeekboard ExclusiveArch: %{rust_arches} - startdde ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - statsd ExclusiveArch: %{nodejs_arches} noarch - stratis-cli ExclusiveArch: %{rust_arches} noarch - stratisd ExclusiveArch: %{rust_arches} - stripesnoop ExclusiveArch: %{ix86} x86_64 - supercollider ExclusiveArch: %{qt5_qtwebengine_arches} - supermin ExclusiveArch: %{kernel_arches} - svt-av1 ExclusiveArch: x86_64 - svt-vp9 ExclusiveArch: x86_64 - swift-lang ExclusiveArch: x86_64 aarch64 - sysbench ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x - syslinux ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - taglib-sharp ExclusiveArch: %{mono_arches} - tarantool ExclusiveArch: %{ix86} x86_64 - tboot ExclusiveArch: %{ix86} x86_64 - tdlib ExclusiveArch: x86_64 - templates_parser ExclusiveArch: %GPRbuild_arches - ternimal ExclusiveArch: %{rust_arches} - testcloud ExclusiveArch: %{kernel_arches} noarch - themonospot-base ExclusiveArch: %mono_arches - themonospot-console ExclusiveArch: %mono_arches - themonospot-gui-gtk ExclusiveArch: %mono_arches - themonospot-plugin-avi ExclusiveArch: %mono_arches - themonospot-plugin-mkv ExclusiveArch: %mono_arches - thermald ExclusiveArch: %{ix86} x86_64 - tilix ExclusiveArch: %{ldc_arches} - tmux-top ExclusiveArch: %{go_arches} - tomboy ExclusiveArch: %{mono_arches} - topojson-client ExclusiveArch: %{nodejs_arches} noarch - topojson-server ExclusiveArch: %{nodejs_arches} noarch - topojson-simplify ExclusiveArch: %{nodejs_arches} noarch - torbrowser-launcher ExclusiveArch: %{ix86} x86_64 - tuned-profiles-nfv-host-bin ExclusiveArch: %{ix86} x86_64 - uClibc ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} - ucx ExclusiveArch: aarch64 ppc64le x86_64 - ugene ExclusiveArch: %{ix86} x86_64 - uglify-js ExclusiveArch: %{nodejs_arches} noarch - uglify-js1 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - unetbootin ExclusiveArch: %{ix86} x86_64 - ursa-major ExclusiveArch: noarch aarch64 ppc64le s390x x86_64 - v8-314 ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64 - valgrind ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 - vboot-utils ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - virt-p2v ExclusiveArch: x86_64 - virt-v2v ExclusiveArch: x86_64 - virtualbox-guest-additions ExclusiveArch: i686 x86_64 - vkd3d ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - vmaf ExclusiveArch: x86_64 - vmem ExclusiveArch: x86_64 - vmemcache ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 - vrq ExclusiveArch: %{ix86} x86_64 - warsow ExclusiveArch: %{ix86} x86_64 %{arm} - warsow-data ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{ix86} x86_64 %{arm} - webkit2-sharp ExclusiveArch: %mono_arches - wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: %{ix86} %{arm} - wine-dxvk ExclusiveArch: %{ix86} x86_64 - winetricks ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - wxMaxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 - x2goclient ExclusiveArch: x86_64 - xe-guest-utilities-latest ExclusiveArch: %{ix86} x86_64 - xen ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 - xmlada ExclusiveArch: %{GPRbuild_arches} - xorg-x11-drv-armsoc ExclusiveArch: %{arm} aarch64 - xorg-x11-drv-intel ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-openchrome ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vesa ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vmware ExclusiveArch: %{ix86} x86_64 ia64 - xsp ExclusiveArch: %mono_arches - yarnpkg ExclusiveArch: %{nodejs_arches} noarch - zeromq-ada ExclusiveArch: %{GPRbuild_arches} - zlib-ada ExclusiveArch: %{GPRbuild_arches} - zlib-ng ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 - zola ExclusiveArch: %{rust_arches}

2 years, 12 months

1
0
0 / 0

Architecture specific change in rpms/rust-derive_builder_core0.9.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-derive_builder_core0.9.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-derive_builder_core0.9.git/c.... Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 4d284aef7682a2e692ac8a1e229fdfa4d76e8971 Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Tue May 4 00:15:48 2021 +0200 initial import (derive_builder_core 0.9 compat package) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a082fa6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/results_*/ +/*.src.rpm + +/derive_builder_core-0.9.0.crate diff --git a/README.md b/README.md deleted file mode 100644 index 6987ca9..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-derive_builder_core0.9 - -The rust-derive_builder_core0.9 package diff --git a/derive_builder_core-fix-metadata.diff b/derive_builder_core-fix-metadata.diff new file mode 100644 index 0000000..fa27437 --- /dev/null +++ b/derive_builder_core-fix-metadata.diff @@ -0,0 +1,11 @@ +--- derive_builder_core-0.9.0/Cargo.toml 2019-11-07T20:52:44+00:00 ++++ derive_builder_core-0.9.0/Cargo.toml 2021-05-01T13:25:16.617833+00:00 +@@ -20,7 +20,7 @@ + license = "MIT/Apache-2.0" + repository = "https://github.com/colin-kiegel/rust-derive-builder" + [dependencies.darling] +-version = "0.10.2" ++version = "0.12" + + [dependencies.log] + version = "0.4" diff --git a/rust-derive_builder_core0.9.spec b/rust-derive_builder_core0.9.spec new file mode 100644 index 0000000..6918d69 --- /dev/null +++ b/rust-derive_builder_core0.9.spec @@ -0,0 +1,102 @@ +# Generated by rust2rpm 17 +%bcond_without check +%global debug_package %{nil} + +%global crate derive_builder_core + +Name: rust-%{crate}0.9 +Version: 0.9.0 +Release: 1%{?dist} +Summary: Internal helper library for the derive_builder crate + +# Upstream license specification: MIT/Apache-2.0 +License: MIT or ASL 2.0 +URL: https://crates.io/crates/derive_builder_core +Source: %{crates_source} +# Initial patched metadata +# * bump to darling 0.12 (already upstream for 0.10) +Patch0: derive_builder_core-fix-metadata.diff + +ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif + +BuildRequires: rust-packaging + +%global _description %{expand: +Internal helper library for the derive_builder crate.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE-MIT LICENSE-APACHE +%doc README.md CHANGELOG.md +%{cargo_registry}/%{crate}-%{version_no_tilde}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+log-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+log-devel %{_description} + +This package contains library source intended for building other packages +which use "log" feature of "%{crate}" crate. + +%files -n %{name}+log-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+logging-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+logging-devel %{_description} + +This package contains library source intended for building other packages +which use "logging" feature of "%{crate}" crate. + +%files -n %{name}+logging-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Sat May 01 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.9.0-1 +- Initial compat package for derive_builder_core 0.9 diff --git a/sources b/sources new file mode 100644 index 0000000..c12a8ba --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (derive_builder_core-0.9.0.crate) = 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf

2 years, 12 months

1
0
0 / 0

Architecture specific change in rpms/golang-github-aliyun-cli.git

by githook-noreply＠fedoraproject.org

The package rpms/golang-github-aliyun-cli.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/golang-github-aliyun-cli.git/comm.... Change: +ExcludeArch: i686 # (Bug rhbz#1956389) Thanks. Full change: ============ commit ea8b64212615e9856abcbb15c3f11f733b22d872 Author: Brandon Perkins <bperkins(a)redhat.com> Date: Mon May 3 11:37:19 2021 -0400 ExcludeArch i686 due to build failing from running out of memory (Fixes rhbz#1956389) diff --git a/golang-github-aliyun-cli.spec b/golang-github-aliyun-cli.spec index 205216d..6598b8d 100644 --- a/golang-github-aliyun-cli.spec +++ b/golang-github-aliyun-cli.spec @@ -32,7 +32,7 @@ Alibaba Cloud (Aliyun) CLI.} %global godocs1 README-openapi-meta.md Name: %{goname} -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{godevelsummary0} # Upstream license specification: Apache-2.0 and MIT @@ -41,9 +41,11 @@ URL: %{gourl} Source0: %{gosource0} Source1: %{gosource1} -# https://bugzilla.redhat.com/show_bug.cgi?id=1866529 # https://github.com/aliyun/aliyun-cli/issues/303 +# https://bugzilla.redhat.com/show_bug.cgi?id=1866529 ExcludeArch: armv7hl # (Bug rhbz#1866529) +# https://bugzilla.redhat.com/show_bug.cgi?id=1956389 +ExcludeArch: i686 # (Bug rhbz#1956389) BuildRequires: golang-github-shulhan-bindata BuildRequires: golang(github.com/alibabacloud-go/tea/tea) @@ -129,6 +131,9 @@ cp -Trv /etc/skel %{getenv:HOME} %gopkgfiles %changelog +* Mon May 03 2021 Brandon Perkins <bperkins(a)redhat.com> - 3.0.74-2 +- ExcludeArch i686 due to build failing from running out of memory (Fixes rhbz#1956389) + * Mon May 03 2021 Brandon Perkins <bperkins(a)redhat.com> - 3.0.74-1 - Update to version 3.0.74 (Fixes rhbz#1955892) - Update to aliyun-openapi-meta to commit commit 6f1305476cd7a50be83a52fa33defb799619eda2 Author: Brandon Perkins <bperkins(a)redhat.com> Date: Mon May 3 10:56:19 2021 -0400 Update to version 3.0.74 (Fixes rhbz#1955892) Update to aliyun-openapi-meta to commit 95a090031d4d5b4dd8d2d29104f33769b3ea66b4 Addition of oss LICENSE and CHANGELOG Addition of MIT upstream license Removal of patch for building against credentials-go-1.1.0 https://github.com/aliyun/aliyun-cli/pull/300 Addition of alibabacloud-go/tea/tea and golang.org/x/crypto/ssh/terminal BuildRequires diff --git a/.gitignore b/.gitignore index 883ecf7..16cd04a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /aliyun-openapi-meta-2d5d1aa75ba1fcc3648fb6d168c9b4868ee3d0b6.tar.gz /aliyun-cli-3.0.73.tar.gz /aliyun-openapi-meta-1e468f0cf8af08594022c94d3d6ff2ba40c574dd.tar.gz +/aliyun-cli-3.0.74.tar.gz +/aliyun-openapi-meta-95a090031d4d5b4dd8d2d29104f33769b3ea66b4.tar.gz diff --git a/aliyun-cli-credentials-config.patch b/aliyun-cli-credentials-config.patch deleted file mode 100644 index 180a797..0000000 --- a/aliyun-cli-credentials-config.patch +++ /dev/null @@ -1,4253 +0,0 @@ -From 0a9ceb9c501cb45303f75e3332a6d73a7caa911b Mon Sep 17 00:00:00 2001 -From: Brandon Perkins <bperkins(a)redhat.com> -Date: Fri, 31 Jul 2020 12:29:14 -0400 -Subject: [PATCH] Changes to build against credentials-go-1.1.0 - ---- - config/flags_test.go | 4 +- - config/profile.go | 10 ++-- - config/profile_test.go | 10 ++-- - openapi/commando_test.go | 2 +- - oss/lib/allpart_size.go | 2 +- - oss/lib/allpart_size_test.go | 10 ++-- - oss/lib/append_file.go | 2 +- - oss/lib/append_file_test.go | 26 +++++----- - oss/lib/bucket_cors.go | 2 +- - oss/lib/bucket_cors_test.go | 14 +++--- - oss/lib/bucket_encryption.go | 2 +- - oss/lib/bucket_encryption_test.go | 14 +++--- - oss/lib/bucket_lifecycle.go | 2 +- - oss/lib/bucket_lifecycle_test.go | 18 +++---- - oss/lib/bucket_logging.go | 2 +- - oss/lib/bucket_logging_test.go | 16 +++--- - oss/lib/bucket_policy.go | 2 +- - oss/lib/bucket_policy_test.go | 18 +++---- - oss/lib/bucket_qos.go | 2 +- - oss/lib/bucket_qos_test.go | 18 +++---- - oss/lib/bucket_referer.go | 2 +- - oss/lib/bucket_referer_test.go | 32 ++++++------ - oss/lib/bucket_tagging.go | 2 +- - oss/lib/bucket_tagging_test.go | 14 +++--- - oss/lib/bucket_versioning.go | 2 +- - oss/lib/bucket_versioning_test.go | 12 ++--- - oss/lib/bucket_website.go | 2 +- - oss/lib/bucket_website_test.go | 18 +++---- - oss/lib/cat.go | 2 +- - oss/lib/cat_test.go | 20 ++++---- - oss/lib/cli_bridge.go | 53 +++++++++---------- - oss/lib/command.go | 20 ++++---- - oss/lib/command_test.go | 84 +++++++++++++++---------------- - oss/lib/config.go | 10 ++-- - oss/lib/config_helper.go | 4 +- - oss/lib/config_test.go | 8 +-- - oss/lib/const.go | 2 +- - oss/lib/cors_options.go | 2 +- - oss/lib/cors_options_test.go | 8 +-- - oss/lib/cp.go | 4 +- - oss/lib/cp_test.go | 82 +++++++++++++++--------------- - oss/lib/create_symlink.go | 2 +- - oss/lib/du.go | 2 +- - oss/lib/du_test.go | 18 +++---- - oss/lib/ecs_role_test.go | 28 +++++------ - oss/lib/listpart.go | 2 +- - oss/lib/listpart_test.go | 10 ++-- - oss/lib/ls.go | 2 +- - oss/lib/ls_test.go | 64 +++++++++++------------ - oss/lib/mb.go | 2 +- - oss/lib/mb_test.go | 12 ++--- - oss/lib/mkdir.go | 2 +- - oss/lib/mkdir_test.go | 6 +-- - oss/lib/monitor_test.go | 8 +-- - oss/lib/object_tagging.go | 2 +- - oss/lib/object_tagging_test.go | 10 ++-- - oss/lib/option.go | 2 +- - oss/lib/probe.go | 2 +- - oss/lib/probe_test.go | 16 +++--- - oss/lib/read_symlink.go | 2 +- - oss/lib/request_payment.go | 2 +- - oss/lib/request_payment_test.go | 12 ++--- - oss/lib/restore.go | 2 +- - oss/lib/restore_test.go | 2 +- - oss/lib/rm.go | 2 +- - oss/lib/rm_test.go | 52 +++++++++---------- - oss/lib/set_acl.go | 2 +- - oss/lib/set_acl_test.go | 16 +++--- - oss/lib/set_meta.go | 2 +- - oss/lib/set_meta_test.go | 16 +++--- - oss/lib/signurl.go | 2 +- - oss/lib/signurl_test.go | 8 +-- - oss/lib/stat.go | 2 +- - oss/lib/stat_test.go | 16 +++--- - oss/lib/symlink_test.go | 4 +- - oss/lib/user_qos.go | 2 +- - oss/lib/user_qos_test.go | 10 ++-- - 77 files changed, 452 insertions(+), 451 deletions(-) - -diff --git a/config/flags_test.go b/config/flags_test.go -index bdf47ac0..ffca4a1c 100644 ---- a/config/flags_test.go -+++ b/config/flags_test.go -@@ -60,7 +60,7 @@ func TestAddFlag(t *testing.T) { - ExcludeWith: nil, - Shorthand: 0, - } -- newAccessKeyIDFlag = &cli.Flag{ -+ newAccessKeyIdFlag = &cli.Flag{ - Category: "config", - Name: AccessKeyIdFlagName, - AssignedMode: cli.AssignedOnce, -@@ -342,7 +342,7 @@ func TestAddFlag(t *testing.T) { - assert.Equal(t, newModeFlag, f) - - f = NewAccessKeyIdFlag() -- assert.Equal(t, newAccessKeyIDFlag, f) -+ assert.Equal(t, newAccessKeyIdFlag, f) - - f = NewAccessKeySecretFlag() - assert.Equal(t, newAccessKeySecretFlag, f) -diff --git a/config/profile.go b/config/profile.go -index 1224848e..a93b7fc7 100644 ---- a/config/profile.go -+++ b/config/profile.go -@@ -283,11 +283,11 @@ func (cp *Profile) GetClientByRamRoleArnWithEcs(config *sdk.Config) (*sdk.Client - if err != nil { - return nil, err - } -- accessKeyID, accessKeySecret, StsToken, err := cp.GetSessionCredential(client) -+ accessKeyId, accessKeySecret, StsToken, err := cp.GetSessionCredential(client) - if err != nil { - return nil, err - } -- cred := credentials.NewStsTokenCredential(accessKeyID, accessKeySecret, StsToken) -+ cred := credentials.NewStsTokenCredential(accessKeyId, accessKeySecret, StsToken) - return sdk.NewClientWithOptions(cp.RegionId, config, cred) - } - -@@ -313,13 +313,13 @@ func (cp *Profile) GetSessionCredential(client *sdk.Client) (string, string, str - if err != nil { - return "", "", "", err - } -- accessKeyID, _ := jmespath.Search("Credentials.AccessKeyId", v) -+ accessKeyId, _ := jmespath.Search("Credentials.AccessKeyId", v) - accessKeySecret, _ := jmespath.Search("Credentials.AccessKeySecret", v) - StsToken, _ := jmespath.Search("Credentials.SecurityToken", v) -- if accessKeyID == nil || accessKeySecret == nil || StsToken == nil { -+ if accessKeyId == nil || accessKeySecret == nil || StsToken == nil { - return "", "", "", errors.New("get session credential failed") - } -- return accessKeyID.(string), accessKeySecret.(string), StsToken.(string), nil -+ return accessKeyId.(string), accessKeySecret.(string), StsToken.(string), nil - } - - func (cp *Profile) GetClientByEcsRamRole(config *sdk.Config) (*sdk.Client, error) { -diff --git a/config/profile_test.go b/config/profile_test.go -index 7bc88617..146486bf 100644 ---- a/config/profile_test.go -+++ b/config/profile_test.go -@@ -289,7 +289,7 @@ func TestOverwriteWithFlagsWithAccessKeySecretEnv(t *testing.T) { - - } - --func TestOverwriteWithFlagsWithAccessKeyIDEnv(t *testing.T) { -+func TestOverwriteWithFlagsWithAccessKeyIdEnv(t *testing.T) { - buf := new(bytes.Buffer) - ctx := cli.NewCommandContext(buf) - AddFlags(ctx.Flags()) -@@ -452,16 +452,16 @@ func TestIsRegion(t *testing.T) { - - func TestAutoModeRecognition(t *testing.T) { - -- p := &Profile{AccessKeyId: "accessKeyID", AccessKeySecret: "accessKeySecret"} -+ p := &Profile{AccessKeyId: "accessKeyId", AccessKeySecret: "accessKeySecret"} - assert.Equal(t, AuthenticateMode(""), p.Mode) - AutoModeRecognition(p) - assert.Equal(t, AK, p.Mode) - -- p = &Profile{AccessKeyId: "accessKeyID", AccessKeySecret: "accessKeySecret", StsToken: "stsToken"} -+ p = &Profile{AccessKeyId: "accessKeyId", AccessKeySecret: "accessKeySecret", StsToken: "stsToken"} - AutoModeRecognition(p) - assert.Equal(t, StsToken, p.Mode) - -- p = &Profile{AccessKeyId: "accessKeyID", AccessKeySecret: "accessKeySecret", RamRoleArn: "ramRoleArn"} -+ p = &Profile{AccessKeyId: "accessKeyId", AccessKeySecret: "accessKeySecret", RamRoleArn: "ramRoleArn"} - AutoModeRecognition(p) - assert.Equal(t, RamRoleArn, p.Mode) - -@@ -473,7 +473,7 @@ func TestAutoModeRecognition(t *testing.T) { - AutoModeRecognition(p) - assert.Equal(t, EcsRamRole, p.Mode) - -- p = &Profile{AccessKeyId: "accessKeyID", AccessKeySecret: "accessKeySecret", StsToken: "stsToken", Mode: AK} -+ p = &Profile{AccessKeyId: "accessKeyId", AccessKeySecret: "accessKeySecret", StsToken: "stsToken", Mode: AK} - AutoModeRecognition(p) - assert.Equal(t, AK, p.Mode) - -diff --git a/openapi/commando_test.go b/openapi/commando_test.go -index d1f5d62e..b77fcb2a 100644 ---- a/openapi/commando_test.go -+++ b/openapi/commando_test.go -@@ -67,7 +67,7 @@ func Test_main(t *testing.T) { - ctx.Flags().Get("region").SetValue("cn-hangzhou") - ctx.Flags().Add(config.NewAccessKeyIdFlag()) - ctx.Flags().Get("access-key-id").SetAssigned(true) -- ctx.Flags().Get("access-key-id").SetValue("AccessKeyID") -+ ctx.Flags().Get("access-key-id").SetValue("AccessKeyId") - ctx.Flags().Add(config.NewAccessKeySecretFlag()) - ctx.Flags().Get("access-key-secret").SetAssigned(true) - ctx.Flags().Get("access-key-secret").SetValue("AccessKeySecret") -diff --git a/oss/lib/allpart_size.go b/oss/lib/allpart_size.go -index 89447a7b..cd5a160a 100644 ---- a/oss/lib/allpart_size.go -+++ b/oss/lib/allpart_size.go -@@ -86,7 +86,7 @@ var allPartSizeCommand = AllPartSizeCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/allpart_size_test.go b/oss/lib/allpart_size_test.go -index f78cede2..8f9d00e9 100644 ---- a/oss/lib/allpart_size_test.go -+++ b/oss/lib/allpart_size_test.go -@@ -32,7 +32,7 @@ func (s *OssutilCommandSuite) TestAllPartSize(c *C) { - defer fd.Close() - - // begin upload part -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -55,7 +55,7 @@ func (s *OssutilCommandSuite) TestAllPartSize(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -93,7 +93,7 @@ func (s *OssutilCommandSuite) TestAllPartSizeBucketError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -111,7 +111,7 @@ func (s *OssutilCommandSuite) TestAllPartSizeEmptyEndpoint(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -121,7 +121,7 @@ func (s *OssutilCommandSuite) TestAllPartSizeEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/append_file.go b/oss/lib/append_file.go -index 270827ff..563522f9 100644 ---- a/oss/lib/append_file.go -+++ b/oss/lib/append_file.go -@@ -138,7 +138,7 @@ var appendFileCommand = AppendFileCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/append_file_test.go b/oss/lib/append_file_test.go -index 152148d8..533d47e4 100644 ---- a/oss/lib/append_file_test.go -+++ b/oss/lib/append_file_test.go -@@ -26,7 +26,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithoutMeta(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -47,7 +47,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithoutMeta(c *C) { - cpDir := CheckpointDir - cpOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "checkpointDir": &cpDir, -@@ -86,7 +86,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithMeta(c *C) { - strMeta := "x-oss-meta-author:luxun" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -104,7 +104,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithMeta(c *C) { - cpDir := CheckpointDir - cpOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "checkpointDir": &cpDir, -@@ -121,7 +121,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithMeta(c *C) { - c.Assert(strText, Equals, string(fileBody)) - - // check meta -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -157,7 +157,7 @@ func (s *OssutilCommandSuite) TestAppendFileError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -213,7 +213,7 @@ func (s *OssutilCommandSuite) TestAppendFileClientError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -224,7 +224,7 @@ func (s *OssutilCommandSuite) TestAppendFileClientError(c *C) { - c.Assert(err, IsNil) - - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -258,7 +258,7 @@ func (s *OssutilCommandSuite) TestAppendFileObjectExistMetaError(c *C) { - strMeta := "x-oss-meta-author:luxun" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -291,7 +291,7 @@ func (s *OssutilCommandSuite) TestAppendFileParserMetaError(c *C) { - strMeta := "x-oss-meta-author#luxun" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -323,7 +323,7 @@ func (s *OssutilCommandSuite) TestAppendFileAppendFromFileError(c *C) { - var testCommand AppendFileCommand - testCommand.afOption.fileName = randLowStr(12) - -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -372,7 +372,7 @@ func (s *OssutilCommandSuite) TestAppendFileWithPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -390,7 +390,7 @@ func (s *OssutilCommandSuite) TestAppendFileWithPayer(c *C) { - cpDir := CheckpointDir - cpOptions := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "checkpointDir": &cpDir, -diff --git a/oss/lib/bucket_cors.go b/oss/lib/bucket_cors.go -index fab406db..d3f611a0 100644 ---- a/oss/lib/bucket_cors.go -+++ b/oss/lib/bucket_cors.go -@@ -137,7 +137,7 @@ var corsCommand = CorsCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_cors_test.go b/oss/lib/bucket_cors_test.go -index 26b0724e..7ff3bcc2 100644 ---- a/oss/lib/bucket_cors_test.go -+++ b/oss/lib/bucket_cors_test.go -@@ -33,7 +33,7 @@ func (s *OssutilCommandSuite) TestCorsPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -49,7 +49,7 @@ func (s *OssutilCommandSuite) TestCorsPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -87,7 +87,7 @@ func (s *OssutilCommandSuite) TestCorsPutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -186,7 +186,7 @@ func (s *OssutilCommandSuite) TestCorsGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -202,7 +202,7 @@ func (s *OssutilCommandSuite) TestCorsGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -247,7 +247,7 @@ func (s *OssutilCommandSuite) TestCorsDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -263,7 +263,7 @@ func (s *OssutilCommandSuite) TestCorsDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_encryption.go b/oss/lib/bucket_encryption.go -index 4a2fd73a..a4d918f2 100644 ---- a/oss/lib/bucket_encryption.go -+++ b/oss/lib/bucket_encryption.go -@@ -108,7 +108,7 @@ var bucketEncryptionCommand = BucketEncryptionCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_encryption_test.go b/oss/lib/bucket_encryption_test.go -index 4a1b02ac..9a3dc108 100644 ---- a/oss/lib/bucket_encryption_test.go -+++ b/oss/lib/bucket_encryption_test.go -@@ -18,7 +18,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionPutSuccess(c *C) { - strSSEAlgorithm := "KMS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -83,7 +83,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionDeleteSuccess(c *C) { - strSSEAlgorithm := "KMS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -124,7 +124,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -155,7 +155,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionPutEmptyEndpoint(c *C) { - strSSEAlgorithm := "KMS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -168,7 +168,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -191,7 +191,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionGetEmptyEndpoint(c *C) { - strSSEAlgorithm := "KMS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -204,7 +204,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/bucket_lifecycle.go b/oss/lib/bucket_lifecycle.go -index f3194a78..63f9c3e5 100644 ---- a/oss/lib/bucket_lifecycle.go -+++ b/oss/lib/bucket_lifecycle.go -@@ -156,7 +156,7 @@ var bucketLifeCycleCommand = BucketLifeCycleCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_lifecycle_test.go b/oss/lib/bucket_lifecycle_test.go -index 51a45f73..da0c1942 100644 ---- a/oss/lib/bucket_lifecycle_test.go -+++ b/oss/lib/bucket_lifecycle_test.go -@@ -39,7 +39,7 @@ func (s *OssutilCommandSuite) TestLifecyclePutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -55,7 +55,7 @@ func (s *OssutilCommandSuite) TestLifecyclePutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -97,7 +97,7 @@ func (s *OssutilCommandSuite) TestLifecyclePutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -183,7 +183,7 @@ func (s *OssutilCommandSuite) TestLifecycleOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -195,7 +195,7 @@ func (s *OssutilCommandSuite) TestLifecycleOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -235,7 +235,7 @@ func (s *OssutilCommandSuite) TestLifecycleGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -251,7 +251,7 @@ func (s *OssutilCommandSuite) TestLifecycleGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -301,7 +301,7 @@ func (s *OssutilCommandSuite) TestLifecycleDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -317,7 +317,7 @@ func (s *OssutilCommandSuite) TestLifecycleDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_logging.go b/oss/lib/bucket_logging.go -index bd11e40d..f65671e1 100644 ---- a/oss/lib/bucket_logging.go -+++ b/oss/lib/bucket_logging.go -@@ -116,7 +116,7 @@ var bucketLogCommand = BucketLogCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_logging_test.go b/oss/lib/bucket_logging_test.go -index d43548ac..b3add1ba 100644 ---- a/oss/lib/bucket_logging_test.go -+++ b/oss/lib/bucket_logging_test.go -@@ -21,7 +21,7 @@ func (s *OssutilCommandSuite) TestBucketLogPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -37,7 +37,7 @@ func (s *OssutilCommandSuite) TestBucketLogPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -77,7 +77,7 @@ func (s *OssutilCommandSuite) TestBucketLogDeleteSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -150,7 +150,7 @@ func (s *OssutilCommandSuite) TestBucketLogGetToStdout(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -185,7 +185,7 @@ func (s *OssutilCommandSuite) TestBucketLogGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -201,7 +201,7 @@ func (s *OssutilCommandSuite) TestBucketLogGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -246,7 +246,7 @@ func (s *OssutilCommandSuite) TestBucketLogPutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -314,7 +314,7 @@ func (s *OssutilCommandSuite) TestBucketLogDeleteError(c *C) { - strKey := "aaa" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &strKey, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_policy.go b/oss/lib/bucket_policy.go -index 11699124..67d4d092 100644 ---- a/oss/lib/bucket_policy.go -+++ b/oss/lib/bucket_policy.go -@@ -153,7 +153,7 @@ var bucketPolicyCommand = BucketPolicyCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_policy_test.go b/oss/lib/bucket_policy_test.go -index fdb34483..0206045f 100644 ---- a/oss/lib/bucket_policy_test.go -+++ b/oss/lib/bucket_policy_test.go -@@ -36,7 +36,7 @@ func (s *OssutilCommandSuite) TestPolicyPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -52,7 +52,7 @@ func (s *OssutilCommandSuite) TestPolicyPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -86,7 +86,7 @@ func (s *OssutilCommandSuite) TestPolicyPutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -172,7 +172,7 @@ func (s *OssutilCommandSuite) TestPolicyOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -184,7 +184,7 @@ func (s *OssutilCommandSuite) TestPolicyOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -227,7 +227,7 @@ func (s *OssutilCommandSuite) TestPolicyGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -243,7 +243,7 @@ func (s *OssutilCommandSuite) TestPolicyGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -296,7 +296,7 @@ func (s *OssutilCommandSuite) TestPolicyDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -312,7 +312,7 @@ func (s *OssutilCommandSuite) TestPolicyDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_qos.go b/oss/lib/bucket_qos.go -index 2f84b2de..a77ba024 100644 ---- a/oss/lib/bucket_qos.go -+++ b/oss/lib/bucket_qos.go -@@ -142,7 +142,7 @@ var bucketQosCommand = BucketQosCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_qos_test.go b/oss/lib/bucket_qos_test.go -index c9ed5cdb..7cca919b 100644 ---- a/oss/lib/bucket_qos_test.go -+++ b/oss/lib/bucket_qos_test.go -@@ -39,7 +39,7 @@ func (s *OssutilCommandSuite) TestBucketQosPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -58,7 +58,7 @@ func (s *OssutilCommandSuite) TestBucketQosPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -104,7 +104,7 @@ func (s *OssutilCommandSuite) TestBucketQosPutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -190,7 +190,7 @@ func (s *OssutilCommandSuite) TestBucketQosOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -202,7 +202,7 @@ func (s *OssutilCommandSuite) TestBucketQosOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -241,7 +241,7 @@ func (s *OssutilCommandSuite) TestBucketQosGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -257,7 +257,7 @@ func (s *OssutilCommandSuite) TestBucketQosGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -305,7 +305,7 @@ func (s *OssutilCommandSuite) TestBucketQosDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -321,7 +321,7 @@ func (s *OssutilCommandSuite) TestBucketQosDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_referer.go b/oss/lib/bucket_referer.go -index edcc96c9..3e61a4cb 100644 ---- a/oss/lib/bucket_referer.go -+++ b/oss/lib/bucket_referer.go -@@ -121,7 +121,7 @@ var bucketRefererCommand = BucketRefererCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_referer_test.go b/oss/lib/bucket_referer_test.go -index 2b16fa50..9b6a1361 100644 ---- a/oss/lib/bucket_referer_test.go -+++ b/oss/lib/bucket_referer_test.go -@@ -19,7 +19,7 @@ func (s *OssutilCommandSuite) TestBucketRefererPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -37,7 +37,7 @@ func (s *OssutilCommandSuite) TestBucketRefererPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -80,7 +80,7 @@ func (s *OssutilCommandSuite) TestBucketRefererDisableEmpty(c *C) { - disableEmptyRefer := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -99,7 +99,7 @@ func (s *OssutilCommandSuite) TestBucketRefererDisableEmpty(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -141,7 +141,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -159,7 +159,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -205,7 +205,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetToStdout(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -228,7 +228,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetToStdout(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -265,7 +265,7 @@ func (s *OssutilCommandSuite) TestBucketRefererBucketError(c *C) { - disableEmptyRefer := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -290,7 +290,7 @@ func (s *OssutilCommandSuite) TestBucketRefererDeleteSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -308,7 +308,7 @@ func (s *OssutilCommandSuite) TestBucketRefererDeleteSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -373,7 +373,7 @@ func (s *OssutilCommandSuite) TestBucketRefererError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -412,7 +412,7 @@ func (s *OssutilCommandSuite) TestBucketRefererPutEmptyEndpoint(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -424,7 +424,7 @@ func (s *OssutilCommandSuite) TestBucketRefererPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -450,7 +450,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -462,7 +462,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/bucket_tagging.go b/oss/lib/bucket_tagging.go -index 93b1453e..7c3fb37d 100644 ---- a/oss/lib/bucket_tagging.go -+++ b/oss/lib/bucket_tagging.go -@@ -106,7 +106,7 @@ var bucketTagCommand = BucketTagCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_tagging_test.go b/oss/lib/bucket_tagging_test.go -index 3efc75d2..6403eecc 100644 ---- a/oss/lib/bucket_tagging_test.go -+++ b/oss/lib/bucket_tagging_test.go -@@ -17,7 +17,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -51,7 +51,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingDeleteSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -94,7 +94,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -137,7 +137,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingPutEmptyEndpoint(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -149,7 +149,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -172,7 +172,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingGetEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -184,7 +184,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/bucket_versioning.go b/oss/lib/bucket_versioning.go -index e520686d..9afe463a 100644 ---- a/oss/lib/bucket_versioning.go -+++ b/oss/lib/bucket_versioning.go -@@ -98,7 +98,7 @@ var bucketVersioningCommand = BucketVersioningCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_versioning_test.go b/oss/lib/bucket_versioning_test.go -index a19148da..c285b888 100644 ---- a/oss/lib/bucket_versioning_test.go -+++ b/oss/lib/bucket_versioning_test.go -@@ -16,7 +16,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningPutSuccess(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -65,7 +65,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -105,7 +105,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningPutEmptyEndpoint(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -117,7 +117,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -139,7 +139,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningGetEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -151,7 +151,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/bucket_website.go b/oss/lib/bucket_website.go -index db9a7b11..97d20223 100644 ---- a/oss/lib/bucket_website.go -+++ b/oss/lib/bucket_website.go -@@ -230,7 +230,7 @@ var bucketWebsiteCommand = BucketWebSiteCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_website_test.go b/oss/lib/bucket_website_test.go -index 01f27aa8..71ad688c 100644 ---- a/oss/lib/bucket_website_test.go -+++ b/oss/lib/bucket_website_test.go -@@ -52,7 +52,7 @@ func (s *OssutilCommandSuite) TestWebsitePutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -68,7 +68,7 @@ func (s *OssutilCommandSuite) TestWebsitePutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -111,7 +111,7 @@ func (s *OssutilCommandSuite) TestWebsitePutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -197,7 +197,7 @@ func (s *OssutilCommandSuite) TestWebsiteOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -209,7 +209,7 @@ func (s *OssutilCommandSuite) TestWebsiteOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -262,7 +262,7 @@ func (s *OssutilCommandSuite) TestWebsiteGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -278,7 +278,7 @@ func (s *OssutilCommandSuite) TestWebsiteGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -341,7 +341,7 @@ func (s *OssutilCommandSuite) TestWebsiteDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -357,7 +357,7 @@ func (s *OssutilCommandSuite) TestWebsiteDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/cat.go b/oss/lib/cat.go -index ac92bff3..c9c2b101 100644 ---- a/oss/lib/cat.go -+++ b/oss/lib/cat.go -@@ -92,7 +92,7 @@ var catCommand = CatCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/cat_test.go b/oss/lib/cat_test.go -index 1cc88831..dd3a99b2 100644 ---- a/oss/lib/cat_test.go -+++ b/oss/lib/cat_test.go -@@ -11,7 +11,7 @@ import ( - - func (s *OssutilCommandSuite) TestCatObjectSuccess(c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucketName := bucketNamePrefix + randLowStr(5) -@@ -32,7 +32,7 @@ func (s *OssutilCommandSuite) TestCatObjectSuccess(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -62,7 +62,7 @@ func (s *OssutilCommandSuite) TestCatObjectSuccess(c *C) { - - func (s *OssutilCommandSuite) TestCatObjectError(c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucketName := bucketNamePrefix + randLowStr(5) -@@ -73,7 +73,7 @@ func (s *OssutilCommandSuite) TestCatObjectError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -98,7 +98,7 @@ func (s *OssutilCommandSuite) TestCatObjectError(c *C) { - - func (s *OssutilCommandSuite) TestCatObjecEndpointEmptyError(c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucketName := bucketNamePrefix + randLowStr(5) -@@ -109,7 +109,7 @@ func (s *OssutilCommandSuite) TestCatObjecEndpointEmptyError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -121,7 +121,7 @@ func (s *OssutilCommandSuite) TestCatObjecEndpointEmptyError(c *C) { - c.Assert(err, IsNil) - - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -176,7 +176,7 @@ func (s *OssutilCommandSuite) TestCatObjectWithVersion(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -202,7 +202,7 @@ func (s *OssutilCommandSuite) TestCatObjectWithVersion(c *C) { - //begin cat with version id v1 - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -242,7 +242,7 @@ func (s *OssutilCommandSuite) TestCatObjectWithPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/cli_bridge.go b/oss/lib/cli_bridge.go -index 31a41afc..a6455198 100644 ---- a/oss/lib/cli_bridge.go -+++ b/oss/lib/cli_bridge.go -@@ -8,6 +8,7 @@ import ( - "github.com/aliyun/aliyun-cli/cli" - "github.com/aliyun/aliyun-cli/config" - "github.com/aliyun/aliyun-cli/i18n" -+ "github.com/alibabacloud-go/tea/tea" - "github.com/aliyun/credentials-go/credentials" - ) - -@@ -100,13 +101,13 @@ func ParseAndRunCommandFromCli(ctx *cli.Context, args []string) error { - return fmt.Errorf("config failed: %s", err.Error()) - } - -- accessKeyID, accessSecret, stsToken, err := getSessionCredential(&profile) -+ accessKeyId, accessSecret, stsToken, err := getSessionCredential(&profile) - if err != nil { - return fmt.Errorf("can't get credential %s", err) - } - - configs := make(map[string]string, 0) -- configs["access-key-id"] = accessKeyID -+ configs["access-key-id"] = accessKeyId - configs["access-key-secret"] = accessSecret - configs["sts-token"] = stsToken - -@@ -154,35 +155,35 @@ func ParseAndRunCommandFromCli(ctx *cli.Context, args []string) error { - } - - func getSessionCredential(profile *config.Profile) (string, string, string, error) { -- var conf *credentials.Configuration -+ var conf *credentials.Config - switch profile.Mode { - case config.AK: -- conf = &credentials.Configuration{ -- Type: "access_key", -- AccessKeyID: profile.AccessKeyId, -- AccessKeySecret: profile.AccessKeySecret, -+ conf = &credentials.Config{ -+ Type: tea.String("access_key"), -+ AccessKeyId: tea.String(profile.AccessKeyId), -+ AccessKeySecret: tea.String(profile.AccessKeySecret), - } - case config.StsToken: -- conf = &credentials.Configuration{ -- Type: "sts", -- AccessKeyID: profile.AccessKeyId, -- AccessKeySecret: profile.AccessKeySecret, -- SecurityToken: profile.StsToken, -+ conf = &credentials.Config{ -+ Type: tea.String("sts"), -+ AccessKeyId: tea.String(profile.AccessKeyId), -+ AccessKeySecret: tea.String(profile.AccessKeySecret), -+ SecurityToken: tea.String(profile.StsToken), - } - case config.RamRoleArn: -- conf = &credentials.Configuration{ -- Type: "ram_role_arn", -- AccessKeyID: profile.AccessKeyId, -- AccessKeySecret: profile.AccessKeySecret, -- RoleArn: profile.RamRoleArn, -- RoleSessionName: profile.RoleSessionName, -- Policy: "", -- RoleSessionExpiration: profile.ExpiredSeconds, -+ conf = &credentials.Config{ -+ Type: tea.String("ram_role_arn"), -+ AccessKeyId: tea.String(profile.AccessKeyId), -+ AccessKeySecret: tea.String(profile.AccessKeySecret), -+ RoleArn: tea.String(profile.RamRoleArn), -+ RoleSessionName: tea.String(profile.RoleSessionName), -+ Policy: tea.String(""), -+ RoleSessionExpiration: tea.Int(profile.ExpiredSeconds), - } - case config.EcsRamRole: -- conf = &credentials.Configuration{ -- Type: "ecs_ram_role", -- RoleName: profile.RamRoleName, -+ conf = &credentials.Config{ -+ Type: tea.String("ecs_ram_role"), -+ RoleName: tea.String(profile.RamRoleName), - } - case config.RamRoleArnWithEcs: - client, _ := sdk.NewClientWithEcsRamRole(profile.RegionId, profile.RamRoleName) -@@ -193,11 +194,11 @@ func getSessionCredential(profile *config.Profile) (string, string, string, erro - return "", "", "", err - } - var lastErr error -- accessKeyID, err := credential.GetAccessKeyID() -+ accessKeyId, err := credential.GetAccessKeyId() - if err != nil { - lastErr = err - } -- accessSecret, err := credential.GetAccessSecret() -+ accessSecret, err := credential.GetAccessKeySecret() - if err != nil { - lastErr = err - } -@@ -208,5 +209,5 @@ func getSessionCredential(profile *config.Profile) (string, string, string, erro - if lastErr != nil { - return "", "", "", lastErr - } -- return accessKeyID, accessSecret, stsToken, nil -+ return tea.StringValue(accessKeyId), tea.StringValue(accessSecret), tea.StringValue(stsToken), nil - } -diff --git a/oss/lib/command.go b/oss/lib/command.go -index 5d990d4c..8cf54fc3 100644 ---- a/oss/lib/command.go -+++ b/oss/lib/command.go -@@ -127,7 +127,7 @@ func (cmd *Command) loadConfig(configFile string, cmder interface{}) error { - } - - func (cmd *Command) needConfigFile() bool { -- for _, name := range []string{OptionEndpoint, OptionAccessKeyID, OptionAccessKeySecret, OptionSTSToken} { -+ for _, name := range []string{OptionEndpoint, OptionAccessKeyId, OptionAccessKeySecret, OptionSTSToken} { - val, _ := GetString(name, cmd.options) - if val != "" { - return false -@@ -282,7 +282,7 @@ func (cmd *Command) formatOption(option Option) string { - // get oss client according to bucket(if bucket not empty) - func (cmd *Command) ossClient(bucket string) (*oss.Client, error) { - endpoint, isCname := cmd.getEndpoint(bucket) -- accessKeyID, _ := GetString(OptionAccessKeyID, cmd.options) -+ accessKeyId, _ := GetString(OptionAccessKeyId, cmd.options) - accessKeySecret, _ := GetString(OptionAccessKeySecret, cmd.options) - stsToken, _ := GetString(OptionSTSToken, cmd.options) - disableCRC64, _ := GetBool(OptionDisableCRC64, cmd.options) -@@ -292,12 +292,12 @@ func (cmd *Command) ossClient(bucket string) (*oss.Client, error) { - ecsUrl, _ := cmd.getEcsRamAkService() - localHost, _ := GetString(OptionLocalHost, cmd.options) - -- if accessKeyID == "" && ecsUrl == "" { -- return nil, fmt.Errorf("accessKeyID and ecsUrl are both empty") -+ if accessKeyId == "" && ecsUrl == "" { -+ return nil, fmt.Errorf("accessKeyId and ecsUrl are both empty") - } - - if ecsUrl == "" { -- if err := cmd.checkCredentials(endpoint, accessKeyID, accessKeySecret); err != nil { -+ if err := cmd.checkCredentials(endpoint, accessKeyId, accessKeySecret); err != nil { - return nil, err - } - } -@@ -331,13 +331,13 @@ func (cmd *Command) ossClient(bucket string) (*oss.Client, error) { - options = append(options, oss.SetLogger(utilLogger)) - } - -- if accessKeyID == "" { -+ if accessKeyId == "" { - LogInfo("using user ak service:%s\n", ecsUrl) - ecsRoleAKBuild := EcsRoleAKBuild{url: ecsUrl} - options = append(options, oss.SetCredentialsProvider(&ecsRoleAKBuild)) - } - -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret, options...) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret, options...) - if err != nil { - return nil, err - } -@@ -359,12 +359,12 @@ func (cmd *Command) ossClient(bucket string) (*oss.Client, error) { - return client, nil - } - --func (cmd *Command) checkCredentials(endpoint, accessKeyID, accessKeySecret string) error { -+func (cmd *Command) checkCredentials(endpoint, accessKeyId, accessKeySecret string) error { - if strings.TrimSpace(endpoint) == "" { - return fmt.Errorf("invalid endpoint, endpoint is empty, please check your config") - } -- if strings.TrimSpace(accessKeyID) == "" { -- return fmt.Errorf("invalid accessKeyID, accessKeyID is empty, please check your config") -+ if strings.TrimSpace(accessKeyId) == "" { -+ return fmt.Errorf("invalid accessKeyId, accessKeyId is empty, please check your config") - } - if strings.TrimSpace(accessKeySecret) == "" { - return fmt.Errorf("invalid accessKeySecret, accessKeySecret is empty, please check your config") -diff --git a/oss/lib/command_test.go b/oss/lib/command_test.go -index a56cd018..d9e5ad88 100644 ---- a/oss/lib/command_test.go -+++ b/oss/lib/command_test.go -@@ -31,7 +31,7 @@ var _ = Suite(&OssutilCommandSuite{}) - var ( - // Update before running test - endpoint = "" -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - payerBucket = "" -@@ -92,8 +92,8 @@ func SetUpCredential() { - if strings.HasPrefix(endpoint, "http://") { - endpoint = endpoint[7:] - } -- if accessKeyID == "" { -- accessKeyID = os.Getenv("OSS_TEST_ACCESS_KEY_ID") -+ if accessKeyId == "" { -+ accessKeyId = os.Getenv("OSS_TEST_ACCESS_KEY_ID") - } - if accessKeySecret == "" { - accessKeySecret = os.Getenv("OSS_TEST_ACCESS_KEY_SECRET") -@@ -200,7 +200,7 @@ func getFileList(dpath string) ([]string, error) { - - func (s *OssutilCommandSuite) PutObject(bucketName string, object string, body string, c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -213,7 +213,7 @@ func (s *OssutilCommandSuite) PutObject(bucketName string, object string, body s - - func (s *OssutilCommandSuite) AppendObject(bucketName string, object string, body string, position int64, c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -228,7 +228,7 @@ func (s *OssutilCommandSuite) configNonInteractive(c *C) { - var args []string - options := OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "configFile": &configFile, - } -@@ -241,7 +241,7 @@ func (s *OssutilCommandSuite) configNonInteractive(c *C) { - c.Assert(len(opts), Equals, 4) - c.Assert(opts[OptionLanguage], Equals, DefaultLanguage) - c.Assert(opts[OptionEndpoint], Equals, endpoint) -- c.Assert(opts[OptionAccessKeyID], Equals, accessKeyID) -+ c.Assert(opts[OptionAccessKeyId], Equals, accessKeyId) - c.Assert(opts[OptionAccessKeySecret], Equals, accessKeySecret) - } - -@@ -294,7 +294,7 @@ func (s *OssutilCommandSuite) rawList(args []string, cmdline string, optionPairs - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -363,7 +363,7 @@ func (s *OssutilCommandSuite) rawListLimitedMarker(args []string, cmdline string - limitedNumStr := strconv.FormatInt(limitedNum, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -461,7 +461,7 @@ func (s *OssutilCommandSuite) rawRemove(args []string, recursive, force, bucket - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -482,7 +482,7 @@ func (s *OssutilCommandSuite) removeBucketObjectVersions(bucket string, c *C) (b - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -522,7 +522,7 @@ func (s *OssutilCommandSuite) removeWrapper(cmdline string, bucket string, objec - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -558,7 +558,7 @@ func (s *OssutilCommandSuite) initRemove(bucket string, object string, cmdline s - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -629,7 +629,7 @@ func (s *OssutilCommandSuite) rawPutBucketWithACL(args []string, acl string) (bo - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -644,7 +644,7 @@ func (s *OssutilCommandSuite) rawPutBucketWithACLLanguage(args []string, acl, la - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -661,7 +661,7 @@ func (s *OssutilCommandSuite) putBucket(bucket string, c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -677,7 +677,7 @@ func (s *OssutilCommandSuite) putBucketWithEndPoint(bucket string, strEndPoint s - str := "" - options := OptionMapType{ - "endpoint": &strEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -694,7 +694,7 @@ func (s *OssutilCommandSuite) putBucketVersioning(bucket string, status string, - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -717,7 +717,7 @@ func (s *OssutilCommandSuite) initPutBucketWithStorageClass(args []string, stora - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -741,7 +741,7 @@ func (s *OssutilCommandSuite) rawCPWithArgs(args []string, recursive, force, upd - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -817,7 +817,7 @@ func (s *OssutilCommandSuite) rawCPWithFilter(args []string, recursive, force, u - - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -847,7 +847,7 @@ func (s *OssutilCommandSuite) rawCPWithOutputDir(srcURL, destURL string, recursi - cpDir := CheckpointDir - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -873,7 +873,7 @@ func (s *OssutilCommandSuite) rawCPWithPayer(args []string, recursive, force, up - cpDir := CheckpointDir - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -898,7 +898,7 @@ func (s *OssutilCommandSuite) initCopyCommand(srcURL, destURL string, recursive, - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -924,7 +924,7 @@ func (s *OssutilCommandSuite) initCopyWithSnapshot(srcURL, destURL string, recur - cpDir := CheckpointDir - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -950,7 +950,7 @@ func (s *OssutilCommandSuite) initCopyWithRange(srcURL, destURL string, recursiv - cpDir := CheckpointDir - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -999,7 +999,7 @@ func (s *OssutilCommandSuite) rawGetStatWithArgs(args []string) (bool, error) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1070,7 +1070,7 @@ func (s *OssutilCommandSuite) rawSetACLWithArgs(args []string, recursive, bucket - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1090,7 +1090,7 @@ func (s *OssutilCommandSuite) rawSetAclWithFilter(args []string, recursive, forc - - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1112,7 +1112,7 @@ func (s *OssutilCommandSuite) initSetACL(bucket, object, acl string, recursive, - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1146,7 +1146,7 @@ func (s *OssutilCommandSuite) initSetACLWithArgs(args []string, cmdline string, - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1187,7 +1187,7 @@ func (s *OssutilCommandSuite) rawSetMetaWithArgs(args []string, update, delete, - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1214,7 +1214,7 @@ func (s *OssutilCommandSuite) rawSetMetaWithArgsWithPattern(args []string, updat - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1237,7 +1237,7 @@ func (s *OssutilCommandSuite) rawSetMetaWithFilter(args []string, update, delete - - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1316,7 +1316,7 @@ func (s *OssutilCommandSuite) initSetMeta(bucket, object, meta string, update, d - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1362,7 +1362,7 @@ func (s *OssutilCommandSuite) initSetMetaWithArgs(args []string, cmdline string, - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1396,7 +1396,7 @@ func (s *OssutilCommandSuite) initCreateSymlink(cmdline string) error { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1441,7 +1441,7 @@ func (s *OssutilCommandSuite) initReadSymlink(cmdline string) error { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1465,7 +1465,7 @@ func (s *OssutilCommandSuite) initSignURL(cmdline, encodingType string, timeout - t := strconv.FormatInt(timeout, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1536,7 +1536,7 @@ func (s *OssutilCommandSuite) initRestoreObject(args []string, cmdline string, o - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1740,7 +1740,7 @@ func (s *OssutilCommandSuite) TestErrOssDownloadFile(c *C) { - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1807,7 +1807,7 @@ func (s *OssutilCommandSuite) TestNeedConfig(c *C) { - e := "a" - options := OptionMapType{ - "endpoint": &e, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &str, -diff --git a/oss/lib/config.go b/oss/lib/config.go -index 0d9ba431..b4a0f12c 100644 ---- a/oss/lib/config.go -+++ b/oss/lib/config.go -@@ -66,7 +66,7 @@ var specChineseConfig = SpecText{ - 或者非法，将采用默认语言：` + DefaultLanguage + `。 - 注意：该配置项在此次config成功结束后才会生效，在执行config命令过 - 程中语言显示不会受用户的选择影响。 -- (3) endpoint, accessKeyID, accessKeySecret -+ (3) endpoint, accessKeyId, accessKeySecret - 回车代表着跳过相应配置项的设置。注意：endpoint应该为一个二级域 - 名(SLD)，例如：` + DefaultEndpoint + `。 - 以上选项一般为必选项。 -@@ -121,7 +121,7 @@ var specChineseConfig = SpecText{ - [Credentials] - language = CH - endpoint = ` + DefaultEndpoint + ` -- accessKeyID = your_key_id -+ accessKeyId = your_key_id - accessKeySecret = your_key_secret - stsToken = your_sts_token - outputDir = your_output_dir -@@ -207,7 +207,7 @@ Usage: - default language: ` + DefaultLanguage + `. - Notice that the configuration will go into effect after the config - command successfully executed, it's dimmed while execute the command. -- (3) endpoint, accessKeyID, accessKeySecret -+ (3) endpoint, accessKeyId, accessKeySecret - Carriage return means skip the configuration of these options. - Note: Endpoint means a second-level domain(SLD), eg: ` + DefaultEndpoint + `. - The three options are necessary in normal condition. -@@ -264,7 +264,7 @@ Credential File Format: - [Credentials] - language = EN - endpoint = ` + DefaultEndpoint + ` -- accessKeyID = your_key_id -+ accessKeyId = your_key_id - accessKeySecret = your_key_secret - stsToken = your_sts_token - outputDir = your_output_dir -@@ -301,7 +301,7 @@ var configCommand = ConfigCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionOutputDir, -diff --git a/oss/lib/config_helper.go b/oss/lib/config_helper.go -index 4ca1c43c..a7906dfb 100644 ---- a/oss/lib/config_helper.go -+++ b/oss/lib/config_helper.go -@@ -38,7 +38,7 @@ type configOption struct { - var CredOptionList = []string{ - OptionLanguage, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionOutputDir, -@@ -49,7 +49,7 @@ var CredOptionList = []string{ - var CredOptionMap = map[string]configOption{ - OptionLanguage: configOption{[]string{"language", "Language"}, false, true, "", ""}, - OptionEndpoint: configOption{[]string{"endpoint", "host"}, true, true, "", ""}, -- OptionAccessKeyID: configOption{[]string{"accessKeyID", "accessKeyId", "AccessKeyID", "AccessKeyId", "access_key_id", "access_id", "accessid", "access-key-id", "access-id"}, true, false, "", ""}, -+ OptionAccessKeyId: configOption{[]string{"accessKeyId", "accessKeyId", "AccessKeyId", "AccessKeyId", "access_key_id", "access_id", "accessid", "access-key-id", "access-id"}, true, false, "", ""}, - OptionAccessKeySecret: configOption{[]string{"accessKeySecret", "AccessKeySecret", "access_key_secret", "access_key", "accesskey", "access-key-secret", "access-key"}, true, false, "", ""}, - OptionSTSToken: configOption{[]string{"stsToken", "ststoken", "STSToken", "sts_token", "sts-token"}, true, false, "", ""}, - OptionOutputDir: configOption{[]string{"outputDir", "output-dir", "output_dir", "output_directory"}, false, true, "ossutil生成的文件的输出目录, ", "the directory to store files generated by ossutil, "}, -diff --git a/oss/lib/config_test.go b/oss/lib/config_test.go -index a2524256..d2b0d36b 100644 ---- a/oss/lib/config_test.go -+++ b/oss/lib/config_test.go -@@ -56,7 +56,7 @@ func (s *OssutilConfigSuite) TestConfigNonInteractive(c *C) { - var args []string - options := OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &stsToken, - "configFile": &configFile, -@@ -74,7 +74,7 @@ func (s *OssutilConfigSuite) TestConfigNonInteractive(c *C) { - c.Assert(len(opts), Equals, 5) - c.Assert(opts[OptionLanguage], Equals, DefaultLanguage) - c.Assert(opts[OptionEndpoint], Equals, endpoint) -- c.Assert(opts[OptionAccessKeyID], Equals, accessKeyID) -+ c.Assert(opts[OptionAccessKeyId], Equals, accessKeyId) - c.Assert(opts[OptionAccessKeySecret], Equals, accessKeySecret) - c.Assert(opts[OptionSTSToken], Equals, stsToken) - } -@@ -200,7 +200,7 @@ func (s *OssutilConfigSuite) TestConfigOptionEmptyValue(c *C) { - id := "" - options := OptionMapType{ - "endpoint": &endp, -- "accessKeyID": &id, -+ "accessKeyId": &id, - "accessKeySecret": &accessKeySecret, - "stsToken": &stsToken, - "configFile": &configFile, -@@ -217,7 +217,7 @@ func (s *OssutilConfigSuite) TestConfigOptionEmptyValue(c *C) { - c.Assert(err, IsNil) - c.Assert(len(opts), Equals, 3) - c.Assert(opts[OptionEndpoint], IsNil) -- c.Assert(opts[OptionAccessKeyID], IsNil) -+ c.Assert(opts[OptionAccessKeyId], IsNil) - c.Assert(opts[OptionLanguage], Equals, DefaultLanguage) - c.Assert(opts[OptionAccessKeySecret], Equals, accessKeySecret) - c.Assert(opts[OptionSTSToken], Equals, stsToken) -diff --git a/oss/lib/const.go b/oss/lib/const.go -index 11e7d1f8..f3c9e27b 100644 ---- a/oss/lib/const.go -+++ b/oss/lib/const.go -@@ -10,7 +10,7 @@ import ( - const ( - OptionConfigFile string = "configFile" - OptionEndpoint = "endpoint" -- OptionAccessKeyID = "accessKeyID" -+ OptionAccessKeyId = "accessKeyId" - OptionAccessKeySecret = "accessKeySecret" - OptionSTSToken = "stsToken" - OptionACL = "acl" -diff --git a/oss/lib/cors_options.go b/oss/lib/cors_options.go -index a0373360..15353569 100644 ---- a/oss/lib/cors_options.go -+++ b/oss/lib/cors_options.go -@@ -79,7 +79,7 @@ var corsOptionsCommand = OptionsCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/cors_options_test.go b/oss/lib/cors_options_test.go -index 2f3bd13e..4a58e790 100644 ---- a/oss/lib/cors_options_test.go -+++ b/oss/lib/cors_options_test.go -@@ -36,7 +36,7 @@ func (s *OssutilCommandSuite) TestCorsOptionsSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -79,7 +79,7 @@ func (s *OssutilCommandSuite) TestCorsOptionsError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -119,7 +119,7 @@ func (s *OssutilCommandSuite) TestCorsOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -131,7 +131,7 @@ func (s *OssutilCommandSuite) TestCorsOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/cp.go b/oss/lib/cp.go -index d16a7eec..fe76e8f4 100644 ---- a/oss/lib/cp.go -+++ b/oss/lib/cp.go -@@ -199,7 +199,7 @@ var specChineseCopy = SpecText{ - （1）如果未进入批量文件迭代过程，错误已经发生，则不会产生report文件，ossutil会终止 - 运行，不继续迭代过程。如，用户输入cp命令出错时，不会产生report文件，而是屏幕输出错 - 误并退出。 -- （2）如果批量操作过程某文件发生的错误为：Bucket不存在、accessKeyID/accessKeySecret -+ （2）如果批量操作过程某文件发生的错误为：Bucket不存在、accessKeyId/accessKeySecret - 错误造成的权限验证非法等错误，ossutil会屏幕输出错误并退出。 - - report文件名为：` + ReportPrefix + `日期_时间` + ReportSuffix + `。report文件是ossutil输出文件的一种， -@@ -1265,7 +1265,7 @@ var copyCommand = CopyCommand{ - OptionACL, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/cp_test.go b/oss/lib/cp_test.go -index 5df88afc..99c4c159 100644 ---- a/oss/lib/cp_test.go -+++ b/oss/lib/cp_test.go -@@ -578,7 +578,7 @@ func (s *OssutilCommandSuite) TestUploadErrSrc(c *C) { - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1080,7 +1080,7 @@ func (s *OssutilCommandSuite) TestCPIDKey(c *C) { - s.createFile(ufile, data, c) - - cfile := randStr(10) -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "cp" -@@ -1093,7 +1093,7 @@ func (s *OssutilCommandSuite) TestCPIDKey(c *C) { - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -1108,7 +1108,7 @@ func (s *OssutilCommandSuite) TestCPIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -1158,7 +1158,7 @@ func (s *OssutilCommandSuite) TestUploadOutputDir(c *C) { - // SignatureDoesNotMatch err copy -> no outputdir - cfile := configFile - configFile = randStr(10) -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", endpoint, accessKeyID, "abc", bucketName, endpoint) -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", endpoint, accessKeyId, "abc", bucketName, endpoint) - s.createFile(configFile, data, c) - - showElapse, err = s.rawCPWithOutputDir(ufile, CloudURLToString(bucketName, object), true, true, false, 1, dir) -@@ -1168,7 +1168,7 @@ func (s *OssutilCommandSuite) TestUploadOutputDir(c *C) { - c.Assert(err, NotNil) - c.Assert(os.IsNotExist(err), Equals, true) - -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, bucketName, "abc") -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, bucketName, "abc") - s.createFile(configFile, data, c) - - // err copy without -r -> no outputdir -@@ -1262,7 +1262,7 @@ func (s *OssutilCommandSuite) TestBatchUploadOutputDir(c *C) { - // err copy -> outputdir - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n", "abc", accessKeyID, accessKeySecret) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n", "abc", accessKeyId, accessKeySecret) - s.createFile(configFile, data, c) - testResultFile, _ = os.OpenFile(resultPath, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) - out := os.Stdout -@@ -1342,7 +1342,7 @@ func (s *OssutilCommandSuite) TestDownloadOutputDir(c *C) { - // err copy without -r -> no outputdir - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, bucketName, "abc") - s.createFile(configFile, data, c) - - showElapse, err = s.rawCPWithOutputDir(CloudURLToString(bucketName, object), downloadFileName, false, true, false, 1, dir) -@@ -1405,7 +1405,7 @@ func (s *OssutilCommandSuite) TestCopyOutputDir(c *C) { - // list err copy without -r -> no outputdir - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, srcBucket, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, srcBucket, "abc") - s.createFile(configFile, data, c) - showElapse, err = s.rawCPWithOutputDir(CloudURLToString(srcBucket, object), CloudURLToString(destBucket, object), false, true, false, 1, dir) - c.Assert(err, NotNil) -@@ -1471,7 +1471,7 @@ func (s *OssutilCommandSuite) TestBatchCopyOutputDir(c *C) { - // test objectStatistic err - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", srcBucket, "abc", srcBucket, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", srcBucket, "abc", srcBucket, "abc") - s.createFile(configFile, data, c) - - showElapse, err = s.rawCPWithOutputDir(CloudURLToString(srcBucket, ""), CloudURLToString(destBucket, ""), true, true, false, 1, dir) -@@ -1508,7 +1508,7 @@ func (s *OssutilCommandSuite) TestConfigOutputDir(c *C) { - // err copy -> outputdir - cfile := configFile - configFile = randStr(10) -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, bucketName, "abc") -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, bucketName, "abc") - s.createFile(configFile, data, c) - - showElapse, err := s.rawCPWithOutputDir(ufile, CloudURLToString(bucketName, object), true, true, false, 1, edir) -@@ -1525,7 +1525,7 @@ func (s *OssutilCommandSuite) TestConfigOutputDir(c *C) { - os.RemoveAll(DefaultOutputDir) - - // config outputdir -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\noutputDir=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, dir, bucketName, endpoint, bucketName, "abc") -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\noutputDir=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, dir, bucketName, endpoint, bucketName, "abc") - s.createFile(configFile, data, c) - - showElapse, err = s.rawCPWithOutputDir(ufile, CloudURLToString(bucketName, object), true, true, false, 1, "") -@@ -1663,7 +1663,7 @@ func (s *OssutilCommandSuite) TestCPURLEncoding(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -3205,7 +3205,7 @@ func (s *OssutilCommandSuite) TestCPObjectLimitSpeed(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3267,7 +3267,7 @@ func (s *OssutilCommandSuite) TestCPDirLimitSpeed(c *C) { - recursive := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3355,7 +3355,7 @@ func (s *OssutilCommandSuite) TestCPPartionDownloadSuccess(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "checkpointDir": &cpDir, -@@ -3414,7 +3414,7 @@ func (s *OssutilCommandSuite) TestCPPartitionDownloadParameterError(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "checkpointDir": &cpDir, -@@ -3491,7 +3491,7 @@ func (s *OssutilCommandSuite) TestCPDownloadSnapshot(c *C) { - recursive := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3563,7 +3563,7 @@ func (s *OssutilCommandSuite) TestCPVersioingParameterError(c *C) { - versionId := "123" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3611,7 +3611,7 @@ func (s *OssutilCommandSuite) TestCPVersioingDownloadSuccess(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3663,7 +3663,7 @@ func (s *OssutilCommandSuite) TestCPVersioingCopySuccess(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3712,7 +3712,7 @@ func (s *OssutilCommandSuite) TestCPWithAuthProxy(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "checkpointDir": &cpDir, -@@ -3753,7 +3753,7 @@ func (s *OssutilCommandSuite) TestCPWithAuthProxyError(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "checkpointDir": &cpDir, -@@ -3803,7 +3803,7 @@ func (s *OssutilCommandSuite) TestCPSetLocalAddrSuccess(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3852,7 +3852,7 @@ func (s *OssutilCommandSuite) TestCPSetLocalAddrError(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3904,7 +3904,7 @@ func (s *OssutilCommandSuite) TestUploadSymlinkDir(c *C) { - recursive := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3971,7 +3971,7 @@ func (s *OssutilCommandSuite) TestUploadSubSymlinkDir(c *C) { - enableSymlinkDir := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4043,7 +4043,7 @@ func (s *OssutilCommandSuite) TestUploadOnlyCurrentDir(c *C) { - onlyCurrentDir := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4110,7 +4110,7 @@ func (s *OssutilCommandSuite) TestDownloadOnlyCurrentDir(c *C) { - onlyCurrentDir := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4194,7 +4194,7 @@ func (s *OssutilCommandSuite) TestUploadDisableDirObject(c *C) { - disableDirObject := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4263,7 +4263,7 @@ func (s *OssutilCommandSuite) TestCPObjectProgressBarNetErrorRetry(c *C) { - strRetryTimes := "3" - options := OptionMapType{ - "endpoint": &mockHost, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4307,7 +4307,7 @@ func (s *OssutilCommandSuite) TestUploadWithDisableAllSymlinkDirFailure(c *C) { - - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4367,7 +4367,7 @@ func (s *OssutilCommandSuite) TestUploadWithDisableAllSymlinkDirSuccess(c *C) { - disableAllSymlink := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4439,7 +4439,7 @@ func (s *OssutilCommandSuite) TestUploadSymlinkFileProgressPrecise(c *C) { - disableAllSymlink := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4503,7 +4503,7 @@ func (s *OssutilCommandSuite) TestDownLoadWithoutDisableIgnoreError(c *C) { - recursive := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4582,7 +4582,7 @@ func (s *OssutilCommandSuite) TestDownLoadWithDisableIgnoreError(c *C) { - disableIgnoreError := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4637,7 +4637,7 @@ func (s *OssutilCommandSuite) TestCpWithTaggingError(c *C) { - tagging := "tagA=A&&tagb=B" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4688,7 +4688,7 @@ func (s *OssutilCommandSuite) TestUploadFileWithTagging(c *C) { - tagging := "tagA=A&tagb=B&tagc=C" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4726,7 +4726,7 @@ func (s *OssutilCommandSuite) TestCopyFileWithoutTagging(c *C) { - tagging := "tagA=A&tagb=B&tagc=C" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4779,7 +4779,7 @@ func (s *OssutilCommandSuite) TestCopyFileWithTagging(c *C) { - tagging := "tagA=A&tagb=B&tagc=C" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4828,7 +4828,7 @@ func (s *OssutilCommandSuite) TestUploadMultiFileFileWithTagging(c *C) { - tagging := "tagA=A&tagb=B&tagc=C" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -diff --git a/oss/lib/create_symlink.go b/oss/lib/create_symlink.go -index b40371d2..4722cb52 100644 ---- a/oss/lib/create_symlink.go -+++ b/oss/lib/create_symlink.go -@@ -108,7 +108,7 @@ var createSymlinkCommand = CreateSymlinkCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/du.go b/oss/lib/du.go -index 6b230090..e8068467 100644 ---- a/oss/lib/du.go -+++ b/oss/lib/du.go -@@ -109,7 +109,7 @@ var duSizeCommand = DuCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/du_test.go b/oss/lib/du_test.go -index c6065fa8..f40592e3 100644 ---- a/oss/lib/du_test.go -+++ b/oss/lib/du_test.go -@@ -47,7 +47,7 @@ func (s *OssutilCommandSuite) TestDuObjectSize(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - } -@@ -104,7 +104,7 @@ func (s *OssutilCommandSuite) TestDuPartSize(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - } -@@ -150,7 +150,7 @@ func (s *OssutilCommandSuite) TestDuObjectAndPartSize(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - } -@@ -189,7 +189,7 @@ func (s *OssutilCommandSuite) TestDuPayerObject(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &ConfigFile, -@@ -216,7 +216,7 @@ func (s *OssutilCommandSuite) TestDuPayerErrorObject(c *C) { - requester := "requester_test" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &ConfigFile, -@@ -235,7 +235,7 @@ func (s *OssutilCommandSuite) TestDuPayerErrorObject(c *C) { - - func (s *OssutilCommandSuite) TestDuPayerPart(c *C) { - bucketName := payerBucket -- client, err := oss.New(payerBucketEndPoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(payerBucketEndPoint, accessKeyId, accessKeySecret) - bucket, err := client.Bucket(bucketName) - - content_len := 100 -@@ -256,7 +256,7 @@ func (s *OssutilCommandSuite) TestDuPayerPart(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &ConfigFile, -@@ -297,7 +297,7 @@ func (s *OssutilCommandSuite) TestDuVersionsObjectAndStorageClass(c *C) { - strMethod := "put" - versionsOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -339,7 +339,7 @@ func (s *OssutilCommandSuite) TestDuVersionsObjectAndStorageClass(c *C) { - command := "du" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "allVersions": &allVersions, -diff --git a/oss/lib/ecs_role_test.go b/oss/lib/ecs_role_test.go -index 666ba1dd..1b5a6747 100644 ---- a/oss/lib/ecs_role_test.go -+++ b/oss/lib/ecs_role_test.go -@@ -20,15 +20,15 @@ const ( - func StsHttpHandlerOk(w http.ResponseWriter, r *http.Request) { - akJson := &STSAkJson{} - -- if accessKeyID == "" { -- accessKeyID = os.Getenv("OSS_TEST_ACCESS_KEY_ID") -+ if accessKeyId == "" { -+ accessKeyId = os.Getenv("OSS_TEST_ACCESS_KEY_ID") - } - - if accessKeySecret == "" { - accessKeySecret = os.Getenv("OSS_TEST_ACCESS_KEY_SECRET") - } - -- akJson.AccessKeyId = accessKeyID -+ akJson.AccessKeyId = accessKeyId - akJson.AccessKeySecret = accessKeySecret - akJson.SecurityToken = "" - nowLocalTime := time.Now() -@@ -78,7 +78,7 @@ func startHttpServer(handler func(http.ResponseWriter, *http.Request)) *http.Ser - } - - func (s *OssutilCommandSuite) TestEcsRoleSuccess(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -112,14 +112,14 @@ func (s *OssutilCommandSuite) TestEcsRoleAkTimeout(c *C) { - time.Sleep(time.Duration(1) * time.Second) - - ecsRole := EcsRoleAKBuild{url: "http://127.0.0.1:32915/latest/meta-data/Ram/security-credentials/EcsRamRo..."} -- strKeyId1 := ecsRole.GetCredentials().GetAccessKeyID() -+ strKeyId1 := ecsRole.GetCredentials().GetAccessKeyId() - c.Assert(strKeyId1 == "", Equals, false) - Expiration1 := ecsRole.Expiration - - // wait Ak timeout - time.Sleep(time.Duration(1+TestEcsTimeout) * time.Second) - -- strKeyId2 := ecsRole.GetCredentials().GetAccessKeyID() -+ strKeyId2 := ecsRole.GetCredentials().GetAccessKeyId() - c.Assert(strKeyId2 == "", Equals, false) - Expiration2 := ecsRole.Expiration - -@@ -131,7 +131,7 @@ func (s *OssutilCommandSuite) TestEcsRoleAkTimeout(c *C) { - } - - func (s *OssutilCommandSuite) TestEcsRoleNotHttpServerError(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -153,7 +153,7 @@ func (s *OssutilCommandSuite) TestEcsRoleNotHttpServerError(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -166,7 +166,7 @@ func (s *OssutilCommandSuite) TestEcsRoleNotHttpServerError(c *C) { - } - - func (s *OssutilCommandSuite) TestEcsRoleAkEmptyError(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -191,7 +191,7 @@ func (s *OssutilCommandSuite) TestEcsRoleAkEmptyError(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -205,7 +205,7 @@ func (s *OssutilCommandSuite) TestEcsRoleAkEmptyError(c *C) { - } - - func (s *OssutilCommandSuite) TestEcsRoleCodeError(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -230,7 +230,7 @@ func (s *OssutilCommandSuite) TestEcsRoleCodeError(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -244,7 +244,7 @@ func (s *OssutilCommandSuite) TestEcsRoleCodeError(c *C) { - } - - func (s *OssutilCommandSuite) TestEcsRoleJsonError(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -269,7 +269,7 @@ func (s *OssutilCommandSuite) TestEcsRoleJsonError(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/listpart.go b/oss/lib/listpart.go -index b435f207..4c3f30d6 100644 ---- a/oss/lib/listpart.go -+++ b/oss/lib/listpart.go -@@ -86,7 +86,7 @@ var listPartCommand = ListPartCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/listpart_test.go b/oss/lib/listpart_test.go -index 2434bc29..63b7c53e 100644 ---- a/oss/lib/listpart_test.go -+++ b/oss/lib/listpart_test.go -@@ -32,7 +32,7 @@ func (s *OssutilCommandSuite) TestListPartSuccess(c *C) { - defer fd.Close() - - // begin upload part -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -55,7 +55,7 @@ func (s *OssutilCommandSuite) TestListPartSuccess(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -106,7 +106,7 @@ func (s *OssutilCommandSuite) TestListPartError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -148,7 +148,7 @@ func (s *OssutilCommandSuite) TestListPartClientError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -159,7 +159,7 @@ func (s *OssutilCommandSuite) TestListPartClientError(c *C) { - c.Assert(err, IsNil) - - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/ls.go b/oss/lib/ls.go -index ca115af1..2b651708 100644 ---- a/oss/lib/ls.go -+++ b/oss/lib/ls.go -@@ -379,7 +379,7 @@ var listCommand = ListCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/ls_test.go b/oss/lib/ls_test.go -index fac6c8bf..b4199ae4 100644 ---- a/oss/lib/ls_test.go -+++ b/oss/lib/ls_test.go -@@ -21,7 +21,7 @@ func (s *OssutilCommandSuite) TestListLoadConfig(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -34,7 +34,7 @@ func (s *OssutilCommandSuite) TestListLoadConfig(c *C) { - args = []string{"oss://"} - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -53,7 +53,7 @@ func (s *OssutilCommandSuite) TestListNotExistConfigFile(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -74,7 +74,7 @@ func (s *OssutilCommandSuite) TestListErrConfigFile(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -89,7 +89,7 @@ func (s *OssutilCommandSuite) TestListErrConfigFile(c *C) { - - func (s *OssutilCommandSuite) TestListConfigFile(c *C) { - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\nretryTimes=%s", endpoint, accessKeyID, accessKeySecret, "errretry") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\nretryTimes=%s", endpoint, accessKeyId, accessKeySecret, "errretry") - s.createFile(cfile, data, c) - - command := "ls" -@@ -98,7 +98,7 @@ func (s *OssutilCommandSuite) TestListConfigFile(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -115,7 +115,7 @@ func (s *OssutilCommandSuite) TestListWithBucketEndpoint(c *C) { - bucketName := bucketNameExist - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", "abc", accessKeyID, accessKeySecret, bucketName, endpoint) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", "abc", accessKeyId, accessKeySecret, bucketName, endpoint) - s.createFile(cfile, data, c) - - command := "ls" -@@ -124,7 +124,7 @@ func (s *OssutilCommandSuite) TestListWithBucketEndpoint(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -142,7 +142,7 @@ func (s *OssutilCommandSuite) TestListWithBucketCname(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s\n[Bucket-Cname]\n%s=%s", "abc", accessKeyID, accessKeySecret, bucketName, "abc", bucketName, bucketName+"."+endpoint) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s\n[Bucket-Cname]\n%s=%s", "abc", accessKeyId, accessKeySecret, bucketName, "abc", bucketName, bucketName+"."+endpoint) - s.createFile(cfile, data, c) - - command := "ls" -@@ -151,7 +151,7 @@ func (s *OssutilCommandSuite) TestListWithBucketCname(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -174,7 +174,7 @@ func (s *OssutilCommandSuite) TestListObjectsBucketNotExist(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -298,7 +298,7 @@ func (s *OssutilCommandSuite) TestListIDKey(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "ls" -@@ -307,7 +307,7 @@ func (s *OssutilCommandSuite) TestListIDKey(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -318,7 +318,7 @@ func (s *OssutilCommandSuite) TestListIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -337,7 +337,7 @@ func (s *OssutilCommandSuite) TestListBucketIDKey(c *C) { - bucketName := bucketNameExist - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "ls" -@@ -346,7 +346,7 @@ func (s *OssutilCommandSuite) TestListBucketIDKey(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -357,7 +357,7 @@ func (s *OssutilCommandSuite) TestListBucketIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -373,7 +373,7 @@ func (s *OssutilCommandSuite) TestListBucketIDKey(c *C) { - // list without config file - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -396,7 +396,7 @@ func (s *OssutilCommandSuite) TestListMultipartUploads(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -466,7 +466,7 @@ func (s *OssutilCommandSuite) TestListMultipartUploadsError(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s", endpoint, "abc", accessKeySecret) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s", endpoint, "abc", accessKeySecret) - s.createFile(cfile, data, c) - - command := "ls" -@@ -476,7 +476,7 @@ func (s *OssutilCommandSuite) TestListMultipartUploadsError(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -735,7 +735,7 @@ func (s *OssutilCommandSuite) TestListObjectfilterInclude(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -801,7 +801,7 @@ func (s *OssutilCommandSuite) TestListObjectfilterExclude(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -886,7 +886,7 @@ func (s *OssutilCommandSuite) TestListDirectoryfilterInclude(c *C) { - bDirectory := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -968,7 +968,7 @@ func (s *OssutilCommandSuite) TestListDirectoryfilterExclude(c *C) { - bDirectory := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1033,7 +1033,7 @@ func (s *OssutilCommandSuite) TestListPartfilterInclude(c *C) { - bPart := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1089,7 +1089,7 @@ func (s *OssutilCommandSuite) TestListPartfilterExclude(c *C) { - bPart := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1154,7 +1154,7 @@ func (s *OssutilCommandSuite) TestListObjectVersionsNormal(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "allVersions": &allVersions, -@@ -1196,7 +1196,7 @@ func (s *OssutilCommandSuite) TestListObjectVersionsNormal(c *C) { - force := true - deleteOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1251,7 +1251,7 @@ func (s *OssutilCommandSuite) TestListObjectVersionsMarker(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "allVersions": &allVersions, -@@ -1352,7 +1352,7 @@ func (s *OssutilCommandSuite) TestListObjectfilterIncludeVersions(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1445,7 +1445,7 @@ func (s *OssutilCommandSuite) TestListDirectoryfilterIncludeVersions(c *C) { - allVersions := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -diff --git a/oss/lib/mb.go b/oss/lib/mb.go -index 111254c8..161fcf62 100644 ---- a/oss/lib/mb.go -+++ b/oss/lib/mb.go -@@ -153,7 +153,7 @@ var makeBucketCommand = MakeBucketCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/mb_test.go b/oss/lib/mb_test.go -index f8fc7afa..0d82127e 100644 ---- a/oss/lib/mb_test.go -+++ b/oss/lib/mb_test.go -@@ -41,7 +41,7 @@ func (s *OssutilCommandSuite) TestMakeBucketErrorName(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -80,7 +80,7 @@ func (s *OssutilCommandSuite) TestMakeBucketErrorOption(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -106,7 +106,7 @@ func (s *OssutilCommandSuite) TestMakeBucketIDKey(c *C) { - bucketName := bucketNamePrefix + randLowStr(10) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", "abc", "def", "ghi", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", "abc", "def", "ghi", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "mb" -@@ -114,7 +114,7 @@ func (s *OssutilCommandSuite) TestMakeBucketIDKey(c *C) { - args := []string{CloudURLToString(bucketName, "")} - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -124,7 +124,7 @@ func (s *OssutilCommandSuite) TestMakeBucketIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -186,7 +186,7 @@ func (s *OssutilCommandSuite) TestMbCreateBucketWithRedundancy(c *C) { - strRedundancy := "ZRS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/mkdir.go b/oss/lib/mkdir.go -index 100bdd47..4da059d3 100644 ---- a/oss/lib/mkdir.go -+++ b/oss/lib/mkdir.go -@@ -72,7 +72,7 @@ var mkdirCommand = MkdirCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/mkdir_test.go b/oss/lib/mkdir_test.go -index d0d0ca1d..775ae5d1 100644 ---- a/oss/lib/mkdir_test.go -+++ b/oss/lib/mkdir_test.go -@@ -10,7 +10,7 @@ import ( - - func (s *OssutilCommandSuite) TestMkdirAll(c *C) { - // create bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucketName := bucketNamePrefix + randLowStr(12) -@@ -24,7 +24,7 @@ func (s *OssutilCommandSuite) TestMkdirAll(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -91,7 +91,7 @@ func (s *OssutilCommandSuite) TestMkdirAllEncodingError(c *C) { - strEncode := "url" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/monitor_test.go b/oss/lib/monitor_test.go -index 5d671110..3456d1c3 100644 ---- a/oss/lib/monitor_test.go -+++ b/oss/lib/monitor_test.go -@@ -301,7 +301,7 @@ func (s *OssutilCommandSuite) TestProgressBarStatisticErr(c *C) { - - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(configFile, data, c) - - err := s.initCopyCommand(CloudURLToString(bucketName, ""), downloadDir, true, true, false, DefaultBigFileThreshold, CheckpointDir, DefaultOutputDir) -@@ -372,7 +372,7 @@ func (s *OssutilCommandSuite) TestProgressBarContinueErr(c *C) { - - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n", "abc", accessKeyID, accessKeySecret) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n", "abc", accessKeyId, accessKeySecret) - s.createFile(configFile, data, c) - - err = s.initCopyCommand(udir, CloudURLToString(bucketName, ""), true, true, false, DefaultBigFileThreshold, CheckpointDir, DefaultOutputDir) -@@ -670,7 +670,7 @@ func (s *OssutilCommandSuite) TestSetACLProgress(c *C) { - // batch set acl list error - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n", endpoint, accessKeyID, "") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n", endpoint, accessKeyId, "") - s.createFile(configFile, data, c) - - err = s.initSetACL(bucketName, "TestSetACLProgress", "private", true, false, true) -@@ -787,7 +787,7 @@ func (s *OssutilCommandSuite) TestSetMetaProgress(c *C) { - // batch set acl list error - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n", endpoint, accessKeyID, "") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n", endpoint, accessKeyId, "") - s.createFile(configFile, data, c) - - err = s.initSetMeta(bucketName, prefix, "x-oss-object-acl:default#X-Oss-Meta-A:A", true, false, true, true, DefaultLanguage) -diff --git a/oss/lib/object_tagging.go b/oss/lib/object_tagging.go -index 8c5eb270..826bee6d 100644 ---- a/oss/lib/object_tagging.go -+++ b/oss/lib/object_tagging.go -@@ -131,7 +131,7 @@ var objectTagCommand = ObjectTagCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/object_tagging_test.go b/oss/lib/object_tagging_test.go -index ad720a06..cbb1e2c6 100644 ---- a/oss/lib/object_tagging_test.go -+++ b/oss/lib/object_tagging_test.go -@@ -23,7 +23,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingSingleOperation(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -106,7 +106,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingBatchOperation(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -198,7 +198,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingVersionId(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -278,7 +278,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingError(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -352,7 +352,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/option.go b/oss/lib/option.go -index 7e801ffc..b1caa260 100644 ---- a/oss/lib/option.go -+++ b/oss/lib/option.go -@@ -42,7 +42,7 @@ var OptionMap = map[string]Option{ - OptionEndpoint: Option{"-e", "--endpoint", "", OptionTypeString, "", "", - fmt.Sprintf("ossutil工具的基本endpoint配置（该选项值会覆盖配置文件中的相应设置），注意其必须为一个二级域名。"), - fmt.Sprintf("Base endpoint for oss endpoint(Notice that the value of the option will cover the value in config file). Take notice that it should be second-level domain(SLD).")}, -- OptionAccessKeyID: Option{"-i", "--access-key-id", "", OptionTypeString, "", "", "访问oss使用的AccessKeyID（该选项值会覆盖配置文件中的相应设置）。", "AccessKeyID while access oss(Notice that the value of the option will cover the value in config file)."}, -+ OptionAccessKeyId: Option{"-i", "--access-key-id", "", OptionTypeString, "", "", "访问oss使用的AccessKeyId（该选项值会覆盖配置文件中的相应设置）。", "AccessKeyId while access oss(Notice that the value of the option will cover the value in config file)."}, - OptionAccessKeySecret: Option{"-k", "--access-key-secret", "", OptionTypeString, "", "", "访问oss使用的AccessKeySecret（该选项值会覆盖配置文件中的相应设置）。", "AccessKeySecret while access oss(Notice that the value of the option will cover the value in config file)."}, - OptionSTSToken: Option{"-t", "--sts-token", "", OptionTypeString, "", "", "访问oss使用的STSToken（该选项值会覆盖配置文件中的相应设置），非必须设置项。", "STSToken while access oss(Notice that the value of the option will cover the value in config file), not necessary."}, - OptionLimitedNum: Option{"", "--limited-num", strconv.Itoa(DefaultLimitedNum), OptionTypeInt64, strconv.FormatInt(MinLimitedNum, 10), "", "返回结果的最大个数。", "the limited number of return results."}, -diff --git a/oss/lib/probe.go b/oss/lib/probe.go -index f00bc1c3..791760be 100644 ---- a/oss/lib/probe.go -+++ b/oss/lib/probe.go -@@ -336,7 +336,7 @@ var probeCommand = ProbeCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/probe_test.go b/oss/lib/probe_test.go -index 7e2b5120..ec3cc0b1 100644 ---- a/oss/lib/probe_test.go -+++ b/oss/lib/probe_test.go -@@ -138,7 +138,7 @@ func (s *OssutilCommandSuite) probeDownloadWithParameter(c *C, object string, do - } - - tempStr := "" -- options[OptionAccessKeyID] = &tempStr -+ options[OptionAccessKeyId] = &tempStr - options[OptionAccessKeySecret] = &tempStr - options[OptionEndpoint] = &tempStr - -@@ -209,7 +209,7 @@ func (s *OssutilCommandSuite) probeUploadObject(c *C, object string, uploadFileN - } - - tempStr := "" -- options[OptionAccessKeyID] = &tempStr -+ options[OptionAccessKeyId] = &tempStr - options[OptionAccessKeySecret] = &tempStr - options[OptionEndpoint] = &tempStr - -@@ -369,7 +369,7 @@ func (s *OssutilCommandSuite) TestProbeUploadObjectBucketInvalid(c *C) { - } - - tempStr := "" -- options[OptionAccessKeyID] = &tempStr -+ options[OptionAccessKeyId] = &tempStr - options[OptionAccessKeySecret] = &tempStr - options[OptionEndpoint] = &tempStr - -@@ -566,7 +566,7 @@ func (s *OssutilCommandSuite) TestProbeUploadObjectRepeat(c *C) { - } - - tempStr := "" -- options[OptionAccessKeyID] = &tempStr -+ options[OptionAccessKeyId] = &tempStr - options[OptionAccessKeySecret] = &tempStr - options[OptionEndpoint] = &tempStr - -@@ -740,7 +740,7 @@ func (s *OssutilCommandSuite) TestProbeUploadBandWidth(c *C) { - str := "" - options := OptionMapType{ - OptionEndpoint: &str, -- OptionAccessKeyID: &str, -+ OptionAccessKeyId: &str, - OptionAccessKeySecret: &str, - OptionConfigFile: &configFile, - OptionBucketName: &bucketName, -@@ -767,7 +767,7 @@ func (s *OssutilCommandSuite) TestProbeDownloadBandWidthSuccess(c *C) { - str := "" - options := OptionMapType{ - OptionEndpoint: &str, -- OptionAccessKeyID: &str, -+ OptionAccessKeyId: &str, - OptionAccessKeySecret: &str, - OptionConfigFile: &configFile, - OptionObject: &objectName, -@@ -793,7 +793,7 @@ func (s *OssutilCommandSuite) TestProbeDownloadBandWidthError(c *C) { - str := "" - options := OptionMapType{ - OptionEndpoint: &str, -- OptionAccessKeyID: &str, -+ OptionAccessKeyId: &str, - OptionAccessKeySecret: &str, - OptionConfigFile: &configFile, - OptionObject: &objectName, -@@ -831,7 +831,7 @@ func (s *OssutilCommandSuite) TestProbeItemNotSupported(c *C) { - str := "" - options := OptionMapType{ - OptionEndpoint: &str, -- OptionAccessKeyID: &str, -+ OptionAccessKeyId: &str, - OptionAccessKeySecret: &str, - OptionConfigFile: &configFile, - OptionObject: &objectName, -diff --git a/oss/lib/read_symlink.go b/oss/lib/read_symlink.go -index 49d0a886..a5810b2c 100644 ---- a/oss/lib/read_symlink.go -+++ b/oss/lib/read_symlink.go -@@ -105,7 +105,7 @@ var readSymlinkCommand = ReadSymlinkCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/request_payment.go b/oss/lib/request_payment.go -index a764ebba..8da1b7d8 100644 ---- a/oss/lib/request_payment.go -+++ b/oss/lib/request_payment.go -@@ -98,7 +98,7 @@ var requestPaymentCommand = RequestPaymentCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/request_payment_test.go b/oss/lib/request_payment_test.go -index 608044b2..2f547cc9 100644 ---- a/oss/lib/request_payment_test.go -+++ b/oss/lib/request_payment_test.go -@@ -16,7 +16,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentPutSuccess(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -65,7 +65,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -105,7 +105,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentPutEmptyEndpoint(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -117,7 +117,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -139,7 +139,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentGetEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -151,7 +151,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/restore.go b/oss/lib/restore.go -index 9bb99eaa..655a312e 100644 ---- a/oss/lib/restore.go -+++ b/oss/lib/restore.go -@@ -146,7 +146,7 @@ var restoreCommand = RestoreCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/restore_test.go b/oss/lib/restore_test.go -index 335803fd..58cd430d 100644 ---- a/oss/lib/restore_test.go -+++ b/oss/lib/restore_test.go -@@ -405,7 +405,7 @@ func (s *OssutilCommandSuite) TestRestoreObjectWithPayerError400(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/rm.go b/oss/lib/rm.go -index 4d4db948..ea0b37b2 100644 ---- a/oss/lib/rm.go -+++ b/oss/lib/rm.go -@@ -309,7 +309,7 @@ var removeCommand = RemoveCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/rm_test.go b/oss/lib/rm_test.go -index 8b25317e..01b0c82f 100644 ---- a/oss/lib/rm_test.go -+++ b/oss/lib/rm_test.go -@@ -54,7 +54,7 @@ func (s *OssutilCommandSuite) TestRemoveObjects(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -95,12 +95,12 @@ func (s *OssutilCommandSuite) TestRemoveObjects(c *C) { - - // error remove bucket with config - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -114,7 +114,7 @@ func (s *OssutilCommandSuite) TestRemoveObjects(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -147,7 +147,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectBucketOption(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -432,7 +432,7 @@ func (s *OssutilCommandSuite) TestRmObjectfilter(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -462,7 +462,7 @@ func (s *OssutilCommandSuite) TestRmObjectfilter(c *C) { - bForce := true - rmOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "recursive": &bRecusive, -@@ -528,7 +528,7 @@ func (s *OssutilCommandSuite) TestRmPartfilter(c *C) { - bPart := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -582,7 +582,7 @@ func (s *OssutilCommandSuite) TestRmPartfilterExclude(c *C) { - bPart := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -614,7 +614,7 @@ func (s *OssutilCommandSuite) TestRmPartfilterExclude(c *C) { - bMultiPart := true - rmOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "recursive": &bRecusive, -@@ -669,7 +669,7 @@ func (s *OssutilCommandSuite) TestRmSpecialCharacterKey(c *C) { - encodingType := "url" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -740,7 +740,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectsInVersioningBucket(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -781,12 +781,12 @@ func (s *OssutilCommandSuite) TestRemoveObjectsInVersioningBucket(c *C) { - - // error remove bucket with config - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -800,7 +800,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectsInVersioningBucket(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -842,7 +842,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithVersionId(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -859,7 +859,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithVersionId(c *C) { - args = []string{CloudURLToString(bucketName, "")} - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &str, -@@ -900,7 +900,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithAllVersion(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -918,7 +918,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithAllVersion(c *C) { - args = []string{CloudURLToString(bucketName, objectName)} - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -934,7 +934,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithAllVersion(c *C) { - args = []string{CloudURLToString(bucketName, "")} - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &str, -@@ -974,7 +974,7 @@ func (s *OssutilCommandSuite) TestRmObjectfilterVersioning(c *C) { - allVersions := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1005,7 +1005,7 @@ func (s *OssutilCommandSuite) TestRmObjectfilterVersioning(c *C) { - bForce := true - rmOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "recursive": &bRecusive, -@@ -1064,7 +1064,7 @@ func (s *OssutilCommandSuite) TestRmObjectWithPayer(c *C) { - requester := "requester" - rmOptions := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "force": &bForce, -@@ -1097,7 +1097,7 @@ func (s *OssutilCommandSuite) TestRmBatchObjectWithPayer(c *C) { - requester := "requester" - rmOptions := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "force": &bForce, -@@ -1113,7 +1113,7 @@ func (s *OssutilCommandSuite) TestRmBatchObjectWithPayer(c *C) { - - func (s *OssutilCommandSuite) TestRmBatchPartsWithPayer(c *C) { - bucketName := payerBucket -- client, err := oss.New(payerBucketEndPoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(payerBucketEndPoint, accessKeyId, accessKeySecret) - bucket, err := client.Bucket(bucketName) - - content_len := 100 -@@ -1137,7 +1137,7 @@ func (s *OssutilCommandSuite) TestRmBatchPartsWithPayer(c *C) { - requester := "requester" - rmOptions := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "force": &bForce, -diff --git a/oss/lib/set_acl.go b/oss/lib/set_acl.go -index f0558899..51e82339 100644 ---- a/oss/lib/set_acl.go -+++ b/oss/lib/set_acl.go -@@ -237,7 +237,7 @@ var setACLCommand = SetACLCommand{ - OptionInclude, - OptionExclude, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/set_acl_test.go b/oss/lib/set_acl_test.go -index 5b00b735..f72bb429 100644 ---- a/oss/lib/set_acl_test.go -+++ b/oss/lib/set_acl_test.go -@@ -205,7 +205,7 @@ func (s *OssutilCommandSuite) TestErrBatchSetACL(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str1, -- "accessKeyID": &str1, -+ "accessKeyId": &str1, - "accessKeySecret": &str1, - "stsToken": &str, - "routines": &routines, -@@ -229,7 +229,7 @@ func (s *OssutilCommandSuite) TestSetACLIDKey(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "set-acl" -@@ -239,7 +239,7 @@ func (s *OssutilCommandSuite) TestSetACLIDKey(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -252,7 +252,7 @@ func (s *OssutilCommandSuite) TestSetACLIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -290,7 +290,7 @@ func (s *OssutilCommandSuite) TestSetACLURLEncoding(c *C) { - encodingType := URLEncodingType - options := OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &configFile, -@@ -1233,7 +1233,7 @@ func (s *OssutilCommandSuite) TestSetObjectAclWithVersion(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1274,7 +1274,7 @@ func (s *OssutilCommandSuite) TestSetObjectAclWithInvalidVersionArgs(c *C) { - flag := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1287,7 +1287,7 @@ func (s *OssutilCommandSuite) TestSetObjectAclWithInvalidVersionArgs(c *C) { - - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/set_meta.go b/oss/lib/set_meta.go -index f24d9792..1a36de1b 100644 ---- a/oss/lib/set_meta.go -+++ b/oss/lib/set_meta.go -@@ -283,7 +283,7 @@ var setMetaCommand = SetMetaCommand{ - OptionExclude, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/set_meta_test.go b/oss/lib/set_meta_test.go -index b9980018..cc5fdcf0 100644 ---- a/oss/lib/set_meta_test.go -+++ b/oss/lib/set_meta_test.go -@@ -187,7 +187,7 @@ func (s *OssutilCommandSuite) TestErrBatchSetMeta(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str1, -- "accessKeyID": &str1, -+ "accessKeyId": &str1, - "accessKeySecret": &str1, - "stsToken": &str, - "update": &ok, -@@ -280,7 +280,7 @@ func (s *OssutilCommandSuite) TestSetMetaIDKey(c *C) { - s.putObject(bucketName, object, uploadFileName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "set-meta" -@@ -290,7 +290,7 @@ func (s *OssutilCommandSuite) TestSetMetaIDKey(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -303,7 +303,7 @@ func (s *OssutilCommandSuite) TestSetMetaIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -341,7 +341,7 @@ func (s *OssutilCommandSuite) TestSetMetaURLEncoding(c *C) { - encodingType := URLEncodingType - options := OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &configFile, -@@ -1495,7 +1495,7 @@ func (s *OssutilCommandSuite) TestSetObjectMetaWithVersion(c *C) { - update := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1526,7 +1526,7 @@ func (s *OssutilCommandSuite) TestSetObjectMetaWithInvalidVersionArgs(c *C) { - flag := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1539,7 +1539,7 @@ func (s *OssutilCommandSuite) TestSetObjectMetaWithInvalidVersionArgs(c *C) { - - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/signurl.go b/oss/lib/signurl.go -index 3fcaacf9..acdd3e6d 100644 ---- a/oss/lib/signurl.go -+++ b/oss/lib/signurl.go -@@ -120,7 +120,7 @@ var signURLCommand = SignurlCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionLogLevel, -diff --git a/oss/lib/signurl_test.go b/oss/lib/signurl_test.go -index 64bd0c71..ecefd872 100644 ---- a/oss/lib/signurl_test.go -+++ b/oss/lib/signurl_test.go -@@ -282,7 +282,7 @@ func (s *OssutilCommandSuite) TestSignurlWithVersion(c *C) { - args := []string{CloudURLToString(bucketName, objectName)} - options := OptionMapType{ - "endpoint": &str1, -- "accessKeyID": &str1, -+ "accessKeyId": &str1, - "accessKeySecret": &str1, - "stsToken": &str1, - "configFile": &configFile, -@@ -331,7 +331,7 @@ func (s *OssutilCommandSuite) TestSignUrlTraficLimit(c *C) { - timeOut := strconv.FormatInt(60, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -383,7 +383,7 @@ func (s *OssutilCommandSuite) TestSignUrlWithDisableEncodePathUrl(c *C) { - timeOut := strconv.FormatInt(60, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -438,7 +438,7 @@ func (s *OssutilCommandSuite) TestSignUrlWithRequestPayer(c *C) { - timeOut := strconv.FormatInt(60, 10) - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/stat.go b/oss/lib/stat.go -index ff04d895..b36c8477 100644 ---- a/oss/lib/stat.go -+++ b/oss/lib/stat.go -@@ -102,7 +102,7 @@ var statCommand = StatCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/stat_test.go b/oss/lib/stat_test.go -index 463f384a..4bfd340a 100644 ---- a/oss/lib/stat_test.go -+++ b/oss/lib/stat_test.go -@@ -20,7 +20,7 @@ func (s *OssutilCommandSuite) TestStatErrArgc(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -85,7 +85,7 @@ func (s *OssutilCommandSuite) TestGetStatRetryTimes(c *C) { - retryTimes := "1" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -113,7 +113,7 @@ func (s *OssutilCommandSuite) TestStatIDKey(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "stat" -@@ -122,7 +122,7 @@ func (s *OssutilCommandSuite) TestStatIDKey(c *C) { - retryTimes := "1" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -133,7 +133,7 @@ func (s *OssutilCommandSuite) TestStatIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -167,7 +167,7 @@ func (s *OssutilCommandSuite) TestStatURLEncoding(c *C) { - encodingType := URLEncodingType - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -228,7 +228,7 @@ func (s *OssutilCommandSuite) TestStatVersioning(c *C) { - encodingType := URLEncodingType - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -271,7 +271,7 @@ func (s *OssutilCommandSuite) TestStatObjectWithPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/symlink_test.go b/oss/lib/symlink_test.go -index 2b33d6a2..3a58e331 100644 ---- a/oss/lib/symlink_test.go -+++ b/oss/lib/symlink_test.go -@@ -252,7 +252,7 @@ func (s *OssutilCommandSuite) TestSymlinkVersioning(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &ConfigFile, -@@ -301,7 +301,7 @@ func (s *OssutilCommandSuite) TestSymlinkWithPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/user_qos.go b/oss/lib/user_qos.go -index 0c43ad6f..b90a0aac 100644 ---- a/oss/lib/user_qos.go -+++ b/oss/lib/user_qos.go -@@ -76,7 +76,7 @@ var userQosCommand = UserQosCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/user_qos_test.go b/oss/lib/user_qos_test.go -index 99746b7e..c8a7e562 100644 ---- a/oss/lib/user_qos_test.go -+++ b/oss/lib/user_qos_test.go -@@ -16,7 +16,7 @@ func (s *OssutilCommandSuite) TestUserQosGetError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -44,7 +44,7 @@ func (s *OssutilCommandSuite) TestUserQosOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -56,7 +56,7 @@ func (s *OssutilCommandSuite) TestUserQosOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -79,7 +79,7 @@ func (s *OssutilCommandSuite) TestUserQosGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -95,7 +95,7 @@ func (s *OssutilCommandSuite) TestUserQosGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, diff --git a/golang-github-aliyun-cli.spec b/golang-github-aliyun-cli.spec index f6bd9e7..205216d 100644 --- a/golang-github-aliyun-cli.spec +++ b/golang-github-aliyun-cli.spec @@ -6,12 +6,12 @@ # https://github.com/aliyun/aliyun-cli %global goipath0 github.com/aliyun/aliyun-cli -Version: 3.0.73 +Version: 3.0.74 # https://github.com/aliyun/aliyun-openapi-meta %global goipath1 github.com/aliyun/aliyun-openapi-meta %global version1 0 -%global commit1 1e468f0cf8af08594022c94d3d6ff2ba40c574dd +%global commit1 95a090031d4d5b4dd8d2d29104f33769b3ea66b4 %gometa -a @@ -23,9 +23,10 @@ Version: 3.0.73 %global common_description %{expand: Alibaba Cloud (Aliyun) CLI.} -%global golicenses0 LICENSE +%global golicenses0 LICENSE LICENSE-oss %global godocs0 CHANGELOG.md README-CN.md README.md README-bin.md\\\ - README-cli.md README-CN-oss.md README-oss.md + README-cli.md README-CN-oss.md README-oss.md\\\ + CHANGELOG-oss.md %global golicenses1 LICENSE %global godocs1 README-openapi-meta.md @@ -34,20 +35,18 @@ Name: %{goname} Release: 1%{?dist} Summary: %{godevelsummary0} -# Upstream license specification: Apache-2.0 -License: ASL 2.0 +# Upstream license specification: Apache-2.0 and MIT +License: ASL 2.0 and MIT URL: %{gourl} Source0: %{gosource0} Source1: %{gosource1} -# https://github.com/aliyun/aliyun-cli/pull/300 -Patch0: aliyun-cli-credentials-config.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=1866529 # https://github.com/aliyun/aliyun-cli/issues/303 ExcludeArch: armv7hl # (Bug rhbz#1866529) BuildRequires: golang-github-shulhan-bindata +BuildRequires: golang(github.com/alibabacloud-go/tea/tea) BuildRequires: golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk) BuildRequires: golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials) BuildRequires: golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints) @@ -61,6 +60,7 @@ BuildRequires: golang(github.com/droundy/goopt) BuildRequires: golang(github.com/jmespath/go-jmespath) BuildRequires: golang(github.com/posener/complete) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb) +BuildRequires: golang(golang.org/x/crypto/ssh/terminal) BuildRequires: golang(gopkg.in/ini.v1) BuildRequires: golang(gopkg.in/yaml.v2) BuildRequires: help2man @@ -82,11 +82,12 @@ BuildRequires: zsh %prep %goprep -a cd %{gosourcedir} -%patch0 -p1 mv bin/README.md README-bin.md mv cli/README.md README-cli.md mv oss/README.md README-oss.md mv oss/README-CN.md README-CN-oss.md +mv oss/LICENSE LICENSE-oss +mv oss/CHANGELOG.md CHANGELOG-oss.md mv %{_builddir}/%{extractdir1}/README.md %{_builddir}/%{extractdir1}/README-openapi-meta.md rm %{gobuilddir}/src/%{goipath0} %{gobuilddir}/src/%{goipath1} ln -fs %{_builddir}/%{extractdir1} %{_builddir}/aliyun-openapi-meta @@ -116,8 +117,8 @@ cp -Trv /etc/skel %{getenv:HOME} %endif %files -%license ../%{extractdir0}/LICENSE -%doc ../%{extractdir0}/CHANGELOG.md +%license ../%{extractdir0}/LICENSE ../%{extractdir0}/LICENSE-oss +%doc ../%{extractdir0}/CHANGELOG.md ../%{extractdir0}/CHANGELOG-oss.md %doc ../%{extractdir0}/README-CN.md ../%{extractdir0}/README.md %doc ../%{extractdir0}/README-bin.md ../%{extractdir0}/README-cli.md %doc ../%{extractdir0}/README-CN-oss.md ../%{extractdir0}/README-oss.md @@ -128,6 +129,17 @@ cp -Trv /etc/skel %{getenv:HOME} %gopkgfiles %changelog +* Mon May 03 2021 Brandon Perkins <bperkins(a)redhat.com> - 3.0.74-1 +- Update to version 3.0.74 (Fixes rhbz#1955892) +- Update to aliyun-openapi-meta to commit + 95a090031d4d5b4dd8d2d29104f33769b3ea66b4 +- Addition of oss LICENSE and CHANGELOG +- Addition of MIT upstream license +- Removal of patch for building against credentials-go-1.1.0 + https://github.com/aliyun/aliyun-cli/pull/300 +- Addition of alibabacloud-go/tea/tea and + golang.org/x/crypto/ssh/terminal BuildRequires + * Mon Feb 22 2021 Brandon Perkins <bperkins(a)redhat.com> - 3.0.73-1 - Update to version 3.0.73 (Fixes rhbz#1930798) - Update to aliyun-openapi-meta to commit diff --git a/sources b/sources index b8f7312..647b174 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aliyun-cli-3.0.73.tar.gz) = 4c1b4f88fef19d7d94a05b3c58be837eeefb8a6d935fe35f7861fd74828a62aef20c2fd90f71550dbcfe48f23bc667cd3e54de6fd99ac2074eb1539765d1d039 -SHA512 (aliyun-openapi-meta-1e468f0cf8af08594022c94d3d6ff2ba40c574dd.tar.gz) = deffacd4b3a0815087b347258e9e63532b461544045b2125a8667f9c6ea749079dd4fb3e359e58b3c1492881a6508aba50bb52da6a1aaa0a9422b38028e68681 +SHA512 (aliyun-cli-3.0.74.tar.gz) = 2fcae76bfbb60291541e74a47979273e5dd9f3f8afd41f08ed25afdcc545e9824854e5a0d575d0a41b9f57535677c80a35e183c0769e9e4f95a8c426104560a1 +SHA512 (aliyun-openapi-meta-95a090031d4d5b4dd8d2d29104f33769b3ea66b4.tar.gz) = cbc35d73276043a74613e7b39fc5ca7be5022ce97259840e5046561d80efa9a08dc2ac2de434ac11cf34f6555570d13deacbbc9641b7b30a1fada4fe4263f416

2 years, 12 months

1
0
0 / 0

Architecture specific change in rpms/rust-build-env.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-build-env.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-build-env.git/commit/?id=745.... Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 7457fded868e273ae335b43a032e0dfcfbd9b2a9 Author: Rémi Lauzier <remilauzier(a)protonmail.com> Date: Tue Apr 27 11:03:46 2021 -0400 Initial import (rhbz#1944392) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ed18aad --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/build-env-0.3.0.crate diff --git a/rust-build-env.spec b/rust-build-env.spec new file mode 100644 index 0000000..e460d76 --- /dev/null +++ b/rust-build-env.spec @@ -0,0 +1,75 @@ +# Generated by rust2rpm 17 +%bcond_without check +%global debug_package %{nil} + +%global crate build-env + +Name: rust-%{crate} +Version: 0.3.0 +Release: 1%{?dist} +Summary: Extract information about the build process from the environment + +# Upstream license specification: Apache-2.0 OR MIT +# https://github.com/jmesmon/build-env/issues/7 +License: ASL 2.0 or MIT +URL: https://crates.io/crates/build-env +Source: %{crates_source} + +ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif + +BuildRequires: rust-packaging + +%global _description %{expand: +Extract information about the build process from the environment.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%doc README.md +%{cargo_registry}/%{crate}-%{version_no_tilde}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Mon Mar 29 16:05:38 EDT 2021 Rémi Lauzier <remilauzier(a)protonmail.com> - 0.3.0-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..997b530 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (build-env-0.3.0.crate) = 73414996cd1a082263f927b153b4f9165b8f0b1b29e0754b42fd6a904e34e34f0ecdd82a9167877d1b5cbc9308f34a7fd50b35ad9c58500cbc9569b699a5fc05

2 years, 12 months

1
0
0 / 0

Architecture specific change in rpms/golang-github-aliyun-cli.git

by githook-noreply＠fedoraproject.org

The package rpms/golang-github-aliyun-cli.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/golang-github-aliyun-cli.git/comm.... Change: +ExcludeArch: i686 # (Bug rhbz#1956389) Thanks. Full change: ============ commit ea8b64212615e9856abcbb15c3f11f733b22d872 Author: Brandon Perkins <bperkins(a)redhat.com> Date: Mon May 3 11:37:19 2021 -0400 ExcludeArch i686 due to build failing from running out of memory (Fixes rhbz#1956389) diff --git a/golang-github-aliyun-cli.spec b/golang-github-aliyun-cli.spec index 205216d..6598b8d 100644 --- a/golang-github-aliyun-cli.spec +++ b/golang-github-aliyun-cli.spec @@ -32,7 +32,7 @@ Alibaba Cloud (Aliyun) CLI.} %global godocs1 README-openapi-meta.md Name: %{goname} -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{godevelsummary0} # Upstream license specification: Apache-2.0 and MIT @@ -41,9 +41,11 @@ URL: %{gourl} Source0: %{gosource0} Source1: %{gosource1} -# https://bugzilla.redhat.com/show_bug.cgi?id=1866529 # https://github.com/aliyun/aliyun-cli/issues/303 +# https://bugzilla.redhat.com/show_bug.cgi?id=1866529 ExcludeArch: armv7hl # (Bug rhbz#1866529) +# https://bugzilla.redhat.com/show_bug.cgi?id=1956389 +ExcludeArch: i686 # (Bug rhbz#1956389) BuildRequires: golang-github-shulhan-bindata BuildRequires: golang(github.com/alibabacloud-go/tea/tea) @@ -129,6 +131,9 @@ cp -Trv /etc/skel %{getenv:HOME} %gopkgfiles %changelog +* Mon May 03 2021 Brandon Perkins <bperkins(a)redhat.com> - 3.0.74-2 +- ExcludeArch i686 due to build failing from running out of memory (Fixes rhbz#1956389) + * Mon May 03 2021 Brandon Perkins <bperkins(a)redhat.com> - 3.0.74-1 - Update to version 3.0.74 (Fixes rhbz#1955892) - Update to aliyun-openapi-meta to commit commit 6f1305476cd7a50be83a52fa33defb799619eda2 Author: Brandon Perkins <bperkins(a)redhat.com> Date: Mon May 3 10:56:19 2021 -0400 Update to version 3.0.74 (Fixes rhbz#1955892) Update to aliyun-openapi-meta to commit 95a090031d4d5b4dd8d2d29104f33769b3ea66b4 Addition of oss LICENSE and CHANGELOG Addition of MIT upstream license Removal of patch for building against credentials-go-1.1.0 https://github.com/aliyun/aliyun-cli/pull/300 Addition of alibabacloud-go/tea/tea and golang.org/x/crypto/ssh/terminal BuildRequires diff --git a/.gitignore b/.gitignore index 883ecf7..16cd04a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /aliyun-openapi-meta-2d5d1aa75ba1fcc3648fb6d168c9b4868ee3d0b6.tar.gz /aliyun-cli-3.0.73.tar.gz /aliyun-openapi-meta-1e468f0cf8af08594022c94d3d6ff2ba40c574dd.tar.gz +/aliyun-cli-3.0.74.tar.gz +/aliyun-openapi-meta-95a090031d4d5b4dd8d2d29104f33769b3ea66b4.tar.gz diff --git a/aliyun-cli-credentials-config.patch b/aliyun-cli-credentials-config.patch deleted file mode 100644 index 180a797..0000000 --- a/aliyun-cli-credentials-config.patch +++ /dev/null @@ -1,4253 +0,0 @@ -From 0a9ceb9c501cb45303f75e3332a6d73a7caa911b Mon Sep 17 00:00:00 2001 -From: Brandon Perkins <bperkins(a)redhat.com> -Date: Fri, 31 Jul 2020 12:29:14 -0400 -Subject: [PATCH] Changes to build against credentials-go-1.1.0 - ---- - config/flags_test.go | 4 +- - config/profile.go | 10 ++-- - config/profile_test.go | 10 ++-- - openapi/commando_test.go | 2 +- - oss/lib/allpart_size.go | 2 +- - oss/lib/allpart_size_test.go | 10 ++-- - oss/lib/append_file.go | 2 +- - oss/lib/append_file_test.go | 26 +++++----- - oss/lib/bucket_cors.go | 2 +- - oss/lib/bucket_cors_test.go | 14 +++--- - oss/lib/bucket_encryption.go | 2 +- - oss/lib/bucket_encryption_test.go | 14 +++--- - oss/lib/bucket_lifecycle.go | 2 +- - oss/lib/bucket_lifecycle_test.go | 18 +++---- - oss/lib/bucket_logging.go | 2 +- - oss/lib/bucket_logging_test.go | 16 +++--- - oss/lib/bucket_policy.go | 2 +- - oss/lib/bucket_policy_test.go | 18 +++---- - oss/lib/bucket_qos.go | 2 +- - oss/lib/bucket_qos_test.go | 18 +++---- - oss/lib/bucket_referer.go | 2 +- - oss/lib/bucket_referer_test.go | 32 ++++++------ - oss/lib/bucket_tagging.go | 2 +- - oss/lib/bucket_tagging_test.go | 14 +++--- - oss/lib/bucket_versioning.go | 2 +- - oss/lib/bucket_versioning_test.go | 12 ++--- - oss/lib/bucket_website.go | 2 +- - oss/lib/bucket_website_test.go | 18 +++---- - oss/lib/cat.go | 2 +- - oss/lib/cat_test.go | 20 ++++---- - oss/lib/cli_bridge.go | 53 +++++++++---------- - oss/lib/command.go | 20 ++++---- - oss/lib/command_test.go | 84 +++++++++++++++---------------- - oss/lib/config.go | 10 ++-- - oss/lib/config_helper.go | 4 +- - oss/lib/config_test.go | 8 +-- - oss/lib/const.go | 2 +- - oss/lib/cors_options.go | 2 +- - oss/lib/cors_options_test.go | 8 +-- - oss/lib/cp.go | 4 +- - oss/lib/cp_test.go | 82 +++++++++++++++--------------- - oss/lib/create_symlink.go | 2 +- - oss/lib/du.go | 2 +- - oss/lib/du_test.go | 18 +++---- - oss/lib/ecs_role_test.go | 28 +++++------ - oss/lib/listpart.go | 2 +- - oss/lib/listpart_test.go | 10 ++-- - oss/lib/ls.go | 2 +- - oss/lib/ls_test.go | 64 +++++++++++------------ - oss/lib/mb.go | 2 +- - oss/lib/mb_test.go | 12 ++--- - oss/lib/mkdir.go | 2 +- - oss/lib/mkdir_test.go | 6 +-- - oss/lib/monitor_test.go | 8 +-- - oss/lib/object_tagging.go | 2 +- - oss/lib/object_tagging_test.go | 10 ++-- - oss/lib/option.go | 2 +- - oss/lib/probe.go | 2 +- - oss/lib/probe_test.go | 16 +++--- - oss/lib/read_symlink.go | 2 +- - oss/lib/request_payment.go | 2 +- - oss/lib/request_payment_test.go | 12 ++--- - oss/lib/restore.go | 2 +- - oss/lib/restore_test.go | 2 +- - oss/lib/rm.go | 2 +- - oss/lib/rm_test.go | 52 +++++++++---------- - oss/lib/set_acl.go | 2 +- - oss/lib/set_acl_test.go | 16 +++--- - oss/lib/set_meta.go | 2 +- - oss/lib/set_meta_test.go | 16 +++--- - oss/lib/signurl.go | 2 +- - oss/lib/signurl_test.go | 8 +-- - oss/lib/stat.go | 2 +- - oss/lib/stat_test.go | 16 +++--- - oss/lib/symlink_test.go | 4 +- - oss/lib/user_qos.go | 2 +- - oss/lib/user_qos_test.go | 10 ++-- - 77 files changed, 452 insertions(+), 451 deletions(-) - -diff --git a/config/flags_test.go b/config/flags_test.go -index bdf47ac0..ffca4a1c 100644 ---- a/config/flags_test.go -+++ b/config/flags_test.go -@@ -60,7 +60,7 @@ func TestAddFlag(t *testing.T) { - ExcludeWith: nil, - Shorthand: 0, - } -- newAccessKeyIDFlag = &cli.Flag{ -+ newAccessKeyIdFlag = &cli.Flag{ - Category: "config", - Name: AccessKeyIdFlagName, - AssignedMode: cli.AssignedOnce, -@@ -342,7 +342,7 @@ func TestAddFlag(t *testing.T) { - assert.Equal(t, newModeFlag, f) - - f = NewAccessKeyIdFlag() -- assert.Equal(t, newAccessKeyIDFlag, f) -+ assert.Equal(t, newAccessKeyIdFlag, f) - - f = NewAccessKeySecretFlag() - assert.Equal(t, newAccessKeySecretFlag, f) -diff --git a/config/profile.go b/config/profile.go -index 1224848e..a93b7fc7 100644 ---- a/config/profile.go -+++ b/config/profile.go -@@ -283,11 +283,11 @@ func (cp *Profile) GetClientByRamRoleArnWithEcs(config *sdk.Config) (*sdk.Client - if err != nil { - return nil, err - } -- accessKeyID, accessKeySecret, StsToken, err := cp.GetSessionCredential(client) -+ accessKeyId, accessKeySecret, StsToken, err := cp.GetSessionCredential(client) - if err != nil { - return nil, err - } -- cred := credentials.NewStsTokenCredential(accessKeyID, accessKeySecret, StsToken) -+ cred := credentials.NewStsTokenCredential(accessKeyId, accessKeySecret, StsToken) - return sdk.NewClientWithOptions(cp.RegionId, config, cred) - } - -@@ -313,13 +313,13 @@ func (cp *Profile) GetSessionCredential(client *sdk.Client) (string, string, str - if err != nil { - return "", "", "", err - } -- accessKeyID, _ := jmespath.Search("Credentials.AccessKeyId", v) -+ accessKeyId, _ := jmespath.Search("Credentials.AccessKeyId", v) - accessKeySecret, _ := jmespath.Search("Credentials.AccessKeySecret", v) - StsToken, _ := jmespath.Search("Credentials.SecurityToken", v) -- if accessKeyID == nil || accessKeySecret == nil || StsToken == nil { -+ if accessKeyId == nil || accessKeySecret == nil || StsToken == nil { - return "", "", "", errors.New("get session credential failed") - } -- return accessKeyID.(string), accessKeySecret.(string), StsToken.(string), nil -+ return accessKeyId.(string), accessKeySecret.(string), StsToken.(string), nil - } - - func (cp *Profile) GetClientByEcsRamRole(config *sdk.Config) (*sdk.Client, error) { -diff --git a/config/profile_test.go b/config/profile_test.go -index 7bc88617..146486bf 100644 ---- a/config/profile_test.go -+++ b/config/profile_test.go -@@ -289,7 +289,7 @@ func TestOverwriteWithFlagsWithAccessKeySecretEnv(t *testing.T) { - - } - --func TestOverwriteWithFlagsWithAccessKeyIDEnv(t *testing.T) { -+func TestOverwriteWithFlagsWithAccessKeyIdEnv(t *testing.T) { - buf := new(bytes.Buffer) - ctx := cli.NewCommandContext(buf) - AddFlags(ctx.Flags()) -@@ -452,16 +452,16 @@ func TestIsRegion(t *testing.T) { - - func TestAutoModeRecognition(t *testing.T) { - -- p := &Profile{AccessKeyId: "accessKeyID", AccessKeySecret: "accessKeySecret"} -+ p := &Profile{AccessKeyId: "accessKeyId", AccessKeySecret: "accessKeySecret"} - assert.Equal(t, AuthenticateMode(""), p.Mode) - AutoModeRecognition(p) - assert.Equal(t, AK, p.Mode) - -- p = &Profile{AccessKeyId: "accessKeyID", AccessKeySecret: "accessKeySecret", StsToken: "stsToken"} -+ p = &Profile{AccessKeyId: "accessKeyId", AccessKeySecret: "accessKeySecret", StsToken: "stsToken"} - AutoModeRecognition(p) - assert.Equal(t, StsToken, p.Mode) - -- p = &Profile{AccessKeyId: "accessKeyID", AccessKeySecret: "accessKeySecret", RamRoleArn: "ramRoleArn"} -+ p = &Profile{AccessKeyId: "accessKeyId", AccessKeySecret: "accessKeySecret", RamRoleArn: "ramRoleArn"} - AutoModeRecognition(p) - assert.Equal(t, RamRoleArn, p.Mode) - -@@ -473,7 +473,7 @@ func TestAutoModeRecognition(t *testing.T) { - AutoModeRecognition(p) - assert.Equal(t, EcsRamRole, p.Mode) - -- p = &Profile{AccessKeyId: "accessKeyID", AccessKeySecret: "accessKeySecret", StsToken: "stsToken", Mode: AK} -+ p = &Profile{AccessKeyId: "accessKeyId", AccessKeySecret: "accessKeySecret", StsToken: "stsToken", Mode: AK} - AutoModeRecognition(p) - assert.Equal(t, AK, p.Mode) - -diff --git a/openapi/commando_test.go b/openapi/commando_test.go -index d1f5d62e..b77fcb2a 100644 ---- a/openapi/commando_test.go -+++ b/openapi/commando_test.go -@@ -67,7 +67,7 @@ func Test_main(t *testing.T) { - ctx.Flags().Get("region").SetValue("cn-hangzhou") - ctx.Flags().Add(config.NewAccessKeyIdFlag()) - ctx.Flags().Get("access-key-id").SetAssigned(true) -- ctx.Flags().Get("access-key-id").SetValue("AccessKeyID") -+ ctx.Flags().Get("access-key-id").SetValue("AccessKeyId") - ctx.Flags().Add(config.NewAccessKeySecretFlag()) - ctx.Flags().Get("access-key-secret").SetAssigned(true) - ctx.Flags().Get("access-key-secret").SetValue("AccessKeySecret") -diff --git a/oss/lib/allpart_size.go b/oss/lib/allpart_size.go -index 89447a7b..cd5a160a 100644 ---- a/oss/lib/allpart_size.go -+++ b/oss/lib/allpart_size.go -@@ -86,7 +86,7 @@ var allPartSizeCommand = AllPartSizeCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/allpart_size_test.go b/oss/lib/allpart_size_test.go -index f78cede2..8f9d00e9 100644 ---- a/oss/lib/allpart_size_test.go -+++ b/oss/lib/allpart_size_test.go -@@ -32,7 +32,7 @@ func (s *OssutilCommandSuite) TestAllPartSize(c *C) { - defer fd.Close() - - // begin upload part -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -55,7 +55,7 @@ func (s *OssutilCommandSuite) TestAllPartSize(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -93,7 +93,7 @@ func (s *OssutilCommandSuite) TestAllPartSizeBucketError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -111,7 +111,7 @@ func (s *OssutilCommandSuite) TestAllPartSizeEmptyEndpoint(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -121,7 +121,7 @@ func (s *OssutilCommandSuite) TestAllPartSizeEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/append_file.go b/oss/lib/append_file.go -index 270827ff..563522f9 100644 ---- a/oss/lib/append_file.go -+++ b/oss/lib/append_file.go -@@ -138,7 +138,7 @@ var appendFileCommand = AppendFileCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/append_file_test.go b/oss/lib/append_file_test.go -index 152148d8..533d47e4 100644 ---- a/oss/lib/append_file_test.go -+++ b/oss/lib/append_file_test.go -@@ -26,7 +26,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithoutMeta(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -47,7 +47,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithoutMeta(c *C) { - cpDir := CheckpointDir - cpOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "checkpointDir": &cpDir, -@@ -86,7 +86,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithMeta(c *C) { - strMeta := "x-oss-meta-author:luxun" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -104,7 +104,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithMeta(c *C) { - cpDir := CheckpointDir - cpOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "checkpointDir": &cpDir, -@@ -121,7 +121,7 @@ func (s *OssutilCommandSuite) TestAppendFileSuccessWithMeta(c *C) { - c.Assert(strText, Equals, string(fileBody)) - - // check meta -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -157,7 +157,7 @@ func (s *OssutilCommandSuite) TestAppendFileError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -213,7 +213,7 @@ func (s *OssutilCommandSuite) TestAppendFileClientError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -224,7 +224,7 @@ func (s *OssutilCommandSuite) TestAppendFileClientError(c *C) { - c.Assert(err, IsNil) - - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -258,7 +258,7 @@ func (s *OssutilCommandSuite) TestAppendFileObjectExistMetaError(c *C) { - strMeta := "x-oss-meta-author:luxun" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -291,7 +291,7 @@ func (s *OssutilCommandSuite) TestAppendFileParserMetaError(c *C) { - strMeta := "x-oss-meta-author#luxun" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -323,7 +323,7 @@ func (s *OssutilCommandSuite) TestAppendFileAppendFromFileError(c *C) { - var testCommand AppendFileCommand - testCommand.afOption.fileName = randLowStr(12) - -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -372,7 +372,7 @@ func (s *OssutilCommandSuite) TestAppendFileWithPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -390,7 +390,7 @@ func (s *OssutilCommandSuite) TestAppendFileWithPayer(c *C) { - cpDir := CheckpointDir - cpOptions := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "checkpointDir": &cpDir, -diff --git a/oss/lib/bucket_cors.go b/oss/lib/bucket_cors.go -index fab406db..d3f611a0 100644 ---- a/oss/lib/bucket_cors.go -+++ b/oss/lib/bucket_cors.go -@@ -137,7 +137,7 @@ var corsCommand = CorsCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_cors_test.go b/oss/lib/bucket_cors_test.go -index 26b0724e..7ff3bcc2 100644 ---- a/oss/lib/bucket_cors_test.go -+++ b/oss/lib/bucket_cors_test.go -@@ -33,7 +33,7 @@ func (s *OssutilCommandSuite) TestCorsPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -49,7 +49,7 @@ func (s *OssutilCommandSuite) TestCorsPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -87,7 +87,7 @@ func (s *OssutilCommandSuite) TestCorsPutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -186,7 +186,7 @@ func (s *OssutilCommandSuite) TestCorsGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -202,7 +202,7 @@ func (s *OssutilCommandSuite) TestCorsGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -247,7 +247,7 @@ func (s *OssutilCommandSuite) TestCorsDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -263,7 +263,7 @@ func (s *OssutilCommandSuite) TestCorsDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_encryption.go b/oss/lib/bucket_encryption.go -index 4a2fd73a..a4d918f2 100644 ---- a/oss/lib/bucket_encryption.go -+++ b/oss/lib/bucket_encryption.go -@@ -108,7 +108,7 @@ var bucketEncryptionCommand = BucketEncryptionCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_encryption_test.go b/oss/lib/bucket_encryption_test.go -index 4a1b02ac..9a3dc108 100644 ---- a/oss/lib/bucket_encryption_test.go -+++ b/oss/lib/bucket_encryption_test.go -@@ -18,7 +18,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionPutSuccess(c *C) { - strSSEAlgorithm := "KMS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -83,7 +83,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionDeleteSuccess(c *C) { - strSSEAlgorithm := "KMS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -124,7 +124,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -155,7 +155,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionPutEmptyEndpoint(c *C) { - strSSEAlgorithm := "KMS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -168,7 +168,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -191,7 +191,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionGetEmptyEndpoint(c *C) { - strSSEAlgorithm := "KMS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -204,7 +204,7 @@ func (s *OssutilCommandSuite) TestBucketEncryptionGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/bucket_lifecycle.go b/oss/lib/bucket_lifecycle.go -index f3194a78..63f9c3e5 100644 ---- a/oss/lib/bucket_lifecycle.go -+++ b/oss/lib/bucket_lifecycle.go -@@ -156,7 +156,7 @@ var bucketLifeCycleCommand = BucketLifeCycleCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_lifecycle_test.go b/oss/lib/bucket_lifecycle_test.go -index 51a45f73..da0c1942 100644 ---- a/oss/lib/bucket_lifecycle_test.go -+++ b/oss/lib/bucket_lifecycle_test.go -@@ -39,7 +39,7 @@ func (s *OssutilCommandSuite) TestLifecyclePutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -55,7 +55,7 @@ func (s *OssutilCommandSuite) TestLifecyclePutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -97,7 +97,7 @@ func (s *OssutilCommandSuite) TestLifecyclePutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -183,7 +183,7 @@ func (s *OssutilCommandSuite) TestLifecycleOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -195,7 +195,7 @@ func (s *OssutilCommandSuite) TestLifecycleOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -235,7 +235,7 @@ func (s *OssutilCommandSuite) TestLifecycleGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -251,7 +251,7 @@ func (s *OssutilCommandSuite) TestLifecycleGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -301,7 +301,7 @@ func (s *OssutilCommandSuite) TestLifecycleDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -317,7 +317,7 @@ func (s *OssutilCommandSuite) TestLifecycleDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_logging.go b/oss/lib/bucket_logging.go -index bd11e40d..f65671e1 100644 ---- a/oss/lib/bucket_logging.go -+++ b/oss/lib/bucket_logging.go -@@ -116,7 +116,7 @@ var bucketLogCommand = BucketLogCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_logging_test.go b/oss/lib/bucket_logging_test.go -index d43548ac..b3add1ba 100644 ---- a/oss/lib/bucket_logging_test.go -+++ b/oss/lib/bucket_logging_test.go -@@ -21,7 +21,7 @@ func (s *OssutilCommandSuite) TestBucketLogPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -37,7 +37,7 @@ func (s *OssutilCommandSuite) TestBucketLogPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -77,7 +77,7 @@ func (s *OssutilCommandSuite) TestBucketLogDeleteSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -150,7 +150,7 @@ func (s *OssutilCommandSuite) TestBucketLogGetToStdout(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -185,7 +185,7 @@ func (s *OssutilCommandSuite) TestBucketLogGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -201,7 +201,7 @@ func (s *OssutilCommandSuite) TestBucketLogGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -246,7 +246,7 @@ func (s *OssutilCommandSuite) TestBucketLogPutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -314,7 +314,7 @@ func (s *OssutilCommandSuite) TestBucketLogDeleteError(c *C) { - strKey := "aaa" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &strKey, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_policy.go b/oss/lib/bucket_policy.go -index 11699124..67d4d092 100644 ---- a/oss/lib/bucket_policy.go -+++ b/oss/lib/bucket_policy.go -@@ -153,7 +153,7 @@ var bucketPolicyCommand = BucketPolicyCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_policy_test.go b/oss/lib/bucket_policy_test.go -index fdb34483..0206045f 100644 ---- a/oss/lib/bucket_policy_test.go -+++ b/oss/lib/bucket_policy_test.go -@@ -36,7 +36,7 @@ func (s *OssutilCommandSuite) TestPolicyPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -52,7 +52,7 @@ func (s *OssutilCommandSuite) TestPolicyPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -86,7 +86,7 @@ func (s *OssutilCommandSuite) TestPolicyPutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -172,7 +172,7 @@ func (s *OssutilCommandSuite) TestPolicyOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -184,7 +184,7 @@ func (s *OssutilCommandSuite) TestPolicyOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -227,7 +227,7 @@ func (s *OssutilCommandSuite) TestPolicyGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -243,7 +243,7 @@ func (s *OssutilCommandSuite) TestPolicyGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -296,7 +296,7 @@ func (s *OssutilCommandSuite) TestPolicyDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -312,7 +312,7 @@ func (s *OssutilCommandSuite) TestPolicyDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_qos.go b/oss/lib/bucket_qos.go -index 2f84b2de..a77ba024 100644 ---- a/oss/lib/bucket_qos.go -+++ b/oss/lib/bucket_qos.go -@@ -142,7 +142,7 @@ var bucketQosCommand = BucketQosCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_qos_test.go b/oss/lib/bucket_qos_test.go -index c9ed5cdb..7cca919b 100644 ---- a/oss/lib/bucket_qos_test.go -+++ b/oss/lib/bucket_qos_test.go -@@ -39,7 +39,7 @@ func (s *OssutilCommandSuite) TestBucketQosPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -58,7 +58,7 @@ func (s *OssutilCommandSuite) TestBucketQosPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -104,7 +104,7 @@ func (s *OssutilCommandSuite) TestBucketQosPutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -190,7 +190,7 @@ func (s *OssutilCommandSuite) TestBucketQosOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -202,7 +202,7 @@ func (s *OssutilCommandSuite) TestBucketQosOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -241,7 +241,7 @@ func (s *OssutilCommandSuite) TestBucketQosGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -257,7 +257,7 @@ func (s *OssutilCommandSuite) TestBucketQosGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -305,7 +305,7 @@ func (s *OssutilCommandSuite) TestBucketQosDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -321,7 +321,7 @@ func (s *OssutilCommandSuite) TestBucketQosDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/bucket_referer.go b/oss/lib/bucket_referer.go -index edcc96c9..3e61a4cb 100644 ---- a/oss/lib/bucket_referer.go -+++ b/oss/lib/bucket_referer.go -@@ -121,7 +121,7 @@ var bucketRefererCommand = BucketRefererCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_referer_test.go b/oss/lib/bucket_referer_test.go -index 2b16fa50..9b6a1361 100644 ---- a/oss/lib/bucket_referer_test.go -+++ b/oss/lib/bucket_referer_test.go -@@ -19,7 +19,7 @@ func (s *OssutilCommandSuite) TestBucketRefererPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -37,7 +37,7 @@ func (s *OssutilCommandSuite) TestBucketRefererPutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -80,7 +80,7 @@ func (s *OssutilCommandSuite) TestBucketRefererDisableEmpty(c *C) { - disableEmptyRefer := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -99,7 +99,7 @@ func (s *OssutilCommandSuite) TestBucketRefererDisableEmpty(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -141,7 +141,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -159,7 +159,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -205,7 +205,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetToStdout(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -228,7 +228,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetToStdout(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -265,7 +265,7 @@ func (s *OssutilCommandSuite) TestBucketRefererBucketError(c *C) { - disableEmptyRefer := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -290,7 +290,7 @@ func (s *OssutilCommandSuite) TestBucketRefererDeleteSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -308,7 +308,7 @@ func (s *OssutilCommandSuite) TestBucketRefererDeleteSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -373,7 +373,7 @@ func (s *OssutilCommandSuite) TestBucketRefererError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -412,7 +412,7 @@ func (s *OssutilCommandSuite) TestBucketRefererPutEmptyEndpoint(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -424,7 +424,7 @@ func (s *OssutilCommandSuite) TestBucketRefererPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -450,7 +450,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -462,7 +462,7 @@ func (s *OssutilCommandSuite) TestBucketRefererGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/bucket_tagging.go b/oss/lib/bucket_tagging.go -index 93b1453e..7c3fb37d 100644 ---- a/oss/lib/bucket_tagging.go -+++ b/oss/lib/bucket_tagging.go -@@ -106,7 +106,7 @@ var bucketTagCommand = BucketTagCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_tagging_test.go b/oss/lib/bucket_tagging_test.go -index 3efc75d2..6403eecc 100644 ---- a/oss/lib/bucket_tagging_test.go -+++ b/oss/lib/bucket_tagging_test.go -@@ -17,7 +17,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingPutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -51,7 +51,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingDeleteSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -94,7 +94,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -137,7 +137,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingPutEmptyEndpoint(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -149,7 +149,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -172,7 +172,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingGetEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -184,7 +184,7 @@ func (s *OssutilCommandSuite) TestBucketTaggingGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/bucket_versioning.go b/oss/lib/bucket_versioning.go -index e520686d..9afe463a 100644 ---- a/oss/lib/bucket_versioning.go -+++ b/oss/lib/bucket_versioning.go -@@ -98,7 +98,7 @@ var bucketVersioningCommand = BucketVersioningCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_versioning_test.go b/oss/lib/bucket_versioning_test.go -index a19148da..c285b888 100644 ---- a/oss/lib/bucket_versioning_test.go -+++ b/oss/lib/bucket_versioning_test.go -@@ -16,7 +16,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningPutSuccess(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -65,7 +65,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -105,7 +105,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningPutEmptyEndpoint(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -117,7 +117,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -139,7 +139,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningGetEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -151,7 +151,7 @@ func (s *OssutilCommandSuite) TestBucketVersioningGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/bucket_website.go b/oss/lib/bucket_website.go -index db9a7b11..97d20223 100644 ---- a/oss/lib/bucket_website.go -+++ b/oss/lib/bucket_website.go -@@ -230,7 +230,7 @@ var bucketWebsiteCommand = BucketWebSiteCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/bucket_website_test.go b/oss/lib/bucket_website_test.go -index 01f27aa8..71ad688c 100644 ---- a/oss/lib/bucket_website_test.go -+++ b/oss/lib/bucket_website_test.go -@@ -52,7 +52,7 @@ func (s *OssutilCommandSuite) TestWebsitePutSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -68,7 +68,7 @@ func (s *OssutilCommandSuite) TestWebsitePutSuccess(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -111,7 +111,7 @@ func (s *OssutilCommandSuite) TestWebsitePutError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -197,7 +197,7 @@ func (s *OssutilCommandSuite) TestWebsiteOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -209,7 +209,7 @@ func (s *OssutilCommandSuite) TestWebsiteOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -262,7 +262,7 @@ func (s *OssutilCommandSuite) TestWebsiteGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -278,7 +278,7 @@ func (s *OssutilCommandSuite) TestWebsiteGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -341,7 +341,7 @@ func (s *OssutilCommandSuite) TestWebsiteDelete(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -357,7 +357,7 @@ func (s *OssutilCommandSuite) TestWebsiteDelete(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/cat.go b/oss/lib/cat.go -index ac92bff3..c9c2b101 100644 ---- a/oss/lib/cat.go -+++ b/oss/lib/cat.go -@@ -92,7 +92,7 @@ var catCommand = CatCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/cat_test.go b/oss/lib/cat_test.go -index 1cc88831..dd3a99b2 100644 ---- a/oss/lib/cat_test.go -+++ b/oss/lib/cat_test.go -@@ -11,7 +11,7 @@ import ( - - func (s *OssutilCommandSuite) TestCatObjectSuccess(c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucketName := bucketNamePrefix + randLowStr(5) -@@ -32,7 +32,7 @@ func (s *OssutilCommandSuite) TestCatObjectSuccess(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -62,7 +62,7 @@ func (s *OssutilCommandSuite) TestCatObjectSuccess(c *C) { - - func (s *OssutilCommandSuite) TestCatObjectError(c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucketName := bucketNamePrefix + randLowStr(5) -@@ -73,7 +73,7 @@ func (s *OssutilCommandSuite) TestCatObjectError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -98,7 +98,7 @@ func (s *OssutilCommandSuite) TestCatObjectError(c *C) { - - func (s *OssutilCommandSuite) TestCatObjecEndpointEmptyError(c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucketName := bucketNamePrefix + randLowStr(5) -@@ -109,7 +109,7 @@ func (s *OssutilCommandSuite) TestCatObjecEndpointEmptyError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -121,7 +121,7 @@ func (s *OssutilCommandSuite) TestCatObjecEndpointEmptyError(c *C) { - c.Assert(err, IsNil) - - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -176,7 +176,7 @@ func (s *OssutilCommandSuite) TestCatObjectWithVersion(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -202,7 +202,7 @@ func (s *OssutilCommandSuite) TestCatObjectWithVersion(c *C) { - //begin cat with version id v1 - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -242,7 +242,7 @@ func (s *OssutilCommandSuite) TestCatObjectWithPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/cli_bridge.go b/oss/lib/cli_bridge.go -index 31a41afc..a6455198 100644 ---- a/oss/lib/cli_bridge.go -+++ b/oss/lib/cli_bridge.go -@@ -8,6 +8,7 @@ import ( - "github.com/aliyun/aliyun-cli/cli" - "github.com/aliyun/aliyun-cli/config" - "github.com/aliyun/aliyun-cli/i18n" -+ "github.com/alibabacloud-go/tea/tea" - "github.com/aliyun/credentials-go/credentials" - ) - -@@ -100,13 +101,13 @@ func ParseAndRunCommandFromCli(ctx *cli.Context, args []string) error { - return fmt.Errorf("config failed: %s", err.Error()) - } - -- accessKeyID, accessSecret, stsToken, err := getSessionCredential(&profile) -+ accessKeyId, accessSecret, stsToken, err := getSessionCredential(&profile) - if err != nil { - return fmt.Errorf("can't get credential %s", err) - } - - configs := make(map[string]string, 0) -- configs["access-key-id"] = accessKeyID -+ configs["access-key-id"] = accessKeyId - configs["access-key-secret"] = accessSecret - configs["sts-token"] = stsToken - -@@ -154,35 +155,35 @@ func ParseAndRunCommandFromCli(ctx *cli.Context, args []string) error { - } - - func getSessionCredential(profile *config.Profile) (string, string, string, error) { -- var conf *credentials.Configuration -+ var conf *credentials.Config - switch profile.Mode { - case config.AK: -- conf = &credentials.Configuration{ -- Type: "access_key", -- AccessKeyID: profile.AccessKeyId, -- AccessKeySecret: profile.AccessKeySecret, -+ conf = &credentials.Config{ -+ Type: tea.String("access_key"), -+ AccessKeyId: tea.String(profile.AccessKeyId), -+ AccessKeySecret: tea.String(profile.AccessKeySecret), - } - case config.StsToken: -- conf = &credentials.Configuration{ -- Type: "sts", -- AccessKeyID: profile.AccessKeyId, -- AccessKeySecret: profile.AccessKeySecret, -- SecurityToken: profile.StsToken, -+ conf = &credentials.Config{ -+ Type: tea.String("sts"), -+ AccessKeyId: tea.String(profile.AccessKeyId), -+ AccessKeySecret: tea.String(profile.AccessKeySecret), -+ SecurityToken: tea.String(profile.StsToken), - } - case config.RamRoleArn: -- conf = &credentials.Configuration{ -- Type: "ram_role_arn", -- AccessKeyID: profile.AccessKeyId, -- AccessKeySecret: profile.AccessKeySecret, -- RoleArn: profile.RamRoleArn, -- RoleSessionName: profile.RoleSessionName, -- Policy: "", -- RoleSessionExpiration: profile.ExpiredSeconds, -+ conf = &credentials.Config{ -+ Type: tea.String("ram_role_arn"), -+ AccessKeyId: tea.String(profile.AccessKeyId), -+ AccessKeySecret: tea.String(profile.AccessKeySecret), -+ RoleArn: tea.String(profile.RamRoleArn), -+ RoleSessionName: tea.String(profile.RoleSessionName), -+ Policy: tea.String(""), -+ RoleSessionExpiration: tea.Int(profile.ExpiredSeconds), - } - case config.EcsRamRole: -- conf = &credentials.Configuration{ -- Type: "ecs_ram_role", -- RoleName: profile.RamRoleName, -+ conf = &credentials.Config{ -+ Type: tea.String("ecs_ram_role"), -+ RoleName: tea.String(profile.RamRoleName), - } - case config.RamRoleArnWithEcs: - client, _ := sdk.NewClientWithEcsRamRole(profile.RegionId, profile.RamRoleName) -@@ -193,11 +194,11 @@ func getSessionCredential(profile *config.Profile) (string, string, string, erro - return "", "", "", err - } - var lastErr error -- accessKeyID, err := credential.GetAccessKeyID() -+ accessKeyId, err := credential.GetAccessKeyId() - if err != nil { - lastErr = err - } -- accessSecret, err := credential.GetAccessSecret() -+ accessSecret, err := credential.GetAccessKeySecret() - if err != nil { - lastErr = err - } -@@ -208,5 +209,5 @@ func getSessionCredential(profile *config.Profile) (string, string, string, erro - if lastErr != nil { - return "", "", "", lastErr - } -- return accessKeyID, accessSecret, stsToken, nil -+ return tea.StringValue(accessKeyId), tea.StringValue(accessSecret), tea.StringValue(stsToken), nil - } -diff --git a/oss/lib/command.go b/oss/lib/command.go -index 5d990d4c..8cf54fc3 100644 ---- a/oss/lib/command.go -+++ b/oss/lib/command.go -@@ -127,7 +127,7 @@ func (cmd *Command) loadConfig(configFile string, cmder interface{}) error { - } - - func (cmd *Command) needConfigFile() bool { -- for _, name := range []string{OptionEndpoint, OptionAccessKeyID, OptionAccessKeySecret, OptionSTSToken} { -+ for _, name := range []string{OptionEndpoint, OptionAccessKeyId, OptionAccessKeySecret, OptionSTSToken} { - val, _ := GetString(name, cmd.options) - if val != "" { - return false -@@ -282,7 +282,7 @@ func (cmd *Command) formatOption(option Option) string { - // get oss client according to bucket(if bucket not empty) - func (cmd *Command) ossClient(bucket string) (*oss.Client, error) { - endpoint, isCname := cmd.getEndpoint(bucket) -- accessKeyID, _ := GetString(OptionAccessKeyID, cmd.options) -+ accessKeyId, _ := GetString(OptionAccessKeyId, cmd.options) - accessKeySecret, _ := GetString(OptionAccessKeySecret, cmd.options) - stsToken, _ := GetString(OptionSTSToken, cmd.options) - disableCRC64, _ := GetBool(OptionDisableCRC64, cmd.options) -@@ -292,12 +292,12 @@ func (cmd *Command) ossClient(bucket string) (*oss.Client, error) { - ecsUrl, _ := cmd.getEcsRamAkService() - localHost, _ := GetString(OptionLocalHost, cmd.options) - -- if accessKeyID == "" && ecsUrl == "" { -- return nil, fmt.Errorf("accessKeyID and ecsUrl are both empty") -+ if accessKeyId == "" && ecsUrl == "" { -+ return nil, fmt.Errorf("accessKeyId and ecsUrl are both empty") - } - - if ecsUrl == "" { -- if err := cmd.checkCredentials(endpoint, accessKeyID, accessKeySecret); err != nil { -+ if err := cmd.checkCredentials(endpoint, accessKeyId, accessKeySecret); err != nil { - return nil, err - } - } -@@ -331,13 +331,13 @@ func (cmd *Command) ossClient(bucket string) (*oss.Client, error) { - options = append(options, oss.SetLogger(utilLogger)) - } - -- if accessKeyID == "" { -+ if accessKeyId == "" { - LogInfo("using user ak service:%s\n", ecsUrl) - ecsRoleAKBuild := EcsRoleAKBuild{url: ecsUrl} - options = append(options, oss.SetCredentialsProvider(&ecsRoleAKBuild)) - } - -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret, options...) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret, options...) - if err != nil { - return nil, err - } -@@ -359,12 +359,12 @@ func (cmd *Command) ossClient(bucket string) (*oss.Client, error) { - return client, nil - } - --func (cmd *Command) checkCredentials(endpoint, accessKeyID, accessKeySecret string) error { -+func (cmd *Command) checkCredentials(endpoint, accessKeyId, accessKeySecret string) error { - if strings.TrimSpace(endpoint) == "" { - return fmt.Errorf("invalid endpoint, endpoint is empty, please check your config") - } -- if strings.TrimSpace(accessKeyID) == "" { -- return fmt.Errorf("invalid accessKeyID, accessKeyID is empty, please check your config") -+ if strings.TrimSpace(accessKeyId) == "" { -+ return fmt.Errorf("invalid accessKeyId, accessKeyId is empty, please check your config") - } - if strings.TrimSpace(accessKeySecret) == "" { - return fmt.Errorf("invalid accessKeySecret, accessKeySecret is empty, please check your config") -diff --git a/oss/lib/command_test.go b/oss/lib/command_test.go -index a56cd018..d9e5ad88 100644 ---- a/oss/lib/command_test.go -+++ b/oss/lib/command_test.go -@@ -31,7 +31,7 @@ var _ = Suite(&OssutilCommandSuite{}) - var ( - // Update before running test - endpoint = "" -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - payerBucket = "" -@@ -92,8 +92,8 @@ func SetUpCredential() { - if strings.HasPrefix(endpoint, "http://") { - endpoint = endpoint[7:] - } -- if accessKeyID == "" { -- accessKeyID = os.Getenv("OSS_TEST_ACCESS_KEY_ID") -+ if accessKeyId == "" { -+ accessKeyId = os.Getenv("OSS_TEST_ACCESS_KEY_ID") - } - if accessKeySecret == "" { - accessKeySecret = os.Getenv("OSS_TEST_ACCESS_KEY_SECRET") -@@ -200,7 +200,7 @@ func getFileList(dpath string) ([]string, error) { - - func (s *OssutilCommandSuite) PutObject(bucketName string, object string, body string, c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -213,7 +213,7 @@ func (s *OssutilCommandSuite) PutObject(bucketName string, object string, body s - - func (s *OssutilCommandSuite) AppendObject(bucketName string, object string, body string, position int64, c *C) { - // create client and bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -228,7 +228,7 @@ func (s *OssutilCommandSuite) configNonInteractive(c *C) { - var args []string - options := OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "configFile": &configFile, - } -@@ -241,7 +241,7 @@ func (s *OssutilCommandSuite) configNonInteractive(c *C) { - c.Assert(len(opts), Equals, 4) - c.Assert(opts[OptionLanguage], Equals, DefaultLanguage) - c.Assert(opts[OptionEndpoint], Equals, endpoint) -- c.Assert(opts[OptionAccessKeyID], Equals, accessKeyID) -+ c.Assert(opts[OptionAccessKeyId], Equals, accessKeyId) - c.Assert(opts[OptionAccessKeySecret], Equals, accessKeySecret) - } - -@@ -294,7 +294,7 @@ func (s *OssutilCommandSuite) rawList(args []string, cmdline string, optionPairs - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -363,7 +363,7 @@ func (s *OssutilCommandSuite) rawListLimitedMarker(args []string, cmdline string - limitedNumStr := strconv.FormatInt(limitedNum, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -461,7 +461,7 @@ func (s *OssutilCommandSuite) rawRemove(args []string, recursive, force, bucket - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -482,7 +482,7 @@ func (s *OssutilCommandSuite) removeBucketObjectVersions(bucket string, c *C) (b - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -522,7 +522,7 @@ func (s *OssutilCommandSuite) removeWrapper(cmdline string, bucket string, objec - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -558,7 +558,7 @@ func (s *OssutilCommandSuite) initRemove(bucket string, object string, cmdline s - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -629,7 +629,7 @@ func (s *OssutilCommandSuite) rawPutBucketWithACL(args []string, acl string) (bo - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -644,7 +644,7 @@ func (s *OssutilCommandSuite) rawPutBucketWithACLLanguage(args []string, acl, la - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -661,7 +661,7 @@ func (s *OssutilCommandSuite) putBucket(bucket string, c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -677,7 +677,7 @@ func (s *OssutilCommandSuite) putBucketWithEndPoint(bucket string, strEndPoint s - str := "" - options := OptionMapType{ - "endpoint": &strEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -694,7 +694,7 @@ func (s *OssutilCommandSuite) putBucketVersioning(bucket string, status string, - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -717,7 +717,7 @@ func (s *OssutilCommandSuite) initPutBucketWithStorageClass(args []string, stora - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -741,7 +741,7 @@ func (s *OssutilCommandSuite) rawCPWithArgs(args []string, recursive, force, upd - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -817,7 +817,7 @@ func (s *OssutilCommandSuite) rawCPWithFilter(args []string, recursive, force, u - - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -847,7 +847,7 @@ func (s *OssutilCommandSuite) rawCPWithOutputDir(srcURL, destURL string, recursi - cpDir := CheckpointDir - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -873,7 +873,7 @@ func (s *OssutilCommandSuite) rawCPWithPayer(args []string, recursive, force, up - cpDir := CheckpointDir - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -898,7 +898,7 @@ func (s *OssutilCommandSuite) initCopyCommand(srcURL, destURL string, recursive, - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -924,7 +924,7 @@ func (s *OssutilCommandSuite) initCopyWithSnapshot(srcURL, destURL string, recur - cpDir := CheckpointDir - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -950,7 +950,7 @@ func (s *OssutilCommandSuite) initCopyWithRange(srcURL, destURL string, recursiv - cpDir := CheckpointDir - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -999,7 +999,7 @@ func (s *OssutilCommandSuite) rawGetStatWithArgs(args []string) (bool, error) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1070,7 +1070,7 @@ func (s *OssutilCommandSuite) rawSetACLWithArgs(args []string, recursive, bucket - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1090,7 +1090,7 @@ func (s *OssutilCommandSuite) rawSetAclWithFilter(args []string, recursive, forc - - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1112,7 +1112,7 @@ func (s *OssutilCommandSuite) initSetACL(bucket, object, acl string, recursive, - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1146,7 +1146,7 @@ func (s *OssutilCommandSuite) initSetACLWithArgs(args []string, cmdline string, - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1187,7 +1187,7 @@ func (s *OssutilCommandSuite) rawSetMetaWithArgs(args []string, update, delete, - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1214,7 +1214,7 @@ func (s *OssutilCommandSuite) rawSetMetaWithArgsWithPattern(args []string, updat - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1237,7 +1237,7 @@ func (s *OssutilCommandSuite) rawSetMetaWithFilter(args []string, update, delete - - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1316,7 +1316,7 @@ func (s *OssutilCommandSuite) initSetMeta(bucket, object, meta string, update, d - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1362,7 +1362,7 @@ func (s *OssutilCommandSuite) initSetMetaWithArgs(args []string, cmdline string, - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1396,7 +1396,7 @@ func (s *OssutilCommandSuite) initCreateSymlink(cmdline string) error { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1441,7 +1441,7 @@ func (s *OssutilCommandSuite) initReadSymlink(cmdline string) error { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1465,7 +1465,7 @@ func (s *OssutilCommandSuite) initSignURL(cmdline, encodingType string, timeout - t := strconv.FormatInt(timeout, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1536,7 +1536,7 @@ func (s *OssutilCommandSuite) initRestoreObject(args []string, cmdline string, o - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1740,7 +1740,7 @@ func (s *OssutilCommandSuite) TestErrOssDownloadFile(c *C) { - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1807,7 +1807,7 @@ func (s *OssutilCommandSuite) TestNeedConfig(c *C) { - e := "a" - options := OptionMapType{ - "endpoint": &e, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &str, -diff --git a/oss/lib/config.go b/oss/lib/config.go -index 0d9ba431..b4a0f12c 100644 ---- a/oss/lib/config.go -+++ b/oss/lib/config.go -@@ -66,7 +66,7 @@ var specChineseConfig = SpecText{ - 或者非法，将采用默认语言：` + DefaultLanguage + `。 - 注意：该配置项在此次config成功结束后才会生效，在执行config命令过 - 程中语言显示不会受用户的选择影响。 -- (3) endpoint, accessKeyID, accessKeySecret -+ (3) endpoint, accessKeyId, accessKeySecret - 回车代表着跳过相应配置项的设置。注意：endpoint应该为一个二级域 - 名(SLD)，例如：` + DefaultEndpoint + `。 - 以上选项一般为必选项。 -@@ -121,7 +121,7 @@ var specChineseConfig = SpecText{ - [Credentials] - language = CH - endpoint = ` + DefaultEndpoint + ` -- accessKeyID = your_key_id -+ accessKeyId = your_key_id - accessKeySecret = your_key_secret - stsToken = your_sts_token - outputDir = your_output_dir -@@ -207,7 +207,7 @@ Usage: - default language: ` + DefaultLanguage + `. - Notice that the configuration will go into effect after the config - command successfully executed, it's dimmed while execute the command. -- (3) endpoint, accessKeyID, accessKeySecret -+ (3) endpoint, accessKeyId, accessKeySecret - Carriage return means skip the configuration of these options. - Note: Endpoint means a second-level domain(SLD), eg: ` + DefaultEndpoint + `. - The three options are necessary in normal condition. -@@ -264,7 +264,7 @@ Credential File Format: - [Credentials] - language = EN - endpoint = ` + DefaultEndpoint + ` -- accessKeyID = your_key_id -+ accessKeyId = your_key_id - accessKeySecret = your_key_secret - stsToken = your_sts_token - outputDir = your_output_dir -@@ -301,7 +301,7 @@ var configCommand = ConfigCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionOutputDir, -diff --git a/oss/lib/config_helper.go b/oss/lib/config_helper.go -index 4ca1c43c..a7906dfb 100644 ---- a/oss/lib/config_helper.go -+++ b/oss/lib/config_helper.go -@@ -38,7 +38,7 @@ type configOption struct { - var CredOptionList = []string{ - OptionLanguage, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionOutputDir, -@@ -49,7 +49,7 @@ var CredOptionList = []string{ - var CredOptionMap = map[string]configOption{ - OptionLanguage: configOption{[]string{"language", "Language"}, false, true, "", ""}, - OptionEndpoint: configOption{[]string{"endpoint", "host"}, true, true, "", ""}, -- OptionAccessKeyID: configOption{[]string{"accessKeyID", "accessKeyId", "AccessKeyID", "AccessKeyId", "access_key_id", "access_id", "accessid", "access-key-id", "access-id"}, true, false, "", ""}, -+ OptionAccessKeyId: configOption{[]string{"accessKeyId", "accessKeyId", "AccessKeyId", "AccessKeyId", "access_key_id", "access_id", "accessid", "access-key-id", "access-id"}, true, false, "", ""}, - OptionAccessKeySecret: configOption{[]string{"accessKeySecret", "AccessKeySecret", "access_key_secret", "access_key", "accesskey", "access-key-secret", "access-key"}, true, false, "", ""}, - OptionSTSToken: configOption{[]string{"stsToken", "ststoken", "STSToken", "sts_token", "sts-token"}, true, false, "", ""}, - OptionOutputDir: configOption{[]string{"outputDir", "output-dir", "output_dir", "output_directory"}, false, true, "ossutil生成的文件的输出目录, ", "the directory to store files generated by ossutil, "}, -diff --git a/oss/lib/config_test.go b/oss/lib/config_test.go -index a2524256..d2b0d36b 100644 ---- a/oss/lib/config_test.go -+++ b/oss/lib/config_test.go -@@ -56,7 +56,7 @@ func (s *OssutilConfigSuite) TestConfigNonInteractive(c *C) { - var args []string - options := OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &stsToken, - "configFile": &configFile, -@@ -74,7 +74,7 @@ func (s *OssutilConfigSuite) TestConfigNonInteractive(c *C) { - c.Assert(len(opts), Equals, 5) - c.Assert(opts[OptionLanguage], Equals, DefaultLanguage) - c.Assert(opts[OptionEndpoint], Equals, endpoint) -- c.Assert(opts[OptionAccessKeyID], Equals, accessKeyID) -+ c.Assert(opts[OptionAccessKeyId], Equals, accessKeyId) - c.Assert(opts[OptionAccessKeySecret], Equals, accessKeySecret) - c.Assert(opts[OptionSTSToken], Equals, stsToken) - } -@@ -200,7 +200,7 @@ func (s *OssutilConfigSuite) TestConfigOptionEmptyValue(c *C) { - id := "" - options := OptionMapType{ - "endpoint": &endp, -- "accessKeyID": &id, -+ "accessKeyId": &id, - "accessKeySecret": &accessKeySecret, - "stsToken": &stsToken, - "configFile": &configFile, -@@ -217,7 +217,7 @@ func (s *OssutilConfigSuite) TestConfigOptionEmptyValue(c *C) { - c.Assert(err, IsNil) - c.Assert(len(opts), Equals, 3) - c.Assert(opts[OptionEndpoint], IsNil) -- c.Assert(opts[OptionAccessKeyID], IsNil) -+ c.Assert(opts[OptionAccessKeyId], IsNil) - c.Assert(opts[OptionLanguage], Equals, DefaultLanguage) - c.Assert(opts[OptionAccessKeySecret], Equals, accessKeySecret) - c.Assert(opts[OptionSTSToken], Equals, stsToken) -diff --git a/oss/lib/const.go b/oss/lib/const.go -index 11e7d1f8..f3c9e27b 100644 ---- a/oss/lib/const.go -+++ b/oss/lib/const.go -@@ -10,7 +10,7 @@ import ( - const ( - OptionConfigFile string = "configFile" - OptionEndpoint = "endpoint" -- OptionAccessKeyID = "accessKeyID" -+ OptionAccessKeyId = "accessKeyId" - OptionAccessKeySecret = "accessKeySecret" - OptionSTSToken = "stsToken" - OptionACL = "acl" -diff --git a/oss/lib/cors_options.go b/oss/lib/cors_options.go -index a0373360..15353569 100644 ---- a/oss/lib/cors_options.go -+++ b/oss/lib/cors_options.go -@@ -79,7 +79,7 @@ var corsOptionsCommand = OptionsCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/cors_options_test.go b/oss/lib/cors_options_test.go -index 2f3bd13e..4a58e790 100644 ---- a/oss/lib/cors_options_test.go -+++ b/oss/lib/cors_options_test.go -@@ -36,7 +36,7 @@ func (s *OssutilCommandSuite) TestCorsOptionsSuccess(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -79,7 +79,7 @@ func (s *OssutilCommandSuite) TestCorsOptionsError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -119,7 +119,7 @@ func (s *OssutilCommandSuite) TestCorsOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -131,7 +131,7 @@ func (s *OssutilCommandSuite) TestCorsOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/cp.go b/oss/lib/cp.go -index d16a7eec..fe76e8f4 100644 ---- a/oss/lib/cp.go -+++ b/oss/lib/cp.go -@@ -199,7 +199,7 @@ var specChineseCopy = SpecText{ - （1）如果未进入批量文件迭代过程，错误已经发生，则不会产生report文件，ossutil会终止 - 运行，不继续迭代过程。如，用户输入cp命令出错时，不会产生report文件，而是屏幕输出错 - 误并退出。 -- （2）如果批量操作过程某文件发生的错误为：Bucket不存在、accessKeyID/accessKeySecret -+ （2）如果批量操作过程某文件发生的错误为：Bucket不存在、accessKeyId/accessKeySecret - 错误造成的权限验证非法等错误，ossutil会屏幕输出错误并退出。 - - report文件名为：` + ReportPrefix + `日期_时间` + ReportSuffix + `。report文件是ossutil输出文件的一种， -@@ -1265,7 +1265,7 @@ var copyCommand = CopyCommand{ - OptionACL, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/cp_test.go b/oss/lib/cp_test.go -index 5df88afc..99c4c159 100644 ---- a/oss/lib/cp_test.go -+++ b/oss/lib/cp_test.go -@@ -578,7 +578,7 @@ func (s *OssutilCommandSuite) TestUploadErrSrc(c *C) { - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1080,7 +1080,7 @@ func (s *OssutilCommandSuite) TestCPIDKey(c *C) { - s.createFile(ufile, data, c) - - cfile := randStr(10) -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "cp" -@@ -1093,7 +1093,7 @@ func (s *OssutilCommandSuite) TestCPIDKey(c *C) { - partSize := strconv.FormatInt(DefaultPartSize, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -1108,7 +1108,7 @@ func (s *OssutilCommandSuite) TestCPIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -1158,7 +1158,7 @@ func (s *OssutilCommandSuite) TestUploadOutputDir(c *C) { - // SignatureDoesNotMatch err copy -> no outputdir - cfile := configFile - configFile = randStr(10) -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", endpoint, accessKeyID, "abc", bucketName, endpoint) -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", endpoint, accessKeyId, "abc", bucketName, endpoint) - s.createFile(configFile, data, c) - - showElapse, err = s.rawCPWithOutputDir(ufile, CloudURLToString(bucketName, object), true, true, false, 1, dir) -@@ -1168,7 +1168,7 @@ func (s *OssutilCommandSuite) TestUploadOutputDir(c *C) { - c.Assert(err, NotNil) - c.Assert(os.IsNotExist(err), Equals, true) - -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, bucketName, "abc") -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, bucketName, "abc") - s.createFile(configFile, data, c) - - // err copy without -r -> no outputdir -@@ -1262,7 +1262,7 @@ func (s *OssutilCommandSuite) TestBatchUploadOutputDir(c *C) { - // err copy -> outputdir - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n", "abc", accessKeyID, accessKeySecret) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n", "abc", accessKeyId, accessKeySecret) - s.createFile(configFile, data, c) - testResultFile, _ = os.OpenFile(resultPath, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) - out := os.Stdout -@@ -1342,7 +1342,7 @@ func (s *OssutilCommandSuite) TestDownloadOutputDir(c *C) { - // err copy without -r -> no outputdir - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, bucketName, "abc") - s.createFile(configFile, data, c) - - showElapse, err = s.rawCPWithOutputDir(CloudURLToString(bucketName, object), downloadFileName, false, true, false, 1, dir) -@@ -1405,7 +1405,7 @@ func (s *OssutilCommandSuite) TestCopyOutputDir(c *C) { - // list err copy without -r -> no outputdir - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, srcBucket, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, srcBucket, "abc") - s.createFile(configFile, data, c) - showElapse, err = s.rawCPWithOutputDir(CloudURLToString(srcBucket, object), CloudURLToString(destBucket, object), false, true, false, 1, dir) - c.Assert(err, NotNil) -@@ -1471,7 +1471,7 @@ func (s *OssutilCommandSuite) TestBatchCopyOutputDir(c *C) { - // test objectStatistic err - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", srcBucket, "abc", srcBucket, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", srcBucket, "abc", srcBucket, "abc") - s.createFile(configFile, data, c) - - showElapse, err = s.rawCPWithOutputDir(CloudURLToString(srcBucket, ""), CloudURLToString(destBucket, ""), true, true, false, 1, dir) -@@ -1508,7 +1508,7 @@ func (s *OssutilCommandSuite) TestConfigOutputDir(c *C) { - // err copy -> outputdir - cfile := configFile - configFile = randStr(10) -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, bucketName, "abc") -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, bucketName, "abc") - s.createFile(configFile, data, c) - - showElapse, err := s.rawCPWithOutputDir(ufile, CloudURLToString(bucketName, object), true, true, false, 1, edir) -@@ -1525,7 +1525,7 @@ func (s *OssutilCommandSuite) TestConfigOutputDir(c *C) { - os.RemoveAll(DefaultOutputDir) - - // config outputdir -- data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\noutputDir=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", endpoint, accessKeyID, accessKeySecret, dir, bucketName, endpoint, bucketName, "abc") -+ data = fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\noutputDir=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", endpoint, accessKeyId, accessKeySecret, dir, bucketName, endpoint, bucketName, "abc") - s.createFile(configFile, data, c) - - showElapse, err = s.rawCPWithOutputDir(ufile, CloudURLToString(bucketName, object), true, true, false, 1, "") -@@ -1663,7 +1663,7 @@ func (s *OssutilCommandSuite) TestCPURLEncoding(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -3205,7 +3205,7 @@ func (s *OssutilCommandSuite) TestCPObjectLimitSpeed(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3267,7 +3267,7 @@ func (s *OssutilCommandSuite) TestCPDirLimitSpeed(c *C) { - recursive := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3355,7 +3355,7 @@ func (s *OssutilCommandSuite) TestCPPartionDownloadSuccess(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "checkpointDir": &cpDir, -@@ -3414,7 +3414,7 @@ func (s *OssutilCommandSuite) TestCPPartitionDownloadParameterError(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "checkpointDir": &cpDir, -@@ -3491,7 +3491,7 @@ func (s *OssutilCommandSuite) TestCPDownloadSnapshot(c *C) { - recursive := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3563,7 +3563,7 @@ func (s *OssutilCommandSuite) TestCPVersioingParameterError(c *C) { - versionId := "123" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3611,7 +3611,7 @@ func (s *OssutilCommandSuite) TestCPVersioingDownloadSuccess(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3663,7 +3663,7 @@ func (s *OssutilCommandSuite) TestCPVersioingCopySuccess(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3712,7 +3712,7 @@ func (s *OssutilCommandSuite) TestCPWithAuthProxy(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "checkpointDir": &cpDir, -@@ -3753,7 +3753,7 @@ func (s *OssutilCommandSuite) TestCPWithAuthProxyError(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "checkpointDir": &cpDir, -@@ -3803,7 +3803,7 @@ func (s *OssutilCommandSuite) TestCPSetLocalAddrSuccess(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3852,7 +3852,7 @@ func (s *OssutilCommandSuite) TestCPSetLocalAddrError(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3904,7 +3904,7 @@ func (s *OssutilCommandSuite) TestUploadSymlinkDir(c *C) { - recursive := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -3971,7 +3971,7 @@ func (s *OssutilCommandSuite) TestUploadSubSymlinkDir(c *C) { - enableSymlinkDir := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4043,7 +4043,7 @@ func (s *OssutilCommandSuite) TestUploadOnlyCurrentDir(c *C) { - onlyCurrentDir := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4110,7 +4110,7 @@ func (s *OssutilCommandSuite) TestDownloadOnlyCurrentDir(c *C) { - onlyCurrentDir := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4194,7 +4194,7 @@ func (s *OssutilCommandSuite) TestUploadDisableDirObject(c *C) { - disableDirObject := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4263,7 +4263,7 @@ func (s *OssutilCommandSuite) TestCPObjectProgressBarNetErrorRetry(c *C) { - strRetryTimes := "3" - options := OptionMapType{ - "endpoint": &mockHost, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4307,7 +4307,7 @@ func (s *OssutilCommandSuite) TestUploadWithDisableAllSymlinkDirFailure(c *C) { - - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4367,7 +4367,7 @@ func (s *OssutilCommandSuite) TestUploadWithDisableAllSymlinkDirSuccess(c *C) { - disableAllSymlink := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4439,7 +4439,7 @@ func (s *OssutilCommandSuite) TestUploadSymlinkFileProgressPrecise(c *C) { - disableAllSymlink := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4503,7 +4503,7 @@ func (s *OssutilCommandSuite) TestDownLoadWithoutDisableIgnoreError(c *C) { - recursive := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4582,7 +4582,7 @@ func (s *OssutilCommandSuite) TestDownLoadWithDisableIgnoreError(c *C) { - disableIgnoreError := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4637,7 +4637,7 @@ func (s *OssutilCommandSuite) TestCpWithTaggingError(c *C) { - tagging := "tagA=A&&tagb=B" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4688,7 +4688,7 @@ func (s *OssutilCommandSuite) TestUploadFileWithTagging(c *C) { - tagging := "tagA=A&tagb=B&tagc=C" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4726,7 +4726,7 @@ func (s *OssutilCommandSuite) TestCopyFileWithoutTagging(c *C) { - tagging := "tagA=A&tagb=B&tagc=C" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4779,7 +4779,7 @@ func (s *OssutilCommandSuite) TestCopyFileWithTagging(c *C) { - tagging := "tagA=A&tagb=B&tagc=C" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -@@ -4828,7 +4828,7 @@ func (s *OssutilCommandSuite) TestUploadMultiFileFileWithTagging(c *C) { - tagging := "tagA=A&tagb=B&tagc=C" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "checkpointDir": &cpDir, -diff --git a/oss/lib/create_symlink.go b/oss/lib/create_symlink.go -index b40371d2..4722cb52 100644 ---- a/oss/lib/create_symlink.go -+++ b/oss/lib/create_symlink.go -@@ -108,7 +108,7 @@ var createSymlinkCommand = CreateSymlinkCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/du.go b/oss/lib/du.go -index 6b230090..e8068467 100644 ---- a/oss/lib/du.go -+++ b/oss/lib/du.go -@@ -109,7 +109,7 @@ var duSizeCommand = DuCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/du_test.go b/oss/lib/du_test.go -index c6065fa8..f40592e3 100644 ---- a/oss/lib/du_test.go -+++ b/oss/lib/du_test.go -@@ -47,7 +47,7 @@ func (s *OssutilCommandSuite) TestDuObjectSize(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - } -@@ -104,7 +104,7 @@ func (s *OssutilCommandSuite) TestDuPartSize(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - } -@@ -150,7 +150,7 @@ func (s *OssutilCommandSuite) TestDuObjectAndPartSize(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - } -@@ -189,7 +189,7 @@ func (s *OssutilCommandSuite) TestDuPayerObject(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &ConfigFile, -@@ -216,7 +216,7 @@ func (s *OssutilCommandSuite) TestDuPayerErrorObject(c *C) { - requester := "requester_test" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &ConfigFile, -@@ -235,7 +235,7 @@ func (s *OssutilCommandSuite) TestDuPayerErrorObject(c *C) { - - func (s *OssutilCommandSuite) TestDuPayerPart(c *C) { - bucketName := payerBucket -- client, err := oss.New(payerBucketEndPoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(payerBucketEndPoint, accessKeyId, accessKeySecret) - bucket, err := client.Bucket(bucketName) - - content_len := 100 -@@ -256,7 +256,7 @@ func (s *OssutilCommandSuite) TestDuPayerPart(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &ConfigFile, -@@ -297,7 +297,7 @@ func (s *OssutilCommandSuite) TestDuVersionsObjectAndStorageClass(c *C) { - strMethod := "put" - versionsOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -339,7 +339,7 @@ func (s *OssutilCommandSuite) TestDuVersionsObjectAndStorageClass(c *C) { - command := "du" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &ConfigFile, - "allVersions": &allVersions, -diff --git a/oss/lib/ecs_role_test.go b/oss/lib/ecs_role_test.go -index 666ba1dd..1b5a6747 100644 ---- a/oss/lib/ecs_role_test.go -+++ b/oss/lib/ecs_role_test.go -@@ -20,15 +20,15 @@ const ( - func StsHttpHandlerOk(w http.ResponseWriter, r *http.Request) { - akJson := &STSAkJson{} - -- if accessKeyID == "" { -- accessKeyID = os.Getenv("OSS_TEST_ACCESS_KEY_ID") -+ if accessKeyId == "" { -+ accessKeyId = os.Getenv("OSS_TEST_ACCESS_KEY_ID") - } - - if accessKeySecret == "" { - accessKeySecret = os.Getenv("OSS_TEST_ACCESS_KEY_SECRET") - } - -- akJson.AccessKeyId = accessKeyID -+ akJson.AccessKeyId = accessKeyId - akJson.AccessKeySecret = accessKeySecret - akJson.SecurityToken = "" - nowLocalTime := time.Now() -@@ -78,7 +78,7 @@ func startHttpServer(handler func(http.ResponseWriter, *http.Request)) *http.Ser - } - - func (s *OssutilCommandSuite) TestEcsRoleSuccess(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -112,14 +112,14 @@ func (s *OssutilCommandSuite) TestEcsRoleAkTimeout(c *C) { - time.Sleep(time.Duration(1) * time.Second) - - ecsRole := EcsRoleAKBuild{url: "http://127.0.0.1:32915/latest/meta-data/Ram/security-credentials/EcsRamRo..."} -- strKeyId1 := ecsRole.GetCredentials().GetAccessKeyID() -+ strKeyId1 := ecsRole.GetCredentials().GetAccessKeyId() - c.Assert(strKeyId1 == "", Equals, false) - Expiration1 := ecsRole.Expiration - - // wait Ak timeout - time.Sleep(time.Duration(1+TestEcsTimeout) * time.Second) - -- strKeyId2 := ecsRole.GetCredentials().GetAccessKeyID() -+ strKeyId2 := ecsRole.GetCredentials().GetAccessKeyId() - c.Assert(strKeyId2 == "", Equals, false) - Expiration2 := ecsRole.Expiration - -@@ -131,7 +131,7 @@ func (s *OssutilCommandSuite) TestEcsRoleAkTimeout(c *C) { - } - - func (s *OssutilCommandSuite) TestEcsRoleNotHttpServerError(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -153,7 +153,7 @@ func (s *OssutilCommandSuite) TestEcsRoleNotHttpServerError(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -166,7 +166,7 @@ func (s *OssutilCommandSuite) TestEcsRoleNotHttpServerError(c *C) { - } - - func (s *OssutilCommandSuite) TestEcsRoleAkEmptyError(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -191,7 +191,7 @@ func (s *OssutilCommandSuite) TestEcsRoleAkEmptyError(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -205,7 +205,7 @@ func (s *OssutilCommandSuite) TestEcsRoleAkEmptyError(c *C) { - } - - func (s *OssutilCommandSuite) TestEcsRoleCodeError(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -230,7 +230,7 @@ func (s *OssutilCommandSuite) TestEcsRoleCodeError(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -244,7 +244,7 @@ func (s *OssutilCommandSuite) TestEcsRoleCodeError(c *C) { - } - - func (s *OssutilCommandSuite) TestEcsRoleJsonError(c *C) { -- accessKeyID = "" -+ accessKeyId = "" - accessKeySecret = "" - stsToken = "" - -@@ -269,7 +269,7 @@ func (s *OssutilCommandSuite) TestEcsRoleJsonError(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/listpart.go b/oss/lib/listpart.go -index b435f207..4c3f30d6 100644 ---- a/oss/lib/listpart.go -+++ b/oss/lib/listpart.go -@@ -86,7 +86,7 @@ var listPartCommand = ListPartCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/listpart_test.go b/oss/lib/listpart_test.go -index 2434bc29..63b7c53e 100644 ---- a/oss/lib/listpart_test.go -+++ b/oss/lib/listpart_test.go -@@ -32,7 +32,7 @@ func (s *OssutilCommandSuite) TestListPartSuccess(c *C) { - defer fd.Close() - - // begin upload part -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucket, err := client.Bucket(bucketName) -@@ -55,7 +55,7 @@ func (s *OssutilCommandSuite) TestListPartSuccess(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -106,7 +106,7 @@ func (s *OssutilCommandSuite) TestListPartError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -148,7 +148,7 @@ func (s *OssutilCommandSuite) TestListPartClientError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -159,7 +159,7 @@ func (s *OssutilCommandSuite) TestListPartClientError(c *C) { - c.Assert(err, IsNil) - - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/ls.go b/oss/lib/ls.go -index ca115af1..2b651708 100644 ---- a/oss/lib/ls.go -+++ b/oss/lib/ls.go -@@ -379,7 +379,7 @@ var listCommand = ListCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/ls_test.go b/oss/lib/ls_test.go -index fac6c8bf..b4199ae4 100644 ---- a/oss/lib/ls_test.go -+++ b/oss/lib/ls_test.go -@@ -21,7 +21,7 @@ func (s *OssutilCommandSuite) TestListLoadConfig(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -34,7 +34,7 @@ func (s *OssutilCommandSuite) TestListLoadConfig(c *C) { - args = []string{"oss://"} - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -53,7 +53,7 @@ func (s *OssutilCommandSuite) TestListNotExistConfigFile(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -74,7 +74,7 @@ func (s *OssutilCommandSuite) TestListErrConfigFile(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -89,7 +89,7 @@ func (s *OssutilCommandSuite) TestListErrConfigFile(c *C) { - - func (s *OssutilCommandSuite) TestListConfigFile(c *C) { - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\nretryTimes=%s", endpoint, accessKeyID, accessKeySecret, "errretry") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\nretryTimes=%s", endpoint, accessKeyId, accessKeySecret, "errretry") - s.createFile(cfile, data, c) - - command := "ls" -@@ -98,7 +98,7 @@ func (s *OssutilCommandSuite) TestListConfigFile(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -115,7 +115,7 @@ func (s *OssutilCommandSuite) TestListWithBucketEndpoint(c *C) { - bucketName := bucketNameExist - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", "abc", accessKeyID, accessKeySecret, bucketName, endpoint) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", "abc", accessKeyId, accessKeySecret, bucketName, endpoint) - s.createFile(cfile, data, c) - - command := "ls" -@@ -124,7 +124,7 @@ func (s *OssutilCommandSuite) TestListWithBucketEndpoint(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -142,7 +142,7 @@ func (s *OssutilCommandSuite) TestListWithBucketCname(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s\n[Bucket-Cname]\n%s=%s", "abc", accessKeyID, accessKeySecret, bucketName, "abc", bucketName, bucketName+"."+endpoint) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s\n[Bucket-Cname]\n%s=%s", "abc", accessKeyId, accessKeySecret, bucketName, "abc", bucketName, bucketName+"."+endpoint) - s.createFile(cfile, data, c) - - command := "ls" -@@ -151,7 +151,7 @@ func (s *OssutilCommandSuite) TestListWithBucketCname(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -174,7 +174,7 @@ func (s *OssutilCommandSuite) TestListObjectsBucketNotExist(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -298,7 +298,7 @@ func (s *OssutilCommandSuite) TestListIDKey(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "ls" -@@ -307,7 +307,7 @@ func (s *OssutilCommandSuite) TestListIDKey(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -318,7 +318,7 @@ func (s *OssutilCommandSuite) TestListIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -337,7 +337,7 @@ func (s *OssutilCommandSuite) TestListBucketIDKey(c *C) { - bucketName := bucketNameExist - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "ls" -@@ -346,7 +346,7 @@ func (s *OssutilCommandSuite) TestListBucketIDKey(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -357,7 +357,7 @@ func (s *OssutilCommandSuite) TestListBucketIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -373,7 +373,7 @@ func (s *OssutilCommandSuite) TestListBucketIDKey(c *C) { - // list without config file - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -396,7 +396,7 @@ func (s *OssutilCommandSuite) TestListMultipartUploads(c *C) { - limitedNum := strconv.FormatInt(-1, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -466,7 +466,7 @@ func (s *OssutilCommandSuite) TestListMultipartUploadsError(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s", endpoint, "abc", accessKeySecret) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s", endpoint, "abc", accessKeySecret) - s.createFile(cfile, data, c) - - command := "ls" -@@ -476,7 +476,7 @@ func (s *OssutilCommandSuite) TestListMultipartUploadsError(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -735,7 +735,7 @@ func (s *OssutilCommandSuite) TestListObjectfilterInclude(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -801,7 +801,7 @@ func (s *OssutilCommandSuite) TestListObjectfilterExclude(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -886,7 +886,7 @@ func (s *OssutilCommandSuite) TestListDirectoryfilterInclude(c *C) { - bDirectory := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -968,7 +968,7 @@ func (s *OssutilCommandSuite) TestListDirectoryfilterExclude(c *C) { - bDirectory := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1033,7 +1033,7 @@ func (s *OssutilCommandSuite) TestListPartfilterInclude(c *C) { - bPart := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1089,7 +1089,7 @@ func (s *OssutilCommandSuite) TestListPartfilterExclude(c *C) { - bPart := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1154,7 +1154,7 @@ func (s *OssutilCommandSuite) TestListObjectVersionsNormal(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "allVersions": &allVersions, -@@ -1196,7 +1196,7 @@ func (s *OssutilCommandSuite) TestListObjectVersionsNormal(c *C) { - force := true - deleteOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1251,7 +1251,7 @@ func (s *OssutilCommandSuite) TestListObjectVersionsMarker(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "allVersions": &allVersions, -@@ -1352,7 +1352,7 @@ func (s *OssutilCommandSuite) TestListObjectfilterIncludeVersions(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1445,7 +1445,7 @@ func (s *OssutilCommandSuite) TestListDirectoryfilterIncludeVersions(c *C) { - allVersions := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -diff --git a/oss/lib/mb.go b/oss/lib/mb.go -index 111254c8..161fcf62 100644 ---- a/oss/lib/mb.go -+++ b/oss/lib/mb.go -@@ -153,7 +153,7 @@ var makeBucketCommand = MakeBucketCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/mb_test.go b/oss/lib/mb_test.go -index f8fc7afa..0d82127e 100644 ---- a/oss/lib/mb_test.go -+++ b/oss/lib/mb_test.go -@@ -41,7 +41,7 @@ func (s *OssutilCommandSuite) TestMakeBucketErrorName(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -80,7 +80,7 @@ func (s *OssutilCommandSuite) TestMakeBucketErrorOption(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -106,7 +106,7 @@ func (s *OssutilCommandSuite) TestMakeBucketIDKey(c *C) { - bucketName := bucketNamePrefix + randLowStr(10) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", "abc", "def", "ghi", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s", "abc", "def", "ghi", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "mb" -@@ -114,7 +114,7 @@ func (s *OssutilCommandSuite) TestMakeBucketIDKey(c *C) { - args := []string{CloudURLToString(bucketName, "")} - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -124,7 +124,7 @@ func (s *OssutilCommandSuite) TestMakeBucketIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -186,7 +186,7 @@ func (s *OssutilCommandSuite) TestMbCreateBucketWithRedundancy(c *C) { - strRedundancy := "ZRS" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/mkdir.go b/oss/lib/mkdir.go -index 100bdd47..4da059d3 100644 ---- a/oss/lib/mkdir.go -+++ b/oss/lib/mkdir.go -@@ -72,7 +72,7 @@ var mkdirCommand = MkdirCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/mkdir_test.go b/oss/lib/mkdir_test.go -index d0d0ca1d..775ae5d1 100644 ---- a/oss/lib/mkdir_test.go -+++ b/oss/lib/mkdir_test.go -@@ -10,7 +10,7 @@ import ( - - func (s *OssutilCommandSuite) TestMkdirAll(c *C) { - // create bucket -- client, err := oss.New(endpoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(endpoint, accessKeyId, accessKeySecret) - c.Assert(err, IsNil) - - bucketName := bucketNamePrefix + randLowStr(12) -@@ -24,7 +24,7 @@ func (s *OssutilCommandSuite) TestMkdirAll(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -91,7 +91,7 @@ func (s *OssutilCommandSuite) TestMkdirAllEncodingError(c *C) { - strEncode := "url" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/monitor_test.go b/oss/lib/monitor_test.go -index 5d671110..3456d1c3 100644 ---- a/oss/lib/monitor_test.go -+++ b/oss/lib/monitor_test.go -@@ -301,7 +301,7 @@ func (s *OssutilCommandSuite) TestProgressBarStatisticErr(c *C) { - - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(configFile, data, c) - - err := s.initCopyCommand(CloudURLToString(bucketName, ""), downloadDir, true, true, false, DefaultBigFileThreshold, CheckpointDir, DefaultOutputDir) -@@ -372,7 +372,7 @@ func (s *OssutilCommandSuite) TestProgressBarContinueErr(c *C) { - - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n", "abc", accessKeyID, accessKeySecret) -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n", "abc", accessKeyId, accessKeySecret) - s.createFile(configFile, data, c) - - err = s.initCopyCommand(udir, CloudURLToString(bucketName, ""), true, true, false, DefaultBigFileThreshold, CheckpointDir, DefaultOutputDir) -@@ -670,7 +670,7 @@ func (s *OssutilCommandSuite) TestSetACLProgress(c *C) { - // batch set acl list error - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n", endpoint, accessKeyID, "") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n", endpoint, accessKeyId, "") - s.createFile(configFile, data, c) - - err = s.initSetACL(bucketName, "TestSetACLProgress", "private", true, false, true) -@@ -787,7 +787,7 @@ func (s *OssutilCommandSuite) TestSetMetaProgress(c *C) { - // batch set acl list error - cfile := configFile - configFile = randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n", endpoint, accessKeyID, "") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n", endpoint, accessKeyId, "") - s.createFile(configFile, data, c) - - err = s.initSetMeta(bucketName, prefix, "x-oss-object-acl:default#X-Oss-Meta-A:A", true, false, true, true, DefaultLanguage) -diff --git a/oss/lib/object_tagging.go b/oss/lib/object_tagging.go -index 8c5eb270..826bee6d 100644 ---- a/oss/lib/object_tagging.go -+++ b/oss/lib/object_tagging.go -@@ -131,7 +131,7 @@ var objectTagCommand = ObjectTagCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/object_tagging_test.go b/oss/lib/object_tagging_test.go -index ad720a06..cbb1e2c6 100644 ---- a/oss/lib/object_tagging_test.go -+++ b/oss/lib/object_tagging_test.go -@@ -23,7 +23,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingSingleOperation(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -106,7 +106,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingBatchOperation(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -198,7 +198,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingVersionId(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -278,7 +278,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingError(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -352,7 +352,7 @@ func (s *OssutilCommandSuite) TestObjectTaggingPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/option.go b/oss/lib/option.go -index 7e801ffc..b1caa260 100644 ---- a/oss/lib/option.go -+++ b/oss/lib/option.go -@@ -42,7 +42,7 @@ var OptionMap = map[string]Option{ - OptionEndpoint: Option{"-e", "--endpoint", "", OptionTypeString, "", "", - fmt.Sprintf("ossutil工具的基本endpoint配置（该选项值会覆盖配置文件中的相应设置），注意其必须为一个二级域名。"), - fmt.Sprintf("Base endpoint for oss endpoint(Notice that the value of the option will cover the value in config file). Take notice that it should be second-level domain(SLD).")}, -- OptionAccessKeyID: Option{"-i", "--access-key-id", "", OptionTypeString, "", "", "访问oss使用的AccessKeyID（该选项值会覆盖配置文件中的相应设置）。", "AccessKeyID while access oss(Notice that the value of the option will cover the value in config file)."}, -+ OptionAccessKeyId: Option{"-i", "--access-key-id", "", OptionTypeString, "", "", "访问oss使用的AccessKeyId（该选项值会覆盖配置文件中的相应设置）。", "AccessKeyId while access oss(Notice that the value of the option will cover the value in config file)."}, - OptionAccessKeySecret: Option{"-k", "--access-key-secret", "", OptionTypeString, "", "", "访问oss使用的AccessKeySecret（该选项值会覆盖配置文件中的相应设置）。", "AccessKeySecret while access oss(Notice that the value of the option will cover the value in config file)."}, - OptionSTSToken: Option{"-t", "--sts-token", "", OptionTypeString, "", "", "访问oss使用的STSToken（该选项值会覆盖配置文件中的相应设置），非必须设置项。", "STSToken while access oss(Notice that the value of the option will cover the value in config file), not necessary."}, - OptionLimitedNum: Option{"", "--limited-num", strconv.Itoa(DefaultLimitedNum), OptionTypeInt64, strconv.FormatInt(MinLimitedNum, 10), "", "返回结果的最大个数。", "the limited number of return results."}, -diff --git a/oss/lib/probe.go b/oss/lib/probe.go -index f00bc1c3..791760be 100644 ---- a/oss/lib/probe.go -+++ b/oss/lib/probe.go -@@ -336,7 +336,7 @@ var probeCommand = ProbeCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/probe_test.go b/oss/lib/probe_test.go -index 7e2b5120..ec3cc0b1 100644 ---- a/oss/lib/probe_test.go -+++ b/oss/lib/probe_test.go -@@ -138,7 +138,7 @@ func (s *OssutilCommandSuite) probeDownloadWithParameter(c *C, object string, do - } - - tempStr := "" -- options[OptionAccessKeyID] = &tempStr -+ options[OptionAccessKeyId] = &tempStr - options[OptionAccessKeySecret] = &tempStr - options[OptionEndpoint] = &tempStr - -@@ -209,7 +209,7 @@ func (s *OssutilCommandSuite) probeUploadObject(c *C, object string, uploadFileN - } - - tempStr := "" -- options[OptionAccessKeyID] = &tempStr -+ options[OptionAccessKeyId] = &tempStr - options[OptionAccessKeySecret] = &tempStr - options[OptionEndpoint] = &tempStr - -@@ -369,7 +369,7 @@ func (s *OssutilCommandSuite) TestProbeUploadObjectBucketInvalid(c *C) { - } - - tempStr := "" -- options[OptionAccessKeyID] = &tempStr -+ options[OptionAccessKeyId] = &tempStr - options[OptionAccessKeySecret] = &tempStr - options[OptionEndpoint] = &tempStr - -@@ -566,7 +566,7 @@ func (s *OssutilCommandSuite) TestProbeUploadObjectRepeat(c *C) { - } - - tempStr := "" -- options[OptionAccessKeyID] = &tempStr -+ options[OptionAccessKeyId] = &tempStr - options[OptionAccessKeySecret] = &tempStr - options[OptionEndpoint] = &tempStr - -@@ -740,7 +740,7 @@ func (s *OssutilCommandSuite) TestProbeUploadBandWidth(c *C) { - str := "" - options := OptionMapType{ - OptionEndpoint: &str, -- OptionAccessKeyID: &str, -+ OptionAccessKeyId: &str, - OptionAccessKeySecret: &str, - OptionConfigFile: &configFile, - OptionBucketName: &bucketName, -@@ -767,7 +767,7 @@ func (s *OssutilCommandSuite) TestProbeDownloadBandWidthSuccess(c *C) { - str := "" - options := OptionMapType{ - OptionEndpoint: &str, -- OptionAccessKeyID: &str, -+ OptionAccessKeyId: &str, - OptionAccessKeySecret: &str, - OptionConfigFile: &configFile, - OptionObject: &objectName, -@@ -793,7 +793,7 @@ func (s *OssutilCommandSuite) TestProbeDownloadBandWidthError(c *C) { - str := "" - options := OptionMapType{ - OptionEndpoint: &str, -- OptionAccessKeyID: &str, -+ OptionAccessKeyId: &str, - OptionAccessKeySecret: &str, - OptionConfigFile: &configFile, - OptionObject: &objectName, -@@ -831,7 +831,7 @@ func (s *OssutilCommandSuite) TestProbeItemNotSupported(c *C) { - str := "" - options := OptionMapType{ - OptionEndpoint: &str, -- OptionAccessKeyID: &str, -+ OptionAccessKeyId: &str, - OptionAccessKeySecret: &str, - OptionConfigFile: &configFile, - OptionObject: &objectName, -diff --git a/oss/lib/read_symlink.go b/oss/lib/read_symlink.go -index 49d0a886..a5810b2c 100644 ---- a/oss/lib/read_symlink.go -+++ b/oss/lib/read_symlink.go -@@ -105,7 +105,7 @@ var readSymlinkCommand = ReadSymlinkCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/request_payment.go b/oss/lib/request_payment.go -index a764ebba..8da1b7d8 100644 ---- a/oss/lib/request_payment.go -+++ b/oss/lib/request_payment.go -@@ -98,7 +98,7 @@ var requestPaymentCommand = RequestPaymentCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/request_payment_test.go b/oss/lib/request_payment_test.go -index 608044b2..2f547cc9 100644 ---- a/oss/lib/request_payment_test.go -+++ b/oss/lib/request_payment_test.go -@@ -16,7 +16,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentPutSuccess(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -65,7 +65,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentError(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -105,7 +105,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentPutEmptyEndpoint(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -117,7 +117,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentPutEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -139,7 +139,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentGetEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -151,7 +151,7 @@ func (s *OssutilCommandSuite) TestRequestPaymentGetEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -diff --git a/oss/lib/restore.go b/oss/lib/restore.go -index 9bb99eaa..655a312e 100644 ---- a/oss/lib/restore.go -+++ b/oss/lib/restore.go -@@ -146,7 +146,7 @@ var restoreCommand = RestoreCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/restore_test.go b/oss/lib/restore_test.go -index 335803fd..58cd430d 100644 ---- a/oss/lib/restore_test.go -+++ b/oss/lib/restore_test.go -@@ -405,7 +405,7 @@ func (s *OssutilCommandSuite) TestRestoreObjectWithPayerError400(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/rm.go b/oss/lib/rm.go -index 4d4db948..ea0b37b2 100644 ---- a/oss/lib/rm.go -+++ b/oss/lib/rm.go -@@ -309,7 +309,7 @@ var removeCommand = RemoveCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/rm_test.go b/oss/lib/rm_test.go -index 8b25317e..01b0c82f 100644 ---- a/oss/lib/rm_test.go -+++ b/oss/lib/rm_test.go -@@ -54,7 +54,7 @@ func (s *OssutilCommandSuite) TestRemoveObjects(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -95,12 +95,12 @@ func (s *OssutilCommandSuite) TestRemoveObjects(c *C) { - - // error remove bucket with config - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -114,7 +114,7 @@ func (s *OssutilCommandSuite) TestRemoveObjects(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -147,7 +147,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectBucketOption(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -432,7 +432,7 @@ func (s *OssutilCommandSuite) TestRmObjectfilter(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -462,7 +462,7 @@ func (s *OssutilCommandSuite) TestRmObjectfilter(c *C) { - bForce := true - rmOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "recursive": &bRecusive, -@@ -528,7 +528,7 @@ func (s *OssutilCommandSuite) TestRmPartfilter(c *C) { - bPart := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -582,7 +582,7 @@ func (s *OssutilCommandSuite) TestRmPartfilterExclude(c *C) { - bPart := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -614,7 +614,7 @@ func (s *OssutilCommandSuite) TestRmPartfilterExclude(c *C) { - bMultiPart := true - rmOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "recursive": &bRecusive, -@@ -669,7 +669,7 @@ func (s *OssutilCommandSuite) TestRmSpecialCharacterKey(c *C) { - encodingType := "url" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -740,7 +740,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectsInVersioningBucket(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -781,12 +781,12 @@ func (s *OssutilCommandSuite) TestRemoveObjectsInVersioningBucket(c *C) { - - // error remove bucket with config - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -800,7 +800,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectsInVersioningBucket(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -842,7 +842,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithVersionId(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -859,7 +859,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithVersionId(c *C) { - args = []string{CloudURLToString(bucketName, "")} - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &str, -@@ -900,7 +900,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithAllVersion(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -918,7 +918,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithAllVersion(c *C) { - args = []string{CloudURLToString(bucketName, objectName)} - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -934,7 +934,7 @@ func (s *OssutilCommandSuite) TestRemoveObjectWithAllVersion(c *C) { - args = []string{CloudURLToString(bucketName, "")} - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &str, -@@ -974,7 +974,7 @@ func (s *OssutilCommandSuite) TestRmObjectfilterVersioning(c *C) { - allVersions := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "limitedNum": &limitedNum, -@@ -1005,7 +1005,7 @@ func (s *OssutilCommandSuite) TestRmObjectfilterVersioning(c *C) { - bForce := true - rmOptions := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "recursive": &bRecusive, -@@ -1064,7 +1064,7 @@ func (s *OssutilCommandSuite) TestRmObjectWithPayer(c *C) { - requester := "requester" - rmOptions := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "force": &bForce, -@@ -1097,7 +1097,7 @@ func (s *OssutilCommandSuite) TestRmBatchObjectWithPayer(c *C) { - requester := "requester" - rmOptions := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "force": &bForce, -@@ -1113,7 +1113,7 @@ func (s *OssutilCommandSuite) TestRmBatchObjectWithPayer(c *C) { - - func (s *OssutilCommandSuite) TestRmBatchPartsWithPayer(c *C) { - bucketName := payerBucket -- client, err := oss.New(payerBucketEndPoint, accessKeyID, accessKeySecret) -+ client, err := oss.New(payerBucketEndPoint, accessKeyId, accessKeySecret) - bucket, err := client.Bucket(bucketName) - - content_len := 100 -@@ -1137,7 +1137,7 @@ func (s *OssutilCommandSuite) TestRmBatchPartsWithPayer(c *C) { - requester := "requester" - rmOptions := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "configFile": &configFile, - "force": &bForce, -diff --git a/oss/lib/set_acl.go b/oss/lib/set_acl.go -index f0558899..51e82339 100644 ---- a/oss/lib/set_acl.go -+++ b/oss/lib/set_acl.go -@@ -237,7 +237,7 @@ var setACLCommand = SetACLCommand{ - OptionInclude, - OptionExclude, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/set_acl_test.go b/oss/lib/set_acl_test.go -index 5b00b735..f72bb429 100644 ---- a/oss/lib/set_acl_test.go -+++ b/oss/lib/set_acl_test.go -@@ -205,7 +205,7 @@ func (s *OssutilCommandSuite) TestErrBatchSetACL(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str1, -- "accessKeyID": &str1, -+ "accessKeyId": &str1, - "accessKeySecret": &str1, - "stsToken": &str, - "routines": &routines, -@@ -229,7 +229,7 @@ func (s *OssutilCommandSuite) TestSetACLIDKey(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "set-acl" -@@ -239,7 +239,7 @@ func (s *OssutilCommandSuite) TestSetACLIDKey(c *C) { - ok := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -252,7 +252,7 @@ func (s *OssutilCommandSuite) TestSetACLIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -290,7 +290,7 @@ func (s *OssutilCommandSuite) TestSetACLURLEncoding(c *C) { - encodingType := URLEncodingType - options := OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &configFile, -@@ -1233,7 +1233,7 @@ func (s *OssutilCommandSuite) TestSetObjectAclWithVersion(c *C) { - var str string - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1274,7 +1274,7 @@ func (s *OssutilCommandSuite) TestSetObjectAclWithInvalidVersionArgs(c *C) { - flag := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1287,7 +1287,7 @@ func (s *OssutilCommandSuite) TestSetObjectAclWithInvalidVersionArgs(c *C) { - - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/set_meta.go b/oss/lib/set_meta.go -index f24d9792..1a36de1b 100644 ---- a/oss/lib/set_meta.go -+++ b/oss/lib/set_meta.go -@@ -283,7 +283,7 @@ var setMetaCommand = SetMetaCommand{ - OptionExclude, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/set_meta_test.go b/oss/lib/set_meta_test.go -index b9980018..cc5fdcf0 100644 ---- a/oss/lib/set_meta_test.go -+++ b/oss/lib/set_meta_test.go -@@ -187,7 +187,7 @@ func (s *OssutilCommandSuite) TestErrBatchSetMeta(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str1, -- "accessKeyID": &str1, -+ "accessKeyId": &str1, - "accessKeySecret": &str1, - "stsToken": &str, - "update": &ok, -@@ -280,7 +280,7 @@ func (s *OssutilCommandSuite) TestSetMetaIDKey(c *C) { - s.putObject(bucketName, object, uploadFileName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "set-meta" -@@ -290,7 +290,7 @@ func (s *OssutilCommandSuite) TestSetMetaIDKey(c *C) { - routines := strconv.Itoa(Routines) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -303,7 +303,7 @@ func (s *OssutilCommandSuite) TestSetMetaIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -341,7 +341,7 @@ func (s *OssutilCommandSuite) TestSetMetaURLEncoding(c *C) { - encodingType := URLEncodingType - options := OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &configFile, -@@ -1495,7 +1495,7 @@ func (s *OssutilCommandSuite) TestSetObjectMetaWithVersion(c *C) { - update := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1526,7 +1526,7 @@ func (s *OssutilCommandSuite) TestSetObjectMetaWithInvalidVersionArgs(c *C) { - flag := true - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -1539,7 +1539,7 @@ func (s *OssutilCommandSuite) TestSetObjectMetaWithInvalidVersionArgs(c *C) { - - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/signurl.go b/oss/lib/signurl.go -index 3fcaacf9..acdd3e6d 100644 ---- a/oss/lib/signurl.go -+++ b/oss/lib/signurl.go -@@ -120,7 +120,7 @@ var signURLCommand = SignurlCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionLogLevel, -diff --git a/oss/lib/signurl_test.go b/oss/lib/signurl_test.go -index 64bd0c71..ecefd872 100644 ---- a/oss/lib/signurl_test.go -+++ b/oss/lib/signurl_test.go -@@ -282,7 +282,7 @@ func (s *OssutilCommandSuite) TestSignurlWithVersion(c *C) { - args := []string{CloudURLToString(bucketName, objectName)} - options := OptionMapType{ - "endpoint": &str1, -- "accessKeyID": &str1, -+ "accessKeyId": &str1, - "accessKeySecret": &str1, - "stsToken": &str1, - "configFile": &configFile, -@@ -331,7 +331,7 @@ func (s *OssutilCommandSuite) TestSignUrlTraficLimit(c *C) { - timeOut := strconv.FormatInt(60, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -383,7 +383,7 @@ func (s *OssutilCommandSuite) TestSignUrlWithDisableEncodePathUrl(c *C) { - timeOut := strconv.FormatInt(60, 10) - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -438,7 +438,7 @@ func (s *OssutilCommandSuite) TestSignUrlWithRequestPayer(c *C) { - timeOut := strconv.FormatInt(60, 10) - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/stat.go b/oss/lib/stat.go -index ff04d895..b36c8477 100644 ---- a/oss/lib/stat.go -+++ b/oss/lib/stat.go -@@ -102,7 +102,7 @@ var statCommand = StatCommand{ - OptionEncodingType, - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/stat_test.go b/oss/lib/stat_test.go -index 463f384a..4bfd340a 100644 ---- a/oss/lib/stat_test.go -+++ b/oss/lib/stat_test.go -@@ -20,7 +20,7 @@ func (s *OssutilCommandSuite) TestStatErrArgc(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -85,7 +85,7 @@ func (s *OssutilCommandSuite) TestGetStatRetryTimes(c *C) { - retryTimes := "1" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -113,7 +113,7 @@ func (s *OssutilCommandSuite) TestStatIDKey(c *C) { - s.putBucket(bucketName, c) - - cfile := randStr(10) -- data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyID=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") -+ data := fmt.Sprintf("[Credentials]\nendpoint=%s\naccessKeyId=%s\naccessKeySecret=%s\n[Bucket-Endpoint]\n%s=%s[Bucket-Cname]\n%s=%s", "abc", "def", "ghi", bucketName, "abc", bucketName, "abc") - s.createFile(cfile, data, c) - - command := "stat" -@@ -122,7 +122,7 @@ func (s *OssutilCommandSuite) TestStatIDKey(c *C) { - retryTimes := "1" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &cfile, -@@ -133,7 +133,7 @@ func (s *OssutilCommandSuite) TestStatIDKey(c *C) { - - options = OptionMapType{ - "endpoint": &endpoint, -- "accessKeyID": &accessKeyID, -+ "accessKeyId": &accessKeyId, - "accessKeySecret": &accessKeySecret, - "stsToken": &str, - "configFile": &cfile, -@@ -167,7 +167,7 @@ func (s *OssutilCommandSuite) TestStatURLEncoding(c *C) { - encodingType := URLEncodingType - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -228,7 +228,7 @@ func (s *OssutilCommandSuite) TestStatVersioning(c *C) { - encodingType := URLEncodingType - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -271,7 +271,7 @@ func (s *OssutilCommandSuite) TestStatObjectWithPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/symlink_test.go b/oss/lib/symlink_test.go -index 2b33d6a2..3a58e331 100644 ---- a/oss/lib/symlink_test.go -+++ b/oss/lib/symlink_test.go -@@ -252,7 +252,7 @@ func (s *OssutilCommandSuite) TestSymlinkVersioning(c *C) { - str := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &ConfigFile, -@@ -301,7 +301,7 @@ func (s *OssutilCommandSuite) TestSymlinkWithPayer(c *C) { - requester := "requester" - options := OptionMapType{ - "endpoint": &payerBucketEndPoint, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -diff --git a/oss/lib/user_qos.go b/oss/lib/user_qos.go -index 0c43ad6f..b90a0aac 100644 ---- a/oss/lib/user_qos.go -+++ b/oss/lib/user_qos.go -@@ -76,7 +76,7 @@ var userQosCommand = UserQosCommand{ - validOptionNames: []string{ - OptionConfigFile, - OptionEndpoint, -- OptionAccessKeyID, -+ OptionAccessKeyId, - OptionAccessKeySecret, - OptionSTSToken, - OptionProxyHost, -diff --git a/oss/lib/user_qos_test.go b/oss/lib/user_qos_test.go -index 99746b7e..c8a7e562 100644 ---- a/oss/lib/user_qos_test.go -+++ b/oss/lib/user_qos_test.go -@@ -16,7 +16,7 @@ func (s *OssutilCommandSuite) TestUserQosGetError(c *C) { - strMethod := "" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -44,7 +44,7 @@ func (s *OssutilCommandSuite) TestUserQosOptionsEmptyEndpoint(c *C) { - strMethod := "get" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -56,7 +56,7 @@ func (s *OssutilCommandSuite) TestUserQosOptionsEmptyEndpoint(c *C) { - oldConfigStr, err := ioutil.ReadFile(configFile) - c.Assert(err, IsNil) - fd, _ := os.OpenFile(configFile, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0664) -- configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyID=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" -+ configStr := "[Credentials]" + "\n" + "language=CH" + "\n" + "accessKeyId=123" + "\n" + "accessKeySecret=456" + "\n" + "endpoint=" - fd.WriteString(configStr) - fd.Close() - -@@ -79,7 +79,7 @@ func (s *OssutilCommandSuite) TestUserQosGetConfirm(c *C) { - strMethod := "put" - options := OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, -@@ -95,7 +95,7 @@ func (s *OssutilCommandSuite) TestUserQosGetConfirm(c *C) { - strMethod = "get" - options = OptionMapType{ - "endpoint": &str, -- "accessKeyID": &str, -+ "accessKeyId": &str, - "accessKeySecret": &str, - "stsToken": &str, - "configFile": &configFile, diff --git a/golang-github-aliyun-cli.spec b/golang-github-aliyun-cli.spec index f6bd9e7..205216d 100644 --- a/golang-github-aliyun-cli.spec +++ b/golang-github-aliyun-cli.spec @@ -6,12 +6,12 @@ # https://github.com/aliyun/aliyun-cli %global goipath0 github.com/aliyun/aliyun-cli -Version: 3.0.73 +Version: 3.0.74 # https://github.com/aliyun/aliyun-openapi-meta %global goipath1 github.com/aliyun/aliyun-openapi-meta %global version1 0 -%global commit1 1e468f0cf8af08594022c94d3d6ff2ba40c574dd +%global commit1 95a090031d4d5b4dd8d2d29104f33769b3ea66b4 %gometa -a @@ -23,9 +23,10 @@ Version: 3.0.73 %global common_description %{expand: Alibaba Cloud (Aliyun) CLI.} -%global golicenses0 LICENSE +%global golicenses0 LICENSE LICENSE-oss %global godocs0 CHANGELOG.md README-CN.md README.md README-bin.md\\\ - README-cli.md README-CN-oss.md README-oss.md + README-cli.md README-CN-oss.md README-oss.md\\\ + CHANGELOG-oss.md %global golicenses1 LICENSE %global godocs1 README-openapi-meta.md @@ -34,20 +35,18 @@ Name: %{goname} Release: 1%{?dist} Summary: %{godevelsummary0} -# Upstream license specification: Apache-2.0 -License: ASL 2.0 +# Upstream license specification: Apache-2.0 and MIT +License: ASL 2.0 and MIT URL: %{gourl} Source0: %{gosource0} Source1: %{gosource1} -# https://github.com/aliyun/aliyun-cli/pull/300 -Patch0: aliyun-cli-credentials-config.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=1866529 # https://github.com/aliyun/aliyun-cli/issues/303 ExcludeArch: armv7hl # (Bug rhbz#1866529) BuildRequires: golang-github-shulhan-bindata +BuildRequires: golang(github.com/alibabacloud-go/tea/tea) BuildRequires: golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk) BuildRequires: golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials) BuildRequires: golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints) @@ -61,6 +60,7 @@ BuildRequires: golang(github.com/droundy/goopt) BuildRequires: golang(github.com/jmespath/go-jmespath) BuildRequires: golang(github.com/posener/complete) BuildRequires: golang(github.com/syndtr/goleveldb/leveldb) +BuildRequires: golang(golang.org/x/crypto/ssh/terminal) BuildRequires: golang(gopkg.in/ini.v1) BuildRequires: golang(gopkg.in/yaml.v2) BuildRequires: help2man @@ -82,11 +82,12 @@ BuildRequires: zsh %prep %goprep -a cd %{gosourcedir} -%patch0 -p1 mv bin/README.md README-bin.md mv cli/README.md README-cli.md mv oss/README.md README-oss.md mv oss/README-CN.md README-CN-oss.md +mv oss/LICENSE LICENSE-oss +mv oss/CHANGELOG.md CHANGELOG-oss.md mv %{_builddir}/%{extractdir1}/README.md %{_builddir}/%{extractdir1}/README-openapi-meta.md rm %{gobuilddir}/src/%{goipath0} %{gobuilddir}/src/%{goipath1} ln -fs %{_builddir}/%{extractdir1} %{_builddir}/aliyun-openapi-meta @@ -116,8 +117,8 @@ cp -Trv /etc/skel %{getenv:HOME} %endif %files -%license ../%{extractdir0}/LICENSE -%doc ../%{extractdir0}/CHANGELOG.md +%license ../%{extractdir0}/LICENSE ../%{extractdir0}/LICENSE-oss +%doc ../%{extractdir0}/CHANGELOG.md ../%{extractdir0}/CHANGELOG-oss.md %doc ../%{extractdir0}/README-CN.md ../%{extractdir0}/README.md %doc ../%{extractdir0}/README-bin.md ../%{extractdir0}/README-cli.md %doc ../%{extractdir0}/README-CN-oss.md ../%{extractdir0}/README-oss.md @@ -128,6 +129,17 @@ cp -Trv /etc/skel %{getenv:HOME} %gopkgfiles %changelog +* Mon May 03 2021 Brandon Perkins <bperkins(a)redhat.com> - 3.0.74-1 +- Update to version 3.0.74 (Fixes rhbz#1955892) +- Update to aliyun-openapi-meta to commit + 95a090031d4d5b4dd8d2d29104f33769b3ea66b4 +- Addition of oss LICENSE and CHANGELOG +- Addition of MIT upstream license +- Removal of patch for building against credentials-go-1.1.0 + https://github.com/aliyun/aliyun-cli/pull/300 +- Addition of alibabacloud-go/tea/tea and + golang.org/x/crypto/ssh/terminal BuildRequires + * Mon Feb 22 2021 Brandon Perkins <bperkins(a)redhat.com> - 3.0.73-1 - Update to version 3.0.73 (Fixes rhbz#1930798) - Update to aliyun-openapi-meta to commit diff --git a/sources b/sources index b8f7312..647b174 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aliyun-cli-3.0.73.tar.gz) = 4c1b4f88fef19d7d94a05b3c58be837eeefb8a6d935fe35f7861fd74828a62aef20c2fd90f71550dbcfe48f23bc667cd3e54de6fd99ac2074eb1539765d1d039 -SHA512 (aliyun-openapi-meta-1e468f0cf8af08594022c94d3d6ff2ba40c574dd.tar.gz) = deffacd4b3a0815087b347258e9e63532b461544045b2125a8667f9c6ea749079dd4fb3e359e58b3c1492881a6508aba50bb52da6a1aaa0a9422b38028e68681 +SHA512 (aliyun-cli-3.0.74.tar.gz) = 2fcae76bfbb60291541e74a47979273e5dd9f3f8afd41f08ed25afdcc545e9824854e5a0d575d0a41b9f57535677c80a35e183c0769e9e4f95a8c426104560a1 +SHA512 (aliyun-openapi-meta-95a090031d4d5b4dd8d2d29104f33769b3ea66b4.tar.gz) = cbc35d73276043a74613e7b39fc5ca7be5022ce97259840e5046561d80efa9a08dc2ac2de434ac11cf34f6555570d13deacbbc9641b7b30a1fada4fe4263f416

2 years, 12 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes May 2021