diff --git a/compose/rest/namespace.go b/compose/rest/namespace.go index 27631019d..5075db59f 100644 --- a/compose/rest/namespace.go +++ b/compose/rest/namespace.go @@ -17,14 +17,13 @@ type ( namespacePayload struct { *types.Namespace - CanGrant bool `json:"canGrant"` - CanUpdateNamespace bool `json:"canUpdateNamespace"` - CanDeleteNamespace bool `json:"canDeleteNamespace"` - CanManageNamespace bool `json:"canManageNamespace"` - CanCreateModule bool `json:"canCreateModule"` - CanCreateChart bool `json:"canCreateChart"` - CanCreateAutomationScript bool `json:"canCreateAutomationScript"` - CanCreatePage bool `json:"canCreatePage"` + CanGrant bool `json:"canGrant"` + CanUpdateNamespace bool `json:"canUpdateNamespace"` + CanDeleteNamespace bool `json:"canDeleteNamespace"` + CanManageNamespace bool `json:"canManageNamespace"` + CanCreateModule bool `json:"canCreateModule"` + CanCreateChart bool `json:"canCreateChart"` + CanCreatePage bool `json:"canCreatePage"` } namespaceSetPayload struct { @@ -46,7 +45,6 @@ type ( CanCreateModule(context.Context, *types.Namespace) bool CanCreateChart(context.Context, *types.Namespace) bool - CanCreateAutomationScript(context.Context, *types.Namespace) bool CanCreatePage(context.Context, *types.Namespace) bool } ) @@ -150,10 +148,9 @@ func (ctrl Namespace) makePayload(ctx context.Context, ns *types.Namespace, err CanDeleteNamespace: ctrl.ac.CanDeleteNamespace(ctx, ns), CanManageNamespace: ctrl.ac.CanManageNamespace(ctx, ns), - CanCreateModule: ctrl.ac.CanCreateModule(ctx, ns), - CanCreateChart: ctrl.ac.CanCreateChart(ctx, ns), - CanCreateAutomationScript: ctrl.ac.CanCreateAutomationScript(ctx, ns), - CanCreatePage: ctrl.ac.CanCreatePage(ctx, ns), + CanCreateModule: ctrl.ac.CanCreateModule(ctx, ns), + CanCreateChart: ctrl.ac.CanCreateChart(ctx, ns), + CanCreatePage: ctrl.ac.CanCreatePage(ctx, ns), }, nil } diff --git a/compose/service/access_control.go b/compose/service/access_control.go index 9cb15af47..ba7604885 100644 --- a/compose/service/access_control.go +++ b/compose/service/access_control.go @@ -87,10 +87,6 @@ func (svc accessControl) CanCreateModule(ctx context.Context, r *types.Namespace return svc.can(ctx, r, "module.create") } -func (svc accessControl) CanCreateAutomationScript(ctx context.Context, r *types.Namespace) bool { - return svc.can(ctx, r, "automation-script.create") -} - func (svc accessControl) CanReadModule(ctx context.Context, r *types.Module) bool { return svc.can(ctx, r, "read") } @@ -250,17 +246,5 @@ func (svc accessControl) Whitelist() permissions.Whitelist { "delete", ) - wl.Set( - types.AutomationScriptPermissionResource, - "read", - "update", - "delete", - ) - - wl.Set( - types.AutomationTriggerPermissionResource, - "run", - ) - return wl } diff --git a/compose/types/permission_resources.go b/compose/types/permission_resources.go index 788ce45ee..aa618e716 100644 --- a/compose/types/permission_resources.go +++ b/compose/types/permission_resources.go @@ -10,5 +10,3 @@ const ChartPermissionResource = permissions.Resource("compose:chart:") const ModulePermissionResource = permissions.Resource("compose:module:") const ModuleFieldPermissionResource = permissions.Resource("compose:module-field:") const PagePermissionResource = permissions.Resource("compose:page:") -const AutomationScriptPermissionResource = permissions.Resource("compose:automation-script:") -const AutomationTriggerPermissionResource = permissions.Resource("compose:automation-trigger:") diff --git a/system/service/access_control.go b/system/service/access_control.go index b4422a844..5d946d09c 100644 --- a/system/service/access_control.go +++ b/system/service/access_control.go @@ -77,10 +77,6 @@ func (svc accessControl) CanCreateApplication(ctx context.Context) bool { return svc.can(ctx, types.SystemPermissionResource, "application.create") } -func (svc accessControl) CanCreateAutomationScript(ctx context.Context) bool { - return svc.can(ctx, types.SystemPermissionResource, "automation-script.create") -} - func (svc accessControl) CanAssignReminder(ctx context.Context) bool { return svc.can(ctx, types.SystemPermissionResource, "reminder.assign") } @@ -233,17 +229,5 @@ func (svc accessControl) Whitelist() permissions.Whitelist { "members.manage", ) - wl.Set( - types.AutomationScriptPermissionResource, - "read", - "update", - "delete", - ) - - wl.Set( - types.AutomationTriggerPermissionResource, - "run", - ) - return wl } diff --git a/system/types/permission_resources.go b/system/types/permission_resources.go index 6ecfe9d63..bf54339be 100644 --- a/system/types/permission_resources.go +++ b/system/types/permission_resources.go @@ -9,5 +9,3 @@ const ApplicationPermissionResource = permissions.Resource("system:application:" const OrganisationPermissionResource = permissions.Resource("system:organisation:") const UserPermissionResource = permissions.Resource("system:user:") const RolePermissionResource = permissions.Resource("system:role:") -const AutomationScriptPermissionResource = permissions.Resource("system:automation-script:") -const AutomationTriggerPermissionResource = permissions.Resource("system:automation-trigger:")