Fixes #714 - delay secure storage prompts

Signed-off-by: Rob Stryker <[email protected]>
redhat-developer · Nov 6, 2023 · c004268 · c004268
1 parent 544b7e9
commit c004268
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/...erver.spi/src/main/java/org/jboss/tools/rsp/server/spi/servertype/AbstractServerType.java b/...erver.spi/src/main/java/org/jboss/tools/rsp/server/spi/servertype/AbstractServerType.java
@@ -9,9 +9,11 @@
 package org.jboss.tools.rsp.server.spi.servertype;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
@@ -30,6 +32,7 @@
 import org.jboss.tools.rsp.eclipse.core.runtime.IStatus;
 import org.jboss.tools.rsp.eclipse.core.runtime.Status;
 import org.jboss.tools.rsp.server.spi.SPIActivator;
+import org.jboss.tools.rsp.server.spi.model.IServerModel;
 import org.jboss.tools.rsp.server.spi.util.StatusConverter;
 
 public abstract class AbstractServerType implements IServerType {
@@ -188,6 +191,19 @@ protected WorkflowResponse handleInitialCreateServerWorkflow(CreateServerWorkflo
 		return workflow;
 	}
 
+	public boolean hasSecureAttributes() {
+		Attributes a = getRequiredAttributes();
+		Attributes b = getOptionalAttributes();
+		Set<String> all = new HashSet<>();
+		all.addAll(a.getAttributes().keySet());
+		all.addAll(b.getAttributes().keySet());
+		for( Iterator<String> i = all.iterator(); i.hasNext(); ) {
+			if( i.next().startsWith(IServerModel.SECURE_ATTRIBUTE_PREFIX)) 
+				return true;
+		}
+		return false;
+	}
+
 	public ServerLaunchMode[] getLaunchModes() {
 		return new ServerLaunchMode[] {};
 	}

diff --git a/...s.rsp.server.spi/src/main/java/org/jboss/tools/rsp/server/spi/servertype/IServerType.java b/...s.rsp.server.spi/src/main/java/org/jboss/tools/rsp/server/spi/servertype/IServerType.java
@@ -21,6 +21,7 @@ public interface IServerType {
 	public IServerDelegate createServerDelegate(IServer server);
 	public Attributes getRequiredAttributes();
 	public Attributes getOptionalAttributes();
+	public boolean hasSecureAttributes();
 	public Attributes getRequiredLaunchAttributes();
 	public Attributes getOptionalLaunchAttributes();
 	public ServerLaunchMode[] getLaunchModes();

diff --git a/...rg.jboss.tools.rsp.server/src/main/java/org/jboss/tools/rsp/server/model/ServerModel.java b/...rg.jboss.tools.rsp.server/src/main/java/org/jboss/tools/rsp/server/model/ServerModel.java
@@ -575,16 +575,7 @@ public ServerType[] getAccessibleServerTypes() {
 
 	@Override
 	public boolean hasSecureAttributes(IServerType type) {
-		Attributes a = type.getRequiredAttributes();
-		Attributes b = type.getOptionalAttributes();
-		Set<String> all = new HashSet<>();
-		all.addAll(a.getAttributes().keySet());
-		all.addAll(b.getAttributes().keySet());
-		for( Iterator<String> i = all.iterator(); i.hasNext(); ) {
-			if( i.next().startsWith(IServerModel.SECURE_ATTRIBUTE_PREFIX)) 
-				return true;
-		}
-		return false;
+		return type.hasSecureAttributes();
 	}
 
 	@Override

diff --git a/....tools.rsp.server.test/src/main/java/org/jboss/tools/rsp/server/model/ServerTypeTest.java b/....tools.rsp.server.test/src/main/java/org/jboss/tools/rsp/server/model/ServerTypeTest.java
@@ -313,5 +313,10 @@ public WorkflowResponse createServerWorkflow(RSPServer server, CreateServerWorkf
 			return null;
 		}
 
+		@Override
+		public boolean hasSecureAttributes() {
+			return false;
+		}
+
 	}
 }
diff --git a/...ift/src/main/java/org/jboss/tools/rsp/server/minishift/servertype/impl/CDKServerType.java b/...ift/src/main/java/org/jboss/tools/rsp/server/minishift/servertype/impl/CDKServerType.java
@@ -26,6 +26,10 @@ public class CDKServerType extends BaseMinishiftServerType {
 	public CDKServerType(String id, String name, String desc) {
 		super(id, name, desc);
 	}
+
+	public boolean hasSecureAttributes() {
+		return true;
+	}
 
 	private IServerManagementModel getServerManagementModel() {
 		if( LauncherSingleton.getDefault() == null )

diff --git a/...ift/src/main/java/org/jboss/tools/rsp/server/minishift/servertype/impl/CRCServerType.java b/...ift/src/main/java/org/jboss/tools/rsp/server/minishift/servertype/impl/CRCServerType.java
@@ -26,6 +26,10 @@ public IServerDelegate createServerDelegate(IServer server) {
 		return new CRCServerDelegate(server);
 	}
 
+	public boolean hasSecureAttributes() {
+		return true;
+	}
+
 	@Override
 	protected void fillRequiredAttributes(CreateServerAttributesUtility attrs) {
 		attrs.addAttribute(IMinishiftServerAttributes.MINISHIFT_BINARY,