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.

Sign up for GitHub

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

Jump to bottom

Feature/refactor registry helper #504

Merged
merged 7 commits into from
Jun 7, 2020
Merged

Feature/refactor registry helper #504

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7589f2e
error handling
rusenask Jun 6, 2020
f526b2f
should return an err
rusenask Jun 6, 2020
55e342e
updated return
rusenask Jun 6, 2020
59730da
fmt
rusenask Jun 7, 2020
9da637e
deps
rusenask Jun 7, 2020
2503baa
test for cred helper
rusenask Jun 7, 2020
19facc2
check for nil creds
rusenask Jun 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
error handling
  • Loading branch information
@rusenask
rusenask committed Jun 6, 2020
commit 7589f2e8c6714b9c1fc4ccbd4ff187017439ff0d
16 changes: 10 additions & 6 deletions trigger/poll/multi_tags_watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,24 @@ func (j *WatchRepositoryTagsJob) Run() {
j.details.mu.RLock()
defer j.details.mu.RUnlock()

creds := credentialshelper.GetCredentials(j.details.trackedImage)

reg := j.details.trackedImage.Image.Scheme() + "://" + j.details.trackedImage.Image.Registry()
if j.details.latest == "" {
j.details.latest = j.details.trackedImage.Image.Tag()
}

repository, err := j.registryClient.Get(registry.Opts{
registryOpts := registry.Opts{
Registry: reg,
Name: j.details.trackedImage.Image.ShortName(),
Tag: j.details.latest,
Username: creds.Username,
Password: creds.Password,
})
}

creds, err := credentialshelper.GetCredentials(j.details.trackedImage)
if err == nil {
registryOpts.Username = creds.Username
registryOpts.Password = creds.Password
}

repository, err := j.registryClient.Get(registryOpts)

if err != nil {
log.WithFields(log.Fields{
Expand Down
15 changes: 10 additions & 5 deletions trigger/poll/single_tag_watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,20 @@ func NewWatchTagJob(providers provider.Providers, registryClient registry.Client

// Run - main function to check schedule
func (j *WatchTagJob) Run() {
creds := credentialshelper.GetCredentials(j.details.trackedImage)
reg := j.details.trackedImage.Image.Scheme() + "://" + j.details.trackedImage.Image.Registry()
currentDigest, err := j.registryClient.Digest(registry.Opts{
registryOpts := registry.Opts{
Registry: reg,
Name: j.details.trackedImage.Image.ShortName(),
Tag: j.details.trackedImage.Image.Tag(),
Username: creds.Username,
Password: creds.Password,
})
}

creds, err := credentialshelper.GetCredentials(j.details.trackedImage)
if err == nil {
registryOpts.Username = creds.Username
registryOpts.Password = creds.Password
}

currentDigest, err := j.registryClient.Digest(registryOpts)

registriesScannedCounter.With(prometheus.Labels{"registry": j.details.trackedImage.Image.Registry(), "image": j.details.trackedImage.Image.Repository()}).Inc()

Expand Down
16 changes: 10 additions & 6 deletions trigger/poll/watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,15 +225,19 @@ func (w *RepositoryWatcher) addJob(ti *types.TrackedImage, schedule string) erro
// getting initial digest
reg := ti.Image.Scheme() + "://" + ti.Image.Registry()

creds := credentialshelper.GetCredentials(ti)

digest, err := w.registryClient.Digest(registry.Opts{
registryOpts := registry.Opts{
Registry: reg,
Name: ti.Image.ShortName(),
Tag: ti.Image.Tag(),
Username: creds.Username,
Password: creds.Password,
})
}

creds, err := credentialshelper.GetCredentials(ti)
if err == nil {
registryOpts.Username = creds.Username
registryOpts.Password = creds.Password
}

digest, err := w.registryClient.Digest(registryOpts)
if err != nil {
log.WithFields(log.Fields{
"error": err,
Expand Down