Merge pull request #104 from isimluk/ci-scap

Attempt to fix SCAP CI
GoComply · Nov 20, 2023 · 95911df · 95911df
2 parents 505fa2d + a727541
commit 95911df
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 55 deletions.
diff --git a/.github/workflows/scap.sh b/.github/workflows/scap.sh
@@ -9,7 +9,7 @@ workdir=./scap/
 mkdir -p $workdir
 cat <<__END__ > $workdir/go.mod
 module github.com/gocomply/scap
-go 1.17
+go 1.20
 __END__
 
 pushd $workdir
@@ -22,6 +22,7 @@ pushd $workdir
 
     # Generage go code based on XSDs
     $xsd2go convert .scap_schemas/schemas/cpe/2.3/cpe-dictionary_2.3.xsd github.com/gocomply/scap pkg/scap/models
+    go vet ./...
     $xsd2go convert \
             --xmlns-override=http://cpe.mitre.org/language/2.0=cpe_language \
             .scap_schemas/schemas/xccdf/1.2/xccdf_1.2.xsd github.com/gocomply/scap pkg/scap/models

diff --git a/pkg/template/pkged.go b/pkg/template/pkged.go
diff --git a/pkg/template/types.tmpl b/pkg/template/types.tmpl
@@ -45,7 +45,9 @@ import (
   {{- if .ContainsText }}
     Text string `xml:",chardata"`
   {{- end}}
-  innerXml string `xml:",innerxml"`
+  {{- if .ContainsInnerXml }}
+    InnerXml string `xml:",innerxml"`
+  {{- end}}
   }
 {{end}}
 

diff --git a/pkg/xsd/types.go b/pkg/xsd/types.go
@@ -92,6 +92,10 @@ func (ct *ComplexType) GoTypeName() string {
 	return ct.GoName()
 }
 
+func (ct *ComplexType) ContainsInnerXml() bool {
+	return ct.Mixed
+}
+
 func (ct *ComplexType) ContainsText() bool {
 	return ct.content != nil && ct.content.ContainsText()
 }

diff --git a/tests/smoke_test.go b/tests/smoke_test.go
@@ -2,7 +2,6 @@ package tests
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -21,14 +20,14 @@ func TestSanity(t *testing.T) {
 	for _, xsdPath := range xsdFiles {
 		actual := assertConvertsFine(t, xsdPath)
 
-		expected, err := ioutil.ReadFile(xsdPath + ".out")
+		expected, err := os.ReadFile(xsdPath + ".out")
 		require.NoError(t, err)
 		assert.Equal(t, string(expected), string(actual))
 	}
 }
 
 func assertConvertsFine(t *testing.T, xsdPath string) []byte {
-	dname, err := ioutil.TempDir("", "xsd2go_tests_")
+	dname, err := os.MkdirTemp("", "xsd2go_tests_")
 	assert.Nil(t, err)
 	defer os.RemoveAll(dname)
 
@@ -41,7 +40,7 @@ func assertConvertsFine(t *testing.T, xsdPath string) []byte {
 
 	generatedFilePath, err := locateGeneratedFile(outputDir)
 	require.NoError(t, err)
-	result, err := ioutil.ReadFile(generatedFilePath)
+	result, err := os.ReadFile(generatedFilePath)
 	require.NoError(t, err)
 
 	out, err := exec.Command("go", "build", generatedFilePath).Output()

diff --git a/tests/xsd-examples/valid/complex.xsd.out b/tests/xsd-examples/valid/complex.xsd.out
@@ -35,8 +35,6 @@ type MyElementType struct {
 	Id21 *int `xml:"id_21"`
 
 	Id22 *int `xml:"id_22"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 // XSD SimpleType declarations
diff --git a/tests/xsd-examples/valid/restriction.xsd.out b/tests/xsd-examples/valid/restriction.xsd.out
@@ -21,8 +21,6 @@ type StateRefType struct {
 	XMLName xml.Name
 
 	StateRef StateIdpattern `xml:"state_ref,attr"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type MySimpleBaseType struct {
@@ -32,8 +30,7 @@ type MySimpleBaseType struct {
 
 	Operation OperationEnumeration `xml:"operation,attr,omitempty"`
 
-	Text     string `xml:",chardata"`
-	innerXml string `xml:",innerxml"`
+	Text string `xml:",chardata"`
 }
 
 type MyElementType struct {
@@ -42,8 +39,6 @@ type MyElementType struct {
 	Datatype DatatypeEnumeration `xml:"datatype,attr,omitempty"`
 
 	Operation OperationEnumeration `xml:"operation,attr,omitempty"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 // XSD SimpleType declarations

diff --git a/tests/xsd-examples/valid/simple-8859-1.xsd.out b/tests/xsd-examples/valid/simple-8859-1.xsd.out
@@ -19,8 +19,6 @@ type MyElementType struct {
 	XMLName xml.Name
 
 	Id int64 `xml:",any"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 // XSD SimpleType declarations
diff --git a/tests/xsd-examples/valid/simple.xsd.out b/tests/xsd-examples/valid/simple.xsd.out
@@ -19,8 +19,6 @@ type MyElementType struct {
 	XMLName xml.Name
 
 	Id int64 `xml:",any"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 // XSD SimpleType declarations
diff --git a/tests/xsd-examples/valid/xmldsig-core-schema.xsd.out b/tests/xsd-examples/valid/xmldsig-core-schema.xsd.out
@@ -264,17 +264,14 @@ type SignatureType struct {
 	KeyInfo *KeyInfoType `xml:"KeyInfo"`
 
 	Object []ObjectType `xml:"Object"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type SignatureValueType struct {
 	XMLName xml.Name
 
 	Id string `xml:"Id,attr,omitempty"`
 
-	Text     string `xml:",chardata"`
-	innerXml string `xml:",innerxml"`
+	Text string `xml:",chardata"`
 }
 
 type SignedInfoType struct {
@@ -287,16 +284,14 @@ type SignedInfoType struct {
 	SignatureMethod SignatureMethodType `xml:"SignatureMethod"`
 
 	Reference []ReferenceType `xml:"Reference"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type CanonicalizationMethodType struct {
 	XMLName xml.Name
 
 	Algorithm string `xml:"Algorithm,attr"`
 
-	innerXml string `xml:",innerxml"`
+	InnerXml string `xml:",innerxml"`
 }
 
 type SignatureMethodType struct {
@@ -306,7 +301,7 @@ type SignatureMethodType struct {
 
 	HmacoutputLength *HmacoutputLengthType `xml:",any"`
 
-	innerXml string `xml:",innerxml"`
+	InnerXml string `xml:",innerxml"`
 }
 
 type ReferenceType struct {
@@ -323,16 +318,12 @@ type ReferenceType struct {
 	DigestMethod DigestMethodType `xml:"DigestMethod"`
 
 	DigestValue DigestValueType `xml:"DigestValue"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type TransformsType struct {
 	XMLName xml.Name
 
 	Transform []TransformType `xml:",any"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type TransformType struct {
@@ -342,15 +333,15 @@ type TransformType struct {
 
 	Xpath []string `xml:"XPath"`
 
-	innerXml string `xml:",innerxml"`
+	InnerXml string `xml:",innerxml"`
 }
 
 type DigestMethodType struct {
 	XMLName xml.Name
 
 	Algorithm string `xml:"Algorithm,attr"`
 
-	innerXml string `xml:",innerxml"`
+	InnerXml string `xml:",innerxml"`
 }
 
 type KeyInfoType struct {
@@ -372,7 +363,7 @@ type KeyInfoType struct {
 
 	MgmtData []string `xml:"MgmtData"`
 
-	innerXml string `xml:",innerxml"`
+	InnerXml string `xml:",innerxml"`
 }
 
 type KeyValueType struct {
@@ -382,7 +373,7 @@ type KeyValueType struct {
 
 	RsakeyValue *RsakeyValueType `xml:"RSAKeyValue"`
 
-	innerXml string `xml:",innerxml"`
+	InnerXml string `xml:",innerxml"`
 }
 
 type RetrievalMethodType struct {
@@ -393,8 +384,6 @@ type RetrievalMethodType struct {
 	Type string `xml:"Type,attr,omitempty"`
 
 	Transforms *TransformsType `xml:",any"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type X509DataType struct {
@@ -409,8 +398,6 @@ type X509DataType struct {
 	X509Certificate string `xml:"X509Certificate"`
 
 	X509Crl string `xml:"X509CRL"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type X509IssuerSerialType struct {
@@ -419,8 +406,6 @@ type X509IssuerSerialType struct {
 	X509IssuerName string `xml:"X509IssuerName"`
 
 	X509SerialNumber int64 `xml:"X509SerialNumber"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type PgpdataType struct {
@@ -429,16 +414,12 @@ type PgpdataType struct {
 	PgpkeyId string `xml:"PGPKeyID"`
 
 	PgpkeyPacket string `xml:"PGPKeyPacket"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type SpkidataType struct {
 	XMLName xml.Name
 
 	Spkisexp string `xml:",any"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type ObjectType struct {
@@ -450,7 +431,7 @@ type ObjectType struct {
 
 	Encoding string `xml:"Encoding,attr,omitempty"`
 
-	innerXml string `xml:",innerxml"`
+	InnerXml string `xml:",innerxml"`
 }
 
 type ManifestType struct {
@@ -459,8 +440,6 @@ type ManifestType struct {
 	Id string `xml:"Id,attr,omitempty"`
 
 	Reference []ReferenceType `xml:",any"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type SignaturePropertiesType struct {
@@ -469,8 +448,6 @@ type SignaturePropertiesType struct {
 	Id string `xml:"Id,attr,omitempty"`
 
 	SignatureProperty []SignaturePropertyType `xml:",any"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type SignaturePropertyType struct {
@@ -480,7 +457,7 @@ type SignaturePropertyType struct {
 
 	Id string `xml:"Id,attr,omitempty"`
 
-	innerXml string `xml:",innerxml"`
+	InnerXml string `xml:",innerxml"`
 }
 
 type DsakeyValueType struct {
@@ -491,8 +468,6 @@ type DsakeyValueType struct {
 	Y CryptoBinary `xml:"Y"`
 
 	J *CryptoBinary `xml:"J"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 type RsakeyValueType struct {
@@ -501,8 +476,6 @@ type RsakeyValueType struct {
 	Modulus CryptoBinary `xml:"Modulus"`
 
 	Exponent CryptoBinary `xml:"Exponent"`
-
-	innerXml string `xml:",innerxml"`
 }
 
 // XSD SimpleType declarations