@@ -3,6 +3,7 @@ package internalstorage
33import (
44 "context"
55 "fmt"
6+ "strings"
67
78 "gorm.io/gorm"
89 "k8s.io/apimachinery/pkg/runtime/schema"
@@ -12,30 +13,12 @@ import (
1213)
1314
1415type StorageFactory struct {
15- db * gorm.DB
16- AutoMigration * bool
17- DivisionPolicy DivisionPolicy
18- Mapper []ResourceMapper
16+ db * gorm.DB
17+ SkipAutoMigration bool
18+ DivisionPolicy DivisionPolicy
1919}
2020
2121func (s * StorageFactory ) AutoMigrate () error {
22- if s .AutoMigration != nil && * s .AutoMigration {
23- switch s.DivisionPolicy {
24- if err := s .db .AutoMigrate (& Resource {}); err != nil {
25- return err
26- }
27- case "" , DivisionPolicyNone :
28- case DivisionPolicyGroupResource :
29-
30- }
31-
32- if s .DivisionPolicy == "" || s .DivisionPolicy == DivisionPolicyNone {
33- if err := s .db .AutoMigrate (& Resource {}); err != nil {
34- return err
35- }
36- }
37- }
38-
3922 return nil
4023}
4124
@@ -44,10 +27,37 @@ func (s *StorageFactory) GetSupportedRequestVerbs() []string {
4427}
4528
4629func (s * StorageFactory ) NewResourceStorage (config * storage.ResourceStorageConfig ) (storage.ResourceStorage , error ) {
47- return & ResourceStorage {
48- db : s .db ,
49- codec : config .Codec ,
30+ gvr := schema.GroupVersionResource {
31+ Group : config .StorageGroupResource .Group ,
32+ Version : config .StorageVersion .Version ,
33+ Resource : config .StorageGroupResource .Resource ,
34+ }
35+ table := s .tableName (gvr )
36+
37+ var model interface {}
38+ switch s .DivisionPolicy {
39+ case DivisionPolicyGroupVersionResource :
40+ model = & GroupVersionResource {}
41+ if ! s .SkipAutoMigration {
42+ if exist := s .db .Migrator ().HasTable (table ); ! exist {
43+ if err := s .db .AutoMigrate (& GroupVersionResource {}); err != nil {
44+ return nil , err
45+ }
46+
47+ if err := s .db .Migrator ().RenameTable ("group_version_resources" , table ); err != nil {
48+ if ! s .db .Migrator ().HasTable (table ) {
49+ return nil , err
50+ }
51+ }
52+ }
53+ }
54+ default :
55+ model = & Resource {}
56+ }
5057
58+ return & ResourceStorage {
59+ db : s .db .Table (table ).Model (model ),
60+ codec : config .Codec ,
5161 storageGroupResource : config .StorageGroupResource ,
5262 storageVersion : config .StorageVersion ,
5363 memoryVersion : config .MemoryVersion ,
@@ -64,12 +74,21 @@ func (s *StorageFactory) NewCollectionResourceStorage(cr *internal.CollectionRes
6474}
6575
6676func (s * StorageFactory ) GetResourceVersions (ctx context.Context , cluster string ) (map [schema.GroupVersionResource ]map [string ]interface {}, error ) {
77+ tables , err := s .db .Migrator ().GetTables ()
78+ if err != nil {
79+ return nil , err
80+ }
81+
6782 var resources []Resource
68- result := s .db .WithContext (ctx ).Select ("group" , "version" , "resource" , "namespace" , "name" , "resource_version" ).
69- Where (map [string ]interface {}{"cluster" : cluster }).
70- Find (& resources )
71- if result .Error != nil {
72- return nil , InterpretDBError (cluster , result .Error )
83+ for _ , table := range tables {
84+ result := s .db .WithContext (ctx ).
85+ Table (table ).
86+ Select ("group" , "version" , "resource" , "namespace" , "name" , "resource_version" ).
87+ Where (map [string ]interface {}{"cluster" : cluster }).
88+ Find (& resources )
89+ if result .Error != nil {
90+ return nil , InterpretDBError (cluster , result .Error )
91+ }
7392 }
7493
7594 resourceversions := make (map [schema.GroupVersionResource ]map [string ]interface {})
@@ -91,18 +110,41 @@ func (s *StorageFactory) GetResourceVersions(ctx context.Context, cluster string
91110}
92111
93112func (s * StorageFactory ) CleanCluster (ctx context.Context , cluster string ) error {
94- result := s .db .WithContext (ctx ).Where (map [string ]interface {}{"cluster" : cluster }).Delete (& Resource {})
95- return InterpretDBError (cluster , result .Error )
113+ tables , err := s .db .Migrator ().GetTables ()
114+ if err != nil {
115+ return err
116+ }
117+
118+ for _ , table := range tables {
119+ result := s .db .WithContext (ctx ).Table (table ).Where (map [string ]interface {}{"cluster" : cluster }).Delete (& Resource {})
120+ if result .Error != nil {
121+ return InterpretDBError (cluster , result .Error )
122+ }
123+ }
124+
125+ return nil
96126}
97127
98128func (s * StorageFactory ) CleanClusterResource (ctx context.Context , cluster string , gvr schema.GroupVersionResource ) error {
99- result := s .db .WithContext (ctx ).Where (map [string ]interface {}{
100- "cluster" : cluster ,
101- "group" : gvr .Group ,
102- "version" : gvr .Version ,
103- "resource" : gvr .Resource ,
104- }).Delete (& Resource {})
105- return InterpretDBError (fmt .Sprintf ("%s/%s" , cluster , gvr ), result .Error )
129+ err := s .db .Transaction (func (db * gorm.DB ) error {
130+ result := s .db .WithContext (ctx ).
131+ Table (s .tableName (gvr )).
132+ Where (map [string ]interface {}{
133+ "cluster" : cluster ,
134+ "group" : gvr .Group ,
135+ "version" : gvr .Version ,
136+ "resource" : gvr .Resource ,
137+ }).
138+ Delete (& Resource {})
139+
140+ if result .Error != nil {
141+ return result .Error
142+ }
143+
144+ return nil
145+ })
146+
147+ return InterpretDBError (fmt .Sprintf ("%s/%s" , cluster , gvr ), err )
106148}
107149
108150func (s * StorageFactory ) GetCollectionResources (ctx context.Context ) ([]* internal.CollectionResource , error ) {
@@ -116,3 +158,22 @@ func (s *StorageFactory) GetCollectionResources(ctx context.Context) ([]*interna
116158func (s * StorageFactory ) PrepareCluster (cluster string ) error {
117159 return nil
118160}
161+
162+ // GenerateTableFor return table name using gvr string
163+ func GenerateTableFor (gvr schema.GroupVersionResource ) string {
164+ if gvr .Group == "" {
165+ return fmt .Sprintf ("%s_%s" , gvr .Version , gvr .Resource )
166+ }
167+
168+ group := strings .ReplaceAll (gvr .Group , "." , "_" )
169+ return fmt .Sprintf ("%s_%s_%s" , group , gvr .Version , gvr .Resource )
170+ }
171+
172+ func (s * StorageFactory ) tableName (gvr schema.GroupVersionResource ) string {
173+ table := "resources"
174+ if s .DivisionPolicy == DivisionPolicyGroupVersionResource {
175+ table = GenerateTableFor (gvr )
176+ }
177+
178+ return table
179+ }
0 commit comments