Support deploying fed directory

Author: rathnapandi

README.md

@@ -79,6 +79,13 @@ java -jar apim-deployment-project/gateway-standalone/target/gateway-standalone-1
 java -jar apim-deployment-project/gateway-standalone/target/gateway-standalone-1.0.0.jar --operation=deploy --gatewayURL=https://localhost:8090 --username=admin --password=changeme --group=Finance --instance=server1 --fedFile=/home/axway/finance.fed --type=fed
 ```
 
+### Deploy a FED directory to a specific Gateway
+
+```bash
+java -jar apim-deployment-project/gateway-standalone/target/gateway-standalone-1.0.0.jar --operation=deploy --gatewayURL=https://localhost:8090 --username=admin --password=changeme --group=Finance --instance=server1 --fedDir=/home/axway/finance --type=fed
+
+```
+
 ### Deploy the POL and ENV files to all Gateways
 
 

apim-deployment-project/core/src/main/java/com/axway/apim/Archive.java

@@ -0,0 +1,58 @@
+package com.axway.apim;
+
+import java.io.*;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+
+public class Archive {
+
+    public Manifest createManifest(String uuidStr){
+        Manifest manifest = new Manifest();
+        Attributes attributes = manifest.getMainAttributes();
+        attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
+        attributes.put(new Attributes.Name("Id"),uuidStr);
+        attributes.put(new Attributes.Name("Timestamp"), System.currentTimeMillis()+"");
+        return manifest;
+    }
+
+    public  void createFed(String uuisStr, Manifest manifest, String filename, File dir) throws IOException {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(filename);
+             JarOutputStream jarOutputStream = new JarOutputStream(fileOutputStream, manifest)){
+            File[] files = dir.listFiles();
+            for (File file : files) {
+                if (!file.isDirectory()) {
+                    addContent(jarOutputStream, file, uuisStr);
+                } else {
+                    if (file.getName().equals("meta-inf")) {
+                        File[] metaInfFiles = file.listFiles();
+                        for (File metaInfFile : metaInfFiles) {
+                            if (metaInfFile.getName().equals("manifest.mf")) {
+                                continue;
+                            }
+
+                            addContent(jarOutputStream, metaInfFile, "meta-inf");
+                        }
+                    }
+                }
+            }
+
+        }
+    }
+
+
+    private   void addContent(JarOutputStream jarOutputStream, File file, String dirName) throws IOException {
+        try ( BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file))){
+            jarOutputStream.putNextEntry(new JarEntry(dirName + "/" + file.getName()));
+            byte[] buffer = new byte[1024];
+            while (true) {
+                int count = bufferedInputStream.read(buffer);
+                if (count == -1)
+                    break;
+                jarOutputStream.write(buffer, 0, count);
+            }
+            jarOutputStream.closeEntry();
+        }
+    }
+}

apim-deployment-project/gateway-standalone/src/main/java/com/axway/apim/Main.java

@@ -35,6 +35,7 @@ public static void main(String[] args) {
         boolean inSecure = line.hasOption("insecure");
 
         String fedFileName = null;
+        String fedDir = null;
         String polFileName = null;
         String envFileName = null;
         String instanceName = null;
@@ -46,7 +47,9 @@ public static void main(String[] args) {
         if (type.equalsIgnoreCase("fed")) {
             if (line.hasOption('f')) {
                 fedFileName = line.getOptionValue("f");
-            } else {
+            } else if(line.hasOption('d')){
+                fedDir = line.getOptionValue("d");
+            }else {
                 LOGGER.error("Provide fed location");
                 System.exit(1);
             }
@@ -78,7 +81,7 @@ public static void main(String[] args) {
                 envFileName, inSecure);
         } else if (operation.equalsIgnoreCase("deploy")) {
             orchestrator.deploy(url, username, password, groupName, instanceName, type, fedFileName, polFileName,
-                envFileName, inSecure);
+                envFileName, inSecure, fedDir);
         } else {
             LOGGER.error("Provide valid operation name: possible values download or deploy");
             System.exit(1);
@@ -124,6 +127,9 @@ private static Options options() {
         Option fedFile = Option.builder("f").longOpt("fedFile").required(false).hasArg(true).desc("Federation File")
             .build();
 
+        Option fedDir = Option.builder("d").longOpt("fedDir").required(false).hasArg(true).desc("Federation directory")
+            .build();
+
         Option polFile = Option.builder("pol").longOpt("polFile").required(false).hasArg(true).desc("PolicyFile File")
             .build();
 
@@ -148,6 +154,7 @@ private static Options options() {
         options.addOption(help);
         options.addOption(type);
         options.addOption(inSecure);
+        options.addOption(fedDir);
         return options;
     }
 

apim-deployment-project/gateway-standalone/src/main/java/com/axway/apim/Orchestrator.java

@@ -1,11 +1,14 @@
 package com.axway.apim;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
+import java.util.UUID;
+import java.util.jar.Manifest;
 
 import static com.axway.apim.Constants.*;
 
@@ -41,14 +44,22 @@ public void download(String url, String username, String password, String groupN
     }
 
     public void deploy(String url, String username, String password, String groupName, String instanceName, String type,
-                       String fedFileName, String polFileName, String envFileName, boolean insecure) {
+                       String fedFileName, String polFileName, String envFileName, boolean insecure, String fedDir) {
         try {
             String archiveId = null;
             gatewayDeployment.init(url, username, password, insecure);
             String phyGroupName = gatewayDeployment.getPhysicalGroupName(groupName, url);
             List<String> servers = gatewayDeployment.getServerLists(url, instanceName, phyGroupName);
             if (type.equalsIgnoreCase("fed")) {
 
+                if (fedFileName == null && fedDir != null) {
+                    // Handle fed project
+                    Archive archive = new Archive();
+                    String uuidStr = UUID.randomUUID().toString();
+                    fedFileName = uuidStr + ".fed";
+                    Manifest manifest = archive.createManifest(uuidStr);
+                    archive.createFed(uuidStr, manifest, fedFileName, new File(fedDir));
+                }
                 archiveId = gatewayDeployment.uploadFed(phyGroupName, FED_ATTACHMENT_NAME, url, fedFileName,
                     servers);