Removed a hardcoded schema string in favor of the configuration value (…

…#588)
openraven · Mar 12, 2024 · 9527562 · 9527562
1 parent d37e050
commit 9527562
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/magpie-cli/pom.xml b/magpie-cli/pom.xml
@@ -31,7 +31,7 @@
  <dependency>
  <groupId>ch.qos.logback</groupId>
  <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
+ <version>1.5.3</version>
  </dependency>
  <dependency>
  <groupId>com.fasterxml.jackson.dataformat</groupId>

diff --git a/...-core/src/main/java/io/openraven/magpie/core/cspm/services/PolicyAnalyzerServiceImpl.java b/...-core/src/main/java/io/openraven/magpie/core/cspm/services/PolicyAnalyzerServiceImpl.java
@@ -33,6 +33,8 @@ public class PolicyAnalyzerServiceImpl implements PolicyAnalyzerService {
  private static final ObjectMapper MAPPER = new ObjectMapper();
  private AssetsRepo assetsRepo;
 
+ private PersistConfig config;
+
  @Override
  public void init(MagpieConfig config) {
  final var rawPersistConfig = config.getPlugins().get(PersistPlugin.ID);
@@ -42,6 +44,7 @@ public void init(MagpieConfig config) {
 
  try {
  final PersistConfig persistConfig = MAPPER.treeToValue(MAPPER.valueToTree(rawPersistConfig.getConfig()), PersistConfig.class);
+ this.config = persistConfig;
  assetsRepo = new HibernateAssetsRepoImpl(persistConfig);
  } catch (JsonProcessingException e) {
  throw new ConfigException("Cannot instantiate PersistConfig while initializing PolicyAnalyzerService", e);
@@ -81,7 +84,8 @@ private void processPolicy(Policy policy,
 
  private boolean cloudProviderAssetsAvailable(Policy policy) {
  var provider = Strings.isNullOrEmpty(policy.getCloudProvider()) ? "" : policy.getCloudProvider().toLowerCase(Locale.ROOT);
- List<Map<String, Object>> data = assetsRepo.queryNative("select count(*) from magpie.%provider%".replace("%provider%", provider));
+ var schema = Strings.isNullOrEmpty(config.getSchema()) ? "magpie" : config.getSchema();
+ List<Map<String, Object>> data = assetsRepo.queryNative("select count(*) from %schema%.%provider%".replace("%schema%", schema).replace("%provider%", provider));
  final var count = data.get(0).get("count");
  BigInteger compareTo;
  if(count instanceof BigInteger) {