-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reduce github api requests in clusterctl
* Removes additional cert-manager latest version detection because it always gets overwritten. * Uses goproxy instead of github api for listing repository versions.
- Loading branch information
Showing
5 changed files
with
332 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| 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. | ||
| */ | ||
|
|
||
| package repository | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io" | ||
| "net/http" | ||
| "net/url" | ||
| "path" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| type goproxyClient struct { | ||
| scheme string | ||
| host string | ||
| } | ||
|
|
||
| func newGoproxyClient(scheme, host string) *goproxyClient { | ||
| return &goproxyClient{ | ||
| scheme: scheme, | ||
| host: host, | ||
| } | ||
| } | ||
|
|
||
| func (g *goproxyClient) List(owner, repository string) ([]byte, error) { | ||
| // build the naive path | ||
| var gomodulePath string | ||
| switch owner { | ||
| case "kubernetes-sigs": | ||
| gomodulePath = path.Join("sigs.k8s.io", repository) | ||
| case "kubernetes": | ||
| gomodulePath = path.Join("k8s.io", repository) | ||
| default: | ||
| gomodulePath = path.Join("github.com", owner, repository) | ||
| } | ||
|
|
||
| rawURL := url.URL{ | ||
| Scheme: g.scheme, | ||
| Host: g.host, | ||
| Path: path.Join(gomodulePath, "@v", "/list"), | ||
| } | ||
|
|
||
| req, err := http.NewRequestWithContext(context.TODO(), http.MethodGet, rawURL.String(), http.NoBody) | ||
| if err != nil { | ||
| return nil, errors.Wrapf(err, "failed to get versions for go module %q via goproxy %q: failed to create request", gomodulePath, g.host) | ||
| } | ||
|
|
||
| resp, err := http.DefaultClient.Do(req) | ||
| if err != nil { | ||
| return nil, errors.Wrapf(err, "failed to get versions for go module %q via goproxy %q", gomodulePath, g.host) | ||
| } | ||
| defer resp.Body.Close() | ||
|
|
||
| rawResponse, err := io.ReadAll(resp.Body) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "error read goproxy response body") | ||
| } | ||
| return rawResponse, nil | ||
| } | ||
|
|
||
| func getGoproxyHost(goproxy string) (string, string, error) { | ||
| // fallback default | ||
| if goproxy == "" { | ||
| return "https", "proxy.golang.org", nil | ||
| } | ||
|
|
||
| var goproxyHost, goproxyScheme string | ||
| // Use url from GOPROXY variable if set. | ||
| // xref https://github.com/golang/go/blob/master/src/cmd/go/internal/modfetch/proxy.go | ||
| for goproxy != "" { | ||
| var rawURL string | ||
| if i := strings.IndexAny(goproxy, ",|"); i >= 0 { | ||
| rawURL = goproxy[:i] | ||
| goproxy = goproxy[i+1:] | ||
| } else { | ||
| rawURL = goproxy | ||
| goproxy = "" | ||
| } | ||
|
|
||
| rawURL = strings.TrimSpace(rawURL) | ||
| if rawURL == "" { | ||
| continue | ||
| } | ||
| if rawURL == "off" || rawURL == "direct" { | ||
| return "", "", fmt.Errorf("expected GOPROXY environment variable to not be set to off or direct") | ||
| } | ||
|
|
||
| // Single-word tokens are reserved for built-in behaviors, and anything | ||
| // containing the string ":/" or matching an absolute file path must be a | ||
| // complete URL. For all other paths, implicitly add "https://". | ||
| if strings.ContainsAny(rawURL, ".:/") && !strings.Contains(rawURL, ":/") && !filepath.IsAbs(rawURL) && !path.IsAbs(rawURL) { | ||
| rawURL = "https://" + rawURL | ||
| } | ||
|
|
||
| parsedURL, err := url.Parse(rawURL) | ||
| if err != nil { | ||
| return "", "", errors.Wrapf(err, "parse GOPROXY url %q", rawURL) | ||
| } | ||
| goproxyHost = parsedURL.Host | ||
| goproxyScheme = parsedURL.Scheme | ||
| // A host was found so no need to continue. | ||
| break | ||
| } | ||
|
|
||
| return goproxyScheme, goproxyHost, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| 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. | ||
| */ | ||
|
|
||
| package repository | ||
|
|
||
| import "testing" | ||
|
|
||
| func Test_getGoproxyHost(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| envvar string | ||
| wantScheme string | ||
| wantHost string | ||
| wantErr bool | ||
| }{ | ||
| { | ||
| name: "defaulting", | ||
| envvar: "", | ||
| wantScheme: "https", | ||
| wantHost: "proxy.golang.org", | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "direct is unsupported", | ||
| envvar: "direct", | ||
| wantScheme: "", | ||
| wantHost: "", | ||
| wantErr: true, | ||
| }, | ||
| { | ||
| name: "off is unsupported", | ||
| envvar: "off", | ||
| wantScheme: "", | ||
| wantHost: "", | ||
| wantErr: true, | ||
| }, | ||
| { | ||
| name: "other goproxy", | ||
| envvar: "foo.bar.de", | ||
| wantScheme: "https", | ||
| wantHost: "foo.bar.de", | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "other goproxy comma separated, return first", | ||
| envvar: "foo.bar,foobar.barfoo", | ||
| wantScheme: "https", | ||
| wantHost: "foo.bar", | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "other goproxy including https scheme", | ||
| envvar: "https://foo.bar", | ||
| wantScheme: "https", | ||
| wantHost: "foo.bar", | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "other goproxy including http scheme", | ||
| envvar: "http://foo.bar", | ||
| wantScheme: "http", | ||
| wantHost: "foo.bar", | ||
| wantErr: false, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| gotScheme, gotHost, err := getGoproxyHost(tt.envvar) | ||
| if (err != nil) != tt.wantErr { | ||
| t.Errorf("getGoproxyHost() error = %v, wantErr %v", err, tt.wantErr) | ||
| return | ||
| } | ||
| if gotScheme != tt.wantScheme { | ||
| t.Errorf("getGoproxyHost() = %v, wantScheme %v", gotScheme, tt.wantScheme) | ||
| } | ||
| if gotHost != tt.wantHost { | ||
| t.Errorf("getGoproxyHost() = %v, wantHost %v", gotHost, tt.wantHost) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.