Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions cluster-autoscaler/cloudprovider/gce/gce_url.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,15 @@ func GenerateInstanceUrl(domainUrl string, ref GceRef) string {
if domainUrl == "" {
domainUrl = defaultDomainUrl
}
instanceUrlTemplate := domainUrl + projectsSubstring + "%s/zones/%s/instances/%s"
return fmt.Sprintf(instanceUrlTemplate, ref.Project, ref.Zone, ref.Name)
return domainUrl + projectsSubstring + ref.Project + "/zones/" + ref.Zone + "/instances/" + ref.Name
}

// GenerateMigUrl generates url for instance.
func GenerateMigUrl(domainUrl string, ref GceRef) string {
if domainUrl == "" {
domainUrl = defaultDomainUrl
}
migUrlTemplate := domainUrl + projectsSubstring + "%s/zones/%s/instanceGroups/%s"
return fmt.Sprintf(migUrlTemplate, ref.Project, ref.Zone, ref.Name)
return domainUrl + projectsSubstring + ref.Project + "/zones/" + ref.Zone + "/instanceGroups/" + ref.Name
}

// IsInstanceTemplateRegional determines whether or not an instance template is regional based on the url
Expand All @@ -116,13 +114,13 @@ func InstanceTemplateNameFromUrl(instanceTemplateLink string) (InstanceTemplateN
}

func parseGceUrl(prefix, url, expectedResource string) (project string, zone string, name string, err error) {
reg := regexp.MustCompile(fmt.Sprintf("%sprojects/.*/zones/.*/%s/.*", prefix, expectedResource))
reg := regexp.MustCompile(prefix + "projects/.*/zones/.*/" + expectedResource + "/.*")
errMsg := fmt.Errorf("wrong url: expected format %sprojects/<project-id>/zones/<zone>/%s/<name>, got %s", prefix, expectedResource, url)
if !reg.MatchString(url) {
return "", "", "", errMsg
}

subMatches := regexp.MustCompile(fmt.Sprintf("%sprojects/(.*)/zones/(.*)/%s/(.*)", prefix, expectedResource)).FindStringSubmatch(url)
subMatches := regexp.MustCompile(prefix + "projects/(.*)/zones/(.*)/" + expectedResource + "/(.*)").FindStringSubmatch(url)
project = subMatches[1]
zone = subMatches[2]
name = subMatches[3]
Expand Down