Cleanup the code

Threagile · Mar 31, 2024 · b081d5b · b081d5b
1 parent 3a2528d
commit b081d5b
Show file tree

Hide file tree

Showing 21 changed files with 0 additions and 841 deletions.
diff --git a/pkg/security/types/authentication.go b/pkg/security/types/authentication.go
@@ -5,9 +5,7 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package types
 
 import (
-	"encoding/json"
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"strings"
 )
 
@@ -59,40 +57,6 @@ func (what Authentication) Explain() string {
 	return AuthenticationTypeDescription[what].Description
 }
 
-func (what Authentication) MarshalJSON() ([]byte, error) {
-	return json.Marshal(what.String())
-}
-
-func (what *Authentication) UnmarshalJSON(data []byte) error {
-	var text string
-	unmarshalError := json.Unmarshal(data, &text)
-	if unmarshalError != nil {
-		return unmarshalError
-	}
-
-	value, findError := what.Find(text)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
-func (what Authentication) MarshalYAML() (interface{}, error) {
-	return what.String(), nil
-}
-
-func (what *Authentication) UnmarshalYAML(node *yaml.Node) error {
-	value, findError := what.Find(node.Value)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
 func (what Authentication) Find(value string) (Authentication, error) {
 	for index, description := range AuthenticationTypeDescription {
 		if strings.EqualFold(value, description.Name) {

diff --git a/pkg/security/types/authorization.go b/pkg/security/types/authorization.go
@@ -5,9 +5,7 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package types
 
 import (
-	"encoding/json"
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"strings"
 )
 
@@ -46,40 +44,6 @@ func (what Authorization) Explain() string {
 	return AuthorizationTypeDescription[what].Description
 }
 
-func (what Authorization) MarshalJSON() ([]byte, error) {
-	return json.Marshal(what.String())
-}
-
-func (what *Authorization) UnmarshalJSON(data []byte) error {
-	var text string
-	unmarshalError := json.Unmarshal(data, &text)
-	if unmarshalError != nil {
-		return unmarshalError
-	}
-
-	value, findError := what.Find(text)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
-func (what Authorization) MarshalYAML() (interface{}, error) {
-	return what.String(), nil
-}
-
-func (what *Authorization) UnmarshalYAML(node *yaml.Node) error {
-	value, findError := what.Find(node.Value)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
 func (what Authorization) Find(value string) (Authorization, error) {
 	for index, description := range AuthorizationTypeDescription {
 		if strings.EqualFold(value, description.Name) {

diff --git a/pkg/security/types/confidentiality.go b/pkg/security/types/confidentiality.go
@@ -5,9 +5,7 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package types
 
 import (
-	"encoding/json"
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"strings"
 )
 
@@ -86,40 +84,6 @@ func (what Confidentiality) RatingStringInScale() string {
 	return result
 }
 
-func (what Confidentiality) MarshalJSON() ([]byte, error) {
-	return json.Marshal(what.String())
-}
-
-func (what *Confidentiality) UnmarshalJSON(data []byte) error {
-	var text string
-	unmarshalError := json.Unmarshal(data, &text)
-	if unmarshalError != nil {
-		return unmarshalError
-	}
-
-	value, findError := what.Find(text)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
-func (what Confidentiality) MarshalYAML() (interface{}, error) {
-	return what.String(), nil
-}
-
-func (what *Confidentiality) UnmarshalYAML(node *yaml.Node) error {
-	value, findError := what.Find(node.Value)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
 func (what Confidentiality) Find(value string) (Confidentiality, error) {
 	for index, description := range ConfidentialityTypeDescription {
 		if strings.EqualFold(value, description.Name) {

diff --git a/pkg/security/types/criticality.go b/pkg/security/types/criticality.go
@@ -5,9 +5,7 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package types
 
 import (
-	"encoding/json"
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"strings"
 )
 
@@ -86,40 +84,6 @@ func (what Criticality) RatingStringInScale() string {
 	return result
 }
 
-func (what Criticality) MarshalJSON() ([]byte, error) {
-	return json.Marshal(what.String())
-}
-
-func (what *Criticality) UnmarshalJSON(data []byte) error {
-	var text string
-	unmarshalError := json.Unmarshal(data, &text)
-	if unmarshalError != nil {
-		return unmarshalError
-	}
-
-	value, findError := what.Find(text)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
-func (what Criticality) MarshalYAML() (interface{}, error) {
-	return what.String(), nil
-}
-
-func (what *Criticality) UnmarshalYAML(node *yaml.Node) error {
-	value, findError := what.Find(node.Value)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
 func (what Criticality) Find(value string) (Criticality, error) {
 	for index, description := range CriticalityTypeDescription {
 		if strings.EqualFold(value, description.Name) {

diff --git a/pkg/security/types/data_breach_probability.go b/pkg/security/types/data_breach_probability.go
@@ -5,9 +5,7 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package types
 
 import (
-	"encoding/json"
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"strings"
 )
 
@@ -50,40 +48,6 @@ func (what DataBreachProbability) Title() string {
 	return [...]string{"Improbable", "Possible", "Probable"}[what]
 }
 
-func (what DataBreachProbability) MarshalJSON() ([]byte, error) {
-	return json.Marshal(what.String())
-}
-
-func (what *DataBreachProbability) UnmarshalJSON(data []byte) error {
-	var text string
-	unmarshalError := json.Unmarshal(data, &text)
-	if unmarshalError != nil {
-		return unmarshalError
-	}
-
-	value, findError := what.Find(text)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
-func (what DataBreachProbability) MarshalYAML() (interface{}, error) {
-	return what.String(), nil
-}
-
-func (what *DataBreachProbability) UnmarshalYAML(node *yaml.Node) error {
-	value, findError := what.Find(node.Value)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
 func (what DataBreachProbability) Find(value string) (DataBreachProbability, error) {
 	if len(value) == 0 {
 		return Possible, nil

diff --git a/pkg/security/types/data_format.go b/pkg/security/types/data_format.go
@@ -5,9 +5,7 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package types
 
 import (
-	"encoding/json"
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"strings"
 )
 
@@ -67,50 +65,6 @@ func (what DataFormat) Description() string {
 		"File input/uploads", "CSV tabular data"}[what]
 }
 
-func (what DataFormat) MarshalJSON() ([]byte, error) {
-	return json.Marshal(what.String())
-}
-
-func (what *DataFormat) UnmarshalJSON(data []byte) error {
-	var text string
-	unmarshalError := json.Unmarshal(data, &text)
-	if unmarshalError != nil {
-		return unmarshalError
-	}
-
-	value, findError := what.find(text)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
-func (what DataFormat) MarshalYAML() (interface{}, error) {
-	return what.String(), nil
-}
-
-func (what *DataFormat) UnmarshalYAML(node *yaml.Node) error {
-	value, findError := what.find(node.Value)
-	if findError != nil {
-		return findError
-	}
-
-	*what = value
-	return nil
-}
-
-func (what DataFormat) find(value string) (DataFormat, error) {
-	for index, description := range DataFormatTypeDescription {
-		if strings.EqualFold(value, description.Name) {
-			return DataFormat(index), nil
-		}
-	}
-
-	return DataFormat(0), fmt.Errorf("unknown data format value %q", value)
-}
-
 type ByDataFormatAcceptedSort []DataFormat
 
 func (what ByDataFormatAcceptedSort) Len() int      { return len(what) }

diff --git a/pkg/security/types/date.go b/pkg/security/types/date.go
@@ -1,40 +1,9 @@
 package types
 
 import (
-	"gopkg.in/yaml.v3"
 	"time"
 )
 
 type Date struct {
 	time.Time
 }
-
-func (what Date) MarshalJSON() ([]byte, error) {
-	return []byte(what.Format(`"2006-01-02"`)), nil
-}
-
-func (what *Date) UnmarshalJSON(bytes []byte) error {
-	date, parseError := time.Parse(`"2006-01-02"`, string(bytes))
-	if parseError != nil {
-		return parseError
-	}
-
-	what.Time = date
-
-	return nil
-}
-
-func (what Date) MarshalYAML() (interface{}, error) {
-	return what.Format(`2006-01-02`), nil
-}
-
-func (what *Date) UnmarshalYAML(node *yaml.Node) error {
-	date, parseError := time.Parse(`2006-01-02`, node.Value)
-	if parseError != nil {
-		return parseError
-	}
-
-	what.Time = date
-
-	return nil
-}