update nifi dependency to 1.27.0

Author: Gorbasch

README.md

@@ -5,16 +5,19 @@ Fortunately Apache NiFi already ships with a couple of processors which provide
 This is why we created this custom controller service which adds an alternative oauth2 access token provider besides the [StandardOauth2AccessTokenProvider](https://nifi.apache.org/docs/nifi-docs/components/org.apache.nifi/nifi-oauth2-provider-nar/1.20.0/org.apache.nifi.oauth2.StandardOauth2AccessTokenProvider/index.html). It provides the access token generated by the [GCPCredentialsControllerService](https://nifi.apache.org/docs/nifi-docs/components/org.apache.nifi/nifi-gcp-nar/1.19.1/org.apache.nifi.processors.gcp.credentials.service.GCPCredentialsControllerService/index.html) service for the [InvokeHTTP](https://nifi.apache.org/docs/nifi-docs/components/org.apache.nifi/nifi-standard-nar/1.17.0/org.apache.nifi.processors.standard.InvokeHTTP/index.html) processor. This way it can be used to generate requests towards any Google API with https support.
 
 ## Installation
+
 1. Download the latest .nar file from the [release page](https://github.com/Digital-Loop/nifi-gcp-oauth2-access-token/releases).
-2. Copy it to the `lib` directory of your Apache NiFi deployment.
+2. Copy it to the `extensions` directory of your Apache NiFi deployment.
 
 ## Manual Build
+
 ```
 mvn clean install
-cp nifi-gcp-oauth2-provider-nar/target/nifi-gcp-oauth2-provider-nar-1.0.0.nar $NIFI_HOME/lib
+cp nifi-gcp-oauth2-provider-nar/target/nifi-gcp-oauth2-provider-nar-1.0.0.nar $NIFI_HOME/extensions
 ```
 
 ## Usage
+
 1. Create and configure a [GCPCredentialsControllerService](https://nifi.apache.org/docs/nifi-docs/components/org.apache.nifi/nifi-gcp-nar/1.19.1/org.apache.nifi.processors.gcp.credentials.service.GCPCredentialsControllerService/index.html) controller service.
 2. Create a GCPOauth2AccessTokenProvider controller service (provided by this module).
 3. You can add one or multiple [scopes](https://developers.google.com/identity/protocols/oauth2/scopes) if required (the required scopes are mentioned in the corresponding Google API documentation).
@@ -23,5 +26,6 @@ cp nifi-gcp-oauth2-provider-nar/target/nifi-gcp-oauth2-provider-nar-1.0.0.nar $N
 6. Configure http method, http url and headers as explained by the corresponding API documentation (the flow file content is used as the request body).
 
 ## Examples
+
 1. [Search Console API](./examples/google-search-console/README.md)
 2. [Business Profile API](./examples/google-business-profile/README.md)

nifi-gcp-oauth2-provider-nar/pom.xml

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-gcp-nar</artifactId>
-            <version>1.20.0</version>
+            <version>1.27.0</version>
             <type>nar</type>
         </dependency>
     </dependencies>

nifi-gcp-oauth2-provider/pom.xml

@@ -34,53 +34,43 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0</version>
+            <version>1.27.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-gcp-services-api</artifactId>
-            <version>1.20.0</version>
+            <version>1.27.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-gcp-processors</artifactId>
-            <version>1.20.0</version>
+            <version>1.27.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-oauth2-provider-api</artifactId>
-            <version>1.20.0</version>
+            <version>1.27.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-oauth2-provider-service</artifactId>
-            <version>1.20.0</version>
+            <version>1.27.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <version>1.27.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

nifi-gcp-oauth2-provider/src/main/java/com/dloop/nifi/gcp/oauth2/GCPOauth2AccessTokenProvider.java

@@ -39,8 +39,17 @@
 
 @Tags({ "gcp", "oauth2", "provider", "authorization", "access token", "http" })
 @CapabilityDescription("Provides OAuth 2.0 access tokens for Google APIs.")
-@SeeAlso({OAuth2AccessTokenProvider.class, GCPCredentialsService.class})
+@SeeAlso({ OAuth2AccessTokenProvider.class, GCPCredentialsService.class })
 public class GCPOauth2AccessTokenProvider extends AbstractControllerService implements OAuth2AccessTokenProvider {
+    public static final PropertyDescriptor PROJECT_ID = new PropertyDescriptor.Builder()
+            .name("project-id")
+            .displayName("Project ID")
+            .description(
+                    "Creates a credential with the provided quota project.")
+            .required(false)
+            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+            .build();
+
     public static final PropertyDescriptor SCOPE = new PropertyDescriptor.Builder()
             .name("scope")
             .displayName("Scope")
@@ -54,7 +63,7 @@ public class GCPOauth2AccessTokenProvider extends AbstractControllerService impl
             .name("delegate")
             .displayName("Delegate")
             .description(
-                    "If the credentials support domain-wide delegation, creates a copy of the identity so that it * impersonates the specified user; otherwise, returns the same instance.")
+                    "If the credentials support domain-wide delegation, creates a copy of the identity so that it impersonates the specified user; otherwise, returns the same instance.")
             .required(false)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
@@ -64,12 +73,14 @@ public class GCPOauth2AccessTokenProvider extends AbstractControllerService impl
     static {
         final List<PropertyDescriptor> props = new ArrayList<>();
         props.add(GoogleUtils.GCP_CREDENTIALS_PROVIDER_SERVICE);
+        props.add(PROJECT_ID);
         props.add(SCOPE);
         props.add(DELEGATE);
         properties = Collections.unmodifiableList(props);
     }
 
     private volatile GoogleCredentials googleCredentials;
+    private volatile String projectId;
     private volatile String[] scopes;
     private volatile String delegate;
 
@@ -87,20 +98,24 @@ public void onEnabled(final ConfigurationContext context) throws InitializationE
         // Get GCP credentials
         googleCredentials = gcpCredentialsService.getGoogleCredentials();
 
+        // Change quota project if specified
+        projectId = context.getProperty(PROJECT_ID).getValue();
+        if (projectId != null && !projectId.isBlank()) {
+            googleCredentials = googleCredentials.createWithQuotaProject(projectId);
+        }
+
         // Apply required scope(s)
         String scope = context.getProperty(SCOPE).getValue();
         if (scope != null) {
             scopes = scope.split("\\s+");
             if (scopes.length > 0) {
-                getLogger().debug("dloop-scope: " + String.join(" ", scopes));
                 googleCredentials = googleCredentials.createScoped(scopes);
             }
         }
 
-        // Impersonate another account if specified
+        // Impersonate a user account via account wide delegation if specified
         delegate = context.getProperty(DELEGATE).getValue();
         if (delegate != null && !delegate.isBlank()) {
-            getLogger().debug("dloop-delegate: " + delegate);
             googleCredentials = googleCredentials.createDelegated(delegate);
         }
     }

nifi-gcp-oauth2-provider/src/test/java/com/dloop/nifi/gcp/oauth2/TestGCPOauth2AccessTokenProvider.java

@@ -16,7 +16,6 @@
  */
 package com.dloop.nifi.gcp.oauth2;
 
-import org.apache.nifi.oauth2.StandardOauth2AccessTokenProvider;
 import org.apache.nifi.processors.gcp.credentials.service.GCPCredentialsControllerService;
 import org.apache.nifi.processors.gcp.util.GoogleUtils;
 import org.apache.nifi.reporting.InitializationException;
@@ -45,7 +44,7 @@ public void testService() throws InitializationException {
         runner.addControllerService("test-gcp-oauth2-access-token-provider", tokenProviderService);
         runner.setProperty(tokenProviderService, GoogleUtils.GCP_CREDENTIALS_PROVIDER_SERVICE,
                 "test-gcp-credentials-controller-service");
-        runner.setProperty(tokenProviderService, StandardOauth2AccessTokenProvider.SCOPE, "test-value");
+        runner.setProperty(tokenProviderService, GCPOauth2AccessTokenProvider.SCOPE, "test-value");
         runner.enableControllerService(tokenProviderService);
         runner.assertValid(tokenProviderService);
     }

pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <groupId>com.dloop</groupId>