Merge branch 'main' of github.com:code-dot-org/aiproxy into redirect-http-to-https

Author: cat5inthecradle

Dockerfile

@@ -1,11 +1,9 @@
 FROM python:3.11-slim
 
-RUN pip install Flask
-
 WORKDIR /app
 COPY requirements.txt .
 
-RUN pip install -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
 
 COPY ./test /app/test
 COPY ./lib /app/lib

ci-build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+if [ -n "$CODEBUILD_BUILD_ID" ]; then
+    # CodeBuild environment
+    IMAGE_TAG=${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7}
+else
+    # Local Git repository
+    IMAGE_TAG=$(git rev-parse --short HEAD)
+fi
+
+IMAGE_NAME=aiproxy
+
+echo "Building Docker Image ${IMAGE_NAME}:${IMAGE_TAG}..."
+docker build -t ${IMAGE_NAME}:${IMAGE_TAG} .

ci-lint.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+echo "Validating Cloudformation Templates..."
+cfn-lint cicd/1-setup/*.template.yml
+cfn-lint cicd/2-cicd/*.template.yml
+cfn-lint cicd/3-app/aiproxy/template.yml
+
+echo "Validating Dockerfile..."
+docker run --rm -i hadolint/hadolint < Dockerfile

cicd/3-app/aiproxy/buildspec.yml

@@ -16,6 +16,12 @@ phases:
     commands:
       - echo Logging in to Docker Hub...
       - echo $DOCKER_HUB_PAT | docker login -u $DOCKER_HUB_USERNAME --password-stdin
+
+      - echo "Logging in to AWS ECR..."
+      - ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+      - AWS_REGION=us-east-1
+      - ECR_REGISTRY="${ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
+      - aws ecr get-login-password --region ${AWS_REGION} | docker login --username AWS --password-stdin ${ECR_REGISTRY}
 
   build:
     # This will build and push the docker image to ECR and package the
@@ -29,25 +35,17 @@ phases:
 
       - cd $CODEBUILD_SRC_DIR
 
-      - echo "Validating Cloudformation Templates..."
-      - cfn-lint cicd/1-setup/*.template.yml
-      - cfn-lint cicd/2-cicd/*.template.yml
-      - cfn-lint cicd/3-app/aiproxy/template.yml
+      - ./ci-lint.sh
+
+      - echo "Running Unit Tests..."
+      - echo "This is where I would run my unit tests"
 
       - echo "Building Docker Image..."
       - IMAGE_NAME=aiproxy
       - IMAGE_TAG=${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7} # short commit hash
       - docker build -t ${IMAGE_NAME}:${IMAGE_TAG} .
 
-      - echo "Running Unit Tests..."
-      - echo "This is where I would run my unit tests"
-
       - echo "Pushing Docker Image to ECR..."
-      - ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
-      - AWS_REGION=us-east-1
-      - ECR_REGISTRY="${ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
-      - aws ecr get-login-password --region ${AWS_REGION} | docker login --username AWS --password-stdin ${ECR_REGISTRY}
-
       - docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${ECR_REPOSITORY}:${IMAGE_TAG}
       - docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${ECR_REPOSITORY}:latest
       - docker push ${ECR_REPOSITORY}:${IMAGE_TAG}

cicd/3-app/aiproxy/pr-buildspec.yml

@@ -17,29 +17,15 @@ phases:
       - echo Logging in to Docker Hub...
       - echo $DOCKER_HUB_PAT | docker login -u $DOCKER_HUB_USERNAME --password-stdin
 
-  
   build:
-    # This should be moved to a shell script if it gets more complicated.
     commands:
       - set -e
 
       - BRANCH_NAME=${CODEBUILD_WEBHOOK_HEAD_REF#"refs/heads/"}
       - ARTIFACT_PATH=branch/$BRANCH_NAME/$CODEBUILD_BUILD_NUMBER
+      - COMMIT_HASH=${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7}
 
       - cd $CODEBUILD_SRC_DIR
 
-      - echo "Validating Cloudformation Templates..."
-      - cfn-lint cicd/1-setup/*.template.yml
-      - cfn-lint cicd/2-cicd/*.template.yml
-      - cfn-lint cicd/3-app/aiproxy/template.yml
-
-      - echo "Building Docker Image..."
-      - IMAGE_NAME=aiproxy
-      - IMAGE_TAG=${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7}
-      - docker build -t ${IMAGE_NAME}:${IMAGE_TAG} .
-
-      - echo "Running Unit Tests..."
-      - docker run --rm ${IMAGE_NAME}:${IMAGE_TAG} python -m unittest test_app.py
-
-      - echo "Pushing Docker Image to ECR..."
-      - echo "This is where I would push the docker image to ECR, when I get around to it"
+      - ./ci-lint.sh
+      - ./ci-build.sh

src/__init__.py

@@ -16,6 +16,10 @@
 import openai
 
 def create_app(test_config=None):
+
+    # divide by zero LOL
+    print(1/0)
+
     # create and configure the app
     app = Flask(__name__, instance_relative_config=True)
     app.config.from_mapping(