Skip to content

Commit 5e468a4

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#84478 from hvaara/fix-golint-pkg/credentialprovider/gcp
Fix golint issues in pkg/credentialprovider/gcp
2 parents 86dbdbe + e40c473 commit 5e468a4

File tree

4 files changed

+32
-33
lines changed

4 files changed

+32
-33
lines changed

‎hack/.golint_failures‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ pkg/controller/volume/persistentvolume
104104
pkg/controller/volume/persistentvolume/config/v1alpha1
105105
pkg/controller/volume/persistentvolume/options
106106
pkg/credentialprovider
107-
pkg/credentialprovider/gcp
108107
pkg/features
109108
pkg/kubeapiserver
110109
pkg/kubeapiserver/options

‎pkg/credentialprovider/gcp/doc.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Package gcp_credentials contains implementations of DockerConfigProvider
17+
// Package gcp contains implementations of DockerConfigProvider
1818
// for Google Cloud Platform.
19-
package gcp_credentials // import "k8s.io/kubernetes/pkg/credentialprovider/gcp"
19+
package gcp // import "k8s.io/kubernetes/pkg/credentialprovider/gcp"

‎pkg/credentialprovider/gcp/metadata.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package gcp_credentials
17+
package gcp
1818

1919
import (
2020
"encoding/json"
@@ -31,14 +31,14 @@ import (
3131
)
3232

3333
const (
34-
metadataUrl = "http://metadata.google.internal./computeMetadata/v1/"
35-
metadataAttributes = metadataUrl + "instance/attributes/"
34+
metadataURL = "http://metadata.google.internal./computeMetadata/v1/"
35+
metadataAttributes = metadataURL + "instance/attributes/"
3636
dockerConfigKey = metadataAttributes + "google-dockercfg"
37-
dockerConfigUrlKey = metadataAttributes + "google-dockercfg-url"
38-
serviceAccounts = metadataUrl + "instance/service-accounts/"
39-
metadataScopes = metadataUrl + "instance/service-accounts/default/scopes"
40-
metadataToken = metadataUrl + "instance/service-accounts/default/token"
41-
metadataEmail = metadataUrl + "instance/service-accounts/default/email"
37+
dockerConfigURLKey = metadataAttributes + "google-dockercfg-url"
38+
serviceAccounts = metadataURL + "instance/service-accounts/"
39+
metadataScopes = metadataURL + "instance/service-accounts/default/scopes"
40+
metadataToken = metadataURL + "instance/service-accounts/default/token"
41+
metadataEmail = metadataURL + "instance/service-accounts/default/email"
4242
storageScopePrefix = "https://www.googleapis.com/auth/devstorage"
4343
cloudPlatformScopePrefix = "https://www.googleapis.com/auth/cloud-platform"
4444
defaultServiceAccount = "default/"
@@ -70,7 +70,7 @@ type dockerConfigKeyProvider struct {
7070

7171
// A DockerConfigProvider that reads its configuration from a URL read from
7272
// a specific Google Compute Engine metadata key: 'google-dockercfg-url'.
73-
type dockerConfigUrlKeyProvider struct {
73+
type dockerConfigURLKeyProvider struct {
7474
metadataProvider
7575
}
7676

@@ -100,7 +100,7 @@ func init() {
100100

101101
credentialprovider.RegisterCredentialProvider("google-dockercfg-url",
102102
&credentialprovider.CachingDockerConfigProvider{
103-
Provider: &dockerConfigUrlKeyProvider{
103+
Provider: &dockerConfigURLKeyProvider{
104104
metadataProvider{Client: httpClient},
105105
},
106106
Lifetime: 60 * time.Second,
@@ -160,9 +160,9 @@ func (g *dockerConfigKeyProvider) Provide(image string) credentialprovider.Docke
160160
}
161161

162162
// Provide implements DockerConfigProvider
163-
func (g *dockerConfigUrlKeyProvider) Provide(image string) credentialprovider.DockerConfig {
163+
func (g *dockerConfigURLKeyProvider) Provide(image string) credentialprovider.DockerConfig {
164164
// Read the contents of the google-dockercfg-url key and load a .dockercfg from there
165-
if url, err := credentialprovider.ReadUrl(dockerConfigUrlKey, g.Client, metadataHeader); err != nil {
165+
if url, err := credentialprovider.ReadUrl(dockerConfigURLKey, g.Client, metadataHeader); err != nil {
166166
klog.Errorf("while reading 'google-dockercfg-url' metadata: %v", err)
167167
} else {
168168
if strings.HasPrefix(string(url), "http") {
@@ -268,7 +268,7 @@ type tokenBlob struct {
268268
func (g *containerRegistryProvider) Provide(image string) credentialprovider.DockerConfig {
269269
cfg := credentialprovider.DockerConfig{}
270270

271-
tokenJsonBlob, err := credentialprovider.ReadUrl(metadataToken, g.Client, metadataHeader)
271+
tokenJSONBlob, err := credentialprovider.ReadUrl(metadataToken, g.Client, metadataHeader)
272272
if err != nil {
273273
klog.Errorf("while reading access token endpoint: %v", err)
274274
return cfg
@@ -281,8 +281,8 @@ func (g *containerRegistryProvider) Provide(image string) credentialprovider.Doc
281281
}
282282

283283
var parsedBlob tokenBlob
284-
if err := json.Unmarshal([]byte(tokenJsonBlob), &parsedBlob); err != nil {
285-
klog.Errorf("while parsing json blob %s: %v", tokenJsonBlob, err)
284+
if err := json.Unmarshal([]byte(tokenJSONBlob), &parsedBlob); err != nil {
285+
klog.Errorf("while parsing json blob %s: %v", tokenJSONBlob, err)
286286
return cfg
287287
}
288288

‎pkg/credentialprovider/gcp/metadata_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package gcp_credentials
17+
package gcp
1818

1919
import (
2020
"encoding/base64"
@@ -42,7 +42,7 @@ func createProductNameFile() (string, error) {
4242
}
4343

4444
func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
45-
registryUrl := "hello.kubernetes.io"
45+
registryURL := "hello.kubernetes.io"
4646
email := "[email protected]"
4747
username := "foo"
4848
password := "bar"
@@ -52,7 +52,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
5252
"email": %q,
5353
"auth": %q
5454
}
55-
}`, registryUrl, email, auth)
55+
}`, registryURL, email, auth)
5656

5757
var err error
5858
gceProductNameFile, err = createProductNameFile()
@@ -93,9 +93,9 @@ func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
9393

9494
keyring.Add(provider.Provide(""))
9595

96-
creds, ok := keyring.Lookup(registryUrl)
96+
creds, ok := keyring.Lookup(registryURL)
9797
if !ok {
98-
t.Errorf("Didn't find expected URL: %s", registryUrl)
98+
t.Errorf("Didn't find expected URL: %s", registryURL)
9999
return
100100
}
101101
if len(creds) > 1 {
@@ -115,7 +115,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
115115
}
116116

117117
func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
118-
registryUrl := "hello.kubernetes.io"
118+
registryURL := "hello.kubernetes.io"
119119
email := "[email protected]"
120120
username := "foo"
121121
password := "bar"
@@ -125,7 +125,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
125125
"email": %q,
126126
"auth": %q
127127
}
128-
}`, registryUrl, email, auth)
128+
}`, registryURL, email, auth)
129129

130130
var err error
131131
gceProductNameFile, err = createProductNameFile()
@@ -143,7 +143,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
143143
w.WriteHeader(http.StatusOK)
144144
w.Header().Set("Content-Type", "application/json")
145145
fmt.Fprintln(w, sampleDockerConfig)
146-
} else if strings.HasSuffix(dockerConfigUrlKey, r.URL.Path) {
146+
} else if strings.HasSuffix(dockerConfigURLKey, r.URL.Path) {
147147
w.WriteHeader(http.StatusOK)
148148
w.Header().Set("Content-Type", "application/text")
149149
fmt.Fprint(w, "http://foo.bar.com"+valueEndpoint)
@@ -161,7 +161,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
161161
})
162162

163163
keyring := &credentialprovider.BasicDockerKeyring{}
164-
provider := &dockerConfigUrlKeyProvider{
164+
provider := &dockerConfigURLKeyProvider{
165165
metadataProvider{Client: &http.Client{Transport: transport}},
166166
}
167167

@@ -171,9 +171,9 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
171171

172172
keyring.Add(provider.Provide(""))
173173

174-
creds, ok := keyring.Lookup(registryUrl)
174+
creds, ok := keyring.Lookup(registryURL)
175175
if !ok {
176-
t.Errorf("Didn't find expected URL: %s", registryUrl)
176+
t.Errorf("Didn't find expected URL: %s", registryURL)
177177
return
178178
}
179179
if len(creds) > 1 {
@@ -193,7 +193,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
193193
}
194194

195195
func TestContainerRegistryBasics(t *testing.T) {
196-
registryUrl := "container.cloud.google.com"
196+
registryURL := "container.cloud.google.com"
197197
email := "[email protected]"
198198
token := &tokenBlob{AccessToken: "ya26.lots-of-indiscernible-garbage"}
199199

@@ -255,9 +255,9 @@ func TestContainerRegistryBasics(t *testing.T) {
255255

256256
keyring.Add(provider.Provide(""))
257257

258-
creds, ok := keyring.Lookup(registryUrl)
258+
creds, ok := keyring.Lookup(registryURL)
259259
if !ok {
260-
t.Errorf("Didn't find expected URL: %s", registryUrl)
260+
t.Errorf("Didn't find expected URL: %s", registryURL)
261261
return
262262
}
263263
if len(creds) > 1 {
@@ -425,7 +425,7 @@ func TestAllProvidersNoMetadata(t *testing.T) {
425425
&dockerConfigKeyProvider{
426426
metadataProvider{Client: &http.Client{Transport: transport}},
427427
},
428-
&dockerConfigUrlKeyProvider{
428+
&dockerConfigURLKeyProvider{
429429
metadataProvider{Client: &http.Client{Transport: transport}},
430430
},
431431
&containerRegistryProvider{

0 commit comments

Comments
 (0)