Sync monorepo state at 6910b9f5795b8dce64601f1cbba153a9b910e448

Author: uc-build-user

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## UNPUBLISHED
+## 1.2.0 - 09-04-2024
+
+- Add methods for creating, retrieving, updating, and deleting ColumnDataTypes
+- Add DataType field to Column that refers to a ColumnDataType
+- Add InputDataType and OutputDataType fields to Transformer that refer to ColumnDataTypes
+- Update userstore sample to interact with ColumnDataTypes
+- Breaking change: Add additional boolean parameter to ListAccessors an ListMutators for requesting all versions
+
+## 1.1.0 - 20-03-2024
 
 - Breaking change: idp/userstore/ColumnField parameter "Optional" has been changed to "Required", with fields not required by default
 - Add InputConstraints and OutputConstraints parameters of type idp/userstore/ColumnConstraints to idp/policy/Transformer

authz/client.go

@@ -754,7 +754,7 @@ func (c *Client) CreateObject(ctx context.Context, id, typeID uuid.UUID, alias s
 			}
 			return &resp, nil
 		}, func(in *Object, curr *Object) bool {
-			return curr.EqualsIgnoringID(in, true) && (id.IsNil() || curr.ID == id)
+			return curr.EqualsIgnoringID(in) && (id.IsNil() || curr.ID == id)
 		})
 }
 

authz/models.go

@@ -164,14 +164,14 @@ type Object struct {
 }
 
 // EqualsIgnoringID returns true if the two objects are equal, ignoring the ID field
-func (o *Object) EqualsIgnoringID(other *Object, includeOrg bool) bool {
+func (o *Object) EqualsIgnoringID(other *Object) bool {
 	if o.Alias == nil && other.Alias == nil {
-		return o.TypeID == other.TypeID && (!includeOrg || o.OrganizationID == other.OrganizationID)
+		return o.TypeID == other.TypeID && o.OrganizationID == other.OrganizationID
 	}
 	if o.Alias == nil || other.Alias == nil {
 		return false
 	}
-	return *o.Alias == *other.Alias && o.TypeID == other.TypeID && (!includeOrg || o.OrganizationID == other.OrganizationID)
+	return *o.Alias == *other.Alias && o.TypeID == other.TypeID && o.OrganizationID == other.OrganizationID
 }
 
 //go:generate genvalidate Object

go.mod

@@ -20,6 +20,7 @@ require (
 )
 
 retract (
+	v0.8.5
 	v0.8.4
 	v0.8.3
 	v0.8.2

idp/client.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"net/url"
+	"strconv"
 	"strings"
 	"time"
 
@@ -23,6 +24,7 @@ import (
 type options struct {
 	ifNotExists       bool
 	includeAuthN      bool
+	debug             bool
 	organizationID    uuid.UUID
 	userID            uuid.UUID
 	dataRegion        region.DataRegion
@@ -55,6 +57,13 @@ func IncludeAuthN() Option {
 	})
 }
 
+// Debug returns an Option that will cause the client to return debug information, if available
+func Debug() Option {
+	return optFunc(func(opts *options) {
+		opts.debug = true
+	})
+}
+
 // OrganizationID returns an Option that will cause the client to use the specified organization ID for the request
 func OrganizationID(organizationID uuid.UUID) Option {
 	return optFunc(func(opts *options) {
@@ -236,6 +245,110 @@ func (c *Client) DeleteUser(ctx context.Context, id uuid.UUID) error {
 	return ucerr.Wrap(c.client.Delete(ctx, requestURL.String(), nil))
 }
 
+// CreateDataTypeRequest is the request body for creating a new data type
+type CreateDataTypeRequest struct {
+	DataType userstore.ColumnDataType `json:"data_type"`
+}
+
+//go:generate genvalidate CreateDataTypeRequest
+
+// CreateDataType creates a new data type for the associated tenant
+func (c *Client) CreateDataType(
+	ctx context.Context,
+	dataType userstore.ColumnDataType,
+	opts ...Option,
+) (*userstore.ColumnDataType, error) {
+	options := c.options
+	for _, opt := range opts {
+		opt.apply(&options)
+	}
+
+	req := CreateDataTypeRequest{
+		DataType: dataType,
+	}
+
+	var resp userstore.ColumnDataType
+	if options.ifNotExists {
+		exists, existingID, err := c.client.CreateIfNotExists(ctx, paths.DataTypePath, req, &resp)
+		if err != nil {
+			return nil, ucerr.Wrap(err)
+		}
+		if exists {
+			resp = req.DataType
+			resp.ID = existingID
+		}
+	} else {
+		if err := c.client.Post(ctx, paths.DataTypePath, req, &resp); err != nil {
+			return nil, ucerr.Wrap(err)
+		}
+	}
+
+	return &resp, nil
+}
+
+// DeleteDataType deletes the data type specified by the data type ID for the associated tenant
+func (c *Client) DeleteDataType(ctx context.Context, dataTypeID uuid.UUID) error {
+	return ucerr.Wrap(c.client.Delete(ctx, paths.DataTypePathForID(dataTypeID), nil))
+}
+
+// GetDataType returns the data type specified by the data type ID for the associated tenant
+func (c *Client) GetDataType(ctx context.Context, dataTypeID uuid.UUID) (*userstore.ColumnDataType, error) {
+	var resp userstore.ColumnDataType
+	if err := c.client.Get(ctx, paths.DataTypePathForID(dataTypeID), &resp); err != nil {
+		return nil, ucerr.Wrap(err)
+	}
+
+	return &resp, nil
+}
+
+// ListDataTypesResponse is the paginated response struct for listing data types
+type ListDataTypesResponse struct {
+	Data []userstore.ColumnDataType `json:"data"`
+	pagination.ResponseFields
+}
+
+// ListDataTypes lists all data types for the associated tenant
+func (c *Client) ListDataTypes(ctx context.Context, opts ...Option) (*ListDataTypesResponse, error) {
+	options := c.options
+	for _, opt := range opts {
+		opt.apply(&options)
+	}
+
+	pager, err := pagination.ApplyOptions(options.paginationOptions...)
+	if err != nil {
+		return nil, ucerr.Wrap(err)
+	}
+	query := pager.Query()
+
+	var res ListDataTypesResponse
+	if err := c.client.Get(ctx, fmt.Sprintf("%s?%s", paths.DataTypePath, query.Encode()), &res); err != nil {
+		return nil, ucerr.Wrap(err)
+	}
+
+	return &res, nil
+}
+
+// UpdateDataTypeRequest is the request body for updating a data type
+type UpdateDataTypeRequest struct {
+	DataType userstore.ColumnDataType `json:"data_type"`
+}
+
+//go:generate genvalidate UpdateDataTypeRequest
+
+// UpdateDataType updates the data type specified by the data type ID with the specified data for the associated tenant
+func (c *Client) UpdateDataType(ctx context.Context, dataTypeID uuid.UUID, updatedDataType userstore.ColumnDataType) (*userstore.ColumnDataType, error) {
+	req := UpdateDataTypeRequest{
+		DataType: updatedDataType,
+	}
+
+	var resp userstore.ColumnDataType
+	if err := c.client.Put(ctx, paths.DataTypePathForID(dataTypeID), req, &resp); err != nil {
+		return nil, ucerr.Wrap(err)
+	}
+
+	return &resp, nil
+}
+
 // CreateColumnRequest is the request body for creating a new column
 // TODO: should this support multiple at once before we ship this API?
 type CreateColumnRequest struct {
@@ -782,7 +895,7 @@ type ListAccessorsResponse struct {
 }
 
 // ListAccessors lists all the available accessors for the associated tenant
-func (c *Client) ListAccessors(ctx context.Context, opts ...Option) (*ListAccessorsResponse, error) {
+func (c *Client) ListAccessors(ctx context.Context, versioned bool, opts ...Option) (*ListAccessorsResponse, error) {
 	options := c.options
 	for _, opt := range opts {
 		opt.apply(&options)
@@ -793,6 +906,7 @@ func (c *Client) ListAccessors(ctx context.Context, opts ...Option) (*ListAccess
 	}
 
 	query := pager.Query()
+	query.Add("versioned", strconv.FormatBool(versioned))
 
 	var res ListAccessorsResponse
 	if err := c.client.Get(ctx, fmt.Sprintf("%s?%s", paths.ListAccessorsPath, query.Encode()), &res); err != nil {
@@ -893,7 +1007,7 @@ type ListMutatorsResponse struct {
 }
 
 // ListMutators lists all the available mutators for the associated tenant
-func (c *Client) ListMutators(ctx context.Context, opts ...Option) (*ListMutatorsResponse, error) {
+func (c *Client) ListMutators(ctx context.Context, versioned bool, opts ...Option) (*ListMutatorsResponse, error) {
 	options := c.options
 	for _, opt := range opts {
 		opt.apply(&options)
@@ -904,6 +1018,7 @@ func (c *Client) ListMutators(ctx context.Context, opts ...Option) (*ListMutator
 	}
 
 	query := pager.Query()
+	query.Add("versioned", strconv.FormatBool(versioned))
 
 	var res ListMutatorsResponse
 	if err := c.client.Get(ctx, fmt.Sprintf("%s?%s", paths.ListMutatorsPath, query.Encode()), &res); err != nil {
@@ -939,13 +1054,15 @@ type ExecuteAccessorRequest struct {
 	AccessorID     uuid.UUID                    `json:"accessor_id" validate:"notnil"` // the accessor that specifies what data to access
 	Context        policy.ClientContext         `json:"context"`                       // context that is provided to the accessor Access Policy
 	SelectorValues userstore.UserSelectorValues `json:"selector_values"`               // the values to use for the selector
+	Debug          bool                         `json:"debug,omitempty"`               // whether to include debug information in the response
 }
 
 //go:generate genvalidate ExecuteAccessorRequest
 
 // ExecuteAccessorResponse is the response body for accessing user data
 type ExecuteAccessorResponse struct {
-	Data []string `json:"data"`
+	Data  []string               `json:"data"`
+	Debug map[string]interface{} `json:"debug,omitempty"`
 	pagination.ResponseFields
 }
 
@@ -966,6 +1083,7 @@ func (c *Client) ExecuteAccessor(ctx context.Context, accessorID uuid.UUID, clie
 		AccessorID:     accessorID,
 		Context:        clientContext,
 		SelectorValues: selectorValues,
+		Debug:          options.debug,
 	}
 
 	var res ExecuteAccessorResponse
@@ -985,6 +1103,8 @@ const MutatorColumnCurrentValue = "UCCUR-7f55f479-3822-4976-a8a9-b789d5c6f152"
 // ValueAndPurposes is a tuple for specifying the value and the purpose to store for a user column
 type ValueAndPurposes struct {
 	Value            any                    `json:"value"`
+	ValueAdditions   any                    `json:"value_additions"`
+	ValueDeletions   any                    `json:"value_deletions"`
 	PurposeAdditions []userstore.ResourceID `json:"purpose_additions"`
 	PurposeDeletions []userstore.ResourceID `json:"purpose_deletions"`
 }
@@ -1239,3 +1359,22 @@ func (c *Client) DownloadPythonSDK(ctx context.Context) (string, error) {
 
 	return sdk, nil
 }
+
+// GetExternalOIDCIssuers returns the list of external OIDC issuers for JWT tokens for the tenant
+func (c *Client) GetExternalOIDCIssuers(ctx context.Context) ([]string, error) {
+	var resp []string
+	if err := c.client.Get(ctx, paths.ExternalOIDCIssuersPath, &resp); err != nil {
+		return nil, ucerr.Wrap(err)
+	}
+
+	return resp, nil
+}
+
+// UpdateExternalOIDCIssuers updates the list of external OIDC issuers for JWT tokens for the tenant
+func (c *Client) UpdateExternalOIDCIssuers(ctx context.Context, issuers []string) error {
+	if err := c.client.Put(ctx, paths.ExternalOIDCIssuersPath, issuers, nil); err != nil {
+		return ucerr.Wrap(err)
+	}
+
+	return nil
+}

idp/paths/data_type_paths.go

@@ -0,0 +1,15 @@
+package paths
+
+import (
+	"fmt"
+
+	"github.com/gofrs/uuid"
+)
+
+// DataTypePath is the path constant for interacting with data types
+var DataTypePath = fmt.Sprintf("%s/%s", BaseConfigPath, "datatypes")
+
+// DataTypePathForID returns the data type path for a specific data type id
+func DataTypePathForID(dataTypeID uuid.UUID) string {
+	return fmt.Sprintf("%s/%v", DataTypePath, dataTypeID)
+}

idp/paths/paths.go

@@ -153,9 +153,31 @@ var (
 	TestTransformer    = fmt.Sprintf("%s/actions/test", BaseTransformerPath)
 	ExecuteTransformer = fmt.Sprintf("%s/actions/execute", BaseTransformerPath)
 
+	BaseDataMappingPath = "/userstore/datamapping"
+
+	CreateDataSourcePath = fmt.Sprintf("%s/datasource", BaseDataMappingPath)
+	singleDataSourcePath = func(id uuid.UUID) string {
+		return fmt.Sprintf("%s/%s", CreateDataSourcePath, id)
+	}
+	DeleteDataSourcePath = singleDataSourcePath
+	GetDataSourcePath    = singleDataSourcePath
+	UpdateDataSourcePath = singleDataSourcePath
+	ListDataSourcesPath  = CreateDataSourcePath
+
+	CreateDataSourceElementPath = fmt.Sprintf("%s/element", BaseDataMappingPath)
+	singleDataSourceElementPath = func(id uuid.UUID) string {
+		return fmt.Sprintf("%s/%s", CreateDataSourceElementPath, id)
+	}
+	DeleteDataSourceElementPath = singleDataSourceElementPath
+	GetDataSourceElementPath    = singleDataSourceElementPath
+	UpdateDataSourceElementPath = singleDataSourceElementPath
+	ListDataSourceElementsPath  = CreateDataSourceElementPath
+
 	DownloadGolangSDKPath     = fmt.Sprintf("%s/download/codegensdk.go", UserStoreBasePath)
 	DownloadPythonSDKPath     = fmt.Sprintf("%s/download/codegensdk.py", UserStoreBasePath)
 	DownloadTypescriptSDKPath = fmt.Sprintf("%s/download/codegensdk.ts", UserStoreBasePath)
+
+	ExternalOIDCIssuersPath = fmt.Sprintf("%s/oidcissuers", UserStoreBasePath)
 )
 
 // StripUserstoreBase makes the URLs functional for handler setup