From ac4c7a9d25d3570e816e6ddf107b97353287e387 Mon Sep 17 00:00:00 2001 From: ChenLuigi Date: Wed, 31 Jan 2024 16:17:28 +0200 Subject: [PATCH 1/8] #Add new FF to be supported (SBT,AIBOM and SWIFT) #Add a new list (entitlements) to all the supported entitlements --- .../agent/api/dispatch/AppFlags.java | 7 +++--- .../api/dispatch/ConfigurationResult.java | 14 +++++++++++ .../agent/api/dispatch/EntitlementType.java | 25 +++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java index 9eb11af5..1dc9f462 100644 --- a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java @@ -2,9 +2,10 @@ public enum AppFlags { UPLOAD_SCA_LOGS("UPLOAD_SCA_LOGS"), - ASYNC_CHECK_POLICIES_ENABLED("ASYNC_CHECK_POLICIES_ENABLED"); - - + ASYNC_CHECK_POLICIES_ENABLED("ASYNC_CHECK_POLICIES_ENABLED"), + SBT_SUPPORT_ENABLED("SBT_SUPPORT_ENABLED"), + AI_BOM_SUPPORT_ENABLED("AI_BOM_SUPPORT_ENABLED"), + SWIFT_SUPPORT_ENABLED("SWIFT_SUPPORT_ENABLED"); private final String value; AppFlags(String value) { diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/ConfigurationResult.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/ConfigurationResult.java index d8d87789..9c8f0f1a 100644 --- a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/ConfigurationResult.java +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/ConfigurationResult.java @@ -1,5 +1,7 @@ package org.whitesource.agent.api.dispatch; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -36,11 +38,15 @@ public class ConfigurationResult extends BaseResult { private FsaConfiguration fsaConfiguration; private Map flags; + + private Collection entitlements; + /* --- Constructors --- */ public ConfigurationResult() { fsaConfiguration = new FsaConfiguration(); flags = new HashMap<>(); + entitlements = new ArrayList<>(); } public ConfigurationResult(boolean checkPolicies, boolean forceCheckAllDependencies, boolean forceUpdate, String includes, @@ -174,8 +180,16 @@ public void setFsaConfiguration(FsaConfiguration fsaConfiguration) { public void setFlags(Map flags) { this.flags = flags; } + public Map getFlags() { return this.flags; } + public Collection getEntitlements() { + return entitlements; + } + + public void setEntitlements(Collection entitlements) { + this.entitlements = entitlements; + } } diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java new file mode 100644 index 00000000..5e86fdc5 --- /dev/null +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java @@ -0,0 +1,25 @@ +package org.whitesource.agent.api.dispatch; + +public enum EntitlementType { + CORE("CORE"), + API_1("API_1"), + API_2("API_2"), + ESSENTIALS("ESSENTIALS"), + SCA("SCA"), + SAST("SAST"), + CN("CN"), + LLM("LLM"), + IMG("IMG"), + IAC("IAC"); + + private final String value; + + EntitlementType(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} + From a66b11e697332f890852835828985804153aaf24 Mon Sep 17 00:00:00 2001 From: ChenLuigi Date: Wed, 31 Jan 2024 16:38:34 +0200 Subject: [PATCH 2/8] Add REACHABILITY_SUPPORT_ENABLED and REACHABILITY_SUPPORT_LANGUAGES --- .../java/org/whitesource/agent/api/dispatch/AppFlags.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java index 1dc9f462..67d370cc 100644 --- a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java @@ -5,7 +5,9 @@ public enum AppFlags { ASYNC_CHECK_POLICIES_ENABLED("ASYNC_CHECK_POLICIES_ENABLED"), SBT_SUPPORT_ENABLED("SBT_SUPPORT_ENABLED"), AI_BOM_SUPPORT_ENABLED("AI_BOM_SUPPORT_ENABLED"), - SWIFT_SUPPORT_ENABLED("SWIFT_SUPPORT_ENABLED"); + SWIFT_SUPPORT_ENABLED("SWIFT_SUPPORT_ENABLED"), + REACHABILITY_SUPPORT_ENABLED("REACHABILITY_SUPPORT_ENABLED"), + REACHABILITY_SUPPORT_LANGUAGES("REACHABILITY_SUPPORT_LANGUAGES"); private final String value; AppFlags(String value) { From 47fb8880b1cf871182c843803052e9c049fbb364 Mon Sep 17 00:00:00 2001 From: ChenLuigi Date: Thu, 1 Feb 2024 10:25:10 +0200 Subject: [PATCH 3/8] Add CONTAINER_SECURITY to EntitlementType --- .../org/whitesource/agent/api/dispatch/EntitlementType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java index 5e86fdc5..a90f09ef 100644 --- a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java @@ -10,7 +10,8 @@ public enum EntitlementType { CN("CN"), LLM("LLM"), IMG("IMG"), - IAC("IAC"); + IAC("IAC"), + CONTAINER_SECURITY("CONTAINER_SECURITY"); private final String value; From 00af8b91be4d891a65adbedc39442df8c2a6ac58 Mon Sep 17 00:00:00 2001 From: Hudson CI Date: Thu, 1 Feb 2024 12:37:43 +0000 Subject: [PATCH 4/8] [maven-release-plugin] prepare release release-tag-2.9.9.89 --- pom.xml | 4 ++-- wss-agent-api/pom.xml | 2 +- wss-agent-client/pom.xml | 2 +- wss-agent-hash-calculator/pom.xml | 4 ++-- wss-agent-report/pom.xml | 2 +- wss-agent-utils/pom.xml | 4 ++-- wss-agent-via-api/pom.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 7b849152..be25a583 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.whitesource wss-agent-parent - 2.9.9.89-SNAPSHOT + 2.9.9.89 pom White Source agent API @@ -29,7 +29,7 @@ scm:git:git@github.com:whitesource/agents.git scm:git:git@github.com:whitesource/agents.git git@github.com:whitesource/agents.git - release-tag-2.9.9.86 + release-tag-2.9.9.89 https://github.com/whitesource/agents/issues diff --git a/wss-agent-api/pom.xml b/wss-agent-api/pom.xml index 3f22fd8c..b8312db8 100644 --- a/wss-agent-api/pom.xml +++ b/wss-agent-api/pom.xml @@ -4,7 +4,7 @@ org.whitesource wss-agent-parent - 2.9.9.89-SNAPSHOT + 2.9.9.89 wss-agent-api jar diff --git a/wss-agent-client/pom.xml b/wss-agent-client/pom.xml index 2dd1f8c2..d1d10926 100644 --- a/wss-agent-client/pom.xml +++ b/wss-agent-client/pom.xml @@ -4,7 +4,7 @@ wss-agent-parent org.whitesource - 2.9.9.89-SNAPSHOT + 2.9.9.89 wss-agent-api-client diff --git a/wss-agent-hash-calculator/pom.xml b/wss-agent-hash-calculator/pom.xml index 14f0efb5..dcd2f91e 100644 --- a/wss-agent-hash-calculator/pom.xml +++ b/wss-agent-hash-calculator/pom.xml @@ -5,12 +5,12 @@ org.whitesource wss-agent-parent - 2.9.9.89-SNAPSHOT + 2.9.9.89 org.whitesource wss-agent-hash-calculator - 2.9.9.89-SNAPSHOT + 2.9.9.89 diff --git a/wss-agent-report/pom.xml b/wss-agent-report/pom.xml index 75776327..6e990603 100644 --- a/wss-agent-report/pom.xml +++ b/wss-agent-report/pom.xml @@ -5,7 +5,7 @@ org.whitesource wss-agent-parent - 2.9.9.89-SNAPSHOT + 2.9.9.89 wss-agent-report diff --git a/wss-agent-utils/pom.xml b/wss-agent-utils/pom.xml index 834167d1..51e4ac14 100644 --- a/wss-agent-utils/pom.xml +++ b/wss-agent-utils/pom.xml @@ -5,12 +5,12 @@ org.whitesource wss-agent-parent - 2.9.9.89-SNAPSHOT + 2.9.9.89 org.whitesource wss-agent-utils - 2.9.9.89-SNAPSHOT + 2.9.9.89 diff --git a/wss-agent-via-api/pom.xml b/wss-agent-via-api/pom.xml index 34d5e3eb..66f25ba4 100644 --- a/wss-agent-via-api/pom.xml +++ b/wss-agent-via-api/pom.xml @@ -3,7 +3,7 @@ wss-agent-parent org.whitesource - 2.9.9.89-SNAPSHOT + 2.9.9.89 4.0.0 From a6293155151793f9378c872517de7b82f6a8316f Mon Sep 17 00:00:00 2001 From: Hudson CI Date: Thu, 1 Feb 2024 12:37:44 +0000 Subject: [PATCH 5/8] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- wss-agent-api/pom.xml | 2 +- wss-agent-client/pom.xml | 2 +- wss-agent-hash-calculator/pom.xml | 4 ++-- wss-agent-report/pom.xml | 2 +- wss-agent-utils/pom.xml | 4 ++-- wss-agent-via-api/pom.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index be25a583..c9cca84c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.whitesource wss-agent-parent - 2.9.9.89 + 2.9.9.90-SNAPSHOT pom White Source agent API @@ -29,7 +29,7 @@ scm:git:git@github.com:whitesource/agents.git scm:git:git@github.com:whitesource/agents.git git@github.com:whitesource/agents.git - release-tag-2.9.9.89 + release-tag-2.9.9.86 https://github.com/whitesource/agents/issues diff --git a/wss-agent-api/pom.xml b/wss-agent-api/pom.xml index b8312db8..2fbac366 100644 --- a/wss-agent-api/pom.xml +++ b/wss-agent-api/pom.xml @@ -4,7 +4,7 @@ org.whitesource wss-agent-parent - 2.9.9.89 + 2.9.9.90-SNAPSHOT wss-agent-api jar diff --git a/wss-agent-client/pom.xml b/wss-agent-client/pom.xml index d1d10926..d85566f3 100644 --- a/wss-agent-client/pom.xml +++ b/wss-agent-client/pom.xml @@ -4,7 +4,7 @@ wss-agent-parent org.whitesource - 2.9.9.89 + 2.9.9.90-SNAPSHOT wss-agent-api-client diff --git a/wss-agent-hash-calculator/pom.xml b/wss-agent-hash-calculator/pom.xml index dcd2f91e..ad26cdef 100644 --- a/wss-agent-hash-calculator/pom.xml +++ b/wss-agent-hash-calculator/pom.xml @@ -5,12 +5,12 @@ org.whitesource wss-agent-parent - 2.9.9.89 + 2.9.9.90-SNAPSHOT org.whitesource wss-agent-hash-calculator - 2.9.9.89 + 2.9.9.90-SNAPSHOT diff --git a/wss-agent-report/pom.xml b/wss-agent-report/pom.xml index 6e990603..a9aabcc0 100644 --- a/wss-agent-report/pom.xml +++ b/wss-agent-report/pom.xml @@ -5,7 +5,7 @@ org.whitesource wss-agent-parent - 2.9.9.89 + 2.9.9.90-SNAPSHOT wss-agent-report diff --git a/wss-agent-utils/pom.xml b/wss-agent-utils/pom.xml index 51e4ac14..4f0d012e 100644 --- a/wss-agent-utils/pom.xml +++ b/wss-agent-utils/pom.xml @@ -5,12 +5,12 @@ org.whitesource wss-agent-parent - 2.9.9.89 + 2.9.9.90-SNAPSHOT org.whitesource wss-agent-utils - 2.9.9.89 + 2.9.9.90-SNAPSHOT diff --git a/wss-agent-via-api/pom.xml b/wss-agent-via-api/pom.xml index 66f25ba4..f0b9a5f0 100644 --- a/wss-agent-via-api/pom.xml +++ b/wss-agent-via-api/pom.xml @@ -3,7 +3,7 @@ wss-agent-parent org.whitesource - 2.9.9.89 + 2.9.9.90-SNAPSHOT 4.0.0 From 0e2b1463d7f287c42dc997bb4e61a0a2c94aba87 Mon Sep 17 00:00:00 2001 From: Alex Maybaum Date: Thu, 16 May 2024 12:53:48 +0300 Subject: [PATCH 6/8] WEI-3783 add JWT access token API --- .../api/dispatch/JwtAccessTokenRequest.java | 20 ++++++++++++++++ .../api/dispatch/JwtAccessTokenResult.java | 23 +++++++++++++++++++ .../agent/api/dispatch/RequestType.java | 4 ++-- .../agent/client/WssServiceClient.java | 2 ++ .../agent/client/WssServiceClientImpl.java | 11 +++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenRequest.java create mode 100644 wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenResult.java diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenRequest.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenRequest.java new file mode 100644 index 00000000..23b90054 --- /dev/null +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenRequest.java @@ -0,0 +1,20 @@ +package org.whitesource.agent.api.dispatch; + +public class JwtAccessTokenRequest extends BaseRequest { + + private static final long serialVersionUID = -2280907846002128613L; + + public JwtAccessTokenRequest() { + super(RequestType.JWT_ACCESS_TOKEN); + } + + public JwtAccessTokenRequest(String orgToken) { + this(); + this.orgToken = orgToken; + } + + public JwtAccessTokenRequest(String orgToken, String userKey) { + this(orgToken); + this.userKey = userKey; + } +} diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenResult.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenResult.java new file mode 100644 index 00000000..a16f0a2a --- /dev/null +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenResult.java @@ -0,0 +1,23 @@ +package org.whitesource.agent.api.dispatch; + +public class JwtAccessTokenResult extends BaseResult { + + private String jwtAccessToken; + + public JwtAccessTokenResult() { + super(); + } + + public JwtAccessTokenResult(String jwtAccessToken) { + super(); + this.jwtAccessToken = jwtAccessToken; + } + + public String getJwtAccessToken() { + return jwtAccessToken; + } + + public void setJwtAccessToken(String jwtAccessToken) { + this.jwtAccessToken = jwtAccessToken; + } +} diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/RequestType.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/RequestType.java index f4f66f66..d4dae80c 100644 --- a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/RequestType.java +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/RequestType.java @@ -32,8 +32,8 @@ public enum RequestType { ASYNC_CHECK_POLICY_COMPLIANCE ("ASYNC_CHECK_POLICY_COMPLIANCE"), ASYNC_CHECK_POLICY_COMPLIANCE_STATUS ("ASYNC_CHECK_POLICY_COMPLIANCE_STATUS"), ASYNC_CHECK_POLICY_COMPLIANCE_RESPONSE ("ASYNC_CHECK_POLICY_COMPLIANCE_RESPONSE"), - - UPLOAD_SCA_LOGS("UPLOAD_SCA_LOGS"); + UPLOAD_SCA_LOGS("UPLOAD_SCA_LOGS"), + JWT_ACCESS_TOKEN("JWT_ACCESS_TOKEN"); private final String value; diff --git a/wss-agent-client/src/main/java/org/whitesource/agent/client/WssServiceClient.java b/wss-agent-client/src/main/java/org/whitesource/agent/client/WssServiceClient.java index a2caff60..6bb52faa 100644 --- a/wss-agent-client/src/main/java/org/whitesource/agent/client/WssServiceClient.java +++ b/wss-agent-client/src/main/java/org/whitesource/agent/client/WssServiceClient.java @@ -193,4 +193,6 @@ public interface WssServiceClient { * @return the customer headers configured for this client */ Map getHeaders(); + + JwtAccessTokenResult jwtAccessToken(JwtAccessTokenRequest request) throws WssServiceException; } diff --git a/wss-agent-client/src/main/java/org/whitesource/agent/client/WssServiceClientImpl.java b/wss-agent-client/src/main/java/org/whitesource/agent/client/WssServiceClientImpl.java index f80aa225..055e786f 100644 --- a/wss-agent-client/src/main/java/org/whitesource/agent/client/WssServiceClientImpl.java +++ b/wss-agent-client/src/main/java/org/whitesource/agent/client/WssServiceClientImpl.java @@ -244,6 +244,11 @@ public ConfigurationResult getConfiguration(ConfigurationRequest request) throws return service(request); } + @Override + public JwtAccessTokenResult jwtAccessToken(JwtAccessTokenRequest request) throws WssServiceException { + return service(request); + } + @Override public void shutdown() { httpClient.getConnectionManager().shutdown(); @@ -388,6 +393,9 @@ protected R service(ServiceRequest request) throws WssServiceException { case GET_CONFIGURATION: result = (R) gson.fromJson(data, ConfigurationResult.class); break; + case JWT_ACCESS_TOKEN: + result = (R) gson.fromJson(data, JwtAccessTokenResult.class); + break; default: throw new IllegalStateException("Unsupported request type."); } @@ -480,6 +488,9 @@ protected HttpRequestBase createHttpRequest(ServiceRequest request) throw case GET_CONFIGURATION: jsonDiff = gson.toJson(((ConfigurationRequest) request).getProjects()); break; + case JWT_ACCESS_TOKEN: + jsonDiff = gson.toJson(((JwtAccessTokenRequest) request).getProjects()); + break; default: break; } From 04b721c9464c297981c65955927be9e1dd3783c7 Mon Sep 17 00:00:00 2001 From: Alex Maybaum Date: Thu, 16 May 2024 13:09:43 +0300 Subject: [PATCH 7/8] WEI-3783 add serial version uuid --- .../whitesource/agent/api/dispatch/JwtAccessTokenResult.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenResult.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenResult.java index a16f0a2a..6a4b80bd 100644 --- a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenResult.java +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/JwtAccessTokenResult.java @@ -2,6 +2,8 @@ public class JwtAccessTokenResult extends BaseResult { + private static final long serialVersionUID = 4617440013556093604L; + private String jwtAccessToken; public JwtAccessTokenResult() { From 3ca6dad571e0bd044e80cfe491d1803f4e85be7a Mon Sep 17 00:00:00 2001 From: Alex Maybaum Date: Sun, 19 May 2024 16:33:14 +0300 Subject: [PATCH 8/8] WEI-3783 sync with master --- .../agent/api/dispatch/AppFlags.java | 9 +++---- .../api/dispatch/ConfigurationResult.java | 14 ---------- .../agent/api/dispatch/EntitlementType.java | 26 ------------------- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java index 67d370cc..9eb11af5 100644 --- a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/AppFlags.java @@ -2,12 +2,9 @@ public enum AppFlags { UPLOAD_SCA_LOGS("UPLOAD_SCA_LOGS"), - ASYNC_CHECK_POLICIES_ENABLED("ASYNC_CHECK_POLICIES_ENABLED"), - SBT_SUPPORT_ENABLED("SBT_SUPPORT_ENABLED"), - AI_BOM_SUPPORT_ENABLED("AI_BOM_SUPPORT_ENABLED"), - SWIFT_SUPPORT_ENABLED("SWIFT_SUPPORT_ENABLED"), - REACHABILITY_SUPPORT_ENABLED("REACHABILITY_SUPPORT_ENABLED"), - REACHABILITY_SUPPORT_LANGUAGES("REACHABILITY_SUPPORT_LANGUAGES"); + ASYNC_CHECK_POLICIES_ENABLED("ASYNC_CHECK_POLICIES_ENABLED"); + + private final String value; AppFlags(String value) { diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/ConfigurationResult.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/ConfigurationResult.java index 9c8f0f1a..d8d87789 100644 --- a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/ConfigurationResult.java +++ b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/ConfigurationResult.java @@ -1,7 +1,5 @@ package org.whitesource.agent.api.dispatch; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -38,15 +36,11 @@ public class ConfigurationResult extends BaseResult { private FsaConfiguration fsaConfiguration; private Map flags; - - private Collection entitlements; - /* --- Constructors --- */ public ConfigurationResult() { fsaConfiguration = new FsaConfiguration(); flags = new HashMap<>(); - entitlements = new ArrayList<>(); } public ConfigurationResult(boolean checkPolicies, boolean forceCheckAllDependencies, boolean forceUpdate, String includes, @@ -180,16 +174,8 @@ public void setFsaConfiguration(FsaConfiguration fsaConfiguration) { public void setFlags(Map flags) { this.flags = flags; } - public Map getFlags() { return this.flags; } - public Collection getEntitlements() { - return entitlements; - } - - public void setEntitlements(Collection entitlements) { - this.entitlements = entitlements; - } } diff --git a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java b/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java deleted file mode 100644 index a90f09ef..00000000 --- a/wss-agent-api/src/main/java/org/whitesource/agent/api/dispatch/EntitlementType.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.whitesource.agent.api.dispatch; - -public enum EntitlementType { - CORE("CORE"), - API_1("API_1"), - API_2("API_2"), - ESSENTIALS("ESSENTIALS"), - SCA("SCA"), - SAST("SAST"), - CN("CN"), - LLM("LLM"), - IMG("IMG"), - IAC("IAC"), - CONTAINER_SECURITY("CONTAINER_SECURITY"); - - private final String value; - - EntitlementType(String value) { - this.value = value; - } - - public String getValue() { - return value; - } -} -