{Core} Add aliyun upgrade and configurable plugin index source and fix CloudSSO/OAuth one-off CLI flags persisting (#1299)

* add aliyun upgrade

* adjust

* fix tests

* add tests

* add plugin setting

* add file

* fix tests

* add tests

* add tests

* add tests

* add tests

* fix oauth cloudsso profile saving

Author: AllyW

cli/plugin/manager.go

@@ -10,20 +10,23 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"os"
+	"path"
 	"path/filepath"
 	"runtime"
 	"sort"
 	"strings"
 	"time"
 
 	"github.com/aliyun/aliyun-cli/v3/cli"
+	"github.com/aliyun/aliyun-cli/v3/sysconfig/pluginsettings"
 	"golang.org/x/mod/semver"
 )
 
 const (
-	IndexURL        = "https://aliyun-cli-pub.oss-cn-hangzhou.aliyuncs.com/plugins/plugin_pkg_index.json"    // 默认索引地址
-	CommandIndexURL = "https://aliyun-cli-pub.oss-cn-hangzhou.aliyuncs.com/plugins/plugin_search_index.json" // 命令倒排索引地址
+	IndexURL        = "https://aliyuncli.alicdn.com/plugins/plugin_pkg_index.json"    // 默认索引地址
+	CommandIndexURL = "https://aliyuncli.alicdn.com/plugins/plugin_search_index.json" // 命令倒排索引地址
 	EnvPluginsDir   = "ALIBABA_CLOUD_CLI_PLUGINS_DIR"
 	EnvNoCache      = "ALIBABA_CLOUD_CLI_PLUGIN_NO_CACHE"
 
@@ -43,8 +46,9 @@ func (e *ErrPluginNotFound) Error() string {
 
 type Manager struct {
 	rootDir         string
-	indexURL        string // For testing: allows overriding IndexURL
-	commandIndexURL string // For testing: allows overriding CommandIndexURL
+	sourceBase      string // from plugin-settings.json / env; empty = use built-in index URLs
+	indexURL        string // For testing: allows overriding resolved package index URL
+	commandIndexURL string // For testing: allows overriding resolved command index URL
 }
 
 func getHomePath() string {
@@ -86,7 +90,50 @@ func NewManager() (*Manager, error) {
 	if err := os.MkdirAll(rootDir, 0755); err != nil {
 		return nil, err
 	}
-	return &Manager{rootDir: rootDir}, nil
+	sysDir := filepath.Join(getHomePath(), ".aliyun")
+	settings, err := pluginsettings.Load(sysDir)
+	if err != nil {
+		settings = pluginsettings.Default()
+	}
+	base := pluginsettings.EffectiveSourceBase(settings)
+	return &Manager{rootDir: rootDir, sourceBase: base}, nil
+}
+
+func (m *Manager) resolvedPkgIndexURL() string {
+	if m.indexURL != "" {
+		return m.indexURL
+	}
+	if b := strings.TrimRight(strings.TrimSpace(m.sourceBase), "/"); b != "" {
+		return b + "/plugin_pkg_index.json"
+	}
+	return IndexURL
+}
+
+func (m *Manager) resolvedCommandIndexURL() string {
+	if m.commandIndexURL != "" {
+		return m.commandIndexURL
+	}
+	if b := strings.TrimRight(strings.TrimSpace(m.sourceBase), "/"); b != "" {
+		return b + "/plugin_search_index.json"
+	}
+	return CommandIndexURL
+}
+
+// common layout: .../pkgs/{name}/{version}/{basename}.
+func (m *Manager) resolvePackageDownloadURL(origURL, pluginName, version string) string {
+	if strings.TrimSpace(m.sourceBase) == "" {
+		return origURL
+	}
+	u, err := url.Parse(origURL)
+	if err != nil {
+		return origURL
+	}
+	baseName := path.Base(u.Path)
+	if baseName == "" || baseName == "." || baseName == "/" {
+		return origURL
+	}
+	b := strings.TrimRight(strings.TrimSpace(m.sourceBase), "/")
+	return fmt.Sprintf("%s/pkgs/%s/%s/%s", b, pluginName, version, baseName)
 }
 
 func (m *Manager) readCache(cacheFile string, ttl time.Duration, result interface{}) (hit bool, staleAvailable bool) {
@@ -161,10 +208,7 @@ func (m *Manager) fetchWithCache(url, cacheFile string, result interface{}) erro
 }
 
 func (m *Manager) GetIndex() (*Index, error) {
-	indexURL := IndexURL
-	if m.indexURL != "" {
-		indexURL = m.indexURL
-	}
+	indexURL := m.resolvedPkgIndexURL()
 	cacheFile := filepath.Join(m.rootDir, indexCacheFile)
 	var index Index
 	if err := m.fetchWithCache(indexURL, cacheFile, &index); err != nil {
@@ -174,10 +218,7 @@ func (m *Manager) GetIndex() (*Index, error) {
 }
 
 func (m *Manager) GetCommandIndex() (*CommandIndex, error) {
-	commandIndexURL := CommandIndexURL
-	if m.commandIndexURL != "" {
-		commandIndexURL = m.commandIndexURL
-	}
+	commandIndexURL := m.resolvedCommandIndexURL()
 	cacheFile := filepath.Join(m.rootDir, commandCacheFile)
 	var index CommandIndex
 	if err := m.fetchWithCache(commandIndexURL, cacheFile, &index); err != nil {
@@ -678,14 +719,18 @@ func (m *Manager) installPlugin(ctx *cli.Context, targetPlugin *PluginInfo, vers
 		return err
 	}
 
-	archivePath, err := m.downloadAndVerifyPlugin(ctx, platInfo, actualPluginName, version)
+	downloadURL := m.resolvePackageDownloadURL(platInfo.URL, actualPluginName, version)
+	platForDownload := *platInfo
+	platForDownload.URL = downloadURL
+
+	archivePath, err := m.downloadAndVerifyPlugin(ctx, &platForDownload, actualPluginName, version)
 	if err != nil {
 		return err
 	}
 	defer os.RemoveAll(filepath.Dir(archivePath))
 
 	extractDir := filepath.Join(m.rootDir, actualPluginName)
-	if err := m.extractPlugin(archivePath, extractDir, platInfo.URL); err != nil {
+	if err := m.extractPlugin(archivePath, extractDir, downloadURL); err != nil {
 		return err
 	}
 

cli/plugin/manager_test.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/aliyun/aliyun-cli/v3/cli"
+	"github.com/aliyun/aliyun-cli/v3/sysconfig/pluginsettings"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -30,6 +31,35 @@ func newTestContext() *cli.Context {
 	return cli.NewCommandContext(stdout, stderr)
 }
 
+func TestManager_resolvedIndexURLsWithSourceBase(t *testing.T) {
+	m := &Manager{sourceBase: "https://mirror.example.com/plugins"}
+	assert.Equal(t, "https://mirror.example.com/plugins/plugin_pkg_index.json", m.resolvedPkgIndexURL())
+	assert.Equal(t, "https://mirror.example.com/plugins/plugin_search_index.json", m.resolvedCommandIndexURL())
+}
+
+func TestManager_resolvePackageDownloadURL(t *testing.T) {
+	orig := "https://aliyun-cli-pub.oss-cn-hangzhou.aliyuncs.com/plugins/pkgs/aliyun-cli-acc/0.2.0/aliyun-cli-acc-linux-amd64.tar.gz"
+	m := &Manager{sourceBase: "https://mirror.example.com/plugins"}
+	got := m.resolvePackageDownloadURL(orig, "aliyun-cli-acc", "0.2.0")
+	assert.Equal(t, "https://mirror.example.com/plugins/pkgs/aliyun-cli-acc/0.2.0/aliyun-cli-acc-linux-amd64.tar.gz", got)
+
+	m2 := &Manager{}
+	assert.Equal(t, orig, m2.resolvePackageDownloadURL(orig, "x", "1.0.0"))
+}
+
+func TestNewManager_LoadsSourceBaseFromFile(t *testing.T) {
+	home := t.TempDir()
+	cleanup := setTestHomeDir(t, home)
+	defer cleanup()
+	confDir := filepath.Join(home, ".aliyun")
+	assert.NoError(t, os.MkdirAll(confDir, 0755))
+	data := []byte(`{"source_base":"https://x.example/plugins"}`)
+	assert.NoError(t, os.WriteFile(filepath.Join(confDir, pluginsettings.ConfigFileName), data, 0600))
+	mgr, err := NewManager()
+	assert.NoError(t, err)
+	assert.Equal(t, "https://x.example/plugins", mgr.sourceBase)
+}
+
 func TestNewManager(t *testing.T) {
 	t.Run("Success", func(t *testing.T) {
 		testHome := t.TempDir()

cli/upgrade/replace_binary_windows_test.go

@@ -0,0 +1,44 @@
+// Copyright (c) 2009-present, Alibaba Cloud All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package upgrade
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestReplaceBinary_Windows_NoOldFileAfterSuccess(t *testing.T) {
+	tmpDir := t.TempDir()
+	current := filepath.Join(tmpDir, "aliyun.exe")
+	oldSidecar := current + ".old"
+	newPath := filepath.Join(tmpDir, "aliyun.new.exe")
+	want := []byte("new payload")
+	os.WriteFile(current, []byte("old"), 0755)
+	os.WriteFile(newPath, want, 0755)
+
+	assert.NoError(t, replaceBinary(newPath, current))
+
+	got, err := os.ReadFile(current)
+	assert.NoError(t, err)
+	assert.Equal(t, want, got)
+
+	_, err = os.Stat(oldSidecar)
+	assert.True(t, os.IsNotExist(err), ".old sidecar should be removed after successful replace")
+}