@contrail/cli 1.0.58 → 1.0.60

package/lib/projects/interfaces.d.ts

@@ -23,6 +23,7 @@ export declare class AssortmentConfiguration {
 export declare class Folder {
     identifier: string;
     name: string;
+    principals: string[];
     assortments: AssortmentConfiguration[];
     subFolders: Folder[];
 }
@@ -30,6 +31,7 @@ export declare class ProjectConfiguration {
     projectName: string;
     identifier: string;
     commonConfig: CommonConfiguration;
+    principals: string[];
     assortments: AssortmentConfiguration[];
     subFolders: Folder[];
 }
@@ -37,6 +39,7 @@ export declare class ProjectConfigurationTemplate {
     projectName: string;
     identifier: string;
     commonConfig: CommonConfiguration;
+    principals: string[];
     allFolders: FolderSlim[];
     allAssortments: AssortmentConfigurationSlim[];
     allAssortmentRelationships: AssortmentConfigurationRelationships[];
@@ -44,6 +47,7 @@ export declare class ProjectConfigurationTemplate {
 export declare class FolderSlim {
     identifier: string;
     name: string;
+    principals: string[];
     folderIdentifier: string;
 }
 export declare class AssortmentConfigurationSlim {

package/lib/projects/project-exporter.js

@@ -54,10 +54,12 @@ async function exportProject(name) {
     const projectConfiguration = {
         projectName: workspace.name,
         identifier: workspace.identifier,
+        principals: [],
         commonConfig: {},
         assortments: [],
         subFolders: []
     };
+    projectConfiguration.principals = await getFolderPrincipals(workspace);
     const allAssortments = [];
     await getAssortmentsAndSubFolders(workspace.id, projectConfiguration.assortments, projectConfiguration.subFolders, allAssortments);
     await convertRelationshipsInFolders(projectConfiguration, allAssortments);
@@ -104,9 +106,11 @@ async function getAssortmentsAndSubFolders(parentId, assortments, subFolders, al
             const converted = {
                 identifier: folder.identifier,
                 name: folder.name,
+                principals: [],
                 assortments: [],
                 subFolders: [],
             };
+            converted.principals = await getFolderPrincipals(folder);
             await getAssortmentsAndSubFolders(folder.id, converted.assortments, converted.subFolders, allAssortments);
             subFolders.push(converted);
         }
@@ -136,6 +140,20 @@ function convertRelationshipsToIdentifiers(assortments, allAssortments) {
         delete assortment.composedFromAssortmentIds;
     }
 }
+async function getFolderPrincipals(folder) {
+    const principals = [];
+    if (!folder.policyOwner) {
+        return ['INHERIT'];
+    }
+    const workspacePrincipals = await new Entities().get({
+        entityName: 'workspace-principal',
+        criteria: { workspaceId: folder.id }
+    });
+    for (const workspacePrincipal of workspacePrincipals) {
+        principals.push(workspacePrincipal.principalReference);
+    }
+    return principals;
+}
 function deleteNonUserKeys(assortment) {
     delete assortment.name;
     delete assortment.identifier;

package/lib/projects/project-uploader.js

@@ -58,6 +58,7 @@ function parseToProjectConfiguration(projectConfigurationFromFile) {
         projectName: projectConfigurationFromFile.projectName,
         identifier: projectConfigurationFromFile.identifier,
         commonConfig: projectConfigurationFromFile.commonConfig,
+        principals: projectConfigurationFromFile.principals,
         assortments: [],
         subFolders: [],
     };

package/lib/types/types-extractor.js

@@ -271,7 +271,7 @@ function saveData(reducedData, dir) {
                 if (!fileLabel) {
                     console.warn('skipping bad data:', item);
                 }
-                fs.writeFileSync(path.join(subDir, `${fileLabel}.yml`), yamlStr, 'utf8');
+                fs.writeFileSync(path.join(subDir, `${removeSlash(fileLabel)}.yml`), yamlStr, 'utf8');
             }
         }
         else {
@@ -280,3 +280,7 @@ function saveData(reducedData, dir) {
         }
     }
 }
+function removeSlash(string) {
+    const re = /\//gi;
+    return string.replace(re, '-');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {

package/src/projects/interfaces.ts

@@ -22,6 +22,7 @@ export class AssortmentConfiguration {
 export class Folder {
   identifier: string;
   name: string;
+  principals: string[];
   assortments: AssortmentConfiguration[];
   subFolders: Folder[];
 }
@@ -30,6 +31,7 @@ export class ProjectConfiguration {
   projectName: string;
   identifier: string;
   commonConfig: CommonConfiguration;
+  principals: string[];
   assortments: AssortmentConfiguration[];
   subFolders: Folder[];
 }
@@ -38,6 +40,7 @@ export class ProjectConfigurationTemplate {
   projectName: string;
   identifier: string;
   commonConfig: CommonConfiguration;
+  principals: string[];
   allFolders: FolderSlim[];
   allAssortments: AssortmentConfigurationSlim[];
   allAssortmentRelationships: AssortmentConfigurationRelationships[];
@@ -46,6 +49,7 @@ export class ProjectConfigurationTemplate {
 export class FolderSlim {
   identifier: string;
   name: string;
+  principals: string[];
   folderIdentifier: string;
 }
 

package/src/projects/project-exporter.ts

@@ -67,11 +67,14 @@ async function exportProject(name) {
   const projectConfiguration = {
     projectName: workspace.name,
     identifier: workspace.identifier,
+    principals: [],
     commonConfig: {},
     assortments: [],
     subFolders: []
   };
 
+  projectConfiguration.principals = await getFolderPrincipals(workspace);
+
   const allAssortments = [];
   await getAssortmentsAndSubFolders(workspace.id, projectConfiguration.assortments, projectConfiguration.subFolders, allAssortments);
   await convertRelationshipsInFolders(projectConfiguration, allAssortments);
@@ -125,9 +128,12 @@ async function getAssortmentsAndSubFolders(parentId, assortments, subFolders, al
       const converted =  {
         identifier: folder.identifier,
         name: folder.name,
+        principals: [],
         assortments: [],
         subFolders: [],
       };
+
+      converted.principals = await getFolderPrincipals(folder);
       await getAssortmentsAndSubFolders(folder.id, converted.assortments, converted.subFolders, allAssortments);
       subFolders.push(converted);
     }
@@ -166,6 +172,24 @@ function convertRelationshipsToIdentifiers(assortments, allAssortments) {
   }
 }
 
+async function getFolderPrincipals(folder) {
+  const principals = [];
+  if (!folder.policyOwner) {
+    return ['INHERIT'];
+  }
+
+  const workspacePrincipals = await new Entities().get({
+    entityName: 'workspace-principal',
+    criteria: {workspaceId: folder.id}
+  });
+
+  for (const workspacePrincipal of workspacePrincipals) {
+    principals.push(workspacePrincipal.principalReference);
+  }
+
+  return principals;
+}
+
 function deleteNonUserKeys(assortment) {
   delete assortment.name;
   delete assortment.identifier;

package/src/projects/project-uploader.ts

@@ -74,6 +74,7 @@ function parseToProjectConfiguration(projectConfigurationFromFile: ProjectConfig
     projectName: projectConfigurationFromFile.projectName,
     identifier: projectConfigurationFromFile.identifier,
     commonConfig: projectConfigurationFromFile.commonConfig,
+    principals: projectConfigurationFromFile.principals,
     assortments: [],
     subFolders: [],
   };

package/src/types/types-extractor.ts

@@ -306,7 +306,7 @@ function saveData(reducedData, dir: string) {
         if(!fileLabel) {
           console.warn('skipping bad data:', item);
         }
-        fs.writeFileSync(path.join(subDir, `${fileLabel}.yml`), yamlStr, 'utf8');
+        fs.writeFileSync(path.join(subDir, `${removeSlash(fileLabel)}.yml`), yamlStr, 'utf8');
       }
     } else {
       const yamlStr = yaml.dump(reducedData[key]);
@@ -314,4 +314,9 @@ function saveData(reducedData, dir: string) {
     }
 
   }
+}
+
+function removeSlash(string) {
+  const re = /\//gi;
+  return string.replace(re, '-');
 }