[MM-37772] Idiomatic naming (URL, URI, API) (#18128)
* s/Url/URL/g & s/Uri/URI/g * s/Api/API/g
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
a7f5512ff3
Коммит
757dc96461
@@ -69,7 +69,7 @@ func (wc *writeCounter) Write(p []byte) (int, error) {
|
||||
return n, nil
|
||||
}
|
||||
|
||||
func getCurrentVersionTgzUrl() string {
|
||||
func getCurrentVersionTgzURL() string {
|
||||
version := model.CurrentVersion
|
||||
if strings.HasPrefix(model.BuildNumber, version+"-rc") {
|
||||
version = model.BuildNumber
|
||||
@@ -184,24 +184,24 @@ func UpgradeToE0() error {
|
||||
return err
|
||||
}
|
||||
|
||||
filename, err := download(getCurrentVersionTgzUrl(), 1024*1024*300)
|
||||
filename, err := download(getCurrentVersionTgzURL(), 1024*1024*300)
|
||||
if err != nil {
|
||||
if filename != "" {
|
||||
os.Remove(filename)
|
||||
}
|
||||
upgradeError = fmt.Errorf("error downloading the new Mattermost server binary file (percentage: %d)", upgradePercentage)
|
||||
mlog.Error("Unable to download the Mattermost server binary file", mlog.Int64("percentage", upgradePercentage), mlog.String("url", getCurrentVersionTgzUrl()), mlog.Err(err))
|
||||
mlog.Error("Unable to download the Mattermost server binary file", mlog.Int64("percentage", upgradePercentage), mlog.String("url", getCurrentVersionTgzURL()), mlog.Err(err))
|
||||
upgradePercentage = 0
|
||||
return err
|
||||
}
|
||||
defer os.Remove(filename)
|
||||
sigfilename, err := download(getCurrentVersionTgzUrl()+".sig", 1024)
|
||||
sigfilename, err := download(getCurrentVersionTgzURL()+".sig", 1024)
|
||||
if err != nil {
|
||||
if sigfilename != "" {
|
||||
os.Remove(sigfilename)
|
||||
}
|
||||
upgradeError = errors.New("error downloading the signature file of the new server")
|
||||
mlog.Error("Unable to download the signature file of the new Mattermost server", mlog.String("url", getCurrentVersionTgzUrl()+".sig"), mlog.Err(err))
|
||||
mlog.Error("Unable to download the signature file of the new Mattermost server", mlog.String("url", getCurrentVersionTgzURL()+".sig"), mlog.Err(err))
|
||||
upgradePercentage = 0
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ func TestCanIUpgradeToE0(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
func TestGetCurrentVersionTgzUrl(t *testing.T) {
|
||||
func TestGetCurrentVersionTgzURL(t *testing.T) {
|
||||
t.Run("get release version in regular version", func(t *testing.T) {
|
||||
currentVersion := model.CurrentVersion
|
||||
buildNumber := model.CurrentVersion
|
||||
@@ -45,7 +45,7 @@ func TestGetCurrentVersionTgzUrl(t *testing.T) {
|
||||
model.CurrentVersion = currentVersion
|
||||
model.BuildNumber = buildNumber
|
||||
}()
|
||||
require.Equal(t, "https://releases.mattermost.com/5.22.0/mattermost-5.22.0-linux-amd64.tar.gz", getCurrentVersionTgzUrl())
|
||||
require.Equal(t, "https://releases.mattermost.com/5.22.0/mattermost-5.22.0-linux-amd64.tar.gz", getCurrentVersionTgzURL())
|
||||
})
|
||||
|
||||
t.Run("get release version in dev version", func(t *testing.T) {
|
||||
@@ -57,7 +57,7 @@ func TestGetCurrentVersionTgzUrl(t *testing.T) {
|
||||
model.CurrentVersion = currentVersion
|
||||
model.BuildNumber = buildNumber
|
||||
}()
|
||||
require.Equal(t, "https://releases.mattermost.com/5.22.0/mattermost-5.22.0-linux-amd64.tar.gz", getCurrentVersionTgzUrl())
|
||||
require.Equal(t, "https://releases.mattermost.com/5.22.0/mattermost-5.22.0-linux-amd64.tar.gz", getCurrentVersionTgzURL())
|
||||
})
|
||||
|
||||
t.Run("get release version in rc version", func(t *testing.T) {
|
||||
@@ -69,7 +69,7 @@ func TestGetCurrentVersionTgzUrl(t *testing.T) {
|
||||
model.CurrentVersion = currentVersion
|
||||
model.BuildNumber = buildNumber
|
||||
}()
|
||||
require.Equal(t, "https://releases.mattermost.com/5.22.0-rc2/mattermost-5.22.0-rc2-linux-amd64.tar.gz", getCurrentVersionTgzUrl())
|
||||
require.Equal(t, "https://releases.mattermost.com/5.22.0-rc2/mattermost-5.22.0-rc2-linux-amd64.tar.gz", getCurrentVersionTgzURL())
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user