Skip to content

Commit

Permalink
Fix EDA commands for required org (#3058)
Browse files Browse the repository at this point in the history
  • Loading branch information
@akus062381
akus062381 authored Aug 27, 2024
1 parent fc23c32 commit 965a9a7
Show file tree
Hide file tree
Showing 22 changed files with 1,032 additions and 945 deletions.
30 changes: 18 additions & 12 deletions cypress/e2e/eda/Access-Management/team-access.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@ cyLabel(['upstream'], () => {
cy.getEdaRulebooks(edaProject, 'hello_echo.yml').then((edaRuleBooks) => {
edaRuleBook = edaRuleBooks[0];
cy.createEdaDecisionEnvironment(organization?.id).then((decisionEnvironment) => {
cy.createEdaRulebookActivation({
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
}).then((edaRulebookActivation) => {
cy.createEdaRulebookActivation(
{
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
},
edaOrg
).then((edaRulebookActivation) => {
resource_object = edaRulebookActivation;
});
});
Expand Down Expand Up @@ -127,12 +130,15 @@ cyLabel(['upstream'], () => {
cy.getEdaRulebooks(edaProject, 'hello_echo.yml').then((edaRuleBooks) => {
edaRuleBook = edaRuleBooks[0];
cy.createEdaDecisionEnvironment(edaOrganization?.id).then((decisionEnvironment) => {
cy.createEdaRulebookActivation({
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
}).then((edaRulebookActivation) => {
cy.createEdaRulebookActivation(
{
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
},
edaOrganization
).then((edaRulebookActivation) => {
resource_object = edaRulebookActivation;
});
});
Expand Down
85 changes: 46 additions & 39 deletions cypress/e2e/eda/Access-Management/teams-roles-tab.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,15 @@ cyLabel(['upstream'], () => {
cy.getEdaRulebooks(edaProject, 'hello_echo.yml').then((edaRuleBooks) => {
edaRuleBook = edaRuleBooks[0];
cy.createEdaDecisionEnvironment(edaOrg?.id).then((decisionEnvironment) => {
cy.createEdaRulebookActivation({
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
}).then((edaRulebookActivation) => {
cy.createEdaRulebookActivation(
{
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
},
edaOrg
).then((edaRulebookActivation) => {
resource_object = edaRulebookActivation;
});
});
Expand Down Expand Up @@ -105,41 +108,45 @@ cyLabel(['upstream'], () => {
let cred1: EdaCredential;
let cred2: EdaCredential;
let cred3: EdaCredential;
let edaOrg: EdaOrganization;

before(() => {
cy.createEdaTeam().then((EdaTeam) => {
team = EdaTeam;
});
cy.createEdaCredential().then((edaCred1) => {
cred1 = edaCred1;
cy.createEdaCredential().then((edaCred2) => {
cred2 = edaCred2;
cy.createEdaCredential().then((edaCred3) => {
cred3 = edaCred3;
cy.getEdaRoles().then((rolesArray) => {
roleIDs = rolesArray.reduce((acc, role) => {
const { name, id } = role;
return { ...acc, [name]: id };
}, {});
RoleID = roleIDs['Eda Credential Admin'];
cy.createRoleTeamAssignments(
cred1.id.toString(),
RoleID,
team.id,
'eda.edacredential'
);
cy.createRoleTeamAssignments(
cred2.id.toString(),
RoleID,
team.id,
'eda.edacredential'
);
cy.createRoleTeamAssignments(
cred3.id.toString(),
RoleID,
team.id,
'eda.edacredential'
);
cy.createEdaOrganization().then((organization) => {
edaOrg = organization;
cy.createEdaTeam().then((EdaTeam) => {
team = EdaTeam;
});
cy.createEdaCredential(edaOrg.id).then((edaCred1) => {
cred1 = edaCred1;
cy.createEdaCredential(edaOrg.id).then((edaCred2) => {
cred2 = edaCred2;
cy.createEdaCredential(edaOrg.id).then((edaCred3) => {
cred3 = edaCred3;
cy.getEdaRoles().then((rolesArray) => {
roleIDs = rolesArray.reduce((acc, role) => {
const { name, id } = role;
return { ...acc, [name]: id };
}, {});
RoleID = roleIDs['Eda Credential Admin'];
cy.createRoleTeamAssignments(
cred1.id.toString(),
RoleID,
team.id,
'eda.edacredential'
);
cy.createRoleTeamAssignments(
cred2.id.toString(),
RoleID,
team.id,
'eda.edacredential'
);
cy.createRoleTeamAssignments(
cred3.id.toString(),
RoleID,
team.id,
'eda.edacredential'
);
});
});
});
});
Expand Down
30 changes: 18 additions & 12 deletions cypress/e2e/eda/Access-Management/user-access.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,15 @@ cyLabel(['upstream'], () => {
cy.getEdaRulebooks(edaProject, 'hello_echo.yml').then((edaRuleBooks) => {
edaRuleBook = edaRuleBooks[0];
cy.createEdaDecisionEnvironment(edaOrg?.id).then((decisionEnvironment) => {
cy.createEdaRulebookActivation({
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
}).then((edaRulebookActivation) => {
cy.createEdaRulebookActivation(
{
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
},
edaOrg
).then((edaRulebookActivation) => {
resource_object = edaRulebookActivation;
});
});
Expand Down Expand Up @@ -129,12 +132,15 @@ cyLabel(['upstream'], () => {
cy.getEdaRulebooks(edaProject, 'hello_echo.yml').then((edaRuleBooks) => {
edaRuleBook = edaRuleBooks[0];
cy.createEdaDecisionEnvironment(edaOrg?.id).then((decisionEnvironment) => {
cy.createEdaRulebookActivation({
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
}).then((edaRulebookActivation) => {
cy.createEdaRulebookActivation(
{
rulebook_id: edaRuleBook.id,
decision_environment_id: decisionEnvironment.id,
k8s_service_name: 'sample',
log_level: LogLevelEnum.Error,
},
edaOrg
).then((edaRulebookActivation) => {
resource_object = edaRulebookActivation;
});
});
Expand Down
Loading

0 comments on commit 965a9a7

Please sign in to comment.