Skip to content

Commit 7044adc

Browse files
authored
narrow endpoint env (#1304)
1 parent 54f8b4b commit 7044adc

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

config/profile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ func (cp *Profile) OverwriteWithFlags(ctx *cli.Context) {
253253
}
254254

255255
if cp.Endpoint == "" {
256-
cp.Endpoint = util.GetFromEnv("ALIBABA_CLOUD_ENDPOINT", "ALIBABACLOUD_ENDPOINT", "ALICLOUD_ENDPOINT", "ENDPOINT")
256+
cp.Endpoint = util.GetFromEnv("ALIBABA_CLOUD_ENDPOINT")
257257
}
258258

259259
if cp.CredentialsURI == "" {

config/profile_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,21 +499,23 @@ func TestOverwriteWithFlagsWithEndpointEnv(t *testing.T) {
499499
actual.OverwriteWithFlags(ctx)
500500
assert.Equal(t, exp, actual)
501501

502+
actual = newProfile()
502503
os.Setenv("ENDPOINT", "endpoint1.aliyuncs.com")
503504
actual.OverwriteWithFlags(ctx)
504-
exp.Endpoint = "endpoint1.aliyuncs.com"
505+
// endpoint env is intentionally narrowed to ALIBABA_CLOUD_ENDPOINT only
506+
exp.Endpoint = ""
505507
assert.Equal(t, exp, actual)
506508

507509
actual = newProfile()
508510
os.Setenv("ALICLOUD_ENDPOINT", "endpoint2.aliyuncs.com")
509511
actual.OverwriteWithFlags(ctx)
510-
exp.Endpoint = "endpoint2.aliyuncs.com"
512+
exp.Endpoint = ""
511513
assert.Equal(t, exp, actual)
512514

513515
actual = newProfile()
514516
os.Setenv("ALIBABACLOUD_ENDPOINT", "endpoint3.aliyuncs.com")
515517
actual.OverwriteWithFlags(ctx)
516-
exp.Endpoint = "endpoint3.aliyuncs.com"
518+
exp.Endpoint = ""
517519
assert.Equal(t, exp, actual)
518520

519521
actual = newProfile()

0 commit comments

Comments
 (0)