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

Adding Aquasec icon. #1323

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Adding Aquasec icon. #1323

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: 8 additions & 0 deletions plugin/src/main/java/io/jenkins/plugins/analysis/warnings/AquaScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import hudson.Extension;

import io.jenkins.plugins.analysis.core.model.AnalysisModelParser;
import io.jenkins.plugins.analysis.core.model.StaticAnalysisLabelProvider;
import io.jenkins.plugins.analysis.core.model.SvgIconLabelProvider;

/**
* Provides a parser and customized messages for Aqua Scanner CLI (scannercli) reports.
Expand All @@ -14,6 +16,7 @@
public class AquaScanner extends AnalysisModelParser {
private static final long serialVersionUID = 1L;
private static final String ID = "scannercli";
private static final String ICON_NAME = "aquasec";

/**
* Creates a new instance of {@link AquaScanner}.
Expand All @@ -33,6 +36,11 @@ public Descriptor() {
super(ID);
}

@Override
public StaticAnalysisLabelProvider getLabelProvider() {
return new SvgIconLabelProvider(getId(), getDisplayName(), getDescriptionProvider(), ICON_NAME);
}

@Override
public boolean canScanConsoleLog() {
return false;
Expand Down
5 changes: 5 additions & 0 deletions plugin/src/main/webapp/icons/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,8 @@ The Stylelint logo is licensed under CC BY 4.0.
https://icon-icons.com/icon/Stylelint/131966

------------------------------------------------------------------------------

The Aquasec logo is licensed under the GNU GENERAL PUBLIC LICENSE.
Copy link
Contributor

Choose a reason for hiding this comment

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

Does the GNU GPL license text then have to be distributed with the plugin?

Is the SVG form the source, or is there a different preferred form for editing?

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, GPL is not compatible with MIT as far as I understand. On https://www.aquasec.com/brand/ I do not find the GPL reference (but there are only other tools listed). Is there a way to contact them if it's ok to reuse the icon here?

Copy link
Contributor

Choose a reason for hiding this comment

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

If you do contact them, I suggest you send them a screen shot of how the logo would look in Jenkins when accompanied by other logos. Mainly to show how much space is available and whether it is feasible to include the "aqua" logotype that they have on the branding page.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will try to contact them at some point.
In the meantime Stylelint icon might need a review as well as it is using https://icon-icons.com/icon/Stylelint/131966.

I am curious if it would be better if we generated icons ourselves based on tool abbreviations?
That way it makes it easier to distinguish them on the UI rather than seeing the default icon.

Copy link
Contributor

Choose a reason for hiding this comment

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

stylelint/stylelint#340 imported the logo "under CC license" but I don't know which of the CC licenses that means. https://github.com/stylelint/stylelint/blob/14.9.1/identity/credits.md links to https://thenounproject.com/icon/tuxedo-2104/ but I don't see license terms on that page. https://thenounproject.com/legal/ section 3(A) says different icons are available under different licenses. Perhaps the site requires users to sign in before it reveals the license for each icon.

Copy link
Contributor Author

@Mulgish Mulgish Jul 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Looks like it has CC BY license.

image
image

https://icon-icons.com/icon/aquasec-logo/170524
Copy link
Contributor

Choose a reason for hiding this comment

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

That site also lists the Apple logo as being GPL licensed. Doesn't seem trustworthy to me. https://icon-icons.com/icon/apple-logo/168588

Copy link
Contributor

@KalleOlaviNiemitalo KalleOlaviNiemitalo Jul 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

icon-icons.com seems to have copied the aquasec logo from https://github.com/VectorLogoZone/vectorlogozone/blob/84a142101777f3f9131d9e2f326e8e15275fa0b9/www/logos/aquasec/aquasec-icon.svg, first committed on 2018-08-22. LICENSE.TXT in that repository was changed from GNU GPL v3-or-later to GNU AGPL v3-or-later on 2018-04-07, so icon-icons.com seems to be operating with out-of-date information. Also, the README.md says "The logos themselves remain property of their original owners." so the LICENSE.TXT doesn't even apply to the logos.


------------------------------------------------------------------------------
18 changes: 18 additions & 0 deletions plugin/src/main/webapp/icons/aquasec.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading