Revert "Data access dumps (#606)" (#612)

This reverts commit 103e932, reversing
changes made to 8799108.

The Data Access spec has changed, in particular the promotion of
_Sparkplug Device_ to rank 2 was incorrect. Reverting so we can make a
release without these changes.

Author: amrc-benmorrow

acs-auth/dump-schema.yaml

@@ -37,10 +37,4 @@ oneOf:
               - type: "null"
               - type: object
                 propertyNames: { format: uuid }
-                additionalProperties:
-                  oneOf:
-                    - type: boolean
-                    - type: string
-                      enum: ["both"]
-              - type: string
-                enum: ["both"]
+                additionalProperties: { type: boolean }

acs-auth/lib/loader.js

@@ -36,16 +36,8 @@ export class Loader {
                     .map(([p, t]) => [p, t ?? { [Special.Wildcard]: false }])
                     .flatMap(([permission, targs]) =>
                         Object.entries(targs)
-                            .flatMap(([target, plural]) => {
-                                if (plural === "both"){
-                                    return [
-                                        { principal, permission, target, plural: true },
-                                        { principal, permission, target, plural: false }
-                                    ];
-                                }
-                                return { principal, permission, target, plural };
-                            })
-                        ));
+                            .flatMap(([target, plural]) =>
+                                ({ principal, permission, target, plural }))));
         const permitted = {
             acl:    await data.check_targ(req.auth, Perm.WriteACL, true),
             id:     await data.check_targ(req.auth, Perm.WriteACL, true),

acs-service-setup/dumps/data-access.yaml

@@ -421,56 +421,6 @@ export const Git = {
     },
 };
 
-export const DataAccess = {
-    App: {
-        DatasetDefinition: "eae2d4ae-164d-4dc6-b646-7e0320057bd9",
-        DatasetMetadata: "e3b9fd2c-9de1-470b-9675-739e2a55b77f", 
-        UnionComponents: "1c4ca454-de38-44d9-92fb-aa5218bfa257",
-        SessionLimits: "8754c000-3778-4ae6-b2b8-bbcd959bb775",
-        MESIdentifiers: "af178f0c-3b1e-44f2-9724-5cf06e8fd056",
-    },
-
-    Class: {
-        Measurement: "cce0ac4e-b5ba-4837-b45d-c74df55aa2d7",
-        Dataset: "c31d3cbd-01cd-4833-8014-c4512aef1e5c",
-        SparkplugDevice: "18773d6d-a70d-443a-b29a-3f1583195290",
-        Session: "2f555be8-e7fc-4fb0-b62f-809cefd8a141",
-        Union: "c57a42a9-348c-4972-a05b-9082c20f2afc", 
-        Published: "414d2d10-6be8-4c27-8e9f-c716ef5432b9",
-        Partial: "6c583d11-9a88-4bc1-b77c-81b01e9c9827",
-        MESDataset: "586205bf-81c6-4091-9d2c-f3c0465ebdc4",
-        Equipment: "4c93ddc1-e610-4efe-91e3-a355f9ba1a09", 
-        WorkOrder: "b416e44c-c57e-4486-9431-64c425f1b2c6",
-        Product: "4a089748-b26b-4f12-8f1a-164bfba97809",
-        Operation: "bd0354eb-b8f7-4bd9-8407-0588e545603c",
-        MES: "2c691583-89fe-4421-bf2c-64e34e663711"
-    },
-
-    Group: {
-        DatasetGroup: "17e37253-8626-4031-b217-28c6a03e91c1",
-        DatasetRoleGroup: "56c52f70-0649-4962-8526-9ec9d1c85ca4",
-        StructuralDatasetType: "70ff7bea-bb2d-48c2-88fd-4f7a79b1aa3c", 
-        FunctionalDatasetGroup: "86e5b048-e956-4820-939e-3abf3eda4e03", 
-    }, 
-    
-    Service: {
-        DataAccess: "06cee697-29d3-4972-9479-bc392e24946e"
-    }, 
-
-    Requirement: {
-        ServiceRole: "dd18050c-a9ab-4287-8af2-e983f20e89c8"
-    }, 
-
-    Perm: {
-        All: "1e3cb5aa-a3f7-4bb6-9ef1-c3bc08427f60",
-        CreateDataset: "2d666b41-7a0d-4845-ad59-3113f25b469a",
-        IncludeInUnion: "94d51085-af83-4796-8059-fcd578e3f572", 
-        ReadDataset: "ec48462e-37eb-4f56-8efa-83d813e85559",
-        UseForSession: "c089b9a9-06cd-4211-94fc-9ad52a759987", 
-        EditDataset: "af06b9e5-456a-43e4-b636-5b17de28fc7f",
-    }
-}
-
 export const UNS = {
     Group: {
         Sparkplug:  "e414d355-b991-429b-8f5d-97e823ff71f5",
@@ -484,4 +434,3 @@ export const UNS = {
         ReadEntireUNS:      "ffa40b36-3a61-4545-832a-2d1e8b860d63",
     },
 };
-

acs-service-setup/lib/uuids.js

@@ -87,7 +87,6 @@ export const Service = {
     Clusters: "2706aa43-a826-441e-9cec-cd3d4ce623c2",
     Manager: "619eecab-742d-4824-8b97-bcae472e5c04",
     Files: 'a2a6efc5-9793-4486-9fd9-7caf9e3b5451',
-    DataAccess: "06cee697-29d3-4972-9479-bc392e24946e"
 };
 
 /* This list is not meant to be exhaustive, but these are commonly used