diff --git a/go.mod b/go.mod index 79248128..6d8a5d7d 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,7 @@ require ( github.com/alibabacloud-go/cas-20200407/v3 v3.0.4 github.com/alibabacloud-go/cdn-20180510/v5 v5.2.2 github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.10 + github.com/alibabacloud-go/live-20161101 v1.1.1 github.com/alibabacloud-go/nlb-20220430/v2 v2.0.3 github.com/alibabacloud-go/slb-20140515/v4 v4.0.9 github.com/alibabacloud-go/tea v1.2.2 @@ -29,7 +30,8 @@ require ( github.com/qiniu/go-sdk/v7 v7.25.1 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1065 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1065 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1065 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1080 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.1080 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1065 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1065 github.com/volcengine/ve-tos-golang-sdk/v2 v2.7.8 @@ -50,7 +52,6 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect - github.com/alibabacloud-go/live-20161101 v1.1.1 // indirect github.com/alibabacloud-go/openplatform-20191219/v2 v2.0.1 // indirect github.com/alibabacloud-go/tea-fileform v1.1.1 // indirect github.com/alibabacloud-go/tea-oss-sdk v1.1.3 // indirect diff --git a/go.sum b/go.sum index ca08858b..16cf7f56 100644 --- a/go.sum +++ b/go.sum @@ -187,8 +187,6 @@ github.com/alibabacloud-go/tea-xml v1.1.1/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCE github.com/alibabacloud-go/tea-xml v1.1.2/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= github.com/alibabacloud-go/tea-xml v1.1.3 h1:7LYnm+JbOq2B+T/B0fHC4Ies4/FofC4zHzYtqw7dgt0= github.com/alibabacloud-go/tea-xml v1.1.3/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= -github.com/aliyun/alibaba-cloud-sdk-go v1.63.72 h1:HvFZUzEbNvfe8F2Mg0wBGv90bPhWDxgVtDHR5zoBOU0= -github.com/aliyun/alibaba-cloud-sdk-go v1.63.72/go.mod h1:SOSDHfe1kX91v3W5QiBsWSLqeLxImobbMX1mxrFHsVQ= github.com/aliyun/alibaba-cloud-sdk-go v1.63.80 h1:Dn5QrIWYgi7IZJkuhrAe33x/jFWlbHCW3Dip1Tv3z9c= github.com/aliyun/alibaba-cloud-sdk-go v1.63.80/go.mod h1:SOSDHfe1kX91v3W5QiBsWSLqeLxImobbMX1mxrFHsVQ= github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g= @@ -830,10 +828,13 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1065 h1:q0Op2Q github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1065/go.mod h1:UiS7HMWbxGhO/y7nmnHuBMyP4qEDmJeooK6YKWNMuEw= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1065 h1:Kb/l5yh9M6Ow59ZRAMcdIBxsNT3uy8fZYh8xy2rM+xQ= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1065/go.mod h1:bgwicHdrBXLcgB4mQd8pWbSNuM7fIAjhxHfdZ/Hb7p4= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1065 h1:krcqtAmexnHHBm/4ge4tr2b1cn/a7JGBESVGoZYXQAE= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1065/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1080 h1:N+Urn1Sva75ZoYh9Gjf7A4kJAA3wWItxsoxyADZBol4= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1080/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1065 h1:aEFtLD1ceyeljQXB1S2BjN0zjTkf0X3XmpuxFIiC29w= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1065/go.mod h1:HWvwy09hFSMXrj9SMvVRWV4U7rZO3l+WuogyNuxiT3M= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.1080 h1:ygmXHhIedpjo0yFe6LbB+4ygHaVK8mnrwBAllfw7cX8= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.1080/go.mod h1:UuvtB7f2kQMCBC5vt8hbjWGEba8qzf5YWP+C3VLKY6w= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1065 h1:rHI/2WYmEBfnqVNo5iUy0gu0J7ekFBE/NDV/oKZv448= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1065/go.mod h1:nnd6/G8xfl7RMsm2XYdQT5SfjdxG/U09QaC6qO89JJg= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1065 h1:gDuqak8/kNgF99+ksk70JHjI1Poa5pmrgYDW6xYya8I= diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index c183b2cf..35a818f4 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -23,7 +23,8 @@ import ( providerSSH "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ssh" providerTencentCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-cdn" providerTencentCloudCLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-clb" - providerTencentCloudCOD "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-cos" + providerTencentCloudCOS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-cos" + providerTencentCloudCSS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-css" providerTencentCloudECDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-ecdn" providerTencentCloudEO "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-eo" providerVolcEngineCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-cdn" @@ -283,7 +284,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, logger.Logger, return deployer, logger, err } - case domain.DeployProviderTypeTencentCloudCDN, domain.DeployProviderTypeTencentCloudCLB, domain.DeployProviderTypeTencentCloudCOS, domain.DeployProviderTypeTencentCloudECDN, domain.DeployProviderTypeTencentCloudEO: + case domain.DeployProviderTypeTencentCloudCDN, domain.DeployProviderTypeTencentCloudCLB, domain.DeployProviderTypeTencentCloudCOS, domain.DeployProviderTypeTencentCloudCSS, domain.DeployProviderTypeTencentCloudECDN, domain.DeployProviderTypeTencentCloudEO: { access := domain.AccessConfigForTencentCloud{} if err := maps.Decode(options.ProviderAccessConfig, &access); err != nil { @@ -312,7 +313,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, logger.Logger, return deployer, logger, err case domain.DeployProviderTypeTencentCloudCOS: - deployer, err := providerTencentCloudCOD.NewWithLogger(&providerTencentCloudCOD.TencentCloudCOSDeployerConfig{ + deployer, err := providerTencentCloudCOS.NewWithLogger(&providerTencentCloudCOS.TencentCloudCOSDeployerConfig{ SecretId: access.SecretId, SecretKey: access.SecretKey, Region: maps.GetValueAsString(options.ProviderDeployConfig, "region"), @@ -321,6 +322,14 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, logger.Logger, }, logger) return deployer, logger, err + case domain.DeployProviderTypeTencentCloudCSS: + deployer, err := providerTencentCloudCSS.NewWithLogger(&providerTencentCloudCSS.TencentCloudCSSDeployerConfig{ + SecretId: access.SecretId, + SecretKey: access.SecretKey, + Domain: maps.GetValueAsString(options.ProviderDeployConfig, "domain"), + }, logger) + return deployer, logger, err + case domain.DeployProviderTypeTencentCloudECDN: deployer, err := providerTencentCloudECDN.NewWithLogger(&providerTencentCloudECDN.TencentCloudECDNDeployerConfig{ SecretId: access.SecretId, diff --git a/internal/domain/provider.go b/internal/domain/provider.go index dd9d1607..7d3f2464 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -89,6 +89,7 @@ const ( DeployProviderTypeTencentCloudCDN = DeployProviderType("tencentcloud-cdn") DeployProviderTypeTencentCloudCLB = DeployProviderType("tencentcloud-clb") DeployProviderTypeTencentCloudCOS = DeployProviderType("tencentcloud-cos") + DeployProviderTypeTencentCloudCSS = DeployProviderType("tencentcloud-css") DeployProviderTypeTencentCloudECDN = DeployProviderType("tencentcloud-ecdn") DeployProviderTypeTencentCloudEO = DeployProviderType("tencentcloud-eo") DeployProviderTypeVolcEngineCDN = DeployProviderType("volcengine-cdn") diff --git a/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go b/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go new file mode 100644 index 00000000..391fc05b --- /dev/null +++ b/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go @@ -0,0 +1,109 @@ +package tencentcloudcss + +import ( + "context" + "errors" + + xerrors "github.com/pkg/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" + + "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/logger" + "github.com/usual2970/certimate/internal/pkg/core/uploader" + providerSsl "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" +) + +type TencentCloudCSSDeployerConfig struct { + // 腾讯云 SecretId。 + SecretId string `json:"secretId"` + // 腾讯云 SecretKey。 + SecretKey string `json:"secretKey"` + // 直播播放域名(不支持泛域名)。 + Domain string `json:"domain"` +} + +type TencentCloudCSSDeployer struct { + config *TencentCloudCSSDeployerConfig + logger logger.Logger + sdkClient *tcLive.Client + sslUploader uploader.Uploader +} + +var _ deployer.Deployer = (*TencentCloudCSSDeployer)(nil) + +func New(config *TencentCloudCSSDeployerConfig) (*TencentCloudCSSDeployer, error) { + return NewWithLogger(config, logger.NewNilLogger()) +} + +func NewWithLogger(config *TencentCloudCSSDeployerConfig, logger logger.Logger) (*TencentCloudCSSDeployer, error) { + if config == nil { + return nil, errors.New("config is nil") + } + + if logger == nil { + return nil, errors.New("logger is nil") + } + + client, err := createSdkClient(config.SecretId, config.SecretKey) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create sdk client") + } + + uploader, err := providerSsl.New(&providerSsl.TencentCloudSSLUploaderConfig{ + SecretId: config.SecretId, + SecretKey: config.SecretKey, + }) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create ssl uploader") + } + + return &TencentCloudCSSDeployer{ + logger: logger, + config: config, + sdkClient: client, + sslUploader: uploader, + }, nil +} + +func (d *TencentCloudCSSDeployer) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { + // 上传证书到 SSL + upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) + if err != nil { + return nil, xerrors.Wrap(err, "failed to upload certificate file") + } + + d.logger.Logt("certificate file uploaded", upres) + + // 绑定证书对应的播放域名 + // REF: https://cloud.tencent.com/document/product/267/78655 + modifyLiveDomainCertBindingsReq := &tcLive.ModifyLiveDomainCertBindingsRequest{ + DomainInfos: []*tcLive.LiveCertDomainInfo{ + { + DomainName: common.StringPtr(d.config.Domain), + Status: common.Int64Ptr(1), + }, + }, + CloudCertId: common.StringPtr(upres.CertId), + } + modifyLiveDomainCertBindingsResp, err := d.sdkClient.ModifyLiveDomainCertBindings(modifyLiveDomainCertBindingsReq) + if err != nil { + return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.ModifyLiveDomainCertBindings'") + } + + d.logger.Logt("已部署证书到云资源实例", modifyLiveDomainCertBindingsResp.Response) + + return &deployer.DeployResult{}, nil +} + +func createSdkClient(secretId, secretKey string) (*tcLive.Client, error) { + credential := common.NewCredential(secretId, secretKey) + + client, err := tcLive.NewClient(credential, "", profile.NewClientProfile()) + if err != nil { + return nil, err + } + + return client, nil +} diff --git a/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css_test.go b/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css_test.go new file mode 100644 index 00000000..4efe7bba --- /dev/null +++ b/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css_test.go @@ -0,0 +1,75 @@ +package tencentcloudcss_test + +import ( + "context" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-css" +) + +var ( + fInputCertPath string + fInputKeyPath string + fSecretId string + fSecretKey string + fDomain string +) + +func init() { + argsPrefix := "CERTIMATE_DEPLOYER_TENCENTCLOUDCSS_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fSecretId, argsPrefix+"SECRETID", "", "") + flag.StringVar(&fSecretKey, argsPrefix+"SECRETKEY", "", "") + flag.StringVar(&fDomain, argsPrefix+"DOMAIN", "", "") +} + +/* +Shell command to run this test: + + go test -v ./tencentcloud_css_test.go -args \ + --CERTIMATE_DEPLOYER_TENCENTCLOUDCSS_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --CERTIMATE_DEPLOYER_TENCENTCLOUDCSS_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --CERTIMATE_DEPLOYER_TENCENTCLOUDCSS_SECRETID="your-secret-id" \ + --CERTIMATE_DEPLOYER_TENCENTCLOUDCSS_SECRETKEY="your-secret-key" \ + --CERTIMATE_DEPLOYER_TENCENTCLOUDCSS_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("SECRETID: %v", fSecretId), + fmt.Sprintf("SECRETKEY: %v", fSecretKey), + fmt.Sprintf("DOMAIN: %v", fDomain), + }, "\n")) + + deployer, err := provider.New(&provider.TencentCloudCSSDeployerConfig{ + SecretId: fSecretId, + SecretKey: fSecretKey, + 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/ui/src/components/workflow/node/DeployNode.tsx b/ui/src/components/workflow/node/DeployNode.tsx index ce3952d1..8a211a67 100644 --- a/ui/src/components/workflow/node/DeployNode.tsx +++ b/ui/src/components/workflow/node/DeployNode.tsx @@ -45,7 +45,7 @@ const DeployNode = ({ node, disabled }: DeployNodeProps) => { const config = (node.config as WorkflowNodeConfigForDeploy) ?? {}; const provider = deployProvidersMap.get(config.provider); return ( - <Space> + <Space className="max-w-full"> <Avatar src={provider?.icon} size="small" /> <Typography.Text className="truncate">{t(provider?.name ?? "")}</Typography.Text> </Space> diff --git a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx index b369a478..2643b2c7 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx @@ -34,6 +34,7 @@ import DeployNodeConfigFormSSHConfig from "./DeployNodeConfigFormSSHConfig.tsx"; import DeployNodeConfigFormTencentCloudCDNConfig from "./DeployNodeConfigFormTencentCloudCDNConfig.tsx"; import DeployNodeConfigFormTencentCloudCLBConfig from "./DeployNodeConfigFormTencentCloudCLBConfig.tsx"; import DeployNodeConfigFormTencentCloudCOSConfig from "./DeployNodeConfigFormTencentCloudCOSConfig.tsx"; +import DeployNodeConfigFormTencentCloudCSSConfig from "./DeployNodeConfigFormTencentCloudCSSConfig.tsx"; import DeployNodeConfigFormTencentCloudECDNConfig from "./DeployNodeConfigFormTencentCloudECDNConfig.tsx"; import DeployNodeConfigFormTencentCloudEOConfig from "./DeployNodeConfigFormTencentCloudEOConfig.tsx"; import DeployNodeConfigFormVolcEngineCDNConfig from "./DeployNodeConfigFormVolcEngineCDNConfig.tsx"; @@ -149,6 +150,8 @@ const DeployNodeConfigForm = forwardRef<DeployNodeConfigFormInstance, DeployNode return <DeployNodeConfigFormTencentCloudCLBConfig {...nestedFormProps} />; case DEPLOY_PROVIDERS.TENCENTCLOUD_COS: return <DeployNodeConfigFormTencentCloudCOSConfig {...nestedFormProps} />; + case DEPLOY_PROVIDERS.TENCENTCLOUD_CSS: + return <DeployNodeConfigFormTencentCloudCSSConfig {...nestedFormProps} />; case DEPLOY_PROVIDERS.TENCENTCLOUD_ECDN: return <DeployNodeConfigFormTencentCloudECDNConfig {...nestedFormProps} />; case DEPLOY_PROVIDERS.TENCENTCLOUD_EO: diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCSSConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCSSConfig.tsx new file mode 100644 index 00000000..c05b1e7a --- /dev/null +++ b/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCSSConfig.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 DeployNodeConfigFormTencentCloudCSSConfigFieldValues = Nullish<{ + domain: string; +}>; + +export type DeployNodeConfigFormTencentCloudCSSConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: DeployNodeConfigFormTencentCloudCSSConfigFieldValues; + onValuesChange?: (values: DeployNodeConfigFormTencentCloudCSSConfigFieldValues) => void; +}; + +const initFormModel = (): DeployNodeConfigFormTencentCloudCSSConfigFieldValues => { + return {}; +}; + +const DeployNodeConfigFormTencentCloudCSSConfig = ({ + form: formInst, + formName, + disabled, + initialValues, + onValuesChange, +}: DeployNodeConfigFormTencentCloudCSSConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + domain: z + .string({ message: t("workflow_node.deploy.form.tencentcloud_css_domain.placeholder") }) + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer<typeof formSchema>) => { + onValuesChange?.(values); + }; + + return ( + <Form + form={formInst} + disabled={disabled} + initialValues={initialValues ?? initFormModel()} + layout="vertical" + name={formName} + onValuesChange={handleFormChange} + > + <Form.Item + name="domain" + label={t("workflow_node.deploy.form.tencentcloud_css_domain.label")} + rules={[formRule]} + tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.deploy.form.tencentcloud_css_domain.tooltip") }}></span>} + > + <Input placeholder={t("workflow_node.deploy.form.tencentcloud_css_domain.placeholder")} /> + </Form.Item> + </Form> + ); +}; + +export default DeployNodeConfigFormTencentCloudCSSConfig; diff --git a/ui/src/components/workflow/node/_SharedNode.tsx b/ui/src/components/workflow/node/_SharedNode.tsx index 906f7d8f..c6ddfe50 100644 --- a/ui/src/components/workflow/node/_SharedNode.tsx +++ b/ui/src/components/workflow/node/_SharedNode.tsx @@ -196,7 +196,7 @@ const SharedNodeBlock = ({ children, node, disabled, onClick }: SharedNodeBlockP </div> <div className="flex cursor-pointer flex-col justify-center px-4 py-2" onClick={handleNodeClick}> - <div className="text-sm">{children}</div> + <div className="overflow-hidden text-sm">{children}</div> </div> </Card> </Popover> diff --git a/ui/src/domain/provider.ts b/ui/src/domain/provider.ts index 1db23f01..0874fbcc 100644 --- a/ui/src/domain/provider.ts +++ b/ui/src/domain/provider.ts @@ -170,6 +170,7 @@ export const DEPLOY_PROVIDERS = Object.freeze({ TENCENTCLOUD_CDN: `${ACCESS_PROVIDERS.TENCENTCLOUD}-cdn`, TENCENTCLOUD_CLB: `${ACCESS_PROVIDERS.TENCENTCLOUD}-clb`, TENCENTCLOUD_COS: `${ACCESS_PROVIDERS.TENCENTCLOUD}-cos`, + TENCENTCLOUD_CSS: `${ACCESS_PROVIDERS.TENCENTCLOUD}-css`, TENCENTCLOUD_ECDN: `${ACCESS_PROVIDERS.TENCENTCLOUD}-ecdn`, TENCENTCLOUD_EO: `${ACCESS_PROVIDERS.TENCENTCLOUD}-eo`, VOLCENGINE_CDN: `${ACCESS_PROVIDERS.VOLCENGINE}-cdn`, @@ -211,6 +212,7 @@ export const deployProvidersMap: Map<DeployProvider["type"] | string, DeployProv [DEPLOY_PROVIDERS.TENCENTCLOUD_ECDN, "common.provider.tencentcloud.ecdn"], [DEPLOY_PROVIDERS.TENCENTCLOUD_EO, "common.provider.tencentcloud.eo"], [DEPLOY_PROVIDERS.TENCENTCLOUD_CLB, "common.provider.tencentcloud.clb"], + [DEPLOY_PROVIDERS.TENCENTCLOUD_CSS, "common.provider.tencentcloud.css"], [DEPLOY_PROVIDERS.HUAWEICLOUD_CDN, "common.provider.huaweicloud.cdn"], [DEPLOY_PROVIDERS.HUAWEICLOUD_ELB, "common.provider.huaweicloud.elb"], [DEPLOY_PROVIDERS.BAIDUCLOUD_CDN, "common.provider.baiducloud.cdn"], diff --git a/ui/src/i18n/locales/en/nls.common.json b/ui/src/i18n/locales/en/nls.common.json index 86915bd3..c8c37a7e 100644 --- a/ui/src/i18n/locales/en/nls.common.json +++ b/ui/src/i18n/locales/en/nls.common.json @@ -37,30 +37,30 @@ "common.provider.acmehttpreq": "Http Request (ACME Proxy)", "common.provider.aliyun": "Alibaba Cloud", - "common.provider.aliyun.alb": "Alibaba Cloud - ALB", - "common.provider.aliyun.cdn": "Alibaba Cloud - CDN", - "common.provider.aliyun.clb": "Alibaba Cloud - CLB", - "common.provider.aliyun.dcdn": "Alibaba Cloud - DCDN", - "common.provider.aliyun.dns": "Alibaba Cloud - DNS", + "common.provider.aliyun.alb": "Alibaba Cloud - Application Load Balancer (ALB)", + "common.provider.aliyun.cdn": "Alibaba Cloud - Content Delivery Network (CDN)", + "common.provider.aliyun.clb": "Alibaba Cloud - Classic Load Balancer (CLB)", + "common.provider.aliyun.dcdn": "Alibaba Cloud - Dynamic Route for Content Delivery Network (DCDN)", + "common.provider.aliyun.dns": "Alibaba Cloud - Domain Name Service (DNS)", "common.provider.aliyun.live": "Alibaba Cloud - ApsaraVideo Live", - "common.provider.aliyun.nlb": "Alibaba Cloud - NLB", - "common.provider.aliyun.oss": "Alibaba Cloud - OSS", + "common.provider.aliyun.nlb": "Alibaba Cloud - Network Load Balancer (NLB)", + "common.provider.aliyun.oss": "Alibaba Cloud - Object Storage Service (OSS)", "common.provider.aws": "AWS", "common.provider.aws.route53": "AWS - Route53", "common.provider.azure": "Azure", "common.provider.azure.dns": "Azure - DNS", "common.provider.baiducloud": "Baidu Cloud", - "common.provider.baiducloud.cdn": "Baidu Cloud - CDN", + "common.provider.baiducloud.cdn": "Baidu Cloud - Content Delivery Network (CDN)", "common.provider.byteplus": "BytePlus", - "common.provider.byteplus.cdn": "BytePlus - CDN", + "common.provider.byteplus.cdn": "BytePlus - Content Delivery Network (CDN)", "common.provider.cloudflare": "Cloudflare", "common.provider.dogecloud": "Doge Cloud", - "common.provider.dogecloud.cdn": "Doge Cloud - CDN", + "common.provider.dogecloud.cdn": "Doge Cloud - Content Delivery Network (CDN)", "common.provider.godaddy": "GoDaddy", "common.provider.huaweicloud": "Huawei Cloud", - "common.provider.huaweicloud.cdn": "Huawei Cloud - CDN", - "common.provider.huaweicloud.dns": "Huawei Cloud - DNS", - "common.provider.huaweicloud.elb": "Huawei Cloud - ELB", + "common.provider.huaweicloud.cdn": "Huawei Cloud - Content Delivery Network (CDN)", + "common.provider.huaweicloud.dns": "Huawei Cloud - Domain Name Service (DNS)", + "common.provider.huaweicloud.elb": "Huawei Cloud - Elastic Load Balance (ELB)", "common.provider.kubernetes": "Kubernetes", "common.provider.kubernetes.secret": "Kubernetes - Secret", "common.provider.local": "Local deployment", @@ -68,22 +68,23 @@ "common.provider.namesilo": "NameSilo", "common.provider.powerdns": "PowerDNS", "common.provider.qiniu": "Qiniu", - "common.provider.qiniu.cdn": "Qiniu - CDN", + "common.provider.qiniu.cdn": "Qiniu - Content Delivery Network (CDN)", "common.provider.ssh": "SSH deployment", "common.provider.tencentcloud": "Tencent Cloud", - "common.provider.tencentcloud.cdn": "Tencent Cloud - CDN", - "common.provider.tencentcloud.clb": "Tencent Cloud - CLB", - "common.provider.tencentcloud.cos": "Tencent Cloud - COS", - "common.provider.tencentcloud.dns": "Tencent Cloud - DNS", - "common.provider.tencentcloud.ecdn": "Tencent Cloud - ECDN", + "common.provider.tencentcloud.cdn": "Tencent Cloud - Content Delivery Network (CDN)", + "common.provider.tencentcloud.clb": "Tencent Cloud - Cloud Load Balancer (CLB)", + "common.provider.tencentcloud.cos": "Tencent Cloud - Cloud Object Storage (COS)", + "common.provider.tencentcloud.css": "Tencent Cloud - Cloud Streaming Service (CSS)", + "common.provider.tencentcloud.dns": "Tencent Cloud - Domain Name Service (DNS)", + "common.provider.tencentcloud.ecdn": "Tencent Cloud - Enterprise Content Delivery Network (ECDN)", "common.provider.tencentcloud.eo": "Tencent Cloud - EdgeOne", "common.provider.volcengine": "Volcengine", - "common.provider.volcengine.cdn": "Volcengine - CDN", - "common.provider.volcengine.clb": "Volcengine - CLB", - "common.provider.volcengine.dcdn": "Volcengine - DCDN", - "common.provider.volcengine.dns": "Volcengine - DNS", + "common.provider.volcengine.cdn": "Volcengine - Content Delivery Network (CDN)", + "common.provider.volcengine.clb": "Volcengine - Cloud Load Balancer (CLB)", + "common.provider.volcengine.dcdn": "Volcengine - Dynamic Content Delivery Network (DCDN)", + "common.provider.volcengine.dns": "Volcengine - Domain Name Service (DNS)", "common.provider.volcengine.live": "Volcengine - Live", - "common.provider.volcengine.tos": "Volcengine - TOS", + "common.provider.volcengine.tos": "Volcengine - Tinder Object Storage (TOS)", "common.provider.webhook": "Webhook", "common.notifier.bark": "Bark", diff --git a/ui/src/i18n/locales/en/nls.workflow.nodes.json b/ui/src/i18n/locales/en/nls.workflow.nodes.json index ab4c7ddc..0ec16538 100644 --- a/ui/src/i18n/locales/en/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/en/nls.workflow.nodes.json @@ -289,6 +289,9 @@ "workflow_node.deploy.form.tencentcloud_cos_domain.label": "Tencent Cloud COS domain", "workflow_node.deploy.form.tencentcloud_cos_domain.placeholder": "Please enter Tencent Cloud COS domain name", "workflow_node.deploy.form.tencentcloud_cos_domain.tooltip": "For more information, see <a href=\"https://console.tencentcloud.com/cos\" target=\"_blank\">https://console.tencentcloud.com/cos</a>", + "workflow_node.deploy.form.tencentcloud_css_domain.label": "Tencent Cloud CSS playing domain", + "workflow_node.deploy.form.tencentcloud_css_domain.placeholder": "Please enter Tencent Cloud CSS playing domain name", + "workflow_node.deploy.form.tencentcloud_css_domain.tooltip": "For more information, see <a href=\"https://console.cloud.tencent.com/live/livestat\" target=\"_blank\">https://console.cloud.tencent.com/live/livestat</a>", "workflow_node.deploy.form.tencentcloud_ecdn_domain.label": "Tencent Cloud ECDN domain", "workflow_node.deploy.form.tencentcloud_ecdn_domain.placeholder": "Please enter Tencent Cloud ECDN domain name", "workflow_node.deploy.form.tencentcloud_ecdn_domain.tooltip": "For more information, see <a href=\"https://console.tencentcloud.com/cdn\" target=\"_blank\">https://console.tencentcloud.com/cdn</a>", diff --git a/ui/src/i18n/locales/zh/nls.common.json b/ui/src/i18n/locales/zh/nls.common.json index 05b54c96..0a7d93cf 100644 --- a/ui/src/i18n/locales/zh/nls.common.json +++ b/ui/src/i18n/locales/zh/nls.common.json @@ -74,6 +74,7 @@ "common.provider.tencentcloud.cdn": "腾讯云 - 内容分发网络 CDN", "common.provider.tencentcloud.clb": "腾讯云 - 负载均衡 CLB", "common.provider.tencentcloud.cos": "腾讯云 - 对象存储 COS", + "common.provider.tencentcloud.css": "腾讯云 - 云直播 CSS", "common.provider.tencentcloud.dns": "腾讯云 - 云解析 DNS", "common.provider.tencentcloud.ecdn": "腾讯云 - 全站加速网络 ECDN", "common.provider.tencentcloud.eo": "腾讯云 - 边缘安全加速平台 EdgeOne", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 26ecfc3c..c06ff102 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -115,7 +115,7 @@ "workflow_node.deploy.form.aliyun_live_region.placeholder": "请输入阿里云地域(例如:cn-hangzhou)", "workflow_node.deploy.form.aliyun_live_region.tooltip": "这是什么?请参阅 <a href=\"https://help.aliyun.com/zh/live/product-overview/supported-regions\" target=\"_blank\">https://help.aliyun.com/zh/live/product-overview/supported-regions</a>", "workflow_node.deploy.form.aliyun_live_domain.label": "阿里云视频直播流域名(支持泛域名)", - "workflow_node.deploy.form.aliyun_live_domain.placeholder": "阿里云地域视频直播流域名", + "workflow_node.deploy.form.aliyun_live_domain.placeholder": "请输入阿里云视频直播流域名", "workflow_node.deploy.form.aliyun_live_domain.tooltip": "这是什么?请参阅 <a href=\"https://live.console.aliyun.com\" target=\"_blank\">https://live.console.aliyun.com</a>", "workflow_node.deploy.form.aliyun_nlb_resource_type.label": "证书替换方式", "workflow_node.deploy.form.aliyun_nlb_resource_type.placeholder": "请选择证书替换方式", @@ -289,6 +289,9 @@ "workflow_node.deploy.form.tencentcloud_cos_domain.label": "腾讯云 COS 自定义域名", "workflow_node.deploy.form.tencentcloud_cos_domain.placeholder": "请输入腾讯云 COS 自定义域名", "workflow_node.deploy.form.tencentcloud_cos_domain.tooltip": "这是什么?请参阅 see <a href=\"https://console.cloud.tencent.com/cos\" target=\"_blank\">https://console.cloud.tencent.com/cos</a>", + "workflow_node.deploy.form.tencentcloud_css_domain.label": "腾讯云云直播播放域名", + "workflow_node.deploy.form.tencentcloud_css_domain.placeholder": "请输入腾讯云云直播播放域名", + "workflow_node.deploy.form.tencentcloud_css_domain.tooltip": "这是什么?请参阅 <a href=\"https://console.cloud.tencent.com/live/livestat\" target=\"_blank\">https://console.cloud.tencent.com/live/livestat</a>", "workflow_node.deploy.form.tencentcloud_ecdn_domain.label": "腾讯云 ECDN 加速域名(支持泛域名)", "workflow_node.deploy.form.tencentcloud_ecdn_domain.placeholder": "请输入腾讯云 ECDN 加速域名", "workflow_node.deploy.form.tencentcloud_ecdn_domain.tooltip": "这是什么?请参阅 <a href=\"https://console.cloud.tencent.com/cdn\" target=\"_blank\">https://console.cloud.tencent.com/cdn</a><br><br>泛域名表示形式为:*.example.com",