More flexible authentication, supports oauth as well

Author: Javatar81

operator-gen-maven-plugin/src/main/java/org/acme/gen/DependentGen.java

@@ -64,8 +64,8 @@
 import jakarta.inject.Inject;
 
 public class DependentGen {
-	private static final String FIELD_AUTHENTICATION = "authentication";
-	private static final String VAR_WEB_CLIENT_SESSION = "webClientSession";
+	private static final String FIELD_CLIENT_PROVIDER = "clientProvider";
+	//private static final String VAR_WEB_CLIENT_SESSION = "webClientSession";
 	private static final String FIELD_API_CLIENT = "apiClient";
 	private static final String FIELD_NAME_VERTX = "vertx";
 	private static final String NAME_POSTFIX = "Dependent";
@@ -121,13 +121,9 @@ public void create() {
 				new SimpleName(PerResourcePollingDependentResource.class.getSimpleName()),
 				new NodeList<>(resourceType, crdType));
 
-		
-		
-		
 		ClassOrInterfaceDeclaration clazz = cu.addClass(className, Keyword.PUBLIC)
 				.addExtendedType(dependentType);
 
-		
 		fields(clazz);
 		constructor(clazz);
 		initClientMethod(clazz);
@@ -196,16 +192,16 @@ private void initClientMethod(ClassOrInterfaceDeclaration clazz) {
 				.addAnnotation(PostConstruct.class);
 
 
-		ClassOrInterfaceType webClientSessionType = new ClassOrInterfaceType(null, WebClientSession.class.getSimpleName());
-		ClassOrInterfaceType webClientType = new ClassOrInterfaceType(null, WebClient.class.getSimpleName());
+		//ClassOrInterfaceType webClientSessionType = new ClassOrInterfaceType(null, WebClientSession.class.getSimpleName());
+		//ClassOrInterfaceType webClientType = new ClassOrInterfaceType(null, WebClient.class.getSimpleName());
 		ClassOrInterfaceType vertxRequestAdapterType = new ClassOrInterfaceType(null, VertXRequestAdapter.class.getSimpleName());
 		ClassOrInterfaceType apiClientType = new ClassOrInterfaceType(null, "ApiClient");
 
 		NodeList<Statement> initClientStatements = new NodeList<>();
 
-		initClientStatements.add(new ExpressionStmt(new AssignExpr(new VariableDeclarationExpr(webClientSessionType, VAR_WEB_CLIENT_SESSION), new MethodCallExpr(new TypeExpr(webClientSessionType), "create", new NodeList<>(new MethodCallExpr(new TypeExpr(webClientType), "create", new NodeList<>(new NameExpr(FIELD_NAME_VERTX))))), Operator.ASSIGN)));
-		initClientStatements.add(new ExpressionStmt(new MethodCallExpr(new NameExpr(FIELD_AUTHENTICATION), "addAuthHeaders", new NodeList<>(new NameExpr(VAR_WEB_CLIENT_SESSION)))));
-		initClientStatements.add(new ExpressionStmt(new AssignExpr(new VariableDeclarationExpr(vertxRequestAdapterType, "requestAdapter"), new ObjectCreationExpr(null, vertxRequestAdapterType, new NodeList<>(new NameExpr(VAR_WEB_CLIENT_SESSION))), Operator.ASSIGN)));
+		//initClientStatements.add(new ExpressionStmt(new AssignExpr(new VariableDeclarationExpr(webClientSessionType, VAR_WEB_CLIENT_SESSION), new MethodCallExpr(new TypeExpr(webClientSessionType), "create", new NodeList<>(new MethodCallExpr(new TypeExpr(webClientType), "create", new NodeList<>(new NameExpr(FIELD_NAME_VERTX))))), Operator.ASSIGN)));
+		//initClientStatements.add(new ExpressionStmt(new MethodCallExpr(new NameExpr(FIELD_CLIENT_PROVIDER), "provide", new NodeList<>())));
+		initClientStatements.add(new ExpressionStmt(new AssignExpr(new VariableDeclarationExpr(vertxRequestAdapterType, "requestAdapter"), new ObjectCreationExpr(null, vertxRequestAdapterType, new NodeList<>(new MethodCallExpr(new NameExpr(FIELD_CLIENT_PROVIDER), "provide", new NodeList<>()))), Operator.ASSIGN)));
 		initClientStatements.add(new ExpressionStmt(new MethodCallExpr(new NameExpr("urlProvider"), "provide", new NodeList<>(new NameExpr("requestAdapter")))));
 		initClientStatements.add(new ExpressionStmt(new AssignExpr(new NameExpr(FIELD_API_CLIENT), new ObjectCreationExpr(null, apiClientType, new NodeList<>(new NameExpr("requestAdapter"))), Operator.ASSIGN)));
 		initClientMethod.setBody(new BlockStmt(initClientStatements));
@@ -214,7 +210,7 @@ private void initClientMethod(ClassOrInterfaceDeclaration clazz) {
 	private void fields(ClassOrInterfaceDeclaration clazz) {
 		clazz.addField(Vertx.class, FIELD_NAME_VERTX).addAnnotation(Inject.class);
 		clazz.addField("ApiClient", FIELD_API_CLIENT, Keyword.PRIVATE);
-		clazz.addField("HeaderAuthentication", FIELD_AUTHENTICATION).addAnnotation(Inject.class);
+		clazz.addField("WebClientProvider", FIELD_CLIENT_PROVIDER).addAnnotation(Inject.class);
 		clazz.addField("BaseUrlProvider", "urlProvider").addAnnotation(Inject.class);
 	}
 

samples/gitea-operator-gen/src/main/java/org/operator/gen/v1alpha1/AuthHeaderClientProvider.java

@@ -0,0 +1,27 @@
+package org.operator.gen.v1alpha1;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import io.vertx.core.Vertx;
+import io.vertx.ext.web.client.WebClient;
+import io.vertx.ext.web.client.WebClientSession;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+
+@Dependent
+public class AuthHeaderClientProvider implements WebClientProvider {
+	@Inject()
+	Vertx vertx;
+
+	@ConfigProperty(name = "gitea.api.token")
+	private String token;
+	
+
+	@Override
+	public WebClient provide() {
+		WebClientSession webClientSession = WebClientSession.create(WebClient.create(vertx));
+		webClientSession.addHeader("Authorization", "token " + token);
+		return webClientSession;
+	}
+
+}

samples/gitea-operator-gen/src/main/java/org/operator/gen/v1alpha1/DefaultWebClientProvider.java

@@ -0,0 +1,20 @@
+package org.operator.gen.v1alpha1;
+
+import io.quarkus.arc.DefaultBean;
+import io.vertx.core.Vertx;
+import io.vertx.ext.web.client.WebClient;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+
+@DefaultBean
+@Dependent
+public class DefaultWebClientProvider implements WebClientProvider{
+	@Inject()
+	Vertx vertx;
+	
+	@Override
+	public WebClient provide() {
+		return WebClient.create(vertx);
+	}
+
+}

samples/gitea-operator-gen/src/main/java/org/operator/gen/v1alpha1/HeaderAuthentication.java

@@ -0,0 +1,9 @@
+package org.operator.gen.v1alpha1;
+
+import io.vertx.ext.web.client.WebClient;
+
+public interface WebClientProvider {
+	
+	WebClient provide();
+	
+}

samples/gitea-operator-gen/src/main/java/org/operator/gen/v1alpha1/MyOrganizationDependent.java

@@ -20,8 +20,6 @@
 import io.fabric8.openshift.client.OpenShiftClient;
 import io.kiota.http.vertx.VertXRequestAdapter;
 import io.vertx.core.Vertx;
-import io.vertx.ext.web.client.WebClient;
-import io.vertx.ext.web.client.WebClientSession;
 import jakarta.inject.Inject;
 
 public abstract class DependentsIT<T, U extends CustomResource<?, ?>> {
@@ -32,18 +30,15 @@ public abstract class DependentsIT<T, U extends CustomResource<?, ?>> {
 	@Inject
 	Vertx vertx;
 	@Inject
-	HeaderAuthentication auth;
+	AuthHeaderClientProvider clientProvider;
 	@ConfigProperty(name = "gitea.api.uri")
 	String giteaApiUri;
 	@ConfigProperty(name = "test.kubernetes.namespace")
 	String namespace;
 
 	@BeforeEach
    	void setUp() {
-    	WebClient webClient = WebClient.create(vertx);
-		WebClientSession webClientSession = WebClientSession.create(webClient);
-		auth.addAuthHeaders(webClientSession);
-		VertXRequestAdapter requestAdapter = new VertXRequestAdapter(webClientSession);
+		VertXRequestAdapter requestAdapter = new VertXRequestAdapter(clientProvider.provide());
 		requestAdapter.setBaseUrl(giteaApiUri);
 		apiClient = new ApiClient(requestAdapter);
    	}