bbende commented on code in PR #9017: URL: https://github.com/apache/nifi/pull/9017#discussion_r1664777155
########## nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/nar/NarRestApiClient.java: ########## @@ -0,0 +1,138 @@ +/* + * 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.nar; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; +import org.apache.commons.io.IOUtils; +import org.apache.nifi.web.api.entity.NarSummariesEntity; +import org.apache.nifi.web.client.StandardHttpUriBuilder; +import org.apache.nifi.web.client.api.HttpRequestBodySpec; +import org.apache.nifi.web.client.api.HttpResponseEntity; +import org.apache.nifi.web.client.api.HttpResponseStatus; +import org.apache.nifi.web.client.api.WebClientService; +import org.apache.nifi.web.client.api.WebClientServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.util.Objects; + +/** + * Encapsulate API calls for listing and downloading NARs through the REST API of a NiFi node. + */ +public class NarRestApiClient { + + private static final Logger LOGGER = LoggerFactory.getLogger(NarRestApiClient.class); + + private static final String HTTP_SCHEME = "http"; + private static final String HTTPS_SCHEME = "https"; + + private static final String NIFI_API_PATH = "nifi-api"; + private static final String CONTROLLER_PATH = "controller"; + private static final String NAR_MANAGER_PATH = "nar-manager"; + private static final String NARS_PATH = "nars"; + private static final String NAR_DOWNLOAD_PATH = "download"; + + private final URI baseUri; + private final WebClientService webClientService; + private final ObjectMapper objectMapper; + + public NarRestApiClient(final WebClientService webClientService, final String host, final int port, final boolean secure) { + try { + this.baseUri = new URI(secure ? HTTPS_SCHEME : HTTP_SCHEME, null, host, port, null, null, null); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + this.webClientService = Objects.requireNonNull(webClientService, "WebClientService is required"); + this.objectMapper = new ObjectMapper(); + this.objectMapper.setAnnotationIntrospector(new JakartaXmlBindAnnotationIntrospector(objectMapper.getTypeFactory())); + } + + public NarSummariesEntity listNarSummaries() { + final URI requestUri = new StandardHttpUriBuilder() + .scheme(baseUri.getScheme()) + .host(baseUri.getHost()) + .port(baseUri.getPort()) + .addPathSegment(NIFI_API_PATH) + .addPathSegment(CONTROLLER_PATH) + .addPathSegment(NAR_MANAGER_PATH) + .addPathSegment(NARS_PATH) + .build(); + LOGGER.info("Requesting NAR summaries from {}", requestUri); + + final HttpRequestBodySpec requestBodySpec = webClientService.get() + .uri(requestUri) + .header("Accept", "application/json"); + + try (final HttpResponseEntity response = requestBodySpec.retrieve()) { + final InputStream responseBody = getResponseBody(requestUri, response); + return objectMapper.readValue(responseBody, NarSummariesEntity.class); + } catch (final WebClientServiceException | IOException e) { + throw new NarRestApiRetryableException(e.getMessage(), e); Review Comment: I wanted to leave this one as is because the message from the retryable exception will be logged in the retry loop in `StandardNarManager`, so it looks like this currently: ``` 2024-07-03 16:46:27,810 INFO [main] org.apache.nifi.nar.StandardNarManager Synchronizing NARs with cluster coordinator 2024-07-03 16:46:27,914 WARN [main] org.apache.nifi.nar.StandardNarManager Error calling https://localhost:8443/nifi-api/controller/nar-manager/nars - 409 - The Flow Controller is initializing the Data Flow.: retrying 2024-07-03 16:46:27,914 INFO [main] org.apache.nifi.nar.StandardNarManager Unable to retrieve NAR summaries from cluster coordinator: retrying until [2024-07-03T20:51:27.811Z] ``` If we changed it as suggested, then the second line there would just say `List NAR summaries failed` with no info about why. -- 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]
