diff --git a/README.md b/README.md index 2c3ccbbc..5d11c865 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ make local.run | [百度智能云](https://cloud.baidu.com/) | 可部署到百度智能云 CDN 等服务 | | [华为云](https://www.huaweicloud.com/) | 可部署到华为云 CDN、ELB、WAF 等服务 | | [火山引擎](https://www.volcengine.com/) | 可部署到火山引擎 TOS、CDN、DCDN、CLB、ImageX、Live 等服务 | -| [京东云](https://www.jdcloud.com/) | 可部署到京东云 CDN、ALB、视频直播等服务 | +| [京东云](https://www.jdcloud.com/) | 可部署到京东云 CDN、ALB、视频直播、视频点播等服务 | | [七牛云](https://www.qiniu.com/) | 可部署到七牛云 CDN、直播云等服务 | | [白山云](https://www.baishan.com/) | 可部署到白山云 CDN | | [多吉云](https://www.dogecloud.com/) | 可部署到多吉云 CDN | diff --git a/README_EN.md b/README_EN.md index 7ced5c04..b8f2e2dc 100644 --- a/README_EN.md +++ b/README_EN.md @@ -129,7 +129,7 @@ The following hosting providers are supported: | [Baidu AI Cloud](https://intl.cloud.baidu.com/) | Supports deployment to Baidu AI CLoud CDN | | [Huawei Cloud](https://www.huaweicloud.com/) | Supports deployment to Huawei Cloud CDN, ELB, WAF | | [Volcengine](https://www.volcengine.com/) | Supports deployment to Volcengine TOS, CDN, DCDN, CLB, ImageX, Live | -| [JD Cloud](https://www.jdcloud.com/) | Supports deployment to JD Cloud CDN, ALB, Live Video | +| [JD Cloud](https://www.jdcloud.com/) | Supports deployment to JD Cloud CDN, ALB, Live Video, VOD | | [Qiniu Cloud](https://www.qiniu.com/) | Supports deployment to Qiniu Cloud CDN, Pili | | [Baishan Cloud](https://intl.baishancloud.com/) | Supports deployment to Baishan Cloud CDN | | [Doge Cloud](https://www.dogecloud.com/) | Supports deployment to Doge Cloud CDN | diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index 8da7fd0a..6a8a0b6c 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -34,6 +34,7 @@ import ( pJDCloudALB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/jdcloud-alb" pJDCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/jdcloud-cdn" pJDCloudLive "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/jdcloud-live" + pJDCloudVOD "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/jdcloud-vod" pK8sSecret "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/k8s-secret" pLocal "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/local" pQiniuCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/qiniu-cdn" @@ -429,7 +430,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } } - case domain.DeployProviderTypeJDCloudALB, domain.DeployProviderTypeJDCloudCDN, domain.DeployProviderTypeJDCloudLive: + case domain.DeployProviderTypeJDCloudALB, domain.DeployProviderTypeJDCloudCDN, domain.DeployProviderTypeJDCloudLive, domain.DeployProviderTypeJDCloudVOD: { access := domain.AccessConfigForJDCloud{} if err := maps.Populate(options.ProviderAccessConfig, &access); err != nil { @@ -464,6 +465,14 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { }) return deployer, err + case domain.DeployProviderTypeJDCloudVOD: + deployer, err := pJDCloudVOD.NewDeployer(&pJDCloudVOD.DeployerConfig{ + AccessKeyId: access.AccessKeyId, + AccessKeySecret: access.AccessKeySecret, + Domain: maps.GetValueAsString(options.ProviderDeployConfig, "domain"), + }) + return deployer, err + default: break } diff --git a/internal/domain/provider.go b/internal/domain/provider.go index 17e959e6..7402cadf 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -131,6 +131,7 @@ const ( DeployProviderTypeJDCloudALB = DeployProviderType("jdcloud-alb") DeployProviderTypeJDCloudCDN = DeployProviderType("jdcloud-cdn") DeployProviderTypeJDCloudLive = DeployProviderType("jdcloud-live") + DeployProviderTypeJDCloudVOD = DeployProviderType("jdcloud-vod") DeployProviderTypeKubernetesSecret = DeployProviderType("k8s-secret") DeployProviderTypeLocal = DeployProviderType("local") DeployProviderTypeQiniuCDN = DeployProviderType("qiniu-cdn") diff --git a/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go b/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go new file mode 100644 index 00000000..8db109c1 --- /dev/null +++ b/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go @@ -0,0 +1,122 @@ +package jdcloudvod + +import ( + "context" + "fmt" + "strconv" + "time" + + jdCore "github.com/jdcloud-api/jdcloud-sdk-go/core" + jdVodApi "github.com/jdcloud-api/jdcloud-sdk-go/services/vod/apis" + jdVodClient "github.com/jdcloud-api/jdcloud-sdk-go/services/vod/client" + xerrors "github.com/pkg/errors" + + "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/logger" +) + +type DeployerConfig struct { + // 京东云 AccessKeyId。 + AccessKeyId string `json:"accessKeyId"` + // 京东云 AccessKeySecret。 + AccessKeySecret string `json:"accessKeySecret"` + // 点播加速域名（不支持泛域名）。 + Domain string `json:"domain"` +} + +type DeployerProvider struct { + config *DeployerConfig + logger logger.Logger + sdkClient *jdVodClient.VodClient +} + +var _ deployer.Deployer = (*DeployerProvider)(nil) + +func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { + if config == nil { + panic("config is nil") + } + + client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create sdk client") + } + + return &DeployerProvider{ + config: config, + logger: logger.NewNilLogger(), + sdkClient: client, + }, nil +} + +func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider { + d.logger = logger + return d +} + +func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { + // 查询域名列表 + // REF: https://docs.jdcloud.com/cn/video-on-demand/api/listdomains + var domainId int + listDomainsPageNumber := 1 + listDomainsPageSize := 100 + for { + listDomainsReq := jdVodApi.NewListDomainsRequest() + listDomainsReq.SetPageNumber(1) + listDomainsReq.SetPageSize(100) + listDomainsResp, err := d.sdkClient.ListDomains(listDomainsReq) + if err != nil { + return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.ListDomains'") + } + + for _, domain := range listDomainsResp.Result.Content { + if domain.Name == d.config.Domain { + domainId, _ = strconv.Atoi(domain.Id) + break + } + } + + if len(listDomainsResp.Result.Content) < listDomainsPageSize { + break + } else { + listDomainsPageNumber++ + } + } + if domainId == 0 { + return nil, xerrors.New("domain not found") + } + + // 查询域名 SSL 配置 + // REF: https://docs.jdcloud.com/cn/video-on-demand/api/gethttpssl + getHttpSslReq := jdVodApi.NewGetHttpSslRequest(domainId) + getHttpSslResp, err := d.sdkClient.GetHttpSsl(getHttpSslReq) + if err != nil { + return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.GetHttpSsl'") + } else { + d.logger.Logt("已查询到域名 SSL 配置", getHttpSslResp) + } + + // 设置域名 SSL 配置 + // REF: https://docs.jdcloud.com/cn/video-on-demand/api/sethttpssl + setHttpSslReq := jdVodApi.NewSetHttpSslRequest(domainId) + setHttpSslReq.SetTitle(fmt.Sprintf("certimate-%d", time.Now().UnixMilli())) + setHttpSslReq.SetSslCert(certPem) + setHttpSslReq.SetSslKey(privkeyPem) + setHttpSslReq.SetSource("default") + setHttpSslReq.SetJumpType(getHttpSslResp.Result.JumpType) + setHttpSslReq.SetEnabled(true) + setHttpSslResp, err := d.sdkClient.SetHttpSsl(setHttpSslReq) + if err != nil { + return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.SetHttpSsl'") + } else { + d.logger.Logt("已设置域名 SSL 配置", setHttpSslResp) + } + + return &deployer.DeployResult{}, nil +} + +func createSdkClient(accessKeyId, accessKeySecret string) (*jdVodClient.VodClient, error) { + clientCredentials := jdCore.NewCredentials(accessKeyId, accessKeySecret) + client := jdVodClient.NewVodClient(clientCredentials) + return client, nil +} diff --git a/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod_test.go b/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod_test.go new file mode 100644 index 00000000..6046982b --- /dev/null +++ b/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod_test.go @@ -0,0 +1,75 @@ +package jdcloudvod_test + +import ( + "context" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/jdcloud-vod" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fAccessKeySecret string + fDomain string +) + +func init() { + argsPrefix := "CERTIMATE_DEPLOYER_JDCLOUDVOD_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fAccessKeySecret, argsPrefix+"ACCESSKEYSECRET", "", "") + flag.StringVar(&fDomain, argsPrefix+"DOMAIN", "", "") +} + +/* +Shell command to run this test: + + go test -v ./jdcloud_vod_test.go -args \ + --CERTIMATE_DEPLOYER_JDCLOUDVOD_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --CERTIMATE_DEPLOYER_JDCLOUDVOD_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --CERTIMATE_DEPLOYER_JDCLOUDVOD_ACCESSKEYID="your-access-key-id" \ + --CERTIMATE_DEPLOYER_JDCLOUDVOD_ACCESSKEYSECRET="your-secret-access-key" \ + --CERTIMATE_DEPLOYER_JDCLOUDVOD_DOMAIN="example.com" +*/ +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), + fmt.Sprintf("DOMAIN: %v", fDomain), + }, "\n")) + + deployer, err := provider.NewDeployer(&provider.DeployerConfig{ + AccessKeyId: fAccessKeyId, + AccessKeySecret: fAccessKeySecret, + Domain: fDomain, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := deployer.Deploy(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + t.Logf("ok: %v", res) + }) +} diff --git a/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go b/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go index 6368bc51..b53bf87c 100644 --- a/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go +++ b/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go @@ -67,9 +67,9 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe describeCertsPageSize := 100 for { describeCertsReq := jdSslApi.NewDescribeCertsRequest() - describeCertsReq.DomainName = &certX509.Subject.CommonName - describeCertsReq.PageNumber = &describeCertsPageNumber - describeCertsReq.PageSize = &describeCertsPageSize + describeCertsReq.SetDomainName(certX509.Subject.CommonName) + describeCertsReq.SetPageNumber(describeCertsPageNumber) + describeCertsReq.SetPageSize(describeCertsPageSize) describeCertsResp, err := u.sdkClient.DescribeCerts(describeCertsReq) if err != nil { return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DescribeCerts'") diff --git a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx index 000b67e3..b9f65b08 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx @@ -42,6 +42,7 @@ import DeployNodeConfigFormHuaweiCloudWAFConfig from "./DeployNodeConfigFormHuaw import DeployNodeConfigFormJDCloudALBConfig from "./DeployNodeConfigFormJDCloudALBConfig"; import DeployNodeConfigFormJDCloudCDNConfig from "./DeployNodeConfigFormJDCloudCDNConfig"; import DeployNodeConfigFormJDCloudLiveConfig from "./DeployNodeConfigFormJDCloudLiveConfig"; +import DeployNodeConfigFormJDCloudVODConfig from "./DeployNodeConfigFormJDCloudVODConfig"; import DeployNodeConfigFormKubernetesSecretConfig from "./DeployNodeConfigFormKubernetesSecretConfig"; import DeployNodeConfigFormLocalConfig from "./DeployNodeConfigFormLocalConfig"; import DeployNodeConfigFormQiniuCDNConfig from "./DeployNodeConfigFormQiniuCDNConfig"; @@ -191,6 +192,8 @@ const DeployNodeConfigForm = forwardRef; case DEPLOY_PROVIDERS.JDCLOUD_LIVE: return ; + case DEPLOY_PROVIDERS.JDCLOUD_VOD: + return ; case DEPLOY_PROVIDERS.KUBERNETES_SECRET: return ; case DEPLOY_PROVIDERS.LOCAL: diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormJDCloudVODConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormJDCloudVODConfig.tsx new file mode 100644 index 00000000..ad64a735 --- /dev/null +++ b/ui/src/components/workflow/node/DeployNodeConfigFormJDCloudVODConfig.tsx @@ -0,0 +1,65 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +import { validDomainName } from "@/utils/validators"; + +type DeployNodeConfigFormJDCloudVODConfigFieldValues = Nullish<{ + domain: string; +}>; + +export type DeployNodeConfigFormJDCloudVODConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: DeployNodeConfigFormJDCloudVODConfigFieldValues; + onValuesChange?: (values: DeployNodeConfigFormJDCloudVODConfigFieldValues) => void; +}; + +const initFormModel = (): DeployNodeConfigFormJDCloudVODConfigFieldValues => { + return {}; +}; + +const DeployNodeConfigFormJDCloudVODConfig = ({ + form: formInst, + formName, + disabled, + initialValues, + onValuesChange, +}: DeployNodeConfigFormJDCloudVODConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + domain: z + .string({ message: t("workflow_node.deploy.form.jdcloud_vod_domain.placeholder") }) + .refine((v) => validDomainName(v), t("common.errmsg.domain_invalid")), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + +
+ ); +}; + +export default DeployNodeConfigFormJDCloudVODConfig; diff --git a/ui/src/domain/provider.ts b/ui/src/domain/provider.ts index d549f4cd..13a82a4c 100644 --- a/ui/src/domain/provider.ts +++ b/ui/src/domain/provider.ts @@ -225,6 +225,7 @@ export const DEPLOY_PROVIDERS = Object.freeze({ JDCLOUD_ALB: `${ACCESS_PROVIDERS.JDCLOUD}-alb`, JDCLOUD_CDN: `${ACCESS_PROVIDERS.JDCLOUD}-cdn`, JDCLOUD_LIVE: `${ACCESS_PROVIDERS.JDCLOUD}-live`, + JDCLOUD_VOD: `${ACCESS_PROVIDERS.JDCLOUD}-vod`, KUBERNETES_SECRET: `${ACCESS_PROVIDERS.KUBERNETES}-secret`, LOCAL: `${ACCESS_PROVIDERS.LOCAL}`, QINIU_CDN: `${ACCESS_PROVIDERS.QINIU}-cdn`, @@ -317,6 +318,7 @@ export const deployProvidersMap: Maphttps://cdn-console.jdcloud.com/", "workflow_node.deploy.form.jdcloud_live_domain.label": "JD Cloud Live Video play domain", "workflow_node.deploy.form.jdcloud_live_domain.placeholder": "Please enter JD Cloud Live Video play domain name", - "workflow_node.deploy.form.jdcloud_live_domain.tooltip": "For more information, see https://docs.jdcloud.com/en/live-video/domain-management", + "workflow_node.deploy.form.jdcloud_live_domain.tooltip": "For more information, see https://live-console.jdcloud.com/", + "workflow_node.deploy.form.jdcloud_vod_domain.label": "JD Cloud VOD domain", + "workflow_node.deploy.form.jdcloud_vod_domain.placeholder": "Please enter JD Cloud VOD domain name", + "workflow_node.deploy.form.jdcloud_vod_domain.tooltip": "For more information, see https://vod-console.jdcloud.com/", "workflow_node.deploy.form.k8s_namespace.label": "Kubernetes Namespace", "workflow_node.deploy.form.k8s_namespace.placeholder": "Please enter Kubernetes Namespace", "workflow_node.deploy.form.k8s_namespace.tooltip": "For more information, see https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/", diff --git a/ui/src/i18n/locales/zh/nls.provider.json b/ui/src/i18n/locales/zh/nls.provider.json index 5b4e8ee3..101b0553 100644 --- a/ui/src/i18n/locales/zh/nls.provider.json +++ b/ui/src/i18n/locales/zh/nls.provider.json @@ -59,6 +59,7 @@ "provider.jdcloud.cdn": "京东云 - 内容分发网络 CDN", "provider.jdcloud.dns": "京东云 - 云解析 DNS", "provider.jdcloud.live": "京东云 - 视频直播", + "provider.jdcloud.vod": "京东云 - 视频点播", "provider.kubernetes": "Kubernetes", "provider.kubernetes.secret": "Kubernetes - Secret", "provider.local": "本地部署", @@ -99,7 +100,7 @@ "provider.category.all": "全部", "provider.category.cdn": "CDN", - "provider.category.storage": "存储", + "provider.category.storage": "文件存储", "provider.category.loadbalance": "负载均衡", "provider.category.firewall": "防火墙", "provider.category.av": "音视频", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 9298d2a8..a4c0998b 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -294,7 +294,10 @@ "workflow_node.deploy.form.jdcloud_cdn_domain.tooltip": "这是什么？请参阅 https://cdn-console.jdcloud.com/", "workflow_node.deploy.form.jdcloud_live_domain.label": "京东云视频直播播放域名", "workflow_node.deploy.form.jdcloud_live_domain.placeholder": "请输入京东云视频直播播放域名", - "workflow_node.deploy.form.jdcloud_live_domain.tooltip": "这是什么？请参阅 https://docs.jdcloud.com/cn/live-video/domain-management", + "workflow_node.deploy.form.jdcloud_live_domain.tooltip": "这是什么？请参阅 https://live-console.jdcloud.com", + "workflow_node.deploy.form.jdcloud_vod_domain.label": "京东云视频点播加速域名", + "workflow_node.deploy.form.jdcloud_vod_domain.placeholder": "请输入京东云视频点播加速域名", + "workflow_node.deploy.form.jdcloud_vod_domain.tooltip": "这是什么？请参阅 https://vod-console.jdcloud.com/", "workflow_node.deploy.form.k8s_namespace.label": "Kubernetes 命名空间", "workflow_node.deploy.form.k8s_namespace.placeholder": "请输入 Kubernetes 命名空间", "workflow_node.deploy.form.k8s_namespace.tooltip": "这是什么？请参阅 https://kubernetes.io/zh-cn/docs/concepts/overview/working-with-objects/namespaces/",