Skip to content

Commit 4e0c659

Browse files
review comments
1 parent ebd5b91 commit 4e0c659

5 files changed

Lines changed: 13 additions & 205 deletions

File tree

api/RestHandler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func (impl *RestHandlerImpl) ReleaseWebhookHandler(w http.ResponseWriter, r *htt
184184
// validate event type
185185
eventType := r.Header.Get(impl.client.GitHubConfig.GitHubEventTypeHeader)
186186
impl.logger.Debugw("webhook event type header", "eventType : ", eventType)
187-
if len(eventType) == 0 && eventType != bean.EventTypeRelease {
187+
if len(eventType) == 0 || eventType != bean.EventTypeRelease {
188188
impl.logger.Errorw("Event type not known ", eventType)
189189
impl.WriteJsonResp(w, err, nil, http.StatusBadRequest)
190190
return

pkg/ReleaseNoteService.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type ReleaseNoteService interface {
3838
UpdateReleases(requestBodyBytes []byte) (bool, error)
3939
GetModulesV2() ([]*common.Module, error)
4040
GetModuleByName(name string) (*common.Module, error)
41-
GetReleasesOnInitialisation(repository bean.Repository)
41+
GetReleasesOnInitialisation(repository bean.Repository) error
4242
}
4343

4444
type ReleaseNoteServiceImpl struct {
@@ -68,7 +68,11 @@ func NewReleaseNoteServiceImpl(logger *zap.SugaredLogger, client *util.GitHubCli
6868
// Async Call for getting releases from Github
6969
serviceImpl.logger.Infow("getting release from github")
7070
for _, repo := range client.GitHubConfig.GitHubRepo {
71-
go serviceImpl.GetReleasesOnInitialisation(bean.Repository(repo))
71+
err := serviceImpl.GetReleasesOnInitialisation(bean.Repository(repo))
72+
if err != nil {
73+
logger.Errorw("error in getting releases from github", "err", err)
74+
return nil, err
75+
}
7276
}
7377
return serviceImpl, nil
7478
}
@@ -283,6 +287,8 @@ func (impl *ReleaseNoteServiceImpl) GetReleasesFromGithubWithRetry(repository be
283287
retryCount = retryCount + 1
284288
releasesDto, releaseStatus := impl.GetReleasesFromGithub(repository)
285289
if !releaseStatus {
290+
// adding sleep for 3 seconds before retry
291+
time.Sleep(3 * time.Second)
286292
continue
287293
}
288294
operationComplete = releaseStatus
@@ -468,23 +474,25 @@ func (impl *ReleaseNoteServiceImpl) GetModuleByName(name string) (*common.Module
468474
return module, nil
469475
}
470476

471-
func (impl *ReleaseNoteServiceImpl) GetReleasesOnInitialisation(repository bean.Repository) {
477+
func (impl *ReleaseNoteServiceImpl) GetReleasesOnInitialisation(repository bean.Repository) error {
472478
cacheKey := bean.GetCacheKeyBasedOnRepo(repository)
473479
// Getting releases from github on Initialisation(will try 3 times if failed)
474480
releases, err := impl.GetReleasesFromGithubWithRetry(repository)
475481
if err != nil {
476482
impl.logger.Errorw("error in getting releases from github on initialisation", "err", fmt.Errorf("failed operation on fetching releases from github, attempted 3 times"))
477-
return
483+
return err
478484
}
479485
if len(releases) > 0 {
480486
releaseCache[cacheKey] = releases
481487
releaseInfo := releases[0]
482488
_, err = impl.updateTagToBlobStorage(releaseInfo, repository)
483489
if err != nil {
484490
impl.logger.Errorw("error in updating on blob", "err", err, "tagName", releaseInfo.TagName)
491+
return err
485492
}
486493

487494
}
495+
return nil
488496
}
489497

490498
func (impl *ReleaseNoteServiceImpl) createBlobStorageRequest(cloudProvider blob_storage.BlobStorageType, sourceKey string, destinationKey string) *blob_storage.BlobStorageRequest {

pkg/releaseNote/ReleaseNoteRepository.go

Lines changed: 0 additions & 74 deletions
This file was deleted.

pkg/sql/connection.go

Lines changed: 0 additions & 102 deletions
This file was deleted.

pkg/sql/wire_sql.go

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)