github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84478 from hvaara/fix-golint-pkg/credentialprovider/gcp

Browse Source 
Fix golint issues in pkg/credentialprovider/gcp
This commit is contained in:
Kubernetes Prow Robot 2019-10-30 06:38:54 -07:00 committed by GitHub
commit 5e468a49de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@ -104,7 +104,6 @@ pkg/controller/volume/persistentvolume
pkg/controller/volume/persistentvolume/config/v1alpha1 pkg/controller/volume/persistentvolume/config/v1alpha1
pkg/controller/volume/persistentvolume/options pkg/controller/volume/persistentvolume/options
pkg/credentialprovider pkg/credentialprovider
pkg/credentialprovider/gcp
pkg/features pkg/features
pkg/kubeapiserver pkg/kubeapiserver
pkg/kubeapiserver/options pkg/kubeapiserver/options

4
pkg/credentialprovider/gcp/doc.go
View File

@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package gcp_credentials contains implementations of DockerConfigProvider // Package gcp contains implementations of DockerConfigProvider
// for Google Cloud Platform. // for Google Cloud Platform.
package gcp_credentials // import "k8s.io/kubernetes/pkg/credentialprovider/gcp" package gcp // import "k8s.io/kubernetes/pkg/credentialprovider/gcp"

30
pkg/credentialprovider/gcp/metadata.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package gcp_credentials package gcp
import ( import (
"encoding/json" "encoding/json"
@ -31,14 +31,14 @@ import (
) )
const ( const (
metadataUrl = "http://metadata.google.internal./computeMetadata/v1/" metadataURL = "http://metadata.google.internal./computeMetadata/v1/"
metadataAttributes = metadataUrl + "instance/attributes/" metadataAttributes = metadataURL + "instance/attributes/"
dockerConfigKey = metadataAttributes + "google-dockercfg" dockerConfigKey = metadataAttributes + "google-dockercfg"
dockerConfigUrlKey = metadataAttributes + "google-dockercfg-url" dockerConfigURLKey = metadataAttributes + "google-dockercfg-url"
serviceAccounts = metadataUrl + "instance/service-accounts/" serviceAccounts = metadataURL + "instance/service-accounts/"
metadataScopes = metadataUrl + "instance/service-accounts/default/scopes" metadataScopes = metadataURL + "instance/service-accounts/default/scopes"
metadataToken = metadataUrl + "instance/service-accounts/default/token" metadataToken = metadataURL + "instance/service-accounts/default/token"
metadataEmail = metadataUrl + "instance/service-accounts/default/email" metadataEmail = metadataURL + "instance/service-accounts/default/email"
storageScopePrefix = "https://www.googleapis.com/auth/devstorage" storageScopePrefix = "https://www.googleapis.com/auth/devstorage"
cloudPlatformScopePrefix = "https://www.googleapis.com/auth/cloud-platform" cloudPlatformScopePrefix = "https://www.googleapis.com/auth/cloud-platform"
defaultServiceAccount = "default/" defaultServiceAccount = "default/"
@ -70,7 +70,7 @@ type dockerConfigKeyProvider struct {
// A DockerConfigProvider that reads its configuration from a URL read from // A DockerConfigProvider that reads its configuration from a URL read from
// a specific Google Compute Engine metadata key: 'google-dockercfg-url'. // a specific Google Compute Engine metadata key: 'google-dockercfg-url'.
type dockerConfigUrlKeyProvider struct { type dockerConfigURLKeyProvider struct {
metadataProvider metadataProvider
} }
@ -100,7 +100,7 @@ func init() {
credentialprovider.RegisterCredentialProvider("google-dockercfg-url", credentialprovider.RegisterCredentialProvider("google-dockercfg-url",
&credentialprovider.CachingDockerConfigProvider{ &credentialprovider.CachingDockerConfigProvider{
Provider: &dockerConfigUrlKeyProvider{ Provider: &dockerConfigURLKeyProvider{
metadataProvider{Client: httpClient}, metadataProvider{Client: httpClient},
}, },
Lifetime: 60 * time.Second, Lifetime: 60 * time.Second,
@ -160,9 +160,9 @@ func (g *dockerConfigKeyProvider) Provide(image string) credentialprovider.Docke
} }
// Provide implements DockerConfigProvider // Provide implements DockerConfigProvider
func (g *dockerConfigUrlKeyProvider) Provide(image string) credentialprovider.DockerConfig { func (g *dockerConfigURLKeyProvider) Provide(image string) credentialprovider.DockerConfig {
// Read the contents of the google-dockercfg-url key and load a .dockercfg from there // Read the contents of the google-dockercfg-url key and load a .dockercfg from there
if url, err := credentialprovider.ReadUrl(dockerConfigUrlKey, g.Client, metadataHeader); err != nil { if url, err := credentialprovider.ReadUrl(dockerConfigURLKey, g.Client, metadataHeader); err != nil {
klog.Errorf("while reading 'google-dockercfg-url' metadata: %v", err) klog.Errorf("while reading 'google-dockercfg-url' metadata: %v", err)
} else { } else {
if strings.HasPrefix(string(url), "http") { if strings.HasPrefix(string(url), "http") {
@ -268,7 +268,7 @@ type tokenBlob struct {
func (g *containerRegistryProvider) Provide(image string) credentialprovider.DockerConfig { func (g *containerRegistryProvider) Provide(image string) credentialprovider.DockerConfig {
cfg := credentialprovider.DockerConfig{} cfg := credentialprovider.DockerConfig{}
tokenJsonBlob, err := credentialprovider.ReadUrl(metadataToken, g.Client, metadataHeader) tokenJSONBlob, err := credentialprovider.ReadUrl(metadataToken, g.Client, metadataHeader)
if err != nil { if err != nil {
klog.Errorf("while reading access token endpoint: %v", err) klog.Errorf("while reading access token endpoint: %v", err)
return cfg return cfg
@ -281,8 +281,8 @@ func (g *containerRegistryProvider) Provide(image string) credentialprovider.Doc
} }
var parsedBlob tokenBlob var parsedBlob tokenBlob
if err := json.Unmarshal([]byte(tokenJsonBlob), &parsedBlob); err != nil { if err := json.Unmarshal([]byte(tokenJSONBlob), &parsedBlob); err != nil {
klog.Errorf("while parsing json blob %s: %v", tokenJsonBlob, err) klog.Errorf("while parsing json blob %s: %v", tokenJSONBlob, err)
return cfg return cfg
} }

30
pkg/credentialprovider/gcp/metadata_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package gcp_credentials package gcp
import ( import (
"encoding/base64" "encoding/base64"
@ -42,7 +42,7 @@ func createProductNameFile() (string, error) {
} }
func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) { func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
registryUrl := "hello.kubernetes.io" registryURL := "hello.kubernetes.io"
email := "foo@bar.baz" email := "foo@bar.baz"
username := "foo" username := "foo"
password := "bar" password := "bar"
@ -52,7 +52,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
"email": %q, "email": %q,
"auth": %q "auth": %q
} }
}`, registryUrl, email, auth) }`, registryURL, email, auth)
var err error var err error
gceProductNameFile, err = createProductNameFile() gceProductNameFile, err = createProductNameFile()
@ -93,9 +93,9 @@ func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
keyring.Add(provider.Provide("")) keyring.Add(provider.Provide(""))
creds, ok := keyring.Lookup(registryUrl) creds, ok := keyring.Lookup(registryURL)
if !ok { if !ok {
t.Errorf("Didn't find expected URL: %s", registryUrl) t.Errorf("Didn't find expected URL: %s", registryURL)
return return
} }
if len(creds) > 1 { if len(creds) > 1 {
@ -115,7 +115,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
} }
func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) { func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
registryUrl := "hello.kubernetes.io" registryURL := "hello.kubernetes.io"
email := "foo@bar.baz" email := "foo@bar.baz"
username := "foo" username := "foo"
password := "bar" password := "bar"
@ -125,7 +125,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
"email": %q, "email": %q,
"auth": %q "auth": %q
} }
}`, registryUrl, email, auth) }`, registryURL, email, auth)
var err error var err error
gceProductNameFile, err = createProductNameFile() gceProductNameFile, err = createProductNameFile()
@ -143,7 +143,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
fmt.Fprintln(w, sampleDockerConfig) fmt.Fprintln(w, sampleDockerConfig)
} else if strings.HasSuffix(dockerConfigUrlKey, r.URL.Path) { } else if strings.HasSuffix(dockerConfigURLKey, r.URL.Path) {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
w.Header().Set("Content-Type", "application/text") w.Header().Set("Content-Type", "application/text")
fmt.Fprint(w, "http://foo.bar.com"+valueEndpoint) fmt.Fprint(w, "http://foo.bar.com"+valueEndpoint)
@ -161,7 +161,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
}) })
keyring := &credentialprovider.BasicDockerKeyring{} keyring := &credentialprovider.BasicDockerKeyring{}
provider := &dockerConfigUrlKeyProvider{ provider := &dockerConfigURLKeyProvider{
metadataProvider{Client: &http.Client{Transport: transport}}, metadataProvider{Client: &http.Client{Transport: transport}},
} }
@ -171,9 +171,9 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
keyring.Add(provider.Provide("")) keyring.Add(provider.Provide(""))
creds, ok := keyring.Lookup(registryUrl) creds, ok := keyring.Lookup(registryURL)
if !ok { if !ok {
t.Errorf("Didn't find expected URL: %s", registryUrl) t.Errorf("Didn't find expected URL: %s", registryURL)
return return
} }
if len(creds) > 1 { if len(creds) > 1 {
@ -193,7 +193,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
} }
func TestContainerRegistryBasics(t *testing.T) { func TestContainerRegistryBasics(t *testing.T) {
registryUrl := "container.cloud.google.com" registryURL := "container.cloud.google.com"
email := "1234@project.gserviceaccount.com" email := "1234@project.gserviceaccount.com"
token := &tokenBlob{AccessToken: "ya26.lots-of-indiscernible-garbage"} token := &tokenBlob{AccessToken: "ya26.lots-of-indiscernible-garbage"}
@ -255,9 +255,9 @@ func TestContainerRegistryBasics(t *testing.T) {
keyring.Add(provider.Provide("")) keyring.Add(provider.Provide(""))
creds, ok := keyring.Lookup(registryUrl) creds, ok := keyring.Lookup(registryURL)
if !ok { if !ok {
t.Errorf("Didn't find expected URL: %s", registryUrl) t.Errorf("Didn't find expected URL: %s", registryURL)
return return
} }
if len(creds) > 1 { if len(creds) > 1 {
@ -425,7 +425,7 @@ func TestAllProvidersNoMetadata(t *testing.T) {
&dockerConfigKeyProvider{ &dockerConfigKeyProvider{
metadataProvider{Client: &http.Client{Transport: transport}}, metadataProvider{Client: &http.Client{Transport: transport}},
}, },
&dockerConfigUrlKeyProvider{ &dockerConfigURLKeyProvider{
metadataProvider{Client: &http.Client{Transport: transport}}, metadataProvider{Client: &http.Client{Transport: transport}},
}, },
&containerRegistryProvider{ &containerRegistryProvider{