Skip to content
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

Jump to bottom

[artifact-manager) (#588) Policies import and export for multi tenant environments #600

Merged
merged 24 commits into from
Jan 29, 2025
Merged

[artifact-manager) (#588) Policies import and export for multi tenant environments #600

merged 24 commits into from
Jan 29, 2025

Conversation

Michaelpalacce
Copy link
Collaborator

@Michaelpalacce Michaelpalacce commented Jan 24, 2025 •
edited by VenelinBakalov
Loading

Description

Checklist

  • I have added relevant error handling and logging messages to help troubleshooting
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation, relevant usage information (if applicable)
  • I have updated the PR title with affected component, related issue number and a short summary of the changes introduced
  • I have added labels for implementation kind (kind/) and version type (version/)
  • I have tested against live environment, if applicable
  • I have synced any structure and/or content vRA-NG improvements with vra-ng and ts-vra-ng archetypes (if applicable)
  • I have my changes rebased and squashed to the minimal number of relevant commits. Notice: don't squash all commits
  • I have added a descriptive commit message with a short title, including a Fixed #XXX - or Closed #XXX - prefix to auto-close the issue

Testing

Release Notes

Related issues and PRs

Closes #588

@Michaelpalacce
refactor(approval-policies)!: Import and export reworked
abe72ba 
No longer allows policies of the same type with the same name.
Will do checks to enforce this.
This is not tested
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
fix(VraNgApprovalPolicy): Removed unused function
a364c3c 
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
docs: Added one todo for projectId
449ff0e 
It may be important to set the projectId only if it was initially set
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
refactor(vrang-policy-stores): Restructured methods to be grouped based
1883bfc 
on functionality
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
refactor(policy): Better organization and some small error handling
6596587 
fixes
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
refactor(cs-policy-store): Export done, working on import
ff28df1 
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
refactor(content sharing policy): Import/export working
e49b65b 
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
refactor(day-two-actions-policy): Import and export
e75d839 
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
refactor(policies): Finished all the other policies, need to test
a65d9f3 
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
test: Fixed unit tests to match current functionality
e1fbc60 
Signed-off-by: Stefan Genov <[email protected]>
@github-actions github-actions bot added the kind/bug Something isn't working label Jan 24, 2025
@Michaelpalacce Michaelpalacce added lang/java Related to Java Code area/artifact-manager Relates to the `artifact-manager` maven module version/major Introduces a breaking change labels Jan 28, 2025
@Michaelpalacce Michaelpalacce changed the title Fix/588 policy import and export [artifact-manager) (#588) Policies import and export for multi tenant environments Jan 28, 2025
@Michaelpalacce Michaelpalacce marked this pull request as ready for review January 28, 2025 07:07
@Michaelpalacce Michaelpalacce requested a review from a team as a code owner January 28, 2025 07:07
Tchoui
Tchoui approved these changes Jan 28, 2025
View reviewed changes
Copy link
Contributor

@Tchoui Tchoui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

.../main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgApprovalPolicyStore.java Show resolved Hide resolved
.../main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgApprovalPolicyStore.java Show resolved Hide resolved
...java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgContentSharingPolicyStore.java Show resolved Hide resolved
...java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgContentSharingPolicyStore.java Show resolved Hide resolved
...in/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgDay2ActionsPolicyStore.java Show resolved Hide resolved
...ava/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgDeploymentLimitPolicyStore.java Show resolved Hide resolved
...src/main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgLeasePolicyStore.java Show resolved Hide resolved
...src/main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgLeasePolicyStore.java Show resolved Hide resolved
.../java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgResourceQuotaPolicyStore.java Show resolved Hide resolved
.../java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgResourceQuotaPolicyStore.java Show resolved Hide resolved
@VenelinBakalov VenelinBakalov added version/minor Introduces a non-breaking feature or change and removed version/major Introduces a breaking change labels Jan 29, 2025
pboychev-bcom
pboychev-bcom reviewed Jan 29, 2025
View reviewed changes
Copy link
Contributor

@pboychev-bcom pboychev-bcom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great effort, Stef, thank you so much!

There's a few comments here and there, some might trigger discussions on the tool behaviour, the comments will be applicable for multiple operations even if it's only one comment, these might require more broad discussions, mainly concerns:

  • Configuration significance - no config - pull all, empty config - pull none, specific config - pull specified - do we want that, is it there already?
  • Rollback type of behaviour - in cases where we delete items and create the new ones and the creation fails, how do we ensure business continuity? Re-creating the original entries? We should also consider partial state being uploaded - some policies are there, some are not, would there be business disruptions caused.

.github/linters/sun_checks.xml Show resolved Hide resolved
...java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgContentSharingPolicyStore.java Show resolved Hide resolved
...java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgContentSharingPolicyStore.java Show resolved Hide resolved
...ava/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgDeploymentLimitPolicyStore.java Show resolved Hide resolved
Michaelpalacce and others added 13 commits January 29, 2025 14:00
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
5166281 
…ifact/aria/automation/store/VraNgApprovalPolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
118cd68 
…ifact/aria/automation/store/VraNgApprovalPolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
39dd7c7 
…ifact/aria/automation/store/VraNgApprovalPolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
82e1bc7 
…ifact/aria/automation/store/VraNgContentSharingPolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
c7f0b3c 
…ifact/aria/automation/store/VraNgDay2ActionsPolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
21ead90 
…ifact/aria/automation/store/VraNgDay2ActionsPolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
42e663c 
…ifact/aria/automation/store/VraNgLeasePolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
6c92eec 
…ifact/aria/automation/store/VraNgLeasePolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
2a44b28 
…ifact/aria/automation/store/VraNgResourceQuotaPolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce @VenelinBakalov
Update common/artifact-manager/src/main/java/com/vmware/pscoe/iac/art…
3981bdb 
…ifact/aria/automation/store/VraNgResourceQuotaPolicyStore.java

Co-authored-by: Venelin Bakalov <[email protected]>
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
refactor(error-handling): Improved error handling message
21ceb5a 
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
Merge branch 'main' of https://github.com/vmware/build-tools-for-vmwa…
7276804 
…re-aria into fix/588-policy-import-and-export

Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce
docs: Release
feb5977 
Signed-off-by: Stefan Genov <[email protected]>
@Michaelpalacce Michaelpalacce merged commit 1944bda into main Jan 29, 2025
19 checks passed
@VenelinBakalov VenelinBakalov added version/major Introduces a breaking change and removed version/minor Introduces a non-breaking feature or change labels Jan 30, 2025
@VenelinBakalov VenelinBakalov added this to the 4.0.0 milestone Jan 30, 2025
@VenelinBakalov VenelinBakalov mentioned this pull request Jan 30, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VenelinBakalov VenelinBakalov VenelinBakalov left review comments

@Tchoui Tchoui Tchoui approved these changes

@pboychev-bcom pboychev-bcom pboychev-bcom approved these changes

Assignees
No one assigned
Labels
area/artifact-manager Relates to the `artifact-manager` maven module kind/bug Something isn't working lang/java Related to Java Code version/major Introduces a breaking change
Projects
None yet
Milestone
4.x.x
Development

Successfully merging this pull request may close these issues.

Policy imports to tenants on the same appliance don't work as expected
4 participants
@Michaelpalacce @Tchoui @VenelinBakalov @pboychev-bcom