From ac4c7a9d25d3570e816e6ddf107b97353287e387 Mon Sep 17 00:00:00 2001 From: ChenLuigi Date: Wed, 31 Jan 2024 16:17:28 +0200 Subject: [PATCH 1/3] #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/3] 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/3] 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;