fix: use *time.Time to represent finish time (chaos-mesh#4056)

* fix: use `*time.Time` to represent finish time Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * Update CHANGELOG.md Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> --------- Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>
xlgao-zju · Jun 19, 2023 · d86a8ec · d86a8ec
1 parent c713634
commit d86a8ec
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@ For more information and how-to, see [RFC: Keep A Changelog](https://github.com/
 
 - Fix version comparison in install.sh [#3901](https://github.com/chaos-mesh/chaos-mesh/pull/3901)
 - Fix stuck dashboard updates when using ReadWriteOnce PVCs [#3876](https://github.com/chaos-mesh/chaos-mesh/issues/3876)
+- Fix MySQL NO_ZERO_IN_DATE by using `*time.Time` to represent finish time [#4056](https://github.com/chaos-mesh/chaos-mesh/pull/4056)
 
 ### Security
 

diff --git a/pkg/config/dashboard.go b/pkg/config/dashboard.go
@@ -63,7 +63,10 @@ type ChaosDashboardConfig struct {
 
 // DatabaseConfig defines the configuration for databases
 type DatabaseConfig struct {
-	Driver     string `envconfig:"DATABASE_DRIVER"     default:"sqlite3"`
+	Driver string `envconfig:"DATABASE_DRIVER"     default:"sqlite3"`
+	// Datasource is the connection string for database.
+	// For sqlite3, it is the path of the database file.
+	// For mysql, it is the DSN (https://github.com/go-sql-driver/mysql#dsn-data-source-name).
 	Datasource string `envconfig:"DATABASE_DATASOURCE" default:"core.sqlite"`
 }
 

diff --git a/pkg/dashboard/apiserver/archive/archive_test.go b/pkg/dashboard/apiserver/archive/archive_test.go
@@ -65,7 +65,7 @@ func (m *MockExperimentStore) ListMeta(ctx context.Context, kind, namespace, nam
 			Namespace:  "testNamespace",
 			Action:     "testAction",
 			StartTime:  time.Time{},
-			FinishTime: time.Time{},
+			FinishTime: &time.Time{},
 			Archived:   true,
 		}
 		res = append(res, expMeta)
@@ -90,7 +90,7 @@ func (m *MockExperimentStore) FindByUID(ctx context.Context, UID string) (*core.
 				Namespace:  "testNamespace",
 				Action:     "testAction",
 				StartTime:  time.Time{},
-				FinishTime: time.Time{},
+				FinishTime: &time.Time{},
 				Archived:   true,
 			},
 			Experiment: string(jsonStr),
@@ -106,7 +106,7 @@ func (m *MockExperimentStore) FindByUID(ctx context.Context, UID string) (*core.
 				Namespace:  "testNamespace",
 				Action:     "testAction",
 				StartTime:  time.Time{},
-				FinishTime: time.Time{},
+				FinishTime: &time.Time{},
 				Archived:   true,
 			},
 			Experiment: string(jsonStr),
@@ -122,7 +122,7 @@ func (m *MockExperimentStore) FindByUID(ctx context.Context, UID string) (*core.
 				Namespace:  "testNamespace",
 				Action:     "testAction",
 				StartTime:  time.Time{},
-				FinishTime: time.Time{},
+				FinishTime: &time.Time{},
 				Archived:   true,
 			},
 			Experiment: string(jsonStr),
@@ -138,7 +138,7 @@ func (m *MockExperimentStore) FindByUID(ctx context.Context, UID string) (*core.
 				Namespace:  "testNamespace",
 				Action:     "testAction",
 				StartTime:  time.Time{},
-				FinishTime: time.Time{},
+				FinishTime: &time.Time{},
 				Archived:   true,
 			},
 			Experiment: string(jsonStr),
@@ -154,7 +154,7 @@ func (m *MockExperimentStore) FindByUID(ctx context.Context, UID string) (*core.
 				Namespace:  "testNamespace",
 				Action:     "testAction",
 				StartTime:  time.Time{},
-				FinishTime: time.Time{},
+				FinishTime: &time.Time{},
 				Archived:   true,
 			},
 			Experiment: string(jsonStr),
@@ -170,7 +170,7 @@ func (m *MockExperimentStore) FindByUID(ctx context.Context, UID string) (*core.
 				Namespace:  "testNamespace",
 				Action:     "testAction",
 				StartTime:  time.Time{},
-				FinishTime: time.Time{},
+				FinishTime: &time.Time{},
 				Archived:   true,
 			},
 			Experiment: string(jsonStr),
@@ -184,7 +184,7 @@ func (m *MockExperimentStore) FindByUID(ctx context.Context, UID string) (*core.
 				Namespace:  "testNamespace",
 				Action:     "testAction",
 				StartTime:  time.Time{},
-				FinishTime: time.Time{},
+				FinishTime: &time.Time{},
 				Archived:   true,
 			},
 			Experiment: "",
@@ -209,7 +209,7 @@ func (m *MockExperimentStore) FindMetaByUID(ctx context.Context, UID string) (*c
 			Namespace:  "testNamespace",
 			Action:     "testAction",
 			StartTime:  time.Time{},
-			FinishTime: time.Time{},
+			FinishTime: &time.Time{},
 			Archived:   true,
 		}
 	case "testErrRecordNotFound":
@@ -259,7 +259,7 @@ func (m *MockScheduleStore) ListMeta(ctx context.Context, namespace, name string
 			Namespace:  "testNamespace",
 			Action:     "testAction",
 			StartTime:  time.Time{},
-			FinishTime: time.Time{},
+			FinishTime: &time.Time{},
 			Archived:   true,
 		}
 		res = append(res, schMeta)
@@ -284,7 +284,7 @@ func (m *MockScheduleStore) FindByUID(ctx context.Context, UID string) (*core.Sc
 				Namespace:  "testNamespace",
 				Action:     "testAction",
 				StartTime:  time.Time{},
-				FinishTime: time.Time{},
+				FinishTime: &time.Time{},
 				Archived:   true,
 			},
 			Schedule: string(jsonStr),

diff --git a/pkg/dashboard/collector/collector.go b/pkg/dashboard/collector/collector.go
@@ -194,7 +194,7 @@ func convertInnerObjectToExperiment(obj v1alpha1.InnerObject) (*core.Experiment,
 
 	archive.StartTime = chaosMeta.GetCreationTimestamp().Time
 	if chaosMeta.GetDeletionTimestamp() != nil {
-		archive.FinishTime = chaosMeta.GetDeletionTimestamp().Time
+		archive.FinishTime = &chaosMeta.GetDeletionTimestamp().Time
 	}
 
 	data, err := json.Marshal(chaosMeta)

diff --git a/pkg/dashboard/collector/schedule_collector.go b/pkg/dashboard/collector/schedule_collector.go
@@ -112,7 +112,7 @@ func (r *ScheduleCollector) setUnarchivedSchedule(req ctrl.Request, schedule v1a
 
 	archive.StartTime = schedule.GetCreationTimestamp().Time
 	if schedule.GetDeletionTimestamp() != nil {
-		archive.FinishTime = schedule.GetDeletionTimestamp().Time
+		archive.FinishTime = &schedule.GetDeletionTimestamp().Time
 	}
 
 	data, err := json.Marshal(schedule)

diff --git a/pkg/dashboard/core/experiment.go b/pkg/dashboard/core/experiment.go
@@ -67,12 +67,12 @@ type Experiment struct {
 // ExperimentMeta defines the metadata of an experiment. Use in db.
 type ExperimentMeta struct {
 	gorm.Model
-	UID        string    `gorm:"index:uid" json:"uid"`
-	Kind       string    `json:"kind"`
-	Name       string    `json:"name"`
-	Namespace  string    `json:"namespace"`
-	Action     string    `json:"action"`
-	StartTime  time.Time `json:"start_time"`
-	FinishTime time.Time `json:"finish_time"`
-	Archived   bool      `json:"archived"`
+	UID        string     `gorm:"index:uid" json:"uid"`
+	Kind       string     `json:"kind"`
+	Name       string     `json:"name"`
+	Namespace  string     `json:"namespace"`
+	Action     string     `json:"action"`
+	StartTime  time.Time  `json:"start_time"`
+	FinishTime *time.Time `json:"finish_time"`
+	Archived   bool       `json:"archived"`
 }
diff --git a/pkg/dashboard/core/schedule.go b/pkg/dashboard/core/schedule.go
@@ -64,12 +64,12 @@ type Schedule struct {
 // ScheduleMeta defines the metadata of a schedule instance. Use in db.
 type ScheduleMeta struct {
 	gorm.Model
-	UID        string    `gorm:"index:schedule_uid" json:"uid"`
-	Kind       string    `json:"kind"`
-	Name       string    `json:"name"`
-	Namespace  string    `json:"namespace"`
-	Action     string    `json:"action"`
-	StartTime  time.Time `json:"start_time"`
-	FinishTime time.Time `json:"finish_time"`
-	Archived   bool      `json:"archived"`
+	UID        string     `gorm:"index:schedule_uid" json:"uid"`
+	Kind       string     `json:"kind"`
+	Name       string     `json:"name"`
+	Namespace  string     `json:"namespace"`
+	Action     string     `json:"action"`
+	StartTime  time.Time  `json:"start_time"`
+	FinishTime *time.Time `json:"finish_time"`
+	Archived   bool       `json:"archived"`
 }
diff --git a/pkg/dashboard/core/workflow.go b/pkg/dashboard/core/workflow.go
@@ -58,7 +58,7 @@ type WorkflowMeta struct {
 	Entry     string    `json:"entry"` // the entry node name
 	CreatedAt time.Time `json:"created_at"`
 	// FinishTime represents the time when the workflow was deleted from Kubernetes.
-	FinishTime time.Time `json:"finish_time"`
+	FinishTime *time.Time `json:"finish_time"`
 	// EndTime represents the time when the workflow completed all steps.
 	EndTime  string         `json:"end_time"`
 	Status   WorkflowStatus `json:"status,omitempty"`
@@ -261,7 +261,7 @@ func convertWorkflow(kubeWorkflow v1alpha1.Workflow) WorkflowMeta {
 	}
 
 	if kubeWorkflow.GetDeletionTimestamp() != nil {
-		result.FinishTime = kubeWorkflow.GetDeletionTimestamp().Time
+		result.FinishTime = &kubeWorkflow.GetDeletionTimestamp().Time
 	}
 
 	if wfcontrollers.WorkflowConditionEqualsTo(kubeWorkflow.Status, v1alpha1.WorkflowConditionAccomplished, corev1.ConditionTrue) {