Merge branch 'main' into add_cf_to_auto_alarm

Author: kcantrel

.github/CODEOWNERS

@@ -0,0 +1,24 @@
+#
+# Set a "catch-all" owner. Should be set to the current active admin for the repo.
+* @kcantrel
+#
+# Set the owner for all the individual samples, if the owner is known and they want to continue to maintain the sample:
+/AI/GenAI-ChatBot-application-sample/ @cbenbass
+/CloudFormation/deploy-fsx-ontap/ @kcantrel
+/Ansible/fsx_inventory_report/ @kcantrel
+/Ansible/snapmirror_report/ @kcantrel
+/EKS/FSxN-as-PVC-for-EKS/ @mickeysh
+/Management-Utilities/auto_create_sm_relationships/ @kcantrel
+/Management-Utilities/auto_set_fsxn_auto_grow/ @kcantrel
+/Management-Utilities/fsx-ontap-aws-cli-scripts/ @kcantrel
+/Management-Utilities/fsxn-rotate-secret/ @kcantrel
+/Management-Utilities/warm_performance_tier/ @kcantrel
+/Monitoring/CloudWatch-FSx/ @LirazRom10
+/Monitoring/LUN-monitoring/ @LirazRom10
+/Monitoring/auto-add-cw-alarms/ @kcantrel
+/Monitoring/monitor-ontap-services/ @kcantrel
+/Monitoring/ingest_nas_audit_logs_into_cloudwatch/ @kcantrel
+/Terraform/deploy-fsx-ontap-sqlserver/ @varunrai
+/Terraform/deploy-fsx-ontap-fileshare-access/ @varunrai
+/Terraform/deploy-fsx-ontap/ @kcantrel
+/Terraform/fsxn-replicate/ @nichollri

.github/linters/.yaml-lint.yml

@@ -2,6 +2,7 @@
 extends: default
 rules:
   line-length: disable
+  comments-indentation: disable
   trailing-spaces: disable
   truthy: disable
   braces:

.github/workflows/dependency-review.yml

@@ -0,0 +1,39 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request,
+# surfacing known-vulnerable versions of the packages declared or updated in the PR.
+# Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable
+# packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: 'Dependency review'
+on:
+  pull_request:
+    branches: [ "main" ]
+
+# If using a dependency submission action in this workflow this permission will need to be set to:
+#
+# permissions:
+#   contents: write
+#
+# https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api
+permissions:
+  contents: read
+  # Write permissions for pull-requests are required for using the `comment-summary-in-pr` option, comment out if you aren't using this option
+  pull-requests: write
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout repository'
+        uses: actions/checkout@v4
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v4
+        # Commonly enabled options, see https://github.com/actions/dependency-review-action#configuration-options for all available options.
+        with:
+          comment-summary-in-pr: always
+        #   fail-on-severity: moderate
+        #   deny-licenses: GPL-1.0-or-later, LGPL-2.0-or-later
+        #   retry-on-snapshot-warnings: true

AI/GenAI-ChatBot-application-sample/.env.local.sample

@@ -2,6 +2,8 @@ NEXT_PUBLIC_LOGIN_PROVIDER=cognito
 NEXT_PUBLIC_KNOWLEDGE_BASE_ID=YOUR_KNOWLEDGE_BASE_ID
 NEXT_PUBLIC_AWS_USER_POOLS_ID=YOUR_AWS_USER_POOLS_ID
 NEXT_PUBLIC_AWS_USER_WEB_CLIENT_ID=YOUR_AWS_USER_WEB_CLIENT_ID
+# NEXT_PUBLIC_LOGIN_EXTERNAL_PROVIDER=AD--NAME-SAMPLE
+# NEXT_PUBLIC_AWS_OAUTH={"domain":"<DOMAIN_PREFIX>.auth.<REGION>.amazoncognito.com","scope":["openid","profile","email"],"redirectSignIn":"http://localhost:9091","redirectSignOut":"http://localhost:9091","responseType":"code"}
 
 # NEXT_PUBLIC_LOGIN_PROVIDER=clerk
 # NEXT_PUBLIC_KNOWLEDGE_BASE_ID=YOUR_KNOWLEDGE_BASE_ID

AI/GenAI-ChatBot-application-sample/README.md

@@ -37,6 +37,18 @@ To get started, you need to configure one of the supported login providers. Conf
     - NEXT_PUBLIC_AWS_USER_POOLS_ID=YOUR_AWS_USER_POOLS_ID
     - NEXT_PUBLIC_AWS_USER_WEB_CLIENT_ID=YOUR_AWS_USER_WEB_CLIENT_ID
 
+#### Configure Active Directory with Amazon Cognito
+1. To integrate Active Directory with Amazon Cognito, follow the [A guide to AD FS federation with Amazon Cognito user pools instructions (Steps 1 to 4)](https://aws.amazon.com/blogs/security/simplify-web-app-authentication-a-guide-to-ad-fs-federation-with-amazon-cognito-user-pools/).
+2. To configure SAML request signing, follow the instructions in [Signing SAML requests](https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-pools-SAML-signing-encryption.html#cognito-user-pools-SAML-signing).
+3. Specify the federated identity provider and authorization by adding the following variables to the `.env.local` file, with values that match your environment.
+    - NEXT_PUBLIC_LOGIN_EXTERNAL_PROVIDER=YOUR_COGNITO_IDENTITY_PROVIDER_NAME
+    - NEXT_PUBLIC_AWS_OAUTH={"domain":"<DOMAIN_PREFIX>.auth.<REGION>.amazoncognito.com","scope":["openid", "profile", "email"],"redirectSignIn":"http://localhost:9091","redirectSignOut":"http://localhost:9091","responseType":"code"} 
+    - Domain - The domain for your Cognito user pool.
+    - Scope - Scopes specifying the access privileges.
+    - redirectSignIn - The URL to redirect to after a successful sign-in.
+    - redirectSignOut - The URL to redirect to after a successful sign-out.
+    - responseType - The type of response to receive from the authorization server.
+
 ### Set up Clerk
 1. Follow the [Sign up](https://dashboard.clerk.com/sign-in?redirect_url=https%3A%2F%2Fdashboard.clerk.com%2F) instructions to sign up for a Clerk account. 
 2. Download and unpack the Workload Factory GenAI sample application source package.
@@ -49,21 +61,8 @@ To get started, you need to configure one of the supported login providers. Conf
     - CLERK_SECRET_KEY=YOUR_CLERK_SECRET_KEY
     - NEXT_PUBLIC_CLERK_TEMPLATE=YOUR_CLERK_TEMPLATE
 
-## Download the application
-To download the application, clone the GitHub repository. Then, change to the sample application directory so that you can build or run it:
-
-1. 
-    ```bash
-    git clone https://github.com/NetApp/FSx-ONTAP-samples-scripts
-    ```
-
-2. 
-    ```bash
-    cd FSx-ONTAP-samples-scripts/AI/GenAI-ChatBot-application-sample
-    ```
-
-## Install dependencies
-To install dependencies for the sample application, run the following command:
+## Install the application
+To install the sample application, run the following command:
 
 ```bash
 npm install
@@ -91,21 +90,4 @@ npm run build
 - Learn more about the APIs used in this sample application by visiting the [Workload Factory API documentation](https://console.workloads.netapp.com/api-doc).
 - To learn more about Next.js, take a look at the following resources:
     - [Next.js documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-    - [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
-
-## Author Information
-
-This repository is maintained by the contributors listed on [GitHub](https://github.com/NetApp/FSx-ONTAP-samples-scripts/graphs/contributors).
-
-## License
-
-Licensed under the Apache License, Version 2.0 (the "License").
-
-You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](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.
-
-© 2024 NetApp, Inc. All Rights Reserved.
+    - [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

AI/GenAI-ChatBot-application-sample/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gen-ai-standalone-app",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "scripts": {
     "dev": "cross-env HOST=localhost PORT=9091 next dev",
@@ -9,27 +9,27 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@clerk/nextjs": "^5.2.2",
-    "@reduxjs/toolkit": "^2.2.5",
-    "@types/react-redux": "^7.1.33",
+    "@clerk/nextjs": "^5.7.2",
+    "@reduxjs/toolkit": "^2.2.8",
+    "@types/react-redux": "^7.1.34",
     "aws-amplify": "5.3.11",
     "cross-env": "^7.0.3",
-    "html-react-parser": "^5.1.10",
+    "html-react-parser": "^5.1.18",
     "moment": "^2.30.1",
-    "next": "14.2.4",
+    "next": "14.2.15",
     "react": "^18",
     "react-dom": "^18",
     "react-popper-tooltip": "^4.4.2",
     "react-redux": "^9.1.2",
-    "sass": "^1.77.6"
+    "sass": "^1.79.5"
   },
   "devDependencies": {
     "@svgr/webpack": "^8.1.0",
-    "@types/node": "^20",
+    "@types/node": "^22",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "eslint": "^8",
-    "eslint-config-next": "14.2.4",
+    "eslint-config-next": "14.2.15",
     "typescript": "^5"
   }
 }

AI/GenAI-ChatBot-application-sample/src/app/auth/auth-service.ts

@@ -19,7 +19,7 @@ export class AuthService {
         await Auth.signUp({
             username,
             password,
-        }).then(data => {
+        }).then(() => {
 
             logger.info("Registering " + username);
 
@@ -131,7 +131,7 @@ export class AuthService {
                     data: data
                 });
             })
-            .catch(err => {
+            .catch(() => {
                 logger.error("Couldn't sign out for some reason");
                 Hub.dispatch(AuthService.CHANNEL, {
                     event: AuthService.AUTH_EVENTS.SIGN_OUT,

AI/GenAI-ChatBot-application-sample/src/app/cognito/aws-configs.ts

@@ -5,6 +5,7 @@ const awsConfig = {
     aws_user_pools_mfa_type: 'OFF',
     aws_user_pools_web_client_id: process.env.NEXT_PUBLIC_AWS_USER_WEB_CLIENT_ID,
     aws_user_settings: 'enable',
+    oauth: process.env.NEXT_PUBLIC_AWS_OAUTH
 };
 
 export default awsConfig

AI/GenAI-ChatBot-application-sample/src/app/components/loginForm/loginForm.tsx

@@ -15,11 +15,17 @@ import { addNotification, removeNotification } from '@/lib/slices/notifications.
 import { NOTIFICATION_CONSTS } from '../NotificationGroup/notification.consts';
 import { setAuth } from '@/lib/slices/auth.slice';
 import { ClerkSignIn } from '@/app/services/clerk.service';
-import { SignInResult, LoginProvider } from '@/lib/api/api.types';
+import {LoginProvider, SignInResultClerk, SignInResultCognito} from '@/lib/api/api.types';
 import useRunUntil from '@/app/hooks/useRunUntil';
 
-const LoginForm = () => {
+export type LoginType = 'AD' | 'UserPassword'
+interface LoginFormProps {
+    onLoginSuccess: (loginType:LoginType )=> void
+}
+
+const LoginForm = ({onLoginSuccess}:LoginFormProps) => {
     const loginProvider = process.env.NEXT_PUBLIC_LOGIN_PROVIDER as LoginProvider;
+    const loginEternalProvider:string | undefined = process.env.NEXT_PUBLIC_LOGIN_EXTERNAL_PROVIDER;
 
     const emailRef = useRef<HTMLInputElement>(null);
 
@@ -29,8 +35,8 @@ const LoginForm = () => {
     const [email, setEmail] = useState<string | undefined>();
     const [password, setPassword] = useState<string | undefined>();
 
-    const { isLoading: isLoadingCog, jwtToken: jwtTokenCog, email: emailCog, password: passwordCog, userName: userNameCog, error: errorCog, doLogin: doLoginCog } = loginProvider === 'cognito' ? CognitoSignIn() : {} as SignInResult
-    const { isLoading: isLoadingClerk, jwtToken: jwtTokenClerk, email: emailClerk, password: passwordClerk, userName: userNameClerk, error: errorClerk, doLogin: doLoginClerk } = loginProvider === 'clerk' ? ClerkSignIn() : {} as SignInResult;
+    const { isLoading: isLoadingCog, jwtToken: jwtTokenCog, email: emailCog, password: passwordCog, userName: userNameCog, error: errorCog, doLogin: doLoginCog } = loginProvider  === 'cognito' ? CognitoSignIn() : {} as SignInResultCognito
+    const { isLoading: isLoadingClerk, jwtToken: jwtTokenClerk, email: emailClerk, password: passwordClerk, userName: userNameClerk, error: errorClerk, doLogin: doLoginClerk } = loginProvider === 'clerk' ? ClerkSignIn() : {} as SignInResultClerk;
 
     useRunUntil(() => {
         emailRef.current?.focus();
@@ -53,18 +59,19 @@ const LoginForm = () => {
 
     useEffect(() => {
         if (jwtTokenCog || jwtTokenClerk) {
+            onLoginSuccess(loginEternalProvider?  'AD': 'UserPassword')
             dispatch(setAuth({
                 isSuccess: true,
                 accessToken: jwtTokenCog || jwtTokenClerk,
                 userName: userNameClerk || userNameCog
             }));
             router.push(`${ROUTES.BASE}${ROUTES.CHAT}`);
         }
-    }, [jwtTokenCog, jwtTokenClerk, router, userNameClerk, userNameCog, dispatch])
+    }, [jwtTokenCog, jwtTokenClerk, router, userNameClerk, userNameCog, dispatch, loginEternalProvider, onLoginSuccess])
 
     const doLogin = () => {
         dispatch(removeNotification(NOTIFICATION_CONSTS.UNIQUE_IDS.USER_NOT_CONFIRMED));
-        loginProvider === 'cognito' ? doLoginCog(email, password) : doLoginClerk(email, password);
+        loginProvider === 'cognito' ? doLoginCog(email, password,loginEternalProvider) : doLoginClerk(email, password);
     }
 
     return (
@@ -73,7 +80,8 @@ const LoginForm = () => {
             <div className={styles.formContent}>
                 <span className={_Classes(global.Regular_24, styles.formTitle)}>Log in to Workload Factory GenAI sample application</span>
                 <span className={`${global.Regular_14}`}>Log in to NetApp GenAI Studio chatbot sample application with<br />your company user account.</span>
-                <DsTextField
+                {!process.env.NEXT_PUBLIC_LOGIN_EXTERNAL_PROVIDER && <>
+                    <DsTextField
                     ref={emailRef}
                     title='Email'
                     className={styles.formInput}
@@ -91,20 +99,21 @@ const LoginForm = () => {
                         value: 'This field is required.'
                     } : undefined}
                 />
-                <DsTextField
-                    title='Password'
-                    isPassword
-                    className={styles.formInput}
-                    onChange={event => setPassword(event?.target.value)}
-                    onKeyDown={event => {
-                        if (event.key === 'Enter') {
-                            doLogin();
-                        }
-                    }}
-                    message={password === '' ? {
-                        type: 'error',
-                        value: 'This field is required.'
-                    } : undefined} />
+                    <DsTextField
+                        title='Password'
+                        isPassword
+                        className={styles.formInput}
+                        onChange={event => setPassword(event?.target.value)}
+                        onKeyDown={event => {
+                            if (event.key === 'Enter') {
+                                doLogin();
+                            }
+                        }}
+                        message={password === '' ? {
+                            type: 'error',
+                            value: 'This field is required.'
+                        } : undefined} />
+                </>}
                 <DsButton onClick={() => doLogin()} className={styles.loginButton} isLoading={isLoadingCog || isLoadingClerk}>Login</DsButton>
             </div>
         </div>

AI/GenAI-ChatBot-application-sample/src/app/global.module.scss

@@ -6,6 +6,10 @@
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
     color: #404040;
 
+    &.isHidden {
+        opacity: 0;
+    }
+
     &.font-variants {
         --semibold-font-weight: 500;
 
@@ -37,7 +41,7 @@
             font-size: 20px;
             line-height: 32px;
             font-weight: 400;
-          }
+        }
 
         .Regular_14 {
             font-size: 14px;