Compare commits
	
		
			17 Commits
		
	
	
		
			main
			...
			d9fe927832
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					d9fe927832 | ||
| 
						 | 
					99cfdfddd0 | ||
| 
						 | 
					f579e440f8 | ||
| 
						 | 
					ba69728c81 | ||
| 
						 | 
					5366e313c5 | ||
| 
						 | 
					283be1a1ec | ||
| 
						 | 
					1b7204c2ba | ||
| 
						 | 
					8f9aed299d | ||
| 
						 | 
					6522977280 | ||
| 
						 | 
					c707974a2e | ||
| 
						 | 
					cc2f224d60 | ||
| 
						 | 
					b14e6cf873 | ||
| 
						 | 
					87e3c0df80 | ||
| 
						 | 
					aea09a6081 | ||
| 
						 | 
					d05cede409 | ||
| 
						 | 
					17162027b6 | ||
| 
						 | 
					8887f1b2bd | 
							
								
								
									
										49
									
								
								.jenkins/Jenkinsfile
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								.jenkins/Jenkinsfile
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,49 @@
 | 
				
			|||||||
 | 
					pipeline {
 | 
				
			||||||
 | 
					    agent {
 | 
				
			||||||
 | 
					        kubernetes {
 | 
				
			||||||
 | 
					            yamlFile '.jenkins/podTemplate.yaml'
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    environment {
 | 
				
			||||||
 | 
					        ACR_NAME = 'marcin00'
 | 
				
			||||||
 | 
					        CLIENT_ID = 'c302726f-fafb-4143-94c1-67a70975574a'
 | 
				
			||||||
 | 
					        DOCKER_REGISTRY_URL = 'marcin00.azurecr.io'
 | 
				
			||||||
 | 
					        DOCKER_IMAGE = "${DOCKER_REGISTRY_URL}/user-microservice:${GIT_COMMIT}"
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    stages {
 | 
				
			||||||
 | 
					        stage('Code Tests') {
 | 
				
			||||||
 | 
					            steps {
 | 
				
			||||||
 | 
					                container('python') {
 | 
				
			||||||
 | 
					                    dir('api') {
 | 
				
			||||||
 | 
					                        sh '''
 | 
				
			||||||
 | 
					                            python3 -m venv env
 | 
				
			||||||
 | 
					                            source env/bin/activate
 | 
				
			||||||
 | 
					                            pip install -r requirements.txt pytest
 | 
				
			||||||
 | 
					                            python3 -m pytest --junit-xml=pytest_junit.xml
 | 
				
			||||||
 | 
					                        '''
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            post {
 | 
				
			||||||
 | 
					                always {
 | 
				
			||||||
 | 
					                    junit testResults: '**/*pytest_junit.xml'
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        stage('Build & Push Docker') {
 | 
				
			||||||
 | 
					            steps {
 | 
				
			||||||
 | 
					                container('docker') {
 | 
				
			||||||
 | 
					                    sh '''
 | 
				
			||||||
 | 
					                    docker build -t ${DOCKER_IMAGE} .
 | 
				
			||||||
 | 
					                    az login --identity --client-id ${CLIENT_ID}
 | 
				
			||||||
 | 
					                    az acr login --name ${ACR_NAME}
 | 
				
			||||||
 | 
					                    docker push ${DOCKER_IMAGE}
 | 
				
			||||||
 | 
					                    '''
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										50
									
								
								.jenkins/podTemplate.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								.jenkins/podTemplate.yaml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,50 @@
 | 
				
			|||||||
 | 
					apiVersion: v1
 | 
				
			||||||
 | 
					kind: Pod
 | 
				
			||||||
 | 
					metadata:
 | 
				
			||||||
 | 
					  annotations:
 | 
				
			||||||
 | 
					    io.kubernetes.cri-o.userns-mode: "auto:size=65536"
 | 
				
			||||||
 | 
					  labels:
 | 
				
			||||||
 | 
					    jenkins: "slave"
 | 
				
			||||||
 | 
					    jenkins/label: "kubernetes-agent"
 | 
				
			||||||
 | 
					spec:
 | 
				
			||||||
 | 
					  runtimeClassName: sysbox-runc
 | 
				
			||||||
 | 
					  containers:
 | 
				
			||||||
 | 
					    - name: jnlp
 | 
				
			||||||
 | 
					      image: jenkins/inbound-agent:alpine
 | 
				
			||||||
 | 
					      tty: false
 | 
				
			||||||
 | 
					      workingDir: /home/jenkins/agent
 | 
				
			||||||
 | 
					      volumeMounts:
 | 
				
			||||||
 | 
					        - name: workspace-volume
 | 
				
			||||||
 | 
					          mountPath: /home/jenkins/agent
 | 
				
			||||||
 | 
					      env:
 | 
				
			||||||
 | 
					        - name: JENKINS_WEB_SOCKET
 | 
				
			||||||
 | 
					          value: "true"
 | 
				
			||||||
 | 
					        - name: REMOTING_OPTS
 | 
				
			||||||
 | 
					          value: "-noReconnectAfter 1d"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    - name: python
 | 
				
			||||||
 | 
					      image: python:3.11.7-alpine
 | 
				
			||||||
 | 
					      command:
 | 
				
			||||||
 | 
					        - cat
 | 
				
			||||||
 | 
					      tty: true
 | 
				
			||||||
 | 
					      workingDir: /home/jenkins/agent
 | 
				
			||||||
 | 
					      volumeMounts:
 | 
				
			||||||
 | 
					        - name: workspace-volume
 | 
				
			||||||
 | 
					          mountPath: /home/jenkins/agent
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    - name: docker
 | 
				
			||||||
 | 
					      image: marcin00.azurecr.io/azure-cli-docker:slim-bookworm
 | 
				
			||||||
 | 
					      tty: true
 | 
				
			||||||
 | 
					      workingDir: /home/jenkins/agent
 | 
				
			||||||
 | 
					      volumeMounts:
 | 
				
			||||||
 | 
					        - name: workspace-volume
 | 
				
			||||||
 | 
					          mountPath: /home/jenkins/agent
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  nodeSelector:
 | 
				
			||||||
 | 
					    kubernetes.io/os: linux
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  restartPolicy: Never
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  volumes:
 | 
				
			||||||
 | 
					    - name: workspace-volume
 | 
				
			||||||
 | 
					      emptyDir: {}
 | 
				
			||||||
@@ -4,7 +4,7 @@ from flask_jwt_extended import JWTManager
 | 
				
			|||||||
from jwt import ExpiredSignatureError
 | 
					from jwt import ExpiredSignatureError
 | 
				
			||||||
from models import db, RevokedToken
 | 
					from models import db, RevokedToken
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
from utils import init_db, wait_for_db
 | 
					from utils import init_db
 | 
				
			||||||
from views import user_bp
 | 
					from views import user_bp
 | 
				
			||||||
from werkzeug.exceptions import HTTPException
 | 
					from werkzeug.exceptions import HTTPException
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -53,7 +53,6 @@ def create_app(config_name="default"):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    # Fill database by initial values (only if we are not testing)
 | 
					    # Fill database by initial values (only if we are not testing)
 | 
				
			||||||
    with app.app_context():
 | 
					    with app.app_context():
 | 
				
			||||||
        wait_for_db()
 | 
					 | 
				
			||||||
        db.create_all()
 | 
					        db.create_all()
 | 
				
			||||||
        if config_name != "testing":
 | 
					        if config_name != "testing":
 | 
				
			||||||
            init_db()
 | 
					            init_db()
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										19
									
								
								api/utils.py
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								api/utils.py
									
									
									
									
									
								
							@@ -2,9 +2,6 @@ from flask import abort
 | 
				
			|||||||
from flask_jwt_extended import get_jwt_identity
 | 
					from flask_jwt_extended import get_jwt_identity
 | 
				
			||||||
from models import User, db
 | 
					from models import User, db
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
from sqlalchemy import text
 | 
					 | 
				
			||||||
from sqlalchemy.exc import DatabaseError
 | 
					 | 
				
			||||||
import time
 | 
					 | 
				
			||||||
from werkzeug.security import generate_password_hash
 | 
					from werkzeug.security import generate_password_hash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -30,22 +27,6 @@ def get_user_or_404(user_id):
 | 
				
			|||||||
    return user
 | 
					    return user
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MAX_RETRIES = 100
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
def wait_for_db():
 | 
					 | 
				
			||||||
    for retries in range(MAX_RETRIES):
 | 
					 | 
				
			||||||
        try:
 | 
					 | 
				
			||||||
            with db.engine.connect() as connection:
 | 
					 | 
				
			||||||
                connection.execute(text("SELECT 1"))
 | 
					 | 
				
			||||||
            print("Successfully connected with database.")
 | 
					 | 
				
			||||||
            return
 | 
					 | 
				
			||||||
        except DatabaseError:
 | 
					 | 
				
			||||||
            print(f"Waiting for database... (retry {retries + 1})")
 | 
					 | 
				
			||||||
            time.sleep(3)
 | 
					 | 
				
			||||||
    print("Failed to connect to database.")
 | 
					 | 
				
			||||||
    raise Exception("Database not ready after multiple retries.")
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
def init_db():
 | 
					def init_db():
 | 
				
			||||||
    """Create default admin account if database is empty"""
 | 
					    """Create default admin account if database is empty"""
 | 
				
			||||||
    with db.session.begin():
 | 
					    with db.session.begin():
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user