ignoredDeps) {
}
private String getExhortIgnoreMethod() {
- var val = Environment.get(EXHORT_IGNORE_METHOD);
+ var val = Environment.get(TRUSTIFY_DA_IGNORE_METHOD);
return val != null ? val.trim().toLowerCase() : null;
}
diff --git a/src/main/java/com/redhat/exhort/sbom/Sbom.java b/src/main/java/io/github/guacsec/trustifyda/sbom/Sbom.java
similarity index 97%
rename from src/main/java/com/redhat/exhort/sbom/Sbom.java
rename to src/main/java/io/github/guacsec/trustifyda/sbom/Sbom.java
index 73d8fefc..ed5bcf79 100644
--- a/src/main/java/com/redhat/exhort/sbom/Sbom.java
+++ b/src/main/java/io/github/guacsec/trustifyda/sbom/Sbom.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.sbom;
+package io.github.guacsec.trustifyda.sbom;
import com.github.packageurl.PackageURL;
import java.util.Collection;
diff --git a/src/main/java/com/redhat/exhort/sbom/SbomFactory.java b/src/main/java/io/github/guacsec/trustifyda/sbom/SbomFactory.java
similarity index 95%
rename from src/main/java/com/redhat/exhort/sbom/SbomFactory.java
rename to src/main/java/io/github/guacsec/trustifyda/sbom/SbomFactory.java
index 262a0f47..bb54b56e 100644
--- a/src/main/java/com/redhat/exhort/sbom/SbomFactory.java
+++ b/src/main/java/io/github/guacsec/trustifyda/sbom/SbomFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.sbom;
+package io.github.guacsec.trustifyda.sbom;
public class SbomFactory {
diff --git a/src/main/java/io/github/guacsec/trustifyda/sbom/package-info.java b/src/main/java/io/github/guacsec/trustifyda/sbom/package-info.java
new file mode 100644
index 00000000..84d1ff1f
--- /dev/null
+++ b/src/main/java/io/github/guacsec/trustifyda/sbom/package-info.java
@@ -0,0 +1 @@
+package io.github.guacsec.trustifyda.sbom;
diff --git a/src/main/java/com/redhat/exhort/tools/Ecosystem.java b/src/main/java/io/github/guacsec/trustifyda/tools/Ecosystem.java
similarity index 86%
rename from src/main/java/com/redhat/exhort/tools/Ecosystem.java
rename to src/main/java/io/github/guacsec/trustifyda/tools/Ecosystem.java
index 85aad7b5..04fe0447 100644
--- a/src/main/java/com/redhat/exhort/tools/Ecosystem.java
+++ b/src/main/java/io/github/guacsec/trustifyda/tools/Ecosystem.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.tools;
+package io.github.guacsec.trustifyda.tools;
-import com.redhat.exhort.Provider;
-import com.redhat.exhort.providers.GoModulesProvider;
-import com.redhat.exhort.providers.GradleProvider;
-import com.redhat.exhort.providers.JavaMavenProvider;
-import com.redhat.exhort.providers.JavaScriptProviderFactory;
-import com.redhat.exhort.providers.PythonPipProvider;
+import io.github.guacsec.trustifyda.Provider;
+import io.github.guacsec.trustifyda.providers.GoModulesProvider;
+import io.github.guacsec.trustifyda.providers.GradleProvider;
+import io.github.guacsec.trustifyda.providers.JavaMavenProvider;
+import io.github.guacsec.trustifyda.providers.JavaScriptProviderFactory;
+import io.github.guacsec.trustifyda.providers.PythonPipProvider;
import java.nio.file.Path;
/** Utility class used for instantiating providers. * */
diff --git a/src/main/java/com/redhat/exhort/tools/Operations.java b/src/main/java/io/github/guacsec/trustifyda/tools/Operations.java
similarity index 94%
rename from src/main/java/com/redhat/exhort/tools/Operations.java
rename to src/main/java/io/github/guacsec/trustifyda/tools/Operations.java
index 12f55cfd..9b1dd932 100644
--- a/src/main/java/com/redhat/exhort/tools/Operations.java
+++ b/src/main/java/io/github/guacsec/trustifyda/tools/Operations.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.tools;
+package io.github.guacsec.trustifyda.tools;
import static java.lang.String.join;
-import com.redhat.exhort.logging.LoggersFactory;
-import com.redhat.exhort.utils.Environment;
+import io.github.guacsec.trustifyda.logging.LoggersFactory;
+import io.github.guacsec.trustifyda.utils.Environment;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -48,9 +48,9 @@ private Operations() {
/**
* Function for looking up custom executable path based on the default one provides as an
* argument. I.e. if defaultExecutable=mvn, this function will look for a custom mvn path set as
- * an environment variable or a java property with the name EXHORT_MVN_PATH. If not found, the
- * original mvn passed as defaultExecutable will be returned. Note, environment variables takes
- * precedence on java properties.
+ * an environment variable or a java property with the name TRUSTIFY_DA_MVN_PATH. If not found,
+ * the original mvn passed as defaultExecutable will be returned. Note, environment variables
+ * takes precedence on java properties.
*
* @param defaultExecutable default executable (uppercase spaces and dashes will be replaced with
* underscores).
@@ -64,7 +64,7 @@ public static String getCustomPathOrElse(String defaultExecutable) {
}
var target = normalized.toUpperCase().replaceAll(" ", "_").replaceAll("-", "_");
- var primaryKey = String.format("EXHORT_%s_PATH", target);
+ var primaryKey = String.format("TRUSTIFY_DA_%s_PATH", target);
String primary = Environment.get(primaryKey);
if (primary != null) {
return primary;
@@ -316,7 +316,7 @@ public static String getExecutable(String command, String args) {
* Checks whether a wrapper preference is set for a given tool name.
*
* This method looks for an environment variable with the name {@code
- * EXHORT_PREFER_W}, where {@code } is the uppercase form of the provided
+ * TRUSTIFY_DA_PREFER_W}, where {@code } is the uppercase form of the provided
* {@code name} parameter. If the environment variable is present (i.e., not {@code null}), the
* method returns {@code true}.
*
@@ -324,7 +324,7 @@ public static String getExecutable(String command, String args) {
* @return {@code true} if the corresponding environment variable is set; {@code false} otherwise
*/
public static boolean getWrapperPreference(String name) {
- return Environment.get("EXHORT_PREFER_" + name.toUpperCase() + "W") != null;
+ return Environment.get("TRUSTIFY_DA_PREFER_" + name.toUpperCase() + "W") != null;
}
/**
@@ -334,7 +334,7 @@ public static boolean getWrapperPreference(String name) {
* @return the configuration value if set and not blank, null otherwise
*/
public static String getMavenConfig(String configName) {
- String configValue = Environment.get("EXHORT_MVN_" + configName);
+ String configValue = Environment.get("TRUSTIFY_DA_MVN_" + configName);
return (configValue != null && !configValue.isBlank()) ? configValue : null;
}
diff --git a/src/main/java/com/redhat/exhort/tools/package-info.java b/src/main/java/io/github/guacsec/trustifyda/tools/package-info.java
similarity index 64%
rename from src/main/java/com/redhat/exhort/tools/package-info.java
rename to src/main/java/io/github/guacsec/trustifyda/tools/package-info.java
index f5dae356..3c7705d3 100644
--- a/src/main/java/com/redhat/exhort/tools/package-info.java
+++ b/src/main/java/io/github/guacsec/trustifyda/tools/package-info.java
@@ -1,2 +1,2 @@
/** Package hosting various utility and tools used throughout the project. * */
-package com.redhat.exhort.tools;
+package io.github.guacsec.trustifyda.tools;
diff --git a/src/main/java/com/redhat/exhort/utils/Environment.java b/src/main/java/io/github/guacsec/trustifyda/utils/Environment.java
similarity index 96%
rename from src/main/java/com/redhat/exhort/utils/Environment.java
rename to src/main/java/io/github/guacsec/trustifyda/utils/Environment.java
index 076828dd..4cd6019f 100644
--- a/src/main/java/com/redhat/exhort/utils/Environment.java
+++ b/src/main/java/io/github/guacsec/trustifyda/utils/Environment.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
import java.util.Optional;
diff --git a/src/main/java/com/redhat/exhort/utils/PythonControllerBase.java b/src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerBase.java
similarity index 90%
rename from src/main/java/com/redhat/exhort/utils/PythonControllerBase.java
rename to src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerBase.java
index 267e3291..b8b65a2b 100644
--- a/src/main/java/com/redhat/exhort/utils/PythonControllerBase.java
+++ b/src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerBase.java
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
-import static com.redhat.exhort.Provider.PROP_MATCH_MANIFEST_VERSIONS;
-import static com.redhat.exhort.impl.ExhortApi.debugLoggingIsNeeded;
+import static io.github.guacsec.trustifyda.Provider.PROP_MATCH_MANIFEST_VERSIONS;
+import static io.github.guacsec.trustifyda.impl.ExhortApi.debugLoggingIsNeeded;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.redhat.exhort.exception.PackageNotInstalledException;
-import com.redhat.exhort.logging.LoggersFactory;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.exception.PackageNotInstalledException;
+import io.github.guacsec.trustifyda.logging.LoggersFactory;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -40,13 +40,13 @@
public abstract class PythonControllerBase {
- public static final String PROP_EXHORT_PIP_PIPDEPTREE = "EXHORT_PIP_PIPDEPTREE";
- public static final String PROP_EXHORT_PIP_FREEZE = "EXHORT_PIP_FREEZE";
- public static final String PROP_EXHORT_PIP_USE_DEP_TREE = "EXHORT_PIP_USE_DEP_TREE";
- public static final String PROP_EXHORT_PYTHON_INSTALL_BEST_EFFORTS =
- "EXHORT_PYTHON_INSTALL_BEST_EFFORTS";
- public static final String PROP_EXHORT_PIP_SHOW = "EXHORT_PIP_SHOW";
- public static final String PROP_EXHORT_PYTHON_VIRTUAL_ENV = "EXHORT_PYTHON_VIRTUAL_ENV";
+ public static final String PROP_TRUSTIFY_DA_PIP_PIPDEPTREE = "TRUSTIFY_DA_PIP_PIPDEPTREE";
+ public static final String PROP_TRUSTIFY_DA_PIP_FREEZE = "TRUSTIFY_DA_PIP_FREEZE";
+ public static final String PROP_TRUSTIFY_DA_PIP_USE_DEP_TREE = "TRUSTIFY_DA_PIP_USE_DEP_TREE";
+ public static final String PROP_TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS =
+ "TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS";
+ public static final String PROP_TRUSTIFY_DA_PIP_SHOW = "TRUSTIFY_DA_PIP_SHOW";
+ public static final String PROP_TRUSTIFY_DA_PYTHON_VIRTUAL_ENV = "TRUSTIFY_DA_PYTHON_VIRTUAL_ENV";
private final Logger log = LoggersFactory.getLogger(this.getClass().getName());
protected Path pythonEnvironmentDir;
@@ -78,7 +78,7 @@ public final List> getDependencies(
}
if (automaticallyInstallPackageOnEnvironment()) {
boolean installBestEfforts =
- Environment.getBoolean(PROP_EXHORT_PYTHON_INSTALL_BEST_EFFORTS, false);
+ Environment.getBoolean(PROP_TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS, false);
/*
make best efforts to install the requirements.txt on the virtual environment created from
the python3 passed in. that means that it will install the packages without referring to
@@ -90,7 +90,7 @@ public final List> getDependencies(
if (matchManifestVersions) {
throw new RuntimeException(
"Conflicting settings, "
- + PythonControllerBase.PROP_EXHORT_PYTHON_INSTALL_BEST_EFFORTS
+ + PythonControllerBase.PROP_TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS
+ "=true can only work with "
+ PROP_MATCH_MANIFEST_VERSIONS
+ "=false");
@@ -223,26 +223,27 @@ private String getPipShowFromEnvironment(List depNames) {
args.add(pipBinaryLocation);
args.add("show");
args.addAll(depNames);
- return executeCommandOrExtractFromEnv(PROP_EXHORT_PIP_SHOW, args.toArray(new String[] {}));
+ return executeCommandOrExtractFromEnv(PROP_TRUSTIFY_DA_PIP_SHOW, args.toArray(new String[] {}));
}
String getPipFreezeFromEnvironment() {
return executeCommandOrExtractFromEnv(
- PROP_EXHORT_PIP_FREEZE, pipBinaryLocation, "freeze", "--all");
+ PROP_TRUSTIFY_DA_PIP_FREEZE, pipBinaryLocation, "freeze", "--all");
}
List getDependencyTreeJsonFromPipDepTree() {
executeCommandOrExtractFromEnv(
- PROP_EXHORT_PIP_PIPDEPTREE, pipBinaryLocation, "install", "pipdeptree");
+ PROP_TRUSTIFY_DA_PIP_PIPDEPTREE, pipBinaryLocation, "install", "pipdeptree");
String pipdeptreeJsonString = "";
if (isVirtualEnv()) {
pipdeptreeJsonString =
- executeCommandOrExtractFromEnv(PROP_EXHORT_PIP_PIPDEPTREE, "./bin/pipdeptree", "--json");
+ executeCommandOrExtractFromEnv(
+ PROP_TRUSTIFY_DA_PIP_PIPDEPTREE, "./bin/pipdeptree", "--json");
} else if (isRealEnv()) {
pipdeptreeJsonString =
executeCommandOrExtractFromEnv(
- PROP_EXHORT_PIP_PIPDEPTREE, pathToPythonBin, "-m", "pipdeptree", "--json");
+ PROP_TRUSTIFY_DA_PIP_PIPDEPTREE, pathToPythonBin, "-m", "pipdeptree", "--json");
}
if (debugLoggingIsNeeded()) {
String pipdeptreeMessage =
@@ -307,7 +308,7 @@ private void bringAllDependencies(
+ " better to install requirements.txt altogether) or turn on environment"
+ " variable %s=true to automatically install it on"
+ " virtual environment (will slow down the analysis)",
- depName, PROP_EXHORT_PYTHON_VIRTUAL_ENV));
+ depName, PROP_TRUSTIFY_DA_PYTHON_VIRTUAL_ENV));
}
Map dataMap = new HashMap<>();
@@ -411,7 +412,7 @@ private PythonDependency getPythonDependencyByShowStringBlock(String pipShowStri
}
private void fillCacheWithEnvironmentDeps(Map cache) {
- boolean usePipDepTree = Environment.getBoolean(PROP_EXHORT_PIP_USE_DEP_TREE, false);
+ boolean usePipDepTree = Environment.getBoolean(PROP_TRUSTIFY_DA_PIP_USE_DEP_TREE, false);
if (usePipDepTree) {
getDependencyTreeJsonFromPipDepTree().forEach(d -> saveToCacheWithKeyVariations(cache, d));
} else {
diff --git a/src/main/java/com/redhat/exhort/utils/PythonControllerRealEnv.java b/src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerRealEnv.java
similarity index 97%
rename from src/main/java/com/redhat/exhort/utils/PythonControllerRealEnv.java
rename to src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerRealEnv.java
index 7deae16f..3dead077 100644
--- a/src/main/java/com/redhat/exhort/utils/PythonControllerRealEnv.java
+++ b/src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerRealEnv.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
import java.nio.file.FileSystems;
import java.nio.file.Path;
diff --git a/src/main/java/com/redhat/exhort/utils/PythonControllerTestEnv.java b/src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerTestEnv.java
similarity index 92%
rename from src/main/java/com/redhat/exhort/utils/PythonControllerTestEnv.java
rename to src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerTestEnv.java
index 7070510e..0b28b0a1 100644
--- a/src/main/java/com/redhat/exhort/utils/PythonControllerTestEnv.java
+++ b/src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerTestEnv.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.nio.file.Path;
public class PythonControllerTestEnv extends PythonControllerRealEnv {
diff --git a/src/main/java/com/redhat/exhort/utils/PythonControllerVirtualEnv.java b/src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerVirtualEnv.java
similarity index 95%
rename from src/main/java/com/redhat/exhort/utils/PythonControllerVirtualEnv.java
rename to src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerVirtualEnv.java
index ae29988f..f39ab436 100644
--- a/src/main/java/com/redhat/exhort/utils/PythonControllerVirtualEnv.java
+++ b/src/main/java/io/github/guacsec/trustifyda/utils/PythonControllerVirtualEnv.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.io.IOException;
import java.nio.file.FileSystems;
import java.nio.file.Files;
@@ -28,9 +28,9 @@ public class PythonControllerVirtualEnv extends PythonControllerBase {
// private System.Logger log = System.getLogger("name");
public PythonControllerVirtualEnv(String pathToPythonBin) {
this.pipBinaryDir =
- Path.of(FileSystems.getDefault().getSeparator(), "tmp", "exhort_env", "bin");
+ Path.of(FileSystems.getDefault().getSeparator(), "tmp", "trustify_da_env", "bin");
this.pythonEnvironmentDir =
- Path.of(FileSystems.getDefault().getSeparator(), "tmp", "exhort_env");
+ Path.of(FileSystems.getDefault().getSeparator(), "tmp", "trustify_da_env");
this.pathToPythonBin = pathToPythonBin;
}
diff --git a/src/main/java/com/redhat/exhort/utils/PythonDependency.java b/src/main/java/io/github/guacsec/trustifyda/utils/PythonDependency.java
similarity index 96%
rename from src/main/java/com/redhat/exhort/utils/PythonDependency.java
rename to src/main/java/io/github/guacsec/trustifyda/utils/PythonDependency.java
index 7a2bd715..7dd2916b 100644
--- a/src/main/java/com/redhat/exhort/utils/PythonDependency.java
+++ b/src/main/java/io/github/guacsec/trustifyda/utils/PythonDependency.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
import java.util.List;
diff --git a/src/main/java/com/redhat/exhort/utils/StringInsensitive.java b/src/main/java/io/github/guacsec/trustifyda/utils/StringInsensitive.java
similarity index 96%
rename from src/main/java/com/redhat/exhort/utils/StringInsensitive.java
rename to src/main/java/io/github/guacsec/trustifyda/utils/StringInsensitive.java
index 3675712e..982b835a 100644
--- a/src/main/java/com/redhat/exhort/utils/StringInsensitive.java
+++ b/src/main/java/io/github/guacsec/trustifyda/utils/StringInsensitive.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
import java.util.Objects;
diff --git a/src/main/java/com/redhat/exhort/vcs/GitVersionControlSystemImpl.java b/src/main/java/io/github/guacsec/trustifyda/vcs/GitVersionControlSystemImpl.java
similarity index 98%
rename from src/main/java/com/redhat/exhort/vcs/GitVersionControlSystemImpl.java
rename to src/main/java/io/github/guacsec/trustifyda/vcs/GitVersionControlSystemImpl.java
index 35bbdcb2..11b4f0f5 100644
--- a/src/main/java/com/redhat/exhort/vcs/GitVersionControlSystemImpl.java
+++ b/src/main/java/io/github/guacsec/trustifyda/vcs/GitVersionControlSystemImpl.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.vcs;
+package io.github.guacsec.trustifyda.vcs;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.nio.file.Path;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/com/redhat/exhort/vcs/TagInfo.java b/src/main/java/io/github/guacsec/trustifyda/vcs/TagInfo.java
similarity index 97%
rename from src/main/java/com/redhat/exhort/vcs/TagInfo.java
rename to src/main/java/io/github/guacsec/trustifyda/vcs/TagInfo.java
index 3ab17cd2..88e0fcc8 100644
--- a/src/main/java/com/redhat/exhort/vcs/TagInfo.java
+++ b/src/main/java/io/github/guacsec/trustifyda/vcs/TagInfo.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.vcs;
+package io.github.guacsec.trustifyda.vcs;
import java.time.LocalDateTime;
diff --git a/src/main/java/com/redhat/exhort/vcs/VersionControlSystem.java b/src/main/java/io/github/guacsec/trustifyda/vcs/VersionControlSystem.java
similarity index 97%
rename from src/main/java/com/redhat/exhort/vcs/VersionControlSystem.java
rename to src/main/java/io/github/guacsec/trustifyda/vcs/VersionControlSystem.java
index 757bb97c..e9cb2df7 100644
--- a/src/main/java/com/redhat/exhort/vcs/VersionControlSystem.java
+++ b/src/main/java/io/github/guacsec/trustifyda/vcs/VersionControlSystem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.vcs;
+package io.github.guacsec.trustifyda.vcs;
import java.nio.file.Path;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 6e740677..a9d27524 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-module com.redhat.exhort {
+module io.github.guacsec.trustifyda {
requires java.net.http;
requires com.fasterxml.jackson.annotation;
requires com.fasterxml.jackson.core;
@@ -6,33 +6,33 @@
requires jakarta.annotation;
requires java.xml;
requires jakarta.mail;
- requires transitive exhort.api;
+ requires transitive trustifyda.api;
requires cyclonedx.core.java;
requires transitive packageurl.java;
requires transitive java.logging;
requires org.tomlj;
requires java.base;
- opens com.redhat.exhort.providers to
+ opens io.github.guacsec.trustifyda.providers to
com.fasterxml.jackson.databind;
- exports com.redhat.exhort;
- exports com.redhat.exhort.impl;
- exports com.redhat.exhort.sbom;
- exports com.redhat.exhort.tools;
- exports com.redhat.exhort.utils;
+ exports io.github.guacsec.trustifyda;
+ exports io.github.guacsec.trustifyda.impl;
+ exports io.github.guacsec.trustifyda.sbom;
+ exports io.github.guacsec.trustifyda.tools;
+ exports io.github.guacsec.trustifyda.utils;
- opens com.redhat.exhort.utils to
+ opens io.github.guacsec.trustifyda.utils to
com.fasterxml.jackson.databind;
- opens com.redhat.exhort.sbom to
+ opens io.github.guacsec.trustifyda.sbom to
com.fasterxml.jackson.databind,
packageurl.java;
- exports com.redhat.exhort.providers;
- exports com.redhat.exhort.providers.javascript.model;
- exports com.redhat.exhort.logging;
- exports com.redhat.exhort.image;
+ exports io.github.guacsec.trustifyda.providers;
+ exports io.github.guacsec.trustifyda.providers.javascript.model;
+ exports io.github.guacsec.trustifyda.logging;
+ exports io.github.guacsec.trustifyda.image;
- opens com.redhat.exhort.image to
+ opens io.github.guacsec.trustifyda.image to
com.fasterxml.jackson.databind;
}
diff --git a/src/main/resources/cli_help.txt b/src/main/resources/cli_help.txt
index 8301f1cf..dd5b6b21 100644
--- a/src/main/resources/cli_help.txt
+++ b/src/main/resources/cli_help.txt
@@ -1,7 +1,7 @@
-Exhort Java API CLI
+Dependency Analytics Java API CLI
USAGE:
- java -jar exhort-java-api.jar [OPTIONS]
+ java -jar trustify-da-java-client-cli.jar [OPTIONS]
COMMANDS:
stack [--summary|--html]
@@ -21,7 +21,7 @@ OPTIONS:
-h, --help Show this help message
EXAMPLES:
- java -jar exhort-java-api.jar stack /path/to/pom.xml
- java -jar exhort-java-api.jar stack /path/to/package.json --summary
- java -jar exhort-java-api.jar stack /path/to/build.gradle --html
- java -jar exhort-java-api.jar component /path/to/requirements.txt
+ java -jar trustify-da-java-client-cli.jar stack /path/to/pom.xml
+ java -jar trustify-da-java-client-cli.jar stack /path/to/package.json --summary
+ java -jar trustify-da-java-client-cli.jar stack /path/to/build.gradle --html
+ java -jar trustify-da-java-client-cli.jar component /path/to/requirements.txt
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
index 39940fa7..66bae57e 100644
--- a/src/main/resources/config.properties
+++ b/src/main/resources/config.properties
@@ -1 +1 @@
-EXHORT_DEV_MODE=false
+TRUSTIFY_DA_DEV_MODE=false
diff --git a/src/main/resources/exhort/openapi.yaml b/src/main/resources/exhort/openapi.yaml
deleted file mode 100644
index 2cc153f5..00000000
--- a/src/main/resources/exhort/openapi.yaml
+++ /dev/null
@@ -1,407 +0,0 @@
-openapi: 3.0.3
-info:
- title: Exhort API
- description: Vulnerability analysis with Red Hat Trusted Profile Analyzer
- license:
- name: Apache 2.0
- url: https://www.apache.org/licenses/LICENSE-2.0.html
- version: 4.1.0
-servers:
- - url: https://rhda.rhcloud.com/api/v4
- description: Production server
- - url: https://exhort-alpha.stage.devshift.net/api/v4
- description: Staging server
- - url: http://localhost:8080/api/v4
- description: Local development
-paths:
- /analysis:
- post:
- operationId: analysis
- summary: Takes a client-resolved dependency graph to perform a full stack analysis from all the available Vulnerability sources
- security:
- - RhdaTokenAuth: []
- - SnykTokenAuth: []
- - OssIndexUserAuth: []
- OssIndexTokenAuth: []
- parameters:
- - name: providers
- in: query
- description: List of vulnerability providers to get the report from
- required: false
- schema:
- enum:
- - snyk
- - oss-index
- type: string
- example: snyk
- requestBody:
- required: true
- description: Dependency graph in SBOM format
- content:
- application/vnd.cyclonedx+json:
- schema:
- type: object
- application/vnd.spdx+json:
- schema:
- type: object
- responses:
- '200':
- description: Full dependency analysis from all the available providers
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AnalysisReport'
- text/html:
- schema:
- type: object
- multipart/mixed:
- schema:
- type: object
- properties:
- json_report:
- $ref: '#/components/schemas/AnalysisReport'
- html_report:
- type: object
- '422':
- description: Invalid request
- content:
- text/plain:
- schema:
- type: string
- description: Error message
- /batch-analysis:
- post:
- operationId: batchAnalysis
- summary: Takes an array of client-resolved dependency graphs to perform a full stack analysis from all the available Vulnerability sources
- security:
- - RhdaTokenAuth: [ ]
- - SnykTokenAuth: [ ]
- - OssIndexUserAuth: [ ]
- OssIndexTokenAuth: [ ]
- parameters:
- - name: providers
- in: query
- description: List of vulnerability providers to get the report from
- required: false
- schema:
- enum:
- - snyk
- - oss-index
- type: string
- example: snyk
- requestBody:
- required: true
- description: An array of dependency graphs in SBOM format
- content:
- application/vnd.cyclonedx+json:
- schema:
- type: object
- additionalProperties:
- type: object
- application/vnd.spdx+json:
- schema:
- type: object
- additionalProperties:
- type: object
- responses:
- '200':
- description: Full dependency analysis from all the available providers
- content:
- application/json:
- schema:
- type: object
- additionalProperties:
- $ref: '#/components/schemas/AnalysisReport'
- text/html:
- schema:
- type: object
- multipart/mixed:
- schema:
- type: object
- properties:
- json_report:
- type: object
- additionalProperties:
- $ref: '#/components/schemas/AnalysisReport'
- html_report:
- type: object
- '422':
- description: Invalid request
- content:
- text/plain:
- schema:
- type: string
- description: Error message
- /token:
- get:
- operationId: validateToken
- summary: Validates a vulnerability provider token
- security:
- - RhdaTokenAuth: []
- - SnykTokenAuth: []
- - OssIndexUserAuth: []
- OssIndexTokenAuth: []
- responses:
- '200':
- description: Successful token validation
- content:
- text/plain:
- schema:
- type: string
- description: Response message
- '401':
- description: Invalid token
- content:
- text/plain:
- schema:
- type: string
- description: Error message
- '403':
- description: Forbidden. The token does not have permissions
- content:
- text/plain:
- schema:
- type: string
- description: Error message
- '429':
- description: Too many requests. Rate limit exceeded
- content:
- text/plain:
- schema:
- type: string
- description: Error message
- '400':
- description: Invalid request
- content:
- text/plain:
- schema:
- type: string
- description: Missing token
-
-components:
- securitySchemes:
- RhdaTokenAuth:
- type: apiKey
- in: header
- name: rhda-token
- SnykTokenAuth:
- type: apiKey
- in: header
- name: ex-snyk-token
- OssIndexUserAuth:
- type: apiKey
- in: header
- name: ex-oss-index-name
- OssIndexTokenAuth:
- type: apiKey
- in: header
- name: ex-oss-index-token
- schemas:
- AnalysisReport:
- type: object
- properties:
- scanned:
- $ref: '#/components/schemas/Scanned'
- providers:
- $ref: '#/components/schemas/Providers'
- Scanned:
- type: object
- description: Number of dependencies scanned
- properties:
- total:
- type: integer
- direct:
- type: integer
- transitive:
- type: integer
- Providers:
- type: object
- additionalProperties:
- $ref: '#/components/schemas/ProviderReport'
- ProviderReport:
- type: object
- properties:
- status:
- $ref: '#/components/schemas/ProviderStatus'
- sources:
- type: object
- additionalProperties:
- $ref: '#/components/schemas/Source'
- ProviderStatus:
- type: object
- properties:
- ok:
- type: boolean
- name:
- type: string
- code:
- type: integer
- message:
- type: string
- Source:
- type: object
- properties:
- summary:
- $ref: '#/components/schemas/SourceSummary'
- dependencies:
- type: array
- items:
- $ref: '#/components/schemas/DependencyReport'
- unscanned:
- type: array
- items:
- $ref: '#/components/schemas/UnscannedDependency'
- SourceSummary:
- type: object
- properties:
- direct:
- type: integer
- default: 0
- transitive:
- type: integer
- default: 0
- total:
- type: integer
- default: 0
- dependencies:
- type: integer
- default: 0
- critical:
- type: integer
- default: 0
- high:
- type: integer
- default: 0
- medium:
- type: integer
- default: 0
- low:
- type: integer
- default: 0
- remediations:
- type: integer
- default: 0
- recommendations:
- type: integer
- default: 0
- unscanned:
- type: integer
- default: 0
- PackageRef:
- type: string
- description: PackageURL used to identify a dependency artifact
- example: pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final
- DependencyReport:
- type: object
- properties:
- ref:
- $ref: '#/components/schemas/PackageRef'
- issues:
- type: array
- items:
- $ref: '#/components/schemas/Issue'
- transitive:
- type: array
- items:
- $ref: '#/components/schemas/TransitiveDependencyReport'
- recommendation:
- description: Trusted Content recommendation that is not related to any security vulnerability
- allOf:
- - $ref: '#/components/schemas/PackageRef'
- highestVulnerability:
- description: Highest vulnerability found for this dependency
- $ref: '#/components/schemas/Issue'
- Severity:
- type: string
- enum:
- - CRITICAL
- - HIGH
- - MEDIUM
- - LOW
- Issue:
- type: object
- properties:
- id:
- type: string
- title:
- type: string
- source:
- type: string
- cvss:
- $ref: '#/components/schemas/CvssVector'
- cvssScore:
- type: number
- format: float
- severity:
- $ref: '#/components/schemas/Severity'
- cves:
- type: array
- items:
- type: string
- unique:
- type: boolean
- default: false
- remediation:
- $ref: '#/components/schemas/Remediation'
- TransitiveDependencyReport:
- type: object
- properties:
- ref:
- $ref: '#/components/schemas/PackageRef'
- issues:
- type: array
- items:
- $ref: '#/components/schemas/Issue'
- highestVulnerability:
- description: Highest vulnerability found for this dependency
- $ref: '#/components/schemas/Issue'
- Remediation:
- type: object
- properties:
- fixedIn:
- type: array
- items:
- type: string
- trustedContent:
- type: object
- properties:
- ref:
- $ref: '#/components/schemas/PackageRef'
- status:
- type: string
- justification:
- type: string
- CvssVector:
- type: object
- properties:
- attackVector:
- type: string
- attackComplexity:
- type: string
- privilegesRequired:
- type: string
- userInteraction:
- type: string
- scope:
- type: string
- confidentialityImpact:
- type: string
- integrityImpact:
- type: string
- availabilityImpact:
- type: string
- exploitCodeMaturity:
- type: string
- remediationLevel:
- type: string
- reportConfidence:
- type: string
- cvss:
- type: string
- UnscannedDependency:
- type: object
- properties:
- ref:
- $ref: '#/components/schemas/PackageRef'
- reason:
- type: string
diff --git a/src/test/java/com/redhat/exhort/ExhortTest.java b/src/test/java/io/github/guacsec/trustifyda/ExhortTest.java
similarity index 95%
rename from src/test/java/com/redhat/exhort/ExhortTest.java
rename to src/test/java/io/github/guacsec/trustifyda/ExhortTest.java
index b21a6957..4b41c569 100644
--- a/src/test/java/com/redhat/exhort/ExhortTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/ExhortTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort;
+package io.github.guacsec.trustifyda;
import java.io.File;
import java.io.IOException;
@@ -58,7 +58,7 @@ public static Path resolveFile(String path) {
protected String getFileFromResource(String fileName, String path) {
Path tmpFile;
try {
- var tmpDir = Files.createTempDirectory("exhort_test_");
+ var tmpDir = Files.createTempDirectory("TRUSTIFY_DA_test_");
tmpFile = Files.createFile(tmpDir.resolve(fileName));
try (var is = getResourceAsStreamDecision(this.getClass(), path)) {
if (Objects.nonNull(is)) {
@@ -81,7 +81,7 @@ public static class TempDirFromResources {
private final Path tmpDir;
public TempDirFromResources() throws IOException {
- tmpDir = Files.createTempDirectory("exhort_test_");
+ tmpDir = Files.createTempDirectory("TRUSTIFY_DA_test_");
}
public class AddPath {
@@ -145,7 +145,7 @@ public Path getTempDir() {
protected String getFileFromString(String fileName, String content) {
Path tmpFile;
try {
- var tmpDir = Files.createTempDirectory("exhort_test_");
+ var tmpDir = Files.createTempDirectory("TRUSTIFY_DA_test_");
tmpFile = Files.createFile(tmpDir.resolve(fileName));
Files.write(tmpFile, content.getBytes());
diff --git a/src/test/java/com/redhat/exhort/cli/AppTest.java b/src/test/java/io/github/guacsec/trustifyda/cli/AppTest.java
similarity index 92%
rename from src/test/java/com/redhat/exhort/cli/AppTest.java
rename to src/test/java/io/github/guacsec/trustifyda/cli/AppTest.java
index 889b49c4..27cbd4aa 100644
--- a/src/test/java/com/redhat/exhort/cli/AppTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/cli/AppTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.cli;
+package io.github.guacsec.trustifyda.cli;
-import static com.redhat.exhort.cli.AppUtils.exitWithError;
-import static com.redhat.exhort.cli.AppUtils.printException;
-import static com.redhat.exhort.cli.AppUtils.printLine;
+import static io.github.guacsec.trustifyda.cli.AppUtils.exitWithError;
+import static io.github.guacsec.trustifyda.cli.AppUtils.printException;
+import static io.github.guacsec.trustifyda.cli.AppUtils.printLine;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
@@ -28,14 +28,14 @@
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.api.v4.AnalysisReport;
-import com.redhat.exhort.api.v4.ProviderReport;
-import com.redhat.exhort.api.v4.ProviderStatus;
-import com.redhat.exhort.api.v4.Scanned;
-import com.redhat.exhort.api.v4.Source;
-import com.redhat.exhort.api.v4.SourceSummary;
-import com.redhat.exhort.impl.ExhortApi;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
+import io.github.guacsec.trustifyda.api.v5.ProviderReport;
+import io.github.guacsec.trustifyda.api.v5.ProviderStatus;
+import io.github.guacsec.trustifyda.api.v5.Scanned;
+import io.github.guacsec.trustifyda.api.v5.Source;
+import io.github.guacsec.trustifyda.api.v5.SourceSummary;
+import io.github.guacsec.trustifyda.impl.ExhortApi;
import java.io.IOException;
import java.lang.reflect.Method;
import java.nio.file.Path;
@@ -62,7 +62,7 @@ void main_with_no_args_should_print_help() {
try (MockedStatic mockedAppUtils = mockStatic(AppUtils.class)) {
App.main(new String[0]);
- mockedAppUtils.verify(() -> printLine(contains("Exhort Java API CLI")));
+ mockedAppUtils.verify(() -> printLine(contains("Dependency Analytics Java API CLI")));
}
}
@@ -72,11 +72,14 @@ void main_with_help_flag_should_print_help(String helpFlag) {
try (MockedStatic mockedAppUtils = mockStatic(AppUtils.class)) {
App.main(new String[] {helpFlag});
- mockedAppUtils.verify(() -> printLine(contains("Exhort Java API CLI")));
+ mockedAppUtils.verify(() -> printLine(contains("Dependency Analytics Java API CLI")));
mockedAppUtils.verify(() -> printLine(contains("USAGE:")));
mockedAppUtils.verify(
() ->
- printLine(contains("java -jar exhort-java-api.jar [OPTIONS]")));
+ printLine(
+ contains(
+ "java -jar trustify-da-java-client-cli.jar "
+ + " [OPTIONS]")));
}
}
@@ -85,7 +88,7 @@ void main_with_help_flag_after_other_args_should_print_help() {
try (MockedStatic mockedAppUtils = mockStatic(AppUtils.class)) {
App.main(new String[] {"stack", "--help"});
- mockedAppUtils.verify(() -> printLine(contains("Exhort Java API CLI")));
+ mockedAppUtils.verify(() -> printLine(contains("Dependency Analytics Java API CLI")));
}
}
@@ -97,7 +100,10 @@ void help_should_contain_usage_section() {
mockedAppUtils.verify(() -> printLine(contains("USAGE:")));
mockedAppUtils.verify(
() ->
- printLine(contains("java -jar exhort-java-api.jar [OPTIONS]")));
+ printLine(
+ contains(
+ "java -jar trustify-da-java-client-cli.jar "
+ + " [OPTIONS]")));
}
}
@@ -159,19 +165,27 @@ void help_should_contain_examples_section() {
mockedAppUtils.verify(() -> printLine(contains("EXAMPLES:")));
mockedAppUtils.verify(
- () -> printLine(contains("java -jar exhort-java-api.jar stack /path/to/pom.xml")));
+ () ->
+ printLine(
+ contains("java -jar trustify-da-java-client-cli.jar stack /path/to/pom.xml")));
mockedAppUtils.verify(
() ->
printLine(
- contains("java -jar exhort-java-api.jar stack /path/to/package.json --summary")));
+ contains(
+ "java -jar trustify-da-java-client-cli.jar stack /path/to/package.json"
+ + " --summary")));
mockedAppUtils.verify(
() ->
printLine(
- contains("java -jar exhort-java-api.jar stack /path/to/build.gradle --html")));
+ contains(
+ "java -jar trustify-da-java-client-cli.jar stack /path/to/build.gradle"
+ + " --html")));
mockedAppUtils.verify(
() ->
printLine(
- contains("java -jar exhort-java-api.jar component /path/to/requirements.txt")));
+ contains(
+ "java -jar trustify-da-java-client-cli.jar component"
+ + " /path/to/requirements.txt")));
}
}
@@ -203,7 +217,7 @@ void help_loads_from_external_file() {
App.main(new String[] {"--help"});
// Verify that help content is printed (loaded from cli_help.txt)
- mockedAppUtils.verify(() -> printLine(contains("Exhort Java API CLI")));
+ mockedAppUtils.verify(() -> printLine(contains("Dependency Analytics Java API CLI")));
mockedAppUtils.verify(() -> printLine(contains("USAGE:")));
mockedAppUtils.verify(() -> printLine(contains("COMMANDS:")));
mockedAppUtils.verify(() -> printLine(contains("EXAMPLES:")));
diff --git a/src/test/java/com/redhat/exhort/image/ImageRefTest.java b/src/test/java/io/github/guacsec/trustifyda/image/ImageRefTest.java
similarity index 96%
rename from src/test/java/com/redhat/exhort/image/ImageRefTest.java
rename to src/test/java/io/github/guacsec/trustifyda/image/ImageRefTest.java
index e2af9e2c..d3edb8c8 100644
--- a/src/test/java/com/redhat/exhort/image/ImageRefTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/image/ImageRefTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.image;
+package io.github.guacsec.trustifyda.image;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.AdditionalMatchers.aryEq;
@@ -24,8 +24,8 @@
import com.github.packageurl.MalformedPackageURLException;
import com.github.packageurl.PackageURL;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/src/test/java/com/redhat/exhort/image/ImageTest.java b/src/test/java/io/github/guacsec/trustifyda/image/ImageTest.java
similarity index 99%
rename from src/test/java/com/redhat/exhort/image/ImageTest.java
rename to src/test/java/io/github/guacsec/trustifyda/image/ImageTest.java
index b9454ba4..b201b002 100644
--- a/src/test/java/com/redhat/exhort/image/ImageTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/image/ImageTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.image;
+package io.github.guacsec.trustifyda.image;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
diff --git a/src/test/java/com/redhat/exhort/image/ImageUtilsTest.java b/src/test/java/io/github/guacsec/trustifyda/image/ImageUtilsTest.java
similarity index 87%
rename from src/test/java/com/redhat/exhort/image/ImageUtilsTest.java
rename to src/test/java/io/github/guacsec/trustifyda/image/ImageUtilsTest.java
index 6ad99d76..2208deca 100644
--- a/src/test/java/com/redhat/exhort/image/ImageUtilsTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/image/ImageUtilsTest.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.image;
-
-import static com.redhat.exhort.image.ImageUtils.EXHORT_IMAGE_ARCH;
-import static com.redhat.exhort.image.ImageUtils.EXHORT_IMAGE_OS;
-import static com.redhat.exhort.image.ImageUtils.EXHORT_IMAGE_PLATFORM;
-import static com.redhat.exhort.image.ImageUtils.EXHORT_IMAGE_SERVICE_ENDPOINT;
-import static com.redhat.exhort.image.ImageUtils.EXHORT_IMAGE_VARIANT;
-import static com.redhat.exhort.image.ImageUtils.EXHORT_SKOPEO_CONFIG_PATH;
-import static com.redhat.exhort.image.ImageUtils.EXHORT_SYFT_CONFIG_PATH;
-import static com.redhat.exhort.image.ImageUtils.EXHORT_SYFT_IMAGE_SOURCE;
+package io.github.guacsec.trustifyda.image;
+
+import static io.github.guacsec.trustifyda.image.ImageUtils.TRUSTIFY_DA_IMAGE_ARCH;
+import static io.github.guacsec.trustifyda.image.ImageUtils.TRUSTIFY_DA_IMAGE_OS;
+import static io.github.guacsec.trustifyda.image.ImageUtils.TRUSTIFY_DA_IMAGE_PLATFORM;
+import static io.github.guacsec.trustifyda.image.ImageUtils.TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT;
+import static io.github.guacsec.trustifyda.image.ImageUtils.TRUSTIFY_DA_IMAGE_VARIANT;
+import static io.github.guacsec.trustifyda.image.ImageUtils.TRUSTIFY_DA_SKOPEO_CONFIG_PATH;
+import static io.github.guacsec.trustifyda.image.ImageUtils.TRUSTIFY_DA_SYFT_CONFIG_PATH;
+import static io.github.guacsec.trustifyda.image.ImageUtils.TRUSTIFY_DA_SYFT_IMAGE_SOURCE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -39,9 +39,9 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;
import com.github.packageurl.MalformedPackageURLException;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.tools.Operations;
-import com.redhat.exhort.utils.Environment;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.tools.Operations;
+import io.github.guacsec.trustifyda.utils.Environment;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -134,11 +134,11 @@ void tearDown() {
@Test
@ClearSystemProperty(key = "PATH")
- @ClearSystemProperty(key = "EXHORT_SYFT_PATH")
- @ClearSystemProperty(key = EXHORT_SYFT_CONFIG_PATH)
- @ClearSystemProperty(key = "EXHORT_DOCKER_PATH")
- @ClearSystemProperty(key = "EXHORT_PODMAN_PATH")
- @ClearSystemProperty(key = EXHORT_SYFT_IMAGE_SOURCE)
+ @ClearSystemProperty(key = "TRUSTIFY_DA_SYFT_PATH")
+ @ClearSystemProperty(key = TRUSTIFY_DA_SYFT_CONFIG_PATH)
+ @ClearSystemProperty(key = "TRUSTIFY_DA_DOCKER_PATH")
+ @ClearSystemProperty(key = "TRUSTIFY_DA_PODMAN_PATH")
+ @ClearSystemProperty(key = TRUSTIFY_DA_SYFT_IMAGE_SOURCE)
void test_generate_image_sbom() throws IOException, MalformedPackageURLException {
try (MockedStatic mock = Mockito.mockStatic(Operations.class);
var is = getResourceAsStreamDecision(this.getClass(), "msc/image/image_sbom.json")) {
@@ -181,9 +181,9 @@ void test_generate_image_sbom() throws IOException, MalformedPackageURLException
}
@Test
- @ClearSystemProperty(key = "EXHORT_SKOPEO_PATH")
- @ClearSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH)
- @ClearSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT)
+ @ClearSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH")
+ @ClearSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT)
void test_get_image_digests_single() throws IOException {
try (MockedStatic mock = Mockito.mockStatic(Operations.class);
var isRaw =
@@ -247,9 +247,9 @@ void test_get_image_digests_single() throws IOException {
}
@Test
- @ClearSystemProperty(key = "EXHORT_SKOPEO_PATH")
- @ClearSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH)
- @ClearSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT)
+ @ClearSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH")
+ @ClearSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT)
void test_get_image_digests_multiple() throws IOException {
try (MockedStatic mock = Mockito.mockStatic(Operations.class);
var is =
@@ -300,33 +300,33 @@ void test_get_image_digests_multiple() throws IOException {
}
@Test
- @SetSystemProperty(key = EXHORT_IMAGE_PLATFORM, value = mockImagePlatform)
- @SetSystemProperty(key = EXHORT_SYFT_IMAGE_SOURCE, value = mockSyftSource)
- @SetSystemProperty(key = EXHORT_IMAGE_OS, value = mockOs)
- @SetSystemProperty(key = EXHORT_IMAGE_ARCH, value = mockArch)
- @SetSystemProperty(key = EXHORT_IMAGE_VARIANT, value = mockVariant)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_PLATFORM, value = mockImagePlatform)
+ @SetSystemProperty(key = TRUSTIFY_DA_SYFT_IMAGE_SOURCE, value = mockSyftSource)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_OS, value = mockOs)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_ARCH, value = mockArch)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_VARIANT, value = mockVariant)
void test_get_image_platform() {
var platform = ImageUtils.getImagePlatform();
assertEquals(new Platform(mockImagePlatform), platform);
}
@Test
- @ClearSystemProperty(key = EXHORT_IMAGE_PLATFORM)
- @SetSystemProperty(key = EXHORT_SYFT_IMAGE_SOURCE, value = mockSyftSource)
- @SetSystemProperty(key = EXHORT_IMAGE_OS, value = mockOs)
- @SetSystemProperty(key = EXHORT_IMAGE_ARCH, value = mockArch)
- @SetSystemProperty(key = EXHORT_IMAGE_VARIANT, value = mockVariant)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_PLATFORM)
+ @SetSystemProperty(key = TRUSTIFY_DA_SYFT_IMAGE_SOURCE, value = mockSyftSource)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_OS, value = mockOs)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_ARCH, value = mockArch)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_VARIANT, value = mockVariant)
void test_get_image_platform_no_default() {
var platform = ImageUtils.getImagePlatform();
assertEquals(new Platform(mockOs, mockArch, mockVariant), platform);
}
@Test
- @ClearSystemProperty(key = EXHORT_IMAGE_PLATFORM)
- @SetSystemProperty(key = EXHORT_SYFT_IMAGE_SOURCE, value = "podman")
- @SetSystemProperty(key = EXHORT_IMAGE_OS, value = mockOs)
- @SetSystemProperty(key = EXHORT_IMAGE_ARCH, value = mockArch)
- @ClearSystemProperty(key = EXHORT_IMAGE_VARIANT)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_PLATFORM)
+ @SetSystemProperty(key = TRUSTIFY_DA_SYFT_IMAGE_SOURCE, value = "podman")
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_OS, value = mockOs)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_ARCH, value = mockArch)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_VARIANT)
void test_get_image_platform_no_default_no_variant() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
mock.when(() -> Operations.getCustomPathOrElse(eq("podman"))).thenReturn("podman");
@@ -345,11 +345,11 @@ void test_get_image_platform_no_default_no_variant() {
}
@Test
- @ClearSystemProperty(key = EXHORT_IMAGE_PLATFORM)
- @SetSystemProperty(key = EXHORT_SYFT_IMAGE_SOURCE, value = "podman")
- @ClearSystemProperty(key = EXHORT_IMAGE_OS)
- @ClearSystemProperty(key = EXHORT_IMAGE_ARCH)
- @ClearSystemProperty(key = EXHORT_IMAGE_VARIANT)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_PLATFORM)
+ @SetSystemProperty(key = TRUSTIFY_DA_SYFT_IMAGE_SOURCE, value = "podman")
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_OS)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_ARCH)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_VARIANT)
@ClearSystemProperty(key = "PATH")
void test_get_image_platform_no_defaults() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
@@ -370,8 +370,8 @@ void test_get_image_platform_no_defaults() {
}
@Test
- @SetSystemProperty(key = EXHORT_SYFT_CONFIG_PATH, value = mockSyftConfig)
- @SetSystemProperty(key = EXHORT_SYFT_IMAGE_SOURCE, value = mockSyftSource)
+ @SetSystemProperty(key = TRUSTIFY_DA_SYFT_CONFIG_PATH, value = mockSyftConfig)
+ @SetSystemProperty(key = TRUSTIFY_DA_SYFT_IMAGE_SOURCE, value = mockSyftSource)
void test_exec_syft() {
try (MockedStatic mockEnv =
Mockito.mockStatic(Environment.class, Mockito.CALLS_REAL_METHODS)) {
@@ -426,8 +426,8 @@ void test_exec_syft() {
}
@Test
- @ClearSystemProperty(key = EXHORT_SYFT_CONFIG_PATH)
- @ClearSystemProperty(key = EXHORT_SYFT_IMAGE_SOURCE)
+ @ClearSystemProperty(key = TRUSTIFY_DA_SYFT_CONFIG_PATH)
+ @ClearSystemProperty(key = TRUSTIFY_DA_SYFT_IMAGE_SOURCE)
void test_exec_syft_no_config_no_source() {
try (MockedStatic mockEnv =
Mockito.mockStatic(Environment.class, Mockito.CALLS_REAL_METHODS)) {
@@ -514,7 +514,7 @@ void test_update_PATH_env_no_PATH() {
}
@Test
- @SetSystemProperty(key = "EXHORT_DOCKER_PATH", value = mockDockerPath)
+ @SetSystemProperty(key = "TRUSTIFY_DA_DOCKER_PATH", value = mockDockerPath)
@SetSystemProperty(key = "PATH", value = mockPath)
void test_host_info_docker() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
@@ -535,7 +535,7 @@ void test_host_info_docker() {
}
@Test
- @ClearSystemProperty(key = "EXHORT_DOCKER_PATH")
+ @ClearSystemProperty(key = "TRUSTIFY_DA_DOCKER_PATH")
void test_host_info_no_docker_path() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
var output = new Operations.ProcessExecOutput("", "test-error", 0);
@@ -557,7 +557,7 @@ void test_host_info_no_docker_path() {
}
@Test
- @SetSystemProperty(key = "EXHORT_DOCKER_PATH", value = mockDockerPath)
+ @SetSystemProperty(key = "TRUSTIFY_DA_DOCKER_PATH", value = mockDockerPath)
@SetSystemProperty(key = "PATH", value = mockPath)
void test_docker_get_os() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
@@ -578,7 +578,7 @@ void test_docker_get_os() {
}
@ParameterizedTest(name = "{0}")
- @SetSystemProperty(key = "EXHORT_DOCKER_PATH", value = mockDockerPath)
+ @SetSystemProperty(key = "TRUSTIFY_DA_DOCKER_PATH", value = mockDockerPath)
@SetSystemProperty(key = "PATH", value = mockPath)
@MethodSource("dockerArchSources")
void test_docker_get_arch(String sysArch, String arch) {
@@ -600,7 +600,7 @@ void test_docker_get_arch(String sysArch, String arch) {
}
@ParameterizedTest(name = "{0}")
- @SetSystemProperty(key = "EXHORT_DOCKER_PATH", value = mockDockerPath)
+ @SetSystemProperty(key = "TRUSTIFY_DA_DOCKER_PATH", value = mockDockerPath)
@SetSystemProperty(key = "PATH", value = mockPath)
@MethodSource("dockerVariantSources")
void test_docker_get_variant(String sysArch, String variant) {
@@ -622,7 +622,7 @@ void test_docker_get_variant(String sysArch, String variant) {
}
@Test
- @SetSystemProperty(key = "EXHORT_PODMAN_PATH", value = mockPodmanPath)
+ @SetSystemProperty(key = "TRUSTIFY_DA_PODMAN_PATH", value = mockPodmanPath)
@SetSystemProperty(key = "PATH", value = mockPath)
void test_host_info_podman() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
@@ -643,7 +643,7 @@ void test_host_info_podman() {
}
@Test
- @SetSystemProperty(key = "EXHORT_PODMAN_PATH", value = mockPodmanPath)
+ @SetSystemProperty(key = "TRUSTIFY_DA_PODMAN_PATH", value = mockPodmanPath)
@SetSystemProperty(key = "PATH", value = mockPath)
void test_podman_get_os() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
@@ -664,7 +664,7 @@ void test_podman_get_os() {
}
@Test
- @SetSystemProperty(key = "EXHORT_PODMAN_PATH", value = mockPodmanPath)
+ @SetSystemProperty(key = "TRUSTIFY_DA_PODMAN_PATH", value = mockPodmanPath)
@SetSystemProperty(key = "PATH", value = mockPath)
void test_podman_get_arch() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
@@ -685,7 +685,7 @@ void test_podman_get_arch() {
}
@Test
- @SetSystemProperty(key = "EXHORT_PODMAN_PATH", value = mockPodmanPath)
+ @SetSystemProperty(key = "TRUSTIFY_DA_PODMAN_PATH", value = mockPodmanPath)
@SetSystemProperty(key = "PATH", value = mockPath)
void test_podman_get_variant() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
@@ -715,9 +715,9 @@ void test_docker_podman_info() {
}
@Test
- @SetSystemProperty(key = "EXHORT_SKOPEO_PATH", value = mockSkopeoPath)
- @SetSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH, value = mockSkopeoConfig)
- @SetSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT, value = mockSkopeoDaemon)
+ @SetSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH", value = mockSkopeoPath)
+ @SetSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH, value = mockSkopeoConfig)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT, value = mockSkopeoDaemon)
void test_exec_skopeo_inspect_raw() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
var output = new Operations.ProcessExecOutput("test-output", "test-error", 0);
@@ -749,9 +749,9 @@ void test_exec_skopeo_inspect_raw() {
}
@Test
- @SetSystemProperty(key = "EXHORT_SKOPEO_PATH", value = mockSkopeoPath)
- @ClearSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH)
- @SetSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT, value = mockSkopeoDaemon)
+ @SetSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH", value = mockSkopeoPath)
+ @ClearSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT, value = mockSkopeoDaemon)
void test_exec_skopeo_inspect_raw_no_config() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
var output = new Operations.ProcessExecOutput("test-output", "test-error", 0);
@@ -781,9 +781,9 @@ void test_exec_skopeo_inspect_raw_no_config() {
}
@Test
- @ClearSystemProperty(key = "EXHORT_SKOPEO_PATH")
- @SetSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH, value = mockSkopeoConfig)
- @ClearSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT)
+ @ClearSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH")
+ @SetSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH, value = mockSkopeoConfig)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT)
void test_exec_skopeo_inspect_raw_no_daemon() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
var output = new Operations.ProcessExecOutput("test-output", "test-error", 0);
@@ -813,9 +813,9 @@ void test_exec_skopeo_inspect_raw_no_daemon() {
}
@Test
- @ClearSystemProperty(key = "EXHORT_SKOPEO_PATH")
- @ClearSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH)
- @ClearSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT)
+ @ClearSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH")
+ @ClearSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT)
void test_exec_skopeo_inspect_raw_no_config_no_daemon() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
var output = new Operations.ProcessExecOutput("test-output", "test-error", 0);
@@ -843,9 +843,9 @@ void test_exec_skopeo_inspect_raw_no_config_no_daemon() {
}
@Test
- @SetSystemProperty(key = "EXHORT_SKOPEO_PATH", value = mockSkopeoPath)
- @SetSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH, value = mockSkopeoConfig)
- @SetSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT, value = mockSkopeoDaemon)
+ @SetSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH", value = mockSkopeoPath)
+ @SetSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH, value = mockSkopeoConfig)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT, value = mockSkopeoDaemon)
void test_exec_skopeo_inspect() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
var output = new Operations.ProcessExecOutput("test-output", "test-error", 0);
@@ -877,9 +877,9 @@ void test_exec_skopeo_inspect() {
}
@Test
- @SetSystemProperty(key = "EXHORT_SKOPEO_PATH", value = mockSkopeoPath)
- @ClearSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH)
- @SetSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT, value = mockSkopeoDaemon)
+ @SetSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH", value = mockSkopeoPath)
+ @ClearSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH)
+ @SetSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT, value = mockSkopeoDaemon)
void test_exec_skopeo_inspect_no_config() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
var output = new Operations.ProcessExecOutput("test-output", "test-error", 0);
@@ -909,9 +909,9 @@ void test_exec_skopeo_inspect_no_config() {
}
@Test
- @ClearSystemProperty(key = "EXHORT_SKOPEO_PATH")
- @SetSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH, value = mockSkopeoConfig)
- @ClearSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT)
+ @ClearSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH")
+ @SetSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH, value = mockSkopeoConfig)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT)
void test_exec_skopeo_inspect_no_daemon() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
var output = new Operations.ProcessExecOutput("test-output", "test-error", 0);
@@ -941,9 +941,9 @@ void test_exec_skopeo_inspect_no_daemon() {
}
@Test
- @ClearSystemProperty(key = "EXHORT_SKOPEO_PATH")
- @ClearSystemProperty(key = EXHORT_SKOPEO_CONFIG_PATH)
- @ClearSystemProperty(key = EXHORT_IMAGE_SERVICE_ENDPOINT)
+ @ClearSystemProperty(key = "TRUSTIFY_DA_SKOPEO_PATH")
+ @ClearSystemProperty(key = TRUSTIFY_DA_SKOPEO_CONFIG_PATH)
+ @ClearSystemProperty(key = TRUSTIFY_DA_IMAGE_SERVICE_ENDPOINT)
void test_exec_skopeo_inspect_no_config_no_daemon() {
try (MockedStatic mock = Mockito.mockStatic(Operations.class)) {
var output = new Operations.ProcessExecOutput("test-output", "test-error", 0);
diff --git a/src/test/java/com/redhat/exhort/image/PlatformTest.java b/src/test/java/io/github/guacsec/trustifyda/image/PlatformTest.java
similarity index 99%
rename from src/test/java/com/redhat/exhort/image/PlatformTest.java
rename to src/test/java/io/github/guacsec/trustifyda/image/PlatformTest.java
index 2de69807..b491bcae 100644
--- a/src/test/java/com/redhat/exhort/image/PlatformTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/image/PlatformTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.image;
+package io.github.guacsec.trustifyda.image;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/src/test/java/com/redhat/exhort/impl/ExhortApiIT.java b/src/test/java/io/github/guacsec/trustifyda/impl/ExhortApiIT.java
similarity index 90%
rename from src/test/java/com/redhat/exhort/impl/ExhortApiIT.java
rename to src/test/java/io/github/guacsec/trustifyda/impl/ExhortApiIT.java
index c79be200..fa7dfe10 100644
--- a/src/test/java/com/redhat/exhort/impl/ExhortApiIT.java
+++ b/src/test/java/io/github/guacsec/trustifyda/impl/ExhortApiIT.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.impl;
+package io.github.guacsec.trustifyda.impl;
-import static com.redhat.exhort.Provider.PROP_MATCH_MANIFEST_VERSIONS;
-import static com.redhat.exhort.image.ImageUtils.SKIP_VALIDATION_KEY;
-import static com.redhat.exhort.utils.PythonControllerBase.PROP_EXHORT_PYTHON_INSTALL_BEST_EFFORTS;
-import static com.redhat.exhort.utils.PythonControllerBase.PROP_EXHORT_PYTHON_VIRTUAL_ENV;
+import static io.github.guacsec.trustifyda.Provider.PROP_MATCH_MANIFEST_VERSIONS;
+import static io.github.guacsec.trustifyda.image.ImageUtils.SKIP_VALIDATION_KEY;
+import static io.github.guacsec.trustifyda.utils.PythonControllerBase.PROP_TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS;
+import static io.github.guacsec.trustifyda.utils.PythonControllerBase.PROP_TRUSTIFY_DA_PYTHON_VIRTUAL_ENV;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -30,17 +30,17 @@
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mockStatic;
-import com.redhat.exhort.Api;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.api.v4.AnalysisReport;
-import com.redhat.exhort.api.v4.ProviderReport;
-import com.redhat.exhort.image.ImageRef;
-import com.redhat.exhort.providers.HelperExtension;
-import com.redhat.exhort.providers.JavaScriptNpmProvider;
-import com.redhat.exhort.providers.JavaScriptPnpmProvider;
-import com.redhat.exhort.providers.JavaScriptYarnProvider;
-import com.redhat.exhort.tools.Ecosystem;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.Api;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
+import io.github.guacsec.trustifyda.api.v5.ProviderReport;
+import io.github.guacsec.trustifyda.image.ImageRef;
+import io.github.guacsec.trustifyda.providers.HelperExtension;
+import io.github.guacsec.trustifyda.providers.JavaScriptNpmProvider;
+import io.github.guacsec.trustifyda.providers.JavaScriptPnpmProvider;
+import io.github.guacsec.trustifyda.providers.JavaScriptYarnProvider;
+import io.github.guacsec.trustifyda.tools.Ecosystem;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -61,6 +61,7 @@
import java.util.function.Function;
import java.util.stream.Collectors;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -78,9 +79,12 @@
@Tag("IntegrationTest")
@ExtendWith(HelperExtension.class)
@ExtendWith(MockitoExtension.class)
-@SetSystemProperty(key = "RHDA_SOURCE", value = "exhort-java-api-it")
-@SetSystemProperty(key = "EXHORT_DEV_MODE", value = "false")
+@SetSystemProperty(key = "TRUST_DA_SOURCE", value = "trustify-da-java-client-it")
+@SetSystemProperty(key = "TRUSTIFY_DA_DEV_MODE", value = "false")
@RestoreSystemProperties
+// TODO: Re-enable this integration test when https://issues.redhat.com/browse/TC-3192 is resolved
+// The test is currently disabled due to backend service changes that prevent successful connections
+@Disabled("Backend service unavailable - see https://issues.redhat.com/browse/TC-3192")
class ExhortApiIT extends ExhortTest {
private static Api api;
@@ -318,8 +322,8 @@ private static T testImageAnalysis(Function, T> imageAnalysisF
private static void preparePythonEnvironment(Ecosystem.Type packageManager) {
if (packageManager.equals(Ecosystem.Type.PYTHON)) {
- System.setProperty(PROP_EXHORT_PYTHON_VIRTUAL_ENV, "true");
- System.setProperty(PROP_EXHORT_PYTHON_INSTALL_BEST_EFFORTS, "true");
+ System.setProperty(PROP_TRUSTIFY_DA_PYTHON_VIRTUAL_ENV, "true");
+ System.setProperty(PROP_TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS, "true");
System.setProperty(PROP_MATCH_MANIFEST_VERSIONS, "false");
}
}
diff --git a/src/test/java/com/redhat/exhort/impl/Exhort_Api_Test.java b/src/test/java/io/github/guacsec/trustifyda/impl/Exhort_Api_Test.java
similarity index 82%
rename from src/test/java/com/redhat/exhort/impl/Exhort_Api_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/impl/Exhort_Api_Test.java
index ced2a908..0c8eba4e 100644
--- a/src/test/java/com/redhat/exhort/impl/Exhort_Api_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/impl/Exhort_Api_Test.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.impl;
+package io.github.guacsec.trustifyda.impl;
-import static com.redhat.exhort.image.ImageUtils.SKIP_VALIDATION_KEY;
+import static io.github.guacsec.trustifyda.image.ImageUtils.SKIP_VALIDATION_KEY;
import static org.assertj.core.api.BDDAssertions.then;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -39,13 +39,13 @@
import com.fasterxml.jackson.databind.node.TextNode;
import com.github.packageurl.MalformedPackageURLException;
import com.github.packageurl.PackageURL;
-import com.redhat.exhort.Api;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.Provider;
-import com.redhat.exhort.api.v4.AnalysisReport;
-import com.redhat.exhort.image.ImageRef;
-import com.redhat.exhort.tools.Ecosystem;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.Api;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.Provider;
+import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
+import io.github.guacsec.trustifyda.image.ImageRef;
+import io.github.guacsec.trustifyda.tools.Ecosystem;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -66,7 +66,6 @@
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junitpioneer.jupiter.ClearSystemProperty;
@@ -80,34 +79,28 @@
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-@ClearSystemProperty(key = "EXHORT_SNYK_TOKEN")
-@ClearSystemProperty(key = "EXHORT_DEV_MODE")
-@ClearSystemProperty(key = "EXHORT_PROXY_URL")
-@ClearSystemProperty(key = "DEV_EXHORT_BACKEND_URL")
-@ClearSystemProperty(key = "RHDA_TOKEN")
-@ClearSystemProperty(key = "RHDA_SOURCE")
+@ClearSystemProperty(key = "TRUSTIFY_DA_DEV_MODE")
+@ClearSystemProperty(key = "TRUSTIFY_DA_PROXY_URL")
+@ClearSystemProperty(key = "DEV_TRUSTIFY_DA_BACKEND_URL")
+@ClearSystemProperty(key = "TRUST_DA_TOKEN")
+@ClearSystemProperty(key = "TRUST_DA_SOURCE")
@SuppressWarnings("unchecked")
class Exhort_Api_Test extends ExhortTest {
+ public static final String S_API_V_5_BATCH_ANALYSIS = "%s/api/v5/batch-analysis";
@Mock Provider mockProvider;
@Mock HttpClient mockHttpClient;
@InjectMocks ExhortApi exhortApiSut;
- @AfterEach
- void cleanup() {
- System.clearProperty("EXHORT_SNYK_TOKEN");
- }
-
@Test
- @SetSystemProperty(key = "EXHORT_SNYK_TOKEN", value = "snyk-token-from-env-var")
- @SetSystemProperty(key = "RHDA_TOKEN", value = "rhda-token-from-env-var")
- @SetSystemProperty(key = "RHDA_SOURCE", value = "rhda-source-from-env-var")
+ @SetSystemProperty(key = "TRUST_DA_TOKEN", value = "trust-da-token-from-env-var")
+ @SetSystemProperty(key = "TRUST_DA_SOURCE", value = "trust-da-source-from-env-var")
void stackAnalysisHtml_with_pom_xml_should_return_html_report_from_the_backend()
throws IOException, ExecutionException, InterruptedException {
// create a temporary pom.xml file
- var tmpFile = Files.createTempFile("exhort_test_pom_", ".xml");
+ var tmpFile = Files.createTempFile("TRUSTIFY_DA_test_pom_", ".xml");
try (var is =
getResourceAsStreamDecision(this.getClass(), "tst_manifests/maven/empty/pom.xml")) {
Files.write(tmpFile, is.readAllBytes());
@@ -122,12 +115,15 @@ void stackAnalysisHtml_with_pom_xml_should_return_html_report_from_the_backend()
r ->
r.headers().firstValue("Content-Type").get().equals("fake-content-type")
&& r.headers().firstValue("Accept").get().equals("text/html")
- &&
- // snyk token is set using the environment variable (annotation)
- r.headers().firstValue("ex-snyk-token").get().equals("snyk-token-from-env-var")
- && r.headers().firstValue("rhda-token").get().equals("rhda-token-from-env-var")
- && r.headers().firstValue("rhda-source").get().equals("rhda-source-from-env-var")
- && r.headers().firstValue("rhda-operation-type").get().equals("Stack Analysis")
+ && r.headers()
+ .firstValue("trust-da-token")
+ .get()
+ .equals("trust-da-token-from-env-var")
+ && r.headers()
+ .firstValue("trust-da-source")
+ .get()
+ .equals("trust-da-source-from-env-var")
+ && r.headers().firstValue("trust-da-operation-type").get().equals("Stack Analysis")
&& r.method().equals("POST");
// load dummy html and set as the expected analysis
@@ -162,13 +158,12 @@ void stackAnalysisHtml_with_pom_xml_should_return_html_report_from_the_backend()
}
@Test
- @SetSystemProperty(key = "EXHORT_SNYK_TOKEN", value = "snyk-token")
- @SetSystemProperty(key = "RHDA_TOKEN", value = "rhda-token")
- @SetSystemProperty(key = "RHDA_SOURCE", value = "rhda-source")
+ @SetSystemProperty(key = "TRUST_DA_TOKEN", value = "trust-da-token")
+ @SetSystemProperty(key = "TRUST_DA_SOURCE", value = "trust-da-source")
void stackAnalysis_with_pom_xml_should_return_json_object_from_the_backend()
throws IOException, ExecutionException, InterruptedException {
// create a temporary pom.xml file
- var tmpFile = Files.createTempFile("exhort_test_pom_", ".xml");
+ var tmpFile = Files.createTempFile("TRUSTIFY_DA_test_pom_", ".xml");
try (var is =
getResourceAsStreamDecision(this.getClass(), "tst_manifests/maven/empty/pom.xml")) {
Files.write(tmpFile, is.readAllBytes());
@@ -183,10 +178,9 @@ void stackAnalysis_with_pom_xml_should_return_json_object_from_the_backend()
r ->
r.headers().firstValue("Content-Type").get().equals("fake-content-type")
&& r.headers().firstValue("Accept").get().equals("application/json")
- && r.headers().firstValue("ex-snyk-token").get().equals("snyk-token")
- && r.headers().firstValue("rhda-token").get().equals("rhda-token")
- && r.headers().firstValue("rhda-source").get().equals("rhda-source")
- && r.headers().firstValue("rhda-operation-type").get().equals("Stack Analysis")
+ && r.headers().firstValue("trust-da-token").get().equals("trust-da-token")
+ && r.headers().firstValue("trust-da-source").get().equals("trust-da-source")
+ && r.headers().firstValue("trust-da-operation-type").get().equals("Stack Analysis")
&& r.method().equals("POST");
// load dummy json and set as the expected analysis
@@ -238,22 +232,26 @@ void componentAnalysis_with_pom_xml_should_return_json_object_from_the_backend()
.willReturn(new Provider.Content("fake-body-content".getBytes(), "fake-content-type"));
// we expect this to picked up because no env var to take precedence
- System.setProperty("EXHORT_SNYK_TOKEN", "snyk-token-from-property");
- System.setProperty("RHDA_TOKEN", "rhda-token-from-property");
- System.setProperty("RHDA_SOURCE", "rhda-source-from-property");
+ System.setProperty("TRUST_DA_TOKEN", "trust-da-token-from-property");
+ System.setProperty("TRUST_DA_SOURCE", "trust-da-source-from-property");
// create an argument matcher to make sure we mock the response for the right request
ArgumentMatcher matchesRequest =
r ->
r.headers().firstValue("Content-Type").get().equals("fake-content-type")
&& r.headers().firstValue("Accept").get().equals("application/json")
- &&
- // snyk token is set using properties which is picked up because no env var
- // specified
- r.headers().firstValue("ex-snyk-token").get().equals("snyk-token-from-property")
- && r.headers().firstValue("rhda-token").get().equals("rhda-token-from-property")
- && r.headers().firstValue("rhda-source").get().equals("rhda-source-from-property")
- && r.headers().firstValue("rhda-operation-type").get().equals("Component Analysis")
+ && r.headers()
+ .firstValue("trust-da-token")
+ .get()
+ .equals("trust-da-token-from-property")
+ && r.headers()
+ .firstValue("trust-da-source")
+ .get()
+ .equals("trust-da-source-from-property")
+ && r.headers()
+ .firstValue("trust-da-operation-type")
+ .get()
+ .equals("Component Analysis")
&& r.method().equals("POST");
// load dummy json and set as the expected analysis
@@ -308,7 +306,7 @@ void componentAnalysis_with_pom_xml_should_return_json_object_from_the_backend()
}
// create a temporary pom.xml file
- var tmpFile = Files.createTempFile("exhort_test_pom_", ".xml");
+ var tmpFile = Files.createTempFile("TRUSTIFY_DA_test_pom_", ".xml");
try (var is =
getResourceAsStreamDecision(this.getClass(), "tst_manifests/maven/empty/pom.xml")) {
Files.write(tmpFile, is.readAllBytes());
@@ -362,7 +360,7 @@ void componentAnalysis_with_pom_xml_should_return_json_object_from_the_backend()
void componentAnalysis_with_pom_xml_as_path_should_return_json_object_from_the_backend()
throws IOException, ExecutionException, InterruptedException {
// load pom.xml
- var tmpFile = Files.createTempFile("exhort_test_pom_", ".xml");
+ var tmpFile = Files.createTempFile("TRUSTIFY_DA_test_pom_", ".xml");
try (var is =
getResourceAsStreamDecision(this.getClass(), "tst_manifests/maven/empty/pom.xml")) {
Files.write(tmpFile, is.readAllBytes());
@@ -373,17 +371,12 @@ void componentAnalysis_with_pom_xml_as_path_should_return_json_object_from_the_b
.willReturn(new Provider.Content("fake-body-content".getBytes(), "fake-content-type"));
// we expect this to picked up because no env var to take precedence
- System.setProperty("EXHORT_SNYK_TOKEN", "snyk-token-from-property");
// create an argument matcher to make sure we mock the response for the right request
ArgumentMatcher matchesRequest =
r ->
r.headers().firstValue("Content-Type").get().equals("fake-content-type")
&& r.headers().firstValue("Accept").get().equals("application/json")
- &&
- // snyk token is set using properties which is picked up because no env var
- // specified
- r.headers().firstValue("ex-snyk-token").get().equals("snyk-token-from-property")
&& r.method().equals("POST");
// load dummy json and set as the expected analysis
@@ -419,47 +412,46 @@ void componentAnalysis_with_pom_xml_as_path_should_return_json_object_from_the_b
}
@Test
- @SetSystemProperty(key = "EXHORT_DEV_MODE", value = "true")
- @ClearSystemProperty(key = "DEV_EXHORT_BACKEND_URL")
+ @SetSystemProperty(key = "TRUSTIFY_DA_DEV_MODE", value = "true")
+ @ClearSystemProperty(key = "DEV_TRUSTIFY_DA_BACKEND_URL")
@RestoreSystemProperties
- void check_Exhort_Url_When_DEV_Mode_true_And_DEV_Exhort_Url_Set() {
+ void check_TRUSTIFY_DA_Url_When_DEV_Mode_true_And_DEV_TRUSTIFY_DA_Url_Set() {
String dummyUrl = "http://dummy-url";
- System.setProperty("DEV_EXHORT_BACKEND_URL", dummyUrl);
+ System.setProperty("DEV_TRUSTIFY_DA_BACKEND_URL", dummyUrl);
ExhortApi exhortApi = new ExhortApi();
then(exhortApi.getEndpoint()).isEqualTo(dummyUrl);
}
@Test
- @SetSystemProperty(key = "EXHORT_DEV_MODE", value = "false")
- void check_Exhort_Url_When_DEV_Mode_false_And_DEV_Exhort_Url_Set() {
+ @SetSystemProperty(key = "TRUSTIFY_DA_DEV_MODE", value = "false")
+ void check_TRUSTIFY_DA_Url_When_DEV_Mode_false_And_DEV_TRUSTIFY_DA_Url_Set() {
ExhortApi exhortApi = new ExhortApi();
then(exhortApi.getEndpoint()).isEqualTo(ExhortApi.DEFAULT_ENDPOINT);
}
@Test
- @SetSystemProperty(key = "EXHORT_DEV_MODE", value = "true")
- void check_Exhort_Url_When_DEV_Mode_true_Dev_Exhort_URL_Selected() {
+ @SetSystemProperty(key = "TRUSTIFY_DA_DEV_MODE", value = "true")
+ void check_TRUSTIFY_DA_Url_When_DEV_Mode_true_Dev_TRUSTIFY_DA_URL_Selected() {
ExhortApi exhortApi = new ExhortApi();
then(exhortApi.getEndpoint()).isEqualTo(ExhortApi.DEFAULT_ENDPOINT_DEV);
}
@Test
- @SetSystemProperty(key = "EXHORT_DEV_MODE", value = "false")
- void check_Exhort_Url_When_DEV_Mode_not_set_Then_Default_Exhort_URL_Selected() {
+ @SetSystemProperty(key = "TRUSTIFY_DA_DEV_MODE", value = "false")
+ void check_TRUSTIFY_DA_Url_When_DEV_Mode_not_set_Then_Default_TRUSTIFY_DA_URL_Selected() {
ExhortApi exhortApi = new ExhortApi();
then(exhortApi.getEndpoint()).isEqualTo(ExhortApi.DEFAULT_ENDPOINT);
}
@Test
- void check_Exhort_Url_When_Nothing_Set_Then_Default_Exhort_URL_Selected() {
+ void check_TRUSTIFY_DA_Url_When_Nothing_Set_Then_Default_TRUSTIFY_DA_URL_Selected() {
ExhortApi exhortApi = new ExhortApi();
then(exhortApi.getEndpoint()).isEqualTo(ExhortApi.DEFAULT_ENDPOINT);
}
@Test
- @SetSystemProperty(key = "EXHORT_SNYK_TOKEN", value = "snyk-token-from-env-var")
- @SetSystemProperty(key = "RHDA_TOKEN", value = "rhda-token-from-env-var")
- @SetSystemProperty(key = "RHDA_SOURCE", value = "rhda-source-from-env-var")
+ @SetSystemProperty(key = "TRUST_DA_TOKEN", value = "trust-da-token-from-env-var")
+ @SetSystemProperty(key = "TRUST_DA_SOURCE", value = "trust-da-source-from-env-var")
@SetSystemProperty(key = SKIP_VALIDATION_KEY, value = "true")
void test_image_analysis()
throws IOException, ExecutionException, InterruptedException, MalformedPackageURLException {
@@ -514,17 +506,24 @@ void test_image_analysis()
r.uri()
.equals(
URI.create(
- String.format(
- "%s/api/v4/batch-analysis", exhortApiSut.getEndpoint())))
+ String.format(S_API_V_5_BATCH_ANALYSIS, exhortApiSut.getEndpoint())))
&& r.headers().firstValue("Content-Type").get().equals(Api.CYCLONEDX_MEDIA_TYPE)
&& r.headers()
.firstValue("Accept")
.get()
.equals(Api.MediaType.APPLICATION_JSON.toString())
- && r.headers().firstValue("ex-snyk-token").get().equals("snyk-token-from-env-var")
- && r.headers().firstValue("rhda-token").get().equals("rhda-token-from-env-var")
- && r.headers().firstValue("rhda-source").get().equals("rhda-source-from-env-var")
- && r.headers().firstValue("rhda-operation-type").get().equals("Image Analysis")
+ && r.headers()
+ .firstValue("trust-da-token")
+ .get()
+ .equals("trust-da-token-from-env-var")
+ && r.headers()
+ .firstValue("trust-da-source")
+ .get()
+ .equals("trust-da-source-from-env-var")
+ && r.headers()
+ .firstValue("trust-da-operation-type")
+ .get()
+ .equals("Image Analysis")
&& r.method().equals("POST");
when(mockHttpClient.sendAsync(argThat(matchesRequest), any()))
@@ -557,9 +556,8 @@ void test_image_analysis()
}
@Test
- @SetSystemProperty(key = "EXHORT_SNYK_TOKEN", value = "snyk-token-from-env-var")
- @SetSystemProperty(key = "RHDA_TOKEN", value = "rhda-token-from-env-var")
- @SetSystemProperty(key = "RHDA_SOURCE", value = "rhda-source-from-env-var")
+ @SetSystemProperty(key = "TRUST_DA_TOKEN", value = "trust-da-token-from-env-var")
+ @SetSystemProperty(key = "TRUST_DA_SOURCE", value = "trust-da-source-from-env-var")
@SetSystemProperty(key = SKIP_VALIDATION_KEY, value = "true")
void imageAnalysisHtml() throws IOException, ExecutionException, InterruptedException {
try (MockedStatic mock = Mockito.mockStatic(Operations.class);
@@ -613,17 +611,24 @@ void imageAnalysisHtml() throws IOException, ExecutionException, InterruptedExce
r.uri()
.equals(
URI.create(
- String.format(
- "%s/api/v4/batch-analysis", exhortApiSut.getEndpoint())))
+ String.format(S_API_V_5_BATCH_ANALYSIS, exhortApiSut.getEndpoint())))
&& r.headers().firstValue("Content-Type").get().equals(Api.CYCLONEDX_MEDIA_TYPE)
&& r.headers()
.firstValue("Accept")
.get()
.equals(Api.MediaType.TEXT_HTML.toString())
- && r.headers().firstValue("ex-snyk-token").get().equals("snyk-token-from-env-var")
- && r.headers().firstValue("rhda-token").get().equals("rhda-token-from-env-var")
- && r.headers().firstValue("rhda-source").get().equals("rhda-source-from-env-var")
- && r.headers().firstValue("rhda-operation-type").get().equals("Image Analysis")
+ && r.headers()
+ .firstValue("trust-da-token")
+ .get()
+ .equals("trust-da-token-from-env-var")
+ && r.headers()
+ .firstValue("trust-da-source")
+ .get()
+ .equals("trust-da-source-from-env-var")
+ && r.headers()
+ .firstValue("trust-da-operation-type")
+ .get()
+ .equals("Image Analysis")
&& r.method().equals("POST");
when(mockHttpClient.sendAsync(argThat(matchesRequest), any()))
@@ -635,9 +640,8 @@ void imageAnalysisHtml() throws IOException, ExecutionException, InterruptedExce
}
@Test
- @SetSystemProperty(key = "EXHORT_SNYK_TOKEN", value = "snyk-token-from-env-var")
- @SetSystemProperty(key = "RHDA_TOKEN", value = "rhda-token-from-env-var")
- @SetSystemProperty(key = "RHDA_SOURCE", value = "rhda-source-from-env-var")
+ @SetSystemProperty(key = "TRUST_DA_TOKEN", value = "trust-da-token-from-env-var")
+ @SetSystemProperty(key = "TRUST_DA_SOURCE", value = "trust-da-source-from-env-var")
void test_perform_batch_analysis()
throws IOException, MalformedPackageURLException, ExecutionException, InterruptedException {
try (var is = getResourceAsStreamDecision(this.getClass(), "msc/image/image_sbom.json")) {
@@ -651,17 +655,24 @@ void test_perform_batch_analysis()
r.uri()
.equals(
URI.create(
- String.format(
- "%s/api/v4/batch-analysis", exhortApiSut.getEndpoint())))
+ String.format(S_API_V_5_BATCH_ANALYSIS, exhortApiSut.getEndpoint())))
&& r.headers().firstValue("Content-Type").get().equals(Api.CYCLONEDX_MEDIA_TYPE)
&& r.headers()
.firstValue("Accept")
.get()
.equals(Api.MediaType.APPLICATION_JSON.toString())
- && r.headers().firstValue("ex-snyk-token").get().equals("snyk-token-from-env-var")
- && r.headers().firstValue("rhda-token").get().equals("rhda-token-from-env-var")
- && r.headers().firstValue("rhda-source").get().equals("rhda-source-from-env-var")
- && r.headers().firstValue("rhda-operation-type").get().equals("Image Analysis")
+ && r.headers()
+ .firstValue("trust-da-token")
+ .get()
+ .equals("trust-da-token-from-env-var")
+ && r.headers()
+ .firstValue("trust-da-source")
+ .get()
+ .equals("trust-da-source-from-env-var")
+ && r.headers()
+ .firstValue("trust-da-operation-type")
+ .get()
+ .equals("Image Analysis")
&& r.method().equals("POST");
var imageRef =
@@ -806,7 +817,7 @@ void test_get_batch_analysis_reports_from_response() {
}
@Test
- @SetSystemProperty(key = "EXHORT_PROXY_URL", value = "http://proxy.example.com:8080")
+ @SetSystemProperty(key = "TRUSTIFY_DA_PROXY_URL", value = "http://proxy.example.com:8080")
void test_create_httpclient_applies_http_proxyselector() {
HttpClient client = ExhortApi.createHttpClient();
Optional selectorOpt = client.proxy();
@@ -824,7 +835,7 @@ void test_create_httpclient_applies_http_proxyselector() {
}
@Test
- @SetSystemProperty(key = "EXHORT_PROXY_URL", value = "://bad-url")
+ @SetSystemProperty(key = "TRUSTIFY_DA_PROXY_URL", value = "://bad-url")
void test_create_httpclient_should_fallback_to_direct_when_proxyurl_is_invalid() {
HttpClient client = ExhortApi.createHttpClient();
Optional proxySelector = client.proxy();
diff --git a/src/test/java/com/redhat/exhort/providers/GoModulesMainModuleVersionTest.java b/src/test/java/io/github/guacsec/trustifyda/providers/GoModulesMainModuleVersionTest.java
similarity index 93%
rename from src/test/java/com/redhat/exhort/providers/GoModulesMainModuleVersionTest.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/GoModulesMainModuleVersionTest.java
index e1f11cec..3553668d 100644
--- a/src/test/java/com/redhat/exhort/providers/GoModulesMainModuleVersionTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/GoModulesMainModuleVersionTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -40,9 +40,9 @@ class GoModulesMainModuleVersionTest {
void setUp() {
try {
this.goModulesProvider = new GoModulesProvider(null);
- this.testGitRepo = Files.createTempDirectory("exhort_tmp");
+ this.testGitRepo = Files.createTempDirectory("TRUSTIFY_DA_tmp");
gitInit();
- this.noGitRepo = Files.createTempDirectory("exhort_tmp");
+ this.noGitRepo = Files.createTempDirectory("TRUSTIFY_DA_tmp");
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/src/test/java/com/redhat/exhort/providers/Golang_Modules_Provider_Test.java b/src/test/java/io/github/guacsec/trustifyda/providers/Golang_Modules_Provider_Test.java
similarity index 93%
rename from src/test/java/com/redhat/exhort/providers/Golang_Modules_Provider_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/Golang_Modules_Provider_Test.java
index 13edfa79..a940f5f9 100644
--- a/src/test/java/com/redhat/exhort/providers/Golang_Modules_Provider_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/Golang_Modules_Provider_Test.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
-import static com.redhat.exhort.Provider.PROP_MATCH_MANIFEST_VERSIONS;
+import static io.github.guacsec.trustifyda.Provider.PROP_MATCH_MANIFEST_VERSIONS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -28,8 +28,8 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import com.redhat.exhort.Api;
-import com.redhat.exhort.ExhortTest;
+import io.github.guacsec.trustifyda.Api;
+import io.github.guacsec.trustifyda.ExhortTest;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -64,7 +64,7 @@ static Stream testFolders() {
@MethodSource("testFolders")
void test_the_provideStack(String testFolder) throws IOException {
// create temp file hosting our sut package.json
- var tmpGoModulesDir = Files.createTempDirectory("exhort_test_");
+ var tmpGoModulesDir = Files.createTempDirectory("TRUSTIFY_DA_test_");
var tmpGolangFile = Files.createFile(tmpGoModulesDir.resolve("go.mod"));
try (var is =
getResourceAsStreamDecision(
@@ -94,7 +94,7 @@ void test_the_provideStack(String testFolder) throws IOException {
@MethodSource("testFolders")
void test_the_provideComponent(String testFolder) throws IOException {
// create temp file hosting our sut package.json
- var tmpGoModulesDir = Files.createTempDirectory("exhort_test_");
+ var tmpGoModulesDir = Files.createTempDirectory("TRUSTIFY_DA_test_");
var tmpGolangFile = Files.createFile(tmpGoModulesDir.resolve("go.mod"));
try (var is =
getResourceAsStreamDecision(
@@ -167,7 +167,7 @@ void Test_Golang_Modules_with_Match_Manifest_Version(boolean MatchManifestVersio
@Test
void Test_Golang_MvS_Logic_Disabled() throws IOException {
- System.setProperty(GoModulesProvider.PROP_EXHORT_GO_MVS_LOGIC_ENABLED, "false");
+ System.setProperty(GoModulesProvider.PROP_TRUSTIFY_DA_GO_MVS_LOGIC_ENABLED, "false");
String goModPath = getFileFromResource("go.mod", "msc/golang/mvs_logic/go.mod");
Path manifest = Path.of(goModPath);
GoModulesProvider goModulesProvider = new GoModulesProvider(manifest);
@@ -184,13 +184,13 @@ void Test_Golang_MvS_Logic_Disabled() throws IOException {
.filter(str -> str.contains("\"ref\" : \"pkg:golang/go.opencensus.io@"))
.count());
- System.clearProperty(GoModulesProvider.PROP_EXHORT_GO_MVS_LOGIC_ENABLED);
+ System.clearProperty(GoModulesProvider.PROP_TRUSTIFY_DA_GO_MVS_LOGIC_ENABLED);
resultSbom =
dropIgnoredKeepFormat(
goModulesProvider.getDependenciesSbom(manifest, true).getAsJsonString());
// check that there is more than one version of package golang/go.opencensus.io in sbom for
- // EXHORT_GO_MVS_LOGIC_ENABLED=false
+ // TRUSTIFY_DA_GO_MVS_LOGIC_ENABLED=false
assertTrue(
Arrays.stream(resultSbom.split(System.lineSeparator()))
.filter(str -> str.contains("\"ref\" : \"pkg:golang/go.opencensus.io@"))
diff --git a/src/test/java/com/redhat/exhort/providers/Gradle_Groovy_Provider_Test.java b/src/test/java/io/github/guacsec/trustifyda/providers/Gradle_Groovy_Provider_Test.java
similarity index 95%
rename from src/test/java/com/redhat/exhort/providers/Gradle_Groovy_Provider_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/Gradle_Groovy_Provider_Test.java
index 3cfe1d63..6ee9fad4 100644
--- a/src/test/java/com/redhat/exhort/providers/Gradle_Groovy_Provider_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/Gradle_Groovy_Provider_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
diff --git a/src/test/java/com/redhat/exhort/providers/Gradle_Kotlin_Provider_Test.java b/src/test/java/io/github/guacsec/trustifyda/providers/Gradle_Kotlin_Provider_Test.java
similarity index 95%
rename from src/test/java/com/redhat/exhort/providers/Gradle_Kotlin_Provider_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/Gradle_Kotlin_Provider_Test.java
index 1980e504..e75fb2d0 100644
--- a/src/test/java/com/redhat/exhort/providers/Gradle_Kotlin_Provider_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/Gradle_Kotlin_Provider_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
diff --git a/src/test/java/com/redhat/exhort/providers/Gradle_Provider_Test.java b/src/test/java/io/github/guacsec/trustifyda/providers/Gradle_Provider_Test.java
similarity index 96%
rename from src/test/java/com/redhat/exhort/providers/Gradle_Provider_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/Gradle_Provider_Test.java
index 7d08bcaa..ecd5c23e 100644
--- a/src/test/java/com/redhat/exhort/providers/Gradle_Provider_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/Gradle_Provider_Test.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mockStatic;
-import com.redhat.exhort.Api;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.Api;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -60,7 +60,7 @@ static Stream testFolders() {
@MethodSource("testFolders")
void test_the_provideStack(String testFolder) throws IOException {
// create temp file hosting our sut build.gradle
- var tmpGradleDir = Files.createTempDirectory("exhort_test_");
+ var tmpGradleDir = Files.createTempDirectory("TRUSTIFY_DA_test_");
var tmpGradleFile = Files.createFile(tmpGradleDir.resolve(getManifestName()));
try (var is =
getClass()
@@ -163,7 +163,7 @@ void test_the_provideStack(String testFolder) throws IOException {
@MethodSource("testFolders")
void test_the_provideComponent(String testFolder) throws IOException {
// create temp file hosting our sut build.gradle
- var tmpGradleDir = Files.createTempDirectory("exhort_test_");
+ var tmpGradleDir = Files.createTempDirectory("TRUSTIFY_DA_test_");
var tmpGradleFile = Files.createFile(tmpGradleDir.resolve(getManifestName()));
try (var is =
getClass()
diff --git a/src/test/java/com/redhat/exhort/providers/HelperExtension.java b/src/test/java/io/github/guacsec/trustifyda/providers/HelperExtension.java
similarity index 92%
rename from src/test/java/com/redhat/exhort/providers/HelperExtension.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/HelperExtension.java
index 177e7dab..24c2b089 100644
--- a/src/test/java/com/redhat/exhort/providers/HelperExtension.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/HelperExtension.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
-import com.redhat.exhort.impl.ExhortApi;
-import com.redhat.exhort.logging.LoggersFactory;
+import io.github.guacsec.trustifyda.impl.ExhortApi;
+import io.github.guacsec.trustifyda.logging.LoggersFactory;
import java.util.logging.Logger;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
diff --git a/src/test/java/com/redhat/exhort/providers/Java_Envs_Test.java b/src/test/java/io/github/guacsec/trustifyda/providers/Java_Envs_Test.java
similarity index 95%
rename from src/test/java/com/redhat/exhort/providers/Java_Envs_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/Java_Envs_Test.java
index 63b1eaca..9631356a 100644
--- a/src/test/java/com/redhat/exhort/providers/Java_Envs_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/Java_Envs_Test.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-import com.redhat.exhort.utils.Environment;
+import io.github.guacsec.trustifyda.utils.Environment;
import java.util.Collections;
import org.junit.jupiter.api.Test;
import org.junitpioneer.jupiter.SetSystemProperty;
diff --git a/src/test/java/com/redhat/exhort/providers/Java_Maven_Provider_Test.java b/src/test/java/io/github/guacsec/trustifyda/providers/Java_Maven_Provider_Test.java
similarity index 96%
rename from src/test/java/com/redhat/exhort/providers/Java_Maven_Provider_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/Java_Maven_Provider_Test.java
index 9c42d892..ed70a06d 100644
--- a/src/test/java/com/redhat/exhort/providers/Java_Maven_Provider_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/Java_Maven_Provider_Test.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mockStatic;
-import com.redhat.exhort.Api;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.Api;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -63,7 +63,7 @@ static Stream testFolders() {
@MethodSource("testFolders")
void test_the_provideStack(String testFolder) throws IOException {
// create temp file hosting our sut pom.xml
- var tmpPomFile = Files.createTempFile("exhort_test_", ".xml");
+ var tmpPomFile = Files.createTempFile("TRUSTIFY_DA_test_", ".xml");
try (var is =
getResourceAsStreamDecision(
getClass(), String.format("tst_manifests/maven/%s/pom.xml", testFolder))) {
@@ -168,7 +168,7 @@ void test_the_provideComponent(String testFolder) throws IOException {
void test_the_provideComponent_With_Path(String testFolder) throws IOException {
// load the pom target pom file
// create temp file hosting our sut pom.xml
- var tmpPomFile = Files.createTempFile("exhort_test_", ".xml");
+ var tmpPomFile = Files.createTempFile("TRUSTIFY_DA_test_", ".xml");
try (var is =
getResourceAsStreamDecision(
getClass(), String.format("tst_manifests/maven/%s/pom.xml", testFolder))) {
diff --git a/src/test/java/com/redhat/exhort/providers/Javascript_Envs_Test.java b/src/test/java/io/github/guacsec/trustifyda/providers/Javascript_Envs_Test.java
similarity index 95%
rename from src/test/java/com/redhat/exhort/providers/Javascript_Envs_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/Javascript_Envs_Test.java
index 151fcf28..9e34eaba 100644
--- a/src/test/java/com/redhat/exhort/providers/Javascript_Envs_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/Javascript_Envs_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -22,8 +22,8 @@
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mockStatic;
-import com.redhat.exhort.tools.Operations;
-import com.redhat.exhort.utils.Environment;
+import io.github.guacsec.trustifyda.tools.Operations;
+import io.github.guacsec.trustifyda.utils.Environment;
import java.io.File;
import java.nio.file.Path;
import java.util.Collections;
diff --git a/src/test/java/com/redhat/exhort/providers/Javascript_Provider_Test.java b/src/test/java/io/github/guacsec/trustifyda/providers/Javascript_Provider_Test.java
similarity index 96%
rename from src/test/java/com/redhat/exhort/providers/Javascript_Provider_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/Javascript_Provider_Test.java
index f7664eda..f81fe025 100644
--- a/src/test/java/com/redhat/exhort/providers/Javascript_Provider_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/Javascript_Provider_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
@@ -24,10 +24,10 @@
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mockStatic;
-import com.redhat.exhort.Api;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.tools.Ecosystem;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.Api;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.tools.Ecosystem;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -61,7 +61,7 @@ static Stream testCases() {
@MethodSource({"testCases"})
void test_the_provideStack(String pkgManager, String testFolder) throws IOException {
// create temp file hosting our sut package.json
- var tmpFolder = Files.createTempDirectory("exhort_test_");
+ var tmpFolder = Files.createTempDirectory("TRUSTIFY_DA_test_");
var tmpFile = Files.createFile(tmpFolder.resolve("package.json"));
var tmpLockFile = Files.createFile(tmpFolder.resolve(getLockFile(pkgManager)));
try (var is =
@@ -151,7 +151,7 @@ void test_the_provideComponent_with_Path(String pkgManager, String testFolder) t
// load the pom target pom file
// create temp file hosting our sut package.json
- var tmpFolder = Files.createTempDirectory("exhort_test_");
+ var tmpFolder = Files.createTempDirectory("TRUSTIFY_DA_test_");
var tmpFile = Files.createFile(tmpFolder.resolve("package.json"));
try (var is =
diff --git a/src/test/java/com/redhat/exhort/providers/PythonEnvironmentExtension.java b/src/test/java/io/github/guacsec/trustifyda/providers/PythonEnvironmentExtension.java
similarity index 93%
rename from src/test/java/com/redhat/exhort/providers/PythonEnvironmentExtension.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/PythonEnvironmentExtension.java
index f462211d..32e0d464 100644
--- a/src/test/java/com/redhat/exhort/providers/PythonEnvironmentExtension.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/PythonEnvironmentExtension.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
-import com.redhat.exhort.tools.Operations;
-import com.redhat.exhort.utils.PythonControllerBase;
-import com.redhat.exhort.utils.PythonControllerTestEnv;
+import io.github.guacsec.trustifyda.tools.Operations;
+import io.github.guacsec.trustifyda.utils.PythonControllerBase;
+import io.github.guacsec.trustifyda.utils.PythonControllerTestEnv;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -62,7 +62,7 @@ public void beforeAll(ExtensionContext extensionContext) {
String pip3 = Operations.getCustomPathOrElse("pip3");
this.pythonController = new PythonControllerTestEnv(python3, pip3);
log.log(System.Logger.Level.INFO, "Finished Preparing environment for testing");
- // var tmpPythonModuleDir = Files.createTempDirectory("exhort_test_");
+ // var tmpPythonModuleDir = Files.createTempDirectory("TRUSTIFY_DA_test_");
// var tmpPythonFile = Files.createFile(tmpPythonModuleDir.resolve("requirements.txt"));
// Python_Provider_Test.testFolders().forEach( test -> {
// try (var is =
diff --git a/src/test/java/com/redhat/exhort/providers/Python_Provider_Test.java b/src/test/java/io/github/guacsec/trustifyda/providers/Python_Provider_Test.java
similarity index 85%
rename from src/test/java/com/redhat/exhort/providers/Python_Provider_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/providers/Python_Provider_Test.java
index 59e13fd0..efec78bb 100644
--- a/src/test/java/com/redhat/exhort/providers/Python_Provider_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/providers/Python_Provider_Test.java
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.providers;
+package io.github.guacsec.trustifyda.providers;
-import static com.redhat.exhort.utils.PythonControllerBase.PROP_EXHORT_PIP_FREEZE;
-import static com.redhat.exhort.utils.PythonControllerBase.PROP_EXHORT_PIP_PIPDEPTREE;
-import static com.redhat.exhort.utils.PythonControllerBase.PROP_EXHORT_PIP_SHOW;
-import static com.redhat.exhort.utils.PythonControllerBase.PROP_EXHORT_PIP_USE_DEP_TREE;
+import static io.github.guacsec.trustifyda.utils.PythonControllerBase.PROP_TRUSTIFY_DA_PIP_FREEZE;
+import static io.github.guacsec.trustifyda.utils.PythonControllerBase.PROP_TRUSTIFY_DA_PIP_PIPDEPTREE;
+import static io.github.guacsec.trustifyda.utils.PythonControllerBase.PROP_TRUSTIFY_DA_PIP_SHOW;
+import static io.github.guacsec.trustifyda.utils.PythonControllerBase.PROP_TRUSTIFY_DA_PIP_USE_DEP_TREE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import com.redhat.exhort.Api;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.utils.PythonControllerBase;
+import io.github.guacsec.trustifyda.Api;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.utils.PythonControllerBase;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -57,7 +57,7 @@ public Python_Provider_Test(PythonControllerBase pythonController) {
@MethodSource("testFolders")
void test_the_provideStack(String testFolder) throws IOException {
// create temp file hosting our sut package.json
- var tmpPythonModuleDir = Files.createTempDirectory("exhort_test_");
+ var tmpPythonModuleDir = Files.createTempDirectory("trustify_da_test_");
var tmpPythonFile = Files.createFile(tmpPythonModuleDir.resolve("requirements.txt"));
var provider = new PythonPipProvider(tmpPythonFile);
provider.setPythonController(pythonController);
@@ -110,11 +110,11 @@ void test_the_provideComponent(String testFolder) throws IOException {
@ParameterizedTest
@MethodSource("testFolders")
- @SetSystemProperty(key = PythonControllerBase.PROP_EXHORT_PYTHON_VIRTUAL_ENV, value = "true")
+ @SetSystemProperty(key = PythonControllerBase.PROP_TRUSTIFY_DA_PYTHON_VIRTUAL_ENV, value = "true")
@RestoreSystemProperties
void test_the_provideStack_with_properties(String testFolder) throws IOException {
// create temp file hosting our sut package.json
- var tmpPythonModuleDir = Files.createTempDirectory("exhort_test_");
+ var tmpPythonModuleDir = Files.createTempDirectory("trustify_da_test_");
var tmpPythonFile = Files.createFile(tmpPythonModuleDir.resolve("requirements.txt"));
try (var is =
getResourceAsStreamDecision(
@@ -135,8 +135,8 @@ void test_the_provideStack_with_properties(String testFolder) throws IOException
String pipFreezeContent = this.getStringFromFile("tst_manifests/pip/pip-freeze-all.txt");
String base64PipShow = new String(Base64.getEncoder().encode(pipShowContent.getBytes()));
String base64PipFreeze = new String(Base64.getEncoder().encode(pipFreezeContent.getBytes()));
- System.setProperty(PROP_EXHORT_PIP_SHOW, base64PipShow);
- System.setProperty(PROP_EXHORT_PIP_FREEZE, base64PipFreeze);
+ System.setProperty(PROP_TRUSTIFY_DA_PIP_SHOW, base64PipShow);
+ System.setProperty(PROP_TRUSTIFY_DA_PIP_FREEZE, base64PipFreeze);
// cleanup
Files.deleteIfExists(tmpPythonFile);
Files.deleteIfExists(tmpPythonModuleDir);
@@ -147,12 +147,12 @@ void test_the_provideStack_with_properties(String testFolder) throws IOException
@ParameterizedTest
@MethodSource("testFolders")
- @SetSystemProperty(key = PythonControllerBase.PROP_EXHORT_PYTHON_VIRTUAL_ENV, value = "true")
- @SetSystemProperty(key = PROP_EXHORT_PIP_USE_DEP_TREE, value = "true")
+ @SetSystemProperty(key = PythonControllerBase.PROP_TRUSTIFY_DA_PYTHON_VIRTUAL_ENV, value = "true")
+ @SetSystemProperty(key = PROP_TRUSTIFY_DA_PIP_USE_DEP_TREE, value = "true")
@RestoreSystemProperties
void test_the_provideStack_with_pipdeptree(String testFolder) throws IOException {
// create temp file hosting our sut package.json
- var tmpPythonModuleDir = Files.createTempDirectory("exhort_test_");
+ var tmpPythonModuleDir = Files.createTempDirectory("trustify_da_test_");
var tmpPythonFile = Files.createFile(tmpPythonModuleDir.resolve("requirements.txt"));
try (var is =
getResourceAsStreamDecision(
@@ -171,7 +171,7 @@ void test_the_provideStack_with_pipdeptree(String testFolder) throws IOException
var content = new PythonPipProvider(tmpPythonFile).provideStack();
String pipdeptreeContent = this.getStringFromFile("tst_manifests/pip/pipdeptree.json");
String base64Pipdeptree = new String(Base64.getEncoder().encode(pipdeptreeContent.getBytes()));
- System.setProperty(PROP_EXHORT_PIP_PIPDEPTREE, base64Pipdeptree);
+ System.setProperty(PROP_TRUSTIFY_DA_PIP_PIPDEPTREE, base64Pipdeptree);
// cleanup
Files.deleteIfExists(tmpPythonFile);
Files.deleteIfExists(tmpPythonModuleDir);
@@ -200,8 +200,8 @@ void test_the_provideComponent_with_properties(String testFolder) throws IOExcep
String pipFreezeContent = this.getStringFromFile("tst_manifests/pip/pip-freeze-all.txt");
String base64PipShow = new String(Base64.getEncoder().encode(pipShowContent.getBytes()));
String base64PipFreeze = new String(Base64.getEncoder().encode(pipFreezeContent.getBytes()));
- System.setProperty(PROP_EXHORT_PIP_SHOW, base64PipShow);
- System.setProperty(PROP_EXHORT_PIP_FREEZE, base64PipFreeze);
+ System.setProperty(PROP_TRUSTIFY_DA_PIP_SHOW, base64PipShow);
+ System.setProperty(PROP_TRUSTIFY_DA_PIP_FREEZE, base64PipFreeze);
// when providing component content for our pom
var content = new PythonPipProvider(Path.of(targetRequirements)).provideComponent();
// verify expected SBOM is returned
diff --git a/src/test/java/com/redhat/exhort/tools/Ecosystem_Test.java b/src/test/java/io/github/guacsec/trustifyda/tools/Ecosystem_Test.java
similarity index 93%
rename from src/test/java/com/redhat/exhort/tools/Ecosystem_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/tools/Ecosystem_Test.java
index 7de7cd1e..bd066b84 100644
--- a/src/test/java/com/redhat/exhort/tools/Ecosystem_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/tools/Ecosystem_Test.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.tools;
+package io.github.guacsec.trustifyda.tools;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import com.redhat.exhort.providers.JavaMavenProvider;
+import io.github.guacsec.trustifyda.providers.JavaMavenProvider;
import java.nio.file.Path;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/redhat/exhort/tools/OperationsTest.java b/src/test/java/io/github/guacsec/trustifyda/tools/OperationsTest.java
similarity index 97%
rename from src/test/java/com/redhat/exhort/tools/OperationsTest.java
rename to src/test/java/io/github/guacsec/trustifyda/tools/OperationsTest.java
index 4cdfecdb..8aefaf38 100644
--- a/src/test/java/com/redhat/exhort/tools/OperationsTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/tools/OperationsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.tools;
+package io.github.guacsec.trustifyda.tools;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.assertj.core.api.Assertions.assertThatRuntimeException;
diff --git a/src/test/java/com/redhat/exhort/tools/Operations_Test.java b/src/test/java/io/github/guacsec/trustifyda/tools/Operations_Test.java
similarity index 93%
rename from src/test/java/com/redhat/exhort/tools/Operations_Test.java
rename to src/test/java/io/github/guacsec/trustifyda/tools/Operations_Test.java
index 5f87053c..823229f9 100644
--- a/src/test/java/com/redhat/exhort/tools/Operations_Test.java
+++ b/src/test/java/io/github/guacsec/trustifyda/tools/Operations_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.tools;
+package io.github.guacsec.trustifyda.tools;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
@@ -42,7 +42,7 @@ void when_running_process_for_non_existing_command_should_throw_runtime_exceptio
class Test_getCustomPathOrElse {
@Test
- @SetSystemProperty(key = "EXHORT_MADE_UP_CMD_PATH", value = "/path/to/made_up_cmd")
+ @SetSystemProperty(key = "TRUSTIFY_DA_MADE_UP_CMD_PATH", value = "/path/to/made_up_cmd")
void when_custom_path_exists_as_property() {
assertThat(Operations.getCustomPathOrElse("made-up cmd")).isEqualTo("/path/to/made_up_cmd");
}
diff --git a/src/test/java/com/redhat/exhort/utils/PythonControllerBaseTest.java b/src/test/java/io/github/guacsec/trustifyda/utils/PythonControllerBaseTest.java
similarity index 99%
rename from src/test/java/com/redhat/exhort/utils/PythonControllerBaseTest.java
rename to src/test/java/io/github/guacsec/trustifyda/utils/PythonControllerBaseTest.java
index 0bce9e7c..729a0dce 100644
--- a/src/test/java/com/redhat/exhort/utils/PythonControllerBaseTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/utils/PythonControllerBaseTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import com.redhat.exhort.ExhortTest;
+import io.github.guacsec.trustifyda.ExhortTest;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
diff --git a/src/test/java/com/redhat/exhort/utils/PythonControllerRealEnvTest.java b/src/test/java/io/github/guacsec/trustifyda/utils/PythonControllerRealEnvTest.java
similarity index 96%
rename from src/test/java/com/redhat/exhort/utils/PythonControllerRealEnvTest.java
rename to src/test/java/io/github/guacsec/trustifyda/utils/PythonControllerRealEnvTest.java
index 5e01c07d..378cd1da 100644
--- a/src/test/java/com/redhat/exhort/utils/PythonControllerRealEnvTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/utils/PythonControllerRealEnvTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
-import static com.redhat.exhort.Provider.PROP_MATCH_MANIFEST_VERSIONS;
-import static com.redhat.exhort.utils.PythonControllerBaseTest.matchCommandPipFreeze;
-import static com.redhat.exhort.utils.PythonControllerBaseTest.matchCommandPipShow;
+import static io.github.guacsec.trustifyda.Provider.PROP_MATCH_MANIFEST_VERSIONS;
+import static io.github.guacsec.trustifyda.utils.PythonControllerBaseTest.matchCommandPipFreeze;
+import static io.github.guacsec.trustifyda.utils.PythonControllerBaseTest.matchCommandPipShow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -26,8 +26,8 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
-import com.redhat.exhort.ExhortTest;
-import com.redhat.exhort.tools.Operations;
+import io.github.guacsec.trustifyda.ExhortTest;
+import io.github.guacsec.trustifyda.tools.Operations;
import java.nio.file.Path;
import java.util.HashSet;
import java.util.List;
diff --git a/src/test/java/com/redhat/exhort/utils/PythonControllerVirtualEnvTest.java b/src/test/java/io/github/guacsec/trustifyda/utils/PythonControllerVirtualEnvTest.java
similarity index 90%
rename from src/test/java/com/redhat/exhort/utils/PythonControllerVirtualEnvTest.java
rename to src/test/java/io/github/guacsec/trustifyda/utils/PythonControllerVirtualEnvTest.java
index 1027f576..a116589c 100644
--- a/src/test/java/com/redhat/exhort/utils/PythonControllerVirtualEnvTest.java
+++ b/src/test/java/io/github/guacsec/trustifyda/utils/PythonControllerVirtualEnvTest.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.redhat.exhort.utils;
+package io.github.guacsec.trustifyda.utils;
-import static com.redhat.exhort.Provider.PROP_MATCH_MANIFEST_VERSIONS;
-import static com.redhat.exhort.utils.PythonControllerBase.PROP_EXHORT_PYTHON_INSTALL_BEST_EFFORTS;
+import static io.github.guacsec.trustifyda.Provider.PROP_MATCH_MANIFEST_VERSIONS;
+import static io.github.guacsec.trustifyda.utils.PythonControllerBase.PROP_TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -29,7 +29,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.redhat.exhort.ExhortTest;
+import io.github.guacsec.trustifyda.ExhortTest;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -58,7 +58,7 @@ static void setUp() {
@Test
@RestoreSystemProperties
void test_Virtual_Environment_Install_Best_Efforts() throws JsonProcessingException {
- System.setProperty(PROP_EXHORT_PYTHON_INSTALL_BEST_EFFORTS, "true");
+ System.setProperty(PROP_TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS, "true");
System.setProperty(PROP_MATCH_MANIFEST_VERSIONS, "false");
String requirementsTxt =
getFileFromString("requirements.txt", "flask==9.9.9\ndeprecated==15.15.99\n");
@@ -70,7 +70,7 @@ void test_Virtual_Environment_Install_Best_Efforts() throws JsonProcessingExcept
@Test
@RestoreSystemProperties
- @SetSystemProperty(key = PROP_EXHORT_PYTHON_INSTALL_BEST_EFFORTS, value = "true")
+ @SetSystemProperty(key = PROP_TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS, value = "true")
void test_Virtual_Environment_Install_Best_Efforts_Conflict_MMV_Should_Throw_Runtime_Exception() {
String requirementsTxt =
getFileFromString("requirements.txt", "flask==9.9.9\ndeprecated==15.15.99\n");
diff --git a/src/test/java/module-info.test b/src/test/java/module-info.test
index 70b4d39b..9581cbeb 100644
--- a/src/test/java/module-info.test
+++ b/src/test/java/module-info.test
@@ -2,22 +2,22 @@
jdk.attach,jdk.unsupported,org.assertj.core,org.junit.jupiter.params,org.mockito,org.mockito.junit.jupiter,net.bytebuddy,net.bytebuddy.agent
--add-reads
- com.redhat.exhort=org.assertj.core,org.junit.jupiter.api
+ io.github.guacsec.trustifyda=org.assertj.core,org.junit.jupiter.api
--add-reads
- com.redhat.exhort=org.junit.jupiter.params,org.mockito
+ io.github.guacsec.trustifyda=org.junit.jupiter.params,org.mockito
--add-reads
org.mockito=java.net.http
--add-opens
- com.redhat.exhort/com.redhat.exhort.impl=org.junit.platform.commons
+ io.github.guacsec.trustifyda/io.github.guacsec.trustifyda.impl=org.junit.platform.commons
--add-opens
- com.redhat.exhort/com.redhat.exhort.providers=org.junit.platform.commons
+ io.github.guacsec.trustifyda/io.github.guacsec.trustifyda.providers=org.junit.platform.commons
--add-opens
- com.redhat.exhort/com.redhat.exhort.tools=org.junit.platform.commons
+ io.github.guacsec.trustifyda/io.github.guacsec.trustifyda.tools=org.junit.platform.commons
--add-opens
- com.redhat.exhort/com.redhat.exhort.image=org.junit.platform.commons
+ io.github.guacsec.trustifyda/io.github.guacsec.trustifyda.image=org.junit.platform.commons
--add-opens
- com.redhat.exhort/com.redhat.exhort.image=org.mockito
+ io.github.guacsec.trustifyda/io.github.guacsec.trustifyda.image=org.mockito
--add-opens
java.base/java.lang=org.junitpioneer
--add-opens
diff --git a/src/test/resources/dummy_responses/maven/analysis-report.html b/src/test/resources/dummy_responses/maven/analysis-report.html
index 14a74c61..def12152 100644
--- a/src/test/resources/dummy_responses/maven/analysis-report.html
+++ b/src/test/resources/dummy_responses/maven/analysis-report.html
@@ -192,7 +192,7 @@
| # Transitive |
Highest CVSS |
Highest Severity |
- Red Hat remediation available |
+ Trustify remediation available |
@@ -232,7 +232,7 @@
-
SNYK-JAVA-LOG4J-1300176
@@ -289,7 +289,7 @@
CVE-2019-17571
|
-
SNYK-JAVA-LOG4J-572732
@@ -325,7 +325,7 @@
CVE-2022-23305
|
-
SNYK-JAVA-LOG4J-2342645
@@ -361,7 +361,7 @@
CVE-2022-23307
|
-
SNYK-JAVA-LOG4J-2342646
@@ -397,7 +397,7 @@
CVE-2022-23302
|
-
SNYK-JAVA-LOG4J-2342647
@@ -433,7 +433,7 @@
CVE-2021-4104
|
-
SNYK-JAVA-LOG4J-2316893
@@ -469,7 +469,7 @@
CVE-2023-26464
|
-
SNYK-JAVA-LOG4J-3358774
@@ -505,7 +505,7 @@
CVE-2020-9488
|
-
SNYK-JAVA-LOG4J-1300176
@@ -590,4 +590,4 @@
})
|