Skip to content

Commit 5ed3049

Browse files
marmijojlebon
authored andcommitted
mantle/platform/aliyun: modify the API to use HTTPS by default
Attempting to override the http scheme for each request is not working for every request type. Let's set the client config scheme to HTTPS by default. Move away from `NewClientWithAccessKey` and instead create an access key separately and then use `NewClientWithOptions` to create the client with a custom config using "HTTPS" for the scheme. Also remove the scheme override for each request.
1 parent ba45b29 commit 5ed3049

File tree

1 file changed

+6
-8
lines changed
  • mantle/platform/api/aliyun

1 file changed

+6
-8
lines changed

mantle/platform/api/aliyun/api.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import (
2626
"github.com/coreos/pkg/capnslog"
2727
"github.com/coreos/pkg/multierror"
2828

29+
"github.com/aliyun/alibaba-cloud-sdk-go/sdk"
30+
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials"
2931
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
3032
"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
3133
"github.com/aliyun/aliyun-oss-go-sdk/oss"
@@ -88,7 +90,10 @@ func New(opts *Options) (*API, error) {
8890
opts.Region = profile.Region
8991
}
9092

91-
ecs, err := ecs.NewClientWithAccessKey(opts.Region, opts.AccessKeyID, opts.SecretKey)
93+
config := sdk.NewConfig()
94+
config.Scheme = "HTTPS"
95+
credential := credentials.NewAccessKeyCredential(opts.AccessKeyID, opts.SecretKey)
96+
ecs, err := ecs.NewClientWithOptions(opts.Region, config, credential)
9297
if err != nil {
9398
return nil, err
9499
}
@@ -207,7 +212,6 @@ func (a *API) ImportImage(format, bucket, object, image_size, device, name, desc
207212
request := ecs.CreateImportImageRequest()
208213
request.SetConnectTimeout(defaultConnectTimeout)
209214
request.SetReadTimeout(defaultReadTimeout)
210-
request.Scheme = "https"
211215
request.DiskDeviceMapping = &[]ecs.ImportImageDiskDeviceMapping{
212216
{
213217
Format: format,
@@ -297,7 +301,6 @@ func (a *API) GetImages(name string) (*ecs.DescribeImagesResponse, error) {
297301
request := ecs.CreateDescribeImagesRequest()
298302
request.SetConnectTimeout(defaultConnectTimeout)
299303
request.SetReadTimeout(defaultReadTimeout)
300-
request.Scheme = "https"
301304
request.ImageName = name
302305
return a.ecs.DescribeImages(request)
303306
}
@@ -307,7 +310,6 @@ func (a *API) GetImagesByID(id string, region string) (*ecs.DescribeImagesRespon
307310
request := ecs.CreateDescribeImagesRequest()
308311
request.SetConnectTimeout(defaultConnectTimeout)
309312
request.SetReadTimeout(defaultReadTimeout)
310-
request.Scheme = "https"
311313
request.ImageId = id
312314
request.RegionId = region
313315
return a.ecs.DescribeImages(request)
@@ -318,7 +320,6 @@ func (a *API) DeleteImage(id string, force bool) error {
318320
request := ecs.CreateDeleteImageRequest()
319321
request.SetConnectTimeout(defaultConnectTimeout)
320322
request.SetReadTimeout(defaultReadTimeout)
321-
request.Scheme = "https"
322323
request.ImageId = id
323324
request.Force = requests.NewBoolean(force)
324325

@@ -350,7 +351,6 @@ func (a *API) DeleteSnapshot(id string, force bool) error {
350351
request := ecs.CreateDeleteSnapshotRequest()
351352
request.SetConnectTimeout(defaultConnectTimeout)
352353
request.SetReadTimeout(defaultReadTimeout)
353-
request.Scheme = "https"
354354
request.SnapshotId = id
355355
request.Force = requests.NewBoolean(force)
356356
_, err := a.ecs.DeleteSnapshot(request)
@@ -430,7 +430,6 @@ func (a *API) ListRegions() ([]string, error) {
430430
request := ecs.CreateDescribeRegionsRequest()
431431
request.SetConnectTimeout(defaultConnectTimeout)
432432
request.SetReadTimeout(defaultReadTimeout)
433-
request.Scheme = "https"
434433

435434
response, err := a.ecs.DescribeRegions(request)
436435
if err != nil {
@@ -468,7 +467,6 @@ func (a *API) ChangeVisibility(region string, id string, public bool) error {
468467
request := ecs.CreateModifyImageSharePermissionRequest()
469468
request.SetConnectTimeout(defaultConnectTimeout)
470469
request.SetReadTimeout(defaultReadTimeout)
471-
request.Scheme = "https"
472470
request.ImageId = id
473471
request.RegionId = region
474472
request.IsPublic = requests.NewBoolean(public)

0 commit comments

Comments
 (0)