Skip to content

Commit 46c9a56

Browse files
committed
feat: update imagex sdk
1 parent 96d8c18 commit 46c9a56

File tree

7 files changed

+95
-93
lines changed

7 files changed

+95
-93
lines changed

acme/acme.go

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ func getGoogleAcmeAuth(config *model.Config) error {
7272
if err != nil {
7373
return err
7474
}
75-
// TODO: Use resp.
7675
config.Acme.KeyId = resp.KeyId
7776
config.Acme.HmacEncoded = string(resp.B64MacKey)
7877
return nil

acme/challenge/imagex.go

+17-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package challenge
22

33
import (
4+
"context"
45
"fmt"
56

67
"github.com/go-acme/lego/v4/lego"
78
"github.com/paraparty/acme-task/imagex"
89
"github.com/paraparty/acme-task/model"
910
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"
1112
)
1213

1314
func ImageXChallenge(client *lego.Client, task *model.Task) error {
@@ -35,7 +36,7 @@ func ImageXChallenge(client *lego.Client, task *model.Task) error {
3536
}
3637

3738
type imagexChallenge struct {
38-
Service *volcImageX.ImageX
39+
Service *volcImageX.Imagex
3940
DomainMapping map[string]string
4041
}
4142

@@ -70,7 +71,16 @@ func (c *imagexChallenge) CleanUp(domain, token, keyAuth string) error {
7071
return fmt.Errorf("%s not found in ImageX", domain)
7172
}
7273

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)
7484
if err != nil {
7585
return err
7686
}
@@ -79,16 +89,18 @@ func (c *imagexChallenge) CleanUp(domain, token, keyAuth string) error {
7989
}
8090

8191
func (c *imagexChallenge) init() error {
82-
services, err := c.Service.GetImageServices("")
92+
getAllImageServicesQuery := &volcImageX.GetAllImageServicesQuery{}
93+
servicesResp, err := c.Service.GetAllImageServices(context.Background(), getAllImageServicesQuery)
8394
if err != nil {
8495
return err
8596
}
97+
services := servicesResp.Result
8698

8799
c.DomainMapping = make(map[string]string, 0)
88100

89101
for _, item := range services.Services {
90102
for _, domain := range item.DomainInfos {
91-
c.DomainMapping[domain.DomainName] = item.ServiceId
103+
c.DomainMapping[domain.DomainName] = item.ServiceID
92104
}
93105
}
94106
return nil

go.mod

+9-8
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ require (
77
github.com/avast/retry-go/v4 v4.3.1
88
github.com/go-acme/lego/v4 v4.9.0
99
github.com/google/uuid v1.3.0
10-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.490
11-
github.com/volcengine/volc-sdk-golang v1.0.67
10+
github.com/volcengine/volc-sdk-golang v1.0.176
1211
google.golang.org/api v0.100.0
1312
gopkg.in/yaml.v3 v3.0.1
1413
)
1514

1615
require (
1716
cloud.google.com/go/compute v1.12.1 // indirect
1817
cloud.google.com/go/compute/metadata v0.2.1 // indirect
18+
github.com/avast/retry-go v3.0.0+incompatible // indirect
1919
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
2020
github.com/cloudflare/cloudflare-go v0.49.0 // indirect
2121
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -28,16 +28,17 @@ require (
2828
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
2929
github.com/miekg/dns v1.1.50 // indirect
3030
github.com/pkg/errors v0.9.1 // indirect
31+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.490 // indirect
3132
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.490 // indirect
3233
go.opencensus.io v0.23.0 // indirect
33-
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
34-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
35-
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
34+
golang.org/x/crypto v0.11.0 // indirect
35+
golang.org/x/mod v0.8.0 // indirect
36+
golang.org/x/net v0.12.0 // indirect
3637
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
37-
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
38-
golang.org/x/text v0.4.0 // indirect
38+
golang.org/x/sys v0.10.0 // indirect
39+
golang.org/x/text v0.11.0 // indirect
3940
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
40-
golang.org/x/tools v0.1.12 // indirect
41+
golang.org/x/tools v0.6.0 // indirect
4142
google.golang.org/appengine v1.6.7 // indirect
4243
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
4344
google.golang.org/grpc v1.50.1 // indirect

0 commit comments

Comments
 (0)