Fixed required order fields

internal/tokenmanagement_test.go

@@ -0,0 +1,51 @@
+package internal
+
+import (
+	"testing"
+
+	"github.com/databricks/databricks-sdk-go/service/scim"
+	"github.com/databricks/databricks-sdk-go/service/tokenmanagement"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCreateOboToken(t *testing.T) {
+	ctx, w := workspaceTest(t)
+	if !w.Config.IsAws() {
+		t.Skip("works only on aws")
+	}
+	groups, err := w.Groups.GroupDisplayNameToIdMap(ctx, scim.ListGroupsRequest{})
+	require.NoError(t, err)
+
+	spn, err := w.ServicePrincipals.Create(ctx, scim.ServicePrincipal{
+		DisplayName: RandomName(t.Name()),
+		Groups: []scim.ComplexValue{
+			{
+				Value: groups["admins"],
+			},
+		},
+	})
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		err = w.ServicePrincipals.DeleteById(ctx, spn.Id)
+		require.NoError(t, err)
+	})
+
+	obo, err := w.TokenManagement.CreateOboToken(ctx, tokenmanagement.CreateOboTokenRequest{
+		ApplicationId:   spn.ApplicationId,
+		LifetimeSeconds: 60,
+	})
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		err = w.TokenManagement.DeleteByTokenId(ctx, obo.TokenInfo.TokenId)
+		require.NoError(t, err)
+	})
+
+	byId, err := w.TokenManagement.GetByTokenId(ctx, obo.TokenInfo.TokenId)
+	require.NoError(t, err)
+	t.Log(byId)
+
+	all, err := w.TokenManagement.ListAll(ctx, tokenmanagement.List{})
+	require.NoError(t, err)
+	assert.True(t, len(all) >= 1)
+}

openapi/code/entity.go

@@ -109,6 +109,34 @@ func (e *Entity) IsExternal() bool {
 	return e.Package != nil && len(e.Package.types) == 0
 }
 
+func (e *Entity) RequiredFields() (fields []Field) {
+	for _, r := range e.RequiredOrder {
+		v := e.fields[r]
+		v.Of = e
+		fields = append(fields, v)
+	}
+	return
+}
+
+func (e *Entity) NonRequiredFields() (fields []Field) {
+	required := map[string]bool{}
+	for _, r := range e.RequiredOrder {
+		required[r] = true
+	}
+	for k, v := range e.fields {
+		if required[k] {
+			// handled in [Entity.RequiredFields]
+			continue
+		}
+		v.Of = e
+		fields = append(fields, v)
+	}
+	slices.SortFunc(fields, func(a, b Field) bool {
+		return a.CamelName() < b.CamelName()
+	})
+	return
+}
+
 // Fields returns sorted slice of field representations
 func (e *Entity) Fields() (fields []Field) {
 	for _, v := range e.fields {

openapi/code/service.go

@@ -106,6 +106,10 @@ func (svc *Service) newRequest(params []openapi.Parameter, op *openapi.Operation
 		field.IsPath = param.IsPath
 		field.IsQuery = param.IsQuery
 		request.fields[param.Name] = field
+		if param.Required {
+			// TODO: figure out what to do with entity+param requests
+			request.RequiredOrder = append(request.RequiredOrder, param.Name)
+		}
 	}
 	if request.Name == "" {
 		// when there was a merge of params with a request or new entity was made