Skip to content

Commit 6733edf

Browse files
authored
Merge pull request #1 from beclab/fix/cloudurl
fix: cloud url
2 parents dff7d48 + bf3ca67 commit 6733edf

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

pkg/controller/cloud.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"encoding/json"
66
"fmt"
77
"net/http"
8+
"os"
9+
"strings"
810
"time"
911

1012
"github.com/emicklei/go-restful/v3"
@@ -151,7 +153,12 @@ func getAccountFromSettings(admin string) (userid, token string, err error) {
151153

152154
func GetAwsAccountFromCloud(ctx context.Context, client dynamic.Interface, bucket string) (*AWSAccount, error) {
153155
// cloudUrl := "https://cloud-dev-api.bttcdn.com/v1/resource/stsToken"
154-
cloudUrl := "https://cloud-api.bttcdn.com/v1/resource/stsToken/setup"
156+
cloudHost := "https://cloud-api.bttcdn.com"
157+
cloudHostFromEnv := os.Getenv("OLARES_SPACE_URL")
158+
if cloudHostFromEnv != "" {
159+
cloudHost = cloudHostFromEnv
160+
}
161+
cloudURL := fmt.Sprintf("%s/v1/resource/stsToken/setup", strings.TrimSuffix(cloudHost, "/"))
155162

156163
clusterId, ak, sk, st, err := getClusterId(ctx, client)
157164
if err != nil {
@@ -175,10 +182,10 @@ func GetAwsAccountFromCloud(ctx context.Context, client dynamic.Interface, bucke
175182
"durationSeconds": fmt.Sprintf("%.0f", duration.Seconds()),
176183
}).
177184
SetResult(&AWSAccountResponse{}).
178-
Post(cloudUrl)
185+
Post(cloudURL)
179186

180187
if err != nil {
181-
klog.Error("fetch data from cloud error, ", err, ", ", cloudUrl)
188+
klog.Error("fetch data from cloud error, ", err, ", ", cloudURL)
182189
return nil, err
183190
}
184191

0 commit comments

Comments
 (0)