chore: cherry-pick changes from v2 (#3239)

* chore: Upgrade of LogBack and Spring Boot (#3232) (cherry picked from commit 2c172f9) Signed-off-by: achmelo <[email protected]> * feat: Cloud Gateway SAF IDT auth scheme (#3234) * chore: move babel to dev, modify webpack config, spring security Signed-off-by: achmelo <[email protected]> * read keys from common httpsconfig Signed-off-by: achmelo <[email protected]> * New ZAAS safIdt endpoint to generate SAF ID tokens for authenticated user. Signed-off-by: Petr Weinfurt <[email protected]> * IT tests for safIdt endpoint. Signed-off-by: Petr Weinfurt <[email protected]> * initial safidt filter impl Signed-off-by: achmelo <[email protected]> * Address code review comments. Signed-off-by: Petr Weinfurt <[email protected]> * Remove unused class Signed-off-by: Petr Weinfurt <[email protected]> * Fix tests Signed-off-by: Petr Weinfurt <[email protected]> * Fix IT tests Signed-off-by: Petr Weinfurt <[email protected]> * Fix unit tests Signed-off-by: Petr Weinfurt <[email protected]> * Add Controller Advice to handle exceptions. Signed-off-by: Petr Weinfurt <[email protected]> * refactor, unit tests Signed-off-by: achmelo <[email protected]> * Handle more exceptions. Signed-off-by: Petr Weinfurt <[email protected]> * safidt service in test Signed-off-by: achmelo <[email protected]> * Add content type and body to negative test. Signed-off-by: Petr Weinfurt <[email protected]> * Add content type and body to negative test. Signed-off-by: Petr Weinfurt <[email protected]> * Add content type and body to negative test. Signed-off-by: Petr Weinfurt <[email protected]> * Add negative tests with valid Okta token and no mapping. Signed-off-by: Petr Weinfurt <[email protected]> * Fix Rest assured RequestSpec preparation. Signed-off-by: Petr Weinfurt <[email protected]> * Checkout the main branch before Sonar scan to resolve issue 'Could not find ref 'v2.x.x' in refs/heads, refs/remotes/upstream or refs/remotes/origin.' Signed-off-by: Petr Weinfurt <[email protected]> * Fetch the main branch before Sonar scan to resolve issue 'Could not find ref 'v2.x.x' in refs/heads, refs/remotes/upstream or refs/remotes/origin.' Signed-off-by: Petr Weinfurt <[email protected]> * Replace deprecated sonar.login property Signed-off-by: Petr Weinfurt <[email protected]> * Replace deprecated sonar.login property Signed-off-by: Petr Weinfurt <[email protected]> * remove git fetch Signed-off-by: Petr Weinfurt <[email protected]> * Fetch depth 0 Signed-off-by: Petr Weinfurt <[email protected]> * Fetch depth 0 Signed-off-by: Petr Weinfurt <[email protected]> * Add SAF IDT request to negative IT tests Signed-off-by: Petr Weinfurt <[email protected]> * Handle TokenNotValid and TokenExpired exception with 401 response. Signed-off-by: Petr Weinfurt <[email protected]> * Handle TokenNotValid and TokenExpired exception with 401 response. Signed-off-by: Petr Weinfurt <[email protected]> * remove duplicated code Signed-off-by: achmelo <[email protected]> * delete unused imports Signed-off-by: achmelo <[email protected]> --------- Signed-off-by: achmelo <[email protected]> Signed-off-by: Petr Weinfurt <[email protected]> Co-authored-by: Petr Weinfurt <[email protected]> (cherry picked from commit 8d397b3) Signed-off-by: achmelo <[email protected]> * chore: support additional contents - catalog (#3215) * add content mapping - wip Signed-off-by: at670475 <[email protected]> * fix slint Signed-off-by: at670475 <[email protected]> * embed medium blogs Signed-off-by: at670475 <[email protected]> * remove config Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * add expandable icons Signed-off-by: at670475 <[email protected]> * wip - use cases work Signed-off-by: at670475 <[email protected]> * format cases Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * open new tab for links Signed-off-by: at670475 <[email protected]> * embed internal doc Signed-off-by: at670475 <[email protected]> * adjusting based on the design decision Signed-off-by: at670475 <[email protected]> * fix css Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * fix window size Signed-off-by: at670475 <[email protected]> * fix css Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * fix margin between videos Signed-off-by: at670475 <[email protected]> * revert back Signed-off-by: at670475 <[email protected]> * fix label name Signed-off-by: at670475 <[email protected]> * add check for title and description Signed-off-by: at670475 <[email protected]> * disable link Signed-off-by: at670475 <[email protected]> * add tests Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * clean up of codea nd tests Signed-off-by: at670475 <[email protected]> * clean up Signed-off-by: at670475 <[email protected]> * increase default counter Signed-off-by: at670475 <[email protected]> * revert back tests Signed-off-by: at670475 <[email protected]> * add margin to blogs Signed-off-by: at670475 <[email protected]> * fix button Signed-off-by: at670475 <[email protected]> * support zowe doc tutorials Signed-off-by: at670475 <[email protected]> * fix testa Signed-off-by: at670475 <[email protected]> * fix test Signed-off-by: at670475 <[email protected]> * increase coverage Signed-off-by: at670475 <[email protected]> * reduce complexity Signed-off-by: at670475 <[email protected]> * fix code smells Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * fix code smells Signed-off-by: at670475 <[email protected]> * fix code smell Signed-off-by: at670475 <[email protected]> * fix bug Signed-off-by: at670475 <[email protected]> * add tests Signed-off-by: at670475 <[email protected]> * fix bug Signed-off-by: at670475 <[email protected]> * add test Signed-off-by: at670475 <[email protected]> * fix test Signed-off-by: at670475 <[email protected]> * refactoring Signed-off-by: at670475 <[email protected]> * fix test Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * optymize Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * add tests Signed-off-by: at670475 <[email protected]> * fix test Signed-off-by: at670475 <[email protected]> * add test Signed-off-by: at670475 <[email protected]> * add tests Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * fix issue with description Signed-off-by: at670475 <[email protected]> * add test Signed-off-by: at670475 <[email protected]> * add test Signed-off-by: at670475 <[email protected]> --------- Signed-off-by: at670475 <[email protected]> (cherry picked from commit 2aac3b6) Signed-off-by: achmelo <[email protected]> * chore: AT-TLS context configuration tests (#3236) --------- Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> (cherry picked from commit ce012ca) Signed-off-by: achmelo <[email protected]> --------- Signed-off-by: achmelo <[email protected]> Signed-off-by: Petr Weinfurt <[email protected]> Signed-off-by: at670475 <[email protected]> Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pavel Jareš <[email protected]> Co-authored-by: Petr Weinfurt <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: Pablo Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]>
zowe · Dec 18, 2023 · 716d6ee · 716d6ee
1 parent c5d540f
commit 716d6ee
Show file tree

Hide file tree

Showing 39 changed files with 1,855 additions and 178 deletions.
diff --git a/.gitignore b/.gitignore
@@ -119,3 +119,5 @@ onboarding-enabler-micronaut/out/
 onboarding-enabler-nodejs-sample-app/tools/
 
 file/
+
+zowe-cli-id-federation-plugin/*.jcl
diff --git a/...services/src/test/java/org/zowe/apiml/apicatalog/functional/ApiCatalogFunctionalTest.java b/...services/src/test/java/org/zowe/apiml/apicatalog/functional/ApiCatalogFunctionalTest.java
@@ -14,10 +14,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.ContextConfiguration;
+import org.zowe.apiml.apicatalog.ApiCatalogApplication;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(
+    classes = ApiCatalogApplication.class,
+    webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
+)
 @ContextConfiguration
 public abstract class ApiCatalogFunctionalTest {
 
@@ -33,6 +37,10 @@ void setUp() {
     }
 
     protected String getCatalogUriWithPath(String path) {
-        return String.format("https://%s:%d", hostname, port) + path;
+        return getCatalogUriWithPath("https", path);
+    }
+
+    protected String getCatalogUriWithPath(String scheme, String path) {
+        return String.format("%s://%s:%d/%s", scheme, hostname, port, path);
     }
 }
diff --git a/api-catalog-services/src/test/java/org/zowe/apiml/apicatalog/functional/AttlsConfigTest.java b/api-catalog-services/src/test/java/org/zowe/apiml/apicatalog/functional/AttlsConfigTest.java
@@ -0,0 +1,69 @@
+/*
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ */
+
+package org.zowe.apiml.apicatalog.functional;
+
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.TestPropertySource;
+
+import javax.net.ssl.SSLException;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.fail;
+
+@TestPropertySource(
+    properties = {
+        "server.attls.enabled=true",
+        "server.ssl.enabled=false"
+    }
+)
+public class AttlsConfigTest extends ApiCatalogFunctionalTest {
+
+    @Nested
+    class GivenAttlsModeEnabled {
+
+        @Nested
+        class WhenContextLoads {
+
+            @Test
+            void requestFailsWithHttps() {
+                try {
+                    given()
+                        .log().all()
+                    .when()
+                        .get(getCatalogUriWithPath("containers"))
+                    .then()
+                        .log().all()
+                        .statusCode(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+                    fail("Expected an SSL failure");
+                } catch (Exception e) {
+                    assertInstanceOf(SSLException.class, e);
+                }
+            }
+
+            @Test
+            void requestFailsWithAttlsContextReasonWithHttp() {
+                given()
+                    .log().all()
+                .when()
+                    .get(getCatalogUriWithPath("http", "apicatalog/api/v1/containers"))
+                .then()
+                    .log().all()
+                    .statusCode(HttpStatus.SC_INTERNAL_SERVER_ERROR)
+                    .body(containsString("Connection is not secure."))
+                    .body(containsString("AttlsContext.getStatConn"));
+            }
+        }
+    }
+}
diff --git a/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.jsx b/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.jsx
@@ -79,6 +79,7 @@ export default class DetailPage extends Component {
             history,
             currentTileId,
             fetchNewTiles,
+            selectedService,
         } = this.props;
         let { tiles } = this.props;
         const iconBack = <ChevronLeftIcon />;
@@ -102,7 +103,15 @@ export default class DetailPage extends Component {
         }
         const apiPortalEnabled = isAPIPortal();
         const hasTiles = !fetchTilesError && tiles && tiles.length > 0;
-        const { useCasesCounter, tutorialsCounter, videosCounter } = countAdditionalContents(services);
+        const {
+            useCasesCounter,
+            tutorialsCounter,
+            videosCounter,
+            filteredUseCases,
+            filteredTutorials,
+            videos,
+            documentation,
+        } = countAdditionalContents(selectedService);
         const onlySwaggerPresent = tutorialsCounter === 0 && videosCounter === 0 && useCasesCounter === 0;
         const showSideBar = false;
         if (
@@ -202,7 +211,7 @@ export default class DetailPage extends Component {
                                             className="links"
                                             onClick={(e) => this.handleLinkClick(e, '#tutorials-label')}
                                         >
-                                            Tutorials ({tutorialsCounter})
+                                            TechDocs Resources ({tutorialsCounter})
                                         </Link>
                                         <Link
                                             className="links"
@@ -236,9 +245,13 @@ export default class DetailPage extends Component {
                                             render={() => (
                                                 <div className="tabs-swagger">
                                                     <ServiceTabContainer
+                                                        videos={videos}
+                                                        useCases={filteredUseCases}
+                                                        tutorials={filteredTutorials}
                                                         videosCounter={videosCounter}
                                                         tutorialsCounter={tutorialsCounter}
                                                         useCasesCounter={useCasesCounter}
+                                                        documentation={documentation}
                                                         tiles={tiles}
                                                     />
                                                 </div>
@@ -271,4 +284,5 @@ DetailPage.propTypes = {
     history: PropTypes.shape({
         push: PropTypes.func.isRequired,
     }).isRequired,
+    selectedService: PropTypes.object.isRequired,
 };
diff --git a/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.test.jsx b/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.test.jsx
@@ -8,7 +8,7 @@
  * Copyright Contributors to the Zowe Project.
  */
 import { shallow } from 'enzyme';
-import { describe, expect, it, jest } from '@jest/globals';
+import { describe, expect, it } from '@jest/globals';
 import DetailPage from './DetailPage';
 
 const tile = {
@@ -51,6 +51,10 @@ describe('>>> Detailed Page component tests', () => {
         process.env.REACT_APP_API_PORTAL = false;
     });
 
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
     it('should start epic on mount', () => {
         const fetchTilesStart = jest.fn();
         const fetchNewTiles = jest.fn();
@@ -252,9 +256,19 @@ describe('>>> Detailed Page component tests', () => {
         process.env.REACT_APP_API_PORTAL = true;
         const fetchTilesStart = jest.fn();
         const fetchNewTiles = jest.fn();
-        tile.services[0].videos = ['video1', 'video2'];
-        tile.services[0].tutorials = ['tutorial1', 'tutorial2'];
-        tile.services[0].useCases = ['useCase1', 'useCase2'];
+        // eslint-disable-next-line global-require
+        const utils = require('../../utils/utilFunctions');
+        const spyOnCountAdditionalContents = jest.spyOn(utils, 'default');
+        spyOnCountAdditionalContents.mockImplementation(() => ({
+            useCasesCounter: 2,
+            tutorialsCounter: 2,
+            videosCounter: 2,
+            hasSwagger: true,
+            useCases: [],
+            tutorials: [],
+            videos: [],
+            documentation: '',
+        }));
         const wrapper = shallow(
             <DetailPage
                 tiles={[tile]}
@@ -268,6 +282,7 @@ describe('>>> Detailed Page component tests', () => {
             />
         );
         expect(wrapper.find('#right-resources-menu').exists()).toEqual(true);
+        spyOnCountAdditionalContents.mockRestore();
     });
 
     it('should click on the links', () => {

diff --git a/api-catalog-ui/frontend/src/components/DetailPage/DetailPageContainer.jsx b/api-catalog-ui/frontend/src/components/DetailPage/DetailPageContainer.jsx
@@ -28,6 +28,7 @@ const mapStateToProps = (state) => ({
     fetchTilesError: state.tilesReducer.error,
     selectedTile: state.selectedServiceReducer.selectedTile,
     selectedServiceId: state.selectedServiceReducer.selectedService.serviceId,
+    selectedService: state.selectedServiceReducer.selectedService,
     isLoading: loadingSelector(state),
     currentTileId: state.tilesReducer.currentTileId,
 });

diff --git a/api-catalog-ui/frontend/src/components/ExtraContents/BlogContainer.jsx b/api-catalog-ui/frontend/src/components/ExtraContents/BlogContainer.jsx
@@ -0,0 +1,110 @@
+/*
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ */
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import BlogTile from './BlogTile';
+
+export default function BlogContainer({ user, url, title }) {
+    const rss2json = `https://api.rss2json.com/v1/api.json?rss_url=https%3A%2F%2Fmedium.com%2Ffeed%2F%40${user}`;
+    const [myBlog, setMyBlog] = useState([]);
+
+    const fetchData = async () => {
+        try {
+            const res = await fetch(url);
+            const data = await res.text();
+
+            const parser = new DOMParser();
+            const doc = parser.parseFromString(data, 'text/html');
+            const divs = doc.querySelector('.linklist.relatedlinks');
+            if (divs) {
+                divs.parentNode.removeChild(divs);
+            }
+
+            let content = doc.querySelector('.shortdesc');
+            if (!content?.textContent) {
+                content = doc.querySelector('.p');
+            }
+            const tutorialTitle = doc.querySelector('h1.title');
+            const blogTitle = tutorialTitle?.textContent;
+            const blogContent = content?.textContent;
+
+            const blogData = {
+                content: blogContent,
+                description: blogContent,
+                title: blogTitle,
+                link: url,
+            };
+
+            setMyBlog(blogData);
+        } catch (error) {
+            // eslint-disable-next-line no-console
+            console.error('Error fetching data:', error);
+            return null;
+        }
+    };
+
+    useEffect(() => {
+        const fetchDataEffect = async () => {
+            if (!url?.includes('medium.com') && !url?.includes('docs.zowe.org')) {
+                await fetchData();
+            } else if (url?.includes('docs.zowe.org')) {
+                const blogData = {
+                    content: '',
+                    description: `Tutorial from the Zowe documentation related to ${title}`,
+                    title,
+                    link: url,
+                };
+                setMyBlog(blogData);
+            } else {
+                try {
+                    const res = await fetch(rss2json);
+                    const data = await res.json();
+                    setMyBlog(data);
+                } catch (error) {
+                    // eslint-disable-next-line no-console
+                    console.error('Error fetching data:', error);
+                    return null;
+                }
+            }
+        };
+
+        fetchDataEffect();
+    }, [rss2json]);
+
+    function displayBlogs() {
+        if (myBlog?.items) {
+            const correctBlog = myBlog.items.find((blog) => blog?.link.includes(url));
+            return correctBlog && <BlogTile blogData={correctBlog} />;
+        }
+    }
+    if (url?.includes('medium.com')) {
+        return (
+            <div data-testid="medium-blog-container" className="BlogsContainer">
+                {displayBlogs()}
+            </div>
+        );
+    }
+
+    return (
+        myBlog && (
+            <div data-testid="tech-blog-container" className="BlogsContainer">
+                <BlogTile blogData={myBlog} />
+            </div>
+        )
+    );
+}
+
+BlogContainer.propTypes = {
+    url: PropTypes.shape({
+        includes: PropTypes.func.isRequired,
+    }).isRequired,
+    user: PropTypes.string.isRequired,
+    title: PropTypes.string.isRequired,
+};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -119,3 +119,5 @@ onboarding-enabler-micronaut/out/
		onboarding-enabler-nodejs-sample-app/tools/

		file/

		zowe-cli-id-federation-plugin/*.jcl