Skip to content

Commit

Permalink
Merge pull request #202 from apigee/Issue201
Browse files Browse the repository at this point in the history 
Fix for #201
  • Loading branch information
@ssvaidyanathan
ssvaidyanathan authored Apr 15, 2024
2 parents 04bae2e + 5ca7913 commit bb37172
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 52 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ target
.classpath
.project
.DS_Store
**/*/Test.java
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,22 @@ The apigee.config.dir option must be used to identify the top most directory con
├── api
│   ├── forecastweatherapi
│   │   ├── kvms.json
│   │   ├── kvms-security.json
│   └── oauth
│   ├── kvms.json
├── env
│   ├── prod
│   │   ├── kvms.json
│   │   ├── kvms-targets.json
│   │ ├── flowhooks.json
│   │ ├── targetServers.json
│   │ ├── references.json
│   ├── test
│   │ ├── kvms.json
│   │ ├── targetServers.json
│   │ ├── targetServers-backend.json
│   │ ├── keystores.json
│   │ ├── keystores-signed.json
│   │ ├── aliases.json
│ │ └── references.json
└── org
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>com.apigee.edge.config</groupId>
<artifactId>apigee-config-maven-plugin</artifactId>
<version>2.7.1-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>apigee-config-maven-plugin</name>
<description>Plugin to manage configuration in Apigee</description>
Expand Down
2 changes: 1 addition & 1 deletion samples/APIandConfig/shared-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<plugin>
<groupId>com.apigee.edge.config</groupId>
<artifactId>apigee-config-maven-plugin</artifactId>
<version>2.7.0</version>
<version>2.8.0</version>
<executions>
<execution>
<id>create-config-targetserver</id>
Expand Down
2 changes: 1 addition & 1 deletion samples/EdgeConfig/shared-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<plugin>
<groupId>com.apigee.edge.config</groupId>
<artifactId>apigee-config-maven-plugin</artifactId>
<version>2.7.0</version>
<version>2.8.0</version>
<executions>
<execution>
<id>create-config-targetserver</id>
Expand Down
135 changes: 86 additions & 49 deletions src/main/java/com/apigee/edge/config/mavenplugin/GatewayAbstractMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import static org.apache.commons.lang3.StringUtils.isNotBlank;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -457,7 +459,7 @@ private File findConsolidatedConfigFile()
return null;
}

private File findConfigFile(String scope, String config)
/*private File findConfigFile(String scope, String config)
throws MojoExecutionException {
File configFile = new File(configDir + File.separator +
scope + File.separator +
Expand All @@ -466,27 +468,50 @@ private File findConfigFile(String scope, String config)
return configFile;
}
return null;
}*/

/**
* finds all the files for a given operation. For example kvms.json, kvms*.json
* @param scope
* @param config
* @return
* @throws MojoExecutionException
*/
private List<File> findConfigFiles(String scope, String config)
throws MojoExecutionException {
List<File> configFiles = new ArrayList<File>();
File[] listOfFiles = new File(configDir + File.separator + scope).listFiles();
for (File file : listOfFiles) {
if (file.isFile() && file.getName().startsWith(config)) {
configFiles.add(file);
}
}
return configFiles;
}

protected List getAPIConfig(Logger logger, String config, String api)
throws MojoExecutionException {
File configFile;
List<File> configFiles;
String scope = "api" + File.separator + api;
ArrayList apiConfig = new ArrayList();

/* configDir takes precedence over edge.json */
if (configDir != null && configDir.length() > 0) {
configFile = findConfigFile(scope, config);
if (configFile == null) {
logger.info("Config file " + scope + File.separator + config + ".json not found.");
return null;
}

logger.info("Retrieving config from " + scope + File.separator + config + ".json");
try {
return ConfigReader.getAPIConfig(configFile);
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage());
configFiles = findConfigFiles(scope, config);
for (File cfgFile : configFiles) {
if (cfgFile == null) {
logger.info("Config file " + scope + File.separator + cfgFile.getName() + " not found.");
return null;
}
logger.info("Retrieving config from " + scope + File.separator + cfgFile.getName());
try {
apiConfig.addAll(ConfigReader.getAPIConfig(cfgFile));
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage());
}
}
return apiConfig;
}

/* consolidated edge.json in CWD as fallback */
Expand Down Expand Up @@ -545,25 +570,29 @@ protected Set<String> getAPIList(Logger logger)
protected List getEnvConfig(Logger logger, String config)
throws MojoExecutionException {
File configFile;
List<File> configFiles;
String scope = "env" + File.separator + this.buildProfile.getEnvironment();

ArrayList envConfig = new ArrayList();

/* configDir takes precedence over edge.json */
if (configDir != null && configDir.length() > 0) {
configFile = findConfigFile(scope, config);
if (configFile == null) {
logger.info("Config file " + scope + File.separator + config + ".json not found.");
return null;
}

logger.info("Retrieving config from " + scope + File.separator + config + ".json");
try {
return ConfigReader.getEnvConfig(this.buildProfile.getEnvironment(),
configFile);
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage());
configFiles = findConfigFiles(scope, config);
for (File cfgFile : configFiles) {
if (cfgFile == null) {
logger.info("Config file " + scope + File.separator + cfgFile.getName() + " not found.");
return null;
}
logger.info("Retrieving config from " + scope + File.separator + cfgFile.getName());
try {
envConfig.addAll(ConfigReader.getEnvConfig(this.buildProfile.getEnvironment(), cfgFile));
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage());
}
}
return envConfig;
}


/* consolidated edge.json in CWD as fallback */
configFile = findConsolidatedConfigFile();

Expand All @@ -588,22 +617,26 @@ protected List getEnvConfig(Logger logger, String config)
protected List getOrgConfig(Logger logger, String config)
throws MojoExecutionException {
File configFile;
List<File> configFiles;
String scope = "org";
ArrayList orgConfig = new ArrayList();

/* configDir takes precedence over edge.json */
if (configDir != null && configDir.length() > 0) {
configFile = findConfigFile(scope, config);
if (configFile == null) {
logger.info("Config file " + scope + File.separator + config + ".json not found.");
return null;
}

logger.info("Retrieving config from " + scope + File.separator + config + ".json");
try {
return ConfigReader.getOrgConfig(configFile);
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage());
configFiles = findConfigFiles(scope, config);
for (File cfgFile : configFiles) {
if (cfgFile == null) {
logger.info("Config file " + scope + File.separator + cfgFile.getName() + " not found.");
return null;
}
logger.info("Retrieving config from " + scope + File.separator + cfgFile.getName());
try {
orgConfig.addAll(ConfigReader.getOrgConfig(cfgFile));
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage());
}
}
return orgConfig;
}

/* consolidated edge.json in CWD as fallback */
Expand All @@ -627,22 +660,26 @@ protected List getOrgConfig(Logger logger, String config)
protected Map getOrgConfigWithId(Logger logger, String config)
throws MojoExecutionException {
File configFile;
List<File> configFiles;
String scope = "org";

Map<String, List<String>> orgConfig = new HashMap<String, List<String>> ();

/* configDir takes precedence over edge.json */
if (configDir != null && configDir.length() > 0) {
configFile = findConfigFile(scope, config);
if (configFile == null) {
logger.info("Config file " + scope + File.separator + config + ".json not found.");
return null;
}

logger.info("Retrieving config from " + scope + File.separator + config + ".json");
try {
return ConfigReader.getOrgConfigWithId(configFile);
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage());
if (configDir != null && configDir.length() > 0) {
configFiles = findConfigFiles(scope, config);
for (File cfgFile : configFiles) {
if (cfgFile == null) {
logger.info("Config file " + scope + File.separator + cfgFile.getName() + " not found.");
return null;
}
logger.info("Retrieving config from " + scope + File.separator + cfgFile.getName());
try {
orgConfig.putAll(ConfigReader.getOrgConfigWithId(cfgFile));
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage());
}
}
return orgConfig;
}

/* consolidated edge.json in CWD as fallback */
Expand Down

0 comments on commit bb37172

Please sign in to comment.