diff --git a/internal/domain/expr/expr_test.go b/internal/domain/expr/expr_test.go
index fb76d98c5..b320fbd2e 100644
--- a/internal/domain/expr/expr_test.go
+++ b/internal/domain/expr/expr_test.go
@@ -1,127 +1,120 @@
-package expr
+package expr_test
import (
"testing"
+
+ "github.com/stretchr/testify/assert"
+
+ "github.com/certimate-go/certimate/internal/domain/expr"
)
-func TestLogicalEval(t *testing.T) {
- // 测试逻辑表达式 and
- logicalExpr := LogicalExpr{
- Left: ConstantExpr{
- Type: "const",
- Value: "true",
- ValueType: "boolean",
- },
- Operator: And,
- Right: ConstantExpr{
- Type: "const",
- Value: "true",
- ValueType: "boolean",
- },
- }
- result, err := logicalExpr.Eval(nil)
- if err != nil {
- t.Errorf("failed to evaluate logical expression: %v", err)
- }
- if result.Value != true {
- t.Errorf("expected true, got %v", result)
- }
-
- // 测试逻辑表达式 or
- orExpr := LogicalExpr{
- Left: ConstantExpr{
- Type: "const",
- Value: "true",
- ValueType: "boolean",
- },
- Operator: Or,
- Right: ConstantExpr{
- Type: "const",
- Value: "true",
- ValueType: "boolean",
- },
- }
- result, err = orExpr.Eval(nil)
- if err != nil {
- t.Errorf("failed to evaluate logical expression: %v", err)
- }
- if result.Value != true {
- t.Errorf("expected true, got %v", result)
- }
-}
-
func TestUnmarshalExpr(t *testing.T) {
- type args struct {
+ type testInput struct {
data []byte
}
- tests := []struct {
- name string
- args args
- want Expr
- wantErr bool
+ testCases := []struct {
+ name string
+ input testInput
+ expected *expr.Expr
+ expectedErr bool
}{
{
- name: "test1",
- args: args{
- data: []byte(`{"left":{"left":{"selector":{"id":"ODnYSOXB6HQP2_vz6JcZE","name":"certificate.validity","type":"boolean"},"type":"var"},"operator":"is","right":{"type":"const","value":true,"valueType":"boolean"},"type":"comparison"},"operator":"and","right":{"left":{"selector":{"id":"ODnYSOXB6HQP2_vz6JcZE","name":"certificate.daysLeft","type":"number"},"type":"var"},"operator":"eq","right":{"type":"const","value":2,"valueType":"number"},"type":"comparison"},"type":"logical"}`),
+ name: "case1",
+ input: testInput{
+ data: []byte(`{"left":{"left":{"selector":{"id":"ODnYSOXB6HQP2_vz6JcZE","name":"certificate.validity","type":"boolean"},"type":"var"},"operator":"eq","right":{"type":"const","value":"true","valueType":"boolean"},"type":"comparison"},"operator":"and","right":{"left":{"selector":{"id":"ODnYSOXB6HQP2_vz6JcZE","name":"certificate.daysLeft","type":"number"},"type":"var"},"operator":"eq","right":{"type":"const","value":"2","valueType":"number"},"type":"comparison"},"type":"logical"}`),
},
+ expectedErr: false,
},
}
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- got, err := UnmarshalExpr(tt.args.data)
- if (err != nil) != tt.wantErr {
- t.Errorf("UnmarshalExpr() error = %v, wantErr %v", err, tt.wantErr)
- return
- }
- if got == nil {
- t.Errorf("UnmarshalExpr() got = nil, want %v", tt.want)
- return
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ _, err := expr.UnmarshalExpr(tc.input.data)
+ if tc.expectedErr {
+ assert.Error(t, err, "Case: %-20s", tc.name)
+ } else {
+ assert.NoError(t, err, "Case: %-20s", tc.name)
}
})
}
}
-func TestExpr_Eval(t *testing.T) {
- type args struct {
- variables map[string]map[string]any
+func TestEvalExpr(t *testing.T) {
+ type testInput struct {
data []byte
+ variables map[string]map[string]any
}
- tests := []struct {
- name string
- args args
- want *EvalResult
- wantErr bool
+ testCases := []struct {
+ name string
+ input testInput
+ expected *expr.EvalResult
+ expectedErr bool
}{
{
- name: "test1",
- args: args{
+ name: "case1",
+ input: testInput{
+ data: []byte(`{"left":{"left":{"selector":{"id":"ODnYSOXB6HQP2_vz6JcZE","name":"certificate.validity","type":"boolean"},"type":"var"},"operator":"eq","right":{"type":"const","value":"true","valueType":"boolean"},"type":"comparison"},"operator":"and","right":{"left":{"selector":{"id":"ODnYSOXB6HQP2_vz6JcZE","name":"certificate.daysLeft","type":"number"},"type":"var"},"operator":"eq","right":{"type":"const","value":"2","valueType":"number"},"type":"comparison"},"type":"logical"}`),
variables: map[string]map[string]any{
"ODnYSOXB6HQP2_vz6JcZE": {
- "certificate.validity": true,
- "certificate.daysLeft": 2,
+ "certificate.validity": "true",
+ "certificate.daysLeft": "2",
},
},
- data: []byte(`{"left":{"left":{"selector":{"id":"ODnYSOXB6HQP2_vz6JcZE","name":"certificate.validity","type":"boolean"},"type":"var"},"operator":"is","right":{"type":"const","value":true,"valueType":"boolean"},"type":"comparison"},"operator":"and","right":{"left":{"selector":{"id":"ODnYSOXB6HQP2_vz6JcZE","name":"certificate.daysLeft","type":"number"},"type":"var"},"operator":"eq","right":{"type":"const","value":2,"valueType":"number"},"type":"comparison"},"type":"logical"}`),
},
+ expectedErr: false,
},
}
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- c, err := UnmarshalExpr(tt.args.data)
- if err != nil {
- t.Errorf("UnmarshalExpr() error = %v", err)
- return
- }
- got, err := c.Eval(tt.args.variables)
- t.Log("got:", got)
- if (err != nil) != tt.wantErr {
- t.Errorf("ConstExpr.Eval() error = %v, wantErr %v", err, tt.wantErr)
- return
- }
- if got.Value != true {
- t.Errorf("ConstExpr.Eval() got = %v, want %v", got.Value, true)
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ temp, err := expr.UnmarshalExpr(tc.input.data)
+ assert.NoError(t, err, "failed to unmarshal expression")
+
+ result, err := temp.Eval(tc.input.variables)
+ if tc.expectedErr {
+ assert.Error(t, err, "Case: %-20s", tc.name)
+ } else {
+ assert.NoError(t, err, "Case: %-20s", tc.name)
+ assert.True(t, result.Value.(bool))
}
})
}
}
+
+func TestEvalLogicalExpr(t *testing.T) {
+ t.Run("And", func(t *testing.T) {
+ logicalExpr := expr.LogicalExpr{
+ Left: expr.ConstantExpr{
+ Type: "const",
+ Value: "true",
+ ValueType: "boolean",
+ },
+ Operator: expr.And,
+ Right: expr.ConstantExpr{
+ Type: "const",
+ Value: "true",
+ ValueType: "boolean",
+ },
+ }
+ result, err := logicalExpr.Eval(nil)
+ assert.NoError(t, err, "failed to evaluate logical expression")
+ assert.True(t, result.Value.(bool))
+ })
+
+ t.Run("Or", func(t *testing.T) {
+ orExpr := expr.LogicalExpr{
+ Left: expr.ConstantExpr{
+ Type: "const",
+ Value: "true",
+ ValueType: "boolean",
+ },
+ Operator: expr.Or,
+ Right: expr.ConstantExpr{
+ Type: "const",
+ Value: "true",
+ ValueType: "boolean",
+ },
+ }
+ result, err := orExpr.Eval(nil)
+ assert.NoError(t, err, "failed to evaluate logical expression")
+ assert.True(t, result.Value.(bool))
+ })
+}
diff --git a/pkg/core/certmgr/providers/1panel/1panel_test.go b/pkg/core/certmgr/providers/1panel/1panel_test.go
index 5193f4861..a8fb4afc2 100644
--- a/pkg/core/certmgr/providers/1panel/1panel_test.go
+++ b/pkg/core/certmgr/providers/1panel/1panel_test.go
@@ -3,12 +3,14 @@ package onepanelssl_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/1panel"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("1PANEL_")
+ fp = it.Args("1PANEL_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
ApiVersion: fApiVersion,
ApiKey: fApiKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas_test.go b/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas_test.go
index 01541fc15..61eb507f4 100644
--- a/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas_test.go
+++ b/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas_test.go
@@ -3,12 +3,14 @@ package aliyuncas_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("ALIYUNCAS_")
+ fp = it.Args("ALIYUNCAS_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
AccessKeySecret: fAccessKeySecret,
Region: fRegion,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb_test.go b/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb_test.go
index 188ea952b..74567f9f7 100644
--- a/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb_test.go
+++ b/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb_test.go
@@ -1,16 +1,16 @@
package aliyunslb_test
import (
- "fmt"
- "strings"
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-slb"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("ALIYUNSLB_")
+ fp = it.Args("ALIYUNSLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -40,25 +40,13 @@ func TestProvider(t *testing.T) {
fp.Parse()
t.Run("Upload", func(t *testing.T) {
- t.Log(strings.Join([]string{
- "args:",
- fmt.Sprintf("TESTCERTPATH: %v", fTestCertPath),
- fmt.Sprintf("TESTKEYPATH: %v", fTestKeyPath),
- fmt.Sprintf("ACCESSKEYID: %v", fAccessKeyId),
- fmt.Sprintf("ACCESSKEYSECRET: %v", fAccessKeySecret),
- fmt.Sprintf("REGION: %v", fRegion),
- }, "\n"))
-
provider, err := impl.NewCertmgr(&impl.CertmgrConfig{
AccessKeyId: fAccessKeyId,
AccessKeySecret: fAccessKeySecret,
Region: fRegion,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/aws-acm/aws_acm_test.go b/pkg/core/certmgr/providers/aws-acm/aws_acm_test.go
index fd5c785a4..ca516cef3 100644
--- a/pkg/core/certmgr/providers/aws-acm/aws_acm_test.go
+++ b/pkg/core/certmgr/providers/aws-acm/aws_acm_test.go
@@ -3,12 +3,14 @@ package awsacm_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("AWSACM_")
+ fp = it.Args("AWSACM_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretAccessKey: fSecretAccessKey,
Region: fRegion,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/aws-iam/aws_iam_test.go b/pkg/core/certmgr/providers/aws-iam/aws_iam_test.go
index ecc88fc7a..0cffd4520 100644
--- a/pkg/core/certmgr/providers/aws-iam/aws_iam_test.go
+++ b/pkg/core/certmgr/providers/aws-iam/aws_iam_test.go
@@ -3,12 +3,14 @@ package awsiam_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("AWSIAM_")
+ fp = it.Args("AWSIAM_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretAccessKey: fSecretAccessKey,
Region: fRegion,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault_test.go b/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault_test.go
index 7c5060945..eac69b0a2 100644
--- a/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault_test.go
+++ b/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault_test.go
@@ -3,12 +3,14 @@ package azurekeyvault_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/azure-keyvault"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("AZUREKEYVAULT_")
+ fp = it.Args("AZUREKEYVAULT_")
fTestCertPath string
fTestKeyPath string
fTenantId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
CloudName: fCloudName,
KeyVaultName: fKeyVaultName,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert_test.go b/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert_test.go
index 512108ce1..6f014c2f9 100644
--- a/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert_test.go
+++ b/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert_test.go
@@ -3,12 +3,14 @@ package baiducloudcert_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("BAIDUCLOUDCERT_")
+ fp = it.Args("BAIDUCLOUDCERT_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn_test.go b/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn_test.go
index aa5043d89..b39395524 100644
--- a/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn_test.go
+++ b/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn_test.go
@@ -3,12 +3,14 @@ package baishancdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baishan-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("BAISHANCDN_")
+ fp = it.Args("BAISHANCDN_")
fTestCertPath string
fTestKeyPath string
fApiToken string
@@ -35,11 +37,8 @@ func TestProvider(t *testing.T) {
provider, err := impl.NewCertmgr(&impl.CertmgrConfig{
ApiToken: fApiToken,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn_test.go b/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn_test.go
index 1c4bbe1ea..fa44ae37a 100644
--- a/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn_test.go
+++ b/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn_test.go
@@ -3,12 +3,14 @@ package bytepluscdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("BYTEPLUSCDN_")
+ fp = it.Args("BYTEPLUSCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/byteplus-certcenter/byteplus_certcenter_test.go b/pkg/core/certmgr/providers/byteplus-certcenter/byteplus_certcenter_test.go
index 242523ab3..1a4cb30cd 100644
--- a/pkg/core/certmgr/providers/byteplus-certcenter/byteplus_certcenter_test.go
+++ b/pkg/core/certmgr/providers/byteplus-certcenter/byteplus_certcenter_test.go
@@ -3,12 +3,14 @@ package bytepluscertcenter_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-certcenter"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("BYTEPLUSCERTCENTER_")
+ fp = it.Args("BYTEPLUSCERTCENTER_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive_test.go b/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive_test.go
index 3a381cc88..1a24127b8 100644
--- a/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive_test.go
+++ b/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive_test.go
@@ -3,12 +3,14 @@ package byteplusmedialive_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-medialive"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("BYTEPLUSMEDIALIVE_")
+ fp = it.Args("BYTEPLUSMEDIALIVE_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/cmcccloud-vlb/cmcccloud_vlb_test.go b/pkg/core/certmgr/providers/cmcccloud-vlb/cmcccloud_vlb_test.go
index 170a1d6f1..45e52b47f 100644
--- a/pkg/core/certmgr/providers/cmcccloud-vlb/cmcccloud_vlb_test.go
+++ b/pkg/core/certmgr/providers/cmcccloud-vlb/cmcccloud_vlb_test.go
@@ -3,12 +3,14 @@ package cmcccloudvlb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/cmcccloud-vlb"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("CMCCCLOUDVLB_")
+ fp = it.Args("CMCCCLOUDVLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
PoolId: fPoolId,
IsDefault: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao_test.go b/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao_test.go
index 6a09c5611..2be59f21f 100644
--- a/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao_test.go
+++ b/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao_test.go
@@ -3,12 +3,14 @@ package ctcccloudao_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-ao"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("CTCCCLOUDAO_")
+ fp = it.Args("CTCCCLOUDAO_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn_test.go b/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn_test.go
index 357f134e8..d821b0cff 100644
--- a/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn_test.go
+++ b/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn_test.go
@@ -3,12 +3,14 @@ package ctcccloudcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("CTCCCLOUDCDN_")
+ fp = it.Args("CTCCCLOUDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms_test.go b/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms_test.go
index 4b6c5676a..83bad09db 100644
--- a/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms_test.go
+++ b/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms_test.go
@@ -3,12 +3,14 @@ package ctcccloudcms_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cms"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("CTCCCLOUDCMS_")
+ fp = it.Args("CTCCCLOUDCMS_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb_test.go b/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb_test.go
index 163d4a19a..4dcc1cd2e 100644
--- a/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb_test.go
+++ b/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb_test.go
@@ -3,12 +3,14 @@ package ctcccloudelb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-elb"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("CTCCCLOUDELB_")
+ fp = it.Args("CTCCCLOUDELB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretAccessKey: fSecretAccessKey,
RegionId: fRegionId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn_test.go b/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn_test.go
index 69891a666..e85d0e232 100644
--- a/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn_test.go
+++ b/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn_test.go
@@ -3,12 +3,14 @@ package ctcccloudicdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-icdn"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("CTCCCLOUDICDN_")
+ fp = it.Args("CTCCCLOUDICDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn_test.go b/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn_test.go
index debb644dd..44f5b709b 100644
--- a/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn_test.go
+++ b/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn_test.go
@@ -3,12 +3,14 @@ package ctcccloudlvdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-lvdn"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("CTCCCLOUDLVDN_")
+ fp = it.Args("CTCCCLOUDLVDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/digitalocean-certificate/digitalocean_certificate_test.go b/pkg/core/certmgr/providers/digitalocean-certificate/digitalocean_certificate_test.go
index 733f9e788..297635d96 100644
--- a/pkg/core/certmgr/providers/digitalocean-certificate/digitalocean_certificate_test.go
+++ b/pkg/core/certmgr/providers/digitalocean-certificate/digitalocean_certificate_test.go
@@ -3,12 +3,14 @@ package digitaloceancertificate_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/digitalocean-certificate"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("DIGITALOCEANCERTIFICATE_")
+ fp = it.Args("DIGITALOCEANCERTIFICATE_")
fTestCertPath string
fTestKeyPath string
fAccessToken string
@@ -35,11 +37,8 @@ func TestProvider(t *testing.T) {
provider, err := impl.NewCertmgr(&impl.CertmgrConfig{
AccessToken: fAccessToken,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/dogecloud/dogecloud_test.go b/pkg/core/certmgr/providers/dogecloud/dogecloud_test.go
index cd92c29c5..b029b423f 100644
--- a/pkg/core/certmgr/providers/dogecloud/dogecloud_test.go
+++ b/pkg/core/certmgr/providers/dogecloud/dogecloud_test.go
@@ -3,12 +3,14 @@ package dogecloud_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dogecloud"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("DOGECLOUD_")
+ fp = it.Args("DOGECLOUD_")
fTestCertPath string
fTestKeyPath string
fAccessKey string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKey: fAccessKey,
SecretKey: fSecretKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/dokploy/dokploy_test.go b/pkg/core/certmgr/providers/dokploy/dokploy_test.go
index f3e83124d..307e904b6 100644
--- a/pkg/core/certmgr/providers/dokploy/dokploy_test.go
+++ b/pkg/core/certmgr/providers/dokploy/dokploy_test.go
@@ -3,12 +3,14 @@ package dokploy_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dokploy"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("DOKPLOY_")
+ fp = it.Args("DOKPLOY_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -40,11 +42,8 @@ func TestProvider(t *testing.T) {
ApiKey: fApiKey,
AllowInsecureConnections: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn_test.go b/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn_test.go
index 3ac400844..2474fc742 100644
--- a/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn_test.go
+++ b/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn_test.go
@@ -3,12 +3,14 @@ package gcorecdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/gcore-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("GCORECDN_")
+ fp = it.Args("GCORECDN_")
fTestCertPath string
fTestKeyPath string
fApiToken string
@@ -35,11 +37,8 @@ func TestProvider(t *testing.T) {
provider, err := impl.NewCertmgr(&impl.CertmgrConfig{
ApiToken: fApiToken,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/googlecloud-certificatemanager/googlecloud_certificatemanager_test.go b/pkg/core/certmgr/providers/googlecloud-certificatemanager/googlecloud_certificatemanager_test.go
index 389c11a18..63d80f092 100644
--- a/pkg/core/certmgr/providers/googlecloud-certificatemanager/googlecloud_certificatemanager_test.go
+++ b/pkg/core/certmgr/providers/googlecloud-certificatemanager/googlecloud_certificatemanager_test.go
@@ -4,12 +4,14 @@ import (
"os"
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/googlecloud-certificatemanager"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("GOOGLECLOUDCERTIFICATEMANAGER_")
+ fp = it.Args("GOOGLECLOUDCERTIFICATEMANAGER_")
fTestCertPath string
fTestKeyPath string
fProjectId string
@@ -45,11 +47,8 @@ func TestProvider(t *testing.T) {
ProjectId: fProjectId,
ServiceAccountKey: fServiceAccountKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb_test.go b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb_test.go
index 062e66f41..ce063c7c3 100644
--- a/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb_test.go
+++ b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb_test.go
@@ -3,12 +3,14 @@ package huaweicloudelb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-elb"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDELB_")
+ fp = it.Args("HUAWEICLOUDELB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretAccessKey: fSecretAccessKey,
Region: fRegion,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm_test.go b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm_test.go
index 761a811d1..b0fdedb37 100644
--- a/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm_test.go
+++ b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm_test.go
@@ -3,12 +3,14 @@ package huaweicloudscm_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDSCM_")
+ fp = it.Args("HUAWEICLOUDSCM_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretAccessKey: fSecretAccessKey,
Region: fRegion,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf_test.go b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf_test.go
index 1a1286ba1..4f3f45d04 100644
--- a/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf_test.go
+++ b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf_test.go
@@ -3,12 +3,14 @@ package huaweicloudwaf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-waf"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDWAF_")
+ fp = it.Args("HUAWEICLOUDWAF_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretAccessKey: fSecretAccessKey,
Region: fRegion,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl_test.go b/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl_test.go
index 78948aca8..0f987b9be 100644
--- a/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl_test.go
+++ b/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl_test.go
@@ -3,12 +3,14 @@ package jdcloudssl_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("JDCLOUDSSL_")
+ fp = it.Args("JDCLOUDSSL_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
AccessKeySecret: fAccessKeySecret,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ksyun-kcm/ksyun_kcm_test.go b/pkg/core/certmgr/providers/ksyun-kcm/ksyun_kcm_test.go
index 0005cd4c0..2ce2e7f67 100644
--- a/pkg/core/certmgr/providers/ksyun-kcm/ksyun_kcm_test.go
+++ b/pkg/core/certmgr/providers/ksyun-kcm/ksyun_kcm_test.go
@@ -3,12 +3,14 @@ package ksyunkcm_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ksyun-kcm"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("KSYUNKCM_")
+ fp = it.Args("KSYUNKCM_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ksyun-slb/ksyun_slb_test.go b/pkg/core/certmgr/providers/ksyun-slb/ksyun_slb_test.go
index 4d2e6d7a0..e140788a8 100644
--- a/pkg/core/certmgr/providers/ksyun-slb/ksyun_slb_test.go
+++ b/pkg/core/certmgr/providers/ksyun-slb/ksyun_slb_test.go
@@ -3,12 +3,14 @@ package ksyunslb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ksyun-slb"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("KSYUNSLB_")
+ fp = it.Args("KSYUNSLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretAccessKey: fSecretAccessKey,
Region: fRegion,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager_test.go b/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager_test.go
index da4fb7d67..b06dc8950 100644
--- a/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager_test.go
+++ b/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager_test.go
@@ -3,12 +3,14 @@ package nginxproxymanager_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/nginxproxymanager"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("NGINXPROXYMANAGER_")
+ fp = it.Args("NGINXPROXYMANAGER_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -45,11 +47,8 @@ func TestProvider(t *testing.T) {
Password: fPassword,
AllowInsecureConnections: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/oraclecloud-certificatesmgmt/oraclecloud_certificatesmgmt_test.go b/pkg/core/certmgr/providers/oraclecloud-certificatesmgmt/oraclecloud_certificatesmgmt_test.go
index d0675de3e..59d979bd3 100644
--- a/pkg/core/certmgr/providers/oraclecloud-certificatesmgmt/oraclecloud_certificatesmgmt_test.go
+++ b/pkg/core/certmgr/providers/oraclecloud-certificatesmgmt/oraclecloud_certificatesmgmt_test.go
@@ -3,12 +3,14 @@ package oraclecloudcertificatesmgmt_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/oraclecloud-certificatesmgmt"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("ORACLECLOUDCERTIFICATESMGMT_")
+ fp = it.Args("ORACLECLOUDCERTIFICATESMGMT_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -56,11 +58,8 @@ func TestProvider(t *testing.T) {
UserOcid: fUserOcid,
CompartmentOcid: fCompartmentOcid,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/qingcloud-lb/qingcloud_lb_test.go b/pkg/core/certmgr/providers/qingcloud-lb/qingcloud_lb_test.go
index 377857afc..f8f9a6ac4 100644
--- a/pkg/core/certmgr/providers/qingcloud-lb/qingcloud_lb_test.go
+++ b/pkg/core/certmgr/providers/qingcloud-lb/qingcloud_lb_test.go
@@ -3,12 +3,14 @@ package qingcloudlb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qingcloud-lb"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("QINGCLOUDLB_")
+ fp = it.Args("QINGCLOUDLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretAccessKey: fSecretAccessKey,
ZoneId: fZoneId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert_test.go b/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert_test.go
index 966773112..1b4727e43 100644
--- a/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert_test.go
+++ b/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert_test.go
@@ -3,12 +3,14 @@ package qiniusslcert_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("QINIUSSLCERT_")
+ fp = it.Args("QINIUSSLCERT_")
fTestCertPath string
fTestKeyPath string
fAccessKey string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKey: fAccessKey,
SecretKey: fSecretKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter_test.go b/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter_test.go
index f88760034..164bb3844 100644
--- a/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter_test.go
+++ b/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter_test.go
@@ -3,12 +3,14 @@ package rainyunsslcenter_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/rainyun-sslcenter"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("RAINYUNSSLCENTER_")
+ fp = it.Args("RAINYUNSSLCENTER_")
fTestCertPath string
fTestKeyPath string
fApiKey string
@@ -35,11 +37,8 @@ func TestProvider(t *testing.T) {
provider, err := impl.NewCertmgr(&impl.CertmgrConfig{
ApiKey: fApiKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/tencentcloud-gaap/tencentcloud_gaap_test.go b/pkg/core/certmgr/providers/tencentcloud-gaap/tencentcloud_gaap_test.go
index 84651702f..256aa70de 100644
--- a/pkg/core/certmgr/providers/tencentcloud-gaap/tencentcloud_gaap_test.go
+++ b/pkg/core/certmgr/providers/tencentcloud-gaap/tencentcloud_gaap_test.go
@@ -3,12 +3,14 @@ package tencentcloudgaap_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-gaap"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDGAAP_")
+ fp = it.Args("TENCENTCLOUDGAAP_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
SecretId: fSecretId,
SecretKey: fSecretKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl_test.go b/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl_test.go
index 28175bdae..665230f1a 100644
--- a/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl_test.go
+++ b/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl_test.go
@@ -3,12 +3,14 @@ package tencentcloudssl_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDSSL_")
+ fp = it.Args("TENCENTCLOUDSSL_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
SecretId: fSecretId,
SecretKey: fSecretKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/tencentcloud-tse/tencentcloud_tse_test.go b/pkg/core/certmgr/providers/tencentcloud-tse/tencentcloud_tse_test.go
index b013bddff..32a91271b 100644
--- a/pkg/core/certmgr/providers/tencentcloud-tse/tencentcloud_tse_test.go
+++ b/pkg/core/certmgr/providers/tencentcloud-tse/tencentcloud_tse_test.go
@@ -3,12 +3,14 @@ package tencentcloudtse_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-tse"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDTSE_")
+ fp = it.Args("TENCENTCLOUDTSE_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
ServiceType: fServiceType,
GatewayId: fGatewayId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb_test.go b/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb_test.go
index 7eed38873..e936db871 100644
--- a/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb_test.go
+++ b/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb_test.go
@@ -3,12 +3,14 @@ package ucloudulb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ulb"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("UCLOUDULB_")
+ fp = it.Args("UCLOUDULB_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
PublicKey: fPublicKey,
Region: fRegion,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx_test.go b/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx_test.go
index deb2050c4..54acc18d6 100644
--- a/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx_test.go
+++ b/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx_test.go
@@ -3,12 +3,14 @@ package ucloudulb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-upathx"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("UCLOUDUPATHX_")
+ fp = it.Args("UCLOUDUPATHX_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
PrivateKey: fPrivateKey,
PublicKey: fPublicKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl_test.go b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl_test.go
index 5e6b92ab5..e98b66b1d 100644
--- a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl_test.go
+++ b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl_test.go
@@ -3,12 +3,14 @@ package ucloudussl_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ussl"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("UCLOUDUSSL_")
+ fp = it.Args("UCLOUDUSSL_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
PrivateKey: fPrivateKey,
PublicKey: fPublicKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl_test.go b/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl_test.go
index 61011980f..0e74a066d 100644
--- a/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl_test.go
+++ b/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl_test.go
@@ -3,12 +3,14 @@ package upyunssl_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/upyun-ssl"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("UPYUNSSL_")
+ fp = it.Args("UPYUNSSL_")
fTestCertPath string
fTestKeyPath string
fUsername string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
Username: fUsername,
Password: fPassword,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 945c5aa4a..cf6cf8225 100644
--- a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go
+++ b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn_test.go
@@ -3,12 +3,14 @@ package volcenginecdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("VOLCENGINECDN_")
+ fp = it.Args("VOLCENGINECDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 255b484a1..c661d7eab 100644
--- a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter_test.go
+++ b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter_test.go
@@ -3,12 +3,14 @@ package volcenginecertcenter_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("VOLCENGINECERTCENTER_")
+ fp = it.Args("VOLCENGINECERTCENTER_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 4d60ab980..32e9e89ad 100644
--- a/pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go
+++ b/pkg/core/certmgr/providers/volcengine-live/volcengine_live_test.go
@@ -3,12 +3,14 @@ package volcenginelive_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-live"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("VOLCENGINELIVE_")
+ fp = it.Args("VOLCENGINELIVE_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate_test.go b/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate_test.go
index 031493606..053fd96f7 100644
--- a/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate_test.go
+++ b/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate_test.go
@@ -3,12 +3,14 @@ package wangsucertificate_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/wangsu-certificate"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("WANGSUCERTIFICATE_")
+ fp = it.Args("WANGSUCERTIFICATE_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
AccessKeySecret: fAccessKeySecret,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/yandexcloud-certificatemanager/yandexcloud_certificatemanager_test.go b/pkg/core/certmgr/providers/yandexcloud-certificatemanager/yandexcloud_certificatemanager_test.go
index 798e50925..7903a41ff 100644
--- a/pkg/core/certmgr/providers/yandexcloud-certificatemanager/yandexcloud_certificatemanager_test.go
+++ b/pkg/core/certmgr/providers/yandexcloud-certificatemanager/yandexcloud_certificatemanager_test.go
@@ -4,12 +4,14 @@ import (
"os"
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/yandexcloud-certificatemanager"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("YANDEXCLOUDCERTIFICATEMANAGER_")
+ fp = it.Args("YANDEXCLOUDCERTIFICATEMANAGER_")
fTestCertPath string
fTestKeyPath string
fFolderId string
@@ -45,11 +47,8 @@ func TestProvider(t *testing.T) {
FolderId: fFolderId,
ServiceAccountKey: fServiceAccountKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn_test.go b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn_test.go
index 680e3b300..3b0f0d1f5 100644
--- a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn_test.go
+++ b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn_test.go
@@ -3,12 +3,14 @@ package zenlayercdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("ZENLAYERCDN_")
+ fp = it.Args("ZENLAYERCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
AccessKeyPassword: fAccessKeyPassword,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga_test.go b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga_test.go
index f34825b61..392ada54b 100644
--- a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga_test.go
+++ b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga_test.go
@@ -3,12 +3,14 @@ package zenlayerga_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-ga"
- tester "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
+ it "github.com/certimate-go/certimate/pkg/core/certmgr/testing"
)
var (
- fp = tester.Args("ZENLAYERGA_")
+ fp = it.Args("ZENLAYERGA_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
AccessKeyPassword: fAccessKeyPassword,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestUpload(t, provider, tester.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestUpload(t, provider, it.TestUploadArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/certmgr/testing/args.go b/pkg/core/certmgr/testing/args.go
index f10b33bdc..077fd3fa6 100644
--- a/pkg/core/certmgr/testing/args.go
+++ b/pkg/core/certmgr/testing/args.go
@@ -1,9 +1,9 @@
package testing
import (
- tester "github.com/certimate-go/certimate/pkg/core/internal/testing"
+ "github.com/certimate-go/certimate/pkg/core/internal/testing"
)
-func Args(prefix string) tester.ArgsParser {
- return tester.Args(prefix)
+func Args(prefix string) testing.ArgsParser {
+ return testing.Args(prefix)
}
diff --git a/pkg/core/certmgr/testing/testing.go b/pkg/core/certmgr/testing/testing.go
index 261d48ad0..cf26b9add 100644
--- a/pkg/core/certmgr/testing/testing.go
+++ b/pkg/core/certmgr/testing/testing.go
@@ -7,6 +7,9 @@ import (
"os"
"testing"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+
"github.com/certimate-go/certimate/pkg/core/certmgr"
)
@@ -29,16 +32,16 @@ func TestUpload(t *testing.T, testProvider certmgr.Provider, testArgs TestUpload
ctx := context.Background()
certData, _ := os.ReadFile(testArgs.CertPath)
privkeyData, _ := os.ReadFile(testArgs.KeyPath)
+ assert.NotNil(t, certData)
+ assert.NotNil(t, privkeyData)
logger := slog.Default()
logger.Enabled(ctx, slog.LevelDebug)
testProvider.SetLogger(logger)
res, err := testProvider.Upload(ctx, string(certData), string(privkeyData))
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
+ require.NotNil(t, res)
resjson, _ := json.Marshal(res)
t.Logf("ok: %s", string(resjson))
diff --git a/pkg/core/deployer/providers/1panel-console/1panel_console_test.go b/pkg/core/deployer/providers/1panel-console/1panel_console_test.go
index 6343515c9..651ea4601 100644
--- a/pkg/core/deployer/providers/1panel-console/1panel_console_test.go
+++ b/pkg/core/deployer/providers/1panel-console/1panel_console_test.go
@@ -3,12 +3,14 @@ package onepanelconsole_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/1panel-console"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("1PANELCONSOLE_")
+ fp = it.Args("1PANELCONSOLE_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -45,11 +47,8 @@ func TestProvider(t *testing.T) {
AllowInsecureConnections: true,
AutoRestart: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/1panel/1panel_test.go b/pkg/core/deployer/providers/1panel/1panel_test.go
index dcea299fc..f91245264 100644
--- a/pkg/core/deployer/providers/1panel/1panel_test.go
+++ b/pkg/core/deployer/providers/1panel/1panel_test.go
@@ -3,12 +3,14 @@ package onepanel_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/1panel"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("1PANEL_")
+ fp = it.Args("1PANEL_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -53,12 +55,9 @@ func TestProvider(t *testing.T) {
WebsiteMatchPattern: impl.WEBSITE_MATCH_PATTERN_SPECIFIED,
WebsiteId: fWebsiteId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToCertificate", func(t *testing.T) {
@@ -70,11 +69,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb_test.go b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb_test.go
index 92291b1ae..3e9eb25d1 100644
--- a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb_test.go
+++ b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb_test.go
@@ -3,12 +3,14 @@ package aliyunalb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-alb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNALB_")
+ fp = it.Args("ALIYUNALB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -55,12 +57,9 @@ func TestProvider(t *testing.T) {
LoadbalancerId: fLoadbalancerId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListener", func(t *testing.T) {
@@ -72,11 +71,8 @@ func TestProvider(t *testing.T) {
ListenerId: fListenerId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw_test.go b/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw_test.go
index 48b51c7a4..6e1901daa 100644
--- a/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw_test.go
+++ b/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw_test.go
@@ -3,12 +3,14 @@ package aliyunapigw_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-apigw"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNAPIGW_")
+ fp = it.Args("ALIYUNAPIGW_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -60,11 +62,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn_test.go b/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn_test.go
index 44b9735c6..eb5e96763 100644
--- a/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn_test.go
+++ b/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn_test.go
@@ -3,12 +3,14 @@ package aliyuncdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNCDN_")
+ fp = it.Args("ALIYUNCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb_test.go b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb_test.go
index 5deae8360..696581ef0 100644
--- a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb_test.go
+++ b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb_test.go
@@ -3,12 +3,14 @@ package aliyunclb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-clb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNCLB_")
+ fp = it.Args("ALIYUNCLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -55,12 +57,9 @@ func TestProvider(t *testing.T) {
LoadbalancerId: fLoadbalancerId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListener", func(t *testing.T) {
@@ -73,11 +72,8 @@ func TestProvider(t *testing.T) {
ListenerPort: int32(fListenerPort),
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn_test.go b/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn_test.go
index 4bfa45cea..0eae4fcac 100644
--- a/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn_test.go
+++ b/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn_test.go
@@ -3,12 +3,14 @@ package aliyundcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-dcdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNDCDN_")
+ fp = it.Args("ALIYUNDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro_test.go b/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro_test.go
index 49b0f3fe7..a18058490 100644
--- a/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro_test.go
+++ b/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro_test.go
@@ -3,12 +3,14 @@ package aliyunddospro_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-ddospro"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNDDOSPRO_")
+ fp = it.Args("ALIYUNDDOSPRO_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas_test.go b/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas_test.go
index 639fbb4bf..abf4ba7bb 100644
--- a/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas_test.go
+++ b/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas_test.go
@@ -3,12 +3,14 @@ package aliyunesasaas_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-esa-saas"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNESASAAS_")
+ fp = it.Args("ALIYUNESASAAS_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -52,11 +54,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-esa/aliyun_esa_test.go b/pkg/core/deployer/providers/aliyun-esa/aliyun_esa_test.go
index 60823a3eb..618bf8748 100644
--- a/pkg/core/deployer/providers/aliyun-esa/aliyun_esa_test.go
+++ b/pkg/core/deployer/providers/aliyun-esa/aliyun_esa_test.go
@@ -3,12 +3,14 @@ package aliyunesa_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-esa"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNESA_")
+ fp = it.Args("ALIYUNESA_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -47,11 +49,8 @@ func TestProvider(t *testing.T) {
Region: fRegion,
SiteId: fSiteId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-fc/aliyun_fc_test.go b/pkg/core/deployer/providers/aliyun-fc/aliyun_fc_test.go
index 97819185b..cbd477662 100644
--- a/pkg/core/deployer/providers/aliyun-fc/aliyun_fc_test.go
+++ b/pkg/core/deployer/providers/aliyun-fc/aliyun_fc_test.go
@@ -3,12 +3,14 @@ package aliyunfc_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-fc"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNFC_")
+ fp = it.Args("ALIYUNFC_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -49,11 +51,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga_test.go b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga_test.go
index 4226dabf3..a1e9f1a22 100644
--- a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga_test.go
+++ b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga_test.go
@@ -3,12 +3,14 @@ package aliyunga_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-ga"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNGA_")
+ fp = it.Args("ALIYUNGA_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,12 +53,9 @@ func TestProvider(t *testing.T) {
AcceleratorId: fAcceleratorId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListener", func(t *testing.T) {
@@ -67,11 +66,8 @@ func TestProvider(t *testing.T) {
ListenerId: fListenerId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-live/aliyun_live_test.go b/pkg/core/deployer/providers/aliyun-live/aliyun_live_test.go
index 8441ccb94..c159a7c32 100644
--- a/pkg/core/deployer/providers/aliyun-live/aliyun_live_test.go
+++ b/pkg/core/deployer/providers/aliyun-live/aliyun_live_test.go
@@ -3,12 +3,14 @@ package aliyunlive_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-live"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNLIVE_")
+ fp = it.Args("ALIYUNLIVE_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb_test.go b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb_test.go
index 43364e5a9..2f68d6405 100644
--- a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb_test.go
+++ b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb_test.go
@@ -3,12 +3,14 @@ package aliyunnlb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-nlb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNNLB_")
+ fp = it.Args("ALIYUNNLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,12 +53,9 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER,
LoadbalancerId: fLoadbalancerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListener", func(t *testing.T) {
@@ -67,11 +66,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-oss/aliyun_oss_test.go b/pkg/core/deployer/providers/aliyun-oss/aliyun_oss_test.go
index acf75e897..8e886ef96 100644
--- a/pkg/core/deployer/providers/aliyun-oss/aliyun_oss_test.go
+++ b/pkg/core/deployer/providers/aliyun-oss/aliyun_oss_test.go
@@ -3,12 +3,14 @@ package aliyunoss_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-oss"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNOSS_")
+ fp = it.Args("ALIYUNOSS_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
Bucket: fBucket,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-vod/aliyun_vod_test.go b/pkg/core/deployer/providers/aliyun-vod/aliyun_vod_test.go
index 8682e3448..f37197a90 100644
--- a/pkg/core/deployer/providers/aliyun-vod/aliyun_vod_test.go
+++ b/pkg/core/deployer/providers/aliyun-vod/aliyun_vod_test.go
@@ -3,12 +3,14 @@ package aliyunvod_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-vod"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNVOD_")
+ fp = it.Args("ALIYUNVOD_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aliyun-waf/aliyun_waf_test.go b/pkg/core/deployer/providers/aliyun-waf/aliyun_waf_test.go
index 3e9dc25e7..56e655091 100644
--- a/pkg/core/deployer/providers/aliyun-waf/aliyun_waf_test.go
+++ b/pkg/core/deployer/providers/aliyun-waf/aliyun_waf_test.go
@@ -3,12 +3,14 @@ package aliyunwaf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-waf"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ALIYUNWAF_")
+ fp = it.Args("ALIYUNWAF_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -47,11 +49,8 @@ func TestProvider(t *testing.T) {
Region: fRegion,
InstanceId: fInstanceId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/apisix/apisix_test.go b/pkg/core/deployer/providers/apisix/apisix_test.go
index 1dbcef9f6..61d14d103 100644
--- a/pkg/core/deployer/providers/apisix/apisix_test.go
+++ b/pkg/core/deployer/providers/apisix/apisix_test.go
@@ -3,12 +3,14 @@ package apisix_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/apisix"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("APISIX_")
+ fp = it.Args("APISIX_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -45,11 +47,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aws-alb/aws_alb_test.go b/pkg/core/deployer/providers/aws-alb/aws_alb_test.go
index 5f277940b..d5ca6b1ed 100644
--- a/pkg/core/deployer/providers/aws-alb/aws_alb_test.go
+++ b/pkg/core/deployer/providers/aws-alb/aws_alb_test.go
@@ -3,12 +3,14 @@ package awsalb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-alb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("AWSALB_")
+ fp = it.Args("AWSALB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -52,11 +54,8 @@ func TestProvider(t *testing.T) {
ListenerArn: fListenerArn,
CertificateSource: impl.CERTIFICATE_SOURCE_ACM,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aws-amplify/aws_amplify_test.go b/pkg/core/deployer/providers/aws-amplify/aws_amplify_test.go
index 279464938..b8f461bdb 100644
--- a/pkg/core/deployer/providers/aws-amplify/aws_amplify_test.go
+++ b/pkg/core/deployer/providers/aws-amplify/aws_amplify_test.go
@@ -3,12 +3,14 @@ package awsamplify_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-amplify"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("AWSAMPLIFY_")
+ fp = it.Args("AWSAMPLIFY_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
Domain: fDomain,
CertificateSource: impl.CERTIFICATE_SOURCE_ACM,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aws-apigateway/aws_apigateway_test.go b/pkg/core/deployer/providers/aws-apigateway/aws_apigateway_test.go
index 3d8dd4abf..8b483a981 100644
--- a/pkg/core/deployer/providers/aws-apigateway/aws_apigateway_test.go
+++ b/pkg/core/deployer/providers/aws-apigateway/aws_apigateway_test.go
@@ -3,12 +3,14 @@ package awsapigateway_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-apigateway"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("AWSAPIGATEWAY_")
+ fp = it.Args("AWSAPIGATEWAY_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
Domain: fDomain,
CertificateSource: impl.CERTIFICATE_SOURCE_ACM,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aws-clb/aws_clb_test.go b/pkg/core/deployer/providers/aws-clb/aws_clb_test.go
index 91e666c0e..44957cf3e 100644
--- a/pkg/core/deployer/providers/aws-clb/aws_clb_test.go
+++ b/pkg/core/deployer/providers/aws-clb/aws_clb_test.go
@@ -3,12 +3,14 @@ package awsclb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-clb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("AWSCLB_")
+ fp = it.Args("AWSCLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -52,11 +54,8 @@ func TestProvider(t *testing.T) {
LoadbalancerPort: int32(fLoadbalancerPort),
CertificateSource: impl.CERTIFICATE_SOURCE_ACM,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront_test.go b/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront_test.go
index 71832e17d..7fa8ca992 100644
--- a/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront_test.go
+++ b/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront_test.go
@@ -3,12 +3,14 @@ package awscloudfront_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-cloudfront"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("AWSCLOUDFRONT_")
+ fp = it.Args("AWSCLOUDFRONT_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DistributionId: fDistributionId,
CertificateSource: impl.CERTIFICATE_SOURCE_ACM,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/aws-nlb/aws_nlb_test.go b/pkg/core/deployer/providers/aws-nlb/aws_nlb_test.go
index ddc74784c..624ecc8ca 100644
--- a/pkg/core/deployer/providers/aws-nlb/aws_nlb_test.go
+++ b/pkg/core/deployer/providers/aws-nlb/aws_nlb_test.go
@@ -3,12 +3,14 @@ package awsnlb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-nlb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("AWSNLB_")
+ fp = it.Args("AWSNLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -52,11 +54,8 @@ func TestProvider(t *testing.T) {
ListenerArn: fListenerArn,
CertificateSource: impl.CERTIFICATE_SOURCE_ACM,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go
index 52c4d5d17..559d5d36d 100644
--- a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go
+++ b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go
@@ -3,12 +3,14 @@ package baiducloudappblb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-appblb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAIDUCLOUDAPPBLB_")
+ fp = it.Args("BAIDUCLOUDAPPBLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -52,11 +54,8 @@ func TestProvider(t *testing.T) {
LoadbalancerId: fLoadbalancerId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb_test.go b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb_test.go
index b89fd8726..3e6ee519a 100644
--- a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb_test.go
+++ b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb_test.go
@@ -3,12 +3,14 @@ package baiducloudblb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-blb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAIDUCLOUDBLB_")
+ fp = it.Args("BAIDUCLOUDBLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -52,11 +54,8 @@ func TestProvider(t *testing.T) {
LoadbalancerId: fLoadbalancerId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn_test.go b/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn_test.go
index e2c47d5cf..015913726 100644
--- a/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn_test.go
+++ b/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn_test.go
@@ -3,12 +3,14 @@ package baiducloudcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAIDUCLOUDCDN_")
+ fp = it.Args("BAIDUCLOUDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn_test.go b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn_test.go
index 7b90ab7c6..a70832054 100644
--- a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn_test.go
+++ b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn_test.go
@@ -3,12 +3,14 @@ package baishancdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baishan-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAISHANCDN_")
+ fp = it.Args("BAISHANCDN_")
fTestCertPath string
fTestKeyPath string
fApiToken string
@@ -40,11 +42,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baotapanel-console/baotapanel_console_test.go b/pkg/core/deployer/providers/baotapanel-console/baotapanel_console_test.go
index bf637218a..4f7113b88 100644
--- a/pkg/core/deployer/providers/baotapanel-console/baotapanel_console_test.go
+++ b/pkg/core/deployer/providers/baotapanel-console/baotapanel_console_test.go
@@ -3,12 +3,14 @@ package baotapanelconsole_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanel-console"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAOTAPANELCONSOLE_")
+ fp = it.Args("BAOTAPANELCONSOLE_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -41,11 +43,8 @@ func TestProvider(t *testing.T) {
AllowInsecureConnections: true,
AutoRestart: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baotapanel/baotapanel_test.go b/pkg/core/deployer/providers/baotapanel/baotapanel_test.go
index 0cd599f43..85b532636 100644
--- a/pkg/core/deployer/providers/baotapanel/baotapanel_test.go
+++ b/pkg/core/deployer/providers/baotapanel/baotapanel_test.go
@@ -3,12 +3,14 @@ package baotapanel_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanel"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAOTAPANEL_")
+ fp = it.Args("BAOTAPANEL_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
SiteType: fSiteType,
SiteNames: []string{fSiteName},
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baotapanelgo-console/baotapanelgo_console_test.go b/pkg/core/deployer/providers/baotapanelgo-console/baotapanelgo_console_test.go
index a3f0ef2be..a4fe3f6f8 100644
--- a/pkg/core/deployer/providers/baotapanelgo-console/baotapanelgo_console_test.go
+++ b/pkg/core/deployer/providers/baotapanelgo-console/baotapanelgo_console_test.go
@@ -3,12 +3,14 @@ package baotapanelgoconsole_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanelgo-console"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAOTAPANELGOCONSOLE_")
+ fp = it.Args("BAOTAPANELGOCONSOLE_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -40,11 +42,8 @@ func TestProvider(t *testing.T) {
ApiKey: fApiKey,
AllowInsecureConnections: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baotapanelgo/baotapanelgo_test.go b/pkg/core/deployer/providers/baotapanelgo/baotapanelgo_test.go
index 8109e9565..71912e0af 100644
--- a/pkg/core/deployer/providers/baotapanelgo/baotapanelgo_test.go
+++ b/pkg/core/deployer/providers/baotapanelgo/baotapanelgo_test.go
@@ -3,12 +3,14 @@ package baotapanelgo_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanelgo"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAOTAPANELGO_")
+ fp = it.Args("BAOTAPANELGO_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
SiteType: fSiteType,
SiteNames: []string{fSiteName},
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baotawaf-console/baotawaf_console_test.go b/pkg/core/deployer/providers/baotawaf-console/baotawaf_console_test.go
index 9f9fea680..39590f116 100644
--- a/pkg/core/deployer/providers/baotawaf-console/baotawaf_console_test.go
+++ b/pkg/core/deployer/providers/baotawaf-console/baotawaf_console_test.go
@@ -3,12 +3,14 @@ package baotapanelconsole_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotawaf-console"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAOTAWAFCONSOLE_")
+ fp = it.Args("BAOTAWAFCONSOLE_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -42,11 +44,8 @@ func TestProvider(t *testing.T) {
ApiKey: fApiKey,
AllowInsecureConnections: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/baotawaf/baotawaf_test.go b/pkg/core/deployer/providers/baotawaf/baotawaf_test.go
index cf071bacd..ffbc985f0 100644
--- a/pkg/core/deployer/providers/baotawaf/baotawaf_test.go
+++ b/pkg/core/deployer/providers/baotawaf/baotawaf_test.go
@@ -3,12 +3,14 @@ package baotawaf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotawaf"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BAOTAWAF_")
+ fp = it.Args("BAOTAWAF_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
SiteNames: []string{fSiteName},
SitePort: int32(fSitePort),
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/bunny-cdn/bunny_cdn_test.go b/pkg/core/deployer/providers/bunny-cdn/bunny_cdn_test.go
index 7b086d876..a3d6009ce 100644
--- a/pkg/core/deployer/providers/bunny-cdn/bunny_cdn_test.go
+++ b/pkg/core/deployer/providers/bunny-cdn/bunny_cdn_test.go
@@ -3,12 +3,14 @@ package bunnycdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/bunny-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BUNNYCDN_")
+ fp = it.Args("BUNNYCDN_")
fTestCertPath string
fTestKeyPath string
fApiKey string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
PullZoneId: fPullZoneId,
Hostname: fHostName,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/byteplus-alb/byteplus_alb_test.go b/pkg/core/deployer/providers/byteplus-alb/byteplus_alb_test.go
index 61ee84d22..a8b46c897 100644
--- a/pkg/core/deployer/providers/byteplus-alb/byteplus_alb_test.go
+++ b/pkg/core/deployer/providers/byteplus-alb/byteplus_alb_test.go
@@ -3,12 +3,14 @@ package byteplusalb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-alb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BYTEPLUSALB_")
+ fp = it.Args("BYTEPLUSALB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/byteplus-apig/byteplus_apig_test.go b/pkg/core/deployer/providers/byteplus-apig/byteplus_apig_test.go
index 196d17bba..6e2f5d935 100644
--- a/pkg/core/deployer/providers/byteplus-apig/byteplus_apig_test.go
+++ b/pkg/core/deployer/providers/byteplus-apig/byteplus_apig_test.go
@@ -3,12 +3,14 @@ package byteplusapig_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-apig"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BYTEPLUSAPIG_")
+ fp = it.Args("BYTEPLUSAPIG_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn_test.go b/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn_test.go
index a33e34f0b..f6b830819 100644
--- a/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn_test.go
+++ b/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn_test.go
@@ -3,12 +3,14 @@ package bytepluscdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BYTEPLUSCDN_")
+ fp = it.Args("BYTEPLUSCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretAccessKey: fSecretAccessKey,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/byteplus-clb/byteplus_clb_test.go b/pkg/core/deployer/providers/byteplus-clb/byteplus_clb_test.go
index 92fa6db02..286d34367 100644
--- a/pkg/core/deployer/providers/byteplus-clb/byteplus_clb_test.go
+++ b/pkg/core/deployer/providers/byteplus-clb/byteplus_clb_test.go
@@ -3,12 +3,14 @@ package byteplusclb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-clb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BYTEPLUSCLB_")
+ fp = it.Args("BYTEPLUSCLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/byteplus-medialive/byteplus_medialive_test.go b/pkg/core/deployer/providers/byteplus-medialive/byteplus_medialive_test.go
index fdcdec493..8bc12abcb 100644
--- a/pkg/core/deployer/providers/byteplus-medialive/byteplus_medialive_test.go
+++ b/pkg/core/deployer/providers/byteplus-medialive/byteplus_medialive_test.go
@@ -3,12 +3,14 @@ package byteplusmedialive_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-medialive"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BYTEPLUSMEDIALIVE_")
+ fp = it.Args("BYTEPLUSMEDIALIVE_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/byteplus-tos/byteplus_tos_test.go b/pkg/core/deployer/providers/byteplus-tos/byteplus_tos_test.go
index 3dc1a31ca..9a2b8e2a4 100644
--- a/pkg/core/deployer/providers/byteplus-tos/byteplus_tos_test.go
+++ b/pkg/core/deployer/providers/byteplus-tos/byteplus_tos_test.go
@@ -3,12 +3,14 @@ package byteplustos_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-tos"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("BYTEPLUSTOS_")
+ fp = it.Args("BYTEPLUSTOS_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
Bucket: fBucket,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/cachefly/cachefly_test.go b/pkg/core/deployer/providers/cachefly/cachefly_test.go
index acfeebcb1..8a5e7e2f5 100644
--- a/pkg/core/deployer/providers/cachefly/cachefly_test.go
+++ b/pkg/core/deployer/providers/cachefly/cachefly_test.go
@@ -3,12 +3,14 @@ package cachefly_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/cachefly"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CACHEFLY_")
+ fp = it.Args("CACHEFLY_")
fTestCertPath string
fTestKeyPath string
fApiToken string
@@ -35,11 +37,8 @@ func TestProvider(t *testing.T) {
provider, err := impl.NewDeployer(&impl.DeployerConfig{
ApiToken: fApiToken,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/cdnfly/cdnfly_test.go b/pkg/core/deployer/providers/cdnfly/cdnfly_test.go
index 8d8ac59a7..6e30a861c 100644
--- a/pkg/core/deployer/providers/cdnfly/cdnfly_test.go
+++ b/pkg/core/deployer/providers/cdnfly/cdnfly_test.go
@@ -3,12 +3,14 @@ package cdnfly_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/cdnfly"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CDNFLY_")
+ fp = it.Args("CDNFLY_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -49,11 +51,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/cloudflare-ssl/cloudflare_ssl_test.go b/pkg/core/deployer/providers/cloudflare-ssl/cloudflare_ssl_test.go
index 79455b93a..24edd8f1c 100644
--- a/pkg/core/deployer/providers/cloudflare-ssl/cloudflare_ssl_test.go
+++ b/pkg/core/deployer/providers/cloudflare-ssl/cloudflare_ssl_test.go
@@ -3,12 +3,14 @@ package cloudflaressl_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/cloudflare-ssl"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CLOUDFLARESSL_")
+ fp = it.Args("CLOUDFLARESSL_")
fTestCertPath string
fTestKeyPath string
fApiToken string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
ZoneId: fZoneId,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/cmcccloud-cdn/cmcccloud_cdn_test.go b/pkg/core/deployer/providers/cmcccloud-cdn/cmcccloud_cdn_test.go
index fcb723985..2e4eedbdc 100644
--- a/pkg/core/deployer/providers/cmcccloud-cdn/cmcccloud_cdn_test.go
+++ b/pkg/core/deployer/providers/cmcccloud-cdn/cmcccloud_cdn_test.go
@@ -3,12 +3,14 @@ package cmcccloudcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/cmcccloud-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CMCCCLOUDCDN_")
+ fp = it.Args("CMCCCLOUDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/cmcccloud-vlb/cmcccloud_vlb_test.go b/pkg/core/deployer/providers/cmcccloud-vlb/cmcccloud_vlb_test.go
index 2439f8d99..88d2148a2 100644
--- a/pkg/core/deployer/providers/cmcccloud-vlb/cmcccloud_vlb_test.go
+++ b/pkg/core/deployer/providers/cmcccloud-vlb/cmcccloud_vlb_test.go
@@ -3,12 +3,14 @@ package cmcccloudvlb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/cmcccloud-vlb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CMCCCLOUDVLB_")
+ fp = it.Args("CMCCCLOUDVLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,12 +53,9 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER,
LoadbalancerId: fLoadbalancerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListener", func(t *testing.T) {
@@ -67,11 +66,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/cpanel/cpanel_test.go b/pkg/core/deployer/providers/cpanel/cpanel_test.go
index d8140cd2b..1ca12ab4f 100644
--- a/pkg/core/deployer/providers/cpanel/cpanel_test.go
+++ b/pkg/core/deployer/providers/cpanel/cpanel_test.go
@@ -3,12 +3,14 @@ package cpanel_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/cpanel"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CPANEL_")
+ fp = it.Args("CPANEL_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -49,11 +51,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_WEBSITE,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao_test.go b/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao_test.go
index 4951e09b8..b4e4760c4 100644
--- a/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao_test.go
+++ b/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao_test.go
@@ -3,12 +3,14 @@ package ctcccloudao_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-ao"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CTCCCLOUDAO_")
+ fp = it.Args("CTCCCLOUDAO_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn_test.go b/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn_test.go
index ee29f936b..4f36191a3 100644
--- a/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn_test.go
+++ b/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn_test.go
@@ -3,12 +3,14 @@ package ctcccloudcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CTCCCLOUDCDN_")
+ fp = it.Args("CTCCCLOUDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms_test.go b/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms_test.go
index affc71976..0d6e1d642 100644
--- a/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms_test.go
+++ b/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms_test.go
@@ -3,12 +3,14 @@ package ctcccloudcms_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-cms"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CTCCCLOUDCMS_")
+ fp = it.Args("CTCCCLOUDCMS_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
AccessKeyId: fAccessKeyId,
SecretAccessKey: fSecretAccessKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb_test.go b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb_test.go
index ea6e76a2e..eea8851b5 100644
--- a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb_test.go
+++ b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb_test.go
@@ -3,12 +3,14 @@ package ctcccloudelb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-elb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CTCCCLOUDELB_")
+ fp = it.Args("CTCCCLOUDELB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,12 +53,9 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER,
LoadbalancerId: fLoadbalancerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListener", func(t *testing.T) {
@@ -67,11 +66,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas_test.go b/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas_test.go
index 7a10843fb..efbafb738 100644
--- a/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas_test.go
+++ b/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas_test.go
@@ -3,12 +3,14 @@ package ctcccloudfaas_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-faas"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CTCCCLOUDFAAS_")
+ fp = it.Args("CTCCCLOUDFAAS_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -47,11 +49,8 @@ func TestProvider(t *testing.T) {
RegionId: fRegionId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn_test.go b/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn_test.go
index d5894440d..17955e098 100644
--- a/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn_test.go
+++ b/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn_test.go
@@ -3,12 +3,14 @@ package ctcccloudicdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-icdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CTCCCLOUDCDN_")
+ fp = it.Args("CTCCCLOUDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn_test.go b/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn_test.go
index a6b7a3267..0e6166334 100644
--- a/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn_test.go
+++ b/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn_test.go
@@ -3,12 +3,14 @@ package ctcccloudlvdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-lvdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("CTCCCLOUDLVDN_")
+ fp = it.Args("CTCCCLOUDLVDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn_test.go b/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn_test.go
index 03f6b705f..c0bd7f283 100644
--- a/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn_test.go
+++ b/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn_test.go
@@ -3,12 +3,14 @@ package dogecloudcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/dogecloud-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("DOGECLOUDCDN_")
+ fp = it.Args("DOGECLOUDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKey string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretKey: fSecretKey,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/flexcdn/flexcdn_test.go b/pkg/core/deployer/providers/flexcdn/flexcdn_test.go
index d34207509..128cd10a7 100644
--- a/pkg/core/deployer/providers/flexcdn/flexcdn_test.go
+++ b/pkg/core/deployer/providers/flexcdn/flexcdn_test.go
@@ -3,12 +3,14 @@ package flexcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/flexcdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("FLEXCDN_")
+ fp = it.Args("FLEXCDN_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -50,11 +52,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/flyio/flyio_test.go b/pkg/core/deployer/providers/flyio/flyio_test.go
index ca42dfd21..c22f7cb73 100644
--- a/pkg/core/deployer/providers/flyio/flyio_test.go
+++ b/pkg/core/deployer/providers/flyio/flyio_test.go
@@ -3,12 +3,14 @@ package flyio_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/flyio"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("FLYIO_")
+ fp = it.Args("FLYIO_")
fTestCertPath string
fTestKeyPath string
fApiToken string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
AppName: fAppName,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ftp/ftp_test.go b/pkg/core/deployer/providers/ftp/ftp_test.go
index e3f640a8c..db0c8273b 100644
--- a/pkg/core/deployer/providers/ftp/ftp_test.go
+++ b/pkg/core/deployer/providers/ftp/ftp_test.go
@@ -3,12 +3,14 @@ package ftp_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ftp"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("FTP_")
+ fp = it.Args("FTP_")
fTestCertPath string
fTestKeyPath string
fFtpHost string
@@ -56,11 +58,8 @@ func TestProvider(t *testing.T) {
FilePathForCrt: fFilePathForCrt + ".pem",
FilePathForKey: fFilePathForKey + ".pem",
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/gcore-cdn/gcore_cdn_test.go b/pkg/core/deployer/providers/gcore-cdn/gcore_cdn_test.go
index 30044d1c3..4c114296a 100644
--- a/pkg/core/deployer/providers/gcore-cdn/gcore_cdn_test.go
+++ b/pkg/core/deployer/providers/gcore-cdn/gcore_cdn_test.go
@@ -3,12 +3,14 @@ package gcorecdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/gcore-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("GCORECDN_")
+ fp = it.Args("GCORECDN_")
fTestCertPath string
fTestKeyPath string
fApiToken string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
ApiToken: fApiToken,
ResourceId: fResourceId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/goedge/goedge_test.go b/pkg/core/deployer/providers/goedge/goedge_test.go
index 4d422c4ce..65c34ff85 100644
--- a/pkg/core/deployer/providers/goedge/goedge_test.go
+++ b/pkg/core/deployer/providers/goedge/goedge_test.go
@@ -3,12 +3,14 @@ package goedge_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/goedge"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("GOEDGE_")
+ fp = it.Args("GOEDGE_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -50,11 +52,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad_test.go b/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad_test.go
index d0b246709..32936f96c 100644
--- a/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad_test.go
+++ b/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad_test.go
@@ -3,12 +3,14 @@ package huaweicloudaad_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-aad"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDAAD_")
+ fp = it.Args("HUAWEICLOUDAAD_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig_test.go b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig_test.go
index 8bb560eaa..3cf151190 100644
--- a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig_test.go
+++ b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig_test.go
@@ -3,12 +3,14 @@ package huaweicloudapig_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-apig"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDAPIG_")
+ fp = it.Args("HUAWEICLOUDAPIG_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn_test.go b/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn_test.go
index 419277094..61b48373a 100644
--- a/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn_test.go
+++ b/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn_test.go
@@ -3,12 +3,14 @@ package huaweicloudcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDCDN_")
+ fp = it.Args("HUAWEICLOUDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb_test.go b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb_test.go
index 7f516a2cd..3091213d7 100644
--- a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb_test.go
+++ b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb_test.go
@@ -3,12 +3,14 @@ package huaweicloudelb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-elb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDELB_")
+ fp = it.Args("HUAWEICLOUDELB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -54,12 +56,9 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER,
LoadbalancerId: fLoadbalancerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListenerId", func(t *testing.T) {
@@ -70,12 +69,9 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToCertificate", func(t *testing.T) {
@@ -86,11 +82,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live_test.go b/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live_test.go
index b2691e396..8b21aa283 100644
--- a/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live_test.go
+++ b/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live_test.go
@@ -3,12 +3,14 @@ package huaweicloudlive_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-live"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDLIVE_")
+ fp = it.Args("HUAWEICLOUDLIVE_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs_test.go b/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs_test.go
index 815486c6a..67f87ffa7 100644
--- a/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs_test.go
+++ b/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs_test.go
@@ -3,12 +3,14 @@ package huaweicloudobs_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-obs"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDOBS_")
+ fp = it.Args("HUAWEICLOUDOBS_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
Bucket: fBucket,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/huaweicloud-vod/huaweicloud_vod_test.go b/pkg/core/deployer/providers/huaweicloud-vod/huaweicloud_vod_test.go
index c7927b3c7..6aa71e676 100644
--- a/pkg/core/deployer/providers/huaweicloud-vod/huaweicloud_vod_test.go
+++ b/pkg/core/deployer/providers/huaweicloud-vod/huaweicloud_vod_test.go
@@ -3,12 +3,14 @@ package huaweicloudvod_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-vod"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDVOD_")
+ fp = it.Args("HUAWEICLOUDVOD_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf_test.go b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf_test.go
index 1cf24fac0..d7a666b6f 100644
--- a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf_test.go
+++ b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf_test.go
@@ -3,12 +3,14 @@ package huaweicloudwaf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-waf"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("HUAWEICLOUDWAF_")
+ fp = it.Args("HUAWEICLOUDWAF_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_PREMIUMHOST,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb_test.go b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb_test.go
index 295ca2294..dac86be63 100644
--- a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb_test.go
+++ b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb_test.go
@@ -3,12 +3,14 @@ package jdcloudalb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-alb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("JDCLOUDALB_")
+ fp = it.Args("JDCLOUDALB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,12 +53,9 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER,
LoadbalancerId: fLoadbalancerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListener", func(t *testing.T) {
@@ -67,11 +66,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn_test.go b/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn_test.go
index 64307849d..014018d5d 100644
--- a/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn_test.go
+++ b/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn_test.go
@@ -3,12 +3,14 @@ package jdcloudcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("JDCLOUDCDN_")
+ fp = it.Args("JDCLOUDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/jdcloud-live/jdcloud_live_test.go b/pkg/core/deployer/providers/jdcloud-live/jdcloud_live_test.go
index 5578369c9..4a79c665a 100644
--- a/pkg/core/deployer/providers/jdcloud-live/jdcloud_live_test.go
+++ b/pkg/core/deployer/providers/jdcloud-live/jdcloud_live_test.go
@@ -3,12 +3,14 @@ package jdcloudlive_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-live"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("JDCLOUDLIVE_")
+ fp = it.Args("JDCLOUDLIVE_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod_test.go b/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod_test.go
index 1293c16e9..952bc89cf 100644
--- a/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod_test.go
+++ b/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod_test.go
@@ -3,12 +3,14 @@ package jdcloudvod_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-vod"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("JDCLOUDVOD_")
+ fp = it.Args("JDCLOUDVOD_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf_test.go b/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf_test.go
index fa96a5159..743ca880d 100644
--- a/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf_test.go
+++ b/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf_test.go
@@ -3,12 +3,14 @@ package jdcloudwaf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-waf"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("JDCLOUDWAF_")
+ fp = it.Args("JDCLOUDWAF_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -47,11 +49,8 @@ func TestProvider(t *testing.T) {
InstanceId: fInstanceId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/k8s-secret/k8s_secret_test.go b/pkg/core/deployer/providers/k8s-secret/k8s_secret_test.go
index f63f14484..005a5cba9 100644
--- a/pkg/core/deployer/providers/k8s-secret/k8s_secret_test.go
+++ b/pkg/core/deployer/providers/k8s-secret/k8s_secret_test.go
@@ -4,12 +4,14 @@ import (
"os"
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/k8s-secret"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("K8SSECRET_")
+ fp = it.Args("K8SSECRET_")
fTestCertPath string
fTestKeyPath string
fKubeConfig string
@@ -57,11 +59,8 @@ func TestProvider(t *testing.T) {
SecretDataKeyForCrt: fSecretDataKeyForCrt,
SecretDataKeyForKey: fSecretDataKeyForKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/kong/kong_test.go b/pkg/core/deployer/providers/kong/kong_test.go
index 5d0e28a48..dca330d69 100644
--- a/pkg/core/deployer/providers/kong/kong_test.go
+++ b/pkg/core/deployer/providers/kong/kong_test.go
@@ -3,12 +3,14 @@ package kong_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/kong"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("KONG_")
+ fp = it.Args("KONG_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -45,11 +47,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn_test.go b/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn_test.go
index 76db6fc60..1fea31028 100644
--- a/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn_test.go
+++ b/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn_test.go
@@ -3,12 +3,14 @@ package ksyuncdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ksyun-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("KSYUNCDN_")
+ fp = it.Args("KSYUNCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,12 +50,9 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToCertificate", func(t *testing.T) {
@@ -63,11 +62,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ksyun-slb/ksyun_slb_test.go b/pkg/core/deployer/providers/ksyun-slb/ksyun_slb_test.go
index 18db03922..05037db6c 100644
--- a/pkg/core/deployer/providers/ksyun-slb/ksyun_slb_test.go
+++ b/pkg/core/deployer/providers/ksyun-slb/ksyun_slb_test.go
@@ -3,12 +3,14 @@ package ksyunslb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ksyun-slb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("KSYUNSLB_")
+ fp = it.Args("KSYUNSLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/lecdn/lecdn_test.go b/pkg/core/deployer/providers/lecdn/lecdn_test.go
index e068c5bc1..32b960d7c 100644
--- a/pkg/core/deployer/providers/lecdn/lecdn_test.go
+++ b/pkg/core/deployer/providers/lecdn/lecdn_test.go
@@ -3,12 +3,14 @@ package lecdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/lecdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("LECDN_")
+ fp = it.Args("LECDN_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -53,11 +55,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/linode-los/linode_los_test.go b/pkg/core/deployer/providers/linode-los/linode_los_test.go
index c20ab0d24..254ce85a1 100644
--- a/pkg/core/deployer/providers/linode-los/linode_los_test.go
+++ b/pkg/core/deployer/providers/linode-los/linode_los_test.go
@@ -3,12 +3,14 @@ package linodelos_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/linode-los"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("LINODELOS_")
+ fp = it.Args("LINODELOS_")
fTestCertPath string
fTestKeyPath string
fApiToken string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
RegionId: fRegionId,
Bucket: fBucket,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/local/local_test.go b/pkg/core/deployer/providers/local/local_test.go
index 511f91fe5..46b079aae 100644
--- a/pkg/core/deployer/providers/local/local_test.go
+++ b/pkg/core/deployer/providers/local/local_test.go
@@ -3,12 +3,14 @@ package local_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/local"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("LOCAL_")
+ fp = it.Args("LOCAL_")
fTestCertPath string
fTestKeyPath string
fFilePathForCrt string
@@ -67,12 +69,9 @@ func TestProvider(t *testing.T) {
PreCommand: fPreCommand,
PostCommand: fPostCommand,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_PFX", func(t *testing.T) {
@@ -82,12 +81,9 @@ func TestProvider(t *testing.T) {
PfxPassword: fPfxPassword,
PfxEncoder: fPfxEncoder,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_JKS", func(t *testing.T) {
@@ -98,11 +94,8 @@ func TestProvider(t *testing.T) {
JksKeypass: fJksKeypass,
JksStorepass: fJksStorepass,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/mohua-mvh/mohua_mvh_test.go b/pkg/core/deployer/providers/mohua-mvh/mohua_mvh_test.go
index ee9b37d56..e9797dedf 100644
--- a/pkg/core/deployer/providers/mohua-mvh/mohua_mvh_test.go
+++ b/pkg/core/deployer/providers/mohua-mvh/mohua_mvh_test.go
@@ -3,12 +3,14 @@ package mohuamvh_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/mohua-mvh"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("MOHUAMVH_")
+ fp = it.Args("MOHUAMVH_")
fTestCertPath string
fTestKeyPath string
fUsername string
@@ -47,11 +49,8 @@ func TestProvider(t *testing.T) {
HostId: fHostId,
DomainId: fDomainId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/netlify/netlify_test.go b/pkg/core/deployer/providers/netlify/netlify_test.go
index 719122cb8..079752e2b 100644
--- a/pkg/core/deployer/providers/netlify/netlify_test.go
+++ b/pkg/core/deployer/providers/netlify/netlify_test.go
@@ -3,12 +3,14 @@ package netlify_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/netlify"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("NETLIFY_")
+ fp = it.Args("NETLIFY_")
fTestCertPath string
fTestKeyPath string
fApiToken string
@@ -40,11 +42,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_WEBSITE,
SiteId: fSiteId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager_test.go b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager_test.go
index d71da2564..2a39a81e9 100644
--- a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager_test.go
+++ b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager_test.go
@@ -3,12 +3,14 @@ package nginxproxymanager_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/nginxproxymanager"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("NGINXPROXYMANAGER_")
+ fp = it.Args("NGINXPROXYMANAGER_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -54,11 +56,8 @@ func TestProvider(t *testing.T) {
HostMatchPattern: impl.HOST_MATCH_PATTERN_SPECIFIED,
HostId: fHostId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/proxmoxve/proxmoxve_test.go b/pkg/core/deployer/providers/proxmoxve/proxmoxve_test.go
index 8fdde94a9..d6e63dd47 100644
--- a/pkg/core/deployer/providers/proxmoxve/proxmoxve_test.go
+++ b/pkg/core/deployer/providers/proxmoxve/proxmoxve_test.go
@@ -3,12 +3,14 @@ package proxmoxve_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/proxmoxve"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("PROXMOXVE_")
+ fp = it.Args("PROXMOXVE_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -49,11 +51,8 @@ func TestProvider(t *testing.T) {
NodeName: fNodeName,
AutoRestart: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/qingcloud-lb/qingcloud_lb_test.go b/pkg/core/deployer/providers/qingcloud-lb/qingcloud_lb_test.go
index 9f7b457a6..db378759b 100644
--- a/pkg/core/deployer/providers/qingcloud-lb/qingcloud_lb_test.go
+++ b/pkg/core/deployer/providers/qingcloud-lb/qingcloud_lb_test.go
@@ -3,12 +3,14 @@ package qingcloudlb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/qingcloud-lb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("QINGCLOUDLB_")
+ fp = it.Args("QINGCLOUDLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -52,12 +54,9 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER,
LoadbalancerId: fLoadbalancerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListenerId", func(t *testing.T) {
@@ -68,11 +67,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn_test.go b/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn_test.go
index 15a5f0e71..d41d15698 100644
--- a/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn_test.go
+++ b/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn_test.go
@@ -3,12 +3,14 @@ package qiniucdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/qiniu-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("QINIUCDN_")
+ fp = it.Args("QINIUCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKey string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo_test.go b/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo_test.go
index cc514bff0..dc9452bd9 100644
--- a/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo_test.go
+++ b/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo_test.go
@@ -3,12 +3,14 @@ package qiniukodo_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/qiniu-kodo"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("QINIUKODO_")
+ fp = it.Args("QINIUKODO_")
fTestCertPath string
fTestKeyPath string
fAccessKey string
@@ -47,11 +49,8 @@ func TestProvider(t *testing.T) {
Bucket: fBucket,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/qiniu-pili/qiniu_pili_test.go b/pkg/core/deployer/providers/qiniu-pili/qiniu_pili_test.go
index a3f5484e5..9743c21e9 100644
--- a/pkg/core/deployer/providers/qiniu-pili/qiniu_pili_test.go
+++ b/pkg/core/deployer/providers/qiniu-pili/qiniu_pili_test.go
@@ -3,12 +3,14 @@ package qiniupili_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/qiniu-pili"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("QINIUPILI_")
+ fp = it.Args("QINIUPILI_")
fTestCertPath string
fTestKeyPath string
fAccessKey string
@@ -47,11 +49,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn_test.go b/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn_test.go
index 050be059b..a567e53bf 100644
--- a/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn_test.go
+++ b/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn_test.go
@@ -3,12 +3,14 @@ package rainyunrcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/rainyun-rcdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("RAINYUNRCDN_")
+ fp = it.Args("RAINYUNRCDN_")
fTestCertPath string
fTestKeyPath string
fApiKey string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter_test.go b/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter_test.go
index 574d65b48..148c04596 100644
--- a/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter_test.go
+++ b/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter_test.go
@@ -3,12 +3,14 @@ package rainyunsslcenter_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/rainyun-sslcenter"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("RAINYUNSSLCENTER_")
+ fp = it.Args("RAINYUNSSLCENTER_")
fTestCertPath string
fTestKeyPath string
fApiKey string
@@ -35,11 +37,8 @@ func TestProvider(t *testing.T) {
provider, err := impl.NewDeployer(&impl.DeployerConfig{
ApiKey: fApiKey,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ratpanel-console/ratpanel_console_test.go b/pkg/core/deployer/providers/ratpanel-console/ratpanel_console_test.go
index 799043a45..e8235855d 100644
--- a/pkg/core/deployer/providers/ratpanel-console/ratpanel_console_test.go
+++ b/pkg/core/deployer/providers/ratpanel-console/ratpanel_console_test.go
@@ -3,12 +3,14 @@ package ratpanelconsole_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ratpanel-console"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("RATPANELCONSOLE_")
+ fp = it.Args("RATPANELCONSOLE_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
AccessToken: fAccessToken,
AllowInsecureConnections: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ratpanel/ratpanel_test.go b/pkg/core/deployer/providers/ratpanel/ratpanel_test.go
index d137f3e13..3579d5414 100644
--- a/pkg/core/deployer/providers/ratpanel/ratpanel_test.go
+++ b/pkg/core/deployer/providers/ratpanel/ratpanel_test.go
@@ -3,12 +3,14 @@ package ratpanel_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ratpanel"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("RATPANEL_")
+ fp = it.Args("RATPANEL_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -49,11 +51,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_WEBSITE,
SiteNames: []string{fSiteName},
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/s3/s3_test.go b/pkg/core/deployer/providers/s3/s3_test.go
index 6e24bd249..aec61ae83 100644
--- a/pkg/core/deployer/providers/s3/s3_test.go
+++ b/pkg/core/deployer/providers/s3/s3_test.go
@@ -3,12 +3,14 @@ package s3_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/s3"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("S3_")
+ fp = it.Args("S3_")
fTestCertPath string
fTestKeyPath string
fSshHost string
@@ -60,11 +62,8 @@ func TestProvider(t *testing.T) {
ObjectKeyForCrt: fObjectKeyForCrt + ".pem",
ObjectKeyForKey: fObjectKeyForKey + ".pem",
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/safeline/safeline_test.go b/pkg/core/deployer/providers/safeline/safeline_test.go
index 705f67e05..009d9913a 100644
--- a/pkg/core/deployer/providers/safeline/safeline_test.go
+++ b/pkg/core/deployer/providers/safeline/safeline_test.go
@@ -3,12 +3,14 @@ package safeline_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/safeline"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("SAFELINE_")
+ fp = it.Args("SAFELINE_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -45,11 +47,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/samwaf-console/samwaf_console_test.go b/pkg/core/deployer/providers/samwaf-console/samwaf_console_test.go
index c8379e834..ce179875a 100644
--- a/pkg/core/deployer/providers/samwaf-console/samwaf_console_test.go
+++ b/pkg/core/deployer/providers/samwaf-console/samwaf_console_test.go
@@ -3,12 +3,14 @@ package samwafconsole_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/samwaf-console"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("SAMWAFCONSOLE_")
+ fp = it.Args("SAMWAFCONSOLE_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -42,11 +44,8 @@ func TestProvider(t *testing.T) {
AllowInsecureConnections: true,
AutoRestart: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/samwaf/samwaf_test.go b/pkg/core/deployer/providers/samwaf/samwaf_test.go
index cf5a2befa..a2e3e0e6b 100644
--- a/pkg/core/deployer/providers/samwaf/samwaf_test.go
+++ b/pkg/core/deployer/providers/samwaf/samwaf_test.go
@@ -3,12 +3,14 @@ package samwaf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/samwaf"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("SAMWAF_")
+ fp = it.Args("SAMWAF_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -45,11 +47,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ssh/ssh_test.go b/pkg/core/deployer/providers/ssh/ssh_test.go
index f673a642e..633e67251 100644
--- a/pkg/core/deployer/providers/ssh/ssh_test.go
+++ b/pkg/core/deployer/providers/ssh/ssh_test.go
@@ -3,12 +3,14 @@ package ssh_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ssh"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("SSH_")
+ fp = it.Args("SSH_")
fTestCertPath string
fTestKeyPath string
fSshHost string
@@ -58,11 +60,8 @@ func TestProvider(t *testing.T) {
FilePathForCrt: fFilePathForCrt + ".pem",
FilePathForKey: fFilePathForKey + ".pem",
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/synologydsm/synologydsm_test.go b/pkg/core/deployer/providers/synologydsm/synologydsm_test.go
index 268556790..d6ea4ed44 100644
--- a/pkg/core/deployer/providers/synologydsm/synologydsm_test.go
+++ b/pkg/core/deployer/providers/synologydsm/synologydsm_test.go
@@ -3,12 +3,14 @@ package synologydsm_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/synologydsm"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("SYNOLOGYDSM_")
+ fp = it.Args("SYNOLOGYDSM_")
fTestCertPath string
fTestKeyPath string
fServerUrl string
@@ -55,11 +57,8 @@ func TestProvider(t *testing.T) {
CertificateIdOrDescription: fCertificateIdOrDesc,
IsDefault: fIsDefault,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn_test.go b/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn_test.go
index 402d3b9e7..a1f9c0f55 100644
--- a/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn_test.go
@@ -3,12 +3,14 @@ package tencentcloudcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDCDN_")
+ fp = it.Args("TENCENTCLOUDCDN_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb_test.go b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb_test.go
index 8072b7cd2..d4e4787ab 100644
--- a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb_test.go
@@ -3,12 +3,14 @@ package tencentcloudclb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-clb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDCLB_")
+ fp = it.Args("TENCENTCLOUDCLB_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -54,12 +56,9 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER,
LoadbalancerId: fLoadbalancerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToListener", func(t *testing.T) {
@@ -71,12 +70,9 @@ func TestProvider(t *testing.T) {
LoadbalancerId: fLoadbalancerId,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToRuleDomain", func(t *testing.T) {
@@ -89,11 +85,8 @@ func TestProvider(t *testing.T) {
ListenerId: fListenerId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos_test.go b/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos_test.go
index 88c22865c..eb88c5198 100644
--- a/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos_test.go
@@ -3,12 +3,14 @@ package tencentcloudcos_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-cos"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDCOS_")
+ fp = it.Args("TENCENTCLOUDCOS_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
Bucket: fBucket,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css_test.go b/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css_test.go
index 9167d7273..e98a13990 100644
--- a/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css_test.go
@@ -3,12 +3,14 @@ package tencentcloudcss_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-css"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDCSS_")
+ fp = it.Args("TENCENTCLOUDCSS_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
SecretKey: fSecretKey,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn_test.go b/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn_test.go
index c3680fea1..655fe78ec 100644
--- a/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn_test.go
@@ -3,12 +3,14 @@ package tencentcloudecdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ecdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDECDN_")
+ fp = it.Args("TENCENTCLOUDECDN_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo_test.go b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo_test.go
index 23117972c..74393a609 100644
--- a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo_test.go
@@ -4,12 +4,14 @@ import (
"strings"
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-eo"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDEO_")
+ fp = it.Args("TENCENTCLOUDEO_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -50,11 +52,8 @@ func TestProvider(t *testing.T) {
Domains: strings.Split(fDomains, ";"),
EnableMultipleSSL: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-eomakers/tencentcloud_eomakers_test.go b/pkg/core/deployer/providers/tencentcloud-eomakers/tencentcloud_eomakers_test.go
index 8c8677b3d..fa1e0d6bb 100644
--- a/pkg/core/deployer/providers/tencentcloud-eomakers/tencentcloud_eomakers_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-eomakers/tencentcloud_eomakers_test.go
@@ -4,12 +4,14 @@ import (
"strings"
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-eomakers"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDEOMAKERS_")
+ fp = it.Args("TENCENTCLOUDEOMAKERS_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -54,11 +56,8 @@ func TestProvider(t *testing.T) {
Domains: strings.Split(fDomains, ";"),
EnableMultipleSSL: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-ga2/tencentcloud_ga2_test.go b/pkg/core/deployer/providers/tencentcloud-ga2/tencentcloud_ga2_test.go
index 5f2a1fce6..78cdfd557 100644
--- a/pkg/core/deployer/providers/tencentcloud-ga2/tencentcloud_ga2_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-ga2/tencentcloud_ga2_test.go
@@ -3,12 +3,14 @@ package tencentcloudga2_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ga2"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDGA2_")
+ fp = it.Args("TENCENTCLOUDGA2_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
AcceleratorId: fAcceleratorId,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap_test.go b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap_test.go
index cf95eea68..1ae0d1e68 100644
--- a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap_test.go
@@ -3,12 +3,14 @@ package tencentcloudgaap_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-gaap"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUGAAP_")
+ fp = it.Args("TENCENTCLOUGAAP_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
ProxyId: fProxyId,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf_test.go b/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf_test.go
index 610f35571..1b3e3ad49 100644
--- a/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf_test.go
@@ -3,12 +3,14 @@ package tencentcloudscf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-scf"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDSCF_")
+ fp = it.Args("TENCENTCLOUDSCF_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod_test.go b/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod_test.go
index e16532bcb..9c7423bc7 100644
--- a/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod_test.go
@@ -3,12 +3,14 @@ package tencentcloudvod_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-vod"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDVOD_")
+ fp = it.Args("TENCENTCLOUDVOD_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -50,11 +52,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf_test.go b/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf_test.go
index ee5276e4f..3d7e2f972 100644
--- a/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf_test.go
+++ b/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf_test.go
@@ -3,12 +3,14 @@ package tencentcloudwaf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-waf"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("TENCENTCLOUDWAF_")
+ fp = it.Args("TENCENTCLOUDWAF_")
fTestCertPath string
fTestKeyPath string
fSecretId string
@@ -55,11 +57,8 @@ func TestProvider(t *testing.T) {
Domain: fDomain,
DomainId: fDomainId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb_test.go b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb_test.go
index c81622acf..2df965a5d 100644
--- a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb_test.go
+++ b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb_test.go
@@ -3,12 +3,14 @@ package ucloudualb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-ualb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("UCLOUDUALB_")
+ fp = it.Args("UCLOUDUALB_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -52,11 +54,8 @@ func TestProvider(t *testing.T) {
LoadbalancerId: fLoadbalancerId,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn_test.go b/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn_test.go
index c48f77328..aea04a87d 100644
--- a/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn_test.go
+++ b/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn_test.go
@@ -3,12 +3,14 @@ package uclouducdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-ucdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("UCLOUDUCDN_")
+ fp = it.Args("UCLOUDUCDN_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
PublicKey: fPublicKey,
DomainId: fDomainId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb_test.go b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb_test.go
index 6a9372448..fa9189783 100644
--- a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb_test.go
+++ b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb_test.go
@@ -3,12 +3,14 @@ package uclouduclb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-uclb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("UCLOUDUCLB_")
+ fp = it.Args("UCLOUDUCLB_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -52,11 +54,8 @@ func TestProvider(t *testing.T) {
LoadbalancerId: fLoadbalancerId,
VServerId: fVServerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf_test.go b/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf_test.go
index 27d3dfeff..bfe7b0122 100644
--- a/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf_test.go
+++ b/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf_test.go
@@ -3,12 +3,14 @@ package uclouduewaf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-uewaf"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("UCLOUDUEWAF_")
+ fp = it.Args("UCLOUDUEWAF_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
PublicKey: fPublicKey,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx_test.go b/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx_test.go
index a5010b7ba..067b6a704 100644
--- a/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx_test.go
+++ b/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx_test.go
@@ -3,12 +3,14 @@ package ucloudupathx_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-upathx"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("UCLOUDUPATHX_")
+ fp = it.Args("UCLOUDUPATHX_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -49,11 +51,8 @@ func TestProvider(t *testing.T) {
AcceleratorId: fAcceleratorId,
ListenerPort: int32(fListenerPort),
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/ucloud-us3/ucloud_us3_test.go b/pkg/core/deployer/providers/ucloud-us3/ucloud_us3_test.go
index 02fa17038..5e7acdbcd 100644
--- a/pkg/core/deployer/providers/ucloud-us3/ucloud_us3_test.go
+++ b/pkg/core/deployer/providers/ucloud-us3/ucloud_us3_test.go
@@ -3,12 +3,14 @@ package ucloudus3_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-us3"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("UCLOUDUS3_")
+ fp = it.Args("UCLOUDUS3_")
fTestCertPath string
fTestKeyPath string
fPrivateKey string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
Bucket: fBucket,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/unicloud-webhost/unicloud_webhost_test.go b/pkg/core/deployer/providers/unicloud-webhost/unicloud_webhost_test.go
index 931005654..202d28b36 100644
--- a/pkg/core/deployer/providers/unicloud-webhost/unicloud_webhost_test.go
+++ b/pkg/core/deployer/providers/unicloud-webhost/unicloud_webhost_test.go
@@ -3,12 +3,14 @@ package unicloudwebhost_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/unicloud-webhost"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("UNICLOUDWEBHOST_")
+ fp = it.Args("UNICLOUDWEBHOST_")
fTestCertPath string
fTestKeyPath string
fUsername string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
SpaceId: fSpaceId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/upyun-cdn/upyun_cdn_test.go b/pkg/core/deployer/providers/upyun-cdn/upyun_cdn_test.go
index e9a72f5ad..3d40ad283 100644
--- a/pkg/core/deployer/providers/upyun-cdn/upyun_cdn_test.go
+++ b/pkg/core/deployer/providers/upyun-cdn/upyun_cdn_test.go
@@ -3,12 +3,14 @@ package upyuncdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/upyun-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("UPYUNCDN_")
+ fp = it.Args("UPYUNCDN_")
fTestCertPath string
fTestKeyPath string
fUsername string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
Password: fPassword,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/upyun-file/upyun_file_test.go b/pkg/core/deployer/providers/upyun-file/upyun_file_test.go
index d23e49a69..635aa2e32 100644
--- a/pkg/core/deployer/providers/upyun-file/upyun_file_test.go
+++ b/pkg/core/deployer/providers/upyun-file/upyun_file_test.go
@@ -3,12 +3,14 @@ package upyunfile_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/upyun-file"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("UPYUNFILE_")
+ fp = it.Args("UPYUNFILE_")
fTestCertPath string
fTestKeyPath string
fUsername string
@@ -47,11 +49,8 @@ func TestProvider(t *testing.T) {
Bucket: fBucket,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/vercel/vercel_test.go b/pkg/core/deployer/providers/vercel/vercel_test.go
index 326c1f1e7..fbe8d129f 100644
--- a/pkg/core/deployer/providers/vercel/vercel_test.go
+++ b/pkg/core/deployer/providers/vercel/vercel_test.go
@@ -3,12 +3,14 @@ package vercel_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/vercel"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VERCEL_")
+ fp = it.Args("VERCEL_")
fTestCertPath string
fTestKeyPath string
fApiAccessToken string
@@ -39,11 +41,8 @@ func TestProvider(t *testing.T) {
ApiAccessToken: fApiAccessToken,
TeamId: fTeamId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 289964522..71faef9c6 100644
--- a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go
+++ b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go
@@ -3,12 +3,14 @@ package volcenginealb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-alb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINEALB_")
+ fp = it.Args("VOLCENGINEALB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 8165a3af6..d3210c60a 100644
--- a/pkg/core/deployer/providers/volcengine-apig/volcengine_apig_test.go
+++ b/pkg/core/deployer/providers/volcengine-apig/volcengine_apig_test.go
@@ -3,12 +3,14 @@ package volcengineapig_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-apig"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINEAPIG_")
+ fp = it.Args("VOLCENGINEAPIG_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 4c85e0e61..9d98219cb 100644
--- a/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn_test.go
+++ b/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn_test.go
@@ -3,12 +3,14 @@ package volcenginecdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINECDN_")
+ fp = it.Args("VOLCENGINECDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 1d5ed418a..ed6bde0e3 100644
--- a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go
+++ b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go
@@ -3,12 +3,14 @@ package volcengineclb_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-clb"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINECLB_")
+ fp = it.Args("VOLCENGINECLB_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,11 +50,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_LISTENER,
ListenerId: fListenerId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 2f79f926f..2690af806 100644
--- a/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn_test.go
+++ b/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn_test.go
@@ -3,12 +3,14 @@ package volcenginedcdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-dcdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINEDCDN_")
+ fp = it.Args("VOLCENGINEDCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 8590be3da..33d57a8ec 100644
--- a/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex_test.go
+++ b/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex_test.go
@@ -3,12 +3,14 @@ package volcengineimagex_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-imagex"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINEIMAGEX_")
+ fp = it.Args("VOLCENGINEIMAGEX_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
ServiceId: fServiceId,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 ca12e46b7..38667475f 100644
--- a/pkg/core/deployer/providers/volcengine-live/volcengine_live_test.go
+++ b/pkg/core/deployer/providers/volcengine-live/volcengine_live_test.go
@@ -3,12 +3,14 @@ package volcenginelive_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-live"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINELIVE_")
+ fp = it.Args("VOLCENGINELIVE_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -44,11 +46,8 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 26086f48e..c770fee13 100644
--- a/pkg/core/deployer/providers/volcengine-tos/volcengine_tos_test.go
+++ b/pkg/core/deployer/providers/volcengine-tos/volcengine_tos_test.go
@@ -3,12 +3,14 @@ package volcenginetos_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-tos"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINETOS_")
+ fp = it.Args("VOLCENGINETOS_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
Bucket: fBucket,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 8ec7fc15c..34df4ea21 100644
--- a/pkg/core/deployer/providers/volcengine-vod/volcengine_vod_test.go
+++ b/pkg/core/deployer/providers/volcengine-vod/volcengine_vod_test.go
@@ -3,12 +3,14 @@ package volcenginevod_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-vod"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINEVOD_")
+ fp = it.Args("VOLCENGINEVOD_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -52,11 +54,8 @@ func TestProvider(t *testing.T) {
DomainType: fDomainType,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
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 99e7a87b6..e9534e854 100644
--- a/pkg/core/deployer/providers/volcengine-waf/volcengine_waf_test.go
+++ b/pkg/core/deployer/providers/volcengine-waf/volcengine_waf_test.go
@@ -3,12 +3,14 @@ package volcenginewaf_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-waf"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("VOLCENGINEWAF_")
+ fp = it.Args("VOLCENGINEWAF_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -51,11 +53,8 @@ func TestProvider(t *testing.T) {
AccessMode: fAccessMode,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn_test.go b/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn_test.go
index a63900126..487a3fad8 100644
--- a/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn_test.go
+++ b/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn_test.go
@@ -3,12 +3,14 @@ package wangsucdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/wangsu-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("WANGSUCDN_")
+ fp = it.Args("WANGSUCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
AccessKeySecret: fAccessKeySecret,
Domains: []string{fDomain},
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro_test.go b/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro_test.go
index d8b3764c4..93d45e916 100644
--- a/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro_test.go
+++ b/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro_test.go
@@ -3,12 +3,14 @@ package wangsucdnpro_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/wangsu-cdnpro"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("WANGSUCDNPRO_")
+ fp = it.Args("WANGSUCDNPRO_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -59,11 +61,8 @@ func TestProvider(t *testing.T) {
CertificateId: fCertificateId,
WebhookId: fWebhookId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate_test.go b/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate_test.go
index 2d5f4175f..4c142dbe6 100644
--- a/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate_test.go
+++ b/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate_test.go
@@ -3,12 +3,14 @@ package wangsucertificate_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/wangsu-certificate"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("WANGSUCERTIFICATE_")
+ fp = it.Args("WANGSUCERTIFICATE_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -43,11 +45,8 @@ func TestProvider(t *testing.T) {
AccessKeySecret: fAccessKeySecret,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/webhook/webhook_test.go b/pkg/core/deployer/providers/webhook/webhook_test.go
index 41e7ad3b4..055f323dd 100644
--- a/pkg/core/deployer/providers/webhook/webhook_test.go
+++ b/pkg/core/deployer/providers/webhook/webhook_test.go
@@ -3,12 +3,14 @@ package webhook_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/webhook"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("WEBHOOK_")
+ fp = it.Args("WEBHOOK_")
fTestCertPath string
fTestKeyPath string
fWebhookUrl string
@@ -47,11 +49,8 @@ func TestProvider(t *testing.T) {
},
AllowInsecureConnections: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn_test.go b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn_test.go
index 924fd932a..396e1ac55 100644
--- a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn_test.go
+++ b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn_test.go
@@ -3,12 +3,14 @@ package zenlayercdn_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/zenlayer-cdn"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ZENLAYERCDN_")
+ fp = it.Args("ZENLAYERCDN_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -48,12 +50,9 @@ func TestProvider(t *testing.T) {
DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT,
Domain: fDomain,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToCertificate", func(t *testing.T) {
@@ -63,11 +62,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga_test.go b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga_test.go
index 261949203..65892332a 100644
--- a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga_test.go
+++ b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga_test.go
@@ -3,12 +3,14 @@ package zenlayerga_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/deployer/providers/zenlayer-ga"
- tester "github.com/certimate-go/certimate/pkg/core/deployer/testing"
+ it "github.com/certimate-go/certimate/pkg/core/deployer/testing"
)
var (
- fp = tester.Args("ZENLAYERGA_")
+ fp = it.Args("ZENLAYERGA_")
fTestCertPath string
fTestKeyPath string
fAccessKeyId string
@@ -47,12 +49,9 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_ACCELERATOR,
AcceleratorId: fAcceleratorId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
t.Run("Deploy_ToCertificate", func(t *testing.T) {
@@ -62,11 +61,8 @@ func TestProvider(t *testing.T) {
DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE,
CertificateId: fCertificateId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestDeploy(t, provider, tester.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
+ it.TestDeploy(t, provider, it.TestDeployArgs{CertPath: fTestCertPath, KeyPath: fTestKeyPath})
})
}
diff --git a/pkg/core/deployer/testing/args.go b/pkg/core/deployer/testing/args.go
index f10b33bdc..077fd3fa6 100644
--- a/pkg/core/deployer/testing/args.go
+++ b/pkg/core/deployer/testing/args.go
@@ -1,9 +1,9 @@
package testing
import (
- tester "github.com/certimate-go/certimate/pkg/core/internal/testing"
+ "github.com/certimate-go/certimate/pkg/core/internal/testing"
)
-func Args(prefix string) tester.ArgsParser {
- return tester.Args(prefix)
+func Args(prefix string) testing.ArgsParser {
+ return testing.Args(prefix)
}
diff --git a/pkg/core/deployer/testing/testing.go b/pkg/core/deployer/testing/testing.go
index 17e22158b..47b7634c4 100644
--- a/pkg/core/deployer/testing/testing.go
+++ b/pkg/core/deployer/testing/testing.go
@@ -7,6 +7,9 @@ import (
"os"
"testing"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+
"github.com/certimate-go/certimate/pkg/core/deployer"
)
@@ -29,16 +32,16 @@ func TestDeploy(t *testing.T, testProvider deployer.Provider, testArgs TestDeplo
ctx := context.Background()
certData, _ := os.ReadFile(testArgs.CertPath)
privkeyData, _ := os.ReadFile(testArgs.KeyPath)
+ assert.NotNil(t, certData)
+ assert.NotNil(t, privkeyData)
logger := slog.Default()
logger.Enabled(ctx, slog.LevelDebug)
testProvider.SetLogger(logger)
res, err := testProvider.Deploy(ctx, string(certData), string(privkeyData))
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
+ require.NotNil(t, res)
resjson, _ := json.Marshal(res)
t.Logf("ok: %s", string(resjson))
diff --git a/pkg/core/notifier/providers/dingtalkbot/dingtalkbot_test.go b/pkg/core/notifier/providers/dingtalkbot/dingtalkbot_test.go
index 80e325410..38fe32e57 100644
--- a/pkg/core/notifier/providers/dingtalkbot/dingtalkbot_test.go
+++ b/pkg/core/notifier/providers/dingtalkbot/dingtalkbot_test.go
@@ -3,12 +3,14 @@ package dingtalkbot_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/dingtalkbot"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("DINGTALKBOT_")
+ fp = it.Args("DINGTALKBOT_")
fWebhookUrl string
fSecret string
)
@@ -33,11 +35,8 @@ func TestProvider(t *testing.T) {
WebhookUrl: fWebhookUrl,
Secret: fSecret,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
}
diff --git a/pkg/core/notifier/providers/discordbot/discordbot_test.go b/pkg/core/notifier/providers/discordbot/discordbot_test.go
index dff6b0e1f..7f54c8c4e 100644
--- a/pkg/core/notifier/providers/discordbot/discordbot_test.go
+++ b/pkg/core/notifier/providers/discordbot/discordbot_test.go
@@ -3,12 +3,14 @@ package discordbot_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/discordbot"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("DISCORDBOT_")
+ fp = it.Args("DISCORDBOT_")
fApiToken string
fChannelId string
)
@@ -33,11 +35,8 @@ func TestProvider(t *testing.T) {
BotToken: fApiToken,
ChannelId: fChannelId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
}
diff --git a/pkg/core/notifier/providers/email/email_test.go b/pkg/core/notifier/providers/email/email_test.go
index a02154291..ccfafe622 100644
--- a/pkg/core/notifier/providers/email/email_test.go
+++ b/pkg/core/notifier/providers/email/email_test.go
@@ -3,12 +3,14 @@ package email_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/email"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("EMAIL_")
+ fp = it.Args("EMAIL_")
fSmtpHost string
fSmtpPort int64
fSmtpTLS bool
@@ -53,12 +55,9 @@ func TestProvider(t *testing.T) {
SenderAddress: fSenderAddress,
ReceiverAddress: fReceiverAddress,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
t.Run("Notify_Html", func(t *testing.T) {
@@ -78,6 +77,6 @@ func TestProvider(t *testing.T) {
}
const mockHtml = "Hello Certimate！
Google"
- tester.TestNotify(t, provider, tester.TestNotifyArgs{Message: mockHtml})
+ it.TestNotify(t, provider, it.TestNotifyArgs{Message: mockHtml})
})
}
diff --git a/pkg/core/notifier/providers/larkbot/larkbot_test.go b/pkg/core/notifier/providers/larkbot/larkbot_test.go
index 50b6f86e8..4142f0cb1 100644
--- a/pkg/core/notifier/providers/larkbot/larkbot_test.go
+++ b/pkg/core/notifier/providers/larkbot/larkbot_test.go
@@ -3,12 +3,14 @@ package larkbot_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/larkbot"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("LARKBOT_")
+ fp = it.Args("LARKBOT_")
fWebhookUrl string
fSecret string
)
@@ -33,11 +35,8 @@ func TestProvider(t *testing.T) {
WebhookUrl: fWebhookUrl,
Secret: fSecret,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
}
diff --git a/pkg/core/notifier/providers/matrix/matrix_test.go b/pkg/core/notifier/providers/matrix/matrix_test.go
index 259cbacd8..b8d5f1cef 100644
--- a/pkg/core/notifier/providers/matrix/matrix_test.go
+++ b/pkg/core/notifier/providers/matrix/matrix_test.go
@@ -3,12 +3,14 @@ package matrix_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/matrix"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("MATRIX_")
+ fp = it.Args("MATRIX_")
fServerUrl string
fUserId string
fAccessToken string
@@ -41,11 +43,8 @@ func TestProvider(t *testing.T) {
AccessToken: fAccessToken,
RoomId: fRoomId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
}
diff --git a/pkg/core/notifier/providers/mattermost/mattermost_test.go b/pkg/core/notifier/providers/mattermost/mattermost_test.go
index 66ac470fa..8bb176d94 100644
--- a/pkg/core/notifier/providers/mattermost/mattermost_test.go
+++ b/pkg/core/notifier/providers/mattermost/mattermost_test.go
@@ -3,12 +3,14 @@ package mattermost_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/mattermost"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("MATTERMOST_")
+ fp = it.Args("MATTERMOST_")
fServerUrl string
fChannelId string
fUsername string
@@ -41,11 +43,8 @@ func TestProvider(t *testing.T) {
Username: fUsername,
Password: fPassword,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
}
diff --git a/pkg/core/notifier/providers/slackbot/slackbot_test.go b/pkg/core/notifier/providers/slackbot/slackbot_test.go
index f5a3748f7..423b78c94 100644
--- a/pkg/core/notifier/providers/slackbot/slackbot_test.go
+++ b/pkg/core/notifier/providers/slackbot/slackbot_test.go
@@ -3,12 +3,14 @@ package slackbot_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/slackbot"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("SLACKBOT_")
+ fp = it.Args("SLACKBOT_")
fApiToken string
fChannelId string
)
@@ -33,11 +35,8 @@ func TestProvider(t *testing.T) {
BotToken: fApiToken,
ChannelId: fChannelId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
}
diff --git a/pkg/core/notifier/providers/telegrambot/telegrambot_test.go b/pkg/core/notifier/providers/telegrambot/telegrambot_test.go
index 79f132ae5..91a2928f4 100644
--- a/pkg/core/notifier/providers/telegrambot/telegrambot_test.go
+++ b/pkg/core/notifier/providers/telegrambot/telegrambot_test.go
@@ -3,12 +3,14 @@ package telegrambot_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/telegrambot"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("TELEGRAMBOT_")
+ fp = it.Args("TELEGRAMBOT_")
fApiToken string
fChatId string
)
@@ -33,11 +35,8 @@ func TestProvider(t *testing.T) {
BotToken: fApiToken,
ChatId: fChatId,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
}
diff --git a/pkg/core/notifier/providers/webhook/webhook_test.go b/pkg/core/notifier/providers/webhook/webhook_test.go
index d4266ab72..ba0ad24d1 100644
--- a/pkg/core/notifier/providers/webhook/webhook_test.go
+++ b/pkg/core/notifier/providers/webhook/webhook_test.go
@@ -3,12 +3,14 @@ package webhook_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/webhook"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("WEBHOOK_")
+ fp = it.Args("WEBHOOK_")
fWebhookUrl string
fWebhookContentType string
)
@@ -37,11 +39,8 @@ func TestProvider(t *testing.T) {
},
AllowInsecureConnections: true,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
}
diff --git a/pkg/core/notifier/providers/wecombot/wecombot_test.go b/pkg/core/notifier/providers/wecombot/wecombot_test.go
index 1784b97ce..e249d49d5 100644
--- a/pkg/core/notifier/providers/wecombot/wecombot_test.go
+++ b/pkg/core/notifier/providers/wecombot/wecombot_test.go
@@ -3,12 +3,14 @@ package wecombot_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
impl "github.com/certimate-go/certimate/pkg/core/notifier/providers/wecombot"
- tester "github.com/certimate-go/certimate/pkg/core/notifier/testing"
+ it "github.com/certimate-go/certimate/pkg/core/notifier/testing"
)
var (
- fp = tester.Args("WECOMBOT_")
+ fp = it.Args("WECOMBOT_")
fWebhookUrl string
)
@@ -29,11 +31,8 @@ func TestProvider(t *testing.T) {
provider, err := impl.NewNotifier(&impl.NotifierConfig{
WebhookUrl: fWebhookUrl,
})
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
- tester.TestNotify(t, provider, tester.TestNotifyArgs{})
+ it.TestNotify(t, provider, it.TestNotifyArgs{})
})
}
diff --git a/pkg/core/notifier/testing/testing.go b/pkg/core/notifier/testing/testing.go
index 501fb44e9..e8eb51ec2 100644
--- a/pkg/core/notifier/testing/testing.go
+++ b/pkg/core/notifier/testing/testing.go
@@ -7,6 +7,7 @@ import (
"testing"
"github.com/samber/lo"
+ "github.com/stretchr/testify/require"
"github.com/certimate-go/certimate/pkg/core/notifier"
)
@@ -31,10 +32,8 @@ func TestNotify(t *testing.T, testProvider notifier.Provider, testArgs TestNotif
testProvider.SetLogger(logger)
res, err := testProvider.Notify(ctx, message, subject)
- if err != nil {
- t.Errorf("err: %+v", err)
- return
- }
+ require.NoError(t, err)
+ require.NotNil(t, res)
resjson, _ := json.Marshal(res)
t.Logf("ok: %s", string(resjson))
diff --git a/pkg/utils/cert/hostname/hostname_test.go b/pkg/utils/cert/hostname/hostname_test.go
index b59acc602..97c1f9ab8 100644
--- a/pkg/utils/cert/hostname/hostname_test.go
+++ b/pkg/utils/cert/hostname/hostname_test.go
@@ -3,6 +3,8 @@ package hostname_test
import (
"testing"
+ "github.com/stretchr/testify/assert"
+
xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname"
)
@@ -38,15 +40,12 @@ func TestUtil(t *testing.T) {
}
for _, tc := range testCases {
- result := xcerthostname.IsMatch(tc.pattern, tc.hostname)
- status := "✓"
- pf := t.Logf
- if result != tc.expected {
- status = "✗"
- pf = t.Errorf
+ matched := xcerthostname.IsMatch(tc.pattern, tc.hostname)
+ if tc.expected {
+ assert.True(t, matched, "Pattern: %-20s Hostname: %-20s", tc.pattern, tc.hostname)
+ } else {
+ assert.False(t, matched, "Pattern: %-20s Hostname: %-20s", tc.pattern, tc.hostname)
}
-
- pf("%s Pattern: %-20s Hostname: %-20s Expected: %-5v Got: %-5v\n", status, tc.pattern, tc.hostname, tc.expected, result)
}
})
}