From 0ea36082da31aac9f63553c02d210837fb5036a4 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 12:05:24 +0530 Subject: [PATCH 01/14] added fpm app --- src/dj/fpm/__init__.py | 0 src/dj/fpm/admin.py | 3 +++ src/dj/fpm/apps.py | 6 ++++++ src/dj/fpm/migrations/__init__.py | 0 src/dj/fpm/models.py | 3 +++ src/dj/fpm/tests.py | 3 +++ src/dj/fpm/views.py | 3 +++ src/dj/proj/settings.py | 1 + 8 files changed, 19 insertions(+) create mode 100644 src/dj/fpm/__init__.py create mode 100644 src/dj/fpm/admin.py create mode 100644 src/dj/fpm/apps.py create mode 100644 src/dj/fpm/migrations/__init__.py create mode 100644 src/dj/fpm/models.py create mode 100644 src/dj/fpm/tests.py create mode 100644 src/dj/fpm/views.py diff --git a/src/dj/fpm/__init__.py b/src/dj/fpm/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/dj/fpm/admin.py b/src/dj/fpm/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/src/dj/fpm/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/src/dj/fpm/apps.py b/src/dj/fpm/apps.py new file mode 100644 index 0000000..65e69e3 --- /dev/null +++ b/src/dj/fpm/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class FpmConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'fpm' diff --git a/src/dj/fpm/migrations/__init__.py b/src/dj/fpm/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/dj/fpm/models.py b/src/dj/fpm/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/src/dj/fpm/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/src/dj/fpm/tests.py b/src/dj/fpm/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/src/dj/fpm/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/dj/fpm/views.py b/src/dj/fpm/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/src/dj/fpm/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/src/dj/proj/settings.py b/src/dj/proj/settings.py index 9816ccc..dc707cf 100644 --- a/src/dj/proj/settings.py +++ b/src/dj/proj/settings.py @@ -37,6 +37,7 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + "fpm" ] MIDDLEWARE = [ From 68d4df508932c84cfe286d2c8247fe7e12f08866 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 12:07:09 +0530 Subject: [PATCH 02/14] pyfmt --- src/dj/fpm/apps.py | 4 +-- src/dj/manage.py | 4 +-- src/dj/proj/asgi.py | 2 +- src/dj/proj/settings.py | 74 ++++++++++++++++++++--------------------- src/dj/proj/urls.py | 2 +- src/dj/proj/wsgi.py | 2 +- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/dj/fpm/apps.py b/src/dj/fpm/apps.py index 65e69e3..b06ed96 100644 --- a/src/dj/fpm/apps.py +++ b/src/dj/fpm/apps.py @@ -2,5 +2,5 @@ class FpmConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'fpm' + default_auto_field = "django.db.models.BigAutoField" + name = "fpm" diff --git a/src/dj/manage.py b/src/dj/manage.py index 96864bb..ce21b31 100755 --- a/src/dj/manage.py +++ b/src/dj/manage.py @@ -6,7 +6,7 @@ def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'proj.settings') + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "proj.settings") try: from django.core.management import execute_from_command_line except ImportError as exc: @@ -18,5 +18,5 @@ def main(): execute_from_command_line(sys.argv) -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/src/dj/proj/asgi.py b/src/dj/proj/asgi.py index b0f11c2..bb6c1ea 100644 --- a/src/dj/proj/asgi.py +++ b/src/dj/proj/asgi.py @@ -11,6 +11,6 @@ from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'proj.settings') +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "proj.settings") application = get_asgi_application() diff --git a/src/dj/proj/settings.py b/src/dj/proj/settings.py index dc707cf..221ae9d 100644 --- a/src/dj/proj/settings.py +++ b/src/dj/proj/settings.py @@ -20,7 +20,7 @@ # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-edztux3%v77%_-4fa*w&14+%$&vf#90vr=l)k_1*69+u#@ojga' +SECRET_KEY = "django-insecure-edztux3%v77%_-4fa*w&14+%$&vf#90vr=l)k_1*69+u#@ojga" # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -31,53 +31,53 @@ # Application definition INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - "fpm" + "django.contrib.admin", + "django.contrib.auth", + "django.contrib.contenttypes", + "django.contrib.sessions", + "django.contrib.messages", + "django.contrib.staticfiles", + "fpm", ] MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', + "django.middleware.security.SecurityMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", + "django.middleware.common.CommonMiddleware", + "django.middleware.csrf.CsrfViewMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", + "django.middleware.clickjacking.XFrameOptionsMiddleware", ] -ROOT_URLCONF = 'proj.urls' +ROOT_URLCONF = "proj.urls" TEMPLATES = [ { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', + "BACKEND": "django.template.backends.django.DjangoTemplates", + "DIRS": [], + "APP_DIRS": True, + "OPTIONS": { + "context_processors": [ + "django.template.context_processors.debug", + "django.template.context_processors.request", + "django.contrib.auth.context_processors.auth", + "django.contrib.messages.context_processors.messages", ], }, }, ] -WSGI_APPLICATION = 'proj.wsgi.application' +WSGI_APPLICATION = "proj.wsgi.application" # Database # https://docs.djangoproject.com/en/4.0/ref/settings/#databases DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + "default": { + "ENGINE": "django.db.backends.sqlite3", + "NAME": BASE_DIR / "db.sqlite3", } } @@ -87,16 +87,16 @@ AUTH_PASSWORD_VALIDATORS = [ { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator", }, { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator", }, { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator", }, { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator", }, ] @@ -104,9 +104,9 @@ # Internationalization # https://docs.djangoproject.com/en/4.0/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = "en-us" -TIME_ZONE = 'UTC' +TIME_ZONE = "UTC" USE_I18N = True @@ -116,9 +116,9 @@ # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.0/howto/static-files/ -STATIC_URL = 'static/' +STATIC_URL = "static/" # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field -DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" diff --git a/src/dj/proj/urls.py b/src/dj/proj/urls.py index 215db06..01641a1 100644 --- a/src/dj/proj/urls.py +++ b/src/dj/proj/urls.py @@ -17,5 +17,5 @@ from django.urls import path urlpatterns = [ - path('admin/', admin.site.urls), + path("admin/", admin.site.urls), ] diff --git a/src/dj/proj/wsgi.py b/src/dj/proj/wsgi.py index 3fefe7a..57bbb97 100644 --- a/src/dj/proj/wsgi.py +++ b/src/dj/proj/wsgi.py @@ -11,6 +11,6 @@ from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'proj.settings') +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "proj.settings") application = get_wsgi_application() From d5c15e596d965c81a838047010184c3873b65057 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 13:05:10 +0530 Subject: [PATCH 03/14] fpm api routes --- src/dj/fpm/urls.py | 8 ++++++++ src/dj/fpm/views.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/dj/proj/urls.py | 3 ++- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/dj/fpm/urls.py diff --git a/src/dj/fpm/urls.py b/src/dj/fpm/urls.py new file mode 100644 index 0000000..017cc99 --- /dev/null +++ b/src/dj/fpm/urls.py @@ -0,0 +1,8 @@ +from django.urls import path + +from . import views + +urlpatterns = [ + path("dev/fpm-ready", views.fpm_ready), + path("dev/get-package", views.get_package) +] diff --git a/src/dj/fpm/views.py b/src/dj/fpm/views.py index 91ea44a..2791d7d 100644 --- a/src/dj/fpm/views.py +++ b/src/dj/fpm/views.py @@ -1,3 +1,47 @@ +import django.http from django.shortcuts import render +from django.http import JsonResponse # Create your views here. + + +def success(data, status=200): + return JsonResponse({"result": data, "success": True}, status=status) + + +def error(message, status=500): + return JsonResponse({"message": message, "success": False}, status=status) + + +def fpm_ready(req: django.http.HttpRequest): + + if not req.GET: + return JsonResponse("request method is not supported", status=402) + + ec2_reservation = req.GET.get("ec2_reservation", None) + git_hash = req.GET.get("hash", None) + + if not ec2_reservation: + return JsonResponse("ec2_reservation is mandatory parameter", status=402) + + if not git_hash: + return JsonResponse("hash is mandatory parameter", status=402) + + return success({}) + + +def get_package(req: django.http.HttpRequest): + + if not req.GET: + return JsonResponse("request method is not supported", status=402) + + ec2_reservation = req.GET.get("ec2_reservation", None) + + if not ec2_reservation: + return JsonResponse("ec2_reservation is mandatory parameter", status=402) + + return success({ + "package": "", + "git": "" + }) + diff --git a/src/dj/proj/urls.py b/src/dj/proj/urls.py index 01641a1..e9d44d9 100644 --- a/src/dj/proj/urls.py +++ b/src/dj/proj/urls.py @@ -14,8 +14,9 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path +from django.urls import path, include urlpatterns = [ path("admin/", admin.site.urls), + path("v1/fpm/", include("fpm.urls")) ] From f66f9f9cc878840db0778cdc167d88c53bc3cf14 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 13:15:47 +0530 Subject: [PATCH 04/14] a bit of command automation --- .autoenv.zsh | 2 ++ etc/zsh/auto.sh | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 .autoenv.zsh create mode 100644 etc/zsh/auto.sh diff --git a/.autoenv.zsh b/.autoenv.zsh new file mode 100644 index 0000000..f23a7d1 --- /dev/null +++ b/.autoenv.zsh @@ -0,0 +1,2 @@ +export PROJDIR=$(pwd) +source "$PROJDIR"/etc/zsh/auto.sh \ No newline at end of file diff --git a/etc/zsh/auto.sh b/etc/zsh/auto.sh new file mode 100644 index 0000000..2cfc40d --- /dev/null +++ b/etc/zsh/auto.sh @@ -0,0 +1,34 @@ +export PYTHONPATH=$PYTHONPATH:$PROJDIR/src:$PROJDIR/src/dj + +function push() { + CWD=${1:-$PROJDIR} + cd "$CWD" >> /dev/null || return; +} + +function pop() { + cd "${CWD:-$PROJDIR}" >> /dev/null || return; + unset CWD +} + + +function manage() { + push "$PROJDIR"/src/dj/ + python manage.py "$*" + pop +} + +function run() { + push "$PROJDIR"/src/dj/ + manage runserver + pop +} + +function fmt() { + push "$PROJDIR"/src/dj/ + black . + pop +} + +function 0() { + cd "$PROJDIR" || return; +} \ No newline at end of file From c9079b5772886cb38f2c9a09080817b484c4e0e4 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 13:28:25 +0530 Subject: [PATCH 05/14] db setup --- etc/zsh/auto.sh | 12 ++++++++++++ src/dj/proj/settings.py | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/etc/zsh/auto.sh b/etc/zsh/auto.sh index 2cfc40d..5ec8c5f 100644 --- a/etc/zsh/auto.sh +++ b/etc/zsh/auto.sh @@ -31,4 +31,16 @@ function fmt() { function 0() { cd "$PROJDIR" || return; +} + +function migrate() { + manage migrate $* +} + +function recreatedb() { + psql -h 127.0.0.1 -d postgres -c "CREATE USER root;" + psql -h 127.0.0.1 -d postgres -c "ALTER USER root WITH SUPERUSER;" + psql -h 127.0.0.1 -c "DROP DATABASE IF EXISTS fpm_controller;" template1 + psql -h 127.0.0.1 -c "CREATE DATABASE fpm_controller;" template1 + migrate $* } \ No newline at end of file diff --git a/src/dj/proj/settings.py b/src/dj/proj/settings.py index 221ae9d..dc5eea8 100644 --- a/src/dj/proj/settings.py +++ b/src/dj/proj/settings.py @@ -76,8 +76,12 @@ DATABASES = { "default": { - "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", + "ENGINE": "django.db.backends.postgresql", + "NAME": "fpm_controller", + "USER": "root", + "PASSWORD": "", + "HOST": "127.0.0.1", + "PORT": 5432 } } From 90723263e4b7af7c35d33713253ca5151cb54383 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 13:43:21 +0530 Subject: [PATCH 06/14] fpm models --- etc/zsh/auto.sh | 14 ++++++++++ src/dj/fpm/migrations/0001_initial.py | 37 +++++++++++++++++++++++++++ src/dj/fpm/models.py | 20 +++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 src/dj/fpm/migrations/0001_initial.py diff --git a/etc/zsh/auto.sh b/etc/zsh/auto.sh index 5ec8c5f..393c10c 100644 --- a/etc/zsh/auto.sh +++ b/etc/zsh/auto.sh @@ -14,7 +14,9 @@ function pop() { function manage() { push "$PROJDIR"/src/dj/ python manage.py "$*" + response=$? pop + return $response } function run() { @@ -43,4 +45,16 @@ function recreatedb() { psql -h 127.0.0.1 -c "DROP DATABASE IF EXISTS fpm_controller;" template1 psql -h 127.0.0.1 -c "CREATE DATABASE fpm_controller;" template1 migrate $* +} + +function makemigrations() { + manage makemigrations $* +} + +function djshell() { + manage shell +} + +function dbshell() { + manage dbshell } \ No newline at end of file diff --git a/src/dj/fpm/migrations/0001_initial.py b/src/dj/fpm/migrations/0001_initial.py new file mode 100644 index 0000000..fbe60da --- /dev/null +++ b/src/dj/fpm/migrations/0001_initial.py @@ -0,0 +1,37 @@ +# Generated by Django 4.0.4 on 2022-06-14 08:13 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Package', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.TextField(help_text='name of the FPM package', unique=True)), + ('git', models.TextField(help_text='git url of FPM package')), + ('hash', models.TextField(blank=True, help_text='latest deployed hash of git', null=True)), + ('plan', models.TextField(help_text='We have different plans like free, paid for serving FPM package')), + ('hours', models.IntegerField(default=0)), + ('status', models.TextField(help_text='status of the package')), + ], + ), + migrations.CreateModel( + name='DedicatedInstance', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ec2_reservation', models.TextField(db_index=True)), + ('ec2_instance_id', models.TextField(blank=True, null=True)), + ('status', models.TextField(help_text='status of EC2 instance, ready, initializing, ect...')), + ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fpm.package')), + ], + ), + ] diff --git a/src/dj/fpm/models.py b/src/dj/fpm/models.py index 71a8362..e117e50 100644 --- a/src/dj/fpm/models.py +++ b/src/dj/fpm/models.py @@ -1,3 +1,23 @@ from django.db import models # Create your models here. + +""" +FPM package module +""" + + +class Package(models.Model): + name = models.TextField(unique=True, help_text="name of the FPM package") + git = models.TextField(help_text="git url of FPM package") + hash = models.TextField(null=True, blank=True, help_text="latest deployed hash of git") + plan = models.TextField(help_text="We have different plans like free, paid for serving FPM package") + hours = models.IntegerField(default=0) + status = models.TextField(help_text="status of the package") + + +class DedicatedInstance(models.Model): + package = models.ForeignKey(Package, on_delete=models.CASCADE) + ec2_reservation = models.TextField(db_index=True) + ec2_instance_id = models.TextField(null=True, blank=True) + status = models.TextField(help_text="status of EC2 instance, ready, initializing, ect...") From 939cbb5ef3fc4c3eef25d977ac32920fa243554b Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 14:44:26 +0530 Subject: [PATCH 07/14] fixed django url --- src/dj/fpm/urls.py | 4 ++-- src/dj/fpm/views.py | 14 +++++++------- src/dj/proj/urls.py | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/dj/fpm/urls.py b/src/dj/fpm/urls.py index 017cc99..bdc0631 100644 --- a/src/dj/fpm/urls.py +++ b/src/dj/fpm/urls.py @@ -3,6 +3,6 @@ from . import views urlpatterns = [ - path("dev/fpm-ready", views.fpm_ready), - path("dev/get-package", views.get_package) + path(r"dev/fpm-ready", views.fpm_ready), + path(r"dev/get-package", views.get_package) ] diff --git a/src/dj/fpm/views.py b/src/dj/fpm/views.py index 2791d7d..4d82b42 100644 --- a/src/dj/fpm/views.py +++ b/src/dj/fpm/views.py @@ -15,30 +15,30 @@ def error(message, status=500): def fpm_ready(req: django.http.HttpRequest): - if not req.GET: - return JsonResponse("request method is not supported", status=402) + if req.method != "GET": + return error("request method is not supported", status=402) ec2_reservation = req.GET.get("ec2_reservation", None) git_hash = req.GET.get("hash", None) if not ec2_reservation: - return JsonResponse("ec2_reservation is mandatory parameter", status=402) + return error("ec2_reservation is mandatory parameter", status=402) if not git_hash: - return JsonResponse("hash is mandatory parameter", status=402) + return error("hash is mandatory parameter", status=402) return success({}) def get_package(req: django.http.HttpRequest): - if not req.GET: - return JsonResponse("request method is not supported", status=402) + if req.method != "GET": + return error("request method is not supported", status=402) ec2_reservation = req.GET.get("ec2_reservation", None) if not ec2_reservation: - return JsonResponse("ec2_reservation is mandatory parameter", status=402) + return error("ec2_reservation is mandatory parameter", status=402) return success({ "package": "", diff --git a/src/dj/proj/urls.py b/src/dj/proj/urls.py index e9d44d9..e7a684b 100644 --- a/src/dj/proj/urls.py +++ b/src/dj/proj/urls.py @@ -16,7 +16,8 @@ from django.contrib import admin from django.urls import path, include + urlpatterns = [ path("admin/", admin.site.urls), - path("v1/fpm/", include("fpm.urls")) + path(r"v1/fpm/", include("fpm.urls")), ] From 6e903f8bcb23e98f44fbda2dd23ad731cdf1ff7c Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 15:02:20 +0530 Subject: [PATCH 08/14] get-package api is ready --- src/dj/fpm/views.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/dj/fpm/views.py b/src/dj/fpm/views.py index 4d82b42..90d4acf 100644 --- a/src/dj/fpm/views.py +++ b/src/dj/fpm/views.py @@ -1,6 +1,6 @@ import django.http -from django.shortcuts import render from django.http import JsonResponse +from dj.fpm.models import DedicatedInstance # Create your views here. @@ -31,7 +31,6 @@ def fpm_ready(req: django.http.HttpRequest): def get_package(req: django.http.HttpRequest): - if req.method != "GET": return error("request method is not supported", status=402) @@ -40,8 +39,13 @@ def get_package(req: django.http.HttpRequest): if not ec2_reservation: return error("ec2_reservation is mandatory parameter", status=402) + try: + instance: DedicatedInstance = DedicatedInstance.objects.get(ec2_reservation=ec2_reservation) + except: + return error("instance with ec2_reservation id not found", status=404) + return success({ - "package": "", - "git": "" + "package": instance.package.name, + "git": instance.package.git }) From 2e3d7c4a285fb1e76cbb6de7322958ea74e764f9 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 15:13:48 +0530 Subject: [PATCH 09/14] fpm fpm-ready api --- requirements.txt | 3 ++- src/dj/fpm/views.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7e8375c..85f465a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ Django==4.0.4 black==22.3.0 -psycopg2==2.9.3 \ No newline at end of file +psycopg2==2.9.3 +ipython==8.4.0 \ No newline at end of file diff --git a/src/dj/fpm/views.py b/src/dj/fpm/views.py index 90d4acf..374fded 100644 --- a/src/dj/fpm/views.py +++ b/src/dj/fpm/views.py @@ -1,6 +1,6 @@ import django.http from django.http import JsonResponse -from dj.fpm.models import DedicatedInstance +from fpm.models import DedicatedInstance # Create your views here. @@ -27,6 +27,15 @@ def fpm_ready(req: django.http.HttpRequest): if not git_hash: return error("hash is mandatory parameter", status=402) + try: + instance: DedicatedInstance = DedicatedInstance.objects.get(ec2_reservation=ec2_reservation) + except: + return error("instance with ec2_reservation id not found", status=404) + + instance.package.hash = git_hash + instance.status = 'ready' + instance.save() + return success({}) From e2254d0f9643117b29afad77d4966a0c5344a1ae Mon Sep 17 00:00:00 2001 From: wilderbit Date: Tue, 14 Jun 2022 16:07:22 +0530 Subject: [PATCH 10/14] remove extra --- src/dj/fpm/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dj/fpm/urls.py b/src/dj/fpm/urls.py index bdc0631..1838a87 100644 --- a/src/dj/fpm/urls.py +++ b/src/dj/fpm/urls.py @@ -3,6 +3,6 @@ from . import views urlpatterns = [ - path(r"dev/fpm-ready", views.fpm_ready), - path(r"dev/get-package", views.get_package) + path(r"fpm-ready", views.fpm_ready), + path(r"get-package", views.get_package) ] From 6664701d2a01c7b97c11b7be3671ff059077c108 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Wed, 15 Jun 2022 15:59:33 +0530 Subject: [PATCH 11/14] changes in model --- etc/zsh/auto.sh | 5 +++-- src/dj/fpm/migrations/0001_initial.py | 18 ++++++++-------- src/dj/fpm/models.py | 30 +++++++++++++++++---------- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/etc/zsh/auto.sh b/etc/zsh/auto.sh index 393c10c..f65fa59 100644 --- a/etc/zsh/auto.sh +++ b/etc/zsh/auto.sh @@ -1,8 +1,8 @@ export PYTHONPATH=$PYTHONPATH:$PROJDIR/src:$PROJDIR/src/dj function push() { - CWD=${1:-$PROJDIR} - cd "$CWD" >> /dev/null || return; + CWD=$(pwd) + cd "${1:-$PROJDIR}" >> /dev/null || return; } function pop() { @@ -37,6 +37,7 @@ function 0() { function migrate() { manage migrate $* + echo migrate_done } function recreatedb() { diff --git a/src/dj/fpm/migrations/0001_initial.py b/src/dj/fpm/migrations/0001_initial.py index fbe60da..f77d7a1 100644 --- a/src/dj/fpm/migrations/0001_initial.py +++ b/src/dj/fpm/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.4 on 2022-06-14 08:13 +# Generated by Django 4.0.4 on 2022-06-15 10:01 from django.db import migrations, models import django.db.models.deletion @@ -16,21 +16,21 @@ class Migration(migrations.Migration): name='Package', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.TextField(help_text='name of the FPM package', unique=True)), - ('git', models.TextField(help_text='git url of FPM package')), - ('hash', models.TextField(blank=True, help_text='latest deployed hash of git', null=True)), - ('plan', models.TextField(help_text='We have different plans like free, paid for serving FPM package')), + ('name', models.CharField(help_text='name of the FPM package', max_length=255, unique=True)), + ('git', models.CharField(help_text='git url of FPM package', max_length=1023)), + ('hash', models.CharField(blank=True, help_text='latest deployed hash of git', max_length=512, null=True)), + ('plan', models.CharField(help_text='We have different plans like free, paid for serving FPM package', max_length=255)), ('hours', models.IntegerField(default=0)), - ('status', models.TextField(help_text='status of the package')), + ('status', models.CharField(choices=[('deployed', 'Package Deployed'), ('in_dev', 'In development state')], help_text='status of the package', max_length=255)), ], ), migrations.CreateModel( name='DedicatedInstance', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ec2_reservation', models.TextField(db_index=True)), - ('ec2_instance_id', models.TextField(blank=True, null=True)), - ('status', models.TextField(help_text='status of EC2 instance, ready, initializing, ect...')), + ('ec2_reservation', models.CharField(db_index=True, max_length=255)), + ('ec2_instance_id', models.CharField(blank=True, max_length=255, null=True)), + ('status', models.CharField(choices=[('initializing', 'Instance Initializing'), ('ready', 'Instance ready to serve'), ('failed', 'Failed to initialize')], help_text='status of EC2 instance, ready, initializing, ect...', max_length=127)), ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fpm.package')), ], ), diff --git a/src/dj/fpm/models.py b/src/dj/fpm/models.py index e117e50..b738cde 100644 --- a/src/dj/fpm/models.py +++ b/src/dj/fpm/models.py @@ -2,22 +2,30 @@ # Create your models here. -""" -FPM package module -""" +package_status = [ + ("deployed", "Package Deployed"), + ("in_dev", "In development state") +] + +instance_status = [ + ("initializing", "Instance Initializing"), + ("ready", "Instance ready to serve"), + ("failed", "Failed to initialize") +] class Package(models.Model): - name = models.TextField(unique=True, help_text="name of the FPM package") - git = models.TextField(help_text="git url of FPM package") - hash = models.TextField(null=True, blank=True, help_text="latest deployed hash of git") - plan = models.TextField(help_text="We have different plans like free, paid for serving FPM package") + name = models.CharField(unique=True, help_text="name of the FPM package", max_length=255) + git = models.CharField(help_text="git url of FPM package", max_length=1023) + hash = models.CharField(null=True, blank=True, help_text="latest deployed hash of git", max_length=512) + plan = models.CharField(help_text="We have different plans like free, paid for serving FPM package", max_length=255) hours = models.IntegerField(default=0) - status = models.TextField(help_text="status of the package") + status = models.CharField(help_text="status of the package", max_length=255, choices=package_status) class DedicatedInstance(models.Model): package = models.ForeignKey(Package, on_delete=models.CASCADE) - ec2_reservation = models.TextField(db_index=True) - ec2_instance_id = models.TextField(null=True, blank=True) - status = models.TextField(help_text="status of EC2 instance, ready, initializing, ect...") + ec2_reservation = models.CharField(db_index=True, max_length=255) + ec2_instance_id = models.CharField(null=True, blank=True, max_length=255) + status = models.CharField( + help_text="status of EC2 instance, ready, initializing, ect...", max_length=127, choices=instance_status) From cba23cda208d58d5d78fd9c66c47efb21b2f8380 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Wed, 15 Jun 2022 16:18:53 +0530 Subject: [PATCH 12/14] models changes and add Package to admin site --- etc/zsh/auto.sh | 7 +++++-- src/dj/fpm/admin.py | 8 +++++++- src/dj/fpm/migrations/0001_initial.py | 6 +++++- src/dj/fpm/models.py | 7 +++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/etc/zsh/auto.sh b/etc/zsh/auto.sh index f65fa59..84896f9 100644 --- a/etc/zsh/auto.sh +++ b/etc/zsh/auto.sh @@ -37,7 +37,6 @@ function 0() { function migrate() { manage migrate $* - echo migrate_done } function recreatedb() { @@ -58,4 +57,8 @@ function djshell() { function dbshell() { manage dbshell -} \ No newline at end of file +} + +function createsuperuser() { + manage createsuperuser +} diff --git a/src/dj/fpm/admin.py b/src/dj/fpm/admin.py index 8c38f3f..106222f 100644 --- a/src/dj/fpm/admin.py +++ b/src/dj/fpm/admin.py @@ -1,3 +1,9 @@ from django.contrib import admin +from fpm.models import Package + + +@admin.register(Package) +class PackageAdmin(admin.ModelAdmin): + list_display = ('name', 'plan', 'hours', 'status') + exclude = ('created_at', 'updated_at') -# Register your models here. diff --git a/src/dj/fpm/migrations/0001_initial.py b/src/dj/fpm/migrations/0001_initial.py index f77d7a1..72df467 100644 --- a/src/dj/fpm/migrations/0001_initial.py +++ b/src/dj/fpm/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.4 on 2022-06-15 10:01 +# Generated by Django 4.0.4 on 2022-06-15 10:41 from django.db import migrations, models import django.db.models.deletion @@ -22,6 +22,8 @@ class Migration(migrations.Migration): ('plan', models.CharField(help_text='We have different plans like free, paid for serving FPM package', max_length=255)), ('hours', models.IntegerField(default=0)), ('status', models.CharField(choices=[('deployed', 'Package Deployed'), ('in_dev', 'In development state')], help_text='status of the package', max_length=255)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), ], ), migrations.CreateModel( @@ -31,6 +33,8 @@ class Migration(migrations.Migration): ('ec2_reservation', models.CharField(db_index=True, max_length=255)), ('ec2_instance_id', models.CharField(blank=True, max_length=255, null=True)), ('status', models.CharField(choices=[('initializing', 'Instance Initializing'), ('ready', 'Instance ready to serve'), ('failed', 'Failed to initialize')], help_text='status of EC2 instance, ready, initializing, ect...', max_length=127)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fpm.package')), ], ), diff --git a/src/dj/fpm/models.py b/src/dj/fpm/models.py index b738cde..6dd34c1 100644 --- a/src/dj/fpm/models.py +++ b/src/dj/fpm/models.py @@ -21,6 +21,11 @@ class Package(models.Model): plan = models.CharField(help_text="We have different plans like free, paid for serving FPM package", max_length=255) hours = models.IntegerField(default=0) status = models.CharField(help_text="status of the package", max_length=255, choices=package_status) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self): + return self.name class DedicatedInstance(models.Model): @@ -29,3 +34,5 @@ class DedicatedInstance(models.Model): ec2_instance_id = models.CharField(null=True, blank=True, max_length=255) status = models.CharField( help_text="status of EC2 instance, ready, initializing, ect...", max_length=127, choices=instance_status) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) From a605bcea8472778e3e5d3cd79d2107e4d39a8cf0 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Wed, 15 Jun 2022 16:30:59 +0530 Subject: [PATCH 13/14] models changes and add Package to admin site --- .pre-commit-config.yaml | 5 ++ requirements.txt | 3 +- src/dj/fpm/migrations/0001_initial.py | 108 +++++++++++++++++++++----- src/dj/fpm/models.py | 29 ++++--- src/dj/fpm/urls.py | 2 +- src/dj/fpm/views.py | 16 ++-- src/dj/proj/settings.py | 2 +- 7 files changed, 124 insertions(+), 41 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..1e87e62 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,5 @@ +repos: +- repo: https://github.com/psf/black + rev: 22.3.0 + hooks: + - id: black \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 85f465a..cc63f0f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ Django==4.0.4 black==22.3.0 psycopg2==2.9.3 -ipython==8.4.0 \ No newline at end of file +ipython==8.4.0 +pre-commit==2.19.0 \ No newline at end of file diff --git a/src/dj/fpm/migrations/0001_initial.py b/src/dj/fpm/migrations/0001_initial.py index 72df467..2508317 100644 --- a/src/dj/fpm/migrations/0001_initial.py +++ b/src/dj/fpm/migrations/0001_initial.py @@ -8,34 +8,102 @@ class Migration(migrations.Migration): initial = True - dependencies = [ - ] + dependencies = [] operations = [ migrations.CreateModel( - name='Package', + name="Package", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(help_text='name of the FPM package', max_length=255, unique=True)), - ('git', models.CharField(help_text='git url of FPM package', max_length=1023)), - ('hash', models.CharField(blank=True, help_text='latest deployed hash of git', max_length=512, null=True)), - ('plan', models.CharField(help_text='We have different plans like free, paid for serving FPM package', max_length=255)), - ('hours', models.IntegerField(default=0)), - ('status', models.CharField(choices=[('deployed', 'Package Deployed'), ('in_dev', 'In development state')], help_text='status of the package', max_length=255)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('updated_at', models.DateTimeField(auto_now=True)), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "name", + models.CharField( + help_text="name of the FPM package", max_length=255, unique=True + ), + ), + ( + "git", + models.CharField( + help_text="git url of FPM package", max_length=1023 + ), + ), + ( + "hash", + models.CharField( + blank=True, + help_text="latest deployed hash of git", + max_length=512, + null=True, + ), + ), + ( + "plan", + models.CharField( + help_text="We have different plans like free, paid for serving FPM package", + max_length=255, + ), + ), + ("hours", models.IntegerField(default=0)), + ( + "status", + models.CharField( + choices=[ + ("deployed", "Package Deployed"), + ("in_dev", "In development state"), + ], + help_text="status of the package", + max_length=255, + ), + ), + ("created_at", models.DateTimeField(auto_now_add=True)), + ("updated_at", models.DateTimeField(auto_now=True)), ], ), migrations.CreateModel( - name='DedicatedInstance', + name="DedicatedInstance", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ec2_reservation', models.CharField(db_index=True, max_length=255)), - ('ec2_instance_id', models.CharField(blank=True, max_length=255, null=True)), - ('status', models.CharField(choices=[('initializing', 'Instance Initializing'), ('ready', 'Instance ready to serve'), ('failed', 'Failed to initialize')], help_text='status of EC2 instance, ready, initializing, ect...', max_length=127)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('updated_at', models.DateTimeField(auto_now=True)), - ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fpm.package')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("ec2_reservation", models.CharField(db_index=True, max_length=255)), + ( + "ec2_instance_id", + models.CharField(blank=True, max_length=255, null=True), + ), + ( + "status", + models.CharField( + choices=[ + ("initializing", "Instance Initializing"), + ("ready", "Instance ready to serve"), + ("failed", "Failed to initialize"), + ], + help_text="status of EC2 instance, ready, initializing, ect...", + max_length=127, + ), + ), + ("created_at", models.DateTimeField(auto_now_add=True)), + ("updated_at", models.DateTimeField(auto_now=True)), + ( + "package", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="fpm.package" + ), + ), ], ), ] diff --git a/src/dj/fpm/models.py b/src/dj/fpm/models.py index 6dd34c1..b1a181d 100644 --- a/src/dj/fpm/models.py +++ b/src/dj/fpm/models.py @@ -2,25 +2,31 @@ # Create your models here. -package_status = [ - ("deployed", "Package Deployed"), - ("in_dev", "In development state") -] +package_status = [("deployed", "Package Deployed"), ("in_dev", "In development state")] instance_status = [ ("initializing", "Instance Initializing"), ("ready", "Instance ready to serve"), - ("failed", "Failed to initialize") + ("failed", "Failed to initialize"), ] class Package(models.Model): - name = models.CharField(unique=True, help_text="name of the FPM package", max_length=255) + name = models.CharField( + unique=True, help_text="name of the FPM package", max_length=255 + ) git = models.CharField(help_text="git url of FPM package", max_length=1023) - hash = models.CharField(null=True, blank=True, help_text="latest deployed hash of git", max_length=512) - plan = models.CharField(help_text="We have different plans like free, paid for serving FPM package", max_length=255) + hash = models.CharField( + null=True, blank=True, help_text="latest deployed hash of git", max_length=512 + ) + plan = models.CharField( + help_text="We have different plans like free, paid for serving FPM package", + max_length=255, + ) hours = models.IntegerField(default=0) - status = models.CharField(help_text="status of the package", max_length=255, choices=package_status) + status = models.CharField( + help_text="status of the package", max_length=255, choices=package_status + ) created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) @@ -33,6 +39,9 @@ class DedicatedInstance(models.Model): ec2_reservation = models.CharField(db_index=True, max_length=255) ec2_instance_id = models.CharField(null=True, blank=True, max_length=255) status = models.CharField( - help_text="status of EC2 instance, ready, initializing, ect...", max_length=127, choices=instance_status) + help_text="status of EC2 instance, ready, initializing, ect...", + max_length=127, + choices=instance_status, + ) created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) diff --git a/src/dj/fpm/urls.py b/src/dj/fpm/urls.py index 1838a87..a625966 100644 --- a/src/dj/fpm/urls.py +++ b/src/dj/fpm/urls.py @@ -4,5 +4,5 @@ urlpatterns = [ path(r"fpm-ready", views.fpm_ready), - path(r"get-package", views.get_package) + path(r"get-package", views.get_package), ] diff --git a/src/dj/fpm/views.py b/src/dj/fpm/views.py index 374fded..e27889c 100644 --- a/src/dj/fpm/views.py +++ b/src/dj/fpm/views.py @@ -28,12 +28,14 @@ def fpm_ready(req: django.http.HttpRequest): return error("hash is mandatory parameter", status=402) try: - instance: DedicatedInstance = DedicatedInstance.objects.get(ec2_reservation=ec2_reservation) + instance: DedicatedInstance = DedicatedInstance.objects.get( + ec2_reservation=ec2_reservation + ) except: return error("instance with ec2_reservation id not found", status=404) instance.package.hash = git_hash - instance.status = 'ready' + instance.status = "ready" instance.save() return success({}) @@ -49,12 +51,10 @@ def get_package(req: django.http.HttpRequest): return error("ec2_reservation is mandatory parameter", status=402) try: - instance: DedicatedInstance = DedicatedInstance.objects.get(ec2_reservation=ec2_reservation) + instance: DedicatedInstance = DedicatedInstance.objects.get( + ec2_reservation=ec2_reservation + ) except: return error("instance with ec2_reservation id not found", status=404) - return success({ - "package": instance.package.name, - "git": instance.package.git - }) - + return success({"package": instance.package.name, "git": instance.package.git}) diff --git a/src/dj/proj/settings.py b/src/dj/proj/settings.py index dc5eea8..010c3fc 100644 --- a/src/dj/proj/settings.py +++ b/src/dj/proj/settings.py @@ -81,7 +81,7 @@ "USER": "root", "PASSWORD": "", "HOST": "127.0.0.1", - "PORT": 5432 + "PORT": 5432, } } From a7819a01967376e8449036768ba21bf604b7c6d8 Mon Sep 17 00:00:00 2001 From: wilderbit Date: Wed, 15 Jun 2022 16:31:34 +0530 Subject: [PATCH 14/14] pyfmt --- src/dj/fpm/admin.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/dj/fpm/admin.py b/src/dj/fpm/admin.py index 106222f..dec8c8f 100644 --- a/src/dj/fpm/admin.py +++ b/src/dj/fpm/admin.py @@ -4,6 +4,5 @@ @admin.register(Package) class PackageAdmin(admin.ModelAdmin): - list_display = ('name', 'plan', 'hours', 'status') - exclude = ('created_at', 'updated_at') - + list_display = ("name", "plan", "hours", "status") + exclude = ("created_at", "updated_at")