diff --git a/.github/workflows/code-review.yml b/.github/workflows/code-review.yml index 0caca3ebd..1264fe68f 100644 --- a/.github/workflows/code-review.yml +++ b/.github/workflows/code-review.yml @@ -225,12 +225,12 @@ jobs: - name: Build Docker image run: | - docker build -t angularai-app:${{ github.sha }} -f deploy/dev/Dockerfile . + docker build -t goodone-app:${{ github.sha }} -f deploy/dev/Dockerfile . - name: Run Trivy vulnerability scanner (Image) uses: aquasecurity/trivy-action@0.28.0 with: - image-ref: 'angularai-app:${{ github.sha }}' + image-ref: 'goodone-app:${{ github.sha }}' format: 'table' exit-code: '1' # Fail the build if vulnerabilities are found ignore-unfixed: true @@ -241,7 +241,7 @@ jobs: - name: Generate Trivy SARIF (Image) uses: aquasecurity/trivy-action@0.28.0 with: - image-ref: 'angularai-app:${{ github.sha }}' + image-ref: 'goodone-app:${{ github.sha }}' format: 'sarif' output: 'trivy-image.sarif.json' ignore-unfixed: true @@ -358,10 +358,10 @@ jobs: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - name: Build Docker image for Snyk - run: docker build -t angularai-app:snyk . + run: docker build -t goodone-app:snyk . - name: Snyk Container Scan - run: snyk container test angularai-app:snyk --severity-threshold=high --sarif > snyk-container.sarif.json + run: snyk container test goodone-app:snyk --severity-threshold=high --sarif > snyk-container.sarif.json continue-on-error: true env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72cc67ca9..988b0e1e5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -78,7 +78,7 @@ jobs: - name: Build, tag, and push image to Amazon ECR env: ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} - ECR_REPOSITORY: angularai-app + ECR_REPOSITORY: goodone-app IMAGE_TAG: ${{ steps.vars.outputs.VERSION }} NVD_API_KEY: ${{ secrets.NVD_API_KEY }} run: | @@ -97,14 +97,14 @@ jobs: - name: Update ECS service env: AWS_PAGER: "" - CLUSTER_NAME: angular-boot - SERVICE_NAME: angularai-backend-test-service + CLUSTER_NAME: goodone-cluster + SERVICE_NAME: goodone-backend-test-service TASK_DEF_FILE: deploy/aws/backend-test-task-definition.json VERSION: ${{ steps.vars.outputs.VERSION }} ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} run: | # Read the task definition and update the image - NEW_TASK_DEF=$(cat $TASK_DEF_FILE | jq --arg IMAGE "$ECR_REGISTRY/angularai-app:$VERSION" '.containerDefinitions[0].image = $IMAGE') + NEW_TASK_DEF=$(cat $TASK_DEF_FILE | jq --arg IMAGE "$ECR_REGISTRY/goodone-app:$VERSION" '.containerDefinitions[0].image = $IMAGE') # Remove fields not allowed in register-task-definition FINAL_TASK_DEF=$(echo $NEW_TASK_DEF | jq 'del(.taskDefinitionArn, .revision, .status, .requiresAttributes, .compatibilities, .registeredAt, .registeredBy)') diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 2fd8c414e..8c6dc5196 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,21 +7,23 @@ + + + - - - \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index b901aa45c..c783def3d 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -15,7 +15,7 @@ $ProjectFileDir$ - + postgresql true org.postgresql.Driver @@ -39,7 +39,7 @@ $ProjectFileDir$ - + h2.unified true true @@ -53,7 +53,7 @@ $ProjectFileDir$ - + h2.unified true true @@ -67,7 +67,7 @@ $ProjectFileDir$ - + postgresql true org.postgresql.Driver @@ -80,4 +80,4 @@ $ProjectFileDir$ - \ No newline at end of file + diff --git a/.idea/db-forest-config.xml b/.idea/db-forest-config.xml index cd7cfc288..c15cda30c 100644 --- a/.idea/db-forest-config.xml +++ b/.idea/db-forest-config.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 565f0ad66..20bb796cd 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 58e18f769..5a84008f8 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -27,4 +27,4 @@