Revert "Add controller version to generated files" (#47)

This reverts commit 13d5677bf3.
This commit is contained in:
Joshua Spence
2021-09-24 07:21:34 +10:00
committed by GitHub
parent 7d87194aef
commit 8d4ca5f389
63 changed files with 8 additions and 73 deletions

View File

@@ -21,7 +21,6 @@
{{ else }}{{- template "field-embed" $fv }}{{ end }}{{ end }} {{ else }}{{- template "field-embed" $fv }}{{ end }}{{ end }}
}{{ end }} `json:"{{ .JSONName }}{{ if .OmitEmpty }},omitempty{{ end }}"` {{ if .FieldValidation }}// {{ .FieldValidation }}{{ end }} {{- end }} }{{ end }} `json:"{{ .JSONName }}{{ if .OmitEmpty }},omitempty{{ end }}"` {{ if .FieldValidation }}// {{ .FieldValidation }}{{ end }} {{- end }}
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version {{ .ControllerVersion }}
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -92,7 +92,6 @@ var fileReps = []replacement{
var embedTypes bool var embedTypes bool
type Resource struct { type Resource struct {
ControllerVersion string
StructName string StructName string
ResourcePath string ResourcePath string
Types map[string]*FieldInfo Types map[string]*FieldInfo
@@ -110,11 +109,9 @@ type FieldInfo struct {
CustomUnmarshalType string CustomUnmarshalType string
} }
func NewResource(version string, structName string, resourcePath string) *Resource { func NewResource(structName string, resourcePath string) *Resource {
baseType := NewFieldInfo(structName, resourcePath, "struct", "", false, false, "") baseType := NewFieldInfo(structName, resourcePath, "struct", "", false, false, "")
resource := &Resource{ resource := &Resource{
ControllerVersion: version,
StructName: structName, StructName: structName,
ResourcePath: resourcePath, ResourcePath: resourcePath,
Types: map[string]*FieldInfo{ Types: map[string]*FieldInfo{
@@ -301,7 +298,7 @@ func main() {
continue continue
} }
resource := NewResource(fmt.Sprintf("v%s", unifiVersion), structName, urlPath) resource := NewResource(structName, urlPath)
switch resource.StructName { switch resource.StructName {
case "Account": case "Account":

View File

@@ -2,9 +2,8 @@ package main
import ( import (
"fmt" "fmt"
"testing"
assert "github.com/stretchr/testify/assert" assert "github.com/stretchr/testify/assert"
"testing"
) )
func TestFieldInfoFromValidation(t *testing.T) { func TestFieldInfoFromValidation(t *testing.T) {
@@ -146,7 +145,7 @@ func TestResourceTypes(t *testing.T) {
} }
t.Run("structural test", func(t *testing.T) { t.Run("structural test", func(t *testing.T) {
resource := NewResource("v1.1", "Struct", "path") resource := NewResource("Struct", "path")
resource.FieldProcessor = expectation.FieldProcessor resource.FieldProcessor = expectation.FieldProcessor
err := resource.processJSON(([]byte)(testData)) err := resource.processJSON(([]byte)(testData))

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi

View File

@@ -1,5 +1,4 @@
// Code generated from ace.jar fields *.json files // Code generated from ace.jar fields *.json files
// Controller Version v6.4.54
// DO NOT EDIT. // DO NOT EDIT.
package unifi package unifi