You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/13 11:02:15 UTC
[incubator-dlab] branch DLAB-terraform updated (61006fa -> ec83eae)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 61006fa Merge pull request #303 from apache/merge_gcp_endpoint_terraform
add 0c36b2a [DLAB-1054]: Added possibility to retrieve custom images per project
add e611e76 Added space
add 5e5ded1 Code review
add 852175f Merge pull request #294 from ofuks/DLAB-1054
add df48bb4 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets
add 864c4db Merge pull request #300 from apache/DLAB-1037
add a555c58 [DLAB-1090] Include EMR disk name cluster_name, instead of instance_name on GCP.
add 8032f1f minor fix
add 9821a56 Merge pull request #296 from apache/DLAB-1090
add c1663b0 [DLAB-1090]:Fixed name of primary disk for dataproc.
add fe5e433 Merge pull request #301 from apache/fix-dataproc
add 310b9c5 DLAB-000 billing mock on gcp implemented
add 5a9566f DLAB-23 added gcp billing + refactored current billing implementation
add 105ef3a DLAB-23 billing updated for aws
add ccfa823 DLAB-23 dictionary updated
add 236e8b6 DLAB-23 added billing for gcp
add 0522016 DLAB-000 license headers updated
add 217462d DLAB-23 billing updated
add f5563be DLAB-23 fixed merge conflicts
add eed9091 DLAB-23 pom fixed
add f79696d DLAB-23 removed copping billing jar
add 807bbe4 Merge remote-tracking branch 'remotes/origin/develop' into bil-2
add 82e2820 Merge remote-tracking branch 'remotes/origin/develop' into bil-2
add 99b7c2d DLAB-23 added billing on GCP
add a42e071 DLAB-23 added possibility to export billing on GCP
add 461b6b7 DLAB-23 added project to billable resource
add b2ccd81 DLAB-23 additional log added
add c012d21 Devops gcp billing
add 1971736 Devops gcp billing. Added billing_dataset_name.
add d43c4f4 Devops gcp billing. Added RedHat support.
add 8320e93 Fixed MongoDB password parsing.
add db65309 Set billing service on 8088 port in billing.yml
add e319c0e Fixed blling.yml
add 8d4a972 Merge pull request #298 from apache/bil-devops
add adedd5e Merge pull request #302 from apache/bil-2
new ec83eae Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-terraform
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/lib/gcp/actions_lib.py | 29 +-
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../general/scripts/aws/common_prepare_notebook.py | 3 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/ssn_configure.py | 6 +-
.../src/ssn/scripts/configure_billing.py | 5 +
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/supervisor_svc.conf | 4 +-
pom.xml | 15 +-
services/billing-gcp/billing.yml | 40 +-
services/billing-gcp/pom.xml | 84 ++--
...licationGcp.java => BillingGcpApplication.java} | 17 +-
.../gcp/conf/BillingApplicationConfiguration.java} | 18 +-
.../dlab/billing/gcp/conf/DlabConfiguration.java} | 20 +-
.../com/epam/dlab/billing/gcp/dao/BillingDAO.java} | 12 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 120 ++++++
.../epam/dlab/billing/gcp/documents/Project.java} | 15 +-
.../dlab/billing/gcp/documents/UserInstance.java | 55 +++
.../epam/dlab/billing/gcp/model/BillingData.java | 70 ++++
.../dlab/billing/gcp/model/BillingHistory.java | 13 +
.../dlab/billing/gcp/model/GcpBillingData.java} | 20 +-
.../gcp/repository/BillingHistoryRepository.java | 7 +
.../billing/gcp/repository/BillingRepository.java | 12 +-
.../billing/gcp/repository/ProjectRepository.java | 11 +-
.../gcp/repository/UserInstanceRepository.java} | 14 +-
.../billing/gcp/scheduler/BillingScheduler.java} | 28 +-
.../dlab/billing/gcp/service/BillingService.java} | 7 +-
.../billing/gcp/service/BillingServiceImpl.java | 176 ++++++++
.../epam/dlab/billing/gcp/util/BillingUtils.java | 92 +++++
.../billing-gcp/src/main/resources/application.yml | 18 +
.../com/epam/dlab/model/exploratory/Image.java | 1 +
services/self-service/self-service.yml | 41 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 15 +-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 +++------
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +++-------
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 ++--
.../backendapi/modules/GcpSelfServiceModule.java | 59 +--
.../resources/ImageExploratoryResource.java | 8 +-
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../resources/dto/aws/AwsBillingFilter.java | 6 +
.../resources/dto/azure/AzureBillingFilter.java | 12 +-
.../GcpBillingFilter.java} | 17 +-
.../BillingResourceGcp.java} | 28 +-
.../dlab/backendapi/service/BillingService.java | 87 ++--
.../service/ImageExploratoryService.java | 2 +-
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 ++++---
.../backendapi/service/gcp/GcpBillingService.java | 102 +++++
.../service/impl/ImageExploratoryServiceImpl.java | 8 +-
.../src/main/resources/webapp/package-lock.json | 458 ++++++++++-----------
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
.../resources/ImageExploratoryResourceTest.java | 12 +-
.../impl/ImageExploratoryServiceImplTest.java | 8 +-
61 files changed, 1746 insertions(+), 1008 deletions(-)
rename services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/{BillingApplicationGcp.java => BillingGcpApplication.java} (58%)
copy services/{dlab-webapp-common/src/main/java/com/epam/dlab/auth/SecurityUnauthorizedHandler.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/conf/BillingApplicationConfiguration.java} (65%)
copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/usage/UsageAggregateResponse.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/conf/DlabConfiguration.java} (69%)
copy services/{self-service/src/main/java/com/epam/dlab/backendapi/service/ApplicationSettingService.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/BillingDAO.java} (78%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/usage/UsageAggregateResponse.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/Project.java} (80%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/UserInstance.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingData.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingHistory.java
copy services/{dlab-model/src/main/java/com/epam/dlab/dto/InfrastructureMetaInfoDTO.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/GcpBillingData.java} (69%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingHistoryRepository.java
copy integration-tests/src/main/java/com/epam/dlab/automation/exceptions/CloudException.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingRepository.java (72%)
copy integration-tests/src/main/java/com/epam/dlab/automation/exceptions/CloudException.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/ProjectRepository.java (76%)
copy services/{dlab-webapp-common/src/main/java/com/epam/dlab/auth/UserInfoDAO.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/UserInstanceRepository.java} (70%)
copy services/{dlab-utils/src/main/java/com/epam/dlab/util/SecurityUtils.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/scheduler/BillingScheduler.java} (58%)
copy services/{dlab-mongo-migration/src/main/java/com/epam/dlab/migration/DbMigration.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingService.java} (88%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingServiceImpl.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
create mode 100644 services/billing-gcp/src/main/resources/application.yml
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{azure/AzureBillingFilter.java => gcp/GcpBillingFilter.java} (78%)
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/{azure/BillingResourceAzure.java => gcp/BillingResourceGcp.java} (77%)
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/gcp/GcpBillingService.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-terraform
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ec83eae31eeefca5f65c56c2b6ba5a76133b849a
Merge: 61006fa adedd5e
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Sep 13 14:01:54 2019 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-terraform
Conflicts:
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
pom.xml
services/self-service/self-service.yml
services/self-service/src/main/java/com/epam/dlab/backendapi/modules/GcpSelfServiceModule.java
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/lib/gcp/actions_lib.py | 29 +-
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../general/scripts/aws/common_prepare_notebook.py | 3 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/ssn_configure.py | 6 +-
.../src/ssn/scripts/configure_billing.py | 5 +
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/supervisor_svc.conf | 4 +-
pom.xml | 15 +-
services/billing-gcp/billing.yml | 40 +-
services/billing-gcp/pom.xml | 84 ++--
...licationGcp.java => BillingGcpApplication.java} | 17 +-
.../BillingApplicationConfiguration.java} | 17 +-
.../dlab/billing/gcp/conf/DlabConfiguration.java} | 24 +-
.../BillingDAO.java} | 10 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 120 ++++++
.../Project.java} | 13 +-
.../dlab/billing/gcp/documents/UserInstance.java | 55 +++
.../epam/dlab/billing/gcp/model/BillingData.java | 70 ++++
.../dlab/billing/gcp/model/BillingHistory.java | 13 +
.../dlab/billing/gcp/model/GcpBillingData.java} | 25 +-
.../gcp/repository/BillingHistoryRepository.java | 7 +
.../BillingRepository.java} | 10 +-
.../ProjectRepository.java} | 9 +-
.../UserInstanceRepository.java} | 11 +-
.../BillingScheduler.java} | 21 +-
.../BillingService.java} | 8 +-
.../billing/gcp/service/BillingServiceImpl.java | 176 ++++++++
.../epam/dlab/billing/gcp/util/BillingUtils.java | 92 +++++
.../billing-gcp/src/main/resources/application.yml | 18 +
.../com/epam/dlab/model/exploratory/Image.java | 1 +
services/self-service/self-service.yml | 41 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 15 +-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 +++------
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +++-------
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 ++--
.../backendapi/modules/GcpSelfServiceModule.java | 59 +--
.../resources/ImageExploratoryResource.java | 8 +-
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../resources/dto/aws/AwsBillingFilter.java | 6 +
.../resources/dto/azure/AzureBillingFilter.java | 12 +-
.../GcpBillingFilter.java} | 17 +-
.../resources/gcp/BillingResourceGcp.java | 76 ++++
.../dlab/backendapi/service/BillingService.java | 87 ++--
.../service/ImageExploratoryService.java | 2 +-
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 ++++---
.../backendapi/service/gcp/GcpBillingService.java | 102 +++++
.../service/impl/ImageExploratoryServiceImpl.java | 8 +-
.../src/main/resources/webapp/package-lock.json | 458 ++++++++++-----------
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
.../resources/ImageExploratoryResourceTest.java | 12 +-
.../impl/ImageExploratoryServiceImplTest.java | 8 +-
61 files changed, 1819 insertions(+), 974 deletions(-)
diff --cc infrastructure-provisioning/scripts/deploy_dlab.py
index 9afab66,d3c321a..342e696
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@@ -124,12 -124,10 +124,14 @@@ parser.add_argument('--ldap_ou', type=s
parser.add_argument('--ldap_service_username', type=str, default='cn=service-user', help='Ldap service user name')
parser.add_argument('--ldap_service_password', type=str, default='service-user-password',
help='Ldap password for admin user')
+parser.add_argument('--keycloak_realm_name', type=str, default='dlab', help='Keycloak Realm name')
+parser.add_argument('--keycloak_auth_server_url', type=str, default='dlab', help='Keycloak auth server URL')
+parser.add_argument('--keycloak_client_name', type=str, default='dlab', help='Keycloak client name')
+parser.add_argument('--keycloak_client_secret', type=str, default='dlab', help='Keycloak client secret')
parser.add_argument('--tags', type=str, default='line_item_operation,line_item_line_item_description', help='Column name in report file that '
'contains tags')
+ parser.add_argument('--billing_dataset_name', type=str, default='', help='Name of GCP dataset (BigQuery service)'
+ ' for billing')
parser.add_argument('--action', required=True, type=str, default='', choices=['build', 'deploy', 'create', 'terminate'],
help='Available options: build, deploy, create, terminate')
args = parser.parse_args()
diff --cc infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 93541e8,ef1d18f..f25c045
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@@ -256,126 -255,18 +256,126 @@@ if __name__ == "__main__"
try:
logging.info('[CONFIGURE SSN INSTANCE UI]')
print('[CONFIGURE SSN INSTANCE UI]')
- mongo_parameters = {
- "conf_service_base_name": os.environ['conf_service_base_name'],
- "conf_os_family": os.environ['conf_os_family'],
- "conf_key_dir": os.environ['conf_key_dir']
- }
- params = "--hostname {} --keyfile {} --dlab_path {} --os_user {} --os_family {} --billing_enabled {} " \
- "--request_id {} --billing_dataset_name {} \
- --resource {} --service_base_name {} --cloud_provider {} --mongo_parameters '{}'". \
+
+ cloud_params = [
+ {
+ 'key': 'KEYCLOAK_REALM_NAME',
+ 'value': os.environ['keycloak_realm_name']
+ },
+ {
+ 'key': 'KEYCLOAK_AUTH_SERVER_URL',
+ 'value': os.environ['keycloak_auth_server_url']
+ },
+ {
+ 'key': 'KEYCLOAK_CLIENT_NAME',
+ 'value': os.environ['keycloak_client_name']
+ },
+ {
+ 'key': 'KEYCLOAK_CLIENT_SECRET',
+ 'value': os.environ['keycloak_client_secret']
+ },
+ {
+ 'key': 'CONF_OS',
+ 'value': os.environ['conf_os_family']
+ },
+ {
+ 'key': 'SERVICE_BASE_NAME',
+ 'value': os.environ['conf_service_base_name']
+ },
+ {
+ 'key': 'EDGE_INSTANCE_SIZE',
+ 'value': ''
+ },
+ {
+ 'key': 'SUBNET_ID',
+ 'value': ''
+ },
+ {
+ 'key': 'REGION',
+ 'value': ''
+ },
+ {
+ 'key': 'ZONE',
+ 'value': ''
+ },
+ {
+ 'key': 'TAG_RESOURCE_ID',
+ 'value': ''
+ },
+ {
+ 'key': 'SG_IDS',
+ 'value': ''
+ },
+ {
+ 'key': 'SSN_INSTANCE_SIZE',
+ 'value': ''
+ },
+ {
+ 'key': 'VPC_ID',
+ 'value': ''
+ },
+ {
+ 'key': 'CONF_KEY_DIR',
+ 'value': os.environ['conf_key_dir']
+ },
+ {
+ 'key': 'LDAP_HOST',
+ 'value': os.environ['ldap_hostname']
+ },
+ {
+ 'key': 'LDAP_DN',
+ 'value': os.environ['ldap_dn']
+ },
+ {
+ 'key': 'LDAP_OU',
+ 'value': os.environ['ldap_ou']
+ },
+ {
+ 'key': 'LDAP_USER_NAME',
+ 'value': os.environ['ldap_service_username']
+ },
+ {
+ 'key': 'LDAP_USER_PASSWORD',
+ 'value': os.environ['ldap_service_password']
+ },
+ {
+ 'key': 'AZURE_RESOURCE_GROUP_NAME',
+ 'value': ''
+ },
+ {
+ 'key': 'AZURE_SSN_STORAGE_ACCOUNT_TAG',
+ 'value': ''
+ },
+ {
+ 'key': 'AZURE_SHARED_STORAGE_ACCOUNT_TAG',
+ 'value': ''
+ },
+ {
+ 'key': 'AZURE_DATALAKE_TAG',
+ 'value': ''
+ },
+ {
+ 'key': 'AZURE_CLIENT_ID',
+ 'value': ''
+ },
+ {
+ 'key': 'SUBNET2_ID',
+ 'value': ''
+ },
+ {
+ 'key': 'VPC2_ID',
+ 'value': ''
+ },
+ {
+ 'key': 'PEERING_ID',
+ 'value': ''
+ }
+ ]
- params = "--hostname {} --keyfile {} --dlab_path {} --os_user {} --os_family {} --request_id {} \
++ params = "--hostname {} --keyfile {} --dlab_path {} --os_user {} --os_family {} --billing_enabled --request_id {} --billing_dataset_name {} \
+ --resource {} --service_base_name {} --cloud_provider {} --cloud_params '{}'". \
format(instance_hostname, ssn_conf['ssh_key_path'], os.environ['ssn_dlab_path'], ssn_conf['dlab_ssh_user'],
- os.environ['conf_os_family'], os.environ['request_id'], os.environ['conf_resource'],
- os.environ['conf_os_family'], billing_enabled, os.environ['request_id'],
- os.environ['billing_dataset_name'], os.environ['conf_resource'],
- ssn_conf['service_base_name'], os.environ['conf_cloud_provider'], json.dumps(mongo_parameters))
++ os.environ['conf_os_family'], billing_enabled, os.environ['request_id'], os.environ['billing_dataset_name'], os.environ['conf_resource'],
+ ssn_conf['service_base_name'], os.environ['conf_cloud_provider'], json.dumps(cloud_params))
try:
local("~/scripts/{}.py {}".format('configure_ui', params))
except:
diff --cc pom.xml
index 1925e09,2ad1fc0..383edcc
--- a/pom.xml
+++ b/pom.xml
@@@ -47,11 -56,9 +56,8 @@@
<modules>
<module>services/common</module>
- <module>services/billing-aws</module>
<module>services/provisioning-service</module>
<module>services/self-service</module>
- <module>services/billing-azure</module>
- <module>services/billing-gcp</module>
- <module>services/security-service</module>
<module>services/dlab-model</module>
<module>services/dlab-utils</module>
<module>services/dlab-webapp-common</module>
diff --cc services/self-service/self-service.yml
index bb15141,290c930..c967f58
--- a/services/self-service/self-service.yml
+++ b/services/self-service/self-service.yml
@@@ -67,52 -67,48 +67,51 @@@ maxSessionDurabilityMilliseconds: 28800
</#if>
server:
+ gzip:
+ enabled: true
requestLog:
appenders:
- - type: file
- currentLogFilename: ${LOG_ROOT_DIR}/ssn/request-selfservice.log
- archive: true
- archivedLogFilenamePattern: ${LOG_ROOT_DIR}/ssn/request-selfservice-%d{yyyy-MM-dd}.log.gz
- archivedFileCount: 10
+ - type: file
+ currentLogFilename: ${LOG_ROOT_DIR}/ssn/request-selfservice.log
+ archive: true
+ archivedLogFilenamePattern: ${LOG_ROOT_DIR}/ssn/request-selfservice-%d{yyyy-MM-dd}.log.gz
+ archivedFileCount: 10
rootPath: "/api"
applicationConnectors:
- # - type: http
- # port: 8080
- - type: https
- port: 8443
- certAlias: dlab
- validateCerts: false
- keyStorePath: ${KEY_STORE_PATH}
- keyStorePassword: ${KEY_STORE_PASSWORD}
- trustStorePath: ${TRUST_STORE_PATH}
- trustStorePassword: ${TRUST_STORE_PASSWORD}
+ # - type: http
+ # port: 8080
+ - type: https
+ port: 8443
+ certAlias: dlab
+ validateCerts: true
+ keyStorePath: ${KEY_STORE_PATH}
+ keyStorePassword: ${KEY_STORE_PASSWORD}
+ trustStorePath: ${TRUST_STORE_PATH}
+ trustStorePassword: ${TRUST_STORE_PASSWORD}
adminConnectors:
- # - type: http
- # port: 8081
- - type: https
- port: 8444
- certAlias: dlab
- validateCerts: false
- keyStorePath: ${KEY_STORE_PATH}
- keyStorePassword: ${KEY_STORE_PASSWORD}
- trustStorePath: ${TRUST_STORE_PATH}
- trustStorePassword: ${TRUST_STORE_PASSWORD}
+ # - type: http
+ # port: 8081
+ - type: https
+ port: 8444
+ certAlias: dlab
+ validateCerts: true
+ keyStorePath: ${KEY_STORE_PATH}
+ keyStorePassword: ${KEY_STORE_PASSWORD}
+ trustStorePath: ${TRUST_STORE_PATH}
+ trustStorePassword: ${TRUST_STORE_PASSWORD}
mongoMigrationEnabled: false
logging:
level: INFO
loggers:
- com.epam: TRACE
+ com.epam: INFO
+ org.apache.guacamole: DEBUG
com.novemberain: ERROR
- io.swagger.v3: DEBUG
appenders:
-<#if DEV_MODE == "true">
+ <#if DEV_MODE == "true">
- type: console
-</#if>
+ </#if>
- type: file
currentLogFilename: ${LOG_ROOT_DIR}/ssn/selfservice.log
archive: true
diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/modules/GcpSelfServiceModule.java
index 59aee57,ba44ce4..b94afb3
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/GcpSelfServiceModule.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/GcpSelfServiceModule.java
@@@ -46,42 -52,46 +49,44 @@@ import org.quartz.impl.StdSchedulerFact
public class GcpSelfServiceModule extends CloudModule {
- private static final String MONGO_URI_FORMAT = "mongodb://%s:%s@%s:%d/%s";
- private static final String QUARTZ_MONGO_URI_PROPERTY = "org.quartz.jobStore.mongoUri";
- private static final String QUARTZ_DB_NAME = "org.quartz.jobStore.dbName";
+ private static final String MONGO_URI_FORMAT = "mongodb://%s:%s@%s:%d/%s";
+ private static final String QUARTZ_MONGO_URI_PROPERTY = "org.quartz.jobStore.mongoUri";
+ private static final String QUARTZ_DB_NAME = "org.quartz.jobStore.dbName";
- @Override
- @SuppressWarnings("unchecked")
- public void init(Environment environment, Injector injector) {
+ @Override
+ @SuppressWarnings("unchecked")
+ public void init(Environment environment, Injector injector) {
- environment.jersey().register(injector.getInstance(EdgeCallbackGcp.class));
- environment.jersey().register(injector.getInstance(KeyUploaderCallbackGcp.class));
- environment.jersey().register(injector.getInstance(ComputationalResourceGcp.class));
- environment.jersey().register(injector.getInstance(BillingResourceGcp.class));
- if (injector.getInstance(SelfServiceApplicationConfiguration.class).isGcpOuauth2AuthenticationEnabled()) {
- environment.jersey().register(injector.getInstance(GcpOauthResource.class));
- }
- injector.getInstance(SecurityFactory.class).configure(injector, environment,
- SelfServiceSecurityAuthenticator.class, injector.getInstance(Authorizer.class));
+ environment.jersey().register(injector.getInstance(EdgeCallbackGcp.class));
+ environment.jersey().register(injector.getInstance(KeyUploaderCallbackGcp.class));
+ environment.jersey().register(injector.getInstance(ComputationalResourceGcp.class));
++ environment.jersey().register(injector.getInstance(BillingResourceGcp.class));
+ if (injector.getInstance(SelfServiceApplicationConfiguration.class).isGcpOuauth2AuthenticationEnabled()) {
+ environment.jersey().register(injector.getInstance(GcpOauthResource.class));
+ }
- }
+ }
- @Override
- protected void configure() {
- bind((KeyDAO.class)).to(GcpKeyDao.class);
- bind(InfrastructureInfoService.class).to(GcpInfrastructureInfoService.class);
- bind(InfrastructureTemplateService.class).to(GcpInfrastructureTemplateService.class);
- bind(SchedulerConfiguration.class).toInstance(
- new SchedulerConfiguration(SelfServiceApplication.class.getPackage().getName()));
- bind(BillingDAO.class).toInstance(new GcpBillingDao());
- }
+ @Override
+ protected void configure() {
+ bind(BillingService.class).to(GcpBillingService.class);
+ bind((KeyDAO.class)).to(GcpKeyDao.class);
+ bind(InfrastructureInfoService.class).to(GcpInfrastructureInfoService.class);
+ bind(InfrastructureTemplateService.class).to(GcpInfrastructureTemplateService.class);
+ bind(BillingDAO.class).to(GcpBillingDao.class);
+ bind(SchedulerConfiguration.class).toInstance(
+ new SchedulerConfiguration(SelfServiceApplication.class.getPackage().getName()));
+ }
- @Provides
- @Singleton
- Scheduler provideScheduler(SelfServiceApplicationConfiguration configuration) throws SchedulerException {
- final MongoServiceFactory mongoFactory = configuration.getMongoFactory();
- final String database = mongoFactory.getDatabase();
- final String mongoUri = String.format(MONGO_URI_FORMAT, mongoFactory.getUsername(), mongoFactory.getPassword(),
- mongoFactory.getHost(), mongoFactory.getPort(), database);
- System.setProperty(QUARTZ_MONGO_URI_PROPERTY, mongoUri);
- System.setProperty(QUARTZ_DB_NAME, database);
- return StdSchedulerFactory.getDefaultScheduler();
- }
+ @Provides
+ @Singleton
+ Scheduler provideScheduler(SelfServiceApplicationConfiguration configuration) throws SchedulerException {
+ final MongoServiceFactory mongoFactory = configuration.getMongoFactory();
+ final String database = mongoFactory.getDatabase();
+ final String mongoUri = String.format(MONGO_URI_FORMAT, mongoFactory.getUsername(), mongoFactory.getPassword(),
+ mongoFactory.getHost(), mongoFactory.getPort(), database);
+ System.setProperty(QUARTZ_MONGO_URI_PROPERTY, mongoUri);
+ System.setProperty(QUARTZ_DB_NAME, database);
+ return StdSchedulerFactory.getDefaultScheduler();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org