diff --git a/.dockerignore b/.dockerignore index fe510ef..b48298b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ bin tests -cassandra-operator .github docs \ No newline at end of file diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 79c3030..454d8b0 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -8,335 +8,315 @@ env: HELM_VERSION: v3.9.2 ICARUS_VERSION: 2.0.4 PYTHON_VERSION: 3.7 # required for helm tester - IBM_CLOUD_API_KEY: ${{ secrets.IBM_CLOUD_API_KEY }} - IBM_CLOUD_REGION: us-south - IBM_CLOUD_RG: icm - IKS_CLUSTER: icm-cassandra-ci - IKS_NAMESPACE: cassandra-operator-ci - ICR_NAMESPACE: cassandra-operator - ICR_USERNAME: ${{ secrets.ICR_USERNAME }} - ICR_PASSWORD: ${{ secrets.ICR_PASSWORD }} - IMAGE_PULL_SECRET: icm-coreeng-pull-secret + ICR_NAMESPACE: mr-cassop TRIVY_SEVERITY: CRITICAL jobs: - run-unit-tests: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4 - - name: Setup Go - uses: actions/setup-go@v4 - with: - go-version: ${{ env.GO_VERSION }} + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version: ${{ env.GO_VERSION }} - - name: Go Lint - uses: golangci/golangci-lint-action@v3 - with: - args: --timeout=5m --enable exportloopref - skip-pkg-cache: true - skip-build-cache: true + - name: Go Lint + uses: golangci/golangci-lint-action@v3 + with: + args: --timeout=5m --enable exportloopref + skip-pkg-cache: true + skip-build-cache: true - - name: Get dependencies - run: go mod download + - name: Get dependencies + run: go mod download - - name: Run operator unit tests - run: go test ./controllers/... -v -coverprofile=operator_unit.out -coverpkg=./... + - name: Run operator unit tests + run: go test ./controllers/... -v -coverprofile=operator_unit.out -coverpkg=./... - - name: Run prober unit tests - run: | - cd ./prober - go test ./... -v -coverprofile=prober_unit.out -coverpkg=./... + - name: Run prober unit tests + run: | + cd ./prober + go test ./... -v -coverprofile=prober_unit.out -coverpkg=./... - - name: Get tests coverage - run: | - go tool cover -func=operator_unit.out | tail -n1 | awk "{print \"Operator unit tests coverage: \" \$3}" - go tool cover -func=prober_unit.out | tail -n1 | awk "{print \"Prober unit tests coverage: \" \$3}" + - name: Get tests coverage + run: | + go tool cover -func=operator_unit.out | tail -n1 | awk "{print \"Operator unit tests coverage: \" \$3}" + go tool cover -func=prober_unit.out | tail -n1 | awk "{print \"Prober unit tests coverage: \" \$3}" run-integration-tests: runs-on: ubuntu-latest strategy: fail-fast: true matrix: - k8s: [1.20.2, 1.21.2, 1.22.1, 1.23.1, 1.24.2] + # k8s: [1.20.2, 1.21.2, 1.22.1, 1.23.1, 1.24.2] + k8s: [1.24.2] steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Setup Go - uses: actions/setup-go@v4 - with: - go-version: ${{ env.GO_VERSION }} - - - name: Setup Kubebuilder assets - run: | - curl -sSLo envtest-bins.tar.gz "https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-$k8s-linux-amd64.tar.gz" - mkdir kubebuilder-$k8s - tar -C kubebuilder-$k8s/ --strip-components=1 -zvxf envtest-bins.tar.gz && rm -f envtest-bins.tar.gz - echo "KUBEBUILDER_ASSETS=$(pwd)/kubebuilder-$k8s/bin" >> $GITHUB_ENV - $(pwd)/kubebuilder-$k8s/bin/kube-apiserver --version - env: - k8s: ${{ matrix.k8s }} - - - name: Get dependencies - run: go mod download - - - name: Run integration tests - run: go test ./tests/integration -v -coverprofile=integration.out -coverpkg=./... - - - name: Get tests coverage - run: | - go tool cover -func=integration.out | tail -n1 | awk "{print \"Integration tests coverage: \" \$3}" + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version: ${{ env.GO_VERSION }} + + - name: Setup Kubebuilder assets + run: | + curl -sSLo envtest-bins.tar.gz "https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-$k8s-linux-amd64.tar.gz" + mkdir kubebuilder-$k8s + tar -C kubebuilder-$k8s/ --strip-components=1 -zvxf envtest-bins.tar.gz && rm -f envtest-bins.tar.gz + echo "KUBEBUILDER_ASSETS=$(pwd)/kubebuilder-$k8s/bin" >> $GITHUB_ENV + $(pwd)/kubebuilder-$k8s/bin/kube-apiserver --version + env: + k8s: ${{ matrix.k8s }} + + - name: Get dependencies + run: go mod download + + - name: Run integration tests + run: go test ./tests/integration -v -coverprofile=integration.out -coverpkg=./... + + - name: Get tests coverage + run: | + go tool cover -func=integration.out | tail -n1 | awk "{print \"Integration tests coverage: \" \$3}" build-operator: runs-on: ubuntu-latest needs: [run-unit-tests, run-integration-tests, validate-helm-charts] steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v4 - - - name: Modify GITHUB_REF_SLUG - run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV - - - name: Setup Buildx - uses: docker/setup-buildx-action@v2 - - - name: Authenticate to Docker Proxy Registry - uses: docker/login-action@v2 - with: - registry: ${{ secrets.DOCKER_PROXY_REGISTRY }} - username: ${{ secrets.ARTIFACTORY_USER }} - password: ${{ secrets.ARTIFACTORY_PASS }} - - - name: Build operator image - uses: docker/build-push-action@v4 - with: - file: Dockerfile - build-args: | - VERSION=${{ env.GITHUB_REF_SLUG }} - DOCKER_PROXY_REGISTRY=${{ secrets.DOCKER_PROXY_REGISTRY }}/ - tags: us.icr.io/${{ env.ICR_NAMESPACE }}/cassandra-operator:${{ env.GITHUB_REF_SLUG }} - outputs: type=docker,dest=cassandra-operator.tar - - - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.9.2 - with: - input: "cassandra-operator.tar" - exit-code: "1" - ignore-unfixed: true - severity: ${{ env.TRIVY_SEVERITY }} - - - name: Upload cassandra operator image artifact - uses: actions/upload-artifact@v3 - with: - name: cassandra-operator - path: cassandra-operator.tar - retention-days: 1 + - name: Checkout + uses: actions/checkout@v4 + + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v4 + + - name: Modify GITHUB_REF_SLUG + run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV + + - name: Setup Buildx + uses: docker/setup-buildx-action@v3 + + - name: Authenticate to Docker Proxy Registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build operator image + uses: docker/build-push-action@v4 + with: + file: Dockerfile + build-args: | + VERSION=${{ env.GITHUB_REF_SLUG }} + tags: cinple/mr-cassop:${{ env.GITHUB_REF_SLUG }} + outputs: type=docker,dest=mr-cassop.tar + + - name: Run Trivy vulnerability scanner + uses: aquasecurity/trivy-action@0.14.0 + with: + input: "mr-cassop.tar" + exit-code: "1" + ignore-unfixed: true + severity: ${{ env.TRIVY_SEVERITY }} + + - name: Upload mr-cassop image artifact + uses: actions/upload-artifact@v3 + with: + name: mr-cassop + path: mr-cassop.tar + retention-days: 1 build-cassandra: runs-on: ubuntu-latest needs: [run-unit-tests, run-integration-tests, validate-helm-charts] steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v4 - - - name: Modify GITHUB_REF_SLUG - run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV - - - name: Setup Buildx - uses: docker/setup-buildx-action@v2 - - - name: Authenticate to Docker Proxy Registry - uses: docker/login-action@v2 - with: - registry: ${{ secrets.DOCKER_PROXY_REGISTRY }} - username: ${{ secrets.ARTIFACTORY_USER }} - password: ${{ secrets.ARTIFACTORY_PASS }} - - - name: Build cassandra image - uses: docker/build-push-action@v4 - with: - file: ./cassandra/Dockerfile - context: ./cassandra - tags: us.icr.io/${{ env.ICR_NAMESPACE }}/cassandra:${{ env.GITHUB_REF_SLUG }} - build-args: DOCKER_PROXY_REGISTRY=${{ secrets.DOCKER_PROXY_REGISTRY }}/ - outputs: type=docker,dest=cassandra.tar - - - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.9.2 - with: - input: "cassandra.tar" - exit-code: "1" - ignore-unfixed: true - severity: ${{ env.TRIVY_SEVERITY }} - - - name: Upload cassandra image artifact - uses: actions/upload-artifact@v3 - with: - name: cassandra - path: cassandra.tar - retention-days: 1 + - name: Checkout + uses: actions/checkout@v4 + + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v4 + + - name: Modify GITHUB_REF_SLUG + run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV + + - name: Setup Buildx + uses: docker/setup-buildx-action@v3 + + - name: Authenticate to Docker Proxy Registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build cassandra image + uses: docker/build-push-action@v4 + with: + file: ./cassandra/Dockerfile + context: ./cassandra + tags: cinple/cassandra:${{ env.GITHUB_REF_SLUG }} + outputs: type=docker,dest=cassandra.tar + + # - name: Run Trivy vulnerability scanner + # uses: aquasecurity/trivy-action@0.9.2 + # with: + # input: "cassandra.tar" + # exit-code: "1" + # ignore-unfixed: true + # severity: ${{ env.TRIVY_SEVERITY }} + + - name: Upload cassandra image artifact + uses: actions/upload-artifact@v3 + with: + name: cassandra + path: cassandra.tar + retention-days: 1 build-prober: runs-on: ubuntu-latest needs: [run-unit-tests, run-integration-tests, validate-helm-charts] steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v4 - - - name: Modify GITHUB_REF_SLUG - run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV - - - name: Setup Buildx - uses: docker/setup-buildx-action@v2 - - - name: Authenticate to Docker Proxy Registry - uses: docker/login-action@v2 - with: - registry: ${{ secrets.DOCKER_PROXY_REGISTRY }} - username: ${{ secrets.ARTIFACTORY_USER }} - password: ${{ secrets.ARTIFACTORY_PASS }} - - - name: Build prober image - uses: docker/build-push-action@v4 - with: - file: ./prober/Dockerfile - context: ./prober - build-args: | - VERSION=${{ env.GITHUB_REF_SLUG }} - DOCKER_PROXY_REGISTRY=${{ secrets.DOCKER_PROXY_REGISTRY }}/ - tags: us.icr.io/${{ env.ICR_NAMESPACE }}/prober:${{ env.GITHUB_REF_SLUG }} - outputs: type=docker,dest=prober.tar - - - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.9.2 - with: - input: "prober.tar" - exit-code: "1" - ignore-unfixed: true - severity: ${{ env.TRIVY_SEVERITY }} - - - name: Upload prober image artifact - uses: actions/upload-artifact@v3 - with: - name: prober - path: prober.tar - retention-days: 1 + - name: Checkout + uses: actions/checkout@v4 + + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v4 + + - name: Modify GITHUB_REF_SLUG + run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV + + - name: Setup Buildx + uses: docker/setup-buildx-action@v3 + + - name: Authenticate to Docker Proxy Registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build prober image + uses: docker/build-push-action@v4 + with: + file: ./prober/Dockerfile + context: ./prober + build-args: | + VERSION=${{ env.GITHUB_REF_SLUG }} + tags: cinple/prober:${{ env.GITHUB_REF_SLUG }} + outputs: type=docker,dest=prober.tar + + - name: Run Trivy vulnerability scanner + uses: aquasecurity/trivy-action@0.14.0 + with: + input: "prober.tar" + exit-code: "1" + ignore-unfixed: true + severity: ${{ env.TRIVY_SEVERITY }} + + - name: Upload prober image artifact + uses: actions/upload-artifact@v3 + with: + name: prober + path: prober.tar + retention-days: 1 build-jolokia: runs-on: ubuntu-latest needs: [run-unit-tests, run-integration-tests, validate-helm-charts] steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v4 - - - name: Modify GITHUB_REF_SLUG - run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV - - - name: Setup Buildx - uses: docker/setup-buildx-action@v2 - - - name: Authenticate to Docker Proxy Registry - uses: docker/login-action@v2 - with: - registry: ${{ secrets.DOCKER_PROXY_REGISTRY }} - username: ${{ secrets.ARTIFACTORY_USER }} - password: ${{ secrets.ARTIFACTORY_PASS }} - - - name: Build jolokia image - uses: docker/build-push-action@v4 - with: - file: ./jolokia/Dockerfile - context: ./jolokia - build-args: DOCKER_PROXY_REGISTRY=${{ secrets.DOCKER_PROXY_REGISTRY }}/ - tags: us.icr.io/${{ env.ICR_NAMESPACE }}/jolokia:${{ env.GITHUB_REF_SLUG }} - outputs: type=docker,dest=jolokia.tar - - - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.9.2 - with: - input: "jolokia.tar" - exit-code: "1" - ignore-unfixed: true - severity: ${{ env.TRIVY_SEVERITY }} - - - name: Upload jolokia image artifact - uses: actions/upload-artifact@v3 - with: - name: jolokia - path: jolokia.tar - retention-days: 1 - + - name: Checkout + uses: actions/checkout@v4 + + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v4 + + - name: Modify GITHUB_REF_SLUG + run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV + + - name: Setup Buildx + uses: docker/setup-buildx-action@v3 + + - name: Authenticate to Docker Proxy Registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build jolokia image + uses: docker/build-push-action@v4 + with: + file: ./jolokia/Dockerfile + context: ./jolokia + tags: cinple/jolokia:${{ env.GITHUB_REF_SLUG }} + outputs: type=docker,dest=jolokia.tar + + - name: Run Trivy vulnerability scanner + uses: aquasecurity/trivy-action@0.14.0 + with: + input: "jolokia.tar" + exit-code: "1" + ignore-unfixed: true + severity: ${{ env.TRIVY_SEVERITY }} + + - name: Upload jolokia image artifact + uses: actions/upload-artifact@v3 + with: + name: jolokia + path: jolokia.tar + retention-days: 1 build-icarus: runs-on: ubuntu-latest needs: [run-unit-tests, run-integration-tests, validate-helm-charts] steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v4 - - - name: Modify GITHUB_REF_SLUG - run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV - - - name: Setup Buildx - uses: docker/setup-buildx-action@v2 - - - name: Authenticate to Docker Proxy Registry - uses: docker/login-action@v2 - with: - registry: ${{ secrets.DOCKER_PROXY_REGISTRY }} - username: ${{ secrets.ARTIFACTORY_USER }} - password: ${{ secrets.ARTIFACTORY_PASS }} - - - name: Build icarus image - uses: docker/build-push-action@v4 - with: - file: ./icarus/Dockerfile - context: ./icarus - build-args: | - ICARUS_VERSION: ${{ env.ICARUS_VERSION }} - DOCKER_PROXY_REGISTRY=${{ secrets.DOCKER_PROXY_REGISTRY }}/ - tags: us.icr.io/${{ env.ICR_NAMESPACE }}/icarus:${{ env.GITHUB_REF_SLUG }} - outputs: type=docker,dest=icarus.tar - - - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.9.2 - with: - input: "icarus.tar" - exit-code: "1" - ignore-unfixed: true - severity: ${{ env.TRIVY_SEVERITY }} - - - name: Upload jolokia image artifact - uses: actions/upload-artifact@v3 - with: - name: icarus - path: icarus.tar - retention-days: 1 - + - name: Checkout + uses: actions/checkout@v4 + + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v4 + + - name: Modify GITHUB_REF_SLUG + run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV + + - name: Setup Buildx + uses: docker/setup-buildx-action@v3 + + - name: Authenticate to Docker Proxy Registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build icarus image + uses: docker/build-push-action@v4 + with: + file: ./icarus/Dockerfile + context: ./icarus + build-args: | + ICARUS_VERSION: ${{ env.ICARUS_VERSION }} + tags: cinple/icarus:${{ env.GITHUB_REF_SLUG }} + outputs: type=docker,dest=icarus.tar + + # - name: Run Trivy vulnerability scanner + # uses: aquasecurity/trivy-action@0.9.2 + # with: + # input: "icarus.tar" + # exit-code: "1" + # ignore-unfixed: true + # severity: ${{ env.TRIVY_SEVERITY }} + + - name: Upload jolokia image artifact + uses: actions/upload-artifact@v3 + with: + name: icarus + path: icarus.tar + retention-days: 1 validate-helm-charts: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # ct needs history to compare @@ -365,15 +345,15 @@ jobs: run: ct lint --target-branch=main --check-version-increment=false - name: Download Pluto - uses: FairwindsOps/pluto/github-action@v5.16.0 + uses: FairwindsOps/pluto/github-action@v5.18.6 - name: Scan for deprecated k8s APIs - run: helm template cassandra-operator/ | pluto detect - + run: helm template mr-cassop/ | pluto detect - check-docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node uses: actions/setup-node@v3 with: @@ -388,10 +368,18 @@ jobs: push-images-for-e2e: if: "!contains(github.event.head_commit.message, 'e2e skip')" - needs: [build-operator, build-cassandra, build-prober, build-jolokia, build-icarus, validate-helm-charts] + needs: + [ + build-operator, + build-cassandra, + build-prober, + build-jolokia, + build-icarus, + validate-helm-charts, + ] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 @@ -399,29 +387,22 @@ jobs: - name: Modify GITHUB_REF_SLUG run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV - - name: Install IBM Cloud CLI - run: | - curl -fsSL https://clis.cloud.ibm.com/install/linux | sh - ibmcloud --version - ibmcloud config --check-version=false - ibmcloud plugin install -f container-registry - - name: Authenticate with IBM Cloud CLI - uses: nick-fields/retry@v2 - id: retry - continue-on-error: false + - name: Authenticate to Docker Proxy Registry + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Authenticate to Docker Proxy Registry + uses: docker/login-action@v2 with: - timeout_seconds: 60 - max_attempts: 3 - retry_on: error - command: | - ibmcloud login --apikey "$IBM_CLOUD_API_KEY" -r "$IBM_CLOUD_REGION" -g "$IBM_CLOUD_RG" --quiet - ibmcloud cr region-set "$IBM_CLOUD_REGION" - ibmcloud cr login + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Download operator image artifact uses: actions/download-artifact@v3 with: - name: cassandra-operator + name: mr-cassop - name: Download cassandra image artifact uses: actions/download-artifact@v3 @@ -445,135 +426,15 @@ jobs: - name: Load container images run: | - docker load -i cassandra-operator.tar + docker load -i mr-cassop.tar docker load -i cassandra.tar docker load -i prober.tar docker load -i jolokia.tar docker load -i icarus.tar - name: Push Images to ICR run: | - docker push "us.icr.io/${{ env.ICR_NAMESPACE }}/cassandra-operator:$GITHUB_REF_SLUG" - docker push "us.icr.io/${{ env.ICR_NAMESPACE }}/prober:$GITHUB_REF_SLUG" - docker push "us.icr.io/${{ env.ICR_NAMESPACE }}/cassandra:$GITHUB_REF_SLUG" - docker push "us.icr.io/${{ env.ICR_NAMESPACE }}/jolokia:$GITHUB_REF_SLUG" - docker push "us.icr.io/${{ env.ICR_NAMESPACE }}/icarus:$GITHUB_REF_SLUG" - - run-e2e-tests: - needs: [push-images-for-e2e] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Block Concurrent Executions for the Deployment - uses: softprops/turnstyle@v1 - with: - poll-interval-seconds: 10 - abort-after-seconds: 7200 - same-branch-only: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v4 - - name: Modify GITHUB_REF_SLUG - run: echo "GITHUB_REF_SLUG=$GITHUB_REF_SLUG-${{ github.run_id }}" >> $GITHUB_ENV - - name: Install IBM Cloud CLI - run: | - curl -fsSL https://clis.cloud.ibm.com/install/linux | sh - ibmcloud --version - ibmcloud config --check-version=false - ibmcloud plugin install -f kubernetes-service - ibmcloud plugin install -f container-registry - - name: Authenticate with IBM Cloud CLI - uses: nick-fields/retry@v2 - id: retry - continue-on-error: false - with: - timeout_seconds: 60 - max_attempts: 3 - retry_on: error - command: | - ibmcloud login --apikey "$IBM_CLOUD_API_KEY" -r "$IBM_CLOUD_REGION" -g "$IBM_CLOUD_RG" --quiet - ibmcloud cr region-set "$IBM_CLOUD_REGION" - ibmcloud cr login - ibmcloud ks cluster config --cluster $IKS_CLUSTER - kubectl config current-context - kubectl config set-context --current --namespace $IKS_NAMESPACE - - name: Setup k8s namespace - run: | - kubectl create namespace $IKS_NAMESPACE || true - kubectl create secret docker-registry icm-coreeng-pull-secret \ - --docker-email=a@b.c \ - --docker-username="$ICR_USERNAME" \ - --docker-password="$ICR_PASSWORD" \ - --docker-server=us.icr.io || true - - name: Deploy C* operator helm chart - uses: nick-fields/retry@v2 - with: - timeout_seconds: 60 - max_attempts: 3 - retry_on: error - command: | - helm install cassandra-operator cassandra-operator \ - --set "container.image=us.icr.io/${{ env.ICR_NAMESPACE }}/cassandra-operator:$GITHUB_REF_SLUG" \ - --set "proberImage=us.icr.io/${{ env.ICR_NAMESPACE }}/prober:$GITHUB_REF_SLUG" \ - --set "cassandraImage=us.icr.io/${{ env.ICR_NAMESPACE }}/cassandra:$GITHUB_REF_SLUG" \ - --set "jolokiaImage=us.icr.io/${{ env.ICR_NAMESPACE }}/jolokia:$GITHUB_REF_SLUG" \ - --set "icarusImage=us.icr.io/${{ env.ICR_NAMESPACE }}/icarus:$GITHUB_REF_SLUG" \ - --set "logFormat=console" \ - --set "logLevel=debug" \ - --set "container.imagePullSecret=$IMAGE_PULL_SECRET" - kubectl rollout status deployment cassandra-operator - - name: C* operator deployment has failed, showing debug... - if: ${{ failure() }} - run: | - kubectl get deployments,po - kubectl describe pod -l operator=cassandra-operator - kubectl logs deployment/cassandra-operator --tail=20 - - name: Set up Go with latest minor version 1.x - uses: actions/setup-go@v4 - with: - go-version: ^1.18 - - name: Get go dependencies - run: go mod download - - name: Install Ginkgo - run: go install github.com/onsi/ginkgo/v2/ginkgo@v2.1.4 - - name: Run e2e tests - id: e2e - run: make e2e-tests - - name: Upload logs artifact - if: ${{ always() && steps.e2e.outcome == 'failure' }} - uses: actions/upload-artifact@v3 - with: - name: logs - path: /tmp/debug-logs/ - retention-days: 7 - - name: Uninstall C* operator helm chart - if: ${{ always() }} - run: helm uninstall cassandra-operator - - name: Remove CassandraCluster CRD - if: ${{ always() }} - run: kubectl delete -f cassandra-operator/crds/db.ibm.com_cassandraclusters.yaml - - name: Remove CassandraBackup CRD - if: ${{ always() }} - run: kubectl delete -f cassandra-operator/crds/db.ibm.com_cassandrabackups.yaml - - name: Remove CassandraRestore CRD - if: ${{ always() }} - run: kubectl delete -f cassandra-operator/crds/db.ibm.com_cassandrarestores.yaml - # We have below logic bc when multiple tags exist for the same image digest within a repository, the ibmcloud cr image-rm command removes the underlying image and all its tags. See details: https://cloud.ibm.com/docs/container-registry-cli-plugin?topic=container-registry-cli-plugin-containerregcli#bx_cr_image_rm - # We can also add a check if commit message contains `no_image_del` then skip the image deletion step - - name: Cleanup k8s namespace - if: ${{ always() }} - run: kubectl delete namespace $IKS_NAMESPACE - - name: Cleanup Images - if: ${{ always() }} - run: | - for image_name in cassandra-operator prober cassandra jolokia icarus; do - image_digest=$(ibmcloud cr image-list --restrict ${{ env.ICR_NAMESPACE }} --format "{{if and (eq .Repository \"us.icr.io/cassandra-operator/$image_name\") (eq .Tag \"$GITHUB_REF_SLUG\")}}{{.Digest}}{{end}}" --no-trunc) - image_tags=$(ibmcloud cr image-digests --restrict ${{ env.ICR_NAMESPACE }} --format "{{if and (eq .Digest \"$image_digest\")}}{{.Tags}}{{end}}" | sed -e 's/\[//g' -e 's/\]//g') - image_tags_arr=($image_tags) - echo "image tags: ${image_tags_arr[@]}, number: ${#image_tags_arr[@]}" - if (( ${#image_tags_arr[@]} > 1 )); then - ibmcloud cr image-untag "us.icr.io/${{ env.ICR_NAMESPACE }}/$image_name:$GITHUB_REF_SLUG" - else - ibmcloud cr image-rm "us.icr.io/${{ env.ICR_NAMESPACE }}/$image_name:$GITHUB_REF_SLUG" - fi - done + docker push "cinple/mr-cassop:$GITHUB_REF_SLUG" + docker push "cinple/prober:$GITHUB_REF_SLUG" + docker push "cinple/cassandra:$GITHUB_REF_SLUG" + docker push "cinple/jolokia:$GITHUB_REF_SLUG" + docker push "cinple/icarus:$GITHUB_REF_SLUG" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e8f90d..5af580d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,13 +7,11 @@ on: env: HELM_VERSION: v3.9.2 - ICR_USERNAME: iamapikey - ICR_PASSWORD: ${{ secrets.IBM_CLOUD_API_KEY }} - ICR_NAMESPACE: cassandra-operator + ICR_NAMESPACE: mr-cassop HELM_REPO_USER: ${{ secrets.ARTIFACTORY_USER }} HELM_REPO_PASS: ${{ secrets.ARTIFACTORY_PASS }} HELM_REPO: ${{ secrets.ARTIFACTORY_HELM_REPO }} - CASSANDRA_VERSION: 3.11.13 + CASSANDRA_VERSION: 3.11.14 ICARUS_VERSION: 2.0.4 JMX_EXPORTER_VERSION: 0.17.0 @@ -21,58 +19,26 @@ jobs: operator: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare image metadata uses: docker/metadata-action@v4 id: meta with: images: | - us.icr.io/${{ env.ICR_NAMESPACE }}/cassandra-operator - uk.icr.io/${{ env.ICR_NAMESPACE }}/cassandra-operator - de.icr.io/${{ env.ICR_NAMESPACE }}/cassandra-operator - au.icr.io/${{ env.ICR_NAMESPACE }}/cassandra-operator - jp.icr.io/${{ env.ICR_NAMESPACE }}/cassandra-operator + cinple/mr-cassop tags: type=ref,event=tag - name: Setup Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to IBM Cloud Container Registry US - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: us.icr.io username: ${{ env.ICR_USERNAME }} password: ${{ env.ICR_PASSWORD }} - - name: Login to IBM Cloud Container Registry UK - uses: docker/login-action@v2 - with: - registry: uk.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry DE - uses: docker/login-action@v2 - with: - registry: de.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry AU - uses: docker/login-action@v2 - with: - registry: au.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry JP - uses: docker/login-action@v2 - with: - registry: jp.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - name: Build and push operator image uses: docker/build-push-action@v4 with: @@ -88,58 +54,26 @@ jobs: cassandra: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare image metadata uses: docker/metadata-action@v4 id: meta with: images: | - us.icr.io/${{ env.ICR_NAMESPACE }}/cassandra - uk.icr.io/${{ env.ICR_NAMESPACE }}/cassandra - de.icr.io/${{ env.ICR_NAMESPACE }}/cassandra - au.icr.io/${{ env.ICR_NAMESPACE }}/cassandra - jp.icr.io/${{ env.ICR_NAMESPACE }}/cassandra + cinple/cassandra tags: type=ref,prefix=${{ env.CASSANDRA_VERSION }}-,event=tag - name: Setup Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to IBM Cloud Container Registry US - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: us.icr.io username: ${{ env.ICR_USERNAME }} password: ${{ env.ICR_PASSWORD }} - - name: Login to IBM Cloud Container Registry UK - uses: docker/login-action@v2 - with: - registry: uk.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry DE - uses: docker/login-action@v2 - with: - registry: de.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry AU - uses: docker/login-action@v2 - with: - registry: au.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry JP - uses: docker/login-action@v2 - with: - registry: jp.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - name: Build and push cassandra image uses: docker/build-push-action@v4 with: @@ -156,58 +90,26 @@ jobs: prober: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare image metadata uses: docker/metadata-action@v4 id: meta with: images: | - us.icr.io/${{ env.ICR_NAMESPACE }}/prober - uk.icr.io/${{ env.ICR_NAMESPACE }}/prober - de.icr.io/${{ env.ICR_NAMESPACE }}/prober - au.icr.io/${{ env.ICR_NAMESPACE }}/prober - jp.icr.io/${{ env.ICR_NAMESPACE }}/prober + cinple/prober tags: type=ref,event=tag - name: Setup Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to IBM Cloud Container Registry US - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: us.icr.io username: ${{ env.ICR_USERNAME }} password: ${{ env.ICR_PASSWORD }} - - name: Login to IBM Cloud Container Registry UK - uses: docker/login-action@v2 - with: - registry: uk.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry DE - uses: docker/login-action@v2 - with: - registry: de.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry AU - uses: docker/login-action@v2 - with: - registry: au.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry JP - uses: docker/login-action@v2 - with: - registry: jp.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - name: Build and push prober image uses: docker/build-push-action@v4 with: @@ -223,58 +125,26 @@ jobs: jolokia: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare image metadata uses: docker/metadata-action@v4 id: meta with: images: | - us.icr.io/${{ env.ICR_NAMESPACE }}/jolokia - uk.icr.io/${{ env.ICR_NAMESPACE }}/jolokia - de.icr.io/${{ env.ICR_NAMESPACE }}/jolokia - au.icr.io/${{ env.ICR_NAMESPACE }}/jolokia - jp.icr.io/${{ env.ICR_NAMESPACE }}/jolokia + cinple/jolokia tags: type=ref,event=tag - name: Setup Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to IBM Cloud Container Registry US - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: us.icr.io username: ${{ env.ICR_USERNAME }} password: ${{ env.ICR_PASSWORD }} - - name: Login to IBM Cloud Container Registry UK - uses: docker/login-action@v2 - with: - registry: uk.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry DE - uses: docker/login-action@v2 - with: - registry: de.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry AU - uses: docker/login-action@v2 - with: - registry: au.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry JP - uses: docker/login-action@v2 - with: - registry: jp.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - name: Build and push jolokia image uses: docker/build-push-action@v4 with: @@ -290,58 +160,26 @@ jobs: icarus: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare image metadata uses: docker/metadata-action@v4 id: meta with: images: | - us.icr.io/${{ env.ICR_NAMESPACE }}/icarus - uk.icr.io/${{ env.ICR_NAMESPACE }}/icarus - de.icr.io/${{ env.ICR_NAMESPACE }}/icarus - au.icr.io/${{ env.ICR_NAMESPACE }}/icarus - jp.icr.io/${{ env.ICR_NAMESPACE }}/icarus + cinple/icarus tags: type=ref,event=tag - name: Setup Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to IBM Cloud Container Registry US - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: us.icr.io username: ${{ env.ICR_USERNAME }} password: ${{ env.ICR_PASSWORD }} - - name: Login to IBM Cloud Container Registry UK - uses: docker/login-action@v2 - with: - registry: uk.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry DE - uses: docker/login-action@v2 - with: - registry: de.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry AU - uses: docker/login-action@v2 - with: - registry: au.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - - name: Login to IBM Cloud Container Registry JP - uses: docker/login-action@v2 - with: - registry: jp.icr.io - username: ${{ env.ICR_USERNAME }} - password: ${{ env.ICR_PASSWORD }} - - name: Build and push icarus image uses: docker/build-push-action@v4 with: @@ -360,7 +198,7 @@ jobs: outputs: tag: ${{ steps.get_release_tag.outputs.tag }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - id: get_release_tag run: echo "::set-output name=tag::${GITHUB_REF##*/}" @@ -375,26 +213,26 @@ jobs: mkdir bin curl -Lo ./bin/yq https://github.com/mikefarah/yq/releases/download/3.4.0/yq_linux_amd64 chmod +x ./bin/yq - ./bin/yq w -i cassandra-operator/values.yaml 'container.image' $(./bin/yq r cassandra-operator/values.yaml 'container.image' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") - ./bin/yq w -i cassandra-operator/values.yaml 'proberImage' $(./bin/yq r cassandra-operator/values.yaml 'proberImage' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") - ./bin/yq w -i cassandra-operator/values.yaml 'cassandraImage' $(./bin/yq r cassandra-operator/values.yaml 'cassandraImage' | sed "s/:.*/:${{ env.CASSANDRA_VERSION }}-${{ steps.get_release_tag.outputs.tag }}/") - ./bin/yq w -i cassandra-operator/values.yaml 'jolokiaImage' $(./bin/yq r cassandra-operator/values.yaml 'jolokiaImage' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") - ./bin/yq w -i cassandra-operator/values.yaml 'icarusImage' $(./bin/yq r cassandra-operator/values.yaml 'icarusImage' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") - ./bin/yq w -i cassandra-operator/Chart.yaml 'appVersion' $(./bin/yq r cassandra-operator/Chart.yaml 'appVersion' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") - ./bin/yq w -i cassandra-operator/Chart.yaml 'version' $(./bin/yq r cassandra-operator/Chart.yaml 'version' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") - - - name: Package cassandra-operator chart + ./bin/yq w -i mr-cassop/values.yaml 'container.image' $(./bin/yq r mr-cassop/values.yaml 'container.image' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") + ./bin/yq w -i mr-cassop/values.yaml 'proberImage' $(./bin/yq r mr-cassop/values.yaml 'proberImage' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") + ./bin/yq w -i mr-cassop/values.yaml 'cassandraImage' $(./bin/yq r mr-cassop/values.yaml 'cassandraImage' | sed "s/:.*/:${{ env.CASSANDRA_VERSION }}-${{ steps.get_release_tag.outputs.tag }}/") + ./bin/yq w -i mr-cassop/values.yaml 'jolokiaImage' $(./bin/yq r mr-cassop/values.yaml 'jolokiaImage' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") + ./bin/yq w -i mr-cassop/values.yaml 'icarusImage' $(./bin/yq r mr-cassop/values.yaml 'icarusImage' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") + ./bin/yq w -i mr-cassop/Chart.yaml 'appVersion' $(./bin/yq r mr-cassop/Chart.yaml 'appVersion' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") + ./bin/yq w -i mr-cassop/Chart.yaml 'version' $(./bin/yq r mr-cassop/Chart.yaml 'version' | sed "s/:.*/:${{ steps.get_release_tag.outputs.tag }}/") + + - name: Package mr-cassop chart env: VERSION: ${{ steps.get_release_tag.outputs.tag }} - run: helm package cassandra-operator --version=${{ steps.get_release_tag.outputs.tag }} --app-version=${{ steps.get_release_tag.outputs.tag }} + run: helm package mr-cassop --version=${{ steps.get_release_tag.outputs.tag }} --app-version=${{ steps.get_release_tag.outputs.tag }} - - name: Publish cassandra-operator chart + - name: Publish mr-cassop chart env: VERSION: ${{ steps.get_release_tag.outputs.tag }} run: | - md5sum_var=$(md5sum ./cassandra-operator-${{ steps.get_release_tag.outputs.tag }}.tgz | awk '{ print $1 }') - sha1sum_var=$(sha1sum ./cassandra-operator-${{ steps.get_release_tag.outputs.tag }}.tgz | awk '{ print $1 }') - curl -s -o /dev/null -w '%{http_code}' -u$HELM_REPO_USER:$HELM_REPO_PASS -T ./cassandra-operator-${{ steps.get_release_tag.outputs.tag }}.tgz --header X-Checksum-MD5:$md5sum_var --header X-Checksum-Sha1:$sha1sum_var $HELM_REPO/cassandra-operator-${{ steps.get_release_tag.outputs.tag }}.tgz + md5sum_var=$(md5sum ./mr-cassop-${{ steps.get_release_tag.outputs.tag }}.tgz | awk '{ print $1 }') + sha1sum_var=$(sha1sum ./mr-cassop-${{ steps.get_release_tag.outputs.tag }}.tgz | awk '{ print $1 }') + curl -s -o /dev/null -w '%{http_code}' -u$HELM_REPO_USER:$HELM_REPO_PASS -T ./mr-cassop-${{ steps.get_release_tag.outputs.tag }}.tgz --header X-Checksum-MD5:$md5sum_var --header X-Checksum-Sha1:$sha1sum_var $HELM_REPO/mr-cassop-${{ steps.get_release_tag.outputs.tag }}.tgz - name: Commit and push updated values.yaml env: @@ -402,7 +240,7 @@ jobs: run: | git config --global user.email "" git config --global user.name "Github Actions CI" - git commit -m "Release ${{ steps.get_release_tag.outputs.tag }}" cassandra-operator/values.yaml cassandra-operator/Chart.yaml + git commit -m "Release ${{ steps.get_release_tag.outputs.tag }}" mr-cassop/values.yaml mr-cassop/Chart.yaml git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} HEAD:main @@ -411,7 +249,7 @@ jobs: needs: [helm-release] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node uses: actions/setup-node@v3 @@ -431,56 +269,56 @@ jobs: cd ./docs npm ci npx docusaurus deploy - - name: Slack notification - run: | - curl -X POST ${{ secrets.SLACK_WEBHOOK }} \ - -H 'Content-type: application/json; charset=utf-8' \ - --data \ - '{ - "channel": "#cassandra-releases", - "username": "actions@github.com", - "icon_url": "https://raw.githubusercontent.com/docker-library/docs/fb8596d619703fc556e6d56e12584d8bfdf13785/cassandra/logo.png", - "blocks": [ - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": ":rocket:A new version of the Cassandra Operator has been released *${{ needs.helm-release.outputs.tag }}*" - } - }, - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": "Take a look at the to get more details.\nRead to get started." - } - } - ] - }' - - - name: Slack notification - run: | - curl -X POST ${{ secrets.SLACK_WEBHOOK }} \ - -H 'Content-type: application/json; charset=utf-8' \ - --data \ - '{ - "channel": "#icm-questions", - "username": "actions@github.com", - "icon_url": "https://raw.githubusercontent.com/docker-library/docs/fb8596d619703fc556e6d56e12584d8bfdf13785/cassandra/logo.png", - "blocks": [ - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": ":rocket:A new version of the Cassandra Operator has been released *${{ needs.helm-release.outputs.tag }}*" - } - }, - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": "Take a look at the to get more details.\nRead to get started." - } - } - ] - }' + # - name: Slack notification + # run: | + # curl -X POST ${{ secrets.SLACK_WEBHOOK }} \ + # -H 'Content-type: application/json; charset=utf-8' \ + # --data \ + # '{ + # "channel": "#cassandra-releases", + # "username": "actions@github.com", + # "icon_url": "https://raw.githubusercontent.com/docker-library/docs/fb8596d619703fc556e6d56e12584d8bfdf13785/cassandra/logo.png", + # "blocks": [ + # { + # "type": "section", + # "text": { + # "type": "mrkdwn", + # "text": ":rocket:A new version of mr-cassop has been released *${{ needs.helm-release.outputs.tag }}*" + # } + # }, + # { + # "type": "section", + # "text": { + # "type": "mrkdwn", + # "text": "Take a look at the to get more details.\nRead to get started." + # } + # } + # ] + # }' + + # - name: Slack notification + # run: | + # curl -X POST ${{ secrets.SLACK_WEBHOOK }} \ + # -H 'Content-type: application/json; charset=utf-8' \ + # --data \ + # '{ + # "channel": "#icm-questions", + # "username": "actions@github.com", + # "icon_url": "https://raw.githubusercontent.com/docker-library/docs/fb8596d619703fc556e6d56e12584d8bfdf13785/cassandra/logo.png", + # "blocks": [ + # { + # "type": "section", + # "text": { + # "type": "mrkdwn", + # "text": ":rocket:A new version of mr-cassop has been released *${{ needs.helm-release.outputs.tag }}*" + # } + # }, + # { + # "type": "section", + # "text": { + # "type": "mrkdwn", + # "text": "Take a look at the to get more details.\nRead to get started." + # } + # } + # ] + # }' diff --git a/Dockerfile b/Dockerfile index 1c5c843..00d8ad0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -ARG DOCKER_PROXY_REGISTRY="" -FROM ${DOCKER_PROXY_REGISTRY}golang:1.18 as builder +FROM golang:1.18 as builder WORKDIR /workspace @@ -17,21 +16,21 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on \ go build \ -ldflags "-X main.Version=$VERSION" \ -a \ - -o bin/cassandra-operator main.go + -o bin/mr-cassop main.go -ARG DOCKER_PROXY_REGISTRY="" -FROM ${DOCKER_PROXY_REGISTRY}debian:bookworm-slim +FROM debian:buster-slim WORKDIR / + RUN apt-get update && \ apt-get install -y ca-certificates && \ update-ca-certificates && \ - rm -rf /var/lib/apt/lists/* - -RUN addgroup --gid 901 cassandra-operator && adduser --uid 901 --gid 901 --home /home/cassandra-operator cassandra-operator + rm -rf /var/lib/apt/lists/* && \ + addgroup --gid 901 mr-cassop && \ + adduser --uid 901 --gid 901 --home /home/mr-cassop mr-cassop -COPY --from=builder /workspace/bin/cassandra-operator . -USER cassandra-operator +COPY --from=builder /workspace/bin/mr-cassop . +USER mr-cassop -ENTRYPOINT ["/cassandra-operator"] +ENTRYPOINT ["/mr-cassop"] diff --git a/Makefile b/Makefile index 6ee829d..e4a9338 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ SHELL ?= bash # Current Operator version VERSION ?= 0.0.1 # Default bundle image tag -IMAGE_TAG_BASE ?= ibmcom/cassandra-operator +IMAGE_TAG_BASE ?= ibmcom/mr-cassop BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) # Options for 'bundle-build' ifneq ($(origin CHANNELS), undefined) @@ -82,8 +82,8 @@ deploy: manifests kustomize # Generate manifests e.g. CRD, RBAC etc. manifests: controller-gen $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role output:rbac:none paths="./..." output:crd:artifacts:config=config/crd/bases - $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role output:rbac:none paths="./..." output:crd:artifacts:config=$(ROOT_DIR)cassandra-operator/crds - $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=cassandra-operator paths="./..." output:crd:none output:rbac:stdout > $(ROOT_DIR)cassandra-operator/templates/clusterrole.yaml + $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role output:rbac:none paths="./..." output:crd:artifacts:config=$(ROOT_DIR)mr-cassop/crds + $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=mr-cassop paths="./..." output:crd:none output:rbac:stdout > $(ROOT_DIR)mr-cassop/templates/clusterrole.yaml # Run go fmt against code fmt: diff --git a/PROJECT b/PROJECT index f78ee41..6132f7c 100644 --- a/PROJECT +++ b/PROJECT @@ -1,12 +1,12 @@ domain: ibm.com layout: go.kubebuilder.io/v3 -repo: github.com/ibm/cassandra-operator +repo: github.com/cin/mr-cassop resources: - domain: ibm.com controller: true group: db kind: CassandraCluster - path: github.com/ibm/cassandra-operator/api/v1alpha1 + path: github.com/cin/mr-cassop/api/v1alpha1 version: v1alpha1 webhooks: validation: true diff --git a/api/v1alpha1/cassandrabackup_types.go b/api/v1alpha1/cassandrabackup_types.go index 73f9ce5..032c3d4 100644 --- a/api/v1alpha1/cassandrabackup_types.go +++ b/api/v1alpha1/cassandrabackup_types.go @@ -2,10 +2,11 @@ package v1alpha1 import ( "fmt" - "github.com/ibm/cassandra-operator/controllers/util" + "strings" + + "github.com/cin/mr-cassop/controllers/util" "go.uber.org/zap" v1 "k8s.io/api/core/v1" - "strings" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/api/v1alpha1/cassandrabackup_webhook.go b/api/v1alpha1/cassandrabackup_webhook.go index 3d2509e..74d49b7 100644 --- a/api/v1alpha1/cassandrabackup_webhook.go +++ b/api/v1alpha1/cassandrabackup_webhook.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/ibm/cassandra-operator/controllers/util" + "github.com/cin/mr-cassop/controllers/util" "k8s.io/apimachinery/pkg/runtime" kerrors "k8s.io/apimachinery/pkg/util/errors" diff --git a/api/v1alpha1/cassandracluster_types.go b/api/v1alpha1/cassandracluster_types.go index 2fea8b1..951cddf 100755 --- a/api/v1alpha1/cassandracluster_types.go +++ b/api/v1alpha1/cassandracluster_types.go @@ -43,7 +43,7 @@ const ( CassandraOperatorAdminPassword = "admin-password" CassandraOperatorInstance = "operator" - CassandraOperatorInstanceName = "cassandra-operator" + CassandraOperatorInstanceName = "mr-cassop" ProberServicePort = 80 JolokiaContainerPort = 8080 diff --git a/api/v1alpha1/cassandracluster_webhook.go b/api/v1alpha1/cassandracluster_webhook.go index d854835..d5c1751 100644 --- a/api/v1alpha1/cassandracluster_webhook.go +++ b/api/v1alpha1/cassandracluster_webhook.go @@ -21,8 +21,8 @@ import ( "strconv" "time" + "github.com/cin/mr-cassop/controllers/util" "github.com/google/go-cmp/cmp" - "github.com/ibm/cassandra-operator/controllers/util" "go.uber.org/zap" "k8s.io/apimachinery/pkg/runtime" diff --git a/cassandra/Dockerfile b/cassandra/Dockerfile index 0f708cc..19554d4 100644 --- a/cassandra/Dockerfile +++ b/cassandra/Dockerfile @@ -1,9 +1,8 @@ -ARG DOCKER_PROXY_REGISTRY="" -ARG CASSANDRA_VERSION=3.11.13 -FROM ${DOCKER_PROXY_REGISTRY}cassandra:${CASSANDRA_VERSION} -ARG JMX_EXPORTER_VERSION=0.17.0 -ENV INSTACLUSTR_CASSANDRA_EXPORTER_VERSION=0.9.10 -ENV DATASTAX_CASSANDRA_EXPORTER_VERSION=0.3.1 +ARG CASSANDRA_VERSION=3.11.17 +FROM cassandra:${CASSANDRA_VERSION} +ARG JMX_EXPORTER_VERSION=0.17.2 +ENV INSTACLUSTR_CASSANDRA_EXPORTER_VERSION=0.9.14 +ENV DATASTAX_CASSANDRA_EXPORTER_VERSION=0.3.5 RUN set -eux; \ # wget_jar org name version dest_dir @@ -19,8 +18,8 @@ RUN set -eux; \ wget; \ wget_jar mx4j mx4j-tools 3.0.1 /mx4j; \ wget_jar io/prometheus/jmx jmx_prometheus_javaagent ${JMX_EXPORTER_VERSION} /prometheus; \ - wget https://github.com/instaclustr/cassandra-exporter/releases/download/v$INSTACLUSTR_CASSANDRA_EXPORTER_VERSION/cassandra-exporter-agent-$INSTACLUSTR_CASSANDRA_EXPORTER_VERSION.jar -O /prometheus/cassandra-exporter-agent.jar; \ - wget https://github.com/datastax/metric-collector-for-apache-cassandra/releases/download/v$DATASTAX_CASSANDRA_EXPORTER_VERSION/datastax-mcac-agent-$DATASTAX_CASSANDRA_EXPORTER_VERSION.tar.gz -O /tmp/datastax-mcac-agent.tgz; \ + wget https://github.com/instaclustr/cassandra-exporter/releases/download/v${INSTACLUSTR_CASSANDRA_EXPORTER_VERSION}/cassandra-exporter-agent-${INSTACLUSTR_CASSANDRA_EXPORTER_VERSION}.jar -O /prometheus/cassandra-exporter-agent.jar; \ + wget https://github.com/datastax/metric-collector-for-apache-cassandra/releases/download/v${DATASTAX_CASSANDRA_EXPORTER_VERSION}/datastax-mcac-agent-${DATASTAX_CASSANDRA_EXPORTER_VERSION}.tar.gz -O /tmp/datastax-mcac-agent.tgz; \ tar zxf /tmp/datastax-mcac-agent.tgz -C /prometheus; \ mv /prometheus/datastax-mcac-agent-* /prometheus/datastax-mcac-agent; \ rm -rf /var/lib/apt/lists/* /tmp/datastax-mcac-agent.tgz /prometheus/datastax-mcac-agent/config; \ diff --git a/config/crd/bases/db.ibm.com_cassandrabackups.yaml b/config/crd/bases/db.ibm.com_cassandrabackups.yaml index 984d18b..6e08d09 100644 --- a/config/crd/bases/db.ibm.com_cassandrabackups.yaml +++ b/config/crd/bases/db.ibm.com_cassandrabackups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.11.2 creationTimestamp: null name: cassandrabackups.db.ibm.com spec: diff --git a/config/crd/bases/db.ibm.com_cassandraclusters.yaml b/config/crd/bases/db.ibm.com_cassandraclusters.yaml index 5d53667..3797905 100755 --- a/config/crd/bases/db.ibm.com_cassandraclusters.yaml +++ b/config/crd/bases/db.ibm.com_cassandraclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.11.2 creationTimestamp: null name: cassandraclusters.db.ibm.com spec: diff --git a/config/crd/bases/db.ibm.com_cassandrarestores.yaml b/config/crd/bases/db.ibm.com_cassandrarestores.yaml index cb905dd..fa7a927 100644 --- a/config/crd/bases/db.ibm.com_cassandrarestores.yaml +++ b/config/crd/bases/db.ibm.com_cassandrarestores.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.11.2 creationTimestamp: null name: cassandrarestores.db.ibm.com spec: @@ -177,7 +177,7 @@ spec: type: boolean snapshotTag: description: Name of the snapshot tag to restore. Can be used to manually - set the snapshot tag. Retrieved from CassandraBackup if specified + set the snapshot tag. Retrieved from CassandraBackup if not specified type: string storageLocation: description: 'example: gcp://myBucket location of SSTables A value diff --git a/config/samples/cassandracluster.yaml b/config/samples/cassandracluster.yaml index e7a1b1b..54bc81d 100644 --- a/config/samples/cassandracluster.yaml +++ b/config/samples/cassandracluster.yaml @@ -29,7 +29,7 @@ spec: - -Xmx1024M - -Xms1024M monitoring: - enabled: true + enabled: false agent: "instaclustr" serviceMonitor: enabled: true @@ -54,7 +54,7 @@ spec: cpu: 200m memory: 256Mi serviceMonitor: - enabled: true + enabled: false reaper: incrementalRepair: false repairParallelism: "DATACENTER_AWARE" @@ -83,7 +83,7 @@ spec: incrementalRepair: false repairParallelism: "DATACENTER_AWARE" serviceMonitor: - enabled: true + enabled: false namespace: "" labels: {} scrapeInterval: 60s diff --git a/controllers/admin_auth.go b/controllers/admin_auth.go index 5a45806..ee9906c 100644 --- a/controllers/admin_auth.go +++ b/controllers/admin_auth.go @@ -4,13 +4,13 @@ import ( "context" "fmt" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/cassandra.go b/controllers/cassandra.go index 0907e4b..b50f065 100755 --- a/controllers/cassandra.go +++ b/controllers/cassandra.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/util" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/util" "github.com/pkg/errors" ) diff --git a/controllers/cassandra_configmap.go b/controllers/cassandra_configmap.go index 367f9bc..476e112 100644 --- a/controllers/cassandra_configmap.go +++ b/controllers/cassandra_configmap.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "github.com/ibm/cassandra-operator/controllers/events" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/cassandra_container.go b/controllers/cassandra_container.go index b3c95ce..3bbc05f 100644 --- a/controllers/cassandra_container.go +++ b/controllers/cassandra_container.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/controllers/cassandra_icarus_container.go b/controllers/cassandra_icarus_container.go index 3853f02..d675d63 100644 --- a/controllers/cassandra_icarus_container.go +++ b/controllers/cassandra_icarus_container.go @@ -1,7 +1,7 @@ package controllers import ( - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" v1 "k8s.io/api/core/v1" ) diff --git a/controllers/cassandra_init_containers.go b/controllers/cassandra_init_containers.go index 1c96daa..622158e 100644 --- a/controllers/cassandra_init_containers.go +++ b/controllers/cassandra_init_containers.go @@ -5,8 +5,8 @@ import ( "sort" "strings" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/controllers/cassandra_pod_ips.go b/controllers/cassandra_pod_ips.go index e69915b..b22e157 100644 --- a/controllers/cassandra_pod_ips.go +++ b/controllers/cassandra_pod_ips.go @@ -3,11 +3,11 @@ package controllers import ( "context" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/google/go-cmp/cmp" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/cassandra_pod_labels.go b/controllers/cassandra_pod_labels.go index e0ba7c7..da10b75 100644 --- a/controllers/cassandra_pod_labels.go +++ b/controllers/cassandra_pod_labels.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/pkg/errors" ) diff --git a/controllers/cassandra_pods_config.go b/controllers/cassandra_pods_config.go index 4519e38..7ce8187 100755 --- a/controllers/cassandra_pods_config.go +++ b/controllers/cassandra_pods_config.go @@ -6,14 +6,14 @@ import ( "sort" "strings" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/prober" - "github.com/ibm/cassandra-operator/controllers/util" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/prober" + "github.com/cin/mr-cassop/controllers/util" "github.com/pkg/errors" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) diff --git a/controllers/cassandra_pods_config_test.go b/controllers/cassandra_pods_config_test.go index 92aae6a..a70a1e6 100755 --- a/controllers/cassandra_pods_config_test.go +++ b/controllers/cassandra_pods_config_test.go @@ -9,16 +9,16 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/ibm/cassandra-operator/controllers/events" + "github.com/cin/mr-cassop/controllers/events" "k8s.io/client-go/tools/record" "go.uber.org/zap" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/mocks" + "github.com/cin/mr-cassop/controllers/prober" "github.com/gogo/protobuf/proto" "github.com/golang/mock/gomock" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/mocks" - "github.com/ibm/cassandra-operator/controllers/prober" . "github.com/onsi/gomega" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" diff --git a/controllers/cassandra_rbac.go b/controllers/cassandra_rbac.go index 38b697f..c69ffd4 100644 --- a/controllers/cassandra_rbac.go +++ b/controllers/cassandra_rbac.go @@ -3,10 +3,10 @@ package controllers import ( "context" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/pkg/errors" diff --git a/controllers/cassandra_scaling.go b/controllers/cassandra_scaling.go index 943fda4..bf93d01 100644 --- a/controllers/cassandra_scaling.go +++ b/controllers/cassandra_scaling.go @@ -9,12 +9,12 @@ import ( "github.com/google/go-cmp/cmp" "k8s.io/apimachinery/pkg/types" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/nodectl" - "github.com/ibm/cassandra-operator/controllers/util" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/nodectl" + "github.com/cin/mr-cassop/controllers/util" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/cassandra_service.go b/controllers/cassandra_service.go index c46ca3c..f77f616 100644 --- a/controllers/cassandra_service.go +++ b/controllers/cassandra_service.go @@ -3,10 +3,10 @@ package controllers import ( "context" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/cassandra_service_monitor.go b/controllers/cassandra_service_monitor.go index 49665f6..af29417 100644 --- a/controllers/cassandra_service_monitor.go +++ b/controllers/cassandra_service_monitor.go @@ -2,9 +2,10 @@ package controllers import ( "context" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/labels" + + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/labels" v1 "k8s.io/api/core/v1" "github.com/pkg/errors" diff --git a/controllers/cassandra_statefulset.go b/controllers/cassandra_statefulset.go index 850848f..0d97c71 100644 --- a/controllers/cassandra_statefulset.go +++ b/controllers/cassandra_statefulset.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/controllers/cassandra_tls.go b/controllers/cassandra_tls.go index ee84f27..1c9fd3a 100644 --- a/controllers/cassandra_tls.go +++ b/controllers/cassandra_tls.go @@ -8,12 +8,12 @@ import ( "os" "regexp" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/certs" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/certs" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/cassandra_tls_test.go b/controllers/cassandra_tls_test.go index 0e8c06b..23b0452 100644 --- a/controllers/cassandra_tls_test.go +++ b/controllers/cassandra_tls_test.go @@ -4,12 +4,13 @@ import ( "context" "encoding/base64" "fmt" + "testing" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "testing" - "github.com/ibm/cassandra-operator/api/v1alpha1" + "github.com/cin/mr-cassop/api/v1alpha1" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/client/fake" ) diff --git a/controllers/cassandrabackup/backup.go b/controllers/cassandrabackup/backup.go index f3c6ef9..03b9cae 100644 --- a/controllers/cassandrabackup/backup.go +++ b/controllers/cassandrabackup/backup.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/icarus" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/icarus" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/controllers/cassandrabackup/controller.go b/controllers/cassandrabackup/controller.go index 4d05e6f..fffda6d 100644 --- a/controllers/cassandrabackup/controller.go +++ b/controllers/cassandrabackup/controller.go @@ -9,11 +9,11 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/config" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/icarus" - "github.com/ibm/cassandra-operator/controllers/names" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/config" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/icarus" + "github.com/cin/mr-cassop/controllers/names" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/cassandrabackup/icarus.go b/controllers/cassandrabackup/icarus.go index 6357d00..23ab01b 100644 --- a/controllers/cassandrabackup/icarus.go +++ b/controllers/cassandrabackup/icarus.go @@ -3,10 +3,10 @@ package cassandrabackup import ( "fmt" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/icarus" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/icarus" ) func createBackupRequest(cc *v1alpha1.CassandraCluster, backup *v1alpha1.CassandraBackup) icarus.BackupRequest { diff --git a/controllers/cassandrabackup/status.go b/controllers/cassandrabackup/status.go index 05e2578..63d85f1 100644 --- a/controllers/cassandrabackup/status.go +++ b/controllers/cassandrabackup/status.go @@ -3,9 +3,9 @@ package cassandrabackup import ( "context" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/icarus" "github.com/google/go-cmp/cmp" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/icarus" ) func (r *CassandraBackupReconciler) reconcileStatus(ctx context.Context, cb *v1alpha1.CassandraBackup, relatedIcarusBackup icarus.Backup) error { diff --git a/controllers/cassandrarestore/controller.go b/controllers/cassandrarestore/controller.go index a12a458..f985e3c 100644 --- a/controllers/cassandrarestore/controller.go +++ b/controllers/cassandrarestore/controller.go @@ -9,11 +9,11 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/config" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/icarus" - "github.com/ibm/cassandra-operator/controllers/names" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/config" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/icarus" + "github.com/cin/mr-cassop/controllers/names" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/cassandrarestore/icarus.go b/controllers/cassandrarestore/icarus.go index 46e1e46..1ea5ae2 100644 --- a/controllers/cassandrarestore/icarus.go +++ b/controllers/cassandrarestore/icarus.go @@ -3,10 +3,10 @@ package cassandrarestore import ( "fmt" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/icarus" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/icarus" ) func createRestoreReq(cc *v1alpha1.CassandraCluster, backup *v1alpha1.CassandraBackup, restore *v1alpha1.CassandraRestore) icarus.RestoreRequest { diff --git a/controllers/cassandrarestore/restore.go b/controllers/cassandrarestore/restore.go index 9dad1b0..985b3cb 100644 --- a/controllers/cassandrarestore/restore.go +++ b/controllers/cassandrarestore/restore.go @@ -3,8 +3,8 @@ package cassandrarestore import ( "context" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/icarus" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/icarus" "github.com/pkg/errors" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/controllers/cassandrarestore/status.go b/controllers/cassandrarestore/status.go index 27cf946..01efaa9 100644 --- a/controllers/cassandrarestore/status.go +++ b/controllers/cassandrarestore/status.go @@ -3,9 +3,9 @@ package cassandrarestore import ( "context" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/icarus" "github.com/google/go-cmp/cmp" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/icarus" ) func (r *CassandraRestoreReconciler) reconcileStatus(ctx context.Context, cr *v1alpha1.CassandraRestore, relatedIcarusRestore icarus.Restore) error { diff --git a/controllers/collectd_configmap.go b/controllers/collectd_configmap.go index cbaf53d..5753834 100644 --- a/controllers/collectd_configmap.go +++ b/controllers/collectd_configmap.go @@ -2,10 +2,11 @@ package controllers import ( "context" + + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/config/config.go b/controllers/config/config.go index 369e4ce..016e244 100644 --- a/controllers/config/config.go +++ b/controllers/config/config.go @@ -16,7 +16,7 @@ var ( } ) -// Config contains the Cassandra Operator configs +// Config contains mr-cassop configs type Config struct { Namespace string `env:"NAMESPACE" envDefault:"default"` LeaderElectionEnabled bool `env:"LEADERELECTION_ENABLED" envDefault:"true"` diff --git a/controllers/controller.go b/controllers/controller.go index 39cfe47..dd002af 100755 --- a/controllers/controller.go +++ b/controllers/controller.go @@ -18,16 +18,16 @@ import ( "net/url" "time" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/config" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/eventhandler" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/jobs" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/nodectl" - "github.com/ibm/cassandra-operator/controllers/prober" - "github.com/ibm/cassandra-operator/controllers/reaper" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/config" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/eventhandler" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/jobs" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/nodectl" + "github.com/cin/mr-cassop/controllers/prober" + "github.com/cin/mr-cassop/controllers/reaper" "github.com/gocql/gocql" "github.com/pkg/errors" diff --git a/controllers/controller_test.go b/controllers/controller_test.go index a60e995..64f72d3 100644 --- a/controllers/controller_test.go +++ b/controllers/controller_test.go @@ -4,15 +4,15 @@ import ( "net/url" "testing" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/config" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/mocks" + "github.com/cin/mr-cassop/controllers/prober" + "github.com/cin/mr-cassop/controllers/reaper" "github.com/gocql/gocql" "github.com/golang/mock/gomock" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/config" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/mocks" - "github.com/ibm/cassandra-operator/controllers/prober" - "github.com/ibm/cassandra-operator/controllers/reaper" "go.uber.org/zap" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" diff --git a/controllers/cql.go b/controllers/cql.go index e74effe..34e7219 100644 --- a/controllers/cql.go +++ b/controllers/cql.go @@ -6,9 +6,9 @@ import ( "go.uber.org/zap" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" "github.com/gocql/gocql" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" ) func newCassandraConfig(cc *v1alpha1.CassandraCluster, adminRole string, adminPwd string, logr *zap.SugaredLogger) *gocql.ClusterConfig { diff --git a/controllers/cql_configmaps.go b/controllers/cql_configmaps.go index 7430dd2..117d8ec 100644 --- a/controllers/cql_configmaps.go +++ b/controllers/cql_configmaps.go @@ -7,11 +7,11 @@ import ( "sort" "strings" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/reaper" - "github.com/ibm/cassandra-operator/controllers/util" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/reaper" + "github.com/cin/mr-cassop/controllers/util" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" diff --git a/controllers/default_role.go b/controllers/default_role.go index 4429386..92ed1c5 100644 --- a/controllers/default_role.go +++ b/controllers/default_role.go @@ -3,9 +3,9 @@ package controllers import ( "context" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/events" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/events" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/defaults.go b/controllers/defaults.go index 28b9c8c..bdb6870 100644 --- a/controllers/defaults.go +++ b/controllers/defaults.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" v1 "k8s.io/api/core/v1" ) @@ -344,10 +344,10 @@ func (r *CassandraClusterReconciler) defaultSysctls(cc *dbv1alpha1.CassandraClus "net.ipv4.tcp_window_scaling": "1", "vm.dirty_background_bytes": "10485760", "vm.dirty_bytes": "1073741824", - "vm.zone_reclaim_mode": "0", - "fs.file-max": "1073741824", - "vm.max_map_count": "1073741824", - "vm.swappiness": "1", + // "vm.zone_reclaim_mode": "0", + "fs.file-max": "1073741824", + "vm.max_map_count": "1073741824", + "vm.swappiness": "1", } if cc.Spec.Cassandra.Sysctls == nil { diff --git a/controllers/defaults_test.go b/controllers/defaults_test.go index f02fe12..85687f4 100644 --- a/controllers/defaults_test.go +++ b/controllers/defaults_test.go @@ -3,9 +3,9 @@ package controllers import ( "testing" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/config" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/config" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" ) @@ -70,10 +70,10 @@ func TestDefaultingFunction(t *testing.T) { "net.ipv4.tcp_window_scaling": "1", "vm.dirty_background_bytes": "10485760", "vm.dirty_bytes": "1073741824", - "vm.zone_reclaim_mode": "0", - "fs.file-max": "1073741824", - "vm.max_map_count": "1073741824", - "vm.swappiness": "1", + // "vm.zone_reclaim_mode": "0", + "fs.file-max": "1073741824", + "vm.max_map_count": "1073741824", + "vm.swappiness": "1", })) cc = &v1alpha1.CassandraCluster{ @@ -184,7 +184,6 @@ func TestDefaultingFunction(t *testing.T) { "net.ipv4.tcp_window_scaling": "1", "vm.dirty_background_bytes": "10485760", "vm.dirty_bytes": "1073741824", - "vm.zone_reclaim_mode": "0", "fs.file-max": "1000000000", "vm.max_map_count": "1000000000", "vm.swappiness": "1", diff --git a/controllers/eventhandler/annotation_handler.go b/controllers/eventhandler/annotation_handler.go index 5cdad99..5b5a4ae 100644 --- a/controllers/eventhandler/annotation_handler.go +++ b/controllers/eventhandler/annotation_handler.go @@ -1,7 +1,7 @@ package eventhandler import ( - "github.com/ibm/cassandra-operator/api/v1alpha1" + "github.com/cin/mr-cassop/api/v1alpha1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/event" diff --git a/controllers/helpers.go b/controllers/helpers.go index 24965d5..27f3db7 100644 --- a/controllers/helpers.go +++ b/controllers/helpers.go @@ -4,13 +4,13 @@ import ( "context" "time" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/prober" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/prober" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/util" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/util" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/keyspaces.go b/controllers/keyspaces.go index 804d3f4..159e52c 100644 --- a/controllers/keyspaces.go +++ b/controllers/keyspaces.go @@ -8,10 +8,10 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/reaper" "github.com/google/go-cmp/cmp" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/reaper" "github.com/pkg/errors" ) diff --git a/controllers/keyspaces_test.go b/controllers/keyspaces_test.go index 5b4af92..57017ad 100644 --- a/controllers/keyspaces_test.go +++ b/controllers/keyspaces_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" "github.com/golang/mock/gomock" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" . "github.com/onsi/gomega" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" diff --git a/controllers/labels/labels.go b/controllers/labels/labels.go index 5b0fff4..1391e31 100644 --- a/controllers/labels/labels.go +++ b/controllers/labels/labels.go @@ -1,7 +1,7 @@ package labels import ( - "github.com/ibm/cassandra-operator/api/v1alpha1" + "github.com/cin/mr-cassop/api/v1alpha1" ) // CombinedComponentLabels create labels for a component and inherits CassandraCluster object labels diff --git a/controllers/maintenance.go b/controllers/maintenance.go index f1f4e93..f62a023 100644 --- a/controllers/maintenance.go +++ b/controllers/maintenance.go @@ -3,17 +3,18 @@ package controllers import ( "context" "fmt" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + "sort" + + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/pkg/errors" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "sort" ) func (r *CassandraClusterReconciler) reconcileMaintenance(ctx context.Context, desiredCC *dbv1alpha1.CassandraCluster) error { diff --git a/controllers/maintenance_test.go b/controllers/maintenance_test.go index 0c2f436..40c3c1d 100644 --- a/controllers/maintenance_test.go +++ b/controllers/maintenance_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" v1 "k8s.io/api/core/v1" diff --git a/controllers/mocks/mock_cql.go b/controllers/mocks/mock_cql.go index 7cc5305..762cc78 100644 --- a/controllers/mocks/mock_cql.go +++ b/controllers/mocks/mock_cql.go @@ -7,8 +7,8 @@ package mocks import ( reflect "reflect" + cql "github.com/cin/mr-cassop/controllers/cql" gomock "github.com/golang/mock/gomock" - cql "github.com/ibm/cassandra-operator/controllers/cql" ) // MockCqlClient is a mock of CqlClient interface. diff --git a/controllers/mocks/mock_icarus.go b/controllers/mocks/mock_icarus.go new file mode 100644 index 0000000..93aeaee --- /dev/null +++ b/controllers/mocks/mock_icarus.go @@ -0,0 +1,95 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: ./controllers/icarus/icarus.go + +// Package mocks is a generated GoMock package. +package mocks + +import ( + context "context" + reflect "reflect" + + icarus "github.com/cin/mr-cassop/controllers/icarus" + gomock "github.com/golang/mock/gomock" +) + +// MockIcarus is a mock of Icarus interface. +type MockIcarus struct { + ctrl *gomock.Controller + recorder *MockIcarusMockRecorder +} + +// MockIcarusMockRecorder is the mock recorder for MockIcarus. +type MockIcarusMockRecorder struct { + mock *MockIcarus +} + +// NewMockIcarus creates a new mock instance. +func NewMockIcarus(ctrl *gomock.Controller) *MockIcarus { + mock := &MockIcarus{ctrl: ctrl} + mock.recorder = &MockIcarusMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockIcarus) EXPECT() *MockIcarusMockRecorder { + return m.recorder +} + +// Backup mocks base method. +func (m *MockIcarus) Backup(ctx context.Context, req icarus.BackupRequest) (icarus.Backup, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Backup", ctx, req) + ret0, _ := ret[0].(icarus.Backup) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Backup indicates an expected call of Backup. +func (mr *MockIcarusMockRecorder) Backup(ctx, req interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Backup", reflect.TypeOf((*MockIcarus)(nil).Backup), ctx, req) +} + +// Backups mocks base method. +func (m *MockIcarus) Backups(ctx context.Context) ([]icarus.Backup, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Backups", ctx) + ret0, _ := ret[0].([]icarus.Backup) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Backups indicates an expected call of Backups. +func (mr *MockIcarusMockRecorder) Backups(ctx interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Backups", reflect.TypeOf((*MockIcarus)(nil).Backups), ctx) +} + +// Restore mocks base method. +func (m *MockIcarus) Restore(ctx context.Context, req icarus.RestoreRequest) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Restore", ctx, req) + ret0, _ := ret[0].(error) + return ret0 +} + +// Restore indicates an expected call of Restore. +func (mr *MockIcarusMockRecorder) Restore(ctx, req interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Restore", reflect.TypeOf((*MockIcarus)(nil).Restore), ctx, req) +} + +// Restores mocks base method. +func (m *MockIcarus) Restores(ctx context.Context) ([]icarus.Restore, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Restores", ctx) + ret0, _ := ret[0].([]icarus.Restore) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Restores indicates an expected call of Restores. +func (mr *MockIcarusMockRecorder) Restores(ctx interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Restores", reflect.TypeOf((*MockIcarus)(nil).Restores), ctx) +} diff --git a/controllers/mocks/mock_nodectl.go b/controllers/mocks/mock_nodectl.go index abe80e2..67b4492 100644 --- a/controllers/mocks/mock_nodectl.go +++ b/controllers/mocks/mock_nodectl.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" + nodectl "github.com/cin/mr-cassop/controllers/nodectl" gomock "github.com/golang/mock/gomock" - nodectl "github.com/ibm/cassandra-operator/controllers/nodectl" ) // MockNodectl is a mock of Nodectl interface. diff --git a/controllers/mocks/mock_prober.go b/controllers/mocks/mock_prober.go index dd154b3..7336f6c 100644 --- a/controllers/mocks/mock_prober.go +++ b/controllers/mocks/mock_prober.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" + v1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" gomock "github.com/golang/mock/gomock" - v1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" ) // MockProberClient is a mock of ProberClient interface. diff --git a/controllers/mocks/mock_reaper.go b/controllers/mocks/mock_reaper.go index ddd01bd..b5a248e 100644 --- a/controllers/mocks/mock_reaper.go +++ b/controllers/mocks/mock_reaper.go @@ -8,9 +8,9 @@ import ( context "context" reflect "reflect" + v1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + reaper "github.com/cin/mr-cassop/controllers/reaper" gomock "github.com/golang/mock/gomock" - v1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - reaper "github.com/ibm/cassandra-operator/controllers/reaper" ) // MockReaperClient is a mock of ReaperClient interface. diff --git a/controllers/names/names.go b/controllers/names/names.go index dba2038..1ed7ffa 100644 --- a/controllers/names/names.go +++ b/controllers/names/names.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" ) const ( - cassandraOperator = "cassandra-operator" + cassandraOperator = "mr-cassop" ) func ProberService(clusterName string) string { diff --git a/controllers/network_policies.go b/controllers/network_policies.go index a7ab364..5d1e755 100644 --- a/controllers/network_policies.go +++ b/controllers/network_policies.go @@ -5,13 +5,13 @@ import ( "fmt" "sort" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/prober" - "github.com/ibm/cassandra-operator/controllers/util" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/prober" + "github.com/cin/mr-cassop/controllers/util" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" nwv1 "k8s.io/api/networking/v1" diff --git a/controllers/nodectl/assassinate.go b/controllers/nodectl/assassinate.go index 3d65627..6f1cbdb 100644 --- a/controllers/nodectl/assassinate.go +++ b/controllers/nodectl/assassinate.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/ibm/cassandra-operator/controllers/nodectl/jolokia" + "github.com/cin/mr-cassop/controllers/nodectl/jolokia" ) func (n *client) Assassinate(ctx context.Context, execNodeIP, assassinateNodeIP string) error { diff --git a/controllers/nodectl/cluster_view.go b/controllers/nodectl/cluster_view.go index e759b24..8697761 100644 --- a/controllers/nodectl/cluster_view.go +++ b/controllers/nodectl/cluster_view.go @@ -3,7 +3,8 @@ package nodectl import ( "context" "encoding/json" - "github.com/ibm/cassandra-operator/controllers/nodectl/jolokia" + + "github.com/cin/mr-cassop/controllers/nodectl/jolokia" ) type ClusterView struct { diff --git a/controllers/nodectl/decommission.go b/controllers/nodectl/decommission.go index 019af45..a7b69b6 100644 --- a/controllers/nodectl/decommission.go +++ b/controllers/nodectl/decommission.go @@ -3,7 +3,7 @@ package nodectl import ( "context" - "github.com/ibm/cassandra-operator/controllers/nodectl/jolokia" + "github.com/cin/mr-cassop/controllers/nodectl/jolokia" ) func (n *client) Decommission(ctx context.Context, nodeIP string) error { diff --git a/controllers/nodectl/jolokia/jolokia.go b/controllers/nodectl/jolokia/jolokia.go index 5f6877c..e44b4f7 100644 --- a/controllers/nodectl/jolokia/jolokia.go +++ b/controllers/nodectl/jolokia/jolokia.go @@ -8,7 +8,7 @@ import ( "io" "net/http" - "github.com/ibm/cassandra-operator/api/v1alpha1" + "github.com/cin/mr-cassop/api/v1alpha1" "github.com/pkg/errors" diff --git a/controllers/nodectl/nodectl.go b/controllers/nodectl/nodectl.go index e819b8b..1140ea5 100644 --- a/controllers/nodectl/nodectl.go +++ b/controllers/nodectl/nodectl.go @@ -3,7 +3,7 @@ package nodectl import ( "context" - "github.com/ibm/cassandra-operator/controllers/nodectl/jolokia" + "github.com/cin/mr-cassop/controllers/nodectl/jolokia" "go.uber.org/zap" ) diff --git a/controllers/nodectl/operation_mode.go b/controllers/nodectl/operation_mode.go index cd9084f..f8f65f8 100644 --- a/controllers/nodectl/operation_mode.go +++ b/controllers/nodectl/operation_mode.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/ibm/cassandra-operator/controllers/nodectl/jolokia" + "github.com/cin/mr-cassop/controllers/nodectl/jolokia" ) type OperationMode string diff --git a/controllers/nodectl/version.go b/controllers/nodectl/version.go index cdbb605..2b8c2c6 100644 --- a/controllers/nodectl/version.go +++ b/controllers/nodectl/version.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/ibm/cassandra-operator/controllers/nodectl/jolokia" + "github.com/cin/mr-cassop/controllers/nodectl/jolokia" "github.com/pkg/errors" ) diff --git a/controllers/prober.go b/controllers/prober.go index dfe6609..4f09836 100644 --- a/controllers/prober.go +++ b/controllers/prober.go @@ -6,11 +6,11 @@ import ( "net/url" "strconv" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/controllers/prober/prober.go b/controllers/prober/prober.go index 66169c2..1fafb7c 100644 --- a/controllers/prober/prober.go +++ b/controllers/prober/prober.go @@ -10,7 +10,7 @@ import ( "net/url" "strconv" - "github.com/ibm/cassandra-operator/api/v1alpha1" + "github.com/cin/mr-cassop/api/v1alpha1" "github.com/pkg/errors" ) diff --git a/controllers/prober_ingress.go b/controllers/prober_ingress.go index a3458b3..78f0049 100644 --- a/controllers/prober_ingress.go +++ b/controllers/prober_ingress.go @@ -3,10 +3,10 @@ package controllers import ( "context" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/pkg/errors" nwv1 "k8s.io/api/networking/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/prober_rbac.go b/controllers/prober_rbac.go index ca0a2fe..b3a82ab 100644 --- a/controllers/prober_rbac.go +++ b/controllers/prober_rbac.go @@ -3,10 +3,10 @@ package controllers import ( "context" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/pkg/errors" diff --git a/controllers/prober_service_monitor.go b/controllers/prober_service_monitor.go index eda65be..2a9909e 100644 --- a/controllers/prober_service_monitor.go +++ b/controllers/prober_service_monitor.go @@ -2,9 +2,10 @@ package controllers import ( "context" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/prometheus_configmap.go b/controllers/prometheus_configmap.go index 2eed5db..2604b4b 100644 --- a/controllers/prometheus_configmap.go +++ b/controllers/prometheus_configmap.go @@ -2,10 +2,11 @@ package controllers import ( "context" + + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/readiness.go b/controllers/readiness.go index 7709ef8..807eea5 100644 --- a/controllers/readiness.go +++ b/controllers/readiness.go @@ -6,9 +6,9 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/prober" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/prober" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/reaper.go b/controllers/reaper.go index aa68827..17d8eb6 100644 --- a/controllers/reaper.go +++ b/controllers/reaper.go @@ -3,14 +3,17 @@ package controllers import ( "context" "fmt" + "net" + "net/url" + + "github.com/cin/mr-cassop/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/compare" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/reaper" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/compare" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/reaper" - "github.com/ibm/cassandra-operator/controllers/util" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" @@ -18,8 +21,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "net" - "net/url" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" diff --git a/controllers/reaper/reaper.go b/controllers/reaper/reaper.go index 3c91007..4b7cb96 100644 --- a/controllers/reaper/reaper.go +++ b/controllers/reaper/reaper.go @@ -10,14 +10,14 @@ import ( "github.com/pkg/errors" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" ) const ( RepairStateRunning = "RUNNING" RepairStatePaused = "PAUSED" - OwnerCassandraOperator = "cassandra-operator" + OwnerCassandraOperator = "mr-cassop" ) type reaperClient struct { diff --git a/controllers/reaper/repair_schedules.go b/controllers/reaper/repair_schedules.go index 127756f..3674b3b 100644 --- a/controllers/reaper/repair_schedules.go +++ b/controllers/reaper/repair_schedules.go @@ -8,8 +8,8 @@ import ( "net/http" "net/url" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" "github.com/google/go-querystring/query" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" ) type RepairSchedule struct { diff --git a/controllers/reaper/repair_schedules_test.go b/controllers/reaper/repair_schedules_test.go index 72db5a8..2c32b8b 100644 --- a/controllers/reaper/repair_schedules_test.go +++ b/controllers/reaper/repair_schedules_test.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/gomega" - "github.com/ibm/cassandra-operator/api/v1alpha1" + "github.com/cin/mr-cassop/api/v1alpha1" ) func TestRepairSchedules(t *testing.T) { diff --git a/controllers/reaper_environment.go b/controllers/reaper_environment.go index ff715d2..5e04421 100644 --- a/controllers/reaper_environment.go +++ b/controllers/reaper_environment.go @@ -2,16 +2,17 @@ package controllers import ( "fmt" - "github.com/ibm/cassandra-operator/controllers/util" "sort" "strconv" "strings" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" + "github.com/cin/mr-cassop/controllers/util" + + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" v1 "k8s.io/api/core/v1" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" ) func reaperEnvironment(cc *v1alpha1.CassandraCluster, dc v1alpha1.DC, adminSecretChecksumStr string, clientTLSSecret *v1.Secret, broadcastAddresses map[string]string) []v1.EnvVar { diff --git a/controllers/reaper_keyspace.go b/controllers/reaper_keyspace.go index b1de6ce..829c6a7 100644 --- a/controllers/reaper_keyspace.go +++ b/controllers/reaper_keyspace.go @@ -5,8 +5,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" "github.com/pkg/errors" ) diff --git a/controllers/reaper_service_monitor.go b/controllers/reaper_service_monitor.go index 015336c..9256060 100644 --- a/controllers/reaper_service_monitor.go +++ b/controllers/reaper_service_monitor.go @@ -2,9 +2,10 @@ package controllers import ( "context" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/repair_schedules.go b/controllers/repair_schedules.go index a29c39a..5922f69 100644 --- a/controllers/repair_schedules.go +++ b/controllers/repair_schedules.go @@ -10,10 +10,10 @@ import ( "strings" "time" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/reaper" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/reaper" "github.com/pkg/errors" ) @@ -169,22 +169,22 @@ func (r *CassandraClusterReconciler) toReaperRepair(repair dbv1alpha1.RepairSche } /* - Reschedules the ScheduleTriggerTime field of the repair job if the timestamp is in the past. - The ScheduleTriggerTime field will be set to the next occurrence of the day of week (DOW) in the future, - based on the current system time. The hour, minute, and second will remain the same. If the timestamp is - already in the future, this function has no affect. +Reschedules the ScheduleTriggerTime field of the repair job if the timestamp is in the past. +The ScheduleTriggerTime field will be set to the next occurrence of the day of week (DOW) in the future, +based on the current system time. The hour, minute, and second will remain the same. If the timestamp is +already in the future, this function has no affect. - Examples: - Assume system time is 2020-11-18T12:00:00 +Examples: +Assume system time is 2020-11-18T12:00:00 - input: 2020-11-15T14:00:00 - output: 2020-11-22T14:00:00 +input: 2020-11-15T14:00:00 +output: 2020-11-22T14:00:00 - input: 2019-01-01T02:00:00 - output: 2020-11-24T02:00:00 +input: 2019-01-01T02:00:00 +output: 2020-11-24T02:00:00 - input: 2020-11-29T02:00:00 - output: 2020-11-29T02:00:00 +input: 2020-11-29T02:00:00 +output: 2020-11-29T02:00:00 */ func rescheduleTimestamp(repair *dbv1alpha1.RepairSchedule) error { diff --git a/controllers/role_admin.go b/controllers/role_admin.go index 92db797..6c18b7e 100644 --- a/controllers/role_admin.go +++ b/controllers/role_admin.go @@ -3,9 +3,9 @@ package controllers import ( "context" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/events" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/events" "github.com/pkg/errors" ) diff --git a/controllers/roles.go b/controllers/roles.go index dd2ae2f..76df7eb 100644 --- a/controllers/roles.go +++ b/controllers/roles.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/util" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/util" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" diff --git a/controllers/shiro_configmap.go b/controllers/shiro_configmap.go index 7167b24..aba390e 100644 --- a/controllers/shiro_configmap.go +++ b/controllers/shiro_configmap.go @@ -2,9 +2,10 @@ package controllers import ( "context" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/webhooks/webhook_certificates.go b/controllers/webhooks/webhook_certificates.go index 411bdc5..23d2758 100644 --- a/controllers/webhooks/webhook_certificates.go +++ b/controllers/webhooks/webhook_certificates.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "github.com/ibm/cassandra-operator/controllers/certs" - "github.com/ibm/cassandra-operator/controllers/config" - "github.com/ibm/cassandra-operator/controllers/names" + "github.com/cin/mr-cassop/controllers/certs" + "github.com/cin/mr-cassop/controllers/config" + "github.com/cin/mr-cassop/controllers/names" "github.com/pkg/errors" ) diff --git a/controllers/webhooks/webhook_service.go b/controllers/webhooks/webhook_service.go index 5bbe3f1..6a42606 100644 --- a/controllers/webhooks/webhook_service.go +++ b/controllers/webhooks/webhook_service.go @@ -2,11 +2,12 @@ package webhooks import ( "context" + + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/config" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/config" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -18,7 +19,7 @@ import ( func setupWebhookService(kubeClient *kubernetes.Clientset, operatorConfig *config.Config) error { var ( ctx = context.Background() - deploymentName = "cassandra-operator" + deploymentName = "mr-cassop" ) operatorDeployment, err := kubeClient.AppsV1().Deployments(operatorConfig.Namespace).Get(ctx, deploymentName, metav1.GetOptions{}) diff --git a/controllers/webhooks/webhook_validating.go b/controllers/webhooks/webhook_validating.go index 42b1375..86a60db 100644 --- a/controllers/webhooks/webhook_validating.go +++ b/controllers/webhooks/webhook_validating.go @@ -2,12 +2,13 @@ package webhooks import ( "context" + + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/certs" + "github.com/cin/mr-cassop/controllers/config" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/certs" - "github.com/ibm/cassandra-operator/controllers/config" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" "github.com/pkg/errors" admissionv1 "k8s.io/api/admissionregistration/v1" rbac "k8s.io/api/rbac/v1" @@ -19,7 +20,7 @@ import ( func setupValidatingWebhookConfig(kubeClient *kubernetes.Clientset, operatorConfig *config.Config, caKeypair certs.Keypair) error { var ( ctx = context.Background() - clusterRoleName = "cassandra-operator" + clusterRoleName = "mr-cassop" ) clusterRole, err := kubeClient.RbacV1().ClusterRoles().Get(ctx, clusterRoleName, metav1.GetOptions{}) diff --git a/controllers/webhooks/webhooks.go b/controllers/webhooks/webhooks.go index 9ab3b95..5a3c60e 100644 --- a/controllers/webhooks/webhooks.go +++ b/controllers/webhooks/webhooks.go @@ -1,7 +1,7 @@ package webhooks import ( - "github.com/ibm/cassandra-operator/controllers/config" + "github.com/cin/mr-cassop/controllers/config" "github.com/pkg/errors" "k8s.io/client-go/kubernetes" ) diff --git a/docs/README.md b/docs/README.md index 9c99f98..9880f5c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,11 +1,11 @@ -# Cassandra Operator Documentation +# mr-cassop Documentation ## Running Locally To download and run this locally, clone the repo and then go to the docs directory: ```console -cd ./cassandra-operator/docs +cd ./mr-cassop/docs ``` If `npm` is not already installed it can be installed with: diff --git a/docs/docs/admin-auth.md b/docs/docs/admin-auth.md index c9cbb4d..4a7851a 100644 --- a/docs/docs/admin-auth.md +++ b/docs/docs/admin-auth.md @@ -3,7 +3,7 @@ title: Admin Auth Management slug: /admin-auth --- -The Cassandra operator requires a separate super role to perform Cassandra management. +mr-cassop requires a separate super role to perform Cassandra management. In Kubernetes the role is represented by a secret that needs to be provided by the user. The secret must have two non-empty entries `admin-role` and `admin-password` for role name and password respectively. @@ -12,7 +12,7 @@ Example of such secret: ```yaml apiVersion: v1 data: - admin-role: Y2Fzc2FuZHJhLW9wZXJhdG9y #cassandra-operator + admin-role: Y2Fzc2FuZHJhLW9wZXJhdG9y #mr-cassop admin-password: ZXhhbXBsZS1wYXNzd29yZA== #example-password kind: Secret metadata: @@ -35,12 +35,12 @@ spec: You can also create a secret by running a `kubectl` command: ```bash -kubectl create secret generic admin-role --from-literal=admin-role=cassandra-operator --from-literal=admin-password=example-password +kubectl create secret generic admin-role --from-literal=admin-role=mr-cassop --from-literal=admin-password=example-password ``` ### Cluster Init -When a fresh cluster is created, Cassandra will create a default role `cassandra` with password `cassandra`. The Cassandra operator will use that role to create the secure user provided role and drop the default role for security reasons. +When a fresh cluster is created, Cassandra will create a default role `cassandra` with password `cassandra`. mr-cassop will use that role to create the secure user provided role and drop the default role for security reasons. #### Creating a previously existed cluster @@ -50,7 +50,7 @@ The PVCs are identified by labels `cassandra-cluster-instance=Note: before running, make sure the Cassandra operator is deployed in your k8s namespace. +>Note: before running, make sure the mr-cassop is deployed in your k8s namespace. To run e2e tests: @@ -90,7 +90,7 @@ make e2e-tests To download and run docs locally, clone the repo and then go to the docs directory: ```console -cd ./cassandra-operator/docs +cd ./mr-cassop/docs ``` If `npm` is not already installed it can be installed with: diff --git a/docs/docs/home.md b/docs/docs/home.md index fdab2a8..fe4acd0 100644 --- a/docs/docs/home.md +++ b/docs/docs/home.md @@ -4,6 +4,6 @@ hide_title: true slug: / --- -# Cassandra Operator +# mr-cassop -Cassandra Operator deploys, configures and manages Cassandra clusters in k8s. \ No newline at end of file +mr-cassop deploys, configures and manages Cassandra clusters in k8s. \ No newline at end of file diff --git a/docs/docs/keyspace-management.md b/docs/docs/keyspace-management.md index 16a45b4..12f9cc1 100644 --- a/docs/docs/keyspace-management.md +++ b/docs/docs/keyspace-management.md @@ -3,7 +3,7 @@ title: Keyspace Management slug: /keyspace-management --- -The Cassandra operator supports configuring replication settings for desired keyspaces. +mr-cassop supports configuring replication settings for desired keyspaces. For each keyspace defined in `.spec.systemKeyspaces.keyspaces`, the operator will set options from `.spec.systemKeyspaces.dcs`. If the latter is not specified, the default is all DCs, each with replication factor of `3`. diff --git a/docs/docs/multi-region-cluster-configuration.md b/docs/docs/multi-region-cluster-configuration.md index 1e91cbb..693987c 100644 --- a/docs/docs/multi-region-cluster-configuration.md +++ b/docs/docs/multi-region-cluster-configuration.md @@ -3,7 +3,7 @@ title: Multi Regions Cluster Configurations slug: /multi-region-cluster-configuration --- -Cassandra Operator supports running Cassandra in multiple regions (Kubernetes clusters). The operator should be deployed in all regions with a C* cluster. Each operator will configure its own CassandraCluster while still communicating with operators in other regions. +mr-cassop supports running Cassandra in multiple regions (Kubernetes clusters). The operator should be deployed in all regions with a C* cluster. Each operator will configure its own CassandraCluster while still communicating with operators in other regions. In order to automate this process, the operator deploys a component that is used to discover information to correctly configure the cluster (available datacenters, replicas per datacenter, seeds, etc.) diff --git a/docs/docs/operator-configuration.md b/docs/docs/operator-configuration.md index 66caf28..948b207 100644 --- a/docs/docs/operator-configuration.md +++ b/docs/docs/operator-configuration.md @@ -7,12 +7,12 @@ slug: /operator-configuration | Field | Description | Default | |----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------| -| `replicas` | Number of Cassandra operator pod replicas | `1` | -| `container` | Parameters of the Cassandra operator container | | -| `container.image` | Path to the Cassandra operator image being used | Latest version available | +| `replicas` | Number of mr-cassop pod replicas | `1` | +| `container` | Parameters of the mr-cassop container | | +| `container.image` | Path to the mr-cassop image being used | Latest version available | | `container.imagePullPolicy` | Image pull policy for the containers | `Always` | | `container.restartPolicy` | Restart policy for the containers | `Always` | -| `container.resources` | [Resource requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#resource-requests-and-limits-of-pod-and-container) for Cassandra operator container. The [field specs](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#resourcerequirements-v1-core) are the same as in the Pod spec | | +| `container.resources` | [Resource requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#resource-requests-and-limits-of-pod-and-container) for mr-cassop container. The [field specs](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#resourcerequirements-v1-core) are the same as in the Pod spec | | | `container.resources.requests` | Resource requests | | | `container.resources.requests.memory` | Memory request | `500m` | | `container.resources.requests.cpu` | CPU request | `200Mi` | @@ -29,17 +29,17 @@ slug: /operator-configuration | `clusterDashboards.enabled` | Cassandra cluster dashboards to be enabled. Allow values: [`datastax`, `instaclustr`, `prober`, `reaper`, `tlp`] | `[]` | | `clusterDashboards.namespace` | Namespace where dashboard configmaps will be deployed | Release namespace | | `clusterDashboards.labels` | Labels for dashboard configmaps (required by service monitors) | `{ grafana_dashboard: "1" }` | -| `monitoring` | Cassandra operator monitoring configuration | | -| `monitoring.enabled` | Enable/disable Cassandra operator monitoring | `false` | -| `monitoring.grafanaDashboard` | Cassandra operator dashboard configuration | | -| `monitoring.grafanaDashboard.enabled` | Enable/disable Cassandra operator dashboard | `false` | +| `monitoring` | mr-cassop monitoring configuration | | +| `monitoring.enabled` | Enable/disable mr-cassop monitoring | `false` | +| `monitoring.grafanaDashboard` | mr-cassop dashboard configuration | | +| `monitoring.grafanaDashboard.enabled` | Enable/disable mr-cassop dashboard | `false` | | `monitoring.grafanaDashboard.namespace` | Namespace where operator dashboard configmap will be deployed | Release namespace | | `monitoring.grafanaDashboard.labels` | Labels for operator dashboard configmap (required by service monitors) | `{ grafana_dashboard: "1" }` | | `monitoring.grafanaDashboard.datasourceName` | Grafana dashboard datasource name | | | `monitoring.serviceMonitor` | Service monitor for operator metrics | | | `monitoring.serviceMonitor.enabled` | Enable/disable creation of operator service monitor | `false` | | `monitoring.serviceMonitor.namespace` | Namespace where operator service monitor should be deployed | Release namespace | -| `monitoring.serviceMonitor.labels` | Labels for operator service monitor | `{ operator: cassandra-operator }` | +| `monitoring.serviceMonitor.labels` | Labels for operator service monitor | `{ operator: mr-cassop }` | | `monitoring.serviceMonitor.scrapeInterval` | Interval at which operator metrics should be scraped | `30s` | | `admissionWebhooks` | [Admission webhook](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/) configuration | | | `admissionWebhooks.enabled` | Enable/disable admission webhooks | `true` | diff --git a/docs/docs/prober.md b/docs/docs/prober.md index cca0295..08c810c 100644 --- a/docs/docs/prober.md +++ b/docs/docs/prober.md @@ -3,7 +3,7 @@ title: Prober slug: /prober --- -To properly configure the cluster, Cassandra operator should coordinate C* node readiness. +To properly configure the cluster, mr-cassop should coordinate C* node readiness. By default, Kubernetes will say that a node is ready as soon as the process is started. This is not enough for Cassandra since it takes some time for node to start and bootstrap. This issue can be fixed by adding readiness probes. For example, we can try to create a CQL session and execute a simple command. If the command is successful, we can assume that the node is ready. @@ -20,7 +20,7 @@ Even though prober stores the state of the cluster in memory, a restart doesn't :::info -Prober does not affect how Cassandra works. It only read states and provides information to Kubernetes and the Cassandra operator to coordinate actions. +Prober does not affect how Cassandra works. It only read states and provides information to Kubernetes and the mr-cassop to coordinate actions. ::: diff --git a/docs/docs/quickstart.md b/docs/docs/quickstart.md index 5324b2a..ed190f9 100644 --- a/docs/docs/quickstart.md +++ b/docs/docs/quickstart.md @@ -27,35 +27,35 @@ Helm charts are hosted on a private Artifactory instance, so you will need to [c Create a namespace for the operator: ```bash -kubectl create ns cassandra-operator +kubectl create ns mr-cassop ``` Images are located in the IBM cloud registry. You need to [create an image pull secret](https://pages.github.ibm.com/TheWeatherCompany/icm-docs/managed-kubernetes/container-registry.html#pulling-an-image-in-kubernetes) in your namespace to load images into the cluster. ```bash kubectl create secret docker-registry container-reg-secret \ - --namespace cassandra-operator \ + --namespace mr-cassop \ --docker-server us.icr.io \ --docker-username \ --docker-password= \ --docker-email= ``` -## Install Cassandra Operator +## Install mr-cassop Use the image pull secret created in the previous step to install the operator: ```bash -helm install cassandra-operator icm/cassandra-operator --set container.imagePullSecret=container-reg-secret --namespace cassandra-operator +helm install mr-cassop icm/mr-cassop --set container.imagePullSecret=container-reg-secret --namespace mr-cassop ``` You should see your operator pod up and running: ```bash -kubectl get pods --namespace cassandra-operator +kubectl get pods --namespace mr-cassop NAME READY STATUS RESTARTS AGE -cassandra-operator-56997bfc5c-gz788 1/1 Running 0 40s +mr-cassop-56997bfc5c-gz788 1/1 Running 0 40s ``` ## Create an admin role secret @@ -65,7 +65,7 @@ The operator needs a secret containing the admin role credentials used for Cassa > Don't forget to replace `admin-password=pass` with your secure password ```bash -kubectl create secret generic admin-role --from-literal=admin-role=cassandra-operator --from-literal=admin-password=pass +kubectl create secret generic admin-role --from-literal=admin-role=mr-cassop --from-literal=admin-password=pass ``` ## Deploy CassandraCluster @@ -99,7 +99,7 @@ example-cassandra-dc1 ClusterIP None 7000/TCP,7001/TCP Wait until the cluster is up and running. Now you can execute queries: ```bash -kubectl exec -it example-cassandra-dc1-1 -- cqlsh -u cassandra-operator -p pass -e "DESCRIBE keyspaces;" +kubectl exec -it example-cassandra-dc1-1 -- cqlsh -u mr-cassop -p pass -e "DESCRIBE keyspaces;" system_traces system_schema system_auth system system_distributed ``` @@ -125,10 +125,10 @@ UN 172.30.200.83 924.49 KiB 16 100.0% dd93c221-a8b1-47f See the [CassandraCluster field specification reference](cassandracluster-configuration.md) for more details. -## Uninstall Cassandra Operator and the Cluster +## Uninstall mr-cassop and the Cluster ```bash kubectl delete CassandraCluster/example -helm uninstall cassandra-operator +helm uninstall mr-cassop kubectl delete crd cassandraclusters.db.ibm.com ``` diff --git a/docs/docs/sysctl.md b/docs/docs/sysctl.md index 854b3fb..e03c8cf 100644 --- a/docs/docs/sysctl.md +++ b/docs/docs/sysctl.md @@ -3,7 +3,7 @@ title: Sysctl configuration slug: /sysctl --- -In order for Cassandra to operate correctly, Cassandra operator sets some [`sysctl`](https://kubernetes.io/docs/tasks/administer-cluster/sysctl-cluster/) parameters by default. +In order for Cassandra to operate correctly, mr-cassop sets some [`sysctl`](https://kubernetes.io/docs/tasks/administer-cluster/sysctl-cluster/) parameters by default. They can be overriden by setting the `.spec.cassandra.sysctls` map in the following way: @@ -32,7 +32,6 @@ Default values: | net.ipv4.tcp_window_scaling | 1 | | vm.dirty_background_bytes | 10485760 | | vm.dirty_bytes | 1073741824 | - | vm.zone_reclaim_mode | 0 | | fs.file-max | 1073741824 | | vm.max_map_count | 1073741824 | | vm.swappiness | 1 | diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index a1cfe34..1bbdff9 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -1,13 +1,13 @@ const isCI = !!process.env.CI; module.exports = { - title: 'Cassandra Operator', + title: 'mr-cassop', githubHost: 'github.com', - url: isCI ? 'https://cassandra-operator-docs.dev.sun.weather.com' : 'http://localhost:3000', + url: isCI ? 'https://mr-cassop-docs.dev.sun.weather.com' : 'http://localhost:3000', baseUrl: '/', onBrokenLinks: 'throw', favicon: 'images/favicon.png', organizationName: 'TheWeatherCompany', - projectName: 'cassandra-operator', + projectName: 'mr-cassop', themeConfig: { hideableSidebar: true, colorMode: { @@ -15,14 +15,14 @@ module.exports = { }, navbar: { hideOnScroll: false, - title: 'Cassandra Operator', + title: 'mr-cassop', logo: { src: 'images/logo.svg', srcDark: 'images/logo.svg', }, items: [ { - href: 'https://cassandra-operator-docs.dev.sun.weather.com', + href: 'https://mr-cassop-docs.dev.sun.weather.com', label: 'GitHub', position: 'right', }, @@ -35,7 +35,7 @@ module.exports = { footer: { style: 'dark', links: [], - copyright: `Cassandra Operator Documentation. Built with Docusaurus.`, + copyright: `mr-cassop Documentation. Built with Docusaurus.`, }, }, presets: [ diff --git a/docs/package-lock.json b/docs/package-lock.json index d57bda0..e5b17a4 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -1,11 +1,11 @@ { - "name": "cassandra-operator", + "name": "mr-cassop", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "cassandra-operator", + "name": "mr-cassop", "version": "1.0.0", "dependencies": { "@docusaurus/core": "2.2.0", @@ -188,16 +188,81 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "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==", + "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==", + "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==", + "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==" + }, + "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==", + "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==", + "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==", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/compat-data": { "version": "7.20.1", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz", @@ -236,20 +301,21 @@ } }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/generator": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.1.tgz", - "integrity": "sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dependencies": { - "@babel/types": "^7.20.0", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "engines": { @@ -297,9 +363,9 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -356,17 +422,17 @@ } }, "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/helper-environment-visitor": { - "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==", + "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==", "engines": { "node": ">=6.9.0" } @@ -383,23 +449,23 @@ } }, "node_modules/@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "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==", "dependencies": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "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==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -519,28 +585,28 @@ } }, "node_modules/@babel/helper-split-export-declaration": { - "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==", + "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==", "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "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==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "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==", "engines": { "node": ">=6.9.0" } @@ -581,12 +647,12 @@ } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -658,9 +724,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.1.tgz", - "integrity": "sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "bin": { "parser": "bin/babel-parser.js" }, @@ -1606,9 +1672,9 @@ } }, "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -1818,9 +1884,9 @@ } }, "node_modules/@babel/preset-env/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -1899,31 +1965,31 @@ } }, "node_modules/@babel/template": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", - "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.10", - "@babel/types": "^7.18.10" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", - "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==", - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.1", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.1", - "@babel/types": "^7.20.0", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "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", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1932,12 +1998,12 @@ } }, "node_modules/@babel/types": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz", - "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dependencies": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -3135,9 +3201,9 @@ } }, "node_modules/@docusaurus/mdx-loader/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -4111,9 +4177,9 @@ } }, "node_modules/@docusaurus/mdx-loader/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -4939,9 +5005,9 @@ } }, "node_modules/@docusaurus/plugin-client-redirects/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -5915,9 +5981,9 @@ } }, "node_modules/@docusaurus/plugin-client-redirects/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -6741,9 +6807,9 @@ } }, "node_modules/@docusaurus/plugin-content-blog/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -7725,9 +7791,9 @@ } }, "node_modules/@docusaurus/plugin-content-blog/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -8576,9 +8642,9 @@ } }, "node_modules/@docusaurus/plugin-content-docs/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -9619,9 +9685,9 @@ } }, "node_modules/@docusaurus/plugin-content-docs/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -10446,9 +10512,9 @@ } }, "node_modules/@docusaurus/plugin-content-pages/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -11422,9 +11488,9 @@ } }, "node_modules/@docusaurus/plugin-content-pages/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -12258,9 +12324,9 @@ } }, "node_modules/@docusaurus/plugin-debug/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -13248,9 +13314,9 @@ } }, "node_modules/@docusaurus/plugin-debug/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -14066,9 +14132,9 @@ } }, "node_modules/@docusaurus/plugin-google-analytics/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -15042,9 +15108,9 @@ } }, "node_modules/@docusaurus/plugin-google-analytics/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -15860,9 +15926,9 @@ } }, "node_modules/@docusaurus/plugin-google-gtag/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -16836,9 +16902,9 @@ } }, "node_modules/@docusaurus/plugin-google-gtag/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -17661,9 +17727,9 @@ } }, "node_modules/@docusaurus/plugin-sitemap/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -18637,9 +18703,9 @@ } }, "node_modules/@docusaurus/plugin-sitemap/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -19464,9 +19530,9 @@ } }, "node_modules/@docusaurus/preset-classic/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -20440,9 +20506,9 @@ } }, "node_modules/@docusaurus/preset-classic/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -21294,9 +21360,9 @@ } }, "node_modules/@docusaurus/theme-classic/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -22270,9 +22336,9 @@ } }, "node_modules/@docusaurus/theme-classic/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -23096,9 +23162,9 @@ } }, "node_modules/@docusaurus/theme-common/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -24072,9 +24138,9 @@ } }, "node_modules/@docusaurus/theme-common/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -24899,9 +24965,9 @@ } }, "node_modules/@docusaurus/theme-search-algolia/node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -25875,9 +25941,9 @@ } }, "node_modules/@docusaurus/theme-search-algolia/node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -26021,13 +26087,13 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -26042,20 +26108,20 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" } }, "node_modules/@jridgewell/sourcemap-codec": { @@ -26064,12 +26130,12 @@ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@leichtgewicht/ip-codec": { @@ -26149,9 +26215,9 @@ } }, "node_modules/@mdx-js/mdx/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -26554,28 +26620,10 @@ "@types/node": "*" } }, - "node_modules/@types/eslint": { - "version": "8.4.9", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz", - "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==", - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==" }, "node_modules/@types/express": { "version": "4.17.14", @@ -26792,133 +26840,133 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==" }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==" }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==" }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==" }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.12.1" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==" }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", "dependencies": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.12.1", "@xtuc/long": "4.2.2" } }, @@ -26950,9 +26998,9 @@ } }, "node_modules/acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "bin": { "acorn": "bin/acorn" }, @@ -26960,10 +27008,10 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz", - "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==", + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "peerDependencies": { "acorn": "^8" } @@ -27418,9 +27466,9 @@ } }, "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -27535,20 +27583,20 @@ } }, "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", + "qs": "6.13.0", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -27659,20 +27707,20 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" } }, "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", "funding": [ { "type": "opencollective", @@ -27681,13 +27729,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" }, "bin": { "browserslist": "cli.js" @@ -27781,12 +27833,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -27840,9 +27898,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001429", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz", - "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg==", + "version": "1.0.30001660", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", + "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", "funding": [ { "type": "opencollective", @@ -27851,6 +27909,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -28495,9 +28557,9 @@ ] }, "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "engines": { "node": ">= 0.6" } @@ -28511,9 +28573,9 @@ } }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "engines": { "node": ">= 0.6" } @@ -29137,6 +29199,22 @@ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -29490,9 +29568,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" + "version": "1.5.24", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.24.tgz", + "integrity": "sha512-0x0wLCmpdKFCi9ulhvYZebgcPmHTkFVUfU2wzDykadkslKwT4oAmDTHEKLnlrDsMGZe4B+ksn8quZfZjYsBetA==" }, "node_modules/emoji-regex": { "version": "8.0.0", @@ -29517,9 +29595,9 @@ } }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } @@ -29533,9 +29611,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -29616,10 +29694,29 @@ "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==" }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", + "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==" }, "node_modules/es-to-primitive": { "version": "1.2.1", @@ -29638,9 +29735,9 @@ } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "engines": { "node": ">=6" } @@ -29906,36 +30003,36 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -30169,9 +30266,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -30180,12 +30277,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -30444,9 +30541,12 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { "version": "1.1.5", @@ -30548,13 +30648,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -30723,6 +30828,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -30756,9 +30872,9 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "node_modules/gray-matter": { "version": "4.0.3", @@ -30841,11 +30957,22 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -30952,6 +31079,17 @@ "node": ">=8" } }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/hast-to-hyperscript": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz", @@ -31707,9 +31845,9 @@ } }, "node_modules/internal-ip/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -32664,9 +32802,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -32830,9 +32968,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge-stream": { "version": "2.0.0", @@ -32861,11 +33002,11 @@ "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==" }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -33082,9 +33223,15 @@ "optional": true }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -33199,9 +33346,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==" }, "node_modules/nopt": { "version": "1.0.10", @@ -33368,9 +33515,12 @@ } }, "node_modules/object-inspect": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -33663,9 +33813,9 @@ } }, "node_modules/package-json/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -33799,9 +33949,9 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/path-type": { "version": "4.0.0", @@ -33812,9 +33962,9 @@ } }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==" }, "node_modules/picomatch": { "version": "2.3.1", @@ -33973,9 +34123,9 @@ } }, "node_modules/postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "funding": [ { "type": "opencollective", @@ -33984,10 +34134,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -34687,11 +34841,11 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -34758,9 +34912,9 @@ } }, "node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -35486,9 +35640,9 @@ } }, "node_modules/remark-mdx/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -35896,9 +36050,9 @@ } }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -35921,17 +36075,17 @@ } }, "node_modules/semver-diff/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -35964,15 +36118,23 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dependencies": { "randombytes": "^2.1.0" } @@ -36103,14 +36265,14 @@ } }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -36121,6 +36283,22 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -36205,13 +36383,17 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -36933,12 +37115,12 @@ } }, "node_modules/terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.33.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.33.0.tgz", + "integrity": "sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g==", "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -36950,15 +37132,15 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.14", + "@jridgewell/trace-mapping": "^0.3.20", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "serialize-javascript": "^6.0.1", + "terser": "^5.26.0" }, "engines": { "node": ">= 10.13.0" @@ -37562,9 +37744,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", "funding": [ { "type": "opencollective", @@ -37573,14 +37755,18 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "escalade": "^3.1.2", + "picocolors": "^1.0.1" }, "bin": { - "browserslist-lint": "cli.js" + "update-browserslist-db": "cli.js" }, "peerDependencies": { "browserslist": ">= 4.21.0" @@ -37877,9 +38063,9 @@ } }, "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -37911,33 +38097,32 @@ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" }, "node_modules/webpack": { - "version": "5.77.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.77.0.tgz", - "integrity": "sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==", - "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", + "dependencies": { + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", - "browserslist": "^4.14.5", + "acorn-import-attributes": "^1.9.5", + "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.17.1", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.4.0", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { @@ -38230,9 +38415,9 @@ } }, "node_modules/webpack/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -38814,11 +38999,63 @@ } }, "@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "requires": { - "@babel/highlight": "^7.18.6" + "@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==", + "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==", + "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==", + "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==" + }, + "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==" + }, + "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==" + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } } }, "@babel/compat-data": { @@ -38849,19 +39086,20 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, "@babel/generator": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.1.tgz", - "integrity": "sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "requires": { - "@babel/types": "^7.20.0", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" } }, @@ -38894,9 +39132,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -38937,16 +39175,16 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, "@babel/helper-environment-visitor": { - "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==" + "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==" }, "@babel/helper-explode-assignable-expression": { "version": "7.18.6", @@ -38957,20 +39195,20 @@ } }, "@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "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==", "requires": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" } }, "@babel/helper-hoist-variables": { - "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==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-member-expression-to-functions": { @@ -39057,22 +39295,22 @@ } }, "@babel/helper-split-export-declaration": { - "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==", + "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==", "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==" + "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==" }, "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" + "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==" }, "@babel/helper-validator-option": { "version": "7.18.6", @@ -39101,12 +39339,12 @@ } }, "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "dependencies": { @@ -39162,9 +39400,9 @@ } }, "@babel/parser": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.1.tgz", - "integrity": "sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw==" + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==" }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.18.6", @@ -39747,9 +39985,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -39904,9 +40142,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -39963,39 +40201,39 @@ } }, "@babel/template": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", - "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.10", - "@babel/types": "^7.18.10" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" } }, "@babel/traverse": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", - "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==", - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.1", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.1", - "@babel/types": "^7.20.0", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "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", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz", - "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "requires": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } }, @@ -40843,9 +41081,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -41581,9 +41819,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -42173,9 +42411,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -42911,9 +43149,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -43504,9 +43742,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -44247,9 +44485,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -44853,9 +45091,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -45634,9 +45872,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -46225,9 +46463,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -46963,9 +47201,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -47562,9 +47800,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -48311,9 +48549,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -48893,9 +49131,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -49631,9 +49869,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -50213,9 +50451,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -50951,9 +51189,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -51540,9 +51778,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -52278,9 +52516,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -52869,9 +53107,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -53607,9 +53845,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -54222,9 +54460,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -54960,9 +55198,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -55549,9 +55787,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -56287,9 +56525,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -56878,9 +57116,9 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "supports-color": { "version": "5.5.0", @@ -57616,9 +57854,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "strip-ansi": { "version": "3.0.1", @@ -57742,13 +57980,13 @@ } }, "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "requires": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" } }, "@jridgewell/resolve-uri": { @@ -57757,17 +57995,17 @@ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" }, "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==" }, "@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", "requires": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" } }, "@jridgewell/sourcemap-codec": { @@ -57776,12 +58014,12 @@ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "@leichtgewicht/ip-codec": { @@ -57847,9 +58085,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" } } }, @@ -58097,28 +58335,10 @@ "@types/node": "*" } }, - "@types/eslint": { - "version": "8.4.9", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz", - "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==", - "requires": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", - "requires": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==" }, "@types/express": { "version": "4.17.14", @@ -58335,133 +58555,133 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" }, "@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", "requires": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==" }, "@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==" }, "@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==" }, "@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==" }, "@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.12.1" } }, "@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==" }, "@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" } }, "@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" } }, "@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", "requires": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.12.1", "@xtuc/long": "4.2.2" } }, @@ -58490,14 +58710,14 @@ } }, "acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==" - }, - "acorn-import-assertions": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz", - "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==", + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==" + }, + "acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "requires": {} }, "acorn-walk": { @@ -58827,9 +59047,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -58919,20 +59139,20 @@ } }, "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "requires": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", + "qs": "6.13.0", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -59031,22 +59251,22 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", "requires": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" } }, "buffer-from": { @@ -59115,12 +59335,15 @@ } }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" } }, "callsites": { @@ -59159,9 +59382,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001429", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz", - "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg==" + "version": "1.0.30001660", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", + "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==" }, "ccount": { "version": "1.1.0", @@ -59646,9 +59869,9 @@ } }, "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" }, "convert-source-map": { "version": "1.8.0", @@ -59659,9 +59882,9 @@ } }, "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" }, "cookie-signature": { "version": "1.0.6", @@ -60075,6 +60298,16 @@ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" }, + "define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + } + }, "define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -60343,9 +60576,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" + "version": "1.5.24", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.24.tgz", + "integrity": "sha512-0x0wLCmpdKFCi9ulhvYZebgcPmHTkFVUfU2wzDykadkslKwT4oAmDTHEKLnlrDsMGZe4B+ksn8quZfZjYsBetA==" }, "emoji-regex": { "version": "8.0.0", @@ -60363,9 +60596,9 @@ "integrity": "sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg==" }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" }, "end-of-stream": { "version": "1.4.4", @@ -60376,9 +60609,9 @@ } }, "enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "requires": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -60441,10 +60674,23 @@ "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==" }, + "es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "requires": { + "get-intrinsic": "^1.2.4" + } + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, "es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", + "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==" }, "es-to-primitive": { "version": "1.2.1", @@ -60457,9 +60703,9 @@ } }, "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==" }, "escape-goat": { "version": "2.1.1", @@ -60654,36 +60900,36 @@ } }, "express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -60868,20 +61114,20 @@ "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==" }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "requires": { "to-regex-range": "^5.0.1" } }, "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -61052,9 +61298,9 @@ "optional": true }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "function.prototype.name": { "version": "1.1.5", @@ -61128,13 +61374,15 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "get-own-enumerable-property-symbols": { @@ -61253,6 +61501,14 @@ "slash": "^3.0.0" } }, + "gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "requires": { + "get-intrinsic": "^1.1.3" + } + }, "got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -61282,9 +61538,9 @@ } }, "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "gray-matter": { "version": "4.0.3", @@ -61348,13 +61604,18 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "requires": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" } }, + "has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==" + }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -61430,6 +61691,14 @@ "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" + } + }, "hast-to-hyperscript": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz", @@ -61981,9 +62250,9 @@ "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "shebang-command": { "version": "1.2.0", @@ -62641,9 +62910,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -62772,9 +63041,9 @@ } }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" }, "merge-stream": { "version": "2.0.0", @@ -62797,11 +63066,11 @@ "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==" }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, @@ -62956,9 +63225,9 @@ "optional": true }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==" }, "nanomatch": { "version": "1.2.13", @@ -63043,9 +63312,9 @@ "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==" }, "node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==" }, "nopt": { "version": "1.0.10", @@ -63168,9 +63437,9 @@ } }, "object-inspect": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==" }, "object-is": { "version": "1.1.5", @@ -63368,9 +63637,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -63475,9 +63744,9 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "path-type": { "version": "4.0.0", @@ -63485,9 +63754,9 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==" }, "picomatch": { "version": "2.3.1", @@ -63602,11 +63871,11 @@ "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==" }, "postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } @@ -64054,11 +64323,11 @@ "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==" }, "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "querystring": { @@ -64098,9 +64367,9 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "requires": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -64675,9 +64944,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" } } }, @@ -64978,9 +65247,9 @@ } }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -64994,16 +65263,16 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "requires": { "debug": "2.6.9", "depd": "2.0.0", @@ -65035,6 +65304,11 @@ } } }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -65043,9 +65317,9 @@ } }, "serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "requires": { "randombytes": "^2.1.0" } @@ -65156,14 +65430,14 @@ } }, "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "requires": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" } }, "set-blocking": { @@ -65171,6 +65445,19 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, + "set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "requires": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + } + }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -65234,13 +65521,14 @@ } }, "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" } }, "signal-exit": { @@ -65805,12 +66093,12 @@ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.33.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.33.0.tgz", + "integrity": "sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g==", "requires": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -65823,15 +66111,15 @@ } }, "terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", "requires": { - "@jridgewell/trace-mapping": "^0.3.14", + "@jridgewell/trace-mapping": "^0.3.20", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "serialize-javascript": "^6.0.1", + "terser": "^5.26.0" }, "dependencies": { "jest-worker": { @@ -66241,12 +66529,12 @@ "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" }, "update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", "requires": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "escalade": "^3.1.2", + "picocolors": "^1.0.1" } }, "update-notifier": { @@ -66456,9 +66744,9 @@ } }, "watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "requires": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -66483,33 +66771,32 @@ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" }, "webpack": { - "version": "5.77.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.77.0.tgz", - "integrity": "sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==", - "requires": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", + "requires": { + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", - "browserslist": "^4.14.5", + "acorn-import-attributes": "^1.9.5", + "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.17.1", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.4.0", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "dependencies": { @@ -66519,9 +66806,9 @@ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" }, "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "requires": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", diff --git a/docs/package.json b/docs/package.json index cad90a0..40c40c4 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,5 +1,5 @@ { - "name": "cassandra-operator", + "name": "mr-cassop", "version": "1.0.0", "private": true, "scripts": { diff --git a/docs/static/CNAME b/docs/static/CNAME index 3b42fba..309f44a 100644 --- a/docs/static/CNAME +++ b/docs/static/CNAME @@ -1 +1 @@ -cassandra-operator-docs.dev.sun.weather.com +mr-cassop-docs.dev.sun.weather.com diff --git a/go.mod b/go.mod index c983aa7..d51a4dc 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ibm/cassandra-operator +module github.com/cin/mr-cassop go 1.18 @@ -58,12 +58,12 @@ require ( github.com/spf13/pflag v1.0.5 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect - golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect - golang.org/x/net v0.7.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index b9d6ebf..4cc288f 100644 --- a/go.sum +++ b/go.sum @@ -590,8 +590,8 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -683,8 +683,8 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -799,12 +799,12 @@ golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -814,8 +814,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/icarus/Dockerfile b/icarus/Dockerfile index 957d770..6bffb84 100644 --- a/icarus/Dockerfile +++ b/icarus/Dockerfile @@ -1,5 +1,4 @@ -ARG DOCKER_PROXY_REGISTRY="" -FROM ${DOCKER_PROXY_REGISTRY}openjdk:11-jre-bullseye +FROM openjdk:11-jre-bullseye ARG ICARUS_VERSION=2.0.4 RUN wget https://github.com/instaclustr/icarus/releases/download/icarus-${ICARUS_VERSION}/icarus.jar diff --git a/jolokia/Dockerfile b/jolokia/Dockerfile index 0e4ff9b..7b1f10e 100644 --- a/jolokia/Dockerfile +++ b/jolokia/Dockerfile @@ -1,13 +1,11 @@ -ARG DOCKER_PROXY_REGISTRY="" -FROM ${DOCKER_PROXY_REGISTRY}alpine AS build +FROM alpine AS build ARG JOLOKIA_VERSION="1.7.1" RUN wget -O jolokia.tar.gz https://github.com/rhuss/jolokia/releases/download/v${JOLOKIA_VERSION}/jolokia-${JOLOKIA_VERSION}-bin.tar.gz; RUN tar -C /tmp/ -xzf jolokia.tar.gz; RUN cp /tmp/jolokia-${JOLOKIA_VERSION}/agents/jolokia-unsecured.war /tmp -ARG DOCKER_PROXY_REGISTRY="" -FROM ${DOCKER_PROXY_REGISTRY}tomcat:9-jdk8-openjdk-slim-bullseye +FROM tomcat:9-jdk8-openjdk-slim-bullseye ENV JOLOKIA_JSR160_PROXY_ENABLED=true ENV JOLOKIA_RESPONSE_TIMEOUT=30000 diff --git a/main.go b/main.go index a06daef..18470fd 100644 --- a/main.go +++ b/main.go @@ -23,8 +23,6 @@ import ( "os" "time" - "github.com/ibm/cassandra-operator/controllers/icarus" - "github.com/go-logr/zapr" "github.com/gocql/gocql" "go.uber.org/zap" @@ -40,20 +38,21 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/healthz" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers" - "github.com/ibm/cassandra-operator/controllers/cassandrabackup" - "github.com/ibm/cassandra-operator/controllers/cassandrarestore" - operatorCfg "github.com/ibm/cassandra-operator/controllers/config" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/jobs" - "github.com/ibm/cassandra-operator/controllers/logger" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/nodectl" - "github.com/ibm/cassandra-operator/controllers/prober" - "github.com/ibm/cassandra-operator/controllers/reaper" - "github.com/ibm/cassandra-operator/controllers/webhooks" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers" + "github.com/cin/mr-cassop/controllers/cassandrabackup" + "github.com/cin/mr-cassop/controllers/cassandrarestore" + operatorCfg "github.com/cin/mr-cassop/controllers/config" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/icarus" + "github.com/cin/mr-cassop/controllers/jobs" + "github.com/cin/mr-cassop/controllers/logger" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/nodectl" + "github.com/cin/mr-cassop/controllers/prober" + "github.com/cin/mr-cassop/controllers/reaper" + "github.com/cin/mr-cassop/controllers/webhooks" ) var ( @@ -71,7 +70,7 @@ var ( ) const ( - leaderElectionID = "cassandra-operator-leader-election-lock" + leaderElectionID = "mr-cassop-leader-election-lock" healthCheckBindAddress = 8042 ) diff --git a/cassandra-operator/.helmignore b/mr-cassop/.helmignore similarity index 100% rename from cassandra-operator/.helmignore rename to mr-cassop/.helmignore diff --git a/cassandra-operator/Chart.yaml b/mr-cassop/Chart.yaml similarity index 78% rename from cassandra-operator/Chart.yaml rename to mr-cassop/Chart.yaml index bda6e5a..2be8aff 100644 --- a/cassandra-operator/Chart.yaml +++ b/mr-cassop/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: 0.0.1 description: A Helm chart for Kubernetes -name: cassandra-operator +name: mr-cassop version: 0.0.1 diff --git a/cassandra-operator/collectd/collectd.conf.tmpl b/mr-cassop/collectd/collectd.conf.tmpl similarity index 100% rename from cassandra-operator/collectd/collectd.conf.tmpl rename to mr-cassop/collectd/collectd.conf.tmpl diff --git a/cassandra-operator/collectd/metric-collector.yaml b/mr-cassop/collectd/metric-collector.yaml similarity index 100% rename from cassandra-operator/collectd/metric-collector.yaml rename to mr-cassop/collectd/metric-collector.yaml diff --git a/cassandra-operator/config/cassandra.yaml b/mr-cassop/config/cassandra.yaml similarity index 100% rename from cassandra-operator/config/cassandra.yaml rename to mr-cassop/config/cassandra.yaml diff --git a/cassandra-operator/config/jvm.options b/mr-cassop/config/jvm.options similarity index 100% rename from cassandra-operator/config/jvm.options rename to mr-cassop/config/jvm.options diff --git a/cassandra-operator/config/logback.xml b/mr-cassop/config/logback.xml similarity index 100% rename from cassandra-operator/config/logback.xml rename to mr-cassop/config/logback.xml diff --git a/cassandra-operator/crds/db.ibm.com_cassandrabackups.yaml b/mr-cassop/crds/db.ibm.com_cassandrabackups.yaml similarity index 99% rename from cassandra-operator/crds/db.ibm.com_cassandrabackups.yaml rename to mr-cassop/crds/db.ibm.com_cassandrabackups.yaml index 984d18b..6e08d09 100644 --- a/cassandra-operator/crds/db.ibm.com_cassandrabackups.yaml +++ b/mr-cassop/crds/db.ibm.com_cassandrabackups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.11.2 creationTimestamp: null name: cassandrabackups.db.ibm.com spec: diff --git a/cassandra-operator/crds/db.ibm.com_cassandraclusters.yaml b/mr-cassop/crds/db.ibm.com_cassandraclusters.yaml similarity index 99% rename from cassandra-operator/crds/db.ibm.com_cassandraclusters.yaml rename to mr-cassop/crds/db.ibm.com_cassandraclusters.yaml index 5d53667..3797905 100644 --- a/cassandra-operator/crds/db.ibm.com_cassandraclusters.yaml +++ b/mr-cassop/crds/db.ibm.com_cassandraclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.11.2 creationTimestamp: null name: cassandraclusters.db.ibm.com spec: diff --git a/cassandra-operator/crds/db.ibm.com_cassandrarestores.yaml b/mr-cassop/crds/db.ibm.com_cassandrarestores.yaml similarity index 99% rename from cassandra-operator/crds/db.ibm.com_cassandrarestores.yaml rename to mr-cassop/crds/db.ibm.com_cassandrarestores.yaml index cb905dd..fa7a927 100644 --- a/cassandra-operator/crds/db.ibm.com_cassandrarestores.yaml +++ b/mr-cassop/crds/db.ibm.com_cassandrarestores.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.11.2 creationTimestamp: null name: cassandrarestores.db.ibm.com spec: @@ -177,7 +177,7 @@ spec: type: boolean snapshotTag: description: Name of the snapshot tag to restore. Can be used to manually - set the snapshot tag. Retrieved from CassandraBackup if specified + set the snapshot tag. Retrieved from CassandraBackup if not specified type: string storageLocation: description: 'example: gcp://myBucket location of SSTables A value diff --git a/cassandra-operator/dashboards/datastax/datastax-condensed.json b/mr-cassop/dashboards/datastax/datastax-condensed.json similarity index 100% rename from cassandra-operator/dashboards/datastax/datastax-condensed.json rename to mr-cassop/dashboards/datastax/datastax-condensed.json diff --git a/cassandra-operator/dashboards/datastax/datastax-overview.json b/mr-cassop/dashboards/datastax/datastax-overview.json similarity index 100% rename from cassandra-operator/dashboards/datastax/datastax-overview.json rename to mr-cassop/dashboards/datastax/datastax-overview.json diff --git a/cassandra-operator/dashboards/datastax/datastax-system-metrics.json b/mr-cassop/dashboards/datastax/datastax-system-metrics.json similarity index 100% rename from cassandra-operator/dashboards/datastax/datastax-system-metrics.json rename to mr-cassop/dashboards/datastax/datastax-system-metrics.json diff --git a/cassandra-operator/dashboards/instaclustr/instaclustr-node-overview.json b/mr-cassop/dashboards/instaclustr/instaclustr-node-overview.json similarity index 100% rename from cassandra-operator/dashboards/instaclustr/instaclustr-node-overview.json rename to mr-cassop/dashboards/instaclustr/instaclustr-node-overview.json diff --git a/cassandra-operator/dashboards/instaclustr/instaclustr-overview.json b/mr-cassop/dashboards/instaclustr/instaclustr-overview.json similarity index 100% rename from cassandra-operator/dashboards/instaclustr/instaclustr-overview.json rename to mr-cassop/dashboards/instaclustr/instaclustr-overview.json diff --git a/cassandra-operator/dashboards/instaclustr/instaclustr-table-details.json b/mr-cassop/dashboards/instaclustr/instaclustr-table-details.json similarity index 100% rename from cassandra-operator/dashboards/instaclustr/instaclustr-table-details.json rename to mr-cassop/dashboards/instaclustr/instaclustr-table-details.json diff --git a/cassandra-operator/dashboards/prober/prober-overview.json b/mr-cassop/dashboards/prober/prober-overview.json similarity index 100% rename from cassandra-operator/dashboards/prober/prober-overview.json rename to mr-cassop/dashboards/prober/prober-overview.json diff --git a/cassandra-operator/dashboards/reaper/reaper-overview.json b/mr-cassop/dashboards/reaper/reaper-overview.json similarity index 100% rename from cassandra-operator/dashboards/reaper/reaper-overview.json rename to mr-cassop/dashboards/reaper/reaper-overview.json diff --git a/cassandra-operator/dashboards/tlp/tlp-client-connections.json b/mr-cassop/dashboards/tlp/tlp-client-connections.json similarity index 100% rename from cassandra-operator/dashboards/tlp/tlp-client-connections.json rename to mr-cassop/dashboards/tlp/tlp-client-connections.json diff --git a/cassandra-operator/dashboards/tlp/tlp-jvm-overview.json b/mr-cassop/dashboards/tlp/tlp-jvm-overview.json similarity index 100% rename from cassandra-operator/dashboards/tlp/tlp-jvm-overview.json rename to mr-cassop/dashboards/tlp/tlp-jvm-overview.json diff --git a/cassandra-operator/dashboards/tlp/tlp-overview.json b/mr-cassop/dashboards/tlp/tlp-overview.json similarity index 100% rename from cassandra-operator/dashboards/tlp/tlp-overview.json rename to mr-cassop/dashboards/tlp/tlp-overview.json diff --git a/cassandra-operator/dashboards/tlp/tlp-read-path.json b/mr-cassop/dashboards/tlp/tlp-read-path.json similarity index 100% rename from cassandra-operator/dashboards/tlp/tlp-read-path.json rename to mr-cassop/dashboards/tlp/tlp-read-path.json diff --git a/cassandra-operator/dashboards/tlp/tlp-write-path.json b/mr-cassop/dashboards/tlp/tlp-write-path.json similarity index 100% rename from cassandra-operator/dashboards/tlp/tlp-write-path.json rename to mr-cassop/dashboards/tlp/tlp-write-path.json diff --git a/cassandra-operator/prometheus/prometheus.yaml b/mr-cassop/prometheus/prometheus.yaml similarity index 100% rename from cassandra-operator/prometheus/prometheus.yaml rename to mr-cassop/prometheus/prometheus.yaml diff --git a/cassandra-operator/reaper-shiro/shiro.ini b/mr-cassop/reaper-shiro/shiro.ini similarity index 100% rename from cassandra-operator/reaper-shiro/shiro.ini rename to mr-cassop/reaper-shiro/shiro.ini diff --git a/cassandra-operator/templates/cassandra-configs.yaml b/mr-cassop/templates/cassandra-configs.yaml similarity index 73% rename from cassandra-operator/templates/cassandra-configs.yaml rename to mr-cassop/templates/cassandra-configs.yaml index 055ef5d..0ad164b 100644 --- a/cassandra-operator/templates/cassandra-configs.yaml +++ b/mr-cassop/templates/cassandra-configs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap metadata: - name: cassandra-operator-cassandra-init-config + name: mr-cassop-cassandra-init-config namespace: {{ .Release.Namespace }} data: {{ (.Files.Glob "config/*").AsConfig | nindent 2 }} diff --git a/cassandra-operator/templates/clusterrole.yaml b/mr-cassop/templates/clusterrole.yaml similarity index 99% rename from cassandra-operator/templates/clusterrole.yaml rename to mr-cassop/templates/clusterrole.yaml index a73d474..6c49546 100644 --- a/cassandra-operator/templates/clusterrole.yaml +++ b/mr-cassop/templates/clusterrole.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: creationTimestamp: null - name: cassandra-operator + name: mr-cassop rules: - apiGroups: - "" diff --git a/cassandra-operator/templates/clusterrolebinding.yaml b/mr-cassop/templates/clusterrolebinding.yaml similarity index 75% rename from cassandra-operator/templates/clusterrolebinding.yaml rename to mr-cassop/templates/clusterrolebinding.yaml index aad8469..5d31886 100644 --- a/cassandra-operator/templates/clusterrolebinding.yaml +++ b/mr-cassop/templates/clusterrolebinding.yaml @@ -2,12 +2,12 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: creationTimestamp: null - name: cassandra-operator + name: mr-cassop roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: cassandra-operator + name: mr-cassop subjects: - kind: ServiceAccount - name: cassandra-operator + name: mr-cassop namespace: {{ .Release.Namespace | quote }} diff --git a/cassandra-operator/templates/deployment.yaml b/mr-cassop/templates/deployment.yaml similarity index 90% rename from cassandra-operator/templates/deployment.yaml rename to mr-cassop/templates/deployment.yaml index df211fc..74d5e0b 100644 --- a/cassandra-operator/templates/deployment.yaml +++ b/mr-cassop/templates/deployment.yaml @@ -1,25 +1,25 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: cassandra-operator + name: mr-cassop namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.replicas }} selector: matchLabels: - operator: cassandra-operator + operator: mr-cassop template: metadata: labels: - operator: cassandra-operator + operator: mr-cassop spec: {{- with .Values.container.imagePullSecret }} imagePullSecrets: - name: {{ . | quote }} {{- end }} - serviceAccountName: cassandra-operator + serviceAccountName: mr-cassop containers: - - name: cassandra-operator + - name: mr-cassop image: "{{ .Values.container.image }}" imagePullPolicy: {{ .Values.container.imagePullPolicy }} resources: diff --git a/cassandra-operator/templates/monitoring/cluster-dashboards.yaml b/mr-cassop/templates/monitoring/cluster-dashboards.yaml similarity index 100% rename from cassandra-operator/templates/monitoring/cluster-dashboards.yaml rename to mr-cassop/templates/monitoring/cluster-dashboards.yaml diff --git a/cassandra-operator/templates/monitoring/collectd-configmap.yaml b/mr-cassop/templates/monitoring/collectd-configmap.yaml similarity index 75% rename from cassandra-operator/templates/monitoring/collectd-configmap.yaml rename to mr-cassop/templates/monitoring/collectd-configmap.yaml index 919bc14..f22346a 100644 --- a/cassandra-operator/templates/monitoring/collectd-configmap.yaml +++ b/mr-cassop/templates/monitoring/collectd-configmap.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap metadata: - name: cassandra-operator-collectd-configmap + name: mr-cassop-collectd-configmap namespace: {{ .Release.Namespace }} data: {{ (.Files.Glob "collectd/*").AsConfig | nindent 2 }} diff --git a/cassandra-operator/templates/monitoring/metrics-service-monitor.yaml b/mr-cassop/templates/monitoring/metrics-service-monitor.yaml similarity index 94% rename from cassandra-operator/templates/monitoring/metrics-service-monitor.yaml rename to mr-cassop/templates/monitoring/metrics-service-monitor.yaml index 5c0639e..c8bc3b8 100644 --- a/cassandra-operator/templates/monitoring/metrics-service-monitor.yaml +++ b/mr-cassop/templates/monitoring/metrics-service-monitor.yaml @@ -9,7 +9,7 @@ metadata: spec: selector: matchLabels: - operator: cassandra-operator + operator: mr-cassop namespaceSelector: matchNames: [{{ .Release.Namespace }}] endpoints: diff --git a/cassandra-operator/templates/monitoring/metrics-service.yaml b/mr-cassop/templates/monitoring/metrics-service.yaml similarity index 79% rename from cassandra-operator/templates/monitoring/metrics-service.yaml rename to mr-cassop/templates/monitoring/metrics-service.yaml index bac0a50..7a371d0 100644 --- a/cassandra-operator/templates/monitoring/metrics-service.yaml +++ b/mr-cassop/templates/monitoring/metrics-service.yaml @@ -5,12 +5,12 @@ metadata: name: {{ .Release.Name }}-metrics namespace: {{ .Release.Namespace }} labels: - operator: cassandra-operator + operator: mr-cassop spec: ports: - name: metrics port: 8329 targetPort: metrics selector: - operator: cassandra-operator + operator: mr-cassop {{- end }} diff --git a/cassandra-operator/templates/monitoring/operator-dashboard.yaml b/mr-cassop/templates/monitoring/operator-dashboard.yaml similarity index 99% rename from cassandra-operator/templates/monitoring/operator-dashboard.yaml rename to mr-cassop/templates/monitoring/operator-dashboard.yaml index 846630a..d51690c 100644 --- a/cassandra-operator/templates/monitoring/operator-dashboard.yaml +++ b/mr-cassop/templates/monitoring/operator-dashboard.yaml @@ -7,7 +7,7 @@ metadata: labels: {{- toYaml .Values.monitoring.grafanaDashboard.labels | nindent 4 }} data: - cassandra-operator.json: |- + mr-cassop.json: |- { "annotations": { "list": [ @@ -1050,7 +1050,7 @@ data: ] }, "timezone": "browser", - "title": "Cassandra Operator", + "title": "mr-cassop", "version": null } {{ end }} \ No newline at end of file diff --git a/cassandra-operator/templates/monitoring/prometheus-configmap.yaml b/mr-cassop/templates/monitoring/prometheus-configmap.yaml similarity index 76% rename from cassandra-operator/templates/monitoring/prometheus-configmap.yaml rename to mr-cassop/templates/monitoring/prometheus-configmap.yaml index ee7cbea..cc32dc8 100644 --- a/cassandra-operator/templates/monitoring/prometheus-configmap.yaml +++ b/mr-cassop/templates/monitoring/prometheus-configmap.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap metadata: - name: cassandra-operator-prometheus-configmap + name: mr-cassop-prometheus-configmap namespace: {{ .Release.Namespace }} data: {{ (.Files.Glob "prometheus/prometheus.yaml").AsConfig | nindent 2 }} diff --git a/cassandra-operator/templates/scripts-configmap.yaml b/mr-cassop/templates/scripts-configmap.yaml similarity index 75% rename from cassandra-operator/templates/scripts-configmap.yaml rename to mr-cassop/templates/scripts-configmap.yaml index b1fd314..726ed65 100644 --- a/cassandra-operator/templates/scripts-configmap.yaml +++ b/mr-cassop/templates/scripts-configmap.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: cassandra-operator-scripts-configmap + name: mr-cassop-scripts-configmap namespace: {{ .Release.Namespace }} data: {{ (.Files.Glob "scripts/*.sh").AsConfig | indent 2 }} diff --git a/cassandra-operator/templates/serviceaccount.yaml b/mr-cassop/templates/serviceaccount.yaml similarity index 75% rename from cassandra-operator/templates/serviceaccount.yaml rename to mr-cassop/templates/serviceaccount.yaml index f0c1f91..9525754 100644 --- a/cassandra-operator/templates/serviceaccount.yaml +++ b/mr-cassop/templates/serviceaccount.yaml @@ -1,5 +1,5 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: cassandra-operator + name: mr-cassop namespace: {{ .Release.Namespace }} diff --git a/cassandra-operator/templates/shiro-config.yaml b/mr-cassop/templates/shiro-config.yaml similarity index 77% rename from cassandra-operator/templates/shiro-config.yaml rename to mr-cassop/templates/shiro-config.yaml index 9ea3e46..24710e5 100644 --- a/cassandra-operator/templates/shiro-config.yaml +++ b/mr-cassop/templates/shiro-config.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap metadata: - name: cassandra-operator-shiro-configmap + name: mr-cassop-shiro-configmap namespace: {{ .Release.Namespace }} data: {{ (.Files.Glob "reaper-shiro/shiro.ini").AsConfig | nindent 2 }} diff --git a/cassandra-operator/values.yaml b/mr-cassop/values.yaml similarity index 61% rename from cassandra-operator/values.yaml rename to mr-cassop/values.yaml index 0389416..2e15d8f 100644 --- a/cassandra-operator/values.yaml +++ b/mr-cassop/values.yaml @@ -1,6 +1,6 @@ replicas: 1 container: - image: us.icr.io/cassandra-operator/cassandra-operator:0.5.0 + image: cinple/mr-cassop/mr-cassop:0.5.0 # imagePullSecret: container-registry-secret imagePullPolicy: IfNotPresent restartPolicy: Always @@ -13,11 +13,11 @@ container: memory: 200Mi logLevel: info logFormat: json -proberImage: us.icr.io/cassandra-operator/prober:0.5.0 # this value will be updated on next release in GHA -jolokiaImage: us.icr.io/cassandra-operator/jolokia:0.5.0 # this value will be updated on next release in GHA -cassandraImage: us.icr.io/cassandra-operator/cassandra:3.11.13-0.5.0 # this value will be updated on next release in GHA +proberImage: cinple/mr-cassop/prober:0.5.0 # this value will be updated on next release in GHA +jolokiaImage: cinple/mr-cassop/jolokia:0.5.0 # this value will be updated on next release in GHA +cassandraImage: cinple/mr-cassop/cassandra:3.11.14-0.5.0 # this value will be updated on next release in GHA reaperImage: thelastpickle/cassandra-reaper:3.2.0 -icarusImage: us.icr.io/cassandra-operator/icarus:0.5.0 +icarusImage: cinple/mr-cassop/icarus:0.5.0 clusterDashboards: enabled: [] namespace: "" @@ -35,7 +35,7 @@ monitoring: enabled: false namespace: "" labels: - operator: cassandra-operator + operator: mr-cassop scrapeInterval: 30s admissionWebhooks: enabled: true diff --git a/prober/Dockerfile b/prober/Dockerfile index 5f0f7b0..6b83f29 100644 --- a/prober/Dockerfile +++ b/prober/Dockerfile @@ -1,5 +1,4 @@ -ARG DOCKER_PROXY_REGISTRY="" -FROM ${DOCKER_PROXY_REGISTRY}golang:1.18 as builder +FROM golang:1.18 as builder LABEL maintainer="coreeng@us.ibm.com" \ description="This docker image is used for the prober Go application" @@ -16,8 +15,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on \ -a \ -o prober . -ARG DOCKER_PROXY_REGISTRY="" -FROM ${DOCKER_PROXY_REGISTRY}debian:bookworm-slim +FROM debian:buster-slim WORKDIR / diff --git a/prober/go.mod b/prober/go.mod index abb0eab..e915dfc 100644 --- a/prober/go.mod +++ b/prober/go.mod @@ -1,4 +1,4 @@ -module github.com/ibm/cassandra-operator/prober +module github.com/cin/mr-cassop/prober go 1.17 @@ -43,11 +43,11 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect - golang.org/x/net v0.7.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.1 // indirect diff --git a/prober/go.sum b/prober/go.sum index b88916d..1855055 100644 --- a/prober/go.sum +++ b/prober/go.sum @@ -419,6 +419,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -456,6 +457,7 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -509,8 +511,10 @@ golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -546,6 +550,7 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -623,12 +628,16 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -638,8 +647,10 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -703,6 +714,7 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/prober/main.go b/prober/main.go index 3b1d7d5..bfac159 100644 --- a/prober/main.go +++ b/prober/main.go @@ -6,12 +6,12 @@ import ( "os" "reflect" - "github.com/ibm/cassandra-operator/prober/logger" + "github.com/cin/mr-cassop/prober/logger" - "github.com/ibm/cassandra-operator/prober/config" - "github.com/ibm/cassandra-operator/prober/prober" + "github.com/cin/mr-cassop/prober/config" + "github.com/cin/mr-cassop/prober/prober" - "github.com/ibm/cassandra-operator/prober/jolokia" + "github.com/cin/mr-cassop/prober/jolokia" "go.uber.org/zap/zapcore" "github.com/caarlos0/env/v6" diff --git a/prober/prober/handlers_test.go b/prober/prober/handlers_test.go index 6261e2e..31d5425 100644 --- a/prober/prober/handlers_test.go +++ b/prober/prober/handlers_test.go @@ -9,7 +9,7 @@ import ( "net/http/httptest" "testing" - "github.com/ibm/cassandra-operator/prober/config" + "github.com/cin/mr-cassop/prober/config" "k8s.io/client-go/kubernetes" "github.com/julienschmidt/httprouter" diff --git a/prober/prober/node_states.go b/prober/prober/node_states.go index 4626739..65da287 100644 --- a/prober/prober/node_states.go +++ b/prober/prober/node_states.go @@ -8,8 +8,8 @@ import ( "strings" "time" + "github.com/cin/mr-cassop/prober/jolokia" "github.com/google/go-cmp/cmp" - "github.com/ibm/cassandra-operator/prober/jolokia" ) type nodeState struct { diff --git a/prober/prober/node_states_test.go b/prober/prober/node_states_test.go index 56c8ccb..9a672d4 100644 --- a/prober/prober/node_states_test.go +++ b/prober/prober/node_states_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/ibm/cassandra-operator/prober/jolokia" + "github.com/cin/mr-cassop/prober/jolokia" "github.com/onsi/gomega" "go.uber.org/zap" diff --git a/prober/prober/prober.go b/prober/prober/prober.go index 4d13914..815791c 100644 --- a/prober/prober/prober.go +++ b/prober/prober/prober.go @@ -6,8 +6,8 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/ibm/cassandra-operator/prober/config" - "github.com/ibm/cassandra-operator/prober/jolokia" + "github.com/cin/mr-cassop/prober/config" + "github.com/cin/mr-cassop/prober/jolokia" "github.com/julienschmidt/httprouter" "go.uber.org/zap" "k8s.io/client-go/kubernetes" diff --git a/prober/prober/prober_test.go b/prober/prober/prober_test.go index dbefe21..fc6d8d9 100644 --- a/prober/prober/prober_test.go +++ b/prober/prober/prober_test.go @@ -8,7 +8,7 @@ import ( "github.com/julienschmidt/httprouter" - "github.com/ibm/cassandra-operator/prober/config" + "github.com/cin/mr-cassop/prober/config" "go.uber.org/zap" "k8s.io/client-go/kubernetes" ) diff --git a/skaffold.yaml b/skaffold.yaml index 56d0d48..e3ce281 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -2,19 +2,19 @@ apiVersion: skaffold/v2beta25 kind: Config build: artifacts: - - image: "us.icr.io/cassandra-operator/cassandra-operator" + - image: "cinple/mr-cassop" context: . docker: dockerfile: Dockerfile - - image: "us.icr.io/cassandra-operator/prober" + - image: "cinple/prober" context: prober/ docker: dockerfile: Dockerfile - - image: "us.icr.io/cassandra-operator/cassandra" + - image: "cinple/cassandra" context: cassandra/ docker: dockerfile: Dockerfile - - image: "us.icr.io/cassandra-operator/jolokia" + - image: "cinple/jolokia" context: jolokia/ docker: dockerfile: Dockerfile @@ -27,7 +27,7 @@ build: # useDockerCLI: true #build: # artifacts: -# - image: "738806440043.dkr.ecr.us-east-1.amazonaws.com/cassandra-operator" +# - image: "738806440043.dkr.ecr.us-east-1.amazonaws.com/mr-cassop" # context: . # docker: # dockerfile: Dockerfile @@ -52,19 +52,19 @@ build: deploy: helm: releases: - - name: "cassandra-operator-{{.USER}}" - chartPath: ./cassandra-operator + - name: "mr-cassop-{{.USER}}" + chartPath: ./mr-cassop valuesFiles: - - cassandra-operator/values.yaml + - mr-cassop/values.yaml setValueTemplates: - container.image: "us.icr.io/cassandra-operator/cassandra-operator:{{.USER}}" + container.image: "cinple/mr-cassop:{{.USER}}" container.imagePullSecret: icm-coreeng-pull-secret container.imagePullPolicy: Always logLevel: debug logFormat: console - proberImage: "us.icr.io/cassandra-operator/prober:{{.USER}}" - jolokiaImage: "us.icr.io/cassandra-operator/jolokia:{{.USER}}" - cassandraImage: "us.icr.io/cassandra-operator/cassandra:{{.USER}}" + proberImage: "cinple/prober:{{.USER}}" + jolokiaImage: "cinple/jolokia:{{.USER}}" + cassandraImage: "cinple/cassandra:{{.USER}}" admissionWebhooks.enabled: true clusterDashboards.enabled[0]: "datastax" clusterDashboards.enabled[1]: "instaclustr" @@ -96,17 +96,17 @@ profiles: deploy: helm: releases: - - name: "cassandra-operator-{{.USER}}" - chartPath: ./cassandra-operator + - name: "mr-cassop-{{.USER}}" + chartPath: ./mr-cassop valuesFiles: - - cassandra-operator/values.yaml + - mr-cassop/values.yaml setValueTemplates: - container.image: "us.icr.io/cassandra-operator/cassandra-operator:{{.USER}}" + container.image: "cinple/mr-cassop:{{.USER}}" container.imagePullPolicy: Never logLevel: debug - proberImage: "us.icr.io/cassandra-operator/prober:{{.USER}}" - jolokiaImage: "us.icr.io/cassandra-operator/jolokia:{{.USER}}" - cassandraImage: "us.icr.io/cassandra-operator/cassandra:{{.USER}}" + proberImage: "cinple/prober:{{.USER}}" + jolokiaImage: "cinple/jolokia:{{.USER}}" + cassandraImage: "cinple/cassandra:{{.USER}}" createNamespace: true wait: true packaged: diff --git a/tests/e2e/auth_test.go b/tests/e2e/auth_test.go index 415479e..3e3f7fe 100644 --- a/tests/e2e/auth_test.go +++ b/tests/e2e/auth_test.go @@ -8,8 +8,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" diff --git a/tests/e2e/client_encryption_test.go b/tests/e2e/client_encryption_test.go index 243f6ba..5282a2e 100644 --- a/tests/e2e/client_encryption_test.go +++ b/tests/e2e/client_encryption_test.go @@ -2,7 +2,8 @@ package e2e import ( "encoding/base64" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/e2e/cluster_encryption_test.go b/tests/e2e/cluster_encryption_test.go index 7289f66..1544fb1 100644 --- a/tests/e2e/cluster_encryption_test.go +++ b/tests/e2e/cluster_encryption_test.go @@ -2,7 +2,8 @@ package e2e import ( "encoding/base64" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/e2e/managed_regions_test.go b/tests/e2e/managed_regions_test.go index fab5d2e..a2050fd 100644 --- a/tests/e2e/managed_regions_test.go +++ b/tests/e2e/managed_regions_test.go @@ -8,10 +8,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" - "github.com/ibm/cassandra-operator/controllers/labels" + "github.com/cin/mr-cassop/controllers/labels" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/tests/e2e/monitoring_test.go b/tests/e2e/monitoring_test.go index 57f2c41..3a29ed9 100644 --- a/tests/e2e/monitoring_test.go +++ b/tests/e2e/monitoring_test.go @@ -5,8 +5,8 @@ import ( "net/http" "time" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/prometheus/common/expfmt" diff --git a/tests/e2e/network_policies_test.go b/tests/e2e/network_policies_test.go index 6572809..ab9bb23 100644 --- a/tests/e2e/network_policies_test.go +++ b/tests/e2e/network_policies_test.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" @@ -136,7 +136,7 @@ var _ = Describe("Network policies in multi-region cluster", Serial, func() { Containers: []v1.Container{ { Name: "test-container", - Image: "cassandra:3.11.13", + Image: "cassandra:3.11.14", Command: []string{"sleep", "3600"}, Stdin: false, StdinOnce: false, diff --git a/tests/e2e/reaper_test.go b/tests/e2e/reaper_test.go index f66145e..6a84947 100644 --- a/tests/e2e/reaper_test.go +++ b/tests/e2e/reaper_test.go @@ -6,20 +6,20 @@ import ( "strings" "time" - "github.com/ibm/cassandra-operator/controllers/names" + "github.com/cin/mr-cassop/controllers/names" "github.com/gocql/gocql" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" ) // We call init function from assigned `Describe` function, in such way we can avoid using init() {} in this file @@ -84,7 +84,7 @@ var _ = Describe("Reaper test", func() { By("Running cql query: checking Cassandra version...") err = session.Query(`SELECT release_version FROM system.local`).Consistency(gocql.LocalQuorum).Scan(&releaseVersion) Expect(err).ToNot(HaveOccurred()) - Expect(releaseVersion).To(Equal("3.11.13")) + Expect(releaseVersion).To(Equal("3.11.14")) By("Running cql query: creating test keyspace...") cqlQuery := `CREATE KEYSPACE IF NOT EXISTS %s WITH REPLICATION = { 'class' : 'NetworkTopologyStrategy', '%s' : %v }` diff --git a/tests/e2e/region_scale_test.go b/tests/e2e/region_scale_test.go index b75a462..5d75d5f 100644 --- a/tests/e2e/region_scale_test.go +++ b/tests/e2e/region_scale_test.go @@ -1,9 +1,9 @@ package e2e import ( + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/e2e/roles_test.go b/tests/e2e/roles_test.go index 34c9fe7..0a78f5e 100644 --- a/tests/e2e/roles_test.go +++ b/tests/e2e/roles_test.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/ibm/cassandra-operator/controllers/labels" + "github.com/cin/mr-cassop/controllers/labels" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" "k8s.io/apimachinery/pkg/types" . "github.com/onsi/ginkgo/v2" diff --git a/tests/e2e/scaling_test.go b/tests/e2e/scaling_test.go index b90fb1c..708effb 100644 --- a/tests/e2e/scaling_test.go +++ b/tests/e2e/scaling_test.go @@ -4,14 +4,14 @@ import ( "fmt" "time" + "github.com/cin/mr-cassop/controllers/cql" "github.com/gocql/gocql" - "github.com/ibm/cassandra-operator/controllers/cql" appsv1 "k8s.io/api/apps/v1" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" diff --git a/tests/e2e/suite_test.go b/tests/e2e/suite_test.go index a94b87f..7eeb34f 100644 --- a/tests/e2e/suite_test.go +++ b/tests/e2e/suite_test.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" - "github.com/ibm/cassandra-operator/api/v1alpha1" + "github.com/cin/mr-cassop/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" @@ -89,7 +89,7 @@ var _ = SynchronizedBeforeSuite(func() []byte { cassandraCRD := apixClient.CustomResourceDefinitions() crd, err := cassandraCRD.Get(ctx, "cassandraclusters.db.ibm.com", metav1.GetOptions{TypeMeta: metav1.TypeMeta{}}) if err != nil || crd == nil { - Fail(fmt.Sprintf("Cassandra operator is not deployed in the cluster. Error: %s", err)) + Fail(fmt.Sprintf("mr-cassop is not deployed in the cluster. Error: %s", err)) } // Create clientset to be able to pull logs and exec into pods @@ -104,7 +104,7 @@ var _ = JustAfterEach(func() { ccList := &v1alpha1.CassandraClusterList{} Expect(kubeClient.List(ctx, ccList)).To(Succeed()) - GinkgoWriter.Println("Gathering log info for Cassandra Operator") + GinkgoWriter.Println("Gathering log info for mr-cassop") showPodLogs(v1alpha1.CassandraOperatorPodLabels, cfg.operatorNamespace) for _, cc := range ccList.Items { diff --git a/tests/e2e/unmanaged_region_test.go b/tests/e2e/unmanaged_region_test.go index 3fee0ee..f0253b0 100644 --- a/tests/e2e/unmanaged_region_test.go +++ b/tests/e2e/unmanaged_region_test.go @@ -3,15 +3,15 @@ package e2e import ( "strings" - "github.com/ibm/cassandra-operator/controllers/util" + "github.com/cin/mr-cassop/controllers/util" "k8s.io/apimachinery/pkg/types" - "github.com/ibm/cassandra-operator/controllers/labels" + "github.com/cin/mr-cassop/controllers/labels" "github.com/gogo/protobuf/proto" "k8s.io/apimachinery/pkg/api/resource" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/tests/e2e/utils_test.go b/tests/e2e/utils_test.go index bb90b65..db53b60 100644 --- a/tests/e2e/utils_test.go +++ b/tests/e2e/utils_test.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,7 +27,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" ) var ( @@ -272,8 +272,8 @@ func deployCassandraCluster(cassandraCluster *v1alpha1.CassandraCluster) { Namespace: cassandraCluster.Namespace, }, Data: map[string][]byte{ - v1alpha1.CassandraOperatorAdminRole: []byte("cassandra-operator"), - v1alpha1.CassandraOperatorAdminPassword: []byte("cassandra-operator-password"), + v1alpha1.CassandraOperatorAdminRole: []byte("mr-cassop"), + v1alpha1.CassandraOperatorAdminPassword: []byte("mr-cassop-password"), }, } Expect(kubeClient.Create(ctx, adminSecret)).To(Succeed()) diff --git a/tests/e2e/zone_as_racks_test.go b/tests/e2e/zone_as_racks_test.go index 941d22c..c0a4fa8 100644 --- a/tests/e2e/zone_as_racks_test.go +++ b/tests/e2e/zone_as_racks_test.go @@ -6,9 +6,9 @@ import ( "k8s.io/apimachinery/pkg/types" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/integration/admin_auth_test.go b/tests/integration/admin_auth_test.go index dc078b2..84da6ba 100644 --- a/tests/integration/admin_auth_test.go +++ b/tests/integration/admin_auth_test.go @@ -1,10 +1,10 @@ package integration import ( + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/integration/cassandra_configs_test.go b/tests/integration/cassandra_configs_test.go index c186102..164cd8f 100644 --- a/tests/integration/cassandra_configs_test.go +++ b/tests/integration/cassandra_configs_test.go @@ -3,15 +3,16 @@ package integration import ( "bufio" "fmt" + "strings" + + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/yaml" - "strings" ) var _ = Describe("cassandra cluster configs", func() { diff --git a/tests/integration/cassandra_test.go b/tests/integration/cassandra_test.go index 15e5d67..471d6cd 100644 --- a/tests/integration/cassandra_test.go +++ b/tests/integration/cassandra_test.go @@ -4,10 +4,10 @@ import ( "fmt" "time" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" @@ -102,7 +102,7 @@ var _ = Describe("cassandra statefulset deployment", func() { "bash", "-c", `chown cassandra:cassandra /var/lib/cassandra -sysctl -w fs.file-max="1073741824" net.core.somaxconn="65000" net.ipv4.ip_local_port_range="1025 65535" net.ipv4.tcp_ecn="0" net.ipv4.tcp_rmem="4096 87380 16777216" net.ipv4.tcp_window_scaling="1" net.ipv4.tcp_wmem="4096 65536 16777216" vm.dirty_background_bytes="10485760" vm.dirty_bytes="1073741824" vm.max_map_count="1073741824" vm.swappiness="1" vm.zone_reclaim_mode="0"`, +sysctl -w fs.file-max="1073741824" net.core.somaxconn="65000" net.ipv4.ip_local_port_range="1025 65535" net.ipv4.tcp_ecn="0" net.ipv4.tcp_rmem="4096 87380 16777216" net.ipv4.tcp_window_scaling="1" net.ipv4.tcp_wmem="4096 65536 16777216" vm.dirty_background_bytes="10485760" vm.dirty_bytes="1073741824" vm.max_map_count="1073741824" vm.swappiness="1"`, }, )) } @@ -333,7 +333,7 @@ var _ = Describe("cassandra statefulset", func() { "bash", "-c", `chown cassandra:cassandra /var/lib/cassandra -sysctl -w fs.file-max="1073741824" net.core.somaxconn="65000" net.ipv4.ip_local_port_range="1025 65535" net.ipv4.tcp_ecn="0" net.ipv4.tcp_rmem="4096 87380 16777216" net.ipv4.tcp_window_scaling="1" net.ipv4.tcp_wmem="4096 65536 16777216" vm.dirty_background_bytes="10485760" vm.dirty_bytes="1073741824" vm.max_map_count="1073741824" vm.swappiness="1" vm.zone_reclaim_mode="0"`}, +sysctl -w fs.file-max="1073741824" net.core.somaxconn="65000" net.ipv4.ip_local_port_range="1025 65535" net.ipv4.tcp_ecn="0" net.ipv4.tcp_rmem="4096 87380 16777216" net.ipv4.tcp_window_scaling="1" net.ipv4.tcp_wmem="4096 65536 16777216" vm.dirty_background_bytes="10485760" vm.dirty_bytes="1073741824" vm.max_map_count="1073741824" vm.swappiness="1"`}, ), ) } diff --git a/tests/integration/cassandrabackup_test.go b/tests/integration/cassandrabackup_test.go index b81907e..c19b3d2 100644 --- a/tests/integration/cassandrabackup_test.go +++ b/tests/integration/cassandrabackup_test.go @@ -1,9 +1,9 @@ package integration import ( + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/icarus" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/icarus" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/integration/cassandracluster_test.go b/tests/integration/cassandracluster_test.go index a100134..bee919b 100644 --- a/tests/integration/cassandracluster_test.go +++ b/tests/integration/cassandracluster_test.go @@ -6,24 +6,24 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/ibm/cassandra-operator/controllers/labels" + "github.com/cin/mr-cassop/controllers/labels" "github.com/google/go-cmp/cmp" "k8s.io/apimachinery/pkg/api/errors" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" ) var _ = Describe("prober, statefulsets and reaper", func() { diff --git a/tests/integration/cassandrarestore_test.go b/tests/integration/cassandrarestore_test.go index b56e5cf..48b36b3 100644 --- a/tests/integration/cassandrarestore_test.go +++ b/tests/integration/cassandrarestore_test.go @@ -1,9 +1,9 @@ package integration import ( + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/icarus" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/icarus" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/integration/encryption_test.go b/tests/integration/encryption_test.go index a8f4416..8178e31 100644 --- a/tests/integration/encryption_test.go +++ b/tests/integration/encryption_test.go @@ -2,10 +2,11 @@ package integration import ( "fmt" + + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/tests/integration/keyspaces_test.go b/tests/integration/keyspaces_test.go index 7ad16a5..fd34e72 100644 --- a/tests/integration/keyspaces_test.go +++ b/tests/integration/keyspaces_test.go @@ -3,9 +3,9 @@ package integration import ( "time" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/tests/integration/maintenance_test.go b/tests/integration/maintenance_test.go index f020024..67422ec 100644 --- a/tests/integration/maintenance_test.go +++ b/tests/integration/maintenance_test.go @@ -3,9 +3,9 @@ package integration import ( "time" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" diff --git a/tests/integration/mocks_test.go b/tests/integration/mocks_test.go index 2b9faaa..cb1fe79 100644 --- a/tests/integration/mocks_test.go +++ b/tests/integration/mocks_test.go @@ -6,18 +6,18 @@ import ( "strconv" "time" - "github.com/ibm/cassandra-operator/controllers/icarus" + "github.com/cin/mr-cassop/controllers/icarus" - "github.com/ibm/cassandra-operator/controllers/nodectl" + "github.com/cin/mr-cassop/controllers/nodectl" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/controllers/reaper" + "github.com/cin/mr-cassop/controllers/reaper" + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/util" "github.com/gocql/gocql" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/util" "github.com/pkg/errors" ) diff --git a/tests/integration/monitoring_test.go b/tests/integration/monitoring_test.go index 7d4d791..8b60d87 100644 --- a/tests/integration/monitoring_test.go +++ b/tests/integration/monitoring_test.go @@ -1,9 +1,9 @@ package integration import ( + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/integration/multiregion_test.go b/tests/integration/multiregion_test.go index aca6354..426a8ba 100644 --- a/tests/integration/multiregion_test.go +++ b/tests/integration/multiregion_test.go @@ -6,10 +6,10 @@ import ( v1 "k8s.io/api/core/v1" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/tests/integration/network_policies_test.go b/tests/integration/network_policies_test.go index d8eee12..dd9c2a2 100644 --- a/tests/integration/network_policies_test.go +++ b/tests/integration/network_policies_test.go @@ -2,10 +2,12 @@ package integration import ( "fmt" + "strconv" + + dbv1alpha1 "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - dbv1alpha1 "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" @@ -13,7 +15,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "strconv" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/tests/integration/pod_ips_test.go b/tests/integration/pod_ips_test.go index 7e41f7c..5cb23d3 100644 --- a/tests/integration/pod_ips_test.go +++ b/tests/integration/pod_ips_test.go @@ -1,10 +1,10 @@ package integration import ( + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v12 "k8s.io/api/apps/v1" diff --git a/tests/integration/pod_labels_test.go b/tests/integration/pod_labels_test.go index db9b240..1b4c981 100644 --- a/tests/integration/pod_labels_test.go +++ b/tests/integration/pod_labels_test.go @@ -1,10 +1,10 @@ package integration import ( + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/labels" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/integration/pod_restart_test.go b/tests/integration/pod_restart_test.go index 4a84c2a..d65a835 100644 --- a/tests/integration/pod_restart_test.go +++ b/tests/integration/pod_restart_test.go @@ -2,10 +2,11 @@ package integration import ( "fmt" + + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/util" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/tests/integration/prober_test.go b/tests/integration/prober_test.go index 4b72a00..5b401ed 100644 --- a/tests/integration/prober_test.go +++ b/tests/integration/prober_test.go @@ -1,9 +1,9 @@ package integration import ( + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/tests/integration/reaper_test.go b/tests/integration/reaper_test.go index 009afae..c50ab97 100644 --- a/tests/integration/reaper_test.go +++ b/tests/integration/reaper_test.go @@ -1,10 +1,10 @@ package integration import ( + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/reaper" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/reaper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" @@ -214,7 +214,7 @@ var _ = Describe("repair schedules in reaper", func() { externalRepairSchedule, { ID: "id-1", - Owner: "cassandra-operator", + Owner: "mr-cassop", State: "ACTIVE", Intensity: 1, KeyspaceName: "system_traces", @@ -229,7 +229,7 @@ var _ = Describe("repair schedules in reaper", func() { }, { ID: "id-2", - Owner: "cassandra-operator", + Owner: "mr-cassop", State: "ACTIVE", Intensity: 1, KeyspaceName: "system_auth", @@ -268,7 +268,7 @@ var _ = Describe("repair schedules in reaper", func() { externalRepairSchedule, { ID: "id-1", - Owner: "cassandra-operator", + Owner: "mr-cassop", State: "ACTIVE", Intensity: 1, KeyspaceName: "system_traces", diff --git a/tests/integration/roles_test.go b/tests/integration/roles_test.go index 04817a6..db27cf3 100644 --- a/tests/integration/roles_test.go +++ b/tests/integration/roles_test.go @@ -3,11 +3,11 @@ package integration import ( "fmt" - "github.com/ibm/cassandra-operator/controllers/util" + "github.com/cin/mr-cassop/controllers/util" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers/cql" "github.com/gogo/protobuf/proto" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers/cql" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/tests/integration/suite_test.go b/tests/integration/suite_test.go index a05c487..0eebdcf 100644 --- a/tests/integration/suite_test.go +++ b/tests/integration/suite_test.go @@ -21,7 +21,6 @@ import ( "encoding/base64" "flag" "fmt" - "github.com/ibm/cassandra-operator/controllers/labels" "net/url" "path/filepath" "strconv" @@ -29,32 +28,34 @@ import ( "testing" "time" - "github.com/ibm/cassandra-operator/controllers/icarus" + "github.com/cin/mr-cassop/controllers/labels" - "github.com/ibm/cassandra-operator/controllers/cassandrarestore" + "github.com/cin/mr-cassop/controllers/icarus" - "github.com/ibm/cassandra-operator/controllers/cassandrabackup" + "github.com/cin/mr-cassop/controllers/cassandrarestore" - "github.com/ibm/cassandra-operator/controllers/nodectl" + "github.com/cin/mr-cassop/controllers/cassandrabackup" + + "github.com/cin/mr-cassop/controllers/nodectl" "sigs.k8s.io/controller-runtime/pkg/event" - "github.com/ibm/cassandra-operator/controllers/webhooks" + "github.com/cin/mr-cassop/controllers/webhooks" admissionv1 "k8s.io/api/admissionregistration/v1" nwv1 "k8s.io/api/networking/v1" "k8s.io/client-go/kubernetes/scheme" + "github.com/cin/mr-cassop/api/v1alpha1" + "github.com/cin/mr-cassop/controllers" + "github.com/cin/mr-cassop/controllers/config" + "github.com/cin/mr-cassop/controllers/cql" + "github.com/cin/mr-cassop/controllers/events" + "github.com/cin/mr-cassop/controllers/logger" + "github.com/cin/mr-cassop/controllers/names" + "github.com/cin/mr-cassop/controllers/prober" + "github.com/cin/mr-cassop/controllers/reaper" "github.com/go-logr/zapr" "github.com/gocql/gocql" - "github.com/ibm/cassandra-operator/api/v1alpha1" - "github.com/ibm/cassandra-operator/controllers" - "github.com/ibm/cassandra-operator/controllers/config" - "github.com/ibm/cassandra-operator/controllers/cql" - "github.com/ibm/cassandra-operator/controllers/events" - "github.com/ibm/cassandra-operator/controllers/logger" - "github.com/ibm/cassandra-operator/controllers/names" - "github.com/ibm/cassandra-operator/controllers/prober" - "github.com/ibm/cassandra-operator/controllers/reaper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/pkg/errors" @@ -171,7 +172,7 @@ var _ = BeforeSuite(func() { logf.SetLogger(zapr.NewLogger(logr)) clusterRole := &rbac.ClusterRole{} - clusterRole.Name = "cassandra-operator" + clusterRole.Name = "mr-cassop" clusterRole.UID = "1" By("bootstrapping test environment") testEnv = &envtest.Environment{ diff --git a/tests/integration/validation_test.go b/tests/integration/validation_test.go index f3e71fe..069118c 100644 --- a/tests/integration/validation_test.go +++ b/tests/integration/validation_test.go @@ -1,10 +1,11 @@ package integration import ( - "github.com/gogo/protobuf/proto" "strings" - "github.com/ibm/cassandra-operator/api/v1alpha1" + "github.com/gogo/protobuf/proto" + + "github.com/cin/mr-cassop/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1"