Skip to content

Commit

Permalink
Satisfy golangci-lint and fix tests
Browse files Browse the repository at this point in the history
(cherry picked from commit 7ce4285)
  • Loading branch information
mjura committed Feb 9, 2024
1 parent 6896f57 commit 5bdaf85
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ jobs:
- name: Analysis
uses: golangci/golangci-lint-action@v3
with:
args: -v
skip-pkg-cache: true
4 changes: 2 additions & 2 deletions test/e2e/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,15 @@ func ReadE2EConfig(configPath string) (*E2EConfig, error) { //nolint:gocyclo
}

func substituteVersions(config *E2EConfig) error {
certManagerURL, err := envsubst.Eval(config.CertManagerChartURL, func(s string) string {
certManagerURL, err := envsubst.Eval(config.CertManagerChartURL, func(_ string) string {
return config.CertManagerVersion
})
if err != nil {
return fmt.Errorf("failed to substitute cert manager chart url: %w", err)
}
config.CertManagerChartURL = certManagerURL

rancherURL, err := envsubst.Eval(config.RancherChartURL, func(s string) string {
rancherURL, err := envsubst.Eval(config.RancherChartURL, func(_ string) string {
return config.RancherVersion
})
if err != nil {
Expand Down

0 comments on commit 5bdaf85

Please sign in to comment.