Skip to content

Commit

Permalink
feat: realize release storage using backend (#1120)
Browse files Browse the repository at this point in the history
  • Loading branch information
healthjyk committed May 21, 2024
1 parent 2aa9fdb commit 70e6c6a
Show file tree
Hide file tree
Showing 7 changed files with 118 additions and 5 deletions.
4 changes: 4 additions & 0 deletions pkg/backend/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/backend/storages"
"kusionstack.io/kusion/pkg/config"
"kusionstack.io/kusion/pkg/engine/release"
"kusionstack.io/kusion/pkg/engine/state"
"kusionstack.io/kusion/pkg/workspace"
)
Expand All @@ -17,6 +18,9 @@ type Backend interface {

// StateStorage returns the state storage.
StateStorage(project, workspace string) state.Storage

// ReleaseStorage returns the release storage.
ReleaseStorage(project, workspace string) (release.Storage, error)
}

// NewBackend creates the Backend with the configuration set in the Kusion configuration file, where the input
Expand Down
6 changes: 6 additions & 0 deletions pkg/backend/storages/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package storages

import (
v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/release"
releasestorages "kusionstack.io/kusion/pkg/engine/release/storages"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
"kusionstack.io/kusion/pkg/workspace"
Expand All @@ -26,3 +28,7 @@ func (s *LocalStorage) StateStorage(project, workspace string) state.Storage {
func (s *LocalStorage) WorkspaceStorage() (workspace.Storage, error) {
return workspacestorages.NewLocalStorage(workspacestorages.GenWorkspaceDirPath(s.path))
}

func (s *LocalStorage) ReleaseStorage(project, workspace string) (release.Storage, error) {
return releasestorages.NewLocalStorage(releasestorages.GenReleaseDirPath(s.path, project, workspace))
}
38 changes: 33 additions & 5 deletions pkg/backend/storages/local_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
releasestorages "kusionstack.io/kusion/pkg/engine/release/storages"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
"kusionstack.io/kusion/pkg/workspace"
workspacestorages "kusionstack.io/kusion/pkg/workspace/storages"
)

Expand Down Expand Up @@ -65,10 +65,9 @@ func TestLocalStorage_StateStorage(t *testing.T) {

func TestLocalStorage_WorkspaceStorage(t *testing.T) {
testcases := []struct {
name string
success bool
localStorage *LocalStorage
workspaceStorage workspace.Storage
name string
success bool
localStorage *LocalStorage
}{
{
name: "workspace storage from local backend",
Expand All @@ -89,3 +88,32 @@ func TestLocalStorage_WorkspaceStorage(t *testing.T) {
})
}
}

func TestLocalStorage_ReleaseStorage(t *testing.T) {
testcases := []struct {
name string
success bool
localStorage *LocalStorage
project, workspace string
}{
{
name: "release storage from local backend",
success: true,
localStorage: &LocalStorage{
path: "kusion",
},
project: "wordpress",
workspace: "dev",
},
}

for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
mockey.PatchConvey("mock new local release storage", t, func() {
mockey.Mock(releasestorages.NewLocalStorage).Return(&releasestorages.LocalStorage{}, nil).Build()
_, err := tc.localStorage.ReleaseStorage(tc.project, tc.workspace)
assert.Equal(t, tc.success, err == nil)
})
})
}
}
6 changes: 6 additions & 0 deletions pkg/backend/storages/oss.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"github.com/aliyun/aliyun-oss-go-sdk/oss"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/release"
releasestorages "kusionstack.io/kusion/pkg/engine/release/storages"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
"kusionstack.io/kusion/pkg/workspace"
Expand Down Expand Up @@ -38,3 +40,7 @@ func (s *OssStorage) StateStorage(project, workspace string) state.Storage {
func (s *OssStorage) WorkspaceStorage() (workspace.Storage, error) {
return workspacestorages.NewOssStorage(s.bucket, workspacestorages.GenGenericOssWorkspacePrefixKey(s.prefix))
}

func (s *OssStorage) ReleaseStorage(project, workspace string) (release.Storage, error) {
return releasestorages.NewOssStorage(s.bucket, releasestorages.GenGenericOssReleasePrefixKey(s.prefix, project, workspace))
}
31 changes: 31 additions & 0 deletions pkg/backend/storages/oss_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
releasestorages "kusionstack.io/kusion/pkg/engine/release/storages"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
workspacestorages "kusionstack.io/kusion/pkg/workspace/storages"
Expand Down Expand Up @@ -100,3 +101,33 @@ func TestOssStorage_WorkspaceStorage(t *testing.T) {
})
}
}

func TestOssStorage_ReleaseStorage(t *testing.T) {
testcases := []struct {
name string
success bool
ossStorage *OssStorage
project, workspace string
}{
{
name: "release storage from s3 backend",
success: true,
ossStorage: &OssStorage{
bucket: &oss.Bucket{},
prefix: "kusion",
},
project: "wordpress",
workspace: "dev",
},
}

for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
mockey.PatchConvey("mock new oss release storage", t, func() {
mockey.Mock(releasestorages.NewOssStorage).Return(&releasestorages.OssStorage{}, nil).Build()
_, err := tc.ossStorage.ReleaseStorage(tc.project, tc.workspace)
assert.Equal(t, tc.success, err == nil)
})
})
}
}
6 changes: 6 additions & 0 deletions pkg/backend/storages/s3.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"github.com/aws/aws-sdk-go/service/s3"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
"kusionstack.io/kusion/pkg/engine/release"
releasestorages "kusionstack.io/kusion/pkg/engine/release/storages"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
"kusionstack.io/kusion/pkg/workspace"
Expand Down Expand Up @@ -51,3 +53,7 @@ func (s *S3Storage) StateStorage(project, workspace string) state.Storage {
func (s *S3Storage) WorkspaceStorage() (workspace.Storage, error) {
return workspacestorages.NewS3Storage(s.s3, s.bucket, workspacestorages.GenGenericOssWorkspacePrefixKey(s.prefix))
}

func (s *S3Storage) ReleaseStorage(project, workspace string) (release.Storage, error) {
return releasestorages.NewS3Storage(s.s3, s.bucket, releasestorages.GenGenericOssReleasePrefixKey(s.prefix, project, workspace))
}
32 changes: 32 additions & 0 deletions pkg/backend/storages/s3_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/stretchr/testify/assert"

v1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1"
releasestorages "kusionstack.io/kusion/pkg/engine/release/storages"
"kusionstack.io/kusion/pkg/engine/state"
statestorages "kusionstack.io/kusion/pkg/engine/state/storages"
workspacestorages "kusionstack.io/kusion/pkg/workspace/storages"
Expand Down Expand Up @@ -105,3 +106,34 @@ func TestS3Storage_WorkspaceStorage(t *testing.T) {
})
}
}

func TestS3Storage_ReleaseStorage(t *testing.T) {
testcases := []struct {
name string
success bool
s3Storage *S3Storage
project, workspace string
}{
{
name: "release storage from s3 backend",
success: true,
s3Storage: &S3Storage{
s3: &s3.S3{},
bucket: "infra",
prefix: "kusion",
},
project: "wordpress",
workspace: "dev",
},
}

for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
mockey.PatchConvey("mock new s3 release storage", t, func() {
mockey.Mock(releasestorages.NewS3Storage).Return(&releasestorages.S3Storage{}, nil).Build()
_, err := tc.s3Storage.ReleaseStorage(tc.project, tc.workspace)
assert.Equal(t, tc.success, err == nil)
})
})
}
}

0 comments on commit 70e6c6a

Please sign in to comment.