new v4 release

Merge branch 'releases/v4' into tmp
v4 new release (#274 )
2026-06-22 03:09:27 +08:00 · 2023-05-31 10:39:32 -04:00 · 2023-05-31 10:32:03 -04:00 · 2022-12-20 12:20:06 -05:00 · 2022-12-06 16:47:10 -05:00 · 2022-11-23 16:30:26 -05:00
23 changed files with 24471 additions and 700 deletions
@@ -10,13 +10,10 @@ jobs:
   CodeQL-Build:
      # CodeQL runs on ubuntu-latest and windows-latest
      runs-on: ubuntu-latest
-      permissions:
-         contents: read
-         security-events: write

      steps:
         - name: Checkout repository
-           uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+           uses: actions/checkout@v3
           with:
              # We must fetch at least the immediate parents so that if this is
              # a pull request then we can checkout the head.
@@ -24,7 +21,7 @@ jobs:

         # Initializes the CodeQL tools for scanning.
         - name: Initialize CodeQL
-           uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f #v3.24.8
+           uses: github/codeql-action/init@v2
           # Override language selection by uncommenting this and choosing your languages
           # with:
           #   languages: go, javascript, csharp, python, cpp, java
@@ -32,7 +29,7 @@ jobs:
         # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
         # If this step fails, then you should remove it and run the build manually (see below)
         - name: Autobuild
-           uses: github/codeql-action/autobuild@05963f47d870e2cb19a537396c1f668a348c7d8f #v3.24.8
+           uses: github/codeql-action/autobuild@v2

         # ℹ️ Command-line programs to run using the OS shell.
         # 📚 https://git.io/JvXDl
@@ -46,4 +43,4 @@ jobs:
         #   make release

         - name: Perform CodeQL Analysis
-           uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f #v3.24.8
+           uses: github/codeql-action/analyze@v2
@@ -1,18 +1,14 @@
-name: Release Project
+name: Create release PR

 on:
-   push:
-      branches:
-         - main
-      paths:
-         - CHANGELOG.md
   workflow_dispatch:
+      inputs:
+         release:
+            description: 'Define release version (ex: v1, v2, v3)'
+            required: true

 jobs:
-   release:
-      permissions:
-         actions: read
-         contents: write
-      uses: Azure/action-release-workflows/.github/workflows/release_js_project.yaml@v1
+   release-pr:
+      uses: OliverMKing/javascript-release-workflow/.github/workflows/release-pr.yml@main
      with:
-         changelogPath: ./CHANGELOG.md
+         release: ${{ github.event.inputs.release }}
@@ -38,7 +38,7 @@ jobs:
           name: Setup Minikube
           uses: medyagh/setup-minikube@latest
           with:
-              minikube-version: 1.31.2
+              minikube-version: 1.24.0
              kubernetes-version: 1.22.3
              driver: 'none'
           timeout-minutes: 3
@@ -38,7 +38,7 @@ jobs:
           name: Setup Minikube
           uses: medyagh/setup-minikube@latest
           with:
-              minikube-version: 1.31.2
+              minikube-version: 1.24.0
              kubernetes-version: 1.22.3
              driver: 'none'
           timeout-minutes: 3
@@ -13,7 +13,7 @@ on:
 jobs:
   run-integration-test:
      name: Run Minikube Integration Tests
-      runs-on: ubuntu-latest
+      runs-on: ubuntu-20.04
      env:
         KUBECONFIG: /home/runner/.kube/config
         NAMESPACE: test-${{ github.run_id }}
@@ -1,89 +0,0 @@
-name: Minikube Integration Tests - resource annotation
-on:
-   pull_request:
-      branches:
-         - main
-         - 'releases/*'
-   push:
-      branches:
-         - main
-         - 'releases/*'
-   workflow_dispatch:
-
-jobs:
-   run-integration-test:
-      name: Run Minikube Integration Tests
-      runs-on: ubuntu-latest
-      env:
-         KUBECONFIG: /home/runner/.kube/config
-         NAMESPACE: test-${{ github.run_id }}
-      steps:
-         - uses: actions/checkout@v3
-
-         - name: Install dependencies
-           run: |
-              rm -rf node_modules/
-              npm install
-         - name: Install ncc
-           run: npm i -g @vercel/ncc
-         - name: Install conntrack
-           run: sudo apt-get install -y conntrack
-         - name: Build
-           run: ncc build src/run.ts -o lib
-
-         - uses: Azure/setup-kubectl@v3
-           name: Install Kubectl
-
-         - id: setup-minikube
-           name: Setup Minikube
-           uses: medyagh/setup-minikube@latest
-           with:
-              minikube-version: 1.24.0
-              kubernetes-version: 1.22.3
-              driver: 'none'
-           timeout-minutes: 3
-
-         - name: Create namespace to run tests
-           run: kubectl create ns ${{ env.NAMESPACE }}
-
-         - uses: actions/setup-python@v2
-           name: Install Python
-           with:
-              python-version: '3.x'
-
-         - name: Cleaning any previously created items
-           run: |
-              python test/integration/k8s-deploy-delete.py 'Service' 'all' ${{ env.NAMESPACE }}
-              python test/integration/k8s-deploy-delete.py 'Deployment' 'all' ${{ env.NAMESPACE }}
-              python test/integration/k8s-deploy-delete.py 'Ingress' 'all' ${{ env.NAMESPACE }}
-
-         - name: Executing deploy action for pod with resource annotation enabled by default
-           uses: ./
-           with:
-              namespace: ${{ env.NAMESPACE }}
-              images: nginx:1.14.2
-              manifests: |
-                 test/integration/manifests/test.yml
-              action: deploy
-
-         - name: Checking if deployments is created with additional resource annotation
-           run: |
-              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE }} kind=Deployment name=nginx-deployment containerName=nginx:1.14.2 labels=app:nginx,workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Minikube_Integration_Tests_-_resource_annotation selectorLabels=app:nginx annotations=actions.github.com/k8s-deploy,deployment.kubernetes.io/revision,kubectl.kubernetes.io/last-applied-configuration
-
-         - name: Cleaning previously created deployment
-           run: |
-              python test/integration/k8s-deploy-delete.py 'Deployment' 'all' ${{ env.NAMESPACE }}
-
-         - name: Executing deploy action for pod with resource annotation disabled
-           uses: ./
-           with:
-              namespace: ${{ env.NAMESPACE }}
-              images: nginx:1.14.2
-              manifests: |
-                 test/integration/manifests/test.yml
-              action: deploy
-              annotate-resources: false
-
-         - name: Checking if deployment is created without additional resource annotation
-           run: |
-              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE }} kind=Deployment name=nginx-deployment containerName=nginx:1.14.2 selectorLabels=app:nginx annotations=deployment.kubernetes.io/revision,kubectl.kubernetes.io/last-applied-configuration
@@ -0,0 +1,10 @@
+name: Tag and create release draft
+
+on:
+   push:
+      branches:
+         - releases/*
+
+jobs:
+   tag-and-release:
+      uses: OliverMKing/javascript-release-workflow/.github/workflows/tag-and-release.yml@main
@@ -2,6 +2,5 @@ node_modules

 .DS_Store
 .idea
-lib/

-coverage/
+coverage/
@@ -1,28 +0,0 @@
-# Changelog
-
-## [5.0.0] - 2024-03-12
-
-### Changed
-
-  #309 Updated to Node20 and upgraded release workflows to @v1 tag
-  #306 update release workflow to use new prefix, remove deprecated release
-  #303 fix: ensure imageNames are not empty strings
-  #299 bump release workflow sha
-  #298 bump minikube to fix runner deps
-  #297 update release workflow
-
-### Added
-
-  #304 add v prefix for version tagging
-  #302 adding ncc to build
-  #301 adding release workflow artifact fix
-
-## [4.10.0] - 2023-10-30
-
-### Added
-
-  #287 Make annotating resources optional
-  #283 Fix “Service” route-method of the Blue-Green strategy with some manifest files
-  #281 bump codeql to node 16
-  #279 upgrade codeql
-  #276 Fixes multiple namespaces bug
@@ -113,13 +113,9 @@ Following are the key capabilities of this action:
    <td>force </br></br>(Optional)</td>
    <td>Deploy when a previous deployment already exists. If true then '--force' argument is added to the apply command. Using '--force' argument is not recommended in production.</td>
  </tr>
-  <tr>
-    <td>annotate-resources</br></br>(Optional)</td>
-    <td>Acceptable values: true/false</br>Default value: true</br>Switch whether to annotate the resources or not. If set to false all annotations are skipped completely.</td>
-  </tr>
  <tr>
    <td>annotate-namespace</br></br>(Optional)</td>
-    <td>Acceptable values: true/false</br>Default value: true</br>Switch whether to annotate the namespace resources object or not. Ignored when annotate-resources is set to false.</td>
+    <td>Acceptable values: true/false</br>Default value: true</br>Switch whether to annotate the namespace resources object or not</td>
  </tr>
  <tr>
    <td>skip-tls-verify</br></br>(Optional)</td>
@@ -132,7 +128,7 @@ Following are the key capabilities of this action:
 ### Basic deployment (without any deployment strategy)

 ```yaml
- uses: Azure/k8s-deploy@v5
+- uses: Azure/k8s-deploy@v4
  with:
     namespace: 'myapp'
     manifests: |
@@ -146,7 +142,7 @@ Following are the key capabilities of this action:
 ### Private cluster deployment

 ```yaml
- uses: Azure/k8s-deploy@v5
+- uses: Azure/k8s-deploy@v4
  with:
     resource-group: yourResourceGroup
     name: yourClusterName
@@ -166,7 +162,7 @@ Following are the key capabilities of this action:
 ### Canary deployment without service mesh

 ```yaml
- uses: Azure/k8s-deploy@v5
+- uses: Azure/k8s-deploy@v4
  with:
     namespace: 'myapp'
     images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -185,7 +181,7 @@ Following are the key capabilities of this action:
 To promote/reject the canary created by the above snippet, the following YAML snippet could be used:

 ```yaml
- uses: Azure/k8s-deploy@v5
+- uses: Azure/k8s-deploy@v4
  with:
     namespace: 'myapp'
     images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -203,7 +199,7 @@ To promote/reject the canary created by the above snippet, the following YAML sn
 ### Canary deployment based on Service Mesh Interface

 ```yaml
- uses: Azure/k8s-deploy@v5
+- uses: Azure/k8s-deploy@v4
  with:
     namespace: 'myapp'
     images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -224,7 +220,7 @@ To promote/reject the canary created by the above snippet, the following YAML sn
 To promote/reject the canary created by the above snippet, the following YAML snippet could be used:

 ```yaml
- uses: Azure/k8s-deploy@v5
+- uses: Azure/k8s-deploy@v4
  with:
     namespace: 'myapp'
     images: 'contoso.azurecr.io/myapp:${{ event.run_id }} '
@@ -243,7 +239,7 @@ To promote/reject the canary created by the above snippet, the following YAML sn
 ### Blue-Green deployment with different route methods

 ```yaml
- uses: Azure/k8s-deploy@v5
+- uses: Azure/k8s-deploy@v4
  with:
     namespace: 'myapp'
     images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -263,7 +259,7 @@ To promote/reject the canary created by the above snippet, the following YAML sn
 To promote/reject the green workload created by the above snippet, the following YAML snippet could be used:

 ```yaml
- uses: Azure/k8s-deploy@v5
+- uses: Azure/k8s-deploy@v4
  with:
     namespace: 'myapp'
     images: 'contoso.azurecr.io/myapp:${{ event.run_id }}'
@@ -292,7 +288,7 @@ jobs:
   build:
      runs-on: ubuntu-latest
      steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@master

         - uses: Azure/docker-login@v1
           with:
@@ -304,23 +300,23 @@ jobs:
              docker build . -t contoso.azurecr.io/k8sdemo:${{ github.sha }}
              docker push contoso.azurecr.io/k8sdemo:${{ github.sha }}

-         - uses: azure/setup-kubectl@v4
+         - uses: azure/setup-kubectl@v2.0

         # Set the target AKS cluster.
-         - uses: Azure/aks-set-context@v4
+         - uses: Azure/aks-set-context@v1
           with:
              creds: '${{ secrets.AZURE_CREDENTIALS }}'
              cluster-name: contoso
              resource-group: contoso-rg

-         - uses: Azure/k8s-create-secret@v4
+         - uses: Azure/k8s-create-secret@v1.1
           with:
              container-registry-url: contoso.azurecr.io
              container-registry-username: ${{ secrets.REGISTRY_USERNAME }}
              container-registry-password: ${{ secrets.REGISTRY_PASSWORD }}
              secret-name: demo-k8s-secret

-         - uses: Azure/k8s-deploy@v5
+         - uses: Azure/k8s-deploy@v4
           with:
              action: deploy
              manifests: |
@@ -341,7 +337,7 @@ jobs:
   build:
      runs-on: ubuntu-latest
      steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@master

         - uses: Azure/docker-login@v1
           with:
@@ -353,13 +349,13 @@ jobs:
              docker build . -t contoso.azurecr.io/k8sdemo:${{ github.sha }}
              docker push contoso.azurecr.io/k8sdemo:${{ github.sha }}

-         - uses: azure/setup-kubectl@v4
+         - uses: azure/setup-kubectl@v2.0

-         - uses: Azure/k8s-set-context@v4
+         - uses: Azure/k8s-set-context@v2
           with:
              kubeconfig: ${{ secrets.KUBE_CONFIG }}

-         - uses: Azure/k8s-create-secret@v4
+         - uses: Azure/k8s-create-secret@v1.1
           with:
              container-registry-url: contoso.azurecr.io
              container-registry-username: ${{ secrets.REGISTRY_USERNAME }}
@@ -391,7 +387,7 @@ jobs:
   build:
      runs-on: ubuntu-latest
      steps:
-         - uses: actions/checkout@v4
+         - uses: actions/checkout@master

         - uses: Azure/docker-login@v1
           with:
@@ -423,16 +419,16 @@ jobs:
              username: ${{ secrets.REGISTRY_USERNAME }}
              password: ${{ secrets.REGISTRY_PASSWORD }}

-         - uses: azure/setup-kubectl@v4
+         - uses: azure/setup-kubectl@v2.0

         # Set the target AKS cluster.
-         - uses: Azure/aks-set-context@v4
+         - uses: Azure/aks-set-context@v1
           with:
              creds: '${{ secrets.AZURE_CREDENTIALS }}'
              cluster-name: contoso
              resource-group: contoso-rg

-         - uses: Azure/k8s-create-secret@v4
+         - uses: Azure/k8s-create-secret@v1.1
           with:
              namespace: ${{ env.NAMESPACE  }}
              container-registry-url: contoso.azurecr.io
@@ -440,7 +436,7 @@ jobs:
              container-registry-password: ${{ secrets.REGISTRY_PASSWORD }}
              secret-name: demo-k8s-secret

-         - uses: azure/k8s-bake@v3
+         - uses: azure/k8s-bake@v2
           with:
              renderEngine: 'helm'
              helmChart: './aks-helloworld/'
@@ -450,7 +446,7 @@ jobs:
              helm-version: 'latest'
           id: bake

-         - uses: Azure/k8s-deploy@v5
+         - uses: Azure/k8s-deploy@v1.2
           with:
              action: deploy
              manifests: ${{ steps.bake.outputs.manifestsBundle }}
@@ -59,12 +59,8 @@ inputs:
      description: 'Github token'
      default: ${{ github.token }}
      required: true
-   annotate-resources:
-      description: 'Annotate the resources. If set to false all annotations are skipped completely.'
-      required: false
-      default: true
   annotate-namespace:
-      description: 'Annotate the target namespace. Ignored when annotate-resources is set to false.'
+      description: 'Annotate the target namespace'
      required: false
      default: true
   private-cluster:
@@ -84,5 +80,5 @@ inputs:
 branding:
   color: 'green'
 runs:
-   using: 'node20'
+   using: 'node16'
   main: 'lib/index.js'
@@ -1,12 +1,12 @@
 {
   "name": "k8s-deploy-action",
-   "version": "5.0.0",
+   "version": "0.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "k8s-deploy-action",
-         "version": "5.0.0",
+         "version": "0.0.0",
         "license": "MIT",
         "dependencies": {
            "@actions/core": "^1.10.0",
@@ -94,89 +94,17 @@
         }
      },
      "node_modules/@babel/code-frame": {
-         "version": "7.22.13",
-         "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-         "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+         "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
         "dev": true,
         "dependencies": {
-            "@babel/highlight": "^7.22.13",
-            "chalk": "^2.4.2"
+            "@babel/highlight": "^7.18.6"
         },
         "engines": {
            "node": ">=6.9.0"
         }
      },
-      "node_modules/@babel/code-frame/node_modules/ansi-styles": {
-         "version": "3.2.1",
-         "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-         "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-         "dev": true,
-         "dependencies": {
-            "color-convert": "^1.9.0"
-         },
-         "engines": {
-            "node": ">=4"
-         }
-      },
-      "node_modules/@babel/code-frame/node_modules/chalk": {
-         "version": "2.4.2",
-         "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-         "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-         "dev": true,
-         "dependencies": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-         },
-         "engines": {
-            "node": ">=4"
-         }
-      },
-      "node_modules/@babel/code-frame/node_modules/color-convert": {
-         "version": "1.9.3",
-         "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-         "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-         "dev": true,
-         "dependencies": {
-            "color-name": "1.1.3"
-         }
-      },
-      "node_modules/@babel/code-frame/node_modules/color-name": {
-         "version": "1.1.3",
-         "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-         "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-         "dev": true
-      },
-      "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
-         "version": "1.0.5",
-         "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-         "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-         "dev": true,
-         "engines": {
-            "node": ">=0.8.0"
-         }
-      },
-      "node_modules/@babel/code-frame/node_modules/has-flag": {
-         "version": "3.0.0",
-         "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-         "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-         "dev": true,
-         "engines": {
-            "node": ">=4"
-         }
-      },
-      "node_modules/@babel/code-frame/node_modules/supports-color": {
-         "version": "5.5.0",
-         "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-         "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-         "dev": true,
-         "dependencies": {
-            "has-flag": "^3.0.0"
-         },
-         "engines": {
-            "node": ">=4"
-         }
-      },
      "node_modules/@babel/compat-data": {
         "version": "7.18.8",
         "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
@@ -217,14 +145,13 @@
         }
      },
      "node_modules/@babel/generator": {
-         "version": "7.23.0",
-         "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-         "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz",
+         "integrity": "sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==",
         "dev": true,
         "dependencies": {
-            "@babel/types": "^7.23.0",
+            "@babel/types": "^7.18.9",
            "@jridgewell/gen-mapping": "^0.3.2",
-            "@jridgewell/trace-mapping": "^0.3.17",
            "jsesc": "^2.5.1"
         },
         "engines": {
@@ -264,34 +191,34 @@
         }
      },
      "node_modules/@babel/helper-environment-visitor": {
-         "version": "7.22.20",
-         "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-         "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+         "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
         "dev": true,
         "engines": {
            "node": ">=6.9.0"
         }
      },
      "node_modules/@babel/helper-function-name": {
-         "version": "7.23.0",
-         "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-         "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
+         "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
         "dev": true,
         "dependencies": {
-            "@babel/template": "^7.22.15",
-            "@babel/types": "^7.23.0"
+            "@babel/template": "^7.18.6",
+            "@babel/types": "^7.18.9"
         },
         "engines": {
            "node": ">=6.9.0"
         }
      },
      "node_modules/@babel/helper-hoist-variables": {
-         "version": "7.22.5",
-         "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-         "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+         "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
         "dev": true,
         "dependencies": {
-            "@babel/types": "^7.22.5"
+            "@babel/types": "^7.18.6"
         },
         "engines": {
            "node": ">=6.9.0"
@@ -350,30 +277,21 @@
         }
      },
      "node_modules/@babel/helper-split-export-declaration": {
-         "version": "7.22.6",
-         "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-         "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+         "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
         "dev": true,
         "dependencies": {
-            "@babel/types": "^7.22.5"
+            "@babel/types": "^7.18.6"
         },
         "engines": {
            "node": ">=6.9.0"
         }
      },
-      "node_modules/@babel/helper-string-parser": {
-         "version": "7.22.5",
-         "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-         "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
-         "dev": true,
-         "engines": {
-            "node": ">=6.9.0"
-         }
-      },
      "node_modules/@babel/helper-validator-identifier": {
-         "version": "7.22.20",
-         "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-         "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+         "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
         "dev": true,
         "engines": {
            "node": ">=6.9.0"
@@ -403,13 +321,13 @@
         }
      },
      "node_modules/@babel/highlight": {
-         "version": "7.22.20",
-         "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-         "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+         "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
         "dev": true,
         "dependencies": {
-            "@babel/helper-validator-identifier": "^7.22.20",
-            "chalk": "^2.4.2",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
            "js-tokens": "^4.0.0"
         },
         "engines": {
@@ -488,9 +406,9 @@
         }
      },
      "node_modules/@babel/parser": {
-         "version": "7.23.0",
-         "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-         "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz",
+         "integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==",
         "dev": true,
         "bin": {
            "parser": "bin/babel-parser.js"
@@ -647,33 +565,33 @@
         }
      },
      "node_modules/@babel/template": {
-         "version": "7.22.15",
-         "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-         "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz",
+         "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==",
         "dev": true,
         "dependencies": {
-            "@babel/code-frame": "^7.22.13",
-            "@babel/parser": "^7.22.15",
-            "@babel/types": "^7.22.15"
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.6",
+            "@babel/types": "^7.18.6"
         },
         "engines": {
            "node": ">=6.9.0"
         }
      },
      "node_modules/@babel/traverse": {
-         "version": "7.23.2",
-         "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-         "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.9.tgz",
+         "integrity": "sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==",
         "dev": true,
         "dependencies": {
-            "@babel/code-frame": "^7.22.13",
-            "@babel/generator": "^7.23.0",
-            "@babel/helper-environment-visitor": "^7.22.20",
-            "@babel/helper-function-name": "^7.23.0",
-            "@babel/helper-hoist-variables": "^7.22.5",
-            "@babel/helper-split-export-declaration": "^7.22.6",
-            "@babel/parser": "^7.23.0",
-            "@babel/types": "^7.23.0",
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.18.9",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.18.9",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.18.9",
+            "@babel/types": "^7.18.9",
            "debug": "^4.1.0",
            "globals": "^11.1.0"
         },
@@ -682,13 +600,12 @@
         }
      },
      "node_modules/@babel/types": {
-         "version": "7.23.0",
-         "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-         "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz",
+         "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==",
         "dev": true,
         "dependencies": {
-            "@babel/helper-string-parser": "^7.22.5",
-            "@babel/helper-validator-identifier": "^7.22.20",
+            "@babel/helper-validator-identifier": "^7.18.6",
            "to-fast-properties": "^2.0.0"
         },
         "engines": {
@@ -1007,13 +924,13 @@
         "dev": true
      },
      "node_modules/@jridgewell/trace-mapping": {
-         "version": "0.3.19",
-         "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-         "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+         "version": "0.3.14",
+         "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
+         "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
         "dev": true,
         "dependencies": {
-            "@jridgewell/resolve-uri": "^3.1.0",
-            "@jridgewell/sourcemap-codec": "^1.4.14"
+            "@jridgewell/resolve-uri": "^3.0.3",
+            "@jridgewell/sourcemap-codec": "^1.4.10"
         }
      },
      "node_modules/@octokit/auth-token": {
@@ -2094,9 +2011,9 @@
         "dev": true
      },
      "node_modules/decode-uri-component": {
-         "version": "0.2.2",
-         "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-         "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+         "version": "0.2.0",
+         "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+         "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
         "dev": true,
         "engines": {
            "node": ">=0.10"
@@ -3726,9 +3643,9 @@
         }
      },
      "node_modules/jest-snapshot/node_modules/semver": {
-         "version": "7.5.4",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-         "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+         "version": "7.3.7",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+         "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
         "dev": true,
         "dependencies": {
            "lru-cache": "^6.0.0"
@@ -3901,9 +3818,9 @@
         "dev": true
      },
      "node_modules/json5": {
-         "version": "2.2.3",
-         "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-         "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+         "version": "2.2.1",
+         "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+         "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
         "dev": true,
         "bin": {
            "json5": "lib/cli.js"
@@ -4231,9 +4148,9 @@
         }
      },
      "node_modules/node-notifier/node_modules/semver": {
-         "version": "7.5.4",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-         "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+         "version": "7.3.7",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+         "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
         "dev": true,
         "optional": true,
         "dependencies": {
@@ -4275,9 +4192,9 @@
         }
      },
      "node_modules/normalize-package-data/node_modules/semver": {
-         "version": "5.7.2",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-         "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+         "version": "5.7.1",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+         "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
         "dev": true,
         "bin": {
            "semver": "bin/semver"
@@ -4729,12 +4646,6 @@
            "url": "https://github.com/sponsors/ljharb"
         }
      },
-      "node_modules/querystringify": {
-         "version": "2.2.0",
-         "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-         "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-         "dev": true
-      },
      "node_modules/react-is": {
         "version": "17.0.2",
         "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -4843,12 +4754,6 @@
         "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
         "dev": true
      },
-      "node_modules/requires-port": {
-         "version": "1.0.0",
-         "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-         "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-         "dev": true
-      },
      "node_modules/resolve": {
         "version": "1.22.1",
         "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -5188,9 +5093,9 @@
         }
      },
      "node_modules/sane/node_modules/semver": {
-         "version": "5.7.2",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-         "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+         "version": "5.7.1",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+         "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
         "dev": true,
         "bin": {
            "semver": "bin/semver"
@@ -5255,9 +5160,9 @@
         }
      },
      "node_modules/semver": {
-         "version": "6.3.1",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-         "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+         "version": "6.3.0",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+         "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
         "bin": {
            "semver": "bin/semver.js"
         }
@@ -5984,15 +5889,14 @@
         }
      },
      "node_modules/tough-cookie": {
-         "version": "4.1.3",
-         "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-         "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+         "version": "4.0.0",
+         "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+         "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
         "dev": true,
         "dependencies": {
            "psl": "^1.1.33",
            "punycode": "^2.1.1",
-            "universalify": "^0.2.0",
-            "url-parse": "^1.5.3"
+            "universalify": "^0.1.2"
         },
         "engines": {
            "node": ">=6"
@@ -6039,9 +5943,9 @@
         }
      },
      "node_modules/ts-jest/node_modules/semver": {
-         "version": "7.5.4",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-         "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+         "version": "7.3.7",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+         "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
         "dev": true,
         "dependencies": {
            "lru-cache": "^6.0.0"
@@ -6161,9 +6065,9 @@
         "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
      },
      "node_modules/universalify": {
-         "version": "0.2.0",
-         "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-         "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+         "version": "0.1.2",
+         "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+         "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
         "dev": true,
         "engines": {
            "node": ">= 4.0.0"
@@ -6250,16 +6154,6 @@
         "deprecated": "Please see https://github.com/lydell/urix#deprecated",
         "dev": true
      },
-      "node_modules/url-parse": {
-         "version": "1.5.10",
-         "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-         "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-         "dev": true,
-         "dependencies": {
-            "querystringify": "^2.1.1",
-            "requires-port": "^1.0.0"
-         }
-      },
      "node_modules/use": {
         "version": "3.1.1",
         "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -6401,9 +6295,9 @@
         "dev": true
      },
      "node_modules/word-wrap": {
-         "version": "1.2.4",
-         "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-         "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
+         "version": "1.2.3",
+         "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+         "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
         "dev": true,
         "engines": {
            "node": ">=0.10.0"
@@ -6592,71 +6486,12 @@
         }
      },
      "@babel/code-frame": {
-         "version": "7.22.13",
-         "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-         "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+         "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
         "dev": true,
         "requires": {
-            "@babel/highlight": "^7.22.13",
-            "chalk": "^2.4.2"
-         },
-         "dependencies": {
-            "ansi-styles": {
-               "version": "3.2.1",
-               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-               "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-               "dev": true,
-               "requires": {
-                  "color-convert": "^1.9.0"
-               }
-            },
-            "chalk": {
-               "version": "2.4.2",
-               "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-               "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-               "dev": true,
-               "requires": {
-                  "ansi-styles": "^3.2.1",
-                  "escape-string-regexp": "^1.0.5",
-                  "supports-color": "^5.3.0"
-               }
-            },
-            "color-convert": {
-               "version": "1.9.3",
-               "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-               "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-               "dev": true,
-               "requires": {
-                  "color-name": "1.1.3"
-               }
-            },
-            "color-name": {
-               "version": "1.1.3",
-               "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-               "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-               "dev": true
-            },
-            "escape-string-regexp": {
-               "version": "1.0.5",
-               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-               "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-               "dev": true
-            },
-            "has-flag": {
-               "version": "3.0.0",
-               "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-               "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-               "dev": true
-            },
-            "supports-color": {
-               "version": "5.5.0",
-               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-               "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-               "dev": true,
-               "requires": {
-                  "has-flag": "^3.0.0"
-               }
-            }
+            "@babel/highlight": "^7.18.6"
         }
      },
      "@babel/compat-data": {
@@ -6689,14 +6524,13 @@
         }
      },
      "@babel/generator": {
-         "version": "7.23.0",
-         "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-         "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz",
+         "integrity": "sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==",
         "dev": true,
         "requires": {
-            "@babel/types": "^7.23.0",
+            "@babel/types": "^7.18.9",
            "@jridgewell/gen-mapping": "^0.3.2",
-            "@jridgewell/trace-mapping": "^0.3.17",
            "jsesc": "^2.5.1"
         },
         "dependencies": {
@@ -6726,28 +6560,28 @@
         }
      },
      "@babel/helper-environment-visitor": {
-         "version": "7.22.20",
-         "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-         "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+         "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
         "dev": true
      },
      "@babel/helper-function-name": {
-         "version": "7.23.0",
-         "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-         "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
+         "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
         "dev": true,
         "requires": {
-            "@babel/template": "^7.22.15",
-            "@babel/types": "^7.23.0"
+            "@babel/template": "^7.18.6",
+            "@babel/types": "^7.18.9"
         }
      },
      "@babel/helper-hoist-variables": {
-         "version": "7.22.5",
-         "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-         "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+         "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
         "dev": true,
         "requires": {
-            "@babel/types": "^7.22.5"
+            "@babel/types": "^7.18.6"
         }
      },
      "@babel/helper-module-imports": {
@@ -6791,24 +6625,18 @@
         }
      },
      "@babel/helper-split-export-declaration": {
-         "version": "7.22.6",
-         "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-         "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+         "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
         "dev": true,
         "requires": {
-            "@babel/types": "^7.22.5"
+            "@babel/types": "^7.18.6"
         }
      },
-      "@babel/helper-string-parser": {
-         "version": "7.22.5",
-         "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-         "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
-         "dev": true
-      },
      "@babel/helper-validator-identifier": {
-         "version": "7.22.20",
-         "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-         "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+         "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
         "dev": true
      },
      "@babel/helper-validator-option": {
@@ -6829,13 +6657,13 @@
         }
      },
      "@babel/highlight": {
-         "version": "7.22.20",
-         "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-         "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+         "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
         "dev": true,
         "requires": {
-            "@babel/helper-validator-identifier": "^7.22.20",
-            "chalk": "^2.4.2",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
            "js-tokens": "^4.0.0"
         },
         "dependencies": {
@@ -6898,9 +6726,9 @@
         }
      },
      "@babel/parser": {
-         "version": "7.23.0",
-         "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-         "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz",
+         "integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==",
         "dev": true
      },
      "@babel/plugin-syntax-async-generators": {
@@ -7012,42 +6840,41 @@
         }
      },
      "@babel/template": {
-         "version": "7.22.15",
-         "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-         "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+         "version": "7.18.6",
+         "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz",
+         "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==",
         "dev": true,
         "requires": {
-            "@babel/code-frame": "^7.22.13",
-            "@babel/parser": "^7.22.15",
-            "@babel/types": "^7.22.15"
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.6",
+            "@babel/types": "^7.18.6"
         }
      },
      "@babel/traverse": {
-         "version": "7.23.2",
-         "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-         "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.9.tgz",
+         "integrity": "sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==",
         "dev": true,
         "requires": {
-            "@babel/code-frame": "^7.22.13",
-            "@babel/generator": "^7.23.0",
-            "@babel/helper-environment-visitor": "^7.22.20",
-            "@babel/helper-function-name": "^7.23.0",
-            "@babel/helper-hoist-variables": "^7.22.5",
-            "@babel/helper-split-export-declaration": "^7.22.6",
-            "@babel/parser": "^7.23.0",
-            "@babel/types": "^7.23.0",
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.18.9",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.18.9",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.18.9",
+            "@babel/types": "^7.18.9",
            "debug": "^4.1.0",
            "globals": "^11.1.0"
         }
      },
      "@babel/types": {
-         "version": "7.23.0",
-         "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-         "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+         "version": "7.18.9",
+         "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz",
+         "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==",
         "dev": true,
         "requires": {
-            "@babel/helper-string-parser": "^7.22.5",
-            "@babel/helper-validator-identifier": "^7.22.20",
+            "@babel/helper-validator-identifier": "^7.18.6",
            "to-fast-properties": "^2.0.0"
         }
      },
@@ -7307,13 +7134,13 @@
         "dev": true
      },
      "@jridgewell/trace-mapping": {
-         "version": "0.3.19",
-         "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-         "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+         "version": "0.3.14",
+         "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
+         "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
         "dev": true,
         "requires": {
-            "@jridgewell/resolve-uri": "^3.1.0",
-            "@jridgewell/sourcemap-codec": "^1.4.14"
+            "@jridgewell/resolve-uri": "^3.0.3",
+            "@jridgewell/sourcemap-codec": "^1.4.10"
         }
      },
      "@octokit/auth-token": {
@@ -8199,9 +8026,9 @@
         "dev": true
      },
      "decode-uri-component": {
-         "version": "0.2.2",
-         "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-         "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+         "version": "0.2.0",
+         "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+         "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
         "dev": true
      },
      "deep-is": {
@@ -9456,9 +9283,9 @@
         },
         "dependencies": {
            "semver": {
-               "version": "7.5.4",
-               "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-               "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+               "version": "7.3.7",
+               "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+               "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
               "dev": true,
               "requires": {
                  "lru-cache": "^6.0.0"
@@ -9591,9 +9418,9 @@
         "dev": true
      },
      "json5": {
-         "version": "2.2.3",
-         "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-         "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+         "version": "2.2.1",
+         "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+         "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
         "dev": true
      },
      "kind-of": {
@@ -9849,9 +9676,9 @@
         },
         "dependencies": {
            "semver": {
-               "version": "7.5.4",
-               "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-               "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+               "version": "7.3.7",
+               "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+               "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
               "dev": true,
               "optional": true,
               "requires": {
@@ -9886,9 +9713,9 @@
         },
         "dependencies": {
            "semver": {
-               "version": "5.7.2",
-               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-               "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+               "version": "5.7.1",
+               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+               "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
               "dev": true
            }
         }
@@ -10217,12 +10044,6 @@
            "side-channel": "^1.0.4"
         }
      },
-      "querystringify": {
-         "version": "2.2.0",
-         "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-         "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-         "dev": true
-      },
      "react-is": {
         "version": "17.0.2",
         "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -10308,12 +10129,6 @@
         "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
         "dev": true
      },
-      "requires-port": {
-         "version": "1.0.0",
-         "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-         "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-         "dev": true
-      },
      "resolve": {
         "version": "1.22.1",
         "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -10582,9 +10397,9 @@
               "dev": true
            },
            "semver": {
-               "version": "5.7.2",
-               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-               "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+               "version": "5.7.1",
+               "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+               "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
               "dev": true
            },
            "shebang-command": {
@@ -10633,9 +10448,9 @@
         }
      },
      "semver": {
-         "version": "6.3.1",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-         "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+         "version": "6.3.0",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+         "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
      },
      "set-blocking": {
         "version": "2.0.0",
@@ -11221,15 +11036,14 @@
         }
      },
      "tough-cookie": {
-         "version": "4.1.3",
-         "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-         "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+         "version": "4.0.0",
+         "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+         "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
         "dev": true,
         "requires": {
            "psl": "^1.1.33",
            "punycode": "^2.1.1",
-            "universalify": "^0.2.0",
-            "url-parse": "^1.5.3"
+            "universalify": "^0.1.2"
         }
      },
      "tr46": {
@@ -11260,9 +11074,9 @@
         },
         "dependencies": {
            "semver": {
-               "version": "7.5.4",
-               "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-               "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+               "version": "7.3.7",
+               "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+               "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
               "dev": true,
               "requires": {
                  "lru-cache": "^6.0.0"
@@ -11352,9 +11166,9 @@
         "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
      },
      "universalify": {
-         "version": "0.2.0",
-         "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-         "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+         "version": "0.1.2",
+         "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+         "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
         "dev": true
      },
      "unset-value": {
@@ -11413,16 +11227,6 @@
         "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
         "dev": true
      },
-      "url-parse": {
-         "version": "1.5.10",
-         "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-         "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-         "dev": true,
-         "requires": {
-            "querystringify": "^2.1.1",
-            "requires-port": "^1.0.0"
-         }
-      },
      "use": {
         "version": "3.1.1",
         "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -11538,9 +11342,9 @@
         "dev": true
      },
      "word-wrap": {
-         "version": "1.2.4",
-         "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-         "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
+         "version": "1.2.3",
+         "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+         "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
         "dev": true
      },
      "wrap-ansi": {
@@ -1,11 +1,10 @@
 {
   "name": "k8s-deploy-action",
-   "version": "5.0.0",
+   "version": "0.0.0",
   "author": "Deepak Sattiraju",
   "license": "MIT",
   "scripts": {
-      "prebuild": "npm i @vercel/ncc",
-      "build": "ncc build src/run.ts -o lib",
+      "build": "npx ncc build src/run.ts -o lib",
      "test": "jest",
      "coverage": "jest --coverage=true",
      "format": "prettier --write .",
@@ -65,10 +65,17 @@ export async function deploy(

   // annotate resources
   core.startGroup('Annotating resources')
+   let allPods
+   try {
+      allPods = JSON.parse((await kubectl.getAllPods()).stdout)
+   } catch (e) {
+      core.debug(`Unable to parse pods: ${e}`)
+   }
   await annotateAndLabelResources(
      deployedManifestFiles,
      kubectl,
-      resourceTypes
+      resourceTypes,
+      allPods
   )
   core.endGroup()
 }
@@ -129,13 +129,19 @@ async function promoteCanary(kubectl: Kubectl, manifests: string[]) {

   // annotate resources
   core.startGroup('Annotating resources')
+   let allPods
+   try {
+      allPods = JSON.parse((await kubectl.getAllPods()).stdout)
+   } catch (e) {
+      core.debug(`Unable to parse pods: ${e}`)
+   }
   const resources: Resource[] = getResources(
      filesToAnnotate,
      models.DEPLOYMENT_TYPES.concat([
         models.DiscoveryAndLoadBalancerResource.SERVICE
      ])
   )
-   await annotateAndLabelResources(filesToAnnotate, kubectl, resources)
+   await annotateAndLabelResources(filesToAnnotate, kubectl, resources, allPods)
   core.endGroup()
 }

@@ -213,6 +219,17 @@ async function promoteBlueGreen(kubectl: Kubectl, manifests: string[]) {

   // annotate resources
   core.startGroup('Annotating resources')
-   await annotateAndLabelResources(deployedManifestFiles, kubectl, resources)
+   let allPods
+   try {
+      allPods = JSON.parse((await kubectl.getAllPods()).stdout)
+   } catch (e) {
+      core.debug(`Unable to parse pods: ${e}`)
+   }
+   await annotateAndLabelResources(
+      deployedManifestFiles,
+      kubectl,
+      resources,
+      allPods
+   )
   core.endGroup()
 }
@@ -147,7 +147,8 @@ export async function checkManifestStability(
 export async function annotateAndLabelResources(
   files: string[],
   kubectl: Kubectl,
-   resourceTypes: Resource[]
+   resourceTypes: Resource[],
+   allPods: any
 ) {
   const defaultWorkflowFileName = 'k8s-deploy-failed-workflow-annotation'
   const githubToken = core.getInput('token')
@@ -162,20 +163,15 @@ export async function annotateAndLabelResources(
   const deploymentConfig = await getDeploymentConfig()
   const annotationKeyLabel = getWorkflowAnnotationKeyLabel()

-   const shouldAnnotateResources = !(
-      core.getInput('annotate-resources').toLowerCase() === 'false'
-   )
-
-   if (shouldAnnotateResources) {
-      await annotateResources(
-         files,
-         kubectl,
-         resourceTypes,
-         annotationKeyLabel,
-         workflowFilePath,
-         deploymentConfig
-      ).catch((err) => core.warning(`Failed to annotate resources: ${err} `))
-   }
+   await annotateResources(
+      files,
+      kubectl,
+      resourceTypes,
+      allPods,
+      annotationKeyLabel,
+      workflowFilePath,
+      deploymentConfig
+   ).catch((err) => core.warning(`Failed to annotate resources: ${err} `))

   await labelResources(files, kubectl, annotationKeyLabel).catch((err) =>
      core.warning(`Failed to label resources: ${err}`)
@@ -186,6 +182,7 @@ async function annotateResources(
   files: string[],
   kubectl: Kubectl,
   resourceTypes: Resource[],
+   allPods: any,
   annotationKey: string,
   workflowFilePath: string,
   deploymentConfig: DeploymentConfig
@@ -229,13 +226,11 @@ async function annotateResources(
         )
      )
   }
-
   for (const file of files) {
      try {
         const annotateResult = await kubectl.annotateFiles(
            file,
-            annotationKeyValStr,
-            namespace
+            annotationKeyValStr
         )
         annotateResults.push(annotateResult)
      } catch (e) {
@@ -254,7 +249,8 @@ async function annotateResources(
               resource.type,
               resource.name,
               resource.namespace,
-               annotationKeyValStr
+               annotationKeyValStr,
+               allPods
            )
         ).forEach((execResult) => annotateResults.push(execResult))
      }
@@ -1,8 +1,8 @@
-import { PrivateKubectl, extractFileNames, replaceFileNamesWithBaseNames } from './privatekubectl'
+import {PrivateKubectl} from './privatekubectl'
 import * as exec from '@actions/exec'

 describe('Private kubectl', () => {
-   const testString = `kubectl annotate -f testdir/test.yml,test2.yml,testdir/subdir/test3.yml -f test4.yml --filename test5.yml actions.github.com/k8s-deploy={"run":"3498366832","repository":"jaiveerk/k8s-deploy","workflow":"Minikube Integration Tests - private cluster","workflowFileName":"run-integration-tests-private.yml","jobName":"run-integration-test","createdBy":"jaiveerk","runUri":"https://github.com/jaiveerk/k8s-deploy/actions/runs/3498366832","commit":"c63b323186ea1320a31290de6dcc094c06385e75","lastSuccessRunCommit":"NA","branch":"refs/heads/main","deployTimestamp":1668787848577,"dockerfilePaths":{"nginx:1.14.2":""},"manifestsPaths":["https://github.com/jaiveerk/k8s-deploy/blob/c63b323186ea1320a31290de6dcc094c06385e75/test/integration/manifests/test.yml"],"helmChartPaths":[],"provider":"GitHub"} --overwrite --namespace test-3498366832`
+   const testString = `kubectl annotate -f test.yml,test2.yml,test3.yml -f test4.yml --filename test5.yml actions.github.com/k8s-deploy={"run":"3498366832","repository":"jaiveerk/k8s-deploy","workflow":"Minikube Integration Tests - private cluster","workflowFileName":"run-integration-tests-private.yml","jobName":"run-integration-test","createdBy":"jaiveerk","runUri":"https://github.com/jaiveerk/k8s-deploy/actions/runs/3498366832","commit":"c63b323186ea1320a31290de6dcc094c06385e75","lastSuccessRunCommit":"NA","branch":"refs/heads/main","deployTimestamp":1668787848577,"dockerfilePaths":{"nginx:1.14.2":""},"manifestsPaths":["https://github.com/jaiveerk/k8s-deploy/blob/c63b323186ea1320a31290de6dcc094c06385e75/test/integration/manifests/test.yml"],"helmChartPaths":[],"provider":"GitHub"} --overwrite --namespace test-3498366832`
   const mockKube = new PrivateKubectl(
      'kubectlPath',
      'namespace',
@@ -12,21 +12,15 @@ describe('Private kubectl', () => {
   )

   it('should extract filenames correctly', () => {
-      expect(extractFileNames(testString)).toEqual(
-         ['testdir/test.yml', 'test2.yml', 'testdir/subdir/test3.yml', 'test4.yml', 'test5.yml']
-      )
-   })
-
-   it('should replace filenames with basenames correctly', () => {
-      expect(replaceFileNamesWithBaseNames(testString)).toEqual(
-         `kubectl annotate -f test.yml,test2.yml,test3.yml -f test4.yml --filename test5.yml actions.github.com/k8s-deploy={"run":"3498366832","repository":"jaiveerk/k8s-deploy","workflow":"Minikube Integration Tests - private cluster","workflowFileName":"run-integration-tests-private.yml","jobName":"run-integration-test","createdBy":"jaiveerk","runUri":"https://github.com/jaiveerk/k8s-deploy/actions/runs/3498366832","commit":"c63b323186ea1320a31290de6dcc094c06385e75","lastSuccessRunCommit":"NA","branch":"refs/heads/main","deployTimestamp":1668787848577,"dockerfilePaths":{"nginx:1.14.2":""},"manifestsPaths":["https://github.com/jaiveerk/k8s-deploy/blob/c63b323186ea1320a31290de6dcc094c06385e75/test/integration/manifests/test.yml"],"helmChartPaths":[],"provider":"GitHub"} --overwrite --namespace test-3498366832`
+      expect(mockKube.extractFilesnames(testString)).toEqual(
+         'test.yml test2.yml test3.yml test4.yml test5.yml'
      )
   })

   test('Should throw well defined Error on error from Azure', async () => {
      const errorMsg = 'An error message'
      jest.spyOn(exec, 'getExecOutput').mockImplementation(async () => {
-         return { exitCode: 1, stdout: '', stderr: errorMsg }
+         return {exitCode: 1, stdout: '', stderr: errorMsg}
      })

      await expect(mockKube.executeCommand('az', 'test')).rejects.toThrow(
@@ -1,6 +1,6 @@
-import { Kubectl } from './kubectl'
+import {Kubectl} from './kubectl'
 import * as minimist from 'minimist'
-import { ExecOptions, ExecOutput, getExecOutput } from '@actions/exec'
+import {ExecOptions, ExecOutput, getExecOutput} from '@actions/exec'
 import * as core from '@actions/core'
 import * as os from 'os'
 import * as fs from 'fs'
@@ -19,7 +19,7 @@ export class PrivateKubectl extends Kubectl {

      if (this.containsFilenames(kubectlCmd)) {
         // For private clusters, files will referenced solely by their basename
-         kubectlCmd = replaceFileNamesWithBaseNames(kubectlCmd)
+         kubectlCmd = this.replaceFilnamesWithBasenames(kubectlCmd)
         addFileFlag = true
      }

@@ -43,19 +43,21 @@ export class PrivateKubectl extends Kubectl {
      ]

      if (addFileFlag) {
-         const filenames = extractFileNames(kubectlCmd)
+         const filenames = this.extractFilesnames(kubectlCmd).split(' ')

         const tempDirectory =
            process.env['runner.tempDirectory'] || os.tmpdir() + '/manifests'
         eo.cwd = tempDirectory
         privateClusterArgs.push(...['--file', '.'])

-         for (const filename of filenames) {
-            try {
-               this.moveFileToTempManifestDir(filename)
-            } catch (e) {
-               core.debug(`Error moving file ${filename} to temp directory: ${e}`)
+         let filenamesArr = filenames[0].split(',')
+         for (let index = 0; index < filenamesArr.length; index++) {
+            const file = filenamesArr[index]
+
+            if (!file) {
+               continue
            }
+            this.moveFileToTempManifestDir(file)
         }
      }

@@ -78,7 +80,7 @@ export class PrivateKubectl extends Kubectl {
         )
      }

-      const runObj: { logs: string; exitCode: number } = JSON.parse(
+      const runObj: {logs: string; exitCode: number} = JSON.parse(
         runOutput.stdout
      )
      if (!silent) core.info(runObj.logs)
@@ -93,6 +95,48 @@ export class PrivateKubectl extends Kubectl {
      } as ExecOutput
   }

+   private replaceFilnamesWithBasenames(kubectlCmd: string) {
+      let exFilenames = this.extractFilesnames(kubectlCmd)
+      let filenames = exFilenames.split(' ')
+      let filenamesArr = filenames[0].split(',')
+
+      for (let index = 0; index < filenamesArr.length; index++) {
+         filenamesArr[index] = path.basename(filenamesArr[index])
+      }
+
+      let baseFilenames = filenamesArr.join()
+
+      let result = kubectlCmd.replace(exFilenames, baseFilenames)
+      return result
+   }
+
+   public extractFilesnames(strToParse: string) {
+      const fileNames: string[] = []
+      const argv = minimist(strToParse.split(' '))
+      const fArg = 'f'
+      const filenameArg = 'filename'
+
+      fileNames.push(...this.extractFilesFromMinimist(argv, fArg))
+      fileNames.push(...this.extractFilesFromMinimist(argv, filenameArg))
+
+      return fileNames.join(' ')
+   }
+
+   private extractFilesFromMinimist(argv, arg: string): string[] {
+      if (!argv[arg]) {
+         return []
+      }
+      const toReturn: string[] = []
+      if (typeof argv[arg] === 'string') {
+         toReturn.push(...argv[arg].split(','))
+      } else {
+         for (const value of argv[arg] as string[]) {
+            toReturn.push(...value.split(','))
+         }
+      }
+
+      return toReturn
+   }

   private containsFilenames(str: string) {
      return str.includes('-f ') || str.includes('filename ')
@@ -101,7 +145,7 @@ export class PrivateKubectl extends Kubectl {
   private createTempManifestsDirectory() {
      const manifestsDir = '/tmp/manifests'
      if (!fs.existsSync('/tmp/manifests')) {
-         fs.mkdirSync('/tmp/manifests', { recursive: true })
+         fs.mkdirSync('/tmp/manifests', {recursive: true})
      }
   }

@@ -110,8 +154,8 @@ export class PrivateKubectl extends Kubectl {
      if (!fs.existsSync('/tmp/' + file)) {
         core.debug(
            '/tmp/' +
-            file +
-            ' does not exist, and therefore cannot be moved to the manifest directory'
+               file +
+               ' does not exist, and therefore cannot be moved to the manifest directory'
         )
      }

@@ -119,63 +163,21 @@ export class PrivateKubectl extends Kubectl {
         if (err) {
            core.debug(
               'Could not rename ' +
-               '/tmp/' +
-               file +
-               ' to  ' +
-               '/tmp/manifests/' +
-               file +
-               ' ERROR: ' +
-               err
+                  '/tmp/' +
+                  file +
+                  ' to  ' +
+                  '/tmp/manifests/' +
+                  file +
+                  ' ERROR: ' +
+                  err
            )
            return
         }
         core.debug(
            "Successfully moved file '" +
-            file +
-            "' from /tmp to /tmp/manifest directory"
+               file +
+               "' from /tmp to /tmp/manifest directory"
         )
      })
   }
 }
-
-export function replaceFileNamesWithBaseNames(kubectlCmd: string) {
-   let filenames = extractFileNames(kubectlCmd)
-   let basenames = filenames.map((filename) => path.basename(filename))
-
-   let result = kubectlCmd
-   if (filenames.length != basenames.length) {
-      throw Error('replacing filenames with basenames, ' + filenames.length + ' filenames != ' + basenames.length + 'basenames')
-   }
-   for (let index = 0; index < filenames.length; index++) {
-      result = result.replace(filenames[index], basenames[index])
-   }
-   return result
-}
-
-export function extractFileNames(strToParse: string) {
-   const fileNames: string[] = []
-   const argv = minimist(strToParse.split(' '))
-   const fArg = 'f'
-   const filenameArg = 'filename'
-
-   fileNames.push(...extractFilesFromMinimist(argv, fArg))
-   fileNames.push(...extractFilesFromMinimist(argv, filenameArg))
-
-   return fileNames
-}
-
-export function extractFilesFromMinimist(argv, arg: string): string[] {
-   if (!argv[arg]) {
-      return []
-   }
-   const toReturn: string[] = []
-   if (typeof argv[arg] === 'string') {
-      toReturn.push(...argv[arg].split(','))
-   } else {
-      for (const value of argv[arg] as string[]) {
-         toReturn.push(...value.split(','))
-      }
-   }
-
-   return toReturn
-}
@@ -23,11 +23,7 @@ export async function getDeploymentConfig(): Promise<DeploymentConfig> {
      )
   }

-   const imageNames =
-      core
-         .getInput('images')
-         .split('\n')
-         .filter((image) => image.length > 0) || []
+   const imageNames = core.getInput('images').split('\n') || []
   const imageDockerfilePathMap: {[id: string]: string} = {}

   const pullImages = !(core.getInput('pull-images').toLowerCase() === 'false')
@@ -61,7 +61,8 @@ export async function annotateChildPods(
   resourceType: string,
   resourceName: string,
   namespace: string | undefined,
-   annotationKeyValStr: string
+   annotationKeyValStr: string,
+   allPods
 ): Promise<ExecOutput[]> {
   let owner = resourceName
   if (resourceType.toLowerCase().indexOf('deployment') > -1) {
@@ -69,14 +70,6 @@ export async function annotateChildPods(
   }

   const commandExecutionResults = []
-
-   let allPods
-   try {
-      allPods = JSON.parse((await kubectl.getAllPods()).stdout)
-   } catch (e) {
-      core.debug(`Unable to parse pods: ${e}`)
-   }
-
   if (allPods?.items && allPods.items?.length > 0) {
      allPods.items.forEach((pod) => {
         const owners = pod?.metadata?.ownerReferences
@@ -7,7 +7,7 @@ def delete(kind, name, namespace):
        if (name == "all"):
            print('kubectl delete --all' + kind + ' -n ' + namespace)
            deletion = subprocess.Popen(
-                ['kubectl', 'delete', kind, '--all', '--namespace', namespace])
+                ['kubectl', 'delete', kind, name, '--namespace', namespace])
            result, err = deletion.communicate()
        else:
            print('kubectl delete ' + kind + ' ' + name + ' -n ' + namespace)
@@ -21,7 +21,7 @@ def delete(kind, name, namespace):
 def main():
    kind = sys.argv[1]
    name = sys.argv[2]
-    namespace = sys.argv[3]
+    namespace = 'test-' + sys.argv[3]
    delete(kind, name, namespace)


@@ -41,6 +41,10 @@ def parseArgs(sysArgs):
        argsDict[labelsKey] = stringListToDict(
            argsDict[labelsKey].split(","), ":")

+    if annotationsKey in argsDict:
+        argsDict[annotationsKey] = stringListToDict(
+            argsDict[annotationsKey].split(","), ":")
+
    if selectorLabelsKey in argsDict:
        argsDict[selectorLabelsKey] = stringListToDict(
            argsDict[selectorLabelsKey].split(","), ":")
@@ -56,9 +60,6 @@ def parseArgs(sysArgs):
    if ingressServicesKey in argsDict:
        argsDict[ingressServicesKey] = argsDict[ingressServicesKey].split(",")

-    if annotationsKey in argsDict:
-        argsDict[annotationsKey] = argsDict[annotationsKey].split(",")
-
    return argsDict


@@ -97,14 +98,14 @@ def verifyDeployment(deployment, parsedArgs):
            return dictMatch, msg

    if annotationsKey in parsedArgs:
-        if len(parsedArgs[annotationsKey]) != len(deployment['metadata']['annotations']):
-            return False, f"expected {len(parsedArgs[annotationsKey])} annotations but found {len(deployment['metadata']['annotations'])}"
-        keysPresent, msg = validateKeyPresence(
-            deployment['metadata']['annotations'], parsedArgs[annotationsKey])
-        if not keysPresent:
-            return keysPresent, msg
+        dictMatch, msg = compareDicts(
+            deployment['metadata']['annotations'], parsedArgs[annotationsKey], annotationsKey)
+        if not dictMatch:
+            return dictMatch, msg
+
    return True, ""

+
 def verifyService(service, parsedArgs):
    # test selector labels, labels, annotations
    if not selectorLabelsKey in parsedArgs:
@@ -123,10 +124,10 @@ def verifyService(service, parsedArgs):
            return dictMatch, msg

    if annotationsKey in parsedArgs:
-        keysPresent, msg = validateKeyPresence(
-            service['metadata']['annotations'], parsedArgs[annotationsKey])
-        if not keysPresent:
-            return keysPresent, msg
+        dictMatch, msg = compareDicts(
+            service['metadata']['annotations'], parsedArgs[annotationsKey], annotationsKey)
+        if not dictMatch:
+            return dictMatch, msg

    return True, ""

@@ -187,13 +188,6 @@ def compareDicts(actual: dict, expected: dict, paramName=""):

    return True, ""

-def validateKeyPresence(actualDict: dict, expectedKeys: list):
-    actualKeys = actualDict.keys()
-    for key in expectedKeys:
-        if key not in actualKeys:
-            return False, f"expected key {key} not found in actual dict. \n actual dict keys {','.join(actualKeys)}"
-
-    return True, ""

 def main():
    parsedArgs: dict = parseArgs(sys.argv[1:])
@@ -226,7 +220,7 @@ def main():

        if k8_object == None:
            raise ValueError(f"{kind} {name} was not found")
-
+    
    except:
        msg = kind+' '+name+' not created or not found'
        getAllObjectsCmd = azPrefix + 'kubectl get '+kind+' -n '+namespace