turcsanyip commented on a change in pull request #4226: URL: https://github.com/apache/nifi/pull/4226#discussion_r417436116
########## File path: nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/utils/AzureEventHubUtils.java ########## @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.processors.azure.eventhub.utils; + +import java.util.ArrayList; +import java.util.List; + +import com.microsoft.azure.eventhubs.ConnectionStringBuilder; + +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.util.StandardValidators; + +public final class AzureEventHubUtils { + + public static final String MANAGED_IDENDITY_POLICY = ConnectionStringBuilder.MANAGED_IDENTITY_AUTHENTICATION; Review comment: I did not catch this typo earlier: IDENTITY ########## File path: nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/utils/AzureEventHubUtils.java ########## @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.processors.azure.eventhub.utils; + +import java.util.ArrayList; +import java.util.List; + +import com.microsoft.azure.eventhubs.ConnectionStringBuilder; + +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.util.StandardValidators; + +public final class AzureEventHubUtils { + + public static final String MANAGED_IDENDITY_POLICY = ConnectionStringBuilder.MANAGED_IDENTITY_AUTHENTICATION; + + public static final PropertyDescriptor POLICY_PRIMARY_KEY = new PropertyDescriptor.Builder() + .name("Shared Access Policy Primary Key") + .description("The primary key of the shared access policy") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .expressionLanguageSupported(ExpressionLanguageScope.NONE) + .sensitive(true) + .required(false) + .build(); + + public static final PropertyDescriptor USE_MANAGED_IDENTITY = new PropertyDescriptor.Builder() + .name("use-managed-identity") + .displayName("Use Azure Managed Identity") + .description("Choose whether or not to use the managed identity of Azure VM/VMSS") + .required(false).defaultValue("false").allowableValues("true", "false") + .addValidator(StandardValidators.BOOLEAN_VALIDATOR).build(); + + public static List<ValidationResult> customValidate(PropertyDescriptor accessPolicyDescriptor, + PropertyDescriptor policyKeyDescriptor, + ValidationContext context) { + List<ValidationResult> retVal = new ArrayList<>(); + + boolean accessPolicyIsSet = context.getProperty(accessPolicyDescriptor).isSet(); + boolean policyKeyIsSet = context.getProperty(policyKeyDescriptor).isSet(); + boolean useManagedIdentity = context.getProperty(USE_MANAGED_IDENTITY).asBoolean(); + + if (useManagedIdentity && (accessPolicyIsSet || policyKeyIsSet) ) { + final String msg = String.format( + "('%s') and ('%s' with '%s') fields cannot be set at the same time.", + USE_MANAGED_IDENTITY.getDisplayName(), + accessPolicyDescriptor.getDisplayName(), + POLICY_PRIMARY_KEY.getDisplayName() + ); + retVal.add(new ValidationResult.Builder().valid(false).explanation(msg).build()); + } else if (!useManagedIdentity && (!accessPolicyIsSet || !policyKeyIsSet)) { + final String msg = String.format( + "either('%s') or (%s with '%s') must be set", + USE_MANAGED_IDENTITY.getDisplayName(), + accessPolicyDescriptor.getDisplayName(), + POLICY_PRIMARY_KEY.getDisplayName() + ); + retVal.add(new ValidationResult.Builder().valid(false).explanation(msg).build()); + } + return retVal; + } + + public static String getManagedIdentityConnectionString(final String namespace, final String eventHubName){ + return new ConnectionStringBuilder().setNamespaceName(namespace).setEventHubName(eventHubName) + .setAuthentication(MANAGED_IDENDITY_POLICY).toString(); + } + public static String getSharedAccessSignatureConnectionString(final String namespace, final String eventHubName, final String sasName, final String sasKey) { Review comment: This could also be used from `PutAzureEventHub` now (be careful with the unused import there). ########## File path: nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java ########## @@ -76,6 +76,7 @@ import java.util.concurrent.TimeUnit; Review comment: com.microsoft.azure.eventhubs.ConnectionStringBuilder is an unused import above. ########## File path: nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java ########## @@ -103,16 +107,10 @@ .description("The name of the shared access policy. This policy must have Listen claims.") .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .expressionLanguageSupported(ExpressionLanguageScope.NONE) - .required(true) - .build(); - static final PropertyDescriptor POLICY_PRIMARY_KEY = new PropertyDescriptor.Builder() - .name("Shared Access Policy Primary Key") - .description("The primary key of the shared access policy") - .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) - .expressionLanguageSupported(ExpressionLanguageScope.NONE) - .sensitive(true) - .required(true) + .required(false) .build(); + static final PropertyDescriptor POLICY_PRIMARY_KEY = AzureEventHubUtils.POLICY_PRIMARY_KEY; + static final PropertyDescriptor USE_MANANGED_IDENTITY = AzureEventHubUtils.USE_MANAGED_IDENTITY; Review comment: I did not catch this typo earlier: MANANGED here too, and also in the other 2 processor classes. ########## File path: nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/utils/AzureEventHubUtils.java ########## @@ -0,0 +1,81 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.processors.azure.eventhub.utils; + +import java.util.ArrayList; +import java.util.List; + +import com.microsoft.azure.eventhubs.ConnectionStringBuilder; + +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.util.StandardValidators; + +public final class AzureEventHubUtils { + + public static final String MANANGED_IDENDITY_POLICY = ConnectionStringBuilder.MANAGED_IDENTITY_AUTHENTICATION; + + public static final PropertyDescriptor POLICY_PRIMARY_KEY = new PropertyDescriptor.Builder() + .name("Shared Access Policy Primary Key") + .description("The primary key of the shared access policy") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .expressionLanguageSupported(ExpressionLanguageScope.NONE) + .sensitive(true) + .required(false) + .build(); + + public static final PropertyDescriptor USE_MANANGED_IDENTITY = new PropertyDescriptor.Builder() + .name("use-managed-identity") + .displayName("Use Azure Managed Identity") + .description("Choose whether or not to use the managed identity of azure vm/vmss. ") + .required(false).defaultValue("false").allowableValues("true", "false") + .addValidator(StandardValidators.BOOLEAN_VALIDATOR).build(); + + public static List<ValidationResult> customValidate(PropertyDescriptor accessPolicyDescriptor, ValidationContext context) { + List<ValidationResult> retVal = new ArrayList<>(); + + boolean accessPolicyIsSet = context.getProperty(accessPolicyDescriptor).isSet(); + boolean policyKeyIsSet = context.getProperty(POLICY_PRIMARY_KEY).isSet(); + boolean useManagedIdentity = context.getProperty(USE_MANANGED_IDENTITY).asBoolean(); + + if (useManagedIdentity && (accessPolicyIsSet || policyKeyIsSet) ) { + final String msg = String.format( + "%s and %s with %s fields cannot be set at the same time.", + USE_MANANGED_IDENTITY.getDisplayName(), + accessPolicyDescriptor.getDisplayName(), + POLICY_PRIMARY_KEY.getDisplayName() + ); + retVal.add(new ValidationResult.Builder().valid(false).explanation(msg).build()); + } else if (!useManagedIdentity && (!accessPolicyIsSet || !policyKeyIsSet)) { + final String msg = String.format( + "Either %s or %s with %s must be set", + USE_MANANGED_IDENTITY.getDisplayName(), + accessPolicyDescriptor.getDisplayName(), + POLICY_PRIMARY_KEY.getDisplayName() + ); + retVal.add(new ValidationResult.Builder().valid(false).explanation(msg).build()); Review comment: You might have missed this comment. I meant `new ValidationResult.Builder().subject("Credentials config ").valid(false).explanation(msg).build())` (or similar string in the subject) which would be more informative than the empty string in the validation error message. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
