Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SELC-5168] feat : Migrazione su monorepo institution #6

Merged
merged 31 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
d2e1e30
[SELC-5168] feat : Migrazione su monorepo institution
eugenbegiqi Jul 8, 2024
f896a93
[SELC-5168] feat : fix pom
eugenbegiqi Jul 8, 2024
2f46404
[SELC-5168] feat : fix profile id value
eugenbegiqi Jul 8, 2024
76e102e
[SELC-5168] feat : added readme test coverage module
eugenbegiqi Jul 9, 2024
deea03f
[SELC-5168] feat : add workflows institution-ms (need to review)
eugenbegiqi Jul 10, 2024
b81fc54
[SELC-5168] feat : retry push
eugenbegiqi Jul 10, 2024
b721c41
[SELC-5168] feat : retry commit with correct foldername
eugenbegiqi Jul 10, 2024
d61b933
remove folder
eugenbegiqi Jul 10, 2024
8f55f8e
[SELC-5168] feat : added insitution-ms app file
eugenbegiqi Jul 10, 2024
0b2daf4
[SELC-5168] feat : changed name for git actions
eugenbegiqi Jul 10, 2024
b828f65
[SELC-5168] feat : changed type of id field to Object
eugenbegiqi Jul 10, 2024
92c0267
[SELC-5168] feat : changed path_open_api_docs
eugenbegiqi Jul 10, 2024
8980cec
[SELC-5168] feat : added last update of the core ms
eugenbegiqi Jul 11, 2024
9ddbde0
refactor: recover Dockerfile with .new
manuraf Jul 11, 2024
71f1095
fix: double /container_apps on release
manuraf Jul 11, 2024
5b24a88
fix: reference institution-ms module in Dockerfile
manuraf Jul 11, 2024
81ddbcf
fix: reference dir on release
manuraf Jul 11, 2024
a020aee
fix: docker_image_name on release
manuraf Jul 11, 2024
d170a35
fix: add WORKDIR /src on dockerfile
manuraf Jul 11, 2024
e24462d
test: change sha eclipse-temurin-17
manuraf Jul 11, 2024
f646076
refactor: change name artifact institution-ms
manuraf Jul 11, 2024
6e4b285
fix: servers selfcare-onboarding pr
manuraf Jul 11, 2024
f81ce41
some fix
manuraf Jul 11, 2024
c545c48
test
manuraf Jul 11, 2024
7e3ddbf
recover test
manuraf Jul 11, 2024
e89e284
Merge branch 'main' into feature/SELC-5168
manuraf Jul 11, 2024
27ebe21
update openapi for merge
manuraf Jul 17, 2024
82b0ccd
pre-commit
manuraf Jul 17, 2024
ba3203e
Merge branch 'main' into feature/SELC-5168
manuraf Jul 17, 2024
7286f82
refactor: ms-core to institution-ms
manuraf Jul 18, 2024
abdabd8
openapi under docs folder
manuraf Jul 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/institution-ms
Submodule institution-ms added at bd592f
12 changes: 12 additions & 0 deletions apps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<packaging>pom</packaging>
<modules>
<module>institution-send-mail-scheduler</module>
<module>institution-ms</module>
</modules>

<profiles>
Expand All @@ -27,6 +28,17 @@
<module>institution-send-mail-scheduler</module>
</modules>
</profile>
<profile>
<id>selc-ms-core</id>
manuraf marked this conversation as resolved.
Show resolved Hide resolved
<activation>
<file>
<exists>institution-ms/pom.xml</exists>
</file>
</activation>
<modules>
<module>institution-ms</module>
</modules>
</profile>
</profiles>

</project>
44 changes: 44 additions & 0 deletions infra/container_apps/institution-ms/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
subscription=DEV-SelfCare
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
resource_group_name = "terraform-state-rg"
storage_account_name = "tfappdevselfcare"
container_name = "terraform-state"
key = "selfcare-pnpg-core.container_app.tfstate"
137 changes: 137 additions & 0 deletions infra/container_apps/institution-ms/env/dev-pnpg/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
is_pnpg = true
env_short = "d"

tags = {
CreatedBy = "Terraform"
Environment = "Dev"
Owner = "SelfCare"
Source = "https://github.com/pagopa/selfcare-ms-core"
CostCenter = "TS310 - PAGAMENTI & SERVIZI"
}

container_app = {
min_replicas = 0
max_replicas = 1
scale_rules = [
{
custom = {
metadata = {
"desiredReplicas" = "1"
"start" = "0 8 * * MON-FRI"
"end" = "0 19 * * MON-FRI"
"timezone" = "Europe/Rome"
}
type = "cron"
}
name = "cron-scale-rule"
}
]
cpu = 0.5
memory = "1Gi"
}

app_settings = [
{
name = "DESTINATION_MAILS"
value = "[email protected]"
# //prod non presente
},
{
name = "SELFCARE_URL"
value = "https://selfcare.pagopa.it"
},
{
name = "MAIL_TEMPLATE_DELEGATION_NOTIFICATION_PATH"
value = "contracts/template/mail/delegation-notification/1.0.0.json"
},
{
name = "MAIL_TEMPLATE_DELEGATION_USER_NOTIFICATION_PATH"
value = "contracts/template/mail/delegation-notification/user-1.0.0.json"
},
{
name = "STORAGE_CONTAINER"
value = "$web"
},
{
name = "STORAGE_ENDPOINT"
value = "core.windows.net"
},

{
name = "STORAGE_APPLICATION_ID"
value = "selcdweupnpgcheckoutsa"
},

{
name = "STORAGE_CREDENTIAL_ID"
value = "selcdweupnpgcheckoutsa"
},
{
name = "STORAGE_TEMPLATE_URL"
value = "https://selcdweupnpgcheckoutsa.z6.web.core.windows.net"
},
{
name = "APPLICATIONINSIGHTS_ROLE_NAME"
value = "ms-core"
},
{
name = "JAVA_TOOL_OPTIONS"
value = "-javaagent:applicationinsights-agent.jar"
},
{
name = "APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL"
value = "OFF"
},
{
name = "EXTERNAL_API_LOG_LEVEL"
value = "DEBUG"
},
{
name = "SMTP_HOST"
value = "smtps.pec.aruba.it"
},
{
name = "SMTP_PORT"
value = "465"
},
{
name = "SMTP_SSL"
value = "true"
},
{
name = "MS_NOTIFICATION_MANAGER_URL"
value = "http://selc-d-pnpg-notification-mngr-ca"
},
{
name = "USERVICE_PARTY_REGISTRY_PROXY_URL"
value = "http://selc-d-pnpg-party-reg-proxy-ca"
},
{
name = "USERVICE_USER_REGISTRY_URL"
value = "https://api.uat.pdv.pagopa.it/user-registry/v1"
},
{
name = "SELFCARE_USER_URL"
value = "http://selc-d-pnpg-user-ms-ca"
},
{
name = "MAIL_SENDER_ADDRESS"
value = "[email protected]"
}
]

secrets_names = {
"STORAGE_APPLICATION_SECRET" = "contracts-storage-access-key"
"APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"
"MONGODB_CONNECTION_URI" = "mongodb-connection-string"
"BLOB_STORAGE_CONN_STRING" = "blob-storage-contract-connection-string"
"STORAGE_CREDENTIAL_SECRET" = "contracts-storage-access-key"
"SMTP_USR" = "smtp-usr"
"SMTP_PSW" = "smtp-psw"
"ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"
"USER_REGISTRY_API_KEY" = "user-registry-api-key"
"JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key"
"BLOB_STORAGE_PRODUCT_CONNECTION_STRING" = "blob-storage-product-connection-string"
"AWS_SES_ACCESS_KEY_ID" = "aws-ses-access-key-id"
"AWS_SES_SECRET_ACCESS_KEY" = "aws-ses-secret-access-key"
}
1 change: 1 addition & 0 deletions infra/container_apps/institution-ms/env/dev/backend.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
subscription=DEV-SelfCare
4 changes: 4 additions & 0 deletions infra/container_apps/institution-ms/env/dev/backend.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
resource_group_name = "terraform-state-rg"
storage_account_name = "tfappdevselfcare"
container_name = "terraform-state"
key = "selfcare-core.container_app.tfstate"
143 changes: 143 additions & 0 deletions infra/container_apps/institution-ms/env/dev/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
env_short = "d"
env = "dev"

tags = {
CreatedBy = "Terraform"
Environment = "Dev"
Owner = "SelfCare"
Source = "https://github.com/pagopa/selfcare-ms-core"
CostCenter = "TS310 - PAGAMENTI & SERVIZI"
}

container_app = {
min_replicas = 0
max_replicas = 1
scale_rules = [
{
custom = {
metadata = {
"desiredReplicas" = "1"
"start" = "0 8 * * MON-FRI"
"end" = "0 19 * * MON-FRI"
"timezone" = "Europe/Rome"
}
type = "cron"
}
name = "cron-scale-rule"
}
]
cpu = 0.5
memory = "1Gi"
}

app_settings = [
{
name = "DESTINATION_MAILS"
value = "[email protected]"
# //prod non presente
},
# {
# name = "ONBOARDING_SEND_EMAIL_TO_INSTITUTION"
# value = "true" //solo prod Selfcare
# },
{
name = "SELFCARE_URL"
value = "https://selfcare.pagopa.it"
},
{
name = "MAIL_TEMPLATE_DELEGATION_NOTIFICATION_PATH"
value = "contracts/template/mail/delegation-notification/1.0.0.json"
},
{
name = "MAIL_TEMPLATE_DELEGATION_USER_NOTIFICATION_PATH"
value = "contracts/template/mail/delegation-notification/user-1.0.0.json"
},
{
name = "STORAGE_CONTAINER"
value = "selc-d-contracts-blob"
},
{
name = "STORAGE_ENDPOINT"
value = "core.windows.net"
},

{
name = "STORAGE_APPLICATION_ID"
value = "selcdcontractsstorage"
},

{
name = "STORAGE_CREDENTIAL_ID"
value = "selcdcontractsstorage"
},
{
name = "STORAGE_TEMPLATE_URL"
value = "https://selcdcheckoutsa.z6.web.core.windows.net"
},
{
name = "APPLICATIONINSIGHTS_ROLE_NAME"
value = "ms-core"
},
{
name = "JAVA_TOOL_OPTIONS"
value = "-javaagent:applicationinsights-agent.jar"
},
{
name = "APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL"
value = "OFF"
},
{
name = "EXTERNAL_API_LOG_LEVEL"
value = "DEBUG"
# // prod è “INFO"
},
{
name = "SMTP_HOST"
value = "smtps.pec.aruba.it"
},

{
name = "SMTP_PORT"
value = "465"
},
{
name = "SMTP_SSL"
value = "true"
},
{
name = "MS_NOTIFICATION_MANAGER_URL"
value = "http://selc-d-notification-mngr-ca"
},
{
name = "USERVICE_PARTY_REGISTRY_PROXY_URL"
value = "http://selc-d-party-reg-proxy-ca"
},
{
name = "USERVICE_USER_REGISTRY_URL"
value = "https://api.uat.pdv.pagopa.it/user-registry/v1"
},
{
name = "SELFCARE_USER_URL"
value = "http://selc-d-user-ms-ca"
},
{
name = "MAIL_SENDER_ADDRESS"
value = "[email protected]"
}
]

secrets_names = {
"STORAGE_APPLICATION_SECRET" = "contracts-storage-access-key"
"APPLICATIONINSIGHTS_CONNECTION_STRING" = "appinsights-connection-string"
"MONGODB_CONNECTION_URI" = "mongodb-connection-string"
"BLOB_STORAGE_CONN_STRING" = "blob-storage-contract-connection-string"
"STORAGE_CREDENTIAL_SECRET" = "contracts-storage-access-key"
"SMTP_USR" = "smtp-usr"
"SMTP_PSW" = "smtp-psw"
"ONBOARDING_INSTITUTION_ALTERNATIVE_EMAIL" = "party-test-institution-email"
"USER_REGISTRY_API_KEY" = "user-registry-api-key"
"JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key"
"BLOB_STORAGE_PRODUCT_CONNECTION_STRING" = "blob-storage-product-connection-string"
"AWS_SES_ACCESS_KEY_ID" = "aws-ses-access-key-id"
"AWS_SES_SECRET_ACCESS_KEY" = "aws-ses-secret-access-key"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
subscription=PROD-SelfCare
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
resource_group_name = "terraform-state-rg"
storage_account_name = "tfappprodselfcare"
container_name = "terraform-state"
key = "selfcare-pnpg-core.container_app.tfstate"
Loading
Loading