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

Followup - prevent handleRepositories from crashing | Stop using pointers in logs | Fix fetching service from repo #262

Merged
merged 7 commits into from
Feb 23, 2024
Merged

Followup - prevent handleRepositories from crashing | Stop using pointers in logs | Fix fetching service from repo #262

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6c5954
fix nil base directory case with handleRepositories
Feb 21, 2024
8652a3a
re-add logging like normal
Feb 21, 2024
149b051
wip
Feb 21, 2024
e20aa6e
gitignore the binary
Feb 21, 2024
5774da6
add og branch
Feb 22, 2024
59c7f3b
changie
Feb 22, 2024
2d0ccab
directory is /
Feb 22, 2024
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
3 changes: 3 additions & 0 deletions .changes/unreleased/Bugfix-20240221-191652.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
kind: Bugfix
body: Fix bug where service repos were never renamed if base dir was /
time: 2024-02-21T19:16:52.351803-05:00
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ src/dist
**/coverage.txt
**/go.work*
**/opslevel-k8s.yaml
**/kubectl-opslevel
29 changes: 20 additions & 9 deletions src/common/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,15 +363,26 @@ func (r *ServiceReconciler) handleTools(service *opslevel.Service, registration

func (r *ServiceReconciler) handleRepositories(service *opslevel.Service, registration opslevel_jq_parser.ServiceRegistration) {
for _, repositoryCreate := range registration.Repositories {
if repositoryCreate.Repository.Alias == nil || *repositoryCreate.Repository.Alias == "null" {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#36

Checking for string "null" because of this^

continue
}
repoCreateString := "repoCreate{}"
b, err := json.Marshal(repositoryCreate)
if err == nil {
repoCreateString = string(b)
}
foundRepository, foundRepositoryErr := r.client.GetRepositoryWithAlias(*repositoryCreate.Repository.Alias)
if foundRepositoryErr != nil {
log.Warn().Msgf("[%s] Repository with alias: '%+v' not found so it cannot be attached to service ... skipping", service.Name, repositoryCreate)
log.Warn().Msgf("[%s] Repository with alias: '%s' not found so it cannot be attached to service ... skipping", service.Name, repoCreateString)
continue
} else if foundRepository == nil {
log.Warn().Msgf("[%s] Repository with alias: '%+v' call to GetRepositoryWithAlias unexpectedly returned nil - please submit a bug report ... skipping", service.Name, repositoryCreate)
log.Warn().Msgf("[%s] Repository with alias: '%s' call to GetRepositoryWithAlias unexpectedly returned nil - please submit a bug report ... skipping", service.Name, repoCreateString)
continue
}
serviceRepository := foundRepository.GetService(service.Id, *repositoryCreate.BaseDirectory)
var serviceRepository *opslevel.ServiceRepository
if repositoryCreate.BaseDirectory != nil {
serviceRepository = foundRepository.GetService(service.Id, *repositoryCreate.BaseDirectory)
}
if serviceRepository != nil {
if repositoryCreate.DisplayName != nil && serviceRepository.DisplayName != *repositoryCreate.DisplayName {
repositoryUpdate := opslevel.ServiceRepositoryUpdateInput{
Expand All @@ -380,22 +391,22 @@ func (r *ServiceReconciler) handleRepositories(service *opslevel.Service, regist
}
err := r.client.UpdateServiceRepository(repositoryUpdate)
if err != nil {
log.Error().Msgf("[%s] Failed updating repository '%+v'\n\tREASON: %v", service.Name, repositoryCreate, err.Error())
log.Error().Msgf("[%s] Failed updating repository '%s'\n\tREASON: %v", service.Name, repoCreateString, err.Error())
continue
} else {
log.Info().Msgf("[%s] Updated repository '%+v'", service.Name, repositoryCreate)
log.Info().Msgf("[%s] Updated repository '%s'", service.Name, repoCreateString)
continue
}
}
log.Debug().Msgf("[%s] Repository '%+v' already attached to service ... skipping", service.Name, repositoryCreate)
log.Debug().Msgf("[%s] Repository '%s' already attached to service ... skipping", service.Name, repoCreateString)
continue
}
repositoryCreate.Service = opslevel.IdentifierInput{Id: &service.Id}
err := r.client.CreateServiceRepository(repositoryCreate)
err = r.client.CreateServiceRepository(repositoryCreate)
if err != nil {
log.Error().Msgf("[%s] Failed assigning repository '%+v'\n\tREASON: %v", service.Name, repositoryCreate, err.Error())
log.Error().Msgf("[%s] Failed assigning repository '%s'\n\tREASON: %v", service.Name, repoCreateString, err.Error())
} else {
log.Info().Msgf("[%s] Attached repository '%+v'", service.Name, repositoryCreate)
log.Info().Msgf("[%s] Attached repository '%s'", service.Name, repoCreateString)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/submodules/opslevel-go
Open in desktop
Submodule opslevel-go updated 2 files
+3 −0 .changes/unreleased/Bugfix-20240221-191059.yaml
+2 −1 repository.go
Loading