From 61ac538725fff4816c086d72685acd4e01eb59bd Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 20 May 2026 11:39:29 +0800 Subject: [PATCH] refactor: move all partial copy of package dependencies to `/pkg/sdk3rd-trimmed` --- go.mod | 2 +- go.sum | 2 + .../providers/aliyun-cas/aliyun_cas.go | 11 +- .../providers/aliyun-cas/internal/client.go | 194 --------- .../providers/aliyun-slb/aliyun_slb.go | 13 +- .../providers/aliyun-slb/internal/client.go | 180 -------- .../certmgr/providers/aws-acm/aws_acm_test.go | 77 ++++ .../certmgr/providers/aws-iam/aws_iam_test.go | 77 ++++ .../providers/dogecloud/dogecloud_test.go | 72 ++++ .../providers/gcore-cdn/gcore_cdn_test.go | 67 +++ .../huaweicloud-elb/huaweicloud_elb.go | 45 +- .../huaweicloud-elb/huaweicloud_elb_test.go | 77 ++++ .../huaweicloud-elb/internal/client.go | 47 --- .../huaweicloud-scm/huaweicloud_scm.go | 25 +- .../huaweicloud-scm/huaweicloud_scm_test.go | 77 ++++ .../huaweicloud-waf/huaweicloud_waf.go | 39 +- .../huaweicloud-waf/huaweicloud_waf_test.go | 77 ++++ .../huaweicloud-waf/internal/client.go | 47 --- .../providers/jdcloud-ssl/jdcloud_ssl.go | 14 +- .../tencentcloud-ssl/internal/client.go | 44 -- .../tencentcloud-ssl/tencentcloud_ssl.go | 11 +- .../volcengine-cdn/internal/client.go | 104 ----- .../volcengine-cdn/volcengine_cdn.go | 15 +- .../volcengine-cdn/volcengine_cdn_test.go | 72 ++++ .../volcengine-certcenter/internal/client.go | 80 ---- .../volcengine_certcenter.go | 15 +- .../volcengine-live/volcengine_live_test.go | 72 ++++ .../providers/zenlayer-cdn/zenlayer_cdn.go | 14 +- .../zenlayer-cdn/zenlayer_cdn_test.go | 72 ++++ .../providers/zenlayer-ga/internal/client.go | 46 -- .../providers/zenlayer-ga/zenlayer_ga.go | 15 +- .../providers/zenlayer-ga/zenlayer_ga_test.go | 72 ++++ pkg/core/deployer/providers/1panel/1panel.go | 9 +- .../providers/aliyun-alb/aliyun_alb.go | 98 +++-- .../providers/aliyun-apigw/aliyun_apigw.go | 98 +++-- .../providers/aliyun-apigw/internal/client.go | 314 -------------- .../aliyun-cas-deploy/aliyun_cas_deploy.go | 15 +- .../aliyun-cas-deploy/internal/client.go | 166 -------- .../providers/aliyun-cas/aliyun_cas.go | 4 +- .../providers/aliyun-cdn/aliyun_cdn.go | 13 +- .../providers/aliyun-clb/aliyun_clb.go | 13 +- .../providers/aliyun-dcdn/aliyun_dcdn.go | 13 +- .../aliyun-ddospro/aliyun_ddospro.go | 13 +- .../aliyun-esa-saas/aliyun_esasaas.go | 13 +- .../providers/aliyun-esa/aliyun_esa.go | 13 +- .../providers/aliyun-esa/internal/client.go | 111 ----- .../deployer/providers/aliyun-fc/aliyun_fc.go | 116 ++--- .../providers/aliyun-fc/internal/client.go | 372 ---------------- .../deployer/providers/aliyun-ga/aliyun_ga.go | 24 +- .../providers/aliyun-ga/internal/client.go | 396 ------------------ .../providers/aliyun-live/aliyun_live.go | 9 +- .../providers/aliyun-nlb/aliyun_nlb.go | 13 +- .../providers/aliyun-vod/aliyun_vod.go | 13 +- .../providers/aliyun-waf/aliyun_waf.go | 13 +- .../deployer/providers/aws-acm/aws_acm.go | 4 +- .../aws-cloudfront/aws_cloudfront.go | 8 +- .../deployer/providers/aws-iam/aws_iam.go | 4 +- .../azure-keyvault/azure_keyvault.go | 4 +- .../baiducloud-appblb/baiducloud_appblb.go | 4 +- .../baiducloud-blb/baiducloud_blb.go | 4 +- .../baiducloud-cert/baiducloud_cert.go | 4 +- .../providers/baishan-cdn/baishan_cdn.go | 4 +- .../providers/baotapanel/baotapanel.go | 5 +- .../providers/baotapanelgo/baotapanelgo.go | 5 +- .../deployer/providers/baotawaf/baotawaf.go | 5 +- .../providers/byteplus-cdn/byteplus_cdn.go | 4 +- .../providers/ctcccloud-ao/ctcccloud_ao.go | 4 +- .../providers/ctcccloud-cdn/ctcccloud_cdn.go | 4 +- .../providers/ctcccloud-cms/ctcccloud_cms.go | 4 +- .../providers/ctcccloud-elb/ctcccloud_elb.go | 4 +- .../ctcccloud-icdn/ctcccloud_icdn.go | 4 +- .../ctcccloud-lvdn/ctcccloud_lvdn.go | 4 +- .../providers/dogecloud-cdn/dogecloud_cdn.go | 4 +- .../deployer/providers/dokploy/dokploy.go | 4 +- .../deployer/providers/gcore-cdn/gcore_cdn.go | 4 +- .../huaweicloud-aad/huaweicloud_aad.go | 134 +++--- .../huaweicloud-aad/internal/client.go | 39 -- .../huaweicloud-apig/huaweicloud_apig.go | 41 +- .../huaweicloud-cdn/huaweicloud_cdn.go | 29 +- .../huaweicloud-elb/huaweicloud_elb.go | 51 ++- .../huaweicloud-live/huaweicloud_live.go | 43 +- .../huaweicloud-scm/huaweicloud_scm.go | 4 +- .../huaweicloud-waf/huaweicloud_waf.go | 53 ++- .../providers/jdcloud-alb/jdcloud_alb.go | 35 +- .../providers/jdcloud-cdn/jdcloud_cdn.go | 21 +- .../providers/jdcloud-live/jdcloud_live.go | 15 +- .../providers/jdcloud-ssl/jdcloud_ssl.go | 4 +- .../providers/jdcloud-vod/jdcloud_vod.go | 19 +- .../providers/jdcloud-waf/jdcloud_waf.go | 21 +- .../nginxproxymanager/nginxproxymanager.go | 9 +- .../deployer/providers/qiniu-cdn/qiniu_cdn.go | 4 +- .../providers/qiniu-kodo/qiniu_kodo.go | 4 +- .../providers/qiniu-pili/qiniu_pili.go | 4 +- .../providers/rainyun-rcdn/rainyun_rcdn.go | 4 +- .../rainyun-sslcenter/rainyun_sslcenter.go | 4 +- pkg/core/deployer/providers/s3/s3_test.go | 94 +++++ .../tencentcloud-cdn/internal/client.go | 104 ----- .../tencentcloud-cdn/tencentcloud_cdn.go | 21 +- .../tencentcloud-clb/internal/client.go | 104 ----- .../tencentcloud-clb/tencentcloud_clb.go | 29 +- .../tencentcloud-cos/internal/client.go | 84 ---- .../tencentcloud-cos/tencentcloud_cos.go | 19 +- .../tencentcloud-css/internal/client.go | 65 --- .../tencentcloud-css/tencentcloud_css.go | 17 +- .../tencentcloud-ecdn/internal/client.go | 104 ----- .../tencentcloud-ecdn/tencentcloud_ecdn.go | 21 +- .../tencentcloud-eo/internal/client.go | 64 --- .../tencentcloud-eo/tencentcloud_eo.go | 45 +- .../tencentcloud-gaap/internal/client.go | 62 --- .../tencentcloud-gaap/tencentcloud_gaap.go | 17 +- .../tencentcloud-scf/internal/client.go | 85 ---- .../tencentcloud-scf/tencentcloud_scf.go | 19 +- .../internal/client.go | 64 --- .../tencentcloud_ssl_deploy.go | 19 +- .../internal/client.go | 105 ----- .../tencentcloud_ssl_update.go | 29 +- .../tencentcloud-ssl/tencentcloud_ssl.go | 4 +- .../tencentcloud-vod/internal/client.go | 65 --- .../tencentcloud-vod/tencentcloud_vod.go | 17 +- .../tencentcloud-waf/internal/client.go | 64 --- .../tencentcloud-waf/tencentcloud_waf.go | 17 +- .../providers/ucloud-ualb/ucloud_ualb.go | 4 +- .../providers/ucloud-ucdn/ucloud_ucdn.go | 4 +- .../providers/ucloud-uclb/ucloud_uclb.go | 4 +- .../providers/ucloud-upathx/ucloud_upathx.go | 4 +- .../providers/ucloud-us3/ucloud_us3.go | 4 +- .../deployer/providers/upyun-cdn/upyun_cdn.go | 4 +- .../providers/upyun-file/upyun_file.go | 4 +- .../volcengine-alb/internal/client.go | 144 ------- .../volcengine-alb/volcengine_alb.go | 19 +- .../volcengine-apig/internal/client.go | 128 ------ .../volcengine-apig/volcengine_apig.go | 19 +- .../volcengine-cdn/internal/client.go | 128 ------ .../volcengine-cdn/volcengine_cdn.go | 19 +- .../volcengine_certcenter.go | 4 +- .../volcengine-clb/internal/client.go | 122 ------ .../volcengine-clb/volcengine_clb.go | 19 +- .../volcengine-dcdn/internal/client.go | 104 ----- .../volcengine-dcdn/volcengine_dcdn.go | 17 +- .../volcengine-imagex/volcengine_imagex.go | 4 +- .../volcengine-live/volcengine_live.go | 4 +- .../volcengine-tos/volcengine_tos.go | 4 +- .../volcengine-vod/volcengine_vod.go | 4 +- .../volcengine-waf/internal/client.go | 104 ----- .../volcengine-waf/volcengine_waf.go | 17 +- .../providers/wangsu-cdn/wangsu_cdn.go | 4 +- .../providers/wangsu-cdnpro/wangsu_cdnpro.go | 2 +- .../wangsu-certificate/wangsu_certificate.go | 4 +- .../providers/zenlayer-cdn/zenlayer_cdn.go | 6 +- .../providers/zenlayer-ga/internal/client.go | 40 -- .../providers/zenlayer-ga/zenlayer_ga.go | 21 +- pkg/core/shared.go | 9 - pkg/sdk3rd-forks/README | 2 +- pkg/sdk3rd-trimmed/README | 3 + .../alb-20200616/v2/client/client.go | 31 ++ .../v2/client/client_context_func.go} | 182 +++----- .../alb-20200616/v2/client/models.go | 41 ++ .../apig-20240327/v6/client/client.go | 31 ++ .../v6/client/client_context_func.go | 172 ++++++++ .../apig-20240327/v6/client/models.go | 17 + .../cas-20200407/v4/client/client.go | 31 ++ .../v4/client/client_context_func.go | 337 +++++++++++++++ .../cas-20200407/v4/client/models.go | 33 ++ .../cdn-20180510/v9/client/client.go | 31 ++ .../v9/client/client_context_func.go} | 56 +-- .../cdn-20180510/v9/client/models.go | 13 + .../cloudapi-20160714/v5/client/client.go | 31 ++ .../v5/client/client_context_func.go | 126 ++++++ .../cloudapi-20160714/v5/client/models.go | 13 + .../dcdn-20180115/v4/client/client.go | 31 ++ .../v4/client/client_context_func.go} | 56 +-- .../dcdn-20180115/v4/client/models.go | 13 + .../ddoscoo-20200101/v5/client/client.go | 31 ++ .../v5/client/client_context_func.go} | 56 +-- .../ddoscoo-20200101/v5/client/models.go | 13 + .../esa-20240910/v2/client/client.go | 31 ++ .../v2/client/client_context_func.go} | 115 +++-- .../esa-20240910/v2/client/models.go | 19 + .../fc-20230330/v4/client/client.go | 31 ++ .../v4/client/client_context_func.go | 107 +++++ .../fc-20230330/v4/client/models.go | 19 + .../fc-open-20210406/v2/client/client.go | 238 +++++++++++ .../fc-open-20210406/v2/client/models.go | 23 + .../ga-20191120/v4/client/client.go | 31 ++ .../v4/client/client_context_func.go | 319 ++++++++++++++ .../ga-20191120/v4/client/models.go | 31 ++ .../live-20161101/v2/client/client.go | 31 ++ .../v2/client/client_context_func.go} | 56 +-- .../live-20161101/v2/client/models.go | 13 + .../nlb-20220430/v4/client/client.go | 31 ++ .../v4/client/client_context_func.go} | 84 ++-- .../nlb-20220430/v4/client/models.go | 23 + .../slb-20140515/v4/client/client.go | 30 ++ .../v4/client/client_context_func.go} | 247 ++++++++--- .../slb-20140515/v4/client/models.go | 37 ++ .../vod-20170321/v4/client/client.go | 31 ++ .../v4/client/client_context_func.go} | 56 +-- .../vod-20170321/v4/client/models.go | 13 + .../waf-openapi-20211001/v7/client/client.go | 31 ++ .../v7/client/client_context_func.go} | 121 +++--- .../waf-openapi-20211001/v7/client/models.go | 57 +++ .../services/aad/v1/aad_client.go | 29 ++ .../services/aad/v1/aad_meta.go | 10 + .../services/aad/v2/aad_client.go | 29 ++ .../services/aad/v2/aad_meta.go | 10 + .../services/apig/v2/apig_client.go} | 12 +- .../services/apig/v2/apig_meta.go | 14 + .../services/cdn/v2/cdn_client.go} | 12 +- .../services/cdn/v2/cdn_meta.go | 14 + .../services/elb/v3/elb_client.go} | 40 +- .../services/elb/v3/elb_meta.go | 38 ++ .../services/live/v1/live_client.go} | 12 +- .../services/live/v1/live_meta.go | 14 + .../services/scm/v3/scm_client.go} | 14 +- .../services/scm/v3/scm_meta.go | 18 + .../services/waf/v1/waf_client.go} | 40 +- .../services/waf/v1/waf_meta.go | 38 ++ .../services/cdn/client/CdnClient.go} | 15 +- .../services/lb/client/LbClient.go} | 13 +- .../services/live/client/LiveClient.go} | 11 +- .../services/ssl/client/SslClient.go | 74 ++++ .../services/vod/client/VodClient.go} | 13 +- .../services/waf/client/WafClient.go} | 10 +- .../tencentcloud/cdn/v20180606/client.go | 124 ++++++ .../tencentcloud/cdn/v20180606/models.go | 27 ++ .../tencentcloud/clb/v20180317/client.go | 120 ++++++ .../tencentcloud/clb/v20180317/models.go | 25 ++ .../tencentcloud/gaap/v20180529/client.go | 74 ++++ .../tencentcloud/gaap/v20180529/models.go | 13 + .../tencentcloud/live/v20180801/client.go | 74 ++++ .../tencentcloud/live/v20180801/models.go | 17 + .../tencentcloud/scf/v20180416/client.go | 99 +++++ .../tencentcloud/scf/v20180416/models.go | 21 + .../tencentcloud/ssl/v20191205/client.go | 222 ++++++++++ .../tencentcloud/ssl/v20191205/models.go | 41 ++ .../tencentcloud/teo/v20220901/client.go | 74 ++++ .../tencentcloud/teo/v20220901/models.go | 19 + .../tencentcloud/vod/v20180717/client.go | 74 ++++ .../tencentcloud/vod/v20180717/models.go | 13 + .../tencentcloud/waf/v20180125/client.go | 78 ++++ .../tencentcloud/waf/v20180125/models.go | 13 + .../alb/api_describe_listener_attributes.go | 39 ++ .../service/alb/api_describe_listeners.go | 42 ++ .../api_describe_load_balancer_attributes.go | 42 ++ .../alb/api_modify_listener_attributes.go | 44 ++ .../service/alb/service_alb.go | 60 +++ .../service/apig/api_get_custom_domain.go | 39 ++ .../service/apig/api_list_custom_domains.go | 41 ++ .../service/apig/api_update_custom_domain.go | 39 ++ .../service/apig/service_apig.go | 60 +++ .../service/cdn/api_add_certificate.go | 39 ++ .../service/cdn/api_batch_deploy_cert.go | 39 ++ .../service/cdn/api_describe_cert_config.go | 39 ++ .../service/cdn/api_list_cdn_domains.go | 39 ++ .../service/cdn/api_list_cert_info.go | 39 ++ .../service/cdn/service_cdn.go | 60 +++ .../api_import_certificate.go | 41 ++ .../service_certificateservice.go | 54 +++ .../service/clb/api_describe_listeners.go | 37 ++ .../api_describe_load_balancer_attributes.go | 37 ++ .../clb/api_modify_listener_attributes.go | 37 ++ .../service/clb/service_clb.go | 60 +++ .../service/dcdn/api_create_cert_bind.go | 39 ++ .../service/dcdn/api_list_domain_config.go | 39 ++ .../service/dcdn/service_dcdn.go | 60 +++ .../service/waf/api_list_domain.go | 39 ++ .../service/waf/api_update_domain.go | 41 ++ .../service/waf/service_waf.go | 60 +++ pkg/sdk3rd/zenlayer/zga/client.go | 105 +++++ pkg/sdk3rd/zenlayer/zga/models.go | 25 ++ 270 files changed, 7290 insertions(+), 5393 deletions(-) delete mode 100644 pkg/core/certmgr/providers/aliyun-cas/internal/client.go delete mode 100644 pkg/core/certmgr/providers/aliyun-slb/internal/client.go create mode 100644 pkg/core/certmgr/providers/aws-acm/aws_acm_test.go create mode 100644 pkg/core/certmgr/providers/aws-iam/aws_iam_test.go create mode 100644 pkg/core/certmgr/providers/dogecloud/dogecloud_test.go create mode 100644 pkg/core/certmgr/providers/gcore-cdn/gcore_cdn_test.go create mode 100644 pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb_test.go delete mode 100644 pkg/core/certmgr/providers/huaweicloud-elb/internal/client.go create mode 100644 pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm_test.go create mode 100644 pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf_test.go delete mode 100644 pkg/core/certmgr/providers/huaweicloud-waf/internal/client.go delete mode 100644 pkg/core/certmgr/providers/tencentcloud-ssl/internal/client.go delete mode 100644 pkg/core/certmgr/providers/volcengine-cdn/internal/client.go create mode 100644 pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go delete mode 100644 pkg/core/certmgr/providers/volcengine-certcenter/internal/client.go create mode 100644 pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go create mode 100644 pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn_test.go delete mode 100644 pkg/core/certmgr/providers/zenlayer-ga/internal/client.go create mode 100644 pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga_test.go delete mode 100644 pkg/core/deployer/providers/aliyun-apigw/internal/client.go delete mode 100644 pkg/core/deployer/providers/aliyun-cas-deploy/internal/client.go delete mode 100644 pkg/core/deployer/providers/aliyun-esa/internal/client.go delete mode 100644 pkg/core/deployer/providers/aliyun-fc/internal/client.go delete mode 100644 pkg/core/deployer/providers/aliyun-ga/internal/client.go delete mode 100644 pkg/core/deployer/providers/huaweicloud-aad/internal/client.go create mode 100644 pkg/core/deployer/providers/s3/s3_test.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-cdn/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-clb/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-cos/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-css/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-ecdn/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-eo/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-gaap/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-scf/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-ssl-deploy/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-ssl-update/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-vod/internal/client.go delete mode 100644 pkg/core/deployer/providers/tencentcloud-waf/internal/client.go delete mode 100644 pkg/core/deployer/providers/volcengine-alb/internal/client.go delete mode 100644 pkg/core/deployer/providers/volcengine-apig/internal/client.go delete mode 100644 pkg/core/deployer/providers/volcengine-cdn/internal/client.go delete mode 100644 pkg/core/deployer/providers/volcengine-clb/internal/client.go delete mode 100644 pkg/core/deployer/providers/volcengine-dcdn/internal/client.go delete mode 100644 pkg/core/deployer/providers/volcengine-waf/internal/client.go delete mode 100644 pkg/core/deployer/providers/zenlayer-ga/internal/client.go delete mode 100644 pkg/core/shared.go create mode 100644 pkg/sdk3rd-trimmed/README create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/client.go rename pkg/{core/deployer/providers/aliyun-alb/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/client_context_func.go} (61%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/client_context_func.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/client_context_func.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/client.go rename pkg/{core/deployer/providers/aliyun-cdn/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/client_context_func.go} (71%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/client_context_func.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/client.go rename pkg/{core/deployer/providers/aliyun-dcdn/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/client_context_func.go} (70%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/client.go rename pkg/{core/deployer/providers/aliyun-ddospro/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/client_context_func.go} (59%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/client.go rename pkg/{core/deployer/providers/aliyun-esa-saas/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/client_context_func.go} (51%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/client_context_func.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/client_context_func.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/client.go rename pkg/{core/deployer/providers/aliyun-live/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/client_context_func.go} (68%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/client.go rename pkg/{core/deployer/providers/aliyun-nlb/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/client_context_func.go} (73%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/client.go rename pkg/{core/deployer/providers/aliyun-clb/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/client_context_func.go} (65%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/client.go rename pkg/{core/deployer/providers/aliyun-vod/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/client_context_func.go} (67%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/client.go rename pkg/{core/deployer/providers/aliyun-waf/internal/client.go => sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/client_context_func.go} (73%) create mode 100644 pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/aad_client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/aad_meta.go create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/aad_client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/aad_meta.go rename pkg/{core/deployer/providers/huaweicloud-apig/internal/client.go => sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/apig_client.go} (75%) create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/apig_meta.go rename pkg/{core/deployer/providers/huaweicloud-cdn/internal/client.go => sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/cdn_client.go} (75%) create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/cdn_meta.go rename pkg/{core/deployer/providers/huaweicloud-elb/internal/client.go => sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/elb_client.go} (66%) create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/elb_meta.go rename pkg/{core/deployer/providers/huaweicloud-live/internal/client.go => sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/live_client.go} (75%) create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/live_meta.go rename pkg/{core/certmgr/providers/huaweicloud-scm/internal/client.go => sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/scm_client.go} (77%) create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/scm_meta.go rename pkg/{core/deployer/providers/huaweicloud-waf/internal/client.go => sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/waf_client.go} (66%) create mode 100644 pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/waf_meta.go rename pkg/{core/deployer/providers/jdcloud-cdn/internal/client.go => sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/client/CdnClient.go} (88%) rename pkg/{core/deployer/providers/jdcloud-alb/internal/client.go => sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/lb/client/LbClient.go} (93%) rename pkg/{core/deployer/providers/jdcloud-live/internal/client.go => sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/live/client/LiveClient.go} (86%) create mode 100644 pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client/SslClient.go rename pkg/{core/deployer/providers/jdcloud-vod/internal/client.go => sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/vod/client/VodClient.go} (89%) rename pkg/{core/deployer/providers/jdcloud-waf/internal/client.go => sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/waf/client/WafClient.go} (80%) create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125/client.go create mode 100644 pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125/models.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_listener_attributes.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_listeners.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_load_balancer_attributes.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_modify_listener_attributes.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/service_alb.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_get_custom_domain.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_list_custom_domains.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_update_custom_domain.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/service_apig.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_add_certificate.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_batch_deploy_cert.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_describe_cert_config.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_list_cdn_domains.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_list_cert_info.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/service_cdn.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice/api_import_certificate.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice/service_certificateservice.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_describe_listeners.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_describe_load_balancer_attributes.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_modify_listener_attributes.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/service_clb.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/api_create_cert_bind.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/api_list_domain_config.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/service_dcdn.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/api_list_domain.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/api_update_domain.go create mode 100644 pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/service_waf.go create mode 100644 pkg/sdk3rd/zenlayer/zga/client.go create mode 100644 pkg/sdk3rd/zenlayer/zga/models.go diff --git a/go.mod b/go.mod index 0a8357947..74241b74b 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/pavlo-v-chernykh/keystore-go/v4 v4.5.0 github.com/pkg/sftp v1.13.10 github.com/pocketbase/dbx v1.12.0 - github.com/pocketbase/pocketbase v0.38.0 + github.com/pocketbase/pocketbase v0.38.1 github.com/povsister/scp v0.0.0-20250701154629-777cf82de5df github.com/pquerna/otp v1.5.0 github.com/qiniu/go-sdk/v7 v7.26.12 diff --git a/go.sum b/go.sum index 325ec1c7c..69581bd21 100644 --- a/go.sum +++ b/go.sum @@ -806,6 +806,8 @@ github.com/pocketbase/dbx v1.12.0 h1:/oLErM+A0b4xI0PWTGPqSDVjzix48PqI/bng2l0PzoA github.com/pocketbase/dbx v1.12.0/go.mod h1:xXRCIAKTHMgUCyCKZm55pUOdvFziJjQfXaWKhu2vhMs= github.com/pocketbase/pocketbase v0.38.0 h1:EwZiOpu2RwJ7O0d0+W+rUAGeXvBhH6zpZOX37wFB830= github.com/pocketbase/pocketbase v0.38.0/go.mod h1:gxdfarbZ4gT/ivRNiIa7uJ1a64eY8yncW+NyvA31aLk= +github.com/pocketbase/pocketbase v0.38.1 h1:wNFm9Nw18D/6hZP5Q+Biz1LSz3bkcFmfb318GoJ/UXo= +github.com/pocketbase/pocketbase v0.38.1/go.mod h1:j2+DlxYqUanERfruYvkBDMKOASfRJUrQKMJdscmookA= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/povsister/scp v0.0.0-20250701154629-777cf82de5df h1:zEgSHrxo8f6hGG1xCaqunfBq8hlfDmFd1JM0QXiQi7o= diff --git a/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go b/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go index 5223c3f32..69f06fb04 100644 --- a/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go +++ b/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go @@ -8,14 +8,13 @@ import ( "strings" "time" - alicas "github.com/alibabacloud-go/cas-20200407/v4/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas/internal" + alicas "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) @@ -33,7 +32,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *internal.CasClient + sdkClient *alicas.Client } var _ certmgr.Provider = (*Certmgr)(nil) @@ -130,7 +129,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert c.logger.Info("ssl certificate already exists") return &certmgr.UploadResult{ CertId: fmt.Sprintf("%d", tea.Int64Value(certItem.CertificateId)), - CertName: *certItem.Name, + CertName: tea.StringValue(certItem.Name), ExtendedData: map[string]any{ "InstanceId": tea.StringValue(getUserCertificateDetailResp.Body.InstanceId), "CertIdentifier": tea.StringValue(getUserCertificateDetailResp.Body.CertIdentifier), @@ -188,7 +187,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, certmgr.ErrUnsupported } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.CasClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*alicas.Client, error) { // 接入点一览 https://api.aliyun.com/product/cas var endpoint string switch region { @@ -204,7 +203,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Cas AccessKeySecret: tea.String(accessKeySecret), } - client, err := internal.NewCasClient(config) + client, err := alicas.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/certmgr/providers/aliyun-cas/internal/client.go b/pkg/core/certmgr/providers/aliyun-cas/internal/client.go deleted file mode 100644 index ece409102..000000000 --- a/pkg/core/certmgr/providers/aliyun-cas/internal/client.go +++ /dev/null @@ -1,194 +0,0 @@ -package internal - -import ( - "context" - - alicas "github.com/alibabacloud-go/cas-20200407/v4/client" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" - openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - "github.com/alibabacloud-go/tea/dara" -) - -// This is a partial copy of https://github.com/alibabacloud-go/cas-20200407/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type CasClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewCasClient(config *openapiutil.Config) (*CasClient, error) { - client := new(CasClient) - err := client.Init(config) - return client, err -} - -func (client *CasClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *CasClient) GetUserCertificateDetailWithContext(ctx context.Context, request *alicas.GetUserCertificateDetailRequest, runtime *dara.RuntimeOptions) (_result *alicas.GetUserCertificateDetailResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.CertFilter) { - query["CertFilter"] = request.CertFilter - } - - if !dara.IsNil(request.CertId) { - query["CertId"] = request.CertId - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("GetUserCertificateDetail"), - Version: dara.String("2020-04-07"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alicas.GetUserCertificateDetailResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *CasClient) ListUserCertificateOrderWithContext(ctx context.Context, request *alicas.ListUserCertificateOrderRequest, runtime *dara.RuntimeOptions) (_result *alicas.ListUserCertificateOrderResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.CurrentPage) { - query["CurrentPage"] = request.CurrentPage - } - - if !dara.IsNil(request.Keyword) { - query["Keyword"] = request.Keyword - } - - if !dara.IsNil(request.OrderType) { - query["OrderType"] = request.OrderType - } - - if !dara.IsNil(request.ResourceGroupId) { - query["ResourceGroupId"] = request.ResourceGroupId - } - - if !dara.IsNil(request.ShowSize) { - query["ShowSize"] = request.ShowSize - } - - if !dara.IsNil(request.Status) { - query["Status"] = request.Status - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("ListUserCertificateOrder"), - Version: dara.String("2020-04-07"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alicas.ListUserCertificateOrderResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *CasClient) UploadUserCertificateWithContext(ctx context.Context, request *alicas.UploadUserCertificateRequest, runtime *dara.RuntimeOptions) (_result *alicas.UploadUserCertificateResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.Cert) { - query["Cert"] = request.Cert - } - - if !dara.IsNil(request.EncryptCert) { - query["EncryptCert"] = request.EncryptCert - } - - if !dara.IsNil(request.EncryptPrivateKey) { - query["EncryptPrivateKey"] = request.EncryptPrivateKey - } - - if !dara.IsNil(request.Key) { - query["Key"] = request.Key - } - - if !dara.IsNil(request.Name) { - query["Name"] = request.Name - } - - if !dara.IsNil(request.ResourceGroupId) { - query["ResourceGroupId"] = request.ResourceGroupId - } - - if !dara.IsNil(request.SignCert) { - query["SignCert"] = request.SignCert - } - - if !dara.IsNil(request.SignPrivateKey) { - query["SignPrivateKey"] = request.SignPrivateKey - } - - if !dara.IsNil(request.Tags) { - query["Tags"] = request.Tags - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("UploadUserCertificate"), - Version: dara.String("2020-04-07"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alicas.UploadUserCertificateResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} diff --git a/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go b/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go index a287d1efe..1a1d077f7 100644 --- a/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go +++ b/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go @@ -13,13 +13,12 @@ import ( "time" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - alislb "github.com/alibabacloud-go/slb-20140515/v4/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-slb/internal" + alislb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) @@ -37,7 +36,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *internal.SlbClient + sdkClient *alislb.Client } var _ certmgr.Provider = (*Certmgr)(nil) @@ -110,8 +109,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") return &certmgr.UploadResult{ - CertId: *certItem.ServerCertificateId, - CertName: *certItem.ServerCertificateName, + CertId: tea.StringValue(certItem.ServerCertificateId), + CertName: tea.StringValue(certItem.ServerCertificateName), }, nil } } @@ -150,7 +149,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, certmgr.ErrUnsupported } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.SlbClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*alislb.Client, error) { // 接入点一览 https://api.aliyun.com/product/Slb var endpoint string switch region { @@ -170,7 +169,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Slb AccessKeySecret: tea.String(accessKeySecret), } - client, err := internal.NewSlbClient(config) + client, err := alislb.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/certmgr/providers/aliyun-slb/internal/client.go b/pkg/core/certmgr/providers/aliyun-slb/internal/client.go deleted file mode 100644 index 8fbfebeae..000000000 --- a/pkg/core/certmgr/providers/aliyun-slb/internal/client.go +++ /dev/null @@ -1,180 +0,0 @@ -package internal - -import ( - "context" - - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" - openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - alislb "github.com/alibabacloud-go/slb-20140515/v4/client" - "github.com/alibabacloud-go/tea/dara" -) - -// This is a partial copy of https://github.com/alibabacloud-go/slb-20140515/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type SlbClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewSlbClient(config *openapi.Config) (*SlbClient, error) { - client := new(SlbClient) - err := client.Init(config) - return client, err -} - -func (client *SlbClient) Init(config *openapi.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *SlbClient) DescribeServerCertificatesWithContext(ctx context.Context, request *alislb.DescribeServerCertificatesRequest, runtime *dara.RuntimeOptions) (_result *alislb.DescribeServerCertificatesResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - - query := map[string]interface{}{} - if !dara.IsNil(request.OwnerAccount) { - query["OwnerAccount"] = request.OwnerAccount - } - - if !dara.IsNil(request.OwnerId) { - query["OwnerId"] = request.OwnerId - } - - if !dara.IsNil(request.RegionId) { - query["RegionId"] = request.RegionId - } - - if !dara.IsNil(request.ResourceGroupId) { - query["ResourceGroupId"] = request.ResourceGroupId - } - - if !dara.IsNil(request.ResourceOwnerAccount) { - query["ResourceOwnerAccount"] = request.ResourceOwnerAccount - } - - if !dara.IsNil(request.ResourceOwnerId) { - query["ResourceOwnerId"] = request.ResourceOwnerId - } - - if !dara.IsNil(request.ServerCertificateId) { - query["ServerCertificateId"] = request.ServerCertificateId - } - - if !dara.IsNil(request.Tag) { - query["Tag"] = request.Tag - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("DescribeServerCertificates"), - Version: dara.String("2014-05-15"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alislb.DescribeServerCertificatesResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *SlbClient) UploadServerCertificateWithContext(ctx context.Context, request *alislb.UploadServerCertificateRequest, runtime *dara.RuntimeOptions) (_result *alislb.UploadServerCertificateResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - - query := map[string]interface{}{} - if !dara.IsNil(request.AliCloudCertificateId) { - query["AliCloudCertificateId"] = request.AliCloudCertificateId - } - - if !dara.IsNil(request.AliCloudCertificateName) { - query["AliCloudCertificateName"] = request.AliCloudCertificateName - } - - if !dara.IsNil(request.AliCloudCertificateRegionId) { - query["AliCloudCertificateRegionId"] = request.AliCloudCertificateRegionId - } - - if !dara.IsNil(request.OwnerAccount) { - query["OwnerAccount"] = request.OwnerAccount - } - - if !dara.IsNil(request.OwnerId) { - query["OwnerId"] = request.OwnerId - } - - if !dara.IsNil(request.PrivateKey) { - query["PrivateKey"] = request.PrivateKey - } - - if !dara.IsNil(request.RegionId) { - query["RegionId"] = request.RegionId - } - - if !dara.IsNil(request.ResourceGroupId) { - query["ResourceGroupId"] = request.ResourceGroupId - } - - if !dara.IsNil(request.ResourceOwnerAccount) { - query["ResourceOwnerAccount"] = request.ResourceOwnerAccount - } - - if !dara.IsNil(request.ResourceOwnerId) { - query["ResourceOwnerId"] = request.ResourceOwnerId - } - - if !dara.IsNil(request.ServerCertificate) { - query["ServerCertificate"] = request.ServerCertificate - } - - if !dara.IsNil(request.ServerCertificateName) { - query["ServerCertificateName"] = request.ServerCertificateName - } - - if !dara.IsNil(request.Tag) { - query["Tag"] = request.Tag - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("UploadServerCertificate"), - Version: dara.String("2014-05-15"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alislb.UploadServerCertificateResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} diff --git a/pkg/core/certmgr/providers/aws-acm/aws_acm_test.go b/pkg/core/certmgr/providers/aws-acm/aws_acm_test.go new file mode 100644 index 000000000..37fe918b2 --- /dev/null +++ b/pkg/core/certmgr/providers/aws-acm/aws_acm_test.go @@ -0,0 +1,77 @@ +package awsacm_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fSecretAccessKey string + fRegion string +) + +func init() { + argsPrefix := "AWSACM_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fSecretAccessKey, argsPrefix+"SECRETACCESSKEY", "", "") + flag.StringVar(&fRegion, argsPrefix+"REGION", "", "") +} + +/* +Shell command to run this test: + + go test -v ./aws_acm_test.go -args \ + --AWSACM_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --AWSACM_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --AWSACM_ACCESSKEYID="your-access-key-id" \ + --AWSACM_SECRETACCESSKEY="your-access-key-secret" \ + --AWSACM_REGION="us-east-1" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("SECRETACCESSKEY: %v", fSecretAccessKey), + fmt.Sprintf("REGION: %v", fRegion), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKeyId: fAccessKeyId, + SecretAccessKey: fSecretAccessKey, + Region: fRegion, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/aws-iam/aws_iam_test.go b/pkg/core/certmgr/providers/aws-iam/aws_iam_test.go new file mode 100644 index 000000000..61d23476f --- /dev/null +++ b/pkg/core/certmgr/providers/aws-iam/aws_iam_test.go @@ -0,0 +1,77 @@ +package awsiam_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fSecretAccessKey string + fRegion string +) + +func init() { + argsPrefix := "AWSIAM_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fSecretAccessKey, argsPrefix+"SECRETACCESSKEY", "", "") + flag.StringVar(&fRegion, argsPrefix+"REGION", "", "") +} + +/* +Shell command to run this test: + + go test -v ./aws_iam_test.go -args \ + --AWSIAM_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --AWSIAM_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --AWSIAM_ACCESSKEYID="your-access-key-id" \ + --AWSIAM_SECRETACCESSKEY="your-access-key-secret" \ + --AWSIAM_REGION="us-east-1" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("SECRETACCESSKEY: %v", fSecretAccessKey), + fmt.Sprintf("REGION: %v", fRegion), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKeyId: fAccessKeyId, + SecretAccessKey: fSecretAccessKey, + Region: fRegion, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/dogecloud/dogecloud_test.go b/pkg/core/certmgr/providers/dogecloud/dogecloud_test.go new file mode 100644 index 000000000..a08ef3c51 --- /dev/null +++ b/pkg/core/certmgr/providers/dogecloud/dogecloud_test.go @@ -0,0 +1,72 @@ +package dogecloud_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dogecloud" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKey string + fSecretKey string +) + +func init() { + argsPrefix := "DOGECLOUD_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKey, argsPrefix+"ACCESSKEY", "", "") + flag.StringVar(&fSecretKey, argsPrefix+"SECRETKEY", "", "") +} + +/* +Shell command to run this test: + + go test -v ./dogecloud_test.go -args \ + --DOGECLOUD_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --DOGECLOUD_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --DOGECLOUD_ACCESSKEY="your-access-key" \ + --DOGECLOUD_SECRETKEY="your-secret-key" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEY: %v", fAccessKey), + fmt.Sprintf("SECRETKEY: %v", fSecretKey), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKey: fAccessKey, + SecretKey: fSecretKey, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn_test.go b/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn_test.go new file mode 100644 index 000000000..96cd88106 --- /dev/null +++ b/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn_test.go @@ -0,0 +1,67 @@ +package gcorecdn_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/gcore-cdn" +) + +var ( + fInputCertPath string + fInputKeyPath string + fApiToken string +) + +func init() { + argsPrefix := "GCORECDN_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fApiToken, argsPrefix+"APITOKEN", "", "") +} + +/* +Shell command to run this test: + + go test -v ./gcore_cdn_test.go -args \ + --GCORECDN_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --GCORECDN_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --GCORECDN_APITOKEN="your-api-token" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("APITOKEN: %v", fApiToken), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + ApiToken: fApiToken, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go index c1d076a5d..2227d390d 100644 --- a/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go @@ -9,16 +9,15 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hcelb "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" - hcelbmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/model" - hcelbregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/region" - hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" - hciammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" - hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" + hwelbmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/model" + hwelbregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/region" + hwiam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" + hwiammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" + hwiamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-elb/internal" + hwelb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) @@ -36,7 +35,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *internal.ElbClient + sdkClient *hwelb.ElbClient } var _ certmgr.Provider = (*Certmgr)(nil) @@ -77,7 +76,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert default: } - listCertificatesReq := &hcelbmodel.ListCertificatesRequest{ + listCertificatesReq := &hwelbmodel.ListCertificatesRequest{ Marker: listCertificatesMarker, Limit: lo.ToPtr(int32(2000)), Type: lo.ToPtr([]string{"server"}), @@ -122,9 +121,9 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 创建新证书 // REF: https://support.huaweicloud.com/api-elb/CreateCertificate.html - createCertificateReq := &hcelbmodel.CreateCertificateRequest{ - Body: &hcelbmodel.CreateCertificateRequestBody{ - Certificate: &hcelbmodel.CreateCertificateOption{ + createCertificateReq := &hwelbmodel.CreateCertificateRequest{ + Body: &hwelbmodel.CreateCertificateRequestBody{ + Certificate: &hwelbmodel.CreateCertificateOption{ EnterpriseProjectId: lo.EmptyableToPtr(c.config.EnterpriseProjectId), ProjectId: lo.ToPtr(projectId), Name: lo.ToPtr(certName), @@ -148,10 +147,10 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { // 更新证书 // REF: https://support.huaweicloud.com/api-elb/UpdateCertificate.html - updateCertificateReq := &hcelbmodel.UpdateCertificateRequest{ + updateCertificateReq := &hwelbmodel.UpdateCertificateRequest{ CertificateId: certIdOrName, - Body: &hcelbmodel.UpdateCertificateRequestBody{ - Certificate: &hcelbmodel.UpdateCertificateOption{ + Body: &hwelbmodel.UpdateCertificateRequestBody{ + Certificate: &hwelbmodel.UpdateCertificateOption{ Certificate: lo.ToPtr(certPEM), PrivateKey: lo.ToPtr(privkeyPEM), }, @@ -166,7 +165,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return &certmgr.OperateResult{}, nil } -func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.ElbClient, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwelb.ElbClient, error) { if region == "" { region = "cn-north-4" // ELB 服务默认区域：华北北京四 } @@ -179,12 +178,12 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Elb return nil, err } - hcRegion, err := hcelbregion.SafeValueOf(region) + hcRegion, err := hwelbregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hcelb.ElbClientBuilder(). + hcClient, err := hwelb.ElbClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -192,7 +191,7 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Elb return nil, err } - client := internal.NewElbClient(hcClient) + client := hwelb.NewElbClient(hcClient) return client, nil } @@ -209,12 +208,12 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - hcRegion, err := hciamregion.SafeValueOf(region) + hcRegion, err := hwiamregion.SafeValueOf(region) if err != nil { return "", err } - hcClient, err := hciam.IamClientBuilder(). + hcClient, err := hwiam.IamClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -222,9 +221,9 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - client := hciam.NewIamClient(hcClient) + client := hwiam.NewIamClient(hcClient) - request := &hciammodel.KeystoneListProjectsRequest{ + request := &hwiammodel.KeystoneListProjectsRequest{ Name: ®ion, } response, err := client.KeystoneListProjects(request) diff --git a/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb_test.go b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb_test.go new file mode 100644 index 000000000..3d649d48f --- /dev/null +++ b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb_test.go @@ -0,0 +1,77 @@ +package huaweicloudelb_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-elb" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fSecretAccessKey string + fRegion string +) + +func init() { + argsPrefix := "HUAWEICLOUDELB_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fSecretAccessKey, argsPrefix+"SECRETACCESSKEY", "", "") + flag.StringVar(&fRegion, argsPrefix+"REGION", "", "") +} + +/* +Shell command to run this test: + + go test -v ./huaweicloud_elb_test.go -args \ + --HUAWEICLOUDELB_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --HUAWEICLOUDELB_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --HUAWEICLOUDELB_ACCESSKEYID="your-access-key-id" \ + --HUAWEICLOUDELB_SECRETACCESSKEY="your-access-key-secret" \ + --HUAWEICLOUDELB_REGION="cn-north-4" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("SECRETACCESSKEY: %v", fSecretAccessKey), + fmt.Sprintf("REGION: %v", fRegion), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKeyId: fAccessKeyId, + SecretAccessKey: fSecretAccessKey, + Region: fRegion, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/huaweicloud-elb/internal/client.go b/pkg/core/certmgr/providers/huaweicloud-elb/internal/client.go deleted file mode 100644 index d2b1df776..000000000 --- a/pkg/core/certmgr/providers/huaweicloud-elb/internal/client.go +++ /dev/null @@ -1,47 +0,0 @@ -package internal - -import ( - httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" - hwelb "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" - "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/model" -) - -// This is a partial copy of https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/services/elb/v3/elb_client.go -// to lightweight the vendor packages in the built binary. -type ElbClient struct { - HcClient *httpclient.HcHttpClient -} - -func NewElbClient(hcClient *httpclient.HcHttpClient) *ElbClient { - return &ElbClient{HcClient: hcClient} -} - -func (c *ElbClient) CreateCertificate(request *model.CreateCertificateRequest) (*model.CreateCertificateResponse, error) { - requestDef := hwelb.GenReqDefForCreateCertificate() - - if resp, err := c.HcClient.Sync(request, requestDef); err != nil { - return nil, err - } else { - return resp.(*model.CreateCertificateResponse), nil - } -} - -func (c *ElbClient) ListCertificates(request *model.ListCertificatesRequest) (*model.ListCertificatesResponse, error) { - requestDef := hwelb.GenReqDefForListCertificates() - - if resp, err := c.HcClient.Sync(request, requestDef); err != nil { - return nil, err - } else { - return resp.(*model.ListCertificatesResponse), nil - } -} - -func (c *ElbClient) UpdateCertificate(request *model.UpdateCertificateRequest) (*model.UpdateCertificateResponse, error) { - requestDef := hwelb.GenReqDefForUpdateCertificate() - - if resp, err := c.HcClient.Sync(request, requestDef); err != nil { - return nil, err - } else { - return resp.(*model.UpdateCertificateResponse), nil - } -} diff --git a/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go index f5f5d9a6e..475d6dd2f 100644 --- a/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go @@ -9,13 +9,12 @@ import ( "time" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" - hcscm "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3" - hcscmmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/model" - hcscmregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/region" + hwscmmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/model" + hwscmregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/region" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm/internal" + hwscm "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) @@ -33,7 +32,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *internal.ScmClient + sdkClient *hwscm.ScmClient } var _ certmgr.Provider = (*Certmgr)(nil) @@ -82,7 +81,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert default: } - listCertificatesReq := &hcscmmodel.ListCertificatesRequest{ + listCertificatesReq := &hwscmmodel.ListCertificatesRequest{ EnterpriseProjectId: lo.EmptyableToPtr(c.config.EnterpriseProjectId), Limit: lo.ToPtr(int32(listCertificatesLimit)), Offset: lo.ToPtr(int32(listCertificatesOffset)), @@ -111,7 +110,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert } // 对比证书内容 - exportCertificateReq := &hcscmmodel.ExportCertificateRequest{ + exportCertificateReq := &hwscmmodel.ExportCertificateRequest{ CertificateId: certItem.Id, } exportCertificateResp, err := c.sdkClient.ExportCertificate(exportCertificateReq) @@ -147,8 +146,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 上传新证书 // REF: https://support.huaweicloud.com/api-ccm/ImportCertificate.html - importCertificateReq := &hcscmmodel.ImportCertificateRequest{ - Body: &hcscmmodel.ImportCertificateRequestBody{ + importCertificateReq := &hwscmmodel.ImportCertificateRequest{ + Body: &hwscmmodel.ImportCertificateRequestBody{ EnterpriseProjectId: lo.EmptyableToPtr(c.config.EnterpriseProjectId), Name: certName, Certificate: certPEM, @@ -171,7 +170,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, certmgr.ErrUnsupported } -func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.ScmClient, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwscm.ScmClient, error) { if region == "" { region = "cn-north-4" // SCM 服务默认区域：华北北京四 } @@ -184,12 +183,12 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Scm return nil, err } - hcRegion, err := hcscmregion.SafeValueOf(region) + hcRegion, err := hwscmregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hcscm.ScmClientBuilder(). + hcClient, err := hwscm.ScmClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -197,6 +196,6 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Scm return nil, err } - client := internal.NewScmClient(hcClient) + client := hwscm.NewScmClient(hcClient) return client, nil } diff --git a/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm_test.go b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm_test.go new file mode 100644 index 000000000..25300c110 --- /dev/null +++ b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm_test.go @@ -0,0 +1,77 @@ +package huaweicloudscm_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fSecretAccessKey string + fRegion string +) + +func init() { + argsPrefix := "HUAWEICLOUDSCM_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fSecretAccessKey, argsPrefix+"SECRETACCESSKEY", "", "") + flag.StringVar(&fRegion, argsPrefix+"REGION", "", "") +} + +/* +Shell command to run this test: + + go test -v ./huaweicloud_scm_test.go -args \ + --HUAWEICLOUDSCM_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --HUAWEICLOUDSCM_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --HUAWEICLOUDSCM_ACCESSKEYID="your-access-key-id" \ + --HUAWEICLOUDSCM_SECRETACCESSKEY="your-access-key-secret" \ + --HUAWEICLOUDSCM_REGION="cn-north-4" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("SECRETACCESSKEY: %v", fSecretAccessKey), + fmt.Sprintf("REGION: %v", fRegion), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKeyId: fAccessKeyId, + SecretAccessKey: fSecretAccessKey, + Region: fRegion, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go index 8a075b3cb..97ec91f1b 100644 --- a/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go @@ -9,16 +9,15 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" - hciammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" - hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" - hcwaf "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" - hcwafmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" - hcwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" + hwiam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" + hwiammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" + hwiamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" + hwwafmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" + hwwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-waf/internal" + hwwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) @@ -36,7 +35,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *internal.WafClient + sdkClient *hwwaf.WafClient } var _ certmgr.Provider = (*Certmgr)(nil) @@ -79,7 +78,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert default: } - listCertificatesReq := &hcwafmodel.ListCertificatesRequest{ + listCertificatesReq := &hwwafmodel.ListCertificatesRequest{ EnterpriseProjectId: lo.EmptyableToPtr(c.config.EnterpriseProjectId), Page: lo.ToPtr(int32(listCertificatesPage)), Pagesize: lo.ToPtr(int32(listCertificatesPageSize)), @@ -95,7 +94,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert } for _, certItem := range *listCertificatesResp.Items { - showCertificateReq := &hcwafmodel.ShowCertificateRequest{ + showCertificateReq := &hwwafmodel.ShowCertificateRequest{ EnterpriseProjectId: lo.EmptyableToPtr(c.config.EnterpriseProjectId), CertificateId: certItem.Id, } @@ -127,9 +126,9 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 创建证书 // REF: https://support.huaweicloud.com/api-waf/CreateCertificate.html - createCertificateReq := &hcwafmodel.CreateCertificateRequest{ + createCertificateReq := &hwwafmodel.CreateCertificateRequest{ EnterpriseProjectId: lo.EmptyableToPtr(c.config.EnterpriseProjectId), - Body: &hcwafmodel.CreateCertificateRequestBody{ + Body: &hwwafmodel.CreateCertificateRequestBody{ Name: certName, Content: certPEM, Key: privkeyPEM, @@ -151,7 +150,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, certmgr.ErrUnsupported } -func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.WafClient, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwwaf.WafClient, error) { projectId, err := getSDKProjectId(accessKeyId, secretAccessKey, region) if err != nil { return nil, err @@ -166,12 +165,12 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Waf return nil, err } - hcRegion, err := hcwafregion.SafeValueOf(region) + hcRegion, err := hwwafregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hcwaf.WafClientBuilder(). + hcClient, err := hwwaf.WafClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -179,7 +178,7 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Waf return nil, err } - client := internal.NewWafClient(hcClient) + client := hwwaf.NewWafClient(hcClient) return client, nil } @@ -192,12 +191,12 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - hcRegion, err := hciamregion.SafeValueOf(region) + hcRegion, err := hwiamregion.SafeValueOf(region) if err != nil { return "", err } - hcClient, err := hciam.IamClientBuilder(). + hcClient, err := hwiam.IamClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -205,9 +204,9 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - client := hciam.NewIamClient(hcClient) + client := hwiam.NewIamClient(hcClient) - request := &hciammodel.KeystoneListProjectsRequest{ + request := &hwiammodel.KeystoneListProjectsRequest{ Name: ®ion, } response, err := client.KeystoneListProjects(request) diff --git a/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf_test.go b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf_test.go new file mode 100644 index 000000000..4afa3c331 --- /dev/null +++ b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf_test.go @@ -0,0 +1,77 @@ +package huaweicloudwaf_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-waf" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fSecretAccessKey string + fRegion string +) + +func init() { + argsPrefix := "HUAWEICLOUDWAF_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fSecretAccessKey, argsPrefix+"SECRETACCESSKEY", "", "") + flag.StringVar(&fRegion, argsPrefix+"REGION", "", "") +} + +/* +Shell command to run this test: + + go test -v ./huaweicloud_waf_test.go -args \ + --HUAWEICLOUDWAF_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --HUAWEICLOUDWAF_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --HUAWEICLOUDWAF_ACCESSKEYID="your-access-key-id" \ + --HUAWEICLOUDWAF_SECRETACCESSKEY="your-access-key-secret" \ + --HUAWEICLOUDWAF_REGION="cn-north-4" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("SECRETACCESSKEY: %v", fSecretAccessKey), + fmt.Sprintf("REGION: %v", fRegion), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKeyId: fAccessKeyId, + SecretAccessKey: fSecretAccessKey, + Region: fRegion, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/huaweicloud-waf/internal/client.go b/pkg/core/certmgr/providers/huaweicloud-waf/internal/client.go deleted file mode 100644 index 49d70bc66..000000000 --- a/pkg/core/certmgr/providers/huaweicloud-waf/internal/client.go +++ /dev/null @@ -1,47 +0,0 @@ -package internal - -import ( - httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" - hwwaf "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" - "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" -) - -// This is a partial copy of https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/services/waf/v1/waf_client.go -// to lightweight the vendor packages in the built binary. -type WafClient struct { - HcClient *httpclient.HcHttpClient -} - -func NewWafClient(hcClient *httpclient.HcHttpClient) *WafClient { - return &WafClient{HcClient: hcClient} -} - -func (c *WafClient) CreateCertificate(request *model.CreateCertificateRequest) (*model.CreateCertificateResponse, error) { - requestDef := hwwaf.GenReqDefForCreateCertificate() - - if resp, err := c.HcClient.Sync(request, requestDef); err != nil { - return nil, err - } else { - return resp.(*model.CreateCertificateResponse), nil - } -} - -func (c *WafClient) ListCertificates(request *model.ListCertificatesRequest) (*model.ListCertificatesResponse, error) { - requestDef := hwwaf.GenReqDefForListCertificates() - - if resp, err := c.HcClient.Sync(request, requestDef); err != nil { - return nil, err - } else { - return resp.(*model.ListCertificatesResponse), nil - } -} - -func (c *WafClient) ShowCertificate(request *model.ShowCertificateRequest) (*model.ShowCertificateResponse, error) { - requestDef := hwwaf.GenReqDefForShowCertificate() - - if resp, err := c.HcClient.Sync(request, requestDef); err != nil { - return nil, err - } else { - return resp.(*model.ShowCertificateResponse), nil - } -} diff --git a/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go b/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go index 1bcd36f11..ca49ba8c0 100644 --- a/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go +++ b/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go @@ -11,10 +11,10 @@ import ( "time" jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" - jdsslapi "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/apis" - jdsslclient "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client" + jdsslapis "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/apis" "github.com/certimate-go/certimate/pkg/core/certmgr" + jdssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) @@ -28,7 +28,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *jdsslclient.SslClient + sdkClient *jdssl.SslClient } var _ certmgr.Provider = (*Certmgr)(nil) @@ -82,7 +82,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert default: } - describeCertsReq := jdsslapi.NewDescribeCertsRequestWithoutParam() + describeCertsReq := jdsslapis.NewDescribeCertsRequestWithoutParam() describeCertsReq.SetDomainName(certX509.Subject.CommonName) describeCertsReq.SetPageNumber(describeCertsPageNumber) describeCertsReq.SetPageSize(describeCertsPageSize) @@ -137,7 +137,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 上传证书 // REF: https://docs.jdcloud.com/cn/ssl-certificate/api/uploadcert - uploadCertReq := jdsslapi.NewUploadCertRequestWithoutParam() + uploadCertReq := jdsslapis.NewUploadCertRequestWithoutParam() uploadCertReq.SetCertName(certName) uploadCertReq.SetCertFile(certPEM) uploadCertReq.SetKeyFile(privkeyPEM) @@ -157,9 +157,9 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, certmgr.ErrUnsupported } -func createSDKClient(accessKeyId, accessKeySecret string) (*jdsslclient.SslClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*jdssl.SslClient, error) { clientCredentials := jdcore.NewCredentials(accessKeyId, accessKeySecret) - client := jdsslclient.NewSslClient(clientCredentials) + client := jdssl.NewSslClient(clientCredentials) client.DisableLogger() return client, nil } diff --git a/pkg/core/certmgr/providers/tencentcloud-ssl/internal/client.go b/pkg/core/certmgr/providers/tencentcloud-ssl/internal/client.go deleted file mode 100644 index 8c14d07b1..000000000 --- a/pkg/core/certmgr/providers/tencentcloud-ssl/internal/client.go +++ /dev/null @@ -1,44 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/ssl/v20191205/client.go -// to lightweight the vendor packages in the built binary. -type SslClient struct { - common.Client -} - -func NewSslClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *SslClient, err error) { - client = &SslClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *SslClient) UploadCertificate(request *tcssl.UploadCertificateRequest) (response *tcssl.UploadCertificateResponse, err error) { - return c.UploadCertificateWithContext(context.Background(), request) -} - -func (c *SslClient) UploadCertificateWithContext(ctx context.Context, request *tcssl.UploadCertificateRequest) (response *tcssl.UploadCertificateResponse, err error) { - if request == nil { - request = tcssl.NewUploadCertificateRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "UploadCertificate") - - if c.GetCredential() == nil { - return nil, errors.New("UploadCertificate require credential") - } - - request.SetContext(ctx) - response = tcssl.NewUploadCertificateResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go b/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go index c9aae8473..675f215ad 100644 --- a/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go +++ b/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -8,10 +8,9 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl/internal" + tcssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" ) type CertmgrConfig struct { @@ -26,7 +25,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *internal.SslClient + sdkClient *tcssl.Client } var _ certmgr.Provider = (*Certmgr)(nil) @@ -63,7 +62,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert uploadCertificateReq.CertificatePublicKey = common.StringPtr(certPEM) uploadCertificateReq.CertificatePrivateKey = common.StringPtr(privkeyPEM) uploadCertificateReq.Repeatable = common.BoolPtr(false) - uploadCertificateResp, err := c.sdkClient.UploadCertificate(uploadCertificateReq) + uploadCertificateResp, err := c.sdkClient.UploadCertificateWithContext(ctx, uploadCertificateReq) c.logger.Debug("sdk request 'ssl.UploadCertificate'", slog.Any("request", uploadCertificateReq), slog.Any("response", uploadCertificateResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'ssl.UploadCertificate': %w", err) @@ -78,7 +77,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, certmgr.ErrUnsupported } -func createSDKClient(secretId, secretKey, endpoint string) (*internal.SslClient, error) { +func createSDKClient(secretId, secretKey, endpoint string) (*tcssl.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -86,7 +85,7 @@ func createSDKClient(secretId, secretKey, endpoint string) (*internal.SslClient, cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewSslClient(credential, "", cpf) + client, err := tcssl.NewClient(credential, "", cpf) if err != nil { return nil, err } diff --git a/pkg/core/certmgr/providers/volcengine-cdn/internal/client.go b/pkg/core/certmgr/providers/volcengine-cdn/internal/client.go deleted file mode 100644 index 2f2f254a9..000000000 --- a/pkg/core/certmgr/providers/volcengine-cdn/internal/client.go +++ /dev/null @@ -1,104 +0,0 @@ -package internal - -import ( - "github.com/volcengine/volcengine-go-sdk/service/cdn" - "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/volcengine/volcengine-go-sdk/volcengine/client" - "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" - "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" - "github.com/volcengine/volcengine-go-sdk/volcengine/request" - "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" - "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" -) - -// This is a partial copy of https://github.com/volcengine/volcengine-go-sdk/blob/master/service/cdn/service_cdn.go -// to lightweight the vendor packages in the built binary. -type CdnClient struct { - *client.Client -} - -func NewCdnClient(p client.ConfigProvider, cfgs ...*volcengine.Config) *CdnClient { - c := p.ClientConfig(cdn.EndpointsID, cfgs...) - return newCdnClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) -} - -func newCdnClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *CdnClient { - svc := &CdnClient{ - Client: client.New( - cfg, - metadata.ClientInfo{ - ServiceName: cdn.ServiceName, - ServiceID: cdn.ServiceID, - SigningName: signingName, - SigningRegion: signingRegion, - Endpoint: endpoint, - APIVersion: "2021-03-01", - }, - handlers, - ), - } - - svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) - svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) - svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) - svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) - svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) - svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) - svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) - - return svc -} - -func (c *CdnClient) newRequest(op *request.Operation, params, data interface{}) *request.Request { - req := c.NewRequest(op, params, data) - - return req -} - -func (c *CdnClient) AddCertificate(input *cdn.AddCertificateInput) (*cdn.AddCertificateOutput, error) { - req, out := c.AddCertificateRequest(input) - return out, req.Send() -} - -func (c *CdnClient) AddCertificateRequest(input *cdn.AddCertificateInput) (req *request.Request, output *cdn.AddCertificateOutput) { - op := &request.Operation{ - Name: "AddCertificate", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &cdn.AddCertificateInput{} - } - - output = &cdn.AddCertificateOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} - -func (c *CdnClient) ListCertInfo(input *cdn.ListCertInfoInput) (*cdn.ListCertInfoOutput, error) { - req, out := c.ListCertInfoRequest(input) - return out, req.Send() -} - -func (c *CdnClient) ListCertInfoRequest(input *cdn.ListCertInfoInput) (req *request.Request, output *cdn.ListCertInfoOutput) { - op := &request.Operation{ - Name: "ListCertInfo", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &cdn.ListCertInfoInput{} - } - - output = &cdn.ListCertInfoOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} diff --git a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go index ad063e399..a503ee564 100644 --- a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go +++ b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go @@ -11,12 +11,11 @@ import ( "strings" "time" - vecdn "github.com/volcengine/volcengine-go-sdk/service/cdn" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-cdn/internal" + vecdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) @@ -30,7 +29,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *internal.CdnClient + sdkClient *vecdn.CDN } var _ certmgr.Provider = (*Certmgr)(nil) @@ -83,7 +82,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert PageNum: ve.Int32(int32(listCertInfoPageNum)), PageSize: ve.Int32(int32(listCertInfoPageSize)), } - listCertInfoResp, err := c.sdkClient.ListCertInfo(listCertInfoReq) + listCertInfoResp, err := c.sdkClient.ListCertInfoWithContext(ctx, listCertInfoReq) c.logger.Debug("sdk request 'cdn.ListCertInfo'", slog.Any("request", listCertInfoReq), slog.Any("response", listCertInfoResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.ListCertInfo': %w", err) @@ -128,8 +127,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert PrivateKey: ve.String(privkeyPEM), Desc: ve.String(certName), } - addCertificateResp, err := c.sdkClient.AddCertificate(addCertificateReq) - c.logger.Debug("sdk request 'cdn.AddCertificate'", slog.Any("request", addCertificateResp), slog.Any("response", addCertificateResp)) + addCertificateResp, err := c.sdkClient.AddCertificateWithContext(ctx, addCertificateReq) + c.logger.Debug("sdk request 'cdn.AddCertificate'", slog.Any("request", addCertificateReq), slog.Any("response", addCertificateResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.AddCertificate': %w", err) } @@ -144,7 +143,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, certmgr.ErrUnsupported } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.CdnClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*vecdn.CDN, error) { config := ve.NewConfig(). WithAkSk(accessKeyId, accessKeySecret). WithRegion("cn-north-1") @@ -154,6 +153,6 @@ func createSDKClient(accessKeyId, accessKeySecret string) (*internal.CdnClient, return nil, err } - client := internal.NewCdnClient(session) + client := vecdn.New(session) return client, nil } diff --git a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go new file mode 100644 index 000000000..9db6f00da --- /dev/null +++ b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go @@ -0,0 +1,72 @@ +package volcenginecdn_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-cdn" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fAccessKeySecret string +) + +func init() { + argsPrefix := "VOLCENGINECDN_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fAccessKeySecret, argsPrefix+"ACCESSKEYSECRET", "", "") +} + +/* +Shell command to run this test: + + go test -v ./volcengine_cdn_test.go -args \ + --VOLCENGINECDN_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --VOLCENGINECDN_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --VOLCENGINECDN_ACCESSKEYID="your-access-key-id" \ + --VOLCENGINECDN_ACCESSKEYSECRET="your-access-key-secret" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("ACCESSKEYSECRET: %v", fAccessKeySecret), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKeyId: fAccessKeyId, + AccessKeySecret: fAccessKeySecret, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/volcengine-certcenter/internal/client.go b/pkg/core/certmgr/providers/volcengine-certcenter/internal/client.go deleted file mode 100644 index 2c154b7fd..000000000 --- a/pkg/core/certmgr/providers/volcengine-certcenter/internal/client.go +++ /dev/null @@ -1,80 +0,0 @@ -package internal - -import ( - "github.com/volcengine/volcengine-go-sdk/service/certificateservice" - "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/volcengine/volcengine-go-sdk/volcengine/client" - "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" - "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" - "github.com/volcengine/volcengine-go-sdk/volcengine/request" - "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" - "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" -) - -// This is a partial copy of https://github.com/volcengine/volcengine-go-sdk/blob/master/service/certificateservice/service_certificateservice.go -// to lightweight the vendor packages in the built binary. -type CertificateserviceClient struct { - *client.Client -} - -func NewCertificateserviceClient(p client.ConfigProvider, cfgs ...*volcengine.Config) *CertificateserviceClient { - c := p.ClientConfig(certificateservice.EndpointsID, cfgs...) - return newCertificateserviceClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) -} - -func newCertificateserviceClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *CertificateserviceClient { - svc := &CertificateserviceClient{ - Client: client.New( - cfg, - metadata.ClientInfo{ - ServiceName: certificateservice.ServiceName, - ServiceID: certificateservice.ServiceID, - SigningName: signingName, - SigningRegion: signingRegion, - Endpoint: endpoint, - APIVersion: "2024-10-01", - }, - handlers, - ), - } - - svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) - svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) - svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) - svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) - svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) - svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) - svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) - - return svc -} - -func (c *CertificateserviceClient) newRequest(op *request.Operation, params, data interface{}) *request.Request { - req := c.NewRequest(op, params, data) - - return req -} - -func (c *CertificateserviceClient) ImportCertificate(input *certificateservice.ImportCertificateInput) (*certificateservice.ImportCertificateOutput, error) { - req, out := c.ImportCertificateRequest(input) - return out, req.Send() -} - -func (c *CertificateserviceClient) ImportCertificateRequest(input *certificateservice.ImportCertificateInput) (req *request.Request, output *certificateservice.ImportCertificateOutput) { - op := &request.Operation{ - Name: "ImportCertificate", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &certificateservice.ImportCertificateInput{} - } - - output = &certificateservice.ImportCertificateOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} diff --git a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go index 2bfd4673e..b4e5633f7 100644 --- a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go @@ -6,12 +6,11 @@ import ( "fmt" "log/slog" - vecs "github.com/volcengine/volcengine-go-sdk/service/certificateservice" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter/internal" + vecertificateservice "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice" ) type CertmgrConfig struct { @@ -26,7 +25,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *internal.CertificateserviceClient + sdkClient *vecertificateservice.CERTIFICATESERVICE } var _ certmgr.Provider = (*Certmgr)(nil) @@ -59,14 +58,14 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { // 上传证书 // REF: https://www.volcengine.com/docs/6638/1365580 - importCertificateReq := &vecs.ImportCertificateInput{ - CertificateInfo: &vecs.CertificateInfoForImportCertificateInput{ + importCertificateReq := &vecertificateservice.ImportCertificateInput{ + CertificateInfo: &vecertificateservice.CertificateInfoForImportCertificateInput{ CertificateChain: ve.String(certPEM), PrivateKey: ve.String(privkeyPEM), }, Repeatable: ve.Bool(false), } - importCertificateResp, err := c.sdkClient.ImportCertificate(importCertificateReq) + importCertificateResp, err := c.sdkClient.ImportCertificateWithContext(ctx, importCertificateReq) c.logger.Debug("sdk request 'certcenter.ImportCertificate'", slog.Any("request", importCertificateReq), slog.Any("response", importCertificateResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'certcenter.ImportCertificate': %w", err) @@ -93,7 +92,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, certmgr.ErrUnsupported } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.CertificateserviceClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*vecertificateservice.CERTIFICATESERVICE, error) { if region == "" { region = "cn-beijing" // 证书中心默认区域：北京 } @@ -107,6 +106,6 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Cer return nil, err } - client := internal.NewCertificateserviceClient(session) + client := vecertificateservice.New(session, config) return client, nil } diff --git a/pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go b/pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go new file mode 100644 index 000000000..85235f72d --- /dev/null +++ b/pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go @@ -0,0 +1,72 @@ +package volcenginelive_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-live" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fAccessKeySecret string +) + +func init() { + argsPrefix := "VOLCENGINELIVE_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fAccessKeySecret, argsPrefix+"ACCESSKEYSECRET", "", "") +} + +/* +Shell command to run this test: + + go test -v ./volcengine_live_test.go -args \ + --VOLCENGINELIVE_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --VOLCENGINELIVE_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --VOLCENGINELIVE_ACCESSKEYID="your-access-key-id" \ + --VOLCENGINELIVE_ACCESSKEYSECRET="your-access-key-secret" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("ACCESSKEYSECRET: %v", fAccessKeySecret), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKeyId: fAccessKeyId, + AccessKeySecret: fAccessKeySecret, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go index 4fb09584a..f34cb41c7 100644 --- a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go +++ b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go @@ -16,7 +16,7 @@ import ( zcommon "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" "github.com/certimate-go/certimate/pkg/core/certmgr" - zcdn "github.com/certimate-go/certimate/pkg/sdk3rd/zenlayer/cdn" + zcdnsdk "github.com/certimate-go/certimate/pkg/sdk3rd/zenlayer/cdn" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) @@ -32,7 +32,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *zcdn.Client + sdkClient *zcdnsdk.Client } var _ certmgr.Provider = (*Certmgr)(nil) @@ -80,7 +80,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert default: } - describeCertificatesReq := zcdn.NewDescribeCertificatesRequest() + describeCertificatesReq := zcdnsdk.NewDescribeCertificatesRequest() describeCertificatesReq.ResourceGroupId = c.config.ResourceGroupId describeCertificatesReq.PageNum = describeCertificatesPageNum describeCertificatesReq.PageSize = describeCertificatesPageSize @@ -156,7 +156,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 创建证书 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/cdn/certificate/createcertificate - createCertificateReq := zcdn.NewCreateCertificateRequest() + createCertificateReq := zcdnsdk.NewCreateCertificateRequest() createCertificateReq.ResourceGroupId = c.config.ResourceGroupId createCertificateReq.CertificateLabel = certName createCertificateReq.CertificateContent = certPEM @@ -176,7 +176,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { // 更新证书 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/cdn/certificate/modifycertificate - modifyCertificateReq := zcdn.NewModifyCertificateRequest() + modifyCertificateReq := zcdnsdk.NewModifyCertificateRequest() modifyCertificateReq.CertificateId = certIdOrName modifyCertificateReq.CertificateContent = certPEM modifyCertificateReq.CertificateKey = privkeyPEM @@ -189,10 +189,10 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return &certmgr.OperateResult{}, nil } -func createSDKClient(accessKeyId, accessKeyPassword string) (*zcdn.Client, error) { +func createSDKClient(accessKeyId, accessKeyPassword string) (*zcdnsdk.Client, error) { config := zcommon.NewConfig() - client, err := zcdn.NewClient(config, accessKeyId, accessKeyPassword) + client, err := zcdnsdk.NewClient(config, accessKeyId, accessKeyPassword) if err != nil { return nil, err } diff --git a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn_test.go b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn_test.go new file mode 100644 index 000000000..cbd67a9cd --- /dev/null +++ b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn_test.go @@ -0,0 +1,72 @@ +package zenlayercdn_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-cdn" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fAccessKeyPassword string +) + +func init() { + argsPrefix := "ZENLAYERCDN_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fAccessKeyPassword, argsPrefix+"ACCESSKEYPASSWORD", "", "") +} + +/* +Shell command to run this test: + + go test -v ./zenlayer_cdn_test.go -args \ + --ZENLAYERCDN_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --ZENLAYERCDN_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --ZENLAYERCDN_ACCESSKEYID="your-access-key-id" \ + --ZENLAYERCDN_ACCESSKEYPASSWORD="your-secret-access-key" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("ACCESSKEYPASSWORD: %v", fAccessKeyPassword), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKeyId: fAccessKeyId, + AccessKeyPassword: fAccessKeyPassword, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/certmgr/providers/zenlayer-ga/internal/client.go b/pkg/core/certmgr/providers/zenlayer-ga/internal/client.go deleted file mode 100644 index 834071bde..000000000 --- a/pkg/core/certmgr/providers/zenlayer-ga/internal/client.go +++ /dev/null @@ -1,46 +0,0 @@ -package internal - -import ( - "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" - zga "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/zga20230706" -) - -// This is a partial copy of https://github.com/zenlayer/zenlayercloud-sdk-go/blob/main/zenlayercloud/zga20230706/client.go -// to lightweight the vendor packages in the built binary. -type ZgaClient struct { - *common.Client -} - -func NewZgaClient(config *common.Config, secretKeyId, secretKeyPassword string) (client *ZgaClient, err error) { - client = &ZgaClient{} - - err = client.InitWithCredential(common.NewCredential(secretKeyId, secretKeyPassword)) - if err != nil { - return nil, err - } - - err = client.WithConfig(config) - if err != nil { - return nil, err - } - - return client, nil -} - -func (c *ZgaClient) CreateCertificate(request *zga.CreateCertificateRequest) (response *zga.CreateCertificateResponse, err error) { - response = zga.NewCreateCertificateResponse() - err = c.ApiCall(request, response) - return -} - -func (c *ZgaClient) DescribeCertificates(request *zga.DescribeCertificatesRequest) (response *zga.DescribeCertificatesResponse, err error) { - response = zga.NewDescribeCertificatesResponse() - err = c.ApiCall(request, response) - return -} - -func (c *ZgaClient) ModifyCertificate(request *zga.ModifyCertificateRequest) (response *zga.ModifyCertificateResponse, err error) { - response = zga.NewModifyCertificateResponse() - err = c.ApiCall(request, response) - return -} diff --git a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go index ca83713f4..fbbe8d0c5 100644 --- a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go +++ b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go @@ -14,10 +14,9 @@ import ( "time" zcommon "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" - zga "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/zga20230706" "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-ga/internal" + zgasdk "github.com/certimate-go/certimate/pkg/sdk3rd/zenlayer/zga" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) @@ -33,7 +32,7 @@ type CertmgrConfig struct { type Certmgr struct { config *CertmgrConfig logger *slog.Logger - sdkClient *internal.ZgaClient + sdkClient *zgasdk.Client } var _ certmgr.Provider = (*Certmgr)(nil) @@ -81,7 +80,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert default: } - describeCertificatesReq := zga.NewDescribeCertificatesRequest() + describeCertificatesReq := zgasdk.NewDescribeCertificatesRequest() describeCertificatesReq.ResourceGroupId = c.config.ResourceGroupId describeCertificatesReq.PageNum = describeCertificatesPageNum describeCertificatesReq.PageSize = describeCertificatesPageSize @@ -157,7 +156,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 创建证书 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/zga/certificate/createcertificate - createCertificateReq := zga.NewCreateCertificateRequest() + createCertificateReq := zgasdk.NewCreateCertificateRequest() createCertificateReq.ResourceGroupId = c.config.ResourceGroupId createCertificateReq.CertificateLabel = certName createCertificateReq.CertificateContent = certPEM @@ -177,7 +176,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.OperateResult, error) { // 更新证书 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/zga/certificate/modifycertificate - modifyCertificateReq := zga.NewModifyCertificateRequest() + modifyCertificateReq := zgasdk.NewModifyCertificateRequest() modifyCertificateReq.CertificateId = certIdOrName modifyCertificateReq.CertificateContent = certPEM modifyCertificateReq.CertificateKey = privkeyPEM @@ -190,10 +189,10 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return &certmgr.OperateResult{}, nil } -func createSDKClient(accessKeyId, accessKeyPassword string) (*internal.ZgaClient, error) { +func createSDKClient(accessKeyId, accessKeyPassword string) (*zgasdk.Client, error) { config := zcommon.NewConfig() - client, err := internal.NewZgaClient(config, accessKeyId, accessKeyPassword) + client, err := zgasdk.NewClient(config, accessKeyId, accessKeyPassword) if err != nil { return nil, err } diff --git a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga_test.go b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga_test.go new file mode 100644 index 000000000..0722e29b4 --- /dev/null +++ b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga_test.go @@ -0,0 +1,72 @@ +package zenlayerga_test + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-ga" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fAccessKeyPassword string +) + +func init() { + argsPrefix := "ZENLAYERGA_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fAccessKeyPassword, argsPrefix+"ACCESSKEYPASSWORD", "", "") +} + +/* +Shell command to run this test: + + go test -v ./zenlayer_ga_test.go -args \ + --ZENLAYERGA_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --ZENLAYERGA_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --ZENLAYERGA_ACCESSKEYID="your-access-key-id" \ + --ZENLAYERGA_ACCESSKEYPASSWORD="your-secret-access-key" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("ACCESSKEYPASSWORD: %v", fAccessKeyPassword), + }, "\n")) + + provider, err := provider.NewCertmgr(&provider.CertmgrConfig{ + AccessKeyId: fAccessKeyId, + AccessKeyPassword: fAccessKeyPassword, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Upload(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + sres, _ := json.Marshal(res) + t.Logf("ok: %s", string(sres)) + }) +} diff --git a/pkg/core/deployer/providers/1panel/1panel.go b/pkg/core/deployer/providers/1panel/1panel.go index 5f04adb06..c3e640fef 100644 --- a/pkg/core/deployer/providers/1panel/1panel.go +++ b/pkg/core/deployer/providers/1panel/1panel.go @@ -10,7 +10,7 @@ import ( "time" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/1panel" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/1panel" "github.com/certimate-go/certimate/pkg/core/deployer" onepanelsdk "github.com/certimate-go/certimate/pkg/sdk3rd/1panel" onepanelsdk2 "github.com/certimate-go/certimate/pkg/sdk3rd/1panel/v2" @@ -63,7 +63,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ ServerUrl: config.ServerUrl, ApiVersion: config.ApiVersion, ApiKey: config.ApiKey, @@ -162,9 +162,8 @@ func (d *Deployer) deployToWebsite(ctx context.Context, certPEM, privkeyPEM stri default: if err := d.updateWebsiteCertificate(ctx, websiteId, websiteSSLId); err != nil { errs = append(errs, err) - } - if i < len(websiteIds)-1 { - xwait.DelayWithContext(ctx, time.Second*5) + } else if i < len(websiteIds)-1 { + xwait.DelayWithContext(ctx, 5*time.Second) } } } diff --git a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go index a7f7d9ca0..ff6a11922 100644 --- a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go +++ b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go @@ -9,17 +9,16 @@ import ( "strings" "time" - alialb "github.com/alibabacloud-go/alb-20200616/v2/client" - alicas "github.com/alibabacloud-go/cas-20200407/v4/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-alb/internal" + alialb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client" + alicas "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) @@ -56,8 +55,8 @@ type Deployer struct { var _ deployer.Provider = (*Deployer)(nil) type wSDKClients struct { - ALB *internal.AlbClient - CAS *internal.CasClient + ALB *alialb.Client + CAS *alicas.Client } func NewDeployer(config *DeployerConfig) (*Deployer, error) { @@ -70,7 +69,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -468,7 +467,7 @@ func (d *Deployer) waitForListenerReady(ctx context.Context, cloudListenerId str d.logger.Info("waiting for aliyun alb listener's status to not be 'Configuring' ...") return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return err } @@ -476,45 +475,54 @@ func (d *Deployer) waitForListenerReady(ctx context.Context, cloudListenerId str } func createSDKClients(accessKeyId, accessKeySecret, region string) (*wSDKClients, error) { - // 接入点一览 https://api.aliyun.com/product/Alb - var albEndpoint string - switch region { - case "", "cn-hangzhou-finance": - albEndpoint = "alb.cn-hangzhou.aliyuncs.com" - default: - albEndpoint = fmt.Sprintf("alb.%s.aliyuncs.com", region) + wsdk := &wSDKClients{} + + { + // 接入点一览 https://api.aliyun.com/product/Alb + var endpoint string + switch region { + case "", "cn-hangzhou-finance": + endpoint = "alb.cn-hangzhou.aliyuncs.com" + default: + endpoint = fmt.Sprintf("alb.%s.aliyuncs.com", region) + } + + config := &aliopen.Config{ + AccessKeyId: tea.String(accessKeyId), + AccessKeySecret: tea.String(accessKeySecret), + Endpoint: tea.String(endpoint), + } + + client, err := alialb.NewClient(config) + if err != nil { + return nil, err + } + + wsdk.ALB = client } - albConfig := &aliopen.Config{ - AccessKeyId: tea.String(accessKeyId), - AccessKeySecret: tea.String(accessKeySecret), - Endpoint: tea.String(albEndpoint), - } - albClient, err := internal.NewAlbClient(albConfig) - if err != nil { - return nil, err + { + // 接入点一览 https://api.aliyun.com/product/cas + var endpoint string + if !strings.HasPrefix(region, "cn-") { + endpoint = "cas.ap-southeast-1.aliyuncs.com" + } else { + endpoint = "cas.aliyuncs.com" + } + + config := &aliopen.Config{ + Endpoint: tea.String(endpoint), + AccessKeyId: tea.String(accessKeyId), + AccessKeySecret: tea.String(accessKeySecret), + } + + client, err := alicas.NewClient(config) + if err != nil { + return nil, err + } + + wsdk.CAS = client } - // 接入点一览 https://api.aliyun.com/product/cas - var casEndpoint string - if !strings.HasPrefix(region, "cn-") { - casEndpoint = "cas.ap-southeast-1.aliyuncs.com" - } else { - casEndpoint = "cas.aliyuncs.com" - } - - casConfig := &aliopen.Config{ - Endpoint: tea.String(casEndpoint), - AccessKeyId: tea.String(accessKeyId), - AccessKeySecret: tea.String(accessKeySecret), - } - casClient, err := internal.NewCasClient(casConfig) - if err != nil { - return nil, err - } - - return &wSDKClients{ - ALB: albClient, - CAS: casClient, - }, nil + return wsdk, nil } diff --git a/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go b/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go index 5f83f3bcc..084430150 100644 --- a/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go +++ b/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go @@ -8,17 +8,16 @@ import ( "strings" "time" - aliapig "github.com/alibabacloud-go/apig-20240327/v6/client" - alicloudapi "github.com/alibabacloud-go/cloudapi-20160714/v5/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-apigw/internal" + aliapig "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client" + alicloudapi "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -54,8 +53,8 @@ type Deployer struct { } type wSDKClients struct { - CloudNativeAPIGateway *internal.ApigClient - TraditionalAPIGateway *internal.CloudapiClient + CloudNativeAPIGateway *aliapig.Client + TraditionalAPIGateway *alicloudapi.Client } var _ deployer.Provider = (*Deployer)(nil) @@ -70,7 +69,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -467,46 +466,55 @@ func (d *Deployer) findCloudNativeDomainIdByDomain(ctx context.Context, cloudGat } func createSDKClients(accessKeyId, accessKeySecret, region string) (*wSDKClients, error) { - // 接入点一览 https://api.aliyun.com/product/APIG - var cloudNativeAPIGEndpoint string - switch region { - case "": - cloudNativeAPIGEndpoint = "apig.cn-hangzhou.aliyuncs.com" - default: - cloudNativeAPIGEndpoint = fmt.Sprintf("apig.%s.aliyuncs.com", region) + wsdk := &wSDKClients{} + + { + // 接入点一览 https://api.aliyun.com/product/APIG + var endpoint string + switch region { + case "": + endpoint = "apig.cn-hangzhou.aliyuncs.com" + default: + endpoint = fmt.Sprintf("apig.%s.aliyuncs.com", region) + } + + config := &aliopen.Config{ + AccessKeyId: tea.String(accessKeyId), + AccessKeySecret: tea.String(accessKeySecret), + Endpoint: tea.String(endpoint), + } + + client, err := aliapig.NewClient(config) + if err != nil { + return nil, err + } + + wsdk.CloudNativeAPIGateway = client } - cloudNativeAPIGConfig := &aliopen.Config{ - AccessKeyId: tea.String(accessKeyId), - AccessKeySecret: tea.String(accessKeySecret), - Endpoint: tea.String(cloudNativeAPIGEndpoint), - } - cloudNativeAPIGClient, err := internal.NewApigClient(cloudNativeAPIGConfig) - if err != nil { - return nil, err + { + // 接入点一览 https://api.aliyun.com/product/CloudAPI + var endpoint string + switch region { + case "": + endpoint = "apigateway.cn-hangzhou.aliyuncs.com" + default: + endpoint = fmt.Sprintf("apigateway.%s.aliyuncs.com", region) + } + + config := &aliopen.Config{ + AccessKeyId: tea.String(accessKeyId), + AccessKeySecret: tea.String(accessKeySecret), + Endpoint: tea.String(endpoint), + } + + client, err := alicloudapi.NewClient(config) + if err != nil { + return nil, err + } + + wsdk.TraditionalAPIGateway = client } - // 接入点一览 https://api.aliyun.com/product/CloudAPI - var traditionalAPIGEndpoint string - switch region { - case "": - traditionalAPIGEndpoint = "apigateway.cn-hangzhou.aliyuncs.com" - default: - traditionalAPIGEndpoint = fmt.Sprintf("apigateway.%s.aliyuncs.com", region) - } - - traditionalAPIGConfig := &aliopen.Config{ - AccessKeyId: tea.String(accessKeyId), - AccessKeySecret: tea.String(accessKeySecret), - Endpoint: tea.String(traditionalAPIGEndpoint), - } - traditionalAPIGClient, err := internal.NewCloudapiClient(traditionalAPIGConfig) - if err != nil { - return nil, err - } - - return &wSDKClients{ - CloudNativeAPIGateway: cloudNativeAPIGClient, - TraditionalAPIGateway: traditionalAPIGClient, - }, nil + return wsdk, nil } diff --git a/pkg/core/deployer/providers/aliyun-apigw/internal/client.go b/pkg/core/deployer/providers/aliyun-apigw/internal/client.go deleted file mode 100644 index 354e54f8a..000000000 --- a/pkg/core/deployer/providers/aliyun-apigw/internal/client.go +++ /dev/null @@ -1,314 +0,0 @@ -package internal - -import ( - "context" - - aliapig "github.com/alibabacloud-go/apig-20240327/v6/client" - alicloudapi "github.com/alibabacloud-go/cloudapi-20160714/v5/client" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" - openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - "github.com/alibabacloud-go/tea/dara" -) - -// This is a partial copy of https://github.com/alibabacloud-go/apig-20240327/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type ApigClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewApigClient(config *openapiutil.Config) (*ApigClient, error) { - client := new(ApigClient) - err := client.Init(config) - return client, err -} - -func (client *ApigClient) GetDomainWithContext(ctx context.Context, domainId *string, request *aliapig.GetDomainRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *aliapig.GetDomainResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.WithStatistics) { - query["withStatistics"] = request.WithStatistics - } - - req := &openapiutil.OpenApiRequest{ - Headers: headers, - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("GetDomain"), - Version: dara.String("2024-03-27"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/v1/domains/" + dara.PercentEncode(dara.StringValue(domainId))), - Method: dara.String("GET"), - AuthType: dara.String("AK"), - Style: dara.String("ROA"), - ReqBodyType: dara.String("json"), - BodyType: dara.String("json"), - } - _result = &aliapig.GetDomainResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *ApigClient) ListDomainsWithContext(ctx context.Context, request *aliapig.ListDomainsRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *aliapig.ListDomainsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.GatewayId) { - query["gatewayId"] = request.GatewayId - } - - if !dara.IsNil(request.GatewayType) { - query["gatewayType"] = request.GatewayType - } - - if !dara.IsNil(request.NameLike) { - query["nameLike"] = request.NameLike - } - - if !dara.IsNil(request.PageNumber) { - query["pageNumber"] = request.PageNumber - } - - if !dara.IsNil(request.PageSize) { - query["pageSize"] = request.PageSize - } - - if !dara.IsNil(request.ResourceGroupId) { - query["resourceGroupId"] = request.ResourceGroupId - } - - req := &openapiutil.OpenApiRequest{ - Headers: headers, - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("ListDomains"), - Version: dara.String("2024-03-27"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/v1/domains"), - Method: dara.String("GET"), - AuthType: dara.String("AK"), - Style: dara.String("ROA"), - ReqBodyType: dara.String("json"), - BodyType: dara.String("json"), - } - _result = &aliapig.ListDomainsResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *ApigClient) UpdateDomainWithContext(ctx context.Context, domainId *string, request *aliapig.UpdateDomainRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *aliapig.UpdateDomainResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - body := map[string]interface{}{} - - if !dara.IsNil(request.CaCertIdentifier) { - body["caCertIdentifier"] = request.CaCertIdentifier - } - - if !dara.IsNil(request.CertIdentifier) { - body["certIdentifier"] = request.CertIdentifier - } - - if !dara.IsNil(request.ClientCACert) { - body["clientCACert"] = request.ClientCACert - } - - if !dara.IsNil(request.ForceHttps) { - body["forceHttps"] = request.ForceHttps - } - - if !dara.IsNil(request.Http2Option) { - body["http2Option"] = request.Http2Option - } - - if !dara.IsNil(request.MTLSEnabled) { - body["mTLSEnabled"] = request.MTLSEnabled - } - - if !dara.IsNil(request.Protocol) { - body["protocol"] = request.Protocol - } - - if !dara.IsNil(request.TlsCipherSuitesConfig) { - body["tlsCipherSuitesConfig"] = request.TlsCipherSuitesConfig - } - - if !dara.IsNil(request.TlsMax) { - body["tlsMax"] = request.TlsMax - } - - if !dara.IsNil(request.TlsMin) { - body["tlsMin"] = request.TlsMin - } - - req := &openapiutil.OpenApiRequest{ - Headers: headers, - Body: openapiutil.ParseToMap(body), - } - params := &openapiutil.Params{ - Action: dara.String("UpdateDomain"), - Version: dara.String("2024-03-27"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/v1/domains/" + dara.PercentEncode(dara.StringValue(domainId))), - Method: dara.String("PUT"), - AuthType: dara.String("AK"), - Style: dara.String("ROA"), - ReqBodyType: dara.String("json"), - BodyType: dara.String("json"), - } - _result = &aliapig.UpdateDomainResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -// This is a partial copy of https://github.com/alibabacloud-go/cloudapi-20160714/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type CloudapiClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewCloudapiClient(config *openapiutil.Config) (*CloudapiClient, error) { - client := new(CloudapiClient) - err := client.Init(config) - return client, err -} - -func (client *CloudapiClient) DescribeApiGroupWithContext(ctx context.Context, request *alicloudapi.DescribeApiGroupRequest, runtime *dara.RuntimeOptions) (_result *alicloudapi.DescribeApiGroupResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.GroupId) { - query["GroupId"] = request.GroupId - } - - if !dara.IsNil(request.SecurityToken) { - query["SecurityToken"] = request.SecurityToken - } - - if !dara.IsNil(request.Tag) { - query["Tag"] = request.Tag - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("DescribeApiGroup"), - Version: dara.String("2016-07-14"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alicloudapi.DescribeApiGroupResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *CloudapiClient) SetDomainCertificateWithContext(ctx context.Context, request *alicloudapi.SetDomainCertificateRequest, runtime *dara.RuntimeOptions) (_result *alicloudapi.SetDomainCertificateResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.CaCertificateBody) { - query["CaCertificateBody"] = request.CaCertificateBody - } - - if !dara.IsNil(request.CertificateBody) { - query["CertificateBody"] = request.CertificateBody - } - - if !dara.IsNil(request.CertificateName) { - query["CertificateName"] = request.CertificateName - } - - if !dara.IsNil(request.CertificatePrivateKey) { - query["CertificatePrivateKey"] = request.CertificatePrivateKey - } - - if !dara.IsNil(request.ClientCertSDnPassThrough) { - query["ClientCertSDnPassThrough"] = request.ClientCertSDnPassThrough - } - - if !dara.IsNil(request.DomainName) { - query["DomainName"] = request.DomainName - } - - if !dara.IsNil(request.GroupId) { - query["GroupId"] = request.GroupId - } - - if !dara.IsNil(request.SecurityToken) { - query["SecurityToken"] = request.SecurityToken - } - - if !dara.IsNil(request.SslOcspCacheEnable) { - query["SslOcspCacheEnable"] = request.SslOcspCacheEnable - } - - if !dara.IsNil(request.SslOcspEnable) { - query["SslOcspEnable"] = request.SslOcspEnable - } - - if !dara.IsNil(request.SslVerifyDepth) { - query["SslVerifyDepth"] = request.SslVerifyDepth - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("SetDomainCertificate"), - Version: dara.String("2016-07-14"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alicloudapi.SetDomainCertificateResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} diff --git a/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go b/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go index ca3d4a9e0..8e29d7763 100644 --- a/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go +++ b/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go @@ -8,15 +8,14 @@ import ( "strings" "time" - alicas "github.com/alibabacloud-go/cas-20200407/v4/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-cas-deploy/internal" + alicas "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) @@ -39,7 +38,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.CasClient + sdkClient *alicas.Client sdkCertmgr certmgr.Provider } @@ -55,7 +54,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -151,14 +150,14 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("waiting for aliyun deployment job completion ...") return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return nil, err } return &deployer.DeployResult{}, nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.CasClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*alicas.Client, error) { // 接入点一览 https://api.aliyun.com/product/cas var endpoint string switch region { @@ -174,7 +173,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Cas Endpoint: tea.String(endpoint), } - client, err := internal.NewCasClient(config) + client, err := alicas.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-cas-deploy/internal/client.go b/pkg/core/deployer/providers/aliyun-cas-deploy/internal/client.go deleted file mode 100644 index 6a93ce1e2..000000000 --- a/pkg/core/deployer/providers/aliyun-cas-deploy/internal/client.go +++ /dev/null @@ -1,166 +0,0 @@ -package internal - -import ( - "context" - - alicas "github.com/alibabacloud-go/cas-20200407/v4/client" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" - openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - "github.com/alibabacloud-go/tea/dara" -) - -// This is a partial copy of https://github.com/alibabacloud-go/cas-20200407/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type CasClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewCasClient(config *openapiutil.Config) (*CasClient, error) { - client := new(CasClient) - err := client.Init(config) - return client, err -} - -func (client *CasClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *CasClient) CreateDeploymentJobWithContext(ctx context.Context, request *alicas.CreateDeploymentJobRequest, runtime *dara.RuntimeOptions) (_result *alicas.CreateDeploymentJobResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.CertIds) { - query["CertIds"] = request.CertIds - } - - if !dara.IsNil(request.ContactIds) { - query["ContactIds"] = request.ContactIds - } - - if !dara.IsNil(request.JobType) { - query["JobType"] = request.JobType - } - - if !dara.IsNil(request.Name) { - query["Name"] = request.Name - } - - if !dara.IsNil(request.ResourceIds) { - query["ResourceIds"] = request.ResourceIds - } - - if !dara.IsNil(request.ScheduleTime) { - query["ScheduleTime"] = request.ScheduleTime - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("CreateDeploymentJob"), - Version: dara.String("2020-04-07"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alicas.CreateDeploymentJobResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *CasClient) DescribeDeploymentJobWithContext(ctx context.Context, request *alicas.DescribeDeploymentJobRequest, runtime *dara.RuntimeOptions) (_result *alicas.DescribeDeploymentJobResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.JobId) { - query["JobId"] = request.JobId - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("DescribeDeploymentJob"), - Version: dara.String("2020-04-07"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alicas.DescribeDeploymentJobResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *CasClient) ListContactWithContext(ctx context.Context, request *alicas.ListContactRequest, runtime *dara.RuntimeOptions) (_result *alicas.ListContactResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.CurrentPage) { - query["CurrentPage"] = request.CurrentPage - } - - if !dara.IsNil(request.Keyword) { - query["Keyword"] = request.Keyword - } - - if !dara.IsNil(request.ShowSize) { - query["ShowSize"] = request.ShowSize - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("ListContact"), - Version: dara.String("2020-04-07"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alicas.ListContactResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} diff --git a/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go b/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go index 692d750b3..06221f1d5 100644 --- a/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go +++ b/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -35,7 +35,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, diff --git a/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go b/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go index a2a2383f1..ed92ae459 100644 --- a/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go +++ b/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go @@ -8,16 +8,15 @@ import ( "strconv" "strings" - alicdn "github.com/alibabacloud-go/cdn-20180510/v9/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-cdn/internal" + alicdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -40,7 +39,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.CdnClient + sdkClient *alicdn.Client sdkCertmgr certmgr.Provider } @@ -56,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -250,14 +249,14 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.CdnClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*alicdn.Client, error) { config := &aliopen.Config{ AccessKeyId: tea.String(accessKeyId), AccessKeySecret: tea.String(accessKeySecret), Endpoint: tea.String("cdn.aliyuncs.com"), } - client, err := internal.NewCdnClient(config) + client, err := alicdn.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go index 8bb66b884..d53aac0ea 100644 --- a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go +++ b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go @@ -7,14 +7,13 @@ import ( "log/slog" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - alislb "github.com/alibabacloud-go/slb-20140515/v4/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-slb" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-slb" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-clb/internal" + alislb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client" ) type DeployerConfig struct { @@ -42,7 +41,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.SlbClient + sdkClient *alislb.Client sdkCertmgr certmgr.Provider } @@ -58,7 +57,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -289,7 +288,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudLoadbalan return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.SlbClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*alislb.Client, error) { // 接入点一览 https://api.aliyun.com/product/Slb var endpoint string switch region { @@ -309,7 +308,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Slb Endpoint: tea.String(endpoint), } - client, err := internal.NewSlbClient(config) + client, err := alislb.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go b/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go index 7985d080e..5f255740a 100644 --- a/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go +++ b/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go @@ -9,15 +9,14 @@ import ( "strings" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - alidcdn "github.com/alibabacloud-go/dcdn-20180115/v4/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-dcdn/internal" + alidcdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -40,7 +39,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.DcdnClient + sdkClient *alidcdn.Client sdkCertmgr certmgr.Provider } @@ -56,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -251,14 +250,14 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.DcdnClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*alidcdn.Client, error) { config := &aliopen.Config{ AccessKeyId: tea.String(accessKeyId), AccessKeySecret: tea.String(accessKeySecret), Endpoint: tea.String("dcdn.aliyuncs.com"), } - client, err := internal.NewDcdnClient(config) + client, err := alidcdn.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro.go b/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro.go index 010617e0f..7209bac28 100644 --- a/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro.go +++ b/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro.go @@ -8,15 +8,14 @@ import ( "strings" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - aliddoscoo "github.com/alibabacloud-go/ddoscoo-20200101/v5/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-ddospro/internal" + aliddoscoo "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -39,7 +38,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.DdoscooClient + sdkClient *aliddoscoo.Client sdkCertmgr certmgr.Provider } @@ -55,7 +54,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -212,7 +211,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.DdoscooClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*aliddoscoo.Client, error) { // 接入点一览 https://api.aliyun.com/product/ddoscoo var endpoint string switch region { @@ -228,7 +227,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Ddo Endpoint: tea.String(endpoint), } - client, err := internal.NewDdoscooClient(config) + client, err := aliddoscoo.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas.go b/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas.go index 23b5d1125..44417bebb 100644 --- a/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas.go +++ b/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas.go @@ -9,15 +9,14 @@ import ( "strings" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - aliesa "github.com/alibabacloud-go/esa-20240910/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-esa-saas/internal" + aliesa "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -42,7 +41,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.EsaClient + sdkClient *aliesa.Client sdkCertmgr certmgr.Provider } @@ -58,7 +57,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -276,7 +275,7 @@ func (d *Deployer) updateHostnameCertificate(ctx context.Context, cloudHostnameI return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.EsaClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*aliesa.Client, error) { // 接入点一览 https://api.aliyun.com/product/ESA var endpoint string switch region { @@ -292,7 +291,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Esa Endpoint: tea.String(endpoint), } - client, err := internal.NewEsaClient(config) + client, err := aliesa.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go b/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go index a0c6ab0f2..8ace61a50 100644 --- a/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go +++ b/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go @@ -9,15 +9,14 @@ import ( "strings" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - aliesa "github.com/alibabacloud-go/esa-20240910/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-esa/internal" + aliesa "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client" ) type DeployerConfig struct { @@ -36,7 +35,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.EsaClient + sdkClient *aliesa.Client sdkCertmgr certmgr.Provider } @@ -52,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -119,7 +118,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return &deployer.DeployResult{}, nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.EsaClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*aliesa.Client, error) { // 接入点一览 https://api.aliyun.com/product/ESA var endpoint string switch region { @@ -135,7 +134,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Esa Endpoint: tea.String(endpoint), } - client, err := internal.NewEsaClient(config) + client, err := aliesa.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-esa/internal/client.go b/pkg/core/deployer/providers/aliyun-esa/internal/client.go deleted file mode 100644 index 24edf1261..000000000 --- a/pkg/core/deployer/providers/aliyun-esa/internal/client.go +++ /dev/null @@ -1,111 +0,0 @@ -package internal - -import ( - "context" - - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" - openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - aliesa "github.com/alibabacloud-go/esa-20240910/v2/client" - "github.com/alibabacloud-go/tea/dara" -) - -// This is a partial copy of https://github.com/alibabacloud-go/esa-20240910/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type EsaClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewEsaClient(config *openapiutil.Config) (*EsaClient, error) { - client := new(EsaClient) - err := client.Init(config) - return client, err -} - -func (client *EsaClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *EsaClient) SetCertificateWithContext(ctx context.Context, request *aliesa.SetCertificateRequest, runtime *dara.RuntimeOptions) (_result *aliesa.SetCertificateResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - if !dara.IsNil(request.KeyServerId) { - query["KeyServerId"] = request.KeyServerId - } - - if !dara.IsNil(request.OwnerId) { - query["OwnerId"] = request.OwnerId - } - - if !dara.IsNil(request.SecurityToken) { - query["SecurityToken"] = request.SecurityToken - } - - body := map[string]interface{}{} - if !dara.IsNil(request.CasId) { - body["CasId"] = request.CasId - } - - if !dara.IsNil(request.Certificate) { - body["Certificate"] = request.Certificate - } - - if !dara.IsNil(request.Id) { - body["Id"] = request.Id - } - - if !dara.IsNil(request.Name) { - body["Name"] = request.Name - } - - if !dara.IsNil(request.PrivateKey) { - body["PrivateKey"] = request.PrivateKey - } - - if !dara.IsNil(request.Region) { - body["Region"] = request.Region - } - - if !dara.IsNil(request.SiteId) { - body["SiteId"] = request.SiteId - } - - if !dara.IsNil(request.Type) { - body["Type"] = request.Type - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - Body: openapiutil.ParseToMap(body), - } - params := &openapiutil.Params{ - Action: dara.String("SetCertificate"), - Version: dara.String("2024-09-10"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &aliesa.SetCertificateResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} diff --git a/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go b/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go index 09933d16d..6d6e8f6a8 100644 --- a/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go +++ b/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go @@ -9,14 +9,13 @@ import ( "time" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - alifc3 "github.com/alibabacloud-go/fc-20230330/v4/client" - alifc2 "github.com/alibabacloud-go/fc-open-20210406/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-fc/internal" + alifc "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client" + alifcopen "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -48,8 +47,8 @@ type Deployer struct { var _ deployer.Provider = (*Deployer)(nil) type wSDKClients struct { - FC2 *internal.FcopenClient - FC3 *internal.FcClient + FC2 *alifcopen.Client + FC3 *alifc.Client } func NewDeployer(config *DeployerConfig) (*Deployer, error) { @@ -271,7 +270,7 @@ func (d *Deployer) getFC3AllDomains(ctx context.Context) ([]string, error) { default: } - listCustomDomainsReq := &alifc3.ListCustomDomainsRequest{ + listCustomDomainsReq := &alifc.ListCustomDomainsRequest{ NextToken: listCustomDomainsNextToken, Limit: tea.Int32(100), } @@ -312,7 +311,7 @@ func (d *Deployer) getFC2AllDomains(ctx context.Context) ([]string, error) { default: } - listCustomDomainsReq := &alifc2.ListCustomDomainsRequest{ + listCustomDomainsReq := &alifcopen.ListCustomDomainsRequest{ NextToken: listCustomDomainsNextToken, Limit: tea.Int32(100), } @@ -355,9 +354,9 @@ func (d *Deployer) updateFC3DomainCertificate(ctx context.Context, domain string // 更新自定义域名 // REF: https://help.aliyun.com/zh/functioncompute/fc-3-0/developer-reference/api-fc-2023-03-30-updatecustomdomain - updateCustomDomainReq := &alifc3.UpdateCustomDomainRequest{ - Body: &alifc3.UpdateCustomDomainInput{ - CertConfig: &alifc3.CertConfig{ + updateCustomDomainReq := &alifc.UpdateCustomDomainRequest{ + Body: &alifc.UpdateCustomDomainInput{ + CertConfig: &alifc.CertConfig{ CertName: tea.String(fmt.Sprintf("certimate-%d", time.Now().UnixMilli())), Certificate: tea.String(certPEM), PrivateKey: tea.String(privkeyPEM), @@ -393,8 +392,8 @@ func (d *Deployer) updateFC2DomainCertificate(ctx context.Context, domain string // 更新自定义域名 // REF: https://help.aliyun.com/zh/functioncompute/fc-2-0/developer-reference/api-fc-open-2021-04-06-updatecustomdomain - updateCustomDomainReq := &alifc2.UpdateCustomDomainRequest{ - CertConfig: &alifc2.CertConfig{ + updateCustomDomainReq := &alifcopen.UpdateCustomDomainRequest{ + CertConfig: &alifcopen.CertConfig{ CertName: tea.String(fmt.Sprintf("certimate-%d", time.Now().UnixMilli())), Certificate: tea.String(certPEM), PrivateKey: tea.String(privkeyPEM), @@ -415,50 +414,59 @@ func (d *Deployer) updateFC2DomainCertificate(ctx context.Context, domain string } func createSDKClients(accessKeyId, accessKeySecret, region string) (*wSDKClients, error) { - // 接入点一览 https://api.aliyun.com/product/FC-Open - var fc2Endpoint string - switch region { - case "": - fc2Endpoint = "fc.aliyuncs.com" - case "cn-hangzhou-finance": - fc2Endpoint = fmt.Sprintf("%s.fc.aliyuncs.com", region) - default: - fc2Endpoint = fmt.Sprintf("fc.%s.aliyuncs.com", region) + wsdk := &wSDKClients{} + + { + // 接入点一览 https://api.aliyun.com/product/FC-Open + var endpoint string + switch region { + case "": + endpoint = "fc.aliyuncs.com" + case "cn-hangzhou-finance": + endpoint = fmt.Sprintf("%s.fc.aliyuncs.com", region) + default: + endpoint = fmt.Sprintf("fc.%s.aliyuncs.com", region) + } + + config := &aliopen.Config{ + AccessKeyId: tea.String(accessKeyId), + AccessKeySecret: tea.String(accessKeySecret), + Endpoint: tea.String(endpoint), + } + + client, err := alifcopen.NewClient(config) + if err != nil { + return nil, err + } + + wsdk.FC2 = client } - fc2Config := &aliopen.Config{ - AccessKeyId: tea.String(accessKeyId), - AccessKeySecret: tea.String(accessKeySecret), - Endpoint: tea.String(fc2Endpoint), - } - fc2Client, err := internal.NewFcopenClient(fc2Config) - if err != nil { - return nil, err + { + // 接入点一览 https://api.aliyun.com/product/FC + var endpoint string + switch region { + case "": + endpoint = "fcv3.cn-hangzhou.aliyuncs.com" + case "me-central-1", "cn-hangzhou-finance", "cn-shanghai-finance-1", "cn-heyuan-acdr-1": + endpoint = fmt.Sprintf("%s.fc.aliyuncs.com", region) + default: + endpoint = fmt.Sprintf("fcv3.%s.aliyuncs.com", region) + } + + config := &aliopen.Config{ + AccessKeyId: tea.String(accessKeyId), + AccessKeySecret: tea.String(accessKeySecret), + Endpoint: tea.String(endpoint), + } + + client, err := alifc.NewClient(config) + if err != nil { + return nil, err + } + + wsdk.FC3 = client } - // 接入点一览 https://api.aliyun.com/product/FC - var fc3Endpoint string - switch region { - case "": - fc3Endpoint = "fcv3.cn-hangzhou.aliyuncs.com" - case "me-central-1", "cn-hangzhou-finance", "cn-shanghai-finance-1", "cn-heyuan-acdr-1": - fc3Endpoint = fmt.Sprintf("%s.fc.aliyuncs.com", region) - default: - fc3Endpoint = fmt.Sprintf("fcv3.%s.aliyuncs.com", region) - } - - fc3Config := &aliopen.Config{ - AccessKeyId: tea.String(accessKeyId), - AccessKeySecret: tea.String(accessKeySecret), - Endpoint: tea.String(fc3Endpoint), - } - fc3Client, err := internal.NewFcClient(fc3Config) - if err != nil { - return nil, err - } - - return &wSDKClients{ - FC2: fc2Client, - FC3: fc3Client, - }, nil + return wsdk, nil } diff --git a/pkg/core/deployer/providers/aliyun-fc/internal/client.go b/pkg/core/deployer/providers/aliyun-fc/internal/client.go deleted file mode 100644 index cf013bce2..000000000 --- a/pkg/core/deployer/providers/aliyun-fc/internal/client.go +++ /dev/null @@ -1,372 +0,0 @@ -package internal - -import ( - "context" - - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" - openapiutilv2 "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - alifc "github.com/alibabacloud-go/fc-20230330/v4/client" - alifcopen "github.com/alibabacloud-go/fc-open-20210406/v2/client" - openapiutil "github.com/alibabacloud-go/openapi-util/service" - util "github.com/alibabacloud-go/tea-utils/v2/service" - "github.com/alibabacloud-go/tea/dara" - "github.com/alibabacloud-go/tea/tea" -) - -// This is a partial copy of https://github.com/alibabacloud-go/fc-20230330/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type FcClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewFcClient(config *openapiutilv2.Config) (*FcClient, error) { - client := new(FcClient) - err := client.Init(config) - return client, err -} - -func (client *FcClient) Init(config *openapiutilv2.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *FcClient) GetCustomDomainWithContext(ctx context.Context, domainName *string, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *alifc.GetCustomDomainResponse, _err error) { - req := &openapiutilv2.OpenApiRequest{ - Headers: headers, - } - params := &openapiutilv2.Params{ - Action: dara.String("GetCustomDomain"), - Version: dara.String("2023-03-30"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/2023-03-30/custom-domains/" + dara.PercentEncode(dara.StringValue(domainName))), - Method: dara.String("GET"), - AuthType: dara.String("AK"), - Style: dara.String("ROA"), - ReqBodyType: dara.String("json"), - BodyType: dara.String("json"), - } - _result = &alifc.GetCustomDomainResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *FcClient) ListCustomDomainsWithContext(ctx context.Context, request *alifc.ListCustomDomainsRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *alifc.ListCustomDomainsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !dara.IsNil(request.Limit) { - query["limit"] = request.Limit - } - - if !dara.IsNil(request.NextToken) { - query["nextToken"] = request.NextToken - } - - if !dara.IsNil(request.Prefix) { - query["prefix"] = request.Prefix - } - - req := &openapiutilv2.OpenApiRequest{ - Headers: headers, - Query: openapiutil.Query(query), - } - params := &openapiutilv2.Params{ - Action: dara.String("ListCustomDomains"), - Version: dara.String("2023-03-30"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/2023-03-30/custom-domains"), - Method: dara.String("GET"), - AuthType: dara.String("AK"), - Style: dara.String("ROA"), - ReqBodyType: dara.String("json"), - BodyType: dara.String("json"), - } - _result = &alifc.ListCustomDomainsResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -func (client *FcClient) UpdateCustomDomainWithContext(ctx context.Context, domainName *string, request *alifc.UpdateCustomDomainRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *alifc.UpdateCustomDomainResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - - req := &openapiutilv2.OpenApiRequest{ - Headers: headers, - Body: openapiutil.ParseToMap(request.Body), - } - params := &openapiutilv2.Params{ - Action: dara.String("UpdateCustomDomain"), - Version: dara.String("2023-03-30"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/2023-03-30/custom-domains/" + dara.PercentEncode(dara.StringValue(domainName))), - Method: dara.String("PUT"), - AuthType: dara.String("AK"), - Style: dara.String("ROA"), - ReqBodyType: dara.String("json"), - BodyType: dara.String("json"), - } - _result = &alifc.UpdateCustomDomainResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -// This is a partial copy of https://github.com/alibabacloud-go/fc-open-20210406/blob/master/client/client.go -// to lightweight the vendor packages in the built binary. -type FcopenClient struct { - openapi.Client -} - -func NewFcopenClient(config *openapi.Config) (*FcopenClient, error) { - client := new(FcopenClient) - err := client.Init(config) - return client, err -} - -func (client *FcopenClient) Init(config *openapi.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *FcopenClient) GetCustomDomain(domainName *string) (_result *alifcopen.GetCustomDomainResponse, _err error) { - runtime := &util.RuntimeOptions{} - headers := &alifcopen.GetCustomDomainHeaders{} - _result = &alifcopen.GetCustomDomainResponse{} - _body, _err := client.GetCustomDomainWithOptions(domainName, headers, runtime) - if _err != nil { - return _result, _err - } - _result = _body - return _result, _err -} - -func (client *FcopenClient) GetCustomDomainWithOptions(domainName *string, headers *alifcopen.GetCustomDomainHeaders, runtime *util.RuntimeOptions) (_result *alifcopen.GetCustomDomainResponse, _err error) { - realHeaders := make(map[string]*string) - - if !tea.BoolValue(util.IsUnset(headers.CommonHeaders)) { - realHeaders = headers.CommonHeaders - } - - if !tea.BoolValue(util.IsUnset(headers.XFcAccountId)) { - realHeaders["X-Fc-Account-Id"] = util.ToJSONString(headers.XFcAccountId) - } - - if !tea.BoolValue(util.IsUnset(headers.XFcDate)) { - realHeaders["X-Fc-Date"] = util.ToJSONString(headers.XFcDate) - } - - if !tea.BoolValue(util.IsUnset(headers.XFcTraceId)) { - realHeaders["X-Fc-Trace-Id"] = util.ToJSONString(headers.XFcTraceId) - } - - req := &openapi.OpenApiRequest{ - Headers: realHeaders, - } - params := &openapi.Params{ - Action: tea.String("GetCustomDomain"), - Version: tea.String("2021-04-06"), - Protocol: tea.String("HTTPS"), - Pathname: tea.String("/2021-04-06/custom-domains/" + tea.StringValue(openapiutil.GetEncodeParam(domainName))), - Method: tea.String("GET"), - AuthType: tea.String("AK"), - Style: tea.String("ROA"), - ReqBodyType: tea.String("json"), - BodyType: tea.String("json"), - } - _result = &alifcopen.GetCustomDomainResponse{} - _body, _err := client.CallApi(params, req, runtime) - if _err != nil { - return _result, _err - } - _err = tea.Convert(_body, &_result) - return _result, _err -} - -func (client *FcopenClient) ListCustomDomains(request *alifcopen.ListCustomDomainsRequest) (_result *alifcopen.ListCustomDomainsResponse, _err error) { - runtime := &util.RuntimeOptions{} - headers := &alifcopen.ListCustomDomainsHeaders{} - _result = &alifcopen.ListCustomDomainsResponse{} - _body, _err := client.ListCustomDomainsWithOptions(request, headers, runtime) - if _err != nil { - return _result, _err - } - _result = _body - return _result, _err -} - -func (client *FcopenClient) ListCustomDomainsWithOptions(request *alifcopen.ListCustomDomainsRequest, headers *alifcopen.ListCustomDomainsHeaders, runtime *util.RuntimeOptions) (_result *alifcopen.ListCustomDomainsResponse, _err error) { - _err = util.ValidateModel(request) - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !tea.BoolValue(util.IsUnset(request.Limit)) { - query["limit"] = request.Limit - } - - if !tea.BoolValue(util.IsUnset(request.NextToken)) { - query["nextToken"] = request.NextToken - } - - if !tea.BoolValue(util.IsUnset(request.Prefix)) { - query["prefix"] = request.Prefix - } - - if !tea.BoolValue(util.IsUnset(request.StartKey)) { - query["startKey"] = request.StartKey - } - - realHeaders := make(map[string]*string) - if !tea.BoolValue(util.IsUnset(headers.CommonHeaders)) { - realHeaders = headers.CommonHeaders - } - - if !tea.BoolValue(util.IsUnset(headers.XFcAccountId)) { - realHeaders["X-Fc-Account-Id"] = util.ToJSONString(headers.XFcAccountId) - } - - if !tea.BoolValue(util.IsUnset(headers.XFcDate)) { - realHeaders["X-Fc-Date"] = util.ToJSONString(headers.XFcDate) - } - - if !tea.BoolValue(util.IsUnset(headers.XFcTraceId)) { - realHeaders["X-Fc-Trace-Id"] = util.ToJSONString(headers.XFcTraceId) - } - - req := &openapi.OpenApiRequest{ - Headers: realHeaders, - Query: openapiutil.Query(query), - } - params := &openapi.Params{ - Action: tea.String("ListCustomDomains"), - Version: tea.String("2021-04-06"), - Protocol: tea.String("HTTPS"), - Pathname: tea.String("/2021-04-06/custom-domains"), - Method: tea.String("GET"), - AuthType: tea.String("AK"), - Style: tea.String("ROA"), - ReqBodyType: tea.String("json"), - BodyType: tea.String("json"), - } - _result = &alifcopen.ListCustomDomainsResponse{} - _body, _err := client.CallApi(params, req, runtime) - if _err != nil { - return _result, _err - } - _err = tea.Convert(_body, &_result) - return _result, _err -} - -func (client *FcopenClient) UpdateCustomDomain(domainName *string, request *alifcopen.UpdateCustomDomainRequest) (_result *alifcopen.UpdateCustomDomainResponse, _err error) { - runtime := &util.RuntimeOptions{} - headers := &alifcopen.UpdateCustomDomainHeaders{} - _result = &alifcopen.UpdateCustomDomainResponse{} - _body, _err := client.UpdateCustomDomainWithOptions(domainName, request, headers, runtime) - if _err != nil { - return _result, _err - } - _result = _body - return _result, _err -} - -func (client *FcopenClient) UpdateCustomDomainWithOptions(domainName *string, request *alifcopen.UpdateCustomDomainRequest, headers *alifcopen.UpdateCustomDomainHeaders, runtime *util.RuntimeOptions) (_result *alifcopen.UpdateCustomDomainResponse, _err error) { - _err = util.ValidateModel(request) - if _err != nil { - return _result, _err - } - body := map[string]interface{}{} - - if !tea.BoolValue(util.IsUnset(request.CertConfig)) { - body["certConfig"] = request.CertConfig - } - - if !tea.BoolValue(util.IsUnset(request.Protocol)) { - body["protocol"] = request.Protocol - } - - if !tea.BoolValue(util.IsUnset(request.RouteConfig)) { - body["routeConfig"] = request.RouteConfig - } - - if !tea.BoolValue(util.IsUnset(request.TlsConfig)) { - body["tlsConfig"] = request.TlsConfig - } - - if !tea.BoolValue(util.IsUnset(request.WafConfig)) { - body["wafConfig"] = request.WafConfig - } - - realHeaders := make(map[string]*string) - if !tea.BoolValue(util.IsUnset(headers.CommonHeaders)) { - realHeaders = headers.CommonHeaders - } - - if !tea.BoolValue(util.IsUnset(headers.XFcAccountId)) { - realHeaders["X-Fc-Account-Id"] = util.ToJSONString(headers.XFcAccountId) - } - - if !tea.BoolValue(util.IsUnset(headers.XFcDate)) { - realHeaders["X-Fc-Date"] = util.ToJSONString(headers.XFcDate) - } - - if !tea.BoolValue(util.IsUnset(headers.XFcTraceId)) { - realHeaders["X-Fc-Trace-Id"] = util.ToJSONString(headers.XFcTraceId) - } - - req := &openapi.OpenApiRequest{ - Headers: realHeaders, - Body: openapiutil.ParseToMap(body), - } - params := &openapi.Params{ - Action: tea.String("UpdateCustomDomain"), - Version: tea.String("2021-04-06"), - Protocol: tea.String("HTTPS"), - Pathname: tea.String("/2021-04-06/custom-domains/" + tea.StringValue(openapiutil.GetEncodeParam(domainName))), - Method: tea.String("PUT"), - AuthType: tea.String("AK"), - Style: tea.String("ROA"), - ReqBodyType: tea.String("json"), - BodyType: tea.String("json"), - } - _result = &alifcopen.UpdateCustomDomainResponse{} - _body, _err := client.CallApi(params, req, runtime) - if _err != nil { - return _result, _err - } - _err = tea.Convert(_body, &_result) - return _result, _err -} diff --git a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go index 25434d9b7..4e19c71b7 100644 --- a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go +++ b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go @@ -8,14 +8,14 @@ import ( "strings" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - aliga "github.com/alibabacloud-go/ga-20191120/v4/client" + "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-ga/internal" + aliga "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client" ) type DeployerConfig struct { @@ -40,7 +40,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.GaClient + sdkClient *aliga.Client sdkCertmgr certmgr.Provider } @@ -56,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -135,7 +135,7 @@ func (d *Deployer) deployToAccelerator(ctx context.Context, cloudCertId string) PageNumber: tea.Int32(int32(listListenersPageNumber)), PageSize: tea.Int32(int32(listListenersPageSize)), } - listListenersResp, err := d.sdkClient.ListListeners(listListenersReq) + listListenersResp, err := d.sdkClient.ListListenersWithContext(ctx, listListenersReq, &dara.RuntimeOptions{}) d.logger.Debug("sdk request 'ga.ListListeners'", slog.Any("request", listListenersReq), slog.Any("response", listListenersResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'ga.ListListeners': %w", err) @@ -214,7 +214,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudAccelerat NextToken: listListenerCertificatesNextToken, MaxResults: tea.Int32(20), } - listListenerCertificatesResp, err := d.sdkClient.ListListenerCertificates(listListenerCertificatesReq) + listListenerCertificatesResp, err := d.sdkClient.ListListenerCertificatesWithContext(ctx, listListenerCertificatesReq, &dara.RuntimeOptions{}) d.logger.Debug("sdk request 'ga.ListListenerCertificates'", slog.Any("request", listListenerCertificatesReq), slog.Any("response", listListenerCertificatesResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'ga.ListListenerCertificates': %w", err) @@ -255,7 +255,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudAccelerat Id: tea.String(cloudCertId), }}, } - updateListenerResp, err := d.sdkClient.UpdateListener(updateListenerReq) + updateListenerResp, err := d.sdkClient.UpdateListenerWithContext(ctx, updateListenerReq, &dara.RuntimeOptions{}) d.logger.Debug("sdk request 'ga.UpdateListener'", slog.Any("request", updateListenerReq), slog.Any("response", updateListenerResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'ga.UpdateListener': %w", err) @@ -281,7 +281,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudAccelerat CertificateId: tea.String(cloudCertId), Domain: tea.String(d.config.Domain), } - updateAdditionalCertificateWithListenerResp, err := d.sdkClient.UpdateAdditionalCertificateWithListener(updateAdditionalCertificateWithListenerReq) + updateAdditionalCertificateWithListenerResp, err := d.sdkClient.UpdateAdditionalCertificateWithListenerWithContext(ctx, updateAdditionalCertificateWithListenerReq, &dara.RuntimeOptions{}) d.logger.Debug("sdk request 'ga.UpdateAdditionalCertificateWithListener'", slog.Any("request", updateAdditionalCertificateWithListenerReq), slog.Any("response", updateAdditionalCertificateWithListenerResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'ga.UpdateAdditionalCertificateWithListener': %w", err) @@ -298,7 +298,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudAccelerat Domain: tea.String(d.config.Domain), }}, } - associateAdditionalCertificatesWithListenerResp, err := d.sdkClient.AssociateAdditionalCertificatesWithListener(associateAdditionalCertificatesWithListenerReq) + associateAdditionalCertificatesWithListenerResp, err := d.sdkClient.AssociateAdditionalCertificatesWithListenerWithContext(ctx, associateAdditionalCertificatesWithListenerReq, &dara.RuntimeOptions{}) d.logger.Debug("sdk request 'ga.AssociateAdditionalCertificatesWithListener'", slog.Any("request", associateAdditionalCertificatesWithListenerReq), slog.Any("response", associateAdditionalCertificatesWithListenerResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'ga.AssociateAdditionalCertificatesWithListener': %w", err) @@ -309,7 +309,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudAccelerat return nil } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.GaClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*aliga.Client, error) { // 接入点一览 https://api.aliyun.com/product/Ga config := &aliopen.Config{ AccessKeyId: tea.String(accessKeyId), @@ -317,7 +317,7 @@ func createSDKClient(accessKeyId, accessKeySecret string) (*internal.GaClient, e Endpoint: tea.String("ga.cn-hangzhou.aliyuncs.com"), } - client, err := internal.NewGaClient(config) + client, err := aliga.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-ga/internal/client.go b/pkg/core/deployer/providers/aliyun-ga/internal/client.go deleted file mode 100644 index 1d7ca54fb..000000000 --- a/pkg/core/deployer/providers/aliyun-ga/internal/client.go +++ /dev/null @@ -1,396 +0,0 @@ -package internal - -import ( - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" - aliga "github.com/alibabacloud-go/ga-20191120/v4/client" - openapiutil "github.com/alibabacloud-go/openapi-util/service" - util "github.com/alibabacloud-go/tea-utils/v2/service" - "github.com/alibabacloud-go/tea/dara" - "github.com/alibabacloud-go/tea/tea" -) - -// This is a partial copy of https://github.com/alibabacloud-go/ga-20191120/blob/master/client/client.go -// to lightweight the vendor packages in the built binary. -type GaClient struct { - openapi.Client -} - -func NewGaClient(config *openapi.Config) (*GaClient, error) { - client := new(GaClient) - err := client.Init(config) - return client, err -} - -func (client *GaClient) Init(config *openapi.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *GaClient) AssociateAdditionalCertificatesWithListenerWithOptions(request *aliga.AssociateAdditionalCertificatesWithListenerRequest, runtime *util.RuntimeOptions) (_result *aliga.AssociateAdditionalCertificatesWithListenerResponse, _err error) { - _err = util.ValidateModel(request) - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !tea.BoolValue(util.IsUnset(request.AcceleratorId)) { - query["AcceleratorId"] = request.AcceleratorId - } - - if !tea.BoolValue(util.IsUnset(request.Certificates)) { - query["Certificates"] = request.Certificates - } - - if !tea.BoolValue(util.IsUnset(request.ClientToken)) { - query["ClientToken"] = request.ClientToken - } - - if !tea.BoolValue(util.IsUnset(request.ListenerId)) { - query["ListenerId"] = request.ListenerId - } - - if !tea.BoolValue(util.IsUnset(request.RegionId)) { - query["RegionId"] = request.RegionId - } - - req := &openapi.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapi.Params{ - Action: tea.String("AssociateAdditionalCertificatesWithListener"), - Version: tea.String("2019-11-20"), - Protocol: tea.String("HTTPS"), - Pathname: tea.String("/"), - Method: tea.String("POST"), - AuthType: tea.String("AK"), - Style: tea.String("RPC"), - ReqBodyType: tea.String("formData"), - BodyType: tea.String("json"), - } - _result = &aliga.AssociateAdditionalCertificatesWithListenerResponse{} - _body, _err := client.CallApi(params, req, runtime) - if _err != nil { - return _result, _err - } - _err = tea.Convert(_body, &_result) - return _result, _err -} - -func (client *GaClient) AssociateAdditionalCertificatesWithListener(request *aliga.AssociateAdditionalCertificatesWithListenerRequest) (_result *aliga.AssociateAdditionalCertificatesWithListenerResponse, _err error) { - runtime := &util.RuntimeOptions{} - _result = &aliga.AssociateAdditionalCertificatesWithListenerResponse{} - _body, _err := client.AssociateAdditionalCertificatesWithListenerWithOptions(request, runtime) - if _err != nil { - return _result, _err - } - _result = _body - return _result, _err -} - -func (client *GaClient) ListListenersWithOptions(request *aliga.ListListenersRequest, runtime *util.RuntimeOptions) (_result *aliga.ListListenersResponse, _err error) { - _err = util.ValidateModel(request) - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !tea.BoolValue(util.IsUnset(request.AcceleratorId)) { - query["AcceleratorId"] = request.AcceleratorId - } - - if !tea.BoolValue(util.IsUnset(request.PageNumber)) { - query["PageNumber"] = request.PageNumber - } - - if !tea.BoolValue(util.IsUnset(request.PageSize)) { - query["PageSize"] = request.PageSize - } - - if !dara.IsNil(request.Protocol) { - query["Protocol"] = request.Protocol - } - - if !tea.BoolValue(util.IsUnset(request.RegionId)) { - query["RegionId"] = request.RegionId - } - - req := &openapi.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapi.Params{ - Action: tea.String("ListListeners"), - Version: tea.String("2019-11-20"), - Protocol: tea.String("HTTPS"), - Pathname: tea.String("/"), - Method: tea.String("POST"), - AuthType: tea.String("AK"), - Style: tea.String("RPC"), - ReqBodyType: tea.String("formData"), - BodyType: tea.String("json"), - } - _result = &aliga.ListListenersResponse{} - _body, _err := client.CallApi(params, req, runtime) - if _err != nil { - return _result, _err - } - _err = tea.Convert(_body, &_result) - return _result, _err -} - -func (client *GaClient) ListListeners(request *aliga.ListListenersRequest) (_result *aliga.ListListenersResponse, _err error) { - runtime := &util.RuntimeOptions{} - _result = &aliga.ListListenersResponse{} - _body, _err := client.ListListenersWithOptions(request, runtime) - if _err != nil { - return _result, _err - } - _result = _body - return _result, _err -} - -func (client *GaClient) ListListenerCertificatesWithOptions(request *aliga.ListListenerCertificatesRequest, runtime *util.RuntimeOptions) (_result *aliga.ListListenerCertificatesResponse, _err error) { - _err = util.ValidateModel(request) - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !tea.BoolValue(util.IsUnset(request.AcceleratorId)) { - query["AcceleratorId"] = request.AcceleratorId - } - - if !tea.BoolValue(util.IsUnset(request.ListenerId)) { - query["ListenerId"] = request.ListenerId - } - - if !tea.BoolValue(util.IsUnset(request.MaxResults)) { - query["MaxResults"] = request.MaxResults - } - - if !tea.BoolValue(util.IsUnset(request.NextToken)) { - query["NextToken"] = request.NextToken - } - - if !tea.BoolValue(util.IsUnset(request.RegionId)) { - query["RegionId"] = request.RegionId - } - - if !tea.BoolValue(util.IsUnset(request.Role)) { - query["Role"] = request.Role - } - - req := &openapi.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapi.Params{ - Action: tea.String("ListListenerCertificates"), - Version: tea.String("2019-11-20"), - Protocol: tea.String("HTTPS"), - Pathname: tea.String("/"), - Method: tea.String("POST"), - AuthType: tea.String("AK"), - Style: tea.String("RPC"), - ReqBodyType: tea.String("formData"), - BodyType: tea.String("json"), - } - _result = &aliga.ListListenerCertificatesResponse{} - _body, _err := client.CallApi(params, req, runtime) - if _err != nil { - return _result, _err - } - _err = tea.Convert(_body, &_result) - return _result, _err -} - -func (client *GaClient) ListListenerCertificates(request *aliga.ListListenerCertificatesRequest) (_result *aliga.ListListenerCertificatesResponse, _err error) { - runtime := &util.RuntimeOptions{} - _result = &aliga.ListListenerCertificatesResponse{} - _body, _err := client.ListListenerCertificatesWithOptions(request, runtime) - if _err != nil { - return _result, _err - } - _result = _body - return _result, _err -} - -func (client *GaClient) UpdateAdditionalCertificateWithListenerWithOptions(request *aliga.UpdateAdditionalCertificateWithListenerRequest, runtime *util.RuntimeOptions) (_result *aliga.UpdateAdditionalCertificateWithListenerResponse, _err error) { - _err = util.ValidateModel(request) - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !tea.BoolValue(util.IsUnset(request.AcceleratorId)) { - query["AcceleratorId"] = request.AcceleratorId - } - - if !tea.BoolValue(util.IsUnset(request.CertificateId)) { - query["CertificateId"] = request.CertificateId - } - - if !tea.BoolValue(util.IsUnset(request.ClientToken)) { - query["ClientToken"] = request.ClientToken - } - - if !tea.BoolValue(util.IsUnset(request.Domain)) { - query["Domain"] = request.Domain - } - - if !tea.BoolValue(util.IsUnset(request.DryRun)) { - query["DryRun"] = request.DryRun - } - - if !tea.BoolValue(util.IsUnset(request.ListenerId)) { - query["ListenerId"] = request.ListenerId - } - - if !tea.BoolValue(util.IsUnset(request.RegionId)) { - query["RegionId"] = request.RegionId - } - - req := &openapi.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapi.Params{ - Action: tea.String("UpdateAdditionalCertificateWithListener"), - Version: tea.String("2019-11-20"), - Protocol: tea.String("HTTPS"), - Pathname: tea.String("/"), - Method: tea.String("POST"), - AuthType: tea.String("AK"), - Style: tea.String("RPC"), - ReqBodyType: tea.String("formData"), - BodyType: tea.String("json"), - } - _result = &aliga.UpdateAdditionalCertificateWithListenerResponse{} - _body, _err := client.CallApi(params, req, runtime) - if _err != nil { - return _result, _err - } - _err = tea.Convert(_body, &_result) - return _result, _err -} - -func (client *GaClient) UpdateAdditionalCertificateWithListener(request *aliga.UpdateAdditionalCertificateWithListenerRequest) (_result *aliga.UpdateAdditionalCertificateWithListenerResponse, _err error) { - runtime := &util.RuntimeOptions{} - _result = &aliga.UpdateAdditionalCertificateWithListenerResponse{} - _body, _err := client.UpdateAdditionalCertificateWithListenerWithOptions(request, runtime) - if _err != nil { - return _result, _err - } - _result = _body - return _result, _err -} - -func (client *GaClient) UpdateListenerWithOptions(request *aliga.UpdateListenerRequest, runtime *util.RuntimeOptions) (_result *aliga.UpdateListenerResponse, _err error) { - _err = util.ValidateModel(request) - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} - - if !tea.BoolValue(util.IsUnset(request.BackendPorts)) { - query["BackendPorts"] = request.BackendPorts - } - - if !tea.BoolValue(util.IsUnset(request.Certificates)) { - query["Certificates"] = request.Certificates - } - - if !tea.BoolValue(util.IsUnset(request.ClientAffinity)) { - query["ClientAffinity"] = request.ClientAffinity - } - - if !tea.BoolValue(util.IsUnset(request.ClientToken)) { - query["ClientToken"] = request.ClientToken - } - - if !tea.BoolValue(util.IsUnset(request.Description)) { - query["Description"] = request.Description - } - - if !tea.BoolValue(util.IsUnset(request.HttpVersion)) { - query["HttpVersion"] = request.HttpVersion - } - - if !tea.BoolValue(util.IsUnset(request.IdleTimeout)) { - query["IdleTimeout"] = request.IdleTimeout - } - - if !tea.BoolValue(util.IsUnset(request.ListenerId)) { - query["ListenerId"] = request.ListenerId - } - - if !tea.BoolValue(util.IsUnset(request.Name)) { - query["Name"] = request.Name - } - - if !tea.BoolValue(util.IsUnset(request.PortRanges)) { - query["PortRanges"] = request.PortRanges - } - - if !tea.BoolValue(util.IsUnset(request.Protocol)) { - query["Protocol"] = request.Protocol - } - - if !tea.BoolValue(util.IsUnset(request.ProxyProtocol)) { - query["ProxyProtocol"] = request.ProxyProtocol - } - - if !tea.BoolValue(util.IsUnset(request.RegionId)) { - query["RegionId"] = request.RegionId - } - - if !tea.BoolValue(util.IsUnset(request.RequestTimeout)) { - query["RequestTimeout"] = request.RequestTimeout - } - - if !tea.BoolValue(util.IsUnset(request.SecurityPolicyId)) { - query["SecurityPolicyId"] = request.SecurityPolicyId - } - - if !tea.BoolValue(util.IsUnset(request.XForwardedForConfig)) { - query["XForwardedForConfig"] = request.XForwardedForConfig - } - - req := &openapi.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapi.Params{ - Action: tea.String("UpdateListener"), - Version: tea.String("2019-11-20"), - Protocol: tea.String("HTTPS"), - Pathname: tea.String("/"), - Method: tea.String("POST"), - AuthType: tea.String("AK"), - Style: tea.String("RPC"), - ReqBodyType: tea.String("formData"), - BodyType: tea.String("json"), - } - _result = &aliga.UpdateListenerResponse{} - _body, _err := client.CallApi(params, req, runtime) - if _err != nil { - return _result, _err - } - _err = tea.Convert(_body, &_result) - return _result, _err -} - -func (client *GaClient) UpdateListener(request *aliga.UpdateListenerRequest) (_result *aliga.UpdateListenerResponse, _err error) { - runtime := &util.RuntimeOptions{} - _result = &aliga.UpdateListenerResponse{} - _body, _err := client.UpdateListenerWithOptions(request, runtime) - if _err != nil { - return _result, _err - } - _result = _body - return _result, _err -} diff --git a/pkg/core/deployer/providers/aliyun-live/aliyun_live.go b/pkg/core/deployer/providers/aliyun-live/aliyun_live.go index e0adfb569..44dbe1ee0 100644 --- a/pkg/core/deployer/providers/aliyun-live/aliyun_live.go +++ b/pkg/core/deployer/providers/aliyun-live/aliyun_live.go @@ -9,13 +9,12 @@ import ( "time" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - alilive "github.com/alibabacloud-go/live-20161101/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-live/internal" + alilive "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -38,7 +37,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.LiveClient + sdkClient *alilive.Client } var _ deployer.Provider = (*Deployer)(nil) @@ -216,7 +215,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.LiveClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*alilive.Client, error) { // 接入点一览 https://api.aliyun.com/product/live var endpoint string switch region { @@ -239,7 +238,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Liv Endpoint: tea.String(endpoint), } - client, err := internal.NewLiveClient(config) + client, err := alilive.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go index acc78d19b..732bea82e 100644 --- a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go +++ b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go @@ -8,15 +8,14 @@ import ( "strings" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" - alinlb "github.com/alibabacloud-go/nlb-20220430/v4/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-nlb/internal" + alinlb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client" ) type DeployerConfig struct { @@ -41,7 +40,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.NlbClient + sdkClient *alinlb.Client sdkCertmgr certmgr.Provider } @@ -57,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -235,7 +234,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.NlbClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*alinlb.Client, error) { // 接入点一览 https://api.aliyun.com/product/Nlb var endpoint string switch region { @@ -251,7 +250,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Nlb Endpoint: tea.String(endpoint), } - client, err := internal.NewNlbClient(config) + client, err := alinlb.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go b/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go index 271a5c770..2d73901b3 100644 --- a/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go +++ b/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go @@ -11,13 +11,12 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" - alivod "github.com/alibabacloud-go/vod-20170321/v4/client" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-vod/internal" + alivod "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -40,7 +39,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.VodClient + sdkClient *alivod.Client sdkCertmgr certmgr.Provider } @@ -56,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -245,7 +244,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.VodClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*alivod.Client, error) { // 接入点一览 https://api.aliyun.com/product/vod var endpoint string switch region { @@ -261,7 +260,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Vod Endpoint: tea.String(endpoint), } - client, err := internal.NewVodClient(config) + client, err := alivod.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go b/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go index d9eae442d..04a717ef0 100644 --- a/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go +++ b/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go @@ -11,13 +11,12 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" - aliwaf "github.com/alibabacloud-go/waf-openapi-20211001/v7/client" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-waf/internal" + aliwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client" ) type DeployerConfig struct { @@ -52,7 +51,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.WafClient + sdkClient *aliwaf.Client sdkCertmgr certmgr.Provider } @@ -68,7 +67,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -389,7 +388,7 @@ func (d *Deployer) deployToWAF3WithCNAME(ctx context.Context, cloudCertId string return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.WafClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*aliwaf.Client, error) { // 接入点一览：https://api.aliyun.com/product/waf-openapi var endpoint string switch region { @@ -405,7 +404,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Waf Endpoint: tea.String(endpoint), } - client, err := internal.NewWafClient(config) + client, err := aliwaf.NewClient(config) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/aws-acm/aws_acm.go b/pkg/core/deployer/providers/aws-acm/aws_acm.go index 51d1e87bc..6e7cab1c5 100644 --- a/pkg/core/deployer/providers/aws-acm/aws_acm.go +++ b/pkg/core/deployer/providers/aws-acm/aws_acm.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -36,7 +36,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, Region: config.Region, diff --git a/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go b/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go index 5c8869307..71116f54c 100644 --- a/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go +++ b/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgracm "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm" - mcertmgriam "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam" + certmgrimplacm "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm" + certmgrimpliam "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -54,7 +54,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { var pcertmgr certmgr.Provider switch config.CertificateSource { case CERTIFICATE_SOURCE_ACM: - pcertmgr, err = mcertmgracm.NewCertmgr(&mcertmgracm.CertmgrConfig{ + pcertmgr, err = certmgrimplacm.NewCertmgr(&certmgrimplacm.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, Region: config.Region, @@ -64,7 +64,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { } case CERTIFICATE_SOURCE_IAM: - pcertmgr, err = mcertmgriam.NewCertmgr(&mcertmgriam.CertmgrConfig{ + pcertmgr, err = certmgrimpliam.NewCertmgr(&certmgrimpliam.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, Region: config.Region, diff --git a/pkg/core/deployer/providers/aws-iam/aws_iam.go b/pkg/core/deployer/providers/aws-iam/aws_iam.go index 6cf7980fb..bc1b1f9c6 100644 --- a/pkg/core/deployer/providers/aws-iam/aws_iam.go +++ b/pkg/core/deployer/providers/aws-iam/aws_iam.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -36,7 +36,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, Region: config.Region, diff --git a/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go b/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go index 6e14c3efd..67e42846c 100644 --- a/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go +++ b/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/azure-keyvault" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/azure-keyvault" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -40,7 +40,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ TenantId: config.TenantId, ClientId: config.ClientId, ClientSecret: config.ClientSecret, diff --git a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go index 18dcb1298..b75a43185 100644 --- a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go +++ b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go @@ -13,7 +13,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -56,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) diff --git a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go index 5817a0de0..6e69f0d1d 100644 --- a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go +++ b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go @@ -13,7 +13,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -56,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) diff --git a/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go b/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go index b0f57c619..2f5d74de7 100644 --- a/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go +++ b/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -31,7 +31,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) diff --git a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go index ea8c054b8..be60d41ab 100644 --- a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go +++ b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go @@ -10,7 +10,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baishan-cdn" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baishan-cdn" "github.com/certimate-go/certimate/pkg/core/deployer" baishansdk "github.com/certimate-go/certimate/pkg/sdk3rd/baishan" ) @@ -49,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ ApiToken: config.ApiToken, }) if err != nil { diff --git a/pkg/core/deployer/providers/baotapanel/baotapanel.go b/pkg/core/deployer/providers/baotapanel/baotapanel.go index 0baed32bf..b64519bc6 100644 --- a/pkg/core/deployer/providers/baotapanel/baotapanel.go +++ b/pkg/core/deployer/providers/baotapanel/baotapanel.go @@ -115,9 +115,8 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep default: if err := d.updateSiteCertificate(ctx, d.config.SiteType, siteName, certPEM, privkeyPEM); err != nil { errs = append(errs, err) - } - if i < len(d.config.SiteNames)-1 { - xwait.DelayWithContext(ctx, time.Second*5) + } else if i < len(d.config.SiteNames)-1 { + xwait.DelayWithContext(ctx, 5*time.Second) } } } diff --git a/pkg/core/deployer/providers/baotapanelgo/baotapanelgo.go b/pkg/core/deployer/providers/baotapanelgo/baotapanelgo.go index cf6361b5b..82fea5677 100644 --- a/pkg/core/deployer/providers/baotapanelgo/baotapanelgo.go +++ b/pkg/core/deployer/providers/baotapanelgo/baotapanelgo.go @@ -90,9 +90,8 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep default: if err := d.updateSiteCertificate(ctx, d.config.SiteType, siteName, certPEM, privkeyPEM); err != nil { errs = append(errs, err) - } - if i < len(d.config.SiteNames)-1 { - xwait.DelayWithContext(ctx, time.Second*5) + } else if i < len(d.config.SiteNames)-1 { + xwait.DelayWithContext(ctx, 5*time.Second) } } } diff --git a/pkg/core/deployer/providers/baotawaf/baotawaf.go b/pkg/core/deployer/providers/baotawaf/baotawaf.go index 195b3a01d..383bf7e34 100644 --- a/pkg/core/deployer/providers/baotawaf/baotawaf.go +++ b/pkg/core/deployer/providers/baotawaf/baotawaf.go @@ -76,9 +76,8 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep default: if err := d.updateSiteCertificate(ctx, siteName, d.config.SitePort, certPEM, privkeyPEM); err != nil { errs = append(errs, err) - } - if i < len(d.config.SiteNames)-1 { - xwait.DelayWithContext(ctx, time.Second*5) + } else if i < len(d.config.SiteNames)-1 { + xwait.DelayWithContext(ctx, 5*time.Second) } } } diff --git a/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go b/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go index 529c06eee..e81946897 100644 --- a/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go +++ b/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go @@ -11,7 +11,7 @@ import ( bp "github.com/volcengine/volcengine-go-sdk/volcengine" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-cdn" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-cdn" "github.com/certimate-go/certimate/pkg/core/deployer" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client.Client.SetAccessKey(config.AccessKey) client.Client.SetSecretKey(config.SecretKey) - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKey: config.AccessKey, SecretKey: config.SecretKey, }) diff --git a/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao.go b/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao.go index 94ab4ad5c..691025062 100644 --- a/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao.go +++ b/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao.go @@ -11,7 +11,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-ao" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-ao" "github.com/certimate-go/certimate/pkg/core/deployer" ctyunao "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/ao" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" @@ -48,7 +48,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) diff --git a/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn.go b/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn.go index c08933008..45e4ebb4a 100644 --- a/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn.go +++ b/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn.go @@ -10,7 +10,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cdn" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cdn" "github.com/certimate-go/certimate/pkg/core/deployer" ctyuncdn "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/cdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) diff --git a/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms.go b/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms.go index 09f839a5e..9c7905078 100644 --- a/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms.go +++ b/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cms" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cms" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -31,7 +31,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) diff --git a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go index 96856580f..324b22196 100644 --- a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go +++ b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go @@ -10,7 +10,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-elb" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-elb" "github.com/certimate-go/certimate/pkg/core/deployer" ctyunelb "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/elb" ) @@ -51,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, RegionId: config.RegionId, diff --git a/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn.go b/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn.go index e504cf8fb..d0a3cdfb9 100644 --- a/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn.go +++ b/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn.go @@ -10,7 +10,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-icdn" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-icdn" "github.com/certimate-go/certimate/pkg/core/deployer" ctyunicdn "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/icdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) diff --git a/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn.go b/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn.go index 370ed4c47..b5644ec92 100644 --- a/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn.go +++ b/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn.go @@ -9,7 +9,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-lvdn" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-lvdn" "github.com/certimate-go/certimate/pkg/core/deployer" ctyunlvdn "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/lvdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" @@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) diff --git a/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go b/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go index 3f668a792..ecd95d77d 100644 --- a/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go +++ b/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go @@ -10,7 +10,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dogecloud" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dogecloud" "github.com/certimate-go/certimate/pkg/core/deployer" dogesdk "github.com/certimate-go/certimate/pkg/sdk3rd/dogecloud" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKey: config.AccessKey, SecretKey: config.SecretKey, }) diff --git a/pkg/core/deployer/providers/dokploy/dokploy.go b/pkg/core/deployer/providers/dokploy/dokploy.go index d950afe2a..feef90851 100644 --- a/pkg/core/deployer/providers/dokploy/dokploy.go +++ b/pkg/core/deployer/providers/dokploy/dokploy.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dokploy" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dokploy" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -33,7 +33,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ ServerUrl: config.ServerUrl, ApiKey: config.ApiKey, AllowInsecureConnections: config.AllowInsecureConnections, diff --git a/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go b/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go index 1ecca181b..10793bc2d 100644 --- a/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go +++ b/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go @@ -13,7 +13,7 @@ import ( "github.com/G-Core/gcorelabscdn-go/sslcerts" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/gcore-cdn" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/gcore-cdn" "github.com/certimate-go/certimate/pkg/core/deployer" gcoresdk "github.com/certimate-go/certimate/pkg/sdk3rd/gcore" ) @@ -52,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ ApiToken: config.ApiToken, }) if err != nil { diff --git a/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad.go b/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad.go index 84be505f0..873843339 100644 --- a/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad.go +++ b/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad.go @@ -8,14 +8,14 @@ import ( "time" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hcaad "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1" - hcaadmodelv1 "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/model" - hcaadregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/region" - hcaadmodelv2 "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/model" + hwaadmodelv1 "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/model" + hwaadregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/region" + hwaadmodelv2 "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/model" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-aad/internal" + hwaadv1 "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1" + hwaadv2 "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -36,30 +36,32 @@ type DeployerConfig struct { } type Deployer struct { - config *DeployerConfig - logger *slog.Logger - sdkClient *internal.AadClient + config *DeployerConfig + logger *slog.Logger + sdkClients *wSDKClients } var _ deployer.Provider = (*Deployer)(nil) +type wSDKClients struct { + AADv1 *hwaadv1.AadClient + AADv2 *hwaadv2.AadClient +} + func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, errors.New("the configuration of the deployer provider is nil") } - client, err := createSDKClient( - config.AccessKeyId, - config.SecretAccessKey, - ) + clients, err := createSDKClients(config.AccessKeyId, config.SecretAccessKey) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } return &Deployer{ - config: config, - logger: slog.Default(), - sdkClient: client, + config: config, + logger: slog.Default(), + sdkClients: clients, }, nil } @@ -89,14 +91,14 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep if err != nil { return nil, err } - domains := lo.Filter(domainCandidates, func(domainItem *hcaadmodelv2.InstanceDomainItem, _ int) bool { + domains := lo.Filter(domainCandidates, func(domainItem *hwaadmodelv2.InstanceDomainItem, _ int) bool { return lo.FromPtr(domainItem.DomainName) == d.config.Domain }) if len(domains) == 0 { return nil, errors.New("could not find domain") } - domainIds = lo.Map(domains, func(domainItem *hcaadmodelv2.InstanceDomainItem, _ int) string { + domainIds = lo.Map(domains, func(domainItem *hwaadmodelv2.InstanceDomainItem, _ int) string { return lo.FromPtr(domainItem.DomainId) }) } @@ -112,14 +114,14 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, err } - domains := lo.Filter(domainCandidates, func(domainItem *hcaadmodelv2.InstanceDomainItem, _ int) bool { + domains := lo.Filter(domainCandidates, func(domainItem *hwaadmodelv2.InstanceDomainItem, _ int) bool { return xcerthostname.IsMatch(d.config.Domain, lo.FromPtr(domainItem.DomainName)) }) if len(domains) == 0 { return nil, errors.New("could not find any domains matched by wildcard") } - domainIds = lo.Map(domains, func(domainItem *hcaadmodelv2.InstanceDomainItem, _ int) string { + domainIds = lo.Map(domains, func(domainItem *hwaadmodelv2.InstanceDomainItem, _ int) string { return lo.FromPtr(domainItem.DomainId) }) } @@ -131,14 +133,14 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, err } - domains := lo.Filter(domainCandidates, func(domainItem *hcaadmodelv2.InstanceDomainItem, _ int) bool { + domains := lo.Filter(domainCandidates, func(domainItem *hwaadmodelv2.InstanceDomainItem, _ int) bool { return xcerthostname.IsMatchByCertificatePEM(certPEM, lo.FromPtr(domainItem.DomainName)) }) if len(domains) == 0 { return nil, errors.New("could not find any domains matched by certificate") } - domainIds = lo.Map(domains, func(domainItem *hcaadmodelv2.InstanceDomainItem, _ int) string { + domainIds = lo.Map(domains, func(domainItem *hwaadmodelv2.InstanceDomainItem, _ int) string { return lo.FromPtr(domainItem.DomainId) }) } @@ -173,8 +175,8 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return &deployer.DeployResult{}, nil } -func (d *Deployer) getAllDomainsByInstanceId(ctx context.Context, cloudInstanceId string) ([]*hcaadmodelv2.InstanceDomainItem, error) { - domains := make([]*hcaadmodelv2.InstanceDomainItem, 0) +func (d *Deployer) getAllDomainsByInstanceId(ctx context.Context, cloudInstanceId string) ([]*hwaadmodelv2.InstanceDomainItem, error) { + domains := make([]*hwaadmodelv2.InstanceDomainItem, 0) // 查询实例关联的域名信息 // REF: https://support.huaweicloud.com/intl/zh-cn/api-aad/ListInstanceDomains.html @@ -187,12 +189,12 @@ func (d *Deployer) getAllDomainsByInstanceId(ctx context.Context, cloudInstanceI default: } - listInstanceDomainsReq := &hcaadmodelv2.ListInstanceDomainsRequest{ + listInstanceDomainsReq := &hwaadmodelv2.ListInstanceDomainsRequest{ InstanceId: cloudInstanceId, Offset: lo.ToPtr(int32(listInstanceDomainsOffset)), Limit: lo.ToPtr(int32(listInstanceDomainsLimit)), } - listInstanceDomainsResp, err := d.sdkClient.ListInstanceDomains(listInstanceDomainsReq) + listInstanceDomainsResp, err := d.sdkClients.AADv2.ListInstanceDomains(listInstanceDomainsReq) d.logger.Debug("sdk request 'aad.ListInstanceDomains'", slog.Any("request", listInstanceDomainsReq), slog.Any("response", listInstanceDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'aad.ListInstanceDomains': %w", err) @@ -224,8 +226,8 @@ func (d *Deployer) getAllDomainsByInstanceId(ctx context.Context, cloudInstanceI func (d *Deployer) updateDomainCertificate(ctx context.Context, cloudDomainId string, certPEM, privkeyPEM string) error { // 上传域名对应证书 // REF: https://support.huaweicloud.com/intl/zh-cn/api-aad/SetCertForDomain.html - setCertForDomainReq := &hcaadmodelv1.SetCertForDomainRequest{ - Body: &hcaadmodelv1.CertificateBody{ + setCertForDomainReq := &hwaadmodelv1.SetCertForDomainRequest{ + Body: &hwaadmodelv1.CertificateBody{ OpType: 0, DomainId: cloudDomainId, CertName: fmt.Sprintf("certimate_%d", time.Now().UnixMilli()), @@ -233,7 +235,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, cloudDomainId st CertKeyFile: lo.ToPtr(privkeyPEM), }, } - setCertForDomainResp, err := d.sdkClient.SetCertForDomain(setCertForDomainReq) + setCertForDomainResp, err := d.sdkClients.AADv1.SetCertForDomain(setCertForDomainReq) d.logger.Debug("sdk request 'aad.SetCertForDomain'", slog.Any("request", setCertForDomainReq), slog.Any("response", setCertForDomainResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'aad.SetCertForDomain': %w", err) @@ -242,30 +244,64 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, cloudDomainId st return nil } -func createSDKClient(accessKeyId, secretAccessKey string) (*internal.AadClient, error) { - region := "cn-north-4" // AAD 服务默认区域：华北北京四 +func createSDKClients(accessKeyId, secretAccessKey string) (*wSDKClients, error) { + wsdk := &wSDKClients{} - auth, err := global.NewCredentialsBuilder(). - WithAk(accessKeyId). - WithSk(secretAccessKey). - SafeBuild() - if err != nil { - return nil, err + { + region := "cn-north-4" // AAD 服务默认区域：华北北京四 + + auth, err := global.NewCredentialsBuilder(). + WithAk(accessKeyId). + WithSk(secretAccessKey). + SafeBuild() + if err != nil { + return nil, err + } + + hcRegion, err := hwaadregion.SafeValueOf(region) + if err != nil { + return nil, err + } + + hcClient, err := hwaadv1.AadClientBuilder(). + WithRegion(hcRegion). + WithCredential(auth). + SafeBuild() + if err != nil { + return nil, err + } + + client := hwaadv1.NewAadClient(hcClient) + wsdk.AADv1 = client } - hcRegion, err := hcaadregion.SafeValueOf(region) - if err != nil { - return nil, err + { + region := "cn-north-4" // AAD 服务默认区域：华北北京四 + + auth, err := global.NewCredentialsBuilder(). + WithAk(accessKeyId). + WithSk(secretAccessKey). + SafeBuild() + if err != nil { + return nil, err + } + + hcRegion, err := hwaadregion.SafeValueOf(region) + if err != nil { + return nil, err + } + + hcClient, err := hwaadv2.AadClientBuilder(). + WithRegion(hcRegion). + WithCredential(auth). + SafeBuild() + if err != nil { + return nil, err + } + + client := hwaadv2.NewAadClient(hcClient) + wsdk.AADv2 = client } - hcClient, err := hcaad.AadClientBuilder(). - WithRegion(hcRegion). - WithCredential(auth). - SafeBuild() - if err != nil { - return nil, err - } - - client := internal.NewAadClient(hcClient) - return client, nil + return wsdk, nil } diff --git a/pkg/core/deployer/providers/huaweicloud-aad/internal/client.go b/pkg/core/deployer/providers/huaweicloud-aad/internal/client.go deleted file mode 100644 index 3bc084c46..000000000 --- a/pkg/core/deployer/providers/huaweicloud-aad/internal/client.go +++ /dev/null @@ -1,39 +0,0 @@ -package internal - -import ( - httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" - hwaadv1 "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1" - modelv1 "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/model" - hwaadv2 "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2" - modelv2 "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/model" -) - -// This is a partial copy of https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/services/aad/v2/aad_client.go -// to lightweight the vendor packages in the built binary. -type AadClient struct { - HcClient *httpclient.HcHttpClient -} - -func NewAadClient(hcClient *httpclient.HcHttpClient) *AadClient { - return &AadClient{HcClient: hcClient} -} - -func (c *AadClient) ListInstanceDomains(request *modelv2.ListInstanceDomainsRequest) (*modelv2.ListInstanceDomainsResponse, error) { - requestDef := hwaadv2.GenReqDefForListInstanceDomains() - - if resp, err := c.HcClient.Sync(request, requestDef); err != nil { - return nil, err - } else { - return resp.(*modelv2.ListInstanceDomainsResponse), nil - } -} - -func (c *AadClient) SetCertForDomain(request *modelv1.SetCertForDomainRequest) (*modelv1.SetCertForDomainResponse, error) { - requestDef := hwaadv1.GenReqDefForSetCertForDomain() - - if resp, err := c.HcClient.Sync(request, requestDef); err != nil { - return nil, err - } else { - return resp.(*modelv1.SetCertForDomainResponse), nil - } -} diff --git a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go index ed8d871c4..f8dd921f3 100644 --- a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go +++ b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go @@ -9,16 +9,15 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hcapig "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2" - hcapigmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/model" - hcapigregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/region" - hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" - hciamModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" - hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" + hwapigmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/model" + hwapigregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/region" + hwiam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" + hwiamModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" + hwiamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-apig/internal" + hwapig "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2" ) type DeployerConfig struct { @@ -40,7 +39,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.ApigClient + sdkClient *hwapig.ApigClient } var _ deployer.Provider = (*Deployer)(nil) @@ -96,7 +95,7 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM // 查询证书详情 // REF: https://support.huaweicloud.com/api-apig/ShowDetailsOfCertificateV2.html - showDetailsOfCertificateV2Req := &hcapigmodel.ShowDetailsOfCertificateV2Request{ + showDetailsOfCertificateV2Req := &hwapigmodel.ShowDetailsOfCertificateV2Request{ CertificateId: d.config.CertificateId, } showDetailsOfCertificateV2Resp, err := d.sdkClient.ShowDetailsOfCertificateV2(showDetailsOfCertificateV2Req) @@ -107,15 +106,15 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM // 修改 SSL 证书 // REF: https://support.huaweicloud.com/api-apig/UpdateCertificateV2.html - updateCertificateV2Req := &hcapigmodel.UpdateCertificateV2Request{ + updateCertificateV2Req := &hwapigmodel.UpdateCertificateV2Request{ CertificateId: d.config.CertificateId, - Body: &hcapigmodel.CertificateForm{ + Body: &hwapigmodel.CertificateForm{ Name: fmt.Sprintf("certimate_%d", time.Now().UnixMilli()), CertContent: certPEM, PrivateKey: privkeyPEM, Type: lo. - If(showDetailsOfCertificateV2Resp.Type.Value() == hcapigmodel.GetCertificateFormTypeEnum().INSTANCE.Value(), lo.ToPtr(hcapigmodel.GetCertificateFormTypeEnum().INSTANCE)). - Else(lo.ToPtr(hcapigmodel.GetCertificateFormTypeEnum().GLOBAL)), + If(showDetailsOfCertificateV2Resp.Type.Value() == hwapigmodel.GetCertificateFormTypeEnum().INSTANCE.Value(), lo.ToPtr(hwapigmodel.GetCertificateFormTypeEnum().INSTANCE)). + Else(lo.ToPtr(hwapigmodel.GetCertificateFormTypeEnum().GLOBAL)), InstanceId: showDetailsOfCertificateV2Resp.InstanceId, }, } @@ -128,7 +127,7 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM return nil } -func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.ApigClient, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwapig.ApigClient, error) { projectId, err := getSDKProjectId(accessKeyId, secretAccessKey, region) if err != nil { return nil, err @@ -143,12 +142,12 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Api return nil, err } - hcRegion, err := hcapigregion.SafeValueOf(region) + hcRegion, err := hwapigregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hcapig.ApigClientBuilder(). + hcClient, err := hwapig.ApigClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -156,7 +155,7 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Api return nil, err } - client := internal.NewApigClient(hcClient) + client := hwapig.NewApigClient(hcClient) return client, nil } @@ -169,12 +168,12 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - hcRegion, err := hciamregion.SafeValueOf(region) + hcRegion, err := hwiamregion.SafeValueOf(region) if err != nil { return "", err } - hcClient, err := hciam.IamClientBuilder(). + hcClient, err := hwiam.IamClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -182,9 +181,9 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - client := hciam.NewIamClient(hcClient) + client := hwiam.NewIamClient(hcClient) - request := &hciamModel.KeystoneListProjectsRequest{ + request := &hwiamModel.KeystoneListProjectsRequest{ Name: ®ion, } response, err := client.KeystoneListProjects(request) diff --git a/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go b/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go index 5b67cd13b..a71ea1fa2 100644 --- a/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go +++ b/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go @@ -8,15 +8,14 @@ import ( "strings" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hccdn "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2" - hccdnmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/model" - hccdnregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/region" + hwcdnmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/model" + hwcdnregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/region" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-cdn/internal" + hwcdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -39,7 +38,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.CdnClient + sdkClient *hwcdn.CdnClient sdkCertmgr certmgr.Provider } @@ -59,7 +58,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, @@ -191,7 +190,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { default: } - listDomainsReq := &hccdnmodel.ListDomainsRequest{ + listDomainsReq := &hwcdnmodel.ListDomainsRequest{ EnterpriseProjectId: lo.EmptyableToPtr(d.config.EnterpriseProjectId), PageNumber: lo.ToPtr(int32(listDomainsPageNumber)), PageSize: lo.ToPtr(int32(listDomainsPageSize)), @@ -229,10 +228,10 @@ func (d *Deployer) updateDomainsCertificate(ctx context.Context, domains []strin // 更新加速域名配置 // REF: https://support.huaweicloud.com/api-cdn/UpdateDomainMultiCertificates.html // REF: https://support.huaweicloud.com/usermanual-cdn/cdn_01_0306.html - updateDomainMultiCertificatesReq := &hccdnmodel.UpdateDomainMultiCertificatesRequest{ + updateDomainMultiCertificatesReq := &hwcdnmodel.UpdateDomainMultiCertificatesRequest{ EnterpriseProjectId: lo.EmptyableToPtr(d.config.EnterpriseProjectId), - Body: &hccdnmodel.UpdateDomainMultiCertificatesRequestBody{ - Https: &hccdnmodel.UpdateDomainMultiCertificatesRequestBodyContent{ + Body: &hwcdnmodel.UpdateDomainMultiCertificatesRequestBody{ + Https: &hwcdnmodel.UpdateDomainMultiCertificatesRequestBodyContent{ DomainName: strings.Join(domains, ","), HttpsSwitch: 1, CertificateType: lo.ToPtr(int32(2)), @@ -250,7 +249,7 @@ func (d *Deployer) updateDomainsCertificate(ctx context.Context, domains []strin return nil } -func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.CdnClient, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwcdn.CdnClient, error) { if region == "" { region = "cn-north-1" // CDN 服务默认区域：华北北京一 } @@ -263,12 +262,12 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Cdn return nil, err } - hcRegion, err := hccdnregion.SafeValueOf(region) + hcRegion, err := hwcdnregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hccdn.CdnClientBuilder(). + hcClient, err := hwcdn.CdnClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -276,6 +275,6 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Cdn return nil, err } - client := internal.NewCdnClient(hcClient) + client := hwcdn.NewCdnClient(hcClient) return client, nil } diff --git a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go index 52b5006c5..b978a6a9d 100644 --- a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go @@ -9,18 +9,17 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hcelb "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" - hcelbmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/model" - hcelbregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/region" - hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" - hciammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" - hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" + hwelbmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/model" + hwelbregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/region" + hwiam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" + hwiammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" + hwiamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-elb" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-elb" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-elb/internal" + hwelb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" ) type DeployerConfig struct { @@ -48,7 +47,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.ElbClient + sdkClient *hwelb.ElbClient sdkCertmgr certmgr.Provider } @@ -64,7 +63,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, @@ -124,7 +123,7 @@ func (d *Deployer) deployToLoadbalancer(ctx context.Context, certPEM, privkeyPEM // 查询负载均衡器详情 // REF: https://support.huaweicloud.com/api-elb/ShowLoadBalancer.html - showLoadBalancerReq := &hcelbmodel.ShowLoadBalancerRequest{ + showLoadBalancerReq := &hwelbmodel.ShowLoadBalancerRequest{ LoadbalancerId: d.config.LoadbalancerId, } showLoadBalancerResp, err := d.sdkClient.ShowLoadBalancer(showLoadBalancerReq) @@ -144,7 +143,7 @@ func (d *Deployer) deployToLoadbalancer(ctx context.Context, certPEM, privkeyPEM default: } - listListenersReq := &hcelbmodel.ListListenersRequest{ + listListenersReq := &hwelbmodel.ListListenersRequest{ Marker: listListenersMarker, Limit: lo.ToPtr(int32(2000)), Protocol: &[]string{"HTTPS", "TERMINATED_HTTPS"}, @@ -248,7 +247,7 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerId string, cloudCertId string) error { // 查询监听器详情 // REF: https://support.huaweicloud.com/api-elb/ShowListener.html - showListenerReq := &hcelbmodel.ShowListenerRequest{ + showListenerReq := &hwelbmodel.ShowListenerRequest{ ListenerId: cloudListenerId, } showListenerResp, err := d.sdkClient.ShowListener(showListenerReq) @@ -259,10 +258,10 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI // 更新监听器 // REF: https://support.huaweicloud.com/api-elb/UpdateListener.html - updateListenerReq := &hcelbmodel.UpdateListenerRequest{ + updateListenerReq := &hwelbmodel.UpdateListenerRequest{ ListenerId: cloudListenerId, - Body: &hcelbmodel.UpdateListenerRequestBody{ - Listener: &hcelbmodel.UpdateListenerOption{ + Body: &hwelbmodel.UpdateListenerRequestBody{ + Listener: &hwelbmodel.UpdateListenerOption{ DefaultTlsContainerRef: lo.ToPtr(cloudCertId), }, }, @@ -273,7 +272,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI sniCertIds := make([]string, 0) sniCertIds = append(sniCertIds, cloudCertId) - listOldCertificateReq := &hcelbmodel.ListCertificatesRequest{ + listOldCertificateReq := &hwelbmodel.ListCertificatesRequest{ Id: &showListenerResp.Listener.SniContainerRefs, } listOldCertificateResp, err := d.sdkClient.ListCertificates(listOldCertificateReq) @@ -282,7 +281,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI return fmt.Errorf("failed to execute sdk request 'elb.ListCertificates': %w", err) } - showNewCertificateReq := &hcelbmodel.ShowCertificateRequest{ + showNewCertificateReq := &hwelbmodel.ShowCertificateRequest{ CertificateId: cloudCertId, } showNewCertificateResp, err := d.sdkClient.ShowCertificate(showNewCertificateReq) @@ -323,7 +322,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI return nil } -func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.ElbClient, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwelb.ElbClient, error) { projectId, err := getSDKProjectId(accessKeyId, secretAccessKey, region) if err != nil { return nil, err @@ -338,12 +337,12 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Elb return nil, err } - hcRegion, err := hcelbregion.SafeValueOf(region) + hcRegion, err := hwelbregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hcelb.ElbClientBuilder(). + hcClient, err := hwelb.ElbClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -351,7 +350,7 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Elb return nil, err } - client := internal.NewElbClient(hcClient) + client := hwelb.NewElbClient(hcClient) return client, nil } @@ -368,12 +367,12 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - hcRegion, err := hciamregion.SafeValueOf(region) + hcRegion, err := hwiamregion.SafeValueOf(region) if err != nil { return "", err } - hcClient, err := hciam.IamClientBuilder(). + hcClient, err := hwiam.IamClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -381,9 +380,9 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - client := hciam.NewIamClient(hcClient) + client := hwiam.NewIamClient(hcClient) - request := &hciammodel.KeystoneListProjectsRequest{ + request := &hwiammodel.KeystoneListProjectsRequest{ Name: ®ion, } response, err := client.KeystoneListProjects(request) diff --git a/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live.go b/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live.go index de394f9bf..e06d3cd60 100644 --- a/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live.go +++ b/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live.go @@ -8,18 +8,17 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" - hciamModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" - hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" - hclive "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1" - hclivemodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/model" - hcliveregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/region" + hwiam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" + hwiamModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" + hwiamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" + hwlivemodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/model" + hwliveregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/region" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-live/internal" + hwlive "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -42,7 +41,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.LiveClient + sdkClient *hwlive.LiveClient sdkCertmgr certmgr.Provider } @@ -62,7 +61,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, @@ -160,7 +159,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { // 查询直播域名 // REF: https://support.huaweicloud.com/api-live/ShowDomain.html - showDomainReq := &hclivemodel.ShowDomainRequest{ + showDomainReq := &hwlivemodel.ShowDomainRequest{ EnterpriseProjectId: lo.EmptyableToPtr(d.config.EnterpriseProjectId), } showDomainResp, err := d.sdkClient.ShowDomain(showDomainReq) @@ -184,10 +183,10 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { func (d *Deployer) updateDomainsCertificate(ctx context.Context, domain string, cloudCertId string) error { // 修改指定域名的 HTTPS 证书配置 // REF: https://support.huaweicloud.com/api-live/UpdateDomainHttpsCert.html - updateDomainHttpsCertReq := &hclivemodel.UpdateDomainHttpsCertRequest{ + updateDomainHttpsCertReq := &hwlivemodel.UpdateDomainHttpsCertRequest{ Domain: domain, - Body: &hclivemodel.DomainHttpsCertInfo{ - TlsCertificate: &hclivemodel.TlsCertificateInfo{ + Body: &hwlivemodel.DomainHttpsCertInfo{ + TlsCertificate: &hwlivemodel.TlsCertificateInfo{ Source: lo.ToPtr("scm"), CertId: lo.ToPtr(cloudCertId), }, @@ -202,7 +201,7 @@ func (d *Deployer) updateDomainsCertificate(ctx context.Context, domain string, return nil } -func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.LiveClient, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwlive.LiveClient, error) { projectId, err := getSDKProjectId(accessKeyId, secretAccessKey, region) if err != nil { return nil, err @@ -217,12 +216,12 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Liv return nil, err } - hcRegion, err := hcliveregion.SafeValueOf(region) + hcRegion, err := hwliveregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hclive.LiveClientBuilder(). + hcClient, err := hwlive.LiveClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -230,7 +229,7 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Liv return nil, err } - client := internal.NewLiveClient(hcClient) + client := hwlive.NewLiveClient(hcClient) return client, nil } @@ -243,12 +242,12 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - hcRegion, err := hciamregion.SafeValueOf(region) + hcRegion, err := hwiamregion.SafeValueOf(region) if err != nil { return "", err } - hcClient, err := hciam.IamClientBuilder(). + hcClient, err := hwiam.IamClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -256,9 +255,9 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - client := hciam.NewIamClient(hcClient) + client := hwiam.NewIamClient(hcClient) - request := &hciamModel.KeystoneListProjectsRequest{ + request := &hwiamModel.KeystoneListProjectsRequest{ Name: ®ion, } response, err := client.KeystoneListProjects(request) diff --git a/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go b/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go index 155ad4ac4..0da3f8a04 100644 --- a/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -33,7 +33,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, diff --git a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go index e7b3142db..574af1292 100644 --- a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go @@ -9,18 +9,17 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" - hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" - hciamModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" - hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" - hcwaf "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" - hcwafmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" - hcwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" + hwiam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" + hwiamModel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" + hwiamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" + hwwafmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" + hwwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-waf" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-waf" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-waf/internal" + hwwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" ) type DeployerConfig struct { @@ -45,7 +44,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.WafClient + sdkClient *hwwaf.WafClient sdkCertmgr certmgr.Provider } @@ -61,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, @@ -129,7 +128,7 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM // 查询证书 // REF: https://support.huaweicloud.com/api-waf/ShowCertificate.html - showCertificateReq := &hcwafmodel.ShowCertificateRequest{ + showCertificateReq := &hwwafmodel.ShowCertificateRequest{ EnterpriseProjectId: lo.EmptyableToPtr(d.config.EnterpriseProjectId), CertificateId: d.config.CertificateId, } @@ -141,10 +140,10 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM // 更新证书 // REF: https://support.huaweicloud.com/api-waf/UpdateCertificate.html - updateCertificateReq := &hcwafmodel.UpdateCertificateRequest{ + updateCertificateReq := &hwwafmodel.UpdateCertificateRequest{ EnterpriseProjectId: lo.EmptyableToPtr(d.config.EnterpriseProjectId), CertificateId: d.config.CertificateId, - Body: &hcwafmodel.UpdateCertificateRequestBody{ + Body: &hwwafmodel.UpdateCertificateRequestBody{ Name: *showCertificateResp.Name, Content: lo.ToPtr(certPEM), Key: lo.ToPtr(privkeyPEM), @@ -184,7 +183,7 @@ func (d *Deployer) deployToCloudServer(ctx context.Context, certPEM, privkeyPEM default: } - listHostReq := &hcwafmodel.ListHostRequest{ + listHostReq := &hwwafmodel.ListHostRequest{ EnterpriseProjectId: lo.EmptyableToPtr(d.config.EnterpriseProjectId), Hostname: lo.ToPtr(strings.TrimPrefix(d.config.Domain, "*")), Page: lo.ToPtr(int32(listHostPage)), @@ -219,10 +218,10 @@ func (d *Deployer) deployToCloudServer(ctx context.Context, certPEM, privkeyPEM // 更新云模式防护域名的配置 // REF: https://support.huaweicloud.com/api-waf/UpdateHost.html - updateHostReq := &hcwafmodel.UpdateHostRequest{ + updateHostReq := &hwwafmodel.UpdateHostRequest{ EnterpriseProjectId: lo.EmptyableToPtr(d.config.EnterpriseProjectId), InstanceId: hostId, - Body: &hcwafmodel.UpdateHostRequestBody{ + Body: &hwwafmodel.UpdateHostRequestBody{ Certificateid: lo.ToPtr(upres.CertId), Certificatename: lo.ToPtr(upres.CertName), }, @@ -261,7 +260,7 @@ func (d *Deployer) deployToPremiumHost(ctx context.Context, certPEM, privkeyPEM default: } - listPremiumHostReq := &hcwafmodel.ListPremiumHostRequest{ + listPremiumHostReq := &hwwafmodel.ListPremiumHostRequest{ EnterpriseProjectId: lo.EmptyableToPtr(d.config.EnterpriseProjectId), Hostname: lo.ToPtr(strings.TrimPrefix(d.config.Domain, "*")), Page: lo.ToPtr(fmt.Sprintf("%d", listPremiumHostPage)), @@ -296,10 +295,10 @@ func (d *Deployer) deployToPremiumHost(ctx context.Context, certPEM, privkeyPEM // 修改独享模式域名配置 // REF: https://support.huaweicloud.com/api-waf/UpdatePremiumHost.html - updatePremiumHostReq := &hcwafmodel.UpdatePremiumHostRequest{ + updatePremiumHostReq := &hwwafmodel.UpdatePremiumHostRequest{ EnterpriseProjectId: lo.EmptyableToPtr(d.config.EnterpriseProjectId), HostId: hostId, - Body: &hcwafmodel.UpdatePremiumHostRequestBody{ + Body: &hwwafmodel.UpdatePremiumHostRequestBody{ Certificateid: lo.ToPtr(upres.CertId), Certificatename: lo.ToPtr(upres.CertName), }, @@ -313,7 +312,7 @@ func (d *Deployer) deployToPremiumHost(ctx context.Context, certPEM, privkeyPEM return nil } -func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.WafClient, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwwaf.WafClient, error) { projectId, err := getSDKProjectId(accessKeyId, secretAccessKey, region) if err != nil { return nil, err @@ -328,12 +327,12 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Waf return nil, err } - hcRegion, err := hcwafregion.SafeValueOf(region) + hcRegion, err := hwwafregion.SafeValueOf(region) if err != nil { return nil, err } - hcClient, err := hcwaf.WafClientBuilder(). + hcClient, err := hwwaf.WafClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -341,7 +340,7 @@ func createSDKClient(accessKeyId, secretAccessKey, region string) (*internal.Waf return nil, err } - client := internal.NewWafClient(hcClient) + client := hwwaf.NewWafClient(hcClient) return client, nil } @@ -354,12 +353,12 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - hcRegion, err := hciamregion.SafeValueOf(region) + hcRegion, err := hwiamregion.SafeValueOf(region) if err != nil { return "", err } - hcClient, err := hciam.IamClientBuilder(). + hcClient, err := hwiam.IamClientBuilder(). WithRegion(hcRegion). WithCredential(auth). SafeBuild() @@ -367,9 +366,9 @@ func getSDKProjectId(accessKeyId, secretAccessKey, region string) (string, error return "", err } - client := hciam.NewIamClient(hcClient) + client := hwiam.NewIamClient(hcClient) - request := &hciamModel.KeystoneListProjectsRequest{ + request := &hwiamModel.KeystoneListProjectsRequest{ Name: ®ion, } response, err := client.KeystoneListProjects(request) diff --git a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go index 39a97a6ae..e3ce7b17d 100644 --- a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go +++ b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go @@ -9,14 +9,14 @@ import ( jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" jdcommon "github.com/jdcloud-api/jdcloud-sdk-go/services/common/models" - jdlb "github.com/jdcloud-api/jdcloud-sdk-go/services/lb/apis" - jdlbmodel "github.com/jdcloud-api/jdcloud-sdk-go/services/lb/models" + jdlbapis "github.com/jdcloud-api/jdcloud-sdk-go/services/lb/apis" + jdlbmodels "github.com/jdcloud-api/jdcloud-sdk-go/services/lb/models" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-alb/internal" + jdlb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/lb/client" ) type DeployerConfig struct { @@ -42,7 +42,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.LbClient + sdkClient *jdlb.LbClient sdkCertmgr certmgr.Provider } @@ -58,7 +58,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -119,7 +119,7 @@ func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) // 查询负载均衡器详情 // REF: https://docs.jdcloud.com/cn/load-balancer/api/describeloadbalancer - describeLoadBalancerReq := jdlb.NewDescribeLoadBalancerRequestWithoutParam() + describeLoadBalancerReq := jdlbapis.NewDescribeLoadBalancerRequestWithoutParam() describeLoadBalancerReq.SetRegionId(d.config.RegionId) describeLoadBalancerReq.SetLoadBalancerId(d.config.LoadbalancerId) describeLoadBalancerResp, err := d.sdkClient.DescribeLoadBalancer(describeLoadBalancerReq) @@ -140,7 +140,7 @@ func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) default: } - describeListenersReq := jdlb.NewDescribeListenersRequestWithoutParam() + describeListenersReq := jdlbapis.NewDescribeListenersRequestWithoutParam() describeListenersReq.SetRegionId(d.config.RegionId) describeListenersReq.SetFilters([]jdcommon.Filter{{Name: "loadBalancerId", Values: []string{d.config.LoadbalancerId}}}) describeListenersReq.SetPageSize(describeListenersPageNumber) @@ -207,7 +207,7 @@ func (d *Deployer) deployToListener(ctx context.Context, cloudCertId string) err func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerId string, cloudCertId string) error { // 查询监听器详情 // REF: https://docs.jdcloud.com/cn/load-balancer/api/describelistener - describeListenerReq := jdlb.NewDescribeListenerRequestWithoutParam() + describeListenerReq := jdlbapis.NewDescribeListenerRequestWithoutParam() describeListenerReq.SetRegionId(d.config.RegionId) describeListenerReq.SetListenerId(cloudListenerId) describeListenerResp, err := d.sdkClient.DescribeListener(describeListenerReq) @@ -221,10 +221,10 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI // 修改监听器信息 // REF: https://docs.jdcloud.com/cn/load-balancer/api/updatelistener - updateListenerReq := jdlb.NewUpdateListenerRequestWithoutParam() + updateListenerReq := jdlbapis.NewUpdateListenerRequestWithoutParam() updateListenerReq.SetRegionId(d.config.RegionId) updateListenerReq.SetListenerId(cloudListenerId) - updateListenerReq.SetCertificateSpecs([]jdlbmodel.CertificateSpec{{CertificateId: cloudCertId}}) + updateListenerReq.SetCertificateSpecs([]jdlbmodels.CertificateSpec{{CertificateId: cloudCertId}}) updateListenerResp, err := d.sdkClient.UpdateListener(updateListenerReq) d.logger.Debug("sdk request 'lb.UpdateListener'", slog.Any("request", updateListenerReq), slog.Any("response", updateListenerResp)) if err != nil { @@ -233,7 +233,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI } else { // 指定 SNI，需部署到扩展证书 - extCertSpecs := lo.Filter(describeListenerResp.Result.Listener.ExtensionCertificateSpecs, func(extCertSpec jdlbmodel.ExtensionCertificateSpec, _ int) bool { + extCertSpecs := lo.Filter(describeListenerResp.Result.Listener.ExtensionCertificateSpecs, func(extCertSpec jdlbmodels.ExtensionCertificateSpec, _ int) bool { return extCertSpec.Domain == d.config.Domain }) if len(extCertSpecs) == 0 { @@ -242,11 +242,11 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI // 批量修改扩展证书 // REF: https://docs.jdcloud.com/cn/load-balancer/api/updatelistenercertificates - updateListenerCertificatesReq := jdlb.NewUpdateListenerCertificatesRequestWithoutParam() + updateListenerCertificatesReq := jdlbapis.NewUpdateListenerCertificatesRequestWithoutParam() updateListenerCertificatesReq.SetRegionId(d.config.RegionId) updateListenerCertificatesReq.SetListenerId(cloudListenerId) - updateListenerCertificatesReq.SetCertificates(lo.Map(extCertSpecs, func(extCertSpec jdlbmodel.ExtensionCertificateSpec, _ int) jdlbmodel.ExtCertificateUpdateSpec { - return jdlbmodel.ExtCertificateUpdateSpec{ + updateListenerCertificatesReq.SetCertificates(lo.Map(extCertSpecs, func(extCertSpec jdlbmodels.ExtensionCertificateSpec, _ int) jdlbmodels.ExtCertificateUpdateSpec { + return jdlbmodels.ExtCertificateUpdateSpec{ CertificateBindId: extCertSpec.CertificateBindId, CertificateId: &cloudCertId, Domain: &extCertSpec.Domain, @@ -262,8 +262,9 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI return nil } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.LbClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*jdlb.LbClient, error) { clientCredentials := jdcore.NewCredentials(accessKeyId, accessKeySecret) - client := internal.NewLbClient(clientCredentials) + client := jdlb.NewLbClient(clientCredentials) + client.DisableLogger() return client, nil } diff --git a/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go b/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go index 625171c4a..882bdee56 100644 --- a/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go +++ b/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go @@ -8,13 +8,13 @@ import ( "strings" jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" - jdcdn "github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/apis" + jdcdnapis "github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/apis" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-cdn/internal" + jdcdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -33,7 +33,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.CdnClient + sdkClient *jdcdn.CdnClient sdkCertmgr certmgr.Provider } @@ -49,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -178,7 +178,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { default: } - getDomainListReq := jdcdn.NewGetDomainListRequestWithoutParam() + getDomainListReq := jdcdnapis.NewGetDomainListRequestWithoutParam() getDomainListReq.SetPageNumber(getDomainListPageNumber) getDomainListReq.SetPageSize(getDomainListPageSize) getDomainListResp, err := d.sdkClient.GetDomainList(getDomainListReq) @@ -209,7 +209,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, cloudCertId string) error { // 查询域名配置信息 // REF: https://docs.jdcloud.com/cn/cdn/api/querydomainconfig - queryDomainConfigReq := jdcdn.NewQueryDomainConfigRequestWithoutParam() + queryDomainConfigReq := jdcdnapis.NewQueryDomainConfigRequestWithoutParam() queryDomainConfigReq.SetDomain(domain) queryDomainConfigResp, err := d.sdkClient.QueryDomainConfig(queryDomainConfigReq) d.logger.Debug("sdk request 'cdn.QueryDomainConfig'", slog.Any("request", queryDomainConfigReq), slog.Any("response", queryDomainConfigResp)) @@ -219,7 +219,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c // 设置通讯协议 // REF: https://docs.jdcloud.com/cn/cdn/api/sethttptype - setHttpTypeReq := jdcdn.NewSetHttpTypeRequestWithoutParam() + setHttpTypeReq := jdcdnapis.NewSetHttpTypeRequestWithoutParam() setHttpTypeReq.SetDomain(domain) setHttpTypeReq.SetHttpType("https") setHttpTypeReq.SetCertFrom("ssl") @@ -234,8 +234,9 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.CdnClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*jdcdn.CdnClient, error) { clientCredentials := jdcore.NewCredentials(accessKeyId, accessKeySecret) - client := internal.NewCdnClient(clientCredentials) + client := jdcdn.NewCdnClient(clientCredentials) + client.DisableLogger() return client, nil } diff --git a/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go b/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go index 459406549..616524dca 100644 --- a/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go +++ b/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go @@ -7,11 +7,11 @@ import ( "log/slog" jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" - jdlive "github.com/jdcloud-api/jdcloud-sdk-go/services/live/apis" + jdliveapis "github.com/jdcloud-api/jdcloud-sdk-go/services/live/apis" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-live/internal" + jdlive "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/live/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -30,7 +30,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.LiveClient + sdkClient *jdlive.LiveClient } var _ deployer.Provider = (*Deployer)(nil) @@ -132,7 +132,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { default: } - describeLiveDomainsReq := jdlive.NewDescribeLiveDomainsRequestWithoutParam() + describeLiveDomainsReq := jdliveapis.NewDescribeLiveDomainsRequestWithoutParam() describeLiveDomainsReq.SetPageNum(describeLiveDomainsPageNumber) describeLiveDomainsReq.SetPageSize(describeLiveDomainsPageSize) describeLiveDomainsResp, err := d.sdkClient.DescribeLiveDomains(describeLiveDomainsReq) @@ -165,7 +165,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, certPEM, privkeyPEM string) error { // 设置直播证书 // REF: https://docs.jdcloud.com/cn/live-video/api/setlivedomaincertificate - setLiveDomainCertificateReq := jdlive.NewSetLiveDomainCertificateRequestWithoutParam() + setLiveDomainCertificateReq := jdliveapis.NewSetLiveDomainCertificateRequestWithoutParam() setLiveDomainCertificateReq.SetPlayDomain(domain) setLiveDomainCertificateReq.SetCertStatus("on") setLiveDomainCertificateReq.SetCert(certPEM) @@ -179,8 +179,9 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.LiveClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*jdlive.LiveClient, error) { clientCredentials := jdcore.NewCredentials(accessKeyId, accessKeySecret) - client := internal.NewLiveClient(clientCredentials) + client := jdlive.NewLiveClient(clientCredentials) + client.DisableLogger() return client, nil } diff --git a/pkg/core/deployer/providers/jdcloud-ssl/jdcloud_ssl.go b/pkg/core/deployer/providers/jdcloud-ssl/jdcloud_ssl.go index 67fad91ad..3f2d53e22 100644 --- a/pkg/core/deployer/providers/jdcloud-ssl/jdcloud_ssl.go +++ b/pkg/core/deployer/providers/jdcloud-ssl/jdcloud_ssl.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -31,7 +31,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) diff --git a/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go b/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go index 9283d0a85..892152134 100644 --- a/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go +++ b/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go @@ -9,11 +9,11 @@ import ( "time" jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" - jdvod "github.com/jdcloud-api/jdcloud-sdk-go/services/vod/apis" + jdvodapis "github.com/jdcloud-api/jdcloud-sdk-go/services/vod/apis" "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-vod/internal" + jdvod "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/vod/client" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -32,7 +32,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.VodClient + sdkClient *jdvod.VodClient } var _ deployer.Provider = (*Deployer)(nil) @@ -134,7 +134,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { default: } - listDomainsReq := jdvod.NewListDomainsRequestWithoutParam() + listDomainsReq := jdvodapis.NewListDomainsRequestWithoutParam() listDomainsReq.SetPageNumber(listDomainsPageNumber) listDomainsReq.SetPageSize(listDomainsPageSize) listDomainsResp, err := d.sdkClient.ListDomains(listDomainsReq) @@ -171,7 +171,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c // 查询域名 SSL 配置 // REF: https://docs.jdcloud.com/cn/video-on-demand/api/gethttpssl - getHttpSslReq := jdvod.NewGetHttpSslRequestWithoutParam() + getHttpSslReq := jdvodapis.NewGetHttpSslRequestWithoutParam() getHttpSslReq.SetDomainId(domainId) getHttpSslResp, err := d.sdkClient.GetHttpSsl(getHttpSslReq) d.logger.Debug("sdk request 'vod.GetHttpSsl'", slog.Any("request", getHttpSslReq), slog.Any("response", getHttpSslResp)) @@ -181,7 +181,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c // 设置域名 SSL 配置 // REF: https://docs.jdcloud.com/cn/video-on-demand/api/sethttpssl - setHttpSslReq := jdvod.NewSetHttpSslRequestWithoutParam() + setHttpSslReq := jdvodapis.NewSetHttpSslRequestWithoutParam() setHttpSslReq.SetDomainId(domainId) setHttpSslReq.SetTitle(fmt.Sprintf("certimate-%d", time.Now().UnixMilli())) setHttpSslReq.SetSslCert(certPEM) @@ -210,7 +210,7 @@ func (d *Deployer) findDomainIdByDomain(ctx context.Context, domain string) (int default: } - listDomainsReq := jdvod.NewListDomainsRequestWithoutParam() + listDomainsReq := jdvodapis.NewListDomainsRequestWithoutParam() listDomainsReq.SetPageNumber(listDomainsPageNumber) listDomainsReq.SetPageSize(listDomainsPageSize) listDomainsResp, err := d.sdkClient.ListDomains(listDomainsReq) @@ -236,8 +236,9 @@ func (d *Deployer) findDomainIdByDomain(ctx context.Context, domain string) (int return 0, fmt.Errorf("could not find domain '%s'", domain) } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.VodClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*jdvod.VodClient, error) { clientCredentials := jdcore.NewCredentials(accessKeyId, accessKeySecret) - client := internal.NewVodClient(clientCredentials) + client := jdvod.NewVodClient(clientCredentials) + client.DisableLogger() return client, nil } diff --git a/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf.go b/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf.go index 7595d5420..4986cb2ee 100644 --- a/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf.go +++ b/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf.go @@ -7,13 +7,13 @@ import ( "log/slog" jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" - jdwaf "github.com/jdcloud-api/jdcloud-sdk-go/services/waf/apis" - jdwafmodel "github.com/jdcloud-api/jdcloud-sdk-go/services/waf/models" + jdwafapis "github.com/jdcloud-api/jdcloud-sdk-go/services/waf/apis" + jdwafmodels "github.com/jdcloud-api/jdcloud-sdk-go/services/waf/models" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-waf/internal" + jdwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/waf/client" ) type DeployerConfig struct { @@ -32,7 +32,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.WafClient + sdkClient *jdwaf.WafClient sdkCertmgr certmgr.Provider } @@ -48,7 +48,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -85,10 +85,10 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep // 绑定证书 // REF: https://docs.jdcloud.com/cn/web-application-firewall/api/bindcert - bindCertReq := jdwaf.NewBindCertRequestWithoutParam() + bindCertReq := jdwafapis.NewBindCertRequestWithoutParam() bindCertReq.SetRegionId(d.config.RegionId) bindCertReq.SetWafInstanceId(d.config.InstanceId) - bindCertReq.SetReq(&jdwafmodel.AssignCertReq{ + bindCertReq.SetReq(&jdwafmodels.AssignCertReq{ WafInstanceId: d.config.InstanceId, Domain: d.config.Domain, CertId: upres.CertId, @@ -102,8 +102,9 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return &deployer.DeployResult{}, nil } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.WafClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*jdwaf.WafClient, error) { clientCredentials := jdcore.NewCredentials(accessKeyId, accessKeySecret) - client := internal.NewWafClient(clientCredentials) + client := jdwaf.NewWafClient(clientCredentials) + client.DisableLogger() return client, nil } diff --git a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go index ec0db34f4..3ec4d0780 100644 --- a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go +++ b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go @@ -12,7 +12,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/nginxproxymanager" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/nginxproxymanager" "github.com/certimate-go/certimate/pkg/core/deployer" npmsdk "github.com/certimate-go/certimate/pkg/sdk3rd/nginxproxymanager" xcert "github.com/certimate-go/certimate/pkg/utils/cert" @@ -69,7 +69,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ ServerUrl: config.ServerUrl, AuthMethod: config.AuthMethod, Username: config.Username, @@ -200,9 +200,8 @@ func (d *Deployer) deployToHost(ctx context.Context, certPEM, privkeyPEM string) default: if err := d.updateHostCertificate(ctx, d.config.HostType, hostId, certId); err != nil { errs = append(errs, err) - } - if i < len(hostIds)-1 { - xwait.DelayWithContext(ctx, time.Second*5) + } else if i < len(hostIds)-1 { + xwait.DelayWithContext(ctx, 5*time.Second) } } } diff --git a/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go b/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go index b692e37b9..e1d6bb6e1 100644 --- a/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go +++ b/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go @@ -11,7 +11,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" "github.com/certimate-go/certimate/pkg/core/deployer" qiniusdk "github.com/certimate-go/certimate/pkg/sdk3rd/qiniu" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" @@ -45,7 +45,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client := qiniusdk.NewCdnManager(auth.New(config.AccessKey, config.SecretKey)) - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKey: config.AccessKey, SecretKey: config.SecretKey, }) diff --git a/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go b/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go index 6ed88090b..131abd51f 100644 --- a/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go +++ b/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go @@ -9,7 +9,7 @@ import ( "github.com/qiniu/go-sdk/v7/auth" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" "github.com/certimate-go/certimate/pkg/core/deployer" qiniusdk "github.com/certimate-go/certimate/pkg/sdk3rd/qiniu" ) @@ -41,7 +41,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client := qiniusdk.NewKodoManager(auth.New(config.AccessKey, config.SecretKey)) - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKey: config.AccessKey, SecretKey: config.SecretKey, }) diff --git a/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go b/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go index 64a81081f..6a8b4dec1 100644 --- a/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go +++ b/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go @@ -10,7 +10,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" "github.com/certimate-go/certimate/pkg/core/deployer" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -45,7 +45,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { manager := pili.NewManager(pili.ManagerConfig{AccessKey: config.AccessKey, SecretKey: config.SecretKey}) - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKey: config.AccessKey, SecretKey: config.SecretKey, }) diff --git a/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go b/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go index cd252380d..7a6c0e431 100644 --- a/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go +++ b/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go @@ -8,7 +8,7 @@ import ( "strconv" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/rainyun-sslcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/rainyun-sslcenter" "github.com/certimate-go/certimate/pkg/core/deployer" rainyunsdk "github.com/certimate-go/certimate/pkg/sdk3rd/rainyun" ) @@ -44,7 +44,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ ApiKey: config.ApiKey, }) if err != nil { diff --git a/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go b/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go index 9b4152f8c..edbb9260f 100644 --- a/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go +++ b/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go @@ -8,7 +8,7 @@ import ( "strconv" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/rainyun-sslcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/rainyun-sslcenter" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -33,7 +33,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ ApiKey: config.ApiKey, }) if err != nil { diff --git a/pkg/core/deployer/providers/s3/s3_test.go b/pkg/core/deployer/providers/s3/s3_test.go new file mode 100644 index 000000000..51c7db077 --- /dev/null +++ b/pkg/core/deployer/providers/s3/s3_test.go @@ -0,0 +1,94 @@ +package s3_test + +import ( + "context" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/deployer/providers/s3" +) + +var ( + fInputCertPath string + fInputKeyPath string + fSshHost string + fAccessKey string + fSecretKey string + fRegion string + fBucket string + fOutputCertPath string + fOutputKeyPath string +) + +func init() { + argsPrefix := "S3_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fSshHost, argsPrefix+"ENDPOINT", "", "") + flag.StringVar(&fAccessKey, argsPrefix+"ACCESSKEY", "", "") + flag.StringVar(&fSecretKey, argsPrefix+"SECRETKEY", "", "") + flag.StringVar(&fRegion, argsPrefix+"REGION", "", "") + flag.StringVar(&fBucket, argsPrefix+"BUCKET", "", "") + flag.StringVar(&fOutputCertPath, argsPrefix+"OUTPUTCERTPATH", "", "") + flag.StringVar(&fOutputKeyPath, argsPrefix+"OUTPUTKEYPATH", "", "") +} + +/* +Shell command to run this test: + + go test -v ./s3_test.go -args \ + --S3_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --S3_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --S3_ENDPOINT="http://endpoint" \ + --S3_ACCESSKEY="your-access-key" \ + --S3_SECRETKEY="your-secret-key" \ + --S3_REGION="your-region" \ + --S3_BUCKET="your-bucket" \ + --S3_OUTPUTCERTPATH="/path/to/your-output-cert.pem" \ + --S3_OUTPUTKEYPATH="/path/to/your-output-key.pem" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("ENDPOINT: %v", fSshHost), + fmt.Sprintf("ACCESSKEY: %v", fAccessKey), + fmt.Sprintf("SECRETKEY: %v", fSecretKey), + fmt.Sprintf("REGION: %v", fRegion), + fmt.Sprintf("BUCKET: %v", fBucket), + fmt.Sprintf("OUTPUTCERTPATH: %v", fOutputCertPath), + fmt.Sprintf("OUTPUTKEYPATH: %v", fOutputKeyPath), + }, "\n")) + + provider, err := provider.NewDeployer(&provider.DeployerConfig{ + Endpoint: fSshHost, + AccessKey: fAccessKey, + SecretKey: fSecretKey, + Region: fRegion, + Bucket: fBucket, + OutputFormat: provider.OUTPUT_FORMAT_PEM, + OutputCertObjectKey: fOutputCertPath, + OutputKeyObjectKey: fOutputKeyPath, + }) + if err != nil { + t.Errorf("err: %+v", err) + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := provider.Deploy(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + } + + t.Logf("ok: %v", res) + }) +} diff --git a/pkg/core/deployer/providers/tencentcloud-cdn/internal/client.go b/pkg/core/deployer/providers/tencentcloud-cdn/internal/client.go deleted file mode 100644 index 5affa966b..000000000 --- a/pkg/core/deployer/providers/tencentcloud-cdn/internal/client.go +++ /dev/null @@ -1,104 +0,0 @@ -package internal - -import ( - "context" - "errors" - - tccdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/cdn/v20180606/client.go -// to lightweight the vendor packages in the built binary. -type CdnClient struct { - common.Client -} - -func NewCdnClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *CdnClient, err error) { - client = &CdnClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *CdnClient) DescribeCertDomains(request *tccdn.DescribeCertDomainsRequest) (response *tccdn.DescribeCertDomainsResponse, err error) { - return c.DescribeCertDomainsWithContext(context.Background(), request) -} - -func (c *CdnClient) DescribeCertDomainsWithContext(ctx context.Context, request *tccdn.DescribeCertDomainsRequest) (response *tccdn.DescribeCertDomainsResponse, err error) { - if request == nil { - request = tccdn.NewDescribeCertDomainsRequest() - } - c.InitBaseRequest(&request.BaseRequest, "cdn", tccdn.APIVersion, "DescribeCertDomains") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeCertDomains require credential") - } - - request.SetContext(ctx) - response = tccdn.NewDescribeCertDomainsResponse() - err = c.Send(request, response) - return -} - -func (c *CdnClient) DescribeDomains(request *tccdn.DescribeDomainsRequest) (response *tccdn.DescribeDomainsResponse, err error) { - return c.DescribeDomainsWithContext(context.Background(), request) -} - -func (c *CdnClient) DescribeDomainsWithContext(ctx context.Context, request *tccdn.DescribeDomainsRequest) (response *tccdn.DescribeDomainsResponse, err error) { - if request == nil { - request = tccdn.NewDescribeDomainsRequest() - } - c.InitBaseRequest(&request.BaseRequest, "cdn", tccdn.APIVersion, "DescribeDomains") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeDomains require credential") - } - - request.SetContext(ctx) - response = tccdn.NewDescribeDomainsResponse() - err = c.Send(request, response) - return -} - -func (c *CdnClient) DescribeDomainsConfig(request *tccdn.DescribeDomainsConfigRequest) (response *tccdn.DescribeDomainsConfigResponse, err error) { - return c.DescribeDomainsConfigWithContext(context.Background(), request) -} - -func (c *CdnClient) DescribeDomainsConfigWithContext(ctx context.Context, request *tccdn.DescribeDomainsConfigRequest) (response *tccdn.DescribeDomainsConfigResponse, err error) { - if request == nil { - request = tccdn.NewDescribeDomainsConfigRequest() - } - c.InitBaseRequest(&request.BaseRequest, "cdn", tccdn.APIVersion, "DescribeDomainsConfig") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeDomainsConfig require credential") - } - - request.SetContext(ctx) - response = tccdn.NewDescribeDomainsConfigResponse() - err = c.Send(request, response) - return -} - -func (c *CdnClient) UpdateDomainConfig(request *tccdn.UpdateDomainConfigRequest) (response *tccdn.UpdateDomainConfigResponse, err error) { - return c.UpdateDomainConfigWithContext(context.Background(), request) -} - -func (c *CdnClient) UpdateDomainConfigWithContext(ctx context.Context, request *tccdn.UpdateDomainConfigRequest) (response *tccdn.UpdateDomainConfigResponse, err error) { - if request == nil { - request = tccdn.NewUpdateDomainConfigRequest() - } - c.InitBaseRequest(&request.BaseRequest, "cdn", tccdn.APIVersion, "UpdateDomainConfig") - - if c.GetCredential() == nil { - return nil, errors.New("UpdateDomainConfig require credential") - } - - request.SetContext(ctx) - response = tccdn.NewUpdateDomainConfigResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go b/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go index 6e4e85ce9..be8afbaeb 100644 --- a/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go +++ b/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go @@ -8,14 +8,13 @@ import ( "strings" "github.com/samber/lo" - tccdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-cdn/internal" + tccdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -36,7 +35,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.CdnClient + sdkClient *tccdn.Client sdkCertmgr certmgr.Provider } @@ -52,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: lo. @@ -184,7 +183,7 @@ func (d *Deployer) getMatchedDomainsByWildcard(ctx context.Context, wildcardDoma } describeDomainsReq.Offset = common.Int64Ptr(int64(describeDomainsOffset)) describeDomainsReq.Limit = common.Int64Ptr(int64(describeDomainsLimit)) - describeDomainsResp, err := d.sdkClient.DescribeDomains(describeDomainsReq) + describeDomainsResp, err := d.sdkClient.DescribeDomainsWithContext(ctx, describeDomainsReq) d.logger.Debug("sdk request 'cdn.DescribeDomains'", slog.Any("request", describeDomainsReq), slog.Any("response", describeDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeDomains': %w", err) @@ -216,7 +215,7 @@ func (d *Deployer) getMatchedDomainsByCertId(ctx context.Context, cloudCertId st describeCertDomainsReq := tccdn.NewDescribeCertDomainsRequest() describeCertDomainsReq.CertId = common.StringPtr(cloudCertId) describeCertDomainsReq.Product = common.StringPtr("cdn") - describeCertDomainsResp, err := d.sdkClient.DescribeCertDomains(describeCertDomainsReq) + describeCertDomainsResp, err := d.sdkClient.DescribeCertDomainsWithContext(ctx, describeCertDomainsReq) d.logger.Debug("sdk request 'cdn.DescribeCertDomains'", slog.Any("request", describeCertDomainsReq), slog.Any("response", describeCertDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeCertDomains': %w", err) @@ -244,7 +243,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c } describeDomainsConfigReq.Offset = common.Int64Ptr(0) describeDomainsConfigReq.Limit = common.Int64Ptr(1) - describeDomainsConfigResp, err := d.sdkClient.DescribeDomainsConfig(describeDomainsConfigReq) + describeDomainsConfigResp, err := d.sdkClient.DescribeDomainsConfigWithContext(ctx, describeDomainsConfigReq) d.logger.Debug("sdk request 'cdn.DescribeDomainsConfig'", slog.Any("request", describeDomainsConfigReq), slog.Any("response", describeDomainsConfigResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'cdn.DescribeDomainsConfig': %w", err) @@ -274,7 +273,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c updateDomainConfigReq.Https.CertInfo = &tccdn.ServerCert{ CertId: common.StringPtr(cloudCertId), } - updateDomainConfigResp, err := d.sdkClient.UpdateDomainConfig(updateDomainConfigReq) + updateDomainConfigResp, err := d.sdkClient.UpdateDomainConfigWithContext(ctx, updateDomainConfigReq) d.logger.Debug("sdk request 'cdn.UpdateDomainConfig'", slog.Any("request", updateDomainConfigReq), slog.Any("response", updateDomainConfigResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'cdn.UpdateDomainConfig': %w", err) @@ -283,7 +282,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(secretId, secretKey, endpoint string) (*internal.CdnClient, error) { +func createSDKClient(secretId, secretKey, endpoint string) (*tccdn.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -291,7 +290,7 @@ func createSDKClient(secretId, secretKey, endpoint string) (*internal.CdnClient, cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewCdnClient(credential, "", cpf) + client, err := tccdn.NewClient(credential, "", cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-clb/internal/client.go b/pkg/core/deployer/providers/tencentcloud-clb/internal/client.go deleted file mode 100644 index d213450a3..000000000 --- a/pkg/core/deployer/providers/tencentcloud-clb/internal/client.go +++ /dev/null @@ -1,104 +0,0 @@ -package internal - -import ( - "context" - "errors" - - tcclb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/clb/v20180317/client.go -// to lightweight the vendor packages in the built binary. -type ClbClient struct { - common.Client -} - -func NewClbClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *ClbClient, err error) { - client = &ClbClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *ClbClient) DescribeListeners(request *tcclb.DescribeListenersRequest) (response *tcclb.DescribeListenersResponse, err error) { - return c.DescribeListenersWithContext(context.Background(), request) -} - -func (c *ClbClient) DescribeListenersWithContext(ctx context.Context, request *tcclb.DescribeListenersRequest) (response *tcclb.DescribeListenersResponse, err error) { - if request == nil { - request = tcclb.NewDescribeListenersRequest() - } - c.InitBaseRequest(&request.BaseRequest, "clb", tcclb.APIVersion, "DescribeListeners") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeListeners require credential") - } - - request.SetContext(ctx) - response = tcclb.NewDescribeListenersResponse() - err = c.Send(request, response) - return -} - -func (c *ClbClient) DescribeTaskStatus(request *tcclb.DescribeTaskStatusRequest) (response *tcclb.DescribeTaskStatusResponse, err error) { - return c.DescribeTaskStatusWithContext(context.Background(), request) -} - -func (c *ClbClient) DescribeTaskStatusWithContext(ctx context.Context, request *tcclb.DescribeTaskStatusRequest) (response *tcclb.DescribeTaskStatusResponse, err error) { - if request == nil { - request = tcclb.NewDescribeTaskStatusRequest() - } - c.InitBaseRequest(&request.BaseRequest, "clb", tcclb.APIVersion, "DescribeTaskStatus") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeTaskStatus require credential") - } - - request.SetContext(ctx) - response = tcclb.NewDescribeTaskStatusResponse() - err = c.Send(request, response) - return -} - -func (c *ClbClient) ModifyDomainAttributes(request *tcclb.ModifyDomainAttributesRequest) (response *tcclb.ModifyDomainAttributesResponse, err error) { - return c.ModifyDomainAttributesWithContext(context.Background(), request) -} - -func (c *ClbClient) ModifyDomainAttributesWithContext(ctx context.Context, request *tcclb.ModifyDomainAttributesRequest) (response *tcclb.ModifyDomainAttributesResponse, err error) { - if request == nil { - request = tcclb.NewModifyDomainAttributesRequest() - } - c.InitBaseRequest(&request.BaseRequest, "clb", tcclb.APIVersion, "ModifyDomainAttributes") - - if c.GetCredential() == nil { - return nil, errors.New("ModifyDomainAttributes require credential") - } - - request.SetContext(ctx) - response = tcclb.NewModifyDomainAttributesResponse() - err = c.Send(request, response) - return -} - -func (c *ClbClient) ModifyListener(request *tcclb.ModifyListenerRequest) (response *tcclb.ModifyListenerResponse, err error) { - return c.ModifyListenerWithContext(context.Background(), request) -} - -func (c *ClbClient) ModifyListenerWithContext(ctx context.Context, request *tcclb.ModifyListenerRequest) (response *tcclb.ModifyListenerResponse, err error) { - if request == nil { - request = tcclb.NewModifyListenerRequest() - } - c.InitBaseRequest(&request.BaseRequest, "clb", tcclb.APIVersion, "ModifyListener") - - if c.GetCredential() == nil { - return nil, errors.New("ModifyListener require credential") - } - - request.SetContext(ctx) - response = tcclb.NewModifyListenerResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go index 3c2d09fa9..8004399fa 100644 --- a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go +++ b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go @@ -9,14 +9,13 @@ import ( "time" "github.com/samber/lo" - tcclb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-clb/internal" + tcclb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) @@ -45,7 +44,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.ClbClient + sdkClient *tcclb.Client sdkCertmgr certmgr.Provider } @@ -61,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: lo. @@ -133,7 +132,7 @@ func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) listenerIds := make([]string, 0) describeListenersReq := tcclb.NewDescribeListenersRequest() describeListenersReq.LoadBalancerId = common.StringPtr(d.config.LoadbalancerId) - describeListenersResp, err := d.sdkClient.DescribeListeners(describeListenersReq) + describeListenersResp, err := d.sdkClient.DescribeListenersWithContext(ctx, describeListenersReq) d.logger.Debug("sdk request 'clb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'clb.DescribeListeners': %w", err) @@ -212,7 +211,7 @@ func (d *Deployer) deployToRuleDomain(ctx context.Context, cloudCertId string) e SSLMode: common.StringPtr("UNIDIRECTIONAL"), CertId: common.StringPtr(cloudCertId), } - modifyDomainAttributesResp, err := d.sdkClient.ModifyDomainAttributes(modifyDomainAttributesReq) + modifyDomainAttributesResp, err := d.sdkClient.ModifyDomainAttributesWithContext(ctx, modifyDomainAttributesReq) d.logger.Debug("sdk request 'clb.ModifyDomainAttributes'", slog.Any("request", modifyDomainAttributesReq), slog.Any("response", modifyDomainAttributesResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'clb.ModifyDomainAttributes': %w", err) @@ -223,7 +222,7 @@ func (d *Deployer) deployToRuleDomain(ctx context.Context, cloudCertId string) e if _, err := xwait.UntilWithContext(ctx, func(_ context.Context, _ int) (bool, error) { describeTaskStatusReq := tcclb.NewDescribeTaskStatusRequest() describeTaskStatusReq.TaskId = modifyDomainAttributesResp.Response.RequestId - describeTaskStatusResp, err := d.sdkClient.DescribeTaskStatus(describeTaskStatusReq) + describeTaskStatusResp, err := d.sdkClient.DescribeTaskStatusWithContext(ctx, describeTaskStatusReq) d.logger.Debug("sdk request 'clb.DescribeTaskStatus'", slog.Any("request", describeTaskStatusReq), slog.Any("response", describeTaskStatusResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'clb.DescribeTaskStatus': %w", err) @@ -238,7 +237,7 @@ func (d *Deployer) deployToRuleDomain(ctx context.Context, cloudCertId string) e d.logger.Info("waiting for tencentcloud task completion ...") return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return err } @@ -251,7 +250,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudLoadbalan describeListenersReq := tcclb.NewDescribeListenersRequest() describeListenersReq.LoadBalancerId = common.StringPtr(cloudLoadbalancerId) describeListenersReq.ListenerIds = common.StringPtrs([]string{cloudListenerId}) - describeListenersResp, err := d.sdkClient.DescribeListeners(describeListenersReq) + describeListenersResp, err := d.sdkClient.DescribeListenersWithContext(ctx, describeListenersReq) d.logger.Debug("sdk request 'clb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'clb.DescribeListeners': %w", err) @@ -271,7 +270,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudLoadbalan } else { modifyListenerReq.Certificate.SSLMode = common.StringPtr("UNIDIRECTIONAL") } - modifyListenerResp, err := d.sdkClient.ModifyListener(modifyListenerReq) + modifyListenerResp, err := d.sdkClient.ModifyListenerWithContext(ctx, modifyListenerReq) d.logger.Debug("sdk request 'clb.ModifyListener'", slog.Any("request", modifyListenerReq), slog.Any("response", modifyListenerResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'clb.ModifyListener': %w", err) @@ -282,7 +281,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudLoadbalan if _, err := xwait.UntilWithContext(ctx, func(_ context.Context, _ int) (bool, error) { describeTaskStatusReq := tcclb.NewDescribeTaskStatusRequest() describeTaskStatusReq.TaskId = modifyListenerResp.Response.RequestId - describeTaskStatusResp, err := d.sdkClient.DescribeTaskStatus(describeTaskStatusReq) + describeTaskStatusResp, err := d.sdkClient.DescribeTaskStatusWithContext(ctx, describeTaskStatusReq) d.logger.Debug("sdk request 'clb.DescribeTaskStatus'", slog.Any("request", describeTaskStatusReq), slog.Any("response", describeTaskStatusResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'clb.DescribeTaskStatus': %w", err) @@ -297,14 +296,14 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudLoadbalan d.logger.Info("waiting for tencentcloud task completion ...") return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return err } return nil } -func createSDKClient(secretId, secretKey, endpoint, region string) (*internal.ClbClient, error) { +func createSDKClient(secretId, secretKey, endpoint, region string) (*tcclb.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -312,7 +311,7 @@ func createSDKClient(secretId, secretKey, endpoint, region string) (*internal.Cl cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewClbClient(credential, region, cpf) + client, err := tcclb.NewClient(credential, region, cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-cos/internal/client.go b/pkg/core/deployer/providers/tencentcloud-cos/internal/client.go deleted file mode 100644 index 5a0ba7e8a..000000000 --- a/pkg/core/deployer/providers/tencentcloud-cos/internal/client.go +++ /dev/null @@ -1,84 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/ssl/v20191205/client.go -// to lightweight the vendor packages in the built binary. -type SslClient struct { - common.Client -} - -func NewSslClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *SslClient, err error) { - client = &SslClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *SslClient) DescribeHostCosInstanceList(request *tcssl.DescribeHostCosInstanceListRequest) (response *tcssl.DescribeHostCosInstanceListResponse, err error) { - return c.DescribeHostCosInstanceListWithContext(context.Background(), request) -} - -func (c *SslClient) DescribeHostCosInstanceListWithContext(ctx context.Context, request *tcssl.DescribeHostCosInstanceListRequest) (response *tcssl.DescribeHostCosInstanceListResponse, err error) { - if request == nil { - request = tcssl.NewDescribeHostCosInstanceListRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "DescribeHostCosInstanceList") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeHostCosInstanceList require credential") - } - - request.SetContext(ctx) - response = tcssl.NewDescribeHostCosInstanceListResponse() - err = c.Send(request, response) - return -} - -func (c *SslClient) DescribeHostDeployRecordDetail(request *tcssl.DescribeHostDeployRecordDetailRequest) (response *tcssl.DescribeHostDeployRecordDetailResponse, err error) { - return c.DescribeHostDeployRecordDetailWithContext(context.Background(), request) -} - -func (c *SslClient) DescribeHostDeployRecordDetailWithContext(ctx context.Context, request *tcssl.DescribeHostDeployRecordDetailRequest) (response *tcssl.DescribeHostDeployRecordDetailResponse, err error) { - if request == nil { - request = tcssl.NewDescribeHostDeployRecordDetailRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "DescribeHostDeployRecordDetail") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeHostDeployRecordDetail require credential") - } - - request.SetContext(ctx) - response = tcssl.NewDescribeHostDeployRecordDetailResponse() - err = c.Send(request, response) - return -} - -func (c *SslClient) DeployCertificateInstance(request *tcssl.DeployCertificateInstanceRequest) (response *tcssl.DeployCertificateInstanceResponse, err error) { - return c.DeployCertificateInstanceWithContext(context.Background(), request) -} - -func (c *SslClient) DeployCertificateInstanceWithContext(ctx context.Context, request *tcssl.DeployCertificateInstanceRequest) (response *tcssl.DeployCertificateInstanceResponse, err error) { - if request == nil { - request = tcssl.NewDeployCertificateInstanceRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "DeployCertificateInstance") - - if c.GetCredential() == nil { - return nil, errors.New("DeployCertificateInstance require credential") - } - - request.SetContext(ctx) - response = tcssl.NewDeployCertificateInstanceResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go b/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go index c5833b6e3..f697f6c22 100644 --- a/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go +++ b/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go @@ -10,12 +10,11 @@ import ( "github.com/samber/lo" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-cos/internal" + tcssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) @@ -42,7 +41,7 @@ type Deployer struct { var _ deployer.Provider = (*Deployer)(nil) type wSDKClients struct { - SSL *internal.SslClient + SSL *tcssl.Client } func NewDeployer(config *DeployerConfig) (*Deployer, error) { @@ -55,7 +54,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, }) @@ -110,7 +109,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep deployCertificateInstanceReq.ResourceType = common.StringPtr("cos") deployCertificateInstanceReq.Status = common.Int64Ptr(1) deployCertificateInstanceReq.InstanceIdList = common.StringPtrs([]string{fmt.Sprintf("%s|%s|%s", d.config.Region, d.config.Bucket, d.config.Domain)}) - deployCertificateInstanceResp, err := d.sdkClient.SSL.DeployCertificateInstance(deployCertificateInstanceReq) + deployCertificateInstanceResp, err := d.sdkClient.SSL.DeployCertificateInstanceWithContext(ctx, deployCertificateInstanceReq) d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'ssl.DeployCertificateInstance': %w", err) @@ -121,7 +120,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep if _, err := xwait.UntilWithContext(ctx, func(_ context.Context, _ int) (bool, error) { describeHostDeployRecordDetailReq := tcssl.NewDescribeHostDeployRecordDetailRequest() describeHostDeployRecordDetailReq.DeployRecordId = common.StringPtr(fmt.Sprintf("%d", *deployCertificateInstanceResp.Response.DeployRecordId)) - describeHostDeployRecordDetailResp, err := d.sdkClient.SSL.DescribeHostDeployRecordDetail(describeHostDeployRecordDetailReq) + describeHostDeployRecordDetailResp, err := d.sdkClient.SSL.DescribeHostDeployRecordDetailWithContext(ctx, describeHostDeployRecordDetailReq) d.logger.Debug("sdk request 'ssl.DescribeHostDeployRecordDetail'", slog.Any("request", describeHostDeployRecordDetailReq), slog.Any("response", describeHostDeployRecordDetailResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'ssl.DescribeHostDeployRecordDetail': %w", err) @@ -147,7 +146,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info(fmt.Sprintf("waiting for tencentcloud deployment job completion (pending: %d, running: %d, succeeded: %d, failed: %d, total: %d) ...", pendingCount, runningCount, succeededCount, failedCount, totalCount)) return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return nil, err } @@ -172,7 +171,7 @@ func (d *Deployer) checkIsBind(ctx context.Context, cloudCertId string) (bool, e describeHostCosInstanceListReq.IsCache = common.Uint64Ptr(0) describeHostCosInstanceListReq.Offset = common.Int64Ptr(int64(describeHostCosInstanceListOffset)) describeHostCosInstanceListReq.Limit = common.Int64Ptr(int64(describeHostCosInstanceListLimit)) - describeHostCosInstanceListResp, err := d.sdkClient.SSL.DescribeHostCosInstanceList(describeHostCosInstanceListReq) + describeHostCosInstanceListResp, err := d.sdkClient.SSL.DescribeHostCosInstanceListWithContext(ctx, describeHostCosInstanceListReq) d.logger.Debug("sdk request 'ssl.DescribeHostCosInstanceList'", slog.Any("request", describeHostCosInstanceListReq), slog.Any("response", describeHostCosInstanceListResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'ssl.DescribeHostCosInstanceList': %w", err) @@ -207,7 +206,7 @@ func (d *Deployer) checkIsBind(ctx context.Context, cloudCertId string) (bool, e func createSDKClients(secretId, secretKey, region string) (*wSDKClients, error) { credential := common.NewCredential(secretId, secretKey) - client, err := internal.NewSslClient(credential, region, profile.NewClientProfile()) + client, err := tcssl.NewClient(credential, region, profile.NewClientProfile()) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-css/internal/client.go b/pkg/core/deployer/providers/tencentcloud-css/internal/client.go deleted file mode 100644 index 81de7f015..000000000 --- a/pkg/core/deployer/providers/tencentcloud-css/internal/client.go +++ /dev/null @@ -1,65 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tclive "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/live/v20180801/client.go -// to lightweight the vendor packages in the built binary. -type LiveClient struct { - common.Client -} - -func NewLiveClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *LiveClient, err error) { - client = &LiveClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *LiveClient) DescribeLiveDomains(request *tclive.DescribeLiveDomainsRequest) (response *tclive.DescribeLiveDomainsResponse, err error) { - return c.DescribeLiveDomainsWithContext(context.Background(), request) -} - -func (c *LiveClient) DescribeLiveDomainsWithContext(ctx context.Context, request *tclive.DescribeLiveDomainsRequest) (response *tclive.DescribeLiveDomainsResponse, err error) { - if request == nil { - request = tclive.NewDescribeLiveDomainsRequest() - } - c.InitBaseRequest(&request.BaseRequest, "live", tclive.APIVersion, "DescribeLiveDomains") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeLiveDomains require credential") - } - - request.SetContext(ctx) - - response = tclive.NewDescribeLiveDomainsResponse() - err = c.Send(request, response) - return -} - -func (c *LiveClient) ModifyLiveDomainCertBindings(request *tclive.ModifyLiveDomainCertBindingsRequest) (response *tclive.ModifyLiveDomainCertBindingsResponse, err error) { - return c.ModifyLiveDomainCertBindingsWithContext(context.Background(), request) -} - -func (c *LiveClient) ModifyLiveDomainCertBindingsWithContext(ctx context.Context, request *tclive.ModifyLiveDomainCertBindingsRequest) (response *tclive.ModifyLiveDomainCertBindingsResponse, err error) { - if request == nil { - request = tclive.NewModifyLiveDomainCertBindingsRequest() - } - c.InitBaseRequest(&request.BaseRequest, "live", tclive.APIVersion, "ModifyLiveDomainCertBindings") - - if c.GetCredential() == nil { - return nil, errors.New("ModifyLiveDomainCertBindings require credential") - } - - request.SetContext(ctx) - response = tclive.NewModifyLiveDomainCertBindingsResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go b/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go index 8bf9dc14d..83c4a6eea 100644 --- a/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go +++ b/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go @@ -10,12 +10,11 @@ import ( "github.com/samber/lo" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tclive "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-css/internal" + tclive "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -36,7 +35,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.LiveClient + sdkClient *tclive.Client sdkCertmgr certmgr.Provider } @@ -52,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: lo. @@ -131,7 +130,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } }) modifyLiveDomainCertBindingsReq.CloudCertId = common.StringPtr(upres.CertId) - modifyLiveDomainCertBindingsResp, err := d.sdkClient.ModifyLiveDomainCertBindings(modifyLiveDomainCertBindingsReq) + modifyLiveDomainCertBindingsResp, err := d.sdkClient.ModifyLiveDomainCertBindingsWithContext(ctx, modifyLiveDomainCertBindingsReq) d.logger.Debug("sdk request 'live.ModifyLiveDomainCertBindings'", slog.Any("request", modifyLiveDomainCertBindingsReq), slog.Any("response", modifyLiveDomainCertBindingsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'live.ModifyLiveDomainCertBindings': %w", err) @@ -159,7 +158,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { describeLiveDomainsReq.DomainType = common.Uint64Ptr(1) describeLiveDomainsReq.PageNum = common.Uint64Ptr(uint64(describeLiveDomainsPageNum)) describeLiveDomainsReq.PageSize = common.Uint64Ptr(uint64(describeLiveDomainsPageSize)) - describeLiveDomainsResp, err := d.sdkClient.DescribeLiveDomains(describeLiveDomainsReq) + describeLiveDomainsResp, err := d.sdkClient.DescribeLiveDomainsWithContext(ctx, describeLiveDomainsReq) d.logger.Debug("sdk request 'live.DescribeLiveDomains'", slog.Any("request", describeLiveDomainsReq), slog.Any("response", describeLiveDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'live.DescribeLiveDomains': %w", err) @@ -183,7 +182,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { return domains, nil } -func createSDKClient(secretId, secretKey, endpoint string) (*internal.LiveClient, error) { +func createSDKClient(secretId, secretKey, endpoint string) (*tclive.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -191,7 +190,7 @@ func createSDKClient(secretId, secretKey, endpoint string) (*internal.LiveClient cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewLiveClient(credential, "", cpf) + client, err := tclive.NewClient(credential, "", cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-ecdn/internal/client.go b/pkg/core/deployer/providers/tencentcloud-ecdn/internal/client.go deleted file mode 100644 index 5affa966b..000000000 --- a/pkg/core/deployer/providers/tencentcloud-ecdn/internal/client.go +++ /dev/null @@ -1,104 +0,0 @@ -package internal - -import ( - "context" - "errors" - - tccdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/cdn/v20180606/client.go -// to lightweight the vendor packages in the built binary. -type CdnClient struct { - common.Client -} - -func NewCdnClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *CdnClient, err error) { - client = &CdnClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *CdnClient) DescribeCertDomains(request *tccdn.DescribeCertDomainsRequest) (response *tccdn.DescribeCertDomainsResponse, err error) { - return c.DescribeCertDomainsWithContext(context.Background(), request) -} - -func (c *CdnClient) DescribeCertDomainsWithContext(ctx context.Context, request *tccdn.DescribeCertDomainsRequest) (response *tccdn.DescribeCertDomainsResponse, err error) { - if request == nil { - request = tccdn.NewDescribeCertDomainsRequest() - } - c.InitBaseRequest(&request.BaseRequest, "cdn", tccdn.APIVersion, "DescribeCertDomains") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeCertDomains require credential") - } - - request.SetContext(ctx) - response = tccdn.NewDescribeCertDomainsResponse() - err = c.Send(request, response) - return -} - -func (c *CdnClient) DescribeDomains(request *tccdn.DescribeDomainsRequest) (response *tccdn.DescribeDomainsResponse, err error) { - return c.DescribeDomainsWithContext(context.Background(), request) -} - -func (c *CdnClient) DescribeDomainsWithContext(ctx context.Context, request *tccdn.DescribeDomainsRequest) (response *tccdn.DescribeDomainsResponse, err error) { - if request == nil { - request = tccdn.NewDescribeDomainsRequest() - } - c.InitBaseRequest(&request.BaseRequest, "cdn", tccdn.APIVersion, "DescribeDomains") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeDomains require credential") - } - - request.SetContext(ctx) - response = tccdn.NewDescribeDomainsResponse() - err = c.Send(request, response) - return -} - -func (c *CdnClient) DescribeDomainsConfig(request *tccdn.DescribeDomainsConfigRequest) (response *tccdn.DescribeDomainsConfigResponse, err error) { - return c.DescribeDomainsConfigWithContext(context.Background(), request) -} - -func (c *CdnClient) DescribeDomainsConfigWithContext(ctx context.Context, request *tccdn.DescribeDomainsConfigRequest) (response *tccdn.DescribeDomainsConfigResponse, err error) { - if request == nil { - request = tccdn.NewDescribeDomainsConfigRequest() - } - c.InitBaseRequest(&request.BaseRequest, "cdn", tccdn.APIVersion, "DescribeDomainsConfig") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeDomainsConfig require credential") - } - - request.SetContext(ctx) - response = tccdn.NewDescribeDomainsConfigResponse() - err = c.Send(request, response) - return -} - -func (c *CdnClient) UpdateDomainConfig(request *tccdn.UpdateDomainConfigRequest) (response *tccdn.UpdateDomainConfigResponse, err error) { - return c.UpdateDomainConfigWithContext(context.Background(), request) -} - -func (c *CdnClient) UpdateDomainConfigWithContext(ctx context.Context, request *tccdn.UpdateDomainConfigRequest) (response *tccdn.UpdateDomainConfigResponse, err error) { - if request == nil { - request = tccdn.NewUpdateDomainConfigRequest() - } - c.InitBaseRequest(&request.BaseRequest, "cdn", tccdn.APIVersion, "UpdateDomainConfig") - - if c.GetCredential() == nil { - return nil, errors.New("UpdateDomainConfig require credential") - } - - request.SetContext(ctx) - response = tccdn.NewUpdateDomainConfigResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go b/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go index 4f174696e..4391b9227 100644 --- a/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go +++ b/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go @@ -8,14 +8,13 @@ import ( "strings" "github.com/samber/lo" - tccdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ecdn/internal" + tccdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -36,7 +35,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.CdnClient + sdkClient *tccdn.Client sdkCertmgr certmgr.Provider } @@ -52,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: lo. @@ -184,7 +183,7 @@ func (d *Deployer) getMatchedDomainsByWildcard(ctx context.Context, wildcardDoma } describeDomainsReq.Offset = common.Int64Ptr(int64(describeDomainsOffset)) describeDomainsReq.Limit = common.Int64Ptr(int64(describeDomainsLimit)) - describeDomainsResp, err := d.sdkClient.DescribeDomains(describeDomainsReq) + describeDomainsResp, err := d.sdkClient.DescribeDomainsWithContext(ctx, describeDomainsReq) d.logger.Debug("sdk request 'cdn.DescribeDomains'", slog.Any("request", describeDomainsReq), slog.Any("response", describeDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeDomains': %w", err) @@ -216,7 +215,7 @@ func (d *Deployer) getMatchedDomainsByCertId(ctx context.Context, cloudCertId st describeCertDomainsReq := tccdn.NewDescribeCertDomainsRequest() describeCertDomainsReq.CertId = common.StringPtr(cloudCertId) describeCertDomainsReq.Product = common.StringPtr("ecdn") - describeCertDomainsResp, err := d.sdkClient.DescribeCertDomains(describeCertDomainsReq) + describeCertDomainsResp, err := d.sdkClient.DescribeCertDomainsWithContext(ctx, describeCertDomainsReq) d.logger.Debug("sdk request 'cdn.DescribeCertDomains'", slog.Any("request", describeCertDomainsReq), slog.Any("response", describeCertDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeCertDomains': %w", err) @@ -244,7 +243,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c } describeDomainsConfigReq.Offset = common.Int64Ptr(0) describeDomainsConfigReq.Limit = common.Int64Ptr(1) - describeDomainsConfigResp, err := d.sdkClient.DescribeDomainsConfig(describeDomainsConfigReq) + describeDomainsConfigResp, err := d.sdkClient.DescribeDomainsConfigWithContext(ctx, describeDomainsConfigReq) d.logger.Debug("sdk request 'cdn.DescribeDomainsConfig'", slog.Any("request", describeDomainsConfigReq), slog.Any("response", describeDomainsConfigResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'cdn.DescribeDomainsConfig': %w", err) @@ -273,7 +272,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c updateDomainConfigReq.Https.CertInfo = &tccdn.ServerCert{ CertId: common.StringPtr(cloudCertId), } - updateDomainConfigResp, err := d.sdkClient.UpdateDomainConfig(updateDomainConfigReq) + updateDomainConfigResp, err := d.sdkClient.UpdateDomainConfigWithContext(ctx, updateDomainConfigReq) d.logger.Debug("sdk request 'cdn.UpdateDomainConfig'", slog.Any("request", updateDomainConfigReq), slog.Any("response", updateDomainConfigResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'cdn.UpdateDomainConfig': %w", err) @@ -282,7 +281,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(secretId, secretKey, endpoint string) (*internal.CdnClient, error) { +func createSDKClient(secretId, secretKey, endpoint string) (*tccdn.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -290,7 +289,7 @@ func createSDKClient(secretId, secretKey, endpoint string) (*internal.CdnClient, cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewCdnClient(credential, "", cpf) + client, err := tccdn.NewClient(credential, "", cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-eo/internal/client.go b/pkg/core/deployer/providers/tencentcloud-eo/internal/client.go deleted file mode 100644 index d6533b303..000000000 --- a/pkg/core/deployer/providers/tencentcloud-eo/internal/client.go +++ /dev/null @@ -1,64 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcteo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/teo/v20220901/client.go -// to lightweight the vendor packages in the built binary. -type TeoClient struct { - common.Client -} - -func NewTeoClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *TeoClient, err error) { - client = &TeoClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *TeoClient) DescribeAccelerationDomains(request *tcteo.DescribeAccelerationDomainsRequest) (response *tcteo.DescribeAccelerationDomainsResponse, err error) { - return c.DescribeAccelerationDomainsWithContext(context.Background(), request) -} - -func (c *TeoClient) DescribeAccelerationDomainsWithContext(ctx context.Context, request *tcteo.DescribeAccelerationDomainsRequest) (response *tcteo.DescribeAccelerationDomainsResponse, err error) { - if request == nil { - request = tcteo.NewDescribeAccelerationDomainsRequest() - } - c.InitBaseRequest(&request.BaseRequest, "teo", tcteo.APIVersion, "DescribeAccelerationDomains") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeAccelerationDomains require credential") - } - - request.SetContext(ctx) - response = tcteo.NewDescribeAccelerationDomainsResponse() - err = c.Send(request, response) - return -} - -func (c *TeoClient) ModifyHostsCertificate(request *tcteo.ModifyHostsCertificateRequest) (response *tcteo.ModifyHostsCertificateResponse, err error) { - return c.ModifyHostsCertificateWithContext(context.Background(), request) -} - -func (c *TeoClient) ModifyHostsCertificateWithContext(ctx context.Context, request *tcteo.ModifyHostsCertificateRequest) (response *tcteo.ModifyHostsCertificateResponse, err error) { - if request == nil { - request = tcteo.NewModifyHostsCertificateRequest() - } - c.InitBaseRequest(&request.BaseRequest, "teo", tcteo.APIVersion, "ModifyHostsCertificate") - - if c.GetCredential() == nil { - return nil, errors.New("ModifyHostsCertificate require credential") - } - - request.SetContext(ctx) - response = tcteo.NewModifyHostsCertificateResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go index d79b2521a..fb75bf8f6 100644 --- a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go +++ b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go @@ -12,12 +12,11 @@ import ( "github.com/samber/lo" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcteo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-eo/internal" + tceo "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" xcertkey "github.com/certimate-go/certimate/pkg/utils/cert/key" @@ -44,7 +43,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.TeoClient + sdkClient *tceo.Client sdkCertmgr certmgr.Provider } @@ -60,7 +59,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: lo. @@ -126,7 +125,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, errors.New("config `domains` is required") } - domainCandidates := lo.Map(domainsInZone, func(domainInfo *tcteo.AccelerationDomain, _ int) string { + domainCandidates := lo.Map(domainsInZone, func(domainInfo *tceo.AccelerationDomain, _ int) string { return lo.FromPtr(domainInfo.DomainName) }) domains = lo.Filter(domainCandidates, func(domain string, _ int) bool { @@ -144,7 +143,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep case DOMAIN_MATCH_PATTERN_CERTSAN: { - domainCandidates := lo.Map(domainsInZone, func(domainInfo *tcteo.AccelerationDomain, _ int) string { + domainCandidates := lo.Map(domainsInZone, func(domainInfo *tceo.AccelerationDomain, _ int) string { return lo.FromPtr(domainInfo.DomainName) }) domains = lo.Filter(domainCandidates, func(domain string, _ int) bool { @@ -163,11 +162,11 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep domains = lo.Filter(domains, func(domain string, _ int) bool { var deployed bool - domainInfo, _ := lo.Find(domainsInZone, func(domainInfo *tcteo.AccelerationDomain) bool { + domainInfo, _ := lo.Find(domainsInZone, func(domainInfo *tceo.AccelerationDomain) bool { return domain == lo.FromPtr(domainInfo.DomainName) }) if domainInfo != nil && domainInfo.Certificate != nil { - deployed = lo.ContainsBy(domainInfo.Certificate.List, func(certInfo *tcteo.CertificateInfo) bool { + deployed = lo.ContainsBy(domainInfo.Certificate.List, func(certInfo *tceo.CertificateInfo) bool { return upres.CertId == lo.FromPtr(certInfo.CertId) }) } @@ -183,7 +182,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep // 配置域名证书 // REF: https://cloud.tencent.com/document/api/1552/80764 - modifyHostsCertificateReqs := make([]*tcteo.ModifyHostsCertificateRequest, 0) + modifyHostsCertificateReqs := make([]*tceo.ModifyHostsCertificateRequest, 0) if d.config.EnableMultipleSSL { const algRSA = "RSA" @@ -204,13 +203,13 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } for _, domain := range domains { - modifyHostsCertificateReq := tcteo.NewModifyHostsCertificateRequest() + modifyHostsCertificateReq := tceo.NewModifyHostsCertificateRequest() modifyHostsCertificateReq.ZoneId = common.StringPtr(d.config.ZoneId) modifyHostsCertificateReq.Mode = common.StringPtr("sslcert") modifyHostsCertificateReq.Hosts = common.StringPtrs([]string{domain}) - modifyHostsCertificateReq.ServerCertInfo = []*tcteo.ServerCertInfo{{CertId: common.StringPtr(upres.CertId)}} + modifyHostsCertificateReq.ServerCertInfo = []*tceo.ServerCertInfo{{CertId: common.StringPtr(upres.CertId)}} - domainInfo, _ := lo.Find(domainsInZone, func(domainInfo *tcteo.AccelerationDomain) bool { + domainInfo, _ := lo.Find(domainsInZone, func(domainInfo *tceo.AccelerationDomain) bool { return domain == lo.FromPtr(domainInfo.DomainName) }) if domainInfo != nil && domainInfo.Certificate != nil { @@ -228,18 +227,18 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep continue } - modifyHostsCertificateReq.ServerCertInfo = append(modifyHostsCertificateReq.ServerCertInfo, &tcteo.ServerCertInfo{CertId: certInfo.CertId}) + modifyHostsCertificateReq.ServerCertInfo = append(modifyHostsCertificateReq.ServerCertInfo, &tceo.ServerCertInfo{CertId: certInfo.CertId}) } } modifyHostsCertificateReqs = append(modifyHostsCertificateReqs, modifyHostsCertificateReq) } } else { - modifyHostsCertificateReq := tcteo.NewModifyHostsCertificateRequest() + modifyHostsCertificateReq := tceo.NewModifyHostsCertificateRequest() modifyHostsCertificateReq.ZoneId = common.StringPtr(d.config.ZoneId) modifyHostsCertificateReq.Mode = common.StringPtr("sslcert") modifyHostsCertificateReq.Hosts = common.StringPtrs(domains) - modifyHostsCertificateReq.ServerCertInfo = []*tcteo.ServerCertInfo{{CertId: common.StringPtr(upres.CertId)}} + modifyHostsCertificateReq.ServerCertInfo = []*tceo.ServerCertInfo{{CertId: common.StringPtr(upres.CertId)}} modifyHostsCertificateReqs = append(modifyHostsCertificateReqs, modifyHostsCertificateReq) } @@ -250,7 +249,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep case <-ctx.Done(): return nil, ctx.Err() default: - modifyHostsCertificateResp, err := d.sdkClient.ModifyHostsCertificate(modifyHostsCertificateReq) + modifyHostsCertificateResp, err := d.sdkClient.ModifyHostsCertificateWithContext(ctx, modifyHostsCertificateReq) d.logger.Debug("sdk request 'teo.ModifyHostsCertificate'", slog.Any("request", modifyHostsCertificateReq), slog.Any("response", modifyHostsCertificateResp)) if err != nil { err = fmt.Errorf("failed to execute sdk request 'teo.ModifyHostsCertificate': %w", err) @@ -266,8 +265,8 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return &deployer.DeployResult{}, nil } -func (d *Deployer) getAllDomainsInZone(ctx context.Context, zoneId string) ([]*tcteo.AccelerationDomain, error) { - var domainsInZone []*tcteo.AccelerationDomain +func (d *Deployer) getAllDomainsInZone(ctx context.Context, zoneId string) ([]*tceo.AccelerationDomain, error) { + var domainsInZone []*tceo.AccelerationDomain const pageSize = 200 for offset := 0; ; offset += pageSize { @@ -279,11 +278,11 @@ func (d *Deployer) getAllDomainsInZone(ctx context.Context, zoneId string) ([]*t // 查询加速域名列表 // REF: https://cloud.tencent.com/document/api/1552/86336 - describeAccelerationDomainsReq := tcteo.NewDescribeAccelerationDomainsRequest() + describeAccelerationDomainsReq := tceo.NewDescribeAccelerationDomainsRequest() describeAccelerationDomainsReq.Limit = common.Int64Ptr(pageSize) describeAccelerationDomainsReq.Offset = common.Int64Ptr(int64(offset)) describeAccelerationDomainsReq.ZoneId = common.StringPtr(zoneId) - describeAccelerationDomainsResp, err := d.sdkClient.DescribeAccelerationDomains(describeAccelerationDomainsReq) + describeAccelerationDomainsResp, err := d.sdkClient.DescribeAccelerationDomainsWithContext(ctx, describeAccelerationDomainsReq) d.logger.Debug("sdk request 'teo.DescribeAccelerationDomains'", slog.Any("request", describeAccelerationDomainsReq), slog.Any("response", describeAccelerationDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'teo.DescribeAccelerationDomains': %w", err) @@ -306,7 +305,7 @@ func (d *Deployer) getAllDomainsInZone(ctx context.Context, zoneId string) ([]*t return domainsInZone, nil } -func createSDKClient(secretId, secretKey, endpoint string) (*internal.TeoClient, error) { +func createSDKClient(secretId, secretKey, endpoint string) (*tceo.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -314,7 +313,7 @@ func createSDKClient(secretId, secretKey, endpoint string) (*internal.TeoClient, cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewTeoClient(credential, "", cpf) + client, err := tceo.NewClient(credential, "", cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-gaap/internal/client.go b/pkg/core/deployer/providers/tencentcloud-gaap/internal/client.go deleted file mode 100644 index 89db9ce7f..000000000 --- a/pkg/core/deployer/providers/tencentcloud-gaap/internal/client.go +++ /dev/null @@ -1,62 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcgaap "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/gaap/v20180529/client.go -// to lightweight the vendor packages in the built binary. -type GaapClient struct { - common.Client -} - -func NewGaapClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *GaapClient, err error) { - client = &GaapClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *GaapClient) DescribeHTTPSListeners(request *tcgaap.DescribeHTTPSListenersRequest) (response *tcgaap.DescribeHTTPSListenersResponse, err error) { - return c.DescribeHTTPSListenersWithContext(context.Background(), request) -} - -func (c *GaapClient) DescribeHTTPSListenersWithContext(ctx context.Context, request *tcgaap.DescribeHTTPSListenersRequest) (response *tcgaap.DescribeHTTPSListenersResponse, err error) { - if request == nil { - request = tcgaap.NewDescribeHTTPSListenersRequest() - } - - if c.GetCredential() == nil { - return nil, errors.New("DescribeHTTPSListeners require credential") - } - - request.SetContext(ctx) - response = tcgaap.NewDescribeHTTPSListenersResponse() - err = c.Send(request, response) - return -} - -func (c *GaapClient) ModifyHTTPSListenerAttribute(request *tcgaap.ModifyHTTPSListenerAttributeRequest) (response *tcgaap.ModifyHTTPSListenerAttributeResponse, err error) { - return c.ModifyHTTPSListenerAttributeWithContext(context.Background(), request) -} - -func (c *GaapClient) ModifyHTTPSListenerAttributeWithContext(ctx context.Context, request *tcgaap.ModifyHTTPSListenerAttributeRequest) (response *tcgaap.ModifyHTTPSListenerAttributeResponse, err error) { - if request == nil { - request = tcgaap.NewModifyHTTPSListenerAttributeRequest() - } - - if c.GetCredential() == nil { - return nil, errors.New("ModifyHTTPSListenerAttribute require credential") - } - - request.SetContext(ctx) - response = tcgaap.NewModifyHTTPSListenerAttributeResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go index 0dc006a06..14908a7a3 100644 --- a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go +++ b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go @@ -10,12 +10,11 @@ import ( "github.com/samber/lo" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcgaap "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-gaap/internal" + tcgaap "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529" ) type DeployerConfig struct { @@ -38,7 +37,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.GaapClient + sdkClient *tcgaap.Client sdkCertmgr certmgr.Provider } @@ -54,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: lo. @@ -126,7 +125,7 @@ func (d *Deployer) updateHttpsListenerCertificate(ctx context.Context, cloudList describeHTTPSListenersReq.ListenerId = common.StringPtr(cloudListenerId) describeHTTPSListenersReq.Offset = common.Uint64Ptr(0) describeHTTPSListenersReq.Limit = common.Uint64Ptr(1) - describeHTTPSListenersResp, err := d.sdkClient.DescribeHTTPSListeners(describeHTTPSListenersReq) + describeHTTPSListenersResp, err := d.sdkClient.DescribeHTTPSListenersWithContext(ctx, describeHTTPSListenersReq) d.logger.Debug("sdk request 'gaap.DescribeHTTPSListeners'", slog.Any("request", describeHTTPSListenersReq), slog.Any("response", describeHTTPSListenersResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'gaap.DescribeHTTPSListeners': %w", err) @@ -140,7 +139,7 @@ func (d *Deployer) updateHttpsListenerCertificate(ctx context.Context, cloudList modifyHTTPSListenerAttributeReq.ProxyId = lo.EmptyableToPtr(d.config.ProxyId) modifyHTTPSListenerAttributeReq.ListenerId = common.StringPtr(cloudListenerId) modifyHTTPSListenerAttributeReq.CertificateId = common.StringPtr(cloudCertId) - modifyHTTPSListenerAttributeResp, err := d.sdkClient.ModifyHTTPSListenerAttribute(modifyHTTPSListenerAttributeReq) + modifyHTTPSListenerAttributeResp, err := d.sdkClient.ModifyHTTPSListenerAttributeWithContext(ctx, modifyHTTPSListenerAttributeReq) d.logger.Debug("sdk request 'gaap.ModifyHTTPSListenerAttribute'", slog.Any("request", modifyHTTPSListenerAttributeReq), slog.Any("response", modifyHTTPSListenerAttributeResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'gaap.ModifyHTTPSListenerAttribute': %w", err) @@ -149,7 +148,7 @@ func (d *Deployer) updateHttpsListenerCertificate(ctx context.Context, cloudList return nil } -func createSDKClients(secretId, secretKey, endpoint string) (*internal.GaapClient, error) { +func createSDKClients(secretId, secretKey, endpoint string) (*tcgaap.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -157,7 +156,7 @@ func createSDKClients(secretId, secretKey, endpoint string) (*internal.GaapClien cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewGaapClient(credential, "", cpf) + client, err := tcgaap.NewClient(credential, "", cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-scf/internal/client.go b/pkg/core/deployer/providers/tencentcloud-scf/internal/client.go deleted file mode 100644 index 42a80900e..000000000 --- a/pkg/core/deployer/providers/tencentcloud-scf/internal/client.go +++ /dev/null @@ -1,85 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcscf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/scf/v20180416/client.go -// to lightweight the vendor packages in the built binary. -type ScfClient struct { - common.Client -} - -func NewScfClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *ScfClient, err error) { - client = &ScfClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *ScfClient) GetCustomDomain(request *tcscf.GetCustomDomainRequest) (response *tcscf.GetCustomDomainResponse, err error) { - return c.GetCustomDomainWithContext(context.Background(), request) -} - -func (c *ScfClient) GetCustomDomainWithContext(ctx context.Context, request *tcscf.GetCustomDomainRequest) (response *tcscf.GetCustomDomainResponse, err error) { - if request == nil { - request = tcscf.NewGetCustomDomainRequest() - } - c.InitBaseRequest(&request.BaseRequest, "scf", tcscf.APIVersion, "GetCustomDomain") - - if c.GetCredential() == nil { - return nil, errors.New("GetCustomDomain require credential") - } - - request.SetContext(ctx) - response = tcscf.NewGetCustomDomainResponse() - err = c.Send(request, response) - return -} - -func (c *ScfClient) ListCustomDomains(request *tcscf.ListCustomDomainsRequest) (response *tcscf.ListCustomDomainsResponse, err error) { - return c.ListCustomDomainsWithContext(context.Background(), request) -} - -func (c *ScfClient) ListCustomDomainsWithContext(ctx context.Context, request *tcscf.ListCustomDomainsRequest) (response *tcscf.ListCustomDomainsResponse, err error) { - if request == nil { - request = tcscf.NewListCustomDomainsRequest() - } - c.InitBaseRequest(&request.BaseRequest, "scf", tcscf.APIVersion, "ListCustomDomains") - - if c.GetCredential() == nil { - return nil, errors.New("ListCustomDomains require credential") - } - - request.SetContext(ctx) - - response = tcscf.NewListCustomDomainsResponse() - err = c.Send(request, response) - return -} - -func (c *ScfClient) UpdateCustomDomain(request *tcscf.UpdateCustomDomainRequest) (response *tcscf.UpdateCustomDomainResponse, err error) { - return c.UpdateCustomDomainWithContext(context.Background(), request) -} - -func (c *ScfClient) UpdateCustomDomainWithContext(ctx context.Context, request *tcscf.UpdateCustomDomainRequest) (response *tcscf.UpdateCustomDomainResponse, err error) { - if request == nil { - request = tcscf.NewUpdateCustomDomainRequest() - } - c.InitBaseRequest(&request.BaseRequest, "scf", tcscf.APIVersion, "UpdateCustomDomain") - - if c.GetCredential() == nil { - return nil, errors.New("UpdateCustomDomain require credential") - } - - request.SetContext(ctx) - response = tcscf.NewUpdateCustomDomainResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go b/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go index da1641eba..08fd74e9a 100644 --- a/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go +++ b/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go @@ -10,12 +10,11 @@ import ( "github.com/samber/lo" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcscf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-scf/internal" + tcscf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -38,7 +37,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.ScfClient + sdkClient *tcscf.Client sdkCertmgr certmgr.Provider } @@ -54,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: lo. @@ -166,7 +165,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { describeLiveDomainsReq := tcscf.NewListCustomDomainsRequest() describeLiveDomainsReq.Offset = common.Uint64Ptr(uint64(listCustomDomainsOffset)) describeLiveDomainsReq.Limit = common.Uint64Ptr(uint64(listCustomDomainsLimit)) - describeLiveDomainsResp, err := d.sdkClient.ListCustomDomains(describeLiveDomainsReq) + describeLiveDomainsResp, err := d.sdkClient.ListCustomDomainsWithContext(ctx, describeLiveDomainsReq) d.logger.Debug("sdk request 'scf.DescribeLiveDomains'", slog.Any("request", describeLiveDomainsReq), slog.Any("response", describeLiveDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'scf.DescribeLiveDomains': %w", err) @@ -195,7 +194,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c // REF: https://cloud.tencent.com/document/api/583/111924 getCustomDomainReq := tcscf.NewGetCustomDomainRequest() getCustomDomainReq.Domain = common.StringPtr(domain) - getCustomDomainResp, err := d.sdkClient.GetCustomDomain(getCustomDomainReq) + getCustomDomainResp, err := d.sdkClient.GetCustomDomainWithContext(ctx, getCustomDomainReq) d.logger.Debug("sdk request 'scf.GetCustomDomain'", slog.Any("request", getCustomDomainReq), slog.Any("response", getCustomDomainResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'scf.GetCustomDomain': %w", err) @@ -216,7 +215,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c if updateCustomDomainReq.Protocol == nil || *updateCustomDomainReq.Protocol == "HTTP" { updateCustomDomainReq.Protocol = common.StringPtr("HTTP&HTTPS") } - updateCustomDomainResp, err := d.sdkClient.UpdateCustomDomain(updateCustomDomainReq) + updateCustomDomainResp, err := d.sdkClient.UpdateCustomDomainWithContext(ctx, updateCustomDomainReq) d.logger.Debug("sdk request 'scf.UpdateCustomDomain'", slog.Any("request", updateCustomDomainReq), slog.Any("response", updateCustomDomainResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'scf.UpdateCustomDomain': %w", err) @@ -225,7 +224,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(secretId, secretKey, endpoint, region string) (*internal.ScfClient, error) { +func createSDKClient(secretId, secretKey, endpoint, region string) (*tcscf.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -233,7 +232,7 @@ func createSDKClient(secretId, secretKey, endpoint, region string) (*internal.Sc cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewScfClient(credential, region, cpf) + client, err := tcscf.NewClient(credential, region, cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-ssl-deploy/internal/client.go b/pkg/core/deployer/providers/tencentcloud-ssl-deploy/internal/client.go deleted file mode 100644 index 3ad3ab6fd..000000000 --- a/pkg/core/deployer/providers/tencentcloud-ssl-deploy/internal/client.go +++ /dev/null @@ -1,64 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/ssl/v20191205/client.go -// to lightweight the vendor packages in the built binary. -type SslClient struct { - common.Client -} - -func NewSslClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *SslClient, err error) { - client = &SslClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *SslClient) DeployCertificateInstance(request *tcssl.DeployCertificateInstanceRequest) (response *tcssl.DeployCertificateInstanceResponse, err error) { - return c.DeployCertificateInstanceWithContext(context.Background(), request) -} - -func (c *SslClient) DeployCertificateInstanceWithContext(ctx context.Context, request *tcssl.DeployCertificateInstanceRequest) (response *tcssl.DeployCertificateInstanceResponse, err error) { - if request == nil { - request = tcssl.NewDeployCertificateInstanceRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "DeployCertificateInstance") - - if c.GetCredential() == nil { - return nil, errors.New("DeployCertificateInstance require credential") - } - - request.SetContext(ctx) - response = tcssl.NewDeployCertificateInstanceResponse() - err = c.Send(request, response) - return -} - -func (c *SslClient) DescribeHostDeployRecordDetail(request *tcssl.DescribeHostDeployRecordDetailRequest) (response *tcssl.DescribeHostDeployRecordDetailResponse, err error) { - return c.DescribeHostDeployRecordDetailWithContext(context.Background(), request) -} - -func (c *SslClient) DescribeHostDeployRecordDetailWithContext(ctx context.Context, request *tcssl.DescribeHostDeployRecordDetailRequest) (response *tcssl.DescribeHostDeployRecordDetailResponse, err error) { - if request == nil { - request = tcssl.NewDescribeHostDeployRecordDetailRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "DescribeHostDeployRecordDetail") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeHostDeployRecordDetail require credential") - } - - request.SetContext(ctx) - response = tcssl.NewDescribeHostDeployRecordDetailResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go b/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go index adc8fb950..0fc1a147a 100644 --- a/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go +++ b/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go @@ -10,12 +10,11 @@ import ( "github.com/samber/lo" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ssl-deploy/internal" + tcssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) @@ -37,7 +36,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.SslClient + sdkClient *tcssl.Client sdkCertmgr certmgr.Provider } @@ -53,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: config.Endpoint, @@ -103,7 +102,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep deployCertificateInstanceReq.ResourceType = common.StringPtr(d.config.ResourceProduct) deployCertificateInstanceReq.InstanceIdList = common.StringPtrs(d.config.ResourceIds) deployCertificateInstanceReq.Status = common.Int64Ptr(1) - deployCertificateInstanceResp, err := d.sdkClient.DeployCertificateInstance(deployCertificateInstanceReq) + deployCertificateInstanceResp, err := d.sdkClient.DeployCertificateInstanceWithContext(ctx, deployCertificateInstanceReq) d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'ssl.DeployCertificateInstance': %w", err) @@ -117,7 +116,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep describeHostDeployRecordDetailReq := tcssl.NewDescribeHostDeployRecordDetailRequest() describeHostDeployRecordDetailReq.DeployRecordId = common.StringPtr(fmt.Sprintf("%d", *deployCertificateInstanceResp.Response.DeployRecordId)) describeHostDeployRecordDetailReq.Limit = common.Uint64Ptr(200) - describeHostDeployRecordDetailResp, err := d.sdkClient.DescribeHostDeployRecordDetail(describeHostDeployRecordDetailReq) + describeHostDeployRecordDetailResp, err := d.sdkClient.DescribeHostDeployRecordDetailWithContext(ctx, describeHostDeployRecordDetailReq) d.logger.Debug("sdk request 'ssl.DescribeHostDeployRecordDetail'", slog.Any("request", describeHostDeployRecordDetailReq), slog.Any("response", describeHostDeployRecordDetailResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'ssl.DescribeHostDeployRecordDetail': %w", err) @@ -143,14 +142,14 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info(fmt.Sprintf("waiting for tencentcloud deployment job completion (pending: %d, running: %d, succeeded: %d, failed: %d, total: %d) ...", pendingCount, runningCount, succeededCount, failedCount, totalCount)) return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return nil, err } return &deployer.DeployResult{}, nil } -func createSDKClient(secretId, secretKey, endpoint, region string) (*internal.SslClient, error) { +func createSDKClient(secretId, secretKey, endpoint, region string) (*tcssl.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -158,7 +157,7 @@ func createSDKClient(secretId, secretKey, endpoint, region string) (*internal.Ss cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewSslClient(credential, region, cpf) + client, err := tcssl.NewClient(credential, region, cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-ssl-update/internal/client.go b/pkg/core/deployer/providers/tencentcloud-ssl-update/internal/client.go deleted file mode 100644 index bb8443c7e..000000000 --- a/pkg/core/deployer/providers/tencentcloud-ssl-update/internal/client.go +++ /dev/null @@ -1,105 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/ssl/v20191205/client.go -// to lightweight the vendor packages in the built binary. -type SslClient struct { - common.Client -} - -func NewSslClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *SslClient, err error) { - client = &SslClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *SslClient) DescribeHostUpdateRecordDetail(request *tcssl.DescribeHostUpdateRecordDetailRequest) (response *tcssl.DescribeHostUpdateRecordDetailResponse, err error) { - return c.DescribeHostUpdateRecordDetailWithContext(context.Background(), request) -} - -func (c *SslClient) DescribeHostUpdateRecordDetailWithContext(ctx context.Context, request *tcssl.DescribeHostUpdateRecordDetailRequest) (response *tcssl.DescribeHostUpdateRecordDetailResponse, err error) { - if request == nil { - request = tcssl.NewDescribeHostUpdateRecordDetailRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "DescribeHostUpdateRecordDetail") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeHostUpdateRecordDetail require credential") - } - - request.SetContext(ctx) - response = tcssl.NewDescribeHostUpdateRecordDetailResponse() - err = c.Send(request, response) - return -} - -func (c *SslClient) DescribeHostUploadUpdateRecordDetail(request *tcssl.DescribeHostUploadUpdateRecordDetailRequest) (response *tcssl.DescribeHostUploadUpdateRecordDetailResponse, err error) { - return c.DescribeHostUploadUpdateRecordDetailWithContext(context.Background(), request) -} - -func (c *SslClient) DescribeHostUploadUpdateRecordDetailWithContext(ctx context.Context, request *tcssl.DescribeHostUploadUpdateRecordDetailRequest) (response *tcssl.DescribeHostUploadUpdateRecordDetailResponse, err error) { - if request == nil { - request = tcssl.NewDescribeHostUploadUpdateRecordDetailRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "DescribeHostUploadUpdateRecordDetail") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeHostUploadUpdateRecordDetail require credential") - } - - request.SetContext(ctx) - response = tcssl.NewDescribeHostUploadUpdateRecordDetailResponse() - err = c.Send(request, response) - return -} - -func (c *SslClient) UpdateCertificateInstance(request *tcssl.UpdateCertificateInstanceRequest) (response *tcssl.UpdateCertificateInstanceResponse, err error) { - return c.UpdateCertificateInstanceWithContext(context.Background(), request) -} - -func (c *SslClient) UpdateCertificateInstanceWithContext(ctx context.Context, request *tcssl.UpdateCertificateInstanceRequest) (response *tcssl.UpdateCertificateInstanceResponse, err error) { - if request == nil { - request = tcssl.NewUpdateCertificateInstanceRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "UpdateCertificateInstance") - - if c.GetCredential() == nil { - return nil, errors.New("UpdateCertificateInstance require credential") - } - - request.SetContext(ctx) - - response = tcssl.NewUpdateCertificateInstanceResponse() - err = c.Send(request, response) - return -} - -func (c *SslClient) UploadUpdateCertificateInstance(request *tcssl.UploadUpdateCertificateInstanceRequest) (response *tcssl.UploadUpdateCertificateInstanceResponse, err error) { - return c.UploadUpdateCertificateInstanceWithContext(context.Background(), request) -} - -func (c *SslClient) UploadUpdateCertificateInstanceWithContext(ctx context.Context, request *tcssl.UploadUpdateCertificateInstanceRequest) (response *tcssl.UploadUpdateCertificateInstanceResponse, err error) { - if request == nil { - request = tcssl.NewUploadUpdateCertificateInstanceRequest() - } - c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "UploadUpdateCertificateInstance") - - if c.GetCredential() == nil { - return nil, errors.New("UploadUpdateCertificateInstance require credential") - } - - request.SetContext(ctx) - response = tcssl.NewUploadUpdateCertificateInstanceResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go b/pkg/core/deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go index bfb1e8ed2..2bd7c90fd 100644 --- a/pkg/core/deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go +++ b/pkg/core/deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go @@ -11,12 +11,11 @@ import ( "github.com/samber/lo" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ssl-update/internal" + tcssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) @@ -40,7 +39,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.SslClient + sdkClient *tcssl.Client sdkCertmgr certmgr.Provider } @@ -56,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: config.Endpoint, @@ -122,7 +121,7 @@ func (d *Deployer) executeUpdateCertificateInstance(ctx context.Context, certPEM updateCertificateInstanceReq.CertificateId = common.StringPtr(upres.CertId) updateCertificateInstanceReq.ResourceTypes = common.StringPtrs(d.config.ResourceProducts) updateCertificateInstanceReq.ResourceTypesRegions = wrapResourceProductRegions(d.config.ResourceProducts, d.config.ResourceRegions) - updateCertificateInstanceResp, err := d.sdkClient.UpdateCertificateInstance(updateCertificateInstanceReq) + updateCertificateInstanceResp, err := d.sdkClient.UpdateCertificateInstanceWithContext(ctx, updateCertificateInstanceReq) d.logger.Debug("sdk request 'ssl.UpdateCertificateInstance'", slog.Any("request", updateCertificateInstanceReq), slog.Any("response", updateCertificateInstanceResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'ssl.UpdateCertificateInstance': %w", err) @@ -136,7 +135,7 @@ func (d *Deployer) executeUpdateCertificateInstance(ctx context.Context, certPEM } return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return err } @@ -146,7 +145,7 @@ func (d *Deployer) executeUpdateCertificateInstance(ctx context.Context, certPEM describeHostUpdateRecordDetailReq := tcssl.NewDescribeHostUpdateRecordDetailRequest() describeHostUpdateRecordDetailReq.DeployRecordId = common.StringPtr(deployRecordId) describeHostUpdateRecordDetailReq.Limit = common.StringPtr("200") - describeHostUpdateRecordDetailResp, err := d.sdkClient.DescribeHostUpdateRecordDetail(describeHostUpdateRecordDetailReq) + describeHostUpdateRecordDetailResp, err := d.sdkClient.DescribeHostUpdateRecordDetailWithContext(ctx, describeHostUpdateRecordDetailReq) d.logger.Debug("sdk request 'ssl.DescribeHostUpdateRecordDetail'", slog.Any("request", describeHostUpdateRecordDetailReq), slog.Any("response", describeHostUpdateRecordDetailResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'ssl.DescribeHostUpdateRecordDetail': %w", err) @@ -172,7 +171,7 @@ func (d *Deployer) executeUpdateCertificateInstance(ctx context.Context, certPEM d.logger.Info(fmt.Sprintf("waiting for tencentcloud deployment job completion (pending: %d, running: %d, succeeded: %d, failed: %d, total: %d) ...", pendingCount, runningCount, succeededCount, failedCount, totalCount)) return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return err } @@ -190,7 +189,7 @@ func (d *Deployer) executeUploadUpdateCertificateInstance(ctx context.Context, c uploadUpdateCertificateInstanceReq.CertificatePrivateKey = common.StringPtr(privkeyPEM) uploadUpdateCertificateInstanceReq.ResourceTypes = common.StringPtrs(d.config.ResourceProducts) uploadUpdateCertificateInstanceReq.ResourceTypesRegions = wrapResourceProductRegions(d.config.ResourceProducts, d.config.ResourceRegions) - uploadUpdateCertificateInstanceResp, err := d.sdkClient.UploadUpdateCertificateInstance(uploadUpdateCertificateInstanceReq) + uploadUpdateCertificateInstanceResp, err := d.sdkClient.UploadUpdateCertificateInstanceWithContext(ctx, uploadUpdateCertificateInstanceReq) d.logger.Debug("sdk request 'ssl.UploadUpdateCertificateInstance'", slog.Any("request", uploadUpdateCertificateInstanceReq), slog.Any("response", uploadUpdateCertificateInstanceResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'ssl.UploadUpdateCertificateInstance': %w", err) @@ -204,7 +203,7 @@ func (d *Deployer) executeUploadUpdateCertificateInstance(ctx context.Context, c } return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return err } @@ -214,7 +213,7 @@ func (d *Deployer) executeUploadUpdateCertificateInstance(ctx context.Context, c describeHostUploadUpdateRecordDetailReq := tcssl.NewDescribeHostUploadUpdateRecordDetailRequest() describeHostUploadUpdateRecordDetailReq.DeployRecordId = common.Int64Ptr(deployRecordId) describeHostUploadUpdateRecordDetailReq.Limit = common.Int64Ptr(200) - describeHostUploadUpdateRecordDetailResp, err := d.sdkClient.DescribeHostUploadUpdateRecordDetail(describeHostUploadUpdateRecordDetailReq) + describeHostUploadUpdateRecordDetailResp, err := d.sdkClient.DescribeHostUploadUpdateRecordDetailWithContext(ctx, describeHostUploadUpdateRecordDetailReq) d.logger.Debug("sdk request 'ssl.DescribeHostUploadUpdateRecordDetail'", slog.Any("request", describeHostUploadUpdateRecordDetailReq), slog.Any("response", describeHostUploadUpdateRecordDetailResp)) if err != nil { return false, fmt.Errorf("failed to execute sdk request 'ssl.DescribeHostUploadUpdateRecordDetail': %w", err) @@ -241,14 +240,14 @@ func (d *Deployer) executeUploadUpdateCertificateInstance(ctx context.Context, c d.logger.Info(fmt.Sprintf("waiting for tencentcloud deployment job completion (running: %d, succeeded: %d, failed: %d, total: %d) ...", runningCount, succeededCount, failedCount, totalCount)) return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return err } return nil } -func createSDKClient(secretId, secretKey, endpoint string) (*internal.SslClient, error) { +func createSDKClient(secretId, secretKey, endpoint string) (*tcssl.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -256,7 +255,7 @@ func createSDKClient(secretId, secretKey, endpoint string) (*internal.SslClient, cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewSslClient(credential, "", cpf) + client, err := tcssl.NewClient(credential, "", cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go b/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go index 3572eb04a..ee98b2826 100644 --- a/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go +++ b/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -33,7 +33,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: config.Endpoint, diff --git a/pkg/core/deployer/providers/tencentcloud-vod/internal/client.go b/pkg/core/deployer/providers/tencentcloud-vod/internal/client.go deleted file mode 100644 index a44814277..000000000 --- a/pkg/core/deployer/providers/tencentcloud-vod/internal/client.go +++ /dev/null @@ -1,65 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcvod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/vod/v20180717/client.go -// to lightweight the vendor packages in the built binary. -type VodClient struct { - common.Client -} - -func NewVodClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *VodClient, err error) { - client = &VodClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *VodClient) DescribeVodDomains(request *tcvod.DescribeVodDomainsRequest) (response *tcvod.DescribeVodDomainsResponse, err error) { - return c.DescribeVodDomainsWithContext(context.Background(), request) -} - -func (c *VodClient) DescribeVodDomainsWithContext(ctx context.Context, request *tcvod.DescribeVodDomainsRequest) (response *tcvod.DescribeVodDomainsResponse, err error) { - if request == nil { - request = tcvod.NewDescribeVodDomainsRequest() - } - c.InitBaseRequest(&request.BaseRequest, "vod", tcvod.APIVersion, "DescribeVodDomains") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeVodDomains require credential") - } - - request.SetContext(ctx) - - response = tcvod.NewDescribeVodDomainsResponse() - err = c.Send(request, response) - return -} - -func (c *VodClient) SetVodDomainCertificate(request *tcvod.SetVodDomainCertificateRequest) (response *tcvod.SetVodDomainCertificateResponse, err error) { - return c.SetVodDomainCertificateWithContext(context.Background(), request) -} - -func (c *VodClient) SetVodDomainCertificateWithContext(ctx context.Context, request *tcvod.SetVodDomainCertificateRequest) (response *tcvod.SetVodDomainCertificateResponse, err error) { - if request == nil { - request = tcvod.NewSetVodDomainCertificateRequest() - } - c.InitBaseRequest(&request.BaseRequest, "vod", tcvod.APIVersion, "SetVodDomainCertificate") - - if c.GetCredential() == nil { - return nil, errors.New("SetVodDomainCertificate require credential") - } - - request.SetContext(ctx) - response = tcvod.NewSetVodDomainCertificateResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go b/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go index 1eec4d04c..3cca89711 100644 --- a/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go +++ b/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go @@ -10,12 +10,11 @@ import ( "github.com/samber/lo" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcvod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-vod/internal" + tcvod "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717" ) type DeployerConfig struct { @@ -37,7 +36,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.VodClient + sdkClient *tcvod.Client sdkCertmgr certmgr.Provider } @@ -53,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: lo. @@ -163,7 +162,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { if d.config.SubAppId != 0 { describeVodDomainsReq.SubAppId = common.Uint64Ptr(uint64(d.config.SubAppId)) } - describeVodDomainsResp, err := d.sdkClient.DescribeVodDomains(describeVodDomainsReq) + describeVodDomainsResp, err := d.sdkClient.DescribeVodDomainsWithContext(ctx, describeVodDomainsReq) d.logger.Debug("sdk request 'vod.DescribeVodDomains'", slog.Any("request", describeVodDomainsReq), slog.Any("response", describeVodDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'vod.DescribeVodDomains': %w", err) @@ -202,7 +201,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c if d.config.SubAppId != 0 { setVodDomainCertificateReq.SubAppId = common.Uint64Ptr(uint64(d.config.SubAppId)) } - setVodDomainCertificateResp, err := d.sdkClient.SetVodDomainCertificate(setVodDomainCertificateReq) + setVodDomainCertificateResp, err := d.sdkClient.SetVodDomainCertificateWithContext(ctx, setVodDomainCertificateReq) d.logger.Debug("sdk request 'vod.SetVodDomainCertificate'", slog.Any("request", setVodDomainCertificateReq), slog.Any("response", setVodDomainCertificateResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'vod.SetVodDomainCertificate': %w", err) @@ -211,7 +210,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(secretId, secretKey, endpoint string) (*internal.VodClient, error) { +func createSDKClient(secretId, secretKey, endpoint string) (*tcvod.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -219,7 +218,7 @@ func createSDKClient(secretId, secretKey, endpoint string) (*internal.VodClient, cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewVodClient(credential, "", cpf) + client, err := tcvod.NewClient(credential, "", cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/tencentcloud-waf/internal/client.go b/pkg/core/deployer/providers/tencentcloud-waf/internal/client.go deleted file mode 100644 index faece0113..000000000 --- a/pkg/core/deployer/providers/tencentcloud-waf/internal/client.go +++ /dev/null @@ -1,64 +0,0 @@ -package internal - -import ( - "context" - "errors" - - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" - "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcwaf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125" -) - -// This is a partial copy of https://github.com/TencentCloud/tencentcloud-sdk-go/blob/master/tencentcloud/waf/v20180125/client.go -// to lightweight the vendor packages in the built binary. -type WafClient struct { - common.Client -} - -func NewWafClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *WafClient, err error) { - client = &WafClient{} - client.Init(region). - WithCredential(credential). - WithProfile(clientProfile) - return -} - -func (c *WafClient) DescribeDomainDetailsSaas(request *tcwaf.DescribeDomainDetailsSaasRequest) (response *tcwaf.DescribeDomainDetailsSaasResponse, err error) { - return c.DescribeDomainDetailsSaasWithContext(context.Background(), request) -} - -func (c *WafClient) DescribeDomainDetailsSaasWithContext(ctx context.Context, request *tcwaf.DescribeDomainDetailsSaasRequest) (response *tcwaf.DescribeDomainDetailsSaasResponse, err error) { - if request == nil { - request = tcwaf.NewDescribeDomainDetailsSaasRequest() - } - c.InitBaseRequest(&request.BaseRequest, "waf", tcwaf.APIVersion, "DescribeDomainDetailsSaas") - - if c.GetCredential() == nil { - return nil, errors.New("DescribeDomainDetailsSaas require credential") - } - - request.SetContext(ctx) - response = tcwaf.NewDescribeDomainDetailsSaasResponse() - err = c.Send(request, response) - return -} - -func (c *WafClient) ModifySpartaProtection(request *tcwaf.ModifySpartaProtectionRequest) (response *tcwaf.ModifySpartaProtectionResponse, err error) { - return c.ModifySpartaProtectionWithContext(context.Background(), request) -} - -func (c *WafClient) ModifySpartaProtectionWithContext(ctx context.Context, request *tcwaf.ModifySpartaProtectionRequest) (response *tcwaf.ModifySpartaProtectionResponse, err error) { - if request == nil { - request = tcwaf.NewModifySpartaProtectionRequest() - } - c.InitBaseRequest(&request.BaseRequest, "waf", tcwaf.APIVersion, "ModifySpartaProtection") - - if c.GetCredential() == nil { - return nil, errors.New("ModifySpartaProtection require credential") - } - - request.SetContext(ctx) - response = tcwaf.NewModifySpartaProtectionResponse() - err = c.Send(request, response) - return -} diff --git a/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go b/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go index b9f254fa1..77c354f37 100644 --- a/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go +++ b/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go @@ -10,12 +10,11 @@ import ( "github.com/samber/lo" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - tcwaf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-waf/internal" + tcwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125" ) type DeployerConfig struct { @@ -38,7 +37,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.WafClient + sdkClient *tcwaf.Client sdkCertmgr certmgr.Provider } @@ -54,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, Endpoint: lo. @@ -108,7 +107,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep describeDomainDetailsSaasReq.InstanceId = common.StringPtr(d.config.InstanceId) describeDomainDetailsSaasReq.Domain = common.StringPtr(d.config.Domain) describeDomainDetailsSaasReq.DomainId = common.StringPtr(d.config.DomainId) - describeDomainDetailsSaasResp, err := d.sdkClient.DescribeDomainDetailsSaas(describeDomainDetailsSaasReq) + describeDomainDetailsSaasResp, err := d.sdkClient.DescribeDomainDetailsSaasWithContext(ctx, describeDomainDetailsSaasReq) d.logger.Debug("sdk request 'waf.DescribeDomainDetailsSaas'", slog.Any("request", describeDomainDetailsSaasReq), slog.Any("response", describeDomainDetailsSaasResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'waf.DescribeDomainDetailsSaas': %w", err) @@ -122,7 +121,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep modifySpartaProtectionReq.DomainId = common.StringPtr(d.config.DomainId) modifySpartaProtectionReq.CertType = common.Int64Ptr(2) modifySpartaProtectionReq.SSLId = common.StringPtr(upres.CertId) - modifySpartaProtectionResp, err := d.sdkClient.ModifySpartaProtection(modifySpartaProtectionReq) + modifySpartaProtectionResp, err := d.sdkClient.ModifySpartaProtectionWithContext(ctx, modifySpartaProtectionReq) d.logger.Debug("sdk request 'waf.ModifySpartaProtection'", slog.Any("request", modifySpartaProtectionReq), slog.Any("response", modifySpartaProtectionResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'waf.ModifySpartaProtection': %w", err) @@ -131,7 +130,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return &deployer.DeployResult{}, nil } -func createSDKClient(secretId, secretKey, endpoint, region string) (*internal.WafClient, error) { +func createSDKClient(secretId, secretKey, endpoint, region string) (*tcwaf.Client, error) { credential := common.NewCredential(secretId, secretKey) cpf := profile.NewClientProfile() @@ -139,7 +138,7 @@ func createSDKClient(secretId, secretKey, endpoint, region string) (*internal.Wa cpf.HttpProfile.Endpoint = endpoint } - client, err := internal.NewWafClient(credential, region, cpf) + client, err := tcwaf.NewClient(credential, region, cpf) if err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go index 40c7cf385..93ade3dd1 100644 --- a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go +++ b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go @@ -13,7 +13,7 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud/auth" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ulb" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ulb" "github.com/certimate-go/certimate/pkg/core/deployer" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ulb" ) @@ -59,7 +59,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, diff --git a/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go b/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go index d3587518d..6aa8f2580 100644 --- a/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go +++ b/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go @@ -11,7 +11,7 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud/auth" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ussl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ussl" "github.com/certimate-go/certimate/pkg/core/deployer" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ucdn" ) @@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, diff --git a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go index bb908ca80..9f469fab1 100644 --- a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go +++ b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go @@ -13,7 +13,7 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud/auth" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ulb" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ulb" "github.com/certimate-go/certimate/pkg/core/deployer" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ulb" ) @@ -59,7 +59,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, diff --git a/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go b/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go index 4f4942dd4..44b69078b 100644 --- a/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go +++ b/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go @@ -11,7 +11,7 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud/auth" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-upathx" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-upathx" "github.com/certimate-go/certimate/pkg/core/deployer" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/upathx" ) @@ -48,7 +48,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, diff --git a/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go b/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go index 017ca08d3..0b80ceff8 100644 --- a/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go +++ b/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go @@ -10,7 +10,7 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud/auth" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ussl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ussl" "github.com/certimate-go/certimate/pkg/core/deployer" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ufile" ) @@ -49,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, diff --git a/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go b/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go index 39df3ae97..fedd342a9 100644 --- a/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go +++ b/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go @@ -10,7 +10,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/upyun-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/upyun-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" upyunsdk "github.com/certimate-go/certimate/pkg/sdk3rd/upyun/console" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ Username: config.Username, Password: config.Password, }) diff --git a/pkg/core/deployer/providers/upyun-file/upyun_file.go b/pkg/core/deployer/providers/upyun-file/upyun_file.go index 4decdf4c6..e9099f0a0 100644 --- a/pkg/core/deployer/providers/upyun-file/upyun_file.go +++ b/pkg/core/deployer/providers/upyun-file/upyun_file.go @@ -9,7 +9,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/upyun-ssl" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/upyun-ssl" "github.com/certimate-go/certimate/pkg/core/deployer" upyunsdk "github.com/certimate-go/certimate/pkg/sdk3rd/upyun/console" ) @@ -44,7 +44,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ Username: config.Username, Password: config.Password, }) diff --git a/pkg/core/deployer/providers/volcengine-alb/internal/client.go b/pkg/core/deployer/providers/volcengine-alb/internal/client.go deleted file mode 100644 index eecfde854..000000000 --- a/pkg/core/deployer/providers/volcengine-alb/internal/client.go +++ /dev/null @@ -1,144 +0,0 @@ -package internal - -import ( - "github.com/volcengine/volcengine-go-sdk/service/alb" - "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/volcengine/volcengine-go-sdk/volcengine/client" - "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" - "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" - "github.com/volcengine/volcengine-go-sdk/volcengine/request" - "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" - "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" -) - -// This is a partial copy of https://github.com/volcengine/volcengine-go-sdk/blob/master/service/alb/service_alb.go -// to lightweight the vendor packages in the built binary. -type AlbClient struct { - *client.Client -} - -func NewAlbClient(p client.ConfigProvider, cfgs ...*volcengine.Config) *AlbClient { - c := p.ClientConfig(alb.EndpointsID, cfgs...) - return newAlbClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) -} - -func newAlbClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *AlbClient { - svc := &AlbClient{ - Client: client.New( - cfg, - metadata.ClientInfo{ - ServiceName: alb.ServiceName, - ServiceID: alb.ServiceID, - SigningName: signingName, - SigningRegion: signingRegion, - Endpoint: endpoint, - APIVersion: "2020-04-01", - }, - handlers, - ), - } - - svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) - svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) - svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) - svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) - svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) - svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) - svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) - - return svc -} - -func (c *AlbClient) newRequest(op *request.Operation, params, data interface{}) *request.Request { - req := c.NewRequest(op, params, data) - - return req -} - -func (c *AlbClient) DescribeListenerAttributes(input *alb.DescribeListenerAttributesInput) (*alb.DescribeListenerAttributesOutput, error) { - req, out := c.DescribeListenerAttributesRequest(input) - return out, req.Send() -} - -func (c *AlbClient) DescribeListenerAttributesRequest(input *alb.DescribeListenerAttributesInput) (req *request.Request, output *alb.DescribeListenerAttributesOutput) { - op := &request.Operation{ - Name: "DescribeListenerAttributes", - HTTPMethod: "GET", - HTTPPath: "/", - } - - if input == nil { - input = &alb.DescribeListenerAttributesInput{} - } - - output = &alb.DescribeListenerAttributesOutput{} - req = c.newRequest(op, input, output) - - return -} - -func (c *AlbClient) DescribeListeners(input *alb.DescribeListenersInput) (*alb.DescribeListenersOutput, error) { - req, out := c.DescribeListenersRequest(input) - return out, req.Send() -} - -func (c *AlbClient) DescribeListenersRequest(input *alb.DescribeListenersInput) (req *request.Request, output *alb.DescribeListenersOutput) { - op := &request.Operation{ - Name: "DescribeListeners", - HTTPMethod: "GET", - HTTPPath: "/", - } - - if input == nil { - input = &alb.DescribeListenersInput{} - } - - output = &alb.DescribeListenersOutput{} - req = c.newRequest(op, input, output) - - return -} - -func (c *AlbClient) DescribeLoadBalancerAttributes(input *alb.DescribeLoadBalancerAttributesInput) (*alb.DescribeLoadBalancerAttributesOutput, error) { - req, out := c.DescribeLoadBalancerAttributesRequest(input) - return out, req.Send() -} - -func (c *AlbClient) DescribeLoadBalancerAttributesRequest(input *alb.DescribeLoadBalancerAttributesInput) (req *request.Request, output *alb.DescribeLoadBalancerAttributesOutput) { - op := &request.Operation{ - Name: "DescribeLoadBalancerAttributes", - HTTPMethod: "GET", - HTTPPath: "/", - } - - if input == nil { - input = &alb.DescribeLoadBalancerAttributesInput{} - } - - output = &alb.DescribeLoadBalancerAttributesOutput{} - req = c.newRequest(op, input, output) - - return -} - -func (c *AlbClient) ModifyListenerAttributes(input *alb.ModifyListenerAttributesInput) (*alb.ModifyListenerAttributesOutput, error) { - req, out := c.ModifyListenerAttributesRequest(input) - return out, req.Send() -} - -func (c *AlbClient) ModifyListenerAttributesRequest(input *alb.ModifyListenerAttributesInput) (req *request.Request, output *alb.ModifyListenerAttributesOutput) { - op := &request.Operation{ - Name: "ModifyListenerAttributes", - HTTPMethod: "GET", - HTTPPath: "/", - } - - if input == nil { - input = &alb.ModifyListenerAttributesInput{} - } - - output = &alb.ModifyListenerAttributesOutput{} - req = c.newRequest(op, input, output) - - return -} diff --git a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go index 256ed4004..f04554f36 100644 --- a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go +++ b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go @@ -7,14 +7,13 @@ import ( "log/slog" "github.com/samber/lo" - vealb "github.com/volcengine/volcengine-go-sdk/service/alb" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-alb/internal" + vealb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb" ) type DeployerConfig struct { @@ -40,7 +39,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.AlbClient + sdkClient *vealb.ALB sdkCertmgr certmgr.Provider } @@ -56,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, Region: config.Region, @@ -206,7 +205,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI describeListenerAttributesReq := &vealb.DescribeListenerAttributesInput{ ListenerId: ve.String(cloudListenerId), } - describeListenerAttributesResp, err := d.sdkClient.DescribeListenerAttributes(describeListenerAttributesReq) + describeListenerAttributesResp, err := d.sdkClient.DescribeListenerAttributesWithContext(ctx, describeListenerAttributesReq) d.logger.Debug("sdk request 'alb.DescribeListenerAttributes'", slog.Any("request", describeListenerAttributesReq), slog.Any("response", describeListenerAttributesResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'alb.DescribeListenerAttributes': %w", err) @@ -222,7 +221,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI CertificateSource: ve.String("cert_center"), CertCenterCertificateId: ve.String(cloudCertId), } - modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributes(modifyListenerAttributesReq) + modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributesWithContext(ctx, modifyListenerAttributesReq) d.logger.Debug("sdk request 'alb.ModifyListenerAttributes'", slog.Any("request", modifyListenerAttributesReq), slog.Any("response", modifyListenerAttributesResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'alb.ModifyListenerAttributes': %w", err) @@ -251,7 +250,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI } }), } - modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributes(modifyListenerAttributesReq) + modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributesWithContext(ctx, modifyListenerAttributesReq) d.logger.Debug("sdk request 'alb.ModifyListenerAttributes'", slog.Any("request", modifyListenerAttributesReq), slog.Any("response", modifyListenerAttributesResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'alb.ModifyListenerAttributes': %w", err) @@ -261,7 +260,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.AlbClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*vealb.ALB, error) { config := ve.NewConfig(). WithAkSk(accessKeyId, accessKeySecret). WithRegion(region) @@ -271,6 +270,6 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Alb return nil, err } - client := internal.NewAlbClient(session) + client := vealb.New(session) return client, nil } diff --git a/pkg/core/deployer/providers/volcengine-apig/internal/client.go b/pkg/core/deployer/providers/volcengine-apig/internal/client.go deleted file mode 100644 index 4b27d451f..000000000 --- a/pkg/core/deployer/providers/volcengine-apig/internal/client.go +++ /dev/null @@ -1,128 +0,0 @@ -package internal - -import ( - "github.com/volcengine/volcengine-go-sdk/service/apig" - "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/volcengine/volcengine-go-sdk/volcengine/client" - "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" - "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" - "github.com/volcengine/volcengine-go-sdk/volcengine/request" - "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" - "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" -) - -// This is a partial copy of https://github.com/volcengine/volcengine-go-sdk/blob/master/service/apig/service_apig.go -// to lightweight the vendor packages in the built binary. -type ApigClient struct { - *client.Client -} - -func NewApigClient(p client.ConfigProvider, cfgs ...*volcengine.Config) *ApigClient { - c := p.ClientConfig(apig.EndpointsID, cfgs...) - return newApigClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) -} - -func newApigClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *ApigClient { - svc := &ApigClient{ - Client: client.New( - cfg, - metadata.ClientInfo{ - ServiceName: apig.ServiceName, - ServiceID: apig.ServiceID, - SigningName: signingName, - SigningRegion: signingRegion, - Endpoint: endpoint, - APIVersion: "2021-03-03", - }, - handlers, - ), - } - - svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) - svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) - svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) - svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) - svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) - svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) - svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) - - return svc -} - -func (c *ApigClient) newRequest(op *request.Operation, params, data interface{}) *request.Request { - req := c.NewRequest(op, params, data) - - return req -} - -func (c *ApigClient) GetCustomDomainRequest(input *apig.GetCustomDomainInput) (req *request.Request, output *apig.GetCustomDomainOutput) { - op := &request.Operation{ - Name: "GetCustomDomain", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &apig.GetCustomDomainInput{} - } - - output = &apig.GetCustomDomainOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} - -func (c *ApigClient) GetCustomDomain(input *apig.GetCustomDomainInput) (*apig.GetCustomDomainOutput, error) { - req, out := c.GetCustomDomainRequest(input) - return out, req.Send() -} - -func (c *ApigClient) ListCustomDomainsRequest(input *apig.ListCustomDomainsInput) (req *request.Request, output *apig.ListCustomDomainsOutput) { - op := &request.Operation{ - Name: "ListCustomDomains", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &apig.ListCustomDomainsInput{} - } - - output = &apig.ListCustomDomainsOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} - -func (c *ApigClient) ListCustomDomains(input *apig.ListCustomDomainsInput) (*apig.ListCustomDomainsOutput, error) { - req, out := c.ListCustomDomainsRequest(input) - return out, req.Send() -} - -func (c *ApigClient) UpdateCustomDomainRequest(input *apig.UpdateCustomDomainInput) (req *request.Request, output *apig.UpdateCustomDomainOutput) { - op := &request.Operation{ - Name: "UpdateCustomDomain", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &apig.UpdateCustomDomainInput{} - } - - output = &apig.UpdateCustomDomainOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} - -func (c *ApigClient) UpdateCustomDomain(input *apig.UpdateCustomDomainInput) (*apig.UpdateCustomDomainOutput, error) { - req, out := c.UpdateCustomDomainRequest(input) - return out, req.Send() -} diff --git a/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go b/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go index 46920c28a..db215f22e 100644 --- a/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go +++ b/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go @@ -7,14 +7,13 @@ import ( "log/slog" "github.com/samber/lo" - veapig "github.com/volcengine/volcengine-go-sdk/service/apig" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-apig/internal" + veapig "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -35,7 +34,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.ApigClient + sdkClient *veapig.APIG sdkCertmgr certmgr.Provider } @@ -51,7 +50,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, Region: config.Region, @@ -202,7 +201,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]*veapig.ItemForListCust PageNumber: ve.Int64(int64(listCustomDomainsPageNumber)), PageSize: ve.Int64(int64(listCustomDomainsPageSize)), } - listCustomDomainsResp, err := d.sdkClient.ListCustomDomains(listCustomDomainsReq) + listCustomDomainsResp, err := d.sdkClient.ListCustomDomainsWithContext(ctx, listCustomDomainsReq) d.logger.Debug("sdk request 'apig.ListCustomDomains'", slog.Any("request", listCustomDomainsReq), slog.Any("response", listCustomDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'apig.ListCustomDomains': %w", err) @@ -233,7 +232,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, cloudDomainId st getCustomDomainReq := &veapig.GetCustomDomainInput{ Id: ve.String(cloudDomainId), } - getCustomDomainResp, err := d.sdkClient.GetCustomDomain(getCustomDomainReq) + getCustomDomainResp, err := d.sdkClient.GetCustomDomainWithContext(ctx, getCustomDomainReq) d.logger.Debug("sdk request 'apig.GetCustomDomain'", slog.Any("request", getCustomDomainReq), slog.Any("response", getCustomDomainResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'apig.GetCustomDomain': %w", err) @@ -249,7 +248,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, cloudDomainId st if !lo.Contains(ve.StringValueSlice(updateCustomDomainReq.Protocol), "HTTPS") { updateCustomDomainReq.Protocol = append(updateCustomDomainReq.Protocol, ve.String("HTTPS")) } - updateCustomDomainResp, err := d.sdkClient.UpdateCustomDomain(updateCustomDomainReq) + updateCustomDomainResp, err := d.sdkClient.UpdateCustomDomainWithContext(ctx, updateCustomDomainReq) d.logger.Debug("sdk request 'apig.UpdateCustomDomain'", slog.Any("request", updateCustomDomainReq), slog.Any("response", updateCustomDomainResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'apig.UpdateCustomDomain': %w", err) @@ -258,7 +257,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, cloudDomainId st return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.ApigClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*veapig.APIG, error) { config := ve.NewConfig(). WithAkSk(accessKeyId, accessKeySecret). WithRegion(region) @@ -268,6 +267,6 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Api return nil, err } - client := internal.NewApigClient(session) + client := veapig.New(session) return client, nil } diff --git a/pkg/core/deployer/providers/volcengine-cdn/internal/client.go b/pkg/core/deployer/providers/volcengine-cdn/internal/client.go deleted file mode 100644 index d6911f98a..000000000 --- a/pkg/core/deployer/providers/volcengine-cdn/internal/client.go +++ /dev/null @@ -1,128 +0,0 @@ -package internal - -import ( - "github.com/volcengine/volcengine-go-sdk/service/cdn" - "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/volcengine/volcengine-go-sdk/volcengine/client" - "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" - "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" - "github.com/volcengine/volcengine-go-sdk/volcengine/request" - "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" - "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" -) - -// This is a partial copy of https://github.com/volcengine/volcengine-go-sdk/blob/master/service/cdn/service_cdn.go -// to lightweight the vendor packages in the built binary. -type CdnClient struct { - *client.Client -} - -func NewCdnClient(p client.ConfigProvider, cfgs ...*volcengine.Config) *CdnClient { - c := p.ClientConfig(cdn.EndpointsID, cfgs...) - return newCdnClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) -} - -func newCdnClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *CdnClient { - svc := &CdnClient{ - Client: client.New( - cfg, - metadata.ClientInfo{ - ServiceName: cdn.ServiceName, - ServiceID: cdn.ServiceID, - SigningName: signingName, - SigningRegion: signingRegion, - Endpoint: endpoint, - APIVersion: "2021-03-01", - }, - handlers, - ), - } - - svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) - svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) - svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) - svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) - svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) - svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) - svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) - - return svc -} - -func (c *CdnClient) newRequest(op *request.Operation, params, data interface{}) *request.Request { - req := c.NewRequest(op, params, data) - - return req -} - -func (c *CdnClient) BatchDeployCert(input *cdn.BatchDeployCertInput) (*cdn.BatchDeployCertOutput, error) { - req, out := c.BatchDeployCertRequest(input) - return out, req.Send() -} - -func (c *CdnClient) BatchDeployCertRequest(input *cdn.BatchDeployCertInput) (req *request.Request, output *cdn.BatchDeployCertOutput) { - op := &request.Operation{ - Name: "BatchDeployCert", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &cdn.BatchDeployCertInput{} - } - - output = &cdn.BatchDeployCertOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} - -func (c *CdnClient) DescribeCertConfig(input *cdn.DescribeCertConfigInput) (*cdn.DescribeCertConfigOutput, error) { - req, out := c.DescribeCertConfigRequest(input) - return out, req.Send() -} - -func (c *CdnClient) DescribeCertConfigRequest(input *cdn.DescribeCertConfigInput) (req *request.Request, output *cdn.DescribeCertConfigOutput) { - op := &request.Operation{ - Name: "DescribeCertConfig", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &cdn.DescribeCertConfigInput{} - } - - output = &cdn.DescribeCertConfigOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} - -func (c *CdnClient) ListCdnDomains(input *cdn.ListCdnDomainsInput) (*cdn.ListCdnDomainsOutput, error) { - req, out := c.ListCdnDomainsRequest(input) - return out, req.Send() -} - -func (c *CdnClient) ListCdnDomainsRequest(input *cdn.ListCdnDomainsInput) (req *request.Request, output *cdn.ListCdnDomainsOutput) { - op := &request.Operation{ - Name: "ListCdnDomains", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &cdn.ListCdnDomainsInput{} - } - - output = &cdn.ListCdnDomainsOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} diff --git a/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go b/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go index 68c5d1918..708d867a3 100644 --- a/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go +++ b/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go @@ -7,14 +7,13 @@ import ( "log/slog" "strings" - vecdn "github.com/volcengine/volcengine-go-sdk/service/cdn" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-cdn" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-cdn" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-cdn/internal" + vecdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -33,7 +32,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.CdnClient + sdkClient *vecdn.CDN sdkCertmgr certmgr.Provider } @@ -49,7 +48,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -174,7 +173,7 @@ func (d *Deployer) getMatchedDomainsByWildcard(ctx context.Context, wildcardDoma PageNum: ve.Int64(int64(listCdnDomainsPageNum)), PageSize: ve.Int64(int64(listCdnDomainsPageSize)), } - listCdnDomainsResp, err := d.sdkClient.ListCdnDomains(listCdnDomainsReq) + listCdnDomainsResp, err := d.sdkClient.ListCdnDomainsWithContext(ctx, listCdnDomainsReq) d.logger.Debug("sdk request 'cdn.ListCdnDomains'", slog.Any("request", listCdnDomainsReq), slog.Any("response", listCdnDomainsResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.ListCdnDomains': %w", err) @@ -208,7 +207,7 @@ func (d *Deployer) getMatchedDomainsByCertId(ctx context.Context, cloudCertId st describeCertConfigReq := &vecdn.DescribeCertConfigInput{ CertId: ve.String(cloudCertId), } - describeCertConfigResp, err := d.sdkClient.DescribeCertConfig(describeCertConfigReq) + describeCertConfigResp, err := d.sdkClient.DescribeCertConfigWithContext(ctx, describeCertConfigReq) d.logger.Debug("sdk request 'cdn.DescribeCertConfig'", slog.Any("request", describeCertConfigReq), slog.Any("response", describeCertConfigResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeCertConfig': %w", err) @@ -242,7 +241,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c Domain: ve.String(domain), CertId: ve.String(cloudCertId), } - batchDeployCertResp, err := d.sdkClient.BatchDeployCert(batchDeployCertReq) + batchDeployCertResp, err := d.sdkClient.BatchDeployCertWithContext(ctx, batchDeployCertReq) d.logger.Debug("sdk request 'cdn.BatchDeployCert'", slog.Any("request", batchDeployCertReq), slog.Any("response", batchDeployCertResp)) if err != nil { return err @@ -251,7 +250,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(accessKeyId, accessKeySecret string) (*internal.CdnClient, error) { +func createSDKClient(accessKeyId, accessKeySecret string) (*vecdn.CDN, error) { config := ve.NewConfig(). WithAkSk(accessKeyId, accessKeySecret). WithRegion("cn-north-1") @@ -261,6 +260,6 @@ func createSDKClient(accessKeyId, accessKeySecret string) (*internal.CdnClient, return nil, err } - client := internal.NewCdnClient(session) + client := vecdn.New(session) return client, nil } diff --git a/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go b/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go index 6b1e5993e..ef3a030d6 100644 --- a/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -33,7 +33,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, errors.New("the configuration of the deployer provider is nil") } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, Region: config.Region, diff --git a/pkg/core/deployer/providers/volcengine-clb/internal/client.go b/pkg/core/deployer/providers/volcengine-clb/internal/client.go deleted file mode 100644 index ee18bc816..000000000 --- a/pkg/core/deployer/providers/volcengine-clb/internal/client.go +++ /dev/null @@ -1,122 +0,0 @@ -package internal - -import ( - "github.com/volcengine/volcengine-go-sdk/service/clb" - "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/volcengine/volcengine-go-sdk/volcengine/client" - "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" - "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" - "github.com/volcengine/volcengine-go-sdk/volcengine/request" - "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" - "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" -) - -// This is a partial copy of https://github.com/volcengine/volcengine-go-sdk/blob/master/service/clb/service_clb.go -// to lightweight the vendor packages in the built binary. -type ClbClient struct { - *client.Client -} - -func NewClbClient(p client.ConfigProvider, cfgs ...*volcengine.Config) *ClbClient { - c := p.ClientConfig(clb.EndpointsID, cfgs...) - return newClbClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) -} - -func newClbClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *ClbClient { - svc := &ClbClient{ - Client: client.New( - cfg, - metadata.ClientInfo{ - ServiceName: clb.ServiceName, - ServiceID: clb.ServiceID, - SigningName: signingName, - SigningRegion: signingRegion, - Endpoint: endpoint, - APIVersion: "2020-04-01", - }, - handlers, - ), - } - - svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) - svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) - svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) - svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) - svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) - svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) - svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) - - return svc -} - -func (c *ClbClient) newRequest(op *request.Operation, params, data interface{}) *request.Request { - req := c.NewRequest(op, params, data) - - return req -} - -func (c *ClbClient) DescribeListeners(input *clb.DescribeListenersInput) (*clb.DescribeListenersOutput, error) { - req, out := c.DescribeListenersRequest(input) - return out, req.Send() -} - -func (c *ClbClient) DescribeListenersRequest(input *clb.DescribeListenersInput) (req *request.Request, output *clb.DescribeListenersOutput) { - op := &request.Operation{ - Name: "DescribeListeners", - HTTPMethod: "GET", - HTTPPath: "/", - } - - if input == nil { - input = &clb.DescribeListenersInput{} - } - - output = &clb.DescribeListenersOutput{} - req = c.newRequest(op, input, output) - - return -} - -func (c *ClbClient) DescribeLoadBalancerAttributes(input *clb.DescribeLoadBalancerAttributesInput) (*clb.DescribeLoadBalancerAttributesOutput, error) { - req, out := c.DescribeLoadBalancerAttributesRequest(input) - return out, req.Send() -} - -func (c *ClbClient) DescribeLoadBalancerAttributesRequest(input *clb.DescribeLoadBalancerAttributesInput) (req *request.Request, output *clb.DescribeLoadBalancerAttributesOutput) { - op := &request.Operation{ - Name: "DescribeLoadBalancerAttributes", - HTTPMethod: "GET", - HTTPPath: "/", - } - - if input == nil { - input = &clb.DescribeLoadBalancerAttributesInput{} - } - - output = &clb.DescribeLoadBalancerAttributesOutput{} - req = c.newRequest(op, input, output) - - return -} - -func (c *ClbClient) ModifyListenerAttributes(input *clb.ModifyListenerAttributesInput) (*clb.ModifyListenerAttributesOutput, error) { - req, out := c.ModifyListenerAttributesRequest(input) - return out, req.Send() -} - -func (c *ClbClient) ModifyListenerAttributesRequest(input *clb.ModifyListenerAttributesInput) (req *request.Request, output *clb.ModifyListenerAttributesOutput) { - op := &request.Operation{ - Name: "ModifyListenerAttributes", - HTTPMethod: "GET", - HTTPPath: "/", - } - - if input == nil { - input = &clb.ModifyListenerAttributesInput{} - } - - output = &clb.ModifyListenerAttributesOutput{} - req = c.newRequest(op, input, output) - - return -} diff --git a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go index 768c4d5d0..45f8aff80 100644 --- a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go +++ b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go @@ -6,14 +6,13 @@ import ( "fmt" "log/slog" - veclb "github.com/volcengine/volcengine-go-sdk/service/clb" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-clb/internal" + veclb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb" ) type DeployerConfig struct { @@ -36,7 +35,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.ClbClient + sdkClient *veclb.CLB sdkCertmgr certmgr.Provider } @@ -52,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, Region: config.Region, @@ -117,7 +116,7 @@ func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) describeLoadBalancerAttributesReq := &veclb.DescribeLoadBalancerAttributesInput{ LoadBalancerId: ve.String(d.config.LoadbalancerId), } - describeLoadBalancerAttributesResp, err := d.sdkClient.DescribeLoadBalancerAttributes(describeLoadBalancerAttributesReq) + describeLoadBalancerAttributesResp, err := d.sdkClient.DescribeLoadBalancerAttributesWithContext(ctx, describeLoadBalancerAttributesReq) d.logger.Debug("sdk request 'clb.DescribeLoadBalancerAttributes'", slog.Any("request", describeLoadBalancerAttributesReq), slog.Any("response", describeLoadBalancerAttributesResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'clb.DescribeLoadBalancerAttributes': %w", err) @@ -141,7 +140,7 @@ func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) PageNumber: ve.Int64(int64(describeListenersPageNumber)), PageSize: ve.Int64(int64(describeListenersPageSize)), } - describeListenersResp, err := d.sdkClient.DescribeListeners(describeListenersReq) + describeListenersResp, err := d.sdkClient.DescribeListenersWithContext(ctx, describeListenersReq) d.logger.Debug("sdk request 'clb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'clb.DescribeListeners': %w", err) @@ -204,7 +203,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI CertificateSource: ve.String("cert_center"), CertCenterCertificateId: ve.String(cloudCertId), } - modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributes(modifyListenerAttributesReq) + modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributesWithContext(ctx, modifyListenerAttributesReq) d.logger.Debug("sdk request 'clb.ModifyListenerAttributes'", slog.Any("request", modifyListenerAttributesReq), slog.Any("response", modifyListenerAttributesResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'clb.ModifyListenerAttributes': %w", err) @@ -213,7 +212,7 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.ClbClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*veclb.CLB, error) { config := ve.NewConfig(). WithAkSk(accessKeyId, accessKeySecret). WithRegion(region) @@ -223,6 +222,6 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Clb return nil, err } - client := internal.NewClbClient(session) + client := veclb.New(session) return client, nil } diff --git a/pkg/core/deployer/providers/volcengine-dcdn/internal/client.go b/pkg/core/deployer/providers/volcengine-dcdn/internal/client.go deleted file mode 100644 index 65d69bce1..000000000 --- a/pkg/core/deployer/providers/volcengine-dcdn/internal/client.go +++ /dev/null @@ -1,104 +0,0 @@ -package internal - -import ( - "github.com/volcengine/volcengine-go-sdk/service/dcdn" - "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/volcengine/volcengine-go-sdk/volcengine/client" - "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" - "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" - "github.com/volcengine/volcengine-go-sdk/volcengine/request" - "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" - "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" -) - -// This is a partial copy of https://github.com/volcengine/volcengine-go-sdk/blob/master/service/dcdn/service_dcdn.go -// to lightweight the vendor packages in the built binary. -type DcdnClient struct { - *client.Client -} - -func NewDcdnClient(p client.ConfigProvider, cfgs ...*volcengine.Config) *DcdnClient { - c := p.ClientConfig(dcdn.EndpointsID, cfgs...) - return newDcdnClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) -} - -func newDcdnClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *DcdnClient { - svc := &DcdnClient{ - Client: client.New( - cfg, - metadata.ClientInfo{ - ServiceName: dcdn.ServiceName, - ServiceID: dcdn.ServiceID, - SigningName: signingName, - SigningRegion: signingRegion, - Endpoint: endpoint, - APIVersion: "2021-04-01", - }, - handlers, - ), - } - - svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) - svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) - svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) - svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) - svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) - svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) - svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) - - return svc -} - -func (c *DcdnClient) newRequest(op *request.Operation, params, data interface{}) *request.Request { - req := c.NewRequest(op, params, data) - - return req -} - -func (c *DcdnClient) CreateCertBind(input *dcdn.CreateCertBindInput) (*dcdn.CreateCertBindOutput, error) { - req, out := c.CreateCertBindRequest(input) - return out, req.Send() -} - -func (c *DcdnClient) CreateCertBindRequest(input *dcdn.CreateCertBindInput) (req *request.Request, output *dcdn.CreateCertBindOutput) { - op := &request.Operation{ - Name: "CreateCertBind", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &dcdn.CreateCertBindInput{} - } - - output = &dcdn.CreateCertBindOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} - -func (c *DcdnClient) ListDomainConfig(input *dcdn.ListDomainConfigInput) (*dcdn.ListDomainConfigOutput, error) { - req, out := c.ListDomainConfigRequest(input) - return out, req.Send() -} - -func (c *DcdnClient) ListDomainConfigRequest(input *dcdn.ListDomainConfigInput) (req *request.Request, output *dcdn.ListDomainConfigOutput) { - op := &request.Operation{ - Name: "ListDomainConfig", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &dcdn.ListDomainConfigInput{} - } - - output = &dcdn.ListDomainConfigOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} diff --git a/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go b/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go index 1de3ed40d..64f7c0edb 100644 --- a/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go +++ b/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go @@ -8,14 +8,13 @@ import ( "strings" "github.com/samber/lo" - vedcdn "github.com/volcengine/volcengine-go-sdk/service/dcdn" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-dcdn/internal" + vedcdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -36,7 +35,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.DcdnClient + sdkClient *vedcdn.DCDN sdkCertmgr certmgr.Provider } @@ -52,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, Region: config.Region, @@ -151,7 +150,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep CertId: ve.String(upres.CertId), DomainNames: ve.StringSlice(domains), } - createCertBindResp, err := d.sdkClient.CreateCertBind(createCertBindReq) + createCertBindResp, err := d.sdkClient.CreateCertBindWithContext(ctx, createCertBindReq) d.logger.Debug("sdk request 'dcdn.CreateCertBind'", slog.Any("request", createCertBindReq), slog.Any("response", createCertBindResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'dcdn.CreateCertBind': %w", err) @@ -178,7 +177,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { PageNumber: ve.Int32(int32(listDomainConfigPageNumber)), PageSize: ve.Int32(int32(listDomainConfigPageSize)), } - listDomainConfigResp, err := d.sdkClient.ListDomainConfig(listDomainConfigReq) + listDomainConfigResp, err := d.sdkClient.ListDomainConfigWithContext(ctx, listDomainConfigReq) d.logger.Debug("sdk request 'dcdn.ListDomainConfig'", slog.Any("request", listDomainConfigReq), slog.Any("response", listDomainConfigResp)) if err != nil { return nil, fmt.Errorf("failed to execute sdk request 'dcdn.ListDomainConfig': %w", err) @@ -203,7 +202,7 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { return domains, nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.DcdnClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*vedcdn.DCDN, error) { if region == "" { region = "cn-beijing" // DCDN 服务默认区域：北京 } @@ -217,6 +216,6 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Dcd return nil, err } - client := internal.NewDcdnClient(session) + client := vedcdn.New(session) return client, nil } diff --git a/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go b/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go index 17df684f6..56914ceec 100644 --- a/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go +++ b/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go @@ -10,7 +10,7 @@ import ( veimagex "github.com/volcengine/volc-sdk-golang/service/imagex/v2" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, Region: config.Region, diff --git a/pkg/core/deployer/providers/volcengine-live/volcengine_live.go b/pkg/core/deployer/providers/volcengine-live/volcengine_live.go index 3e860f4e7..af0401e70 100644 --- a/pkg/core/deployer/providers/volcengine-live/volcengine_live.go +++ b/pkg/core/deployer/providers/volcengine-live/volcengine_live.go @@ -12,7 +12,7 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-live" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-live" "github.com/certimate-go/certimate/pkg/core/deployer" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client.SetAccessKey(config.AccessKeyId) client.SetSecretKey(config.AccessKeySecret) - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) diff --git a/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go b/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go index b70fe895d..9aa5ec06c 100644 --- a/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go +++ b/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go @@ -9,7 +9,7 @@ import ( "github.com/volcengine/ve-tos-golang-sdk/v2/tos" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" "github.com/certimate-go/certimate/pkg/core/deployer" ) @@ -45,7 +45,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, Region: config.Region, diff --git a/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go b/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go index 24acc8f21..3d9f4661f 100644 --- a/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go +++ b/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go @@ -14,7 +14,7 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" "github.com/certimate-go/certimate/pkg/core/deployer" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) @@ -53,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client.SetAccessKey(config.AccessKeyId) client.SetSecretKey(config.AccessKeySecret) - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) diff --git a/pkg/core/deployer/providers/volcengine-waf/internal/client.go b/pkg/core/deployer/providers/volcengine-waf/internal/client.go deleted file mode 100644 index b48f31301..000000000 --- a/pkg/core/deployer/providers/volcengine-waf/internal/client.go +++ /dev/null @@ -1,104 +0,0 @@ -package internal - -import ( - "github.com/volcengine/volcengine-go-sdk/service/waf" - "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/volcengine/volcengine-go-sdk/volcengine/client" - "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" - "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" - "github.com/volcengine/volcengine-go-sdk/volcengine/request" - "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" - "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" -) - -// This is a partial copy of https://github.com/volcengine/volcengine-go-sdk/blob/master/service/waf/service_waf.go -// to lightweight the vendor packages in the built binary. -type WafClient struct { - *client.Client -} - -func NewWafClient(p client.ConfigProvider, cfgs ...*volcengine.Config) *WafClient { - c := p.ClientConfig(waf.EndpointsID, cfgs...) - return newDcdnClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) -} - -func newDcdnClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *WafClient { - svc := &WafClient{ - Client: client.New( - cfg, - metadata.ClientInfo{ - ServiceName: waf.ServiceName, - ServiceID: waf.ServiceID, - SigningName: signingName, - SigningRegion: signingRegion, - Endpoint: endpoint, - APIVersion: "2023-12-25", - }, - handlers, - ), - } - - svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) - svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) - svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) - svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) - svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) - svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) - svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) - - return svc -} - -func (c *WafClient) newRequest(op *request.Operation, params, data interface{}) *request.Request { - req := c.NewRequest(op, params, data) - - return req -} - -func (c *WafClient) UpdateDomain(input *waf.UpdateDomainInput) (*waf.UpdateDomainOutput, error) { - req, out := c.UpdateDomainRequest(input) - return out, req.Send() -} - -func (c *WafClient) UpdateDomainRequest(input *waf.UpdateDomainInput) (req *request.Request, output *waf.UpdateDomainOutput) { - op := &request.Operation{ - Name: "UpdateDomain", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &waf.UpdateDomainInput{} - } - - output = &waf.UpdateDomainOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} - -func (c *WafClient) ListDomain(input *waf.ListDomainInput) (*waf.ListDomainOutput, error) { - req, out := c.ListDomainRequest(input) - return out, req.Send() -} - -func (c *WafClient) ListDomainRequest(input *waf.ListDomainInput) (req *request.Request, output *waf.ListDomainOutput) { - op := &request.Operation{ - Name: "ListDomain", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &waf.ListDomainInput{} - } - - output = &waf.ListDomainOutput{} - req = c.newRequest(op, input, output) - - req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") - - return -} diff --git a/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go b/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go index e580d9f78..4900f848f 100644 --- a/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go +++ b/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go @@ -8,14 +8,13 @@ import ( "strings" "github.com/samber/lo" - vewaf "github.com/volcengine/volcengine-go-sdk/service/waf" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-waf/internal" + vewaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf" ) type DeployerConfig struct { @@ -34,7 +33,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.WafClient + sdkClient *vewaf.WAF sdkCertmgr certmgr.Provider } @@ -50,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, Region: config.Region, @@ -114,7 +113,7 @@ func (d *Deployer) deployWithCNAME(ctx context.Context, cloudCertId string) erro Page: ve.Int32(1), PageSize: ve.Int32(1), } - listDomainResp, err := d.sdkClient.ListDomain(listDomainReq) + listDomainResp, err := d.sdkClient.ListDomainWithContext(ctx, listDomainReq) d.logger.Debug("sdk request 'waf.ListDomain'", slog.Any("request", listDomainReq), slog.Any("response", listDomainResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'waf.ListDomain': %w", err) @@ -151,7 +150,7 @@ func (d *Deployer) deployWithCNAME(ctx context.Context, cloudCertId string) erro updateDomainReq.ProtocolPorts.HTTPS = domainInfo.ProtocolPorts.HTTPS } } - updateDomainResp, err := d.sdkClient.UpdateDomain(updateDomainReq) + updateDomainResp, err := d.sdkClient.UpdateDomainWithContext(ctx, updateDomainReq) d.logger.Debug("sdk request 'waf.UpdateDomain'", slog.Any("request", updateDomainReq), slog.Any("response", updateDomainResp)) if err != nil { return fmt.Errorf("failed to execute sdk request 'waf.UpdateDomain': %w", err) @@ -160,7 +159,7 @@ func (d *Deployer) deployWithCNAME(ctx context.Context, cloudCertId string) erro return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.WafClient, error) { +func createSDKClient(accessKeyId, accessKeySecret, region string) (*vewaf.WAF, error) { config := ve.NewConfig(). WithAkSk(accessKeyId, accessKeySecret). WithRegion(region) @@ -170,6 +169,6 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*internal.Waf return nil, err } - client := internal.NewWafClient(session) + client := vewaf.New(session) return client, nil } diff --git a/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go b/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go index 094666add..bcee38de5 100644 --- a/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go +++ b/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go @@ -11,7 +11,7 @@ import ( "github.com/samber/lo" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/wangsu-certificate" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/wangsu-certificate" "github.com/certimate-go/certimate/pkg/core/deployer" wangsusdk "github.com/certimate-go/certimate/pkg/sdk3rd/wangsu/cdn" ) @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) diff --git a/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go b/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go index 0251e72c1..1ce55e5ae 100644 --- a/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go +++ b/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go @@ -207,7 +207,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info(fmt.Sprintf("waiting for wangsu deployment task completion (current status: %s) ...", getDeploymentTaskDetailResp.Status)) return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return nil, err } diff --git a/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go b/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go index e019fd819..0eb04ebc6 100644 --- a/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go +++ b/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/wangsu-certificate" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/wangsu-certificate" "github.com/certimate-go/certimate/pkg/core/deployer" wangsusdk "github.com/certimate-go/certimate/pkg/sdk3rd/wangsu/certificate" ) @@ -41,7 +41,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) diff --git a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go index 1620b7f76..61d57b70a 100644 --- a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go +++ b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go @@ -11,7 +11,7 @@ import ( zcommon "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-cdn" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-cdn" "github.com/certimate-go/certimate/pkg/core/deployer" zcdnsdk "github.com/certimate-go/certimate/pkg/sdk3rd/zenlayer/cdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" @@ -59,7 +59,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeyPassword: config.AccessKeyPassword, ResourceGroupId: config.ResourceGroupId, @@ -318,7 +318,7 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, cloudDomainId st d.logger.Info("waiting for zenlayer domain deploying completion ...") return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return err } diff --git a/pkg/core/deployer/providers/zenlayer-ga/internal/client.go b/pkg/core/deployer/providers/zenlayer-ga/internal/client.go deleted file mode 100644 index 8f29bde7b..000000000 --- a/pkg/core/deployer/providers/zenlayer-ga/internal/client.go +++ /dev/null @@ -1,40 +0,0 @@ -package internal - -import ( - "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" - zga "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/zga20230706" -) - -// This is a partial copy of https://github.com/zenlayer/zenlayercloud-sdk-go/blob/main/zenlayercloud/zga20230706/client.go -// to lightweight the vendor packages in the built binary. -type ZgaClient struct { - *common.Client -} - -func NewZgaClient(config *common.Config, secretKeyId, secretKeyPassword string) (client *ZgaClient, err error) { - client = &ZgaClient{} - - err = client.InitWithCredential(common.NewCredential(secretKeyId, secretKeyPassword)) - if err != nil { - return nil, err - } - - err = client.WithConfig(config) - if err != nil { - return nil, err - } - - return client, nil -} - -func (c *ZgaClient) DescribeAccelerators(request *zga.DescribeAcceleratorsRequest) (response *zga.DescribeAcceleratorsResponse, err error) { - response = zga.NewDescribeAcceleratorsResponse() - err = c.ApiCall(request, response) - return -} - -func (c *ZgaClient) ModifyAcceleratorCertificate(request *zga.ModifyAcceleratorCertificateRequest) (response *zga.ModifyAcceleratorCertificateResponse, err error) { - response = zga.NewModifyAcceleratorCertificateResponse() - err = c.ApiCall(request, response) - return -} diff --git a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go index d70fac326..6cf17313d 100644 --- a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go +++ b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go @@ -8,12 +8,11 @@ import ( "time" zcommon "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" - zga "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/zga20230706" "github.com/certimate-go/certimate/pkg/core/certmgr" - mcertmgr "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-ga" + certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-ga" "github.com/certimate-go/certimate/pkg/core/deployer" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/zenlayer-ga/internal" + zgasdk "github.com/certimate-go/certimate/pkg/sdk3rd/zenlayer/zga" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) @@ -37,7 +36,7 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkClient *internal.ZgaClient + sdkClient *zgasdk.Client sdkCertmgr certmgr.Provider } @@ -53,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := mcertmgr.NewCertmgr(&mcertmgr.CertmgrConfig{ + pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeyPassword: config.AccessKeyPassword, ResourceGroupId: config.ResourceGroupId, @@ -115,7 +114,7 @@ func (d *Deployer) deployToAccelerator(ctx context.Context, certPEM, privkeyPEM // 查询加速器信息 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/zga/accelerator/describeaccelerators - describeAcceleratorsReq := zga.NewDescribeAcceleratorsRequest() + describeAcceleratorsReq := zgasdk.NewDescribeAcceleratorsRequest() describeAcceleratorsReq.AcceleratorIds = []string{d.config.AcceleratorId} describeAcceleratorsReq.PageNum = 1 describeAcceleratorsReq.PageSize = 1 @@ -131,7 +130,7 @@ func (d *Deployer) deployToAccelerator(ctx context.Context, certPEM, privkeyPEM // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/zga/accelerator/modifyacceleratorcertificate acceleratorInfo := describeAcceleratorsResp.Response.DataSet[0] if acceleratorInfo.Certificate == nil || acceleratorInfo.Certificate.CertificateId != upres.CertId { - modifyAcceleratorCertificateReq := zga.NewModifyAcceleratorCertificateRequest() + modifyAcceleratorCertificateReq := zgasdk.NewModifyAcceleratorCertificateRequest() modifyAcceleratorCertificateReq.AcceleratorId = acceleratorInfo.AcceleratorId modifyAcceleratorCertificateReq.CertificateId = upres.CertId modifyAcceleratorCertificateResp, err := d.sdkClient.ModifyAcceleratorCertificate(modifyAcceleratorCertificateReq) @@ -144,7 +143,7 @@ func (d *Deployer) deployToAccelerator(ctx context.Context, certPEM, privkeyPEM // 查询加速器状态，等待部署状态变更 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/zga/accelerator/describeaccelerators if _, err := xwait.UntilWithContext(ctx, func(_ context.Context, _ int) (bool, error) { - describeAcceleratorsReq := zga.NewDescribeAcceleratorsRequest() + describeAcceleratorsReq := zgasdk.NewDescribeAcceleratorsRequest() describeAcceleratorsReq.AcceleratorIds = []string{acceleratorInfo.AcceleratorId} describeAcceleratorsReq.PageNum = 1 describeAcceleratorsReq.PageSize = 1 @@ -165,7 +164,7 @@ func (d *Deployer) deployToAccelerator(ctx context.Context, certPEM, privkeyPEM d.logger.Info("waiting for zenlayer accelerator deploying completion ...") return false, nil - }, time.Second*5); err != nil { + }, 10*time.Second); err != nil { return err } @@ -188,10 +187,10 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM return nil } -func createSDKClient(accessKeyId, accessKeyPassword string) (*internal.ZgaClient, error) { +func createSDKClient(accessKeyId, accessKeyPassword string) (*zgasdk.Client, error) { config := zcommon.NewConfig() - client, err := internal.NewZgaClient(config, accessKeyId, accessKeyPassword) + client, err := zgasdk.NewClient(config, accessKeyId, accessKeyPassword) if err != nil { return nil, err } diff --git a/pkg/core/shared.go b/pkg/core/shared.go deleted file mode 100644 index e83a1900e..000000000 --- a/pkg/core/shared.go +++ /dev/null @@ -1,9 +0,0 @@ -package core - -import ( - "log/slog" -) - -type WithLogger interface { - SetLogger(logger *slog.Logger) -} diff --git a/pkg/sdk3rd-forks/README b/pkg/sdk3rd-forks/README index a48ccbd15..b65e65e20 100644 --- a/pkg/sdk3rd-forks/README +++ b/pkg/sdk3rd-forks/README @@ -1,3 +1,3 @@ 此目录下存放对依赖包的分叉，通常因为它们原本位于私有仓库中。 -This directory stores the forks of dependent packages, usually because they were originally located in private repositories. +This directory stores the forks of package dependencies, usually because they were originally located in private repositories. diff --git a/pkg/sdk3rd-trimmed/README b/pkg/sdk3rd-trimmed/README new file mode 100644 index 000000000..96b49db80 --- /dev/null +++ b/pkg/sdk3rd-trimmed/README @@ -0,0 +1,3 @@ +此目录下存放对依赖包的裁剪，以使构建的二进制轻量化。 + +This directory stores the partial copy of package dependencies, to lightweight the built binary output. diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/client.go new file mode 100644 index 000000000..81fb5ba9d --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-alb/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/client_context_func.go similarity index 61% rename from pkg/core/deployer/providers/aliyun-alb/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/client_context_func.go index 6cfb1b042..94f58a4b2 100644 --- a/pkg/core/deployer/providers/aliyun-alb/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/client_context_func.go @@ -1,108 +1,20 @@ -package internal +package client import ( "context" - alialb "github.com/alibabacloud-go/alb-20200616/v2/client" - alicas "github.com/alibabacloud-go/cas-20200407/v4/client" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" "github.com/alibabacloud-go/tea/dara" ) -// This is a partial copy of https://github.com/alibabacloud-go/cas-20200407/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type CasClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewCasClient(config *openapiutil.Config) (*CasClient, error) { - client := new(CasClient) - err := client.Init(config) - return client, err -} - -func (client *CasClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *CasClient) GetCertificateDetailWithContext(ctx context.Context, request *alicas.GetCertificateDetailRequest, runtime *dara.RuntimeOptions) (_result *alicas.GetCertificateDetailResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - - query := map[string]interface{}{} - if !dara.IsNil(request.CertificateId) { - query["CertificateId"] = request.CertificateId - } - - req := &openapiutil.OpenApiRequest{ - Query: openapiutil.Query(query), - } - params := &openapiutil.Params{ - Action: dara.String("GetCertificateDetail"), - Version: dara.String("2020-04-07"), - Protocol: dara.String("HTTPS"), - Pathname: dara.String("/"), - Method: dara.String("POST"), - AuthType: dara.String("AK"), - Style: dara.String("RPC"), - ReqBodyType: dara.String("formData"), - BodyType: dara.String("json"), - } - _result = &alicas.GetCertificateDetailResponse{} - _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) - if _err != nil { - return _result, _err - } - _err = dara.Convert(_body, &_result) - return _result, _err -} - -// This is a partial copy of https://github.com/alibabacloud-go/alb-20200616/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type AlbClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewAlbClient(config *openapiutil.Config) (*AlbClient, error) { - client := new(AlbClient) - err := client.Init(config) - return client, err -} - -func (client *AlbClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *AlbClient) AssociateAdditionalCertificatesWithListenerWithContext(ctx context.Context, request *alialb.AssociateAdditionalCertificatesWithListenerRequest, runtime *dara.RuntimeOptions) (_result *alialb.AssociateAdditionalCertificatesWithListenerResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) AssociateAdditionalCertificatesWithListenerWithContext(ctx context.Context, request *AssociateAdditionalCertificatesWithListenerRequest, runtime *dara.RuntimeOptions) (_result *AssociateAdditionalCertificatesWithListenerResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.Certificates) { query["Certificates"] = request.Certificates } @@ -133,7 +45,7 @@ func (client *AlbClient) AssociateAdditionalCertificatesWithListenerWithContext( ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alialb.AssociateAdditionalCertificatesWithListenerResponse{} + _result = &AssociateAdditionalCertificatesWithListenerResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -142,13 +54,14 @@ func (client *AlbClient) AssociateAdditionalCertificatesWithListenerWithContext( return _result, _err } -func (client *AlbClient) DissociateAdditionalCertificatesFromListenerWithContext(ctx context.Context, request *alialb.DissociateAdditionalCertificatesFromListenerRequest, runtime *dara.RuntimeOptions) (_result *alialb.DissociateAdditionalCertificatesFromListenerResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DissociateAdditionalCertificatesFromListenerWithContext(ctx context.Context, request *DissociateAdditionalCertificatesFromListenerRequest, runtime *dara.RuntimeOptions) (_result *DissociateAdditionalCertificatesFromListenerResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.Certificates) { query["Certificates"] = request.Certificates } @@ -179,7 +92,7 @@ func (client *AlbClient) DissociateAdditionalCertificatesFromListenerWithContext ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alialb.DissociateAdditionalCertificatesFromListenerResponse{} + _result = &DissociateAdditionalCertificatesFromListenerResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -188,13 +101,14 @@ func (client *AlbClient) DissociateAdditionalCertificatesFromListenerWithContext return _result, _err } -func (client *AlbClient) GetListenerAttributeWithContext(ctx context.Context, request *alialb.GetListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *alialb.GetListenerAttributeResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) GetListenerAttributeWithContext(ctx context.Context, request *GetListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *GetListenerAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.ListenerId) { query["ListenerId"] = request.ListenerId } @@ -213,7 +127,7 @@ func (client *AlbClient) GetListenerAttributeWithContext(ctx context.Context, re ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alialb.GetListenerAttributeResponse{} + _result = &GetListenerAttributeResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -222,13 +136,14 @@ func (client *AlbClient) GetListenerAttributeWithContext(ctx context.Context, re return _result, _err } -func (client *AlbClient) GetLoadBalancerAttributeWithContext(ctx context.Context, request *alialb.GetLoadBalancerAttributeRequest, runtime *dara.RuntimeOptions) (_result *alialb.GetLoadBalancerAttributeResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) GetLoadBalancerAttributeWithContext(ctx context.Context, request *GetLoadBalancerAttributeRequest, runtime *dara.RuntimeOptions) (_result *GetLoadBalancerAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.LoadBalancerId) { query["LoadBalancerId"] = request.LoadBalancerId } @@ -247,7 +162,7 @@ func (client *AlbClient) GetLoadBalancerAttributeWithContext(ctx context.Context ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alialb.GetLoadBalancerAttributeResponse{} + _result = &GetLoadBalancerAttributeResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -256,13 +171,14 @@ func (client *AlbClient) GetLoadBalancerAttributeWithContext(ctx context.Context return _result, _err } -func (client *AlbClient) ListListenerCertificatesWithContext(ctx context.Context, request *alialb.ListListenerCertificatesRequest, runtime *dara.RuntimeOptions) (_result *alialb.ListListenerCertificatesResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) ListListenerCertificatesWithContext(ctx context.Context, request *ListListenerCertificatesRequest, runtime *dara.RuntimeOptions) (_result *ListListenerCertificatesResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.CertificateIds) { query["CertificateIds"] = request.CertificateIds } @@ -297,7 +213,7 @@ func (client *AlbClient) ListListenerCertificatesWithContext(ctx context.Context ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alialb.ListListenerCertificatesResponse{} + _result = &ListListenerCertificatesResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -306,13 +222,14 @@ func (client *AlbClient) ListListenerCertificatesWithContext(ctx context.Context return _result, _err } -func (client *AlbClient) ListListenersWithContext(ctx context.Context, request *alialb.ListListenersRequest, runtime *dara.RuntimeOptions) (_result *alialb.ListListenersResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) ListListenersWithContext(ctx context.Context, request *ListListenersRequest, runtime *dara.RuntimeOptions) (_result *ListListenersResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.ListenerIds) { query["ListenerIds"] = request.ListenerIds } @@ -351,7 +268,7 @@ func (client *AlbClient) ListListenersWithContext(ctx context.Context, request * ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alialb.ListListenersResponse{} + _result = &ListListenersResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -360,13 +277,14 @@ func (client *AlbClient) ListListenersWithContext(ctx context.Context, request * return _result, _err } -func (client *AlbClient) UpdateListenerAttributeWithContext(ctx context.Context, request *alialb.UpdateListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *alialb.UpdateListenerAttributeResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) UpdateListenerAttributeWithContext(ctx context.Context, request *UpdateListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *UpdateListenerAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.CaCertificates) { query["CaCertificates"] = request.CaCertificates } @@ -441,7 +359,7 @@ func (client *AlbClient) UpdateListenerAttributeWithContext(ctx context.Context, ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alialb.UpdateListenerAttributeResponse{} + _result = &UpdateListenerAttributeResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/models.go new file mode 100644 index 000000000..9850b426b --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client/models.go @@ -0,0 +1,41 @@ +package client + +import ( + alialb "github.com/alibabacloud-go/alb-20200616/v2/client" +) + +type AssociateAdditionalCertificatesWithListenerRequest = alialb.AssociateAdditionalCertificatesWithListenerRequest + +type AssociateAdditionalCertificatesWithListenerRequestCertificates = alialb.AssociateAdditionalCertificatesWithListenerRequestCertificates + +type AssociateAdditionalCertificatesWithListenerResponse = alialb.AssociateAdditionalCertificatesWithListenerResponse + +type DissociateAdditionalCertificatesFromListenerRequest = alialb.DissociateAdditionalCertificatesFromListenerRequest + +type DissociateAdditionalCertificatesFromListenerRequestCertificates = alialb.DissociateAdditionalCertificatesFromListenerRequestCertificates + +type DissociateAdditionalCertificatesFromListenerResponse = alialb.DissociateAdditionalCertificatesFromListenerResponse + +type GetListenerAttributeRequest = alialb.GetListenerAttributeRequest + +type GetListenerAttributeResponse = alialb.GetListenerAttributeResponse + +type GetLoadBalancerAttributeRequest = alialb.GetLoadBalancerAttributeRequest + +type GetLoadBalancerAttributeResponse = alialb.GetLoadBalancerAttributeResponse + +type ListListenerCertificatesRequest = alialb.ListListenerCertificatesRequest + +type ListListenerCertificatesResponse = alialb.ListListenerCertificatesResponse + +type ListListenerCertificatesResponseBodyCertificates = alialb.ListListenerCertificatesResponseBodyCertificates + +type ListListenersRequest = alialb.ListListenersRequest + +type ListListenersResponse = alialb.ListListenersResponse + +type UpdateListenerAttributeRequest = alialb.UpdateListenerAttributeRequest + +type UpdateListenerAttributeRequestCertificates = alialb.UpdateListenerAttributeRequestCertificates + +type UpdateListenerAttributeResponse = alialb.UpdateListenerAttributeResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/client.go new file mode 100644 index 000000000..81fb5ba9d --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/client_context_func.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/client_context_func.go new file mode 100644 index 000000000..276dccc56 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/client_context_func.go @@ -0,0 +1,172 @@ +package client + +import ( + "context" + + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" + "github.com/alibabacloud-go/tea/dara" +) + +func (client *Client) GetDomainWithContext(ctx context.Context, domainId *string, request *GetDomainRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *GetDomainResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.WithStatistics) { + query["withStatistics"] = request.WithStatistics + } + + req := &openapiutil.OpenApiRequest{ + Headers: headers, + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("GetDomain"), + Version: dara.String("2024-03-27"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/v1/domains/" + dara.PercentEncode(dara.StringValue(domainId))), + Method: dara.String("GET"), + AuthType: dara.String("AK"), + Style: dara.String("ROA"), + ReqBodyType: dara.String("json"), + BodyType: dara.String("json"), + } + _result = &GetDomainResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) ListDomainsWithContext(ctx context.Context, request *ListDomainsRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *ListDomainsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.GatewayId) { + query["gatewayId"] = request.GatewayId + } + + if !dara.IsNil(request.GatewayType) { + query["gatewayType"] = request.GatewayType + } + + if !dara.IsNil(request.NameLike) { + query["nameLike"] = request.NameLike + } + + if !dara.IsNil(request.PageNumber) { + query["pageNumber"] = request.PageNumber + } + + if !dara.IsNil(request.PageSize) { + query["pageSize"] = request.PageSize + } + + if !dara.IsNil(request.ResourceGroupId) { + query["resourceGroupId"] = request.ResourceGroupId + } + + req := &openapiutil.OpenApiRequest{ + Headers: headers, + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("ListDomains"), + Version: dara.String("2024-03-27"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/v1/domains"), + Method: dara.String("GET"), + AuthType: dara.String("AK"), + Style: dara.String("ROA"), + ReqBodyType: dara.String("json"), + BodyType: dara.String("json"), + } + _result = &ListDomainsResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) UpdateDomainWithContext(ctx context.Context, domainId *string, request *UpdateDomainRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *UpdateDomainResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + body := map[string]interface{}{} + if !dara.IsNil(request.CaCertIdentifier) { + body["caCertIdentifier"] = request.CaCertIdentifier + } + + if !dara.IsNil(request.CertIdentifier) { + body["certIdentifier"] = request.CertIdentifier + } + + if !dara.IsNil(request.ClientCACert) { + body["clientCACert"] = request.ClientCACert + } + + if !dara.IsNil(request.ForceHttps) { + body["forceHttps"] = request.ForceHttps + } + + if !dara.IsNil(request.Http2Option) { + body["http2Option"] = request.Http2Option + } + + if !dara.IsNil(request.MTLSEnabled) { + body["mTLSEnabled"] = request.MTLSEnabled + } + + if !dara.IsNil(request.Protocol) { + body["protocol"] = request.Protocol + } + + if !dara.IsNil(request.TlsCipherSuitesConfig) { + body["tlsCipherSuitesConfig"] = request.TlsCipherSuitesConfig + } + + if !dara.IsNil(request.TlsMax) { + body["tlsMax"] = request.TlsMax + } + + if !dara.IsNil(request.TlsMin) { + body["tlsMin"] = request.TlsMin + } + + req := &openapiutil.OpenApiRequest{ + Headers: headers, + Body: openapiutil.ParseToMap(body), + } + params := &openapiutil.Params{ + Action: dara.String("UpdateDomain"), + Version: dara.String("2024-03-27"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/v1/domains/" + dara.PercentEncode(dara.StringValue(domainId))), + Method: dara.String("PUT"), + AuthType: dara.String("AK"), + Style: dara.String("ROA"), + ReqBodyType: dara.String("json"), + BodyType: dara.String("json"), + } + _result = &UpdateDomainResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/models.go new file mode 100644 index 000000000..6e6d2f21d --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client/models.go @@ -0,0 +1,17 @@ +package client + +import ( + aliapig "github.com/alibabacloud-go/apig-20240327/v6/client" +) + +type GetDomainRequest = aliapig.GetDomainRequest + +type GetDomainResponse = aliapig.GetDomainResponse + +type ListDomainsRequest = aliapig.ListDomainsRequest + +type ListDomainsResponse = aliapig.ListDomainsResponse + +type UpdateDomainRequest = aliapig.UpdateDomainRequest + +type UpdateDomainResponse = aliapig.UpdateDomainResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/client.go new file mode 100644 index 000000000..81fb5ba9d --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/client_context_func.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/client_context_func.go new file mode 100644 index 000000000..cfb4fa7a5 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/client_context_func.go @@ -0,0 +1,337 @@ +package client + +import ( + "context" + + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" + "github.com/alibabacloud-go/tea/dara" +) + +func (client *Client) CreateDeploymentJobWithContext(ctx context.Context, request *CreateDeploymentJobRequest, runtime *dara.RuntimeOptions) (_result *CreateDeploymentJobResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.CertIds) { + query["CertIds"] = request.CertIds + } + + if !dara.IsNil(request.ContactIds) { + query["ContactIds"] = request.ContactIds + } + + if !dara.IsNil(request.JobType) { + query["JobType"] = request.JobType + } + + if !dara.IsNil(request.Name) { + query["Name"] = request.Name + } + + if !dara.IsNil(request.ResourceIds) { + query["ResourceIds"] = request.ResourceIds + } + + if !dara.IsNil(request.ScheduleTime) { + query["ScheduleTime"] = request.ScheduleTime + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("CreateDeploymentJob"), + Version: dara.String("2020-04-07"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &CreateDeploymentJobResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) DescribeDeploymentJobWithContext(ctx context.Context, request *DescribeDeploymentJobRequest, runtime *dara.RuntimeOptions) (_result *DescribeDeploymentJobResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.JobId) { + query["JobId"] = request.JobId + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("DescribeDeploymentJob"), + Version: dara.String("2020-04-07"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &DescribeDeploymentJobResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) GetCertificateDetailWithContext(ctx context.Context, request *GetCertificateDetailRequest, runtime *dara.RuntimeOptions) (_result *GetCertificateDetailResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.CertificateId) { + query["CertificateId"] = request.CertificateId + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("GetCertificateDetail"), + Version: dara.String("2020-04-07"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &GetCertificateDetailResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) GetUserCertificateDetailWithContext(ctx context.Context, request *GetUserCertificateDetailRequest, runtime *dara.RuntimeOptions) (_result *GetUserCertificateDetailResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.CertFilter) { + query["CertFilter"] = request.CertFilter + } + + if !dara.IsNil(request.CertId) { + query["CertId"] = request.CertId + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("GetUserCertificateDetail"), + Version: dara.String("2020-04-07"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &GetUserCertificateDetailResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) ListContactWithContext(ctx context.Context, request *ListContactRequest, runtime *dara.RuntimeOptions) (_result *ListContactResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.CurrentPage) { + query["CurrentPage"] = request.CurrentPage + } + + if !dara.IsNil(request.Keyword) { + query["Keyword"] = request.Keyword + } + + if !dara.IsNil(request.ShowSize) { + query["ShowSize"] = request.ShowSize + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("ListContact"), + Version: dara.String("2020-04-07"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &ListContactResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) ListUserCertificateOrderWithContext(ctx context.Context, request *ListUserCertificateOrderRequest, runtime *dara.RuntimeOptions) (_result *ListUserCertificateOrderResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.CurrentPage) { + query["CurrentPage"] = request.CurrentPage + } + + if !dara.IsNil(request.Keyword) { + query["Keyword"] = request.Keyword + } + + if !dara.IsNil(request.OrderType) { + query["OrderType"] = request.OrderType + } + + if !dara.IsNil(request.ResourceGroupId) { + query["ResourceGroupId"] = request.ResourceGroupId + } + + if !dara.IsNil(request.ShowSize) { + query["ShowSize"] = request.ShowSize + } + + if !dara.IsNil(request.Status) { + query["Status"] = request.Status + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("ListUserCertificateOrder"), + Version: dara.String("2020-04-07"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &ListUserCertificateOrderResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) UploadUserCertificateWithContext(ctx context.Context, request *UploadUserCertificateRequest, runtime *dara.RuntimeOptions) (_result *UploadUserCertificateResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.Cert) { + query["Cert"] = request.Cert + } + + if !dara.IsNil(request.EncryptCert) { + query["EncryptCert"] = request.EncryptCert + } + + if !dara.IsNil(request.EncryptPrivateKey) { + query["EncryptPrivateKey"] = request.EncryptPrivateKey + } + + if !dara.IsNil(request.Key) { + query["Key"] = request.Key + } + + if !dara.IsNil(request.Name) { + query["Name"] = request.Name + } + + if !dara.IsNil(request.ResourceGroupId) { + query["ResourceGroupId"] = request.ResourceGroupId + } + + if !dara.IsNil(request.SignCert) { + query["SignCert"] = request.SignCert + } + + if !dara.IsNil(request.SignPrivateKey) { + query["SignPrivateKey"] = request.SignPrivateKey + } + + if !dara.IsNil(request.Tags) { + query["Tags"] = request.Tags + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("UploadUserCertificate"), + Version: dara.String("2020-04-07"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &UploadUserCertificateResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/models.go new file mode 100644 index 000000000..464978d0c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client/models.go @@ -0,0 +1,33 @@ +package client + +import ( + alicas "github.com/alibabacloud-go/cas-20200407/v4/client" +) + +type CreateDeploymentJobRequest = alicas.CreateDeploymentJobRequest + +type CreateDeploymentJobResponse = alicas.CreateDeploymentJobResponse + +type DescribeDeploymentJobRequest = alicas.DescribeDeploymentJobRequest + +type DescribeDeploymentJobResponse = alicas.DescribeDeploymentJobResponse + +type GetCertificateDetailRequest = alicas.GetCertificateDetailRequest + +type GetCertificateDetailResponse = alicas.GetCertificateDetailResponse + +type GetUserCertificateDetailRequest = alicas.GetUserCertificateDetailRequest + +type GetUserCertificateDetailResponse = alicas.GetUserCertificateDetailResponse + +type ListContactRequest = alicas.ListContactRequest + +type ListContactResponse = alicas.ListContactResponse + +type ListUserCertificateOrderRequest = alicas.ListUserCertificateOrderRequest + +type ListUserCertificateOrderResponse = alicas.ListUserCertificateOrderResponse + +type UploadUserCertificateRequest = alicas.UploadUserCertificateRequest + +type UploadUserCertificateResponse = alicas.UploadUserCertificateResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/client.go new file mode 100644 index 000000000..17a0f497c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-cdn/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/client_context_func.go similarity index 71% rename from pkg/core/deployer/providers/aliyun-cdn/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/client_context_func.go index d0e58d35e..174ebd6fe 100644 --- a/pkg/core/deployer/providers/aliyun-cdn/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/client_context_func.go @@ -1,47 +1,20 @@ -package internal +package client import ( "context" - alicdn "github.com/alibabacloud-go/cdn-20180510/v9/client" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" "github.com/alibabacloud-go/tea/dara" ) -// This is a partial copy of https://github.com/alibabacloud-go/cdn-20180510/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type CdnClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewCdnClient(config *openapiutil.Config) (*CdnClient, error) { - client := new(CdnClient) - err := client.Init(config) - return client, err -} - -func (client *CdnClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *CdnClient) DescribeUserDomainsWithContext(ctx context.Context, request *alicdn.DescribeUserDomainsRequest, runtime *dara.RuntimeOptions) (_result *alicdn.DescribeUserDomainsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeUserDomainsWithContext(ctx context.Context, request *DescribeUserDomainsRequest, runtime *dara.RuntimeOptions) (_result *DescribeUserDomainsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.CdnType) { query["CdnType"] = request.CdnType } @@ -116,7 +89,7 @@ func (client *CdnClient) DescribeUserDomainsWithContext(ctx context.Context, req ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alicdn.DescribeUserDomainsResponse{} + _result = &DescribeUserDomainsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -125,13 +98,14 @@ func (client *CdnClient) DescribeUserDomainsWithContext(ctx context.Context, req return _result, _err } -func (client *CdnClient) SetCdnDomainSSLCertificateWithContext(ctx context.Context, request *alicdn.SetCdnDomainSSLCertificateRequest, runtime *dara.RuntimeOptions) (_result *alicdn.SetCdnDomainSSLCertificateResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) SetCdnDomainSSLCertificateWithContext(ctx context.Context, request *SetCdnDomainSSLCertificateRequest, runtime *dara.RuntimeOptions) (_result *SetCdnDomainSSLCertificateResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.CertId) { query["CertId"] = request.CertId } @@ -186,7 +160,7 @@ func (client *CdnClient) SetCdnDomainSSLCertificateWithContext(ctx context.Conte ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alicdn.SetCdnDomainSSLCertificateResponse{} + _result = &SetCdnDomainSSLCertificateResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/models.go new file mode 100644 index 000000000..17bd0a018 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client/models.go @@ -0,0 +1,13 @@ +package client + +import ( + alicdn "github.com/alibabacloud-go/cdn-20180510/v9/client" +) + +type DescribeUserDomainsRequest = alicdn.DescribeUserDomainsRequest + +type DescribeUserDomainsResponse = alicdn.DescribeUserDomainsResponse + +type SetCdnDomainSSLCertificateRequest = alicdn.SetCdnDomainSSLCertificateRequest + +type SetCdnDomainSSLCertificateResponse = alicdn.SetCdnDomainSSLCertificateResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/client.go new file mode 100644 index 000000000..81fb5ba9d --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/client_context_func.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/client_context_func.go new file mode 100644 index 000000000..1d92a66d6 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/client_context_func.go @@ -0,0 +1,126 @@ +package client + +import ( + "context" + + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" + "github.com/alibabacloud-go/tea/dara" +) + +func (client *Client) DescribeApiGroupWithContext(ctx context.Context, request *DescribeApiGroupRequest, runtime *dara.RuntimeOptions) (_result *DescribeApiGroupResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.GroupId) { + query["GroupId"] = request.GroupId + } + + if !dara.IsNil(request.SecurityToken) { + query["SecurityToken"] = request.SecurityToken + } + + if !dara.IsNil(request.Tag) { + query["Tag"] = request.Tag + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("DescribeApiGroup"), + Version: dara.String("2016-07-14"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &DescribeApiGroupResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) SetDomainCertificateWithContext(ctx context.Context, request *SetDomainCertificateRequest, runtime *dara.RuntimeOptions) (_result *SetDomainCertificateResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.CaCertificateBody) { + query["CaCertificateBody"] = request.CaCertificateBody + } + + if !dara.IsNil(request.CertificateBody) { + query["CertificateBody"] = request.CertificateBody + } + + if !dara.IsNil(request.CertificateName) { + query["CertificateName"] = request.CertificateName + } + + if !dara.IsNil(request.CertificatePrivateKey) { + query["CertificatePrivateKey"] = request.CertificatePrivateKey + } + + if !dara.IsNil(request.ClientCertSDnPassThrough) { + query["ClientCertSDnPassThrough"] = request.ClientCertSDnPassThrough + } + + if !dara.IsNil(request.DomainName) { + query["DomainName"] = request.DomainName + } + + if !dara.IsNil(request.GroupId) { + query["GroupId"] = request.GroupId + } + + if !dara.IsNil(request.SecurityToken) { + query["SecurityToken"] = request.SecurityToken + } + + if !dara.IsNil(request.SslOcspCacheEnable) { + query["SslOcspCacheEnable"] = request.SslOcspCacheEnable + } + + if !dara.IsNil(request.SslOcspEnable) { + query["SslOcspEnable"] = request.SslOcspEnable + } + + if !dara.IsNil(request.SslVerifyDepth) { + query["SslVerifyDepth"] = request.SslVerifyDepth + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("SetDomainCertificate"), + Version: dara.String("2016-07-14"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &SetDomainCertificateResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/models.go new file mode 100644 index 000000000..8d2a71ba8 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client/models.go @@ -0,0 +1,13 @@ +package client + +import ( + alicloudapi "github.com/alibabacloud-go/cloudapi-20160714/v5/client" +) + +type DescribeApiGroupRequest = alicloudapi.DescribeApiGroupRequest + +type DescribeApiGroupResponse = alicloudapi.DescribeApiGroupResponse + +type SetDomainCertificateRequest = alicloudapi.SetDomainCertificateRequest + +type SetDomainCertificateResponse = alicloudapi.SetDomainCertificateResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/client.go new file mode 100644 index 000000000..17a0f497c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-dcdn/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/client_context_func.go similarity index 70% rename from pkg/core/deployer/providers/aliyun-dcdn/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/client_context_func.go index 9dc6fc704..b80e3e751 100644 --- a/pkg/core/deployer/providers/aliyun-dcdn/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/client_context_func.go @@ -1,47 +1,20 @@ -package internal +package client import ( "context" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - alidcdn "github.com/alibabacloud-go/dcdn-20180115/v4/client" "github.com/alibabacloud-go/tea/dara" ) -// This is a partial copy of https://github.com/alibabacloud-go/dcdn-20180115/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type DcdnClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewDcdnClient(config *openapiutil.Config) (*DcdnClient, error) { - client := new(DcdnClient) - err := client.Init(config) - return client, err -} - -func (client *DcdnClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *DcdnClient) DescribeDcdnUserDomainsWithContext(ctx context.Context, request *alidcdn.DescribeDcdnUserDomainsRequest, runtime *dara.RuntimeOptions) (_result *alidcdn.DescribeDcdnUserDomainsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeDcdnUserDomainsWithContext(ctx context.Context, request *DescribeDcdnUserDomainsRequest, runtime *dara.RuntimeOptions) (_result *DescribeDcdnUserDomainsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.ChangeEndTime) { query["ChangeEndTime"] = request.ChangeEndTime } @@ -112,7 +85,7 @@ func (client *DcdnClient) DescribeDcdnUserDomainsWithContext(ctx context.Context ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alidcdn.DescribeDcdnUserDomainsResponse{} + _result = &DescribeDcdnUserDomainsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -121,13 +94,14 @@ func (client *DcdnClient) DescribeDcdnUserDomainsWithContext(ctx context.Context return _result, _err } -func (client *DcdnClient) SetDcdnDomainSSLCertificateWithContext(ctx context.Context, request *alidcdn.SetDcdnDomainSSLCertificateRequest, runtime *dara.RuntimeOptions) (_result *alidcdn.SetDcdnDomainSSLCertificateResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) SetDcdnDomainSSLCertificateWithContext(ctx context.Context, request *SetDcdnDomainSSLCertificateRequest, runtime *dara.RuntimeOptions) (_result *SetDcdnDomainSSLCertificateResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.CertId) { query["CertId"] = request.CertId } @@ -182,7 +156,7 @@ func (client *DcdnClient) SetDcdnDomainSSLCertificateWithContext(ctx context.Con ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alidcdn.SetDcdnDomainSSLCertificateResponse{} + _result = &SetDcdnDomainSSLCertificateResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/models.go new file mode 100644 index 000000000..d4a86e718 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client/models.go @@ -0,0 +1,13 @@ +package client + +import ( + alidcdn "github.com/alibabacloud-go/dcdn-20180115/v4/client" +) + +type DescribeDcdnUserDomainsRequest = alidcdn.DescribeDcdnUserDomainsRequest + +type DescribeDcdnUserDomainsResponse = alidcdn.DescribeDcdnUserDomainsResponse + +type SetDcdnDomainSSLCertificateRequest = alidcdn.SetDcdnDomainSSLCertificateRequest + +type SetDcdnDomainSSLCertificateResponse = alidcdn.SetDcdnDomainSSLCertificateResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/client.go new file mode 100644 index 000000000..17a0f497c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-ddospro/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/client_context_func.go similarity index 59% rename from pkg/core/deployer/providers/aliyun-ddospro/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/client_context_func.go index 560fe2702..30993a175 100644 --- a/pkg/core/deployer/providers/aliyun-ddospro/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/client_context_func.go @@ -1,47 +1,20 @@ -package internal +package client import ( "context" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - aliddoscoo "github.com/alibabacloud-go/ddoscoo-20200101/v5/client" "github.com/alibabacloud-go/tea/dara" ) -// This is a partial copy of https://github.com/alibabacloud-go/ddoscoo-20200101/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type DdoscooClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewDdoscooClient(config *openapiutil.Config) (*DdoscooClient, error) { - client := new(DdoscooClient) - err := client.Init(config) - return client, err -} - -func (client *DdoscooClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *DdoscooClient) AssociateWebCertWithContext(ctx context.Context, request *aliddoscoo.AssociateWebCertRequest, runtime *dara.RuntimeOptions) (_result *aliddoscoo.AssociateWebCertResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) AssociateWebCertWithContext(ctx context.Context, request *AssociateWebCertRequest, runtime *dara.RuntimeOptions) (_result *AssociateWebCertResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } body := map[string]interface{}{} - if !dara.IsNil(request.Cert) { body["Cert"] = request.Cert } @@ -84,7 +57,7 @@ func (client *DdoscooClient) AssociateWebCertWithContext(ctx context.Context, re ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliddoscoo.AssociateWebCertResponse{} + _result = &AssociateWebCertResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -93,13 +66,14 @@ func (client *DdoscooClient) AssociateWebCertWithContext(ctx context.Context, re return _result, _err } -func (client *DdoscooClient) DescribeDomainsWithContext(ctx context.Context, request *aliddoscoo.DescribeDomainsRequest, runtime *dara.RuntimeOptions) (_result *aliddoscoo.DescribeDomainsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeDomainsWithContext(ctx context.Context, request *DescribeDomainsRequest, runtime *dara.RuntimeOptions) (_result *DescribeDomainsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.InstanceIds) { query["InstanceIds"] = request.InstanceIds } @@ -122,7 +96,7 @@ func (client *DdoscooClient) DescribeDomainsWithContext(ctx context.Context, req ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliddoscoo.DescribeDomainsResponse{} + _result = &DescribeDomainsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/models.go new file mode 100644 index 000000000..9b0b007a7 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client/models.go @@ -0,0 +1,13 @@ +package client + +import ( + aliddoscoo "github.com/alibabacloud-go/ddoscoo-20200101/v5/client" +) + +type AssociateWebCertRequest = aliddoscoo.AssociateWebCertRequest + +type AssociateWebCertResponse = aliddoscoo.AssociateWebCertResponse + +type DescribeDomainsRequest = aliddoscoo.DescribeDomainsRequest + +type DescribeDomainsResponse = aliddoscoo.DescribeDomainsResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/client.go new file mode 100644 index 000000000..17a0f497c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-esa-saas/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/client_context_func.go similarity index 51% rename from pkg/core/deployer/providers/aliyun-esa-saas/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/client_context_func.go index d15fa2856..da4e6a7d3 100644 --- a/pkg/core/deployer/providers/aliyun-esa-saas/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/client_context_func.go @@ -1,46 +1,92 @@ -package internal +package client import ( "context" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - aliesa "github.com/alibabacloud-go/esa-20240910/v2/client" "github.com/alibabacloud-go/tea/dara" ) -// This is a partial copy of https://github.com/alibabacloud-go/esa-20240910/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type EsaClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewEsaClient(config *openapiutil.Config) (*EsaClient, error) { - client := new(EsaClient) - err := client.Init(config) - return client, err -} - -func (client *EsaClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err +func (client *Client) SetCertificateWithContext(ctx context.Context, request *SetCertificateRequest, runtime *dara.RuntimeOptions) (_result *SetCertificateResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } - _err = client.CheckConfig(config) - if _err != nil { - return _err + query := map[string]interface{}{} + if !dara.IsNil(request.KeyServerId) { + query["KeyServerId"] = request.KeyServerId } - return nil -} + if !dara.IsNil(request.SecurityToken) { + query["SecurityToken"] = request.SecurityToken + } -func (client *EsaClient) ListCustomHostnamesWithContext(ctx context.Context, request *aliesa.ListCustomHostnamesRequest, runtime *dara.RuntimeOptions) (_result *aliesa.ListCustomHostnamesResponse, _err error) { - _err = request.Validate() + body := map[string]interface{}{} + if !dara.IsNil(request.CasId) { + body["CasId"] = request.CasId + } + + if !dara.IsNil(request.Certificate) { + body["Certificate"] = request.Certificate + } + + if !dara.IsNil(request.Id) { + body["Id"] = request.Id + } + + if !dara.IsNil(request.Name) { + body["Name"] = request.Name + } + + if !dara.IsNil(request.PrivateKey) { + body["PrivateKey"] = request.PrivateKey + } + + if !dara.IsNil(request.Region) { + body["Region"] = request.Region + } + + if !dara.IsNil(request.SiteId) { + body["SiteId"] = request.SiteId + } + + if !dara.IsNil(request.Type) { + body["Type"] = request.Type + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + Body: openapiutil.ParseToMap(body), + } + params := &openapiutil.Params{ + Action: dara.String("SetCertificate"), + Version: dara.String("2024-09-10"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &SetCertificateResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err } + _err = dara.Convert(_body, &_result) + return _result, _err +} +func (client *Client) ListCustomHostnamesWithContext(ctx context.Context, request *ListCustomHostnamesRequest, runtime *dara.RuntimeOptions) (_result *ListCustomHostnamesResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } query := map[string]interface{}{} if !dara.IsNil(request.Hostname) { query["Hostname"] = request.Hostname @@ -84,7 +130,7 @@ func (client *EsaClient) ListCustomHostnamesWithContext(ctx context.Context, req ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliesa.ListCustomHostnamesResponse{} + _result = &ListCustomHostnamesResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -93,12 +139,13 @@ func (client *EsaClient) ListCustomHostnamesWithContext(ctx context.Context, req return _result, _err } -func (client *EsaClient) UpdateCustomHostnameWithContext(ctx context.Context, request *aliesa.UpdateCustomHostnameRequest, runtime *dara.RuntimeOptions) (_result *aliesa.UpdateCustomHostnameResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) UpdateCustomHostnameWithContext(ctx context.Context, request *UpdateCustomHostnameRequest, runtime *dara.RuntimeOptions) (_result *UpdateCustomHostnameResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } - query := map[string]interface{}{} if !dara.IsNil(request.CasId) { query["CasId"] = request.CasId @@ -146,7 +193,7 @@ func (client *EsaClient) UpdateCustomHostnameWithContext(ctx context.Context, re ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliesa.UpdateCustomHostnameResponse{} + _result = &UpdateCustomHostnameResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/models.go new file mode 100644 index 000000000..ef36a5b7f --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client/models.go @@ -0,0 +1,19 @@ +package client + +import ( + aliesa "github.com/alibabacloud-go/esa-20240910/v2/client" +) + +type ListCustomHostnamesRequest = aliesa.ListCustomHostnamesRequest + +type ListCustomHostnamesResponse = aliesa.ListCustomHostnamesResponse + +type ListCustomHostnamesResponseBodyHostnames = aliesa.ListCustomHostnamesResponseBodyHostnames + +type SetCertificateRequest = aliesa.SetCertificateRequest + +type SetCertificateResponse = aliesa.SetCertificateResponse + +type UpdateCustomHostnameRequest = aliesa.UpdateCustomHostnameRequest + +type UpdateCustomHostnameResponse = aliesa.UpdateCustomHostnameResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/client.go new file mode 100644 index 000000000..17a0f497c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/client_context_func.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/client_context_func.go new file mode 100644 index 000000000..276ca5fb1 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/client_context_func.go @@ -0,0 +1,107 @@ +package client + +import ( + "context" + + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" + "github.com/alibabacloud-go/tea/dara" +) + +func (client *Client) GetCustomDomainWithContext(ctx context.Context, domainName *string, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *GetCustomDomainResponse, _err error) { + req := &openapiutil.OpenApiRequest{ + Headers: headers, + } + params := &openapiutil.Params{ + Action: dara.String("GetCustomDomain"), + Version: dara.String("2023-03-30"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/2023-03-30/custom-domains/" + dara.PercentEncode(dara.StringValue(domainName))), + Method: dara.String("GET"), + AuthType: dara.String("AK"), + Style: dara.String("ROA"), + ReqBodyType: dara.String("json"), + BodyType: dara.String("json"), + } + _result = &GetCustomDomainResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) ListCustomDomainsWithContext(ctx context.Context, request *ListCustomDomainsRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *ListCustomDomainsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.Limit) { + query["limit"] = request.Limit + } + + if !dara.IsNil(request.NextToken) { + query["nextToken"] = request.NextToken + } + + if !dara.IsNil(request.Prefix) { + query["prefix"] = request.Prefix + } + + req := &openapiutil.OpenApiRequest{ + Headers: headers, + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("ListCustomDomains"), + Version: dara.String("2023-03-30"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/2023-03-30/custom-domains"), + Method: dara.String("GET"), + AuthType: dara.String("AK"), + Style: dara.String("ROA"), + ReqBodyType: dara.String("json"), + BodyType: dara.String("json"), + } + _result = &ListCustomDomainsResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) UpdateCustomDomainWithContext(ctx context.Context, domainName *string, request *UpdateCustomDomainRequest, headers map[string]*string, runtime *dara.RuntimeOptions) (_result *UpdateCustomDomainResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + req := &openapiutil.OpenApiRequest{ + Headers: headers, + Body: openapiutil.ParseToMap(request.Body), + } + params := &openapiutil.Params{ + Action: dara.String("UpdateCustomDomain"), + Version: dara.String("2023-03-30"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/2023-03-30/custom-domains/" + dara.PercentEncode(dara.StringValue(domainName))), + Method: dara.String("PUT"), + AuthType: dara.String("AK"), + Style: dara.String("ROA"), + ReqBodyType: dara.String("json"), + BodyType: dara.String("json"), + } + _result = &UpdateCustomDomainResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/models.go new file mode 100644 index 000000000..2f154ba93 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client/models.go @@ -0,0 +1,19 @@ +package client + +import ( + alifc "github.com/alibabacloud-go/fc-20230330/v4/client" +) + +type CertConfig = alifc.CertConfig + +type GetCustomDomainResponse = alifc.GetCustomDomainResponse + +type ListCustomDomainsRequest = alifc.ListCustomDomainsRequest + +type ListCustomDomainsResponse = alifc.ListCustomDomainsResponse + +type UpdateCustomDomainInput = alifc.UpdateCustomDomainInput + +type UpdateCustomDomainRequest = alifc.UpdateCustomDomainRequest + +type UpdateCustomDomainResponse = alifc.UpdateCustomDomainResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client/client.go new file mode 100644 index 000000000..59c039db4 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client/client.go @@ -0,0 +1,238 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/openapi-util/service" + util "github.com/alibabacloud-go/tea-utils/v2/service" + "github.com/alibabacloud-go/tea/tea" +) + +type Client struct { + openapi.Client +} + +func NewClient(config *openapi.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapi.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} + +func (client *Client) GetCustomDomainWithOptions(domainName *string, headers *GetCustomDomainHeaders, runtime *util.RuntimeOptions) (_result *GetCustomDomainResponse, _err error) { + realHeaders := make(map[string]*string) + if !tea.BoolValue(util.IsUnset(headers.CommonHeaders)) { + realHeaders = headers.CommonHeaders + } + + if !tea.BoolValue(util.IsUnset(headers.XFcAccountId)) { + realHeaders["X-Fc-Account-Id"] = util.ToJSONString(headers.XFcAccountId) + } + + if !tea.BoolValue(util.IsUnset(headers.XFcDate)) { + realHeaders["X-Fc-Date"] = util.ToJSONString(headers.XFcDate) + } + + if !tea.BoolValue(util.IsUnset(headers.XFcTraceId)) { + realHeaders["X-Fc-Trace-Id"] = util.ToJSONString(headers.XFcTraceId) + } + + req := &openapi.OpenApiRequest{ + Headers: realHeaders, + } + params := &openapi.Params{ + Action: tea.String("GetCustomDomain"), + Version: tea.String("2021-04-06"), + Protocol: tea.String("HTTPS"), + Pathname: tea.String("/2021-04-06/custom-domains/" + tea.StringValue(openapiutil.GetEncodeParam(domainName))), + Method: tea.String("GET"), + AuthType: tea.String("AK"), + Style: tea.String("ROA"), + ReqBodyType: tea.String("json"), + BodyType: tea.String("json"), + } + _result = &GetCustomDomainResponse{} + _body, _err := client.CallApi(params, req, runtime) + if _err != nil { + return _result, _err + } + _err = tea.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) GetCustomDomain(domainName *string) (_result *GetCustomDomainResponse, _err error) { + runtime := &util.RuntimeOptions{} + headers := &GetCustomDomainHeaders{} + _result = &GetCustomDomainResponse{} + _body, _err := client.GetCustomDomainWithOptions(domainName, headers, runtime) + if _err != nil { + return _result, _err + } + _result = _body + return _result, _err +} + +func (client *Client) ListCustomDomainsWithOptions(request *ListCustomDomainsRequest, headers *ListCustomDomainsHeaders, runtime *util.RuntimeOptions) (_result *ListCustomDomainsResponse, _err error) { + _err = util.ValidateModel(request) + if _err != nil { + return _result, _err + } + query := map[string]interface{}{} + if !tea.BoolValue(util.IsUnset(request.Limit)) { + query["limit"] = request.Limit + } + + if !tea.BoolValue(util.IsUnset(request.NextToken)) { + query["nextToken"] = request.NextToken + } + + if !tea.BoolValue(util.IsUnset(request.Prefix)) { + query["prefix"] = request.Prefix + } + + if !tea.BoolValue(util.IsUnset(request.StartKey)) { + query["startKey"] = request.StartKey + } + + realHeaders := make(map[string]*string) + if !tea.BoolValue(util.IsUnset(headers.CommonHeaders)) { + realHeaders = headers.CommonHeaders + } + + if !tea.BoolValue(util.IsUnset(headers.XFcAccountId)) { + realHeaders["X-Fc-Account-Id"] = util.ToJSONString(headers.XFcAccountId) + } + + if !tea.BoolValue(util.IsUnset(headers.XFcDate)) { + realHeaders["X-Fc-Date"] = util.ToJSONString(headers.XFcDate) + } + + if !tea.BoolValue(util.IsUnset(headers.XFcTraceId)) { + realHeaders["X-Fc-Trace-Id"] = util.ToJSONString(headers.XFcTraceId) + } + + req := &openapi.OpenApiRequest{ + Headers: realHeaders, + Query: openapiutil.Query(query), + } + params := &openapi.Params{ + Action: tea.String("ListCustomDomains"), + Version: tea.String("2021-04-06"), + Protocol: tea.String("HTTPS"), + Pathname: tea.String("/2021-04-06/custom-domains"), + Method: tea.String("GET"), + AuthType: tea.String("AK"), + Style: tea.String("ROA"), + ReqBodyType: tea.String("json"), + BodyType: tea.String("json"), + } + _result = &ListCustomDomainsResponse{} + _body, _err := client.CallApi(params, req, runtime) + if _err != nil { + return _result, _err + } + _err = tea.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) ListCustomDomains(request *ListCustomDomainsRequest) (_result *ListCustomDomainsResponse, _err error) { + runtime := &util.RuntimeOptions{} + headers := &ListCustomDomainsHeaders{} + _result = &ListCustomDomainsResponse{} + _body, _err := client.ListCustomDomainsWithOptions(request, headers, runtime) + if _err != nil { + return _result, _err + } + _result = _body + return _result, _err +} + +func (client *Client) UpdateCustomDomainWithOptions(domainName *string, request *UpdateCustomDomainRequest, headers *UpdateCustomDomainHeaders, runtime *util.RuntimeOptions) (_result *UpdateCustomDomainResponse, _err error) { + _err = util.ValidateModel(request) + if _err != nil { + return _result, _err + } + body := map[string]interface{}{} + if !tea.BoolValue(util.IsUnset(request.CertConfig)) { + body["certConfig"] = request.CertConfig + } + + if !tea.BoolValue(util.IsUnset(request.Protocol)) { + body["protocol"] = request.Protocol + } + + if !tea.BoolValue(util.IsUnset(request.RouteConfig)) { + body["routeConfig"] = request.RouteConfig + } + + if !tea.BoolValue(util.IsUnset(request.TlsConfig)) { + body["tlsConfig"] = request.TlsConfig + } + + if !tea.BoolValue(util.IsUnset(request.WafConfig)) { + body["wafConfig"] = request.WafConfig + } + + realHeaders := make(map[string]*string) + if !tea.BoolValue(util.IsUnset(headers.CommonHeaders)) { + realHeaders = headers.CommonHeaders + } + + if !tea.BoolValue(util.IsUnset(headers.XFcAccountId)) { + realHeaders["X-Fc-Account-Id"] = util.ToJSONString(headers.XFcAccountId) + } + + if !tea.BoolValue(util.IsUnset(headers.XFcDate)) { + realHeaders["X-Fc-Date"] = util.ToJSONString(headers.XFcDate) + } + + if !tea.BoolValue(util.IsUnset(headers.XFcTraceId)) { + realHeaders["X-Fc-Trace-Id"] = util.ToJSONString(headers.XFcTraceId) + } + + req := &openapi.OpenApiRequest{ + Headers: realHeaders, + Body: openapiutil.ParseToMap(body), + } + params := &openapi.Params{ + Action: tea.String("UpdateCustomDomain"), + Version: tea.String("2021-04-06"), + Protocol: tea.String("HTTPS"), + Pathname: tea.String("/2021-04-06/custom-domains/" + tea.StringValue(openapiutil.GetEncodeParam(domainName))), + Method: tea.String("PUT"), + AuthType: tea.String("AK"), + Style: tea.String("ROA"), + ReqBodyType: tea.String("json"), + BodyType: tea.String("json"), + } + _result = &UpdateCustomDomainResponse{} + _body, _err := client.CallApi(params, req, runtime) + if _err != nil { + return _result, _err + } + _err = tea.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) UpdateCustomDomain(domainName *string, request *UpdateCustomDomainRequest) (_result *UpdateCustomDomainResponse, _err error) { + runtime := &util.RuntimeOptions{} + headers := &UpdateCustomDomainHeaders{} + _result = &UpdateCustomDomainResponse{} + _body, _err := client.UpdateCustomDomainWithOptions(domainName, request, headers, runtime) + if _err != nil { + return _result, _err + } + _result = _body + return _result, _err +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client/models.go new file mode 100644 index 000000000..33abe0faf --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client/models.go @@ -0,0 +1,23 @@ +package client + +import ( + alifcopen "github.com/alibabacloud-go/fc-open-20210406/v2/client" +) + +type CertConfig = alifcopen.CertConfig + +type GetCustomDomainHeaders = alifcopen.GetCustomDomainHeaders + +type GetCustomDomainResponse = alifcopen.GetCustomDomainResponse + +type ListCustomDomainsHeaders = alifcopen.ListCustomDomainsHeaders + +type ListCustomDomainsRequest = alifcopen.ListCustomDomainsRequest + +type ListCustomDomainsResponse = alifcopen.ListCustomDomainsResponse + +type UpdateCustomDomainHeaders = alifcopen.UpdateCustomDomainHeaders + +type UpdateCustomDomainRequest = alifcopen.UpdateCustomDomainRequest + +type UpdateCustomDomainResponse = alifcopen.UpdateCustomDomainResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/client.go new file mode 100644 index 000000000..4bcdd7185 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapi.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/client_context_func.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/client_context_func.go new file mode 100644 index 000000000..a927dd26e --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/client_context_func.go @@ -0,0 +1,319 @@ +package client + +import ( + "context" + + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" + "github.com/alibabacloud-go/tea/dara" +) + +func (client *Client) AssociateAdditionalCertificatesWithListenerWithContext(ctx context.Context, request *AssociateAdditionalCertificatesWithListenerRequest, runtime *dara.RuntimeOptions) (_result *AssociateAdditionalCertificatesWithListenerResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.AcceleratorId) { + query["AcceleratorId"] = request.AcceleratorId + } + + if !dara.IsNil(request.Certificates) { + query["Certificates"] = request.Certificates + } + + if !dara.IsNil(request.ClientToken) { + query["ClientToken"] = request.ClientToken + } + + if !dara.IsNil(request.ListenerId) { + query["ListenerId"] = request.ListenerId + } + + if !dara.IsNil(request.RegionId) { + query["RegionId"] = request.RegionId + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("AssociateAdditionalCertificatesWithListener"), + Version: dara.String("2019-11-20"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &AssociateAdditionalCertificatesWithListenerResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) ListListenersWithContext(ctx context.Context, request *ListListenersRequest, runtime *dara.RuntimeOptions) (_result *ListListenersResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.AcceleratorId) { + query["AcceleratorId"] = request.AcceleratorId + } + + if !dara.IsNil(request.PageNumber) { + query["PageNumber"] = request.PageNumber + } + + if !dara.IsNil(request.PageSize) { + query["PageSize"] = request.PageSize + } + + if !dara.IsNil(request.Protocol) { + query["Protocol"] = request.Protocol + } + + if !dara.IsNil(request.RegionId) { + query["RegionId"] = request.RegionId + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("ListListeners"), + Version: dara.String("2019-11-20"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &ListListenersResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) ListListenerCertificatesWithContext(ctx context.Context, request *ListListenerCertificatesRequest, runtime *dara.RuntimeOptions) (_result *ListListenerCertificatesResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.AcceleratorId) { + query["AcceleratorId"] = request.AcceleratorId + } + + if !dara.IsNil(request.ListenerId) { + query["ListenerId"] = request.ListenerId + } + + if !dara.IsNil(request.MaxResults) { + query["MaxResults"] = request.MaxResults + } + + if !dara.IsNil(request.NextToken) { + query["NextToken"] = request.NextToken + } + + if !dara.IsNil(request.RegionId) { + query["RegionId"] = request.RegionId + } + + if !dara.IsNil(request.Role) { + query["Role"] = request.Role + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("ListListenerCertificates"), + Version: dara.String("2019-11-20"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &ListListenerCertificatesResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) UpdateAdditionalCertificateWithListenerWithContext(ctx context.Context, request *UpdateAdditionalCertificateWithListenerRequest, runtime *dara.RuntimeOptions) (_result *UpdateAdditionalCertificateWithListenerResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.AcceleratorId) { + query["AcceleratorId"] = request.AcceleratorId + } + + if !dara.IsNil(request.CertificateId) { + query["CertificateId"] = request.CertificateId + } + + if !dara.IsNil(request.ClientToken) { + query["ClientToken"] = request.ClientToken + } + + if !dara.IsNil(request.Domain) { + query["Domain"] = request.Domain + } + + if !dara.IsNil(request.DryRun) { + query["DryRun"] = request.DryRun + } + + if !dara.IsNil(request.ListenerId) { + query["ListenerId"] = request.ListenerId + } + + if !dara.IsNil(request.RegionId) { + query["RegionId"] = request.RegionId + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("UpdateAdditionalCertificateWithListener"), + Version: dara.String("2019-11-20"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &UpdateAdditionalCertificateWithListenerResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) UpdateListenerWithContext(ctx context.Context, request *UpdateListenerRequest, runtime *dara.RuntimeOptions) (_result *UpdateListenerResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.BackendPorts) { + query["BackendPorts"] = request.BackendPorts + } + + if !dara.IsNil(request.Certificates) { + query["Certificates"] = request.Certificates + } + + if !dara.IsNil(request.ClientAffinity) { + query["ClientAffinity"] = request.ClientAffinity + } + + if !dara.IsNil(request.ClientToken) { + query["ClientToken"] = request.ClientToken + } + + if !dara.IsNil(request.Description) { + query["Description"] = request.Description + } + + if !dara.IsNil(request.HttpVersion) { + query["HttpVersion"] = request.HttpVersion + } + + if !dara.IsNil(request.IdleTimeout) { + query["IdleTimeout"] = request.IdleTimeout + } + + if !dara.IsNil(request.ListenerId) { + query["ListenerId"] = request.ListenerId + } + + if !dara.IsNil(request.Name) { + query["Name"] = request.Name + } + + if !dara.IsNil(request.PortRanges) { + query["PortRanges"] = request.PortRanges + } + + if !dara.IsNil(request.Protocol) { + query["Protocol"] = request.Protocol + } + + if !dara.IsNil(request.ProxyProtocol) { + query["ProxyProtocol"] = request.ProxyProtocol + } + + if !dara.IsNil(request.RegionId) { + query["RegionId"] = request.RegionId + } + + if !dara.IsNil(request.RequestTimeout) { + query["RequestTimeout"] = request.RequestTimeout + } + + if !dara.IsNil(request.SecurityPolicyId) { + query["SecurityPolicyId"] = request.SecurityPolicyId + } + + if !dara.IsNil(request.XForwardedForConfig) { + query["XForwardedForConfig"] = request.XForwardedForConfig + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("UpdateListener"), + Version: dara.String("2019-11-20"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &UpdateListenerResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/models.go new file mode 100644 index 000000000..0b8c676d3 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client/models.go @@ -0,0 +1,31 @@ +package client + +import ( + aliga "github.com/alibabacloud-go/ga-20191120/v4/client" +) + +type AssociateAdditionalCertificatesWithListenerRequest = aliga.AssociateAdditionalCertificatesWithListenerRequest + +type AssociateAdditionalCertificatesWithListenerRequestCertificates = aliga.AssociateAdditionalCertificatesWithListenerRequestCertificates + +type AssociateAdditionalCertificatesWithListenerResponse = aliga.AssociateAdditionalCertificatesWithListenerResponse + +type ListListenersRequest = aliga.ListListenersRequest + +type ListListenersResponse = aliga.ListListenersResponse + +type ListListenerCertificatesRequest = aliga.ListListenerCertificatesRequest + +type ListListenerCertificatesResponse = aliga.ListListenerCertificatesResponse + +type ListListenerCertificatesResponseBodyCertificates = aliga.ListListenerCertificatesResponseBodyCertificates + +type UpdateAdditionalCertificateWithListenerRequest = aliga.UpdateAdditionalCertificateWithListenerRequest + +type UpdateAdditionalCertificateWithListenerResponse = aliga.UpdateAdditionalCertificateWithListenerResponse + +type UpdateListenerRequest = aliga.UpdateListenerRequest + +type UpdateListenerRequestCertificates = aliga.UpdateListenerRequestCertificates + +type UpdateListenerResponse = aliga.UpdateListenerResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/client.go new file mode 100644 index 000000000..17a0f497c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-live/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/client_context_func.go similarity index 68% rename from pkg/core/deployer/providers/aliyun-live/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/client_context_func.go index 27527ac01..df54cc577 100644 --- a/pkg/core/deployer/providers/aliyun-live/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/client_context_func.go @@ -1,47 +1,20 @@ -package internal +package client import ( "context" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - alilive "github.com/alibabacloud-go/live-20161101/v2/client" "github.com/alibabacloud-go/tea/dara" ) -// This is a partial copy of https://github.com/alibabacloud-go/live-20161101/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type LiveClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewLiveClient(config *openapiutil.Config) (*LiveClient, error) { - client := new(LiveClient) - err := client.Init(config) - return client, err -} - -func (client *LiveClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *LiveClient) DescribeLiveUserDomainsWithContext(ctx context.Context, request *alilive.DescribeLiveUserDomainsRequest, runtime *dara.RuntimeOptions) (_result *alilive.DescribeLiveUserDomainsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeLiveUserDomainsWithContext(ctx context.Context, request *DescribeLiveUserDomainsRequest, runtime *dara.RuntimeOptions) (_result *DescribeLiveUserDomainsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.DomainName) { query["DomainName"] = request.DomainName } @@ -100,7 +73,7 @@ func (client *LiveClient) DescribeLiveUserDomainsWithContext(ctx context.Context ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alilive.DescribeLiveUserDomainsResponse{} + _result = &DescribeLiveUserDomainsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -109,13 +82,14 @@ func (client *LiveClient) DescribeLiveUserDomainsWithContext(ctx context.Context return _result, _err } -func (client *LiveClient) SetLiveDomainCertificateWithContext(ctx context.Context, request *alilive.SetLiveDomainCertificateRequest, runtime *dara.RuntimeOptions) (_result *alilive.SetLiveDomainCertificateResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) SetLiveDomainCertificateWithContext(ctx context.Context, request *SetLiveDomainCertificateRequest, runtime *dara.RuntimeOptions) (_result *SetLiveDomainCertificateResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.CertName) { query["CertName"] = request.CertName } @@ -166,7 +140,7 @@ func (client *LiveClient) SetLiveDomainCertificateWithContext(ctx context.Contex ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alilive.SetLiveDomainCertificateResponse{} + _result = &SetLiveDomainCertificateResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/models.go new file mode 100644 index 000000000..2ea8a11bf --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client/models.go @@ -0,0 +1,13 @@ +package client + +import ( + alilive "github.com/alibabacloud-go/live-20161101/v2/client" +) + +type DescribeLiveUserDomainsRequest = alilive.DescribeLiveUserDomainsRequest + +type DescribeLiveUserDomainsResponse = alilive.DescribeLiveUserDomainsResponse + +type SetLiveDomainCertificateRequest = alilive.SetLiveDomainCertificateRequest + +type SetLiveDomainCertificateResponse = alilive.SetLiveDomainCertificateResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/client.go new file mode 100644 index 000000000..17a0f497c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-nlb/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/client_context_func.go similarity index 73% rename from pkg/core/deployer/providers/aliyun-nlb/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/client_context_func.go index 6c62a6579..b4020212f 100644 --- a/pkg/core/deployer/providers/aliyun-nlb/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/client_context_func.go @@ -1,47 +1,20 @@ -package internal +package client import ( "context" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - alinlb "github.com/alibabacloud-go/nlb-20220430/v4/client" "github.com/alibabacloud-go/tea/dara" ) -// This is a partial copy of https://github.com/alibabacloud-go/nlb-20220430/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type NlbClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewNlbClient(config *openapiutil.Config) (*NlbClient, error) { - client := new(NlbClient) - err := client.Init(config) - return client, err -} - -func (client *NlbClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *NlbClient) GetListenerAttributeWithContext(ctx context.Context, request *alinlb.GetListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *alinlb.GetListenerAttributeResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) GetListenerAttributeWithContext(ctx context.Context, request *GetListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *GetListenerAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.ClientToken) { query["ClientToken"] = request.ClientToken } @@ -72,7 +45,7 @@ func (client *NlbClient) GetListenerAttributeWithContext(ctx context.Context, re ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alinlb.GetListenerAttributeResponse{} + _result = &GetListenerAttributeResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -81,13 +54,14 @@ func (client *NlbClient) GetListenerAttributeWithContext(ctx context.Context, re return _result, _err } -func (client *NlbClient) GetLoadBalancerAttributeWithContext(ctx context.Context, request *alinlb.GetLoadBalancerAttributeRequest, runtime *dara.RuntimeOptions) (_result *alinlb.GetLoadBalancerAttributeResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) GetLoadBalancerAttributeWithContext(ctx context.Context, request *GetLoadBalancerAttributeRequest, runtime *dara.RuntimeOptions) (_result *GetLoadBalancerAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.ClientToken) { query["ClientToken"] = request.ClientToken } @@ -118,7 +92,7 @@ func (client *NlbClient) GetLoadBalancerAttributeWithContext(ctx context.Context ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alinlb.GetLoadBalancerAttributeResponse{} + _result = &GetLoadBalancerAttributeResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -127,13 +101,14 @@ func (client *NlbClient) GetLoadBalancerAttributeWithContext(ctx context.Context return _result, _err } -func (client *NlbClient) ListListenersWithContext(ctx context.Context, request *alinlb.ListListenersRequest, runtime *dara.RuntimeOptions) (_result *alinlb.ListListenersResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) ListListenersWithContext(ctx context.Context, request *ListListenersRequest, runtime *dara.RuntimeOptions) (_result *ListListenersResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.ListenerIds) { query["ListenerIds"] = request.ListenerIds } @@ -180,7 +155,7 @@ func (client *NlbClient) ListListenersWithContext(ctx context.Context, request * ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alinlb.ListListenersResponse{} + _result = &ListListenersResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -189,13 +164,14 @@ func (client *NlbClient) ListListenersWithContext(ctx context.Context, request * return _result, _err } -func (client *NlbClient) UpdateListenerAttributeWithContext(ctx context.Context, tmpReq *alinlb.UpdateListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *alinlb.UpdateListenerAttributeResponse, _err error) { - _err = tmpReq.Validate() - if _err != nil { - return _result, _err +func (client *Client) UpdateListenerAttributeWithContext(ctx context.Context, tmpReq *UpdateListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *UpdateListenerAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = tmpReq.Validate() + if _err != nil { + return _result, _err + } } - - request := &alinlb.UpdateListenerAttributeShrinkRequest{} + request := &UpdateListenerAttributeShrinkRequest{} openapiutil.Convert(tmpReq, request) if !dara.IsNil(tmpReq.ProxyProtocolV2Config) { request.ProxyProtocolV2ConfigShrink = openapiutil.ArrayToStringWithSpecifiedStyle(tmpReq.ProxyProtocolV2Config, dara.String("ProxyProtocolV2Config"), dara.String("json")) @@ -288,7 +264,7 @@ func (client *NlbClient) UpdateListenerAttributeWithContext(ctx context.Context, ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alinlb.UpdateListenerAttributeResponse{} + _result = &UpdateListenerAttributeResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/models.go new file mode 100644 index 000000000..2fd369c14 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client/models.go @@ -0,0 +1,23 @@ +package client + +import ( + alinlb "github.com/alibabacloud-go/nlb-20220430/v4/client" +) + +type GetListenerAttributeRequest = alinlb.GetListenerAttributeRequest + +type GetListenerAttributeResponse = alinlb.GetListenerAttributeResponse + +type GetLoadBalancerAttributeRequest = alinlb.GetLoadBalancerAttributeRequest + +type GetLoadBalancerAttributeResponse = alinlb.GetLoadBalancerAttributeResponse + +type ListListenersRequest = alinlb.ListListenersRequest + +type ListListenersResponse = alinlb.ListListenersResponse + +type UpdateListenerAttributeRequest = alinlb.UpdateListenerAttributeRequest + +type UpdateListenerAttributeResponse = alinlb.UpdateListenerAttributeResponse + +type UpdateListenerAttributeShrinkRequest = alinlb.UpdateListenerAttributeShrinkRequest diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/client.go new file mode 100644 index 000000000..8ddf8a551 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/client.go @@ -0,0 +1,30 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapi.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapi.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-clb/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/client_context_func.go similarity index 65% rename from pkg/core/deployer/providers/aliyun-clb/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/client_context_func.go index b56e4d2e9..73a499d15 100644 --- a/pkg/core/deployer/providers/aliyun-clb/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/client_context_func.go @@ -1,45 +1,19 @@ -package internal +package client import ( "context" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" - alislb "github.com/alibabacloud-go/slb-20140515/v4/client" "github.com/alibabacloud-go/tea/dara" ) -// This is a partial copy of https://github.com/alibabacloud-go/slb-20140515/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type SlbClient struct { - openapi.Client -} - -func NewSlbClient(config *openapi.Config) (*SlbClient, error) { - client := new(SlbClient) - err := client.Init(config) - return client, err -} - -func (client *SlbClient) Init(config *openapi.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err +func (client *Client) DescribeDomainExtensionsWithContext(ctx context.Context, request *DescribeDomainExtensionsRequest, runtime *dara.RuntimeOptions) (_result *DescribeDomainExtensionsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *SlbClient) DescribeDomainExtensionsWithContext(ctx context.Context, request *alislb.DescribeDomainExtensionsRequest, runtime *dara.RuntimeOptions) (_result *alislb.DescribeDomainExtensionsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err - } - query := map[string]interface{}{} if !dara.IsNil(request.DomainExtensionId) { query["DomainExtensionId"] = request.DomainExtensionId @@ -87,7 +61,7 @@ func (client *SlbClient) DescribeDomainExtensionsWithContext(ctx context.Context ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alislb.DescribeDomainExtensionsResponse{} + _result = &DescribeDomainExtensionsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -96,12 +70,13 @@ func (client *SlbClient) DescribeDomainExtensionsWithContext(ctx context.Context return _result, _err } -func (client *SlbClient) DescribeLoadBalancerListenersWithContext(ctx context.Context, request *alislb.DescribeLoadBalancerListenersRequest, runtime *dara.RuntimeOptions) (_result *alislb.DescribeLoadBalancerListenersResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeLoadBalancerListenersWithContext(ctx context.Context, request *DescribeLoadBalancerListenersRequest, runtime *dara.RuntimeOptions) (_result *DescribeLoadBalancerListenersResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } - query := map[string]interface{}{} if !dara.IsNil(request.Description) { query["Description"] = request.Description @@ -165,7 +140,7 @@ func (client *SlbClient) DescribeLoadBalancerListenersWithContext(ctx context.Co ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alislb.DescribeLoadBalancerListenersResponse{} + _result = &DescribeLoadBalancerListenersResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -174,12 +149,13 @@ func (client *SlbClient) DescribeLoadBalancerListenersWithContext(ctx context.Co return _result, _err } -func (client *SlbClient) DescribeLoadBalancerAttributeWithContext(ctx context.Context, request *alislb.DescribeLoadBalancerAttributeRequest, runtime *dara.RuntimeOptions) (_result *alislb.DescribeLoadBalancerAttributeResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeLoadBalancerAttributeWithContext(ctx context.Context, request *DescribeLoadBalancerAttributeRequest, runtime *dara.RuntimeOptions) (_result *DescribeLoadBalancerAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } - query := map[string]interface{}{} if !dara.IsNil(request.LoadBalancerId) { query["LoadBalancerId"] = request.LoadBalancerId @@ -219,7 +195,7 @@ func (client *SlbClient) DescribeLoadBalancerAttributeWithContext(ctx context.Co ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alislb.DescribeLoadBalancerAttributeResponse{} + _result = &DescribeLoadBalancerAttributeResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -228,12 +204,13 @@ func (client *SlbClient) DescribeLoadBalancerAttributeWithContext(ctx context.Co return _result, _err } -func (client *SlbClient) DescribeLoadBalancerHTTPSListenerAttributeWithContext(ctx context.Context, request *alislb.DescribeLoadBalancerHTTPSListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *alislb.DescribeLoadBalancerHTTPSListenerAttributeResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeLoadBalancerHTTPSListenerAttributeWithContext(ctx context.Context, request *DescribeLoadBalancerHTTPSListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *DescribeLoadBalancerHTTPSListenerAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } - query := map[string]interface{}{} if !dara.IsNil(request.ListenerPort) { query["ListenerPort"] = request.ListenerPort @@ -277,7 +254,7 @@ func (client *SlbClient) DescribeLoadBalancerHTTPSListenerAttributeWithContext(c ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alislb.DescribeLoadBalancerHTTPSListenerAttributeResponse{} + _result = &DescribeLoadBalancerHTTPSListenerAttributeResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -286,12 +263,76 @@ func (client *SlbClient) DescribeLoadBalancerHTTPSListenerAttributeWithContext(c return _result, _err } -func (client *SlbClient) SetDomainExtensionAttributeWithContext(ctx context.Context, request *alislb.SetDomainExtensionAttributeRequest, runtime *dara.RuntimeOptions) (_result *alislb.SetDomainExtensionAttributeResponse, _err error) { - _err = request.Validate() +func (client *Client) DescribeServerCertificatesWithContext(ctx context.Context, request *DescribeServerCertificatesRequest, runtime *dara.RuntimeOptions) (_result *DescribeServerCertificatesResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.OwnerAccount) { + query["OwnerAccount"] = request.OwnerAccount + } + + if !dara.IsNil(request.OwnerId) { + query["OwnerId"] = request.OwnerId + } + + if !dara.IsNil(request.RegionId) { + query["RegionId"] = request.RegionId + } + + if !dara.IsNil(request.ResourceGroupId) { + query["ResourceGroupId"] = request.ResourceGroupId + } + + if !dara.IsNil(request.ResourceOwnerAccount) { + query["ResourceOwnerAccount"] = request.ResourceOwnerAccount + } + + if !dara.IsNil(request.ResourceOwnerId) { + query["ResourceOwnerId"] = request.ResourceOwnerId + } + + if !dara.IsNil(request.ServerCertificateId) { + query["ServerCertificateId"] = request.ServerCertificateId + } + + if !dara.IsNil(request.Tag) { + query["Tag"] = request.Tag + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("DescribeServerCertificates"), + Version: dara.String("2014-05-15"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &DescribeServerCertificatesResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err } + _err = dara.Convert(_body, &_result) + return _result, _err +} +func (client *Client) SetDomainExtensionAttributeWithContext(ctx context.Context, request *SetDomainExtensionAttributeRequest, runtime *dara.RuntimeOptions) (_result *SetDomainExtensionAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } query := map[string]interface{}{} if !dara.IsNil(request.DomainExtensionId) { query["DomainExtensionId"] = request.DomainExtensionId @@ -335,7 +376,7 @@ func (client *SlbClient) SetDomainExtensionAttributeWithContext(ctx context.Cont ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alislb.SetDomainExtensionAttributeResponse{} + _result = &SetDomainExtensionAttributeResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -344,12 +385,13 @@ func (client *SlbClient) SetDomainExtensionAttributeWithContext(ctx context.Cont return _result, _err } -func (client *SlbClient) SetLoadBalancerHTTPSListenerAttributeWithContext(ctx context.Context, request *alislb.SetLoadBalancerHTTPSListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *alislb.SetLoadBalancerHTTPSListenerAttributeResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) SetLoadBalancerHTTPSListenerAttributeWithContext(ctx context.Context, request *SetLoadBalancerHTTPSListenerAttributeRequest, runtime *dara.RuntimeOptions) (_result *SetLoadBalancerHTTPSListenerAttributeResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } - query := map[string]interface{}{} if !dara.IsNil(request.AclId) { query["AclId"] = request.AclId @@ -537,7 +579,90 @@ func (client *SlbClient) SetLoadBalancerHTTPSListenerAttributeWithContext(ctx co ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alislb.SetLoadBalancerHTTPSListenerAttributeResponse{} + _result = &SetLoadBalancerHTTPSListenerAttributeResponse{} + _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) + if _err != nil { + return _result, _err + } + _err = dara.Convert(_body, &_result) + return _result, _err +} + +func (client *Client) UploadServerCertificateWithContext(ctx context.Context, request *UploadServerCertificateRequest, runtime *dara.RuntimeOptions) (_result *UploadServerCertificateResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } + } + query := map[string]interface{}{} + if !dara.IsNil(request.AliCloudCertificateId) { + query["AliCloudCertificateId"] = request.AliCloudCertificateId + } + + if !dara.IsNil(request.AliCloudCertificateName) { + query["AliCloudCertificateName"] = request.AliCloudCertificateName + } + + if !dara.IsNil(request.AliCloudCertificateRegionId) { + query["AliCloudCertificateRegionId"] = request.AliCloudCertificateRegionId + } + + if !dara.IsNil(request.OwnerAccount) { + query["OwnerAccount"] = request.OwnerAccount + } + + if !dara.IsNil(request.OwnerId) { + query["OwnerId"] = request.OwnerId + } + + if !dara.IsNil(request.PrivateKey) { + query["PrivateKey"] = request.PrivateKey + } + + if !dara.IsNil(request.RegionId) { + query["RegionId"] = request.RegionId + } + + if !dara.IsNil(request.ResourceGroupId) { + query["ResourceGroupId"] = request.ResourceGroupId + } + + if !dara.IsNil(request.ResourceOwnerAccount) { + query["ResourceOwnerAccount"] = request.ResourceOwnerAccount + } + + if !dara.IsNil(request.ResourceOwnerId) { + query["ResourceOwnerId"] = request.ResourceOwnerId + } + + if !dara.IsNil(request.ServerCertificate) { + query["ServerCertificate"] = request.ServerCertificate + } + + if !dara.IsNil(request.ServerCertificateName) { + query["ServerCertificateName"] = request.ServerCertificateName + } + + if !dara.IsNil(request.Tag) { + query["Tag"] = request.Tag + } + + req := &openapiutil.OpenApiRequest{ + Query: openapiutil.Query(query), + } + params := &openapiutil.Params{ + Action: dara.String("UploadServerCertificate"), + Version: dara.String("2014-05-15"), + Protocol: dara.String("HTTPS"), + Pathname: dara.String("/"), + Method: dara.String("POST"), + AuthType: dara.String("AK"), + Style: dara.String("RPC"), + ReqBodyType: dara.String("formData"), + BodyType: dara.String("json"), + } + _result = &UploadServerCertificateResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/models.go new file mode 100644 index 000000000..45ae539bb --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client/models.go @@ -0,0 +1,37 @@ +package client + +import ( + alislb "github.com/alibabacloud-go/slb-20140515/v4/client" +) + +type DescribeDomainExtensionsRequest = alislb.DescribeDomainExtensionsRequest + +type DescribeDomainExtensionsResponse = alislb.DescribeDomainExtensionsResponse + +type DescribeLoadBalancerListenersRequest = alislb.DescribeLoadBalancerListenersRequest + +type DescribeLoadBalancerListenersResponse = alislb.DescribeLoadBalancerListenersResponse + +type DescribeLoadBalancerAttributeRequest = alislb.DescribeLoadBalancerAttributeRequest + +type DescribeLoadBalancerAttributeResponse = alislb.DescribeLoadBalancerAttributeResponse + +type DescribeLoadBalancerHTTPSListenerAttributeRequest = alislb.DescribeLoadBalancerHTTPSListenerAttributeRequest + +type DescribeLoadBalancerHTTPSListenerAttributeResponse = alislb.DescribeLoadBalancerHTTPSListenerAttributeResponse + +type DescribeServerCertificatesRequest = alislb.DescribeServerCertificatesRequest + +type DescribeServerCertificatesResponse = alislb.DescribeServerCertificatesResponse + +type SetDomainExtensionAttributeRequest = alislb.SetDomainExtensionAttributeRequest + +type SetDomainExtensionAttributeResponse = alislb.SetDomainExtensionAttributeResponse + +type SetLoadBalancerHTTPSListenerAttributeRequest = alislb.SetLoadBalancerHTTPSListenerAttributeRequest + +type SetLoadBalancerHTTPSListenerAttributeResponse = alislb.SetLoadBalancerHTTPSListenerAttributeResponse + +type UploadServerCertificateRequest = alislb.UploadServerCertificateRequest + +type UploadServerCertificateResponse = alislb.UploadServerCertificateResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/client.go new file mode 100644 index 000000000..17a0f497c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-vod/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/client_context_func.go similarity index 67% rename from pkg/core/deployer/providers/aliyun-vod/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/client_context_func.go index e2345dccb..32ce24550 100644 --- a/pkg/core/deployer/providers/aliyun-vod/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/client_context_func.go @@ -1,47 +1,20 @@ -package internal +package client import ( "context" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" "github.com/alibabacloud-go/tea/dara" - alivod "github.com/alibabacloud-go/vod-20170321/v4/client" ) -// This is a partial copy of https://github.com/alibabacloud-go/vod-20170321/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type VodClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewVodClient(config *openapiutil.Config) (*VodClient, error) { - client := new(VodClient) - err := client.Init(config) - return client, err -} - -func (client *VodClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *VodClient) DescribeVodUserDomainsWithContext(ctx context.Context, request *alivod.DescribeVodUserDomainsRequest, runtime *dara.RuntimeOptions) (_result *alivod.DescribeVodUserDomainsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeVodUserDomainsWithContext(ctx context.Context, request *DescribeVodUserDomainsRequest, runtime *dara.RuntimeOptions) (_result *DescribeVodUserDomainsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.DomainName) { query["DomainName"] = request.DomainName } @@ -88,7 +61,7 @@ func (client *VodClient) DescribeVodUserDomainsWithContext(ctx context.Context, ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alivod.DescribeVodUserDomainsResponse{} + _result = &DescribeVodUserDomainsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -97,13 +70,14 @@ func (client *VodClient) DescribeVodUserDomainsWithContext(ctx context.Context, return _result, _err } -func (client *VodClient) SetVodDomainSSLCertificateWithContext(ctx context.Context, request *alivod.SetVodDomainSSLCertificateRequest, runtime *dara.RuntimeOptions) (_result *alivod.SetVodDomainSSLCertificateResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) SetVodDomainSSLCertificateWithContext(ctx context.Context, request *SetVodDomainSSLCertificateRequest, runtime *dara.RuntimeOptions) (_result *SetVodDomainSSLCertificateResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.CertId) { query["CertId"] = request.CertId } @@ -162,7 +136,7 @@ func (client *VodClient) SetVodDomainSSLCertificateWithContext(ctx context.Conte ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &alivod.SetVodDomainSSLCertificateResponse{} + _result = &SetVodDomainSSLCertificateResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/models.go new file mode 100644 index 000000000..00e79c59b --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client/models.go @@ -0,0 +1,13 @@ +package client + +import ( + alivod "github.com/alibabacloud-go/vod-20170321/v4/client" +) + +type DescribeVodUserDomainsRequest = alivod.DescribeVodUserDomainsRequest + +type DescribeVodUserDomainsResponse = alivod.DescribeVodUserDomainsResponse + +type SetVodDomainSSLCertificateRequest = alivod.SetVodDomainSSLCertificateRequest + +type SetVodDomainSSLCertificateResponse = alivod.SetVodDomainSSLCertificateResponse diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/client.go new file mode 100644 index 000000000..17a0f497c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/client.go @@ -0,0 +1,31 @@ +package client + +import ( + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" + openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" +) + +type Client struct { + openapi.Client + DisableSDKError *bool + EnableValidate *bool +} + +func NewClient(config *openapiutil.Config) (*Client, error) { + client := new(Client) + err := client.Init(config) + return client, err +} + +func (client *Client) Init(config *openapiutil.Config) (_err error) { + _err = client.Client.Init(config) + if _err != nil { + return _err + } + _err = client.CheckConfig(config) + if _err != nil { + return _err + } + + return nil +} diff --git a/pkg/core/deployer/providers/aliyun-waf/internal/client.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/client_context_func.go similarity index 73% rename from pkg/core/deployer/providers/aliyun-waf/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/client_context_func.go index bf89384d4..f7bf2ce1c 100644 --- a/pkg/core/deployer/providers/aliyun-waf/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/client_context_func.go @@ -1,44 +1,18 @@ -package internal +package client import ( "context" - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" openapiutil "github.com/alibabacloud-go/darabonba-openapi/v2/utils" "github.com/alibabacloud-go/tea/dara" - aliwaf "github.com/alibabacloud-go/waf-openapi-20211001/v7/client" ) -// This is a partial copy of https://github.com/alibabacloud-go/waf-openapi-20211001/blob/master/client/client_context_func.go -// to lightweight the vendor packages in the built binary. -type WafClient struct { - openapi.Client - DisableSDKError *bool -} - -func NewWafClient(config *openapiutil.Config) (*WafClient, error) { - client := new(WafClient) - err := client.Init(config) - return client, err -} - -func (client *WafClient) Init(config *openapiutil.Config) (_err error) { - _err = client.Client.Init(config) - if _err != nil { - return _err - } - _err = client.CheckConfig(config) - if _err != nil { - return _err - } - - return nil -} - -func (client *WafClient) DescribeCloudResourceAccessPortDetailsWithContext(ctx context.Context, request *aliwaf.DescribeCloudResourceAccessPortDetailsRequest, runtime *dara.RuntimeOptions) (_result *aliwaf.DescribeCloudResourceAccessPortDetailsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeCloudResourceAccessPortDetailsWithContext(ctx context.Context, request *DescribeCloudResourceAccessPortDetailsRequest, runtime *dara.RuntimeOptions) (_result *DescribeCloudResourceAccessPortDetailsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} if !dara.IsNil(request.InstanceId) { @@ -91,7 +65,7 @@ func (client *WafClient) DescribeCloudResourceAccessPortDetailsWithContext(ctx c ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliwaf.DescribeCloudResourceAccessPortDetailsResponse{} + _result = &DescribeCloudResourceAccessPortDetailsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -100,13 +74,14 @@ func (client *WafClient) DescribeCloudResourceAccessPortDetailsWithContext(ctx c return _result, _err } -func (client *WafClient) DescribeDefaultHttpsWithContext(ctx context.Context, request *aliwaf.DescribeDefaultHttpsRequest, runtime *dara.RuntimeOptions) (_result *aliwaf.DescribeDefaultHttpsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeDefaultHttpsWithContext(ctx context.Context, request *DescribeDefaultHttpsRequest, runtime *dara.RuntimeOptions) (_result *DescribeDefaultHttpsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.InstanceId) { query["InstanceId"] = request.InstanceId } @@ -133,7 +108,7 @@ func (client *WafClient) DescribeDefaultHttpsWithContext(ctx context.Context, re ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliwaf.DescribeDefaultHttpsResponse{} + _result = &DescribeDefaultHttpsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -142,13 +117,14 @@ func (client *WafClient) DescribeDefaultHttpsWithContext(ctx context.Context, re return _result, _err } -func (client *WafClient) DescribeDomainDetailWithContext(ctx context.Context, request *aliwaf.DescribeDomainDetailRequest, runtime *dara.RuntimeOptions) (_result *aliwaf.DescribeDomainDetailResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeDomainDetailWithContext(ctx context.Context, request *DescribeDomainDetailRequest, runtime *dara.RuntimeOptions) (_result *DescribeDomainDetailResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.Domain) { query["Domain"] = request.Domain } @@ -179,7 +155,7 @@ func (client *WafClient) DescribeDomainDetailWithContext(ctx context.Context, re ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliwaf.DescribeDomainDetailResponse{} + _result = &DescribeDomainDetailResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -188,13 +164,14 @@ func (client *WafClient) DescribeDomainDetailWithContext(ctx context.Context, re return _result, _err } -func (client *WafClient) DescribeResourceInstanceCertsWithContext(ctx context.Context, request *aliwaf.DescribeResourceInstanceCertsRequest, runtime *dara.RuntimeOptions) (_result *aliwaf.DescribeResourceInstanceCertsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) DescribeResourceInstanceCertsWithContext(ctx context.Context, request *DescribeResourceInstanceCertsRequest, runtime *dara.RuntimeOptions) (_result *DescribeResourceInstanceCertsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.InstanceId) { query["InstanceId"] = request.InstanceId } @@ -233,7 +210,7 @@ func (client *WafClient) DescribeResourceInstanceCertsWithContext(ctx context.Co ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliwaf.DescribeResourceInstanceCertsResponse{} + _result = &DescribeResourceInstanceCertsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -242,10 +219,12 @@ func (client *WafClient) DescribeResourceInstanceCertsWithContext(ctx context.Co return _result, _err } -func (client *WafClient) ModifyCloudResourceCertWithContext(ctx context.Context, request *aliwaf.ModifyCloudResourceCertRequest, runtime *dara.RuntimeOptions) (_result *aliwaf.ModifyCloudResourceCertResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) ModifyCloudResourceCertWithContext(ctx context.Context, request *ModifyCloudResourceCertRequest, runtime *dara.RuntimeOptions) (_result *ModifyCloudResourceCertResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} if !dara.IsNil(request.Certificates) { @@ -290,7 +269,7 @@ func (client *WafClient) ModifyCloudResourceCertWithContext(ctx context.Context, ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliwaf.ModifyCloudResourceCertResponse{} + _result = &ModifyCloudResourceCertResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -299,13 +278,14 @@ func (client *WafClient) ModifyCloudResourceCertWithContext(ctx context.Context, return _result, _err } -func (client *WafClient) ModifyDefaultHttpsWithContext(ctx context.Context, request *aliwaf.ModifyDefaultHttpsRequest, runtime *dara.RuntimeOptions) (_result *aliwaf.ModifyDefaultHttpsResponse, _err error) { - _err = request.Validate() - if _err != nil { - return _result, _err +func (client *Client) ModifyDefaultHttpsWithContext(ctx context.Context, request *ModifyDefaultHttpsRequest, runtime *dara.RuntimeOptions) (_result *ModifyDefaultHttpsResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = request.Validate() + if _err != nil { + return _result, _err + } } query := map[string]interface{}{} - if !dara.IsNil(request.CertId) { query["CertId"] = request.CertId } @@ -352,7 +332,7 @@ func (client *WafClient) ModifyDefaultHttpsWithContext(ctx context.Context, requ ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliwaf.ModifyDefaultHttpsResponse{} + _result = &ModifyDefaultHttpsResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err @@ -361,13 +341,14 @@ func (client *WafClient) ModifyDefaultHttpsWithContext(ctx context.Context, requ return _result, _err } -func (client *WafClient) ModifyDomainWithContext(ctx context.Context, tmpReq *aliwaf.ModifyDomainRequest, runtime *dara.RuntimeOptions) (_result *aliwaf.ModifyDomainResponse, _err error) { - _err = tmpReq.Validate() - if _err != nil { - return _result, _err +func (client *Client) ModifyDomainWithContext(ctx context.Context, tmpReq *ModifyDomainRequest, runtime *dara.RuntimeOptions) (_result *ModifyDomainResponse, _err error) { + if dara.BoolValue(client.EnableValidate) == true { + _err = tmpReq.Validate() + if _err != nil { + return _result, _err + } } - - request := &aliwaf.ModifyDomainShrinkRequest{} + request := &ModifyDomainShrinkRequest{} openapiutil.Convert(tmpReq, request) if !dara.IsNil(tmpReq.Listen) { request.ListenShrink = openapiutil.ArrayToStringWithSpecifiedStyle(tmpReq.Listen, dara.String("Listen"), dara.String("json")) @@ -420,7 +401,7 @@ func (client *WafClient) ModifyDomainWithContext(ctx context.Context, tmpReq *al ReqBodyType: dara.String("formData"), BodyType: dara.String("json"), } - _result = &aliwaf.ModifyDomainResponse{} + _result = &ModifyDomainResponse{} _body, _err := client.CallApiWithCtx(ctx, params, req, runtime) if _err != nil { return _result, _err diff --git a/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/models.go b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/models.go new file mode 100644 index 000000000..cf6713ea7 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client/models.go @@ -0,0 +1,57 @@ +package client + +import ( + aliwaf "github.com/alibabacloud-go/waf-openapi-20211001/v7/client" +) + +type DescribeCloudResourceAccessPortDetailsRequest = aliwaf.DescribeCloudResourceAccessPortDetailsRequest + +type DescribeCloudResourceAccessPortDetailsResponse = aliwaf.DescribeCloudResourceAccessPortDetailsResponse + +type DescribeCloudResourceAccessPortDetailsResponseBodyAccessPortDetails = aliwaf.DescribeCloudResourceAccessPortDetailsResponseBodyAccessPortDetails + +type DescribeCloudResourceAccessPortDetailsResponseBodyAccessPortDetailsCertificates = aliwaf.DescribeCloudResourceAccessPortDetailsResponseBodyAccessPortDetailsCertificates + +type DescribeDefaultHttpsRequest = aliwaf.DescribeDefaultHttpsRequest + +type DescribeDefaultHttpsResponse = aliwaf.DescribeDefaultHttpsResponse + +type DescribeDomainDetailRequest = aliwaf.DescribeDomainDetailRequest + +type DescribeDomainDetailResponseBodyRedirectRequestHeaders = aliwaf.DescribeDomainDetailResponseBodyRedirectRequestHeaders + +type DescribeDomainDetailResponse = aliwaf.DescribeDomainDetailResponse + +type DescribeDomainDetailResponseBody = aliwaf.DescribeDomainDetailResponseBody + +type DescribeDomainDetailResponseBodyRedirectBackends = aliwaf.DescribeDomainDetailResponseBodyRedirectBackends + +type DescribeDomainDetailResponseBodyRedirectBackupBackends = aliwaf.DescribeDomainDetailResponseBodyRedirectBackupBackends + +type DescribeResourceInstanceCertsRequest = aliwaf.DescribeResourceInstanceCertsRequest + +type DescribeResourceInstanceCertsResponse = aliwaf.DescribeResourceInstanceCertsResponse + +type DescribeResourceInstanceCertsResponseBodyCerts = aliwaf.DescribeResourceInstanceCertsResponseBodyCerts + +type ModifyCloudResourceCertRequest = aliwaf.ModifyCloudResourceCertRequest + +type ModifyCloudResourceCertRequestCertificates = aliwaf.ModifyCloudResourceCertRequestCertificates + +type ModifyCloudResourceCertResponse = aliwaf.ModifyCloudResourceCertResponse + +type ModifyDefaultHttpsRequest = aliwaf.ModifyDefaultHttpsRequest + +type ModifyDefaultHttpsResponse = aliwaf.ModifyDefaultHttpsResponse + +type ModifyDomainRequest = aliwaf.ModifyDomainRequest + +type ModifyDomainRequestListen = aliwaf.ModifyDomainRequestListen + +type ModifyDomainRequestRedirect = aliwaf.ModifyDomainRequestRedirect + +type ModifyDomainRequestRedirectRequestHeaders = aliwaf.ModifyDomainRequestRedirectRequestHeaders + +type ModifyDomainResponse = aliwaf.ModifyDomainResponse + +type ModifyDomainShrinkRequest = aliwaf.ModifyDomainShrinkRequest diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/aad_client.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/aad_client.go new file mode 100644 index 000000000..bdba448d2 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/aad_client.go @@ -0,0 +1,29 @@ +package v1 + +import ( + httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" + hwaad "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1" + "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/model" +) + +type AadClient struct { + HcClient *httpclient.HcHttpClient +} + +func NewAadClient(hcClient *httpclient.HcHttpClient) *AadClient { + return &AadClient{HcClient: hcClient} +} + +func AadClientBuilder() *httpclient.HcHttpClientBuilder { + return hwaad.AadClientBuilder() +} + +func (c *AadClient) SetCertForDomain(request *model.SetCertForDomainRequest) (*model.SetCertForDomainResponse, error) { + requestDef := GenReqDefForSetCertForDomain() + + if resp, err := c.HcClient.Sync(request, requestDef); err != nil { + return nil, err + } else { + return resp.(*model.SetCertForDomainResponse), nil + } +} diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/aad_meta.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/aad_meta.go new file mode 100644 index 000000000..8b76d6dee --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1/aad_meta.go @@ -0,0 +1,10 @@ +package v1 + +import ( + "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def" + hwaad "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1" +) + +func GenReqDefForSetCertForDomain() *def.HttpRequestDef { + return hwaad.GenReqDefForSetCertForDomain() +} diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/aad_client.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/aad_client.go new file mode 100644 index 000000000..a76584d59 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/aad_client.go @@ -0,0 +1,29 @@ +package v2 + +import ( + httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" + hwaad "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2" + "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/model" +) + +type AadClient struct { + HcClient *httpclient.HcHttpClient +} + +func NewAadClient(hcClient *httpclient.HcHttpClient) *AadClient { + return &AadClient{HcClient: hcClient} +} + +func AadClientBuilder() *httpclient.HcHttpClientBuilder { + return hwaad.AadClientBuilder() +} + +func (c *AadClient) ListInstanceDomains(request *model.ListInstanceDomainsRequest) (*model.ListInstanceDomainsResponse, error) { + requestDef := GenReqDefForListInstanceDomains() + + if resp, err := c.HcClient.Sync(request, requestDef); err != nil { + return nil, err + } else { + return resp.(*model.ListInstanceDomainsResponse), nil + } +} diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/aad_meta.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/aad_meta.go new file mode 100644 index 000000000..1e3f0f621 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/aad_meta.go @@ -0,0 +1,10 @@ +package v2 + +import ( + "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def" + hwaad "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2" +) + +func GenReqDefForListInstanceDomains() *def.HttpRequestDef { + return hwaad.GenReqDefForListInstanceDomains() +} diff --git a/pkg/core/deployer/providers/huaweicloud-apig/internal/client.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/apig_client.go similarity index 75% rename from pkg/core/deployer/providers/huaweicloud-apig/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/apig_client.go index b4f8adf9c..775e1b242 100644 --- a/pkg/core/deployer/providers/huaweicloud-apig/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/apig_client.go @@ -1,4 +1,4 @@ -package internal +package v2 import ( httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" @@ -6,8 +6,6 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/model" ) -// This is a partial copy of https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/services/apig/v2/apig_client.go -// to lightweight the vendor packages in the built binary. type ApigClient struct { HcClient *httpclient.HcHttpClient } @@ -16,8 +14,12 @@ func NewApigClient(hcClient *httpclient.HcHttpClient) *ApigClient { return &ApigClient{HcClient: hcClient} } +func ApigClientBuilder() *httpclient.HcHttpClientBuilder { + return hwapig.ApigClientBuilder() +} + func (c *ApigClient) ShowDetailsOfCertificateV2(request *model.ShowDetailsOfCertificateV2Request) (*model.ShowDetailsOfCertificateV2Response, error) { - requestDef := hwapig.GenReqDefForShowDetailsOfCertificateV2() + requestDef := GenReqDefForShowDetailsOfCertificateV2() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -27,7 +29,7 @@ func (c *ApigClient) ShowDetailsOfCertificateV2(request *model.ShowDetailsOfCert } func (c *ApigClient) UpdateCertificateV2(request *model.UpdateCertificateV2Request) (*model.UpdateCertificateV2Response, error) { - requestDef := hwapig.GenReqDefForUpdateCertificateV2() + requestDef := GenReqDefForUpdateCertificateV2() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/apig_meta.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/apig_meta.go new file mode 100644 index 000000000..561d8cdd3 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/apig_meta.go @@ -0,0 +1,14 @@ +package v2 + +import ( + "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def" + hwapig "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2" +) + +func GenReqDefForShowDetailsOfCertificateV2() *def.HttpRequestDef { + return hwapig.GenReqDefForShowDetailsOfCertificateV2() +} + +func GenReqDefForUpdateCertificateV2() *def.HttpRequestDef { + return hwapig.GenReqDefForUpdateCertificateV2() +} diff --git a/pkg/core/deployer/providers/huaweicloud-cdn/internal/client.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/cdn_client.go similarity index 75% rename from pkg/core/deployer/providers/huaweicloud-cdn/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/cdn_client.go index 12466cb85..74aa4102f 100644 --- a/pkg/core/deployer/providers/huaweicloud-cdn/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/cdn_client.go @@ -1,4 +1,4 @@ -package internal +package v2 import ( httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" @@ -6,8 +6,6 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/model" ) -// This is a partial copy of https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/services/cdn/v2/cdn_client.go -// to lightweight the vendor packages in the built binary. type CdnClient struct { HcClient *httpclient.HcHttpClient } @@ -16,8 +14,12 @@ func NewCdnClient(hcClient *httpclient.HcHttpClient) *CdnClient { return &CdnClient{HcClient: hcClient} } +func CdnClientBuilder() *httpclient.HcHttpClientBuilder { + return hwcdn.CdnClientBuilder() +} + func (c *CdnClient) ListDomains(request *model.ListDomainsRequest) (*model.ListDomainsResponse, error) { - requestDef := hwcdn.GenReqDefForListDomains() + requestDef := GenReqDefForListDomains() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -27,7 +29,7 @@ func (c *CdnClient) ListDomains(request *model.ListDomainsRequest) (*model.ListD } func (c *CdnClient) UpdateDomainMultiCertificates(request *model.UpdateDomainMultiCertificatesRequest) (*model.UpdateDomainMultiCertificatesResponse, error) { - requestDef := hwcdn.GenReqDefForUpdateDomainMultiCertificates() + requestDef := GenReqDefForUpdateDomainMultiCertificates() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/cdn_meta.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/cdn_meta.go new file mode 100644 index 000000000..55d58ccb3 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/cdn_meta.go @@ -0,0 +1,14 @@ +package v2 + +import ( + "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def" + hwcdn "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2" +) + +func GenReqDefForListDomains() *def.HttpRequestDef { + return hwcdn.GenReqDefForListDomains() +} + +func GenReqDefForUpdateDomainMultiCertificates() *def.HttpRequestDef { + return hwcdn.GenReqDefForUpdateDomainMultiCertificates() +} diff --git a/pkg/core/deployer/providers/huaweicloud-elb/internal/client.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/elb_client.go similarity index 66% rename from pkg/core/deployer/providers/huaweicloud-elb/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/elb_client.go index 329ac98a8..4cc46699d 100644 --- a/pkg/core/deployer/providers/huaweicloud-elb/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/elb_client.go @@ -1,4 +1,4 @@ -package internal +package v3 import ( httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" @@ -6,8 +6,6 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/model" ) -// This is a partial copy of https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/services/elb/v3/elb_client.go -// to lightweight the vendor packages in the built binary. type ElbClient struct { HcClient *httpclient.HcHttpClient } @@ -16,8 +14,22 @@ func NewElbClient(hcClient *httpclient.HcHttpClient) *ElbClient { return &ElbClient{HcClient: hcClient} } +func ElbClientBuilder() *httpclient.HcHttpClientBuilder { + return hwelb.ElbClientBuilder() +} + +func (c *ElbClient) CreateCertificate(request *model.CreateCertificateRequest) (*model.CreateCertificateResponse, error) { + requestDef := GenReqDefForCreateCertificate() + + if resp, err := c.HcClient.Sync(request, requestDef); err != nil { + return nil, err + } else { + return resp.(*model.CreateCertificateResponse), nil + } +} + func (c *ElbClient) ListCertificates(request *model.ListCertificatesRequest) (*model.ListCertificatesResponse, error) { - requestDef := hwelb.GenReqDefForListCertificates() + requestDef := GenReqDefForListCertificates() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -27,7 +39,7 @@ func (c *ElbClient) ListCertificates(request *model.ListCertificatesRequest) (*m } func (c *ElbClient) ListListeners(request *model.ListListenersRequest) (*model.ListListenersResponse, error) { - requestDef := hwelb.GenReqDefForListListeners() + requestDef := GenReqDefForListListeners() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -37,7 +49,7 @@ func (c *ElbClient) ListListeners(request *model.ListListenersRequest) (*model.L } func (c *ElbClient) ShowCertificate(request *model.ShowCertificateRequest) (*model.ShowCertificateResponse, error) { - requestDef := hwelb.GenReqDefForShowCertificate() + requestDef := GenReqDefForShowCertificate() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -47,7 +59,7 @@ func (c *ElbClient) ShowCertificate(request *model.ShowCertificateRequest) (*mod } func (c *ElbClient) ShowListener(request *model.ShowListenerRequest) (*model.ShowListenerResponse, error) { - requestDef := hwelb.GenReqDefForShowListener() + requestDef := GenReqDefForShowListener() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -57,7 +69,7 @@ func (c *ElbClient) ShowListener(request *model.ShowListenerRequest) (*model.Sho } func (c *ElbClient) ShowLoadBalancer(request *model.ShowLoadBalancerRequest) (*model.ShowLoadBalancerResponse, error) { - requestDef := hwelb.GenReqDefForShowLoadBalancer() + requestDef := GenReqDefForShowLoadBalancer() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -66,8 +78,18 @@ func (c *ElbClient) ShowLoadBalancer(request *model.ShowLoadBalancerRequest) (*m } } +func (c *ElbClient) UpdateCertificate(request *model.UpdateCertificateRequest) (*model.UpdateCertificateResponse, error) { + requestDef := GenReqDefForUpdateCertificate() + + if resp, err := c.HcClient.Sync(request, requestDef); err != nil { + return nil, err + } else { + return resp.(*model.UpdateCertificateResponse), nil + } +} + func (c *ElbClient) UpdateListener(request *model.UpdateListenerRequest) (*model.UpdateListenerResponse, error) { - requestDef := hwelb.GenReqDefForUpdateListener() + requestDef := GenReqDefForUpdateListener() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/elb_meta.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/elb_meta.go new file mode 100644 index 000000000..a01880c36 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3/elb_meta.go @@ -0,0 +1,38 @@ +package v3 + +import ( + "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def" + hwelb "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" +) + +func GenReqDefForCreateCertificate() *def.HttpRequestDef { + return hwelb.GenReqDefForCreateCertificate() +} + +func GenReqDefForListCertificates() *def.HttpRequestDef { + return hwelb.GenReqDefForListCertificates() +} + +func GenReqDefForListListeners() *def.HttpRequestDef { + return hwelb.GenReqDefForListListeners() +} + +func GenReqDefForShowCertificate() *def.HttpRequestDef { + return hwelb.GenReqDefForShowCertificate() +} + +func GenReqDefForShowListener() *def.HttpRequestDef { + return hwelb.GenReqDefForShowListener() +} + +func GenReqDefForShowLoadBalancer() *def.HttpRequestDef { + return hwelb.GenReqDefForShowLoadBalancer() +} + +func GenReqDefForUpdateCertificate() *def.HttpRequestDef { + return hwelb.GenReqDefForUpdateCertificate() +} + +func GenReqDefForUpdateListener() *def.HttpRequestDef { + return hwelb.GenReqDefForUpdateListener() +} diff --git a/pkg/core/deployer/providers/huaweicloud-live/internal/client.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/live_client.go similarity index 75% rename from pkg/core/deployer/providers/huaweicloud-live/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/live_client.go index 5119335d4..c01ba005b 100644 --- a/pkg/core/deployer/providers/huaweicloud-live/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/live_client.go @@ -1,4 +1,4 @@ -package internal +package v1 import ( httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" @@ -6,8 +6,6 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/model" ) -// This is a partial copy of https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/services/live/v1/live_client.go -// to lightweight the vendor packages in the built binary. type LiveClient struct { HcClient *httpclient.HcHttpClient } @@ -16,8 +14,12 @@ func NewLiveClient(hcClient *httpclient.HcHttpClient) *LiveClient { return &LiveClient{HcClient: hcClient} } +func LiveClientBuilder() *httpclient.HcHttpClientBuilder { + return hwlive.LiveClientBuilder() +} + func (c *LiveClient) ShowDomain(request *model.ShowDomainRequest) (*model.ShowDomainResponse, error) { - requestDef := hwlive.GenReqDefForShowDomain() + requestDef := GenReqDefForShowDomain() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -27,7 +29,7 @@ func (c *LiveClient) ShowDomain(request *model.ShowDomainRequest) (*model.ShowDo } func (c *LiveClient) UpdateDomainHttpsCert(request *model.UpdateDomainHttpsCertRequest) (*model.UpdateDomainHttpsCertResponse, error) { - requestDef := hwlive.GenReqDefForUpdateDomainHttpsCert() + requestDef := GenReqDefForUpdateDomainHttpsCert() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/live_meta.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/live_meta.go new file mode 100644 index 000000000..bd526a9b1 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/live_meta.go @@ -0,0 +1,14 @@ +package v1 + +import ( + "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def" + hwlive "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1" +) + +func GenReqDefForShowDomain() *def.HttpRequestDef { + return hwlive.GenReqDefForShowDomain() +} + +func GenReqDefForUpdateDomainHttpsCert() *def.HttpRequestDef { + return hwlive.GenReqDefForUpdateDomainHttpsCert() +} diff --git a/pkg/core/certmgr/providers/huaweicloud-scm/internal/client.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/scm_client.go similarity index 77% rename from pkg/core/certmgr/providers/huaweicloud-scm/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/scm_client.go index 6e1dda378..3cac7d24c 100644 --- a/pkg/core/certmgr/providers/huaweicloud-scm/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/scm_client.go @@ -1,4 +1,4 @@ -package internal +package v3 import ( httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" @@ -6,8 +6,6 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/model" ) -// This is a partial copy of https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/services/scm/v3/scm_client.go -// to lightweight the vendor packages in the built binary. type ScmClient struct { HcClient *httpclient.HcHttpClient } @@ -16,8 +14,12 @@ func NewScmClient(hcClient *httpclient.HcHttpClient) *ScmClient { return &ScmClient{HcClient: hcClient} } +func ScmClientBuilder() *httpclient.HcHttpClientBuilder { + return hwscm.ScmClientBuilder() +} + func (c *ScmClient) ExportCertificate(request *model.ExportCertificateRequest) (*model.ExportCertificateResponse, error) { - requestDef := hwscm.GenReqDefForExportCertificate() + requestDef := GenReqDefForExportCertificate() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -27,7 +29,7 @@ func (c *ScmClient) ExportCertificate(request *model.ExportCertificateRequest) ( } func (c *ScmClient) ImportCertificate(request *model.ImportCertificateRequest) (*model.ImportCertificateResponse, error) { - requestDef := hwscm.GenReqDefForImportCertificate() + requestDef := GenReqDefForImportCertificate() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -37,7 +39,7 @@ func (c *ScmClient) ImportCertificate(request *model.ImportCertificateRequest) ( } func (c *ScmClient) ListCertificates(request *model.ListCertificatesRequest) (*model.ListCertificatesResponse, error) { - requestDef := hwscm.GenReqDefForListCertificates() + requestDef := GenReqDefForListCertificates() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/scm_meta.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/scm_meta.go new file mode 100644 index 000000000..eec903fc2 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/scm_meta.go @@ -0,0 +1,18 @@ +package v3 + +import ( + "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def" + hwscm "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3" +) + +func GenReqDefForExportCertificate() *def.HttpRequestDef { + return hwscm.GenReqDefForExportCertificate() +} + +func GenReqDefForImportCertificate() *def.HttpRequestDef { + return hwscm.GenReqDefForImportCertificate() +} + +func GenReqDefForListCertificates() *def.HttpRequestDef { + return hwscm.GenReqDefForListCertificates() +} diff --git a/pkg/core/deployer/providers/huaweicloud-waf/internal/client.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/waf_client.go similarity index 66% rename from pkg/core/deployer/providers/huaweicloud-waf/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/waf_client.go index b91b4071b..da9855da8 100644 --- a/pkg/core/deployer/providers/huaweicloud-waf/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/waf_client.go @@ -1,4 +1,4 @@ -package internal +package v1 import ( httpclient "github.com/huaweicloud/huaweicloud-sdk-go-v3/core" @@ -6,8 +6,6 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" ) -// This is a partial copy of https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/services/waf/v1/waf_client.go -// to lightweight the vendor packages in the built binary. type WafClient struct { HcClient *httpclient.HcHttpClient } @@ -16,8 +14,32 @@ func NewWafClient(hcClient *httpclient.HcHttpClient) *WafClient { return &WafClient{HcClient: hcClient} } +func WafClientBuilder() *httpclient.HcHttpClientBuilder { + return hwwaf.WafClientBuilder() +} + +func (c *WafClient) CreateCertificate(request *model.CreateCertificateRequest) (*model.CreateCertificateResponse, error) { + requestDef := GenReqDefForCreateCertificate() + + if resp, err := c.HcClient.Sync(request, requestDef); err != nil { + return nil, err + } else { + return resp.(*model.CreateCertificateResponse), nil + } +} + +func (c *WafClient) ListCertificates(request *model.ListCertificatesRequest) (*model.ListCertificatesResponse, error) { + requestDef := GenReqDefForListCertificates() + + if resp, err := c.HcClient.Sync(request, requestDef); err != nil { + return nil, err + } else { + return resp.(*model.ListCertificatesResponse), nil + } +} + func (c *WafClient) ListHost(request *model.ListHostRequest) (*model.ListHostResponse, error) { - requestDef := hwwaf.GenReqDefForListHost() + requestDef := GenReqDefForListHost() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -27,7 +49,7 @@ func (c *WafClient) ListHost(request *model.ListHostRequest) (*model.ListHostRes } func (c *WafClient) ListPremiumHost(request *model.ListPremiumHostRequest) (*model.ListPremiumHostResponse, error) { - requestDef := hwwaf.GenReqDefForListPremiumHost() + requestDef := GenReqDefForListPremiumHost() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -37,7 +59,7 @@ func (c *WafClient) ListPremiumHost(request *model.ListPremiumHostRequest) (*mod } func (c *WafClient) ShowCertificate(request *model.ShowCertificateRequest) (*model.ShowCertificateResponse, error) { - requestDef := hwwaf.GenReqDefForShowCertificate() + requestDef := GenReqDefForShowCertificate() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -47,7 +69,7 @@ func (c *WafClient) ShowCertificate(request *model.ShowCertificateRequest) (*mod } func (c *WafClient) UpdateCertificate(request *model.UpdateCertificateRequest) (*model.UpdateCertificateResponse, error) { - requestDef := hwwaf.GenReqDefForUpdateCertificate() + requestDef := GenReqDefForUpdateCertificate() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -57,7 +79,7 @@ func (c *WafClient) UpdateCertificate(request *model.UpdateCertificateRequest) ( } func (c *WafClient) UpdateHost(request *model.UpdateHostRequest) (*model.UpdateHostResponse, error) { - requestDef := hwwaf.GenReqDefForUpdateHost() + requestDef := GenReqDefForUpdateHost() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err @@ -67,7 +89,7 @@ func (c *WafClient) UpdateHost(request *model.UpdateHostRequest) (*model.UpdateH } func (c *WafClient) UpdatePremiumHost(request *model.UpdatePremiumHostRequest) (*model.UpdatePremiumHostResponse, error) { - requestDef := hwwaf.GenReqDefForUpdatePremiumHost() + requestDef := GenReqDefForUpdatePremiumHost() if resp, err := c.HcClient.Sync(request, requestDef); err != nil { return nil, err diff --git a/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/waf_meta.go b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/waf_meta.go new file mode 100644 index 000000000..4c6925ba5 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/waf_meta.go @@ -0,0 +1,38 @@ +package v1 + +import ( + "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def" + hwwaf "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" +) + +func GenReqDefForCreateCertificate() *def.HttpRequestDef { + return hwwaf.GenReqDefForCreateCertificate() +} + +func GenReqDefForListCertificates() *def.HttpRequestDef { + return hwwaf.GenReqDefForListCertificates() +} + +func GenReqDefForListHost() *def.HttpRequestDef { + return hwwaf.GenReqDefForListHost() +} + +func GenReqDefForListPremiumHost() *def.HttpRequestDef { + return hwwaf.GenReqDefForListPremiumHost() +} + +func GenReqDefForShowCertificate() *def.HttpRequestDef { + return hwwaf.GenReqDefForShowCertificate() +} + +func GenReqDefForUpdateCertificate() *def.HttpRequestDef { + return hwwaf.GenReqDefForUpdateCertificate() +} + +func GenReqDefForUpdateHost() *def.HttpRequestDef { + return hwwaf.GenReqDefForUpdateHost() +} + +func GenReqDefForUpdatePremiumHost() *def.HttpRequestDef { + return hwwaf.GenReqDefForUpdatePremiumHost() +} diff --git a/pkg/core/deployer/providers/jdcloud-cdn/internal/client.go b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/client/CdnClient.go similarity index 88% rename from pkg/core/deployer/providers/jdcloud-cdn/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/client/CdnClient.go index 7088590c9..4a88b995e 100644 --- a/pkg/core/deployer/providers/jdcloud-cdn/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/client/CdnClient.go @@ -1,4 +1,4 @@ -package internal +package client import ( "encoding/json" @@ -8,8 +8,6 @@ import ( cdn "github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/apis" ) -// This is a partial copy of https://github.com/jdcloud-api/jdcloud-sdk-go/blob/master/services/cdn/client/CdnClient.go -// to lightweight the vendor packages in the built binary. type CdnClient struct { core.JDCloudClient } @@ -27,17 +25,20 @@ func NewCdnClient(credential *core.Credential) *CdnClient { Credential: *credential, Config: *config, ServiceName: "cdn", - Revision: "0.10.47", - Logger: core.NewDummyLogger(), + Revision: "0.10.48", + Logger: core.NewDefaultLogger(core.LogInfo), }, } } +func (c *CdnClient) DisableLogger() { + c.Logger = core.NewDummyLogger() +} + func (c *CdnClient) GetDomainList(request *cdn.GetDomainListRequest) (*cdn.GetDomainListResponse, error) { if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err @@ -57,7 +58,6 @@ func (c *CdnClient) QueryDomainConfig(request *cdn.QueryDomainConfigRequest) (*c if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err @@ -77,7 +77,6 @@ func (c *CdnClient) SetHttpType(request *cdn.SetHttpTypeRequest) (*cdn.SetHttpTy if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err diff --git a/pkg/core/deployer/providers/jdcloud-alb/internal/client.go b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/lb/client/LbClient.go similarity index 93% rename from pkg/core/deployer/providers/jdcloud-alb/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/lb/client/LbClient.go index 101612bab..058884a9b 100644 --- a/pkg/core/deployer/providers/jdcloud-alb/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/lb/client/LbClient.go @@ -1,4 +1,4 @@ -package internal +package client import ( "encoding/json" @@ -8,8 +8,6 @@ import ( lb "github.com/jdcloud-api/jdcloud-sdk-go/services/lb/apis" ) -// This is a partial copy of https://github.com/jdcloud-api/jdcloud-sdk-go/blob/master/services/lb/client/LbClient.go -// to lightweight the vendor packages in the built binary. type LbClient struct { core.JDCloudClient } @@ -33,11 +31,14 @@ func NewLbClient(credential *core.Credential) *LbClient { } } +func (c *LbClient) DisableLogger() { + c.Logger = core.NewDummyLogger() +} + func (c *LbClient) DescribeListener(request *lb.DescribeListenerRequest) (*lb.DescribeListenerResponse, error) { if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err @@ -57,7 +58,6 @@ func (c *LbClient) DescribeListeners(request *lb.DescribeListenersRequest) (*lb. if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err @@ -77,7 +77,6 @@ func (c *LbClient) DescribeLoadBalancer(request *lb.DescribeLoadBalancerRequest) if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err @@ -97,7 +96,6 @@ func (c *LbClient) UpdateListener(request *lb.UpdateListenerRequest) (*lb.Update if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err @@ -117,7 +115,6 @@ func (c *LbClient) UpdateListenerCertificates(request *lb.UpdateListenerCertific if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err diff --git a/pkg/core/deployer/providers/jdcloud-live/internal/client.go b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/live/client/LiveClient.go similarity index 86% rename from pkg/core/deployer/providers/jdcloud-live/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/live/client/LiveClient.go index d7a89ccfc..b47e7b7ee 100644 --- a/pkg/core/deployer/providers/jdcloud-live/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/live/client/LiveClient.go @@ -1,4 +1,4 @@ -package internal +package client import ( "encoding/json" @@ -8,8 +8,6 @@ import ( live "github.com/jdcloud-api/jdcloud-sdk-go/services/live/apis" ) -// This is a partial copy of https://github.com/jdcloud-api/jdcloud-sdk-go/blob/master/services/live/client/LiveClient.go -// to lightweight the vendor packages in the built binary. type LiveClient struct { core.JDCloudClient } @@ -28,11 +26,15 @@ func NewLiveClient(credential *core.Credential) *LiveClient { Config: *config, ServiceName: "live", Revision: "1.0.22", - Logger: core.NewDummyLogger(), + Logger: core.NewDefaultLogger(core.LogInfo), }, } } +func (c *LiveClient) DisableLogger() { + c.Logger = core.NewDummyLogger() +} + func (c *LiveClient) DescribeLiveDomains(request *live.DescribeLiveDomainsRequest) (*live.DescribeLiveDomainsResponse, error) { if request == nil { return nil, errors.New("Request object is nil.") @@ -56,7 +58,6 @@ func (c *LiveClient) SetLiveDomainCertificate(request *live.SetLiveDomainCertifi if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err diff --git a/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client/SslClient.go b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client/SslClient.go new file mode 100644 index 000000000..f1cab7786 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client/SslClient.go @@ -0,0 +1,74 @@ +package client + +import ( + "encoding/json" + "errors" + + "github.com/jdcloud-api/jdcloud-sdk-go/core" + ssl "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/apis" +) + +type SslClient struct { + core.JDCloudClient +} + +func NewSslClient(credential *core.Credential) *SslClient { + if credential == nil { + return nil + } + + config := core.NewConfig() + config.SetEndpoint("ssl.jdcloud-api.com") + + return &SslClient{ + core.JDCloudClient{ + Credential: *credential, + Config: *config, + ServiceName: "ssl", + Revision: "1.0.2", + Logger: core.NewDefaultLogger(core.LogInfo), + }, + } +} + +func (c *SslClient) DisableLogger() { + c.Logger = core.NewDummyLogger() +} + +func (c *SslClient) DescribeCerts(request *ssl.DescribeCertsRequest) (*ssl.DescribeCertsResponse, error) { + if request == nil { + return nil, errors.New("Request object is nil.") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } + + jdResp := &ssl.DescribeCertsResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } + + return jdResp, err +} + +func (c *SslClient) UploadCert(request *ssl.UploadCertRequest) (*ssl.UploadCertResponse, error) { + if request == nil { + return nil, errors.New("Request object is nil.") + } + resp, err := c.Send(request, c.ServiceName) + if err != nil { + return nil, err + } + + jdResp := &ssl.UploadCertResponse{} + err = json.Unmarshal(resp, jdResp) + if err != nil { + c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp)) + return nil, err + } + + return jdResp, err +} diff --git a/pkg/core/deployer/providers/jdcloud-vod/internal/client.go b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/vod/client/VodClient.go similarity index 89% rename from pkg/core/deployer/providers/jdcloud-vod/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/vod/client/VodClient.go index 58113eafc..b1cf9c816 100644 --- a/pkg/core/deployer/providers/jdcloud-vod/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/vod/client/VodClient.go @@ -1,4 +1,4 @@ -package internal +package client import ( "encoding/json" @@ -8,8 +8,6 @@ import ( vod "github.com/jdcloud-api/jdcloud-sdk-go/services/vod/apis" ) -// This is a partial copy of https://github.com/jdcloud-api/jdcloud-sdk-go/blob/master/services/vod/client/VodClient.go -// to lightweight the vendor packages in the built binary. type VodClient struct { core.JDCloudClient } @@ -28,16 +26,19 @@ func NewVodClient(credential *core.Credential) *VodClient { Config: *config, ServiceName: "vod", Revision: "1.2.1", - Logger: core.NewDummyLogger(), + Logger: core.NewDefaultLogger(core.LogInfo), }, } } +func (c *VodClient) DisableLogger() { + c.Logger = core.NewDummyLogger() +} + func (c *VodClient) ListDomains(request *vod.ListDomainsRequest) (*vod.ListDomainsResponse, error) { if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err @@ -57,7 +58,6 @@ func (c *VodClient) GetHttpSsl(request *vod.GetHttpSslRequest) (*vod.GetHttpSslR if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err @@ -77,7 +77,6 @@ func (c *VodClient) SetHttpSsl(request *vod.SetHttpSslRequest) (*vod.SetHttpSslR if request == nil { return nil, errors.New("Request object is nil.") } - resp, err := c.Send(request, c.ServiceName) if err != nil { return nil, err diff --git a/pkg/core/deployer/providers/jdcloud-waf/internal/client.go b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/waf/client/WafClient.go similarity index 80% rename from pkg/core/deployer/providers/jdcloud-waf/internal/client.go rename to pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/waf/client/WafClient.go index 60a487598..7acfce73b 100644 --- a/pkg/core/deployer/providers/jdcloud-waf/internal/client.go +++ b/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/waf/client/WafClient.go @@ -1,4 +1,4 @@ -package internal +package client import ( "encoding/json" @@ -8,8 +8,6 @@ import ( waf "github.com/jdcloud-api/jdcloud-sdk-go/services/waf/apis" ) -// This is a partial copy of https://github.com/jdcloud-api/jdcloud-sdk-go/blob/master/services/waf/client/WafClient.go -// to lightweight the vendor packages in the built binary. type WafClient struct { core.JDCloudClient } @@ -28,11 +26,15 @@ func NewWafClient(credential *core.Credential) *WafClient { Config: *config, ServiceName: "waf", Revision: "1.0.9", - Logger: core.NewDummyLogger(), + Logger: core.NewDefaultLogger(core.LogInfo), }, } } +func (c *WafClient) DisableLogger() { + c.Logger = core.NewDummyLogger() +} + func (c *WafClient) BindCert(request *waf.BindCertRequest) (*waf.BindCertResponse, error) { if request == nil { return nil, errors.New("Request object is nil.") diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606/client.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606/client.go new file mode 100644 index 000000000..2daafebff --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606/client.go @@ -0,0 +1,124 @@ +package v20180606 + +import ( + "context" + "errors" + + tccdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" +) + +const APIVersion = tccdn.APIVersion + +type Client struct { + common.Client +} + +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return +} + +func NewDescribeCertDomainsRequest() (request *DescribeCertDomainsRequest) { + return tccdn.NewDescribeCertDomainsRequest() +} + +func NewDescribeCertDomainsResponse() (response *DescribeCertDomainsResponse) { + return tccdn.NewDescribeCertDomainsResponse() +} + +func (c *Client) DescribeCertDomainsWithContext(ctx context.Context, request *DescribeCertDomainsRequest) (response *DescribeCertDomainsResponse, err error) { + if request == nil { + request = NewDescribeCertDomainsRequest() + } + c.InitBaseRequest(&request.BaseRequest, "cdn", APIVersion, "DescribeCertDomains") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeCertDomains require credential") + } + + request.SetContext(ctx) + + response = NewDescribeCertDomainsResponse() + err = c.Send(request, response) + return +} + +func NewDescribeDomainsRequest() (request *DescribeDomainsRequest) { + return tccdn.NewDescribeDomainsRequest() +} + +func NewDescribeDomainsResponse() (response *DescribeDomainsResponse) { + return tccdn.NewDescribeDomainsResponse() +} + +func (c *Client) DescribeDomainsWithContext(ctx context.Context, request *DescribeDomainsRequest) (response *DescribeDomainsResponse, err error) { + if request == nil { + request = NewDescribeDomainsRequest() + } + c.InitBaseRequest(&request.BaseRequest, "cdn", APIVersion, "DescribeDomains") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeDomains require credential") + } + + request.SetContext(ctx) + + response = NewDescribeDomainsResponse() + err = c.Send(request, response) + return +} + +func NewDescribeDomainsConfigRequest() (request *DescribeDomainsConfigRequest) { + return tccdn.NewDescribeDomainsConfigRequest() +} + +func NewDescribeDomainsConfigResponse() (response *DescribeDomainsConfigResponse) { + return tccdn.NewDescribeDomainsConfigResponse() +} + +func (c *Client) DescribeDomainsConfigWithContext(ctx context.Context, request *DescribeDomainsConfigRequest) (response *DescribeDomainsConfigResponse, err error) { + if request == nil { + request = NewDescribeDomainsConfigRequest() + } + c.InitBaseRequest(&request.BaseRequest, "cdn", APIVersion, "DescribeDomainsConfig") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeDomainsConfig require credential") + } + + request.SetContext(ctx) + + response = NewDescribeDomainsConfigResponse() + err = c.Send(request, response) + return +} + +func NewUpdateDomainConfigRequest() (request *UpdateDomainConfigRequest) { + return tccdn.NewUpdateDomainConfigRequest() +} + +func NewUpdateDomainConfigResponse() (response *UpdateDomainConfigResponse) { + return tccdn.NewUpdateDomainConfigResponse() +} + +func (c *Client) UpdateDomainConfigWithContext(ctx context.Context, request *UpdateDomainConfigRequest) (response *UpdateDomainConfigResponse, err error) { + if request == nil { + request = NewUpdateDomainConfigRequest() + } + c.InitBaseRequest(&request.BaseRequest, "cdn", APIVersion, "UpdateDomainConfig") + + if c.GetCredential() == nil { + return nil, errors.New("UpdateDomainConfig require credential") + } + + request.SetContext(ctx) + + response = NewUpdateDomainConfigResponse() + err = c.Send(request, response) + return +} diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606/models.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606/models.go new file mode 100644 index 000000000..ad81d1a74 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606/models.go @@ -0,0 +1,27 @@ +package v20180606 + +import ( + tccdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" +) + +type ( + DomainFilter = tccdn.DomainFilter + Https = tccdn.Https + ServerCert = tccdn.ServerCert +) + +type DescribeCertDomainsRequest = tccdn.DescribeCertDomainsRequest + +type DescribeCertDomainsResponse = tccdn.DescribeCertDomainsResponse + +type DescribeDomainsRequest = tccdn.DescribeDomainsRequest + +type DescribeDomainsResponse = tccdn.DescribeDomainsResponse + +type DescribeDomainsConfigRequest = tccdn.DescribeDomainsConfigRequest + +type DescribeDomainsConfigResponse = tccdn.DescribeDomainsConfigResponse + +type UpdateDomainConfigRequest = tccdn.UpdateDomainConfigRequest + +type UpdateDomainConfigResponse = tccdn.UpdateDomainConfigResponse diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317/client.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317/client.go new file mode 100644 index 000000000..2ace22ae3 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317/client.go @@ -0,0 +1,120 @@ +package v20180317 + +import ( + "context" + "errors" + + tcclb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" +) + +const APIVersion = tcclb.APIVersion + +type Client struct { + common.Client +} + +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return +} + +func NewDescribeListenersRequest() (request *DescribeListenersRequest) { + return tcclb.NewDescribeListenersRequest() +} + +func NewDescribeListenersResponse() (response *DescribeListenersResponse) { + return tcclb.NewDescribeListenersResponse() +} + +func (c *Client) DescribeListenersWithContext(ctx context.Context, request *DescribeListenersRequest) (response *DescribeListenersResponse, err error) { + if request == nil { + request = NewDescribeListenersRequest() + } + c.InitBaseRequest(&request.BaseRequest, "clb", APIVersion, "DescribeListeners") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeListeners require credential") + } + + request.SetContext(ctx) + response = NewDescribeListenersResponse() + err = c.Send(request, response) + return +} + +func NewDescribeTaskStatusRequest() (request *DescribeTaskStatusRequest) { + return tcclb.NewDescribeTaskStatusRequest() +} + +func NewDescribeTaskStatusResponse() (response *DescribeTaskStatusResponse) { + return tcclb.NewDescribeTaskStatusResponse() +} + +func (c *Client) DescribeTaskStatusWithContext(ctx context.Context, request *DescribeTaskStatusRequest) (response *DescribeTaskStatusResponse, err error) { + if request == nil { + request = NewDescribeTaskStatusRequest() + } + c.InitBaseRequest(&request.BaseRequest, "clb", APIVersion, "DescribeTaskStatus") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeTaskStatus require credential") + } + + request.SetContext(ctx) + response = NewDescribeTaskStatusResponse() + err = c.Send(request, response) + return +} + +func NewModifyDomainAttributesRequest() (request *ModifyDomainAttributesRequest) { + return tcclb.NewModifyDomainAttributesRequest() +} + +func NewModifyDomainAttributesResponse() (response *ModifyDomainAttributesResponse) { + return tcclb.NewModifyDomainAttributesResponse() +} + +func (c *Client) ModifyDomainAttributesWithContext(ctx context.Context, request *ModifyDomainAttributesRequest) (response *ModifyDomainAttributesResponse, err error) { + if request == nil { + request = NewModifyDomainAttributesRequest() + } + c.InitBaseRequest(&request.BaseRequest, "clb", APIVersion, "ModifyDomainAttributes") + + if c.GetCredential() == nil { + return nil, errors.New("ModifyDomainAttributes require credential") + } + + request.SetContext(ctx) + response = NewModifyDomainAttributesResponse() + err = c.Send(request, response) + return +} + +func NewModifyListenerRequest() (request *ModifyListenerRequest) { + return tcclb.NewModifyListenerRequest() +} + +func NewModifyListenerResponse() (response *ModifyListenerResponse) { + return tcclb.NewModifyListenerResponse() +} + +func (c *Client) ModifyListenerWithContext(ctx context.Context, request *ModifyListenerRequest) (response *ModifyListenerResponse, err error) { + if request == nil { + request = NewModifyListenerRequest() + } + c.InitBaseRequest(&request.BaseRequest, "clb", APIVersion, "ModifyListener") + + if c.GetCredential() == nil { + return nil, errors.New("ModifyListener require credential") + } + + request.SetContext(ctx) + response = NewModifyListenerResponse() + err = c.Send(request, response) + return +} diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317/models.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317/models.go new file mode 100644 index 000000000..914b4a1c2 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317/models.go @@ -0,0 +1,25 @@ +package v20180317 + +import ( + tcclb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317" +) + +type ( + CertificateInput = tcclb.CertificateInput +) + +type DescribeListenersRequest = tcclb.DescribeListenersRequest + +type DescribeListenersResponse = tcclb.DescribeListenersResponse + +type DescribeTaskStatusRequest = tcclb.DescribeTaskStatusRequest + +type DescribeTaskStatusResponse = tcclb.DescribeTaskStatusResponse + +type ModifyDomainAttributesRequest = tcclb.ModifyDomainAttributesRequest + +type ModifyDomainAttributesResponse = tcclb.ModifyDomainAttributesResponse + +type ModifyListenerRequest = tcclb.ModifyListenerRequest + +type ModifyListenerResponse = tcclb.ModifyListenerResponse diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529/client.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529/client.go new file mode 100644 index 000000000..41090de4f --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529/client.go @@ -0,0 +1,74 @@ +package v20180529 + +import ( + "context" + "errors" + + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + tcgaap "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529" +) + +const APIVersion = tcgaap.APIVersion + +type Client struct { + common.Client +} + +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return +} + +func NewDescribeHTTPSListenersRequest() (request *DescribeHTTPSListenersRequest) { + return tcgaap.NewDescribeHTTPSListenersRequest() +} + +func NewDescribeHTTPSListenersResponse() (response *DescribeHTTPSListenersResponse) { + return tcgaap.NewDescribeHTTPSListenersResponse() +} + +func (c *Client) DescribeHTTPSListenersWithContext(ctx context.Context, request *DescribeHTTPSListenersRequest) (response *DescribeHTTPSListenersResponse, err error) { + if request == nil { + request = NewDescribeHTTPSListenersRequest() + } + c.InitBaseRequest(&request.BaseRequest, "gaap", APIVersion, "DescribeHTTPSListeners") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeHTTPSListeners require credential") + } + + request.SetContext(ctx) + + response = NewDescribeHTTPSListenersResponse() + err = c.Send(request, response) + return +} + +func NewModifyHTTPSListenerAttributeRequest() (request *ModifyHTTPSListenerAttributeRequest) { + return tcgaap.NewModifyHTTPSListenerAttributeRequest() +} + +func NewModifyHTTPSListenerAttributeResponse() (response *ModifyHTTPSListenerAttributeResponse) { + return tcgaap.NewModifyHTTPSListenerAttributeResponse() +} + +func (c *Client) ModifyHTTPSListenerAttributeWithContext(ctx context.Context, request *ModifyHTTPSListenerAttributeRequest) (response *ModifyHTTPSListenerAttributeResponse, err error) { + if request == nil { + request = NewModifyHTTPSListenerAttributeRequest() + } + c.InitBaseRequest(&request.BaseRequest, "gaap", APIVersion, "ModifyHTTPSListenerAttribute") + + if c.GetCredential() == nil { + return nil, errors.New("ModifyHTTPSListenerAttribute require credential") + } + + request.SetContext(ctx) + + response = NewModifyHTTPSListenerAttributeResponse() + err = c.Send(request, response) + return +} diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529/models.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529/models.go new file mode 100644 index 000000000..052c3e2f5 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529/models.go @@ -0,0 +1,13 @@ +package v20180529 + +import ( + tcgaap "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529" +) + +type DescribeHTTPSListenersRequest = tcgaap.DescribeHTTPSListenersRequest + +type DescribeHTTPSListenersResponse = tcgaap.DescribeHTTPSListenersResponse + +type ModifyHTTPSListenerAttributeRequest = tcgaap.ModifyHTTPSListenerAttributeRequest + +type ModifyHTTPSListenerAttributeResponse = tcgaap.ModifyHTTPSListenerAttributeResponse diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801/client.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801/client.go new file mode 100644 index 000000000..a151d821c --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801/client.go @@ -0,0 +1,74 @@ +package v20180801 + +import ( + "context" + "errors" + + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + tclive "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801" +) + +const APIVersion = tclive.APIVersion + +type Client struct { + common.Client +} + +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return +} + +func NewDescribeLiveDomainsRequest() (request *DescribeLiveDomainsRequest) { + return tclive.NewDescribeLiveDomainsRequest() +} + +func NewDescribeLiveDomainsResponse() (response *DescribeLiveDomainsResponse) { + return tclive.NewDescribeLiveDomainsResponse() +} + +func (c *Client) DescribeLiveDomainsWithContext(ctx context.Context, request *DescribeLiveDomainsRequest) (response *DescribeLiveDomainsResponse, err error) { + if request == nil { + request = NewDescribeLiveDomainsRequest() + } + c.InitBaseRequest(&request.BaseRequest, "live", APIVersion, "DescribeLiveDomains") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeLiveDomains require credential") + } + + request.SetContext(ctx) + + response = NewDescribeLiveDomainsResponse() + err = c.Send(request, response) + return +} + +func NewModifyLiveDomainCertBindingsRequest() (request *ModifyLiveDomainCertBindingsRequest) { + return tclive.NewModifyLiveDomainCertBindingsRequest() +} + +func NewModifyLiveDomainCertBindingsResponse() (response *ModifyLiveDomainCertBindingsResponse) { + return tclive.NewModifyLiveDomainCertBindingsResponse() +} + +func (c *Client) ModifyLiveDomainCertBindingsWithContext(ctx context.Context, request *ModifyLiveDomainCertBindingsRequest) (response *ModifyLiveDomainCertBindingsResponse, err error) { + if request == nil { + request = NewModifyLiveDomainCertBindingsRequest() + } + c.InitBaseRequest(&request.BaseRequest, "live", APIVersion, "ModifyLiveDomainCertBindings") + + if c.GetCredential() == nil { + return nil, errors.New("ModifyLiveDomainCertBindings require credential") + } + + request.SetContext(ctx) + + response = NewModifyLiveDomainCertBindingsResponse() + err = c.Send(request, response) + return +} diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801/models.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801/models.go new file mode 100644 index 000000000..a798c0ab1 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801/models.go @@ -0,0 +1,17 @@ +package v20180801 + +import ( + tclive "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801" +) + +type ( + LiveCertDomainInfo = tclive.LiveCertDomainInfo +) + +type DescribeLiveDomainsRequest = tclive.DescribeLiveDomainsRequest + +type DescribeLiveDomainsResponse = tclive.DescribeLiveDomainsResponse + +type ModifyLiveDomainCertBindingsRequest = tclive.ModifyLiveDomainCertBindingsRequest + +type ModifyLiveDomainCertBindingsResponse = tclive.ModifyLiveDomainCertBindingsResponse diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416/client.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416/client.go new file mode 100644 index 000000000..9eed9a74d --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416/client.go @@ -0,0 +1,99 @@ +package v20180416 + +import ( + "context" + "errors" + + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + tcscf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416" +) + +const APIVersion = tcscf.APIVersion + +type Client struct { + common.Client +} + +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return +} + +func NewGetCustomDomainRequest() (request *GetCustomDomainRequest) { + return tcscf.NewGetCustomDomainRequest() +} + +func NewGetCustomDomainResponse() (response *GetCustomDomainResponse) { + return tcscf.NewGetCustomDomainResponse() +} + +func (c *Client) GetCustomDomainWithContext(ctx context.Context, request *GetCustomDomainRequest) (response *GetCustomDomainResponse, err error) { + if request == nil { + request = NewGetCustomDomainRequest() + } + c.InitBaseRequest(&request.BaseRequest, "scf", APIVersion, "GetCustomDomain") + + if c.GetCredential() == nil { + return nil, errors.New("GetCustomDomain require credential") + } + + request.SetContext(ctx) + + response = NewGetCustomDomainResponse() + err = c.Send(request, response) + return +} + +func NewListCustomDomainsRequest() (request *ListCustomDomainsRequest) { + return tcscf.NewListCustomDomainsRequest() +} + +func NewListCustomDomainsResponse() (response *ListCustomDomainsResponse) { + return tcscf.NewListCustomDomainsResponse() +} + +func (c *Client) ListCustomDomainsWithContext(ctx context.Context, request *ListCustomDomainsRequest) (response *ListCustomDomainsResponse, err error) { + if request == nil { + request = NewListCustomDomainsRequest() + } + c.InitBaseRequest(&request.BaseRequest, "scf", APIVersion, "ListCustomDomains") + + if c.GetCredential() == nil { + return nil, errors.New("ListCustomDomains require credential") + } + + request.SetContext(ctx) + + response = NewListCustomDomainsResponse() + err = c.Send(request, response) + return +} + +func NewUpdateCustomDomainRequest() (request *UpdateCustomDomainRequest) { + return tcscf.NewUpdateCustomDomainRequest() +} + +func NewUpdateCustomDomainResponse() (response *UpdateCustomDomainResponse) { + return tcscf.NewUpdateCustomDomainResponse() +} + +func (c *Client) UpdateCustomDomainWithContext(ctx context.Context, request *UpdateCustomDomainRequest) (response *UpdateCustomDomainResponse, err error) { + if request == nil { + request = NewUpdateCustomDomainRequest() + } + c.InitBaseRequest(&request.BaseRequest, "scf", APIVersion, "UpdateCustomDomain") + + if c.GetCredential() == nil { + return nil, errors.New("UpdateCustomDomain require credential") + } + + request.SetContext(ctx) + + response = NewUpdateCustomDomainResponse() + err = c.Send(request, response) + return +} diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416/models.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416/models.go new file mode 100644 index 000000000..300528383 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416/models.go @@ -0,0 +1,21 @@ +package v20180416 + +import ( + tcscf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416" +) + +type ( + CertConf = tcscf.CertConf +) + +type GetCustomDomainRequest = tcscf.GetCustomDomainRequest + +type GetCustomDomainResponse = tcscf.GetCustomDomainResponse + +type ListCustomDomainsRequest = tcscf.ListCustomDomainsRequest + +type ListCustomDomainsResponse = tcscf.ListCustomDomainsResponse + +type UpdateCustomDomainRequest = tcscf.UpdateCustomDomainRequest + +type UpdateCustomDomainResponse = tcscf.UpdateCustomDomainResponse diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205/client.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205/client.go new file mode 100644 index 000000000..92625cf56 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205/client.go @@ -0,0 +1,222 @@ +package v20191205 + +import ( + "context" + "errors" + + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" +) + +const APIVersion = tcssl.APIVersion + +type Client struct { + common.Client +} + +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return +} + +func NewDescribeHostCosInstanceListRequest() (request *DescribeHostCosInstanceListRequest) { + return tcssl.NewDescribeHostCosInstanceListRequest() +} + +func NewDescribeHostCosInstanceListResponse() (response *DescribeHostCosInstanceListResponse) { + return tcssl.NewDescribeHostCosInstanceListResponse() +} + +func (c *Client) DescribeHostCosInstanceListWithContext(ctx context.Context, request *DescribeHostCosInstanceListRequest) (response *DescribeHostCosInstanceListResponse, err error) { + if request == nil { + request = NewDescribeHostCosInstanceListRequest() + } + c.InitBaseRequest(&request.BaseRequest, "ssl", tcssl.APIVersion, "DescribeHostCosInstanceList") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeHostCosInstanceList require credential") + } + + request.SetContext(ctx) + response = NewDescribeHostCosInstanceListResponse() + err = c.Send(request, response) + return +} + +func NewDescribeHostDeployRecordDetailRequest() (request *DescribeHostDeployRecordDetailRequest) { + return tcssl.NewDescribeHostDeployRecordDetailRequest() +} + +func NewDescribeHostDeployRecordDetailResponse() (response *DescribeHostDeployRecordDetailResponse) { + return tcssl.NewDescribeHostDeployRecordDetailResponse() +} + +func (c *Client) DescribeHostDeployRecordDetailWithContext(ctx context.Context, request *DescribeHostDeployRecordDetailRequest) (response *DescribeHostDeployRecordDetailResponse, err error) { + if request == nil { + request = NewDescribeHostDeployRecordDetailRequest() + } + c.InitBaseRequest(&request.BaseRequest, "ssl", APIVersion, "DescribeHostDeployRecordDetail") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeHostDeployRecordDetail require credential") + } + + request.SetContext(ctx) + + response = NewDescribeHostDeployRecordDetailResponse() + err = c.Send(request, response) + return +} + +func NewDescribeHostUpdateRecordDetailRequest() (request *DescribeHostUpdateRecordDetailRequest) { + return tcssl.NewDescribeHostUpdateRecordDetailRequest() +} + +func NewDescribeHostUpdateRecordDetailResponse() (response *DescribeHostUpdateRecordDetailResponse) { + return tcssl.NewDescribeHostUpdateRecordDetailResponse() +} + +func (c *Client) DescribeHostUpdateRecordDetailWithContext(ctx context.Context, request *DescribeHostUpdateRecordDetailRequest) (response *DescribeHostUpdateRecordDetailResponse, err error) { + if request == nil { + request = NewDescribeHostUpdateRecordDetailRequest() + } + c.InitBaseRequest(&request.BaseRequest, "ssl", APIVersion, "DescribeHostUpdateRecordDetail") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeHostUpdateRecordDetail require credential") + } + + request.SetContext(ctx) + + response = NewDescribeHostUpdateRecordDetailResponse() + err = c.Send(request, response) + return +} + +func NewDescribeHostUploadUpdateRecordDetailRequest() (request *DescribeHostUploadUpdateRecordDetailRequest) { + return tcssl.NewDescribeHostUploadUpdateRecordDetailRequest() +} + +func NewDescribeHostUploadUpdateRecordDetailResponse() (response *DescribeHostUploadUpdateRecordDetailResponse) { + return tcssl.NewDescribeHostUploadUpdateRecordDetailResponse() +} + +func (c *Client) DescribeHostUploadUpdateRecordDetailWithContext(ctx context.Context, request *DescribeHostUploadUpdateRecordDetailRequest) (response *DescribeHostUploadUpdateRecordDetailResponse, err error) { + if request == nil { + request = NewDescribeHostUploadUpdateRecordDetailRequest() + } + c.InitBaseRequest(&request.BaseRequest, "ssl", APIVersion, "DescribeHostUploadUpdateRecordDetail") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeHostUploadUpdateRecordDetail require credential") + } + + request.SetContext(ctx) + + response = NewDescribeHostUploadUpdateRecordDetailResponse() + err = c.Send(request, response) + return +} + +func NewDeployCertificateInstanceRequest() (request *DeployCertificateInstanceRequest) { + return tcssl.NewDeployCertificateInstanceRequest() +} + +func NewDeployCertificateInstanceResponse() (response *DeployCertificateInstanceResponse) { + return tcssl.NewDeployCertificateInstanceResponse() +} + +func (c *Client) DeployCertificateInstanceWithContext(ctx context.Context, request *DeployCertificateInstanceRequest) (response *DeployCertificateInstanceResponse, err error) { + if request == nil { + request = NewDeployCertificateInstanceRequest() + } + c.InitBaseRequest(&request.BaseRequest, "ssl", APIVersion, "DeployCertificateInstance") + + if c.GetCredential() == nil { + return nil, errors.New("DeployCertificateInstance require credential") + } + + request.SetContext(ctx) + + response = NewDeployCertificateInstanceResponse() + err = c.Send(request, response) + return +} + +func NewUpdateCertificateInstanceRequest() (request *UpdateCertificateInstanceRequest) { + return tcssl.NewUpdateCertificateInstanceRequest() +} + +func NewUpdateCertificateInstanceResponse() (response *UpdateCertificateInstanceResponse) { + return tcssl.NewUpdateCertificateInstanceResponse() +} + +func (c *Client) UpdateCertificateInstanceWithContext(ctx context.Context, request *UpdateCertificateInstanceRequest) (response *UpdateCertificateInstanceResponse, err error) { + if request == nil { + request = NewUpdateCertificateInstanceRequest() + } + c.InitBaseRequest(&request.BaseRequest, "ssl", APIVersion, "UpdateCertificateInstance") + + if c.GetCredential() == nil { + return nil, errors.New("UpdateCertificateInstance require credential") + } + + request.SetContext(ctx) + + response = NewUpdateCertificateInstanceResponse() + err = c.Send(request, response) + return +} + +func NewUploadCertificateRequest() (request *UploadCertificateRequest) { + return tcssl.NewUploadCertificateRequest() +} + +func NewUploadCertificateResponse() (response *UploadCertificateResponse) { + return tcssl.NewUploadCertificateResponse() +} + +func (c *Client) UploadCertificateWithContext(ctx context.Context, request *UploadCertificateRequest) (response *UploadCertificateResponse, err error) { + if request == nil { + request = NewUploadCertificateRequest() + } + c.InitBaseRequest(&request.BaseRequest, "ssl", APIVersion, "UploadCertificate") + + if c.GetCredential() == nil { + return nil, errors.New("UploadCertificate require credential") + } + + request.SetContext(ctx) + response = NewUploadCertificateResponse() + err = c.Send(request, response) + return +} + +func NewUploadUpdateCertificateInstanceRequest() (request *UploadUpdateCertificateInstanceRequest) { + return tcssl.NewUploadUpdateCertificateInstanceRequest() +} + +func NewUploadUpdateCertificateInstanceResponse() (response *UploadUpdateCertificateInstanceResponse) { + return tcssl.NewUploadUpdateCertificateInstanceResponse() +} + +func (c *Client) UploadUpdateCertificateInstanceWithContext(ctx context.Context, request *UploadUpdateCertificateInstanceRequest) (response *UploadUpdateCertificateInstanceResponse, err error) { + if request == nil { + request = NewUploadUpdateCertificateInstanceRequest() + } + c.InitBaseRequest(&request.BaseRequest, "ssl", APIVersion, "UploadUpdateCertificateInstance") + + if c.GetCredential() == nil { + return nil, errors.New("UploadUpdateCertificateInstance require credential") + } + + request.SetContext(ctx) + + response = NewUploadUpdateCertificateInstanceResponse() + err = c.Send(request, response) + return +} diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205/models.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205/models.go new file mode 100644 index 000000000..98d9a12a9 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205/models.go @@ -0,0 +1,41 @@ +package v20191205 + +import ( + tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" +) + +type ( + ResourceTypeRegions = tcssl.ResourceTypeRegions +) + +type DescribeHostCosInstanceListRequest = tcssl.DescribeHostCosInstanceListRequest + +type DescribeHostCosInstanceListResponse = tcssl.DescribeHostCosInstanceListResponse + +type DescribeHostDeployRecordDetailRequest = tcssl.DescribeHostDeployRecordDetailRequest + +type DescribeHostDeployRecordDetailResponse = tcssl.DescribeHostDeployRecordDetailResponse + +type DescribeHostUpdateRecordDetailRequest = tcssl.DescribeHostUpdateRecordDetailRequest + +type DescribeHostUpdateRecordDetailResponse = tcssl.DescribeHostUpdateRecordDetailResponse + +type DescribeHostUploadUpdateRecordDetailRequest = tcssl.DescribeHostUploadUpdateRecordDetailRequest + +type DescribeHostUploadUpdateRecordDetailResponse = tcssl.DescribeHostUploadUpdateRecordDetailResponse + +type DeployCertificateInstanceRequest = tcssl.DeployCertificateInstanceRequest + +type DeployCertificateInstanceResponse = tcssl.DeployCertificateInstanceResponse + +type UpdateCertificateInstanceRequest = tcssl.UpdateCertificateInstanceRequest + +type UpdateCertificateInstanceResponse = tcssl.UpdateCertificateInstanceResponse + +type UploadCertificateRequest = tcssl.UploadCertificateRequest + +type UploadCertificateResponse = tcssl.UploadCertificateResponse + +type UploadUpdateCertificateInstanceRequest = tcssl.UploadUpdateCertificateInstanceRequest + +type UploadUpdateCertificateInstanceResponse = tcssl.UploadUpdateCertificateInstanceResponse diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901/client.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901/client.go new file mode 100644 index 000000000..bdd674cdd --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901/client.go @@ -0,0 +1,74 @@ +package v20220901 + +import ( + "context" + "errors" + + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + tceo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901" +) + +const APIVersion = tceo.APIVersion + +type Client struct { + common.Client +} + +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return +} + +func NewDescribeAccelerationDomainsRequest() (request *DescribeAccelerationDomainsRequest) { + return tceo.NewDescribeAccelerationDomainsRequest() +} + +func NewDescribeAccelerationDomainsResponse() (response *DescribeAccelerationDomainsResponse) { + return tceo.NewDescribeAccelerationDomainsResponse() +} + +func (c *Client) DescribeAccelerationDomainsWithContext(ctx context.Context, request *DescribeAccelerationDomainsRequest) (response *DescribeAccelerationDomainsResponse, err error) { + if request == nil { + request = NewDescribeAccelerationDomainsRequest() + } + c.InitBaseRequest(&request.BaseRequest, "teo", APIVersion, "DescribeAccelerationDomains") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeAccelerationDomains require credential") + } + + request.SetContext(ctx) + + response = NewDescribeAccelerationDomainsResponse() + err = c.Send(request, response) + return +} + +func NewModifyHostsCertificateRequest() (request *ModifyHostsCertificateRequest) { + return tceo.NewModifyHostsCertificateRequest() +} + +func NewModifyHostsCertificateResponse() (response *ModifyHostsCertificateResponse) { + return tceo.NewModifyHostsCertificateResponse() +} + +func (c *Client) ModifyHostsCertificateWithContext(ctx context.Context, request *ModifyHostsCertificateRequest) (response *ModifyHostsCertificateResponse, err error) { + if request == nil { + request = NewModifyHostsCertificateRequest() + } + c.InitBaseRequest(&request.BaseRequest, "teo", APIVersion, "ModifyHostsCertificate") + + if c.GetCredential() == nil { + return nil, errors.New("ModifyHostsCertificate require credential") + } + + request.SetContext(ctx) + + response = NewModifyHostsCertificateResponse() + err = c.Send(request, response) + return +} diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901/models.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901/models.go new file mode 100644 index 000000000..ed8556929 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901/models.go @@ -0,0 +1,19 @@ +package v20220901 + +import ( + tceo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901" +) + +type ( + AccelerationDomain = tceo.AccelerationDomain + CertificateInfo = tceo.CertificateInfo + ServerCertInfo = tceo.ServerCertInfo +) + +type DescribeAccelerationDomainsRequest = tceo.DescribeAccelerationDomainsRequest + +type DescribeAccelerationDomainsResponse = tceo.DescribeAccelerationDomainsResponse + +type ModifyHostsCertificateRequest = tceo.ModifyHostsCertificateRequest + +type ModifyHostsCertificateResponse = tceo.ModifyHostsCertificateResponse diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717/client.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717/client.go new file mode 100644 index 000000000..ee6d02916 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717/client.go @@ -0,0 +1,74 @@ +package v20180717 + +import ( + "context" + "errors" + + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + tcvod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717" +) + +const APIVersion = tcvod.APIVersion + +type Client struct { + common.Client +} + +func NewDescribeVodDomainsRequest() (request *DescribeVodDomainsRequest) { + return tcvod.NewDescribeVodDomainsRequest() +} + +func NewDescribeVodDomainsResponse() (response *DescribeVodDomainsResponse) { + return tcvod.NewDescribeVodDomainsResponse() +} + +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return +} + +func (c *Client) DescribeVodDomainsWithContext(ctx context.Context, request *DescribeVodDomainsRequest) (response *DescribeVodDomainsResponse, err error) { + if request == nil { + request = NewDescribeVodDomainsRequest() + } + c.InitBaseRequest(&request.BaseRequest, "vod", APIVersion, "DescribeVodDomains") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeVodDomains require credential") + } + + request.SetContext(ctx) + + response = NewDescribeVodDomainsResponse() + err = c.Send(request, response) + return +} + +func NewSetVodDomainCertificateRequest() (request *SetVodDomainCertificateRequest) { + return tcvod.NewSetVodDomainCertificateRequest() +} + +func NewSetVodDomainCertificateResponse() (response *SetVodDomainCertificateResponse) { + return tcvod.NewSetVodDomainCertificateResponse() +} + +func (c *Client) SetVodDomainCertificateWithContext(ctx context.Context, request *SetVodDomainCertificateRequest) (response *SetVodDomainCertificateResponse, err error) { + if request == nil { + request = NewSetVodDomainCertificateRequest() + } + c.InitBaseRequest(&request.BaseRequest, "vod", APIVersion, "SetVodDomainCertificate") + + if c.GetCredential() == nil { + return nil, errors.New("SetVodDomainCertificate require credential") + } + + request.SetContext(ctx) + + response = NewSetVodDomainCertificateResponse() + err = c.Send(request, response) + return +} diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717/models.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717/models.go new file mode 100644 index 000000000..7359cf24a --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717/models.go @@ -0,0 +1,13 @@ +package v20180717 + +import ( + tcvod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717" +) + +type DescribeVodDomainsRequest = tcvod.DescribeVodDomainsRequest + +type DescribeVodDomainsResponse = tcvod.DescribeVodDomainsResponse + +type SetVodDomainCertificateRequest = tcvod.SetVodDomainCertificateRequest + +type SetVodDomainCertificateResponse = tcvod.SetVodDomainCertificateResponse diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125/client.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125/client.go new file mode 100644 index 000000000..65ef82700 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125/client.go @@ -0,0 +1,78 @@ +package v20180125 + +import ( + "context" + "errors" + + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" + "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" + tcwaf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125" +) + +const APIVersion = tcwaf.APIVersion + +type Client struct { + common.Client +} + +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { + client = &Client{} + client.Init(region). + WithCredential(credential). + WithProfile(clientProfile) + return +} + +func NewDescribeDomainDetailsSaasRequest() (request *DescribeDomainDetailsSaasRequest) { + return tcwaf.NewDescribeDomainDetailsSaasRequest() +} + +func NewDescribeDomainDetailsSaasResponse() (response *DescribeDomainDetailsSaasResponse) { + return tcwaf.NewDescribeDomainDetailsSaasResponse() +} + +func (c *Client) DescribeDomainDetailsSaasWithContext(ctx context.Context, request *DescribeDomainDetailsSaasRequest) (response *DescribeDomainDetailsSaasResponse, err error) { + if request == nil { + request = NewDescribeDomainDetailsSaasRequest() + } + c.InitBaseRequest(&request.BaseRequest, "waf", APIVersion, "DescribeDomainDetailsSaas") + + if c.GetCredential() == nil { + return nil, errors.New("DescribeDomainDetailsSaas require credential") + } + + request.SetContext(ctx) + + response = NewDescribeDomainDetailsSaasResponse() + err = c.Send(request, response) + return +} + +func (c *Client) ModifySpartaProtection(request *tcwaf.ModifySpartaProtectionRequest) (response *tcwaf.ModifySpartaProtectionResponse, err error) { + return c.ModifySpartaProtectionWithContext(context.Background(), request) +} + +func NewModifySpartaProtectionRequest() (request *ModifySpartaProtectionRequest) { + return tcwaf.NewModifySpartaProtectionRequest() +} + +func NewModifySpartaProtectionResponse() (response *ModifySpartaProtectionResponse) { + return tcwaf.NewModifySpartaProtectionResponse() +} + +func (c *Client) ModifySpartaProtectionWithContext(ctx context.Context, request *ModifySpartaProtectionRequest) (response *ModifySpartaProtectionResponse, err error) { + if request == nil { + request = NewModifySpartaProtectionRequest() + } + c.InitBaseRequest(&request.BaseRequest, "waf", APIVersion, "ModifySpartaProtection") + + if c.GetCredential() == nil { + return nil, errors.New("ModifySpartaProtection require credential") + } + + request.SetContext(ctx) + + response = NewModifySpartaProtectionResponse() + err = c.Send(request, response) + return +} diff --git a/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125/models.go b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125/models.go new file mode 100644 index 000000000..c37ccad7f --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125/models.go @@ -0,0 +1,13 @@ +package v20180125 + +import ( + tcwaf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125" +) + +type DescribeDomainDetailsSaasRequest = tcwaf.DescribeDomainDetailsSaasRequest + +type DescribeDomainDetailsSaasResponse = tcwaf.DescribeDomainDetailsSaasResponse + +type ModifySpartaProtectionRequest = tcwaf.ModifySpartaProtectionRequest + +type ModifySpartaProtectionResponse = tcwaf.ModifySpartaProtectionResponse diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_listener_attributes.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_listener_attributes.go new file mode 100644 index 000000000..ac7883838 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_listener_attributes.go @@ -0,0 +1,39 @@ +package alb + +import ( + "github.com/volcengine/volcengine-go-sdk/service/alb" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opDescribeListenerAttributes = "DescribeListenerAttributes" + +func (c *ALB) DescribeListenerAttributesRequest(input *DescribeListenerAttributesInput) (req *request.Request, output *DescribeListenerAttributesOutput) { + op := &request.Operation{ + Name: opDescribeListenerAttributes, + HTTPMethod: "GET", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeListenerAttributesInput{} + } + + output = &DescribeListenerAttributesOutput{} + req = c.newRequest(op, input, output) + + return +} + +func (c *ALB) DescribeListenerAttributesWithContext(ctx volcengine.Context, input *DescribeListenerAttributesInput, opts ...request.Option) (*DescribeListenerAttributesOutput, error) { + req, out := c.DescribeListenerAttributesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type DescribeListenerAttributesInput = alb.DescribeListenerAttributesInput + +type DescribeListenerAttributesOutput = alb.DescribeListenerAttributesOutput + +type DomainExtensionForDescribeListenerAttributesOutput = alb.DomainExtensionForDescribeListenerAttributesOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_listeners.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_listeners.go new file mode 100644 index 000000000..5d0320dd9 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_listeners.go @@ -0,0 +1,42 @@ +package alb + +import ( + "github.com/volcengine/volcengine-go-sdk/service/alb" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opDescribeListeners = "DescribeListeners" + +func (c *ALB) DescribeListenersRequest(input *DescribeListenersInput) (req *request.Request, output *DescribeListenersOutput) { + op := &request.Operation{ + Name: opDescribeListeners, + HTTPMethod: "GET", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeListenersInput{} + } + + output = &DescribeListenersOutput{} + req = c.newRequest(op, input, output) + + return +} + +func (c *ALB) DescribeListeners(input *DescribeListenersInput) (*DescribeListenersOutput, error) { + req, out := c.DescribeListenersRequest(input) + return out, req.Send() +} + +func (c *ALB) DescribeListenersWithContext(ctx volcengine.Context, input *DescribeListenersInput, opts ...request.Option) (*DescribeListenersOutput, error) { + req, out := c.DescribeListenersRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type DescribeListenersInput = alb.DescribeListenersInput + +type DescribeListenersOutput = alb.DescribeListenersOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_load_balancer_attributes.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_load_balancer_attributes.go new file mode 100644 index 000000000..8aba0bad2 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_describe_load_balancer_attributes.go @@ -0,0 +1,42 @@ +package alb + +import ( + "github.com/volcengine/volcengine-go-sdk/service/alb" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opDescribeLoadBalancerAttributes = "DescribeLoadBalancerAttributes" + +func (c *ALB) DescribeLoadBalancerAttributesRequest(input *DescribeLoadBalancerAttributesInput) (req *request.Request, output *DescribeLoadBalancerAttributesOutput) { + op := &request.Operation{ + Name: opDescribeLoadBalancerAttributes, + HTTPMethod: "GET", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeLoadBalancerAttributesInput{} + } + + output = &DescribeLoadBalancerAttributesOutput{} + req = c.newRequest(op, input, output) + + return +} + +func (c *ALB) DescribeLoadBalancerAttributes(input *DescribeLoadBalancerAttributesInput) (*DescribeLoadBalancerAttributesOutput, error) { + req, out := c.DescribeLoadBalancerAttributesRequest(input) + return out, req.Send() +} + +func (c *ALB) DescribeLoadBalancerAttributesWithContext(ctx volcengine.Context, input *DescribeLoadBalancerAttributesInput, opts ...request.Option) (*DescribeLoadBalancerAttributesOutput, error) { + req, out := c.DescribeLoadBalancerAttributesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type DescribeLoadBalancerAttributesInput = alb.DescribeLoadBalancerAttributesInput + +type DescribeLoadBalancerAttributesOutput = alb.DescribeLoadBalancerAttributesOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_modify_listener_attributes.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_modify_listener_attributes.go new file mode 100644 index 000000000..5e3ca03db --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/api_modify_listener_attributes.go @@ -0,0 +1,44 @@ +package alb + +import ( + "github.com/volcengine/volcengine-go-sdk/service/alb" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opModifyListenerAttributes = "ModifyListenerAttributes" + +func (c *ALB) ModifyListenerAttributesRequest(input *ModifyListenerAttributesInput) (req *request.Request, output *ModifyListenerAttributesOutput) { + op := &request.Operation{ + Name: opModifyListenerAttributes, + HTTPMethod: "GET", + HTTPPath: "/", + } + + if input == nil { + input = &ModifyListenerAttributesInput{} + } + + output = &ModifyListenerAttributesOutput{} + req = c.newRequest(op, input, output) + + return +} + +func (c *ALB) ModifyListenerAttributes(input *ModifyListenerAttributesInput) (*ModifyListenerAttributesOutput, error) { + req, out := c.ModifyListenerAttributesRequest(input) + return out, req.Send() +} + +func (c *ALB) ModifyListenerAttributesWithContext(ctx volcengine.Context, input *ModifyListenerAttributesInput, opts ...request.Option) (*ModifyListenerAttributesOutput, error) { + req, out := c.ModifyListenerAttributesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type ModifyListenerAttributesInput = alb.ModifyListenerAttributesInput + +type ModifyListenerAttributesOutput = alb.ModifyListenerAttributesOutput + +type DomainExtensionForModifyListenerAttributesInput = alb.DomainExtensionForModifyListenerAttributesInput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/service_alb.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/service_alb.go new file mode 100644 index 000000000..22796e7eb --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb/service_alb.go @@ -0,0 +1,60 @@ +package alb + +import ( + "github.com/volcengine/volcengine-go-sdk/service/alb" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/client" + "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" + "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" + "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" + "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" +) + +type ALB struct { + *client.Client +} + +const ( + ServiceName = alb.ServiceName + EndpointsID = alb.EndpointsID + ServiceID = alb.ServiceID +) + +func New(p client.ConfigProvider, cfgs ...*volcengine.Config) *ALB { + c := p.ClientConfig(EndpointsID, cfgs...) + return newClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) +} + +func newClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *ALB { + svc := &ALB{ + Client: client.New( + cfg, + metadata.ClientInfo{ + ServiceName: ServiceName, + ServiceID: ServiceID, + SigningName: signingName, + SigningRegion: signingRegion, + Endpoint: endpoint, + APIVersion: "2020-04-01", + }, + handlers, + ), + } + + svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) + svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) + svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) + svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) + + return svc +} + +func (c *ALB) newRequest(op *request.Operation, params, data interface{}) *request.Request { + req := c.NewRequest(op, params, data) + + return req +} diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_get_custom_domain.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_get_custom_domain.go new file mode 100644 index 000000000..01dec31fa --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_get_custom_domain.go @@ -0,0 +1,39 @@ +package apig + +import ( + "github.com/volcengine/volcengine-go-sdk/service/apig" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opGetCustomDomain = "GetCustomDomain" + +func (c *APIG) GetCustomDomainRequest(input *GetCustomDomainInput) (req *request.Request, output *GetCustomDomainOutput) { + op := &request.Operation{ + Name: opGetCustomDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetCustomDomainInput{} + } + + output = &GetCustomDomainOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *APIG) GetCustomDomainWithContext(ctx volcengine.Context, input *GetCustomDomainInput, opts ...request.Option) (*GetCustomDomainOutput, error) { + req, out := c.GetCustomDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type GetCustomDomainInput = apig.GetCustomDomainInput + +type GetCustomDomainOutput = apig.GetCustomDomainOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_list_custom_domains.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_list_custom_domains.go new file mode 100644 index 000000000..42f2c1acc --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_list_custom_domains.go @@ -0,0 +1,41 @@ +package apig + +import ( + "github.com/volcengine/volcengine-go-sdk/service/apig" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opListCustomDomains = "ListCustomDomains" + +func (c *APIG) ListCustomDomainsRequest(input *ListCustomDomainsInput) (req *request.Request, output *ListCustomDomainsOutput) { + op := &request.Operation{ + Name: opListCustomDomains, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListCustomDomainsInput{} + } + + output = &ListCustomDomainsOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *APIG) ListCustomDomainsWithContext(ctx volcengine.Context, input *ListCustomDomainsInput, opts ...request.Option) (*ListCustomDomainsOutput, error) { + req, out := c.ListCustomDomainsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type ListCustomDomainsInput = apig.ListCustomDomainsInput + +type ListCustomDomainsOutput = apig.ListCustomDomainsOutput + +type ItemForListCustomDomainsOutput = apig.ItemForListCustomDomainsOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_update_custom_domain.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_update_custom_domain.go new file mode 100644 index 000000000..a3c4011c4 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/api_update_custom_domain.go @@ -0,0 +1,39 @@ +package apig + +import ( + "github.com/volcengine/volcengine-go-sdk/service/apig" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opUpdateCustomDomain = "UpdateCustomDomain" + +func (c *APIG) UpdateCustomDomainRequest(input *UpdateCustomDomainInput) (req *request.Request, output *UpdateCustomDomainOutput) { + op := &request.Operation{ + Name: opUpdateCustomDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateCustomDomainInput{} + } + + output = &UpdateCustomDomainOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *APIG) UpdateCustomDomainWithContext(ctx volcengine.Context, input *UpdateCustomDomainInput, opts ...request.Option) (*UpdateCustomDomainOutput, error) { + req, out := c.UpdateCustomDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type UpdateCustomDomainInput = apig.UpdateCustomDomainInput + +type UpdateCustomDomainOutput = apig.UpdateCustomDomainOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/service_apig.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/service_apig.go new file mode 100644 index 000000000..db5148686 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig/service_apig.go @@ -0,0 +1,60 @@ +package apig + +import ( + "github.com/volcengine/volcengine-go-sdk/service/apig" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/client" + "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" + "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" + "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" + "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" +) + +type APIG struct { + *client.Client +} + +const ( + ServiceName = apig.ServiceName + EndpointsID = apig.EndpointsID + ServiceID = apig.ServiceID +) + +func New(p client.ConfigProvider, cfgs ...*volcengine.Config) *APIG { + c := p.ClientConfig(EndpointsID, cfgs...) + return newClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) +} + +func newClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *APIG { + svc := &APIG{ + Client: client.New( + cfg, + metadata.ClientInfo{ + ServiceName: ServiceName, + ServiceID: ServiceID, + SigningName: signingName, + SigningRegion: signingRegion, + Endpoint: endpoint, + APIVersion: "2021-03-03", + }, + handlers, + ), + } + + svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) + svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) + svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) + svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) + + return svc +} + +func (c *APIG) newRequest(op *request.Operation, params, data interface{}) *request.Request { + req := c.NewRequest(op, params, data) + + return req +} diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_add_certificate.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_add_certificate.go new file mode 100644 index 000000000..972ad431b --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_add_certificate.go @@ -0,0 +1,39 @@ +package cdn + +import ( + "github.com/volcengine/volcengine-go-sdk/service/cdn" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opAddCertificate = "AddCertificate" + +func (c *CDN) AddCertificateRequest(input *AddCertificateInput) (req *request.Request, output *AddCertificateOutput) { + op := &request.Operation{ + Name: opAddCertificate, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &AddCertificateInput{} + } + + output = &AddCertificateOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *CDN) AddCertificateWithContext(ctx volcengine.Context, input *AddCertificateInput, opts ...request.Option) (*AddCertificateOutput, error) { + req, out := c.AddCertificateRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type AddCertificateInput = cdn.AddCertificateInput + +type AddCertificateOutput = cdn.AddCertificateOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_batch_deploy_cert.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_batch_deploy_cert.go new file mode 100644 index 000000000..abe92c74f --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_batch_deploy_cert.go @@ -0,0 +1,39 @@ +package cdn + +import ( + "github.com/volcengine/volcengine-go-sdk/service/cdn" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opBatchDeployCert = "BatchDeployCert" + +func (c *CDN) BatchDeployCertRequest(input *BatchDeployCertInput) (req *request.Request, output *BatchDeployCertOutput) { + op := &request.Operation{ + Name: opBatchDeployCert, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &BatchDeployCertInput{} + } + + output = &BatchDeployCertOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *CDN) BatchDeployCertWithContext(ctx volcengine.Context, input *BatchDeployCertInput, opts ...request.Option) (*BatchDeployCertOutput, error) { + req, out := c.BatchDeployCertRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type BatchDeployCertInput = cdn.BatchDeployCertInput + +type BatchDeployCertOutput = cdn.BatchDeployCertOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_describe_cert_config.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_describe_cert_config.go new file mode 100644 index 000000000..02ea7ef6d --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_describe_cert_config.go @@ -0,0 +1,39 @@ +package cdn + +import ( + "github.com/volcengine/volcengine-go-sdk/service/cdn" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opDescribeCertConfig = "DescribeCertConfig" + +func (c *CDN) DescribeCertConfigRequest(input *DescribeCertConfigInput) (req *request.Request, output *DescribeCertConfigOutput) { + op := &request.Operation{ + Name: opDescribeCertConfig, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeCertConfigInput{} + } + + output = &DescribeCertConfigOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *CDN) DescribeCertConfigWithContext(ctx volcengine.Context, input *DescribeCertConfigInput, opts ...request.Option) (*DescribeCertConfigOutput, error) { + req, out := c.DescribeCertConfigRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type DescribeCertConfigInput = cdn.DescribeCertConfigInput + +type DescribeCertConfigOutput = cdn.DescribeCertConfigOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_list_cdn_domains.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_list_cdn_domains.go new file mode 100644 index 000000000..69e9368ad --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_list_cdn_domains.go @@ -0,0 +1,39 @@ +package cdn + +import ( + "github.com/volcengine/volcengine-go-sdk/service/cdn" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opListCdnDomains = "ListCdnDomains" + +func (c *CDN) ListCdnDomainsRequest(input *ListCdnDomainsInput) (req *request.Request, output *ListCdnDomainsOutput) { + op := &request.Operation{ + Name: opListCdnDomains, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListCdnDomainsInput{} + } + + output = &ListCdnDomainsOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *CDN) ListCdnDomainsWithContext(ctx volcengine.Context, input *ListCdnDomainsInput, opts ...request.Option) (*ListCdnDomainsOutput, error) { + req, out := c.ListCdnDomainsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type ListCdnDomainsInput = cdn.ListCdnDomainsInput + +type ListCdnDomainsOutput = cdn.ListCdnDomainsOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_list_cert_info.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_list_cert_info.go new file mode 100644 index 000000000..710a60d8e --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/api_list_cert_info.go @@ -0,0 +1,39 @@ +package cdn + +import ( + "github.com/volcengine/volcengine-go-sdk/service/cdn" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opListCertInfo = "ListCertInfo" + +func (c *CDN) ListCertInfoRequest(input *ListCertInfoInput) (req *request.Request, output *ListCertInfoOutput) { + op := &request.Operation{ + Name: opListCertInfo, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListCertInfoInput{} + } + + output = &ListCertInfoOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *CDN) ListCertInfoWithContext(ctx volcengine.Context, input *ListCertInfoInput, opts ...request.Option) (*ListCertInfoOutput, error) { + req, out := c.ListCertInfoRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type ListCertInfoInput = cdn.ListCertInfoInput + +type ListCertInfoOutput = cdn.ListCertInfoOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/service_cdn.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/service_cdn.go new file mode 100644 index 000000000..2f493fbe5 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn/service_cdn.go @@ -0,0 +1,60 @@ +package cdn + +import ( + "github.com/volcengine/volcengine-go-sdk/service/cdn" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/client" + "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" + "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" + "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" + "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" +) + +type CDN struct { + *client.Client +} + +const ( + ServiceName = cdn.ServiceName + EndpointsID = cdn.EndpointsID + ServiceID = cdn.ServiceID +) + +func New(p client.ConfigProvider, cfgs ...*volcengine.Config) *CDN { + c := p.ClientConfig(cdn.EndpointsID, cfgs...) + return newClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) +} + +func newClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *CDN { + svc := &CDN{ + Client: client.New( + cfg, + metadata.ClientInfo{ + ServiceName: cdn.ServiceName, + ServiceID: cdn.ServiceID, + SigningName: signingName, + SigningRegion: signingRegion, + Endpoint: endpoint, + APIVersion: "2021-03-01", + }, + handlers, + ), + } + + svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) + svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) + svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) + svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) + + return svc +} + +func (c *CDN) newRequest(op *request.Operation, params, data interface{}) *request.Request { + req := c.NewRequest(op, params, data) + + return req +} diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice/api_import_certificate.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice/api_import_certificate.go new file mode 100644 index 000000000..18383cc84 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice/api_import_certificate.go @@ -0,0 +1,41 @@ +package certificateservice + +import ( + "github.com/volcengine/volcengine-go-sdk/service/certificateservice" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opImportCertificate = "ImportCertificate" + +func (c *CERTIFICATESERVICE) ImportCertificateRequest(input *ImportCertificateInput) (req *request.Request, output *ImportCertificateOutput) { + op := &request.Operation{ + Name: opImportCertificate, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ImportCertificateInput{} + } + + output = &ImportCertificateOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *CERTIFICATESERVICE) ImportCertificateWithContext(ctx volcengine.Context, input *ImportCertificateInput, opts ...request.Option) (*ImportCertificateOutput, error) { + req, out := c.ImportCertificateRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type ImportCertificateInput = certificateservice.ImportCertificateInput + +type ImportCertificateOutput = certificateservice.ImportCertificateOutput + +type CertificateInfoForImportCertificateInput = certificateservice.CertificateInfoForImportCertificateInput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice/service_certificateservice.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice/service_certificateservice.go new file mode 100644 index 000000000..04756ad5a --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice/service_certificateservice.go @@ -0,0 +1,54 @@ +package certificateservice + +import ( + "github.com/volcengine/volcengine-go-sdk/service/certificateservice" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/client" + "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" + "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" + "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" + "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" +) + +type CERTIFICATESERVICE struct { + *client.Client +} + +func New(p client.ConfigProvider, cfgs ...*volcengine.Config) *CERTIFICATESERVICE { + c := p.ClientConfig(certificateservice.EndpointsID, cfgs...) + return newClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) +} + +func newClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *CERTIFICATESERVICE { + svc := &CERTIFICATESERVICE{ + Client: client.New( + cfg, + metadata.ClientInfo{ + ServiceName: certificateservice.ServiceName, + ServiceID: certificateservice.ServiceID, + SigningName: signingName, + SigningRegion: signingRegion, + Endpoint: endpoint, + APIVersion: "2024-10-01", + }, + handlers, + ), + } + + svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) + svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) + svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) + svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) + + return svc +} + +func (c *CERTIFICATESERVICE) newRequest(op *request.Operation, params, data interface{}) *request.Request { + req := c.NewRequest(op, params, data) + + return req +} diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_describe_listeners.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_describe_listeners.go new file mode 100644 index 000000000..012f18524 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_describe_listeners.go @@ -0,0 +1,37 @@ +package clb + +import ( + "github.com/volcengine/volcengine-go-sdk/service/clb" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opDescribeListeners = "DescribeListeners" + +func (c *CLB) DescribeListenersRequest(input *DescribeListenersInput) (req *request.Request, output *DescribeListenersOutput) { + op := &request.Operation{ + Name: opDescribeListeners, + HTTPMethod: "GET", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeListenersInput{} + } + + output = &DescribeListenersOutput{} + req = c.newRequest(op, input, output) + + return +} + +func (c *CLB) DescribeListenersWithContext(ctx volcengine.Context, input *DescribeListenersInput, opts ...request.Option) (*DescribeListenersOutput, error) { + req, out := c.DescribeListenersRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type DescribeListenersInput = clb.DescribeListenersInput + +type DescribeListenersOutput = clb.DescribeListenersOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_describe_load_balancer_attributes.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_describe_load_balancer_attributes.go new file mode 100644 index 000000000..2f58e08de --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_describe_load_balancer_attributes.go @@ -0,0 +1,37 @@ +package clb + +import ( + "github.com/volcengine/volcengine-go-sdk/service/clb" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opDescribeLoadBalancerAttributes = "DescribeLoadBalancerAttributes" + +func (c *CLB) DescribeLoadBalancerAttributesRequest(input *DescribeLoadBalancerAttributesInput) (req *request.Request, output *DescribeLoadBalancerAttributesOutput) { + op := &request.Operation{ + Name: opDescribeLoadBalancerAttributes, + HTTPMethod: "GET", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeLoadBalancerAttributesInput{} + } + + output = &DescribeLoadBalancerAttributesOutput{} + req = c.newRequest(op, input, output) + + return +} + +func (c *CLB) DescribeLoadBalancerAttributesWithContext(ctx volcengine.Context, input *DescribeLoadBalancerAttributesInput, opts ...request.Option) (*DescribeLoadBalancerAttributesOutput, error) { + req, out := c.DescribeLoadBalancerAttributesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type DescribeLoadBalancerAttributesInput = clb.DescribeLoadBalancerAttributesInput + +type DescribeLoadBalancerAttributesOutput = clb.DescribeLoadBalancerAttributesOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_modify_listener_attributes.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_modify_listener_attributes.go new file mode 100644 index 000000000..99a294da3 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/api_modify_listener_attributes.go @@ -0,0 +1,37 @@ +package clb + +import ( + "github.com/volcengine/volcengine-go-sdk/service/clb" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opModifyListenerAttributes = "ModifyListenerAttributes" + +func (c *CLB) ModifyListenerAttributesRequest(input *ModifyListenerAttributesInput) (req *request.Request, output *ModifyListenerAttributesOutput) { + op := &request.Operation{ + Name: opModifyListenerAttributes, + HTTPMethod: "GET", + HTTPPath: "/", + } + + if input == nil { + input = &ModifyListenerAttributesInput{} + } + + output = &ModifyListenerAttributesOutput{} + req = c.newRequest(op, input, output) + + return +} + +func (c *CLB) ModifyListenerAttributesWithContext(ctx volcengine.Context, input *ModifyListenerAttributesInput, opts ...request.Option) (*ModifyListenerAttributesOutput, error) { + req, out := c.ModifyListenerAttributesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type ModifyListenerAttributesInput = clb.ModifyListenerAttributesInput + +type ModifyListenerAttributesOutput = clb.ModifyListenerAttributesOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/service_clb.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/service_clb.go new file mode 100644 index 000000000..69408a78d --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb/service_clb.go @@ -0,0 +1,60 @@ +package clb + +import ( + "github.com/volcengine/volcengine-go-sdk/service/clb" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/client" + "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" + "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" + "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" + "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" +) + +type CLB struct { + *client.Client +} + +const ( + ServiceName = clb.ServiceName + EndpointsID = clb.EndpointsID + ServiceID = clb.ServiceID +) + +func New(p client.ConfigProvider, cfgs ...*volcengine.Config) *CLB { + c := p.ClientConfig(clb.EndpointsID, cfgs...) + return newClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) +} + +func newClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *CLB { + svc := &CLB{ + Client: client.New( + cfg, + metadata.ClientInfo{ + ServiceName: clb.ServiceName, + ServiceID: clb.ServiceID, + SigningName: signingName, + SigningRegion: signingRegion, + Endpoint: endpoint, + APIVersion: "2020-04-01", + }, + handlers, + ), + } + + svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) + svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) + svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) + svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) + + return svc +} + +func (c *CLB) newRequest(op *request.Operation, params, data interface{}) *request.Request { + req := c.NewRequest(op, params, data) + + return req +} diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/api_create_cert_bind.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/api_create_cert_bind.go new file mode 100644 index 000000000..7fce850ed --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/api_create_cert_bind.go @@ -0,0 +1,39 @@ +package dcdn + +import ( + "github.com/volcengine/volcengine-go-sdk/service/dcdn" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opCreateCertBind = "CreateCertBind" + +func (c *DCDN) CreateCertBindRequest(input *CreateCertBindInput) (req *request.Request, output *CreateCertBindOutput) { + op := &request.Operation{ + Name: opCreateCertBind, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &CreateCertBindInput{} + } + + output = &CreateCertBindOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *DCDN) CreateCertBindWithContext(ctx volcengine.Context, input *CreateCertBindInput, opts ...request.Option) (*CreateCertBindOutput, error) { + req, out := c.CreateCertBindRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type CreateCertBindInput = dcdn.CreateCertBindInput + +type CreateCertBindOutput = dcdn.CreateCertBindOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/api_list_domain_config.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/api_list_domain_config.go new file mode 100644 index 000000000..38e3d2a0b --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/api_list_domain_config.go @@ -0,0 +1,39 @@ +package dcdn + +import ( + "github.com/volcengine/volcengine-go-sdk/service/dcdn" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opListDomainConfig = "ListDomainConfig" + +func (c *DCDN) ListDomainConfigRequest(input *ListDomainConfigInput) (req *request.Request, output *ListDomainConfigOutput) { + op := &request.Operation{ + Name: opListDomainConfig, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListDomainConfigInput{} + } + + output = &ListDomainConfigOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *DCDN) ListDomainConfigWithContext(ctx volcengine.Context, input *ListDomainConfigInput, opts ...request.Option) (*ListDomainConfigOutput, error) { + req, out := c.ListDomainConfigRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type ListDomainConfigInput = dcdn.ListDomainConfigInput + +type ListDomainConfigOutput = dcdn.ListDomainConfigOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/service_dcdn.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/service_dcdn.go new file mode 100644 index 000000000..0d04385fe --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn/service_dcdn.go @@ -0,0 +1,60 @@ +package dcdn + +import ( + "github.com/volcengine/volcengine-go-sdk/service/dcdn" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/client" + "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" + "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" + "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" + "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" +) + +type DCDN struct { + *client.Client +} + +const ( + ServiceName = dcdn.ServiceName + EndpointsID = dcdn.EndpointsID + ServiceID = dcdn.ServiceID +) + +func New(p client.ConfigProvider, cfgs ...*volcengine.Config) *DCDN { + c := p.ClientConfig(dcdn.EndpointsID, cfgs...) + return newClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) +} + +func newClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *DCDN { + svc := &DCDN{ + Client: client.New( + cfg, + metadata.ClientInfo{ + ServiceName: dcdn.ServiceName, + ServiceID: dcdn.ServiceID, + SigningName: signingName, + SigningRegion: signingRegion, + Endpoint: endpoint, + APIVersion: "2021-04-01", + }, + handlers, + ), + } + + svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) + svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) + svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) + svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) + + return svc +} + +func (c *DCDN) newRequest(op *request.Operation, params, data interface{}) *request.Request { + req := c.NewRequest(op, params, data) + + return req +} diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/api_list_domain.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/api_list_domain.go new file mode 100644 index 000000000..27faabc5f --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/api_list_domain.go @@ -0,0 +1,39 @@ +package waf + +import ( + "github.com/volcengine/volcengine-go-sdk/service/waf" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opListDomain = "ListDomain" + +func (c *WAF) ListDomainRequest(input *ListDomainInput) (req *request.Request, output *ListDomainOutput) { + op := &request.Operation{ + Name: opListDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListDomainInput{} + } + + output = &ListDomainOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *WAF) ListDomainWithContext(ctx volcengine.Context, input *ListDomainInput, opts ...request.Option) (*ListDomainOutput, error) { + req, out := c.ListDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type ListDomainInput = waf.ListDomainInput + +type ListDomainOutput = waf.ListDomainOutput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/api_update_domain.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/api_update_domain.go new file mode 100644 index 000000000..8722c1c37 --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/api_update_domain.go @@ -0,0 +1,41 @@ +package waf + +import ( + "github.com/volcengine/volcengine-go-sdk/service/waf" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" +) + +const opUpdateDomain = "UpdateDomain" + +func (c *WAF) UpdateDomainRequest(input *UpdateDomainInput) (req *request.Request, output *UpdateDomainOutput) { + op := &request.Operation{ + Name: opUpdateDomain, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &UpdateDomainInput{} + } + + output = &UpdateDomainOutput{} + req = c.newRequest(op, input, output) + + req.HTTPRequest.Header.Set("Content-Type", "application/json; charset=utf-8") + + return +} + +func (c *WAF) UpdateDomainWithContext(ctx volcengine.Context, input *UpdateDomainInput, opts ...request.Option) (*UpdateDomainOutput, error) { + req, out := c.UpdateDomainRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +type UpdateDomainInput = waf.UpdateDomainInput + +type UpdateDomainOutput = waf.UpdateDomainOutput + +type ProtocolPortsForUpdateDomainInput = waf.ProtocolPortsForUpdateDomainInput diff --git a/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/service_waf.go b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/service_waf.go new file mode 100644 index 000000000..9ceec974e --- /dev/null +++ b/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf/service_waf.go @@ -0,0 +1,60 @@ +package waf + +import ( + "github.com/volcengine/volcengine-go-sdk/service/waf" + "github.com/volcengine/volcengine-go-sdk/volcengine" + "github.com/volcengine/volcengine-go-sdk/volcengine/client" + "github.com/volcengine/volcengine-go-sdk/volcengine/client/metadata" + "github.com/volcengine/volcengine-go-sdk/volcengine/corehandlers" + "github.com/volcengine/volcengine-go-sdk/volcengine/request" + "github.com/volcengine/volcengine-go-sdk/volcengine/signer/volc" + "github.com/volcengine/volcengine-go-sdk/volcengine/volcenginequery" +) + +type WAF struct { + *client.Client +} + +const ( + ServiceName = waf.ServiceName + EndpointsID = waf.EndpointsID + ServiceID = waf.ServiceID +) + +func New(p client.ConfigProvider, cfgs ...*volcengine.Config) *WAF { + c := p.ClientConfig(waf.EndpointsID, cfgs...) + return newClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName) +} + +func newClient(cfg volcengine.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *WAF { + svc := &WAF{ + Client: client.New( + cfg, + metadata.ClientInfo{ + ServiceName: waf.ServiceName, + ServiceID: waf.ServiceID, + SigningName: signingName, + SigningRegion: signingRegion, + Endpoint: endpoint, + APIVersion: "2023-12-25", + }, + handlers, + ), + } + + svc.Handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) + svc.Handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHandler) + svc.Handlers.Sign.PushBackNamed(volc.SignRequestHandler) + svc.Handlers.Build.PushBackNamed(volcenginequery.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(volcenginequery.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(volcenginequery.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(volcenginequery.UnmarshalErrorHandler) + + return svc +} + +func (c *WAF) newRequest(op *request.Operation, params, data interface{}) *request.Request { + req := c.NewRequest(op, params, data) + + return req +} diff --git a/pkg/sdk3rd/zenlayer/zga/client.go b/pkg/sdk3rd/zenlayer/zga/client.go new file mode 100644 index 000000000..c1c359a43 --- /dev/null +++ b/pkg/sdk3rd/zenlayer/zga/client.go @@ -0,0 +1,105 @@ +package zga + +import ( + "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" + zga20230706 "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/zga20230706" +) + +const ( + APIVersion = zga20230706.APIVersion + SERVICE = zga20230706.SERVICE +) + +type Client struct { + common.Client +} + +func NewClientWithSecretKey(secretKeyId, secretKeyPassword string) (client *Client, err error) { + return NewClient(common.NewConfig(), secretKeyId, secretKeyPassword) +} + +func NewClient(config *common.Config, secretKeyId, secretKeyPassword string) (client *Client, err error) { + client = &Client{} + + err = client.InitWithCredential(common.NewCredential(secretKeyId, secretKeyPassword)) + if err != nil { + return nil, err + } + + err = client.WithConfig(config) + if err != nil { + return nil, err + } + + return client, nil +} + +func NewCreateCertificateRequest() (request *CreateCertificateRequest) { + return zga20230706.NewCreateCertificateRequest() +} + +func NewCreateCertificateResponse() (response *CreateCertificateResponse) { + return zga20230706.NewCreateCertificateResponse() +} + +func (c *Client) CreateCertificate(request *CreateCertificateRequest) (response *CreateCertificateResponse, err error) { + response = NewCreateCertificateResponse() + err = c.ApiCall(request, response) + return +} + +func NewDescribeAcceleratorsRequest() (request *DescribeAcceleratorsRequest) { + return zga20230706.NewDescribeAcceleratorsRequest() +} + +func NewDescribeAcceleratorsResponse() (response *DescribeAcceleratorsResponse) { + return zga20230706.NewDescribeAcceleratorsResponse() +} + +func (c *Client) DescribeAccelerators(request *DescribeAcceleratorsRequest) (response *DescribeAcceleratorsResponse, err error) { + response = NewDescribeAcceleratorsResponse() + err = c.ApiCall(request, response) + return +} + +func NewDescribeCertificatesRequest() (request *DescribeCertificatesRequest) { + return zga20230706.NewDescribeCertificatesRequest() +} + +func NewDescribeCertificatesResponse() (response *DescribeCertificatesResponse) { + return zga20230706.NewDescribeCertificatesResponse() +} + +func (c *Client) DescribeCertificates(request *DescribeCertificatesRequest) (response *DescribeCertificatesResponse, err error) { + response = NewDescribeCertificatesResponse() + err = c.ApiCall(request, response) + return +} + +func NewModifyAcceleratorCertificateRequest() (request *ModifyAcceleratorCertificateRequest) { + return zga20230706.NewModifyAcceleratorCertificateRequest() +} + +func NewModifyAcceleratorCertificateResponse() (response *ModifyAcceleratorCertificateResponse) { + return zga20230706.NewModifyAcceleratorCertificateResponse() +} + +func (c *Client) ModifyAcceleratorCertificate(request *ModifyAcceleratorCertificateRequest) (response *ModifyAcceleratorCertificateResponse, err error) { + response = NewModifyAcceleratorCertificateResponse() + err = c.ApiCall(request, response) + return +} + +func NewModifyCertificateRequest() (request *ModifyCertificateRequest) { + return zga20230706.NewModifyCertificateRequest() +} + +func NewModifyCertificateResponse() (response *ModifyCertificateResponse) { + return zga20230706.NewModifyCertificateResponse() +} + +func (c *Client) ModifyCertificate(request *ModifyCertificateRequest) (response *ModifyCertificateResponse, err error) { + response = NewModifyCertificateResponse() + err = c.ApiCall(request, response) + return +} diff --git a/pkg/sdk3rd/zenlayer/zga/models.go b/pkg/sdk3rd/zenlayer/zga/models.go new file mode 100644 index 000000000..a8adc054f --- /dev/null +++ b/pkg/sdk3rd/zenlayer/zga/models.go @@ -0,0 +1,25 @@ +package zga + +import ( + zga20230706 "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/zga20230706" +) + +type CreateCertificateRequest = zga20230706.CreateCertificateRequest + +type CreateCertificateResponse = zga20230706.CreateCertificateResponse + +type DescribeAcceleratorsRequest = zga20230706.DescribeAcceleratorsRequest + +type DescribeAcceleratorsResponse = zga20230706.DescribeAcceleratorsResponse + +type DescribeCertificatesRequest = zga20230706.DescribeCertificatesRequest + +type DescribeCertificatesResponse = zga20230706.DescribeCertificatesResponse + +type ModifyAcceleratorCertificateRequest = zga20230706.ModifyAcceleratorCertificateRequest + +type ModifyAcceleratorCertificateResponse = zga20230706.ModifyAcceleratorCertificateResponse + +type ModifyCertificateRequest = zga20230706.ModifyCertificateRequest + +type ModifyCertificateResponse = zga20230706.ModifyCertificateResponse