Merge pull request #74 from virtualidentityag/revert-73-merge-with-os-v1

Revert "Merge with os v1"
virtualidentityag · Jan 3, 2023 · 86ccb52 · 86ccb52
2 parents 92fa207 + 10bc6b1
commit 86ccb52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 89 deletions.
diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
@@ -15,16 +15,10 @@ jobs:
   test:
     name: Build and run unit tests
     runs-on: ubuntu-latest
-    env:
-      FAIL_WEBHOOK_SECRET: ${{ secrets.MS_TEAMS_FAIL_WEBHOOK_URI }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Prepare environment variables
-        run: |
-          raw=$(git branch -r --contains ${{ github.ref }})
-          branch=${raw##*/}
-          echo BRANCH_NAME=$(echo -n "${branch}") >> $GITHUB_ENV
+
       - name: Setup JVM
         uses: actions/setup-java@v1
         with:
@@ -48,30 +42,13 @@ jobs:
         with:
           name: targetfiles
           path: target/*.jar
-      - name: Microsoft Teams Fail Card
-        if: ${{ (env.FAIL_WEBHOOK_SECRET != null) && (env.FAIL_WEBHOOK_SECRET != '') && (failure() || cancelled()) }}
-        uses: toko-bifrost/[email protected]
-        with:
-          github-token: ${{ github.token }}
-          webhook-uri: ${{ secrets.MS_TEAMS_FAIL_WEBHOOK_URI }}
-          show-on-start: false
-          show-on-exit: true
-          show-on-failure: true
-          card-layout-exit: complete
-          environment: ${{ env.BRANCH_NAME }}
-          custom-actions: |
-            - text: View CI
-              url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
   push_to_registry:
     strategy:
       matrix:
         registry: ["docker.pkg.github.com", "ghcr.io"]
     needs: [test]
     name: Push Docker image to GitHub Packages
     runs-on: ubuntu-latest
-    env:
-      IMAGE_WEBHOOK_SECRET: ${{ secrets.MS_TEAMS_IMAGE_WEBHOOK_URI }}
-      FAIL_WEBHOOK_SECRET: ${{ secrets.MS_TEAMS_FAIL_WEBHOOK_URI }}
     steps:
       - uses: actions/checkout@v2
       - name: Download buildfiles artifact
@@ -86,9 +63,6 @@ jobs:
           format: "YYYYMMDD[_]HHmmss"
       - name: Prepare environment variables
         run: |
-          raw=$(git branch -r --contains ${{ github.ref }})
-          branch=${raw##*/}
-          echo BRANCH_NAME=$(echo -n "${branch}") >> $GITHUB_ENV
           echo "DOCKER_REGISTRY=$(echo "${{ matrix.registry }}/${{ github.repository }}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
           echo "DOCKER_IMAGE=$(echo "${{ github.repository }}" | awk -F / '{print tolower($2)}')" >> $GITHUB_ENV
           echo "REPO_NAME_WITHOUT_PREFIX"=$(echo "${{ github.repository }}" | sed "s/.*\///" | awk -F / '{print tolower($0)}') >> $GITHUB_ENV
@@ -104,31 +78,14 @@ jobs:
         if: ${{ env.TYPE == 'tag' }}
         run: echo DOCKER_IMAGE_TAG=$(echo "${{ env.CLEAN_REF }}") >> $GITHUB_ENV
         shell: bash
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: '${{ env.DOCKER_REGISTRY }}/${{ env.REPO_NAME_WITHOUT_PREFIX }}'
-          flavor: |
-            latest=false
-          tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-            type=raw,value=${{ env.DOCKER_IMAGE_TAG}}
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'release') }}
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+      - name: Push to GitHub Packages
+        uses: docker/[email protected]
         with:
-          registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ secrets.GH_PACKAGE_RELEASE_USER }}
           password: ${{ secrets.GH_PACKAGE_RELEASE_TOKEN }}
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          registry: ${{ env.DOCKER_REGISTRY }}
+          repository: ${{ env.DOCKER_IMAGE }}
+          tags: ${{ env.DOCKER_IMAGE_TAG}}
       - name: Hint about the Docker Image Tag if successfull
         if: ${{ success() }}
         run: |
@@ -151,39 +108,6 @@ jobs:
           exit-code: '1'
           vuln-type: 'os,library'
           severity: 'CRITICAL'
-      - name: Microsoft Teams Fail Card
-        if: ${{ (env.FAIL_WEBHOOK_SECRET != null) && (env.FAIL_WEBHOOK_SECRET != '') && (matrix.registry == 'ghcr.io') && (failure() || cancelled()) }}
-        uses: toko-bifrost/[email protected]
-        with:
-          github-token: ${{ github.token }}
-          webhook-uri: ${{ secrets.MS_TEAMS_FAIL_WEBHOOK_URI }}
-          show-on-start: false
-          show-on-exit: true
-          show-on-failure: true
-          card-layout-exit: complete
-          environment: ${{ env.BRANCH_NAME }}
-          custom-actions: |
-            - text: View CI
-              url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-      - name: Microsoft Teams Image Card
-        if: ${{ (env.IMAGE_WEBHOOK_SECRET != null) && (env.IMAGE_WEBHOOK_SECRET != '') && (matrix.registry == 'ghcr.io') && success() }}
-        uses: toko-bifrost/[email protected]
-        with:
-          github-token: ${{ github.token }}
-          webhook-uri: ${{ secrets.MS_TEAMS_IMAGE_WEBHOOK_URI }}
-          show-on-start: false
-          show-on-exit: true
-          show-on-failure: false
-          card-layout-exit: complete
-          environment: ${{ env.BRANCH_NAME }}
-          custom-facts: |
-            - name: Registry
-              value: ${{ env.DOCKER_REGISTRY }}/${{ env.REPO_NAME_WITHOUT_PREFIX }}
-            - name: Tag
-              value: ${{ env.DOCKER_IMAGE_TAG }}
-          custom-actions: |
-            - text: View CI
-              url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
       - name: Publish to T sys if T-sys release
         if: ${{ (github.ref == 'refs/heads/tsys-release') && (matrix.registry == 'ghcr.io') }}
         uses: fjogeleit/http-request-action@v1

diff --git a/.../agencyservice/api/admin/service/agencypostcoderange/AgencyPostcodeRangeAdminService.java b/.../agencyservice/api/admin/service/agencypostcoderange/AgencyPostcodeRangeAdminService.java
@@ -16,7 +16,6 @@
 import java.util.stream.Collectors;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,9 +30,6 @@ public class AgencyPostcodeRangeAdminService {
   private final @NonNull AgencyService agencyService;
   private final @NonNull AgencyAdminService agencyAdminService;
   private final PostcodeRangeValidator postcodeRangeValidator = new PostcodeRangeValidator();
-  @Value("${multitenancy.enabled}")
-  private boolean multitenancy;
-
 
   /**
    * Returns all post code ranges by given agency id.
@@ -57,9 +53,7 @@ public AgencyPostcodeRangeResponseDTO findPostcodeRangesForAgency(Long agencyId)
    */
   @Transactional
   public void deleteAgencyPostcodeRange(Long agencyId) {
-    if (!multitenancy) {
-      markAgencyOffline(agencyId);
-    }
+    markAgencyOffline(agencyId);
     this.agencyPostCodeRangeRepository.deleteAllByAgencyId(agencyId);
   }