Rydder opp i bygg og oppsett. (#2533)

Author: mrsladek

.devcontainer/Dockerfile

@@ -32,71 +32,6 @@ jobs:
       push-image: ${{ github.ref_name == 'master' }} # default: false
     secrets: inherit
 
-  build-push-docker-image-ghcr-k9-verdikjede:
-    name: Build og push til ghcr og trigg k9-verdikjede
-    permissions:
-      contents: read
-      packages: write
-    runs-on: ubuntu-latest
-    needs: build-app
-    if: github.ref_name == 'master'
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # ratchet:actions/checkout@v4
-      - name: Setup java and maven
-        uses: navikt/fp-gha-workflows/.github/actions/setup-java-and-maven@main # ratchet:exclude
-        with:
-          github-token: ${{ (github.actor != 'dependabot[bot]' && secrets.READER_TOKEN) || secrets.GITHUB_TOKEN }}
-      - name: Maven install and test
-        id: build-and-test
-        uses: navikt/fp-gha-workflows/.github/actions/build-maven-application@main # ratchet:exclude
-        with:
-          skip-tests: 'true'
-      - name: Login to GitHub Packages Docker Registry
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # ratchet:docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # ratchet:docker/setup-buildx-action@v2
-      - name: Docker meta
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # ratchet:docker/metadata-action@v4
-        id: meta
-        with:
-          images: ghcr.io/${{ github.repository }}
-          tags: type=raw,value=latest,enable={{is_default_branch}}
-      - name: Bygg og push docker image
-        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # ratchet:docker/build-push-action@v4
-        id: build_push
-        with:
-          context: "."
-          file: "Dockerfile"
-          platforms: "linux/amd64"
-          pull: true
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-      - uses: navikt/github-app-token-generator@v1
-        id: get-token
-        with:
-          private-key: ${{ secrets.FP_PRIVATE_KEY }} # Erstatt med K9SAKSBEHANDLING_PRIVATE_KEY
-          app-id: ${{ secrets.FP_APP_ID }} # Erstatt med K9SAKSBEHANDLING_APP_ID
-      - name: Trigger verdikjede test
-        shell: bash
-        run: |
-          curl -XPOST -u "x-access-token:${{ steps.get-token.outputs.token }}" \
-          -H "Accept: application/vnd.github.v3+json" \
-          https://api.github.com/repos/navikt/k9-verdikjede/actions/workflows/build.yml/dispatches \
-          -d '{"ref":"master",
-                  "inputs":{
-                      "trigger": "${{ github.repository }}",
-                      "version": "latest"
-                  }}'
-
   release-drafter:
     name: Update
     if: github.ref_name == 'master'

.devcontainer/devcontainer.json

@@ -50,7 +50,5 @@ Det er mulig å kalle tjenesten med bruk av følgende tokens
 - Azure OBO med følgende rettigheter:
     - fpsak-saksbehandler
     - fpsak-veileder
-    - k9-saksbehandler
-    - k9-veileder
     - abakus-drift
 - STS (fases ut)

.devcontainer/docker-compose.yml

@@ -23,7 +23,7 @@
 import no.nav.vedtak.log.metrics.LivenessAware;
 import no.nav.vedtak.log.metrics.ReadinessAware;
 
-@Path("/")
+@Path("/health")
 @Produces(TEXT_PLAIN)
 @RequestScoped
 public class HealthCheckRestService {
@@ -62,7 +62,7 @@ private static CacheControl cacheControl() {
     }
 
     @GET
-    @Path("/health/isAlive")
+    @Path("/isAlive")
     @Operation(description = "Sjekker om poden lever", tags = "nais", hidden = true)
     public Response isAlive() {
         if (live.stream().allMatch(LivenessAware::isAlive)) {
@@ -72,19 +72,8 @@ public Response isAlive() {
         return Response.serverError().cacheControl(CC).build();
     }
 
-    /**
-     * @deprecated Både k9-verdikjede og fpsak-autotest trenger å bytte til det nye endepunkt /internal/health/isAlive
-     */
-    @Deprecated(since = "03.2023", forRemoval = true)
-    @GET
-    @Path("/isAlive")
-    @Operation(description = "Sjekker om poden lever", tags = "nais", hidden = true)
-    public Response isAliveDeprecated() {
-        return isAlive();
-    }
-
     @GET
-    @Path("/health/isReady")
+    @Path("/isReady")
     @Operation(description = "sjekker om poden er klar", tags = "nais", hidden = true)
     public Response isReady() {
         if (ready.stream().allMatch(ReadinessAware::isReady)) {
@@ -94,19 +83,8 @@ public Response isReady() {
         return Response.status(SERVICE_UNAVAILABLE).cacheControl(CC).build();
     }
 
-    /**
-     * @deprecated Både k9-verdikjede og fpsak-autotest trenger å bytte til det nye endepunkt /internal/health/isReady
-     */
-    @Deprecated(since = "03.2023", forRemoval = true)
-    @GET
-    @Path("/isReady")
-    @Operation(description = "sjekker om poden er klar", tags = "nais", hidden = true)
-    public Response isReadyDeprecated() {
-        return isReady();
-    }
-
     @GET
-    @Path("/health/preStop")
+    @Path("/preStop")
     @Operation(description = "Kalles på før stopp", tags = "nais", hidden = true)
     public Response preStop() {
         LOG.info("/preStop endepunkt kalt.");

.devcontainer/postAttachCommand.sh

@@ -10,11 +10,6 @@ systembruker.password=vtp
 # ABAC
 abac.pdp.endpoint.url=http://localhost:8060/rest/asm-pdp/authorize
 
-# OIDC/OPENAM - fjerne ASAP k9-vk er over
-oidc.open.am.well.known.url=http://localhost:8060/rest/isso/oauth2/.well-known/openid-configuration
-oidc.open.am.client.id=fpabakus-localhost
-# oidc.open.am.client.secret=<trenges ikke>
-
 # OIDC/STS
 oidc.sts.well.known.url=http://localhost:8060/rest/v1/sts/.well-known/openid-configuration
 

.github/workflows/build.yml

@@ -10,11 +10,6 @@ systembruker.password=vtp
 # ABAC
 abac.pdp.endpoint.url=http://localhost:8060/rest/asm-pdp/authorize
 
-# OIDC/OPENAM - fjerne ASAP k9-vk er over
-oidc.open.am.well.known.url=http://localhost:8060/rest/isso/oauth2/.well-known/openid-configuration
-oidc.open.am.client.id=fpabakus-localhost
-# oidc.open.am.client.secret=<trenges ikke>
-
 # OIDC/STS
 oidc.sts.well.known.url=http://localhost:8060/rest/v1/sts/.well-known/openid-configuration