new: use new regolithe api

PaloAltoNetworks · Sep 24, 2019 · efe3956 · efe3956
1 parent ec3c803
commit efe3956
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/attribute.go b/attribute.go
@@ -83,11 +83,6 @@ type AttributeSpecification struct {
 	// This is not enforced by elemental. You must write your own business logic to honor this.
 	CreationOnly bool
 
-	// DefaultOrder defines if the attribute is used as the default ordering key.
-	//
-	// This is not enforced by elemental. You must write your own business logic to honor this.
-	DefaultOrder bool
-
 	// DefaultValue holds the default value declared in specification.
 	DefaultValue interface{}
 

diff --git a/attribute_test.go b/attribute_test.go
@@ -47,7 +47,6 @@ func TestAttribute_SpecificationForAttribute(t *testing.T) {
 				So(spec.Availability, ShouldBeEmpty)
 				So(spec.Channel, ShouldBeEmpty)
 				So(spec.CreationOnly, ShouldBeFalse)
-				So(spec.DefaultOrder, ShouldBeFalse)
 				So(spec.Deprecated, ShouldBeFalse)
 				So(spec.Exposed, ShouldBeTrue)
 				So(spec.Filterable, ShouldBeTrue)

diff --git a/cmd/elegen/static/bindata.go b/cmd/elegen/static/bindata.go
diff --git a/cmd/elegen/templates/model.gotpl b/cmd/elegen/templates/model.gotpl
@@ -81,8 +81,8 @@ func (o {{ .Spec.Model.EntityNamePlural }}List) List() elemental.IdentifiablesLi
 func (o {{ .Spec.Model.EntityNamePlural }}List) DefaultOrder() []string {
 
     return []string{
-        {{ range .Spec.OrderingAttributes $latestVersion -}}
-        "{{ .Name }}",
+        {{ range .Spec.DefaultOrder -}}
+        "{{ . }}",
         {{ end }}
     }
 }
@@ -231,8 +231,8 @@ func (o *{{ .Spec.Model.EntityName }}) BleveType() string {
 func (o *{{ .Spec.Model.EntityName  }}) DefaultOrder() []string {
 
     return []string{
-        {{ range .Spec.OrderingAttributes $latestVersion -}}
-        "{{ .Name }}",
+        {{ range .Spec.DefaultOrder -}}
+        "{{ . }}",
         {{ end }}
     }
 }
@@ -587,9 +587,6 @@ var {{ .Spec.Model.EntityName }}AttributesMap = map[string]elemental.AttributeSp
         {{- if .CreationOnly }}
         CreationOnly: {{ .CreationOnly }},
         {{- end }}
-        {{- if .DefaultOrder }}
-        DefaultOrder: {{ .DefaultOrder }},
-        {{- end }}
         {{- if .DefaultValue }}
         DefaultValue: {{ writeDefaultValue $.Set $.Spec . }},
         {{- end }}
@@ -686,9 +683,6 @@ var {{ .Spec.Model.EntityName }}LowerCaseAttributesMap = map[string]elemental.At
         {{- if .CreationOnly }}
         CreationOnly: {{ .CreationOnly }},
         {{- end }}
-        {{- if .DefaultOrder }}
-        DefaultOrder: {{ .DefaultOrder }},
-        {{- end }}
         {{- if .DefaultValue }}
         DefaultValue: {{ writeDefaultValue $.Set $.Spec . }},
         {{- end }}
@@ -811,8 +805,8 @@ func (o Sparse{{ .Spec.Model.EntityNamePlural }}List) List() elemental.Identifia
 func (o Sparse{{ .Spec.Model.EntityNamePlural }}List) DefaultOrder() []string {
 
     return []string{
-        {{ range .Spec.OrderingAttributes $latestVersion -}}
-        "{{ .Name }}",
+        {{ range .Spec.DefaultOrder -}}
+        "{{ . }}",
         {{ end }}
     }
 }