feat: add notebooks and annotations to list of permissions for OSS (#3019)

* feat: add notebooks and annotations resource types to OSS permissions for token generation

* chore: update tests for permissions

Author: williamhbaker

package.json

@@ -52,7 +52,7 @@
     "cy": "CYPRESS_dexUrl=https://$INGRESS_HOST:$PORT_HTTPS CYPRESS_baseUrl=http://localhost:9999 cypress open",
     "cy:dev": "source ../monitor-ci/.env && CYPRESS_dexUrl=CLOUD CYPRESS_baseUrl=https://$INGRESS_HOST:$PORT_HTTPS cypress open --config testFiles='{cloud,shared}/**/*.*'",
     "cy:dev-oss": "source ../monitor-ci/.env && CYPRESS_dexUrl=OSS CYPRESS_baseUrl=https://$INGRESS_HOST:$PORT_HTTPS cypress open --config testFiles='{oss,shared}/**/*.*'",
-    "generate": "export SHA=653a3ddf1991968b898bc1cc3e5e329833cac01a && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
+    "generate": "export SHA=ecdcd4b1baace6942e567771518ba19caf381652 && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
     "generate-local": "export REMOTE=../openapi/ && yarn generate-meta",
     "generate-meta": "if [ -z \"${CLOUD_URL}\" ]; then yarn generate-meta-oss; else yarn generate-meta-cloud; fi",
     "generate-meta-oss": "yarn oss-api && yarn notebooks && yarn unity && yarn annotations-oss && yarn pinned && yarn mapsd-oss && yarn cloudPriv",

src/authorizations/utils/permissions.test.ts

@@ -4,6 +4,20 @@ import {generateDescription} from 'src/authorizations/utils/permissions'
 
 // TODO remove all of this when we move to server side authority
 const ossHvhs = [
+  {
+    action: 'read',
+    resource: {
+      orgID: 'bulldogs',
+      type: 'annotations',
+    },
+  },
+  {
+    action: 'write',
+    resource: {
+      orgID: 'bulldogs',
+      type: 'annotations',
+    },
+  },
   {
     action: 'read',
     resource: {
@@ -102,6 +116,20 @@ const ossHvhs = [
       type: 'labels',
     },
   },
+  {
+    action: 'read',
+    resource: {
+      orgID: 'bulldogs',
+      type: 'notebooks',
+    },
+  },
+  {
+    action: 'write',
+    resource: {
+      orgID: 'bulldogs',
+      type: 'notebooks',
+    },
+  },
   {
     action: 'read',
     resource: {

src/authorizations/utils/permissions.ts

@@ -5,6 +5,7 @@ import {capitalize} from 'lodash'
 type PermissionTypes = Permission['resource']['type']
 
 const sharedPermissionTypes: PermissionTypes[] = [
+  'annotations',
   'authorizations',
   'buckets',
   'checks',
@@ -23,9 +24,9 @@ const sharedPermissionTypes: PermissionTypes[] = [
   'views',
 ]
 
-const cloudPermissionTypes = ['annotations', 'flows', 'functions']
+const cloudPermissionTypes = ['flows', 'functions']
 
-const ossPermissionTypes = ['scrapers', 'sources']
+const ossPermissionTypes = ['notebooks', 'scrapers', 'sources']
 
 // TODO: replace this with some server side mechanism
 const allPermissionTypes: PermissionTypes[] = sharedPermissionTypes.concat(