diff --git a/apps/utgang-pdl/Dockerfile b/apps/utgang-pdl/Dockerfile deleted file mode 100644 index c4ec80f7..00000000 --- a/apps/utgang-pdl/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM ghcr.io/navikt/baseimages/temurin:21 -ENV APPLIKASJON_JAR=App.jar - -COPY build/libs/fat.jar app.jar -CMD ["java", "-jar", "$APPLIKASJON_JAR"] \ No newline at end of file diff --git a/apps/utgang-pdl/docker-compose.yaml b/apps/utgang-pdl/docker-compose.yaml deleted file mode 100644 index c328462c..00000000 --- a/apps/utgang-pdl/docker-compose.yaml +++ /dev/null @@ -1,103 +0,0 @@ -version: '3.9' - -services: - zookeeper: - image: confluentinc/cp-zookeeper:7.5.0 - hostname: zookeeper - ports: - - "2181:2181" - environment: - ZOOKEEPER_CLIENT_PORT: 2181 - ZOOKEEPER_TICK_TIME: 2000 - - kafka: - image: confluentinc/cp-server:7.5.0 - hostname: kafka - depends_on: - - zookeeper - ports: - - "9092:9092" - - "9101:9101" - environment: - KAFKA_BROKER_ID: 1 - KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181' - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT - KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092 - KAFKA_METRIC_REPORTERS: io.confluent.metrics.reporter.ConfluentMetricsReporter - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 - KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0 - KAFKA_CONFLUENT_LICENSE_TOPIC_REPLICATION_FACTOR: 1 - KAFKA_CONFLUENT_BALANCER_TOPIC_REPLICATION_FACTOR: 1 - KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 - KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 - KAFKA_JMX_PORT: 9101 - KAFKA_JMX_HOSTNAME: localhost - CONFLUENT_METRICS_REPORTER_BOOTSTRAP_SERVERS: kafka:29092 - CONFLUENT_METRICS_REPORTER_TOPIC_REPLICAS: 1 - CONFLUENT_METRICS_ENABLE: 'true' - CONFLUENT_SUPPORT_CUSTOMER_ID: 'anonymous' - - kafka-ui: - image: provectuslabs/kafka-ui:latest - ports: - - "9000:8080" - environment: - DYNAMIC_CONFIG_ENABLED: "true" - KAFKA_CLUSTERS_0_NAME: main - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:29092 - depends_on: - - kafka - - init-kafka - - wiremock: - image: wiremock/wiremock:3.4.2 - ports: - - "8090:8080" - volumes: - - ./wiremock:/home/wiremock/mappings/ - - mock-oauth2-server: - image: ghcr.io/navikt/mock-oauth2-server:2.1.2 - ports: - - "8081:8081" - environment: - SERVER_PORT: 8081 - JSON_CONFIG: > - { - "interactiveLogin": true, - "httpServer": "NettyWrapper", - "tokenCallbacks": [ - { - "issuerId": "default", - "tokenExpiry": 15780000, - "requestMappings": [ - { - "requestParam": "scope", - "match": "openid somescope", - "claims": { - "sub": "admin@paw-arbeidssokerregisteret-utgang-pdl", - "aud": ["paw-arbeidssokerregisteret-api-utgang-pdl"] - } - } - ] - } - ] - } - - init-kafka: - image: confluentinc/cp-server:7.5.0 - depends_on: - - kafka - entrypoint: [ '/bin/sh', '-c' ] - command: | - " - # blocks until kafka is reachable - kafka-topics --bootstrap-server kafka:29092 --list - - echo -e 'Creating kafka topics' - kafka-topics --bootstrap-server kafka:29092 --create --if-not-exists --topic paw.arbeidssoker-hendelseslogg-v1 --replication-factor 1 --partitions 1 - kafka-topics --bootstrap-server kafka:29092 --create --if-not-exists --topic paw.arbeidssokerperioder-v1 --replication-factor 1 --partitions 1 - - echo -e 'Successfully created the following topics:' - kafka-topics --bootstrap-server kafka:29092 --list - " \ No newline at end of file diff --git a/apps/utgang-pdl/wiremock/pdl.json b/apps/utgang-pdl/wiremock/pdl.json deleted file mode 100644 index 01327b99..00000000 --- a/apps/utgang-pdl/wiremock/pdl.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "request": { - "method": "POST", - "urlPathPattern": "/pdl" - }, - "response": { - "status": 200, - "jsonBody": { - "data": { - "hentPerson": { - "foedsel": [ - { - "foedselsdato": "1986-11-26", - "foedselsaar": "1986" - } - ], - "opphold": [ - { - "oppholdFra": "2010-01-20", - "oppholdTil": "2022-01-20", - "type": "PERMANENT" - } - ], - "folkeregisterpersonstatus": [ - { - "forenkletStatus": "bosattEtterFolkeregisterloven" - } - ], - "bostedsadresse": [ - { - "angittFlyttedato": "2010-01-20", - "gyldigFraOgMed": "2010-01-20", - "gyldigTilOgMed": "2022-01-20", - "vegadresse": { - "kommunenummer": "0301" - }, - "matrikkeladresse": null, - "ukjentBosted" : null, - "utenlandskAdresse": null - } - ], - "innflyttingTilNorge": [], - "utflyttingFraNorge": [] - } - } - }, - "headers": { - "Content-Type": "application/json" - } - } -} diff --git a/docker/mocks/config/mock-oauth2-server/config.json b/docker/mocks/config/mock-oauth2-server/config.json index c9e6a210..2ab910f1 100644 --- a/docker/mocks/config/mock-oauth2-server/config.json +++ b/docker/mocks/config/mock-oauth2-server/config.json @@ -80,6 +80,20 @@ } } ] + }, + { + "issuerId": "default", + "tokenExpiry": 15780000, + "requestMappings": [ + { + "requestParam": "scope", + "match": "openid somescope", + "claims": { + "sub": "admin@paw-arbeidssokerregisteret-utgang-pdl", + "aud": ["paw-arbeidssokerregisteret-api-utgang-pdl"] + } + } + ] } ] } \ No newline at end of file