add labels to component spec

flanksource · Jul 3, 2023 · 8a0d079 · 8a0d079
1 parent ae54626
commit 8a0d079
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/api/v1/component_types.go b/api/v1/component_types.go
@@ -18,12 +18,13 @@ type Component struct {
 }
 
 type ComponentSpec struct {
-	Name    string    `json:"name,omitempty"`
-	Tooltip string    `json:"tooltip,omitempty"`
-	Icon    string    `json:"icon,omitempty"`
-	Owner   string    `json:"owner,omitempty"`
-	Id      *Template `json:"id,omitempty"` //nolint
-	Order   int       `json:"order,omitempty"`
+	Name    string            `json:"name,omitempty"`
+	Tooltip string            `json:"tooltip,omitempty"`
+	Icon    string            `json:"icon,omitempty"`
+	Owner   string            `json:"owner,omitempty"`
+	Id      *Template         `json:"id,omitempty"` //nolint
+	Order   int               `json:"order,omitempty"`
+	Labels  map[string]string `json:"labels,omitempty"`
 	// The type of component, e.g. service, API, website, library, database, etc.
 	Type string `json:"type,omitempty"`
 	// The lifecycle state of the component e.g. production, staging, dev, etc.

diff --git a/checks/runchecks.go b/checks/runchecks.go
@@ -15,7 +15,7 @@ func RunChecks(ctx *context.Context) []*pkg.CheckResult {
 	var results []*pkg.CheckResult
 
 	// Check if canary is not marked deleted in DB
-	if db.Gorm != nil {
+	if db.Gorm != nil && ctx.Canary.GetPersistedID() != "" {
 		var deletedAt sql.NullTime
 		err := db.Gorm.Table("canaries").Select("deleted_at").Where("id = ?", ctx.Canary.GetPersistedID()).Scan(&deletedAt).Error
 		if err == nil && deletedAt.Valid {

diff --git a/pkg/system_api.go b/pkg/system_api.go
@@ -267,6 +267,7 @@ func NewComponent(c v1.ComponentSpec) *Component {
 		Icon:            c.Icon,
 		Selectors:       c.Selectors,
 		ComponentChecks: c.ComponentChecks,
+		Labels:          c.Labels,
 		Configs:         configs,
 		LogSelectors:    c.LogSelectors,
 	}