diff --git a/.env_file b/.env_file new file mode 100644 index 0000000000..0b5ec11164 --- /dev/null +++ b/.env_file @@ -0,0 +1,2 @@ +JWT_SECRET='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoidGVzbGltIiwicGFzc3dvcmQiOjE1MTYyMzkwMjJ9.QM1IQgwJ3RmeLRBhQGER1zaiWTFhO4FrDy-Oq9uMgyo' +LOG_LEVEL=DEBUG \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9500e81546..82d71c63eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .DS_Store -.env* .flaskenv *.pyc *.pyo @@ -16,7 +15,6 @@ _mailinglist .idea/ docs/_build/ __pycache__ -.env_file # Coverage reports htmlcov/ diff --git a/aws-auth-patch.yml b/aws-auth-patch.yml index 4c3b0e0f26..ca433504fc 100644 --- a/aws-auth-patch.yml +++ b/aws-auth-patch.yml @@ -7,11 +7,15 @@ data: - groups: - system:bootstrappers - system:nodes - rolearn: arn:aws:iam::519002666132:role/eksctl-simple-jwt-api-nodegroup-n-NodeInstanceRole-1DBHED9TMYRZZ + rolearn: arn:aws:iam::416274195800:role/eksctl-simple-jwt-api-nodegroup-n-NodeInstanceRole-1DBHED9TMYRZZ username: system:node:{{EC2PrivateDNSName}} - system:masters - rolearn: arn:aws:iam::519002666132:role/UdacityFlaskDeployCBKubectlRole + rolearn: arn:aws:iam::416274195800:role/UdacityFlaskDeployCBKubectlRole username: build + - groups: + - system:masters + rolearn: arn:aws:iam::416274195800:role/UdacityFlaskDeployCBKubectlRole + username: build kind: ConfigMap metadata: creationTimestamp: "2022-05-11T11:16:26Z" diff --git a/buildspec.yml b/buildspec.yml index 63e53d247f..c52221b7eb 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -38,6 +38,8 @@ phases: - $(aws ecr get-login --no-include-email) - export KUBECONFIG=$HOME/.kube/config - echo `ls -l` + - pip3 install -r requirements.txt + - python -m pytest test_main.py build: commands: - docker build --tag $REPOSITORY_URI:$TAG . diff --git a/ci-cd-codepipeline.cfn.yml b/ci-cd-codepipeline.cfn.yml index c0f4d9d31b..b54d77bc50 100755 --- a/ci-cd-codepipeline.cfn.yml +++ b/ci-cd-codepipeline.cfn.yml @@ -40,7 +40,7 @@ Parameters: GitHubUser: Type: String - Default: SudKul + Default: teslimSulaiman Description: GitHub username or organization MinLength: 3 MaxLength: 100 diff --git a/main.py b/main.py index f6c8219f37..d859fd3cc7 100755 --- a/main.py +++ b/main.py @@ -12,7 +12,7 @@ from flask import Flask, jsonify, request, abort -JWT_SECRET = os.environ.get('JWT_SECRET', 'abc123abc1234') +JWT_SECRET = os.environ.get('JWT_SECRET', 'eyJhbGciOiJIUzI1NiJ9.eyJSb2xlIjoiQWRtaW4iLCJJc3N1ZXIiOiJJc3N1ZXIiLCJVc2VybmFtZSI6InRlc2xpbSIsImV4cCI6MTcxNzc1NjQwMCwiaWF0IjoxNjg2MTM0MDAwfQ.nCXz1TvNZbJ2zmrBVb1AIlgaWow_ejyt4_5EF3fLEO8') LOG_LEVEL = os.environ.get('LOG_LEVEL', 'INFO') diff --git a/trust.json b/trust.json index f934cf3a3f..bf3590cb9a 100644 --- a/trust.json +++ b/trust.json @@ -4,7 +4,7 @@ { "Effect": "Allow", "Principal": { - "AWS": "arn:aws:iam::519002666132:root" + "AWS": "arn:aws:iam::416274195800:root" }, "Action": "sts:AssumeRole" }