Update api spec (#95)

* YOYO NEW API SPEC!

* fixes

Signed-off-by: Jess Frazelle <[email protected]>

* fix base64

Signed-off-by: Jess Frazelle <[email protected]>

* bump version

Signed-off-by: Jess Frazelle <[email protected]>

---------

Signed-off-by: Jess Frazelle <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: jessfraz

VERSION.txt

@@ -1 +1 @@
-v0.2.21
+v0.2.22

cmd/json_base64.go

@@ -17,15 +17,15 @@ func (u Base64) MarshalJSON() ([]byte, error) {
 		return []byte("null"), nil
 	}
 
-	return []byte(`"` + base64.StdEncoding.EncodeToString(u.Inner) + `"`), nil
+	return []byte(`"` + base64.RawStdEncoding.EncodeToString(u.Inner) + `"`), nil
 }
 
 func (u Base64) String() string {
 	if u.Inner == nil {
 		return ""
 	}
 
-	return base64.StdEncoding.EncodeToString(u.Inner)
+	return base64.RawStdEncoding.EncodeToString(u.Inner)
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface.
@@ -45,7 +45,7 @@ func (u *Base64) UnmarshalJSON(data []byte) (err error) {
 	}
 
 	// Fractional seconds are handled implicitly by Parse.
-	uu, err := base64.StdEncoding.DecodeString(strings.Trim(string(data), `"`))
+	uu, err := base64.RawStdEncoding.DecodeString(strings.Trim(string(data), `"`))
 	if err != nil {
 		return err
 	}

cmd/json_base64_test.go

@@ -30,3 +30,14 @@ func TestBase64Null(t *testing.T) {
 		t.Errorf("UnmarshalJSON failed: %v", err)
 	}
 }
+
+func TestBase64String(t *testing.T) {
+	var jsonBase64 Base64
+	if err := jsonBase64.UnmarshalJSON([]byte("diAtMC4wMDEgLTAuMDAxIDAuMDAxCnYgMC4wMDEgLTAuMDAxIDAuMDAxCnYgMC4wMDEgMC4wMDEgMC4wMDEKdiAtMC4wMDEgMC4wMDEgMC4wMDEKdiAtMC4wMDEgMC4wMDEgLTAuMDAxCnYgMC4wMDEgMC4wMDEgLTAuMDAxCnYgMC4wMDEgLTAuMDAxIC0wLjAwMQp2IC0wLjAwMSAtMC4wMDEgLTAuMDAxCnZuIDAgMCAxCnZuIDAgMSAwCnZuIDEgMCAwCnZuIDAgMCAtMQp2biAtMSAwIDAKdm4gMCAtMSAwCm8gVW5uYW1lZC0wCmYgMS8vMSAyLy8xIDMvLzEKZiAxLy8xIDMvLzEgNC8vMQpmIDUvLzIgNC8vMiAzLy8yCmYgNS8vMiAzLy8yIDYvLzIKZiA2Ly8zIDMvLzMgMi8vMwpmIDYvLzMgMi8vMyA3Ly8zCmYgNy8vNCA4Ly80IDUvLzQKZiA3Ly80IDUvLzQgNi8vNApmIDgvLzUgMS8vNSA0Ly81CmYgOC8vNSA0Ly81IDUvLzUKZiA3Ly82IDIvLzYgMS8vNgpmIDcvLzYgMS8vNiA4Ly82Cg")); err != nil {
+		t.Errorf("UnmarshalJSON failed: %v", err)
+	}
+
+	if err := jsonBase64.UnmarshalJSON(nil); err != nil {
+		t.Errorf("UnmarshalJSON failed: %v", err)
+	}
+}

cmd/types.go

@@ -250,7 +250,11 @@ func (data *Data) generateObjectType(name string, s *openapi3.Schema, spec *open
 		if v.Value.Type == "object" && v.Value.Properties != nil && len(v.Value.Properties) > 0 {
 			// Check if we already have a schema for this one of.
 			if _, ok := spec.Components.Schemas[k]; !ok {
-				if err := data.generateObjectType(k, v.Value, spec); err != nil {
+				n := printProperty(k)
+				if n == "Error" {
+					n = name + "Error"
+				}
+				if err := data.generateObjectType(n, v.Value, spec); err != nil {
 					return err
 				}
 			}
@@ -325,7 +329,7 @@ func (data *Data) generateOneOfType(name string, s *openapi3.Schema, spec *opena
 
 	for index, oneOf := range s.OneOf {
 		// We should have a better way of avoiding duplicates. This is a hot fix, but does not scale.
-		if types[index] == "InputFormat coords" || types[index] == "OutputFormat coords" {
+		if types[index] == "InputFormat coords" || types[index] == "OutputFormat coords" || types[index] == "ModelingCmd path" || types[index] == "ModelingCmd interaction" || types[index] == "ModelingCmd window" || types[index] == "OkModelingCmdResponse entity_id" {
 			continue
 		}
 

examples_test.go

@@ -23,7 +23,7 @@ require (
 	github.com/perimeterx/marshmallow v1.1.4 // indirect
 	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
 	go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
-	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.mod

@@ -75,8 +75,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

go.sum

@@ -17,15 +17,15 @@ func (u Base64) MarshalJSON() ([]byte, error) {
 		return []byte("null"), nil
 	}
 
-	return []byte(`"` + base64.StdEncoding.EncodeToString(u.Inner) + `"`), nil
+	return []byte(`"` + base64.RawStdEncoding.EncodeToString(u.Inner) + `"`), nil
 }
 
 func (u Base64) String() string {
 	if u.Inner == nil {
 		return ""
 	}
 
-	return base64.StdEncoding.EncodeToString(u.Inner)
+	return base64.RawStdEncoding.EncodeToString(u.Inner)
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface.
@@ -45,7 +45,7 @@ func (u *Base64) UnmarshalJSON(data []byte) (err error) {
 	}
 
 	// Fractional seconds are handled implicitly by Parse.
-	uu, err := base64.StdEncoding.DecodeString(strings.Trim(string(data), `"`))
+	uu, err := base64.RawStdEncoding.DecodeString(strings.Trim(string(data), `"`))
 	if err != nil {
 		return err
 	}

json_base64.go

@@ -30,3 +30,14 @@ func TestBase64Null(t *testing.T) {
 		t.Errorf("UnmarshalJSON failed: %v", err)
 	}
 }
+
+func TestBase64String(t *testing.T) {
+	var jsonBase64 Base64
+	if err := jsonBase64.UnmarshalJSON([]byte("diAtMC4wMDEgLTAuMDAxIDAuMDAxCnYgMC4wMDEgLTAuMDAxIDAuMDAxCnYgMC4wMDEgMC4wMDEgMC4wMDEKdiAtMC4wMDEgMC4wMDEgMC4wMDEKdiAtMC4wMDEgMC4wMDEgLTAuMDAxCnYgMC4wMDEgMC4wMDEgLTAuMDAxCnYgMC4wMDEgLTAuMDAxIC0wLjAwMQp2IC0wLjAwMSAtMC4wMDEgLTAuMDAxCnZuIDAgMCAxCnZuIDAgMSAwCnZuIDEgMCAwCnZuIDAgMCAtMQp2biAtMSAwIDAKdm4gMCAtMSAwCm8gVW5uYW1lZC0wCmYgMS8vMSAyLy8xIDMvLzEKZiAxLy8xIDMvLzEgNC8vMQpmIDUvLzIgNC8vMiAzLy8yCmYgNS8vMiAzLy8yIDYvLzIKZiA2Ly8zIDMvLzMgMi8vMwpmIDYvLzMgMi8vMyA3Ly8zCmYgNy8vNCA4Ly80IDUvLzQKZiA3Ly80IDUvLzQgNi8vNApmIDgvLzUgMS8vNSA0Ly81CmYgOC8vNSA0Ly81IDUvLzUKZiA3Ly82IDIvLzYgMS8vNgpmIDcvLzYgMS8vNiA4Ly82Cg")); err != nil {
+		t.Errorf("UnmarshalJSON failed: %v", err)
+	}
+
+	if err := jsonBase64.UnmarshalJSON(nil); err != nil {
+		t.Errorf("UnmarshalJSON failed: %v", err)
+	}
+}