change type of resource and user attributes to map[string]interface{}

permitio · Sep 26, 2023 · 42259c3 · 42259c3
1 parent 230b62b
commit 42259c3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/pkg/enforcement/resource.go b/pkg/enforcement/resource.go
@@ -4,16 +4,16 @@ type ResourceI interface {
 	GetID() string
 	GetType() string
 	GetTenant() string
-	GetAttributes() map[string]string
+	GetAttributes() map[string]interface{}
 	GetContext() map[string]string
 }
 
 type Resource struct {
-	Type       string            `json:"type,omitempty"`
-	ID         string            `json:"id,omitempty"`
-	Tenant     string            `json:"tenant,omitempty"`
-	Attributes map[string]string `json:"attributes,omitempty"`
-	Context    map[string]string `json:"context,omitempty"`
+	Type       string                 `json:"type,omitempty"`
+	ID         string                 `json:"id,omitempty"`
+	Tenant     string                 `json:"tenant,omitempty"`
+	Attributes map[string]interface{} `json:"attributes,omitempty"`
+	Context    map[string]string      `json:"context,omitempty"`
 }
 
 func (r *Resource) GetID() string {
@@ -28,7 +28,7 @@ func (r *Resource) GetTenant() string {
 	return r.Tenant
 }
 
-func (r *Resource) GetAttributes() map[string]string {
+func (r *Resource) GetAttributes() map[string]interface{} {
 	return r.Attributes
 }
 
@@ -52,7 +52,7 @@ func (r *Resource) WithTenant(tenant string) *Resource {
 	return r
 }
 
-func (r *Resource) WithAttributes(attributes map[string]string) *Resource {
+func (r *Resource) WithAttributes(attributes map[string]interface{}) *Resource {
 	r.Attributes = attributes
 	return r
 }

diff --git a/pkg/enforcement/user.go b/pkg/enforcement/user.go
@@ -6,12 +6,12 @@ type AssignedRole struct {
 }
 
 type User struct {
-	Key        string            `json:"key,omitempty"`
-	FirstName  string            `json:"first_name,omitempty"`
-	LastName   string            `json:"last_name,omitempty"`
-	Email      string            `json:"email,omitempty"`
-	Roles      []AssignedRole    `json:"roles,omitempty"`
-	Attributes map[string]string `json:"attributes,omitempty"`
+	Key        string                 `json:"key,omitempty"`
+	FirstName  string                 `json:"first_name,omitempty"`
+	LastName   string                 `json:"last_name,omitempty"`
+	Email      string                 `json:"email,omitempty"`
+	Roles      []AssignedRole         `json:"roles,omitempty"`
+	Attributes map[string]interface{} `json:"attributes,omitempty"`
 }
 
 func UserBuilder(key string) *User {
@@ -40,7 +40,7 @@ func (u *User) WithRoles(roles []AssignedRole) *User {
 	return u
 }
 
-func (u *User) WithAttributes(attributes map[string]string) *User {
+func (u *User) WithAttributes(attributes map[string]interface{}) *User {
 	u.Attributes = attributes
 	return u
 }

diff --git a/pkg/tests/integration_test.go b/pkg/tests/integration_test.go
@@ -49,8 +49,8 @@ func (m MyResource) GetTenant() string {
 	return m.Organization
 }
 
-func (m MyResource) GetAttributes() map[string]string {
-	return make(map[string]string)
+func (m MyResource) GetAttributes() map[string]interface{} {
+	return make(map[string]interface{})
 }
 
 func (m MyResource) GetContext() map[string]string {