Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
Signed-off-by: Sunghoon Kang <[email protected]>
  • Loading branch information
devholic committed Aug 1, 2023
1 parent e995046 commit 852cc74
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions internal/api/types/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ func FromStageProto(s *v1alpha1.Stage) *kubev1alpha1.Stage {
if s.GetStatus() != nil {
status = *FromStageStatusProto(s.GetStatus())
}
var objectMeta metav1.ObjectMeta
var objectMeta kubemetav1.ObjectMeta
if s.GetMetadata() != nil {
objectMeta = *s.GetMetadata()
objectMeta = *typesmetav1.FromObjectMetaProto(s.GetMetadata())
}
return &kubev1alpha1.Stage{
TypeMeta: metav1.TypeMeta{
TypeMeta: kubemetav1.TypeMeta{
APIVersion: kubev1alpha1.GroupVersion.String(),
Kind: "Stage",
},
Expand Down Expand Up @@ -64,6 +64,11 @@ func FromStageStateProto(s *v1alpha1.StageState) *kubev1alpha1.StageState {
if s == nil {
return nil
}
var firstSeen *kubemetav1.Time
if s.GetFirstSeen() != nil {
fs := kubemetav1.NewTime(s.GetFirstSeen().AsTime())
firstSeen = &fs
}
commits := make([]kubev1alpha1.GitCommit, len(s.GetCommits()))
for idx, commit := range s.GetCommits() {
commits[idx] = *FromGitCommitProto(commit)
Expand All @@ -78,7 +83,7 @@ func FromStageStateProto(s *v1alpha1.StageState) *kubev1alpha1.StageState {
}
return &kubev1alpha1.StageState{
ID: s.GetId(),
FirstSeen: s.GetFirstSeen(),
FirstSeen: firstSeen,
Provenance: s.GetProvenance(),
Commits: commits,
Images: images,
Expand All @@ -92,7 +97,7 @@ func FromGitCommitProto(g *v1alpha1.GitCommit) *kubev1alpha1.GitCommit {
return nil
}
return &kubev1alpha1.GitCommit{
RepoURL: g.GetRepoURL(),
RepoURL: g.GetRepoUrl(),
ID: g.GetId(),
Branch: g.GetBranch(),
HealthCheckCommit: g.GetHealthCheckCommit(),
Expand All @@ -104,7 +109,7 @@ func FromImageProto(i *v1alpha1.Image) *kubev1alpha1.Image {
return nil
}
return &kubev1alpha1.Image{
RepoURL: i.GetRepoURL(),
RepoURL: i.GetRepoUrl(),
Tag: i.GetTag(),
}
}
Expand All @@ -114,7 +119,7 @@ func FromChartProto(c *v1alpha1.Chart) *kubev1alpha1.Chart {
return nil
}
return &kubev1alpha1.Chart{
RegistryURL: c.GetRegistryURL(),
RegistryURL: c.GetRegistryUrl(),
Name: c.GetName(),
Version: c.GetVersion(),
}
Expand Down

0 comments on commit 852cc74

Please sign in to comment.