Merge pull request #41 from indigo-dc/37-custom-header-id

Allow to set up custom ids for authN headers

Author: alpegon

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/AmazonEc2Credentials.java

@@ -25,8 +25,16 @@ private AmazonEc2Credentials() {
     super(ServiceProvider.EC2);
   }
 
+  private AmazonEc2Credentials(String id) {
+    super(ServiceProvider.EC2, id);
+  }
+  
   public static AmazonEc2Credentials buildCredentials() {
     return new AmazonEc2Credentials();
   }
+  
+  public static AmazonEc2Credentials buildCredentials(String id) {
+    return new AmazonEc2Credentials(id);
+  }
 
 }

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/AzureCredentials.java

@@ -26,10 +26,18 @@ private AzureCredentials() {
     super(ServiceProvider.AZURE);
   }
 
+  private AzureCredentials(String id) {
+    super(ServiceProvider.AZURE, id);
+  }
+
   public static AzureCredentials buildCredentials() {
     return new AzureCredentials();
   }
 
+  public static AzureCredentials buildCredentials(String id) {
+    return new AzureCredentials(id);
+  }
+
   public AzureCredentials withPublicKey(String publicKey) {
     setCredentials(new PrivateKeyProperty(getCredentials(), publicKey));
     return this;

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/DockerCredentials.java

@@ -24,8 +24,16 @@ private DockerCredentials() {
     super(ServiceProvider.DOCKER);
   }
 
+  private DockerCredentials(String id) {
+    super(ServiceProvider.DOCKER, id);
+  }
+
   public static DockerCredentials buildCredentials() {
     return new DockerCredentials();
   }
 
+  public static DockerCredentials buildCredentials(String id) {
+    return new DockerCredentials(id);
+  }
+
 }

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/DummyCredential.java

@@ -24,8 +24,16 @@ private DummyCredential() {
     super(ServiceProvider.DUMMY);
   }
 
+  private DummyCredential(String id) {
+    super(ServiceProvider.DUMMY, id);
+  }
+
   public static DummyCredential buildCredentials() {
     return new DummyCredential();
   }
 
+  public static DummyCredential buildCredentials(String id) {
+    return new DummyCredential(id);
+  }
+
 }

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/FogBowCredentials.java

@@ -24,8 +24,16 @@ private FogBowCredentials() {
     super(ServiceProvider.FOG_BOW);
   }
 
+  private FogBowCredentials(String id) {
+    super(ServiceProvider.FOG_BOW, id);
+  }
+
   public static FogBowCredentials buildCredentials() {
     return new FogBowCredentials();
   }
 
+  public static FogBowCredentials buildCredentials(String id) {
+    return new FogBowCredentials(id);
+  }
+
 }

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/GceCredentials.java

@@ -25,10 +25,18 @@ private GceCredentials() {
     super(ServiceProvider.GCE);
   }
 
+  private GceCredentials(String id) {
+    super(ServiceProvider.GCE, id);
+  }
+
   public static GceCredentials buildCredentials() {
     return new GceCredentials();
   }
 
+  public static GceCredentials buildCredentials(String id) {
+    return new GceCredentials(id);
+  }
+
   public GceCredentials withProject(String project) {
     setCredentials(new ProjectProperty(getCredentials(), project));
     return this;

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/GenericCredentials.java

@@ -33,6 +33,10 @@ protected GenericCredentials(ServiceProvider provider) {
     credentials = new BaseProperties(provider.getId(), provider.getType());
   }
 
+  protected GenericCredentials(ServiceProvider provider, String id) {
+    credentials = new BaseProperties(id, provider.getType());
+  }
+
   @Override
   public String serialize() {
     return credentials.serialize();

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/ImCredentials.java

@@ -24,8 +24,16 @@ private ImCredentials() {
     super(ServiceProvider.INFRASTRUCTURE_MANAGER);
   }
 
+  private ImCredentials(String id) {
+    super(ServiceProvider.INFRASTRUCTURE_MANAGER, id);
+  }
+
   public static ImCredentials buildCredentials() {
     return new ImCredentials();
   }
 
+  public static ImCredentials buildCredentials(String id) {
+    return new ImCredentials(id);
+  }
+
 }

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/KubernetesCredentials.java

@@ -18,15 +18,22 @@
 
 import es.upv.i3m.grycap.im.auth.credentials.ServiceProvider;
 
-public class KubernetesCredentials
-    extends GenericCredentials<KubernetesCredentials> {
+public class KubernetesCredentials extends GenericCredentials<KubernetesCredentials> {
 
   private KubernetesCredentials() {
     super(ServiceProvider.KUBERNETES);
   }
 
+  private KubernetesCredentials(String id) {
+    super(ServiceProvider.KUBERNETES, id);
+  }
+
   public static KubernetesCredentials buildCredentials() {
     return new KubernetesCredentials();
   }
 
+  public static KubernetesCredentials buildCredentials(String id) {
+    return new KubernetesCredentials(id);
+  }
+
 }

src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OcciCredentials.java

@@ -24,8 +24,16 @@ private OcciCredentials() {
     super(ServiceProvider.OCCI);
   }
 
+  private OcciCredentials(String id) {
+    super(ServiceProvider.OCCI, id);
+  }
+
   public static OcciCredentials buildCredentials() {
     return new OcciCredentials();
   }
 
+  public static OcciCredentials buildCredentials(String id) {
+    return new OcciCredentials(id);
+  }
+
 }