Skip to content

Commit

Permalink
Fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Arief Rahmansyah committed May 3, 2024
1 parent 1737c24 commit e4a53fb
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 10 deletions.
2 changes: 1 addition & 1 deletion api/turing/api/ensembler_images_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (c EnsemblerImagesController) ListImages(
}

func (c EnsemblerImagesController) BuildImage(
r *http.Request,
_ *http.Request,
vars RequestVars,
body interface{},
) *Response {
Expand Down
14 changes: 11 additions & 3 deletions api/turing/imagebuilder/imagebuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -512,15 +512,20 @@ func (ib *imageBuilder) GetImageBuildingJobStatus(
status.Message = err.Error()
}

pods, err := ib.clusterController.ListPods(context.Background(), ib.imageBuildingConfig.BuildNamespace, fmt.Sprintf("job-name=%s", kanikoJobName))
pods, err := ib.clusterController.ListPods(
context.Background(),
ib.imageBuildingConfig.BuildNamespace,
fmt.Sprintf("job-name=%s", kanikoJobName),
)
if err != nil && !kerrors.IsNotFound(err) {
status.Message = err.Error()
return
}

for _, pod := range pods.Items {
if len(pod.Status.ContainerStatuses) > 0 {
podContainerTable, podLastTerminationMessage, podLastTerminationReason = utils.ParsePodContainerStatuses(pod.Status.ContainerStatuses)
podContainerTable, podLastTerminationMessage,
podLastTerminationReason = utils.ParsePodContainerStatuses(pod.Status.ContainerStatuses)
status.Message = podLastTerminationReason
break
}
Expand Down Expand Up @@ -555,7 +560,10 @@ func (ib *imageBuilder) DeleteImageBuildingJob(
return err
}

func (ib *imageBuilder) GetEnsemblerImage(project *mlp.Project, ensembler *models.PyFuncEnsembler) (EnsemblerImage, error) {
func (ib *imageBuilder) GetEnsemblerImage(
project *mlp.Project,
ensembler *models.PyFuncEnsembler,
) (EnsemblerImage, error) {
imageName := ib.nameGenerator.generateDockerImageName(project.Name, ensembler.Name)
imageExists, err := ib.checkIfImageExists(imageName, ensembler.RunID)
if err != nil {
Expand Down
32 changes: 26 additions & 6 deletions api/turing/service/ensembler_image_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@ import (
)

type EnsemblerImagesService interface {
ListImages(project *mlp.Project, ensembler *models.PyFuncEnsembler, runnerType models.EnsemblerRunnerType) ([]imagebuilder.EnsemblerImage, error)
BuildImage(project *mlp.Project, ensembler *models.PyFuncEnsembler, runnerType models.EnsemblerRunnerType) error
ListImages(
project *mlp.Project,
ensembler *models.PyFuncEnsembler,
runnerType models.EnsemblerRunnerType,
) ([]imagebuilder.EnsemblerImage, error)
BuildImage(
project *mlp.Project,
ensembler *models.PyFuncEnsembler,
runnerType models.EnsemblerRunnerType,
) error
}

type EnsemblerImagesListOptions struct {
Expand All @@ -25,14 +33,20 @@ type ensemblerImagesService struct {
ensemblerServiceImageBuilder imagebuilder.ImageBuilder
}

func NewEnsemblerImagesService(ensemblerJobImageBuilder, ensemblerServiceImageBuilder imagebuilder.ImageBuilder) EnsemblerImagesService {
func NewEnsemblerImagesService(ensemblerJobImageBuilder imagebuilder.ImageBuilder,
ensemblerServiceImageBuilder imagebuilder.ImageBuilder,
) EnsemblerImagesService {
return &ensemblerImagesService{
ensemblerJobImageBuilder: ensemblerJobImageBuilder,
ensemblerServiceImageBuilder: ensemblerServiceImageBuilder,
}
}

func (s *ensemblerImagesService) ListImages(project *mlp.Project, ensembler *models.PyFuncEnsembler, runnerType models.EnsemblerRunnerType) ([]imagebuilder.EnsemblerImage, error) {
func (s *ensemblerImagesService) ListImages(
project *mlp.Project,
ensembler *models.PyFuncEnsembler,
runnerType models.EnsemblerRunnerType,
) ([]imagebuilder.EnsemblerImage, error) {
builders := []imagebuilder.ImageBuilder{}

if runnerType == models.EnsemblerRunnerTypeJob {
Expand All @@ -55,7 +69,11 @@ func (s *ensemblerImagesService) ListImages(project *mlp.Project, ensembler *mod
return images, nil
}

func (s *ensemblerImagesService) BuildImage(project *mlp.Project, ensembler *models.PyFuncEnsembler, runnerType models.EnsemblerRunnerType) error {
func (s *ensemblerImagesService) BuildImage(
project *mlp.Project,
ensembler *models.PyFuncEnsembler,
runnerType models.EnsemblerRunnerType,
) error {
ib, err := s.getImageBuilder(runnerType)
if err != nil {
return err
Expand Down Expand Up @@ -86,7 +104,9 @@ func (s *ensemblerImagesService) BuildImage(project *mlp.Project, ensembler *mod
return nil
}

func (s *ensemblerImagesService) getImageBuilder(runnerType models.EnsemblerRunnerType) (imagebuilder.ImageBuilder, error) {
func (s *ensemblerImagesService) getImageBuilder(
runnerType models.EnsemblerRunnerType,
) (imagebuilder.ImageBuilder, error) {
switch runnerType {
case models.EnsemblerRunnerTypeJob:
return s.ensemblerJobImageBuilder, nil
Expand Down

0 comments on commit e4a53fb

Please sign in to comment.