Skip to content

Commit d7bb811

Browse files
seswarrajanseswarrajan
committedJul 1, 2022
Adding updatedtime,latest field to sys_policy tbl
Signed-off-by: Eswar Rajan Subramanian <eswar@accuknox.com>
·
v1.1.1v0.0.1
1 parent bb42e47 commit d7bb811

File tree

3 files changed

+30
-12
lines changed

3 files changed

+30
-12
lines changed
 

‎src/libs/mysqlHandler.go

+14-6
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ func GetSystemPoliciesFromMySQL(cfg types.ConfigDB, namespace, status string) ([
299299
var results *sql.Rows
300300
var err error
301301

302-
query := "SELECT apiVersion,kind,name,clusterName,namespace,type,status,outdated,spec,generatedTime FROM " + TableSystemPolicy_TableName
302+
query := "SELECT apiVersion,kind,name,clusterName,namespace,type,status,outdated,spec,generatedTime,updatedTime,latest FROM " + TableSystemPolicy_TableName
303303

304304
if namespace != "" && status != "" {
305305
query = query + " WHERE namespace = ? and status = ? "
@@ -339,6 +339,8 @@ func GetSystemPoliciesFromMySQL(cfg types.ConfigDB, namespace, status string) ([
339339
&policy.Outdated,
340340
&specByte,
341341
&policy.GeneratedTime,
342+
&policy.UpdatedTime,
343+
&policy.Latest,
342344
); err != nil {
343345
return nil, err
344346
}
@@ -364,11 +366,12 @@ func GetSystemPoliciesFromMySQL(cfg types.ConfigDB, namespace, status string) ([
364366
}
365367

366368
func insertSystemPolicy(cfg types.ConfigDB, db *sql.DB, policy types.KnoxSystemPolicy) error {
367-
stmt, err := db.Prepare("INSERT INTO " + TableSystemPolicy_TableName + "(apiVersion,kind,name,clusterName,namespace,type,status,outdated,spec,generatedTime) values(?,?,?,?,?,?,?,?,?,?)")
369+
stmt, err := db.Prepare("INSERT INTO " + TableSystemPolicy_TableName + "(apiVersion,kind,name,clusterName,namespace,type,status,outdated,spec,generatedTime,updatedTime,latest) values(?,?,?,?,?,?,?,?,?,?,?,?)")
368370
if err != nil {
369371
return err
370372
}
371373
defer stmt.Close()
374+
time := ConvertStrToUnixTime("now")
372375

373376
specPointer := &policy.Spec
374377
spec, err := json.Marshal(specPointer)
@@ -386,7 +389,9 @@ func insertSystemPolicy(cfg types.ConfigDB, db *sql.DB, policy types.KnoxSystemP
386389
policy.Metadata["status"],
387390
policy.Outdated,
388391
spec,
389-
policy.GeneratedTime)
392+
time,
393+
time,
394+
true)
390395
if err != nil {
391396
return err
392397
}
@@ -413,7 +418,7 @@ func UpdateSystemPolicyToMySQL(cfg types.ConfigDB, policy types.KnoxSystemPolicy
413418

414419
// set status -> outdated
415420
stmt, err := db.Prepare("UPDATE " + TableSystemPolicy_TableName +
416-
" SET apiVersion=?,kind=?,clusterName=?,namespace=?,type=?,status=?,outdated=?,spec=?,generatedTime=? WHERE name = ?")
421+
" SET apiVersion=?,kind=?,clusterName=?,namespace=?,type=?,status=?,outdated=?,spec=?,updatedTime=?,latest=? WHERE name = ?")
417422
if err != nil {
418423
return err
419424
}
@@ -434,7 +439,8 @@ func UpdateSystemPolicyToMySQL(cfg types.ConfigDB, policy types.KnoxSystemPolicy
434439
policy.Metadata["status"],
435440
policy.Outdated,
436441
spec,
437-
policy.GeneratedTime,
442+
ConvertStrToUnixTime("now"),
443+
true,
438444
policy.Metadata["name"])
439445
if err != nil {
440446
return err
@@ -530,7 +536,9 @@ func CreateTableSystemPolicyMySQL(cfg types.ConfigDB) error {
530536
" `status` varchar(10) DEFAULT NULL," +
531537
" `outdated` varchar(50) DEFAULT NULL," +
532538
" `spec` JSON DEFAULT NULL," +
533-
" `generatedTime` int DEFAULT NULL," +
539+
" `generatedTime` bigint DEFAULT NULL," +
540+
" `updatedTime` bigint DEFAULT NULL," +
541+
" `latest` BOOLEAN," +
534542
" PRIMARY KEY (`id`)" +
535543
" );"
536544

‎src/libs/sqliteHandler.go

+14-6
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ func GetSystemPoliciesFromSQLite(cfg types.ConfigDB, namespace, status string) (
289289
var results *sql.Rows
290290
var err error
291291

292-
query := "SELECT apiVersion,kind,name,clusterName,namespace,type,status,outdated,spec,generatedTime FROM " + TableSystemPolicySQLite_TableName
292+
query := "SELECT apiVersion,kind,name,clusterName,namespace,type,status,outdated,spec,generatedTime,updatedTime,latest FROM " + TableSystemPolicySQLite_TableName
293293

294294
if namespace != "" && status != "" {
295295
query = query + " WHERE namespace = ? and status = ? "
@@ -329,6 +329,8 @@ func GetSystemPoliciesFromSQLite(cfg types.ConfigDB, namespace, status string) (
329329
&policy.Outdated,
330330
&specByte,
331331
&policy.GeneratedTime,
332+
&policy.UpdatedTime,
333+
&policy.Latest,
332334
); err != nil {
333335
return nil, err
334336
}
@@ -354,11 +356,12 @@ func GetSystemPoliciesFromSQLite(cfg types.ConfigDB, namespace, status string) (
354356
}
355357

356358
func insertSystemPolicySQLite(cfg types.ConfigDB, db *sql.DB, policy types.KnoxSystemPolicy) error {
357-
stmt, err := db.Prepare("INSERT INTO " + TableSystemPolicySQLite_TableName + "(apiVersion,kind,name,clusterName,namespace,type,status,outdated,spec,generatedTime) values(?,?,?,?,?,?,?,?,?,?)")
359+
stmt, err := db.Prepare("INSERT INTO " + TableSystemPolicySQLite_TableName + "(apiVersion,kind,name,clusterName,namespace,type,status,outdated,spec,generatedTime,updatedTime,latest) values(?,?,?,?,?,?,?,?,?,?,?,?)")
358360
if err != nil {
359361
return err
360362
}
361363
defer stmt.Close()
364+
time := ConvertStrToUnixTime("now")
362365

363366
specPointer := &policy.Spec
364367
spec, err := json.Marshal(specPointer)
@@ -376,7 +379,9 @@ func insertSystemPolicySQLite(cfg types.ConfigDB, db *sql.DB, policy types.KnoxS
376379
policy.Metadata["status"],
377380
policy.Outdated,
378381
spec,
379-
policy.GeneratedTime)
382+
time,
383+
time,
384+
true)
380385
if err != nil {
381386
return err
382387
}
@@ -403,7 +408,7 @@ func UpdateSystemPolicyToSQLite(cfg types.ConfigDB, policy types.KnoxSystemPolic
403408

404409
// set status -> outdated
405410
stmt, err := db.Prepare("UPDATE " + TableSystemPolicySQLite_TableName +
406-
" SET apiVersion=?,kind=?,clusterName=?,namespace=?,type=?,status=?,outdated=?,spec=?,generatedTime=? WHERE name = ?")
411+
" SET apiVersion=?,kind=?,clusterName=?,namespace=?,type=?,status=?,outdated=?,spec=?,updatedTime=?,latest=? WHERE name = ?")
407412
if err != nil {
408413
return err
409414
}
@@ -424,7 +429,8 @@ func UpdateSystemPolicyToSQLite(cfg types.ConfigDB, policy types.KnoxSystemPolic
424429
policy.Metadata["status"],
425430
policy.Outdated,
426431
spec,
427-
policy.GeneratedTime,
432+
ConvertStrToUnixTime("now"),
433+
true,
428434
policy.Metadata["name"])
429435
if err != nil {
430436
return err
@@ -508,7 +514,9 @@ func CreateTableSystemPolicySQLite(cfg types.ConfigDB) error {
508514
" `status` varchar(10) DEFAULT NULL," +
509515
" `outdated` varchar(50) DEFAULT NULL," +
510516
" `spec` JSON DEFAULT NULL," +
511-
" `generatedTime` int DEFAULT NULL," +
517+
" `generatedTime` bigint DEFAULT NULL," +
518+
" `updatedTime` bigint DEFAULT NULL," +
519+
" `latest` BOOLEAN," +
512520
" PRIMARY KEY (`id`)" +
513521
" );"
514522

‎src/types/policyData.go

+2
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ type KnoxSystemPolicy struct {
253253
Spec KnoxSystemSpec `json:"spec,omitempty" yaml:"spec,omitempty" bson:"spec,omitempty"`
254254

255255
GeneratedTime int64 `json:"generatedTime,omitempty" yaml:"generatedTime,omitempty" bson:"generatedTime,omitempty"`
256+
UpdatedTime int64 `json:"updatedTime,omitempty" yaml:"updatedTime,omitempty" bson:"updatedTime,omitempty"`
257+
Latest int64 `json:"latest,omitempty" yaml:"latest,omitempty" bson:"latest,omitempty"`
256258
}
257259

258260
// ============================= //

0 commit comments

Comments
 (0)
Please sign in to comment.