From a8a9aaff11c15336d89ad231d473aee41918b495 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 4 Jun 2026 01:08:21 +0800 Subject: [PATCH] feat: update access fields to `AccessKeyId` and `SecretAccessKey` for volcengine services --- .../{sp_volcengine_dns.go => sp_volcengine.go} | 0 internal/certmgmt/deployers/sp_volcengine_alb.go | 2 +- internal/certmgmt/deployers/sp_volcengine_apig.go | 2 +- internal/certmgmt/deployers/sp_volcengine_cdn.go | 2 +- .../certmgmt/deployers/sp_volcengine_certcenter.go | 2 +- internal/certmgmt/deployers/sp_volcengine_clb.go | 2 +- internal/certmgmt/deployers/sp_volcengine_dcdn.go | 2 +- internal/certmgmt/deployers/sp_volcengine_imagex.go | 2 +- internal/certmgmt/deployers/sp_volcengine_live.go | 2 +- internal/certmgmt/deployers/sp_volcengine_tos.go | 2 +- internal/certmgmt/deployers/sp_volcengine_vod.go | 2 +- internal/certmgmt/deployers/sp_volcengine_waf.go | 2 +- migrations/1780408800_upgrade_v0.4.25.go | 7 +++++++ .../providers/volcengine-cdn/volcengine_cdn.go | 6 +++--- .../providers/volcengine-cdn/volcengine_cdn_test.go | 8 ++++---- .../volcengine-certcenter/volcengine_certcenter.go | 10 +++++----- .../volcengine_certcenter_test.go | 8 ++++---- .../providers/volcengine-live/volcengine_live.go | 6 +++--- .../volcengine-live/volcengine_live_test.go | 8 ++++---- .../providers/volcengine-alb/volcengine_alb.go | 12 ++++++------ .../providers/volcengine-alb/volcengine_alb_test.go | 8 ++++---- .../providers/volcengine-apig/volcengine_apig.go | 12 ++++++------ .../volcengine-apig/volcengine_apig_test.go | 8 ++++---- .../providers/volcengine-cdn/volcengine_cdn.go | 12 ++++++------ .../providers/volcengine-cdn/volcengine_cdn_test.go | 8 ++++---- .../volcengine-certcenter/volcengine_certcenter.go | 6 +++--- .../providers/volcengine-clb/volcengine_clb.go | 12 ++++++------ .../providers/volcengine-clb/volcengine_clb_test.go | 8 ++++---- .../providers/volcengine-dcdn/volcengine_dcdn.go | 12 ++++++------ .../volcengine-dcdn/volcengine_dcdn_test.go | 8 ++++---- .../providers/volcengine-imagex/volcengine_imagex.go | 12 ++++++------ .../volcengine-imagex/volcengine_imagex_test.go | 8 ++++---- .../providers/volcengine-live/volcengine_live.go | 8 ++++---- .../volcengine-live/volcengine_live_test.go | 8 ++++---- .../providers/volcengine-tos/volcengine_tos.go | 12 ++++++------ .../providers/volcengine-tos/volcengine_tos_test.go | 8 ++++---- .../providers/volcengine-vod/volcengine_vod.go | 8 ++++---- .../providers/volcengine-vod/volcengine_vod_test.go | 8 ++++---- .../providers/volcengine-waf/volcengine_waf.go | 12 ++++++------ .../providers/volcengine-waf/volcengine_waf_test.go | 8 ++++---- 40 files changed, 140 insertions(+), 133 deletions(-) rename internal/certacme/certifiers/{sp_volcengine_dns.go => sp_volcengine.go} (100%) diff --git a/internal/certacme/certifiers/sp_volcengine_dns.go b/internal/certacme/certifiers/sp_volcengine.go similarity index 100% rename from internal/certacme/certifiers/sp_volcengine_dns.go rename to internal/certacme/certifiers/sp_volcengine.go diff --git a/internal/certmgmt/deployers/sp_volcengine_alb.go b/internal/certmgmt/deployers/sp_volcengine_alb.go index ff18c346f..91a69fdcd 100644 --- a/internal/certmgmt/deployers/sp_volcengine_alb.go +++ b/internal/certmgmt/deployers/sp_volcengine_alb.go @@ -18,7 +18,7 @@ func init() { provider, err := volcenginealb.NewDeployer(&volcenginealb.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), diff --git a/internal/certmgmt/deployers/sp_volcengine_apig.go b/internal/certmgmt/deployers/sp_volcengine_apig.go index 80f463d76..551227414 100644 --- a/internal/certmgmt/deployers/sp_volcengine_apig.go +++ b/internal/certmgmt/deployers/sp_volcengine_apig.go @@ -18,7 +18,7 @@ func init() { provider, err := volcengineapig.NewDeployer(&volcengineapig.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_volcengine_cdn.go b/internal/certmgmt/deployers/sp_volcengine_cdn.go index 6afd4a6a2..d1ace169a 100644 --- a/internal/certmgmt/deployers/sp_volcengine_cdn.go +++ b/internal/certmgmt/deployers/sp_volcengine_cdn.go @@ -18,7 +18,7 @@ func init() { provider, err := volcenginecdn.NewDeployer(&volcenginecdn.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_volcengine_certcenter.go b/internal/certmgmt/deployers/sp_volcengine_certcenter.go index 507f5e76a..0ded6004d 100644 --- a/internal/certmgmt/deployers/sp_volcengine_certcenter.go +++ b/internal/certmgmt/deployers/sp_volcengine_certcenter.go @@ -18,7 +18,7 @@ func init() { provider, err := volcenginecertcenter.NewDeployer(&volcenginecertcenter.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), }) diff --git a/internal/certmgmt/deployers/sp_volcengine_clb.go b/internal/certmgmt/deployers/sp_volcengine_clb.go index 862045e87..9ec0ab54b 100644 --- a/internal/certmgmt/deployers/sp_volcengine_clb.go +++ b/internal/certmgmt/deployers/sp_volcengine_clb.go @@ -18,7 +18,7 @@ func init() { provider, err := volcengineclb.NewDeployer(&volcengineclb.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), diff --git a/internal/certmgmt/deployers/sp_volcengine_dcdn.go b/internal/certmgmt/deployers/sp_volcengine_dcdn.go index 9216ac1de..d850bd6e1 100644 --- a/internal/certmgmt/deployers/sp_volcengine_dcdn.go +++ b/internal/certmgmt/deployers/sp_volcengine_dcdn.go @@ -18,7 +18,7 @@ func init() { provider, err := volcenginedcdn.NewDeployer(&volcenginedcdn.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_volcengine_imagex.go b/internal/certmgmt/deployers/sp_volcengine_imagex.go index 43bf3dab1..6f31b0add 100644 --- a/internal/certmgmt/deployers/sp_volcengine_imagex.go +++ b/internal/certmgmt/deployers/sp_volcengine_imagex.go @@ -18,7 +18,7 @@ func init() { provider, err := volcengineimagex.NewDeployer(&volcengineimagex.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), ServiceId: xmaps.GetString(options.ProviderExtendedConfig, "serviceId"), diff --git a/internal/certmgmt/deployers/sp_volcengine_live.go b/internal/certmgmt/deployers/sp_volcengine_live.go index 252b0001b..7d943d5f8 100644 --- a/internal/certmgmt/deployers/sp_volcengine_live.go +++ b/internal/certmgmt/deployers/sp_volcengine_live.go @@ -18,7 +18,7 @@ func init() { provider, err := volcenginelive.NewDeployer(&volcenginelive.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_volcengine_tos.go b/internal/certmgmt/deployers/sp_volcengine_tos.go index 916acd4f6..c29fecf53 100644 --- a/internal/certmgmt/deployers/sp_volcengine_tos.go +++ b/internal/certmgmt/deployers/sp_volcengine_tos.go @@ -18,7 +18,7 @@ func init() { provider, err := volcenginetos.NewDeployer(&volcenginetos.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), diff --git a/internal/certmgmt/deployers/sp_volcengine_vod.go b/internal/certmgmt/deployers/sp_volcengine_vod.go index b28c9f046..f1f3b74ba 100644 --- a/internal/certmgmt/deployers/sp_volcengine_vod.go +++ b/internal/certmgmt/deployers/sp_volcengine_vod.go @@ -18,7 +18,7 @@ func init() { provider, err := volcenginevod.NewDeployer(&volcenginevod.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, SpaceName: xmaps.GetString(options.ProviderExtendedConfig, "spaceName"), DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_volcengine_waf.go b/internal/certmgmt/deployers/sp_volcengine_waf.go index b5685f575..35ec3aa52 100644 --- a/internal/certmgmt/deployers/sp_volcengine_waf.go +++ b/internal/certmgmt/deployers/sp_volcengine_waf.go @@ -18,7 +18,7 @@ func init() { provider, err := volcenginewaf.NewDeployer(&volcenginewaf.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, - AccessKeySecret: credentials.SecretAccessKey, + SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), AccessMode: xmaps.GetString(options.ProviderExtendedConfig, "accessMode"), diff --git a/migrations/1780408800_upgrade_v0.4.25.go b/migrations/1780408800_upgrade_v0.4.25.go index 2187bd555..34606691a 100644 --- a/migrations/1780408800_upgrade_v0.4.25.go +++ b/migrations/1780408800_upgrade_v0.4.25.go @@ -46,6 +46,13 @@ func init() { record.Set("config", config) changed = true } + case "volcengine": + if _, ok := config["accessKeySecret"]; ok { + config["secretAccessKey"] = config["accessKeySecret"] + delete(config, "accessKeySecret") + record.Set("config", config) + changed = true + } } if changed { diff --git a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go index c794a6aa8..e309340c9 100644 --- a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go +++ b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go @@ -21,8 +21,8 @@ import ( type CertmgrConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` } @@ -40,7 +40,7 @@ func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { return nil, fmt.Errorf("the configuration of the certmgr provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } diff --git a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go index 1aa1fc7eb..ecd31b028 100644 --- a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go +++ b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go @@ -12,14 +12,14 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string ) func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") } /* @@ -29,7 +29,7 @@ Shell command to run this test: --VOLCENGINECDN_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINECDN_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINECDN_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINECDN_ACCESSKEYSECRET="your-access-key-secret" + --VOLCENGINECDN_SECRETACCESSKEY="your-secret-access-key" */ func TestProvider(t *testing.T) { fp.Parse() @@ -37,7 +37,7 @@ func TestProvider(t *testing.T) { t.Run("Upload", func(t *testing.T) { provider, err := impl.NewCertmgr(&impl.CertmgrConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, }) if err != nil { t.Errorf("err: %+v", err) diff --git a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go index a3b0133dc..b89daef8a 100644 --- a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go @@ -16,8 +16,8 @@ import ( type CertmgrConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 火山引擎地域。 @@ -37,7 +37,7 @@ func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { return nil, fmt.Errorf("the configuration of the certmgr provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret, config.Region) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } @@ -95,13 +95,13 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, certmgr.ErrUnsupported } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*vecertificateservice.CERTIFICATESERVICE, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*vecertificateservice.CERTIFICATESERVICE, error) { if region == "" { region = "cn-beijing" // 证书中心默认区域：北京 } config := ve.NewConfig(). - WithAkSk(accessKeyId, accessKeySecret). + WithAkSk(accessKeyId, secretAccessKey). WithRegion(region) session, err := vesession.NewSession(config) diff --git a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter_test.go b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter_test.go index e881f11a5..79cd32b8a 100644 --- a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter_test.go +++ b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter_test.go @@ -12,14 +12,14 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string ) func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") } /* @@ -29,7 +29,7 @@ Shell command to run this test: --VOLCENGINECERTCENTER_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINECERTCENTER_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINECERTCENTER_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINECERTCENTER_ACCESSKEYSECRET="your-access-key-secret" + --VOLCENGINECERTCENTER_SECRETACCESSKEY="your-secret-access-key" */ func TestProvider(t *testing.T) { fp.Parse() @@ -37,7 +37,7 @@ func TestProvider(t *testing.T) { t.Run("Upload", func(t *testing.T) { provider, err := impl.NewCertmgr(&impl.CertmgrConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, }) if err != nil { t.Errorf("err: %+v", err) diff --git a/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go b/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go index a0beaf060..0a9edfa1b 100644 --- a/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go +++ b/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go @@ -18,8 +18,8 @@ import ( type CertmgrConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` } @@ -39,7 +39,7 @@ func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { client := velive.NewInstance() client.SetAccessKey(config.AccessKeyId) - client.SetSecretKey(config.AccessKeySecret) + client.SetSecretKey(config.SecretAccessKey) return &Certmgr{ config: config, diff --git a/pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go b/pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go index 6cd4d8f57..caf1e436e 100644 --- a/pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go +++ b/pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go @@ -12,14 +12,14 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string ) func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") } /* @@ -29,7 +29,7 @@ Shell command to run this test: --VOLCENGINELIVE_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINELIVE_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINELIVE_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINELIVE_ACCESSKEYSECRET="your-access-key-secret" + --VOLCENGINELIVE_SECRETACCESSKEY="your-secret-access-key" */ func TestProvider(t *testing.T) { fp.Parse() @@ -37,7 +37,7 @@ func TestProvider(t *testing.T) { t.Run("Upload", func(t *testing.T) { provider, err := impl.NewCertmgr(&impl.CertmgrConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, }) if err != nil { t.Errorf("err: %+v", err) diff --git a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go index 88f7385fe..3632aca2a 100644 --- a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go +++ b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go @@ -19,8 +19,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 火山引擎地域。 @@ -52,14 +52,14 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret, config.Region) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, Region: config.Region, }) @@ -264,9 +264,9 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*vealb.ALB, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*vealb.ALB, error) { config := ve.NewConfig(). - WithAkSk(accessKeyId, accessKeySecret). + WithAkSk(accessKeyId, secretAccessKey). WithRegion(region) session, err := vesession.NewSession(config) diff --git a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go index 08924a166..64af9ba0f 100644 --- a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go +++ b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fRegion string fListenerId string ) @@ -21,7 +21,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fRegion, "REGION") fp.DefineString(&fListenerId, "LISTENERID") } @@ -33,7 +33,7 @@ Shell command to run this test: --VOLCENGINEALB_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINEALB_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINEALB_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINEALB_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINEALB_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINEALB_REGION="cn-beijing" \ --VOLCENGINEALB_LISTENERID="your-listener-id" */ @@ -43,7 +43,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy_ToListener", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, Region: fRegion, DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, diff --git a/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go b/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go index 2a792b9c3..1b3ece0b5 100644 --- a/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go +++ b/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go @@ -20,8 +20,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 火山引擎地域。 @@ -47,14 +47,14 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret, config.Region) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, Region: config.Region, }) @@ -260,9 +260,9 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, cloudDomainId st return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*veapig.APIG, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*veapig.APIG, error) { config := ve.NewConfig(). - WithAkSk(accessKeyId, accessKeySecret). + WithAkSk(accessKeyId, secretAccessKey). WithRegion(region) session, err := vesession.NewSession(config) diff --git a/pkg/core/deployer/providers/volcengine-apig/volcengine_apig_test.go b/pkg/core/deployer/providers/volcengine-apig/volcengine_apig_test.go index d0192f4bb..67a674da1 100644 --- a/pkg/core/deployer/providers/volcengine-apig/volcengine_apig_test.go +++ b/pkg/core/deployer/providers/volcengine-apig/volcengine_apig_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fRegion string fDomain string ) @@ -21,7 +21,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fRegion, "REGION") fp.DefineString(&fDomain, "DOMAIN") } @@ -33,7 +33,7 @@ Shell command to run this test: --VOLCENGINEAPIG_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINEAPIG_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINEAPIG_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINEAPIG_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINEAPIG_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINEALB_REGION="cn-beijing" \ --VOLCENGINEAPIG_DOMAIN="example.com" */ @@ -43,7 +43,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, Region: fRegion, DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT, Domain: fDomain, diff --git a/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go b/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go index 93a7169bb..677a89e56 100644 --- a/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go +++ b/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go @@ -21,8 +21,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 域名匹配模式。 @@ -46,14 +46,14 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, }) if err != nil { @@ -255,9 +255,9 @@ func (d *Deployer) updateDomainCertificate(ctx context.Context, domain string, c return nil } -func createSDKClient(accessKeyId, accessKeySecret string) (*vecdn.CDN, error) { +func createSDKClient(accessKeyId, secretAccessKey string) (*vecdn.CDN, error) { config := ve.NewConfig(). - WithAkSk(accessKeyId, accessKeySecret). + WithAkSk(accessKeyId, secretAccessKey). WithRegion("cn-north-1") session, err := vesession.NewSession(config) diff --git a/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn_test.go b/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn_test.go index 5448e6b49..4aa0d1ef5 100644 --- a/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn_test.go +++ b/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fDomain string ) @@ -20,7 +20,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fDomain, "DOMAIN") } @@ -31,7 +31,7 @@ Shell command to run this test: --VOLCENGINECDN_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINECDN_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINECDN_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINECDN_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINECDN_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINECDN_DOMAIN="example.com" */ func TestProvider(t *testing.T) { @@ -40,7 +40,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT, Domain: fDomain, }) diff --git a/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go b/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go index aaa51d488..282366606 100644 --- a/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go @@ -13,8 +13,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 火山引擎地域。 @@ -36,7 +36,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, Region: config.Region, }) diff --git a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go index ff3f0f5d9..96b8a6e74 100644 --- a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go +++ b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go @@ -18,8 +18,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 火山引擎地域。 @@ -48,14 +48,14 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret, config.Region) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, Region: config.Region, }) @@ -215,9 +215,9 @@ func (d *Deployer) updateListenerCertificate(ctx context.Context, cloudListenerI return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*veclb.CLB, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*veclb.CLB, error) { config := ve.NewConfig(). - WithAkSk(accessKeyId, accessKeySecret). + WithAkSk(accessKeyId, secretAccessKey). WithRegion(region) session, err := vesession.NewSession(config) diff --git a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go index b1019bf9c..a0e34b313 100644 --- a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go +++ b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fRegion string fListenerId string ) @@ -21,7 +21,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fRegion, "REGION") fp.DefineString(&fListenerId, "LISTENERID") } @@ -33,7 +33,7 @@ Shell command to run this test: --VOLCENGINECLB_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINECLB_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINECLB_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINECLB_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINECLB_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINECLB_REGION="cn-beijing" \ --VOLCENGINECLB_LISTENERID="your-listener-id" */ @@ -43,7 +43,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy_ToListener", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, Region: fRegion, DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, diff --git a/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go b/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go index 097550223..bf16f66cf 100644 --- a/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go +++ b/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go @@ -20,8 +20,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 火山引擎地域。 @@ -47,14 +47,14 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret, config.Region) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, Region: config.Region, }) @@ -205,13 +205,13 @@ func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { return domains, nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*vedcdn.DCDN, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*vedcdn.DCDN, error) { if region == "" { region = "cn-beijing" // DCDN 服务默认区域：北京 } config := ve.NewConfig(). - WithAkSk(accessKeyId, accessKeySecret). + WithAkSk(accessKeyId, secretAccessKey). WithRegion(region) session, err := vesession.NewSession(config) diff --git a/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn_test.go b/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn_test.go index 6a5a54ed6..fa232d37d 100644 --- a/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn_test.go +++ b/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fDomain string ) @@ -20,7 +20,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fDomain, "DOMAIN") } @@ -31,7 +31,7 @@ Shell command to run this test: --VOLCENGINEDCDN_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINEDCDN_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINEDCDN_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINEDCDN_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINEDCDN_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINEDCDN_DOMAIN="example.com" */ func TestProvider(t *testing.T) { @@ -40,7 +40,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT, Domain: fDomain, }) diff --git a/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go b/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go index 44891c8bb..bd86b5031 100644 --- a/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go +++ b/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go @@ -16,8 +16,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 火山引擎地域。 @@ -42,14 +42,14 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret, config.Region) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, Region: config.Region, }) @@ -135,7 +135,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return &deployer.DeployResult{}, nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*veimagex.Imagex, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*veimagex.Imagex, error) { var instance *veimagex.Imagex if region == "" { instance = veimagex.NewInstance() @@ -145,7 +145,7 @@ func createSDKClient(accessKeyId, accessKeySecret, region string) (*veimagex.Ima instance.SetCredential(vebase.Credentials{ AccessKeyID: accessKeyId, - SecretAccessKey: accessKeySecret, + SecretAccessKey: secretAccessKey, }) return instance, nil diff --git a/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex_test.go b/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex_test.go index 2bc63069a..3b2699ea8 100644 --- a/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex_test.go +++ b/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fRegion string fServiceId string fDomain string @@ -22,7 +22,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fRegion, "REGION") fp.DefineString(&fServiceId, "SERVICEID") fp.DefineString(&fDomain, "DOMAIN") @@ -35,7 +35,7 @@ Shell command to run this test: --VOLCENGINEIMAGEX_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINEIMAGEX_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINEIMAGEX_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINEIMAGEX_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINEIMAGEX_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINEIMAGEX_REGION="cn-north-1" \ --VOLCENGINEIMAGEX_SERVICEID="your-service-id" \ --VOLCENGINEIMAGEX_DOMAIN="example.com" @@ -46,7 +46,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, Region: fRegion, ServiceId: fServiceId, Domain: fDomain, diff --git a/pkg/core/deployer/providers/volcengine-live/volcengine_live.go b/pkg/core/deployer/providers/volcengine-live/volcengine_live.go index 40b46176b..e2a34bd14 100644 --- a/pkg/core/deployer/providers/volcengine-live/volcengine_live.go +++ b/pkg/core/deployer/providers/volcengine-live/volcengine_live.go @@ -20,8 +20,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 域名匹配模式。 @@ -47,11 +47,11 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client := velive.NewInstance() client.SetAccessKey(config.AccessKeyId) - client.SetSecretKey(config.AccessKeySecret) + client.SetSecretKey(config.SecretAccessKey) pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, }) if err != nil { diff --git a/pkg/core/deployer/providers/volcengine-live/volcengine_live_test.go b/pkg/core/deployer/providers/volcengine-live/volcengine_live_test.go index 54b5d0ecd..115d96ba7 100644 --- a/pkg/core/deployer/providers/volcengine-live/volcengine_live_test.go +++ b/pkg/core/deployer/providers/volcengine-live/volcengine_live_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fDomain string ) @@ -20,7 +20,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fDomain, "DOMAIN") } @@ -31,7 +31,7 @@ Shell command to run this test: --VOLCENGINELIVE_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINELIVE_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINELIVE_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINELIVE_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINELIVE_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINELIVE_DOMAIN="example.com" */ func TestProvider(t *testing.T) { @@ -40,7 +40,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT, Domain: fDomain, }) diff --git a/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go b/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go index 8666582fe..17474a3ad 100644 --- a/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go +++ b/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go @@ -15,8 +15,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 火山引擎地域。 @@ -41,14 +41,14 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret, config.Region) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, Region: config.Region, }) @@ -108,13 +108,13 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return &deployer.DeployResult{}, nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*tos.ClientV2, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*tos.ClientV2, error) { endpoint := fmt.Sprintf("tos-%s.volces.com", region) client, err := tos.NewClientV2( endpoint, tos.WithRegion(region), - tos.WithCredentials(tos.NewStaticCredentials(accessKeyId, accessKeySecret)), + tos.WithCredentials(tos.NewStaticCredentials(accessKeyId, secretAccessKey)), ) if err != nil { return nil, err diff --git a/pkg/core/deployer/providers/volcengine-tos/volcengine_tos_test.go b/pkg/core/deployer/providers/volcengine-tos/volcengine_tos_test.go index ff65929c8..15c77f77b 100644 --- a/pkg/core/deployer/providers/volcengine-tos/volcengine_tos_test.go +++ b/pkg/core/deployer/providers/volcengine-tos/volcengine_tos_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fRegion string fBucket string fDomain string @@ -22,7 +22,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fRegion, "REGION") fp.DefineString(&fBucket, "BUCKET") fp.DefineString(&fDomain, "DOMAIN") @@ -35,7 +35,7 @@ Shell command to run this test: --VOLCENGINETOS_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINETOS_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINETOS_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINETOS_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINETOS_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINETOS_REGION="cn-beijing" \ --VOLCENGINETOS_BUCKET="your-tos-bucket" \ --VOLCENGINETOS_DOMAIN="example.com" @@ -46,7 +46,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, Region: fRegion, Bucket: fBucket, Domain: fDomain, diff --git a/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go b/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go index d840b8b0a..bdfd357ea 100644 --- a/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go +++ b/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go @@ -22,8 +22,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 点播空间名称。 @@ -53,11 +53,11 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client := vevod.NewInstance() client.SetAccessKey(config.AccessKeyId) - client.SetSecretKey(config.AccessKeySecret) + client.SetSecretKey(config.SecretAccessKey) pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, }) if err != nil { diff --git a/pkg/core/deployer/providers/volcengine-vod/volcengine_vod_test.go b/pkg/core/deployer/providers/volcengine-vod/volcengine_vod_test.go index aaaa63b06..9615633f7 100644 --- a/pkg/core/deployer/providers/volcengine-vod/volcengine_vod_test.go +++ b/pkg/core/deployer/providers/volcengine-vod/volcengine_vod_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fSpaceName string fDomainType string fDomain string @@ -22,7 +22,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fSpaceName, "SPACENAME") fp.DefineString(&fDomainType, "DOMAINTYPE") fp.DefineString(&fDomain, "DOMAIN") @@ -35,7 +35,7 @@ Shell command to run this test: --VOLCENGINEVOD_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINEVOD_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINEVOD_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINEVOD_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINEVOD_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINEVOD_SPACENAME="vod-space-name" \ --VOLCENGINEVOD_DOMAINTYPE="play" \ --VOLCENGINEVOD_DOMAIN="example.com" @@ -46,7 +46,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT, SpaceName: fSpaceName, DomainType: fDomainType, diff --git a/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go b/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go index bbbb2c849..24b32888f 100644 --- a/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go +++ b/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go @@ -19,8 +19,8 @@ import ( type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` - // 火山引擎 AccessKeySecret。 - AccessKeySecret string `json:"accessKeySecret"` + // 火山引擎 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` // 火山引擎项目名称。 ProjectName string `json:"projectName,omitempty"` // 火山引擎地域。 @@ -45,14 +45,14 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - client, err := createSDKClient(config.AccessKeyId, config.AccessKeySecret, config.Region) + client, err := createSDKClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { return nil, fmt.Errorf("could not create client: %w", err) } pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, - AccessKeySecret: config.AccessKeySecret, + SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, Region: config.Region, }) @@ -163,9 +163,9 @@ func (d *Deployer) deployWithCNAME(ctx context.Context, cloudCertId string) erro return nil } -func createSDKClient(accessKeyId, accessKeySecret, region string) (*vewaf.WAF, error) { +func createSDKClient(accessKeyId, secretAccessKey, region string) (*vewaf.WAF, error) { config := ve.NewConfig(). - WithAkSk(accessKeyId, accessKeySecret). + WithAkSk(accessKeyId, secretAccessKey). WithRegion(region) session, err := vesession.NewSession(config) diff --git a/pkg/core/deployer/providers/volcengine-waf/volcengine_waf_test.go b/pkg/core/deployer/providers/volcengine-waf/volcengine_waf_test.go index 4bb2ae116..cdf2e58f7 100644 --- a/pkg/core/deployer/providers/volcengine-waf/volcengine_waf_test.go +++ b/pkg/core/deployer/providers/volcengine-waf/volcengine_waf_test.go @@ -12,7 +12,7 @@ var ( fTestCertPath string fTestKeyPath string fAccessKeyId string - fAccessKeySecret string + fSecretAccessKey string fRegion string fAccessMode string fDomain string @@ -22,7 +22,7 @@ func init() { fp.DefineString(&fTestCertPath, "TESTCERTPATH") fp.DefineString(&fTestKeyPath, "TESTKEYPATH") fp.DefineString(&fAccessKeyId, "ACCESSKEYID") - fp.DefineString(&fAccessKeySecret, "ACCESSKEYSECRET") + fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fRegion, "REGION") fp.DefineString(&fAccessMode, "ACCESSMODE") fp.DefineString(&fDomain, "DOMAIN") @@ -35,7 +35,7 @@ Shell command to run this test: --VOLCENGINEWAF_TESTCERTPATH="/path/to/your-test-cert.pem" \ --VOLCENGINEWAF_TESTKEYPATH="/path/to/your-test-key.pem" \ --VOLCENGINEWAF_ACCESSKEYID="your-access-key-id" \ - --VOLCENGINEWAF_ACCESSKEYSECRET="your-access-key-secret" \ + --VOLCENGINEWAF_SECRETACCESSKEY="your-secret-access-key" \ --VOLCENGINEWAF_REGION="cn-beijing" \ --VOLCENGINEWAF_ACCESSMODE="cname" \ --VOLCENGINEWAF_DOMAIN="example.com" @@ -46,7 +46,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, - AccessKeySecret: fAccessKeySecret, + SecretAccessKey: fSecretAccessKey, Region: fRegion, AccessMode: fAccessMode, Domain: fDomain,