Skip to content

Commit

Permalink
deprecations, gofmt
Browse files Browse the repository at this point in the history
  • Loading branch information
romain-dartigues committed Sep 12, 2023
1 parent 783516c commit d86d69d
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 30 deletions.
14 changes: 6 additions & 8 deletions boshupdate/bosh.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"github.com/cloudfoundry/bosh-cli/director"
"github.com/cloudfoundry/bosh-cli/uaa"
"github.com/cloudfoundry/bosh-utils/logger"
"io/ioutil"
"os"
"regexp"
)
Expand Down Expand Up @@ -40,7 +39,7 @@ func (c *BoshConfig) validate() error {
if len(c.CaCert) == 0 {
c.CaCert = os.Getenv("BOSH_CA_CERT")
} else {
val, err := ioutil.ReadFile(c.CaCert)
val, err := os.ReadFile(c.CaCert)
if err != nil {
return fmt.Errorf("unable to read file at path %s", c.CaCert)
}
Expand Down Expand Up @@ -74,8 +73,7 @@ func buildLogger(config BoshConfig) (logger.Logger, error) {
if err != nil {
return nil, err
}
logger := logger.NewLogger(level)
return logger, nil
return logger.NewLogger(level), nil
}

func buildUAA(url string, config BoshConfig, logger logger.Logger) (uaa.UAA, error) {
Expand Down Expand Up @@ -111,12 +109,12 @@ func NewDirector(config BoshConfig) (director.Director, error) {
os.Setenv("BOSH_ALL_PROXY", config.Proxy)
}

logger, err := buildLogger(config)
log, err := buildLogger(config)
if err != nil {
return nil, err
}

infos, err := getDirectorInfo(config, logger)
infos, err := getDirectorInfo(config, log)
if err != nil {
return nil, err
}
Expand All @@ -132,13 +130,13 @@ func NewDirector(config BoshConfig) (director.Director, error) {
if !ok {
return nil, fmt.Errorf("Expected UAA URL '%s' to be a string", uaaURL)
}
uaaCli, err := buildUAA(uaaURLStr, config, logger)
uaaCli, err := buildUAA(uaaURLStr, config, log)
if err != nil {
return nil, err
}
directorConfig.TokenFunc = uaa.NewClientTokenSession(uaaCli).TokenFunc
}

factory := director.NewFactory(logger)
factory := director.NewFactory(log)
return factory.New(directorConfig, director.NewNoopTaskReporter(), director.NewNoopFileReporter())
}
3 changes: 1 addition & 2 deletions boshupdate/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
"io"
"io/ioutil"
"os"
"regexp"
"strings"
Expand Down Expand Up @@ -162,7 +161,7 @@ func (c *Config) Validate() error {

// NewConfig - Creates and validates config from given reader
func NewConfig(file io.Reader) *Config {
content, err := ioutil.ReadAll(file)
content, err := io.ReadAll(file)
if err != nil {
log.Fatalf("unable to read configuration file : %s", err)
os.Exit(1)
Expand Down
30 changes: 15 additions & 15 deletions boshupdate/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/oauth2"
"gopkg.in/yaml.v2"
"io/ioutil"
"io"
"regexp"
"sort"
)
Expand All @@ -32,7 +32,7 @@ func NewManager(config Config) (*Manager, error) {
&oauth2.Token{AccessToken: config.Github.Token},
)
tc := oauth2.NewClient(ctx, ts)
director, err := NewDirector(config.Bosh)
newDirector, err := NewDirector(config.Bosh)
if err != nil {
return nil, errors.Wrapf(err, "unable to create director client")
}
Expand All @@ -41,7 +41,7 @@ func NewManager(config Config) (*Manager, error) {
config: config,
client: github.NewClient(tc),
ctx: ctx,
director: director,
director: newDirector,
}, nil
}

Expand Down Expand Up @@ -122,8 +122,8 @@ func (a *Manager) GetGenericReleases() []GenericReleaseData {
results := []GenericReleaseData{}
for name, item := range a.config.Github.GenericReleases {
entry := log.WithFields(log.Fields{
"name": name,
"repo": item.Repo,
"name": name,
"repo": item.Repo,
"owner": item.Owner,
})
entry.Debugf("processing github release")
Expand Down Expand Up @@ -162,8 +162,8 @@ func (a *Manager) GetManifestReleases() []ManifestReleaseData {

entry := log.WithFields(log.Fields{
"deployment": name,
"repo": item.Repo,
"owner": item.Owner,
"repo": item.Repo,
"owner": item.Owner,
})
entry.Debugf("processing bosh deployment")

Expand All @@ -186,9 +186,9 @@ func (a *Manager) GetManifestReleases() []ManifestReleaseData {

entry = log.WithFields(log.Fields{
"deployment": name,
"repo": item.Repo,
"owner": item.Owner,
"version": target.LatestVersion.Version,
"repo": item.Repo,
"owner": item.Owner,
"version": target.LatestVersion.Version,
})

if len(item.Manifest) == 0 {
Expand Down Expand Up @@ -242,8 +242,8 @@ func (a *Manager) listReleases(item GenericReleaseConfig) ([]*github.RepositoryR
}
}

// 1. For some reason, we get empty date when reading tag object
// We fetch information for corresponding sha to get tag date
// 1. For some reason, we get empty date when reading tag object
// We fetch information for corresponding sha to get tag date
func (a *Manager) getRefs(item GenericReleaseConfig) ([]GithubRef, error) {
res := []GithubRef{}
release := item.HasType("release")
Expand Down Expand Up @@ -312,7 +312,7 @@ func (a *Manager) getContent(ref string, item ManifestReleaseConfig, path string
}

defer stream.Close()
content, err := ioutil.ReadAll(stream)
content, err := io.ReadAll(stream)
if err != nil {
return []byte{}, errors.Wrapf(err, "could read remote stream")
}
Expand All @@ -335,8 +335,8 @@ func (a *Manager) createVersions(refs []GithubRef, last GithubRef, item GenericR
// RenderManifest -
func (a *Manager) RenderManifest(manifest []byte, item ManifestReleaseData) ([]byte, error) {
entry := log.WithFields(log.Fields{
"name": item.Name,
"repo": item.Repo,
"name": item.Name,
"repo": item.Repo,
"owner": item.Owner,
})
entry.Debugf("rendering final manifest")
Expand Down
6 changes: 3 additions & 3 deletions cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ package main

import (
"fmt"
"github.com/alecthomas/kingpin/v2"
"github.com/orange-cloudfoundry/boshupdate_exporter/boshupdate"
log "github.com/sirupsen/logrus"
"github.com/prometheus/common/version"
"github.com/alecthomas/kingpin/v2"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
"os"
)

var (
configFile = kingpin.Flag("config", "Configuration file path").Required().File()
logLevel = kingpin.Flag(
logLevel = kingpin.Flag(
"log.level", "Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]",
).Default("info").String()
logStream = kingpin.Flag(
Expand Down
4 changes: 2 additions & 2 deletions exporter/main.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package main

import (
"github.com/alecthomas/kingpin/v2"
"github.com/orange-cloudfoundry/boshupdate_exporter/boshupdate"
"github.com/prometheus/client_golang/prometheus/promhttp"
log "github.com/sirupsen/logrus"
"github.com/prometheus/common/version"
"github.com/alecthomas/kingpin/v2"
log "github.com/sirupsen/logrus"
"net/http"
"os"
"time"
Expand Down

0 comments on commit d86d69d

Please sign in to comment.