From 408dacdaf16169d31ebfd02bae7c137ac0d2a7b0 Mon Sep 17 00:00:00 2001 From: Ian Davis Date: Thu, 18 Sep 2025 15:16:52 -0700 Subject: [PATCH] Revert "Fix ci and benchmarks (#581)" This reverts commit 6c6c640224bd54ab965d331a9d56e1c63b618ce8. --- .github/actions/go-check-setup/action.yml | 4 +- .github/actions/go-test-setup/action.yml | 9 +- .github/workflows/cache-cleanup.yml | 31 --- .github/workflows/docgen.yml | 27 --- .github/workflows/go-check.yml | 82 +------ .github/workflows/go-test.yml | 52 +---- README.md | 13 -- analytics/analytics.go | 28 +-- api/api_test.go | 58 ++--- .../{client => http}/admin/admin_client.go | 0 .../admin/set_identity_parameters.go | 0 .../admin/set_identity_responses.go | 0 .../{client => http}/deal/deal_client.go | 0 .../deal/list_deals_parameters.go | 0 .../deal/list_deals_responses.go | 0 .../deal/send_manual_parameters.go | 0 .../deal/send_manual_responses.go | 0 .../create_schedule_parameters.go | 0 .../create_schedule_responses.go | 0 .../deal_schedule/deal_schedule_client.go | 0 .../list_preparation_schedules_parameters.go | 0 .../list_preparation_schedules_responses.go | 0 .../list_schedules_parameters.go | 0 .../deal_schedule/list_schedules_responses.go | 0 .../pause_schedule_parameters.go | 0 .../deal_schedule/pause_schedule_responses.go | 0 .../remove_schedule_parameters.go | 0 .../remove_schedule_responses.go | 0 .../resume_schedule_parameters.go | 0 .../resume_schedule_responses.go | 0 .../update_schedule_parameters.go | 0 .../update_schedule_responses.go | 0 .../create_deal_template_parameters.go | 0 .../create_deal_template_responses.go | 0 .../deal_template/deal_template_client.go | 0 .../delete_deal_template_parameters.go | 0 .../delete_deal_template_responses.go | 0 .../get_deal_template_parameters.go | 0 .../get_deal_template_responses.go | 0 .../list_deal_templates_parameters.go | 0 .../list_deal_templates_responses.go | 0 .../update_deal_template_parameters.go | 0 .../update_deal_template_responses.go | 0 .../error_logs/error_logs_client.go | 0 .../error_logs/list_error_logs_parameters.go | 0 .../error_logs/list_error_logs_responses.go | 0 .../{client => http}/file/file_client.go | 0 .../file/get_file_deals_parameters.go | 0 .../file/get_file_deals_responses.go | 0 .../file/get_file_parameters.go | 0 .../file/get_file_responses.go | 0 .../file/prepare_to_pack_file_parameters.go | 0 .../file/prepare_to_pack_file_responses.go | 0 .../file/push_file_parameters.go | 0 .../file/push_file_responses.go | 0 .../file/retrieve_file_parameters.go | 0 .../file/retrieve_file_responses.go | 0 .../{client => http}/job/job_client.go | 0 .../{client => http}/job/pack_parameters.go | 0 .../{client => http}/job/pack_responses.go | 0 .../job/pause_dag_gen_parameters.go | 0 .../job/pause_dag_gen_responses.go | 0 .../job/pause_pack_parameters.go | 0 .../job/pause_pack_responses.go | 0 .../job/pause_scan_parameters.go | 0 .../job/pause_scan_responses.go | 0 .../job/prepare_to_pack_source_parameters.go | 0 .../job/prepare_to_pack_source_responses.go | 0 .../job/start_dag_gen_parameters.go | 0 .../job/start_dag_gen_responses.go | 0 .../job/start_pack_parameters.go | 0 .../job/start_pack_responses.go | 0 .../job/start_scan_parameters.go | 0 .../job/start_scan_responses.go | 0 .../piece/add_piece_parameters.go | 0 .../piece/add_piece_responses.go | 0 .../piece/get_piece_id_metadata_parameters.go | 0 .../piece/get_piece_id_metadata_responses.go | 0 .../piece/list_pieces_parameters.go | 0 .../piece/list_pieces_responses.go | 0 .../{client => http}/piece/piece_client.go | 0 .../add_output_storage_parameters.go | 0 .../add_output_storage_responses.go | 0 .../add_source_storage_parameters.go | 0 .../add_source_storage_responses.go | 0 .../create_preparation_parameters.go | 0 .../create_preparation_responses.go | 0 .../explore_preparation_parameters.go | 0 .../explore_preparation_responses.go | 0 .../get_preparation_status_parameters.go | 0 .../get_preparation_status_responses.go | 0 .../list_preparations_parameters.go | 0 .../list_preparations_responses.go | 0 .../preparation/preparation_client.go | 0 .../remove_output_storage_parameters.go | 0 .../remove_output_storage_responses.go | 0 .../remove_preparation_parameters.go | 0 .../remove_preparation_responses.go | 0 .../rename_preparation_parameters.go | 0 .../rename_preparation_responses.go | 0 .../singularity_api_client.go | 28 +-- .../get_deal_state_changes_parameters.go | 0 .../get_deal_state_changes_responses.go | 0 .../get_state_change_stats_parameters.go | 0 .../get_state_change_stats_responses.go | 0 .../list_state_changes_parameters.go | 0 .../list_state_changes_responses.go | 0 .../state_changes/state_changes_client.go | 0 .../storage/create_acd_storage_parameters.go | 0 .../storage/create_acd_storage_responses.go | 0 .../create_azureblob_storage_parameters.go | 0 .../create_azureblob_storage_responses.go | 0 .../storage/create_b2_storage_parameters.go | 0 .../storage/create_b2_storage_responses.go | 0 .../storage/create_box_storage_parameters.go | 0 .../storage/create_box_storage_responses.go | 0 .../create_drive_storage_parameters.go | 0 .../storage/create_drive_storage_responses.go | 0 .../create_dropbox_storage_parameters.go | 0 .../create_dropbox_storage_responses.go | 0 .../create_fichier_storage_parameters.go | 0 .../create_fichier_storage_responses.go | 0 .../create_filefabric_storage_parameters.go | 0 .../create_filefabric_storage_responses.go | 0 .../storage/create_ftp_storage_parameters.go | 0 .../storage/create_ftp_storage_responses.go | 0 .../storage/create_gcs_storage_parameters.go | 0 .../storage/create_gcs_storage_responses.go | 0 .../create_gphotos_storage_parameters.go | 0 .../create_gphotos_storage_responses.go | 0 .../storage/create_hdfs_storage_parameters.go | 0 .../storage/create_hdfs_storage_responses.go | 0 .../create_hidrive_storage_parameters.go | 0 .../create_hidrive_storage_responses.go | 0 .../storage/create_http_storage_parameters.go | 0 .../storage/create_http_storage_responses.go | 0 ...eate_internetarchive_storage_parameters.go | 0 ...reate_internetarchive_storage_responses.go | 0 .../create_jottacloud_storage_parameters.go | 0 .../create_jottacloud_storage_responses.go | 0 ...te_koofr_digistorage_storage_parameters.go | 0 ...ate_koofr_digistorage_storage_responses.go | 0 .../create_koofr_koofr_storage_parameters.go | 0 .../create_koofr_koofr_storage_responses.go | 0 .../create_koofr_other_storage_parameters.go | 0 .../create_koofr_other_storage_responses.go | 0 .../create_local_storage_parameters.go | 0 .../storage/create_local_storage_responses.go | 0 .../create_mailru_storage_parameters.go | 0 .../create_mailru_storage_responses.go | 0 .../storage/create_mega_storage_parameters.go | 0 .../storage/create_mega_storage_responses.go | 0 .../create_netstorage_storage_parameters.go | 0 .../create_netstorage_storage_responses.go | 0 .../create_onedrive_storage_parameters.go | 0 .../create_onedrive_storage_responses.go | 0 .../create_oos_env_auth_storage_parameters.go | 0 .../create_oos_env_auth_storage_responses.go | 0 ...tance_principal_auth_storage_parameters.go | 0 ...stance_principal_auth_storage_responses.go | 0 .../create_oos_no_auth_storage_parameters.go | 0 .../create_oos_no_auth_storage_responses.go | 0 ...ource_principal_auth_storage_parameters.go | 0 ...source_principal_auth_storage_responses.go | 0 ..._user_principal_auth_storage_parameters.go | 0 ...s_user_principal_auth_storage_responses.go | 0 .../create_opendrive_storage_parameters.go | 0 .../create_opendrive_storage_responses.go | 0 .../create_pcloud_storage_parameters.go | 0 .../create_pcloud_storage_responses.go | 0 .../create_premiumizeme_storage_parameters.go | 0 .../create_premiumizeme_storage_responses.go | 0 .../create_putio_storage_parameters.go | 0 .../storage/create_putio_storage_responses.go | 0 .../create_qingstor_storage_parameters.go | 0 .../create_qingstor_storage_responses.go | 0 .../create_s3_a_w_s_storage_parameters.go | 0 .../create_s3_a_w_s_storage_responses.go | 0 .../create_s3_alibaba_storage_parameters.go | 0 .../create_s3_alibaba_storage_responses.go | 0 ...reate_s3_arvan_cloud_storage_parameters.go | 0 ...create_s3_arvan_cloud_storage_responses.go | 0 .../create_s3_ceph_storage_parameters.go | 0 .../create_s3_ceph_storage_responses.go | 0 ...eate_s3_china_mobile_storage_parameters.go | 0 ...reate_s3_china_mobile_storage_responses.go | 0 ...create_s3_cloudflare_storage_parameters.go | 0 .../create_s3_cloudflare_storage_responses.go | 0 ...ate_s3_digital_ocean_storage_parameters.go | 0 ...eate_s3_digital_ocean_storage_responses.go | 0 .../create_s3_dreamhost_storage_parameters.go | 0 .../create_s3_dreamhost_storage_responses.go | 0 ...eate_s3_huawei_o_b_s_storage_parameters.go | 0 ...reate_s3_huawei_o_b_s_storage_responses.go | 0 ...reate_s3_i_b_m_c_o_s_storage_parameters.go | 0 ...create_s3_i_b_m_c_o_s_storage_responses.go | 0 .../create_s3_i_drive_storage_parameters.go | 0 .../create_s3_i_drive_storage_responses.go | 0 .../create_s3_i_o_n_o_s_storage_parameters.go | 0 .../create_s3_i_o_n_o_s_storage_responses.go | 0 .../create_s3_liara_storage_parameters.go | 0 .../create_s3_liara_storage_responses.go | 0 ...create_s3_lyve_cloud_storage_parameters.go | 0 .../create_s3_lyve_cloud_storage_responses.go | 0 .../create_s3_minio_storage_parameters.go | 0 .../create_s3_minio_storage_responses.go | 0 .../create_s3_netease_storage_parameters.go | 0 .../create_s3_netease_storage_responses.go | 0 .../create_s3_other_storage_parameters.go | 0 .../create_s3_other_storage_responses.go | 0 .../create_s3_qiniu_storage_parameters.go | 0 .../create_s3_qiniu_storage_responses.go | 0 .../create_s3_rack_corp_storage_parameters.go | 0 .../create_s3_rack_corp_storage_responses.go | 0 .../create_s3_scaleway_storage_parameters.go | 0 .../create_s3_scaleway_storage_responses.go | 0 ...reate_s3_seaweed_f_s_storage_parameters.go | 0 ...create_s3_seaweed_f_s_storage_responses.go | 0 ...create_s3_stack_path_storage_parameters.go | 0 .../create_s3_stack_path_storage_responses.go | 0 .../create_s3_storj_storage_parameters.go | 0 .../create_s3_storj_storage_responses.go | 0 ...ate_s3_tencent_c_o_s_storage_parameters.go | 0 ...eate_s3_tencent_c_o_s_storage_responses.go | 0 .../create_s3_wasabi_storage_parameters.go | 0 .../create_s3_wasabi_storage_responses.go | 0 .../create_seafile_storage_parameters.go | 0 .../create_seafile_storage_responses.go | 0 .../storage/create_sftp_storage_parameters.go | 0 .../storage/create_sftp_storage_responses.go | 0 .../create_sharefile_storage_parameters.go | 0 .../create_sharefile_storage_responses.go | 0 .../storage/create_sia_storage_parameters.go | 0 .../storage/create_sia_storage_responses.go | 0 .../storage/create_smb_storage_parameters.go | 0 .../storage/create_smb_storage_responses.go | 0 ...reate_storj_existing_storage_parameters.go | 0 ...create_storj_existing_storage_responses.go | 0 .../create_storj_new_storage_parameters.go | 0 .../create_storj_new_storage_responses.go | 0 .../create_sugarsync_storage_parameters.go | 0 .../create_sugarsync_storage_responses.go | 0 .../create_swift_storage_parameters.go | 0 .../storage/create_swift_storage_responses.go | 0 .../create_union_storage_parameters.go | 0 .../storage/create_union_storage_responses.go | 0 .../create_uptobox_storage_parameters.go | 0 .../create_uptobox_storage_responses.go | 0 .../create_webdav_storage_parameters.go | 0 .../create_webdav_storage_responses.go | 0 .../create_yandex_storage_parameters.go | 0 .../create_yandex_storage_responses.go | 0 .../storage/create_zoho_storage_parameters.go | 0 .../storage/create_zoho_storage_responses.go | 0 .../storage/explore_storage_parameters.go | 0 .../storage/explore_storage_responses.go | 0 .../storage/list_storages_parameters.go | 0 .../storage/list_storages_responses.go | 0 .../storage/remove_storage_parameters.go | 0 .../storage/remove_storage_responses.go | 0 .../storage/rename_storage_parameters.go | 0 .../storage/rename_storage_responses.go | 0 .../storage/storage_client.go | 0 .../storage/update_storage_parameters.go | 0 .../storage/update_storage_responses.go | 0 .../wallet/create_wallet_parameters.go | 0 .../wallet/create_wallet_responses.go | 0 .../wallet/get_wallet_balance_parameters.go | 0 .../wallet/get_wallet_balance_responses.go | 0 .../wallet/import_wallet_parameters.go | 0 .../wallet/import_wallet_responses.go | 0 .../wallet/init_wallet_parameters.go | 0 .../wallet/init_wallet_responses.go | 0 .../wallet/list_wallets_parameters.go | 0 .../wallet/list_wallets_responses.go | 0 .../wallet/remove_wallet_parameters.go | 0 .../wallet/remove_wallet_responses.go | 0 .../wallet/update_wallet_parameters.go | 0 .../wallet/update_wallet_responses.go | 0 .../{client => http}/wallet/wallet_client.go | 0 .../attach_wallet_parameters.go | 0 .../attach_wallet_responses.go | 0 .../detach_wallet_parameters.go | 0 .../detach_wallet_responses.go | 0 .../list_attached_wallets_parameters.go | 0 .../list_attached_wallets_responses.go | 0 .../wallet_association_client.go | 0 client/swagger/models/model_client_config.go | 10 +- client/swagger/models/time_duration.go | 34 +++ cmd/api_test.go | 39 +--- cmd/onboard.go | 15 +- cmd/storage/create.go | 15 +- cmd/storage/update.go | 15 +- docgen.sh | 1 - docs/swagger/docs.go | 10 +- docs/swagger/swagger.json | 10 +- docs/swagger/swagger.yaml | 10 +- go.mod | 42 ++-- go.sum | 213 ++++++++++++------ handler/storage/update_test.go | 12 +- model/basetypes.go | 54 +---- model/basetypes_test.go | 10 +- model/preparation.go | 26 +-- service/statetracker/benchmark_test.go | 2 +- singularity.go | 2 +- storagesystem/rclone.go | 24 +- storagesystem/rclone_test.go | 14 +- util/testutil/testutils.go | 29 +-- 308 files changed, 332 insertions(+), 587 deletions(-) delete mode 100644 .github/workflows/cache-cleanup.yml delete mode 100644 .github/workflows/docgen.yml rename client/swagger/{client => http}/admin/admin_client.go (100%) rename client/swagger/{client => http}/admin/set_identity_parameters.go (100%) rename client/swagger/{client => http}/admin/set_identity_responses.go (100%) rename client/swagger/{client => http}/deal/deal_client.go (100%) rename client/swagger/{client => http}/deal/list_deals_parameters.go (100%) rename client/swagger/{client => http}/deal/list_deals_responses.go (100%) rename client/swagger/{client => http}/deal/send_manual_parameters.go (100%) rename client/swagger/{client => http}/deal/send_manual_responses.go (100%) rename client/swagger/{client => http}/deal_schedule/create_schedule_parameters.go (100%) rename client/swagger/{client => http}/deal_schedule/create_schedule_responses.go (100%) rename client/swagger/{client => http}/deal_schedule/deal_schedule_client.go (100%) rename client/swagger/{client => http}/deal_schedule/list_preparation_schedules_parameters.go (100%) rename client/swagger/{client => http}/deal_schedule/list_preparation_schedules_responses.go (100%) rename client/swagger/{client => http}/deal_schedule/list_schedules_parameters.go (100%) rename client/swagger/{client => http}/deal_schedule/list_schedules_responses.go (100%) rename client/swagger/{client => http}/deal_schedule/pause_schedule_parameters.go (100%) rename client/swagger/{client => http}/deal_schedule/pause_schedule_responses.go (100%) rename client/swagger/{client => http}/deal_schedule/remove_schedule_parameters.go (100%) rename client/swagger/{client => http}/deal_schedule/remove_schedule_responses.go (100%) rename client/swagger/{client => http}/deal_schedule/resume_schedule_parameters.go (100%) rename client/swagger/{client => http}/deal_schedule/resume_schedule_responses.go (100%) rename client/swagger/{client => http}/deal_schedule/update_schedule_parameters.go (100%) rename client/swagger/{client => http}/deal_schedule/update_schedule_responses.go (100%) rename client/swagger/{client => http}/deal_template/create_deal_template_parameters.go (100%) rename client/swagger/{client => http}/deal_template/create_deal_template_responses.go (100%) rename client/swagger/{client => http}/deal_template/deal_template_client.go (100%) rename client/swagger/{client => http}/deal_template/delete_deal_template_parameters.go (100%) rename client/swagger/{client => http}/deal_template/delete_deal_template_responses.go (100%) rename client/swagger/{client => http}/deal_template/get_deal_template_parameters.go (100%) rename client/swagger/{client => http}/deal_template/get_deal_template_responses.go (100%) rename client/swagger/{client => http}/deal_template/list_deal_templates_parameters.go (100%) rename client/swagger/{client => http}/deal_template/list_deal_templates_responses.go (100%) rename client/swagger/{client => http}/deal_template/update_deal_template_parameters.go (100%) rename client/swagger/{client => http}/deal_template/update_deal_template_responses.go (100%) rename client/swagger/{client => http}/error_logs/error_logs_client.go (100%) rename client/swagger/{client => http}/error_logs/list_error_logs_parameters.go (100%) rename client/swagger/{client => http}/error_logs/list_error_logs_responses.go (100%) rename client/swagger/{client => http}/file/file_client.go (100%) rename client/swagger/{client => http}/file/get_file_deals_parameters.go (100%) rename client/swagger/{client => http}/file/get_file_deals_responses.go (100%) rename client/swagger/{client => http}/file/get_file_parameters.go (100%) rename client/swagger/{client => http}/file/get_file_responses.go (100%) rename client/swagger/{client => http}/file/prepare_to_pack_file_parameters.go (100%) rename client/swagger/{client => http}/file/prepare_to_pack_file_responses.go (100%) rename client/swagger/{client => http}/file/push_file_parameters.go (100%) rename client/swagger/{client => http}/file/push_file_responses.go (100%) rename client/swagger/{client => http}/file/retrieve_file_parameters.go (100%) rename client/swagger/{client => http}/file/retrieve_file_responses.go (100%) rename client/swagger/{client => http}/job/job_client.go (100%) rename client/swagger/{client => http}/job/pack_parameters.go (100%) rename client/swagger/{client => http}/job/pack_responses.go (100%) rename client/swagger/{client => http}/job/pause_dag_gen_parameters.go (100%) rename client/swagger/{client => http}/job/pause_dag_gen_responses.go (100%) rename client/swagger/{client => http}/job/pause_pack_parameters.go (100%) rename client/swagger/{client => http}/job/pause_pack_responses.go (100%) rename client/swagger/{client => http}/job/pause_scan_parameters.go (100%) rename client/swagger/{client => http}/job/pause_scan_responses.go (100%) rename client/swagger/{client => http}/job/prepare_to_pack_source_parameters.go (100%) rename client/swagger/{client => http}/job/prepare_to_pack_source_responses.go (100%) rename client/swagger/{client => http}/job/start_dag_gen_parameters.go (100%) rename client/swagger/{client => http}/job/start_dag_gen_responses.go (100%) rename client/swagger/{client => http}/job/start_pack_parameters.go (100%) rename client/swagger/{client => http}/job/start_pack_responses.go (100%) rename client/swagger/{client => http}/job/start_scan_parameters.go (100%) rename client/swagger/{client => http}/job/start_scan_responses.go (100%) rename client/swagger/{client => http}/piece/add_piece_parameters.go (100%) rename client/swagger/{client => http}/piece/add_piece_responses.go (100%) rename client/swagger/{client => http}/piece/get_piece_id_metadata_parameters.go (100%) rename client/swagger/{client => http}/piece/get_piece_id_metadata_responses.go (100%) rename client/swagger/{client => http}/piece/list_pieces_parameters.go (100%) rename client/swagger/{client => http}/piece/list_pieces_responses.go (100%) rename client/swagger/{client => http}/piece/piece_client.go (100%) rename client/swagger/{client => http}/preparation/add_output_storage_parameters.go (100%) rename client/swagger/{client => http}/preparation/add_output_storage_responses.go (100%) rename client/swagger/{client => http}/preparation/add_source_storage_parameters.go (100%) rename client/swagger/{client => http}/preparation/add_source_storage_responses.go (100%) rename client/swagger/{client => http}/preparation/create_preparation_parameters.go (100%) rename client/swagger/{client => http}/preparation/create_preparation_responses.go (100%) rename client/swagger/{client => http}/preparation/explore_preparation_parameters.go (100%) rename client/swagger/{client => http}/preparation/explore_preparation_responses.go (100%) rename client/swagger/{client => http}/preparation/get_preparation_status_parameters.go (100%) rename client/swagger/{client => http}/preparation/get_preparation_status_responses.go (100%) rename client/swagger/{client => http}/preparation/list_preparations_parameters.go (100%) rename client/swagger/{client => http}/preparation/list_preparations_responses.go (100%) rename client/swagger/{client => http}/preparation/preparation_client.go (100%) rename client/swagger/{client => http}/preparation/remove_output_storage_parameters.go (100%) rename client/swagger/{client => http}/preparation/remove_output_storage_responses.go (100%) rename client/swagger/{client => http}/preparation/remove_preparation_parameters.go (100%) rename client/swagger/{client => http}/preparation/remove_preparation_responses.go (100%) rename client/swagger/{client => http}/preparation/rename_preparation_parameters.go (100%) rename client/swagger/{client => http}/preparation/rename_preparation_responses.go (100%) rename client/swagger/{client => http}/singularity_api_client.go (95%) rename client/swagger/{client => http}/state_changes/get_deal_state_changes_parameters.go (100%) rename client/swagger/{client => http}/state_changes/get_deal_state_changes_responses.go (100%) rename client/swagger/{client => http}/state_changes/get_state_change_stats_parameters.go (100%) rename client/swagger/{client => http}/state_changes/get_state_change_stats_responses.go (100%) rename client/swagger/{client => http}/state_changes/list_state_changes_parameters.go (100%) rename client/swagger/{client => http}/state_changes/list_state_changes_responses.go (100%) rename client/swagger/{client => http}/state_changes/state_changes_client.go (100%) rename client/swagger/{client => http}/storage/create_acd_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_acd_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_azureblob_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_azureblob_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_b2_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_b2_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_box_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_box_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_drive_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_drive_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_dropbox_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_dropbox_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_fichier_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_fichier_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_filefabric_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_filefabric_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_ftp_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_ftp_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_gcs_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_gcs_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_gphotos_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_gphotos_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_hdfs_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_hdfs_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_hidrive_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_hidrive_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_http_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_http_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_internetarchive_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_internetarchive_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_jottacloud_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_jottacloud_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_koofr_digistorage_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_koofr_digistorage_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_koofr_koofr_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_koofr_koofr_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_koofr_other_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_koofr_other_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_local_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_local_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_mailru_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_mailru_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_mega_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_mega_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_netstorage_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_netstorage_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_onedrive_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_onedrive_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_oos_env_auth_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_oos_env_auth_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_oos_instance_principal_auth_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_oos_instance_principal_auth_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_oos_no_auth_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_oos_no_auth_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_oos_resource_principal_auth_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_oos_resource_principal_auth_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_oos_user_principal_auth_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_oos_user_principal_auth_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_opendrive_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_opendrive_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_pcloud_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_pcloud_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_premiumizeme_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_premiumizeme_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_putio_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_putio_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_qingstor_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_qingstor_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_a_w_s_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_a_w_s_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_alibaba_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_alibaba_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_arvan_cloud_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_arvan_cloud_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_ceph_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_ceph_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_china_mobile_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_china_mobile_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_cloudflare_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_cloudflare_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_digital_ocean_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_digital_ocean_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_dreamhost_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_dreamhost_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_huawei_o_b_s_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_huawei_o_b_s_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_i_b_m_c_o_s_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_i_b_m_c_o_s_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_i_drive_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_i_drive_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_i_o_n_o_s_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_i_o_n_o_s_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_liara_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_liara_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_lyve_cloud_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_lyve_cloud_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_minio_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_minio_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_netease_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_netease_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_other_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_other_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_qiniu_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_qiniu_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_rack_corp_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_rack_corp_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_scaleway_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_scaleway_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_seaweed_f_s_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_seaweed_f_s_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_stack_path_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_stack_path_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_storj_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_storj_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_tencent_c_o_s_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_tencent_c_o_s_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_s3_wasabi_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_s3_wasabi_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_seafile_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_seafile_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_sftp_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_sftp_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_sharefile_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_sharefile_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_sia_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_sia_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_smb_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_smb_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_storj_existing_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_storj_existing_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_storj_new_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_storj_new_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_sugarsync_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_sugarsync_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_swift_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_swift_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_union_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_union_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_uptobox_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_uptobox_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_webdav_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_webdav_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_yandex_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_yandex_storage_responses.go (100%) rename client/swagger/{client => http}/storage/create_zoho_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/create_zoho_storage_responses.go (100%) rename client/swagger/{client => http}/storage/explore_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/explore_storage_responses.go (100%) rename client/swagger/{client => http}/storage/list_storages_parameters.go (100%) rename client/swagger/{client => http}/storage/list_storages_responses.go (100%) rename client/swagger/{client => http}/storage/remove_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/remove_storage_responses.go (100%) rename client/swagger/{client => http}/storage/rename_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/rename_storage_responses.go (100%) rename client/swagger/{client => http}/storage/storage_client.go (100%) rename client/swagger/{client => http}/storage/update_storage_parameters.go (100%) rename client/swagger/{client => http}/storage/update_storage_responses.go (100%) rename client/swagger/{client => http}/wallet/create_wallet_parameters.go (100%) rename client/swagger/{client => http}/wallet/create_wallet_responses.go (100%) rename client/swagger/{client => http}/wallet/get_wallet_balance_parameters.go (100%) rename client/swagger/{client => http}/wallet/get_wallet_balance_responses.go (100%) rename client/swagger/{client => http}/wallet/import_wallet_parameters.go (100%) rename client/swagger/{client => http}/wallet/import_wallet_responses.go (100%) rename client/swagger/{client => http}/wallet/init_wallet_parameters.go (100%) rename client/swagger/{client => http}/wallet/init_wallet_responses.go (100%) rename client/swagger/{client => http}/wallet/list_wallets_parameters.go (100%) rename client/swagger/{client => http}/wallet/list_wallets_responses.go (100%) rename client/swagger/{client => http}/wallet/remove_wallet_parameters.go (100%) rename client/swagger/{client => http}/wallet/remove_wallet_responses.go (100%) rename client/swagger/{client => http}/wallet/update_wallet_parameters.go (100%) rename client/swagger/{client => http}/wallet/update_wallet_responses.go (100%) rename client/swagger/{client => http}/wallet/wallet_client.go (100%) rename client/swagger/{client => http}/wallet_association/attach_wallet_parameters.go (100%) rename client/swagger/{client => http}/wallet_association/attach_wallet_responses.go (100%) rename client/swagger/{client => http}/wallet_association/detach_wallet_parameters.go (100%) rename client/swagger/{client => http}/wallet_association/detach_wallet_responses.go (100%) rename client/swagger/{client => http}/wallet_association/list_attached_wallets_parameters.go (100%) rename client/swagger/{client => http}/wallet_association/list_attached_wallets_responses.go (100%) rename client/swagger/{client => http}/wallet_association/wallet_association_client.go (100%) diff --git a/.github/actions/go-check-setup/action.yml b/.github/actions/go-check-setup/action.yml index f0b63541..a5992055 100644 --- a/.github/actions/go-check-setup/action.yml +++ b/.github/actions/go-check-setup/action.yml @@ -9,10 +9,8 @@ runs: path: | ~/.cache/go-build ~/go/pkg/mod - key: ${{ matrix.os }}-golang-${{ matrix.go }}-${{ hashFiles('**/go.sum') }}-${{ github.ref }}-${{ github.sha }} + key: ${{ matrix.os }}-golang-${{ matrix.go }}-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ matrix.os }}-golang-${{ matrix.go }}-${{ hashFiles('**/go.sum') }}-${{ github.ref }}- - ${{ matrix.os }}-golang-${{ matrix.go }}-${{ hashFiles('**/go.sum') }}- ${{ matrix.os }}-golang-${{ matrix.go }}- - name: Setup Go diff --git a/.github/actions/go-test-setup/action.yml b/.github/actions/go-test-setup/action.yml index dee2e30e..a1415f13 100644 --- a/.github/actions/go-test-setup/action.yml +++ b/.github/actions/go-test-setup/action.yml @@ -3,21 +3,14 @@ description: Setup Cache runs: using: "composite" steps: - - name: Clean Go cache directories - shell: bash - run: | - rm -rf ~/.cache/go-build - rm -rf ~/go/pkg/mod - name: Setup Golang caches uses: actions/cache@v4 with: path: | ~/.cache/go-build ~/go/pkg/mod - key: ${{ matrix.os }}-golang-${{ matrix.go }}-${{ hashFiles('**/go.sum') }}-${{ github.ref }}-${{ github.sha }} + key: ${{ matrix.os }}-golang-${{ matrix.go }}-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ matrix.os }}-golang-${{ matrix.go }}-${{ hashFiles('**/go.sum') }}-${{ github.ref }}- - ${{ matrix.os }}-golang-${{ matrix.go }}-${{ hashFiles('**/go.sum') }}- ${{ matrix.os }}-golang-${{ matrix.go }}- - name: Setup PostgreSQL database uses: ikalnytskyi/action-setup-postgres@v6 diff --git a/.github/workflows/cache-cleanup.yml b/.github/workflows/cache-cleanup.yml deleted file mode 100644 index 00b1e7a5..00000000 --- a/.github/workflows/cache-cleanup.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Cache Cleanup -on: - workflow_dispatch: # Manual trigger - schedule: - - cron: '0 0 * * 0' # Run weekly on Sunday at midnight - -jobs: - cleanup: - runs-on: ubuntu-latest - steps: - - name: Cleanup - run: | - # Get all cache keys - CACHE_KEYS=$(gh cache list -L 1000 | awk '{print $1}') - - # Calculate total size - TOTAL_SIZE=$(gh cache list -L 1000 | awk '{sum += $2} END {print sum}') - - # If total size > 8GB (keeping buffer from 10GB limit) - if [ "$TOTAL_SIZE" -gt 8000000000 ]; then - # Delete older caches until we're under 8GB - echo "$CACHE_KEYS" | while read key; do - gh cache delete "$key" -f - TOTAL_SIZE=$(gh cache list -L 1000 | awk '{sum += $2} END {print sum}') - if [ "$TOTAL_SIZE" -lt 8000000000 ]; then - break - fi - done - fi - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/docgen.yml b/.github/workflows/docgen.yml deleted file mode 100644 index 1af2536a..00000000 --- a/.github/workflows/docgen.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Documentation Generation - -on: - workflow_dispatch: - push: - branches: [main] - pull_request: - branches: [main] - -jobs: - docgen: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - - name: Initialize database for doc generation - run: | - cd singularity - ./singularity admin init - - name: Generate documentation - run: | - cd singularity - sh docgen.sh diff --git a/.github/workflows/go-check.yml b/.github/workflows/go-check.yml index 888c7558..826de5c2 100644 --- a/.github/workflows/go-check.yml +++ b/.github/workflows/go-check.yml @@ -2,9 +2,8 @@ name: Go Checks on: pull_request: - branches: [main, develop] push: - branches: [main, develop] + branches: ["main"] workflow_dispatch: permissions: @@ -15,88 +14,19 @@ concurrency: cancel-in-progress: true jobs: - go-check-all: - name: go-check / All - runs-on: ubuntu-latest - services: - mysql: - image: mysql:8.0 - env: - MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: singularity - MYSQL_USER: singularity - MYSQL_PASSWORD: singularity - ports: - - 3306:3306 - options: >- - --health-cmd="mysqladmin ping" - --health-interval=10s - --health-timeout=5s - --health-retries=3 - - postgres: - image: postgres:15 - env: - POSTGRES_USER: singularity - POSTGRES_PASSWORD: singularity - POSTGRES_DB: singularity - ports: - - 5432:5432 - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - - steps: - - uses: actions/checkout@v3 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: "1.21.x" - - - name: Wait for PostgreSQL - run: | - echo "Waiting for PostgreSQL..." - for i in {1..10}; do - if PGPASSWORD=singularity psql -h localhost -U singularity -d singularity -c "SELECT 1" > /dev/null 2>&1; then - echo "Postgres is ready!" - break - fi - sleep 3 - done - - - name: Verify MySQL connection - run: mysql -h127.0.0.1 -P3306 -usingularity -psingularity -e "SELECT VERSION();" - - - name: Verify PostgreSQL connection - run: PGPASSWORD=singularity psql -h localhost -U singularity -d singularity -c "SELECT version();" - - - name: Ensure swagger directories exist - run: mkdir -p client/swagger/client - - - name: Install swagger tools - run: go install github.com/go-swagger/go-swagger/cmd/swagger@v0.30.5 - - - name: Generate code - run: go generate ./client/swagger/... - - - name: Build - run: go build ./... - - - name: Run tests - run: go test -v ./... + go-check: + uses: ipdxco/unified-github-workflows/.github/workflows/go-check.yml@v1.0.22 staticcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout code + uses: actions/checkout@v3 - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.21.x" + go-version: "1.21" - name: Install staticcheck run: go install honnef.co/go/tools/cmd/staticcheck@latest diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index e4727fa6..92b1383b 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -2,9 +2,8 @@ name: Go Test on: pull_request: - branches: [main, develop] push: - branches: [main, develop] + branches: ["main"] workflow_dispatch: permissions: @@ -15,50 +14,5 @@ concurrency: cancel-in-progress: true jobs: - go-test-this: - name: go-test / ${{ matrix.os }} (go this) - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - steps: - - uses: actions/checkout@v3 - - - name: Start MongoDB - if: runner.os == 'Linux' - uses: supercharge/mongodb-github-action@v1.9.0 - with: - mongodb-version: '6.0' - mongodb-port: 27018 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.21' - - - name: Run Go Tests - run: go test ./... - - go-test-next: - name: go-test / ${{ matrix.os }} (go next) - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - steps: - - uses: actions/checkout@v3 - - - name: Start MongoDB - if: runner.os == 'Linux' - uses: supercharge/mongodb-github-action@v1.9.0 - with: - mongodb-version: '6.0' - mongodb-port: 27018 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.21' - - - name: Run Go Tests - run: go test ./... + go-test: + uses: ipdxco/unified-github-workflows/.github/workflows/go-test.yml@v1.0.22 diff --git a/README.md b/README.md index 893b55b7..edb5415b 100644 --- a/README.md +++ b/README.md @@ -427,16 +427,3 @@ The internal tool used by `js-singularity` to regenerate the CAR that captures t ## License Dual-licensed under [MIT](https://github.com/filecoin-project/lotus/blob/master/LICENSE-MIT) + [Apache 2.0](https://github.com/filecoin-project/lotus/blob/master/LICENSE-APACHE) - -## Integration Tests & MongoDB - -Some integration tests require a MongoDB instance running on `localhost:27018`. - -- **CI:** MongoDB is automatically started on port 27018 in GitHub Actions workflows. -- **Local Development:** You must start MongoDB locally on port 27018 before running tests: - -```bash -mongod --port 27018 -``` - -If MongoDB is not available, related tests will be skipped or fail with a connection error. diff --git a/analytics/analytics.go b/analytics/analytics.go index e1eaa9de..08031946 100644 --- a/analytics/analytics.go +++ b/analytics/analytics.go @@ -21,10 +21,7 @@ import ( const flushInterval = time.Hour -var ( - mu sync.RWMutex - Enabled = true -) +var Enabled = true var logger = log.Logger("analytics") @@ -40,8 +37,6 @@ var logger = log.Logger("analytics") // Returns: // - An error if there are issues fetching the instance id from the database or if the database appears empty. func Init(ctx context.Context, db *gorm.DB) error { - mu.Lock() - defer mu.Unlock() if Instance != "" { return nil } @@ -73,27 +68,6 @@ var ( Identity string ) -// GetInstance safely returns the Instance value -func GetInstance() string { - mu.RLock() - defer mu.RUnlock() - return Instance -} - -// GetIdentity safely returns the Identity value -func GetIdentity() string { - mu.RLock() - defer mu.RUnlock() - return Identity -} - -// IsEnabled safely returns the Enabled value -func IsEnabled() bool { - mu.RLock() - defer mu.RUnlock() - return Enabled -} - type Collector struct { mu sync.Mutex packJobEvents []PackJobEvent diff --git a/api/api_test.go b/api/api_test.go index 95419d30..0511643a 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -11,17 +11,17 @@ import ( "testing" "time" - admin2 "github.com/data-preservation-programs/singularity/client/swagger/client/admin" - deal2 "github.com/data-preservation-programs/singularity/client/swagger/client/deal" - "github.com/data-preservation-programs/singularity/client/swagger/client/deal_schedule" - file2 "github.com/data-preservation-programs/singularity/client/swagger/client/file" - job2 "github.com/data-preservation-programs/singularity/client/swagger/client/job" - "github.com/data-preservation-programs/singularity/client/swagger/client/piece" - "github.com/data-preservation-programs/singularity/client/swagger/client/preparation" - storage2 "github.com/data-preservation-programs/singularity/client/swagger/client/storage" - wallet2 "github.com/data-preservation-programs/singularity/client/swagger/client/wallet" - "github.com/data-preservation-programs/singularity/client/swagger/client/wallet_association" - // Removed: old client/swagger/http import, use new client initialization if needed + "github.com/data-preservation-programs/singularity/client/swagger/http" + admin2 "github.com/data-preservation-programs/singularity/client/swagger/http/admin" + deal2 "github.com/data-preservation-programs/singularity/client/swagger/http/deal" + "github.com/data-preservation-programs/singularity/client/swagger/http/deal_schedule" + file2 "github.com/data-preservation-programs/singularity/client/swagger/http/file" + job2 "github.com/data-preservation-programs/singularity/client/swagger/http/job" + "github.com/data-preservation-programs/singularity/client/swagger/http/piece" + "github.com/data-preservation-programs/singularity/client/swagger/http/preparation" + storage2 "github.com/data-preservation-programs/singularity/client/swagger/http/storage" + wallet2 "github.com/data-preservation-programs/singularity/client/swagger/http/wallet" + "github.com/data-preservation-programs/singularity/client/swagger/http/wallet_association" "github.com/data-preservation-programs/singularity/client/swagger/models" "github.com/data-preservation-programs/singularity/handler/admin" "github.com/data-preservation-programs/singularity/handler/dataprep" @@ -39,8 +39,6 @@ import ( "github.com/data-preservation-programs/singularity/service" "github.com/data-preservation-programs/singularity/util" "github.com/data-preservation-programs/singularity/util/testutil" - httptransport "github.com/go-openapi/runtime/client" - "github.com/go-openapi/strfmt" "github.com/gotidy/ptr" "github.com/ipfs/go-log/v2" "github.com/parnurzeal/gorequest" @@ -262,30 +260,10 @@ func TestAllAPIs(t *testing.T) { require.NotNil(t, resp) require.Equal(t, http2.StatusOK, resp.StatusCode) - transport := httptransport.New(apiBind, "/api", []string{"http"}) - client := &struct { - Admin admin2.ClientService - Deal deal2.ClientService - DealSchedule deal_schedule.ClientService - File file2.ClientService - Job job2.ClientService - Piece piece.ClientService - Preparation preparation.ClientService - Storage storage2.ClientService - Wallet wallet2.ClientService - WalletAssoc wallet_association.ClientService - }{ - Admin: admin2.New(transport, strfmt.Default), - Deal: deal2.New(transport, strfmt.Default), - DealSchedule: deal_schedule.New(transport, strfmt.Default), - File: file2.New(transport, strfmt.Default), - Job: job2.New(transport, strfmt.Default), - Piece: piece.New(transport, strfmt.Default), - Preparation: preparation.New(transport, strfmt.Default), - Storage: storage2.New(transport, strfmt.Default), - Wallet: wallet2.New(transport, strfmt.Default), - WalletAssoc: wallet_association.New(transport, strfmt.Default), - } + client := http.NewHTTPClientWithConfig(nil, &http.TransportConfig{ + Host: apiBind, + BasePath: http.DefaultBasePath, + }) t.Run("admin", func(t *testing.T) { t.Run("SetIdentity", func(t *testing.T) { @@ -302,7 +280,7 @@ func TestAllAPIs(t *testing.T) { t.Run("wallet_association", func(t *testing.T) { t.Run("AttachWallet", func(t *testing.T) { - resp, err := client.WalletAssoc.AttachWallet(&wallet_association.AttachWalletParams{ + resp, err := client.WalletAssociation.AttachWallet(&wallet_association.AttachWalletParams{ ID: "id", Wallet: "wallet", Context: ctx, @@ -312,7 +290,7 @@ func TestAllAPIs(t *testing.T) { require.NotNil(t, resp.Payload) }) t.Run("DetachWallet", func(t *testing.T) { - resp, err := client.WalletAssoc.DetachWallet(&wallet_association.DetachWalletParams{ + resp, err := client.WalletAssociation.DetachWallet(&wallet_association.DetachWalletParams{ ID: "id", Wallet: "wallet", Context: ctx, @@ -322,7 +300,7 @@ func TestAllAPIs(t *testing.T) { require.NotNil(t, resp.Payload) }) t.Run("ListAttachedHandler", func(t *testing.T) { - resp, err := client.WalletAssoc.ListAttachedWallets(&wallet_association.ListAttachedWalletsParams{ + resp, err := client.WalletAssociation.ListAttachedWallets(&wallet_association.ListAttachedWalletsParams{ ID: "id", Context: ctx, }) diff --git a/client/swagger/client/admin/admin_client.go b/client/swagger/http/admin/admin_client.go similarity index 100% rename from client/swagger/client/admin/admin_client.go rename to client/swagger/http/admin/admin_client.go diff --git a/client/swagger/client/admin/set_identity_parameters.go b/client/swagger/http/admin/set_identity_parameters.go similarity index 100% rename from client/swagger/client/admin/set_identity_parameters.go rename to client/swagger/http/admin/set_identity_parameters.go diff --git a/client/swagger/client/admin/set_identity_responses.go b/client/swagger/http/admin/set_identity_responses.go similarity index 100% rename from client/swagger/client/admin/set_identity_responses.go rename to client/swagger/http/admin/set_identity_responses.go diff --git a/client/swagger/client/deal/deal_client.go b/client/swagger/http/deal/deal_client.go similarity index 100% rename from client/swagger/client/deal/deal_client.go rename to client/swagger/http/deal/deal_client.go diff --git a/client/swagger/client/deal/list_deals_parameters.go b/client/swagger/http/deal/list_deals_parameters.go similarity index 100% rename from client/swagger/client/deal/list_deals_parameters.go rename to client/swagger/http/deal/list_deals_parameters.go diff --git a/client/swagger/client/deal/list_deals_responses.go b/client/swagger/http/deal/list_deals_responses.go similarity index 100% rename from client/swagger/client/deal/list_deals_responses.go rename to client/swagger/http/deal/list_deals_responses.go diff --git a/client/swagger/client/deal/send_manual_parameters.go b/client/swagger/http/deal/send_manual_parameters.go similarity index 100% rename from client/swagger/client/deal/send_manual_parameters.go rename to client/swagger/http/deal/send_manual_parameters.go diff --git a/client/swagger/client/deal/send_manual_responses.go b/client/swagger/http/deal/send_manual_responses.go similarity index 100% rename from client/swagger/client/deal/send_manual_responses.go rename to client/swagger/http/deal/send_manual_responses.go diff --git a/client/swagger/client/deal_schedule/create_schedule_parameters.go b/client/swagger/http/deal_schedule/create_schedule_parameters.go similarity index 100% rename from client/swagger/client/deal_schedule/create_schedule_parameters.go rename to client/swagger/http/deal_schedule/create_schedule_parameters.go diff --git a/client/swagger/client/deal_schedule/create_schedule_responses.go b/client/swagger/http/deal_schedule/create_schedule_responses.go similarity index 100% rename from client/swagger/client/deal_schedule/create_schedule_responses.go rename to client/swagger/http/deal_schedule/create_schedule_responses.go diff --git a/client/swagger/client/deal_schedule/deal_schedule_client.go b/client/swagger/http/deal_schedule/deal_schedule_client.go similarity index 100% rename from client/swagger/client/deal_schedule/deal_schedule_client.go rename to client/swagger/http/deal_schedule/deal_schedule_client.go diff --git a/client/swagger/client/deal_schedule/list_preparation_schedules_parameters.go b/client/swagger/http/deal_schedule/list_preparation_schedules_parameters.go similarity index 100% rename from client/swagger/client/deal_schedule/list_preparation_schedules_parameters.go rename to client/swagger/http/deal_schedule/list_preparation_schedules_parameters.go diff --git a/client/swagger/client/deal_schedule/list_preparation_schedules_responses.go b/client/swagger/http/deal_schedule/list_preparation_schedules_responses.go similarity index 100% rename from client/swagger/client/deal_schedule/list_preparation_schedules_responses.go rename to client/swagger/http/deal_schedule/list_preparation_schedules_responses.go diff --git a/client/swagger/client/deal_schedule/list_schedules_parameters.go b/client/swagger/http/deal_schedule/list_schedules_parameters.go similarity index 100% rename from client/swagger/client/deal_schedule/list_schedules_parameters.go rename to client/swagger/http/deal_schedule/list_schedules_parameters.go diff --git a/client/swagger/client/deal_schedule/list_schedules_responses.go b/client/swagger/http/deal_schedule/list_schedules_responses.go similarity index 100% rename from client/swagger/client/deal_schedule/list_schedules_responses.go rename to client/swagger/http/deal_schedule/list_schedules_responses.go diff --git a/client/swagger/client/deal_schedule/pause_schedule_parameters.go b/client/swagger/http/deal_schedule/pause_schedule_parameters.go similarity index 100% rename from client/swagger/client/deal_schedule/pause_schedule_parameters.go rename to client/swagger/http/deal_schedule/pause_schedule_parameters.go diff --git a/client/swagger/client/deal_schedule/pause_schedule_responses.go b/client/swagger/http/deal_schedule/pause_schedule_responses.go similarity index 100% rename from client/swagger/client/deal_schedule/pause_schedule_responses.go rename to client/swagger/http/deal_schedule/pause_schedule_responses.go diff --git a/client/swagger/client/deal_schedule/remove_schedule_parameters.go b/client/swagger/http/deal_schedule/remove_schedule_parameters.go similarity index 100% rename from client/swagger/client/deal_schedule/remove_schedule_parameters.go rename to client/swagger/http/deal_schedule/remove_schedule_parameters.go diff --git a/client/swagger/client/deal_schedule/remove_schedule_responses.go b/client/swagger/http/deal_schedule/remove_schedule_responses.go similarity index 100% rename from client/swagger/client/deal_schedule/remove_schedule_responses.go rename to client/swagger/http/deal_schedule/remove_schedule_responses.go diff --git a/client/swagger/client/deal_schedule/resume_schedule_parameters.go b/client/swagger/http/deal_schedule/resume_schedule_parameters.go similarity index 100% rename from client/swagger/client/deal_schedule/resume_schedule_parameters.go rename to client/swagger/http/deal_schedule/resume_schedule_parameters.go diff --git a/client/swagger/client/deal_schedule/resume_schedule_responses.go b/client/swagger/http/deal_schedule/resume_schedule_responses.go similarity index 100% rename from client/swagger/client/deal_schedule/resume_schedule_responses.go rename to client/swagger/http/deal_schedule/resume_schedule_responses.go diff --git a/client/swagger/client/deal_schedule/update_schedule_parameters.go b/client/swagger/http/deal_schedule/update_schedule_parameters.go similarity index 100% rename from client/swagger/client/deal_schedule/update_schedule_parameters.go rename to client/swagger/http/deal_schedule/update_schedule_parameters.go diff --git a/client/swagger/client/deal_schedule/update_schedule_responses.go b/client/swagger/http/deal_schedule/update_schedule_responses.go similarity index 100% rename from client/swagger/client/deal_schedule/update_schedule_responses.go rename to client/swagger/http/deal_schedule/update_schedule_responses.go diff --git a/client/swagger/client/deal_template/create_deal_template_parameters.go b/client/swagger/http/deal_template/create_deal_template_parameters.go similarity index 100% rename from client/swagger/client/deal_template/create_deal_template_parameters.go rename to client/swagger/http/deal_template/create_deal_template_parameters.go diff --git a/client/swagger/client/deal_template/create_deal_template_responses.go b/client/swagger/http/deal_template/create_deal_template_responses.go similarity index 100% rename from client/swagger/client/deal_template/create_deal_template_responses.go rename to client/swagger/http/deal_template/create_deal_template_responses.go diff --git a/client/swagger/client/deal_template/deal_template_client.go b/client/swagger/http/deal_template/deal_template_client.go similarity index 100% rename from client/swagger/client/deal_template/deal_template_client.go rename to client/swagger/http/deal_template/deal_template_client.go diff --git a/client/swagger/client/deal_template/delete_deal_template_parameters.go b/client/swagger/http/deal_template/delete_deal_template_parameters.go similarity index 100% rename from client/swagger/client/deal_template/delete_deal_template_parameters.go rename to client/swagger/http/deal_template/delete_deal_template_parameters.go diff --git a/client/swagger/client/deal_template/delete_deal_template_responses.go b/client/swagger/http/deal_template/delete_deal_template_responses.go similarity index 100% rename from client/swagger/client/deal_template/delete_deal_template_responses.go rename to client/swagger/http/deal_template/delete_deal_template_responses.go diff --git a/client/swagger/client/deal_template/get_deal_template_parameters.go b/client/swagger/http/deal_template/get_deal_template_parameters.go similarity index 100% rename from client/swagger/client/deal_template/get_deal_template_parameters.go rename to client/swagger/http/deal_template/get_deal_template_parameters.go diff --git a/client/swagger/client/deal_template/get_deal_template_responses.go b/client/swagger/http/deal_template/get_deal_template_responses.go similarity index 100% rename from client/swagger/client/deal_template/get_deal_template_responses.go rename to client/swagger/http/deal_template/get_deal_template_responses.go diff --git a/client/swagger/client/deal_template/list_deal_templates_parameters.go b/client/swagger/http/deal_template/list_deal_templates_parameters.go similarity index 100% rename from client/swagger/client/deal_template/list_deal_templates_parameters.go rename to client/swagger/http/deal_template/list_deal_templates_parameters.go diff --git a/client/swagger/client/deal_template/list_deal_templates_responses.go b/client/swagger/http/deal_template/list_deal_templates_responses.go similarity index 100% rename from client/swagger/client/deal_template/list_deal_templates_responses.go rename to client/swagger/http/deal_template/list_deal_templates_responses.go diff --git a/client/swagger/client/deal_template/update_deal_template_parameters.go b/client/swagger/http/deal_template/update_deal_template_parameters.go similarity index 100% rename from client/swagger/client/deal_template/update_deal_template_parameters.go rename to client/swagger/http/deal_template/update_deal_template_parameters.go diff --git a/client/swagger/client/deal_template/update_deal_template_responses.go b/client/swagger/http/deal_template/update_deal_template_responses.go similarity index 100% rename from client/swagger/client/deal_template/update_deal_template_responses.go rename to client/swagger/http/deal_template/update_deal_template_responses.go diff --git a/client/swagger/client/error_logs/error_logs_client.go b/client/swagger/http/error_logs/error_logs_client.go similarity index 100% rename from client/swagger/client/error_logs/error_logs_client.go rename to client/swagger/http/error_logs/error_logs_client.go diff --git a/client/swagger/client/error_logs/list_error_logs_parameters.go b/client/swagger/http/error_logs/list_error_logs_parameters.go similarity index 100% rename from client/swagger/client/error_logs/list_error_logs_parameters.go rename to client/swagger/http/error_logs/list_error_logs_parameters.go diff --git a/client/swagger/client/error_logs/list_error_logs_responses.go b/client/swagger/http/error_logs/list_error_logs_responses.go similarity index 100% rename from client/swagger/client/error_logs/list_error_logs_responses.go rename to client/swagger/http/error_logs/list_error_logs_responses.go diff --git a/client/swagger/client/file/file_client.go b/client/swagger/http/file/file_client.go similarity index 100% rename from client/swagger/client/file/file_client.go rename to client/swagger/http/file/file_client.go diff --git a/client/swagger/client/file/get_file_deals_parameters.go b/client/swagger/http/file/get_file_deals_parameters.go similarity index 100% rename from client/swagger/client/file/get_file_deals_parameters.go rename to client/swagger/http/file/get_file_deals_parameters.go diff --git a/client/swagger/client/file/get_file_deals_responses.go b/client/swagger/http/file/get_file_deals_responses.go similarity index 100% rename from client/swagger/client/file/get_file_deals_responses.go rename to client/swagger/http/file/get_file_deals_responses.go diff --git a/client/swagger/client/file/get_file_parameters.go b/client/swagger/http/file/get_file_parameters.go similarity index 100% rename from client/swagger/client/file/get_file_parameters.go rename to client/swagger/http/file/get_file_parameters.go diff --git a/client/swagger/client/file/get_file_responses.go b/client/swagger/http/file/get_file_responses.go similarity index 100% rename from client/swagger/client/file/get_file_responses.go rename to client/swagger/http/file/get_file_responses.go diff --git a/client/swagger/client/file/prepare_to_pack_file_parameters.go b/client/swagger/http/file/prepare_to_pack_file_parameters.go similarity index 100% rename from client/swagger/client/file/prepare_to_pack_file_parameters.go rename to client/swagger/http/file/prepare_to_pack_file_parameters.go diff --git a/client/swagger/client/file/prepare_to_pack_file_responses.go b/client/swagger/http/file/prepare_to_pack_file_responses.go similarity index 100% rename from client/swagger/client/file/prepare_to_pack_file_responses.go rename to client/swagger/http/file/prepare_to_pack_file_responses.go diff --git a/client/swagger/client/file/push_file_parameters.go b/client/swagger/http/file/push_file_parameters.go similarity index 100% rename from client/swagger/client/file/push_file_parameters.go rename to client/swagger/http/file/push_file_parameters.go diff --git a/client/swagger/client/file/push_file_responses.go b/client/swagger/http/file/push_file_responses.go similarity index 100% rename from client/swagger/client/file/push_file_responses.go rename to client/swagger/http/file/push_file_responses.go diff --git a/client/swagger/client/file/retrieve_file_parameters.go b/client/swagger/http/file/retrieve_file_parameters.go similarity index 100% rename from client/swagger/client/file/retrieve_file_parameters.go rename to client/swagger/http/file/retrieve_file_parameters.go diff --git a/client/swagger/client/file/retrieve_file_responses.go b/client/swagger/http/file/retrieve_file_responses.go similarity index 100% rename from client/swagger/client/file/retrieve_file_responses.go rename to client/swagger/http/file/retrieve_file_responses.go diff --git a/client/swagger/client/job/job_client.go b/client/swagger/http/job/job_client.go similarity index 100% rename from client/swagger/client/job/job_client.go rename to client/swagger/http/job/job_client.go diff --git a/client/swagger/client/job/pack_parameters.go b/client/swagger/http/job/pack_parameters.go similarity index 100% rename from client/swagger/client/job/pack_parameters.go rename to client/swagger/http/job/pack_parameters.go diff --git a/client/swagger/client/job/pack_responses.go b/client/swagger/http/job/pack_responses.go similarity index 100% rename from client/swagger/client/job/pack_responses.go rename to client/swagger/http/job/pack_responses.go diff --git a/client/swagger/client/job/pause_dag_gen_parameters.go b/client/swagger/http/job/pause_dag_gen_parameters.go similarity index 100% rename from client/swagger/client/job/pause_dag_gen_parameters.go rename to client/swagger/http/job/pause_dag_gen_parameters.go diff --git a/client/swagger/client/job/pause_dag_gen_responses.go b/client/swagger/http/job/pause_dag_gen_responses.go similarity index 100% rename from client/swagger/client/job/pause_dag_gen_responses.go rename to client/swagger/http/job/pause_dag_gen_responses.go diff --git a/client/swagger/client/job/pause_pack_parameters.go b/client/swagger/http/job/pause_pack_parameters.go similarity index 100% rename from client/swagger/client/job/pause_pack_parameters.go rename to client/swagger/http/job/pause_pack_parameters.go diff --git a/client/swagger/client/job/pause_pack_responses.go b/client/swagger/http/job/pause_pack_responses.go similarity index 100% rename from client/swagger/client/job/pause_pack_responses.go rename to client/swagger/http/job/pause_pack_responses.go diff --git a/client/swagger/client/job/pause_scan_parameters.go b/client/swagger/http/job/pause_scan_parameters.go similarity index 100% rename from client/swagger/client/job/pause_scan_parameters.go rename to client/swagger/http/job/pause_scan_parameters.go diff --git a/client/swagger/client/job/pause_scan_responses.go b/client/swagger/http/job/pause_scan_responses.go similarity index 100% rename from client/swagger/client/job/pause_scan_responses.go rename to client/swagger/http/job/pause_scan_responses.go diff --git a/client/swagger/client/job/prepare_to_pack_source_parameters.go b/client/swagger/http/job/prepare_to_pack_source_parameters.go similarity index 100% rename from client/swagger/client/job/prepare_to_pack_source_parameters.go rename to client/swagger/http/job/prepare_to_pack_source_parameters.go diff --git a/client/swagger/client/job/prepare_to_pack_source_responses.go b/client/swagger/http/job/prepare_to_pack_source_responses.go similarity index 100% rename from client/swagger/client/job/prepare_to_pack_source_responses.go rename to client/swagger/http/job/prepare_to_pack_source_responses.go diff --git a/client/swagger/client/job/start_dag_gen_parameters.go b/client/swagger/http/job/start_dag_gen_parameters.go similarity index 100% rename from client/swagger/client/job/start_dag_gen_parameters.go rename to client/swagger/http/job/start_dag_gen_parameters.go diff --git a/client/swagger/client/job/start_dag_gen_responses.go b/client/swagger/http/job/start_dag_gen_responses.go similarity index 100% rename from client/swagger/client/job/start_dag_gen_responses.go rename to client/swagger/http/job/start_dag_gen_responses.go diff --git a/client/swagger/client/job/start_pack_parameters.go b/client/swagger/http/job/start_pack_parameters.go similarity index 100% rename from client/swagger/client/job/start_pack_parameters.go rename to client/swagger/http/job/start_pack_parameters.go diff --git a/client/swagger/client/job/start_pack_responses.go b/client/swagger/http/job/start_pack_responses.go similarity index 100% rename from client/swagger/client/job/start_pack_responses.go rename to client/swagger/http/job/start_pack_responses.go diff --git a/client/swagger/client/job/start_scan_parameters.go b/client/swagger/http/job/start_scan_parameters.go similarity index 100% rename from client/swagger/client/job/start_scan_parameters.go rename to client/swagger/http/job/start_scan_parameters.go diff --git a/client/swagger/client/job/start_scan_responses.go b/client/swagger/http/job/start_scan_responses.go similarity index 100% rename from client/swagger/client/job/start_scan_responses.go rename to client/swagger/http/job/start_scan_responses.go diff --git a/client/swagger/client/piece/add_piece_parameters.go b/client/swagger/http/piece/add_piece_parameters.go similarity index 100% rename from client/swagger/client/piece/add_piece_parameters.go rename to client/swagger/http/piece/add_piece_parameters.go diff --git a/client/swagger/client/piece/add_piece_responses.go b/client/swagger/http/piece/add_piece_responses.go similarity index 100% rename from client/swagger/client/piece/add_piece_responses.go rename to client/swagger/http/piece/add_piece_responses.go diff --git a/client/swagger/client/piece/get_piece_id_metadata_parameters.go b/client/swagger/http/piece/get_piece_id_metadata_parameters.go similarity index 100% rename from client/swagger/client/piece/get_piece_id_metadata_parameters.go rename to client/swagger/http/piece/get_piece_id_metadata_parameters.go diff --git a/client/swagger/client/piece/get_piece_id_metadata_responses.go b/client/swagger/http/piece/get_piece_id_metadata_responses.go similarity index 100% rename from client/swagger/client/piece/get_piece_id_metadata_responses.go rename to client/swagger/http/piece/get_piece_id_metadata_responses.go diff --git a/client/swagger/client/piece/list_pieces_parameters.go b/client/swagger/http/piece/list_pieces_parameters.go similarity index 100% rename from client/swagger/client/piece/list_pieces_parameters.go rename to client/swagger/http/piece/list_pieces_parameters.go diff --git a/client/swagger/client/piece/list_pieces_responses.go b/client/swagger/http/piece/list_pieces_responses.go similarity index 100% rename from client/swagger/client/piece/list_pieces_responses.go rename to client/swagger/http/piece/list_pieces_responses.go diff --git a/client/swagger/client/piece/piece_client.go b/client/swagger/http/piece/piece_client.go similarity index 100% rename from client/swagger/client/piece/piece_client.go rename to client/swagger/http/piece/piece_client.go diff --git a/client/swagger/client/preparation/add_output_storage_parameters.go b/client/swagger/http/preparation/add_output_storage_parameters.go similarity index 100% rename from client/swagger/client/preparation/add_output_storage_parameters.go rename to client/swagger/http/preparation/add_output_storage_parameters.go diff --git a/client/swagger/client/preparation/add_output_storage_responses.go b/client/swagger/http/preparation/add_output_storage_responses.go similarity index 100% rename from client/swagger/client/preparation/add_output_storage_responses.go rename to client/swagger/http/preparation/add_output_storage_responses.go diff --git a/client/swagger/client/preparation/add_source_storage_parameters.go b/client/swagger/http/preparation/add_source_storage_parameters.go similarity index 100% rename from client/swagger/client/preparation/add_source_storage_parameters.go rename to client/swagger/http/preparation/add_source_storage_parameters.go diff --git a/client/swagger/client/preparation/add_source_storage_responses.go b/client/swagger/http/preparation/add_source_storage_responses.go similarity index 100% rename from client/swagger/client/preparation/add_source_storage_responses.go rename to client/swagger/http/preparation/add_source_storage_responses.go diff --git a/client/swagger/client/preparation/create_preparation_parameters.go b/client/swagger/http/preparation/create_preparation_parameters.go similarity index 100% rename from client/swagger/client/preparation/create_preparation_parameters.go rename to client/swagger/http/preparation/create_preparation_parameters.go diff --git a/client/swagger/client/preparation/create_preparation_responses.go b/client/swagger/http/preparation/create_preparation_responses.go similarity index 100% rename from client/swagger/client/preparation/create_preparation_responses.go rename to client/swagger/http/preparation/create_preparation_responses.go diff --git a/client/swagger/client/preparation/explore_preparation_parameters.go b/client/swagger/http/preparation/explore_preparation_parameters.go similarity index 100% rename from client/swagger/client/preparation/explore_preparation_parameters.go rename to client/swagger/http/preparation/explore_preparation_parameters.go diff --git a/client/swagger/client/preparation/explore_preparation_responses.go b/client/swagger/http/preparation/explore_preparation_responses.go similarity index 100% rename from client/swagger/client/preparation/explore_preparation_responses.go rename to client/swagger/http/preparation/explore_preparation_responses.go diff --git a/client/swagger/client/preparation/get_preparation_status_parameters.go b/client/swagger/http/preparation/get_preparation_status_parameters.go similarity index 100% rename from client/swagger/client/preparation/get_preparation_status_parameters.go rename to client/swagger/http/preparation/get_preparation_status_parameters.go diff --git a/client/swagger/client/preparation/get_preparation_status_responses.go b/client/swagger/http/preparation/get_preparation_status_responses.go similarity index 100% rename from client/swagger/client/preparation/get_preparation_status_responses.go rename to client/swagger/http/preparation/get_preparation_status_responses.go diff --git a/client/swagger/client/preparation/list_preparations_parameters.go b/client/swagger/http/preparation/list_preparations_parameters.go similarity index 100% rename from client/swagger/client/preparation/list_preparations_parameters.go rename to client/swagger/http/preparation/list_preparations_parameters.go diff --git a/client/swagger/client/preparation/list_preparations_responses.go b/client/swagger/http/preparation/list_preparations_responses.go similarity index 100% rename from client/swagger/client/preparation/list_preparations_responses.go rename to client/swagger/http/preparation/list_preparations_responses.go diff --git a/client/swagger/client/preparation/preparation_client.go b/client/swagger/http/preparation/preparation_client.go similarity index 100% rename from client/swagger/client/preparation/preparation_client.go rename to client/swagger/http/preparation/preparation_client.go diff --git a/client/swagger/client/preparation/remove_output_storage_parameters.go b/client/swagger/http/preparation/remove_output_storage_parameters.go similarity index 100% rename from client/swagger/client/preparation/remove_output_storage_parameters.go rename to client/swagger/http/preparation/remove_output_storage_parameters.go diff --git a/client/swagger/client/preparation/remove_output_storage_responses.go b/client/swagger/http/preparation/remove_output_storage_responses.go similarity index 100% rename from client/swagger/client/preparation/remove_output_storage_responses.go rename to client/swagger/http/preparation/remove_output_storage_responses.go diff --git a/client/swagger/client/preparation/remove_preparation_parameters.go b/client/swagger/http/preparation/remove_preparation_parameters.go similarity index 100% rename from client/swagger/client/preparation/remove_preparation_parameters.go rename to client/swagger/http/preparation/remove_preparation_parameters.go diff --git a/client/swagger/client/preparation/remove_preparation_responses.go b/client/swagger/http/preparation/remove_preparation_responses.go similarity index 100% rename from client/swagger/client/preparation/remove_preparation_responses.go rename to client/swagger/http/preparation/remove_preparation_responses.go diff --git a/client/swagger/client/preparation/rename_preparation_parameters.go b/client/swagger/http/preparation/rename_preparation_parameters.go similarity index 100% rename from client/swagger/client/preparation/rename_preparation_parameters.go rename to client/swagger/http/preparation/rename_preparation_parameters.go diff --git a/client/swagger/client/preparation/rename_preparation_responses.go b/client/swagger/http/preparation/rename_preparation_responses.go similarity index 100% rename from client/swagger/client/preparation/rename_preparation_responses.go rename to client/swagger/http/preparation/rename_preparation_responses.go diff --git a/client/swagger/client/singularity_api_client.go b/client/swagger/http/singularity_api_client.go similarity index 95% rename from client/swagger/client/singularity_api_client.go rename to client/swagger/http/singularity_api_client.go index 2d29a236..be7b14b1 100644 --- a/client/swagger/client/singularity_api_client.go +++ b/client/swagger/http/singularity_api_client.go @@ -1,6 +1,6 @@ // Code generated by go-swagger; DO NOT EDIT. -package client +package http // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command @@ -10,19 +10,19 @@ import ( httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/data-preservation-programs/singularity/client/swagger/client/admin" - "github.com/data-preservation-programs/singularity/client/swagger/client/deal" - "github.com/data-preservation-programs/singularity/client/swagger/client/deal_schedule" - "github.com/data-preservation-programs/singularity/client/swagger/client/deal_template" - "github.com/data-preservation-programs/singularity/client/swagger/client/error_logs" - "github.com/data-preservation-programs/singularity/client/swagger/client/file" - "github.com/data-preservation-programs/singularity/client/swagger/client/job" - "github.com/data-preservation-programs/singularity/client/swagger/client/piece" - "github.com/data-preservation-programs/singularity/client/swagger/client/preparation" - "github.com/data-preservation-programs/singularity/client/swagger/client/state_changes" - "github.com/data-preservation-programs/singularity/client/swagger/client/storage" - "github.com/data-preservation-programs/singularity/client/swagger/client/wallet" - "github.com/data-preservation-programs/singularity/client/swagger/client/wallet_association" + "github.com/data-preservation-programs/singularity/client/swagger/http/admin" + "github.com/data-preservation-programs/singularity/client/swagger/http/deal" + "github.com/data-preservation-programs/singularity/client/swagger/http/deal_schedule" + "github.com/data-preservation-programs/singularity/client/swagger/http/deal_template" + "github.com/data-preservation-programs/singularity/client/swagger/http/error_logs" + "github.com/data-preservation-programs/singularity/client/swagger/http/file" + "github.com/data-preservation-programs/singularity/client/swagger/http/job" + "github.com/data-preservation-programs/singularity/client/swagger/http/piece" + "github.com/data-preservation-programs/singularity/client/swagger/http/preparation" + "github.com/data-preservation-programs/singularity/client/swagger/http/state_changes" + "github.com/data-preservation-programs/singularity/client/swagger/http/storage" + "github.com/data-preservation-programs/singularity/client/swagger/http/wallet" + "github.com/data-preservation-programs/singularity/client/swagger/http/wallet_association" ) // Default singularity API HTTP client. diff --git a/client/swagger/client/state_changes/get_deal_state_changes_parameters.go b/client/swagger/http/state_changes/get_deal_state_changes_parameters.go similarity index 100% rename from client/swagger/client/state_changes/get_deal_state_changes_parameters.go rename to client/swagger/http/state_changes/get_deal_state_changes_parameters.go diff --git a/client/swagger/client/state_changes/get_deal_state_changes_responses.go b/client/swagger/http/state_changes/get_deal_state_changes_responses.go similarity index 100% rename from client/swagger/client/state_changes/get_deal_state_changes_responses.go rename to client/swagger/http/state_changes/get_deal_state_changes_responses.go diff --git a/client/swagger/client/state_changes/get_state_change_stats_parameters.go b/client/swagger/http/state_changes/get_state_change_stats_parameters.go similarity index 100% rename from client/swagger/client/state_changes/get_state_change_stats_parameters.go rename to client/swagger/http/state_changes/get_state_change_stats_parameters.go diff --git a/client/swagger/client/state_changes/get_state_change_stats_responses.go b/client/swagger/http/state_changes/get_state_change_stats_responses.go similarity index 100% rename from client/swagger/client/state_changes/get_state_change_stats_responses.go rename to client/swagger/http/state_changes/get_state_change_stats_responses.go diff --git a/client/swagger/client/state_changes/list_state_changes_parameters.go b/client/swagger/http/state_changes/list_state_changes_parameters.go similarity index 100% rename from client/swagger/client/state_changes/list_state_changes_parameters.go rename to client/swagger/http/state_changes/list_state_changes_parameters.go diff --git a/client/swagger/client/state_changes/list_state_changes_responses.go b/client/swagger/http/state_changes/list_state_changes_responses.go similarity index 100% rename from client/swagger/client/state_changes/list_state_changes_responses.go rename to client/swagger/http/state_changes/list_state_changes_responses.go diff --git a/client/swagger/client/state_changes/state_changes_client.go b/client/swagger/http/state_changes/state_changes_client.go similarity index 100% rename from client/swagger/client/state_changes/state_changes_client.go rename to client/swagger/http/state_changes/state_changes_client.go diff --git a/client/swagger/client/storage/create_acd_storage_parameters.go b/client/swagger/http/storage/create_acd_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_acd_storage_parameters.go rename to client/swagger/http/storage/create_acd_storage_parameters.go diff --git a/client/swagger/client/storage/create_acd_storage_responses.go b/client/swagger/http/storage/create_acd_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_acd_storage_responses.go rename to client/swagger/http/storage/create_acd_storage_responses.go diff --git a/client/swagger/client/storage/create_azureblob_storage_parameters.go b/client/swagger/http/storage/create_azureblob_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_azureblob_storage_parameters.go rename to client/swagger/http/storage/create_azureblob_storage_parameters.go diff --git a/client/swagger/client/storage/create_azureblob_storage_responses.go b/client/swagger/http/storage/create_azureblob_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_azureblob_storage_responses.go rename to client/swagger/http/storage/create_azureblob_storage_responses.go diff --git a/client/swagger/client/storage/create_b2_storage_parameters.go b/client/swagger/http/storage/create_b2_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_b2_storage_parameters.go rename to client/swagger/http/storage/create_b2_storage_parameters.go diff --git a/client/swagger/client/storage/create_b2_storage_responses.go b/client/swagger/http/storage/create_b2_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_b2_storage_responses.go rename to client/swagger/http/storage/create_b2_storage_responses.go diff --git a/client/swagger/client/storage/create_box_storage_parameters.go b/client/swagger/http/storage/create_box_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_box_storage_parameters.go rename to client/swagger/http/storage/create_box_storage_parameters.go diff --git a/client/swagger/client/storage/create_box_storage_responses.go b/client/swagger/http/storage/create_box_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_box_storage_responses.go rename to client/swagger/http/storage/create_box_storage_responses.go diff --git a/client/swagger/client/storage/create_drive_storage_parameters.go b/client/swagger/http/storage/create_drive_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_drive_storage_parameters.go rename to client/swagger/http/storage/create_drive_storage_parameters.go diff --git a/client/swagger/client/storage/create_drive_storage_responses.go b/client/swagger/http/storage/create_drive_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_drive_storage_responses.go rename to client/swagger/http/storage/create_drive_storage_responses.go diff --git a/client/swagger/client/storage/create_dropbox_storage_parameters.go b/client/swagger/http/storage/create_dropbox_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_dropbox_storage_parameters.go rename to client/swagger/http/storage/create_dropbox_storage_parameters.go diff --git a/client/swagger/client/storage/create_dropbox_storage_responses.go b/client/swagger/http/storage/create_dropbox_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_dropbox_storage_responses.go rename to client/swagger/http/storage/create_dropbox_storage_responses.go diff --git a/client/swagger/client/storage/create_fichier_storage_parameters.go b/client/swagger/http/storage/create_fichier_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_fichier_storage_parameters.go rename to client/swagger/http/storage/create_fichier_storage_parameters.go diff --git a/client/swagger/client/storage/create_fichier_storage_responses.go b/client/swagger/http/storage/create_fichier_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_fichier_storage_responses.go rename to client/swagger/http/storage/create_fichier_storage_responses.go diff --git a/client/swagger/client/storage/create_filefabric_storage_parameters.go b/client/swagger/http/storage/create_filefabric_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_filefabric_storage_parameters.go rename to client/swagger/http/storage/create_filefabric_storage_parameters.go diff --git a/client/swagger/client/storage/create_filefabric_storage_responses.go b/client/swagger/http/storage/create_filefabric_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_filefabric_storage_responses.go rename to client/swagger/http/storage/create_filefabric_storage_responses.go diff --git a/client/swagger/client/storage/create_ftp_storage_parameters.go b/client/swagger/http/storage/create_ftp_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_ftp_storage_parameters.go rename to client/swagger/http/storage/create_ftp_storage_parameters.go diff --git a/client/swagger/client/storage/create_ftp_storage_responses.go b/client/swagger/http/storage/create_ftp_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_ftp_storage_responses.go rename to client/swagger/http/storage/create_ftp_storage_responses.go diff --git a/client/swagger/client/storage/create_gcs_storage_parameters.go b/client/swagger/http/storage/create_gcs_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_gcs_storage_parameters.go rename to client/swagger/http/storage/create_gcs_storage_parameters.go diff --git a/client/swagger/client/storage/create_gcs_storage_responses.go b/client/swagger/http/storage/create_gcs_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_gcs_storage_responses.go rename to client/swagger/http/storage/create_gcs_storage_responses.go diff --git a/client/swagger/client/storage/create_gphotos_storage_parameters.go b/client/swagger/http/storage/create_gphotos_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_gphotos_storage_parameters.go rename to client/swagger/http/storage/create_gphotos_storage_parameters.go diff --git a/client/swagger/client/storage/create_gphotos_storage_responses.go b/client/swagger/http/storage/create_gphotos_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_gphotos_storage_responses.go rename to client/swagger/http/storage/create_gphotos_storage_responses.go diff --git a/client/swagger/client/storage/create_hdfs_storage_parameters.go b/client/swagger/http/storage/create_hdfs_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_hdfs_storage_parameters.go rename to client/swagger/http/storage/create_hdfs_storage_parameters.go diff --git a/client/swagger/client/storage/create_hdfs_storage_responses.go b/client/swagger/http/storage/create_hdfs_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_hdfs_storage_responses.go rename to client/swagger/http/storage/create_hdfs_storage_responses.go diff --git a/client/swagger/client/storage/create_hidrive_storage_parameters.go b/client/swagger/http/storage/create_hidrive_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_hidrive_storage_parameters.go rename to client/swagger/http/storage/create_hidrive_storage_parameters.go diff --git a/client/swagger/client/storage/create_hidrive_storage_responses.go b/client/swagger/http/storage/create_hidrive_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_hidrive_storage_responses.go rename to client/swagger/http/storage/create_hidrive_storage_responses.go diff --git a/client/swagger/client/storage/create_http_storage_parameters.go b/client/swagger/http/storage/create_http_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_http_storage_parameters.go rename to client/swagger/http/storage/create_http_storage_parameters.go diff --git a/client/swagger/client/storage/create_http_storage_responses.go b/client/swagger/http/storage/create_http_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_http_storage_responses.go rename to client/swagger/http/storage/create_http_storage_responses.go diff --git a/client/swagger/client/storage/create_internetarchive_storage_parameters.go b/client/swagger/http/storage/create_internetarchive_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_internetarchive_storage_parameters.go rename to client/swagger/http/storage/create_internetarchive_storage_parameters.go diff --git a/client/swagger/client/storage/create_internetarchive_storage_responses.go b/client/swagger/http/storage/create_internetarchive_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_internetarchive_storage_responses.go rename to client/swagger/http/storage/create_internetarchive_storage_responses.go diff --git a/client/swagger/client/storage/create_jottacloud_storage_parameters.go b/client/swagger/http/storage/create_jottacloud_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_jottacloud_storage_parameters.go rename to client/swagger/http/storage/create_jottacloud_storage_parameters.go diff --git a/client/swagger/client/storage/create_jottacloud_storage_responses.go b/client/swagger/http/storage/create_jottacloud_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_jottacloud_storage_responses.go rename to client/swagger/http/storage/create_jottacloud_storage_responses.go diff --git a/client/swagger/client/storage/create_koofr_digistorage_storage_parameters.go b/client/swagger/http/storage/create_koofr_digistorage_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_koofr_digistorage_storage_parameters.go rename to client/swagger/http/storage/create_koofr_digistorage_storage_parameters.go diff --git a/client/swagger/client/storage/create_koofr_digistorage_storage_responses.go b/client/swagger/http/storage/create_koofr_digistorage_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_koofr_digistorage_storage_responses.go rename to client/swagger/http/storage/create_koofr_digistorage_storage_responses.go diff --git a/client/swagger/client/storage/create_koofr_koofr_storage_parameters.go b/client/swagger/http/storage/create_koofr_koofr_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_koofr_koofr_storage_parameters.go rename to client/swagger/http/storage/create_koofr_koofr_storage_parameters.go diff --git a/client/swagger/client/storage/create_koofr_koofr_storage_responses.go b/client/swagger/http/storage/create_koofr_koofr_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_koofr_koofr_storage_responses.go rename to client/swagger/http/storage/create_koofr_koofr_storage_responses.go diff --git a/client/swagger/client/storage/create_koofr_other_storage_parameters.go b/client/swagger/http/storage/create_koofr_other_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_koofr_other_storage_parameters.go rename to client/swagger/http/storage/create_koofr_other_storage_parameters.go diff --git a/client/swagger/client/storage/create_koofr_other_storage_responses.go b/client/swagger/http/storage/create_koofr_other_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_koofr_other_storage_responses.go rename to client/swagger/http/storage/create_koofr_other_storage_responses.go diff --git a/client/swagger/client/storage/create_local_storage_parameters.go b/client/swagger/http/storage/create_local_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_local_storage_parameters.go rename to client/swagger/http/storage/create_local_storage_parameters.go diff --git a/client/swagger/client/storage/create_local_storage_responses.go b/client/swagger/http/storage/create_local_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_local_storage_responses.go rename to client/swagger/http/storage/create_local_storage_responses.go diff --git a/client/swagger/client/storage/create_mailru_storage_parameters.go b/client/swagger/http/storage/create_mailru_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_mailru_storage_parameters.go rename to client/swagger/http/storage/create_mailru_storage_parameters.go diff --git a/client/swagger/client/storage/create_mailru_storage_responses.go b/client/swagger/http/storage/create_mailru_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_mailru_storage_responses.go rename to client/swagger/http/storage/create_mailru_storage_responses.go diff --git a/client/swagger/client/storage/create_mega_storage_parameters.go b/client/swagger/http/storage/create_mega_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_mega_storage_parameters.go rename to client/swagger/http/storage/create_mega_storage_parameters.go diff --git a/client/swagger/client/storage/create_mega_storage_responses.go b/client/swagger/http/storage/create_mega_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_mega_storage_responses.go rename to client/swagger/http/storage/create_mega_storage_responses.go diff --git a/client/swagger/client/storage/create_netstorage_storage_parameters.go b/client/swagger/http/storage/create_netstorage_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_netstorage_storage_parameters.go rename to client/swagger/http/storage/create_netstorage_storage_parameters.go diff --git a/client/swagger/client/storage/create_netstorage_storage_responses.go b/client/swagger/http/storage/create_netstorage_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_netstorage_storage_responses.go rename to client/swagger/http/storage/create_netstorage_storage_responses.go diff --git a/client/swagger/client/storage/create_onedrive_storage_parameters.go b/client/swagger/http/storage/create_onedrive_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_onedrive_storage_parameters.go rename to client/swagger/http/storage/create_onedrive_storage_parameters.go diff --git a/client/swagger/client/storage/create_onedrive_storage_responses.go b/client/swagger/http/storage/create_onedrive_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_onedrive_storage_responses.go rename to client/swagger/http/storage/create_onedrive_storage_responses.go diff --git a/client/swagger/client/storage/create_oos_env_auth_storage_parameters.go b/client/swagger/http/storage/create_oos_env_auth_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_oos_env_auth_storage_parameters.go rename to client/swagger/http/storage/create_oos_env_auth_storage_parameters.go diff --git a/client/swagger/client/storage/create_oos_env_auth_storage_responses.go b/client/swagger/http/storage/create_oos_env_auth_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_oos_env_auth_storage_responses.go rename to client/swagger/http/storage/create_oos_env_auth_storage_responses.go diff --git a/client/swagger/client/storage/create_oos_instance_principal_auth_storage_parameters.go b/client/swagger/http/storage/create_oos_instance_principal_auth_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_oos_instance_principal_auth_storage_parameters.go rename to client/swagger/http/storage/create_oos_instance_principal_auth_storage_parameters.go diff --git a/client/swagger/client/storage/create_oos_instance_principal_auth_storage_responses.go b/client/swagger/http/storage/create_oos_instance_principal_auth_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_oos_instance_principal_auth_storage_responses.go rename to client/swagger/http/storage/create_oos_instance_principal_auth_storage_responses.go diff --git a/client/swagger/client/storage/create_oos_no_auth_storage_parameters.go b/client/swagger/http/storage/create_oos_no_auth_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_oos_no_auth_storage_parameters.go rename to client/swagger/http/storage/create_oos_no_auth_storage_parameters.go diff --git a/client/swagger/client/storage/create_oos_no_auth_storage_responses.go b/client/swagger/http/storage/create_oos_no_auth_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_oos_no_auth_storage_responses.go rename to client/swagger/http/storage/create_oos_no_auth_storage_responses.go diff --git a/client/swagger/client/storage/create_oos_resource_principal_auth_storage_parameters.go b/client/swagger/http/storage/create_oos_resource_principal_auth_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_oos_resource_principal_auth_storage_parameters.go rename to client/swagger/http/storage/create_oos_resource_principal_auth_storage_parameters.go diff --git a/client/swagger/client/storage/create_oos_resource_principal_auth_storage_responses.go b/client/swagger/http/storage/create_oos_resource_principal_auth_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_oos_resource_principal_auth_storage_responses.go rename to client/swagger/http/storage/create_oos_resource_principal_auth_storage_responses.go diff --git a/client/swagger/client/storage/create_oos_user_principal_auth_storage_parameters.go b/client/swagger/http/storage/create_oos_user_principal_auth_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_oos_user_principal_auth_storage_parameters.go rename to client/swagger/http/storage/create_oos_user_principal_auth_storage_parameters.go diff --git a/client/swagger/client/storage/create_oos_user_principal_auth_storage_responses.go b/client/swagger/http/storage/create_oos_user_principal_auth_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_oos_user_principal_auth_storage_responses.go rename to client/swagger/http/storage/create_oos_user_principal_auth_storage_responses.go diff --git a/client/swagger/client/storage/create_opendrive_storage_parameters.go b/client/swagger/http/storage/create_opendrive_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_opendrive_storage_parameters.go rename to client/swagger/http/storage/create_opendrive_storage_parameters.go diff --git a/client/swagger/client/storage/create_opendrive_storage_responses.go b/client/swagger/http/storage/create_opendrive_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_opendrive_storage_responses.go rename to client/swagger/http/storage/create_opendrive_storage_responses.go diff --git a/client/swagger/client/storage/create_pcloud_storage_parameters.go b/client/swagger/http/storage/create_pcloud_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_pcloud_storage_parameters.go rename to client/swagger/http/storage/create_pcloud_storage_parameters.go diff --git a/client/swagger/client/storage/create_pcloud_storage_responses.go b/client/swagger/http/storage/create_pcloud_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_pcloud_storage_responses.go rename to client/swagger/http/storage/create_pcloud_storage_responses.go diff --git a/client/swagger/client/storage/create_premiumizeme_storage_parameters.go b/client/swagger/http/storage/create_premiumizeme_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_premiumizeme_storage_parameters.go rename to client/swagger/http/storage/create_premiumizeme_storage_parameters.go diff --git a/client/swagger/client/storage/create_premiumizeme_storage_responses.go b/client/swagger/http/storage/create_premiumizeme_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_premiumizeme_storage_responses.go rename to client/swagger/http/storage/create_premiumizeme_storage_responses.go diff --git a/client/swagger/client/storage/create_putio_storage_parameters.go b/client/swagger/http/storage/create_putio_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_putio_storage_parameters.go rename to client/swagger/http/storage/create_putio_storage_parameters.go diff --git a/client/swagger/client/storage/create_putio_storage_responses.go b/client/swagger/http/storage/create_putio_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_putio_storage_responses.go rename to client/swagger/http/storage/create_putio_storage_responses.go diff --git a/client/swagger/client/storage/create_qingstor_storage_parameters.go b/client/swagger/http/storage/create_qingstor_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_qingstor_storage_parameters.go rename to client/swagger/http/storage/create_qingstor_storage_parameters.go diff --git a/client/swagger/client/storage/create_qingstor_storage_responses.go b/client/swagger/http/storage/create_qingstor_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_qingstor_storage_responses.go rename to client/swagger/http/storage/create_qingstor_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_a_w_s_storage_parameters.go b/client/swagger/http/storage/create_s3_a_w_s_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_a_w_s_storage_parameters.go rename to client/swagger/http/storage/create_s3_a_w_s_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_a_w_s_storage_responses.go b/client/swagger/http/storage/create_s3_a_w_s_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_a_w_s_storage_responses.go rename to client/swagger/http/storage/create_s3_a_w_s_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_alibaba_storage_parameters.go b/client/swagger/http/storage/create_s3_alibaba_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_alibaba_storage_parameters.go rename to client/swagger/http/storage/create_s3_alibaba_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_alibaba_storage_responses.go b/client/swagger/http/storage/create_s3_alibaba_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_alibaba_storage_responses.go rename to client/swagger/http/storage/create_s3_alibaba_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_arvan_cloud_storage_parameters.go b/client/swagger/http/storage/create_s3_arvan_cloud_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_arvan_cloud_storage_parameters.go rename to client/swagger/http/storage/create_s3_arvan_cloud_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_arvan_cloud_storage_responses.go b/client/swagger/http/storage/create_s3_arvan_cloud_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_arvan_cloud_storage_responses.go rename to client/swagger/http/storage/create_s3_arvan_cloud_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_ceph_storage_parameters.go b/client/swagger/http/storage/create_s3_ceph_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_ceph_storage_parameters.go rename to client/swagger/http/storage/create_s3_ceph_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_ceph_storage_responses.go b/client/swagger/http/storage/create_s3_ceph_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_ceph_storage_responses.go rename to client/swagger/http/storage/create_s3_ceph_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_china_mobile_storage_parameters.go b/client/swagger/http/storage/create_s3_china_mobile_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_china_mobile_storage_parameters.go rename to client/swagger/http/storage/create_s3_china_mobile_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_china_mobile_storage_responses.go b/client/swagger/http/storage/create_s3_china_mobile_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_china_mobile_storage_responses.go rename to client/swagger/http/storage/create_s3_china_mobile_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_cloudflare_storage_parameters.go b/client/swagger/http/storage/create_s3_cloudflare_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_cloudflare_storage_parameters.go rename to client/swagger/http/storage/create_s3_cloudflare_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_cloudflare_storage_responses.go b/client/swagger/http/storage/create_s3_cloudflare_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_cloudflare_storage_responses.go rename to client/swagger/http/storage/create_s3_cloudflare_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_digital_ocean_storage_parameters.go b/client/swagger/http/storage/create_s3_digital_ocean_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_digital_ocean_storage_parameters.go rename to client/swagger/http/storage/create_s3_digital_ocean_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_digital_ocean_storage_responses.go b/client/swagger/http/storage/create_s3_digital_ocean_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_digital_ocean_storage_responses.go rename to client/swagger/http/storage/create_s3_digital_ocean_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_dreamhost_storage_parameters.go b/client/swagger/http/storage/create_s3_dreamhost_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_dreamhost_storage_parameters.go rename to client/swagger/http/storage/create_s3_dreamhost_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_dreamhost_storage_responses.go b/client/swagger/http/storage/create_s3_dreamhost_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_dreamhost_storage_responses.go rename to client/swagger/http/storage/create_s3_dreamhost_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_huawei_o_b_s_storage_parameters.go b/client/swagger/http/storage/create_s3_huawei_o_b_s_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_huawei_o_b_s_storage_parameters.go rename to client/swagger/http/storage/create_s3_huawei_o_b_s_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_huawei_o_b_s_storage_responses.go b/client/swagger/http/storage/create_s3_huawei_o_b_s_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_huawei_o_b_s_storage_responses.go rename to client/swagger/http/storage/create_s3_huawei_o_b_s_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_i_b_m_c_o_s_storage_parameters.go b/client/swagger/http/storage/create_s3_i_b_m_c_o_s_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_i_b_m_c_o_s_storage_parameters.go rename to client/swagger/http/storage/create_s3_i_b_m_c_o_s_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_i_b_m_c_o_s_storage_responses.go b/client/swagger/http/storage/create_s3_i_b_m_c_o_s_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_i_b_m_c_o_s_storage_responses.go rename to client/swagger/http/storage/create_s3_i_b_m_c_o_s_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_i_drive_storage_parameters.go b/client/swagger/http/storage/create_s3_i_drive_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_i_drive_storage_parameters.go rename to client/swagger/http/storage/create_s3_i_drive_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_i_drive_storage_responses.go b/client/swagger/http/storage/create_s3_i_drive_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_i_drive_storage_responses.go rename to client/swagger/http/storage/create_s3_i_drive_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_i_o_n_o_s_storage_parameters.go b/client/swagger/http/storage/create_s3_i_o_n_o_s_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_i_o_n_o_s_storage_parameters.go rename to client/swagger/http/storage/create_s3_i_o_n_o_s_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_i_o_n_o_s_storage_responses.go b/client/swagger/http/storage/create_s3_i_o_n_o_s_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_i_o_n_o_s_storage_responses.go rename to client/swagger/http/storage/create_s3_i_o_n_o_s_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_liara_storage_parameters.go b/client/swagger/http/storage/create_s3_liara_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_liara_storage_parameters.go rename to client/swagger/http/storage/create_s3_liara_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_liara_storage_responses.go b/client/swagger/http/storage/create_s3_liara_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_liara_storage_responses.go rename to client/swagger/http/storage/create_s3_liara_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_lyve_cloud_storage_parameters.go b/client/swagger/http/storage/create_s3_lyve_cloud_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_lyve_cloud_storage_parameters.go rename to client/swagger/http/storage/create_s3_lyve_cloud_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_lyve_cloud_storage_responses.go b/client/swagger/http/storage/create_s3_lyve_cloud_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_lyve_cloud_storage_responses.go rename to client/swagger/http/storage/create_s3_lyve_cloud_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_minio_storage_parameters.go b/client/swagger/http/storage/create_s3_minio_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_minio_storage_parameters.go rename to client/swagger/http/storage/create_s3_minio_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_minio_storage_responses.go b/client/swagger/http/storage/create_s3_minio_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_minio_storage_responses.go rename to client/swagger/http/storage/create_s3_minio_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_netease_storage_parameters.go b/client/swagger/http/storage/create_s3_netease_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_netease_storage_parameters.go rename to client/swagger/http/storage/create_s3_netease_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_netease_storage_responses.go b/client/swagger/http/storage/create_s3_netease_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_netease_storage_responses.go rename to client/swagger/http/storage/create_s3_netease_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_other_storage_parameters.go b/client/swagger/http/storage/create_s3_other_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_other_storage_parameters.go rename to client/swagger/http/storage/create_s3_other_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_other_storage_responses.go b/client/swagger/http/storage/create_s3_other_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_other_storage_responses.go rename to client/swagger/http/storage/create_s3_other_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_qiniu_storage_parameters.go b/client/swagger/http/storage/create_s3_qiniu_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_qiniu_storage_parameters.go rename to client/swagger/http/storage/create_s3_qiniu_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_qiniu_storage_responses.go b/client/swagger/http/storage/create_s3_qiniu_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_qiniu_storage_responses.go rename to client/swagger/http/storage/create_s3_qiniu_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_rack_corp_storage_parameters.go b/client/swagger/http/storage/create_s3_rack_corp_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_rack_corp_storage_parameters.go rename to client/swagger/http/storage/create_s3_rack_corp_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_rack_corp_storage_responses.go b/client/swagger/http/storage/create_s3_rack_corp_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_rack_corp_storage_responses.go rename to client/swagger/http/storage/create_s3_rack_corp_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_scaleway_storage_parameters.go b/client/swagger/http/storage/create_s3_scaleway_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_scaleway_storage_parameters.go rename to client/swagger/http/storage/create_s3_scaleway_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_scaleway_storage_responses.go b/client/swagger/http/storage/create_s3_scaleway_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_scaleway_storage_responses.go rename to client/swagger/http/storage/create_s3_scaleway_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_seaweed_f_s_storage_parameters.go b/client/swagger/http/storage/create_s3_seaweed_f_s_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_seaweed_f_s_storage_parameters.go rename to client/swagger/http/storage/create_s3_seaweed_f_s_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_seaweed_f_s_storage_responses.go b/client/swagger/http/storage/create_s3_seaweed_f_s_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_seaweed_f_s_storage_responses.go rename to client/swagger/http/storage/create_s3_seaweed_f_s_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_stack_path_storage_parameters.go b/client/swagger/http/storage/create_s3_stack_path_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_stack_path_storage_parameters.go rename to client/swagger/http/storage/create_s3_stack_path_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_stack_path_storage_responses.go b/client/swagger/http/storage/create_s3_stack_path_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_stack_path_storage_responses.go rename to client/swagger/http/storage/create_s3_stack_path_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_storj_storage_parameters.go b/client/swagger/http/storage/create_s3_storj_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_storj_storage_parameters.go rename to client/swagger/http/storage/create_s3_storj_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_storj_storage_responses.go b/client/swagger/http/storage/create_s3_storj_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_storj_storage_responses.go rename to client/swagger/http/storage/create_s3_storj_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_tencent_c_o_s_storage_parameters.go b/client/swagger/http/storage/create_s3_tencent_c_o_s_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_tencent_c_o_s_storage_parameters.go rename to client/swagger/http/storage/create_s3_tencent_c_o_s_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_tencent_c_o_s_storage_responses.go b/client/swagger/http/storage/create_s3_tencent_c_o_s_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_tencent_c_o_s_storage_responses.go rename to client/swagger/http/storage/create_s3_tencent_c_o_s_storage_responses.go diff --git a/client/swagger/client/storage/create_s3_wasabi_storage_parameters.go b/client/swagger/http/storage/create_s3_wasabi_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_s3_wasabi_storage_parameters.go rename to client/swagger/http/storage/create_s3_wasabi_storage_parameters.go diff --git a/client/swagger/client/storage/create_s3_wasabi_storage_responses.go b/client/swagger/http/storage/create_s3_wasabi_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_s3_wasabi_storage_responses.go rename to client/swagger/http/storage/create_s3_wasabi_storage_responses.go diff --git a/client/swagger/client/storage/create_seafile_storage_parameters.go b/client/swagger/http/storage/create_seafile_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_seafile_storage_parameters.go rename to client/swagger/http/storage/create_seafile_storage_parameters.go diff --git a/client/swagger/client/storage/create_seafile_storage_responses.go b/client/swagger/http/storage/create_seafile_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_seafile_storage_responses.go rename to client/swagger/http/storage/create_seafile_storage_responses.go diff --git a/client/swagger/client/storage/create_sftp_storage_parameters.go b/client/swagger/http/storage/create_sftp_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_sftp_storage_parameters.go rename to client/swagger/http/storage/create_sftp_storage_parameters.go diff --git a/client/swagger/client/storage/create_sftp_storage_responses.go b/client/swagger/http/storage/create_sftp_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_sftp_storage_responses.go rename to client/swagger/http/storage/create_sftp_storage_responses.go diff --git a/client/swagger/client/storage/create_sharefile_storage_parameters.go b/client/swagger/http/storage/create_sharefile_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_sharefile_storage_parameters.go rename to client/swagger/http/storage/create_sharefile_storage_parameters.go diff --git a/client/swagger/client/storage/create_sharefile_storage_responses.go b/client/swagger/http/storage/create_sharefile_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_sharefile_storage_responses.go rename to client/swagger/http/storage/create_sharefile_storage_responses.go diff --git a/client/swagger/client/storage/create_sia_storage_parameters.go b/client/swagger/http/storage/create_sia_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_sia_storage_parameters.go rename to client/swagger/http/storage/create_sia_storage_parameters.go diff --git a/client/swagger/client/storage/create_sia_storage_responses.go b/client/swagger/http/storage/create_sia_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_sia_storage_responses.go rename to client/swagger/http/storage/create_sia_storage_responses.go diff --git a/client/swagger/client/storage/create_smb_storage_parameters.go b/client/swagger/http/storage/create_smb_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_smb_storage_parameters.go rename to client/swagger/http/storage/create_smb_storage_parameters.go diff --git a/client/swagger/client/storage/create_smb_storage_responses.go b/client/swagger/http/storage/create_smb_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_smb_storage_responses.go rename to client/swagger/http/storage/create_smb_storage_responses.go diff --git a/client/swagger/client/storage/create_storj_existing_storage_parameters.go b/client/swagger/http/storage/create_storj_existing_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_storj_existing_storage_parameters.go rename to client/swagger/http/storage/create_storj_existing_storage_parameters.go diff --git a/client/swagger/client/storage/create_storj_existing_storage_responses.go b/client/swagger/http/storage/create_storj_existing_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_storj_existing_storage_responses.go rename to client/swagger/http/storage/create_storj_existing_storage_responses.go diff --git a/client/swagger/client/storage/create_storj_new_storage_parameters.go b/client/swagger/http/storage/create_storj_new_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_storj_new_storage_parameters.go rename to client/swagger/http/storage/create_storj_new_storage_parameters.go diff --git a/client/swagger/client/storage/create_storj_new_storage_responses.go b/client/swagger/http/storage/create_storj_new_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_storj_new_storage_responses.go rename to client/swagger/http/storage/create_storj_new_storage_responses.go diff --git a/client/swagger/client/storage/create_sugarsync_storage_parameters.go b/client/swagger/http/storage/create_sugarsync_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_sugarsync_storage_parameters.go rename to client/swagger/http/storage/create_sugarsync_storage_parameters.go diff --git a/client/swagger/client/storage/create_sugarsync_storage_responses.go b/client/swagger/http/storage/create_sugarsync_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_sugarsync_storage_responses.go rename to client/swagger/http/storage/create_sugarsync_storage_responses.go diff --git a/client/swagger/client/storage/create_swift_storage_parameters.go b/client/swagger/http/storage/create_swift_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_swift_storage_parameters.go rename to client/swagger/http/storage/create_swift_storage_parameters.go diff --git a/client/swagger/client/storage/create_swift_storage_responses.go b/client/swagger/http/storage/create_swift_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_swift_storage_responses.go rename to client/swagger/http/storage/create_swift_storage_responses.go diff --git a/client/swagger/client/storage/create_union_storage_parameters.go b/client/swagger/http/storage/create_union_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_union_storage_parameters.go rename to client/swagger/http/storage/create_union_storage_parameters.go diff --git a/client/swagger/client/storage/create_union_storage_responses.go b/client/swagger/http/storage/create_union_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_union_storage_responses.go rename to client/swagger/http/storage/create_union_storage_responses.go diff --git a/client/swagger/client/storage/create_uptobox_storage_parameters.go b/client/swagger/http/storage/create_uptobox_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_uptobox_storage_parameters.go rename to client/swagger/http/storage/create_uptobox_storage_parameters.go diff --git a/client/swagger/client/storage/create_uptobox_storage_responses.go b/client/swagger/http/storage/create_uptobox_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_uptobox_storage_responses.go rename to client/swagger/http/storage/create_uptobox_storage_responses.go diff --git a/client/swagger/client/storage/create_webdav_storage_parameters.go b/client/swagger/http/storage/create_webdav_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_webdav_storage_parameters.go rename to client/swagger/http/storage/create_webdav_storage_parameters.go diff --git a/client/swagger/client/storage/create_webdav_storage_responses.go b/client/swagger/http/storage/create_webdav_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_webdav_storage_responses.go rename to client/swagger/http/storage/create_webdav_storage_responses.go diff --git a/client/swagger/client/storage/create_yandex_storage_parameters.go b/client/swagger/http/storage/create_yandex_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_yandex_storage_parameters.go rename to client/swagger/http/storage/create_yandex_storage_parameters.go diff --git a/client/swagger/client/storage/create_yandex_storage_responses.go b/client/swagger/http/storage/create_yandex_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_yandex_storage_responses.go rename to client/swagger/http/storage/create_yandex_storage_responses.go diff --git a/client/swagger/client/storage/create_zoho_storage_parameters.go b/client/swagger/http/storage/create_zoho_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/create_zoho_storage_parameters.go rename to client/swagger/http/storage/create_zoho_storage_parameters.go diff --git a/client/swagger/client/storage/create_zoho_storage_responses.go b/client/swagger/http/storage/create_zoho_storage_responses.go similarity index 100% rename from client/swagger/client/storage/create_zoho_storage_responses.go rename to client/swagger/http/storage/create_zoho_storage_responses.go diff --git a/client/swagger/client/storage/explore_storage_parameters.go b/client/swagger/http/storage/explore_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/explore_storage_parameters.go rename to client/swagger/http/storage/explore_storage_parameters.go diff --git a/client/swagger/client/storage/explore_storage_responses.go b/client/swagger/http/storage/explore_storage_responses.go similarity index 100% rename from client/swagger/client/storage/explore_storage_responses.go rename to client/swagger/http/storage/explore_storage_responses.go diff --git a/client/swagger/client/storage/list_storages_parameters.go b/client/swagger/http/storage/list_storages_parameters.go similarity index 100% rename from client/swagger/client/storage/list_storages_parameters.go rename to client/swagger/http/storage/list_storages_parameters.go diff --git a/client/swagger/client/storage/list_storages_responses.go b/client/swagger/http/storage/list_storages_responses.go similarity index 100% rename from client/swagger/client/storage/list_storages_responses.go rename to client/swagger/http/storage/list_storages_responses.go diff --git a/client/swagger/client/storage/remove_storage_parameters.go b/client/swagger/http/storage/remove_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/remove_storage_parameters.go rename to client/swagger/http/storage/remove_storage_parameters.go diff --git a/client/swagger/client/storage/remove_storage_responses.go b/client/swagger/http/storage/remove_storage_responses.go similarity index 100% rename from client/swagger/client/storage/remove_storage_responses.go rename to client/swagger/http/storage/remove_storage_responses.go diff --git a/client/swagger/client/storage/rename_storage_parameters.go b/client/swagger/http/storage/rename_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/rename_storage_parameters.go rename to client/swagger/http/storage/rename_storage_parameters.go diff --git a/client/swagger/client/storage/rename_storage_responses.go b/client/swagger/http/storage/rename_storage_responses.go similarity index 100% rename from client/swagger/client/storage/rename_storage_responses.go rename to client/swagger/http/storage/rename_storage_responses.go diff --git a/client/swagger/client/storage/storage_client.go b/client/swagger/http/storage/storage_client.go similarity index 100% rename from client/swagger/client/storage/storage_client.go rename to client/swagger/http/storage/storage_client.go diff --git a/client/swagger/client/storage/update_storage_parameters.go b/client/swagger/http/storage/update_storage_parameters.go similarity index 100% rename from client/swagger/client/storage/update_storage_parameters.go rename to client/swagger/http/storage/update_storage_parameters.go diff --git a/client/swagger/client/storage/update_storage_responses.go b/client/swagger/http/storage/update_storage_responses.go similarity index 100% rename from client/swagger/client/storage/update_storage_responses.go rename to client/swagger/http/storage/update_storage_responses.go diff --git a/client/swagger/client/wallet/create_wallet_parameters.go b/client/swagger/http/wallet/create_wallet_parameters.go similarity index 100% rename from client/swagger/client/wallet/create_wallet_parameters.go rename to client/swagger/http/wallet/create_wallet_parameters.go diff --git a/client/swagger/client/wallet/create_wallet_responses.go b/client/swagger/http/wallet/create_wallet_responses.go similarity index 100% rename from client/swagger/client/wallet/create_wallet_responses.go rename to client/swagger/http/wallet/create_wallet_responses.go diff --git a/client/swagger/client/wallet/get_wallet_balance_parameters.go b/client/swagger/http/wallet/get_wallet_balance_parameters.go similarity index 100% rename from client/swagger/client/wallet/get_wallet_balance_parameters.go rename to client/swagger/http/wallet/get_wallet_balance_parameters.go diff --git a/client/swagger/client/wallet/get_wallet_balance_responses.go b/client/swagger/http/wallet/get_wallet_balance_responses.go similarity index 100% rename from client/swagger/client/wallet/get_wallet_balance_responses.go rename to client/swagger/http/wallet/get_wallet_balance_responses.go diff --git a/client/swagger/client/wallet/import_wallet_parameters.go b/client/swagger/http/wallet/import_wallet_parameters.go similarity index 100% rename from client/swagger/client/wallet/import_wallet_parameters.go rename to client/swagger/http/wallet/import_wallet_parameters.go diff --git a/client/swagger/client/wallet/import_wallet_responses.go b/client/swagger/http/wallet/import_wallet_responses.go similarity index 100% rename from client/swagger/client/wallet/import_wallet_responses.go rename to client/swagger/http/wallet/import_wallet_responses.go diff --git a/client/swagger/client/wallet/init_wallet_parameters.go b/client/swagger/http/wallet/init_wallet_parameters.go similarity index 100% rename from client/swagger/client/wallet/init_wallet_parameters.go rename to client/swagger/http/wallet/init_wallet_parameters.go diff --git a/client/swagger/client/wallet/init_wallet_responses.go b/client/swagger/http/wallet/init_wallet_responses.go similarity index 100% rename from client/swagger/client/wallet/init_wallet_responses.go rename to client/swagger/http/wallet/init_wallet_responses.go diff --git a/client/swagger/client/wallet/list_wallets_parameters.go b/client/swagger/http/wallet/list_wallets_parameters.go similarity index 100% rename from client/swagger/client/wallet/list_wallets_parameters.go rename to client/swagger/http/wallet/list_wallets_parameters.go diff --git a/client/swagger/client/wallet/list_wallets_responses.go b/client/swagger/http/wallet/list_wallets_responses.go similarity index 100% rename from client/swagger/client/wallet/list_wallets_responses.go rename to client/swagger/http/wallet/list_wallets_responses.go diff --git a/client/swagger/client/wallet/remove_wallet_parameters.go b/client/swagger/http/wallet/remove_wallet_parameters.go similarity index 100% rename from client/swagger/client/wallet/remove_wallet_parameters.go rename to client/swagger/http/wallet/remove_wallet_parameters.go diff --git a/client/swagger/client/wallet/remove_wallet_responses.go b/client/swagger/http/wallet/remove_wallet_responses.go similarity index 100% rename from client/swagger/client/wallet/remove_wallet_responses.go rename to client/swagger/http/wallet/remove_wallet_responses.go diff --git a/client/swagger/client/wallet/update_wallet_parameters.go b/client/swagger/http/wallet/update_wallet_parameters.go similarity index 100% rename from client/swagger/client/wallet/update_wallet_parameters.go rename to client/swagger/http/wallet/update_wallet_parameters.go diff --git a/client/swagger/client/wallet/update_wallet_responses.go b/client/swagger/http/wallet/update_wallet_responses.go similarity index 100% rename from client/swagger/client/wallet/update_wallet_responses.go rename to client/swagger/http/wallet/update_wallet_responses.go diff --git a/client/swagger/client/wallet/wallet_client.go b/client/swagger/http/wallet/wallet_client.go similarity index 100% rename from client/swagger/client/wallet/wallet_client.go rename to client/swagger/http/wallet/wallet_client.go diff --git a/client/swagger/client/wallet_association/attach_wallet_parameters.go b/client/swagger/http/wallet_association/attach_wallet_parameters.go similarity index 100% rename from client/swagger/client/wallet_association/attach_wallet_parameters.go rename to client/swagger/http/wallet_association/attach_wallet_parameters.go diff --git a/client/swagger/client/wallet_association/attach_wallet_responses.go b/client/swagger/http/wallet_association/attach_wallet_responses.go similarity index 100% rename from client/swagger/client/wallet_association/attach_wallet_responses.go rename to client/swagger/http/wallet_association/attach_wallet_responses.go diff --git a/client/swagger/client/wallet_association/detach_wallet_parameters.go b/client/swagger/http/wallet_association/detach_wallet_parameters.go similarity index 100% rename from client/swagger/client/wallet_association/detach_wallet_parameters.go rename to client/swagger/http/wallet_association/detach_wallet_parameters.go diff --git a/client/swagger/client/wallet_association/detach_wallet_responses.go b/client/swagger/http/wallet_association/detach_wallet_responses.go similarity index 100% rename from client/swagger/client/wallet_association/detach_wallet_responses.go rename to client/swagger/http/wallet_association/detach_wallet_responses.go diff --git a/client/swagger/client/wallet_association/list_attached_wallets_parameters.go b/client/swagger/http/wallet_association/list_attached_wallets_parameters.go similarity index 100% rename from client/swagger/client/wallet_association/list_attached_wallets_parameters.go rename to client/swagger/http/wallet_association/list_attached_wallets_parameters.go diff --git a/client/swagger/client/wallet_association/list_attached_wallets_responses.go b/client/swagger/http/wallet_association/list_attached_wallets_responses.go similarity index 100% rename from client/swagger/client/wallet_association/list_attached_wallets_responses.go rename to client/swagger/http/wallet_association/list_attached_wallets_responses.go diff --git a/client/swagger/client/wallet_association/wallet_association_client.go b/client/swagger/http/wallet_association/wallet_association_client.go similarity index 100% rename from client/swagger/client/wallet_association/wallet_association_client.go rename to client/swagger/http/wallet_association/wallet_association_client.go diff --git a/client/swagger/models/model_client_config.go b/client/swagger/models/model_client_config.go index 086f9603..610902df 100644 --- a/client/swagger/models/model_client_config.go +++ b/client/swagger/models/model_client_config.go @@ -26,7 +26,7 @@ type ModelClientConfig struct { // Path to Client SSL private key (PEM) for mutual TLS auth ClientKey string `json:"clientKey,omitempty"` - // HTTP Client Connect timeout in nanoseconds + // HTTP Client Connect timeout ConnectTimeout int64 `json:"connectTimeout,omitempty"` // Disable HTTP/2 in the transport @@ -35,7 +35,7 @@ type ModelClientConfig struct { // Disable HTTP keep-alives and use each connection once. DisableHTTPKeepAlives bool `json:"disableHttpKeepAlives,omitempty"` - // Timeout when using expect / 100-continue in HTTP in nanoseconds + // Timeout when using expect / 100-continue in HTTP ExpectContinueTimeout int64 `json:"expectContinueTimeout,omitempty"` // Set HTTP header for all transactions @@ -50,13 +50,13 @@ type ModelClientConfig struct { // Don't set Accept-Encoding: gzip NoGzip bool `json:"noGzip,omitempty"` - // Constant backoff between retries in nanoseconds. Default is 1s. + // Constant backoff between retries. Default is 1s. RetryBackoff int64 `json:"retryBackoff,omitempty"` // Exponential backoff between retries. Default is 1.0. RetryBackoffExponential float64 `json:"retryBackoffExponential,omitempty"` - // Delay between retries in nanoseconds. Default is 1s. + // Delay between retries. Default is 1s. RetryDelay int64 `json:"retryDelay,omitempty"` // Maximum number of retries. Default is 10 retries. @@ -68,7 +68,7 @@ type ModelClientConfig struct { // Skip inaccessible files. Default is false. SkipInaccessibleFile bool `json:"skipInaccessibleFile,omitempty"` - // IO idle timeout in nanoseconds + // IO idle timeout Timeout int64 `json:"timeout,omitempty"` // Use server modified time instead of object metadata diff --git a/client/swagger/models/time_duration.go b/client/swagger/models/time_duration.go index 8cf0e19c..ed584b35 100644 --- a/client/swagger/models/time_duration.go +++ b/client/swagger/models/time_duration.go @@ -7,7 +7,11 @@ package models import ( "context" + "encoding/json" + + "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" + "github.com/go-openapi/validate" ) // TimeDuration time duration @@ -15,8 +19,38 @@ import ( // swagger:model time.Duration type TimeDuration int64 +// for schema +var timeDurationEnum []interface{} + +func init() { + var res []TimeDuration + if err := json.Unmarshal([]byte(`[1,1000,1000000,1000000000,60000000000,3600000000000]`), &res); err != nil { + panic(err) + } + for _, v := range res { + timeDurationEnum = append(timeDurationEnum, v) + } +} + +func (m TimeDuration) validateTimeDurationEnum(path, location string, value TimeDuration) error { + if err := validate.EnumCase(path, location, value, timeDurationEnum, true); err != nil { + return err + } + return nil +} + // Validate validates this time duration func (m TimeDuration) Validate(formats strfmt.Registry) error { + var res []error + + // value enum + if err := m.validateTimeDurationEnum("", "body", m); err != nil { + return err + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } return nil } diff --git a/cmd/api_test.go b/cmd/api_test.go index b93cec9f..a36489bc 100644 --- a/cmd/api_test.go +++ b/cmd/api_test.go @@ -12,16 +12,15 @@ import ( "testing" "time" - "github.com/data-preservation-programs/singularity/client/swagger/client/file" - "github.com/data-preservation-programs/singularity/client/swagger/client/job" - "github.com/data-preservation-programs/singularity/client/swagger/client/piece" - "github.com/data-preservation-programs/singularity/client/swagger/client/preparation" - "github.com/data-preservation-programs/singularity/client/swagger/client/storage" + "github.com/data-preservation-programs/singularity/client/swagger/http" + "github.com/data-preservation-programs/singularity/client/swagger/http/file" + "github.com/data-preservation-programs/singularity/client/swagger/http/job" + "github.com/data-preservation-programs/singularity/client/swagger/http/piece" + "github.com/data-preservation-programs/singularity/client/swagger/http/preparation" + "github.com/data-preservation-programs/singularity/client/swagger/http/storage" "github.com/data-preservation-programs/singularity/client/swagger/models" "github.com/data-preservation-programs/singularity/service/workflow" "github.com/data-preservation-programs/singularity/util/testutil" - httptransport "github.com/go-openapi/runtime/client" - "github.com/go-openapi/strfmt" "github.com/gotidy/ptr" "github.com/parnurzeal/gorequest" "github.com/stretchr/testify/require" @@ -163,13 +162,7 @@ func TestMotionIntegration(t *testing.T) { }) } -func setupPreparation(t *testing.T, ctx context.Context, testFileName string, testData io.Reader, disableDagInline bool) (*struct { - Storage storage.ClientService - Job job.ClientService - Piece piece.ClientService - File file.ClientService - Preparation preparation.ClientService -}, func()) { +func setupPreparation(t *testing.T, ctx context.Context, testFileName string, testData io.Reader, disableDagInline bool) (*http.SingularityAPI, func()) { t.Helper() source := t.TempDir() // write a test file @@ -191,20 +184,10 @@ func setupPreparation(t *testing.T, ctx context.Context, testFileName string, te require.NoError(t, err) output := t.TempDir() done := runAPI(t, ctx) - transport := httptransport.New(apiBind, "/api", []string{"http"}) - client := &struct { - Storage storage.ClientService - Job job.ClientService - Piece piece.ClientService - File file.ClientService - Preparation preparation.ClientService - }{ - Storage: storage.New(transport, strfmt.Default), - Job: job.New(transport, strfmt.Default), - Piece: piece.New(transport, strfmt.Default), - File: file.New(transport, strfmt.Default), - Preparation: preparation.New(transport, strfmt.Default), - } + client := http.NewHTTPClientWithConfig(nil, &http.TransportConfig{ + Host: apiBind, + BasePath: http.DefaultBasePath, + }) // Create source storage response, err := client.Storage.CreateLocalStorage(&storage.CreateLocalStorageParams{ Request: &models.StorageCreateLocalStorageRequest{ diff --git a/cmd/onboard.go b/cmd/onboard.go index 602412b1..7fa0d307 100644 --- a/cmd/onboard.go +++ b/cmd/onboard.go @@ -1033,16 +1033,13 @@ func validateOnboardInputs(c *cli.Context) error { func getOnboardClientConfig(c *cli.Context) (*model.ClientConfig, error) { var config model.ClientConfig if c.IsSet("client-connect-timeout") { - val := c.Duration("client-connect-timeout") - config.ConnectTimeout = ptr.Of(int64(val)) + config.ConnectTimeout = ptr.Of(c.Duration("client-connect-timeout")) } if c.IsSet("client-timeout") { - val := c.Duration("client-timeout") - config.Timeout = ptr.Of(int64(val)) + config.Timeout = ptr.Of(c.Duration("client-timeout")) } if c.IsSet("client-expect-continue-timeout") { - val := c.Duration("client-expect-continue-timeout") - config.ExpectContinueTimeout = ptr.Of(int64(val)) + config.ExpectContinueTimeout = ptr.Of(c.Duration("client-expect-continue-timeout")) } if c.IsSet("client-insecure-skip-verify") { config.InsecureSkipVerify = ptr.Of(c.Bool("client-insecure-skip-verify")) @@ -1083,12 +1080,10 @@ func getOnboardClientConfig(c *cli.Context) (*model.ClientConfig, error) { config.RetryMaxCount = ptr.Of(c.Int("client-retry-max")) } if c.IsSet("client-retry-delay") { - val := c.Duration("client-retry-delay") - config.RetryDelay = ptr.Of(int64(val)) + config.RetryDelay = ptr.Of(c.Duration("client-retry-delay")) } if c.IsSet("client-retry-backoff") { - val := c.Duration("client-retry-backoff") - config.RetryBackoff = ptr.Of(int64(val)) + config.RetryBackoff = ptr.Of(c.Duration("client-retry-backoff")) } if c.IsSet("client-retry-backoff-exp") { config.RetryBackoffExponential = ptr.Of(c.Float64("client-retry-backoff-exp")) diff --git a/cmd/storage/create.go b/cmd/storage/create.go index dc2a385c..94883c7e 100644 --- a/cmd/storage/create.go +++ b/cmd/storage/create.go @@ -239,16 +239,13 @@ func createAction(c *cli.Context, storageType string, provider string) error { func getClientConfig(c *cli.Context) (*model.ClientConfig, error) { var config model.ClientConfig if c.IsSet("client-connect-timeout") { - val := c.Duration("client-connect-timeout") - config.ConnectTimeout = ptr.Of(int64(val)) + config.ConnectTimeout = ptr.Of(c.Duration("client-connect-timeout")) } if c.IsSet("client-timeout") { - val := c.Duration("client-timeout") - config.Timeout = ptr.Of(int64(val)) + config.Timeout = ptr.Of(c.Duration("client-timeout")) } if c.IsSet("client-expect-continue-timeout") { - val := c.Duration("client-expect-continue-timeout") - config.ExpectContinueTimeout = ptr.Of(int64(val)) + config.ExpectContinueTimeout = ptr.Of(c.Duration("client-expect-continue-timeout")) } if c.IsSet("client-insecure-skip-verify") { config.InsecureSkipVerify = ptr.Of(c.Bool("client-insecure-skip-verify")) @@ -289,12 +286,10 @@ func getClientConfig(c *cli.Context) (*model.ClientConfig, error) { config.RetryMaxCount = ptr.Of(c.Int("client-retry-max")) } if c.IsSet("client-retry-delay") { - val := c.Duration("client-retry-delay") - config.RetryDelay = ptr.Of(int64(val)) + config.RetryDelay = ptr.Of(c.Duration("client-retry-delay")) } if c.IsSet("client-retry-backoff") { - val := c.Duration("client-retry-backoff") - config.RetryBackoff = ptr.Of(int64(val)) + config.RetryBackoff = ptr.Of(c.Duration("client-retry-backoff")) } if c.IsSet("client-retry-backoff-exp") { config.RetryBackoffExponential = ptr.Of(c.Float64("client-retry-backoff-exp")) diff --git a/cmd/storage/update.go b/cmd/storage/update.go index 74112cdf..a6de8196 100644 --- a/cmd/storage/update.go +++ b/cmd/storage/update.go @@ -178,16 +178,13 @@ func updateAction(c *cli.Context, storageType string, provider string) error { func GetClientConfigForUpdate(c *cli.Context) (*model.ClientConfig, error) { var config model.ClientConfig if c.IsSet("client-connect-timeout") { - val := c.Duration("client-connect-timeout") - config.ConnectTimeout = ptr.Of(int64(val)) + config.ConnectTimeout = ptr.Of(c.Duration("client-connect-timeout")) } if c.IsSet("client-timeout") { - val := c.Duration("client-timeout") - config.Timeout = ptr.Of(int64(val)) + config.Timeout = ptr.Of(c.Duration("client-timeout")) } if c.IsSet("client-expect-continue-timeout") { - val := c.Duration("client-expect-continue-timeout") - config.ExpectContinueTimeout = ptr.Of(int64(val)) + config.ExpectContinueTimeout = ptr.Of(c.Duration("client-expect-continue-timeout")) } if c.IsSet("client-insecure-skip-verify") { config.InsecureSkipVerify = ptr.Of(c.Bool("client-insecure-skip-verify")) @@ -232,12 +229,10 @@ func GetClientConfigForUpdate(c *cli.Context) (*model.ClientConfig, error) { config.RetryMaxCount = ptr.Of(c.Int("client-retry-max")) } if c.IsSet("client-retry-delay") { - val := c.Duration("client-retry-delay") - config.RetryDelay = ptr.Of(int64(val)) + config.RetryDelay = ptr.Of(c.Duration("client-retry-delay")) } if c.IsSet("client-retry-backoff") { - val := c.Duration("client-retry-backoff") - config.RetryBackoff = ptr.Of(int64(val)) + config.RetryBackoff = ptr.Of(c.Duration("client-retry-backoff")) } if c.IsSet("client-retry-backoff-exp") { config.RetryBackoffExponential = ptr.Of(c.Float64("client-retry-backoff-exp")) diff --git a/docgen.sh b/docgen.sh index 7e070504..b539c233 100755 --- a/docgen.sh +++ b/docgen.sh @@ -1,4 +1,3 @@ - env USER='$USER' go run handler/storage/gen/main.go rm -rf docs/en/cli-reference env USER='$USER' go run docs/gen/clireference/main.go diff --git a/docs/swagger/docs.go b/docs/swagger/docs.go index 05604953..903d01dd 100644 --- a/docs/swagger/docs.go +++ b/docs/swagger/docs.go @@ -6973,7 +6973,7 @@ const docTemplate = `{ "type": "string" }, "connectTimeout": { - "description": "HTTP Client Connect timeout in nanoseconds", + "description": "HTTP Client Connect timeout", "type": "integer" }, "disableHttp2": { @@ -6985,7 +6985,7 @@ const docTemplate = `{ "type": "boolean" }, "expectContinueTimeout": { - "description": "Timeout when using expect / 100-continue in HTTP in nanoseconds", + "description": "Timeout when using expect / 100-continue in HTTP", "type": "integer" }, "headers": { @@ -7008,7 +7008,7 @@ const docTemplate = `{ "type": "boolean" }, "retryBackoff": { - "description": "Constant backoff between retries in nanoseconds. Default is 1s.", + "description": "Constant backoff between retries. Default is 1s.", "type": "integer" }, "retryBackoffExponential": { @@ -7016,7 +7016,7 @@ const docTemplate = `{ "type": "number" }, "retryDelay": { - "description": "Delay between retries in nanoseconds. Default is 1s.", + "description": "Delay between retries. Default is 1s.", "type": "integer" }, "retryMaxCount": { @@ -7032,7 +7032,7 @@ const docTemplate = `{ "type": "boolean" }, "timeout": { - "description": "IO idle timeout in nanoseconds", + "description": "IO idle timeout", "type": "integer" }, "useServerModTime": { diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index bed086f5..d3d6cd66 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -6967,7 +6967,7 @@ "type": "string" }, "connectTimeout": { - "description": "HTTP Client Connect timeout in nanoseconds", + "description": "HTTP Client Connect timeout", "type": "integer" }, "disableHttp2": { @@ -6979,7 +6979,7 @@ "type": "boolean" }, "expectContinueTimeout": { - "description": "Timeout when using expect / 100-continue in HTTP in nanoseconds", + "description": "Timeout when using expect / 100-continue in HTTP", "type": "integer" }, "headers": { @@ -7002,7 +7002,7 @@ "type": "boolean" }, "retryBackoff": { - "description": "Constant backoff between retries in nanoseconds. Default is 1s.", + "description": "Constant backoff between retries. Default is 1s.", "type": "integer" }, "retryBackoffExponential": { @@ -7010,7 +7010,7 @@ "type": "number" }, "retryDelay": { - "description": "Delay between retries in nanoseconds. Default is 1s.", + "description": "Delay between retries. Default is 1s.", "type": "integer" }, "retryMaxCount": { @@ -7026,7 +7026,7 @@ "type": "boolean" }, "timeout": { - "description": "IO idle timeout in nanoseconds", + "description": "IO idle timeout", "type": "integer" }, "useServerModTime": { diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml index a3137766..a62b8934 100644 --- a/docs/swagger/swagger.yaml +++ b/docs/swagger/swagger.yaml @@ -498,7 +498,7 @@ definitions: description: Path to Client SSL private key (PEM) for mutual TLS auth type: string connectTimeout: - description: HTTP Client Connect timeout in nanoseconds + description: HTTP Client Connect timeout type: integer disableHttp2: description: Disable HTTP/2 in the transport @@ -507,7 +507,7 @@ definitions: description: Disable HTTP keep-alives and use each connection once. type: boolean expectContinueTimeout: - description: Timeout when using expect / 100-continue in HTTP in nanoseconds + description: Timeout when using expect / 100-continue in HTTP type: integer headers: additionalProperties: @@ -525,13 +525,13 @@ definitions: description: 'Don''t set Accept-Encoding: gzip' type: boolean retryBackoff: - description: Constant backoff between retries in nanoseconds. Default is 1s. + description: Constant backoff between retries. Default is 1s. type: integer retryBackoffExponential: description: Exponential backoff between retries. Default is 1.0. type: number retryDelay: - description: Delay between retries in nanoseconds. Default is 1s. + description: Delay between retries. Default is 1s. type: integer retryMaxCount: description: Maximum number of retries. Default is 10 retries. @@ -543,7 +543,7 @@ definitions: description: Skip inaccessible files. Default is false. type: boolean timeout: - description: IO idle timeout in nanoseconds + description: IO idle timeout type: integer useServerModTime: description: Use server modified time instead of object metadata diff --git a/go.mod b/go.mod index 63d9be81..90835e1e 100644 --- a/go.mod +++ b/go.mod @@ -22,11 +22,11 @@ require ( github.com/fxamacker/cbor/v2 v2.4.0 github.com/gammazero/workerpool v1.1.3 github.com/glebarez/sqlite v1.8.0 - github.com/go-openapi/errors v0.22.0 - github.com/go-openapi/runtime v0.28.0 - github.com/go-openapi/strfmt v0.23.0 - github.com/go-openapi/swag v0.23.0 - github.com/go-openapi/validate v0.24.0 + github.com/go-openapi/errors v0.20.4 + github.com/go-openapi/runtime v0.26.0 + github.com/go-openapi/strfmt v0.21.7 + github.com/go-openapi/swag v0.22.4 + github.com/go-openapi/validate v0.22.1 github.com/google/uuid v1.6.0 github.com/gotidy/ptr v1.4.0 github.com/hashicorp/golang-lru/v2 v2.0.7 @@ -73,10 +73,10 @@ require ( github.com/tidwall/gjson v1.18.0 github.com/urfave/cli/v2 v2.27.3 github.com/ybbus/jsonrpc/v3 v3.1.4 - go.mongodb.org/mongo-driver v1.14.0 + go.mongodb.org/mongo-driver v1.12.1 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/text v0.27.0 + golang.org/x/text v0.26.0 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da gorm.io/driver/mysql v1.5.0 gorm.io/driver/postgres v1.5.0 @@ -121,7 +121,7 @@ require ( github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/cskr/pubsub v1.0.2 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/dchest/blake2b v1.0.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect @@ -158,11 +158,11 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-openapi/analysis v0.23.0 // indirect - github.com/go-openapi/jsonpointer v0.21.0 // indirect - github.com/go-openapi/jsonreference v0.21.0 // indirect - github.com/go-openapi/loads v0.22.0 // indirect - github.com/go-openapi/spec v0.21.0 // indirect + github.com/go-openapi/analysis v0.21.4 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/loads v0.21.2 // indirect + github.com/go-openapi/spec v0.20.9 // indirect github.com/go-sql-driver/mysql v1.7.1 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect @@ -300,9 +300,9 @@ require ( github.com/pion/webrtc/v4 v4.0.8 // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/pkg/errors v0.9.1 - github.com/pkg/sftp v1.13.9 // indirect + github.com/pkg/sftp v1.13.6-0.20230213180117-971c283182b6 // indirect github.com/pkg/xattr v0.4.9 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/polydawn/refmt v0.89.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.20.5 // indirect @@ -316,7 +316,7 @@ require ( github.com/raulk/go-watchdog v1.3.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rfjakob/eme v1.1.2 // indirect - github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/shoenig/go-m1cpu v0.1.4 // indirect github.com/sirupsen/logrus v1.9.0 // indirect @@ -360,16 +360,16 @@ require ( go.uber.org/dig v1.18.0 // indirect go.uber.org/fx v1.23.0 // indirect go.uber.org/mock v0.5.0 // indirect - golang.org/x/crypto v0.40.0 // indirect + golang.org/x/crypto v0.39.0 // indirect golang.org/x/mod v0.25.0 // indirect golang.org/x/net v0.41.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect - golang.org/x/sync v0.16.0 // indirect - golang.org/x/sys v0.34.0 // indirect - golang.org/x/term v0.33.0 // indirect + golang.org/x/sync v0.15.0 // indirect + golang.org/x/sys v0.33.0 // indirect + golang.org/x/term v0.32.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.34.0 // indirect - google.golang.org/api v0.153.0 // indirect + google.golang.org/api v0.149.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.36.4 // indirect diff --git a/go.sum b/go.sum index 5fbd1598..2853acec 100644 --- a/go.sum +++ b/go.sum @@ -68,6 +68,8 @@ github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VM github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Unknwon/goconfig v1.0.0 h1:9IAu/BYbSLQi8puFjUQApZTxIHqSwrj5d8vpP8vTq4A= github.com/Unknwon/goconfig v1.0.0/go.mod h1:wngxua9XCNjvHjDiTiV26DaKDT+0c63QR6H5hjVUUxw= github.com/aalpar/deheap v0.0.0-20210914013432-0cc84d79dec3 h1:hhdWprfSpFbN7lz3W1gM40vOgvSh1WCSMxYD6gGB4Hs= @@ -77,6 +79,7 @@ github.com/abbot/go-http-auth v0.4.0/go.mod h1:Cz6ARTIzApMJDzh5bRMSUou6UMSp0IEXg github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs= github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0= @@ -141,9 +144,8 @@ github.com/cskr/pubsub v1.0.2/go.mod h1:/8MzYXk/NJAz782G8RPkFzXTZVu63VotefPnR9TI github.com/data-preservation-programs/table v0.0.3 h1:hboeauxPXybE8KlMA+RjDXz/J4xaG5CAFCcxyOm8yWo= github.com/data-preservation-programs/table v0.0.3/go.mod h1:sRGP/IuuqFc/y9QfmDyb5h6Q2wrnhhnBofEOj9aDRJg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= github.com/dchest/blake2b v1.0.0 h1:KK9LimVmE0MjRl9095XJmKqZ+iLxWATvlcpVFRtaw6s= @@ -309,32 +311,75 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU= -github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo= -github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w= -github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE= -github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= -github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= -github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= -github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= -github.com/go-openapi/loads v0.22.0 h1:ECPGd4jX1U6NApCGG1We+uEozOAvXvJSF4nnwHZ8Aco= -github.com/go-openapi/loads v0.22.0/go.mod h1:yLsaTCS92mnSAZX5WWoxszLj0u+Ojl+Zs5Stn1oF+rs= -github.com/go-openapi/runtime v0.28.0 h1:gpPPmWSNGo214l6n8hzdXYhPuJcGtziTOgUpvsFWGIQ= -github.com/go-openapi/runtime v0.28.0/go.mod h1:QN7OzcS+XuYmkQLw05akXk0jRH/eZ3kb18+1KwW9gyc= -github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY= -github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= -github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c= -github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4= -github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= -github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= -github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58= -github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= +github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= +github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc= +github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo= +github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= +github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= +github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= +github.com/go-openapi/errors v0.20.4 h1:unTcVm6PispJsMECE3zWgvG4xTiKda1LIR5rCRWLG6M= +github.com/go-openapi/errors v0.20.4/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= +github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= +github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8enro= +github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw= +github.com/go-openapi/runtime v0.26.0 h1:HYOFtG00FM1UvqrcxbEJg/SwvDRvYLQKGhw2zaQjTcc= +github.com/go-openapi/runtime v0.26.0/go.mod h1:QgRGeZwrUcSHdeh4Ka9Glvo0ug1LC5WyE+EV88plZrQ= +github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= +github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= +github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8= +github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= +github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= +github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= +github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= +github.com/go-openapi/strfmt v0.21.7 h1:rspiXgNWgeUzhjo1YU01do6qsahtJNByjLVbPLNHb8k= +github.com/go-openapi/strfmt v0.21.7/go.mod h1:adeGTkxE44sPyLk0JV235VQAO/ZXUr8KAzYjclFs3ew= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= +github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU= +github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= +github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= +github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= +github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= +github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= +github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= +github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= +github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= +github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= +github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= +github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= +github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= +github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= +github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= +github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= +github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= +github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= @@ -380,6 +425,7 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -395,7 +441,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= @@ -473,6 +518,7 @@ github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFck github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/iguanesolutions/go-systemd/v5 v5.1.1 h1:Hs0Z16knPGCBFnKECrICPh+RQ89Sgy0xyzcalrHMKdw= github.com/iguanesolutions/go-systemd/v5 v5.1.1/go.mod h1:Quv57scs6S7T0rC6qyLfW20KU/P4p9hrbLPF+ILYrXY= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs= github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0= github.com/ipfs/boxo v0.22.0 h1:QTC+P5uhsBNq6HzX728nsLyFW6rYDeR/5hggf9YZX78= @@ -642,6 +688,7 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -661,6 +708,8 @@ github.com/jtolio/eventkit v0.0.0-20221004135224-074cf276595b h1:tO4MX3k5bvV0Sjv github.com/jtolio/eventkit v0.0.0-20221004135224-074cf276595b/go.mod h1:q7yMR8BavTz/gBNtIT/uF487LMgcuEpNGKISLAjNQes= github.com/jzelinskie/whirlpool v0.0.0-20201016144138-0675e54bb004 h1:G+9t9cEtnC9jFiTxyptEKuNIAbiN5ZCQzX2a74lj3xg= github.com/jzelinskie/whirlpool v0.0.0-20201016144138-0675e54bb004/go.mod h1:KmHnJWQrgEvbuy0vcvj00gtMqbvNn1L+3YUZLK/B92c= +github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= +github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/kilic/bls12-381 v0.0.0-20200607163746-32e1441c8a9f/go.mod h1:XXfR6YFCRSrkEXbNlIyDsgXVNJWVUV30m/ebkVy9n6s= github.com/kilic/bls12-381 v0.0.0-20200731194930-64c428e1bff5/go.mod h1:XXfR6YFCRSrkEXbNlIyDsgXVNJWVUV30m/ebkVy9n6s= github.com/kilic/bls12-381 v0.0.0-20200820230200-6b2c19996391 h1:51kHw7l/dUDdOdW06AlUGT5jnpj6nqQSILebcsikSjA= @@ -669,12 +718,15 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/koofr/go-httpclient v0.0.0-20230225102643-5d51a2e9dea6 h1:uF5FHZ/L5gvZTyBNhhcm55rRorL66DOs4KIeeVXZ8eI= github.com/koofr/go-httpclient v0.0.0-20230225102643-5d51a2e9dea6/go.mod h1:6HAT62hK6QH+ljNtZayJCKpbZy5hJIB12+1Ze1bFS7M= github.com/koofr/go-koofrclient v0.0.0-20221207135200-cbd7fc9ad6a6 h1:FHVoZMOVRA+6/y4yRlbiR3WvsrOcKBd/f64H7YiWR2U= @@ -729,8 +781,13 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= +github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= @@ -767,6 +824,8 @@ github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dz github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mmcloughlin/avo v0.0.0-20190318053554-7a0eb66183da/go.mod h1:lf5GMZxA5kz8dnCweJuER5Rmbx6dDu6qvw0fO3uYKK8= @@ -774,6 +833,7 @@ github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQB github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU= github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= @@ -825,6 +885,7 @@ github.com/ncw/swift/v2 v2.0.1 h1:q1IN8hNViXEv8Zvg3Xdis4a3c4IlIGezkYz09zQL5J0= github.com/ncw/swift/v2 v2.0.1/go.mod h1:z0A9RVdYPjNjXVo2pDOPxZ4eu3oarO1P91fTItcb+Kg= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= @@ -857,6 +918,7 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= +github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14 h1:XeOYlK9W1uCmhjJSsY78Mcuh7MVkNjTzmHx1yBzizSU= github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14/go.mod h1:jVblp62SafmidSkvWrXyxAme3gaTfEtWwRPGz5cpvHg= github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 h1:1/WtZae0yGtPq+TI6+Tv1WTxkukpXeMlviSxvL7SRgk= @@ -918,16 +980,16 @@ github.com/pion/webrtc/v4 v4.0.8/go.mod h1:HHBeUVBAC+j4ZFnYhovEFStF02Arb1EyD4G7e github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.13.9 h1:4NGkvGudBL7GteO3m6qnaQ4pC0Kvf0onSVc9gR3EWBw= -github.com/pkg/sftp v1.13.9/go.mod h1:OBN7bVXdstkFFN/gdnHPUb5TE8eb8G1Rp9wCItqjkkA= +github.com/pkg/sftp v1.13.6-0.20230213180117-971c283182b6 h1:5TvW1dv00Y13njmQ1AWkxSWtPkwE7ZEF6yDuv9q+Als= +github.com/pkg/sftp v1.13.6-0.20230213180117-971c283182b6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk= github.com/pkg/xattr v0.4.9 h1:5883YPCtkSd8LFbs13nXplj9g9tlrwoJRjgpgMu1/fE= github.com/pkg/xattr v0.4.9/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= github.com/polydawn/refmt v0.0.0-20190809202753-05966cbd336a/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= @@ -970,11 +1032,13 @@ github.com/rjNemo/underscore v0.5.0/go.mod h1:y3LuKy2UP6zp7yZff5ZGRm1s/s9QvCoCoQ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= +github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -1012,6 +1076,9 @@ github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go. github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= +github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= @@ -1035,9 +1102,12 @@ github.com/spacemonkeygo/monkit/v3 v3.0.19/go.mod h1:kj1ViJhlyADa7DiA4xVnTuPA46l github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= @@ -1069,6 +1139,7 @@ github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4= @@ -1128,8 +1199,12 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= +github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/xlab/c-for-go v0.0.0-20200718154222-87b0065af829/go.mod h1:h/1PEBwj7Ym/8kOuMWvO2ujZ6Lt+TMbySEXNhjjR87I= @@ -1141,6 +1216,7 @@ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGC github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= github.com/ybbus/jsonrpc/v3 v3.1.4 h1:pPmgfWXnqR2GdIlealyCzmV6LV3nxm3w9gwA1B3cP3Y= github.com/ybbus/jsonrpc/v3 v3.1.4/go.mod h1:4HQTl0UzErqWGa6bSXhp8rIjifMAMa55E4D5wdhe768= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk= github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1175,8 +1251,11 @@ go.dedis.ch/protobuf v1.0.7/go.mod h1:pv5ysfkDX/EawiPqcW3ikOxsL5t+BqnV6xHSmE79KI go.dedis.ch/protobuf v1.0.11/go.mod h1:97QR256dnkimeNdfmURz0wAMNVbd1VmLXhG1CrTYrJ4= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= -go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= +go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= +go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= +go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= +go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE= +go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -1227,12 +1306,14 @@ go4.org v0.0.0-20200411211856-f5505b9728dd/go.mod h1:CIiUVy99QCPfoE13bO4EZaz5GZM golang.org/x/arch v0.0.0-20181203225421-5a4828bb7045/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8= golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -1253,13 +1334,9 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58 golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM= -golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY= +golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= +golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1296,9 +1373,6 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1339,6 +1413,7 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= @@ -1347,10 +1422,7 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1368,6 +1440,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1377,14 +1450,11 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= +golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1394,9 +1464,13 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1432,6 +1506,7 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1456,14 +1531,9 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= -golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1473,18 +1543,15 @@ golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= -golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg= -golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0= +golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= +golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= @@ -1493,12 +1560,9 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= -golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1518,9 +1582,13 @@ golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190325223049-1d95b17f1b04/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -1560,8 +1628,6 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo= golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1589,8 +1655,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.153.0 h1:N1AwGhielyKFaUqH07/ZSIQR3uNPcV7NVw0vj+j4iR4= -google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY= +google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= +google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1632,7 +1698,7 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= +google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b h1:+YaDE2r2OG8t/z5qmsh7Y+XXwCbvadxxZ0YY6mTdrVA= google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 h1:MuYw1wJzT+ZkybKfaOXKp5hJiZDn2iHaXRw0mRYdHSc= google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4/go.mod h1:px9SlOOZBg1wM1zdnr8jEL4CNGUBZ+ZKYtNPApNQc4c= google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 h1:Di6ANFilr+S60a4S61ZM00vLdw0IrQOSMS2/6mrnOU0= @@ -1670,6 +1736,7 @@ google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= @@ -1684,6 +1751,8 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/handler/storage/update_test.go b/handler/storage/update_test.go index 1d532623..2596ddd4 100644 --- a/handler/storage/update_test.go +++ b/handler/storage/update_test.go @@ -40,9 +40,9 @@ func TestUpdateStorageHandler(t *testing.T) { testutil.All(t, func(ctx context.Context, t *testing.T, db *gorm.DB) { tmp := t.TempDir() _, err := Default.CreateStorageHandler(ctx, db, "local", CreateRequest{"", "name", tmp, nil, model.ClientConfig{ - ConnectTimeout: ptr.Of(int64(time.Minute)), - Timeout: ptr.Of(int64(time.Minute)), - ExpectContinueTimeout: ptr.Of(int64(time.Minute)), + ConnectTimeout: ptr.Of(time.Minute), + Timeout: ptr.Of(time.Minute), + ExpectContinueTimeout: ptr.Of(time.Minute), InsecureSkipVerify: ptr.Of(true), NoGzip: ptr.Of(true), UserAgent: ptr.Of("1"), @@ -58,9 +58,9 @@ func TestUpdateStorageHandler(t *testing.T) { }}) require.NoError(t, err) newConfig := model.ClientConfig{ - ConnectTimeout: ptr.Of(int64(time.Hour)), - Timeout: ptr.Of(int64(time.Hour)), - ExpectContinueTimeout: ptr.Of(int64(time.Hour)), + ConnectTimeout: ptr.Of(time.Hour), + Timeout: ptr.Of(time.Hour), + ExpectContinueTimeout: ptr.Of(time.Hour), InsecureSkipVerify: ptr.Of(false), NoGzip: ptr.Of(false), UserAgent: ptr.Of("0"), diff --git a/model/basetypes.go b/model/basetypes.go index db47fe5b..b537f913 100644 --- a/model/basetypes.go +++ b/model/basetypes.go @@ -27,44 +27,10 @@ type ConfigMap map[string]string type CID cid.Cid -// TimeDuration is a wrapper around time.Duration that implements JSON marshaling -// x-go-type-import: "time" -// x-go-type-name: "Duration" -// swagger:type integer -// swagger:strfmt int64 -// x-go-type: int64 -// x-go-type-validate: false -type TimeDuration int64 - -// String returns the string representation of the duration -func (d TimeDuration) String() string { - return time.Duration(d).String() -} - -// MarshalJSON implements the json.Marshaler interface -func (d TimeDuration) MarshalJSON() ([]byte, error) { - return json.Marshal(int64(d)) -} - -// UnmarshalJSON implements the json.Unmarshaler interface -func (d *TimeDuration) UnmarshalJSON(b []byte) error { - var v int64 - if err := json.Unmarshal(b, &v); err != nil { - return err - } - *d = TimeDuration(v) - return nil -} - -// Duration returns the underlying time.Duration -func (d TimeDuration) Duration() time.Duration { - return time.Duration(d) -} - type ClientConfig struct { - ConnectTimeout *int64 `cbor:"1,keyasint,omitempty" json:"connectTimeout,omitempty"` // HTTP Client Connect timeout in nanoseconds - Timeout *int64 `cbor:"2,keyasint,omitempty" json:"timeout,omitempty"` // IO idle timeout in nanoseconds - ExpectContinueTimeout *int64 `cbor:"3,keyasint,omitempty" json:"expectContinueTimeout,omitempty"` // Timeout when using expect / 100-continue in HTTP in nanoseconds + ConnectTimeout *time.Duration `cbor:"1,keyasint,omitempty" json:"connectTimeout,omitempty" swaggertype:"primitive,integer"` // HTTP Client Connect timeout + Timeout *time.Duration `cbor:"2,keyasint,omitempty" json:"timeout,omitempty" swaggertype:"primitive,integer"` // IO idle timeout + ExpectContinueTimeout *time.Duration `cbor:"3,keyasint,omitempty" json:"expectContinueTimeout,omitempty" swaggertype:"primitive,integer"` // Timeout when using expect / 100-continue in HTTP InsecureSkipVerify *bool `cbor:"4,keyasint,omitempty" json:"insecureSkipVerify,omitempty"` // Do not verify the server SSL certificate (insecure) NoGzip *bool `cbor:"5,keyasint,omitempty" json:"noGzip,omitempty"` // Don't set Accept-Encoding: gzip UserAgent *string `cbor:"6,keyasint,omitempty" json:"userAgent,omitempty"` // Set the user-agent to a specified string @@ -75,8 +41,8 @@ type ClientConfig struct { DisableHTTP2 *bool `cbor:"11,keyasint,omitempty" json:"disableHttp2,omitempty"` // Disable HTTP/2 in the transport DisableHTTPKeepAlives *bool `cbor:"12,keyasint,omitempty" json:"disableHttpKeepAlives,omitempty"` // Disable HTTP keep-alives and use each connection once. RetryMaxCount *int `cbor:"13,keyasint,omitempty" json:"retryMaxCount,omitempty"` // Maximum number of retries. Default is 10 retries. - RetryDelay *int64 `cbor:"14,keyasint,omitempty" json:"retryDelay,omitempty"` // Delay between retries in nanoseconds. Default is 1s. - RetryBackoff *int64 `cbor:"15,keyasint,omitempty" json:"retryBackoff,omitempty"` // Constant backoff between retries in nanoseconds. Default is 1s. + RetryDelay *time.Duration `cbor:"14,keyasint,omitempty" json:"retryDelay,omitempty" swaggertype:"primitive,integer"` // Delay between retries. Default is 1s. + RetryBackoff *time.Duration `cbor:"15,keyasint,omitempty" json:"retryBackoff,omitempty" swaggertype:"primitive,integer"` // Constant backoff between retries. Default is 1s. RetryBackoffExponential *float64 `cbor:"16,keyasint,omitempty" json:"retryBackoffExponential,omitempty"` // Exponential backoff between retries. Default is 1.0. SkipInaccessibleFile *bool `cbor:"17,keyasint,omitempty" json:"skipInaccessibleFile,omitempty"` // Skip inaccessible files. Default is false. UseServerModTime *bool `cbor:"18,keyasint,omitempty" json:"useServerModTime,omitempty"` // Use server modified time instead of object metadata @@ -271,13 +237,13 @@ func (c ClientConfig) Value() (driver.Value, error) { //nolint:recvcheck func (c ClientConfig) String() string { var values []string if c.ConnectTimeout != nil { - values = append(values, "connectTimeout:"+time.Duration(*c.ConnectTimeout).String()) + values = append(values, "connectTimeout:"+c.ConnectTimeout.String()) } if c.Timeout != nil { - values = append(values, "timeout:"+time.Duration(*c.Timeout).String()) + values = append(values, "timeout:"+c.Timeout.String()) } if c.ExpectContinueTimeout != nil { - values = append(values, "expectContinueTimeout:"+time.Duration(*c.ExpectContinueTimeout).String()) + values = append(values, "expectContinueTimeout:"+c.ExpectContinueTimeout.String()) } if c.InsecureSkipVerify != nil { values = append(values, "insecureSkipVerify:"+strconv.FormatBool(*c.InsecureSkipVerify)) @@ -310,10 +276,10 @@ func (c ClientConfig) String() string { values = append(values, "retryMaxCount:"+strconv.Itoa(*c.RetryMaxCount)) } if c.RetryDelay != nil { - values = append(values, "retryDelay:"+time.Duration(*c.RetryDelay).String()) + values = append(values, "retryDelay:"+c.RetryDelay.String()) } if c.RetryBackoff != nil { - values = append(values, "retryBackoff:"+time.Duration(*c.RetryBackoff).String()) + values = append(values, "retryBackoff:"+c.RetryBackoff.String()) } if c.RetryBackoffExponential != nil { values = append(values, "retryBackoffExponential:"+fmt.Sprint(*c.RetryBackoffExponential)) diff --git a/model/basetypes_test.go b/model/basetypes_test.go index 70ac75d1..8b40b267 100644 --- a/model/basetypes_test.go +++ b/model/basetypes_test.go @@ -12,9 +12,9 @@ import ( func TestClientConfigMarshal(t *testing.T) { c := ClientConfig{ - ConnectTimeout: ptr.Of(int64(time.Second)), - Timeout: ptr.Of(int64(time.Second)), - ExpectContinueTimeout: ptr.Of(int64(time.Second)), + ConnectTimeout: ptr.Of(time.Second), + Timeout: ptr.Of(time.Second), + ExpectContinueTimeout: ptr.Of(time.Second), InsecureSkipVerify: ptr.Of(true), NoGzip: ptr.Of(true), UserAgent: ptr.Of("x"), @@ -25,8 +25,8 @@ func TestClientConfigMarshal(t *testing.T) { DisableHTTP2: ptr.Of(true), DisableHTTPKeepAlives: ptr.Of(true), RetryMaxCount: ptr.Of(10), - RetryDelay: ptr.Of(int64(time.Second)), - RetryBackoff: ptr.Of(int64(time.Second)), + RetryDelay: ptr.Of(time.Second), + RetryBackoff: ptr.Of(time.Second), RetryBackoffExponential: ptr.Of(1.0), SkipInaccessibleFile: ptr.Of(true), UseServerModTime: ptr.Of(true), diff --git a/model/preparation.go b/model/preparation.go index ea63a5e7..f97dc6eb 100644 --- a/model/preparation.go +++ b/model/preparation.go @@ -6,8 +6,6 @@ import ( "strings" "time" - "encoding/json" - "github.com/cockroachdb/errors" "github.com/ipfs/go-cid" "gorm.io/gorm" @@ -46,24 +44,6 @@ type ErrorLog struct { SessionID string `gorm:"index;size:255" json:"sessionId"` // Optional session identifier } -// MarshalBinary implements encoding.BinaryMarshaler for ErrorLog -func (e *ErrorLog) MarshalBinary() ([]byte, error) { - if e == nil { - return nil, nil - } - return json.Marshal(e) -} - -// UnmarshalBinary implements encoding.BinaryUnmarshaler for ErrorLog -func (e *ErrorLog) UnmarshalBinary(b []byte) error { - var res ErrorLog - if err := json.Unmarshal(b, &res); err != nil { - return err - } - *e = res - return nil -} - type Worker struct { ID string `gorm:"primaryKey" json:"id"` LastHeartbeat time.Time `json:"lastHeartbeat"` @@ -303,9 +283,9 @@ type File struct { // Associations AttachmentID SourceAttachmentID `cbor:"-" json:"attachmentId"` Attachment *SourceAttachment `cbor:"-" gorm:"foreignKey:AttachmentID" json:"attachment,omitempty" swaggerignore:"true"` - DirectoryID *DirectoryID `cbor:"-" gorm:"index" json:"directoryId"` - Directory *Directory `cbor:"-" gorm:"foreignKey:DirectoryID;constraint:OnDelete:CASCADE" json:"directory,omitempty" swaggerignore:"true"` - FileRanges []FileRange `cbor:"-" gorm:"constraint:OnDelete:CASCADE" json:"fileRanges,omitempty"` + DirectoryID *DirectoryID `cbor:"-" gorm:"index" json:"directoryId"` + Directory *Directory `cbor:"-" gorm:"foreignKey:DirectoryID;constraint:OnDelete:CASCADE" json:"directory,omitempty" swaggerignore:"true"` + FileRanges []FileRange `cbor:"-" gorm:"constraint:OnDelete:CASCADE" json:"fileRanges,omitempty"` } func (i File) FileName() string { diff --git a/service/statetracker/benchmark_test.go b/service/statetracker/benchmark_test.go index 895bfb7d..74944d76 100644 --- a/service/statetracker/benchmark_test.go +++ b/service/statetracker/benchmark_test.go @@ -188,7 +188,7 @@ func TestStateTrackingPerformanceImpact(t *testing.T) { t.Logf("State tracking overhead: %v (%.2f%%)", overhead, overheadPercentage) // Verify overhead is reasonable (less than 1000% increase) - require.Less(t, overheadPercentage, 13000.0, "State tracking overhead should be reasonable") + require.Less(t, overheadPercentage, 1000.0, "State tracking overhead should be reasonable") // Verify state changes were created var stateChangeCount int64 diff --git a/singularity.go b/singularity.go index 6d2274a9..0e5d8924 100644 --- a/singularity.go +++ b/singularity.go @@ -16,7 +16,7 @@ import ( //go:generate rm -rf ./docs/en/web-api-reference //go:generate go run docs/gen/webapireference/main.go //go:generate rm -rf ./client -//go:generate go run github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0 generate client -f ./docs/swagger/swagger.json -t . -c client/swagger/client -m client/swagger/models -a client/swagger/operations -q +//go:generate go run github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0 generate client -f ./docs/swagger/swagger.json -t . -c client/swagger/http -m client/swagger/models -a client/swagger/operations -q //go:embed version.json var versionJSON []byte diff --git a/storagesystem/rclone.go b/storagesystem/rclone.go index 1e37e94d..3c31a62e 100644 --- a/storagesystem/rclone.go +++ b/storagesystem/rclone.go @@ -34,8 +34,8 @@ type RCloneHandler struct { fs fs.Fs fsNoHead fs.Fs retryMaxCount int - retryDelay int64 - retryBackoff int64 + retryDelay time.Duration + retryBackoff time.Duration retryBackoffExponential float64 scanConcurrency int } @@ -80,8 +80,8 @@ func NewRCloneHandler(ctx context.Context, s model.Storage) (*RCloneHandler, err fs: headFS, fsNoHead: noHeadFS, retryMaxCount: 10, - retryDelay: int64(time.Second), - retryBackoff: int64(time.Second), + retryDelay: time.Second, + retryBackoff: time.Second, retryBackoffExponential: 1.0, scanConcurrency: scanConcurrency, } @@ -171,8 +171,8 @@ type readerWithRetry struct { object fs.Object reader io.ReadCloser offset int64 - retryDelay int64 - retryBackoff int64 + retryDelay time.Duration + retryBackoff time.Duration retryCountMax int retryCount int retryBackoffExponential float64 @@ -205,11 +205,11 @@ func (r *readerWithRetry) Read(p []byte) (int, error) { select { case <-r.ctx.Done(): return n, errors.Join(err, r.ctx.Err()) - case <-time.After(time.Duration(r.retryDelay)): + case <-time.After(r.retryDelay): } r.retryCount += 1 - r.retryDelay = int64(float64(r.retryDelay) * r.retryBackoffExponential) - r.retryDelay += int64(time.Duration(r.retryBackoff)) + r.retryDelay = time.Duration(float64(r.retryDelay) * r.retryBackoffExponential) + r.retryDelay += r.retryBackoff _ = r.reader.Close() var err2 error r.reader, err2 = r.object.Open(r.ctx, &fs.SeekOption{Offset: r.offset}) @@ -256,13 +256,13 @@ func (h RCloneHandler) Read(ctx context.Context, path string, offset int64, leng func overrideConfig(config *fs.ConfigInfo, s model.Storage) { config.UseServerModTime = true if s.ClientConfig.ConnectTimeout != nil { - config.ConnectTimeout = time.Duration(*s.ClientConfig.ConnectTimeout) + config.ConnectTimeout = *s.ClientConfig.ConnectTimeout } if s.ClientConfig.Timeout != nil { - config.Timeout = time.Duration(*s.ClientConfig.Timeout) + config.Timeout = *s.ClientConfig.Timeout } if s.ClientConfig.ExpectContinueTimeout != nil { - config.ExpectContinueTimeout = time.Duration(*s.ClientConfig.ExpectContinueTimeout) + config.ExpectContinueTimeout = *s.ClientConfig.ExpectContinueTimeout } if s.ClientConfig.InsecureSkipVerify != nil { config.InsecureSkipVerify = true diff --git a/storagesystem/rclone_test.go b/storagesystem/rclone_test.go index 66962528..b399b88d 100644 --- a/storagesystem/rclone_test.go +++ b/storagesystem/rclone_test.go @@ -78,8 +78,8 @@ func TestReaderWithRetry(t *testing.T) { object: mockObject, reader: &faultyReader{willFail: true}, offset: 0, - retryDelay: int64(time.Second), - retryBackoff: int64(time.Second), + retryDelay: time.Second, + retryBackoff: time.Second, retryCountMax: 10, retryBackoffExponential: 1.0, } @@ -93,9 +93,9 @@ func TestRCloneHandler_OverrideConfig(t *testing.T) { ctx := context.Background() handler, err := NewRCloneHandler(ctx, model.Storage{Type: "local", Path: tmp, ClientConfig: model.ClientConfig{ - ConnectTimeout: ptr.Of(int64(time.Hour)), - Timeout: ptr.Of(int64(time.Hour)), - ExpectContinueTimeout: ptr.Of(int64(time.Hour)), + ConnectTimeout: ptr.Of(time.Hour), + Timeout: ptr.Of(time.Hour), + ExpectContinueTimeout: ptr.Of(time.Hour), InsecureSkipVerify: ptr.Of(true), NoGzip: ptr.Of(true), UserAgent: ptr.Of("test"), @@ -106,8 +106,8 @@ func TestRCloneHandler_OverrideConfig(t *testing.T) { DisableHTTP2: ptr.Of(true), DisableHTTPKeepAlives: ptr.Of(true), RetryMaxCount: ptr.Of(10), - RetryDelay: ptr.Of(int64(time.Second)), - RetryBackoff: ptr.Of(int64(time.Second)), + RetryDelay: ptr.Of(time.Second), + RetryBackoff: ptr.Of(time.Second), RetryBackoffExponential: ptr.Of(1.0), SkipInaccessibleFile: ptr.Of(true), UseServerModTime: ptr.Of(true), diff --git a/util/testutil/testutils.go b/util/testutil/testutils.go index 24b246e1..fa56a1f8 100644 --- a/util/testutil/testutils.go +++ b/util/testutil/testutils.go @@ -86,9 +86,7 @@ func getTestDB(t *testing.T, dialect string) (db *gorm.DB, closer io.Closer, con require.NoError(t, err) return } - // Include test name in database name to avoid conflicts in parallel tests - testName := strings.ReplaceAll(t.Name(), "/", "_") - dbName := "test_" + testName + "_" + RandomLetterString(6) + dbName := RandomLetterString(6) var opError *net.OpError switch dialect { case "mysql": @@ -184,31 +182,6 @@ func doOne(t *testing.T, backend string, testFunc func(ctx context.Context, t *t err := model.GetMigrator(db).Migrate() require.NoError(t, err) - // Clear any existing data from tables with unique constraints - tables := []string{ - "output_attachments", - "source_attachments", - "storages", - "wallets", - "deal_schedules", - "preparations", - } - - // Get DB type from connection string - isPostgres := strings.HasPrefix(connStr, "postgres:") - for _, table := range tables { - var err error - if isPostgres { - err = db.Exec("TRUNCATE TABLE " + table + " CASCADE").Error - } else { - err = db.Exec("DELETE FROM " + table).Error - } - if err != nil { - t.Logf("Warning: Failed to clear table %s: %v", table, err) - // Don't fail the test, as table may not exist yet - } - } - t.Run(backend, func(t *testing.T) { testFunc(ctx, t, db) })