Remove quarkiverse-google-cloud-services dependencies

docs/modules/ROOT/pages/reference/extensions/google-bigquery.adoc

@@ -42,11 +42,6 @@ Check the xref:user-guide/index.adoc[User guide] for more information about writ
 
 == Usage
 
-This extension leverages the Quarkiverse Google Cloud Services extension.
-The https://github.com/quarkiverse/quarkiverse-google-cloud-services[documentation] describes how to configure authentication for Google cloud services.
-
-For convenience, a `GoogleBigQueryConnectionFactory` for use by the `google-bigquery` & `google-bigquery-sql` component is automatically configured.
-
 If you want to read SQL scripts from the classpath with `google-bigquery-sql` in native mode,
 then you will need to ensure that they are added to the native image via the `quarkus.native.resources.includes` configuration property.
 Please check https://quarkus.io/guides/building-native-image#quarkus-native-pkg-native-config_quarkus.native.resources.includes[Quarkus documentation] for more details.

docs/modules/ROOT/pages/reference/extensions/google-storage.adoc

@@ -43,18 +43,3 @@ Check the xref:user-guide/index.adoc[User guide] for more information about writ
 This extension auto-enables SSL support in native mode. Hence you do not need to add
 `quarkus.ssl.native=true` to your `application.properties` yourself. See also
 https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide].
-
-== Additional Camel Quarkus configuration
-
-There are two different configuration approaches:
-
-* Google storage client can be defined via quarkus properties leveraging the Quarkiverse - Google Cloud Services - Storage (see https://github.com/quarkiverse/quarkus-google-cloud-services/blob/main/storage[extension git page]).
-Camel will autowire client into the Google-storage component.
-This configuration allows definition of only one storage client, therefore it isn't possible to define several different endpoints, which run together.
-
-* When multiple storage clients are needed, one or more storage client bean need to be registered in the registry (e.g. via a CDI bean producer). Each storage client bean could then be referenced from distinct endpoints.
-[source,properties]
-----
-google-storage://bucket?storageClient=#my_client
-----
-

extensions/google-bigquery/deployment/pom.xml

@@ -30,10 +30,6 @@
     <name>Camel Quarkus :: Google BigQuery :: Deployment</name>
 
     <dependencies>
-        <dependency>
-            <groupId>io.quarkiverse.googlecloudservices</groupId>
-            <artifactId>quarkus-google-cloud-bigquery-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core-deployment</artifactId>

extensions/google-bigquery/deployment/src/main/java/org/apache/camel/quarkus/component/google/bigquery/deployment/GoogleBigqueryProcessor.java

@@ -16,10 +16,8 @@
  */
 package org.apache.camel.quarkus.component.google.bigquery.deployment;
 
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.apache.camel.quarkus.component.google.bigquery.GoogleBigQueryConnectionFactoryProducer;
 
 class GoogleBigqueryProcessor {
     private static final String FEATURE = "camel-google-bigquery";
@@ -28,9 +26,4 @@ class GoogleBigqueryProcessor {
     FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
     }
-
-    @BuildStep
-    public AdditionalBeanBuildItem connectionFactoryProducerBean() {
-        return new AdditionalBeanBuildItem(GoogleBigQueryConnectionFactoryProducer.class);
-    }
 }

extensions/google-bigquery/runtime/pom.xml

@@ -49,8 +49,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.quarkiverse.googlecloudservices</groupId>
-            <artifactId>quarkus-google-cloud-bigquery</artifactId>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>native-image-support</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

extensions/google-bigquery/runtime/src/main/doc/usage.adoc

@@ -1,8 +1,3 @@
-This extension leverages the Quarkiverse Google Cloud Services extension.
-The https://github.com/quarkiverse/quarkiverse-google-cloud-services[documentation] describes how to configure authentication for Google cloud services.
-
-For convenience, a `GoogleBigQueryConnectionFactory` for use by the `google-bigquery` & `google-bigquery-sql` component is automatically configured.
-
 If you want to read SQL scripts from the classpath with `google-bigquery-sql` in native mode,
 then you will need to ensure that they are added to the native image via the `quarkus.native.resources.includes` configuration property.
 Please check https://quarkus.io/guides/building-native-image#quarkus-native-pkg-native-config_quarkus.native.resources.includes[Quarkus documentation] for more details.

extensions/google-pubsub/deployment/pom.xml

@@ -35,8 +35,8 @@
             <artifactId>quarkus-jackson-deployment</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.quarkiverse.googlecloudservices</groupId>
-            <artifactId>quarkus-google-cloud-pubsub-deployment</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-common-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

extensions/google-pubsub/runtime/pom.xml

@@ -63,8 +63,12 @@
             <artifactId>quarkus-jackson</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.quarkiverse.googlecloudservices</groupId>
-            <artifactId>quarkus-google-cloud-pubsub</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>native-image-support</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

extensions/google-storage/deployment/pom.xml

@@ -38,11 +38,6 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-google-storage</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkiverse.googlecloudservices</groupId>
-            <artifactId>quarkus-google-cloud-storage-deployment</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

extensions/google-storage/deployment/src/main/java/org/apache/camel/quarkus/component/google/storage/deployment/GoogleStorageProcessor.java

@@ -16,11 +16,9 @@
  */
 package org.apache.camel.quarkus.component.google.storage.deployment;
 
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.apache.camel.quarkus.component.google.storage.GoogleStorageEnforcer;
 
 class GoogleStorageProcessor {
 
@@ -35,9 +33,4 @@ FeatureBuildItem feature() {
     ExtensionSslNativeSupportBuildItem activateSslNativeSupport() {
         return new ExtensionSslNativeSupportBuildItem(FEATURE);
     }
-
-    @BuildStep
-    public AdditionalBeanBuildItem storageEnforcer() {
-        return new AdditionalBeanBuildItem(GoogleStorageEnforcer.class);
-    }
 }

extensions/google-storage/runtime/pom.xml

@@ -48,25 +48,18 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>native-image-support</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-google-storage</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>google-cloud-storage</artifactId>
-                    <groupId>com.google.cloud</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.quarkiverse.googlecloudservices</groupId>
-            <artifactId>quarkus-google-cloud-storage</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

integration-tests/google-bigquery/README.adoc

@@ -6,11 +6,10 @@ mode does not provide the required capabilities (streaming inserts & queries) th
 The simplest means of setting up authentication is via a https://cloud.google.com/docs/authentication/getting-started[service account]. Use the GCP UI to export
 a JSON representation of your credentials.
 
-You should now set the following environment variable:
+You should now set the following environment variables:
 
 [source,shell]
 ----
 export GOOGLE_APPLICATION_CREDENTIALS=/path/to/credentials.json
+export GOOGLE_PROJECT_ID=your-gcloud-project-id
 ----
-
-You should also modify `application.properties` so that `quarkus.google.cloud.project-id` is correct for your GCP project.

integration-tests/google-bigquery/src/main/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryResource.java

@@ -32,8 +32,8 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import com.google.cloud.bigquery.BigQuery;
 import org.apache.camel.ProducerTemplate;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 @Path("/google-bigquery")
 public class GoogleBigqueryResource {
@@ -42,26 +42,27 @@ public class GoogleBigqueryResource {
     public static final String TABLE_NAME = "camel_quarkus_basic";
 
     @Inject
-    BigQuery bigQuery;
+    ProducerTemplate producerTemplate;
 
     @Inject
-    ProducerTemplate producerTemplate;
+    @ConfigProperty(name = "google.project.id", defaultValue = "test")
+    String projectId;
 
     String tableId = DATASET_ID + "." + TABLE_NAME;
 
     @Path("/table")
     @POST
     public Response createTable() {
         String sql = "CREATE TABLE `" + tableId + "` (id NUMERIC, col1 STRING, col2 STRING)";
-        producerTemplate.requestBody("google-bigquery-sql:" + getProjectId() + ":" + sql, null,
+        producerTemplate.requestBody("google-bigquery-sql:" + projectId + ":" + sql, null,
                 Long.class);
         return Response.created(URI.create("https://camel.apache.org")).build();
     }
 
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
     public Response insertRow(Map<String, String> tableData) {
-        producerTemplate.requestBody("google-bigquery:" + getProjectId() + ":" + DATASET_ID + ":" + TABLE_NAME, tableData);
+        producerTemplate.requestBody("google-bigquery:" + projectId + ":" + DATASET_ID + ":" + TABLE_NAME, tableData);
         return Response.created(URI.create("https://camel.apache.org")).build();
     }
 
@@ -70,7 +71,7 @@ public Response insertRow(Map<String, String> tableData) {
     @Produces(MediaType.APPLICATION_JSON)
     public Response getRow() {
         String sql = "SELECT * FROM `" + tableId + "`";
-        Long rowCount = producerTemplate.requestBody("google-bigquery-sql:" + getProjectId() + ":" + sql, null, Long.class);
+        Long rowCount = producerTemplate.requestBody("google-bigquery-sql:" + projectId + ":" + sql, null, Long.class);
         return Response.ok(rowCount).build();
     }
 
@@ -85,7 +86,7 @@ public Response getRowUsingQueryResource() throws IOException {
         Files.write(sqlFile, sql.getBytes(StandardCharsets.UTF_8));
 
         Long rowCount = producerTemplate.requestBody(
-                "google-bigquery-sql:" + getProjectId() + ":file:" + sqlFile.toAbsolutePath().toString(),
+                "google-bigquery-sql:" + projectId + ":file:" + sqlFile.toAbsolutePath().toString(),
                 null, Long.class);
         return Response.ok(rowCount).build();
     }
@@ -95,11 +96,7 @@ public Response getRowUsingQueryResource() throws IOException {
     @Produces(MediaType.TEXT_PLAIN)
     public Response dropTable() {
         String sql = "DROP TABLE `" + tableId + "`";
-        producerTemplate.requestBody("google-bigquery-sql:" + getProjectId() + ":" + sql, null, Long.class);
+        producerTemplate.requestBody("google-bigquery-sql:" + projectId + ":" + sql, null, Long.class);
         return Response.ok().build();
     }
-
-    private String getProjectId() {
-        return bigQuery.getOptions().getProjectId();
-    }
 }

integration-tests/google-storage/README.adoc

@@ -14,10 +14,6 @@ You can find more info in the https://cloud.google.com/storage/docs/reference/li
 
 When you have the **service account key** you can provide authentication credentials to your application code by setting the environment variable:
 
-`export GOOGLE_APPLICATION_CREDENTIALS="/home/user/Downloads/my-key.json"`
-`export GOOGLE_PROJECT_ID="#name of project"`
-
-or for windows:
-
-`$Env:GOOGLE_APPLICATION_CREDENTIALS = "/home/user/Downloads/my-key.json"`
-`$Env:GOOGLE_PROJECT_ID="#name of project"`
+```
+export GOOGLE_APPLICATION_CREDENTIALS="/home/user/Downloads/my-key.json"
+```