Add validation for secstorage.allowed.internal.sites by vishesh92 · Pull Request #9567 · apache/cloudstack

vishesh92 · 2024-08-22T07:33:37Z

Description

This PR fixes #9530 by adding validation on update of secstorage.allowed.internal.sites to allow only valid CIDRs. This PR also enables logging of WARN messages for the existing wrong configurations.

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
build/CI
test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

codecov · 2024-08-22T07:44:51Z

Codecov Report

Attention: Patch coverage is 42.10526% with 11 lines in your changes missing coverage. Please review.

Project coverage is 15.08%. Comparing base (1a403f1) to head (4ba14ef).
Report is 15 commits behind head on 4.19.

Files with missing lines	Patch %	Lines
.../cloud/configuration/ConfigurationManagerImpl.java	0.00%	6 Missing and 1 partial ⚠️
.../secondarystorage/SecondaryStorageManagerImpl.java	0.00%	2 Missing ⚠️
...ls/src/main/java/com/cloud/utils/net/NetUtils.java	80.00%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##               4.19    #9567    +/-   ##
==========================================
  Coverage     15.08%   15.08%            
- Complexity    11181    11186     +5     
==========================================
  Files          5406     5406            
  Lines        472915   472935    +20     
  Branches      58400    57960   -440     
==========================================
+ Hits          71336    71356    +20     
+ Misses       393637   393633     -4     
- Partials       7942     7946     +4

Flag	Coverage Δ
uitests	`4.30% <ø> (-0.01%)`	⬇️
unittests	`15.80% <42.10%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

vishesh92 · 2024-08-22T10:52:03Z

@blueorangutan package

blueorangutan · 2024-08-22T10:54:04Z

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2024-08-22T11:50:09Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 10748

DaanHoogland

clgtm

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

...roller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

sureshanaparti

minor comments, otherwise clgtm

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

vishesh92 · 2024-08-23T06:29:42Z

@blueorangutan package

blueorangutan · 2024-08-23T06:32:03Z

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2024-08-23T07:42:55Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 10771

DaanHoogland · 2024-08-26T06:58:34Z

@blueorangutan test

blueorangutan · 2024-08-26T07:00:03Z

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2024-08-26T22:01:14Z

[SF] Trillian test result (tid-11170)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 51734 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9567-t11170-kvm-ol8.zip
Smoke tests completed. 132 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestDeployVM>:setup	`Error`	0.00	test_vm_life_cycle.py

* Add validation for secstorage.allowed.internal.sites * Address comments * Apply suggestions from code review Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com> * Address comments --------- Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

Add validation for secstorage.allowed.internal.sites

5ebf0cb

boring-cyborg bot added component:secondary-storage component:ssvm component:UI labels Aug 22, 2024

weizhouapache reviewed Aug 22, 2024

View reviewed changes

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java Outdated Show resolved Hide resolved

vishesh92 linked an issue Aug 22, 2024 that may be closed by this pull request

Template Upload from local depends (wrongly) on the routes being added for internal sites #9530

Closed

sureshanaparti reviewed Aug 22, 2024

View reviewed changes

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java Outdated Show resolved Hide resolved

sureshanaparti added this to the 4.19.2.0 milestone Aug 22, 2024

Address comments

c56e3ea

DaanHoogland approved these changes Aug 22, 2024

View reviewed changes

sureshanaparti reviewed Aug 22, 2024

View reviewed changes

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java Outdated Show resolved Hide resolved

sureshanaparti reviewed Aug 22, 2024

View reviewed changes

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java Outdated Show resolved Hide resolved

sureshanaparti reviewed Aug 22, 2024

View reviewed changes

...roller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java Outdated Show resolved Hide resolved

sureshanaparti approved these changes Aug 22, 2024

View reviewed changes

vishesh92 and others added 2 commits August 23, 2024 11:58

Apply suggestions from code review

eb35f2d

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

Address comments

4ba14ef

yadvr approved these changes Sep 4, 2024

View reviewed changes

yadvr merged commit 0ba9a29 into apache:4.19 Sep 4, 2024

yadvr mentioned this pull request Sep 4, 2024

Template Upload from local depends (wrongly) on the routes being added for internal sites #9530

Closed

DaanHoogland deleted the add-valitaion-sec-storage-sites branch September 4, 2024 07:27

Conversation

vishesh92 commented Aug 22, 2024

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

codecov bot commented Aug 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

vishesh92 commented Aug 22, 2024

Uh oh!

blueorangutan commented Aug 22, 2024

Uh oh!

blueorangutan commented Aug 22, 2024

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

vishesh92 commented Aug 23, 2024

Uh oh!

blueorangutan commented Aug 23, 2024

Uh oh!

blueorangutan commented Aug 23, 2024

Uh oh!

DaanHoogland commented Aug 26, 2024

Uh oh!

blueorangutan commented Aug 26, 2024

Uh oh!

blueorangutan commented Aug 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codecov bot commented Aug 22, 2024 •

edited

Loading