zrb 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- zrb/__init__.py +24 -20
- zrb/__main__.py +5 -5
- zrb/action/runner.py +22 -30
- zrb/advertisement.py +10 -9
- zrb/builtin/__init__.py +18 -16
- zrb/builtin/base64.py +13 -18
- zrb/builtin/devtool/__init__.py +14 -3
- zrb/builtin/devtool/devtool_install.py +207 -221
- zrb/builtin/env.py +9 -12
- zrb/builtin/eval.py +9 -9
- zrb/builtin/explain.py +73 -74
- zrb/builtin/generator/__init__.py +7 -11
- zrb/builtin/generator/app_generator/add.py +86 -87
- zrb/builtin/generator/app_generator/template/base/_automate/generate_snake_zrb_meta_template_name/add.py +78 -77
- zrb/builtin/generator/app_generator/template/base/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/_checker.py +6 -6
- zrb/builtin/generator/app_generator/template/base/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/_common.py +14 -15
- zrb/builtin/generator/app_generator/template/base/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/container.py +32 -32
- zrb/builtin/generator/app_generator/template/base/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/deployment.py +29 -30
- zrb/builtin/generator/app_generator/template/base/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/image.py +1 -3
- zrb/builtin/generator/app_generator/template/base/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/local.py +5 -4
- zrb/builtin/generator/app_generator/template/base/_automate/generate_snake_zrb_meta_template_name/template/src/kebab-zrb-app-name/deployment/__main__.py +24 -32
- zrb/builtin/generator/app_generator/template/build-custom-image/_automate/generate_snake_zrb_meta_template_name/add.py +89 -87
- zrb/builtin/generator/app_generator/template/build-custom-image/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/_common.py +14 -15
- zrb/builtin/generator/app_generator/template/build-custom-image/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/container.py +42 -54
- zrb/builtin/generator/app_generator/template/build-custom-image/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/deployment.py +34 -32
- zrb/builtin/generator/app_generator/template/build-custom-image/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/image.py +19 -22
- zrb/builtin/generator/app_generator/template/build-custom-image/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/local.py +18 -18
- zrb/builtin/generator/app_generator/template/http-port/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/_checker.py +10 -10
- zrb/builtin/generator/app_generator/template/http-port-build-custom-image/_automate/generate_snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/local.py +19 -19
- zrb/builtin/generator/app_generator/template/use-helm/_automate/generate_snake_zrb_meta_template_name/template/src/kebab-zrb-app-name/deployment/__main__.py +12 -14
- zrb/builtin/generator/cmd_task/add.py +23 -25
- zrb/builtin/generator/cmd_task/template/_automate/snake_zrb_task_name.py +3 -5
- zrb/builtin/generator/common/helper.py +15 -20
- zrb/builtin/generator/common/task_factory.py +29 -26
- zrb/builtin/generator/common/task_input.py +97 -91
- zrb/builtin/generator/docker_compose_task/add.py +38 -39
- zrb/builtin/generator/docker_compose_task/template/_automate/snake_zrb_task_name.py +13 -19
- zrb/builtin/generator/docker_compose_task/template/src/kebab-zrb-task-name/image/main.py +18 -14
- zrb/builtin/generator/fastapp/add.py +94 -90
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/_checker.py +28 -27
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/_config.py +68 -39
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/_env.py +24 -22
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/_env_file.py +12 -12
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/_get_start_microservices.py +43 -41
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/_helper.py +23 -24
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/_input.py +21 -20
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/cmd/app-load-test.sh +1 -1
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/cmd/app-start.sh +1 -1
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/cmd/app-test.sh +2 -2
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/container.py +46 -39
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/deployment.py +28 -20
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/frontend.py +21 -27
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/image.py +23 -18
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/load_test.py +35 -36
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/local.py +68 -58
- zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/test.py +24 -38
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/deployment/__main__.py +23 -21
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/deployment/_common.py +72 -75
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/deployment/app_helper.py +70 -75
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/deployment/helm_postgresql_helper.py +18 -21
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/deployment/helm_rabbitmq_helper.py +11 -19
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/deployment/helm_redpanda_helper.py +18 -15
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/deployment/helm_signoz_helper.py +17 -21
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/docker-compose.yml +12 -12
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/loadtest/locustfile.py +10 -12
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/Dockerfile +1 -0
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/app.py +35 -30
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/app_lifespan.py +21 -17
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/app_state.py +3 -2
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/db_connection.py +18 -20
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/frontend_index.py +5 -6
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/log.py +7 -15
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/messagebus.py +38 -34
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/rpc.py +19 -18
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/config.py +68 -103
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/error.py +11 -10
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/messagebus/__init__.py +2 -4
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/messagebus/kafka/admin.py +38 -35
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/messagebus/kafka/consumer.py +38 -45
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/messagebus/kafka/publisher.py +26 -29
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/messagebus/messagebus.py +8 -14
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/messagebus/mock.py +12 -8
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/messagebus/rabbitmq/admin.py +37 -44
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/messagebus/rabbitmq/consumer.py +42 -67
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/messagebus/rabbitmq/publisher.py +32 -55
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/model/repo_model.py +11 -10
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/repo/__init__.py +2 -2
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/repo/db_entity_mixin.py +3 -6
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/repo/db_repo.py +76 -83
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/repo/repo.py +5 -5
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/repo/search_filter.py +1 -0
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/rpc/__init__.py +1 -1
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/rpc/messagebus/caller.py +17 -19
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/rpc/messagebus/server.py +14 -18
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/rpc/rpc.py +15 -28
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/schema/__init__.py +1 -1
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/schema/base_schema.py +6 -5
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/serializer/__init__.py +1 -3
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/core/serializer/serializer.py +3 -4
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/helper/async_task.py +3 -5
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/helper/conversion.py +10 -10
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/helper/migration.py +6 -10
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/migrate.py +3 -2
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/api.py +7 -12
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/__init__.py +4 -6
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/access_token_scheme.py +9 -10
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/access_token_util.py +6 -5
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/authorizer.py +4 -4
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/bearer_token_scheme.py +1 -1
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/model/user_model.py +8 -10
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/password_hasher.py +1 -1
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/refresh_token_util.py +7 -6
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/repo/group_repo.py +3 -8
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/repo/permission_repo.py +3 -7
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/repo/user_repo.py +3 -5
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/component/user.py +12 -7
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/core/__init__.py +7 -12
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/core/access_token/scheme.py +7 -12
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/core/access_token/util.py +20 -30
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/core/authorizer/authorizer.py +1 -3
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/core/authorizer/rpc_authorizer.py +5 -12
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/core/password_hasher/bcrypt_password_hasher.py +3 -8
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/core/password_hasher/password_hasher.py +0 -1
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/core/refresh_token/util.py +15 -21
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/group/api.py +42 -49
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/group/model.py +3 -7
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/group/repo.py +18 -16
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/group/rpc.py +26 -41
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/permission/api.py +46 -51
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/permission/model.py +5 -7
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/permission/repo.py +11 -8
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/permission/rpc.py +28 -45
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/table.py +10 -10
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/user/api.py +60 -72
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/user/model.py +32 -61
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/user/repo.py +33 -36
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/entity/user/rpc.py +42 -61
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/event.py +2 -4
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/migrate.py +3 -5
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/register_module.py +11 -12
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/register_permission.py +19 -26
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/rpc.py +5 -13
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/schema/group.py +6 -4
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/schema/permission.py +3 -1
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/schema/request.py +1 -0
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/schema/token.py +2 -2
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/auth/schema/user.py +4 -3
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/api.py +4 -5
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/component/model/activity_model.py +3 -9
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/component/repo/activity_repo.py +3 -7
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/core/historical_repo_model.py +13 -13
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/api.py +22 -23
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/event.py +5 -7
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/model.py +2 -6
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/repo.py +8 -8
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/rpc.py +28 -45
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/table.py +3 -3
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/event.py +4 -8
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/migrate.py +2 -4
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/register_module.py +10 -11
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/rpc.py +3 -5
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/schema/activity.py +3 -1
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/requirements.txt +12 -12
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/test/auth/test_group_crud.py +76 -106
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/test/auth/test_permission_crud.py +73 -103
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/test/auth/test_user_crud.py +92 -122
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/test/auth/test_user_login.py +107 -134
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/test/conftest.py +2 -2
- zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/test/test_liveness_and_readiness.py +8 -15
- zrb/builtin/generator/fastapp_crud/add.py +74 -79
- zrb/builtin/generator/fastapp_crud/helper.py +51 -48
- zrb/builtin/generator/fastapp_crud/task_factory.py +17 -14
- zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/component/model/snake_zrb_entity_name_model.py +2 -2
- zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/component/repo/snake_zrb_entity_name_repo.py +3 -2
- zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/snake_zrb_entity_name/api.py +58 -40
- zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/snake_zrb_entity_name/model.py +7 -3
- zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/snake_zrb_entity_name/repo.py +9 -4
- zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/snake_zrb_entity_name/rpc.py +32 -39
- zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/schema/snake_zrb_entity_name.py +3 -1
- zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/test/snake_zrb_module_name/test_snake_zrb_entity_name.py +68 -98
- zrb/builtin/generator/fastapp_field/add.py +143 -85
- zrb/builtin/generator/fastapp_field/helper.py +184 -125
- zrb/builtin/generator/fastapp_module/add.py +90 -67
- zrb/builtin/generator/fastapp_module/helper.py +141 -155
- zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/api.py +3 -2
- zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/table.py +3 -3
- zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/event.py +3 -5
- zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/migrate.py +2 -4
- zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/register_module.py +10 -11
- zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/rpc.py +3 -5
- zrb/builtin/generator/pip_package/add.py +39 -40
- zrb/builtin/generator/pip_package/template/_automate/snake_zrb_package_name/local.py +30 -30
- zrb/builtin/generator/pip_package/template/src/kebab-zrb-package-name/src/snake_zrb_package_name/__init__.py +1 -0
- zrb/builtin/generator/pip_package/template/src/kebab-zrb-package-name/src/snake_zrb_package_name/__main__.py +1 -0
- zrb/builtin/generator/pip_package/template/src/kebab-zrb-package-name/src/snake_zrb_package_name/util.py +2 -2
- zrb/builtin/generator/plugin/create.py +39 -36
- zrb/builtin/generator/plugin/template/src/snake_zrb_package_name/__init__.py +1 -1
- zrb/builtin/generator/plugin/template/src/snake_zrb_package_name/__main__.py +1 -0
- zrb/builtin/generator/plugin/template/src/snake_zrb_package_name/task/example_task.py +6 -4
- zrb/builtin/generator/plugin/template/zrb_init.py +27 -27
- zrb/builtin/generator/project/create.py +38 -46
- zrb/builtin/generator/project/template/.flake8 +3 -0
- zrb/builtin/generator/project/template/project.sh +19 -10
- zrb/builtin/generator/project_task/task_factory.py +60 -61
- zrb/builtin/generator/project_task/template/_automate/_project/__init__.py +2 -2
- zrb/builtin/generator/project_task/template/_automate/_project/build_project_images.py +4 -4
- zrb/builtin/generator/project_task/template/_automate/_project/deploy_project.py +4 -4
- zrb/builtin/generator/project_task/template/_automate/_project/destroy_project.py +4 -4
- zrb/builtin/generator/project_task/template/_automate/_project/push_project_images.py +4 -4
- zrb/builtin/generator/project_task/template/_automate/_project/remove_project_containers.py +4 -4
- zrb/builtin/generator/project_task/template/_automate/_project/start_project.py +4 -4
- zrb/builtin/generator/project_task/template/_automate/_project/start_project_containers.py +4 -4
- zrb/builtin/generator/project_task/template/_automate/_project/stop_project_containers.py +4 -4
- zrb/builtin/generator/python_task/add.py +25 -33
- zrb/builtin/generator/python_task/template/_automate/snake_zrb_task_name.py +8 -7
- zrb/builtin/generator/simple_python_app/add.py +81 -75
- zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/_common.py +14 -15
- zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/container.py +46 -61
- zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/deployment.py +34 -32
- zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/image.py +19 -22
- zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/local.py +23 -25
- zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/deployment/__main__.py +24 -32
- zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/src/main.py +18 -14
- zrb/builtin/git.py +46 -46
- zrb/builtin/group.py +13 -34
- zrb/builtin/helper/reccuring_action.py +26 -29
- zrb/builtin/md5.py +17 -30
- zrb/builtin/process.py +19 -19
- zrb/builtin/project.py +13 -15
- zrb/builtin/say.py +69 -88
- zrb/builtin/schedule.py +15 -19
- zrb/builtin/ubuntu.py +44 -35
- zrb/builtin/update.py +5 -5
- zrb/builtin/version.py +3 -7
- zrb/builtin/watch_changes.py +24 -25
- zrb/config/config.py +19 -18
- zrb/helper/accessories/color.py +18 -6
- zrb/helper/accessories/icon.py +24 -3
- zrb/helper/accessories/name.py +120 -28
- zrb/helper/advertisement.py +9 -13
- zrb/helper/callable.py +2 -4
- zrb/helper/cli.py +27 -31
- zrb/helper/codemod/add_argument_to_function.py +3 -4
- zrb/helper/codemod/add_argument_to_function_call.py +4 -7
- zrb/helper/codemod/add_assert_resource.py +7 -7
- zrb/helper/codemod/add_function_call.py +3 -5
- zrb/helper/codemod/add_import_module.py +15 -26
- zrb/helper/codemod/add_key_value_to_dict.py +7 -10
- zrb/helper/codemod/add_property_to_class.py +10 -8
- zrb/helper/codemod/add_upstream_to_task.py +21 -33
- zrb/helper/codemod/append_code_to_function.py +6 -13
- zrb/helper/codemod/format_code.py +2 -1
- zrb/helper/default_env.py +25 -25
- zrb/helper/docker_compose/fetch_external_env.py +18 -18
- zrb/helper/docker_compose/file.py +5 -4
- zrb/helper/docstring.py +44 -47
- zrb/helper/env_map/fetch.py +7 -12
- zrb/helper/file/copy_tree.py +12 -17
- zrb/helper/file/match.py +6 -7
- zrb/helper/file/text.py +8 -6
- zrb/helper/git/detect_changes.py +9 -8
- zrb/helper/loader/load_module.py +14 -13
- zrb/helper/log.py +4 -3
- zrb/helper/map/conversion.py +4 -5
- zrb/helper/python_task.py +2 -4
- zrb/helper/render_data.py +25 -18
- zrb/helper/string/constant.py +2 -2
- zrb/helper/string/conversion.py +17 -16
- zrb/helper/string/jinja.py +2 -2
- zrb/helper/typecheck.py +6 -4
- zrb/helper/typing.py +10 -2
- zrb/helper/util.py +44 -40
- zrb/task/any_task.py +251 -251
- zrb/task/base_remote_cmd_task.py +76 -59
- zrb/task/base_task/base_task.py +95 -108
- zrb/task/base_task/component/base_task_model.py +73 -71
- zrb/task/base_task/component/common_task_model.py +42 -29
- zrb/task/base_task/component/pid_model.py +3 -5
- zrb/task/base_task/component/renderer.py +26 -36
- zrb/task/base_task/component/trackers.py +6 -9
- zrb/task/checker.py +14 -9
- zrb/task/cmd_task.py +102 -100
- zrb/task/decorator.py +19 -13
- zrb/task/docker_compose_task.py +127 -98
- zrb/task/flow_task.py +16 -19
- zrb/task/http_checker.py +40 -36
- zrb/task/notifier.py +50 -38
- zrb/task/parallel.py +3 -3
- zrb/task/path_checker.py +34 -27
- zrb/task/path_watcher.py +49 -40
- zrb/task/port_checker.py +33 -26
- zrb/task/recurring_task.py +36 -42
- zrb/task/remote_cmd_task.py +31 -28
- zrb/task/resource_maker.py +66 -52
- zrb/task/rsync_task.py +24 -21
- zrb/task/task.py +4 -3
- zrb/task/time_watcher.py +36 -31
- zrb/task_env/constant.py +1 -1
- zrb/task_env/env.py +33 -31
- zrb/task_env/env_file.py +24 -23
- zrb/task_group/group.py +27 -30
- zrb/task_input/any_input.py +18 -16
- zrb/task_input/base_input.py +26 -26
- zrb/task_input/bool_input.py +6 -6
- zrb/task_input/choice_input.py +11 -9
- zrb/task_input/constant.py +1 -1
- zrb/task_input/float_input.py +6 -5
- zrb/task_input/int_input.py +8 -8
- zrb/task_input/password_input.py +9 -9
- zrb/task_input/str_input.py +8 -8
- zrb/task_input/task_input.py +4 -2
- {zrb-0.6.0.dist-info → zrb-0.6.1.dist-info}/METADATA +3 -1
- {zrb-0.6.0.dist-info → zrb-0.6.1.dist-info}/RECORD +316 -315
- {zrb-0.6.0.dist-info → zrb-0.6.1.dist-info}/LICENSE +0 -0
- {zrb-0.6.0.dist-info → zrb-0.6.1.dist-info}/WHEEL +0 -0
- {zrb-0.6.0.dist-info → zrb-0.6.1.dist-info}/entry_points.txt +0 -0
@@ -1,30 +1,38 @@
|
|
1
|
-
|
1
|
+
import os
|
2
|
+
|
2
3
|
from zrb.builtin.generator.common.helper import (
|
3
|
-
validate_existing_project_dir,
|
4
|
+
validate_existing_project_dir,
|
5
|
+
validate_inexisting_automation,
|
4
6
|
)
|
7
|
+
from zrb.builtin.generator.common.task_factory import create_register_module
|
5
8
|
from zrb.builtin.generator.common.task_input import (
|
6
|
-
|
7
|
-
|
9
|
+
app_image_name_input,
|
10
|
+
app_name_input,
|
11
|
+
env_prefix_input,
|
12
|
+
http_port_input,
|
13
|
+
project_dir_input,
|
8
14
|
)
|
9
|
-
from zrb.builtin.generator.common.task_factory import create_register_module
|
10
15
|
from zrb.builtin.generator.project_task.task_factory import (
|
11
|
-
|
12
|
-
create_add_deploy_upstream,
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
+
create_add_build_images_upstream,
|
17
|
+
create_add_deploy_upstream,
|
18
|
+
create_add_destroy_upstream,
|
19
|
+
create_add_push_images_upstream,
|
20
|
+
create_add_remove_containers_upstream,
|
21
|
+
create_add_start_containers_upstream,
|
22
|
+
create_add_start_upstream,
|
23
|
+
create_add_stop_containers_upstream,
|
24
|
+
create_ensure_project_tasks,
|
16
25
|
)
|
17
26
|
from zrb.builtin.group import project_add_group
|
18
|
-
from zrb.
|
27
|
+
from zrb.helper.typing import Any
|
28
|
+
from zrb.helper.util import to_kebab_case
|
29
|
+
from zrb.runner import runner
|
19
30
|
from zrb.task.decorator import python_task
|
20
31
|
from zrb.task.resource_maker import ResourceMaker
|
21
|
-
from zrb.
|
22
|
-
from zrb.helper.util import to_kebab_case
|
23
|
-
|
24
|
-
import os
|
32
|
+
from zrb.task.task import Task
|
25
33
|
|
26
34
|
CURRENT_DIR = os.path.dirname(__file__)
|
27
|
-
SNAKE_APP_NAME_TPL =
|
35
|
+
SNAKE_APP_NAME_TPL = "{{util.to_snake_case(input.app_name)}}"
|
28
36
|
|
29
37
|
###############################################################################
|
30
38
|
# Task Definitions
|
@@ -32,21 +40,21 @@ SNAKE_APP_NAME_TPL = '{{util.to_snake_case(input.app_name)}}'
|
|
32
40
|
|
33
41
|
|
34
42
|
@python_task(
|
35
|
-
name=
|
43
|
+
name="validate",
|
36
44
|
inputs=[project_dir_input, app_name_input],
|
37
45
|
)
|
38
46
|
async def validate(*args: Any, **kwargs: Any):
|
39
|
-
project_dir = kwargs.get(
|
47
|
+
project_dir = kwargs.get("project_dir")
|
40
48
|
validate_existing_project_dir(project_dir)
|
41
|
-
app_name = kwargs.get(
|
49
|
+
app_name = kwargs.get("app_name")
|
42
50
|
validate_inexisting_automation(project_dir, app_name)
|
43
|
-
source_dir = os.path.join(project_dir,
|
51
|
+
source_dir = os.path.join(project_dir, "src", f"{to_kebab_case(app_name)}")
|
44
52
|
if os.path.exists(source_dir):
|
45
|
-
raise Exception(f
|
53
|
+
raise Exception(f"Source already exists: {source_dir}")
|
46
54
|
|
47
55
|
|
48
56
|
copy_resource = ResourceMaker(
|
49
|
-
name=
|
57
|
+
name="copy-resource",
|
50
58
|
inputs=[
|
51
59
|
project_dir_input,
|
52
60
|
app_name_input,
|
@@ -56,110 +64,108 @@ copy_resource = ResourceMaker(
|
|
56
64
|
],
|
57
65
|
upstreams=[validate],
|
58
66
|
replacements={
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
67
|
+
"zrbAppName": "{{input.app_name}}",
|
68
|
+
"zrbAppHttpPort": '{{util.coalesce(input.http_port, "3000")}}',
|
69
|
+
"ZRB_ENV_PREFIX": '{{util.coalesce(input.env_prefix, "MY").upper()}}',
|
70
|
+
"zrb-app-image-name": "{{input.app_image_name}}",
|
63
71
|
},
|
64
|
-
template_path=os.path.join(CURRENT_DIR,
|
65
|
-
destination_path=
|
72
|
+
template_path=os.path.join(CURRENT_DIR, "template"),
|
73
|
+
destination_path="{{ input.project_dir }}",
|
66
74
|
excludes=[
|
67
|
-
|
68
|
-
|
69
|
-
]
|
75
|
+
"*/deployment/venv",
|
76
|
+
"*/__pycache__",
|
77
|
+
],
|
70
78
|
)
|
71
79
|
|
72
80
|
register_local_module = create_register_module(
|
73
|
-
module_path=f
|
74
|
-
alias=f
|
81
|
+
module_path=f"_automate.{SNAKE_APP_NAME_TPL}.local",
|
82
|
+
alias=f"{SNAKE_APP_NAME_TPL}_local",
|
75
83
|
inputs=[app_name_input],
|
76
|
-
upstreams=[copy_resource]
|
84
|
+
upstreams=[copy_resource],
|
77
85
|
)
|
78
86
|
|
79
87
|
register_container_module = create_register_module(
|
80
|
-
module_path=f
|
81
|
-
alias=f
|
88
|
+
module_path=f"_automate.{SNAKE_APP_NAME_TPL}.container",
|
89
|
+
alias=f"{SNAKE_APP_NAME_TPL}_container",
|
82
90
|
inputs=[app_name_input],
|
83
|
-
upstreams=[register_local_module]
|
91
|
+
upstreams=[register_local_module],
|
84
92
|
)
|
85
93
|
|
86
94
|
register_image_module = create_register_module(
|
87
|
-
module_path=f
|
88
|
-
alias=f
|
95
|
+
module_path=f"_automate.{SNAKE_APP_NAME_TPL}.image",
|
96
|
+
alias=f"{SNAKE_APP_NAME_TPL}_image",
|
89
97
|
inputs=[app_name_input],
|
90
|
-
upstreams=[register_container_module]
|
98
|
+
upstreams=[register_container_module],
|
91
99
|
)
|
92
100
|
|
93
101
|
register_deployment_module = create_register_module(
|
94
|
-
module_path=f
|
95
|
-
alias=f
|
102
|
+
module_path=f"_automate.{SNAKE_APP_NAME_TPL}.deployment",
|
103
|
+
alias=f"{SNAKE_APP_NAME_TPL}_deployment",
|
96
104
|
inputs=[app_name_input],
|
97
|
-
upstreams=[register_image_module]
|
105
|
+
upstreams=[register_image_module],
|
98
106
|
)
|
99
107
|
|
100
|
-
ensure_project_tasks = create_ensure_project_tasks(
|
101
|
-
upstreams=[copy_resource]
|
102
|
-
)
|
108
|
+
ensure_project_tasks = create_ensure_project_tasks(upstreams=[copy_resource])
|
103
109
|
|
104
110
|
add_start_upstream = create_add_start_upstream(
|
105
|
-
upstream_module=f
|
106
|
-
upstream_task_var=f
|
111
|
+
upstream_module=f"_automate.{SNAKE_APP_NAME_TPL}.local",
|
112
|
+
upstream_task_var=f"start_{SNAKE_APP_NAME_TPL}",
|
107
113
|
upstreams=[ensure_project_tasks],
|
108
|
-
inputs=[app_name_input]
|
114
|
+
inputs=[app_name_input],
|
109
115
|
)
|
110
116
|
|
111
117
|
add_start_container_upstream = create_add_start_containers_upstream(
|
112
|
-
upstream_module=f
|
113
|
-
upstream_task_var=f
|
118
|
+
upstream_module=f"_automate.{SNAKE_APP_NAME_TPL}.container",
|
119
|
+
upstream_task_var=f"start_{SNAKE_APP_NAME_TPL}_container",
|
114
120
|
upstreams=[ensure_project_tasks],
|
115
|
-
inputs=[app_name_input]
|
121
|
+
inputs=[app_name_input],
|
116
122
|
)
|
117
123
|
|
118
124
|
add_stop_container_upstream = create_add_stop_containers_upstream(
|
119
|
-
upstream_module=f
|
120
|
-
upstream_task_var=f
|
125
|
+
upstream_module=f"_automate.{SNAKE_APP_NAME_TPL}.container",
|
126
|
+
upstream_task_var=f"stop_{SNAKE_APP_NAME_TPL}_container",
|
121
127
|
upstreams=[ensure_project_tasks],
|
122
|
-
inputs=[app_name_input]
|
128
|
+
inputs=[app_name_input],
|
123
129
|
)
|
124
130
|
|
125
131
|
add_remove_container_upstream = create_add_remove_containers_upstream(
|
126
|
-
upstream_module=f
|
127
|
-
upstream_task_var=f
|
132
|
+
upstream_module=f"_automate.{SNAKE_APP_NAME_TPL}.container",
|
133
|
+
upstream_task_var=f"remove_{SNAKE_APP_NAME_TPL}_container",
|
128
134
|
upstreams=[ensure_project_tasks],
|
129
|
-
inputs=[app_name_input]
|
135
|
+
inputs=[app_name_input],
|
130
136
|
)
|
131
137
|
|
132
138
|
add_build_image_upstream = create_add_build_images_upstream(
|
133
|
-
upstream_module=f
|
134
|
-
upstream_task_var=f
|
139
|
+
upstream_module=f"_automate.{SNAKE_APP_NAME_TPL}.image",
|
140
|
+
upstream_task_var=f"build_{SNAKE_APP_NAME_TPL}_image",
|
135
141
|
upstreams=[ensure_project_tasks],
|
136
|
-
inputs=[app_name_input]
|
142
|
+
inputs=[app_name_input],
|
137
143
|
)
|
138
144
|
|
139
145
|
add_push_image_upstream = create_add_push_images_upstream(
|
140
|
-
upstream_module=f
|
141
|
-
upstream_task_var=f
|
146
|
+
upstream_module=f"_automate.{SNAKE_APP_NAME_TPL}.image",
|
147
|
+
upstream_task_var=f"push_{SNAKE_APP_NAME_TPL}_image",
|
142
148
|
upstreams=[ensure_project_tasks],
|
143
|
-
inputs=[app_name_input]
|
149
|
+
inputs=[app_name_input],
|
144
150
|
)
|
145
151
|
|
146
152
|
add_deploy_upstream = create_add_deploy_upstream(
|
147
|
-
upstream_module=f
|
148
|
-
upstream_task_var=f
|
153
|
+
upstream_module=f"_automate.{SNAKE_APP_NAME_TPL}.deployment",
|
154
|
+
upstream_task_var=f"deploy_{SNAKE_APP_NAME_TPL}",
|
149
155
|
upstreams=[ensure_project_tasks],
|
150
|
-
inputs=[app_name_input]
|
156
|
+
inputs=[app_name_input],
|
151
157
|
)
|
152
158
|
|
153
159
|
add_destroy_upstream = create_add_destroy_upstream(
|
154
|
-
upstream_module=f
|
155
|
-
upstream_task_var=f
|
160
|
+
upstream_module=f"_automate.{SNAKE_APP_NAME_TPL}.deployment",
|
161
|
+
upstream_task_var=f"destroy_{SNAKE_APP_NAME_TPL}",
|
156
162
|
upstreams=[ensure_project_tasks],
|
157
|
-
inputs=[app_name_input]
|
163
|
+
inputs=[app_name_input],
|
158
164
|
)
|
159
165
|
|
160
166
|
|
161
167
|
@python_task(
|
162
|
-
name=
|
168
|
+
name="simple-python-app",
|
163
169
|
group=project_add_group,
|
164
170
|
upstreams=[
|
165
171
|
register_local_module,
|
@@ -173,10 +179,10 @@ add_destroy_upstream = create_add_destroy_upstream(
|
|
173
179
|
add_build_image_upstream,
|
174
180
|
add_push_image_upstream,
|
175
181
|
add_deploy_upstream,
|
176
|
-
add_destroy_upstream
|
182
|
+
add_destroy_upstream,
|
177
183
|
],
|
178
|
-
runner=runner
|
184
|
+
runner=runner,
|
179
185
|
)
|
180
186
|
async def add_simple_python_app(*args: Any, **kwargs: Any):
|
181
|
-
task: Task = kwargs.get(
|
182
|
-
task.print_out(
|
187
|
+
task: Task = kwargs.get("_task")
|
188
|
+
task.print_out("Success")
|
@@ -1,41 +1,40 @@
|
|
1
|
-
from zrb import BoolInput, StrInput
|
2
1
|
import os
|
3
2
|
|
3
|
+
from zrb import BoolInput, StrInput
|
4
|
+
|
4
5
|
###############################################################################
|
5
6
|
# 🏔️ Constants
|
6
7
|
###############################################################################
|
7
8
|
|
8
9
|
CURRENT_DIR = os.path.dirname(__file__)
|
9
|
-
PROJECT_DIR = os.path.abspath(os.path.join(CURRENT_DIR,
|
10
|
-
RESOURCE_DIR = os.path.join(PROJECT_DIR,
|
11
|
-
DEPLOYMENT_DIR = os.path.join(RESOURCE_DIR,
|
12
|
-
DEPLOYMENT_TEMPLATE_ENV_FILE_NAME = os.path.join(
|
13
|
-
|
14
|
-
)
|
15
|
-
APP_DIR = os.path.join(RESOURCE_DIR, 'src')
|
16
|
-
APP_TEMPLATE_ENV_FILE_NAME = os.path.join(APP_DIR, 'template.env')
|
10
|
+
PROJECT_DIR = os.path.abspath(os.path.join(CURRENT_DIR, "..", ".."))
|
11
|
+
RESOURCE_DIR = os.path.join(PROJECT_DIR, "src", "kebab-zrb-app-name")
|
12
|
+
DEPLOYMENT_DIR = os.path.join(RESOURCE_DIR, "deployment")
|
13
|
+
DEPLOYMENT_TEMPLATE_ENV_FILE_NAME = os.path.join(DEPLOYMENT_DIR, "template.env")
|
14
|
+
APP_DIR = os.path.join(RESOURCE_DIR, "src")
|
15
|
+
APP_TEMPLATE_ENV_FILE_NAME = os.path.join(APP_DIR, "template.env")
|
17
16
|
|
18
17
|
###############################################################################
|
19
18
|
# 🔤 Input Definitions
|
20
19
|
###############################################################################
|
21
20
|
|
22
21
|
local_input = BoolInput(
|
23
|
-
name=
|
22
|
+
name="local-kebab-zrb-app-name",
|
24
23
|
description='Use "kebab-zrb-app-name" on local machine',
|
25
24
|
prompt='Use "kebab-zrb-app-name" on local machine?',
|
26
|
-
default=True
|
25
|
+
default=True,
|
27
26
|
)
|
28
27
|
|
29
28
|
https_input = BoolInput(
|
30
|
-
name=
|
29
|
+
name="kebab-zrb-app-name-https",
|
31
30
|
description='Whether "kebab-zrb-app-name" run on HTTPS',
|
32
31
|
prompt='Is "kebab-zrb-app-name" run on HTTPS?',
|
33
|
-
default=False
|
32
|
+
default=False,
|
34
33
|
)
|
35
34
|
|
36
35
|
host_input = StrInput(
|
37
|
-
name=
|
36
|
+
name="kebab-zrb-app-name-host",
|
38
37
|
description='Hostname of "kebab-zrb-app-name"',
|
39
38
|
prompt='Hostname of "kebab-zrb-app-name"',
|
40
|
-
default=
|
39
|
+
default="localhost",
|
41
40
|
)
|
@@ -1,22 +1,18 @@
|
|
1
|
-
from zrb import (
|
2
|
-
DockerComposeTask, Env, EnvFile, HTTPChecker, ServiceConfig, runner
|
3
|
-
)
|
4
|
-
from zrb.builtin.group import project_group
|
5
|
-
from ._common import (
|
6
|
-
RESOURCE_DIR, APP_DIR, local_input, host_input, https_input
|
7
|
-
)
|
8
|
-
from .image import (
|
9
|
-
image_input, image_env, build_snake_zrb_app_name_image
|
10
|
-
)
|
11
1
|
import os
|
12
2
|
|
3
|
+
from zrb import DockerComposeTask, Env, EnvFile, HTTPChecker, ServiceConfig, runner
|
4
|
+
from zrb.builtin.group import project_group
|
5
|
+
|
6
|
+
from ._common import APP_DIR, RESOURCE_DIR, host_input, https_input, local_input
|
7
|
+
from .image import build_snake_zrb_app_name_image, image_env, image_input
|
8
|
+
|
13
9
|
###############################################################################
|
14
10
|
# 🌳 Env File Definitions
|
15
11
|
###############################################################################
|
16
12
|
|
17
13
|
compose_env_file = EnvFile(
|
18
|
-
path=os.path.join(RESOURCE_DIR,
|
19
|
-
prefix=
|
14
|
+
path=os.path.join(RESOURCE_DIR, "docker-compose.env"),
|
15
|
+
prefix="CONTAINER_ZRB_ENV_PREFIX",
|
20
16
|
)
|
21
17
|
|
22
18
|
###############################################################################
|
@@ -24,9 +20,9 @@ compose_env_file = EnvFile(
|
|
24
20
|
###############################################################################
|
25
21
|
|
26
22
|
host_port_env = Env(
|
27
|
-
name=
|
28
|
-
os_name=
|
29
|
-
default=
|
23
|
+
name="HOST_PORT",
|
24
|
+
os_name="CONTAINER_ZRB_ENV_PREFIX_HOST_PORT",
|
25
|
+
default="zrbAppHttpPort",
|
30
26
|
)
|
31
27
|
|
32
28
|
###############################################################################
|
@@ -36,8 +32,8 @@ host_port_env = Env(
|
|
36
32
|
snake_zrb_app_name_service_config = ServiceConfig(
|
37
33
|
env_files=[
|
38
34
|
EnvFile(
|
39
|
-
path=os.path.join(APP_DIR,
|
40
|
-
prefix=
|
35
|
+
path=os.path.join(APP_DIR, "template.env"),
|
36
|
+
prefix="CONTAINER_ZRB_ENV_PREFIX",
|
41
37
|
)
|
42
38
|
]
|
43
39
|
)
|
@@ -47,16 +43,14 @@ snake_zrb_app_name_service_config = ServiceConfig(
|
|
47
43
|
###############################################################################
|
48
44
|
|
49
45
|
remove_snake_zrb_app_name_container = DockerComposeTask(
|
50
|
-
icon=
|
51
|
-
name=
|
52
|
-
description=
|
46
|
+
icon="💨",
|
47
|
+
name="remove-kebab-zrb-app-name-container",
|
48
|
+
description="Remove human readable zrb app name container",
|
53
49
|
group=project_group,
|
54
50
|
cwd=RESOURCE_DIR,
|
55
|
-
compose_cmd=
|
56
|
-
compose_env_prefix=
|
57
|
-
compose_service_configs={
|
58
|
-
'snake_zrb_app_name': snake_zrb_app_name_service_config
|
59
|
-
},
|
51
|
+
compose_cmd="down",
|
52
|
+
compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
|
53
|
+
compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
|
60
54
|
env_files=[compose_env_file],
|
61
55
|
envs=[
|
62
56
|
image_env,
|
@@ -70,16 +64,14 @@ runner.register(remove_snake_zrb_app_name_container)
|
|
70
64
|
###############################################################################
|
71
65
|
|
72
66
|
stop_snake_zrb_app_name_container = DockerComposeTask(
|
73
|
-
icon=
|
74
|
-
name=
|
75
|
-
description=
|
67
|
+
icon="⛔",
|
68
|
+
name="stop-kebab-zrb-app-name-container",
|
69
|
+
description="Stop human readable zrb app name container",
|
76
70
|
group=project_group,
|
77
71
|
cwd=RESOURCE_DIR,
|
78
|
-
compose_cmd=
|
79
|
-
compose_env_prefix=
|
80
|
-
compose_service_configs={
|
81
|
-
'snake_zrb_app_name': snake_zrb_app_name_service_config
|
82
|
-
},
|
72
|
+
compose_cmd="stop",
|
73
|
+
compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
|
74
|
+
compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
|
83
75
|
env_files=[compose_env_file],
|
84
76
|
envs=[
|
85
77
|
image_env,
|
@@ -93,25 +85,20 @@ runner.register(stop_snake_zrb_app_name_container)
|
|
93
85
|
###############################################################################
|
94
86
|
|
95
87
|
init_snake_zrb_app_name_container = DockerComposeTask(
|
96
|
-
icon=
|
97
|
-
name=
|
88
|
+
icon="🔥",
|
89
|
+
name="init-kebab-zrb-app-name-container",
|
98
90
|
inputs=[
|
99
91
|
local_input,
|
100
92
|
host_input,
|
101
93
|
image_input,
|
102
94
|
],
|
103
|
-
should_execute=
|
104
|
-
upstreams=[
|
105
|
-
build_snake_zrb_app_name_image,
|
106
|
-
remove_snake_zrb_app_name_container
|
107
|
-
],
|
95
|
+
should_execute="{{ input.local_snake_zrb_app_name}}",
|
96
|
+
upstreams=[build_snake_zrb_app_name_image, remove_snake_zrb_app_name_container],
|
108
97
|
cwd=RESOURCE_DIR,
|
109
|
-
compose_cmd=
|
110
|
-
compose_flags=[
|
111
|
-
compose_env_prefix=
|
112
|
-
compose_service_configs={
|
113
|
-
'snake_zrb_app_name': snake_zrb_app_name_service_config
|
114
|
-
},
|
98
|
+
compose_cmd="up",
|
99
|
+
compose_flags=["-d"],
|
100
|
+
compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
|
101
|
+
compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
|
115
102
|
env_files=[compose_env_file],
|
116
103
|
envs=[
|
117
104
|
image_env,
|
@@ -124,9 +111,9 @@ init_snake_zrb_app_name_container = DockerComposeTask(
|
|
124
111
|
###############################################################################
|
125
112
|
|
126
113
|
start_snake_zrb_app_name_container = DockerComposeTask(
|
127
|
-
icon=
|
128
|
-
name=
|
129
|
-
description=
|
114
|
+
icon="🐳",
|
115
|
+
name="start-kebab-zrb-app-name-container",
|
116
|
+
description="Start human readable zrb app name container",
|
130
117
|
group=project_group,
|
131
118
|
inputs=[
|
132
119
|
local_input,
|
@@ -134,15 +121,13 @@ start_snake_zrb_app_name_container = DockerComposeTask(
|
|
134
121
|
https_input,
|
135
122
|
image_input,
|
136
123
|
],
|
137
|
-
should_execute=
|
124
|
+
should_execute="{{ input.local_snake_zrb_app_name}}",
|
138
125
|
upstreams=[init_snake_zrb_app_name_container],
|
139
126
|
cwd=RESOURCE_DIR,
|
140
|
-
compose_cmd=
|
141
|
-
compose_flags=[
|
142
|
-
compose_env_prefix=
|
143
|
-
compose_service_configs={
|
144
|
-
'snake_zrb_app_name': snake_zrb_app_name_service_config
|
145
|
-
},
|
127
|
+
compose_cmd="logs",
|
128
|
+
compose_flags=["-f"],
|
129
|
+
compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
|
130
|
+
compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
|
146
131
|
env_files=[compose_env_file],
|
147
132
|
envs=[
|
148
133
|
image_env,
|
@@ -150,11 +135,11 @@ start_snake_zrb_app_name_container = DockerComposeTask(
|
|
150
135
|
],
|
151
136
|
checkers=[
|
152
137
|
HTTPChecker(
|
153
|
-
name=
|
154
|
-
host=
|
155
|
-
port=
|
156
|
-
is_https=
|
138
|
+
name="check-kebab-zrb-app-name",
|
139
|
+
host="{{input.snake_zrb_app_name_host}}",
|
140
|
+
port="{{env.HOST_PORT}}",
|
141
|
+
is_https="{{input.snake_zrb_app_name_https}}",
|
157
142
|
)
|
158
|
-
]
|
143
|
+
],
|
159
144
|
)
|
160
145
|
runner.register(start_snake_zrb_app_name_container)
|
@@ -1,28 +1,32 @@
|
|
1
|
+
import os
|
2
|
+
|
1
3
|
from zrb import CmdTask, Env, EnvFile, IntInput, StrInput, runner
|
2
4
|
from zrb.builtin.group import project_group
|
3
|
-
|
5
|
+
|
4
6
|
from ._common import (
|
5
|
-
|
6
|
-
|
7
|
+
APP_TEMPLATE_ENV_FILE_NAME,
|
8
|
+
CURRENT_DIR,
|
9
|
+
DEPLOYMENT_DIR,
|
10
|
+
DEPLOYMENT_TEMPLATE_ENV_FILE_NAME,
|
7
11
|
)
|
8
|
-
import
|
12
|
+
from .image import image_env, image_input, push_snake_zrb_app_name_image
|
9
13
|
|
10
14
|
###############################################################################
|
11
15
|
# 🔤 Input Definitions
|
12
16
|
###############################################################################
|
13
17
|
|
14
18
|
replica_input = IntInput(
|
15
|
-
name=
|
19
|
+
name="kebab-zrb-app-name-replica",
|
16
20
|
description='Replica of "kebab-zrb-app-name"',
|
17
21
|
prompt='Replica of "kebab-zrb-app-name"',
|
18
22
|
default=1,
|
19
23
|
)
|
20
24
|
|
21
25
|
pulumi_stack_input = StrInput(
|
22
|
-
name=
|
26
|
+
name="kebab-zrb-app-name-pulumi-stack",
|
23
27
|
description='Pulumi stack name for "kebab-zrb-app-name"',
|
24
28
|
prompt='Pulumi stack name for "kebab-zrb-app-name"',
|
25
|
-
default=os.getenv(
|
29
|
+
default=os.getenv("ZRB_ENV", "dev"),
|
26
30
|
)
|
27
31
|
|
28
32
|
###############################################################################
|
@@ -30,13 +34,11 @@ pulumi_stack_input = StrInput(
|
|
30
34
|
###############################################################################
|
31
35
|
|
32
36
|
deployment_app_env_file = EnvFile(
|
33
|
-
path=APP_TEMPLATE_ENV_FILE_NAME,
|
34
|
-
prefix='DEPLOYMENT_APP_ZRB_ENV_PREFIX'
|
37
|
+
path=APP_TEMPLATE_ENV_FILE_NAME, prefix="DEPLOYMENT_APP_ZRB_ENV_PREFIX"
|
35
38
|
)
|
36
39
|
|
37
40
|
deployment_config_env_file = EnvFile(
|
38
|
-
path=DEPLOYMENT_TEMPLATE_ENV_FILE_NAME,
|
39
|
-
prefix='DEPLOYMENT_CONFIG_ZRB_ENV_PREFIX'
|
41
|
+
path=DEPLOYMENT_TEMPLATE_ENV_FILE_NAME, prefix="DEPLOYMENT_CONFIG_ZRB_ENV_PREFIX"
|
40
42
|
)
|
41
43
|
|
42
44
|
###############################################################################
|
@@ -44,21 +46,21 @@ deployment_config_env_file = EnvFile(
|
|
44
46
|
###############################################################################
|
45
47
|
|
46
48
|
pulumi_backend_url_env = Env(
|
47
|
-
name=
|
48
|
-
os_name=
|
49
|
-
default=f
|
49
|
+
name="PULUMI_BACKEND_URL",
|
50
|
+
os_name="PULUMI_ZRB_ENV_PREFIX_BACKEND_URL",
|
51
|
+
default=f"file://{DEPLOYMENT_DIR}/state",
|
50
52
|
)
|
51
53
|
|
52
54
|
pulumi_config_passphrase_env = Env(
|
53
|
-
name=
|
54
|
-
os_name=
|
55
|
-
default=
|
55
|
+
name="PULUMI_CONFIG_PASSPHRASE",
|
56
|
+
os_name="PULUMI_ZRB_ENV_PREFIX_CONFIG_PASSPHRASE",
|
57
|
+
default="secret",
|
56
58
|
)
|
57
59
|
|
58
60
|
deployment_replica_env = Env(
|
59
|
-
name=
|
60
|
-
os_name=
|
61
|
-
default=
|
61
|
+
name="REPLICA",
|
62
|
+
os_name="DEPLOYMENT_ZRB_ENV_PREFIX",
|
63
|
+
default="{{input.snake_zrb_app_name_replica}}",
|
62
64
|
)
|
63
65
|
|
64
66
|
###############################################################################
|
@@ -66,9 +68,9 @@ deployment_replica_env = Env(
|
|
66
68
|
###############################################################################
|
67
69
|
|
68
70
|
deploy_snake_zrb_app_name = CmdTask(
|
69
|
-
icon=
|
70
|
-
name=
|
71
|
-
description=
|
71
|
+
icon="🚧",
|
72
|
+
name="deploy-kebab-zrb-app-name",
|
73
|
+
description="Deploy human readable zrb app name",
|
72
74
|
group=project_group,
|
73
75
|
inputs=[
|
74
76
|
image_input,
|
@@ -88,9 +90,9 @@ deploy_snake_zrb_app_name = CmdTask(
|
|
88
90
|
deployment_replica_env,
|
89
91
|
],
|
90
92
|
cmd_path=[
|
91
|
-
os.path.join(CURRENT_DIR,
|
92
|
-
os.path.join(CURRENT_DIR,
|
93
|
-
]
|
93
|
+
os.path.join(CURRENT_DIR, "cmd", "pulumi-init-stack.sh"),
|
94
|
+
os.path.join(CURRENT_DIR, "cmd", "pulumi-up.sh"),
|
95
|
+
],
|
94
96
|
)
|
95
97
|
runner.register(deploy_snake_zrb_app_name)
|
96
98
|
|
@@ -99,9 +101,9 @@ runner.register(deploy_snake_zrb_app_name)
|
|
99
101
|
###############################################################################
|
100
102
|
|
101
103
|
destroy_snake_zrb_app_name = CmdTask(
|
102
|
-
icon=
|
103
|
-
name=
|
104
|
-
description=
|
104
|
+
icon="💨",
|
105
|
+
name="destroy-kebab-zrb-app-name",
|
106
|
+
description="Remove human readable zrb app name deployment",
|
105
107
|
group=project_group,
|
106
108
|
inputs=[
|
107
109
|
pulumi_stack_input,
|
@@ -118,8 +120,8 @@ destroy_snake_zrb_app_name = CmdTask(
|
|
118
120
|
deployment_replica_env,
|
119
121
|
],
|
120
122
|
cmd_path=[
|
121
|
-
os.path.join(CURRENT_DIR,
|
122
|
-
os.path.join(CURRENT_DIR,
|
123
|
-
]
|
123
|
+
os.path.join(CURRENT_DIR, "cmd", "pulumi-init-stack.sh"),
|
124
|
+
os.path.join(CURRENT_DIR, "cmd", "pulumi-destroy.sh"),
|
125
|
+
],
|
124
126
|
)
|
125
127
|
runner.register(destroy_snake_zrb_app_name)
|