From ed65e3ac3c834386773f0f7d09285de3b4e48952 Mon Sep 17 00:00:00 2001 From: KK <68334452+healthjyk@users.noreply.github.com> Date: Tue, 28 May 2024 15:20:22 +0800 Subject: [PATCH] feat: no support of phase in the release metadata (#1135) --- pkg/engine/release/storages/local.go | 2 +- pkg/engine/release/storages/local_test.go | 1 - pkg/engine/release/storages/oss.go | 2 +- pkg/engine/release/storages/s3.go | 2 +- .../releases/test_project/test_ws/.metadata.yml | 3 --- pkg/engine/release/storages/util.go | 10 ++-------- pkg/engine/release/storages/util_test.go | 10 +--------- 7 files changed, 6 insertions(+), 24 deletions(-) diff --git a/pkg/engine/release/storages/local.go b/pkg/engine/release/storages/local.go index 724e337e..bb6c3ffd 100644 --- a/pkg/engine/release/storages/local.go +++ b/pkg/engine/release/storages/local.go @@ -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() } diff --git a/pkg/engine/release/storages/local_test.go b/pkg/engine/release/storages/local_test.go index ba269a7d..e898b7d3 100644 --- a/pkg/engine/release/storages/local_test.go +++ b/pkg/engine/release/storages/local_test.go @@ -161,7 +161,6 @@ func mockReleaseMeta(revision uint64) *releaseMetaData { return &releaseMetaData{ Revision: revision, Stack: "test_stack", - Phase: v1.ReleasePhaseSucceeded, } } diff --git a/pkg/engine/release/storages/oss.go b/pkg/engine/release/storages/oss.go index 1081fe48..ef7bf341 100644 --- a/pkg/engine/release/storages/oss.go +++ b/pkg/engine/release/storages/oss.go @@ -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() } diff --git a/pkg/engine/release/storages/s3.go b/pkg/engine/release/storages/s3.go index 5d03e976..f6df21f0 100644 --- a/pkg/engine/release/storages/s3.go +++ b/pkg/engine/release/storages/s3.go @@ -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() } diff --git a/pkg/engine/release/storages/testdata/releases/test_project/test_ws/.metadata.yml b/pkg/engine/release/storages/testdata/releases/test_project/test_ws/.metadata.yml index d381c3c0..ac10f587 100644 --- a/pkg/engine/release/storages/testdata/releases/test_project/test_ws/.metadata.yml +++ b/pkg/engine/release/storages/testdata/releases/test_project/test_ws/.metadata.yml @@ -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 diff --git a/pkg/engine/release/storages/util.go b/pkg/engine/release/storages/util.go index b522345b..097ff428 100644 --- a/pkg/engine/release/storages/util.go +++ b/pkg/engine/release/storages/util.go @@ -5,8 +5,6 @@ import ( "fmt" "path/filepath" "strings" - - v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1" ) const ( @@ -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. @@ -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) } diff --git a/pkg/engine/release/storages/util_test.go b/pkg/engine/release/storages/util_test.go index 15d9ec7e..0182479c 100644 --- a/pkg/engine/release/storages/util_test.go +++ b/pkg/engine/release/storages/util_test.go @@ -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, }, }, } @@ -131,7 +128,6 @@ func TestAddLatestReleaseMetaData(t *testing.T) { { Revision: 1, Stack: "prod", - Phase: v1.ReleasePhaseGenerating, }, }, }, @@ -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, }, }, }, @@ -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) }) }