Sync monorepo state at 6d9a89fb46c870952be0a85ab7d02c9dc0e83c5b

Author: uc-build-user

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 1.6.0 - 12-09-2024
+
+- add ObjectStore CRUD methods
+- add Truncated flag to ExecuteAccessorResponse
+- add Version to Transformer
+- add UpdateTransformerRequest
+- add GetTransformerByVersion method
+- add UpdateTransformer method
+- add SearchIndexed and AccessPolicy to Column
+- add TokenAccessPolicy to ColumnOutputConfig
+- add AreColumnAccessPoliciesOverridden, IsAutoGenerated, UseSearchIndex to Accessor
+- add Schemas to ColumnInputConfig
+- add ShimObjectStore
+- client cache improvements
+- logging improvements
+- add onprem region and universe
+
 ## 1.5.0 - 30-07-2024
 
 - Update userstore sample to exercise multi-key execute accessor pagination

authz/cache_name_provider.go

@@ -1,12 +1,14 @@
 package authz
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"github.com/gofrs/uuid"
 
 	"userclouds.com/infra/cache"
+	"userclouds.com/infra/uclog"
 )
 
 const (
@@ -329,7 +331,11 @@ func (ot ObjectType) GetGlobalCollectionPagesKey(c cache.KeyNameProvider) cache.
 
 // GetSecondaryKeys returns the secondary cache key names for object type
 func (ot ObjectType) GetSecondaryKeys(c cache.KeyNameProvider) []cache.Key {
-	return []cache.Key{c.GetKeyNameWithString(ObjectTypeNameKeyID, ot.TypeName)}
+	if ot.TypeName != "" {
+		return []cache.Key{c.GetKeyNameWithString(ObjectTypeNameKeyID, ot.TypeName)}
+	}
+	uclog.Verbosef(context.Background(), "ObjectType %v has no name. Dropping secondary key", ot.ID)
+	return []cache.Key{}
 }
 
 // GetPerItemCollectionKey returns the per item collection key name for object type
@@ -384,7 +390,11 @@ func (et EdgeType) GetPerItemCollectionKey(c cache.KeyNameProvider) cache.Key {
 
 // GetSecondaryKeys returns the secondary cache key names for edge type
 func (et EdgeType) GetSecondaryKeys(c cache.KeyNameProvider) []cache.Key {
-	return []cache.Key{c.GetKeyNameWithString(EdgeTypeNameKeyID, et.TypeName)}
+	if et.TypeName != "" {
+		return []cache.Key{c.GetKeyNameWithString(EdgeTypeNameKeyID, et.TypeName)}
+	}
+	uclog.Verbosef(context.Background(), "EdgeType %v has no name. Dropping secondary key", et.ID)
+	return []cache.Key{}
 }
 
 // GetDependenciesKey returns the dependencies key name for edge type
@@ -510,7 +520,11 @@ func (e Edge) GetDependencyKeys(c cache.KeyNameProvider) []cache.Key {
 
 // GetSecondaryKeys returns the secondary cache key names for edge
 func (e Edge) GetSecondaryKeys(c cache.KeyNameProvider) []cache.Key {
-	return []cache.Key{c.GetKeyName(EdgeFullKeyID, []string{e.SourceObjectID.String(), e.TargetObjectID.String(), e.EdgeTypeID.String()})}
+	if !e.SourceObjectID.IsNil() || !e.TargetObjectID.IsNil() || !e.EdgeTypeID.IsNil() {
+		return []cache.Key{c.GetKeyName(EdgeFullKeyID, []string{e.SourceObjectID.String(), e.TargetObjectID.String(), e.EdgeTypeID.String()})}
+	}
+	uclog.Verbosef(context.Background(), "Edge %v has no source, target or edge type. Dropping secondary key", e.ID)
+	return []cache.Key{}
 }
 
 // TTL returns the TTL for edge
@@ -614,7 +628,11 @@ func (o Organization) GetDependencyKeys(c cache.KeyNameProvider) []cache.Key {
 
 // GetSecondaryKeys returns the secondary cache key names for organization (none)
 func (o Organization) GetSecondaryKeys(c cache.KeyNameProvider) []cache.Key {
-	return []cache.Key{c.GetKeyNameWithString(OrganizationNameKeyID, o.Name)}
+	if o.Name != "" {
+		return []cache.Key{c.GetKeyNameWithString(OrganizationNameKeyID, o.Name)}
+	}
+	uclog.Verbosef(context.Background(), "Organization %v has no name. Dropping secondary key", o.ID)
+	return []cache.Key{}
 }
 
 // TTL returns the TTL for edge

authz/client.go

@@ -643,7 +643,7 @@ func (c *Client) ListEdgeTypes(ctx context.Context, opts ...Option) ([]EdgeType,
 
 	for {
 		query := pager.Query()
-		if options.organizationID != uuid.Nil {
+		if !options.organizationID.IsNil() {
 			query.Add("organization_id", options.organizationID.String())
 		}
 
@@ -687,7 +687,7 @@ func (c *Client) ListEdgeTypesPaginated(ctx context.Context, opts ...Option) (*L
 
 	query := pager.Query()
 
-	if options.organizationID != uuid.Nil {
+	if !options.organizationID.IsNil() {
 		query.Add("organization_id", options.organizationID.String())
 	}
 
@@ -957,7 +957,7 @@ func (c *Client) ListObjects(ctx context.Context, opts ...Option) (*ListObjectsR
 		return nil, ucerr.Wrap(err)
 	}
 	query := pager.Query()
-	if options.organizationID != uuid.Nil {
+	if !options.organizationID.IsNil() {
 		query.Add("organization_id", options.organizationID.String())
 	}
 	return c.ListObjectsFromQuery(ctx, query, opts...)
@@ -971,7 +971,7 @@ func (c *Client) ListObjectsFromQuery(ctx context.Context, query url.Values, opt
 	for _, opt := range opts {
 		opt.apply(&options)
 	}
-	if options.organizationID != uuid.Nil {
+	if !options.organizationID.IsNil() {
 		query.Add("organization_id", options.organizationID.String())
 	}
 
@@ -1559,7 +1559,7 @@ func (c *Client) GetOrganizationForName(ctx context.Context, name string, opts .
 	}
 
 	pager, err := pagination.ApplyOptions(
-		pagination.Filter("('name',EQ,'testorg')"),
+		pagination.Filter(fmt.Sprintf("('name',EQ,'%s')", name)),
 	)
 	if err != nil {
 		return nil, ucerr.Wrap(err)

authz/models.go

@@ -7,7 +7,6 @@ import (
 	"github.com/gofrs/uuid"
 
 	"userclouds.com/infra/namespace/region"
-	"userclouds.com/infra/pagination"
 	"userclouds.com/infra/ucdb"
 	"userclouds.com/infra/ucerr"
 )
@@ -19,16 +18,6 @@ type ObjectType struct {
 	TypeName string `db:"type_name" json:"type_name" validate:"notempty" required:"true"`
 }
 
-// GetPaginationKeys is part of the pagination.PageableType interface
-func (ObjectType) GetPaginationKeys() pagination.KeyTypes {
-	return pagination.KeyTypes{
-		"id":        pagination.UUIDKeyType,
-		"type_name": pagination.StringKeyType,
-		"created":   pagination.TimestampKeyType,
-		"updated":   pagination.TimestampKeyType,
-	}
-}
-
 // EqualsIgnoringID returns true if two object types are equal, ignoring the ID field
 func (ot *ObjectType) EqualsIgnoringID(other *ObjectType) bool {
 	return ot.TypeName == other.TypeName
@@ -140,19 +129,6 @@ func (e *EdgeType) EqualsIgnoringID(other *EdgeType) bool {
 
 //go:generate genvalidate EdgeType
 
-// GetPaginationKeys is part of the pagination.PageableType interface
-func (EdgeType) GetPaginationKeys() pagination.KeyTypes {
-	return pagination.KeyTypes{
-		"id":                    pagination.UUIDKeyType,
-		"type_name":             pagination.StringKeyType,
-		"organization_id":       pagination.UUIDKeyType,
-		"source_object_type_id": pagination.UUIDKeyType,
-		"target_object_type_id": pagination.UUIDKeyType,
-		"created":               pagination.TimestampKeyType,
-		"updated":               pagination.TimestampKeyType,
-	}
-}
-
 // Object represents an instance of an AuthZ object used for modeling permissions.
 type Object struct {
 	ucdb.BaseModel
@@ -176,18 +152,6 @@ func (o *Object) EqualsIgnoringID(other *Object) bool {
 
 //go:generate genvalidate Object
 
-// GetPaginationKeys is part of the pagination.PageableType interface
-func (Object) GetPaginationKeys() pagination.KeyTypes {
-	return pagination.KeyTypes{
-		"id":              pagination.UUIDKeyType,
-		"alias":           pagination.StringKeyType,
-		"organization_id": pagination.UUIDKeyType,
-		"type_id":         pagination.UUIDKeyType,
-		"created":         pagination.TimestampKeyType,
-		"updated":         pagination.TimestampKeyType,
-	}
-}
-
 // Edge represents a directional relationship between a "source"
 // object and a "target" object.
 type Edge struct {
@@ -207,17 +171,6 @@ func (e *Edge) EqualsIgnoringID(other *Edge) bool {
 
 //go:generate genvalidate Edge
 
-// GetPaginationKeys is part of the pagination.PageableType interface
-func (Edge) GetPaginationKeys() pagination.KeyTypes {
-	return pagination.KeyTypes{
-		"id":               pagination.UUIDKeyType,
-		"source_object_id": pagination.UUIDKeyType,
-		"target_object_id": pagination.UUIDKeyType,
-		"created":          pagination.TimestampKeyType,
-		"updated":          pagination.TimestampKeyType,
-	}
-}
-
 // Organization defines a collection of objects inside of a single AuthZ namespace.
 // Uniqueness (of eg. Object aliases) is enforced by organization, rather than globally in a tenant
 type Organization struct {
@@ -229,16 +182,6 @@ type Organization struct {
 
 //go:generate genvalidate Organization
 
-// GetPaginationKeys is part of the pagination.PageableType interface
-func (Organization) GetPaginationKeys() pagination.KeyTypes {
-	return pagination.KeyTypes{
-		"id":      pagination.UUIDKeyType,
-		"name":    pagination.StringKeyType,
-		"created": pagination.TimestampKeyType,
-		"updated": pagination.TimestampKeyType,
-	}
-}
-
 //go:generate genvalidate CreateObjectTypeRequest
 
 //go:generate genvalidate CreateEdgeTypeRequest

idp/client.go

@@ -358,6 +358,106 @@ func (c *Client) UpdateDatabase(ctx context.Context, databaseID uuid.UUID, updat
 	return &resp, nil
 }
 
+// CreateObjectStoreRequest is the request body for creating a new object store
+type CreateObjectStoreRequest struct {
+	ObjectStore userstore.ShimObjectStore `json:"objectStore"`
+}
+
+//go:generate genvalidate CreateObjectStoreRequest
+
+// CreateObjectStore creates a new sqlshim object store for the tenant
+func (c *Client) CreateObjectStore(ctx context.Context, objectStore userstore.ShimObjectStore, opts ...Option) (*userstore.ShimObjectStore, error) {
+	options := c.options
+	for _, opt := range opts {
+		opt.apply(&options)
+	}
+
+	req := CreateObjectStoreRequest{
+		ObjectStore: objectStore,
+	}
+
+	var resp userstore.ShimObjectStore
+	if options.ifNotExists {
+		exists, existingID, err := c.client.CreateIfNotExists(ctx, paths.CreateObjectStorePath, req, &resp)
+		if err != nil {
+			return nil, ucerr.Wrap(err)
+		}
+		if exists {
+			resp = req.ObjectStore
+			resp.ID = existingID
+		}
+	} else {
+		if err := c.client.Post(ctx, paths.CreateObjectStorePath, req, &resp); err != nil {
+			return nil, ucerr.Wrap(err)
+		}
+	}
+
+	return &resp, nil
+}
+
+// DeleteObjectStore deletes the object store specified by the object store ID for the associated tenant
+func (c *Client) DeleteObjectStore(ctx context.Context, objectStoreID uuid.UUID) error {
+	return ucerr.Wrap(c.client.Delete(ctx, paths.DeleteObjectStorePath(objectStoreID), nil))
+}
+
+// GetObjectStore returns the object store specified by the object store ID for the associated tenant
+func (c *Client) GetObjectStore(ctx context.Context, objectStoreID uuid.UUID) (*userstore.ShimObjectStore, error) {
+	var resp userstore.ShimObjectStore
+	if err := c.client.Get(ctx, paths.GetObjectStorePath(objectStoreID), &resp); err != nil {
+		return nil, ucerr.Wrap(err)
+	}
+
+	return &resp, nil
+}
+
+// ListObjectStoresResponse is the paginated response struct for listing object stores
+type ListObjectStoresResponse struct {
+	Data []userstore.ShimObjectStore `json:"data"`
+	pagination.ResponseFields
+}
+
+// ListObjectStores lists all object stores for the associated tenant
+func (c *Client) ListObjectStores(ctx context.Context, opts ...Option) (*ListObjectStoresResponse, 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 ListObjectStoresResponse
+	if err := c.client.Get(ctx, fmt.Sprintf("%s?%s", paths.ObjectStorePath, query.Encode()), &res); err != nil {
+		return nil, ucerr.Wrap(err)
+	}
+
+	return &res, nil
+}
+
+// UpdateObjectStoreRequest is the request body for updating a object store
+type UpdateObjectStoreRequest struct {
+	ObjectStore userstore.ShimObjectStore `json:"objectStore"`
+}
+
+//go:generate genvalidate UpdateObjectStoreRequest
+
+// UpdateObjectStore updates the object store specified by the object store ID with the specified data for the associated tenant
+func (c *Client) UpdateObjectStore(ctx context.Context, objectStoreID uuid.UUID, updatedObjectStore userstore.ShimObjectStore) (*userstore.ShimObjectStore, error) {
+	req := UpdateObjectStoreRequest{
+		ObjectStore: updatedObjectStore,
+	}
+
+	var resp userstore.ShimObjectStore
+	if err := c.client.Put(ctx, paths.UpdateObjectStorePath(objectStoreID), req, &resp); err != nil {
+		return nil, ucerr.Wrap(err)
+	}
+
+	return &resp, nil
+}
+
 // CreateDataTypeRequest is the request body for creating a new data type
 type CreateDataTypeRequest struct {
 	DataType userstore.ColumnDataType `json:"data_type"`
@@ -1176,6 +1276,8 @@ type ExecuteAccessorRequest struct {
 type ExecuteAccessorResponse struct {
 	Data  []string               `json:"data"`
 	Debug map[string]interface{} `json:"debug,omitempty"`
+	// TODO: Truncated will need to be added to our python SDK if we keep it
+	Truncated bool `json:"truncated" description:"Will be true if an incomplete set of results could be returned for the query"`
 	pagination.ResponseFields
 }
 

idp/paths/paths.go

@@ -27,6 +27,14 @@ var (
 	UpdateDatabasePath = singleDatabasePath
 	DeleteDatabasePath = singleDatabasePath
 
+	ObjectStorePath       = fmt.Sprintf("%s/objectstores", BaseConfigPath)
+	CreateObjectStorePath = ObjectStorePath
+	ListObjectStoresPath  = ObjectStorePath
+	singleObjectStorePath = func(id uuid.UUID) string { return fmt.Sprintf("%s/%s", ObjectStorePath, id) }
+	GetObjectStorePath    = singleObjectStorePath
+	UpdateObjectStorePath = singleObjectStorePath
+	DeleteObjectStorePath = singleObjectStorePath
+
 	BaseConfigColumnsPath  = fmt.Sprintf("%s/columns", BaseConfigPath)
 	singleConfigColumnPath = func(id uuid.UUID) string {
 		return fmt.Sprintf("%s/%s", BaseConfigColumnsPath, id)
@@ -156,7 +164,14 @@ var (
 	GetTransformer = func(id uuid.UUID) string {
 		return fmt.Sprintf("%s/%s", BaseTransformerPath, id)
 	}
+	GetTransformerByVersion = func(id uuid.UUID, version int) string {
+		return fmt.Sprintf("%s/%s?transformer_version=%d", BaseTransformerPath, id, version)
+	}
+	GetTransformerByNameAndVersion = func(name string, version int) string {
+		return fmt.Sprintf("%s?transformer_name=%s&transformer_version=%d", BaseTransformerPath, name, version)
+	}
 	CreateTransformer  = BaseTransformerPath
+	UpdateTransformer  = func(id uuid.UUID) string { return fmt.Sprintf("%s/%s", BaseTransformerPath, id) }
 	DeleteTransformer  = func(id uuid.UUID) string { return fmt.Sprintf("%s/%s", BaseTransformerPath, id) }
 	TestTransformer    = fmt.Sprintf("%s/actions/test", BaseTransformerPath)
 	ExecuteTransformer = fmt.Sprintf("%s/actions/execute", BaseTransformerPath)