restructure propertybag

example/go.mod

@@ -4,3 +4,4 @@ go 1.17
 
 replace github.com/owenrumney/go-sarif/v2 => ../v2
 
+require github.com/owenrumney/go-sarif/v2 v2.0.0-00010101000000-000000000000

example/go.sum

@@ -1,15 +1,10 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

v2/go.mod

@@ -2,4 +2,7 @@ module github.com/owenrumney/go-sarif/v2
 
 go 1.16
 
-require github.com/stretchr/testify v1.7.0
+require (
+	github.com/owenrumney/go-sarif v1.1.1
+	github.com/stretchr/testify v1.7.0
+)

v2/go.sum

@@ -1,11 +1,39 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/owenrumney/go-sarif v1.1.1 h1:QNObu6YX1igyFKhdzd7vgzmw7XsWN3/6NMGuDzBgXmE=
+github.com/owenrumney/go-sarif v1.1.1/go.mod h1:dNDiPlF04ESR/6fHlPyq7gHKmrM0sHUvAGjsoh8ZH0U=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
+github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
+github.com/zclconf/go-cty v1.10.0 h1:mp9ZXQeIcN8kAwuqorjH+Q+njbJKjLrvB2yIh4q7U+0=
+github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

v2/sarif/address.go

@@ -2,7 +2,6 @@ package sarif
 
 // Address ...
 type Address struct {
-	PropertyBag
 	Index              *uint   `json:"index,omitempty"`
 	AbsoluteAddress    *uint   `json:"absoluteAddress,omitempty"`
 	RelativeAddress    *int    `json:"relativeAddress,omitempty"`
@@ -12,6 +11,7 @@ type Address struct {
 	FullyQualifiedName *string `json:"fullyQualifiedName,omitempty"`
 	Kind               *string `json:"kind,omitempty"`
 	ParentIndex        *uint   `json:"parentIndex,omitempty"`
+	PropertyBag
 }
 
 // NewAddress create a new Address and returns a pointer to it

v2/sarif/artifact.go

@@ -2,7 +2,7 @@ package sarif
 
 // Artifact ...
 type Artifact struct {
-	PropertyBag
+
 	Location            *ArtifactLocation `json:"location,omitempty"`
 	ParentIndex         *uint             `json:"parentIndex,omitempty"`
 	Offset              *uint             `json:"offset,omitempty"`
@@ -15,6 +15,7 @@ type Artifact struct {
 	Hashes              map[string]string `json:"hashes,omitempty"`
 	LastModifiedTimeUtc *string           `json:"lastModifiedTimeUtc,omitempty"`
 	Description         *Message          `json:"description,omitempty"`
+	PropertyBag
 }
 
 // NewArtifact creates a new Artifact and returns a pointer to it

v2/sarif/artifact_change.go

@@ -2,9 +2,9 @@ package sarif
 
 // ArtifactChange ...
 type ArtifactChange struct {
-	PropertyBag
 	ArtifactLocation ArtifactLocation `json:"artifactLocation"`
 	Replacements     []*Replacement   `json:"replacements"`
+	PropertyBag
 }
 
 // NewArtifactChange creates a new ArtifactChange and returns a pointer to it

v2/sarif/artifact_content.go

@@ -2,10 +2,10 @@ package sarif
 
 // ArtifactContent ...
 type ArtifactContent struct { 
-	PropertyBag
 	Text     *string                   `json:"text,omitempty"`
 	Binary   *string                   `json:"binary,omitempty"`
 	Rendered *MultiformatMessageString `json:"rendered,omitempty"`
+	PropertyBag
 }
 
 // NewArtifactContent creates a new ArtifactContent and returns a pointer to it

v2/sarif/artifact_location.go

@@ -2,11 +2,11 @@ package sarif
 
 // ArtifactLocation ...
 type ArtifactLocation struct {
-	PropertyBag
 	URI         *string  `json:"uri,omitempty"`
 	URIBaseId   *string  `json:"uriBaseId,omitempty"`
 	Index       *uint    `json:"index,omitempty"`
 	Description *Message `json:"description,omitempty"`
+	PropertyBag
 }
 
 // NewArtifactLocation creates a new ArtifactLocation and returns a pointer to it

v2/sarif/attachment.go

@@ -2,10 +2,10 @@ package sarif
 
 // Attachment ...
 type Attachment struct {
-	PropertyBag
 	ArtifactLocation *ArtifactLocation `json:"artifactLocation,omitempty"`
 	Description      *Message          `json:"description,omitempty"`
 	Rectangles       []*Rectangle      `json:"rectangles,omitempty"`
+	PropertyBag
 }
 
 // NewAttachment creates a new Attachment and returns a pointer to it

v2/sarif/code_flow.go

@@ -2,9 +2,10 @@ package sarif
 
 // CodeFlow ...
 type CodeFlow struct {
-	PropertyBag
 	Message     *Message      `json:"message,omitempty"`
 	ThreadFlows []*ThreadFlow `json:"threadFlows,omitempty"`
+	PropertyBag
+
 }
 
 // NewCodeFlow creates a new CodeFlow and returns a pointer to it

v2/sarif/configuration_override.go

@@ -2,9 +2,10 @@ package sarif
 
 // ConfigurationOverride ...
 type ConfigurationOverride struct {
-	PropertyBag
 	Configuration *ReportingConfiguration       `json:"configuration,omitempty"`
 	Descriptor    *ReportingDescriptorReference `json:"descriptor,omitempty"`
+	PropertyBag
+
 }
 
 // NewConfigurationOverride creates a new ConfigurationOverride and returns a pointer to it

v2/sarif/conversion.go

@@ -2,10 +2,11 @@ package sarif
 
 // Conversion ...
 type Conversion struct {
-	PropertyBag
 	AnalysisToolLogFiles []*ArtifactLocation `json:"analysisToolLogFiles,omitempty"`
 	Invocation           *Invocation         `json:"invocation,omitempty"`
 	Tool                 *Tool               `json:"tool"`
+	PropertyBag
+
 }
 
 // NewConversion creates a new Conversion and returns a pointer to it

v2/sarif/edge.go

@@ -2,11 +2,12 @@ package sarif
 
 // Edge ...
 type Edge struct {
-	PropertyBag
 	ID           string   `json:"id"`
 	Label        *Message `json:"label,omitempty"`
 	SourceNodeID string   `json:"sourceNodeId"`
 	TargetNodeID string   `json:"targetNodeId"`
+	PropertyBag
+
 }
 
 // NewEdge creates a new Edge and returns a pointer to it

v2/sarif/edge_traversal.go

@@ -2,11 +2,12 @@ package sarif
 
 // EdgeTraversal ...
 type EdgeTraversal struct {
-	PropertyBag
 	EdgeID            string                               `json:"edgeId"`
 	FinalState        map[string]*MultiformatMessageString `json:"finalState,omitempty"`
 	Message           *Message                             `json:"message,omitempty"`
 	StepOverEdgeCount *int                                 `json:"stepOverEdgeCount,omitempty"`
+	PropertyBag
+
 }
 
 // NewEdgeTraversal creates a new EdgeTraversal and returns a pointer to it

v2/sarif/exception.go

@@ -2,11 +2,12 @@ package sarif
 
 // Exception ...
 type Exception struct {
-	PropertyBag
 	InnerExceptions []*Exception `json:"innerExceptions,omitempty"`
 	Kind            *string      `json:"kind,omitempty"`
 	Message         *string      `json:"message,omitempty"`
 	Stack           *Stack       `json:"stack,omitempty"`
+	PropertyBag
+
 }
 
 // NewException creates a new Exception and returns a pointer to it

v2/sarif/external_properties.go

@@ -2,7 +2,6 @@ package sarif
 
 // ExternalProperties ...
 type ExternalProperties struct {
-	PropertyBag
 	Addresses              []*Address            `json:"addresses,omitempty"`
 	Artifacts              []*Artifact           `json:"artifacts,omitempty"`
 	Conversion             *Conversion           `json:"conversion,omitempty"`
@@ -23,6 +22,8 @@ type ExternalProperties struct {
 	Version                string                `json:"version,omitempty"`
 	WebRequests            []*WebRequest         `json:"webRequests,omitempty"`
 	WebResponses           []*WebResponse        `json:"webResponses,omitempty"`
+	PropertyBag
+
 }
 
 // NewExternalProperties creates a new ExternalProperties and returns a pointer to it

v2/sarif/external_property_file_reference.go

@@ -2,10 +2,11 @@ package sarif
 
 // ExternalPropertyFileReference ...
 type ExternalPropertyFileReference struct {
-	PropertyBag
 	GUID      *string           `json:"guid,omitempty"`
 	ItemCount *int              `json:"itemCount,omitempty"`
 	Location  *ArtifactLocation `json:"location,omitempty"`
+	PropertyBag
+
 }
 
 // NewExternalPropertyFileReference creates a new ExternalPropertyFileReference and returns a pointer to it

v2/sarif/external_property_file_references.go

@@ -2,7 +2,6 @@ package sarif
 
 // ExternalPropertyFileReferences ...
 type ExternalPropertyFileReferences struct {
-	PropertyBag
 	Addresses              []*ExternalPropertyFileReference `json:"addresses,omitempty"`
 	Artifacts              []*ExternalPropertyFileReference `json:"artifacts,omitempty"`
 	Conversion             *ExternalPropertyFileReference   `json:"conversion,omitempty"`
@@ -20,6 +19,8 @@ type ExternalPropertyFileReferences struct {
 	Translations           []*ExternalPropertyFileReference `json:"translations,omitempty"`
 	WebRequests            []*ExternalPropertyFileReference `json:"webRequests,omitempty"`
 	WebResponses           []*ExternalPropertyFileReference `json:"webResponses,omitempty"`
+	PropertyBag
+
 }
 
 // NewExternalPropertyFileReferences creates a new ExternalPropertyFileReferences and returns a pointer to it

v2/sarif/fix.go

@@ -2,9 +2,9 @@ package sarif
 
 // Fix ...
 type Fix struct {
-	PropertyBag
 	Description     *Message          `json:"description,omitempty"`
-	ArtifactChanges []*ArtifactChange `json:"artifactChanges"` //	required
+	ArtifactChanges []*ArtifactChange `json:"artifactChanges"`
+	PropertyBag
 }
 
 // NewFix creates a new Fix and returns a pointer to it

v2/sarif/graph.go

@@ -2,10 +2,11 @@ package sarif
 
 // Graph ...
 type Graph struct {
-	PropertyBag
 	Description *Message `json:"description,omitempty"`
 	Edges       []*Edge  `json:"edges,omitempty"`
 	Nodes       []*Node  `json:"nodes,omitempty"`
+	PropertyBag
+
 }
 
 // NewGraph creates a new Graph and returns a pointer to it

v2/sarif/graph_traversal.go

@@ -2,13 +2,14 @@ package sarif
 
 // GraphTraversal ...
 type GraphTraversal struct {
-	PropertyBag
 	Description      *Message                             `json:"description,omitempty"`
 	EdgeTraversals   []*EdgeTraversal                     `json:"edgeTraversals,omitempty"`
 	ImmutableState   map[string]*MultiformatMessageString `json:"immutableState,omitempty"`
 	InitialState     map[string]*MultiformatMessageString `json:"initialState,omitempty"`
 	ResultGraphIndex *int                                 `json:"resultGraphIndex,omitempty"`
 	RunGraphIndex    *int                                 `json:"runGraphIndex,omitempty"`
+	PropertyBag
+
 }
 
 // NewGraphTraversal creates a new GraphTraversal and returns a pointer to it

v2/sarif/invocation.go

@@ -4,7 +4,6 @@ import "time"
 
 // Invocation describes the runtime environment of the analysis tool run.
 type Invocation struct {
-	PropertyBag
 	Account                            *string                  `json:"account,omitempty"`
 	Arguments                          []string                 `json:"arguments,omitempty"`
 	CommandLine                        *string                  `json:"commandLine,omitempty"`
@@ -30,6 +29,7 @@ type Invocation struct {
 	ToolConfigurationNotifications     []*Notification          `json:"toolConfigurationNotifications,omitempty"`
 	ToolExecutionNotifications         []*Notification          `json:"toolExecutionNotifications,omitempty"`
 	WorkingDirectory                   *ArtifactLocation        `json:"workingDirectory,omitempty"`
+	PropertyBag
 }
 
 // NewInvocation creates a new Invocation and returns a pointer to it
@@ -83,31 +83,37 @@ func (invocation *Invocation) WithExecutableLocation(executableLocation *Artifac
 	invocation.ExecutableLocation = executableLocation
 	return invocation
 }
+
 // WithExecutionSuccess sets the ExecutionSuccess
 func (invocation *Invocation) WithExecutionSuccess(executionSuccessful bool) *Invocation {
 	invocation.ExecutionSuccessful = &executionSuccessful
 	return invocation
 }
+
 // WithExitCode sets the ExitCode
 func (invocation *Invocation) WithExitCode(exitCode int) *Invocation {
 	invocation.ExitCode = &exitCode
 	return invocation
 }
+
 // WithExitCodeDescription sets the ExitCodeDescription
 func (invocation *Invocation) WithExitCodeDescription(exitCodeDescription string) *Invocation {
 	invocation.ExitCodeDescription = &exitCodeDescription
 	return invocation
 }
+
 // WithExitSignalNumber sets the ExitSignalNumber
 func (invocation *Invocation) WithExitSignalNumber(exitSignalNumber int) *Invocation {
 	invocation.ExitSignalNumber = &exitSignalNumber
 	return invocation
 }
+
 // WithExitSignalName sets the ExitSignalName
 func (invocation *Invocation) WithExitSignalName(exitSignalName string) *Invocation {
 	invocation.ExitSignalName = &exitSignalName
 	return invocation
 }
+
 // WithMachine sets the Machine
 func (invocation *Invocation) WithMachine(machine string) *Invocation {
 	invocation.Machine = &machine
@@ -131,6 +137,7 @@ func (invocation *Invocation) WithProcessID(processID int) *Invocation {
 
 	return invocation
 }
+
 // WithProcessStartFailureMessage sets the ProcessStartFailureMessage
 func (invocation *Invocation) WithProcessStartFailureMessage(failureMessage string) *Invocation {
 	invocation.ProcessStartFailureMessage = &failureMessage
@@ -183,6 +190,7 @@ func (invocation *Invocation) WithStdout(stdOut *ArtifactLocation) *Invocation {
 	invocation.Stdout = stdOut
 	return invocation
 }
+
 // WithStdoutStderr sets the StdoutStderr
 func (invocation *Invocation) WithStdoutStderr(stdoutStderr *ArtifactLocation) *Invocation {
 	invocation.StdoutStderr = stdoutStderr