1
1
package challenge
2
2
3
3
import (
4
+ "context"
4
5
"fmt"
5
6
6
7
"github.com/go-acme/lego/v4/lego"
7
8
"github.com/paraparty/acme-task/imagex"
8
9
"github.com/paraparty/acme-task/model"
9
10
volc "github.com/volcengine/volc-sdk-golang/base"
10
- volcImageX "github.com/volcengine/volc-sdk-golang/service/imagex"
11
+ volcImageX "github.com/volcengine/volc-sdk-golang/service/imagex/v2 "
11
12
)
12
13
13
14
func ImageXChallenge (client * lego.Client , task * model.Task ) error {
@@ -35,7 +36,7 @@ func ImageXChallenge(client *lego.Client, task *model.Task) error {
35
36
}
36
37
37
38
type imagexChallenge struct {
38
- Service * volcImageX.ImageX
39
+ Service * volcImageX.Imagex
39
40
DomainMapping map [string ]string
40
41
}
41
42
@@ -70,7 +71,16 @@ func (c *imagexChallenge) CleanUp(domain, token, keyAuth string) error {
70
71
return fmt .Errorf ("%s not found in ImageX" , domain )
71
72
}
72
73
73
- _ , err := c .Service .DeleteImages (serviceId , []string {path })
74
+ req := volcImageX.DeleteImageUploadFilesReq {
75
+ DeleteImageUploadFilesQuery : & volcImageX.DeleteImageUploadFilesQuery {
76
+ ServiceID : serviceId ,
77
+ },
78
+ DeleteImageUploadFilesBody : & volcImageX.DeleteImageUploadFilesBody {
79
+ StoreUris : []string {path },
80
+ },
81
+ }
82
+
83
+ _ , err := c .Service .DeleteImageUploadFiles (context .Background (), & req )
74
84
if err != nil {
75
85
return err
76
86
}
@@ -79,16 +89,18 @@ func (c *imagexChallenge) CleanUp(domain, token, keyAuth string) error {
79
89
}
80
90
81
91
func (c * imagexChallenge ) init () error {
82
- services , err := c .Service .GetImageServices ("" )
92
+ getAllImageServicesQuery := & volcImageX.GetAllImageServicesQuery {}
93
+ servicesResp , err := c .Service .GetAllImageServices (context .Background (), getAllImageServicesQuery )
83
94
if err != nil {
84
95
return err
85
96
}
97
+ services := servicesResp .Result
86
98
87
99
c .DomainMapping = make (map [string ]string , 0 )
88
100
89
101
for _ , item := range services .Services {
90
102
for _ , domain := range item .DomainInfos {
91
- c .DomainMapping [domain .DomainName ] = item .ServiceId
103
+ c .DomainMapping [domain .DomainName ] = item .ServiceID
92
104
}
93
105
}
94
106
return nil
0 commit comments