diff --git a/.github/workflows/deploy_development.yaml b/.github/workflows/deploy_development.yaml index c27b80b3297..d7288449ba3 100644 --- a/.github/workflows/deploy_development.yaml +++ b/.github/workflows/deploy_development.yaml @@ -54,11 +54,11 @@ jobs: WERF_SET_CI_REGISTRY_IMPORTER_URL: "global.ci_registry_importer_url=registry.d.doma.ai" WERF_SET_CI_MINIAPP_URL: "global.ci_miniapp_url=miniapp.d.doma.ai" WERF_SET_CI_PROPERTY_IMPORTER_URL: "global.ci_property_importer_url=property-importer.d.doma.ai" - WERF_SET_CI_CLASSIFIER_URL: "global.ci_classifier_url=ml.d.doma.ai" + WERF_SET_CI_CLASSIFIERS_API_URL: "global.ci_classifiers_api_url=ml.d.doma.ai" WERF_SET_CI_ADDRESS_SERVICE_URL: "global.ci_address_service_url=address-service.d.doma.ai" WERF_SET_CI_TELEPHONY_URL: "global.ci_telephony_url=telephony.d.doma.ai" WERF_SET_CI_DEV_PORTAL_WEB_URL: "global.ci_dev_portal_web_url=developers.d.doma.ai" - WERF_SET_CI_PASSAPP_URL: "global.ci_passapp_url=miniapp-pass.d.doma.ai" + WERF_SET_CI_PASS_URL: "global.ci_pass_url=miniapp-pass.d.doma.ai" WERF_SET_CI_DOCUMENTS_URL: "global.ci_documents_url=documents.d.doma.ai" WERF_SET_CI_DEV_PORTAL_API_URL: "global.ci_dev_portal_api_url=developers-api.d.doma.ai" WERF_SET_CI_EMPLOYEE_BOT_URL: "global.ci_employee_bot_url=telegram-employee-bot.d.doma.ai" @@ -67,7 +67,7 @@ jobs: WERF_SET_CI_RESIDENT_APP_URL: "global.ci_resident_app_url=m.d.doma.ai" WERF_SET_CI_ANNOUNCEMENT_GENERATOR_URL: "global.ci_announcement_url=announcement-generator.d.doma.ai" WERF_SET_CI_NEWS_GREENHOUSE_URL: "global.ci_news_greenhouse_url=news-sharing-greendom.d.doma.ai" - WERF_SET_CI_METERS_BILLING_INTEGRATION_URL: "global.ci_meters_billing_integration_url=meters-billing-integration.d.doma.ai" + WERF_SET_CI_METER_IMPORTER_URL: "global.ci_meter_importer_url=meters-billing-integration.d.doma.ai" WERF_SET_CI_NAMESPACE: "global.ci_namespace=development" WERF_NAMESPACE: "development" WERF_VIRTUAL_MERGE_FROM_COMMIT: "true" diff --git a/.github/workflows/deploy_production.yaml b/.github/workflows/deploy_production.yaml index c50096c6146..94d5a5e90cd 100644 --- a/.github/workflows/deploy_production.yaml +++ b/.github/workflows/deploy_production.yaml @@ -62,18 +62,18 @@ jobs: WERF_SET_CI_REGISTRY_IMPORTER_URL: "global.ci_registry_importer_url=registry.doma.ai" WERF_SET_CI_MINIAPP_URL: "global.ci_miniapp_url=miniapp.doma.ai" WERF_SET_CI_PROPERTY_IMPORTER_URL: "global.ci_property_importer_url=property-importer.doma.ai" - WERF_SET_CI_CLASSIFIER_URL: "global.ci_classifier_url=ml.doma.ai" + WERF_SET_CI_CLASSIFIERS_API_URL: "global.ci_classifiers_api_url=ml.doma.ai" WERF_SET_CI_ADDRESS_SERVICE_URL: "global.ci_address_service_url=address-service.doma.ai" WERF_SET_CI_TELEPHONY_URL: "global.ci_telephony_url=telephony.doma.ai" WERF_SET_CI_DEV_PORTAL_WEB_URL: "global.ci_dev_portal_web_url=developers.doma.ai" - WERF_SET_CI_PASSAPP_URL: "global.ci_passapp_url=miniapp-pass.doma.ai" + WERF_SET_CI_PASS_URL: "global.ci_pass_url=miniapp-pass.doma.ai" WERF_SET_CI_DEV_PORTAL_API_URL: "global.ci_dev_portal_api_url=developers-api.doma.ai" WERF_SET_CI_EMPLOYEE_BOT_URL: "global.ci_employee_bot_url=telegram-employee-bot.doma.ai" WERF_SET_CI_TICKET_IMPORTER_URL: "global.ci_ticket_importer_url=eds-integration.doma.ai" WERF_SET_CI_EXTERNAL_API_URL: "global.ci_external_api_url=bank-rest-api.doma.ai" WERF_SET_CI_ANNOUNCEMENT_GENERATOR_URL: "global.ci_announcement_url=announcement-generator.doma.ai" WERF_SET_CI_NEWS_GREENHOUSE_URL: "global.ci_news_greenhouse_url=news-sharing-greendom.doma.ai" - WERF_SET_CI_METERS_BILLING_INTEGRATION_URL: "global.ci_meters_billing_integration_url=meters-billing-integration.doma.ai" + WERF_SET_CI_METER_IMPORTER_URL: "global.ci_meter_importer_url=meters-billing-integration.doma.ai" WERF_SET_CI_NAMESPACE: "global.ci_namespace=production" WERF_NAMESPACE: "production" WERF_VIRTUAL_MERGE_FROM_COMMIT: "true" diff --git a/.github/workflows/deploy_review.yaml b/.github/workflows/deploy_review.yaml index a45f0a5ea19..bb249813576 100644 --- a/.github/workflows/deploy_review.yaml +++ b/.github/workflows/deploy_review.yaml @@ -52,13 +52,13 @@ jobs: WERF_SET_CI_REGISTRY_IMPORTER_URL: "global.ci_registry_importer_url=review-${{ env.REVIEW_URL_PREFIX }}-registry.r.doma.ai" WERF_SET_CI_MINIAPP_URL: "global.ci_miniapp_url=review-${{ env.REVIEW_URL_PREFIX }}-miniapp.r.doma.ai" WERF_SET_CI_PROPERTY_IMPORTER_URL: "global.ci_property_importer_url=review-${{ env.REVIEW_URL_PREFIX }}-property-importer.r.doma.ai" - WERF_SET_CI_CLASSIFIER_URL: "global.ci_classifier_url=review-${{ env.REVIEW_URL_PREFIX }}-ml.r.doma.ai" + WERF_SET_CI_CLASSIFIERS_API_URL: "global.ci_classifiers_api_url=review-${{ env.REVIEW_URL_PREFIX }}-ml.r.doma.ai" WERF_SET_CI_ADDRESS_SERVICE_URL: "global.ci_address_service_url=review-${{ env.REVIEW_URL_PREFIX }}-address-service.r.doma.ai" WERF_SET_CI_TELEPHONY_URL: "global.ci_telephony_url=review-${{ env.REVIEW_URL_PREFIX }}-telephony.r.doma.ai" WERF_SET_CI_DEV_PORTAL_WEB_URL: "global.ci_dev_portal_web_url=review-${{ env.REVIEW_URL_PREFIX }}-developers.r.doma.ai" - WERF_SET_CI_PASSAPP_URL: "global.ci_passapp_url=review-${{ env.REVIEW_URL_PREFIX }}-miniapp-pass.r.doma.ai" + WERF_SET_CI_PASS_URL: "global.ci_pass_url=review-${{ env.REVIEW_URL_PREFIX }}-miniapp-pass.r.doma.ai" WERF_SET_CI_NEWS_GREENHOUSE_URL: "global.ci_news_greenhouse_url=news-sharing-greendom.r.doma.ai" - WERF_SET_CI_METERS_BILLING_INTEGRATION_URL: "global.ci_meters_billing_integration_url=meters-billing-integration.r.doma.ai" + WERF_SET_CI_METER_IMPORTER_URL: "global.ci_meter_importer_url=meters-billing-integration.r.doma.ai" WERF_SET_CI_NAMESPACE: "global.ci_namespace=${{ env.REVIEW_NAMESPACE }}" WERF_SET_CI_URL_PREFIX: "global.ci_url_prefix=${{ env.REVIEW_URL_PREFIX }}" WERF_NAMESPACE: ${{ env.REVIEW_NAMESPACE }} diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 0b1ebed14af..4b3b3eba379 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -53,11 +53,11 @@ jobs: WERF_SET_CI_REGISTRY_IMPORTER_URL: "global.ci_registry_importer_url=registry.s1.doma.ai" WERF_SET_CI_MINIAPP_URL: "global.ci_miniapp_url=miniapp.s1.doma.ai" WERF_SET_CI_PROPERTY_IMPORTER_URL: "global.ci_property_importer_url=property-importer.s1.doma.ai" - WERF_SET_CI_CLASSIFIER_URL: "global.ci_classifier_url=ml.s1.doma.ai" + WERF_SET_CI_CLASSIFIERS_API_URL: "global.ci_classifiers_api_url=ml.s1.doma.ai" WERF_SET_CI_ADDRESS_SERVICE_URL: "global.ci_address_service_url=address-service.s1.doma.ai" WERF_SET_CI_TELEPHONY_URL: "global.ci_telephony_url=telephony.s1.doma.ai" WERF_SET_CI_DEV_PORTAL_WEB_URL: "global.ci_dev_portal_web_url=developers.s1.doma.ai" - WERF_SET_CI_PASSAPP_URL: "global.ci_passapp_url=miniapp-pass.s1.doma.ai" + WERF_SET_CI_PASS_URL: "global.ci_pass_url=miniapp-pass.s1.doma.ai" WERF_SET_CI_DOCUMENTS_URL: "global.ci_documents_url=documents.s1.doma.ai" WERF_SET_CI_DEV_PORTAL_API_URL: "global.ci_dev_portal_api_url=developers-api.s1.doma.ai" WERF_SET_CI_EMPLOYEE_BOT_URL: "global.ci_employee_bot_url=telegram-employee-bot.s1.doma.ai" @@ -66,7 +66,7 @@ jobs: WERF_SET_CI_RESIDENT_APP_URL: "global.ci_resident_app_url=m.s1.doma.ai" WERF_SET_CI_ANNOUNCEMENT_GENERATOR_URL: "global.ci_announcement_url=announcement-generator.s1.doma.ai" WERF_SET_CI_NEWS_GREENHOUSE_URL: "global.ci_news_greenhouse_url=news-sharing-greendom.s1.doma.ai" - WERF_SET_CI_METERS_BILLING_INTEGRATION_URL: "global.ci_meters_billing_integration_url=meters-billing-integration.s1.doma.ai" + WERF_SET_CI_METER_IMPORTER_URL: "global.ci_meter_importer_url=meters-billing-integration.s1.doma.ai" WERF_NAMESPACE: "stage" WERF_VIRTUAL_MERGE_FROM_COMMIT: "true" WERF_SET_CI_REF: "ci.werf.io/ref=${GITHUB_REF_NAME}" diff --git a/.gitmodules b/.gitmodules index 3d8f7fa0098..a7f91d2d488 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,9 +49,9 @@ [submodule "apps/resident-app"] path = apps/resident-app url = git@github.com:open-condo-software/condo-resident-app.git -[submodule "apps/meters-billing-integration"] - path = apps/meters-billing-integration - url = git@github.com:open-condo-software/condo-meters-billing-integration.git +[submodule "apps/meter-importer"] + path = apps/meter-importer + url = git@github.com:open-condo-software/condo-meter-importer.git [submodule "apps/news-greenhouse"] path = apps/news-greenhouse url = git@github.com:open-condo-software/condo-news-greenhouse.git diff --git a/.helm b/.helm index d171b0e97e9..a881a6afb78 160000 --- a/.helm +++ b/.helm @@ -1 +1 @@ -Subproject commit d171b0e97e97dd32fb709526a653a6d6b1467684 +Subproject commit a881a6afb78e650f89a46e2e14a5133b7fd4ccc8 diff --git a/apps/condo/next.config.js b/apps/condo/next.config.js index 00cafc0c0e9..63ad4543231 100644 --- a/apps/condo/next.config.js +++ b/apps/condo/next.config.js @@ -49,7 +49,7 @@ const globalHints = JSON.parse(conf['GLOBAL_HINTS'] || '{}') const newsItemsSendingDelay = Number(conf['NEWS_ITEMS_SENDING_DELAY_SEC']) || 15 const audioConfig = JSON.parse(conf['AUDIO_CONFIG'] || '{}') const checkTLSClientCertConfig = JSON.parse(conf['CHECK_TLS_CLIENT_CERT_CONFIG'] || '{}') -const condoRBDomain = conf['CONDORB_DOMAIN'] +const condoRBDomain = conf['RB_DOMAIN'] const sentryConfig = conf['SENTRY_CONFIG'] ? JSON.parse(conf['SENTRY_CONFIG']) : {} const apolloBatchingEnabled = !falsey(conf['APOLLO_BATCHING_ENABLED']) const tourVideoUrl = JSON.parse(conf['TOUR_VIDEO_URL'] || '{}') diff --git a/apps/meter-importer b/apps/meter-importer new file mode 160000 index 00000000000..523e587a57a --- /dev/null +++ b/apps/meter-importer @@ -0,0 +1 @@ +Subproject commit 523e587a57a02317e7c5b540a84457b191b96253 diff --git a/apps/meters-billing-integration b/apps/meters-billing-integration deleted file mode 160000 index 5cfd88be56b..00000000000 --- a/apps/meters-billing-integration +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5cfd88be56bd65359e680c11ae28cf217ef6ba4b diff --git a/werf.yaml b/werf.yaml index 194ff1d016e..e69f2f4a359 100644 --- a/werf.yaml +++ b/werf.yaml @@ -6,6 +6,7 @@ from: ubuntu:20.04 shell: beforeInstall: - "export DEBIAN_FRONTEND=noninteractive" + - "export BASE_IMAGE_VERSION=1" - "groupadd -r app --gid=999" - "useradd --system --create-home --home /app --gid 999 --uid=999 --shell /bin/bash app" - "apt update -qq" @@ -451,7 +452,7 @@ docker: ENV: LANG: C.UTF-8 --- -image: classifier +image: classifiers_api fromImage: python-base fromCacheVersion: "1" git: @@ -474,7 +475,7 @@ docker: ENV: LANG: C.UTF-8 --- -image: addressservice +image: address_service fromImage: base fromCacheVersion: "1" git: @@ -1022,7 +1023,7 @@ shell: - "echo 'REDIS_URL=undefined' >> /app/.env" - "echo 'NODE_ENV=production' >> /app/.env" - "echo 'FILE_FIELD_ADAPTER=local' >> /app/.env" - - "yarn workspace @app/meters-billing-integration next telemetry disable" + - "yarn workspace @app/meter-importer next telemetry disable" - "yarn workspace @app/meters-billing-integration build:deps" - "yarn workspace @app/meters-billing-integration build" - "rm -rf /app/.env" diff --git a/yarn.lock b/yarn.lock index bf562393160..6ca1f33ed68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1345,9 +1345,9 @@ __metadata: languageName: unknown linkType: soft -"@app/meters-billing-integration@workspace:apps/meters-billing-integration": +"@app/meter-importer@workspace:apps/meter-importer": version: 0.0.0-use.local - resolution: "@app/meters-billing-integration@workspace:apps/meters-billing-integration" + resolution: "@app/meter-importer@workspace:apps/meter-importer" dependencies: "@faker-js/faker": ^8.4.1 "@graphql-codegen/add": ^5.0.3 @@ -1357,7 +1357,7 @@ __metadata: "@graphql-codegen/typescript-operations": ^4.2.3 "@graphql-codegen/typescript-react-apollo": ^4.3.2 "@keystonejs/keystone": ^19.3.1 - "@meters-billing-integration/domains": "link:./domains" + "@meter-importer/domains": "link:./domains" "@open-condo/keystone": "workspace:^" "@types/react": ^17.0.1 "@zeit/next-css": ^1.0.1 @@ -13341,9 +13341,9 @@ __metadata: languageName: node linkType: hard -"@meters-billing-integration/domains@link:./domains::locator=%40app%2Fmeters-billing-integration%40workspace%3Aapps%2Fmeters-billing-integration": +"@meter-importer/domains@link:./domains::locator=%40app%2Fmeter-importer%40workspace%3Aapps%2Fmeter-importer": version: 0.0.0-use.local - resolution: "@meters-billing-integration/domains@link:./domains::locator=%40app%2Fmeters-billing-integration%40workspace%3Aapps%2Fmeters-billing-integration" + resolution: "@meter-importer/domains@link:./domains::locator=%40app%2Fmeter-importer%40workspace%3Aapps%2Fmeter-importer" languageName: node linkType: soft