Skip to content

Fix: Remove omitempty from required fields to prevent model corruption during risk seeding #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Remove omitempty from required fields to prevent model corruption during risk seeding #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/input/author.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

type Author struct {
Name string `yaml:"name,omitempty" json:"name,omitempty"`
Name string `yaml:"name" json:"name"`
Contact string `yaml:"contact,omitempty" json:"contact,omitempty"`
Homepage string `yaml:"homepage,omitempty" json:"homepage,omitempty"`
}
Expand Down
18 changes: 9 additions & 9 deletions pkg/input/communication-link.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ package input
import "fmt"

type CommunicationLink struct {
Target string `yaml:"target,omitempty" json:"target,omitempty"`
Description string `yaml:"description,omitempty" json:"description,omitempty"`
Protocol string `yaml:"protocol,omitempty" json:"protocol,omitempty"`
Authentication string `yaml:"authentication,omitempty" json:"authentication,omitempty"`
Authorization string `yaml:"authorization,omitempty" json:"authorization,omitempty"`
Target string `yaml:"target" json:"target"`
Description string `yaml:"description" json:"description"`
Protocol string `yaml:"protocol" json:"protocol"`
Authentication string `yaml:"authentication" json:"authentication"`
Authorization string `yaml:"authorization" json:"authorization"`
Tags []string `yaml:"tags,omitempty" json:"tags,omitempty"`
VPN bool `yaml:"vpn,omitempty" json:"vpn,omitempty"`
IpFiltered bool `yaml:"ip_filtered,omitempty" json:"ip_filtered,omitempty"`
Readonly bool `yaml:"readonly,omitempty" json:"readonly,omitempty"`
Usage string `yaml:"usage,omitempty" json:"usage,omitempty"`
VPN bool `yaml:"vpn" json:"vpn"`
IpFiltered bool `yaml:"ip_filtered" json:"ip_filtered"`
Readonly bool `yaml:"readonly" json:"readonly"`
Usage string `yaml:"usage" json:"usage"`
DataAssetsSent []string `yaml:"data_assets_sent,omitempty" json:"data_assets_sent,omitempty"`
DataAssetsReceived []string `yaml:"data_assets_received,omitempty" json:"data_assets_received,omitempty"`
DiagramTweakWeight int `yaml:"diagram_tweak_weight,omitempty" json:"diagram_tweak_weight,omitempty"`
Expand Down
14 changes: 7 additions & 7 deletions pkg/input/data-asset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ package input
import "fmt"

type DataAsset struct {
ID string `yaml:"id,omitempty" json:"id,omitempty"`
Description string `yaml:"description,omitempty" json:"description,omitempty"`
Usage string `yaml:"usage,omitempty" json:"usage,omitempty"`
ID string `yaml:"id" json:"id"`
Description string `yaml:"description" json:"description"`
Usage string `yaml:"usage" json:"usage"`
Tags []string `yaml:"tags,omitempty" json:"tags,omitempty"`
Origin string `yaml:"origin,omitempty" json:"origin,omitempty"`
Owner string `yaml:"owner,omitempty" json:"owner,omitempty"`
Quantity string `yaml:"quantity,omitempty" json:"quantity,omitempty"`
Confidentiality string `yaml:"confidentiality,omitempty" json:"confidentiality,omitempty"`
Integrity string `yaml:"integrity,omitempty" json:"integrity,omitempty"`
Availability string `yaml:"availability,omitempty" json:"availability,omitempty"`
Quantity string `yaml:"quantity" json:"quantity"`
Confidentiality string `yaml:"confidentiality" json:"confidentiality"`
Integrity string `yaml:"integrity" json:"integrity"`
Availability string `yaml:"availability" json:"availability"`
JustificationCiaRating string `yaml:"justification_cia_rating,omitempty" json:"justification_cia_rating,omitempty"`
}

Expand Down
16 changes: 8 additions & 8 deletions pkg/input/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ import (
// === Model Type Stuff ======================================

type Model struct { // TODO: Eventually remove this and directly use ParsedModelRoot? But then the error messages for model errors are not quite as good anymore...
ThreagileVersion string `yaml:"threagile_version,omitempty" json:"threagile_version,omitempty"`
ThreagileVersion string `yaml:"threagile_version" json:"threagile_version"`
Includes []string `yaml:"includes,omitempty" json:"includes,omitempty"`
Title string `yaml:"title,omitempty" json:"title,omitempty"`
Author Author `yaml:"author,omitempty" json:"author,omitempty"`
Title string `yaml:"title" json:"title"`
Author Author `yaml:"author" json:"author"`
Contributors []Author `yaml:"contributors,omitempty" json:"contributors,omitempty"`
Date string `yaml:"date,omitempty" json:"date,omitempty"`
AppDescription Overview `yaml:"application_description,omitempty" json:"application_description,omitempty"`
BusinessOverview Overview `yaml:"business_overview,omitempty" json:"business_overview,omitempty"`
TechnicalOverview Overview `yaml:"technical_overview,omitempty" json:"technical_overview,omitempty"`
BusinessCriticality string `yaml:"business_criticality,omitempty" json:"business_criticality,omitempty"`
BusinessCriticality string `yaml:"business_criticality" json:"business_criticality"`
ManagementSummaryComment string `yaml:"management_summary_comment,omitempty" json:"management_summary_comment,omitempty"`
SecurityRequirements map[string]string `yaml:"security_requirements,omitempty" json:"security_requirements,omitempty"`
Questions map[string]string `yaml:"questions,omitempty" json:"questions,omitempty"`
AbuseCases map[string]string `yaml:"abuse_cases,omitempty" json:"abuse_cases,omitempty"`
TagsAvailable []string `yaml:"tags_available,omitempty" json:"tags_available,omitempty"`
DataAssets map[string]DataAsset `yaml:"data_assets,omitempty" json:"data_assets,omitempty"`
TechnicalAssets map[string]TechnicalAsset `yaml:"technical_assets,omitempty" json:"technical_assets,omitempty"`
TagsAvailable []string `yaml:"tags_available" json:"tags_available"`
DataAssets map[string]DataAsset `yaml:"data_assets" json:"data_assets"`
TechnicalAssets map[string]TechnicalAsset `yaml:"technical_assets" json:"technical_assets"`
TrustBoundaries map[string]TrustBoundary `yaml:"trust_boundaries,omitempty" json:"trust_boundaries,omitempty"`
SharedRuntimes map[string]SharedRuntime `yaml:"shared_runtimes,omitempty" json:"shared_runtimes,omitempty"`
SharedRuntimes map[string]SharedRuntime `yaml:"shared_runtimes" json:"shared_runtimes"`
CustomRiskCategories RiskCategories `yaml:"custom_risk_categories,omitempty" json:"custom_risk_categories,omitempty"`
RiskTracking map[string]RiskTracking `yaml:"risk_tracking,omitempty" json:"risk_tracking,omitempty"`
DiagramTweakNodesep int `yaml:"diagram_tweak_nodesep,omitempty" json:"diagram_tweak_nodesep,omitempty"`
Expand Down
10 changes: 5 additions & 5 deletions pkg/input/risk-tracking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package input
import "fmt"

type RiskTracking struct {
Status string `yaml:"status,omitempty" json:"status,omitempty"`
Justification string `yaml:"justification,omitempty" json:"justification,omitempty"`
Ticket string `yaml:"ticket,omitempty" json:"ticket,omitempty"`
Date string `yaml:"date,omitempty" json:"date,omitempty"`
CheckedBy string `yaml:"checked_by,omitempty" json:"checked_by,omitempty"`
Status string `yaml:"status" json:"status"`
Justification string `yaml:"justification" json:"justification"`
Ticket string `yaml:"ticket" json:"ticket"`
Date string `yaml:"date" json:"date"`
CheckedBy string `yaml:"checked_by" json:"checked_by"`
}

func (what *RiskTracking) Merge(other RiskTracking) error {
Expand Down
8 changes: 4 additions & 4 deletions pkg/input/shared-runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package input
import "fmt"

type SharedRuntime struct {
ID string `yaml:"id,omitempty" json:"id,omitempty"`
Description string `yaml:"description,omitempty" json:"description,omitempty"`
Tags []string `yaml:"tags,omitempty" json:"tag,omitempty"`
TechnicalAssetsRunning []string `yaml:"technical_assets_running,omitempty" json:"technical_assets_running,omitempty"`
ID string `yaml:"id" json:"id"`
Description string `yaml:"description" json:"description"`
Tags []string `yaml:"tags,omitempty" json:"tags,omitempty"`
TechnicalAssetsRunning []string `yaml:"technical_assets_running" json:"technical_assets_running"`
}

func (what *SharedRuntime) Merge(other SharedRuntime) error {
Expand Down
42 changes: 21 additions & 21 deletions pkg/input/technical-asset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ package input
import "fmt"

type TechnicalAsset struct {
ID string `yaml:"id,omitempty" json:"id,omitempty"`
Description string `yaml:"description,omitempty" json:"description,omitempty"`
Type string `yaml:"type,omitempty" json:"type,omitempty"`
Usage string `yaml:"usage,omitempty" json:"usage,omitempty"`
UsedAsClientByHuman bool `yaml:"used_as_client_by_human,omitempty" json:"used_as_client_by_human,omitempty"`
OutOfScope bool `yaml:"out_of_scope,omitempty" json:"out_of_scope,omitempty"`
ID string `yaml:"id" json:"id"`
Description string `yaml:"description" json:"description"`
Type string `yaml:"type" json:"type"`
Usage string `yaml:"usage" json:"usage"`
UsedAsClientByHuman bool `yaml:"used_as_client_by_human" json:"used_as_client_by_human"`
OutOfScope bool `yaml:"out_of_scope" json:"out_of_scope"`
JustificationOutOfScope string `yaml:"justification_out_of_scope,omitempty" json:"justification_out_of_scope,omitempty"`
Size string `yaml:"size,omitempty" json:"size,omitempty"`
Size string `yaml:"size" json:"size"`
Technology string `yaml:"technology,omitempty" json:"technology,omitempty"`
Technologies []string `yaml:"technologies,omitempty" json:"technologies,omitempty"`
Tags []string `yaml:"tags,omitempty" json:"tags,omitempty"`
Internet bool `yaml:"internet,omitempty" json:"internet,omitempty"`
Machine string `yaml:"machine,omitempty" json:"machine,omitempty"`
Encryption string `yaml:"encryption,omitempty" json:"encryption,omitempty"`
Owner string `yaml:"owner,omitempty" json:"owner,omitempty"`
Confidentiality string `yaml:"confidentiality,omitempty" json:"confidentiality,omitempty"`
Integrity string `yaml:"integrity,omitempty" json:"integrity,omitempty"`
Availability string `yaml:"availability,omitempty" json:"availability,omitempty"`
Internet bool `yaml:"internet" json:"internet"`
Machine string `yaml:"machine" json:"machine"`
Encryption string `yaml:"encryption" json:"encryption"`
Owner string `yaml:"owner" json:"owner"`
Confidentiality string `yaml:"confidentiality" json:"confidentiality"`
Integrity string `yaml:"integrity" json:"integrity"`
Availability string `yaml:"availability" json:"availability"`
JustificationCiaRating string `yaml:"justification_cia_rating,omitempty" json:"justification_cia_rating,omitempty"`
MultiTenant bool `yaml:"multi_tenant,omitempty" json:"multi_tenant,omitempty"`
Redundant bool `yaml:"redundant,omitempty" json:"redundant,omitempty"`
CustomDevelopedParts bool `yaml:"custom_developed_parts,omitempty" json:"custom_developed_parts,omitempty"`
DataAssetsProcessed []string `yaml:"data_assets_processed,omitempty" json:"data_assets_processed,omitempty"`
DataAssetsStored []string `yaml:"data_assets_stored,omitempty" json:"data_assets_stored,omitempty"`
DataFormatsAccepted []string `yaml:"data_formats_accepted,omitempty" json:"data_formats_accepted,omitempty"`
MultiTenant bool `yaml:"multi_tenant" json:"multi_tenant"`
Redundant bool `yaml:"redundant" json:"redundant"`
CustomDevelopedParts bool `yaml:"custom_developed_parts" json:"custom_developed_parts"`
DataAssetsProcessed []string `yaml:"data_assets_processed" json:"data_assets_processed"`
DataAssetsStored []string `yaml:"data_assets_stored" json:"data_assets_stored"`
DataFormatsAccepted []string `yaml:"data_formats_accepted" json:"data_formats_accepted"`
DiagramTweakOrder int `yaml:"diagram_tweak_order,omitempty" json:"diagram_tweak_order,omitempty"`
CommunicationLinks map[string]CommunicationLink `yaml:"communication_links,omitempty" json:"communication_links,omitempty"`
CommunicationLinks map[string]CommunicationLink `yaml:"communication_links" json:"communication_links"`
}

func (what *TechnicalAsset) Merge(other TechnicalAsset) error {
Expand Down
10 changes: 5 additions & 5 deletions pkg/input/trust-boundary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package input
import "fmt"

type TrustBoundary struct {
ID string `yaml:"id,omitempty" json:"id,omitempty"`
Description string `yaml:"description,omitempty" json:"description,omitempty"`
Type string `yaml:"type,omitempty" json:"type,omitempty"`
ID string `yaml:"id" json:"id"`
Description string `yaml:"description" json:"description"`
Type string `yaml:"type" json:"type"`
Tags []string `yaml:"tags,omitempty" json:"tags,omitempty"`
TechnicalAssetsInside []string `yaml:"technical_assets_inside,omitempty" json:"technical_assets_inside,omitempty"`
TrustBoundariesNested []string `yaml:"trust_boundaries_nested,omitempty" json:"trust_boundaries_nested,omitempty"`
TechnicalAssetsInside []string `yaml:"technical_assets_inside" json:"technical_assets_inside"`
TrustBoundariesNested []string `yaml:"trust_boundaries_nested" json:"trust_boundaries_nested"`
}

func (what *TrustBoundary) Merge(other TrustBoundary) error {
Expand Down