IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-27 00:37:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Use strings.ReplaceAll and preallocate containers (#58483)

Browse Source
This commit is contained in:
Sasha Melentyev 2022-11-09 19:17:09 +03:00 committed by GitHub
parent 2dfe0a4060
commit febcaeff3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devenv/docker/blocks/alert_webhook_listener/main.go
View File

@ -14,7 +14,7 @@ func hello(w http.ResponseWriter, r *http.Request) {
return
}
safeBody := strings.Replace(string(body), "\n", "", -1)
safeBody := strings.ReplaceAll(string(body), "\n", "")
line := fmt.Sprintf("webbhook: -> %s", safeBody)
fmt.Println(line)
if _, err := io.WriteString(w, line); err != nil {

4
devenv/docker/blocks/slow_proxy/main.go
View File

@ -32,8 +32,8 @@ func main() {
proxy := httputil.NewSingleHostReverseProxy(originURL)
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
safeSleep := strings.Replace(sleep.String(), "\n", "", -1)
safeRequestUri := strings.Replace(r.RequestURI, "\n", "", -1)
safeSleep := strings.ReplaceAll(sleep.String(), "\n", "")
safeRequestUri := strings.ReplaceAll(r.RequestURI, "\n", "")
log.Printf("sleeping for %s then proxying request: url '%s'", safeSleep, safeRequestUri)
// This is commented out as CodeQL flags this as vulnerability CWE-117 (https://cwe.mitre.org/data/definitions/117.html)

2
pkg/build/version.go
View File

@ -58,7 +58,7 @@ func LinuxPackageVersion(v string, buildID string) (string, string) {
}
func shortenBuildID(buildID string) string {
buildID = strings.Replace(buildID, "-", "", -1)
buildID = strings.ReplaceAll(buildID, "-", "")
if len(buildID) < 9 {
return buildID
}

2
pkg/services/accesscontrol/models.go
View File

@ -165,7 +165,7 @@ func (r RoleDTO) MarshalJSON() ([]byte, error) {
func fallbackDisplayName(rName string) string {
// removing prefix for fixed roles
rNameWithoutPrefix := strings.Replace(rName, FixedRolePrefix, "", 1)
return strings.TrimSpace(strings.Replace(rNameWithoutPrefix, ":", " ", -1))
return strings.TrimSpace(strings.ReplaceAll(rNameWithoutPrefix, ":", " "))
}
type TeamRole struct {

6
pkg/tsdb/cloudwatch/models/cloudwatch_query.go
View File

@ -290,7 +290,7 @@ func (q *CloudWatchQuery) validateAndSetDefaults(refId string, metricsDataQuery
suffix := refId
if !validMetricDataID.MatchString(suffix) {
newUUID := uuid.NewString()
suffix = strings.Replace(newUUID, "-", "", -1)
suffix = strings.ReplaceAll(newUUID, "-", "")
}
q.Id = fmt.Sprintf("query%s", suffix)
}
@ -436,8 +436,8 @@ func parseDimensions(dimensions map[string]interface{}) (map[string][]string, er
}
func sortDimensions(dimensions map[string][]string) map[string][]string {
sortedDimensions := make(map[string][]string)
var keys []string
sortedDimensions := make(map[string][]string, len(dimensions))
keys := make([]string, 0, len(dimensions))
for k := range dimensions {
keys = append(keys, k)
}

4
pkg/web/tree.go
View File

@ -96,8 +96,8 @@ func getWildcards(pattern string) (string, []string) {
// getRawPattern removes all regexp but keeps wildcards for building URL path.
func getRawPattern(rawPattern string) string {
rawPattern = strings.Replace(rawPattern, ":int", "", -1)
rawPattern = strings.Replace(rawPattern, ":string", "", -1)
rawPattern = strings.ReplaceAll(rawPattern, ":int", "")
rawPattern = strings.ReplaceAll(rawPattern, ":string", "")
for {
startIdx := strings.Index(rawPattern, "(")