From 1a25bba51655c12df25cf562ce42273c00c9fd58 Mon Sep 17 00:00:00 2001 From: lehelb Date: Tue, 1 Oct 2024 16:26:58 -0500 Subject: [PATCH] Merge conflict documentation HTML -> MD change --- .../nifi/processors/airtable/QueryAirtableTable.java | 1 + .../additionalDetails.md | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java b/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java index 9db139f7afec0..b3d66b376cf9f 100644 --- a/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java +++ b/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java @@ -112,6 +112,7 @@ public class QueryAirtableTable extends AbstractProcessor { // API Keys are deprecated, Airtable now provides Personal Access Tokens instead. static final PropertyDescriptor PAT = new PropertyDescriptor.Builder() .name("pat") + .displayName("Personal Access Token") .description("The Personal Access Token (PAT) to use in queries. Should be generated on Airtable's account page.") .required(true) .sensitive(true) diff --git a/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/resources/docs/org.apache.nifi.processors.airtable.QueryAirtableTable/additionalDetails.md b/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/resources/docs/org.apache.nifi.processors.airtable.QueryAirtableTable/additionalDetails.md index f7fd766e6a948..e2b63b19a16bd 100644 --- a/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/resources/docs/org.apache.nifi.processors.airtable.QueryAirtableTable/additionalDetails.md +++ b/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/resources/docs/org.apache.nifi.processors.airtable.QueryAirtableTable/additionalDetails.md @@ -23,10 +23,11 @@ processor can query records from a single base and table via Airtable's REST API able to handle a large number of records. It can also split large record sets to multiple FlowFiles just like a database processor. -### API Key +### Personal Access Token -Airtable REST API calls requires an API Key that needs to be passed in a request. An Airtable account is required to -generate an API Key. +Please note that API Keys were deprecated, Airtable now provides Personal Access Tokens (PATs) instead. +Airtable REST API calls requires a PAT (Personal Access Token) that needs to be passed in a request. An Airtable account +is required to generate the PAT. ### API rate limit @@ -37,6 +38,6 @@ is recommended to start off with the default settings and to increase both param ### Metadata API -Currently the Metadata API of Airtable is unstable, and we don't provide a way to use it. Until it becomes stable you +Currently, the Metadata API of Airtable is unstable, and we don't provide a way to use it. Until it becomes stable you can set up a ConvertRecord or MergeRecord processor with a JsonTreeReader to read the content and convert it into a Record with schema. \ No newline at end of file