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

Move 4223 sette opp byggepipeline for integrasjonspunktet i ny plattform #1246

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/call-buildimage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ jobs:
sbom-path: integrasjonspunkt/target
fetch-depth: 0
secrets: inherit


# bygge image, laste opp image relevant plass
# deploye til DEV + evt TEST
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ pom.xml.versionsBackup
*.log
/**/*.iml
/**/target
/**/target
/**/generated-sources
/**/generated-sources/jaxb
/**/generated-sources/wsimport
Expand Down Expand Up @@ -95,6 +96,7 @@ $RECYCLE.BIN/

## Directory-based project format:
.idea/
.vscode/
# if you remove the above rule, at least ignore the follwing:

# User-specific stuff:
Expand Down Expand Up @@ -137,9 +139,11 @@ com_crashlytics_export_strings.xml

# Local properties
integrasjonspunkt-local.properties
integrasjonspunkt-local.yml
integrasjonspunkt-local.properties.bak
integrasjonspunkt/application.properties


# Stuff generated by tests and/or when running
queue/*.queue
integrasjonspunkt-logs/*.log
Expand Down

This file was deleted.

51 changes: 51 additions & 0 deletions integrasjonspunkt/src/main/resources/config/application-dev.yml
Copy link
Contributor

Choose a reason for hiding this comment

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

dev-profilen i integrasjonspunktet er for lokal utvikling. Bør kanskje omdøypast til dev-local?

Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
difi:
move:
org:
keystore:
password: changeit
path: crt/test-certificates.jks
Copy link
Contributor

Choose a reason for hiding this comment

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

Denne stien går til ei fil som ikkje er med i kodebasen. Føresler å fjerna verdien, saman med alias nedanfor.

alias: '974720760'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

serviceregistryEndpoint: https://eformidling.dev/adressetjeneste
oidc:
keystore:
alias: digdir-test-eformidling
Copy link
Contributor

@johannmo johannmo Jan 29, 2025

Choose a reason for hiding this comment

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

Føresler å fjerna alle referansar til konkrete sertifikat.

path: changeit
password: changeit
url: https://test.maskinporten.no/token
audience: https://test.maskinporten.no/
clientId: test_move
dpi:
endpoint: https://qaoffentlig.meldingsformidler.digipost.no/api/ebms
mpcId: no_difi_move_integrasjonspunkt-dev
fiks:
pollingrate: '15000'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

inn:
baseUrl: https://test.svarut.ks.no/tjenester/svarinn
nextmove:
serviceBus:
pollingrate: '5000'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

spring:
config:
import: optional:file:integrasjonspunkt-local.yml
logging:
level:
'no':
Copy link
Contributor

Choose a reason for hiding this comment

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

Overstyring av log-nivå kan fjernast.

Copy link
Contributor

Choose a reason for hiding this comment

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

Gjeld alle innstillingar i denne seksjonen.

difi:
sdp:
client2:
internal:
DigipostMessageSenderFacade: TRACE
mf:
logger:
translog: TRACE
org:
springframework:
ws:
client:
MessageTracing: INFO
server:
MessageTracing: INFO
eureka:
client:
serviceUrl:
defaultZone: https://eformidling.dev/discovery/eureka

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
difi:
move:
oidc:
enable: 'false'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

dpo:
streamingserviceUrl: http://host.docker.internal:8001/dpo/ServiceEngineExternal/BrokerServiceExternalBasicStreamed.svc?wsdl
brokerserviceUrl: http://host.docker.internal:8001/dpo/ServiceEngineExternal/BrokerServiceExternalBasic.svc?wsdl
dpv:
password: whatever
username: whatever
endpointUrl: http://host.docker.internal:8001/dpv/
fiks:
ut:
password: password
endpointUrl: http://host.docker.internal:8001/dpf
username: username
inn:
username: '910075918'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

mailOnError: 'false'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

password: password
baseUrl: http://host.docker.internal:8001/svarinn
pollingrate: '10000'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

org:
number: '910075918'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

keystore:
password: changeit
path: cloud:mock.jks
alias: '910075918'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

sign:
enable: 'false'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

dpi:
trustStore:
path: cloud:mock-truststore.jks
password: changeit
endpoint: http://host.docker.internal:8080/as4
certificate:
recipe: classpath:/pki/recipe-dpi-move-difiSigned.xml
feature:
enableDPE: 'true'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

enableDPF: 'true'
enableDPI: 'true'
enableDPO: 'true'
enableDPV: 'true'
serviceregistryEndpoint: http://host.docker.internal:8090
nextmove:
serviceBus:
baseUrl: host.docker.internal:8001/dpe
useHttps: 'false'
Copy link
Contributor

Choose a reason for hiding this comment

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

Fnuttane kan fjernast.

app:
logger:
enableLogstash: 'false'
eureka:
client:
enabled: 'false'

This file was deleted.

56 changes: 56 additions & 0 deletions integrasjonspunkt/src/main/resources/config/application-mock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
difi:
move:
oidc:
enable: 'false'
dpi:
uri: http://localhost:8080/api/c2
client-type: json
endpoint: http://localhost:8080/as4
certificate:
recipe: classpath:/pki/recipe-dpi-move-difiSigned.xml
oidc:
mock:
token: foo123
dpo:
streamingserviceUrl: http://localhost:8001/dpo/ServiceEngineExternal/BrokerServiceExternalBasicStreamed.svc?wsdl
brokerserviceUrl: http://localhost:8001/dpo/ServiceEngineExternal/BrokerServiceExternalBasic.svc?wsdl
dpv:
password: whatever
username: whatever
endpointUrl: http://localhost:8001/dpv/
fiks:
ut:
password: password
endpointUrl: http://localhost:8001/dpf
username: username
inn:
username: '910075918'
mailOnError: 'false'
password: password
baseUrl: http://localhost:8001/svarinn
pollingrate: '10000'
org:
number: '910075918'
keystore:
password: changeit
path: cloud:mock.jks
alias: '910075918'
sign:
enable: 'false'
feature:
enableDPE: 'true'
enableDPF: 'true'
enableDPI: 'true'
enableDPO: 'true'
enableDPV: 'true'
serviceregistryEndpoint: http://localhost:8090
nextmove:
serviceBus:
baseUrl: localhost:8001/dpe
useHttps: 'false'
app:
logger:
enableLogstash: 'false'
eureka:
client:
enabled: 'false'

This file was deleted.

Loading
Loading