Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: give context to errors (#10592) #15022

Merged
merged 12 commits into from
Aug 11, 2023
24 changes: 12 additions & 12 deletions util/settings/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ func (mgr *SettingsManager) GetSecretsLister() (v1listers.SecretLister, error) {
func (mgr *SettingsManager) GetSecretsInformer() (cache.SharedIndexInformer, error) {
err := mgr.ensureSynced(false)
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving secrets informer %w", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
return mgr.secretsInformer, nil
}
Expand Down Expand Up @@ -688,14 +688,14 @@ func (mgr *SettingsManager) GetConfigMapByName(configMapName string) (*apiv1.Con
func (mgr *SettingsManager) GetResourcesFilter() (*ResourcesFilter, error) {
argoCDCM, err := mgr.getConfigMap()
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving Argo CD config map %w", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
rf := &ResourcesFilter{}
if value, ok := argoCDCM.Data[resourceInclusionsKey]; ok {
includedResources := make([]FilteredResource, 0)
err := yaml.Unmarshal([]byte(value), &includedResources)
if err != nil {
return nil, err
return nil, fmt.Errorf("error unmarshalling included resources %w", err)
}
rf.ResourceInclusions = includedResources
}
Expand All @@ -704,7 +704,7 @@ func (mgr *SettingsManager) GetResourcesFilter() (*ResourcesFilter, error) {
excludedResources := make([]FilteredResource, 0)
err := yaml.Unmarshal([]byte(value), &excludedResources)
if err != nil {
return nil, err
return nil, fmt.Errorf("error unmarshalling excluded resources %w", err)
}
rf.ResourceExclusions = excludedResources
}
Expand Down Expand Up @@ -759,13 +759,13 @@ func (mgr *SettingsManager) GetServerRBACLogEnforceEnable() (bool, error) {
func (mgr *SettingsManager) GetDeepLinks(deeplinkType string) ([]DeepLink, error) {
argoCDCM, err := mgr.getConfigMap()
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving deep links %w", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
deepLinks := make([]DeepLink, 0)
if value, ok := argoCDCM.Data[deeplinkType]; ok {
err := yaml.Unmarshal([]byte(value), &deepLinks)
if err != nil {
return nil, err
return nil, fmt.Errorf("error unmarshalling deep links %w", err)
}
}
return deepLinks, nil
Expand Down Expand Up @@ -1036,7 +1036,7 @@ func (mgr *SettingsManager) GetHelmSettings() (*v1alpha1.HelmOptions, error) {
func (mgr *SettingsManager) GetKustomizeSettings() (*KustomizeSettings, error) {
argoCDCM, err := mgr.getConfigMap()
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving config map %w", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
kustomizeVersionsMap := map[string]KustomizeVersion{}
buildOptions := map[string]string{}
Expand Down Expand Up @@ -1238,15 +1238,15 @@ func (mgr *SettingsManager) GetSettings() (*ArgoCDSettings, error) {
}
argoCDCM, err := mgr.configmaps.ConfigMaps(mgr.namespace).Get(common.ArgoCDConfigMapName)
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving config map name %w", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
argoCDSecret, err := mgr.secrets.Secrets(mgr.namespace).Get(common.ArgoCDSecretName)
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving config map secret name %w", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
selector, err := labels.Parse(partOfArgoCDSelector)
if err != nil {
return nil, err
return nil, fmt.Errorf("error parsing Argo CD selector %w", err)
}
secrets, err := mgr.secrets.Secrets(mgr.namespace).List(selector)
if err != nil {
Expand Down Expand Up @@ -2107,14 +2107,14 @@ func ReplaceStringSecret(val string, secretValues map[string]string) string {
func (mgr *SettingsManager) GetGlobalProjectsSettings() ([]GlobalProjectSettings, error) {
argoCDCM, err := mgr.getConfigMap()
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving config map %w", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
globalProjectSettings := make([]GlobalProjectSettings, 0)
if value, ok := argoCDCM.Data[globalProjectsKey]; ok {
if value != "" {
err := yaml.Unmarshal([]byte(value), &globalProjectSettings)
if err != nil {
return nil, err
return nil, fmt.Errorf("error unmarshalling global project settings %w", err)
crenshaw-dev marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions util/tls/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ func tlsVersionsToStr(versions []uint16) []string {
func getTLSConfigCustomizer(minVersionStr, maxVersionStr, tlsCiphersStr string) (ConfigCustomizer, error) {
minVersion, err := getTLSVersionByString(minVersionStr)
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving TLS version by string %s", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
maxVersion, err := getTLSVersionByString(maxVersionStr)
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving TLS version by string %s", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
if minVersion > maxVersion {
return nil, fmt.Errorf("Minimum TLS version %s must not be higher than maximum TLS version %s", minVersionStr, maxVersionStr)
Expand All @@ -153,7 +153,7 @@ func getTLSConfigCustomizer(minVersionStr, maxVersionStr, tlsCiphersStr string)
if tlsCiphersStr != "" {
cipherSuites, err = getTLSCipherSuitesByString(tlsCiphersStr)
if err != nil {
return nil, err
return nil, fmt.Errorf("error retrieving TLS cipher suites by string %w", err)
vipinachar marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
cipherSuites = make([]uint16, 0)
Expand Down
Loading