ID-46: certs base path is ignored by apigw:deploy

Axway-API-Management-Plus · Jun 24, 2020 · f2423a8 · f2423a8
1 parent a1ad906
commit f2423a8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -4,9 +4,15 @@
 [cols="1,2,<10a", options="header"]
 |===
 |ID|Type|Description
-|https://github.com/Axway-API-Management-Plus/apigw-maven-plugin/issues/40[#41]
+|https://github.com/Axway-API-Management-Plus/apigw-maven-plugin/issues/41[#41]
 |Enhancement
 |Improve error message in case of wrong certificate passphrase.
+
+|https://github.com/Axway-API-Management-Plus/apigw-maven-plugin/issues/46[#46]
+|Bug
+|Base path for certificates is ignored by `apigw:deploy` goal (server or policy projects).
+
+If the `apigw:deploy` goal is executed for server or policy projects, the configuration of the base path for certificates is ignored.
 |===
 
 == Version 1.0.0

diff --git a/src/main/java/com/axway/maven/apigw/AbstractGatewayMojo.java b/src/main/java/com/axway/maven/apigw/AbstractGatewayMojo.java
@@ -104,6 +104,12 @@ public abstract class AbstractGatewayMojo extends AbstractMojo {
 	@Parameter(property = "axway.config.certs.basedir", required = false)
 	protected File configCertsBaseDir = null;
 
+	@Parameter(property = "axway.tools.cfg.cert.expirationDays", required = false)
+	protected int certExpirationDays = 10;
+
+	@Parameter(property = "axway.tools.cfg.cert.updateConfigured", required = false)
+	protected boolean updateCertConfigFile = false;
+
 	@Parameter(property = "axway.config.secrets.file", required = false)
 	protected File configSecretsFile = null;
 

diff --git a/src/main/java/com/axway/maven/apigw/DeploymentArchiveMojo.java b/src/main/java/com/axway/maven/apigw/DeploymentArchiveMojo.java
@@ -12,7 +12,6 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
 import com.axway.maven.apigw.utils.FedBuilder;
@@ -29,12 +28,6 @@ public class DeploymentArchiveMojo extends AbstractFlattendProjectArchiveMojo {
 
 	private Artifact serverArchive;
 
-	@Parameter(property = "axway.tools.cfg.cert.expirationDays", required = false)
-	private int certExpirationDays = 10;
-
-	@Parameter(property = "axway.tools.cfg.cert.updateConfigured", required = false)
-	private boolean updateCertConfigFile = false;
-
 	@Override
 	protected String getArchiveExtension() {
 		return PackageType.DEPLOYMENT.getExtension();
@@ -171,7 +164,7 @@ private void buildFedArchive(File targetDir, File srcPolFile, File srcEnvFile, F
 		}
 		if (this.configSecretsFile != null) {
 			if (this.configSecretsKey == null)
-				throw new MojoExecutionException("Passphrase for secrets file not specified!");
+				throw new MojoExecutionException("Key file for secrets is not specified!");
 			fedBuilder.setSecrets(this.configSecretsFile, this.configSecretsKey);
 		}
 

diff --git a/src/main/java/com/axway/maven/apigw/DeploymentMojo.java b/src/main/java/com/axway/maven/apigw/DeploymentMojo.java
@@ -130,9 +130,14 @@ private File configFed(File pol, File env, File info) throws MojoExecutionExcept
 
 		fb.addPropertyFiles(getPropertyFiles());
 
-		fb.setCertificatesFile(this.configCertsFile);
 		fb.enableVerboseMode(this.verboseCfgTools);
 
+		if (this.configCertsFile != null) {
+			fb.setCertificatesFile(this.configCertsFile);
+			fb.setCertificateExpirationDays(this.certExpirationDays);
+			fb.enableCertificateConfigFileUpdate(this.updateCertConfigFile);
+			fb.setCertificatesBasePath(this.configCertsBaseDir);
+		}
 		if (this.configSecretsFile != null) {
 			if (this.configSecretsKey == null)
 				throw new MojoExecutionException("Key file for secrets is not specified!");