Skip to content

fix: Handle new output file format #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2023
Merged

fix: Handle new output file format #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions visualization_tool/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

103 changes: 51 additions & 52 deletions visualization_tool/src/components/ControlMenu/Controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,48 @@ const titleCase = (str: string) => {

const parseData = (data: OutputFile, fileName: string) => {
const resources = [];
for (const [projectId, projectData] of Object.entries(data.projects)) {
for (const [resourceType, resourceList] of Object.entries(projectData)) {
let type = titleCase(resourceType.slice(0, -1));
if (type === 'Dns Policie') type = 'Dns Policy';
if (
resourceList instanceof Array &&
availableResourceTypes.includes(type as ResourceType)
) {
const currentResources = [];
for (const resource of resourceList) {
const resourceData: Record<string, string | number> = {};
resourceData['file'] = fileName;
resourceData['projectId'] = projectId;
const projectId = data.project_info.projectId;
console.log(Object.entries(data));
for (const [resourceType, resourceList] of Object.entries(data)) {
console.log(resourceType);
let type = titleCase(resourceType.slice(0, -1));
if (type === 'Dns Policie') type = 'Dns Policy';
if (
resourceList instanceof Array &&
availableResourceTypes.includes(type as ResourceType)
) {
const currentResources = [];
for (const resource of resourceList) {
const resourceData: Record<string, string | number> = {};
resourceData['file'] = fileName;
resourceData['projectId'] = projectId;

for (const [key, value] of Object.entries(resource)) {
switch (typeof value) {
case 'string':
// if this attribute is a link, get the last part of the link
if (value.split('/').length > 1) {
resourceData[key] = value.split('/').at(-1) || 'unknown';
} else {
resourceData[key] = value;
}
break;
case 'number':
for (const [key, value] of Object.entries(resource)) {
switch (typeof value) {
case 'string':
// if this attribute is a link, get the last part of the link
if (value.split('/').length > 1) {
resourceData[key] = value.split('/').at(-1) || 'unknown';
} else {
resourceData[key] = value;
break;
default:
break;
}
}
break;
case 'number':
resourceData[key] = value;
break;
default:
break;
}

resourceData['name'] = resourceData['name'] || 'unknown';
resourceData['status'] = resourceData['status'] || 'READY';
resourceData['type'] = type;

currentResources.push(resourceData as Resource);
}

resources.push(...currentResources);
resourceData['name'] = resourceData['name'] || 'unknown';
resourceData['status'] = resourceData['status'] || 'READY';
resourceData['type'] = type;

currentResources.push(resourceData as Resource);
}

resources.push(...currentResources);
}
}

Expand All @@ -66,27 +67,25 @@ const parseData = (data: OutputFile, fileName: string) => {

const parseIAMData = (data: OutputFile, fileName: string) => {
const roles: IAMRole[] = [];
for (const [projectId, projectData] of Object.entries(data.projects)) {
const currentRoles = projectData?.iam_policy as IMAPolicyField[];
const projectId = data.project_info.projectId;
const currentRoles = data.iam_policy as IMAPolicyField[];

if (roles instanceof Array) {
for (const role of currentRoles) {
roles.push({
file: fileName,
projectId,
role: `${projectId}__${role.role.split('/')[1]}`,
members: role.members.map(member => {
return {
memberType: member.split(':')[0],
email: member.split(':')[1],
};
}),
});
}
if (roles instanceof Array) {
for (const role of currentRoles) {
roles.push({
file: fileName,
projectId,
role: `${projectId}__${role.role.split('/')[1]}`,
members: role.members.map(member => {
return {
memberType: member.split(':')[0],
email: member.split(':')[1],
};
}),
});
}
}

// console.log(roles);
return roles;
};
export {parseData, parseIAMData};
10 changes: 5 additions & 5 deletions visualization_tool/src/components/ControlMenu/partials/UploadMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {useState, useRef} from 'react';
import AddIcon from '@mui/icons-material/Add';
import CloseIcon from '@mui/icons-material/Close';

import {Resource} from '../../../types/resources';
import {Resource, OutputFile} from '../../../types/resources';
import {IAMRole} from '../../../types/IAMPolicy';
import {parseData, parseIAMData} from '../Controller';

Expand Down Expand Up @@ -58,14 +58,14 @@ const UploadMenu = ({
const result = e.target?.result as string;

try {
const data = JSON.parse(result);
const data = JSON.parse(result) as OutputFile;
setProjects(prevProjects => [
...prevProjects,
...Object.keys(data.projects),
data.project_info.projectId,
]);
setAllowedProjects(prevProjects => [
...prevProjects,
...Object.keys(data.projects),
data.project_info.projectId,
]);
const resources = parseData(data, file.name);
setResources((prevResources: Resource[]) => [
Expand All @@ -78,7 +78,7 @@ const UploadMenu = ({

setFiles([
...files,
{name: file.name, projects: Object.keys(data.projects)},
{name: file.name, projects: [data.project_info.projectId]},
]);
} catch (err) {
setError('Invalid file');
Expand Down
13 changes: 7 additions & 6 deletions visualization_tool/src/types/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,17 @@ type Resource = {
status: ResourceStatus;
};

type Project = {
[key: string]: Resource[] | IMAPolicyField[];
type ProjectInfo = {
projectId: string;
name: string;
};

type OutputFile = {
projects: {
[key: string]: Project;
};
project_info: ProjectInfo;
iam_policy: IMAPolicyField[];
// [key: string]: Resource[] | IMAPolicyField[] | ProjectInfo;
};

export type {ResourceType, ResourceStatus, Resource, Project, OutputFile};
export type {ResourceType, ResourceStatus, Resource, OutputFile};

export {availableResourceTypes};