Allow overriding domain suffix in GCE cloud provider. #6284
Conversation
| return fmt.Sprintf(migUrlTemplate, ref.Project, ref.Zone, ref.Name) | ||
| } | ||
|
|
||
| func prefix(domainSuffix string) string { |
There was a problem hiding this comment.
Can we allow to override the whole API endpoint? It allows slightly more flexibility while shortening the code slightly.
Also, I believe "API endpoint" wording is more obvious than "domain suffix" when reading the code :)
There was a problem hiding this comment.
changed it to domain url
| migUrlTemplate = gcePrefix + "%s/zones/%s/instanceGroups/%s" | ||
| gceUrlSchema = "https" | ||
| projectsSubstring = "/projects/" | ||
| defaultGceDomainSuffix = "googleapis.com/compute/v1/projects/" |
There was a problem hiding this comment.
Is it intended that "/projects/" is already a part of domain suffix?
There was a problem hiding this comment.
Removed it from suffix
f058edc to
75281ee
Compare
|
/lgtm |
| gcePrefix = gceUrlSchema + "://www." + gceDomainSuffix | ||
| instanceUrlTemplate = gcePrefix + "%s/zones/%s/instances/%s" | ||
| migUrlTemplate = gcePrefix + "%s/zones/%s/instanceGroups/%s" | ||
| gceUrlSchema = "https" |
There was a problem hiding this comment.
Can we remain this to something like urlPrefix or httpsPrefix? The current does not accurately describe the content.
There was a problem hiding this comment.
removed it alltogether
| if domainUrl == "" { | ||
| domainUrl = defaultDomainUrl | ||
| } | ||
| migUrlTemplate := domainUrl + projectsSubstring + "%s/zones/%s/instanceGroups/%s" | ||
| return fmt.Sprintf(migUrlTemplate, ref.Project, ref.Zone, ref.Name) | ||
| } | ||
|
|
||
| func parseGceUrl(url, expectedResource string) (project string, zone string, name string, err error) { |
There was a problem hiding this comment.
nit: I feel like this whole function could be just a single regexp check. What do you think about rewriting this?
There was a problem hiding this comment.
I replaced the checks with regexp, however I still left the split logic. Let me know if you think we should change it further
There was a problem hiding this comment.
I think this is good enough for now - ideal would be replacing the split with regexp as well, but this is already much better.
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: BigDarkClown, olagacek The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
What type of PR is this?
/kind feature
What this PR does / why we need it:
This PR allows overriding Domain Suffix in calls made to GCE cloud provider. If it's not specified the default domain suffix is used.