PR request for ef13f1ba62b95d30bcc13300292a2848f778603f

assets/create-webhook.sh

@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+############################################################
+# Help                                                     #
+############################################################
+Help()
+{
+   # Display Help
+   echo "Add webhook to repo."
+   echo
+   echo "Syntax: create-webhook.sh [-h|-o org -r repo -u url -t token]"
+   echo "options:"
+   echo "-o     Enter the org name."
+   echo "-h     Print this Help."
+   echo "-r     Enter the repo name"
+   echo "-t     Enter the repo auth token e.g. \$(gh auth token)"
+   echo "-u     Enter the webhook url"
+   echo
+}
+
+Webhook()
+{
+  curl "https://api.github.com/repos/$org/$repo/hooks" \
+       -H "Authorization: Token $token" \
+       -d @- << EOF
+  {
+    "name": "web",
+    "active": true,
+    "events": [
+      "push"
+    ],
+    "config": {
+      "url": "$url",
+      "content_type": "json"
+    }
+  }
+EOF
+}
+
+############################################################
+############################################################
+# Main program                                             #
+############################################################
+############################################################
+
+# Set variables
+org=""
+repo=""
+token=""
+url=""
+
+############################################################
+# Process the input options. Add options as needed.        #
+############################################################
+# Get the options
+while getopts ":h:o:r:t:u:" option; do
+   case $option in
+      h) # display Help
+         Help
+         exit;;
+      o) # Enter a name
+         org=$OPTARG;;
+      r) # Enter a name
+         repo=$OPTARG;;
+      t) # Enter a name
+         token=$OPTARG;;
+      u) # Enter a name
+         url=$OPTARG;;
+     \?) # Invalid option
+         echo "Error: Invalid option"
+         exit;;
+   esac
+done
+
+echo "Org: $org, Repo: $repo, Token: $token, Url: $url"
+if [ -z $org ] || [ -z $repo ] || [ -z $token ] || [ -z $url ]; then
+  Help
+else
+  Webhook
+fi

cdk/lib/assets/lambdas/amazon_q_app/amazon_q_app_resource.py

@@ -3,88 +3,90 @@
 import time
 import json
 import datetime
-from botocore.auth import SigV4Auth
-from botocore.awsrequest import AWSRequest
-import botocore.session
 
 amazon_q = boto3.client('qbusiness')
 
+
 def on_event(event, context):
-  q_app_name = os.environ['Q_APP_NAME']
-  q_app_role_arn = os.environ['Q_APP_ROLE_ARN']
-  # physical_id = "PhysicalIdAmazonQCodeAnalysisApp"
-
-  print(json.dumps(event))
-  request_type = event['RequestType']
-  if request_type == 'Create': return on_create(event,  
-                                                q_app_name=q_app_name,
-                                                q_app_role_arn=q_app_role_arn,
-                                                )
-  physical_id = event['PhysicalResourceId']
-  if request_type == 'Update': return on_update(event, physical_id=physical_id)
-  if request_type == 'Delete': return on_delete(event, physical_id=physical_id)
-  raise Exception("Invalid request type: %s" % request_type)
+    q_app_name = os.environ['Q_APP_NAME']
+    q_app_role_arn = os.environ['Q_APP_ROLE_ARN']
+    # physical_id = "PhysicalIdAmazonQCodeAnalysisApp"
+
+    print(json.dumps(event))
+    request_type = event['RequestType']
+    if request_type == 'Create': return on_create(event,
+                                                  q_app_name=q_app_name,
+                                                  q_app_role_arn=q_app_role_arn,
+                                                  )
+    physical_id = event['PhysicalResourceId']
+    if request_type == 'Update': return on_update(event, physical_id=physical_id)
+    if request_type == 'Delete': return on_delete(event, physical_id=physical_id)
+    raise Exception("Invalid request type: %s" % request_type)
 
 
 def on_create(event, q_app_name, q_app_role_arn):
-  props = event["ResourceProperties"]
-  print("create new resource with props %s" % props)
-
-  # Create Amazon Q App
-  amazon_q_app_id = create_q_app(q_app_name=q_app_name,
-                                 role_arn=q_app_role_arn)
-
-  # Create Q Index
-  amazon_q_index_id = create_q_index(q_app_name=q_app_name,
-                                     amazon_q_app_id=amazon_q_app_id)
-
-  # Create Q Retriever
-  amazon_q_retriever_id = create_q_retriever(
-    q_app_name=q_app_name,
-    amazon_q_app_id=amazon_q_app_id,
-    amazon_q_index_id=amazon_q_index_id,
-    q_app_role_arn=q_app_role_arn,
-  )
-
-  return { 
-    'PhysicalResourceId': amazon_q_app_id, 
-    'Data': { 
-        'AmazonQAppId': amazon_q_app_id, 
-        'AmazonQIndexId': amazon_q_index_id, 
-        'AmazonQRetrieverId': amazon_q_retriever_id 
-      }
-  }
+    props = event["ResourceProperties"]
+    print("create new resource with props %s" % props)
+
+    # Create Amazon Q App
+    amazon_q_app_id = create_q_app(q_app_name=q_app_name,
+                                   role_arn=q_app_role_arn)
+
+    # Create Q Index
+    amazon_q_index_id = create_q_index(q_app_name=q_app_name,
+                                       amazon_q_app_id=amazon_q_app_id)
+
+    # Create Q Retriever
+    amazon_q_retriever_id = create_q_retriever(
+        q_app_name=q_app_name,
+        amazon_q_app_id=amazon_q_app_id,
+        amazon_q_index_id=amazon_q_index_id,
+        q_app_role_arn=q_app_role_arn,
+    )
+
+    web_experience_id = create_q_web_experience(amazon_q_app_id=amazon_q_app_id, q_app_name=q_app_name)
+
+    return {
+        'PhysicalResourceId': amazon_q_app_id,
+        'Data': {
+            'AmazonQAppId': amazon_q_app_id,
+            'AmazonQIndexId': amazon_q_index_id,
+            'AmazonQRetrieverId': amazon_q_retriever_id,
+            'AmazonQWebExperienceId': web_experience_id
+        }
+    }
 
 
 def on_update(event, physical_id):
-  # physical_id = event["PhysicalResourceId"]
-  props = event["ResourceProperties"]
-  print("update resource %s with props %s" % (physical_id, props))
+    # physical_id = event["PhysicalResourceId"]
+    props = event["ResourceProperties"]
+    print("update resource %s with props %s" % (physical_id, props))
 
-  return { 'PhysicalResourceId': physical_id } 
+    return {'PhysicalResourceId': physical_id}
 
 
 def on_delete(event, physical_id):
-  # physical_id = event["PhysicalResourceId"]
-  print("delete resource %s" % physical_id)
-  delete_amazon_q_app(q_app_id=physical_id)
+    # physical_id = event["PhysicalResourceId"]
+    print("delete resource %s" % physical_id)
+    delete_amazon_q_app(q_app_id=physical_id)
 
-  return { 'PhysicalResourceId': physical_id } 
+    return {'PhysicalResourceId': physical_id}
 
 
 def create_q_app(q_app_name, role_arn):
-  import datetime
-  response = amazon_q.create_application(
+    import datetime
+    response = amazon_q.create_application(
         attachmentsConfiguration={
             'attachmentsControlMode': 'ENABLED'
         },
         displayName=q_app_name,
         description=f"{q_app_name} created with Cloudformation on {datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}",
         roleArn=role_arn,
     )
-  amazon_q_app_id = response["applicationId"]
+    amazon_q_app_id = response["applicationId"]
+
+    return amazon_q_app_id
 
-  return amazon_q_app_id
 
 def create_q_index(q_app_name, amazon_q_app_id):
     response = amazon_q.create_index(
@@ -98,18 +100,19 @@ def create_q_index(q_app_name, amazon_q_app_id):
     index_id = response["indexId"]
 
     while True:
-      response = amazon_q.get_index(
-      applicationId=amazon_q_app_id,
-      indexId=index_id,
-      )
-      status = response.get('status')
-      print(f"Creat index status {status}")
-      if status == 'ACTIVE':
-          break
-      time.sleep(10)
+        response = amazon_q.get_index(
+            applicationId=amazon_q_app_id,
+            indexId=index_id,
+        )
+        status = response.get('status')
+        print(f"Creat index status {status}")
+        if status == 'ACTIVE':
+            break
+        time.sleep(10)
 
     return index_id
 
+
 def create_q_retriever(q_app_name, amazon_q_app_id, amazon_q_index_id, q_app_role_arn):
     response = amazon_q.create_retriever(
         applicationId=amazon_q_app_id,
@@ -126,9 +129,20 @@ def create_q_retriever(q_app_name, amazon_q_app_id, amazon_q_index_id, q_app_rol
 
     return retriever_id
 
+
 def delete_amazon_q_app(q_app_id):
-  response = amazon_q.delete_application(
+    response = amazon_q.delete_application(
         applicationId=q_app_id
     )
 
-  return response
+    return response
+
+
+def create_q_web_experience(amazon_q_app_id, q_app_name):
+    response = amazon_q.create_web_experience(
+        applicationId=amazon_q_app_id,
+        title=q_app_name
+    )
+    web_experience_id = response["webExperienceId"]
+
+    return web_experience_id

cdk/lib/assets/lambdas/batch_lambdas/submit_batch_job.py

@@ -34,39 +34,49 @@ def on_create(event, physical_id):
     q_app_user_id = os.environ.get("Q_APP_USER_ID")
     ssh_url = os.environ.get("SSH_URL")
     ssh_key_name = os.environ.get("SSH_KEY_NAME")
+    prompt_config_param_name = os.environ.get("PROMPT_CONFIG_SSM_PARAM_NAME")
     print("Getting AP id and index...")
     q_app_id = get_q_app_id(q_app_name)
     q_app_index = get_q_app_index(q_app_name, q_app_id)
 
     container_overrides = {
-        "environment": [{
-            "name": "REPO_URL",
-            "value": repo_url
-        },
-        {
-            "name": "SSH_URL",
-            "value": ssh_url
-        },
-        {
-            "name": "SSH_KEY_NAME",
-            "value": ssh_key_name
-        },
-        {
-            "name": "AMAZON_Q_APP_ID",
-            "value": q_app_id
-        },
-        {
-            "name": "AMAZON_Q_USER_ID",
-            "value": q_app_user_id
-        },
-        {
-            "name": "Q_APP_INDEX",
-            "value": q_app_index
-        },
-        {
-            "name": "Q_APP_ROLE_ARN",
-            "value": q_app_role_arn
-        }],
+        "environment": [
+            {
+                "name": "REPO_URL",
+                "value": repo_url
+            },
+            {
+                "name": "SSH_URL",
+                "value": ssh_url
+            },
+            {
+                "name": "SSH_KEY_NAME",
+                "value": ssh_key_name
+            },
+            {
+                "name": "AMAZON_Q_APP_ID",
+                "value": q_app_id
+            },
+            {
+                "name": "AMAZON_Q_USER_ID",
+                "value": q_app_user_id
+            },
+            {
+                "name": "Q_APP_INDEX",
+                "value": q_app_index
+            },
+            {
+                "name": "Q_APP_ROLE_ARN",
+                "value": q_app_role_arn
+            },
+            {
+                "name": "S3_BUCKET",
+                "value": s3_bucket
+            },
+            {
+                "name": "PROMPT_CONFIG_SSM_PARAM_NAME",
+                "value": prompt_config_param_name
+            }],
         "command": [
             "sh","-c",f"yum -y install python-pip git && pip install boto3 awscli GitPython && aws s3 cp s3://{s3_bucket}/code-processing/generate_documentation_and_ingest_code.py . && python3 generate_documentation_and_ingest_code.py"
         ]