gresockj commented on a change in pull request #5497: URL: https://github.com/apache/nifi/pull/5497#discussion_r739644355
########## File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/extension/NiFiRegistryExtensionBundleMetadata.java ########## @@ -0,0 +1,109 @@ +/* + * 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.registry.extension; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; + +/** + * NiFi Registry implementation of ExtensionBundleMetadata which adds bundleIdentifier to the fields. + */ +public class NiFiRegistryExtensionBundleMetadata extends AbstractExtensionBundleMetadata { + + private static final String SEPARATOR = "::"; + private static final String LOCATION = "%s" + SEPARATOR + "%s" + SEPARATOR + "%s" + SEPARATOR + "%s.nar"; Review comment: What about `String#join` here? Also, perhaps name this LOCATION_FORMAT to be more descriptive. ########## File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/main/java/org/apache/nifi/nar/PropertyBasedNarProviderInitializationContext.java ########## @@ -59,4 +71,9 @@ public PropertyBasedNarProviderInitializationContext(final NiFiProperties proper return result; } + + private SSLContext createSSLContext(final NiFiProperties properties) throws TlsException { + TlsConfiguration tlsConfiguration = StandardTlsConfiguration.fromNiFiProperties(properties); Review comment: `final` ########## File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/extension/NiFiRegistryNarProvider.java ########## @@ -0,0 +1,104 @@ +/* + * 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.registry.extension; + +import org.apache.nifi.nar.NarProvider; +import org.apache.nifi.nar.NarProviderInitializationContext; +import org.apache.nifi.util.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * NarProvider implementation that retrieves NARs from NiFi Registry. The current implementation will retrieve bundles + * from all buckets that the NiFi server is authorized to read from (generally will be all buckets). + * + * Example configuration for nifi.properties: + * nifi.nar.library.provider.nifi-registry.implementation=org.apache.nifi.registry.extension.NiFiRegistryNarProvider Review comment: I suppose we don't currently include any example blank properties in `nifi.properties` for other `NarProvider`s at the moment, but what do you think about adding some? Alternatively, we could add something to the Admin Guide. I'm just concerned that this feature will be fairly invisible if there's no way for the user to know about it other than reading these class comments. ########## File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/extension/NiFiRegistryExtensionBundleMetadata.java ########## @@ -0,0 +1,109 @@ +/* + * 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.registry.extension; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; + +/** + * NiFi Registry implementation of ExtensionBundleMetadata which adds bundleIdentifier to the fields. + */ +public class NiFiRegistryExtensionBundleMetadata extends AbstractExtensionBundleMetadata { + + private static final String SEPARATOR = "::"; + private static final String LOCATION = "%s" + SEPARATOR + "%s" + SEPARATOR + "%s" + SEPARATOR + "%s.nar"; + + private final String bundleIdentifier; + + private NiFiRegistryExtensionBundleMetadata(final Builder builder) { + super(builder.registryIdentifier, builder.group, builder.artifact, builder.version); + this.bundleIdentifier = Validate.notBlank(builder.bundleIdentifier); + } + + public String getBundleIdentifier() { + return bundleIdentifier; + } + + /** + * @return a location string that will be returned from a NarProvider and passed back to the fetch method, + * also servers as the filename used by the NarProvider Review comment: serves* ########## File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/extension/NiFiRegistryExtensionRegistry.java ########## @@ -0,0 +1,125 @@ +/* + * 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.registry.extension; + +import org.apache.nifi.authorization.user.NiFiUser; +import org.apache.nifi.registry.client.BundleVersionClient; +import org.apache.nifi.registry.client.NiFiRegistryClient; +import org.apache.nifi.registry.client.NiFiRegistryClientConfig; +import org.apache.nifi.registry.client.NiFiRegistryException; +import org.apache.nifi.registry.client.RequestConfig; +import org.apache.nifi.registry.client.impl.JerseyNiFiRegistryClient; +import org.apache.nifi.registry.client.impl.request.ProxiedEntityRequestConfig; +import org.apache.nifi.registry.extension.bundle.BundleVersionFilterParams; +import org.apache.nifi.registry.extension.bundle.BundleVersionMetadata; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * NiFi Registry implementation of ExtensionRegistry. + */ +public class NiFiRegistryExtensionRegistry extends AbstractExtensionRegistry<NiFiRegistryExtensionBundleMetadata> { + + private NiFiRegistryClient registryClient; + + public NiFiRegistryExtensionRegistry(final String identifier, final String url, final String name, final SSLContext sslContext) { + super(identifier, url, name, sslContext); + } + + private synchronized NiFiRegistryClient getRegistryClient() { + if (registryClient != null) { + return registryClient; + } + + final NiFiRegistryClientConfig config = new NiFiRegistryClientConfig.Builder() + .connectTimeout(30000) + .readTimeout(30000) + .sslContext(getSSLContext()) + .baseUrl(getURL()) + .build(); + + registryClient = new JerseyNiFiRegistryClient.Builder() + .config(config) + .build(); + + return registryClient; + } + + private synchronized void invalidateClient() { + this.registryClient = null; + } + + @Override + public void setURL(String url) { Review comment: Could be `final` -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
