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

Jump to bottom

feat: no support of phase in the release metadata #1135

Merged
merged 1 commit into from
May 28, 2024
+6 −24
Merged

feat: no support of phase in the release metadata #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/engine/release/storages/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (s *LocalStorage) Create(r *v1.Release) error {
return err
}

addLatestReleaseMetaData(s.meta, r.Revision, r.Stack, r.Phase)
addLatestReleaseMetaData(s.meta, r.Revision, r.Stack)
return s.writeMeta()
}

Expand Down
1 change: 0 additions & 1 deletion pkg/engine/release/storages/local_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ func mockReleaseMeta(revision uint64) *releaseMetaData {
return &releaseMetaData{
Revision: revision,
Stack: "test_stack",
Phase: v1.ReleasePhaseSucceeded,
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/release/storages/oss.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (s *OssStorage) Create(r *v1.Release) error {
return err
}

addLatestReleaseMetaData(s.meta, r.Revision, r.Stack, r.Phase)
addLatestReleaseMetaData(s.meta, r.Revision, r.Stack)
return s.writeMeta()
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/engine/release/storages/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (s *S3Storage) Create(r *v1.Release) error {
return err
}

addLatestReleaseMetaData(s.meta, r.Revision, r.Stack, r.Phase)
addLatestReleaseMetaData(s.meta, r.Revision, r.Stack)
return s.writeMeta()
}

Expand Down
3 changes: 0 additions & 3 deletions pkg/engine/release/storages/testdata/releases/test_project/test_ws/.metadata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ latestRevision: 3
releaseMetaDatas:
- revision: 1
stack: test_stack
phase: succeeded
- revision: 2
stack: test_stack
phase: succeeded
- revision: 3
stack: test_stack
phase: succeeded
10 changes: 2 additions & 8 deletions pkg/engine/release/storages/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"fmt"
"path/filepath"
"strings"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
)

const (
Expand Down Expand Up @@ -44,16 +42,13 @@ type releasesMetaData struct {
ReleaseMetaDatas []*releaseMetaData `yaml:"releaseMetaDatas,omitempty" json:"releaseMetaDatas,omitempty"`
}

// releaseMetaData contains mata data of a specified release, which contains the Revision, Stack and Phase.
// releaseMetaData contains mata data of a specified release, which contains the Revision and Stack.
type releaseMetaData struct {
// Revision of the Release.
Revision uint64

// Stack of the Release.
Stack string

// Phase of the Release.
Phase v1.ReleasePhase
}

// checkRevisionExistence returns the workspace exists or not.
Expand Down Expand Up @@ -90,12 +85,11 @@ func getStackBoundRevisions(meta *releasesMetaData, stack string) []uint64 {

// addLatestReleaseMetaData adds a release and updates the latest revision in the metadata, called
// by the storage.Create.
func addLatestReleaseMetaData(meta *releasesMetaData, revision uint64, stack string, phase v1.ReleasePhase) {
func addLatestReleaseMetaData(meta *releasesMetaData, revision uint64, stack string) {
meta.LatestRevision = revision
metaData := &releaseMetaData{
Revision: revision,
Stack: stack,
Phase: phase,
}
meta.ReleaseMetaDatas = append(meta.ReleaseMetaDatas, metaData)
}
10 changes: 1 addition & 9 deletions pkg/engine/release/storages/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,14 @@ func mockReleasesMetaData() *releasesMetaData {
{
Revision: 1,
Stack: "dev",
Phase: v1.ReleasePhaseSucceeded,
},
{
Revision: 2,
Stack: "pre",
Phase: v1.ReleasePhaseFailed,
},
{
Revision: 3,
Stack: "pre",
Phase: v1.ReleasePhaseSucceeded,
},
},
}
Expand Down Expand Up @@ -131,7 +128,6 @@ func TestAddLatestReleaseMetaData(t *testing.T) {
{
Revision: 1,
Stack: "prod",
Phase: v1.ReleasePhaseGenerating,
},
},
},
Expand All @@ -148,22 +144,18 @@ func TestAddLatestReleaseMetaData(t *testing.T) {
{
Revision: 1,
Stack: "dev",
Phase: v1.ReleasePhaseSucceeded,
},
{
Revision: 2,
Stack: "pre",
Phase: v1.ReleasePhaseFailed,
},
{
Revision: 3,
Stack: "pre",
Phase: v1.ReleasePhaseSucceeded,
},
{
Revision: 4,
Stack: "prod",
Phase: v1.ReleasePhasePreviewing,
},
},
},
Expand All @@ -172,7 +164,7 @@ func TestAddLatestReleaseMetaData(t *testing.T) {

for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
addLatestReleaseMetaData(tc.meta, tc.revision, tc.stack, tc.phase)
addLatestReleaseMetaData(tc.meta, tc.revision, tc.stack)
assert.Equal(t, tc.expectedMeta, tc.expectedMeta)
})
}
Expand Down