diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 7c2463c..68c97b3 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,34 +1,34 @@ -name: Deploy to ec2 -on: - push: - branches: - - main +# name: Deploy to ec2 +# on: +# push: +# branches: +# - main -jobs: - Deployment: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - name: checkout repo +# jobs: +# Deployment: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# name: checkout repo - - uses: burnett01/rsync-deployments@7.0.1 - name: deploy - with: - switches: -avzr --delete - remote_host: ${{ secrets.EC2_HOST }} - remote_user: ec2-user - remote_key: ${{ secrets.EC2_KEY }} - remote_path: /myapp - - uses: JimCronqvist/action-ssh@master - name: Execute ssh - with: - hosts: ${{ secrets.HOST_USERNAME }}@${{ secrets.EC2_HOST }} - privatekey: ${{ secrets.EC2_KEY }} - command: | - sudo apt install docker-compose-plugin -y - docker pull stefnie/api-image:latest - docker pull stefnie/uri-image:latest - docker-compose -f compose.yaml up -d +# - uses: burnett01/rsync-deployments@7.0.1 +# name: deploy +# with: +# switches: -avzr --delete +# remote_host: ${{ secrets.EC2_HOST }} +# remote_user: ec2-user +# remote_key: ${{ secrets.EC2_KEY }} +# remote_path: /myapp +# - uses: JimCronqvist/action-ssh@master +# name: Execute ssh +# with: +# hosts: ${{ secrets.HOST_USERNAME }}@${{ secrets.EC2_HOST }} +# privatekey: ${{ secrets.EC2_KEY }} +# command: | +# sudo apt install docker-compose-plugin -y +# docker pull stefnie/api-image:latest +# docker pull stefnie/uri-image:latest +# docker-compose -f compose.yaml up -d @@ -42,12 +42,12 @@ jobs: - # port: 22 - # script : | - # sudo su - # sudo apt update -y - # sudo apt install docker.io -y - # sudo apt install docker-compose-plugin -y - # docker pull stefnie/api-image:latest - # docker pull stefnie/uri-image:latest - # docker-compose -f compose.yaml up -d \ No newline at end of file +# # port: 22 +# # script : | +# # sudo su +# # sudo apt update -y +# # sudo apt install docker.io -y +# # sudo apt install docker-compose-plugin -y +# # docker pull stefnie/api-image:latest +# # docker pull stefnie/uri-image:latest +# # docker-compose -f compose.yaml up -d \ No newline at end of file diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index acd3d7a..d4571a7 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -1,29 +1,29 @@ -name: Lint test -on: - push: - branches: - - main - # pull_request: - # branches: - # - main +# name: Lint test +# on: +# push: +# branches: +# - main +# # pull_request: +# # branches: +# # - main -jobs: - lint-test: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: ["3.8", "3.9", "3.10", "3.12"] - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install pylint - - name: Analysing the code with pylint - run: | - pylint $(git ls-files '*.py') +# jobs: +# lint-test: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# python-version: ["3.8", "3.9", "3.10", "3.12"] +# steps: +# - uses: actions/checkout@v4 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v3 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Install dependencies +# run: | +# python -m pip install --upgrade pip +# pip install pylint +# - name: Analysing the code with pylint +# run: | +# pylint $(git ls-files '*.py') diff --git a/app/main.py b/app/main.py index a5b9f42..580fadd 100644 --- a/app/main.py +++ b/app/main.py @@ -8,7 +8,7 @@ # Initialize DynamoDB region_name = 'us-east-1' dynamoDB = boto3.resource('dynamodb', region_name=region_name) -table = dynamoDB.Table('DynamoDB-Terraform') +table = dynamoDB.Table('uri-table') def generate_short_url(long_url): """ diff --git a/infrastructure/main.tf b/infrastructure/main.tf index b4885e2..6955e08 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -79,7 +79,7 @@ resource "aws_instance" "web_server" { } resource "aws_dynamodb_table" "dynamodb-table" { - name = "DynamoDB-Terraform" + name = "uri-table" billing_mode = "PROVISIONED" read_capacity = 20 write_capacity = 20