particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

store/compose: rename 'Id' to 'ID' to make linter happy

Browse source 
Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-05-10 21:56:13 +02:00
parent df7a0fec22
commit 5ba7e21a72
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/store/compose.go
View file

@ -20,7 +20,7 @@ func (ste *StateTransitionError) Error() string {
// ImageBuild represents a single image build inside a compose
type ImageBuild struct {
Id int
ID int
ImageType common.ImageType
Manifest *osbuild.Manifest
Targets []*target.Target
@ -28,7 +28,7 @@ type ImageBuild struct {
JobStarted time.Time
JobFinished time.Time
Size uint64
JobId uuid.UUID
JobID uuid.UUID
// Kept for backwards compatibility. Image builds which were done
// before the move to the job queue use this to store whether they
// finished successfully.
@ -49,7 +49,7 @@ func (ib *ImageBuild) DeepCopy() ImageBuild {
}
// Create new image build struct
return ImageBuild{
Id: ib.Id,
ID: ib.ID,
QueueStatus: ib.QueueStatus,
ImageType: ib.ImageType,
Manifest: newManifestPtr,
@ -58,7 +58,7 @@ func (ib *ImageBuild) DeepCopy() ImageBuild {
JobStarted: ib.JobStarted,
JobFinished: ib.JobFinished,
Size: ib.Size,
JobId: ib.JobId,
JobID: ib.JobID,
}
}

8
internal/store/json.go
View file

@ -102,7 +102,7 @@ func newComposesFromV0(composesStruct composesV0) map[uuid.UUID]Compose {
}
for _, imgBuild := range composeStruct.ImageBuilds {
ib := ImageBuild{
Id: imgBuild.ID,
ID: imgBuild.ID,
ImageType: imgBuild.ImageType,
Manifest: imgBuild.Manifest,
Targets: imgBuild.Targets,
@ -110,7 +110,7 @@ func newComposesFromV0(composesStruct composesV0) map[uuid.UUID]Compose {
JobStarted: imgBuild.JobStarted,
JobFinished: imgBuild.JobFinished,
Size: imgBuild.Size,
JobId: imgBuild.JobID,
JobID: imgBuild.JobID,
QueueStatus: imgBuild.QueueStatus,
}
c.ImageBuilds = append(c.ImageBuilds, ib)
@ -239,7 +239,7 @@ func newComposesV0(composes map[uuid.UUID]Compose) composesV0 {
}
for _, imgBuild := range compose.ImageBuilds {
ib := imageBuildV0{
ID: imgBuild.Id,
ID: imgBuild.ID,
ImageType: imgBuild.ImageType,
Manifest: imgBuild.Manifest,
Targets: imgBuild.Targets,
@ -247,7 +247,7 @@ func newComposesV0(composes map[uuid.UUID]Compose) composesV0 {
JobStarted: imgBuild.JobStarted,
JobFinished: imgBuild.JobFinished,
Size: imgBuild.Size,
JobID: imgBuild.JobId,
JobID: imgBuild.JobID,
QueueStatus: imgBuild.QueueStatus,
}
c.ImageBuilds = append(c.ImageBuilds, ib)

2
internal/store/store.go
View file

@ -423,7 +423,7 @@ func (s *Store) PushCompose(composeID uuid.UUID, manifest *osbuild.Manifest, ima
Targets: targets,
JobCreated: time.Now(),
Size: size,
JobId: jobId,
JobID: jobId,
},
},
}

2
internal/weldr/api.go
View file

@ -150,7 +150,7 @@ func (api *API) getComposeState(compose store.Compose) (state common.ComposeStat
return
}
jobId := compose.ImageBuilds[0].JobId
jobId := compose.ImageBuilds[0].JobID
// backwards compatibility: composes that were around before splitting
// the job queue from the store still contain their valid status and