mirror of
https://github.com/usual2970/certimate.git
synced 2025-10-05 14:04:54 +00:00
Merge branch 'main' into feat-ssh-jumpserver
This commit is contained in:
RHQYZ
@@ -31,9 +31,9 @@ func NewWithWorkflowNode(config DeployerWithWorkflowNodeConfig) (Deployer, error
|
||||
|
||||
nodeConfig := config.Node.GetConfigForDeploy()
|
||||
options := &deployerProviderOptions{
|
||||
Provider: domain.DeploymentProviderType(nodeConfig.Provider),
|
||||
ProviderAccessConfig: make(map[string]any),
|
||||
ProviderExtendedConfig: nodeConfig.ProviderConfig,
|
||||
Provider: domain.DeploymentProviderType(nodeConfig.Provider),
|
||||
ProviderAccessConfig: make(map[string]any),
|
||||
ProviderServiceConfig: nodeConfig.ProviderConfig,
|
||||
}
|
||||
|
||||
accessRepo := repository.NewAccessRepository()
|
||||
|
||||
@@ -19,6 +19,7 @@ import (
|
||||
pAliyunDDoS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-ddos"
|
||||
pAliyunESA "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-esa"
|
||||
pAliyunFC "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-fc"
|
||||
pAliyunGA "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-ga"
|
||||
pAliyunLive "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-live"
|
||||
pAliyunNLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-nlb"
|
||||
pAliyunOSS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-oss"
|
||||
@@ -34,12 +35,15 @@ import (
|
||||
pBaishanCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baishan-cdn"
|
||||
pBaotaPanelConsole "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baotapanel-console"
|
||||
pBaotaPanelSite "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baotapanel-site"
|
||||
pBaotaWAFConsole "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baotawaf-console"
|
||||
pBaotaWAFSite "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baotawaf-site"
|
||||
pBunnyCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/bunny-cdn"
|
||||
pBytePlusCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/byteplus-cdn"
|
||||
pCacheFly "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/cachefly"
|
||||
pCdnfly "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/cdnfly"
|
||||
pDogeCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/dogecloud-cdn"
|
||||
pEdgioApplications "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/edgio-applications"
|
||||
pFlexCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/flexcdn"
|
||||
pGcoreCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/gcore-cdn"
|
||||
pGoEdge "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/goedge"
|
||||
pHuaweiCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/huaweicloud-cdn"
|
||||
@@ -51,6 +55,7 @@ import (
|
||||
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"
|
||||
pLeCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/lecdn"
|
||||
pLocal "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/local"
|
||||
pNetlifySite "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/netlify-site"
|
||||
pProxmoxVE "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/proxmoxve"
|
||||
@@ -83,7 +88,9 @@ import (
|
||||
pVolcEngineImageX "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-imagex"
|
||||
pVolcEngineLive "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-live"
|
||||
pVolcEngineTOS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-tos"
|
||||
pWangsuCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/wangsu-cdn"
|
||||
pWangsuCDNPro "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/wangsu-cdnpro"
|
||||
pWangsuCertificate "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/wangsu-certificate"
|
||||
pWebhook "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/webhook"
|
||||
httputil "github.com/usual2970/certimate/internal/pkg/utils/http"
|
||||
maputil "github.com/usual2970/certimate/internal/pkg/utils/map"
|
||||
@@ -91,9 +98,9 @@ import (
|
||||
)
|
||||
|
||||
type deployerProviderOptions struct {
|
||||
Provider domain.DeploymentProviderType
|
||||
ProviderAccessConfig map[string]any
|
||||
ProviderExtendedConfig map[string]any
|
||||
Provider domain.DeploymentProviderType
|
||||
ProviderAccessConfig map[string]any
|
||||
ProviderServiceConfig map[string]any
|
||||
}
|
||||
|
||||
func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer, error) {
|
||||
@@ -113,20 +120,22 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
case domain.DeploymentProviderType1PanelConsole:
|
||||
deployer, err := p1PanelConsole.NewDeployer(&p1PanelConsole.DeployerConfig{
|
||||
ApiUrl: access.ApiUrl,
|
||||
ApiVersion: access.ApiVersion,
|
||||
ApiKey: access.ApiKey,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
AutoRestart: maputil.GetBool(options.ProviderExtendedConfig, "autoRestart"),
|
||||
AutoRestart: maputil.GetBool(options.ProviderServiceConfig, "autoRestart"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
case domain.DeploymentProviderType1PanelSite:
|
||||
deployer, err := p1PanelSite.NewDeployer(&p1PanelSite.DeployerConfig{
|
||||
ApiUrl: access.ApiUrl,
|
||||
ApiVersion: access.ApiVersion,
|
||||
ApiKey: access.ApiKey,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
ResourceType: p1PanelSite.ResourceType(maputil.GetOrDefaultString(options.ProviderExtendedConfig, "resourceType", string(p1PanelSite.RESOURCE_TYPE_WEBSITE))),
|
||||
WebsiteId: maputil.GetInt64(options.ProviderExtendedConfig, "websiteId"),
|
||||
CertificateId: maputil.GetInt64(options.ProviderExtendedConfig, "certificateId"),
|
||||
ResourceType: p1PanelSite.ResourceType(maputil.GetOrDefaultString(options.ProviderServiceConfig, "resourceType", string(p1PanelSite.RESOURCE_TYPE_WEBSITE))),
|
||||
WebsiteId: maputil.GetInt64(options.ProviderServiceConfig, "websiteId"),
|
||||
CertificateId: maputil.GetInt64(options.ProviderServiceConfig, "certificateId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -135,7 +144,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
}
|
||||
}
|
||||
|
||||
case domain.DeploymentProviderTypeAliyunALB, domain.DeploymentProviderTypeAliyunAPIGW, domain.DeploymentProviderTypeAliyunCAS, domain.DeploymentProviderTypeAliyunCASDeploy, domain.DeploymentProviderTypeAliyunCDN, domain.DeploymentProviderTypeAliyunCLB, domain.DeploymentProviderTypeAliyunDCDN, domain.DeploymentProviderTypeAliyunDDoS, domain.DeploymentProviderTypeAliyunESA, domain.DeploymentProviderTypeAliyunFC, domain.DeploymentProviderTypeAliyunLive, domain.DeploymentProviderTypeAliyunNLB, domain.DeploymentProviderTypeAliyunOSS, domain.DeploymentProviderTypeAliyunVOD, domain.DeploymentProviderTypeAliyunWAF:
|
||||
case domain.DeploymentProviderTypeAliyunALB, domain.DeploymentProviderTypeAliyunAPIGW, domain.DeploymentProviderTypeAliyunCAS, domain.DeploymentProviderTypeAliyunCASDeploy, domain.DeploymentProviderTypeAliyunCDN, domain.DeploymentProviderTypeAliyunCLB, domain.DeploymentProviderTypeAliyunDCDN, domain.DeploymentProviderTypeAliyunDDoS, domain.DeploymentProviderTypeAliyunESA, domain.DeploymentProviderTypeAliyunFC, domain.DeploymentProviderTypeAliyunGA, domain.DeploymentProviderTypeAliyunLive, domain.DeploymentProviderTypeAliyunNLB, domain.DeploymentProviderTypeAliyunOSS, domain.DeploymentProviderTypeAliyunVOD, domain.DeploymentProviderTypeAliyunWAF:
|
||||
{
|
||||
access := domain.AccessConfigForAliyun{}
|
||||
if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil {
|
||||
@@ -147,11 +156,11 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunALB.NewDeployer(&pAliyunALB.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pAliyunALB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderExtendedConfig, "listenerId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pAliyunALB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderServiceConfig, "listenerId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -159,11 +168,11 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunAPIGW.NewDeployer(&pAliyunAPIGW.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ServiceType: pAliyunAPIGW.ServiceType(maputil.GetString(options.ProviderExtendedConfig, "serviceType")),
|
||||
GatewayId: maputil.GetString(options.ProviderExtendedConfig, "gatewayId"),
|
||||
GroupId: maputil.GetString(options.ProviderExtendedConfig, "groupId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ServiceType: pAliyunAPIGW.ServiceType(maputil.GetString(options.ProviderServiceConfig, "serviceType")),
|
||||
GatewayId: maputil.GetString(options.ProviderServiceConfig, "gatewayId"),
|
||||
GroupId: maputil.GetString(options.ProviderServiceConfig, "groupId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -171,7 +180,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunCAS.NewDeployer(&pAliyunCAS.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -179,9 +188,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunCASDeploy.NewDeployer(&pAliyunCASDeploy.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceIds: sliceutil.Filter(strings.Split(maputil.GetString(options.ProviderExtendedConfig, "resourceIds"), ";"), func(s string) bool { return s != "" }),
|
||||
ContactIds: sliceutil.Filter(strings.Split(maputil.GetString(options.ProviderExtendedConfig, "contactIds"), ";"), func(s string) bool { return s != "" }),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceIds: sliceutil.Filter(strings.Split(maputil.GetString(options.ProviderServiceConfig, "resourceIds"), ";"), func(s string) bool { return s != "" }),
|
||||
ContactIds: sliceutil.Filter(strings.Split(maputil.GetString(options.ProviderServiceConfig, "contactIds"), ";"), func(s string) bool { return s != "" }),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -189,7 +198,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunCDN.NewDeployer(&pAliyunCDN.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -197,11 +206,11 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunCLB.NewDeployer(&pAliyunCLB.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pAliyunCLB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerPort: maputil.GetOrDefaultInt32(options.ProviderExtendedConfig, "listenerPort", 443),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pAliyunCLB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerPort: maputil.GetOrDefaultInt32(options.ProviderServiceConfig, "listenerPort", 443),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -209,7 +218,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunDCDN.NewDeployer(&pAliyunDCDN.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -217,8 +226,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunDDoS.NewDeployer(&pAliyunDDoS.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -226,8 +235,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunESA.NewDeployer(&pAliyunESA.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
SiteId: maputil.GetInt64(options.ProviderExtendedConfig, "siteId"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
SiteId: maputil.GetInt64(options.ProviderServiceConfig, "siteId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -235,9 +244,20 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunFC.NewDeployer(&pAliyunFC.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ServiceVersion: maputil.GetOrDefaultString(options.ProviderExtendedConfig, "serviceVersion", "3.0"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ServiceVersion: maputil.GetOrDefaultString(options.ProviderServiceConfig, "serviceVersion", "3.0"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
case domain.DeploymentProviderTypeAliyunGA:
|
||||
deployer, err := pAliyunGA.NewDeployer(&pAliyunGA.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
ResourceType: pAliyunGA.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
AcceleratorId: maputil.GetString(options.ProviderServiceConfig, "acceleratorId"),
|
||||
ListenerId: maputil.GetString(options.ProviderServiceConfig, "listenerId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -245,8 +265,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunLive.NewDeployer(&pAliyunLive.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -254,10 +274,10 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunNLB.NewDeployer(&pAliyunNLB.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pAliyunNLB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderExtendedConfig, "listenerId"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pAliyunNLB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderServiceConfig, "listenerId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -265,9 +285,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunOSS.NewDeployer(&pAliyunOSS.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Bucket: maputil.GetString(options.ProviderExtendedConfig, "bucket"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
Bucket: maputil.GetString(options.ProviderServiceConfig, "bucket"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -275,8 +295,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunVOD.NewDeployer(&pAliyunVOD.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -284,10 +304,10 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAliyunWAF.NewDeployer(&pAliyunWAF.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ServiceVersion: maputil.GetOrDefaultString(options.ProviderExtendedConfig, "serviceVersion", "3.0"),
|
||||
InstanceId: maputil.GetString(options.ProviderExtendedConfig, "instanceId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ServiceVersion: maputil.GetOrDefaultString(options.ProviderServiceConfig, "serviceVersion", "3.0"),
|
||||
InstanceId: maputil.GetString(options.ProviderServiceConfig, "instanceId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -308,8 +328,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAWSACM.NewDeployer(&pAWSACM.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
SecretAccessKey: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
CertificateArn: maputil.GetString(options.ProviderExtendedConfig, "certificateArn"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
CertificateArn: maputil.GetString(options.ProviderServiceConfig, "certificateArn"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -317,8 +337,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pAWSCloudFront.NewDeployer(&pAWSCloudFront.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
SecretAccessKey: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
DistributionId: maputil.GetString(options.ProviderExtendedConfig, "distributionId"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
DistributionId: maputil.GetString(options.ProviderServiceConfig, "distributionId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -341,8 +361,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
ClientId: access.ClientId,
|
||||
ClientSecret: access.ClientSecret,
|
||||
CloudName: access.CloudName,
|
||||
KeyVaultName: maputil.GetString(options.ProviderExtendedConfig, "keyvaultName"),
|
||||
CertificateName: maputil.GetString(options.ProviderExtendedConfig, "certificateName"),
|
||||
KeyVaultName: maputil.GetString(options.ProviderServiceConfig, "keyvaultName"),
|
||||
CertificateName: maputil.GetString(options.ProviderServiceConfig, "certificateName"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -363,11 +383,11 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pBaiduCloudAppBLB.NewDeployer(&pBaiduCloudAppBLB.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
SecretAccessKey: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pBaiduCloudAppBLB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerPort: maputil.GetInt32(options.ProviderExtendedConfig, "listenerPort"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pBaiduCloudAppBLB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerPort: maputil.GetInt32(options.ProviderServiceConfig, "listenerPort"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -375,11 +395,11 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pBaiduCloudBLB.NewDeployer(&pBaiduCloudBLB.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
SecretAccessKey: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pBaiduCloudBLB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerPort: maputil.GetInt32(options.ProviderExtendedConfig, "listenerPort"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pBaiduCloudBLB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerPort: maputil.GetInt32(options.ProviderServiceConfig, "listenerPort"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -387,7 +407,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pBaiduCloudCDN.NewDeployer(&pBaiduCloudCDN.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
SecretAccessKey: access.SecretAccessKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -414,8 +434,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
case domain.DeploymentProviderTypeBaishanCDN:
|
||||
deployer, err := pBaishanCDN.NewDeployer(&pBaishanCDN.DeployerConfig{
|
||||
ApiToken: access.ApiToken,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
CertificateId: maputil.GetString(options.ProviderExtendedConfig, "certificateId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
CertificateId: maputil.GetString(options.ProviderServiceConfig, "certificateId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -437,7 +457,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
ApiUrl: access.ApiUrl,
|
||||
ApiKey: access.ApiKey,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
AutoRestart: maputil.GetBool(options.ProviderExtendedConfig, "autoRestart"),
|
||||
AutoRestart: maputil.GetBool(options.ProviderServiceConfig, "autoRestart"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -446,9 +466,40 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
ApiUrl: access.ApiUrl,
|
||||
ApiKey: access.ApiKey,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
SiteType: maputil.GetOrDefaultString(options.ProviderExtendedConfig, "siteType", "other"),
|
||||
SiteName: maputil.GetString(options.ProviderExtendedConfig, "siteName"),
|
||||
SiteNames: sliceutil.Filter(strings.Split(maputil.GetString(options.ProviderExtendedConfig, "siteNames"), ";"), func(s string) bool { return s != "" }),
|
||||
SiteType: maputil.GetOrDefaultString(options.ProviderServiceConfig, "siteType", "other"),
|
||||
SiteName: maputil.GetString(options.ProviderServiceConfig, "siteName"),
|
||||
SiteNames: sliceutil.Filter(strings.Split(maputil.GetString(options.ProviderServiceConfig, "siteNames"), ";"), func(s string) bool { return s != "" }),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
case domain.DeploymentProviderTypeBaotaWAFConsole, domain.DeploymentProviderTypeBaotaWAFSite:
|
||||
{
|
||||
access := domain.AccessConfigForBaotaWAF{}
|
||||
if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil {
|
||||
return nil, fmt.Errorf("failed to populate provider access config: %w", err)
|
||||
}
|
||||
|
||||
switch options.Provider {
|
||||
case domain.DeploymentProviderTypeBaotaWAFConsole:
|
||||
deployer, err := pBaotaWAFConsole.NewDeployer(&pBaotaWAFConsole.DeployerConfig{
|
||||
ApiUrl: access.ApiUrl,
|
||||
ApiKey: access.ApiKey,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
case domain.DeploymentProviderTypeBaotaWAFSite:
|
||||
deployer, err := pBaotaWAFSite.NewDeployer(&pBaotaWAFSite.DeployerConfig{
|
||||
ApiUrl: access.ApiUrl,
|
||||
ApiKey: access.ApiKey,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
SiteName: maputil.GetString(options.ProviderServiceConfig, "siteName"),
|
||||
SitePort: maputil.GetOrDefaultInt32(options.ProviderServiceConfig, "sitePort", 443),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -466,8 +517,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
|
||||
deployer, err := pBunnyCDN.NewDeployer(&pBunnyCDN.DeployerConfig{
|
||||
ApiKey: access.ApiKey,
|
||||
PullZoneId: maputil.GetString(options.ProviderExtendedConfig, "pullZoneId"),
|
||||
Hostname: maputil.GetString(options.ProviderExtendedConfig, "hostname"),
|
||||
PullZoneId: maputil.GetString(options.ProviderServiceConfig, "pullZoneId"),
|
||||
Hostname: maputil.GetString(options.ProviderServiceConfig, "hostname"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -484,7 +535,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pBytePlusCDN.NewDeployer(&pBytePlusCDN.DeployerConfig{
|
||||
AccessKey: access.AccessKey,
|
||||
SecretKey: access.SecretKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -518,9 +569,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
ApiKey: access.ApiKey,
|
||||
ApiSecret: access.ApiSecret,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
ResourceType: pCdnfly.ResourceType(maputil.GetOrDefaultString(options.ProviderExtendedConfig, "resourceType", string(pCdnfly.RESOURCE_TYPE_SITE))),
|
||||
SiteId: maputil.GetString(options.ProviderExtendedConfig, "siteId"),
|
||||
CertificateId: maputil.GetString(options.ProviderExtendedConfig, "certificateId"),
|
||||
ResourceType: pCdnfly.ResourceType(maputil.GetOrDefaultString(options.ProviderServiceConfig, "resourceType", string(pCdnfly.RESOURCE_TYPE_SITE))),
|
||||
SiteId: maputil.GetString(options.ProviderServiceConfig, "siteId"),
|
||||
CertificateId: maputil.GetString(options.ProviderServiceConfig, "certificateId"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -535,7 +586,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pDogeCDN.NewDeployer(&pDogeCDN.DeployerConfig{
|
||||
AccessKey: access.AccessKey,
|
||||
SecretKey: access.SecretKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -550,7 +601,26 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pEdgioApplications.NewDeployer(&pEdgioApplications.DeployerConfig{
|
||||
ClientId: access.ClientId,
|
||||
ClientSecret: access.ClientSecret,
|
||||
EnvironmentId: maputil.GetString(options.ProviderExtendedConfig, "environmentId"),
|
||||
EnvironmentId: maputil.GetString(options.ProviderServiceConfig, "environmentId"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
|
||||
case domain.DeploymentProviderTypeFlexCDN:
|
||||
{
|
||||
access := domain.AccessConfigForFlexCDN{}
|
||||
if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil {
|
||||
return nil, fmt.Errorf("failed to populate provider access config: %w", err)
|
||||
}
|
||||
|
||||
deployer, err := pFlexCDN.NewDeployer(&pFlexCDN.DeployerConfig{
|
||||
ApiUrl: access.ApiUrl,
|
||||
ApiRole: access.ApiRole,
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKey: access.AccessKey,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
ResourceType: pFlexCDN.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
CertificateId: maputil.GetInt64(options.ProviderServiceConfig, "certificateId"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -566,8 +636,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
case domain.DeploymentProviderTypeGcoreCDN:
|
||||
deployer, err := pGcoreCDN.NewDeployer(&pGcoreCDN.DeployerConfig{
|
||||
ApiToken: access.ApiToken,
|
||||
ResourceId: maputil.GetInt64(options.ProviderExtendedConfig, "resourceId"),
|
||||
CertificateId: maputil.GetInt64(options.ProviderExtendedConfig, "certificateId"),
|
||||
ResourceId: maputil.GetInt64(options.ProviderServiceConfig, "resourceId"),
|
||||
CertificateId: maputil.GetInt64(options.ProviderServiceConfig, "certificateId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -589,8 +659,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKey: access.AccessKey,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
ResourceType: pGoEdge.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
CertificateId: maputil.GetInt64(options.ProviderExtendedConfig, "certificateId"),
|
||||
ResourceType: pGoEdge.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
CertificateId: maputil.GetInt64(options.ProviderServiceConfig, "certificateId"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -607,8 +677,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pHuaweiCloudCDN.NewDeployer(&pHuaweiCloudCDN.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
SecretAccessKey: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -616,11 +686,11 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pHuaweiCloudELB.NewDeployer(&pHuaweiCloudELB.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
SecretAccessKey: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pHuaweiCloudELB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
CertificateId: maputil.GetString(options.ProviderExtendedConfig, "certificateId"),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderExtendedConfig, "listenerId"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pHuaweiCloudELB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
CertificateId: maputil.GetString(options.ProviderServiceConfig, "certificateId"),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderServiceConfig, "listenerId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -635,10 +705,10 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pHuaweiCloudWAF.NewDeployer(&pHuaweiCloudWAF.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
SecretAccessKey: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pHuaweiCloudWAF.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
CertificateId: maputil.GetString(options.ProviderExtendedConfig, "certificateId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pHuaweiCloudWAF.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
CertificateId: maputil.GetString(options.ProviderServiceConfig, "certificateId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -659,10 +729,10 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pJDCloudALB.NewDeployer(&pJDCloudALB.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
RegionId: maputil.GetString(options.ProviderExtendedConfig, "regionId"),
|
||||
ResourceType: pJDCloudALB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderExtendedConfig, "listenerId"),
|
||||
RegionId: maputil.GetString(options.ProviderServiceConfig, "regionId"),
|
||||
ResourceType: pJDCloudALB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderServiceConfig, "listenerId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -670,7 +740,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pJDCloudCDN.NewDeployer(&pJDCloudCDN.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -678,7 +748,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pJDCloudLive.NewDeployer(&pJDCloudLive.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -686,7 +756,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pJDCloudVOD.NewDeployer(&pJDCloudVOD.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -695,21 +765,42 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
}
|
||||
}
|
||||
|
||||
case domain.DeploymentProviderTypeLeCDN:
|
||||
{
|
||||
access := domain.AccessConfigForLeCDN{}
|
||||
if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil {
|
||||
return nil, fmt.Errorf("failed to populate provider access config: %w", err)
|
||||
}
|
||||
|
||||
deployer, err := pLeCDN.NewDeployer(&pLeCDN.DeployerConfig{
|
||||
ApiUrl: access.ApiUrl,
|
||||
ApiVersion: access.ApiVersion,
|
||||
ApiRole: access.ApiRole,
|
||||
Username: access.Username,
|
||||
Password: access.Password,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
ResourceType: pLeCDN.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
CertificateId: maputil.GetInt64(options.ProviderServiceConfig, "certificateId"),
|
||||
ClientId: maputil.GetInt64(options.ProviderServiceConfig, "clientId"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
|
||||
case domain.DeploymentProviderTypeLocal:
|
||||
{
|
||||
deployer, err := pLocal.NewDeployer(&pLocal.DeployerConfig{
|
||||
ShellEnv: pLocal.ShellEnvType(maputil.GetString(options.ProviderExtendedConfig, "shellEnv")),
|
||||
PreCommand: maputil.GetString(options.ProviderExtendedConfig, "preCommand"),
|
||||
PostCommand: maputil.GetString(options.ProviderExtendedConfig, "postCommand"),
|
||||
OutputFormat: pLocal.OutputFormatType(maputil.GetOrDefaultString(options.ProviderExtendedConfig, "format", string(pLocal.OUTPUT_FORMAT_PEM))),
|
||||
OutputCertPath: maputil.GetString(options.ProviderExtendedConfig, "certPath"),
|
||||
OutputServerCertPath: maputil.GetString(options.ProviderExtendedConfig, "certPathForServerOnly"),
|
||||
OutputIntermediaCertPath: maputil.GetString(options.ProviderExtendedConfig, "certPathForIntermediaOnly"),
|
||||
OutputKeyPath: maputil.GetString(options.ProviderExtendedConfig, "keyPath"),
|
||||
PfxPassword: maputil.GetString(options.ProviderExtendedConfig, "pfxPassword"),
|
||||
JksAlias: maputil.GetString(options.ProviderExtendedConfig, "jksAlias"),
|
||||
JksKeypass: maputil.GetString(options.ProviderExtendedConfig, "jksKeypass"),
|
||||
JksStorepass: maputil.GetString(options.ProviderExtendedConfig, "jksStorepass"),
|
||||
ShellEnv: pLocal.ShellEnvType(maputil.GetString(options.ProviderServiceConfig, "shellEnv")),
|
||||
PreCommand: maputil.GetString(options.ProviderServiceConfig, "preCommand"),
|
||||
PostCommand: maputil.GetString(options.ProviderServiceConfig, "postCommand"),
|
||||
OutputFormat: pLocal.OutputFormatType(maputil.GetOrDefaultString(options.ProviderServiceConfig, "format", string(pLocal.OUTPUT_FORMAT_PEM))),
|
||||
OutputCertPath: maputil.GetString(options.ProviderServiceConfig, "certPath"),
|
||||
OutputServerCertPath: maputil.GetString(options.ProviderServiceConfig, "certPathForServerOnly"),
|
||||
OutputIntermediaCertPath: maputil.GetString(options.ProviderServiceConfig, "certPathForIntermediaOnly"),
|
||||
OutputKeyPath: maputil.GetString(options.ProviderServiceConfig, "keyPath"),
|
||||
PfxPassword: maputil.GetString(options.ProviderServiceConfig, "pfxPassword"),
|
||||
JksAlias: maputil.GetString(options.ProviderServiceConfig, "jksAlias"),
|
||||
JksKeypass: maputil.GetString(options.ProviderServiceConfig, "jksKeypass"),
|
||||
JksStorepass: maputil.GetString(options.ProviderServiceConfig, "jksStorepass"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -723,11 +814,11 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
|
||||
deployer, err := pK8sSecret.NewDeployer(&pK8sSecret.DeployerConfig{
|
||||
KubeConfig: access.KubeConfig,
|
||||
Namespace: maputil.GetOrDefaultString(options.ProviderExtendedConfig, "namespace", "default"),
|
||||
SecretName: maputil.GetString(options.ProviderExtendedConfig, "secretName"),
|
||||
SecretType: maputil.GetOrDefaultString(options.ProviderExtendedConfig, "secretType", "kubernetes.io/tls"),
|
||||
SecretDataKeyForCrt: maputil.GetOrDefaultString(options.ProviderExtendedConfig, "secretDataKeyForCrt", "tls.crt"),
|
||||
SecretDataKeyForKey: maputil.GetOrDefaultString(options.ProviderExtendedConfig, "secretDataKeyForKey", "tls.key"),
|
||||
Namespace: maputil.GetOrDefaultString(options.ProviderServiceConfig, "namespace", "default"),
|
||||
SecretName: maputil.GetString(options.ProviderServiceConfig, "secretName"),
|
||||
SecretType: maputil.GetOrDefaultString(options.ProviderServiceConfig, "secretType", "kubernetes.io/tls"),
|
||||
SecretDataKeyForCrt: maputil.GetOrDefaultString(options.ProviderServiceConfig, "secretDataKeyForCrt", "tls.crt"),
|
||||
SecretDataKeyForKey: maputil.GetOrDefaultString(options.ProviderServiceConfig, "secretDataKeyForKey", "tls.key"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -741,7 +832,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
|
||||
deployer, err := pNetlifySite.NewDeployer(&pNetlifySite.DeployerConfig{
|
||||
ApiToken: access.ApiToken,
|
||||
SiteId: maputil.GetString(options.ProviderExtendedConfig, "siteId"),
|
||||
SiteId: maputil.GetString(options.ProviderServiceConfig, "siteId"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -758,8 +849,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
ApiToken: access.ApiToken,
|
||||
ApiTokenSecret: access.ApiTokenSecret,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
NodeName: maputil.GetString(options.ProviderExtendedConfig, "nodeName"),
|
||||
AutoRestart: maputil.GetBool(options.ProviderExtendedConfig, "autoRestart"),
|
||||
NodeName: maputil.GetString(options.ProviderServiceConfig, "nodeName"),
|
||||
AutoRestart: maputil.GetBool(options.ProviderServiceConfig, "autoRestart"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -776,7 +867,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pQiniuCDN.NewDeployer(&pQiniuCDN.DeployerConfig{
|
||||
AccessKey: access.AccessKey,
|
||||
SecretKey: access.SecretKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -784,8 +875,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pQiniuPili.NewDeployer(&pQiniuPili.DeployerConfig{
|
||||
AccessKey: access.AccessKey,
|
||||
SecretKey: access.SecretKey,
|
||||
Hub: maputil.GetString(options.ProviderExtendedConfig, "hub"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Hub: maputil.GetString(options.ProviderServiceConfig, "hub"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -805,8 +896,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
case domain.DeploymentProviderTypeTencentCloudCDN:
|
||||
deployer, err := pRainYunRCDN.NewDeployer(&pRainYunRCDN.DeployerConfig{
|
||||
ApiKey: access.ApiKey,
|
||||
InstanceId: maputil.GetInt32(options.ProviderExtendedConfig, "instanceId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
InstanceId: maputil.GetInt32(options.ProviderServiceConfig, "instanceId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -838,7 +929,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
AccessTokenId: access.AccessTokenId,
|
||||
AccessToken: access.AccessToken,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
SiteName: maputil.GetString(options.ProviderExtendedConfig, "siteName"),
|
||||
SiteName: maputil.GetString(options.ProviderServiceConfig, "siteName"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -858,8 +949,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
ApiUrl: access.ApiUrl,
|
||||
ApiToken: access.ApiToken,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
ResourceType: pSafeLine.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
CertificateId: maputil.GetInt32(options.ProviderExtendedConfig, "certificateId"),
|
||||
ResourceType: pSafeLine.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
CertificateId: maputil.GetInt32(options.ProviderServiceConfig, "certificateId"),
|
||||
})
|
||||
return deployer, err
|
||||
}
|
||||
@@ -871,9 +962,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
return nil, fmt.Errorf("failed to populate provider access config: %w", err)
|
||||
}
|
||||
|
||||
jumpServerConfig := make([]pSSH.JumpServerConfig, len(access.JumpServerConfig))
|
||||
jumpServers := make([]pSSH.JumpServerConfig, len(access.JumpServerConfig))
|
||||
for i, jumpServer := range access.JumpServerConfig {
|
||||
jumpServerConfig[i] = pSSH.JumpServerConfig{
|
||||
jumpServers[i] = pSSH.JumpServerConfig{
|
||||
SshHost: jumpServer.Host,
|
||||
SshPort: jumpServer.Port,
|
||||
SshUsername: jumpServer.Username,
|
||||
@@ -890,7 +981,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
SshPassword: access.Password,
|
||||
SshKey: access.Key,
|
||||
SshKeyPassphrase: access.KeyPassphrase,
|
||||
JumpServerConfig: jumpServerConfig,
|
||||
JumpServerConfig: jumpServers,
|
||||
UseSCP: maputil.GetBool(options.ProviderExtendedConfig, "useSCP"),
|
||||
PreCommand: maputil.GetString(options.ProviderExtendedConfig, "preCommand"),
|
||||
PostCommand: maputil.GetString(options.ProviderExtendedConfig, "postCommand"),
|
||||
@@ -919,7 +1010,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudCDN.NewDeployer(&pTencentCloudCDN.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -927,11 +1018,11 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudCLB.NewDeployer(&pTencentCloudCLB.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pTencentCloudCLB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderExtendedConfig, "listenerId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pTencentCloudCLB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderServiceConfig, "listenerId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -939,9 +1030,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudCOS.NewDeployer(&pTencentCloudCOS.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Bucket: maputil.GetString(options.ProviderExtendedConfig, "bucket"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
Bucket: maputil.GetString(options.ProviderServiceConfig, "bucket"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -949,7 +1040,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudCSS.NewDeployer(&pTencentCloudCSS.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -957,7 +1048,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudECDN.NewDeployer(&pTencentCloudECDN.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -965,8 +1056,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudEO.NewDeployer(&pTencentCloudEO.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
ZoneId: maputil.GetString(options.ProviderExtendedConfig, "zoneId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
ZoneId: maputil.GetString(options.ProviderServiceConfig, "zoneId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -974,8 +1065,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudSCF.NewDeployer(&pTencentCloudSCF.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -990,9 +1081,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudSSLDeploy.NewDeployer(&pTencentCloudSSLDeploy.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: maputil.GetString(options.ProviderExtendedConfig, "resourceType"),
|
||||
ResourceIds: sliceutil.Filter(strings.Split(maputil.GetString(options.ProviderExtendedConfig, "resourceIds"), ";"), func(s string) bool { return s != "" }),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: maputil.GetString(options.ProviderServiceConfig, "resourceType"),
|
||||
ResourceIds: sliceutil.Filter(strings.Split(maputil.GetString(options.ProviderServiceConfig, "resourceIds"), ";"), func(s string) bool { return s != "" }),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1000,8 +1091,8 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudVOD.NewDeployer(&pTencentCloudVOD.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
SubAppId: maputil.GetInt64(options.ProviderExtendedConfig, "subAppId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
SubAppId: maputil.GetInt64(options.ProviderServiceConfig, "subAppId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1009,9 +1100,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pTencentCloudWAF.NewDeployer(&pTencentCloudWAF.DeployerConfig{
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
DomainId: maputil.GetString(options.ProviderExtendedConfig, "domainId"),
|
||||
InstanceId: maputil.GetString(options.ProviderExtendedConfig, "instanceId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
DomainId: maputil.GetString(options.ProviderServiceConfig, "domainId"),
|
||||
InstanceId: maputil.GetString(options.ProviderServiceConfig, "instanceId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1033,7 +1124,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
PrivateKey: access.PrivateKey,
|
||||
PublicKey: access.PublicKey,
|
||||
ProjectId: access.ProjectId,
|
||||
DomainId: maputil.GetString(options.ProviderExtendedConfig, "domainId"),
|
||||
DomainId: maputil.GetString(options.ProviderServiceConfig, "domainId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1042,9 +1133,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
PrivateKey: access.PrivateKey,
|
||||
PublicKey: access.PublicKey,
|
||||
ProjectId: access.ProjectId,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Bucket: maputil.GetString(options.ProviderExtendedConfig, "bucket"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
Bucket: maputil.GetString(options.ProviderServiceConfig, "bucket"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1065,7 +1156,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pUpyunCDN.NewDeployer(&pUpyunCDN.DeployerConfig{
|
||||
Username: access.Username,
|
||||
Password: access.Password,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1086,11 +1177,11 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pVolcEngineALB.NewDeployer(&pVolcEngineALB.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pVolcEngineALB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderExtendedConfig, "listenerId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pVolcEngineALB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderServiceConfig, "listenerId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1098,7 +1189,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pVolcEngineCDN.NewDeployer(&pVolcEngineCDN.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.SecretAccessKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1106,7 +1197,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pVolcEngineCertCenter.NewDeployer(&pVolcEngineCertCenter.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1114,10 +1205,10 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pVolcEngineCLB.NewDeployer(&pVolcEngineCLB.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ResourceType: pVolcEngineCLB.ResourceType(maputil.GetString(options.ProviderExtendedConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderExtendedConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderExtendedConfig, "listenerId"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ResourceType: pVolcEngineCLB.ResourceType(maputil.GetString(options.ProviderServiceConfig, "resourceType")),
|
||||
LoadbalancerId: maputil.GetString(options.ProviderServiceConfig, "loadbalancerId"),
|
||||
ListenerId: maputil.GetString(options.ProviderServiceConfig, "listenerId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1125,7 +1216,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pVolcEngineDCDN.NewDeployer(&pVolcEngineDCDN.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.SecretAccessKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1133,9 +1224,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pVolcEngineImageX.NewDeployer(&pVolcEngineImageX.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
ServiceId: maputil.GetString(options.ProviderExtendedConfig, "serviceId"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
ServiceId: maputil.GetString(options.ProviderServiceConfig, "serviceId"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1143,7 +1234,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pVolcEngineLive.NewDeployer(&pVolcEngineLive.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.SecretAccessKey,
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1151,9 +1242,9 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
deployer, err := pVolcEngineTOS.NewDeployer(&pVolcEngineTOS.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.SecretAccessKey,
|
||||
Region: maputil.GetString(options.ProviderExtendedConfig, "region"),
|
||||
Bucket: maputil.GetString(options.ProviderExtendedConfig, "bucket"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
Region: maputil.GetString(options.ProviderServiceConfig, "region"),
|
||||
Bucket: maputil.GetString(options.ProviderServiceConfig, "bucket"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1162,7 +1253,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
}
|
||||
}
|
||||
|
||||
case domain.DeploymentProviderTypeWangsuCDNPro:
|
||||
case domain.DeploymentProviderTypeWangsuCDN, domain.DeploymentProviderTypeWangsuCDNPro, domain.DeploymentProviderTypeWangsuCertificate:
|
||||
{
|
||||
access := domain.AccessConfigForWangsu{}
|
||||
if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil {
|
||||
@@ -1170,15 +1261,31 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
}
|
||||
|
||||
switch options.Provider {
|
||||
case domain.DeploymentProviderTypeWangsuCDN:
|
||||
deployer, err := pWangsuCDN.NewDeployer(&pWangsuCDN.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
Domains: sliceutil.Filter(strings.Split(maputil.GetString(options.ProviderServiceConfig, "domains"), ";"), func(s string) bool { return s != "" }),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
case domain.DeploymentProviderTypeWangsuCDNPro:
|
||||
deployer, err := pWangsuCDNPro.NewDeployer(&pWangsuCDNPro.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
ApiKey: access.ApiKey,
|
||||
Environment: maputil.GetOrDefaultString(options.ProviderExtendedConfig, "environment", "production"),
|
||||
Domain: maputil.GetString(options.ProviderExtendedConfig, "domain"),
|
||||
CertificateId: maputil.GetString(options.ProviderExtendedConfig, "certificateId"),
|
||||
WebhookId: maputil.GetString(options.ProviderExtendedConfig, "webhookId"),
|
||||
Environment: maputil.GetOrDefaultString(options.ProviderServiceConfig, "environment", "production"),
|
||||
Domain: maputil.GetString(options.ProviderServiceConfig, "domain"),
|
||||
CertificateId: maputil.GetString(options.ProviderServiceConfig, "certificateId"),
|
||||
WebhookId: maputil.GetString(options.ProviderServiceConfig, "webhookId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
case domain.DeploymentProviderTypeWangsuCertificate:
|
||||
deployer, err := pWangsuCertificate.NewDeployer(&pWangsuCertificate.DeployerConfig{
|
||||
AccessKeyId: access.AccessKeyId,
|
||||
AccessKeySecret: access.AccessKeySecret,
|
||||
CertificateId: maputil.GetString(options.ProviderServiceConfig, "certificateId"),
|
||||
})
|
||||
return deployer, err
|
||||
|
||||
@@ -1204,7 +1311,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
mergedHeaders[http.CanonicalHeaderKey(key)] = h.Get(key)
|
||||
}
|
||||
}
|
||||
if extendedHeadersString := maputil.GetString(options.ProviderExtendedConfig, "headers"); extendedHeadersString != "" {
|
||||
if extendedHeadersString := maputil.GetString(options.ProviderServiceConfig, "headers"); extendedHeadersString != "" {
|
||||
h, err := httputil.ParseHeaders(extendedHeadersString)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to parse webhook headers: %w", err)
|
||||
@@ -1216,7 +1323,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
|
||||
|
||||
deployer, err := pWebhook.NewDeployer(&pWebhook.DeployerConfig{
|
||||
WebhookUrl: access.Url,
|
||||
WebhookData: maputil.GetOrDefaultString(options.ProviderExtendedConfig, "webhookData", access.DefaultDataForDeployment),
|
||||
WebhookData: maputil.GetOrDefaultString(options.ProviderServiceConfig, "webhookData", access.DefaultDataForDeployment),
|
||||
Method: access.Method,
|
||||
Headers: mergedHeaders,
|
||||
AllowInsecureConnections: access.AllowInsecureConnections,
|
||||
|
||||
Reference in New Issue
Block a user