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

Nod 781 dismissione wisp #6

Merged
merged 30 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b8a2d41
[NOD-781] feat: added RPT implementation for decoupling from generate…
andrea-deri Mar 27, 2024
e06bfe6
[NOD-781] feat: refactored code
andrea-deri Mar 27, 2024
570c695
Merge branch 'main' into NOD-781-dismissione-wisp
andrea-deri Mar 28, 2024
1d9300c
[NOD-781] fix: converted remaining AppError in AppErrorCodeMessageEnum
andrea-deri Mar 28, 2024
259ce2e
[NOD-781] feat: temporary flow
andrea-deri Apr 2, 2024
f1e6c79
[NOD_781] feat: merging error handling update from main
andrea-deri Apr 2, 2024
09dea88
[NOD-781] feat: completed main flow
andrea-deri Apr 2, 2024
37d945a
[NOD-781] fix: aligning PARSING_* error codes
andrea-deri Apr 2, 2024
2c8e908
[NOD-781] fix: completed alignment for all error codes
andrea-deri Apr 2, 2024
801ea72
[NOD-781] fix: completed alignment for all error codes
andrea-deri Apr 2, 2024
e1577ea
[NOD-781] fix: refactored config cache service
andrea-deri Apr 2, 2024
6f955d6
[NOD-781] fix: refactored i18n messages
andrea-deri Apr 2, 2024
6fdc748
[NOD-781] fix: various little fixes
andrea-deri Apr 2, 2024
2bc8472
[NOD-781] feat: add standard error list on OpenAPI
andrea-deri Apr 3, 2024
ff99461
[NOD-781] fix: refactoring on OpenAPI injection placeholder
andrea-deri Apr 3, 2024
3dd6be0
[NOD-781] fix: completed OpenAPI's description for /redirect API
andrea-deri Apr 3, 2024
dd05c93
[NOD-781] fix: Updated OpenAPI content
andrea-deri Apr 3, 2024
bffd76a
[NOD-781] fix: update on infrastructure for first apply
andrea-deri Apr 3, 2024
03a69d8
[NOD-781] fix: update on decoupler caching client after policy creation
andrea-deri Apr 3, 2024
70f5dbf
added unit test
lorenzo-catalano Apr 4, 2024
da62d1d
[NOD-781] feat: completed debt positions mapping
andrea-deri Apr 4, 2024
10640a1
added unit test
lorenzo-catalano Apr 4, 2024
b79fe02
added unit test
lorenzo-catalano Apr 4, 2024
dff37f3
added unit test
lorenzo-catalano Apr 4, 2024
3bf667e
added unit test
lorenzo-catalano Apr 4, 2024
f5d4a45
added unit test
lorenzo-catalano Apr 4, 2024
13842d5
added unit test
lorenzo-catalano Apr 4, 2024
d8a0bb8
added unit test
lorenzo-catalano Apr 4, 2024
c218144
[NOD_781] feat: merging major updates from main
andrea-deri Apr 5, 2024
b3074de
[NOD_781] feat: merging major updates from main
andrea-deri Apr 5, 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ execute the following command:

`sh update-specs.sh`

After the execution, in `target/generated-sources/jaxb` folder there will be the newly generated classes.
After the execution, the newly generated classes are added in `target/generated-sources/jaxb` folder.
The application now can be run and all the class references are correctly resolved.

### Run the project
Expand Down
62 changes: 62 additions & 0 deletions infra/.terraform.lock.hcl

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

61 changes: 6 additions & 55 deletions infra/04_apim_api.tf
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
locals {

apim_wisp_converter_soap_api = {
project_name = "wisp-converter-soap"
repo_name = "pagopa-wisp-converter"
display_name = "WISP Converter - SOAP"
description = "API SOAP for adapting WISP-made requests for GPD system"
path = "wisp-converter/service"
subscription_required = true
host = "api.${var.apim_dns_zone_prefix}.${var.external_domain}"
hostname = var.hostname
}
apim_wisp_converter_rest_api = {
project_name = "wisp-converter-rest"
project_name = "wisp-converter"
repo_name = "pagopa-wisp-converter"
display_name = "WISP Converter"
description = "API for WISP Converter"
Expand All @@ -20,69 +10,30 @@ locals {
host = "api.${var.apim_dns_zone_prefix}.${var.external_domain}"
hostname = var.hostname
}
}


# WISP Converter - SOAP APIs

resource "azurerm_api_management_api_version_set" "api_version_set_wisp_converter_soap" {
name = "${var.prefix}-${var.env_short}-${var.location_short}-${local.apim_wisp_converter_soap_api.project_name}"
resource_group_name = local.apim.rg
api_management_name = local.apim.name
display_name = local.apim_wisp_converter_soap_api.display_name
versioning_scheme = "Segment"
}


module "wisp_converter_soap_api_v1" {
source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.7.0"

name = format("%s-api-gpd-payments-soap-api", var.env_short)
api_management_name = local.apim.name
resource_group_name = local.apim.rg
subscription_required = local.apim_wisp_converter_soap_api.subscription_required
version_set_id = azurerm_api_management_api_version_set.api_version_set_wisp_converter_soap.id
version = "v1"

description = local.apim_wisp_converter_soap_api.description
display_name = local.apim_wisp_converter_soap_api.display_name
path = local.apim_wisp_converter_soap_api.path
protocols = ["https"]
service_url = format("https://%s/pagopa-wisp-converter/service", local.apim_wisp_converter_soap_api.hostname)

soap_pass_through = true

import {
content_format = "wsdl"
content_value = file("./soap/TODO.wsdl") // TODO set WSDL
wsdl_selector {
service_name = "TODO_Service"
endpoint_name = "TODO_Port"
}
}
}


# WISP Converter - REST APIs

resource "azurerm_api_management_api_version_set" "api_version_set_wisp_converter_rest" {
resource "azurerm_api_management_api_version_set" "api_version_set_wisp_converter" {
name = "${var.prefix}-${var.env_short}-${var.location_short}-${local.apim_wisp_converter_rest_api.project_name}"
resource_group_name = local.apim.rg
api_management_name = local.apim.name
display_name = local.apim_wisp_converter_rest_api.display_name
versioning_scheme = "Segment"
}

module "wisp_converter_rest_api_v1" {
module "wisp_converter_api_v1" {
source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.7.0"

name = format("%s-wisp-converter-rest-api", var.env_short)
name = format("%s-wisp-converter-api", var.env_short)
api_management_name = local.apim.name
resource_group_name = local.apim.rg
product_ids = [local.apim.product_id]
subscription_required = true

version_set_id = azurerm_api_management_api_version_set.api_version_set_wisp_converter_rest.id
version_set_id = azurerm_api_management_api_version_set.api_version_set_wisp_converter.id
api_version = "v1"

description = local.apim_wisp_converter_rest_api.description
Expand All @@ -100,4 +51,4 @@ module "wisp_converter_rest_api_v1" {
xml_content = templatefile("./policy/_base_policy.xml", {
hostname = var.hostname
})
}
}
3 changes: 3 additions & 0 deletions infra/env/weu-dev/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ prefix = "pagopa"
env = "dev"
env_short = "d"

domain = "nodo"
location_short = "weu"

tags = {
CreatedBy = "Terraform"
Environment = "Dev"
Expand Down
Loading
Loading