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.

Sign up for GitHub

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

Removing apim #58

Merged
merged 4 commits into from
Nov 26, 2021
Merged

Removing apim #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c775986
detaching apim
Nov 24, 2021
2eaa2cf
apim detached from infrastracture (used only for mocks)
Nov 25, 2021
b02abf0
fixed typo on cors attributes
Nov 25, 2021
a11185c
using ms-product health check to verify aks state
Nov 26, 2021
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
21 changes: 0 additions & 21 deletions src/core/api/hubspidlogin_api/v1/policy.xml
View file
Open in desktop

This file was deleted.

42 changes: 13 additions & 29 deletions src/core/apim.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ resource "azurerm_resource_group" "rg_api" {
}

locals {
apim_cert_name_proxy_endpoint = format("%s-proxy-endpoint-cert", local.project)

api_domain = format("api.%s.%s", var.dns_zone_prefix, var.external_domain)

origins = {
base = concat(
Expand Down Expand Up @@ -60,7 +57,7 @@ module "apim" {
publisher_name = var.apim_publisher_name
publisher_email = data.azurerm_key_vault_secret.apim_publisher_email.value
sku_name = var.apim_sku
virtual_network_type = "Internal"
virtual_network_type = "External"

redis_connection_string = module.redis.primary_connection_string
redis_cache_id = module.redis.id
Expand Down Expand Up @@ -90,19 +87,6 @@ module "apim" {
]
}

resource "azurerm_api_management_custom_domain" "api_custom_domain" {
api_management_id = module.apim.id

proxy {
host_name = local.api_domain
key_vault_id = replace(
data.azurerm_key_vault_certificate.app_gw_platform.secret_id,
"/${data.azurerm_key_vault_certificate.app_gw_platform.version}",
""
)
}
}

#########
## API ##
#########
Expand All @@ -123,7 +107,7 @@ module "monitor" {

content_format = "openapi"
content_value = templatefile("./api/monitor/openapi.json.tpl", {
host = azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
host = "selc-d-apim.azure-api.net" //azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
})

xml_content = file("./api/base_policy.xml")
Expand Down Expand Up @@ -160,14 +144,14 @@ module "apim_hub_spid_login_api_v1" {
api_version = "v1"
protocols = ["https"]

service_url = format("http://%s/hub-spid-login-ms", var.reverse_proxy_ip)
service_url = format("http://%s/spid/v1", var.reverse_proxy_ip)

content_format = "swagger-json"
content_value = templatefile("./api/hubspidlogin_api/v1/swagger.json.tpl", {
host = azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
host = "selc-d-apim.azure-api.net" //azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
})

xml_content = file("./api/hubspidlogin_api/v1/policy.xml")
xml_content = file("./api/base_policy.xml")

subscription_required = false

Expand Down Expand Up @@ -208,11 +192,11 @@ module "apim_uservice_party_process_v1" {
api_version = "v1"
protocols = ["https"]

service_url = format("http://%s/pdnd-interop-uservice-party-process/pdnd-interop-uservice-party-process/0.1", var.reverse_proxy_ip)
service_url = format("http://%s/party-process/v1", var.reverse_proxy_ip)

content_format = "openapi"
content_value = templatefile("./api/party_process/v1/party-process.yml.tpl", {
host = azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
host = "selc-d-apim.azure-api.net" //azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
basePath = "party-process/v1"
})

Expand Down Expand Up @@ -263,11 +247,11 @@ module "apim_uservice_party_management_v1" {
api_version = "v1"
protocols = ["https"]

service_url = format("http://%s/pdnd-interop-uservice-party-management/pdnd-interop-uservice-party-management/0.1", var.reverse_proxy_ip)
service_url = format("http://%s/party-management/v1", var.reverse_proxy_ip)

content_format = "openapi"
content_value = templatefile("./api/party_management/v1/party-management.yml.tpl", {
host = azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
host = "selc-d-apim.azure-api.net"// azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
basePath = "party-management/v1"
})

Expand Down Expand Up @@ -306,11 +290,11 @@ module "apim_uservice_party_registry_proxy_v1" {
api_version = "v1"
protocols = ["https"]

service_url = format("http://%s/pdnd-interop-uservice-party-registry-proxy/pdnd-interop-uservice-party-registry-proxy/0.1", var.reverse_proxy_ip)
service_url = format("http://%s/party-registry-proxy/v1", var.reverse_proxy_ip)

content_format = "openapi"
content_value = templatefile("./api/party_registry_proxy/v1/party-registry-proxy.yml.tpl", {
host = azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
host = "selc-d-apim.azure-api.net" //azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
basePath = "party-registry-proxy/v1"
})

Expand Down Expand Up @@ -349,11 +333,11 @@ module "apim_b4f_dashboard_v1" {
api_version = "v1"
protocols = ["https"]

service_url = format("http://%s/b4f-dashboard", var.reverse_proxy_ip)
service_url = format("http://%s/dashboard/v1", var.reverse_proxy_ip)

content_format = "openapi"
content_value = templatefile("./api/dashboard/v1/dashboard-openapi.json.tpl", {
host = azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
host = "selc-d-apim.azure-api.net" //azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
basePath = "dashboard/v1"
})

Expand Down
14 changes: 7 additions & 7 deletions src/core/appgateway.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ module "app_gw" {

# Configure backends
backends = {
apim = {
protocol = "Https"
aks = {
protocol = "Http"
host = trim(azurerm_dns_a_record.dns_a_api.fqdn, ".")
port = 443
ip_addresses = module.apim.private_ip_addresses
probe = "/status-0123456789abcdef"
probe_name = "probe-apim"
port = 80
ip_addresses = [var.reverse_proxy_ip]
probe = "/ms-product/v1/actuator/health"
probe_name = "probe-aks"
}
}

Expand Down Expand Up @@ -105,7 +105,7 @@ module "app_gw" {
routes = {
api = {
listener = "api"
backend = "apim"
backend = "aks"
}
}

Expand Down
21 changes: 0 additions & 21 deletions src/core/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,27 +73,6 @@ output "container_registry_admin_password" {
sensitive = true
}

## Api management ##
output "apim_name" {
value = module.apim.name
}

output "apim_private_ip_addresses" {
value = module.apim.private_ip_addresses
}

output "apim_public_ip_addresses" {
value = module.apim.public_ip_addresses
}

output "apim_gateway_url" {
value = format("https://%s", azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name)
}

output "apim_gateway_hostname" {
value = azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name
}

## Application gateway.
output "app_gateway_public_ip" {
value = azurerm_public_ip.appgateway_public_ip.ip_address
Expand Down
7 changes: 0 additions & 7 deletions src/core/security.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,3 @@ resource "azurerm_key_vault_secret" "jwt_public_key" {

key_vault_id = module.key_vault.id
}

resource "azurerm_api_management_certificate" "jwt_certificate" {
name = "jwt-spid-crt"
api_management_name = module.apim.name
resource_group_name = azurerm_resource_group.rg_api.name
data = pkcs12_from_pem.jwt_pkcs12.result
}
8 changes: 4 additions & 4 deletions src/k8s/selc_configmaps.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ resource "kubernetes_config_map" "inner-service-url" {
HUB_SPID_LOGIN_URL = "http://hub-spid-login-ms:8080"
B4F_DASHBOARD_URL = "http://b4f-dashboard:8080"
MS_PRODUCT_URL = "http://ms-product:8080"
USERVICE_PARTY_PROCESS_URL = "https://api.dev.selfcare.pagopa.it/party-process/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-process:8088/pdnd-interop-uservice-party-process/0.1"
USERVICE_PARTY_MANAGEMENT_URL = "https://api.dev.selfcare.pagopa.it/party-management/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-management:8088/pdnd-interop-uservice-party-management/0.1"
USERVICE_PARTY_REGISTRY_PROXY_URL = "https://api.dev.selfcare.pagopa.it/party-registry-proxy/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-registry-proxy:8088/pdnd-interop-uservice-party-registry-proxy/0.1"
USERVICE_ATTRIBUTE_REGISTRY_MANAGEMENT_URL = "https://api.dev.selfcare.pagopa.it/attribute-registry-management/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-registry-proxy:8088/pdnd-interop-uservice-attribute-registry-management/0.1"
USERVICE_PARTY_PROCESS_URL = "https://selc-d-apim.azure-api.net/party-process/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-process:8088/pdnd-interop-uservice-party-process/0.1"
USERVICE_PARTY_MANAGEMENT_URL = "https://selc-d-apim.azure-api.net/party-management/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-management:8088/pdnd-interop-uservice-party-management/0.1"
USERVICE_PARTY_REGISTRY_PROXY_URL = "https://selc-d-apim.azure-api.net/party-registry-proxy/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-registry-proxy:8088/pdnd-interop-uservice-party-registry-proxy/0.1"
USERVICE_ATTRIBUTE_REGISTRY_MANAGEMENT_URL = "https://selc-d-apim.azure-api.net/attribute-registry-management/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-registry-proxy:8088/pdnd-interop-uservice-attribute-registry-management/0.1"
}
}

Expand Down
95 changes: 78 additions & 17 deletions src/k8s/selc_ingress.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,50 @@
locals {
cors = {
origins = join(",", concat(
[
format("https://%s", var.api_gateway_url),
format("https://%s", var.cdn_frontend_url),
],
var.env_short != "p"
? [
"https://localhost:3000",
"http://localhost:3000",
"https://localhost:3001",
"http://localhost:3001",
format("https://%s", var.spid_testenv_url)]
:[]
)),
headers = join(",", [
// default headers
"DNT",
"X-CustomHeader",
"Keep-Alive",
"User-Agent",
"X-Requested-With",
"If-Modified-Since",
"Cache-Control",
"Content-Type",
"Authorization",
// application headers
"x-selc-institutionid"
])
}
}

resource "kubernetes_ingress" "selc_ingress" {
depends_on = [helm_release.ingress]

metadata {
name = "${kubernetes_namespace.selc.metadata[0].name}-ingress"
namespace = kubernetes_namespace.selc.metadata[0].name
annotations = {
"kubernetes.io/ingress.class" = "nginx"
"nginx.ingress.kubernetes.io/rewrite-target" = "/$1"
"nginx.ingress.kubernetes.io/ssl-redirect" = "false"
"nginx.ingress.kubernetes.io/use-regex" = "true"
"kubernetes.io/ingress.class" = "nginx"
"nginx.ingress.kubernetes.io/rewrite-target" = "/$1"
"nginx.ingress.kubernetes.io/ssl-redirect" = "false"
"nginx.ingress.kubernetes.io/use-regex" = "true"
"nginx.ingress.kubernetes.io/enable-cors" = "true"
"nginx.ingress.kubernetes.io/cors-allow-headers" = local.cors.headers
"nginx.ingress.kubernetes.io/cors-allow-origin" = local.cors.origins
}
}

Expand All @@ -21,50 +57,75 @@ resource "kubernetes_ingress" "selc_ingress" {
service_name = "hub-spid-login-ms"
service_port = var.default_service_port
}
path = "/hub-spid-login-ms/(.*)"
path = "/spid/v1/(.*)"
}

path {
backend {
service_name = "b4f-dashboard"
service_port = var.default_service_port
}
path = "/b4f-dashboard/(.*)"
path = "/dashboard/v1/(.*)"
}

path {
backend {
service_name = "pdnd-interop-uservice-party-process"
service_port = 8088
service_name = "ms-product"
service_port = var.default_service_port
}
path = "/pdnd-interop-uservice-party-process/(.*)"
path = "/ms-product/v1/(.*)"
}

}
}
}
}

resource "kubernetes_ingress" "selc_pdnd_ingress" {
depends_on = [helm_release.ingress]

metadata {
name = "${kubernetes_namespace.selc.metadata[0].name}-pdnd-ingress"
namespace = kubernetes_namespace.selc.metadata[0].name
annotations = {
"kubernetes.io/ingress.class" = "nginx"
"nginx.ingress.kubernetes.io/rewrite-target" = "/pdnd-interop-uservice-$1/0.1/$2"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe better use 0.1 as terraform var

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the version 0.1 is statically mapped to the v1 version of the ingress' path
I suggest to let it be a costant and not defined as variable

"nginx.ingress.kubernetes.io/ssl-redirect" = "false"
"nginx.ingress.kubernetes.io/use-regex" = "true"
"nginx.ingress.kubernetes.io/enable-cors" = "true"
"nginx.ingress.kubernetes.io/cors-allow-headers" = local.cors.headers
"nginx.ingress.kubernetes.io/cors-allow-origin" = local.cors.origins
}
}

spec {
rule {
http {
path {
backend {
service_name = "pdnd-interop-uservice-party-management"
service_name = "pdnd-interop-uservice-party-process"
service_port = 8088
}
path = "/pdnd-interop-uservice-party-management/(.*)"
path = "/(party-process)/v1/(.*)"
}

path {
backend {
service_name = "pdnd-interop-uservice-party-registry-proxy"
service_name = "pdnd-interop-uservice-party-management"
service_port = 8088
}
path = "/pdnd-interop-uservice-party-registry-proxy/(.*)"
path = "/(party-management)/v1/(.*)"
}

path {
backend {
service_name = "ms-product"
service_port = var.default_service_port
service_name = "pdnd-interop-uservice-party-registry-proxy"
service_port = 8088
}
path = "/ms-product/(.*)"
path = "/(party-registry-proxy)/v1/(.*)"
}

}
}
}
}