Skip to content

Commit 75a168c

Browse files
committed
Use consts when setting values too
Signed-off-by: Charlie Egan <[email protected]>
1 parent f1551f8 commit 75a168c

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

pkg/datagatherer/versionchecker/versionchecker.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,41 +96,41 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
9696
return fmt.Errorf("failed to load params for %s registry %d/%d: %s", v.Kind, i+1, len(aux.Registries), err)
9797
}
9898

99-
c.VersionCheckerClientOptions.GCR.Token = data["token"]
99+
c.VersionCheckerClientOptions.GCR.Token = data[gcrTokenKey]
100100
case "acr":
101101
data, err := loadKeysFromPaths([]string{acrUsernameKey, acrPasswordKey, acrRefreshTokenKey}, v.Params)
102102
if err != nil {
103103
return fmt.Errorf("failed to load params for %s registry %d/%d: %s", v.Kind, i+1, len(aux.Registries), err)
104104
}
105105

106-
c.VersionCheckerClientOptions.ACR.Username = data["username"]
107-
c.VersionCheckerClientOptions.ACR.Password = data["password"]
108-
c.VersionCheckerClientOptions.ACR.RefreshToken = data["refresh_token"]
106+
c.VersionCheckerClientOptions.ACR.Username = data[acrUsernameKey]
107+
c.VersionCheckerClientOptions.ACR.Password = data[acrPasswordKey]
108+
c.VersionCheckerClientOptions.ACR.RefreshToken = data[acrRefreshTokenKey]
109109
case "ecr":
110110
data, err := loadKeysFromPaths([]string{ecrAccessKeyIdKey, ecrSecretAccessKeyKey, ecrSessionTokenKey}, v.Params)
111111
if err != nil {
112112
return fmt.Errorf("failed to load params for %s registry %d/%d: %s", v.Kind, i+1, len(aux.Registries), err)
113113
}
114114

115-
c.VersionCheckerClientOptions.ECR.AccessKeyID = data["access_key_id"]
116-
c.VersionCheckerClientOptions.ECR.SecretAccessKey = data["secret_access_key"]
117-
c.VersionCheckerClientOptions.ECR.SessionToken = data["session_token"]
115+
c.VersionCheckerClientOptions.ECR.AccessKeyID = data[ecrAccessKeyIdKey]
116+
c.VersionCheckerClientOptions.ECR.SecretAccessKey = data[ecrSecretAccessKeyKey]
117+
c.VersionCheckerClientOptions.ECR.SessionToken = data[ecrSessionTokenKey]
118118
case "docker":
119119
data, err := loadKeysFromPaths([]string{dockerUsernameKey, dockerPasswordKey, dockerTokenKey}, v.Params)
120120
if err != nil {
121121
return fmt.Errorf("failed to load params for %s registry %d/%d: %s", v.Kind, i+1, len(aux.Registries), err)
122122
}
123123

124-
c.VersionCheckerClientOptions.Docker.Username = data["username"]
125-
c.VersionCheckerClientOptions.Docker.Password = data["password"]
126-
c.VersionCheckerClientOptions.Docker.Token = data["token"]
124+
c.VersionCheckerClientOptions.Docker.Username = data[dockerUsernameKey]
125+
c.VersionCheckerClientOptions.Docker.Password = data[dockerPasswordKey]
126+
c.VersionCheckerClientOptions.Docker.Token = data[dockerTokenKey]
127127
case "quay":
128128
data, err := loadKeysFromPaths([]string{quayTokenKey}, v.Params)
129129
if err != nil {
130130
return fmt.Errorf("failed to load params for %s registry %d/%d: %s", v.Kind, i+1, len(aux.Registries), err)
131131
}
132132

133-
c.VersionCheckerClientOptions.Quay.Token = data["token"]
133+
c.VersionCheckerClientOptions.Quay.Token = data[quayTokenKey]
134134
case "selfhosted":
135135
// currently, version checker only supports multiple selfhosted registries
136136
data, err := loadKeysFromPaths([]string{selfhostedUsernameKey, selfhostedPasswordKey, selfhostedHostKey, selfhostedBearerKey}, v.Params)
@@ -139,10 +139,10 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
139139
}
140140

141141
opts := vcselfhosted.Options{
142-
Username: data["username"],
143-
Password: data["password"],
144-
Bearer: data["bearer"],
145-
Host: data["host"],
142+
Username: data[selfhostedUsernameKey],
143+
Password: data[selfhostedPasswordKey],
144+
Bearer: data[selfhostedBearerKey],
145+
Host: data[selfhostedHostKey],
146146
}
147147

148148
if len(opts.Host) == 0 {

0 commit comments

Comments
 (0)