From 4b6f1b9cb577754dd4bb7add094c30be79b01ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=B4=E6=98=8E=E8=BE=B0?= Date: Mon, 30 Sep 2024 06:48:01 +0000 Subject: [PATCH] =?UTF-8?q?!6=20k8s=20Agent=20for=20DevStar=20DevContainer?= =?UTF-8?q?=20*=20DELETE=20/api/devcontainer=3FrepoId=3D${repoId}=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20DevContainer=20*=20refactor=20*=20GET=20/a?= =?UTF-8?q?pi/devcontainer=3FrepoId=3D${repoId}&wait=3Dtrue=20=E9=98=BB?= =?UTF-8?q?=E5=A1=9E=E5=BC=8F=E7=AD=89=E5=BE=85=E6=89=93=E5=BC=80=E5=B0=B1?= =?UTF-8?q?=E7=BB=AA=E7=9A=84=20DevContainer=20*=20POST=20/api/devcontaine?= =?UTF-8?q?r=20=E5=88=9B=E5=BB=BA=20DevContainer=20*=20refactored=20the=20?= =?UTF-8?q?code=20*=20Updated=20context=20usage=20with=20cancel=20function?= =?UTF-8?q?=20*=20=E9=A2=84=E7=95=99=E6=8E=A5=E5=8F=A3=EF=BC=8C=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=8D=95=E6=9C=BA=E7=89=88=20DevStar=20DevContainer?= =?UTF-8?q?=20*=20bugFix:=20context=20canceled=20while=20deleting=20k8s=20?= =?UTF-8?q?CRD=20DevcontainerApp=20*=20=E7=94=A8=E6=88=B7=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=88=A0=E9=99=A4=20k8s=20CRD=20DevContainer=20*=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2=E5=88=9B=E5=BB=BA=20DevCon?= =?UTF-8?q?tainer=20=E5=B9=B6=E6=9B=B4=E6=96=B0=20NodePort=20*=20=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=20DevContainer=20*=20transplant=20test=20code=20into=20DevStar?= =?UTF-8?q?=20Studio=20*=20refactored=20API=20router=20to=20/routers/api?= =?UTF-8?q?=20*=20=E6=9B=B4=E6=94=B9=20DevContainer=20Doc=20*=20=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=20DevContainer=20namespace=20*=20=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=87=8D=E5=AE=9A=E5=90=91=20*=20[Doc]=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Kubernetes=20=E9=83=A8=E7=BD=B2=20DevStar?= =?UTF-8?q?=20Studio=20=E6=96=87=E6=A1=A3=E8=AF=B4=E6=98=8E=EF=BC=8C?= =?UTF-8?q?=E7=89=B9=E5=88=AB=E6=98=AF=20namespace=20=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?*=20[Doc]=20=E6=9B=B4=E6=96=B0=20CI=E8=84=9A=E6=9C=AC=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20*=20Revert=20"optimized=20CI=20workflow"=20*=20opti?= =?UTF-8?q?mized=20CI=20workflow=20*=20fix=20typo=20*=20[feature=20test]:?= =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=20Pod=20=E5=86=85=E4=BD=BF=E7=94=A8=20Kub?= =?UTF-8?q?ernetes=20Operator=20=E5=8A=9F=E8=83=BD=20*=20[Optimization]=20?= =?UTF-8?q?error=20msg=20for=20archived=20repo=20*=20[Optimization]:=20dis?= =?UTF-8?q?play=20detailed=20err=20msg=20on=20creating=20devContainer=20fo?= =?UTF-8?q?r=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/devstar-studio-ci.yaml | 12 +- .gitea/workflows/devstar-studio-dev-ci.yaml | 12 +- ...evstar-studio-feature-k8s-operator-ci.yaml | 66 +++ README_ZH.md | 159 +++++- go.mod | 26 +- go.sum | 503 ++++++++++++++++-- .../devstar_devcontainer.go | 4 +- .../k8s_agent/CreateDevcontainer.go | 126 +++++ .../k8s_agent/DeleteDevcontainer.go | 29 + .../k8s_agent/GetDevcontainer.go | 157 ++++++ .../k8s_agent/ListDevcontainers.go | 48 ++ .../k8s_agent/api/v1/devcontainerapp_types.go | 126 +++++ .../k8s_agent/api/v1/groupversion_info.go | 29 + .../k8s_agent/api/v1/zz_generated.deepcopy.go | 181 +++++++ .../dto/CreateDevcontainerOptions.go | 17 + .../dto/DeleteDevcontainerOptions.go | 12 + .../k8s_agent/dto/GetDevcontainerOptions.go | 11 + .../k8s_agent/dto/ListDevcontainersOptions.go | 11 + .../ErrIllegalDevcontainerParameters.go | 14 + .../errors/ErrK8sDevcontainerNotReady.go | 16 + .../errors/ErrOpenDevcontainerTimeout.go | 18 + .../errors/ErrOperateDevcontainer.go | 14 + modules/devstar_devcontainer/k8s_agent/gvr.go | 19 + .../devstar_devcontainer/k8s_agent/init.go | 34 ++ .../utils/IsK8sDevcontainerStatusReady.go | 15 + .../vo/DevcontainerStatusK8sAgentVO.go | 9 + modules/setting/devstar_devcontainer.go | 58 ++ modules/setting/server.go | 3 + modules/setting/setting.go | 1 + modules/validation/binding.go | 23 + modules/validation/helpers.go | 8 + modules/web/middleware/binding.go | 3 + options/locale/locale_en-US.ini | 8 +- options/locale/locale_zh-CN.ini | 8 +- .../devcontainer/create_repo_devcontainer.go | 77 +++ .../devcontainer/delete_repo_devcontainer.go | 52 ++ .../api/devcontainer/get_repo_devcontainer.go | 60 +++ .../devcontainer/list_user_devcontainers.go | 8 +- .../devcontainer/vo/ListRepoDevcontainerVO.go | 11 +- .../vo/ListUserDevcontainersVO.go | 0 .../{web => api}/wechat/init-wechat-routes.go | 2 +- .../wechat/official_account/callback.go | 0 .../init-wechat-official-account-routes.go | 0 .../official_account/login-qr-handlers.go | 2 +- .../entity/devcontainer_result_constants.go | 24 + routers/entity/wechat_qr_result_constants.go | 4 +- routers/init.go | 2 +- .../devcontainer/CreateRepoDevContainer.go | 57 ++ .../DeleteRepoDevContainerForCurrentActor.go | 27 + .../GetRepoDevContainerDetails.go | 44 ++ .../devcontainer/list_repo_devcontainer.go | 113 ---- .../web/user/setting/dev_containers_list.go | 2 +- routers/web/web.go | 27 +- .../OpenDevcontainerAbstractAgentService.go | 53 ++ ...> RepoDevcontainerAbstractAgentService.go} | 103 +++- .../UserDevcontainerService.go | 12 +- .../CreateDevcontainerAPIService.go | 56 ++ .../DeleteDevcontainerAPIService.go | 52 ++ .../OpenDevcontainerAPIService.go | 68 +++ .../dto/CreateDevcontainerDTO.go | 9 + .../errors/ErrDevcontainerAlreadyCreated.go | 17 + .../errors/ErrDevcontainerNotFound.go | 17 + .../errors/ErrFailedOperateDevcontainer.go | 14 + .../errors/ErrIllegalParams.go | 11 + .../AssignDevcontainerCreation2K8sOperator.go | 56 ++ .../AssignDevcontainerDeletion2K8sOperator.go | 44 ++ .../AssignDevcontainerGetting2K8sOperator.go | 53 ++ .../errors/ErrDeleteDevcontainers.go | 14 + .../errors/ErrIllegalK8sAgentParams.go | 11 + .../AbstractDeleteDevcontainerOptions.go | 10 + .../AbstractOpenDevcontainerOptions.go | 10 + .../OpenDevcontainerAppDispatcherOptions.go | 6 + .../vo/OpenDevcontainerAbstractAgentVO.go | 6 + services/forms/devcontainer_form.go | 19 + services/repository/repository.go | 2 +- templates/repo/devcontainer/details.tmpl | 27 +- 76 files changed, 2714 insertions(+), 248 deletions(-) create mode 100644 .gitea/workflows/devstar-studio-feature-k8s-operator-ci.yaml create mode 100644 modules/devstar_devcontainer/k8s_agent/CreateDevcontainer.go create mode 100644 modules/devstar_devcontainer/k8s_agent/DeleteDevcontainer.go create mode 100644 modules/devstar_devcontainer/k8s_agent/GetDevcontainer.go create mode 100644 modules/devstar_devcontainer/k8s_agent/ListDevcontainers.go create mode 100644 modules/devstar_devcontainer/k8s_agent/api/v1/devcontainerapp_types.go create mode 100644 modules/devstar_devcontainer/k8s_agent/api/v1/groupversion_info.go create mode 100644 modules/devstar_devcontainer/k8s_agent/api/v1/zz_generated.deepcopy.go create mode 100644 modules/devstar_devcontainer/k8s_agent/dto/CreateDevcontainerOptions.go create mode 100644 modules/devstar_devcontainer/k8s_agent/dto/DeleteDevcontainerOptions.go create mode 100644 modules/devstar_devcontainer/k8s_agent/dto/GetDevcontainerOptions.go create mode 100644 modules/devstar_devcontainer/k8s_agent/dto/ListDevcontainersOptions.go create mode 100644 modules/devstar_devcontainer/k8s_agent/errors/ErrIllegalDevcontainerParameters.go create mode 100644 modules/devstar_devcontainer/k8s_agent/errors/ErrK8sDevcontainerNotReady.go create mode 100644 modules/devstar_devcontainer/k8s_agent/errors/ErrOpenDevcontainerTimeout.go create mode 100644 modules/devstar_devcontainer/k8s_agent/errors/ErrOperateDevcontainer.go create mode 100644 modules/devstar_devcontainer/k8s_agent/gvr.go create mode 100644 modules/devstar_devcontainer/k8s_agent/init.go create mode 100644 modules/devstar_devcontainer/k8s_agent/utils/IsK8sDevcontainerStatusReady.go create mode 100644 modules/devstar_devcontainer/k8s_agent/vo/DevcontainerStatusK8sAgentVO.go create mode 100644 modules/setting/devstar_devcontainer.go create mode 100644 routers/api/devcontainer/create_repo_devcontainer.go create mode 100644 routers/api/devcontainer/delete_repo_devcontainer.go create mode 100644 routers/api/devcontainer/get_repo_devcontainer.go rename routers/{web => api}/devcontainer/list_user_devcontainers.go (85%) rename routers/{web => api}/devcontainer/vo/ListRepoDevcontainerVO.go (73%) rename routers/{web => api}/devcontainer/vo/ListUserDevcontainersVO.go (100%) rename routers/{web => api}/wechat/init-wechat-routes.go (78%) rename routers/{web => api}/wechat/official_account/callback.go (100%) rename routers/{web => api}/wechat/official_account/init-wechat-official-account-routes.go (100%) rename routers/{web => api}/wechat/official_account/login-qr-handlers.go (94%) create mode 100644 routers/web/devcontainer/CreateRepoDevContainer.go create mode 100644 routers/web/devcontainer/DeleteRepoDevContainerForCurrentActor.go create mode 100644 routers/web/devcontainer/GetRepoDevContainerDetails.go delete mode 100644 routers/web/devcontainer/list_repo_devcontainer.go create mode 100644 services/devstar_devcontainer/OpenDevcontainerAbstractAgentService.go rename services/devstar_devcontainer/{RepoDevcontainerService.go => RepoDevcontainerAbstractAgentService.go} (67%) create mode 100644 services/devstar_devcontainer/api_services/CreateDevcontainerAPIService.go create mode 100644 services/devstar_devcontainer/api_services/DeleteDevcontainerAPIService.go create mode 100644 services/devstar_devcontainer/api_services/OpenDevcontainerAPIService.go create mode 100644 services/devstar_devcontainer/dto/CreateDevcontainerDTO.go create mode 100644 services/devstar_devcontainer/errors/ErrDevcontainerAlreadyCreated.go create mode 100644 services/devstar_devcontainer/errors/ErrDevcontainerNotFound.go create mode 100644 services/devstar_devcontainer/errors/ErrFailedOperateDevcontainer.go create mode 100644 services/devstar_devcontainer/errors/ErrIllegalParams.go create mode 100644 services/devstar_devcontainer/k8s_agent/AssignDevcontainerCreation2K8sOperator.go create mode 100644 services/devstar_devcontainer/k8s_agent/AssignDevcontainerDeletion2K8sOperator.go create mode 100644 services/devstar_devcontainer/k8s_agent/AssignDevcontainerGetting2K8sOperator.go create mode 100644 services/devstar_devcontainer/k8s_agent/errors/ErrDeleteDevcontainers.go create mode 100644 services/devstar_devcontainer/k8s_agent/errors/ErrIllegalK8sAgentParams.go create mode 100644 services/devstar_devcontainer/options/AbstractDeleteDevcontainerOptions.go create mode 100644 services/devstar_devcontainer/options/AbstractOpenDevcontainerOptions.go create mode 100644 services/devstar_devcontainer/options/OpenDevcontainerAppDispatcherOptions.go create mode 100644 services/devstar_devcontainer/vo/OpenDevcontainerAbstractAgentVO.go create mode 100644 services/forms/devcontainer_form.go diff --git a/.gitea/workflows/devstar-studio-ci.yaml b/.gitea/workflows/devstar-studio-ci.yaml index 05ad2a8c3e..395adedb72 100644 --- a/.gitea/workflows/devstar-studio-ci.yaml +++ b/.gitea/workflows/devstar-studio-ci.yaml @@ -6,10 +6,16 @@ # Add variables of Remote Git Repository Panel: # - ${{ vars.DOCKER_REGISTRY_ADDRESS }}: the address for Docker Registry # - ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}: the artifact $name:$version, e.g., `devstar/devstar-studio:latest-rootless` -# - ${{ vars.K8S_NAMESPACE }}: the namespace defined in Helm Chart -# - ${{ vars.K8S_DEPLOYMENT_NAME}}: the Deployment to rolled out restart after pushing artifact to Docker Registry -# Note: the actual artifact name for `master` branch: ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}-build-${{ gitea.sha }} +# Artifact命名规则： ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}-build-${{ gitea.sha }}, e.g., www.devstar.cn/devstar/devstar-studio:rootless-build-0047d315a3f73cca0c18c641d24b0347456618d5 +# DOCKER_REPOSITORY_ARTIFACT = www.devstar.cn/devstar/devstar-studio:rootless，表示 Artifact 名称 +# build 表示分支类别：正式发行分支 +# ${{ gitea.sha }} 表示触发 CI Workflow 的 commit SHA + +# 特别注意：如果使用 devstar.cn 作为 Docker Registry，需要设置 Gitea Actions Runner 变量 DOCKER_REGISTRY_ADDRESS = www.devstar.cn，若没有www前缀会导致上传失败（Ingress重定向规则导致，暂时无解） +# 上传 Artifact 必须加上 www前缀，而拉取时不需要加 www 前缀，例如： +# 上传前 artifact 名称： docker push www.devstar.cn/devstar/devstar-studio:rootless-build-0047d315a3f73cca0c18c641d24b0347456618d5 +# 拉取 artifact 只需要： docker pull devstar.cn/devstar/devstar-studio:rootless-build-0047d315a3f73cca0c18c641d24b0347456618d5 name: DevStar Studio CI Pipeline - master branch on: diff --git a/.gitea/workflows/devstar-studio-dev-ci.yaml b/.gitea/workflows/devstar-studio-dev-ci.yaml index 3d7aecaee3..24ff6af992 100644 --- a/.gitea/workflows/devstar-studio-dev-ci.yaml +++ b/.gitea/workflows/devstar-studio-dev-ci.yaml @@ -6,10 +6,16 @@ # Add variables of Remote Git Repository Panel: # - ${{ vars.DOCKER_REGISTRY_ADDRESS }}: the address for Docker Registry # - ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}: the artifact $name:$version, e.g., `devstar/devstar-studio:rootless` -# - ${{ vars.K8S_NAMESPACE }}: the namespace defined in Helm Chart -# - ${{ vars.K8S_DEPLOYMENT_NAME}}: the Deployment to rolled out restart after pushing artifact to Docker Registry -# Note: the actual artifact name for `dev` branch: ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}-dev-${{ gitea.sha }} +# Artifact命名规则： ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}-dev-${{ gitea.sha }}, e.g., www.devstar.cn/devstar/devstar-studio:rootless-dev-0047d315a3f73cca0c18c641d24b0347456618d5 +# DOCKER_REPOSITORY_ARTIFACT = www.devstar.cn/devstar/devstar-studio:rootless，表示 Artifact 名称 +# dev 表示分支类别：临时开发分支 +# ${{ gitea.sha }} 表示触发 CI Workflow 的 commit SHA + +# 特别注意：如果使用 devstar.cn 作为 Docker Registry，需要设置 Gitea Actions Runner 变量 DOCKER_REGISTRY_ADDRESS = www.devstar.cn，若没有www前缀会导致上传失败（Ingress重定向规则导致，暂时无解） +# 上传 Artifact 必须加上 www前缀，而拉取时不需要加 www 前缀，例如： +# 上传前 artifact 名称： docker push www.devstar.cn/devstar/devstar-studio:rootless-dev-0047d315a3f73cca0c18c641d24b0347456618d5 +# 拉取 artifact 只需要： docker pull devstar.cn/devstar/devstar-studio:rootless-dev-0047d315a3f73cca0c18c641d24b0347456618d5 name: DevStar Studio CI Pipeline - dev branch on: diff --git a/.gitea/workflows/devstar-studio-feature-k8s-operator-ci.yaml b/.gitea/workflows/devstar-studio-feature-k8s-operator-ci.yaml new file mode 100644 index 0000000000..c7c0a81f08 --- /dev/null +++ b/.gitea/workflows/devstar-studio-feature-k8s-operator-ci.yaml @@ -0,0 +1,66 @@ +# +# Add secrets of Remote Git Repository Panel: +# - ${{ secrets.DOCKER_REGISTRY_USERNAME }}: username of Docker Registry +# - ${{ secrets.DOCKER_REGISTRY_PASSWORD }}: password corresponding to the Docker Registry username + +# Add variables of Remote Git Repository Panel: +# - ${{ vars.DOCKER_REGISTRY_ADDRESS }}: the address for Docker Registry +# - ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}: the artifact $name:$version, e.g., `devstar/devstar-studio:rootless` + +# Artifact命名规则： ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}-feature-${{ gitea.sha }}, e.g., www.devstar.cn/devstar/devstar-studio:rootless-feature-0047d315a3f73cca0c18c641d24b0347456618d5 +# DOCKER_REPOSITORY_ARTIFACT = www.devstar.cn/devstar/devstar-studio:rootless，表示 Artifact 名称 +# feature 表示分支类别：临时测试分支 +# ${{ gitea.sha }} 表示触发 CI Workflow 的 commit SHA + +# 特别注意：如果使用 devstar.cn 作为 Docker Registry，需要设置 Gitea Actions Runner 变量 DOCKER_REGISTRY_ADDRESS = www.devstar.cn，若没有www前缀会导致上传失败（Ingress重定向规则导致，暂时无解） +# 上传 Artifact 必须加上 www前缀，而拉取时不需要加 www 前缀，例如： +# 上传前 artifact 名称： docker push www.devstar.cn/devstar/devstar-studio:rootless-feature-0047d315a3f73cca0c18c641d24b0347456618d5 +# 拉取 artifact 只需要： docker pull devstar.cn/devstar/devstar-studio:rootless-feature-0047d315a3f73cca0c18c641d24b0347456618d5 + +# k8s Operator 功能临时测试 CI脚本（正式发行版不应该有此文件） + +name: DevStar Studio CI Pipeline - branch feature-k8s-operator-agent +on: + push: + branches: + - feature-k8s-operator-agent + +jobs: + build-and-push-x86-64-docker-image: + runs-on: ubuntu-latest + steps: + - name: 🔍 Check out repository code + uses: actions/checkout@v4 + with: + ref: feature-k8s-operator-agent + - name: 🔧 Test Codes and Build an Artifact + run: | + echo "Prepare to build repository code ${{ gitea.repository }}:${{ gitea.ref }}." + make docker + - name: 🚀 Push Artifact to Docker Registry + run: | + docker tag devstar-studio:latest ${{ vars.DOCKER_REGISTRY_ADDRESS }}/${{ vars.DOCKER_REPOSITORY_ARTIFACT}}-feature-${{ gitea.sha }} + echo "${{ secrets.DOCKER_REGISTRY_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_REGISTRY_USERNAME }} ${{ vars.DOCKER_REGISTRY_ADDRESS }} --password-stdin + docker push ${{ vars.DOCKER_REGISTRY_ADDRESS }}/${{ vars.DOCKER_REPOSITORY_ARTIFACT}}-feature-${{ gitea.sha }} + - name: 🍏 Job Status Report + run: | + echo "🍏 This job's status is ${{ job.status }}." + echo "Output Artifact: ${{ vars.DOCKER_REGISTRY_ADDRESS }}/${{ vars.DOCKER_REPOSITORY_ARTIFACT}}-feature-${{ gitea.sha }}" + + +# +# P.S.: +################################################################################ +# 1. How to config runner: +# $ docker run \ +# --name gitea-act-runner-repo-devstar-studio \ +# -d \ +# -e GITEA_INSTANCE_URL=https://www.devstar.cn \ +# -e GITEA_RUNNER_REGISTRATION_TOKEN=${YOUR_GITEA_RUNNER_REGISTRATION_TOKEN} \ +# -v /var/run/docker.sock:/var/run/docker.sock \ +# gitea/act_runner:latest +# +# 2. To clean the docker cache: +# $ docker builder prune --force +# $ if [ "$(docker volume ls -qf dangling=true)" ]; then docker volume rm $(docker volume ls -qf dangling=true); fi +# diff --git a/README_ZH.md b/README_ZH.md index 13dcf0ff4c..804d916625 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -2,10 +2,10 @@ DevStar Studio 是 Gitea 发行版 -## 快速开始 +## 1. 快速开始 编译、打包成为镜像：代码目录执行 `make docker` 命令 -### 单机版部署 +### 1.1 单机版部署 使用docker-compose部署DevStar Studio需要参考官方网站： https://docs.gitea.com/zh-cn/next/installation/install-with-docker-rootless @@ -50,6 +50,11 @@ CONTENT_SECURITY_POLICY = default-src 'self' data: 'unsafe-inline' https://mp.we [ui.admin] ;; Dev Container 分页参数（每页展示 DevContainer 个数），若未指定，默认值 50 DEV_CONTAINERS_PAGING_NUM = 50 + +[devstar.devcontainer] +enabled = true +agent = docker +host = 127.0.0.1 ``` 正式部署单机版 @@ -69,7 +74,157 @@ docker run \ devstar-studio:latest ``` +### 1.2 Kubernetes 集群部署 +DevStar Studio 在 Kubernetes集群中部署需要使用 Helm Charts，可参考 [官方示例](https://gitea.com/gitea/helm-chart) 。 + +推荐将 DevStar Studio 与 Dev Container 进行基于 namespace 的资源 **隔离**: +*由于 k8s RBAC 限制，建议将 DevStar Studio 的主应用程序，数据库和缓存 与 Dev Container 部署在同一个 namespace 下* + +- `devstar-studio-ns`: + - **指定方式**：部署 Helm Charts 时候执行 + ```bash + helm install devstar-studio . --namespace devstar-studio-ns --create-namespace + ``` + - **引用方式**：`{{ .Release.Namespace }}`，例如： + ```yaml + apiVersion: v1 + kind: ConfigMap + metadata: + name: devstar-studio-gitea-repository-app-ini-configmap + namespace: {{ .Release.Namespace }} + data: + repository: | + MAX_CREATION_LIMIT = 0 + ``` + + +#### 1.2.1 client-go 版本适配 Kubernetes 集群 + +**注意**：部署在 k8s 之上要根据 Kubernetes 版本调整 `k8s.io/client-go` 版本。例如部署在 **Kubernetes 1.23.10** 之上，需要执行下列指令调整 go packages: +```bash +# 移除旧版本 client-go 的信息 +go get k8s.io/client-go@none + +# 安装适配于 Kubernetes 1.23.10 版本的 client-go +go get k8s.io/client-go@kubernetes-1.23.10 +``` + +#### 1.2.2 应用配置 `app.ini` 信息挂载 + +在 Helm Charts 目录下创建文件夹 `templates/devstar-studio-app.ini/`，用于存储 Gitea 配置信息，请参考 Docker 版 `ini` 配置文件字段，使用 `ConfigMaps` 或者 `Secrets` 类型资源描述。 + +对于 `ConfigMaps` 类型，参考： +```yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: devstar-studio-gitea-app-ini-configmap + namespace: {{ .Release.Namespace }} +data: + database: | + CHARSET_COLLATION = utf8mb4_bin + + wechat: | + WECHAT_OFFICIAL_ACCOUNT_TEMP_QR_EXPIRE_SECONDS=60 + WECHAT_OFFICIAL_ACCOUNT_APP_ID=<微信公众号APPID> + WECHAT_OFFICIAL_ACCOUNT_APP_SECRET=<微信公众号SECRET> + WECHAT_OFFICIAL_ACCOUNT_MESSAGE_TOKEN = <微信公众号自定义Token> + WECHAT_OFFICIAL_ACCOUNT_MESSAGE_AES_KEY = <微信公众号AES加密密钥> + + cors: | + CONTENT_SECURITY_POLICY = default-src 'self' data: 'unsafe-inline' https://mp.weixin.qq.com; img-src * data: + + ui.admin: | + DEV_CONTAINERS_PAGING_NUM = 50 + + devstar.devcontainer: | + enabled = true + agent = k8s + namespace = devstar-studio-ns + host = +``` + +对于 `Secrets` 类型，参考： +```yaml +apiVersion: v1 +kind: Secret +metadata: + name: devstar-studio-gitea-app-ini-secrets + namespace: {{ .Release.Namespace }} +type: Opaque +stringData: + wechat: | + WECHAT_OFFICIAL_ACCOUNT_TEMP_QR_EXPIRE_SECONDS=60 + WECHAT_OFFICIAL_ACCOUNT_APP_ID=<微信公众号APPID> + WECHAT_OFFICIAL_ACCOUNT_APP_SECRET=<微信公众号SECRET> + WECHAT_OFFICIAL_ACCOUNT_MESSAGE_TOKEN = <微信公众号自定义Token> + WECHAT_OFFICIAL_ACCOUNT_MESSAGE_AES_KEY = <微信公众号AES加密密钥> +``` + +为了使 Gitea启动时，能将配置信息同步到 `app.ini` 文件中，需要在 Helm Charts `/values.yaml` 中的 `additionalConfigSources` 中挂载创建的 `ConfigMaps` 与 `Secrets` 资源，示例格式： + +```yaml + ## @param gitea.additionalConfigSources Additional configuration from secret or configmap + additionalConfigSources: + - secret: + secretName: devstar-studio-gitea-app-ini-secrets + - configMap: + name: devstar-studio-gitea-app-ini-configmap +``` + +#### 1.2.3 Kubernetes RBAC 配置 + +为了能够在运行时创建 Dev Container，需要配置**基于角色的访问控制**(Role-Based Access Control, RBAC)。 + +由于 DevStar Studio 运行后将自动创建 ServiceAccount `default`: + +```bash +kubectl get serviceaccounts -n devstar-studio-ns +# NAME SECRETS AGE +# default 1 44d +# devstar-studio-postgresql 1 42d +``` + +因此，只需要创建关联该 ServiceAccount 的 RoleBinding，在 Helm Charts 目录下 创建文件夹 `templates/devstar-devcontainer-rbac/` + +1. 创建 Role +```yaml +kind: Role +apiVersion: rbac.authorization.k8s.io/v1beta1 +metadata: + name: read-devcontainer-pods + namespace: {{ .Values.devstar.devcontainer.namespace }} +rules: + - apiGroups: [""] # meaning: the core API Group + resources: ["pods"] + verbs: ["get", "watch", "list"] +``` + +2. 创建 RoleBiding + +```yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: read-secrets + namespace: {{ .Values.devstar.devcontainer.namespace }} +roleRef: + kind: Role + apiGroup: rbac.authorization.k8s.io + name: admin + namespace: +subjects: + - apiGroup: rbac.authorization.k8s.io + kind: User + name: admin +``` + +**注意**： RBAC 应当对 Gitea 透明，即不得将 RBAC 信息挂载到 `/values.yaml` 中如 1.2.2 小节所示的 `additionalConfigSources` 字段 + + + +-------------------- ## Gitea [![](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main)](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain "Release Nightly") diff --git a/go.mod b/go.mod index b5cec4d54c..bc02f29ee2 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/go-ldap/ldap/v3 v3.4.6 github.com/go-sql-driver/mysql v1.8.1 github.com/go-swagger/go-swagger v0.31.0 - github.com/go-testfixtures/testfixtures/v3 v3.11.0 + github.com/go-testfixtures/testfixtures/v3 v3.8.1 github.com/go-webauthn/webauthn v0.10.2 github.com/gobwas/glob v0.2.3 github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f @@ -121,6 +121,8 @@ require ( gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v3 v3.0.1 + k8s.io/api v0.23.10 + k8s.io/apimachinery v0.23.10 mvdan.cc/xurls/v2 v2.5.0 strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 xorm.io/builder v0.3.13 @@ -130,9 +132,19 @@ require ( require ( github.com/ArtisanCloud/PowerSocialite/v3 v3.0.7 // indirect github.com/clbanning/mxj/v2 v2.7.0 // indirect - github.com/gofrs/uuid v4.4.0+incompatible // indirect - github.com/gomodule/redigo v1.8.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect + golang.org/x/term v0.21.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + k8s.io/client-go v0.23.10 + k8s.io/klog/v2 v2.30.0 // indirect + k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect ) require ( @@ -142,8 +154,6 @@ require ( git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect github.com/ArtisanCloud/PowerWeChat/v3 v3.2.25 github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect - github.com/ClickHouse/ch-go v0.61.5 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.25.0 // indirect github.com/DataDog/zstd v1.5.5 // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.2.1 // indirect @@ -196,8 +206,6 @@ require ( github.com/go-ap/errors v0.0.0-20240304112515-6077fa9c17b0 // indirect github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect github.com/go-enry/go-oniguruma v1.2.1 // indirect - github.com/go-faster/city v1.0.1 // indirect - github.com/go-faster/errors v0.7.1 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-openapi/analysis v0.23.0 // indirect github.com/go-openapi/errors v0.22.0 // indirect @@ -257,7 +265,6 @@ require ( github.com/oklog/ulid v1.3.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/onsi/ginkgo v1.16.5 // indirect - github.com/paulmach/orb v0.11.1 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect @@ -272,7 +279,6 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect github.com/sirupsen/logrus v1.9.3 // indirect @@ -298,8 +304,6 @@ require ( github.com/zeebo/blake3 v0.2.3 // indirect go.etcd.io/bbolt v1.3.10 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect diff --git a/go.sum b/go.sum index 6c4026ba8c..80acd37aa8 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,42 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= code.gitea.io/actions-proto-go v0.4.0 h1:OsPBPhodXuQnsspG1sQ4eRE1PeoZyofd7+i73zCwnsU= code.gitea.io/actions-proto-go v0.4.0/go.mod h1:mn7Wkqz6JbnTOHQpot3yDeHx+O5C9EGhMEE+htvHBas= code.gitea.io/gitea-vet v0.2.3 h1:gdFmm6WOTM65rE8FUBTRzeQZYzXePKSSB1+r574hWwI= @@ -12,6 +49,7 @@ connectrpc.com/connect v1.15.0 h1:lFdeCbZrVVDydAqwr4xGV2y+ULn+0Z73s5JBj2LikWo= connectrpc.com/connect v1.15.0/go.mod h1:bQmjpDY8xItMnttnurVgOkHUBMRT9cpsNi2O4AjKhmA= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= @@ -56,15 +94,19 @@ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 h1:YUUxeiOWgdAQE3pXt2H7QXzZs0q8UBjgRbl56qo8GYM= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2/go.mod h1:dmXQgZuiSubAecswZE+Sm8jkvEa7kQgTPVRvwL/nd0E= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= +github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= -github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= -github.com/ClickHouse/clickhouse-go/v2 v2.25.0 h1:rKscwqgQHzWBTZySZDcHKxgs0Ad+xFULfZvo26W5UlY= -github.com/ClickHouse/clickhouse-go/v2 v2.25.0/go.mod h1:iDTViXk2Fgvf1jn2dbJd1ys+fBkdD1UMRnXlwmhijhQ= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Julusian/godocdown v0.0.0-20170816220326-6d19f8ff2df8/go.mod h1:INZr5t32rG59/5xeltqoCJoNY7e5x/3xoY9WSWVWg74= @@ -78,10 +120,13 @@ github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBa github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78= github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/PuerkitoBio/goquery v1.9.2 h1:4/wZksC3KgkQw7SQgkKotmKljk0M6V8TUvA8Wb4yPeE= github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= github.com/RoaringBitmap/roaring v0.7.1/go.mod h1:jdT9ykXwHFNdJbEtxePexlFYH9LXucApeS0/+/g+p1I= github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ= @@ -109,6 +154,7 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuW github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= @@ -188,6 +234,7 @@ github.com/caddyserver/certmagic v0.21.3 h1:pqRRry3yuB4CWBVq9+cUqu+Y6E2z8TswbhNx github.com/caddyserver/certmagic v0.21.3/go.mod h1:Zq6pklO9nVRl3DIFUw9gVUfXKdpc/0qwTUAQMBlfgtI= github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA= github.com/caddyserver/zerossl v0.1.3/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a h1:MISbI8sU/PSK/ztvmWKFcI7UGb5/HQT7B+i3a2myKgI= github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a/go.mod h1:2GxOXOlEPAMFPfp014mK1SWq8G8BN8o7/dfYqJrVGn8= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -197,14 +244,21 @@ github.com/chi-middleware/proxy v1.1.1/go.mod h1:jQwMEJct2tz9VmtCELxvnXoMfa+SOdi github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs= github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME= github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE= github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -229,8 +283,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0= github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE= -github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw= -github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo= +github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw= +github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dimiro1/reply v0.0.0-20200315094148-d0136a4c9e21 h1:PdsjTl0Cg+ZJgOx/CFV5NNgO1ThTreqdgKYiDCMHJwA= @@ -245,6 +299,7 @@ github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55k github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY= github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= @@ -255,6 +310,7 @@ github.com/editorconfig/editorconfig-core-go/v2 v2.6.2 h1:dKG8sc7n321deIVRcQtwlM github.com/editorconfig/editorconfig-core-go/v2 v2.6.2/go.mod h1:7dvD3GCm7eBw53xZ/lsiq72LqobdMg3ITbMBxnmJmqY= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA= @@ -264,16 +320,26 @@ github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTe github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 h1:hH4PQfOndHDlpzYfLAAfl63E8Le6F2+EL/cdhlkyRJY= github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ= github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethantkoenig/rupture v1.0.1 h1:6aAXghmvtnngMgQzy7SMGdicMvkV86V4n9fT0meE5E4= github.com/ethantkoenig/rupture v1.0.1/go.mod h1:Sjqo/nbffZp1pVVXNGhpugIjsWmuS9KiIB4GtpEBur4= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= github.com/felixge/fgprof v0.9.4 h1:ocDNwMFlnA0NU0zSB3I52xkO4sFXk80VK9lXjLClu88= github.com/felixge/fgprof v0.9.4/go.mod h1:yKl+ERSa++RYOs32d8K6WEXCB4uXdLls4ZaZPpayhMM= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= @@ -284,6 +350,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.6.0 h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1tWA= github.com/fxamacker/cbor/v2 v2.6.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= @@ -308,10 +376,6 @@ github.com/go-enry/go-enry/v2 v2.8.8 h1:EhfxWpw4DQ3WEFB1Y77X8vKqZL0D0EDUUWYDUAIv github.com/go-enry/go-enry/v2 v2.8.8/go.mod h1:9yrj4ES1YrbNb1Wb7/PWYr2bpaCXUGRt0uafN0ISyG8= github.com/go-enry/go-oniguruma v1.2.1 h1:k8aAMuJfMrqm/56SG2lV9Cfti6tC4x8673aHCcBk+eo= github.com/go-enry/go-oniguruma v1.2.1/go.mod h1:bWDhYP+S6xZQgiRL7wlTScFYBe023B6ilRZbCAD5Hf4= -github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= -github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= -github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= -github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e h1:oRq/fiirun5HqlEWMLIcDmLpIELlG4iGbd0s8iqgPi8= github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= @@ -323,16 +387,27 @@ github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMj github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A= github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU= github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo= github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w= github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE= github.com/go-openapi/inflect v0.21.0 h1:FoBjBTQEcbg2cJUWX6uwL9OyIW8eqc9k4KhN4lfbeYk= github.com/go-openapi/inflect v0.21.0/go.mod h1:INezMuUu7SJQc2AyR3WO0DqqYUJSj8Kb4hBd7WtjlAw= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= github.com/go-openapi/loads v0.22.0 h1:ECPGd4jX1U6NApCGG1We+uEozOAvXvJSF4nnwHZ8Aco= @@ -343,6 +418,7 @@ github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9Z github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c= github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58= @@ -358,8 +434,8 @@ github.com/go-swagger/go-swagger v0.31.0/go.mod h1:WSigRRWEig8zV6t6Sm8Y+EmUjlzA/ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= -github.com/go-testfixtures/testfixtures/v3 v3.11.0 h1:XxQr8AnPORcZkyNd7go5UNLPD3dULN8ixYISlzrlfEQ= -github.com/go-testfixtures/testfixtures/v3 v3.11.0/go.mod h1:THmudHF1Ixq++J2/UodcJpxUphfyEd77m83TvDtryqE= +github.com/go-testfixtures/testfixtures/v3 v3.8.1 h1:uonwvepqRvSgddcrReZQhojTlWlmOlHkYAb9ZaOMWgU= +github.com/go-testfixtures/testfixtures/v3 v3.8.1/go.mod h1:Kdu7YeMC0KRXVHdaQ91Vmx3pcjoTF63h4f1qTJDdXLA= github.com/go-webauthn/webauthn v0.10.2 h1:OG7B+DyuTytrEPFmTX503K77fqs3HDK/0Iv+z8UYbq4= github.com/go-webauthn/webauthn v0.10.2/go.mod h1:Gd1IDsGAybuvK1NkwUTLbGmeksxuRJjVN2PE/xsPxHs= github.com/go-webauthn/x v0.1.9 h1:v1oeLmoaa+gPOaZqUdDentu6Rl7HkSSsmOT6gxEQHhE= @@ -371,6 +447,7 @@ github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs= github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14= @@ -386,18 +463,37 @@ github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/geo v0.0.0-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I= github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -405,10 +501,19 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -419,16 +524,37 @@ github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17 github.com/google/go-tpm v0.9.0 h1:sQF6YqWMi+SCXpsmS3fd21oPy/vSddwZry4JnmltHVk= github.com/google/go-tpm v0.9.0/go.mod h1:FkNVkc6C+IsvDI9Jw1OveJmxGZUUaKxtrpOS47QWKfU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/pprof v0.0.0-20240618054019-d3b898a103f8 h1:ASJ/LAqdCHOyMYI+dwNxn7Rd8FscNkMyTr1KZU1JI/M= github.com/google/pprof v0.0.0-20240618054019-d3b898a103f8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw= @@ -441,6 +567,7 @@ github.com/gorilla/feeds v1.2.0 h1:O6pBiXJ5JHhPvqy53NsjKOThq+dNFm8+DFrxBEdzSCc= github.com/gorilla/feeds v1.2.0/go.mod h1:WMib8uJP3BbY+X8Szd1rA5Pzhdfh+HCCAYT2z7Fza6Y= github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE= github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1 h1:LqbZZ9sNMWVjeXS4NN5oVvhMjDyLhmA1LG86oSo+IqY= @@ -451,6 +578,8 @@ github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pw github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/sessions v1.3.0 h1:XYlkq7KcpOB2ZhHBPv5WpjMIxrQosiZanfoy1HLZFzg= github.com/gorilla/sessions v1.3.0/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/h2non/gock v1.2.0 h1:K6ol8rfrRkUOefooBC8elXoaNGYkpp7y2qcxGG6BzUE= github.com/h2non/gock v1.2.0/go.mod h1:tNhoxHYW2W42cYkYb1WqzdbYIieALC99kpYr7rH/BQk= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= @@ -461,6 +590,8 @@ github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB1 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -471,27 +602,30 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI= github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w= -github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM= +github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= +github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= -github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= +github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= -github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= -github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= +github.com/jackc/pgx/v4 v4.18.0 h1:Ltaa1ePvc7msFGALnCrqKJVEByu/qYh5jJBYcDtAno4= +github.com/jackc/pgx/v4 v4.18.0/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 h1:iCHtR9CQyktQ5+f3dMVZfwD2KWJUgm7M0gdL9NGr8KA= github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -504,8 +638,11 @@ github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= @@ -519,7 +656,6 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.6/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= @@ -534,6 +670,7 @@ github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/kljensen/snowball v0.6.0/go.mod h1:27N7E8fVU5H68RlUmnWwZCfxgt4POBJfENGMvNRhldw= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -557,6 +694,8 @@ github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0/go.mod h1:JEfTc3+2DF9 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/going v1.0.3 h1:mY45T5TvW+Xz5A6jY7lf4+NLg9D8+iuStIHyR7M8qsE= @@ -598,12 +737,13 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 h1:j2kD3MT1z4PXCiUllUJF9mWUESr9TWKS7iEKsQ/IipM= github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= @@ -611,8 +751,11 @@ github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= github.com/msteinert/pam v1.2.0 h1:mYfjlvN2KYs2Pb9G6nb/1f/nPfAttT/Jee5Sq9r3bGE= github.com/msteinert/pam v1.2.0/go.mod h1:d2n0DCUK8rGecChV3JzvmsDjOY4R7AYbsNxAT+ftQl0= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/niklasfasching/go-org v1.7.0 h1:vyMdcMWWTe/XmANk19F4k8XGBYg0GQ/gJGMimOjGMek= github.com/niklasfasching/go-org v1.7.0/go.mod h1:WuVm4d45oePiE0eX25GqTDQIt/qPW1T9DGkRscqLW5o= github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= @@ -627,12 +770,15 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/olivere/elastic/v7 v7.0.32 h1:R7CXvbu8Eq+WlsLgxmKVKPox0oOwAE/2T9Si5BnvK6E= github.com/olivere/elastic/v7 v7.0.32/go.mod h1:c7PVmLe3Fxq77PIfY/bZmxY/TAamBhCzZ8xDOE09a9k= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -646,13 +792,11 @@ github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2sz github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU= -github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= -github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= @@ -671,6 +815,7 @@ github.com/pquerna/otp v1.4.0 h1:wZvl1TIVxKRThZIBiwOOHOGP/1+nZyWBil9Y2XNEDzg= github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= @@ -692,6 +837,7 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= @@ -710,8 +856,6 @@ github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6Ng github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY= github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtCdFLPWhpg= github.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jNYPjT5mVcQcIsYzI= -github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= -github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= @@ -739,6 +883,7 @@ github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:s github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -757,6 +902,7 @@ github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cma github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM= github.com/stephens2424/writerset v1.0.2/go.mod h1:aS2JhsMn6eA7e82oNmW4rfsgAOp9COBTTl8mzkwADnc= github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7Z4dM9/Y= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -777,7 +923,6 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= -github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ= github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM= @@ -808,9 +953,6 @@ github.com/xanzy/go-gitlab v0.105.0 h1:3nyLq0ESez0crcaM19o5S//SvezOQguuIHZ3wgX64 github.com/xanzy/go-gitlab v0.105.0/go.mod h1:ETg8tcj4OhrB84UEgeE8dSuV/0h4BBL1uOV/qK0vlyI= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= -github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= -github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -825,10 +967,11 @@ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGC github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= github.com/yohcop/openid-go v1.0.1 h1:DPRd3iPO5F6O5zX2e62XpVAbPT6wV51cuucH0z9g3js= github.com/yohcop/openid-go v1.0.1/go.mod h1:b/AvD03P0KHj4yuihb+VtLD6bYYgsy0zqBzPCRjkCNs= -github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.7.2 h1:NjGd7lO7zrUn/A7eKwn5PEOt4ONYGqpxSEeZuduvgxc= @@ -846,13 +989,15 @@ github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0= go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= -go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= @@ -864,10 +1009,13 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= 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-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -878,30 +1026,87 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +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= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f h1:3CW0unweImhOzd5FmYuRsD4Y4oQFKZIjAnKbjV4WIrw= golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +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.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +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= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= @@ -912,40 +1117,88 @@ golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +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= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/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/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190730183949-1393eb018365/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -964,6 +1217,7 @@ golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -974,9 +1228,13 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +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= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +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.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= @@ -987,18 +1245,66 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +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= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200928182047-19e03678916f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= @@ -1007,9 +1313,94 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c h1:lfpJ/2rWPa/kJgxyyXM8PrNnfCzcmxJ265mADgwmvLI= google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -1017,8 +1408,13 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= @@ -1027,12 +1423,15 @@ gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.44.2/go.mod h1:M3Cogqpuv0QCi3ExAY5V4uOt4qb/R3xZubo9m8lK5wg= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -1048,8 +1447,32 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.23.10 h1:lbE62dyusvPnPUD5plS9X3hJQ4EWUt8iG69AigC6skE= +k8s.io/api v0.23.10/go.mod h1:+vpqBLTniW6bWQN7M3g3fttf3wQduJuRRmXGSb34Gas= +k8s.io/apimachinery v0.23.10 h1:ZZTDUh8kcKvpjptg/zOii7paedymrOIO9WOOOfZScVk= +k8s.io/apimachinery v0.23.10/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/client-go v0.23.10 h1:iDTADqhGG4VBHFGWVQEwRvG3oG8viD2WtFgp36AZ8Dw= +k8s.io/client-go v0.23.10/go.mod h1:+LdgZowNVtLC2/cGLEep+XuVa9jD0hjmxBwH/v+CZqM= +k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5fZ/shhbrgPUxDAE= +k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw= @@ -1072,6 +1495,16 @@ modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg= modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= mvdan.cc/xurls/v2 v2.5.0 h1:lyBNOm8Wo71UknhUs4QTFUNNMyxy2JEIaKKo0RWOh+8= mvdan.cc/xurls/v2 v2.5.0/go.mod h1:yQgaGQ1rFtJUzkmKiHYSSfuQxqfYmd//X6PxvholpeE= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 h1:mUcz5b3FJbP5Cvdq7Khzn6J9OCUQJaBwgBkCR+MOwSs= strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY= xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo= diff --git a/models/devstar_devcontainer/devstar_devcontainer.go b/models/devstar_devcontainer/devstar_devcontainer.go index e5ef5a1917..5687f9b326 100644 --- a/models/devstar_devcontainer/devstar_devcontainer.go +++ b/models/devstar_devcontainer/devstar_devcontainer.go @@ -6,7 +6,9 @@ import ( // DevstarDevcontainer devContainer 关联 代码仓库 和 用户 // -// 遵循gonic规则映射数据库表 `devstar_devcontainer`，各字段注解见 https://xorm.io/docs/chapter-02/4.columns/ +// TODO 移除 port 信息，需要前端主动连接时候实时获取最新分配结果，可以考虑给用户API提供选项：是否阻塞等待 +// +// 遵循gonic规则映射数据库表 `devstar_devcontainer`，各字段注解见 https://xorm.io/docs/chapter-02/4.columns/ type DevstarDevcontainer struct { Id int64 `xorm:"BIGINT pk NOT NULL autoincr 'id' comment('主键，devContainerId')"` Name string `xorm:"VARCHAR(64) charset=utf8mb4 collate=utf8mb4_bin UNIQUE NOT NULL 'name' comment('devContainer名称，自动生成')"` diff --git a/modules/devstar_devcontainer/k8s_agent/CreateDevcontainer.go b/modules/devstar_devcontainer/k8s_agent/CreateDevcontainer.go new file mode 100644 index 0000000000..a9fc59a5dc --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/CreateDevcontainer.go @@ -0,0 +1,126 @@ +package k8s_agent + +import ( + "context" + "encoding/json" + "fmt" + + devcontainer_api_v1 "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/api/v1" + devcontainer_dto "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/dto" + devcontainer_k8s_agent_modules_errors "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/errors" + apimachinery_apis_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apimachinery_apis_v1_unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + apimachinery_watch "k8s.io/apimachinery/pkg/watch" + dynamic_client "k8s.io/client-go/dynamic" +) + +// CreateDevcontainer 创建开发容器 +func CreateDevcontainer(ctx *context.Context, client dynamic_client.Interface, opts *devcontainer_dto.CreateDevcontainerOptions) (*devcontainer_api_v1.DevcontainerApp, error) { + + if ctx == nil || opts == nil { + return nil, devcontainer_k8s_agent_modules_errors.ErrIllegalDevcontainerParameters{ + FieldList: []string{"ctx", "opts"}, + Message: "cannot be nil", + } + } + + devcontainerApp := &devcontainer_api_v1.DevcontainerApp{ + TypeMeta: apimachinery_apis_v1.TypeMeta{ + Kind: "DevcontainerApp", + APIVersion: "devcontainer.devstar.cn/v1", + }, + ObjectMeta: apimachinery_apis_v1.ObjectMeta{ + Name: opts.Name, + Namespace: opts.Namespace, + }, + Spec: devcontainer_api_v1.DevcontainerAppSpec{ + StatefulSet: devcontainer_api_v1.StatefulSetSpec{ + Image: opts.Image, + Command: opts.CommandList, + ContainerPort: opts.ContainerPort, + }, + }, + } + + jsonData, err := json.Marshal(devcontainerApp) + if err != nil { + return nil, devcontainer_k8s_agent_modules_errors.ErrOperateDevcontainer{ + Action: "Marshal JSON", + Message: err.Error(), + } + } + + unstructuredObj := &apimachinery_apis_v1_unstructured.Unstructured{} + _, _, err = apimachinery_apis_v1_unstructured.UnstructuredJSONScheme.Decode(jsonData, &groupVersionKind, unstructuredObj) + if err != nil { + return nil, devcontainer_k8s_agent_modules_errors.ErrOperateDevcontainer{ + Action: "build unstructured obj", + Message: err.Error(), + } + } + + // 创建 DevContainer Status.nodePortAssigned 信息 + _, err = client.Resource(groupVersionResource).Namespace(opts.Namespace).Create(*ctx, unstructuredObj, opts.CreateOptions) + if err != nil { + return nil, devcontainer_k8s_agent_modules_errors.ErrOperateDevcontainer{ + Action: "create DevContainer via Dynamic Client", + Message: err.Error(), + } + } + + // 注册 watcher 监听 DevContainer Status.nodePortAssigned 信息 + watcherTimeoutSeconds := int64(3) + watcher, err := client.Resource(groupVersionResource).Namespace(opts.Namespace).Watch(*ctx, apimachinery_apis_v1.ListOptions{ + FieldSelector: fmt.Sprintf("metadata.name=%s", opts.Name), + //Watch: false, + TimeoutSeconds: &watcherTimeoutSeconds, + Limit: 1, + }) + if err != nil { + return nil, devcontainer_k8s_agent_modules_errors.ErrOperateDevcontainer{ + Action: "register watcher of DevContainer NodePort", + Message: err.Error(), + } + } + defer watcher.Stop() + + //log.Info(" ===== 开始监听 DevContainer NodePort 分配信息 =====") + var nodePortAssigned int64 + for event := range watcher.ResultChan() { + switch event.Type { + case apimachinery_watch.Modified: + if devcontainerUnstructured, ok := event.Object.(*apimachinery_apis_v1_unstructured.Unstructured); ok { + + statusDevcontainer, ok, err := apimachinery_apis_v1_unstructured.NestedMap(devcontainerUnstructured.Object, "status") + if err == nil && ok { + nodePortAssigned = statusDevcontainer["nodePortAssigned"].(int64) + if 30000 <= nodePortAssigned && nodePortAssigned <= 32767 { + devcontainerApp.Status.NodePortAssigned = uint16(nodePortAssigned) + //log.Info("DevContainer NodePort Status 更新完成，最新 NodePort = %v", nodePortAssigned) + //break + // 收到 NodePort Service MODIFIED 消息后，更新 NodePort，直接返回，不再处理后续 Event (否则必须超时3秒才得到 NodePort) + return devcontainerApp, nil + } + } + } + } + } + //log.Info(" ===== 结束监听 DevContainer NodePort 分配信息 =====") + + /* + // 目前需要更新的字段只有 devcontainerInCluster.Status.NodePortAssigned + // 如果后续有其他较多的需要更新的字段，可以考虑重新查询，目前，暂时只考虑 直接更新内存缓存对象，然后返回即可 + // 避免对 k8s API Server 造成访问压力 + //response, err := client.Resource(groupVersionResource).Namespace(opts.Namespace).Get(*ctx, opts.Name, apimachinery_apis_v1.GetOptions{}) + //jsonData, err = response.MarshalJSON() + //devcontainerInCluster := &devcontainer_api_v1.DevcontainerApp{} + //err = json.Unmarshal(jsonData, devcontainerInCluster) + //if err != nil { + // return nil, devcontainer_errors.ErrOperateDevcontainer{ + // Action: "parse response result of in-cluster DevContainer", + // Message: err.Error(), + // } + //} + */ + return devcontainerApp, nil +} diff --git a/modules/devstar_devcontainer/k8s_agent/DeleteDevcontainer.go b/modules/devstar_devcontainer/k8s_agent/DeleteDevcontainer.go new file mode 100644 index 0000000000..f97b9e6e8c --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/DeleteDevcontainer.go @@ -0,0 +1,29 @@ +package k8s_agent + +import ( + devcontainer_dto "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/dto" + devcontainer_errors "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/errors" + "code.gitea.io/gitea/modules/log" + "context" + "fmt" + dynamic_client "k8s.io/client-go/dynamic" +) + +func DeleteDevcontainer(ctx *context.Context, client dynamic_client.Interface, opts *devcontainer_dto.DeleteDevcontainerOptions) error { + if ctx == nil || opts == nil || len(opts.Namespace) == 0 || len(opts.Name) == 0 { + return devcontainer_errors.ErrIllegalDevcontainerParameters{ + FieldList: []string{"ctx", "opts", "opts.Name", "opts.Namespace"}, + Message: "cannot be nil", + } + } + + err := client.Resource(groupVersionResource).Namespace(opts.Namespace).Delete(*ctx, opts.Name, opts.DeleteOptions) + if err != nil { + log.Warn("Failed to delete DevcontainerApp '%s' in namespace '%s': %s", opts.Name, opts.Namespace, err.Error()) + return devcontainer_errors.ErrOperateDevcontainer{ + Action: fmt.Sprintf("delete devcontainer '%s' in namespace '%s'", opts.Name, opts.Namespace), + Message: err.Error(), + } + } + return nil +} diff --git a/modules/devstar_devcontainer/k8s_agent/GetDevcontainer.go b/modules/devstar_devcontainer/k8s_agent/GetDevcontainer.go new file mode 100644 index 0000000000..e3345d2ec3 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/GetDevcontainer.go @@ -0,0 +1,157 @@ +package k8s_agent + +import ( + devcontainer_api_v1 "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/api/v1" + devcontainer_dto "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/dto" + devcontainer_errors "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/errors" + devcontainer_module_utils "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/utils" + devcontainer_agent_module_vo "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/vo" + "code.gitea.io/gitea/modules/setting" + "context" + "fmt" + apimachinery_api_metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apimachinery_apis_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apimachinery_apis_v1_unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + apimachinery_runtime_utils "k8s.io/apimachinery/pkg/runtime" + apimachinery_watch "k8s.io/apimachinery/pkg/watch" + dynamic_client "k8s.io/client-go/dynamic" +) + +func GetDevcontainer(ctx *context.Context, client dynamic_client.Interface, opts *devcontainer_dto.GetDevcontainerOptions) (*devcontainer_api_v1.DevcontainerApp, error) { + + // 0. 检查参数 + if ctx == nil || opts == nil || len(opts.Namespace) == 0 || len(opts.Name) == 0 { + return nil, devcontainer_errors.ErrIllegalDevcontainerParameters{ + FieldList: []string{"ctx", "opts", "opts.Name", "opts.Namespace"}, + Message: "cannot be nil", + } + } + + // 1. 获取 k8s CRD 资源 DevcontainerApp + devcontainerUnstructured, err := client.Resource(groupVersionResource).Namespace(opts.Namespace).Get(*ctx, opts.Name, opts.GetOptions) + if err != nil { + return nil, devcontainer_errors.ErrOperateDevcontainer{ + Action: "Get DevcontainerApp thru k8s API Server", + Message: err.Error(), + } + } + + // 2. 解析 DevcontainerApp Status 域，装填 VO + devcontainerApp := &devcontainer_api_v1.DevcontainerApp{} + err = apimachinery_runtime_utils.DefaultUnstructuredConverter.FromUnstructured(devcontainerUnstructured.Object, &devcontainerApp) + if err != nil { + return nil, devcontainer_errors.ErrOperateDevcontainer{ + Action: "Convert k8s API Server unstructured response into DevcontainerApp", + Message: err.Error(), + } + } + + // 3. 检查 Devcontainer 是否就绪 + if !devcontainer_module_utils.IsK8sDevcontainerStatusReady(&devcontainerApp.Status) { + // 3.1 检查 Wait 参数，若用户不需要阻塞式等待，直接返回 “DevContainer 未就绪” 错误 + if opts.Wait == false { + return nil, devcontainer_errors.ErrK8sDevcontainerNotReady{ + Name: opts.Name, + Namespace: opts.Namespace, + Wait: opts.Wait, + } + } + + // 3.2 执行阻塞式等待 + devcontainerStatusVO, err := waitUntilDevcontainerReadyWithTimeout(ctx, client, opts) + if err != nil { + return nil, devcontainer_errors.ErrOperateDevcontainer{ + Action: "wait for k8s DevContainer to be ready", + Message: err.Error(), + } + } + devcontainerApp.Status.Ready = devcontainerStatusVO.Ready + devcontainerApp.Status.NodePortAssigned = devcontainerStatusVO.NodePortAssigned + } + + // 4. 将就绪的 DevContainer Status VO 返回 + return devcontainerApp, nil +} + +// waitUntilDevcontainerReadyWithTimeout 辅助方法：在超时时间内阻塞等待 DevContainer 就绪 +func waitUntilDevcontainerReadyWithTimeout(ctx *context.Context, client dynamic_client.Interface, opts *devcontainer_dto.GetDevcontainerOptions) (*devcontainer_agent_module_vo.DevcontainerStatusK8sAgentVO, error) { + + // 0. 检查参数 + if ctx == nil || client == nil || opts == nil || len(opts.Name) == 0 || len(opts.Namespace) == 0 { + return nil, devcontainer_errors.ErrIllegalDevcontainerParameters{ + FieldList: []string{"ctx", "client", "opts", "opts.Name", "opts.Namespace"}, + Message: "could not be nil", + } + } + + // 1. 注册 watcher 监听 DevContainer Status 变化 + watcherTimeoutSeconds := setting.Devstar.Devcontainer.TimeoutSeconds + watcher, err := client.Resource(groupVersionResource).Namespace(opts.Namespace).Watch(*ctx, apimachinery_apis_v1.ListOptions{ + FieldSelector: fmt.Sprintf("metadata.name=%s", opts.Name), + Watch: true, + TimeoutSeconds: &watcherTimeoutSeconds, + }) + if err != nil { + return nil, devcontainer_errors.ErrOperateDevcontainer{ + Action: "register watcher of DevContainer Readiness", + Message: err.Error(), + } + } + defer watcher.Stop() + + // 2. 当 DevContainer Watcher 事件处理 + devcontainerStatusVO := &devcontainer_agent_module_vo.DevcontainerStatusK8sAgentVO{} + for event := range watcher.ResultChan() { + switch event.Type { + case apimachinery_watch.Added: + // 2.1 监听 DevcontainerApp ADDED 事件，直接 fallthrough 到 MODIFIED 事件合并处理 + fallthrough + case apimachinery_watch.Modified: + // 2.2 监听 DevcontainerApp MODIFIED 事件 + if devcontainerUnstructured, ok := event.Object.(*apimachinery_apis_v1_unstructured.Unstructured); ok { + // 2.2.1 解析 status 域 + statusDevcontainer, ok, err := apimachinery_apis_v1_unstructured.NestedMap(devcontainerUnstructured.Object, "status") + if err == nil && ok { + devcontainerCurrentStatus := &devcontainer_api_v1.DevcontainerAppStatus{ + Ready: statusDevcontainer["ready"].(bool), + NodePortAssigned: uint16(statusDevcontainer["nodePortAssigned"].(int64)), + } + // 2.2.2 当 Status 达到就绪状态后，返回 + if devcontainer_module_utils.IsK8sDevcontainerStatusReady(devcontainerCurrentStatus) { + return devcontainerStatusVO, nil + } + } + } + case apimachinery_watch.Error: + // 2.3 监听 DevcontainerApp ERROR 事件，返回报错信息 + apimachineryApiMetav1Status, ok := event.Object.(*apimachinery_api_metav1.Status) + if !ok { + return nil, devcontainer_errors.ErrOperateDevcontainer{ + Action: fmt.Sprintf("wait for Devcontainer '%s' in namespace '%s' to be ready", opts.Name, opts.Namespace), + Message: fmt.Sprintf("An error occurred in k8s CRD DevcontainerApp Watcher: \n"+ + " Code: %v (status = %v)\n"+ + "Message: %v\n"+ + " Reason: %v\n"+ + "Details: %v", + apimachineryApiMetav1Status.Code, apimachineryApiMetav1Status.Status, + apimachineryApiMetav1Status.Message, + apimachineryApiMetav1Status.Reason, + apimachineryApiMetav1Status.Details), + } + } + case apimachinery_watch.Deleted: + // 2.4 监听 DevcontainerApp DELETED 事件，返回报错信息 + return nil, devcontainer_errors.ErrOperateDevcontainer{ + Action: fmt.Sprintf("Open DevContainer '%s' in namespace '%s'", opts.Name, opts.Namespace), + Message: fmt.Sprintf("'%s' of Kind DevcontainerApp has been Deleted", opts.Name), + } + } + } + + // 3. k8s CRD DevcontainerApp Watcher 超时关闭处理：直接返回超时错误 + return nil, devcontainer_errors.ErrOpenDevcontainerTimeout{ + Name: opts.Name, + Namespace: opts.Namespace, + TimeoutSeconds: setting.Devstar.Devcontainer.TimeoutSeconds, + } +} diff --git a/modules/devstar_devcontainer/k8s_agent/ListDevcontainers.go b/modules/devstar_devcontainer/k8s_agent/ListDevcontainers.go new file mode 100644 index 0000000000..2cb2cd18a1 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/ListDevcontainers.go @@ -0,0 +1,48 @@ +package k8s_agent + +import ( + "context" + "encoding/json" + "fmt" + + dynamic_client "k8s.io/client-go/dynamic" + + devcontainer_api_v1 "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/api/v1" + devcontainer_dto "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/dto" + devcontainer_errors "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/errors" +) + +// ListDevcontainers 根据条件列举 DevContainer +func ListDevcontainers(ctx *context.Context, client dynamic_client.Interface, opts *devcontainer_dto.ListDevcontainersOptions) (*devcontainer_api_v1.DevcontainerAppList, error) { + + if ctx == nil || opts == nil || len(opts.Namespace) == 0 { + return nil, devcontainer_errors.ErrIllegalDevcontainerParameters{ + FieldList: []string{"ctx", "namespace"}, + Message: "cannot be empty", + } + } + + list, err := client.Resource(groupVersionResource).Namespace(opts.Namespace).List(*ctx, opts.ListOptions) + if err != nil { + return nil, devcontainer_errors.ErrOperateDevcontainer{ + Action: fmt.Sprintf("List Devcontainer in namespace '%s'", opts.Namespace), + Message: err.Error(), + } + } + // JSON 反序列化为 DevcontainerAppList + jsonData, err := list.MarshalJSON() + if err != nil { + return nil, devcontainer_errors.ErrOperateDevcontainer{ + Action: "verify JSON data of Devcontainer List", + Message: err.Error(), + } + } + devcontainerList := &devcontainer_api_v1.DevcontainerAppList{} + if err := json.Unmarshal(jsonData, devcontainerList); err != nil { + return nil, devcontainer_errors.ErrOperateDevcontainer{ + Action: "deserialize Devcontainer List data", + Message: err.Error(), + } + } + return devcontainerList, nil +} diff --git a/modules/devstar_devcontainer/k8s_agent/api/v1/devcontainerapp_types.go b/modules/devstar_devcontainer/k8s_agent/api/v1/devcontainerapp_types.go new file mode 100644 index 0000000000..609465a331 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/api/v1/devcontainerapp_types.go @@ -0,0 +1,126 @@ +/* +Copyright 2024. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! +// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. + +// DevcontainerAppSpec defines the desired state of DevcontainerApp +type DevcontainerAppSpec struct { + // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster + // Important: Run "make" to regenerate code after modifying this file + + StatefulSet StatefulSetSpec `json:"statefulset"` + // +optional + Service ServiceSpec `json:"service"` + + // +kubebuilder:validation:Minimum=0 + + // Optional deadline in seconds for starting the job if it misses scheduled + // time for any reason. Missed jobs executions will be counted as failed ones. + // +optional + StartingDeadlineSeconds *int64 `json:"startingDeadlineSeconds,omitempty"` + + // This flag tells the controller to suspend subsequent executions, it does + // not apply to already started executions. Defaults to false. + // +optional + Suspend *bool `json:"suspend,omitempty"` + + // +kubebuilder:validation:Minimum=0 + + // The number of successful finished jobs to retain. + // This is a pointer to distinguish between explicit zero and not specified. + // +optional + SuccessfulJobsHistoryLimit *int32 `json:"successfulJobsHistoryLimit,omitempty"` + + // +kubebuilder:validation:Minimum=0 + + // The number of failed finished jobs to retain. + // This is a pointer to distinguish between explicit zero and not specified. + // +optional + FailedJobsHistoryLimit *int32 `json:"failedJobsHistoryLimit,omitempty"` +} + +// StatefulSetSpec specifies StatefulSet for DevContainer +type StatefulSetSpec struct { + Image string `json:"image"` + Command []string `json:"command"` + + // +kubebuilder:validation:Minimum=1 + // +optional + ContainerPort uint16 `json:"containerPort,omitempty"` +} + +// ServiceSpec specifies Service for DevContainer +type ServiceSpec struct { + // +kubebuilder:validation:Minimum=30000 + // +kubebuilder:validation:Maximum=32767 + // +optional + NodePort uint16 `json:"nodePort,omitempty"` + + // +kubebuilder:validation:Minimum=1 + // +optional + ServicePort uint16 `json:"servicePort,omitempty"` +} + +// DevcontainerAppStatus defines the observed state of DevcontainerApp +type DevcontainerAppStatus struct { + // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster + // Important: Run "make" to regenerate code after modifying this file + + // A list of pointers to currently running jobs. + // +optional + Active []corev1.ObjectReference `json:"active,omitempty"` + + // Information when was the last time the job was successfully scheduled. + // +optional + LastScheduleTime *metav1.Time `json:"lastScheduleTime,omitempty"` + + // NodePortAssigned 存储 DevcontainerApp CRD调度后集群分配的 NodePort + // +optional + NodePortAssigned uint16 `json:"nodePortAssigned"` + + // Ready 标识 DevcontainerApp 管理的 Pod 的 Readiness Probe 是否达到就绪状态 + // +optional + Ready bool `json:"ready"` +} + +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status + +// DevcontainerApp is the Schema for the devcontainerapps API +type DevcontainerApp struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec DevcontainerAppSpec `json:"spec,omitempty"` + Status DevcontainerAppStatus `json:"status,omitempty"` +} + +// +kubebuilder:object:root=true + +// DevcontainerAppList contains a list of DevcontainerApp +type DevcontainerAppList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DevcontainerApp `json:"items"` +} diff --git a/modules/devstar_devcontainer/k8s_agent/api/v1/groupversion_info.go b/modules/devstar_devcontainer/k8s_agent/api/v1/groupversion_info.go new file mode 100644 index 0000000000..59d9993eb3 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/api/v1/groupversion_info.go @@ -0,0 +1,29 @@ +/* +Copyright 2024. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Package v1 contains API Schema definitions for the devcontainer v1 API group +// +kubebuilder:object:generate=true +// +groupName=devcontainer.devstar.cn +package v1 + +import ( + "k8s.io/apimachinery/pkg/runtime/schema" +) + +var ( + // GroupVersion is group version used to register these objects + GroupVersion = schema.GroupVersion{Group: "devcontainer.devstar.cn", Version: "v1"} +) diff --git a/modules/devstar_devcontainer/k8s_agent/api/v1/zz_generated.deepcopy.go b/modules/devstar_devcontainer/k8s_agent/api/v1/zz_generated.deepcopy.go new file mode 100644 index 0000000000..89ca8ce3a6 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/api/v1/zz_generated.deepcopy.go @@ -0,0 +1,181 @@ +//go:build !ignore_autogenerated + +/* +Copyright 2024. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by controller-gen. DO NOT EDIT. + +package v1 + +import ( + corev1 "k8s.io/api/core/v1" + runtime "k8s.io/apimachinery/pkg/runtime" +) + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DevcontainerApp) DeepCopyInto(out *DevcontainerApp) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DevcontainerApp. +func (in *DevcontainerApp) DeepCopy() *DevcontainerApp { + if in == nil { + return nil + } + out := new(DevcontainerApp) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DevcontainerApp) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DevcontainerAppList) DeepCopyInto(out *DevcontainerAppList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DevcontainerApp, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DevcontainerAppList. +func (in *DevcontainerAppList) DeepCopy() *DevcontainerAppList { + if in == nil { + return nil + } + out := new(DevcontainerAppList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DevcontainerAppList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DevcontainerAppSpec) DeepCopyInto(out *DevcontainerAppSpec) { + *out = *in + in.StatefulSet.DeepCopyInto(&out.StatefulSet) + out.Service = in.Service + if in.StartingDeadlineSeconds != nil { + in, out := &in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds + *out = new(int64) + **out = **in + } + if in.Suspend != nil { + in, out := &in.Suspend, &out.Suspend + *out = new(bool) + **out = **in + } + if in.SuccessfulJobsHistoryLimit != nil { + in, out := &in.SuccessfulJobsHistoryLimit, &out.SuccessfulJobsHistoryLimit + *out = new(int32) + **out = **in + } + if in.FailedJobsHistoryLimit != nil { + in, out := &in.FailedJobsHistoryLimit, &out.FailedJobsHistoryLimit + *out = new(int32) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DevcontainerAppSpec. +func (in *DevcontainerAppSpec) DeepCopy() *DevcontainerAppSpec { + if in == nil { + return nil + } + out := new(DevcontainerAppSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DevcontainerAppStatus) DeepCopyInto(out *DevcontainerAppStatus) { + *out = *in + if in.Active != nil { + in, out := &in.Active, &out.Active + *out = make([]corev1.ObjectReference, len(*in)) + copy(*out, *in) + } + if in.LastScheduleTime != nil { + in, out := &in.LastScheduleTime, &out.LastScheduleTime + *out = (*in).DeepCopy() + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DevcontainerAppStatus. +func (in *DevcontainerAppStatus) DeepCopy() *DevcontainerAppStatus { + if in == nil { + return nil + } + out := new(DevcontainerAppStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ServiceSpec) DeepCopyInto(out *ServiceSpec) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceSpec. +func (in *ServiceSpec) DeepCopy() *ServiceSpec { + if in == nil { + return nil + } + out := new(ServiceSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *StatefulSetSpec) DeepCopyInto(out *StatefulSetSpec) { + *out = *in + if in.Command != nil { + in, out := &in.Command, &out.Command + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StatefulSetSpec. +func (in *StatefulSetSpec) DeepCopy() *StatefulSetSpec { + if in == nil { + return nil + } + out := new(StatefulSetSpec) + in.DeepCopyInto(out) + return out +} diff --git a/modules/devstar_devcontainer/k8s_agent/dto/CreateDevcontainerOptions.go b/modules/devstar_devcontainer/k8s_agent/dto/CreateDevcontainerOptions.go new file mode 100644 index 0000000000..60c66557ae --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/dto/CreateDevcontainerOptions.go @@ -0,0 +1,17 @@ +package dto + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// CreateDevcontainerOptions 定义创建开发容器选项 +type CreateDevcontainerOptions struct { + metav1.CreateOptions + + Name string `json:"name"` + Namespace string `json:"namespace"` + Image string `json:"image"` + CommandList []string `json:"command"` + ContainerPort uint16 `json:"containerPort"` + ServicePort uint16 `json:"servicePort"` +} diff --git a/modules/devstar_devcontainer/k8s_agent/dto/DeleteDevcontainerOptions.go b/modules/devstar_devcontainer/k8s_agent/dto/DeleteDevcontainerOptions.go new file mode 100644 index 0000000000..02d15c7f58 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/dto/DeleteDevcontainerOptions.go @@ -0,0 +1,12 @@ +package dto + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +type DeleteDevcontainerOptions struct { + metav1.DeleteOptions + + Name string `json:"name"` + Namespace string `json:"namespace"` +} diff --git a/modules/devstar_devcontainer/k8s_agent/dto/GetDevcontainerOptions.go b/modules/devstar_devcontainer/k8s_agent/dto/GetDevcontainerOptions.go new file mode 100644 index 0000000000..2f1d918bb9 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/dto/GetDevcontainerOptions.go @@ -0,0 +1,11 @@ +package dto + +import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + +type GetDevcontainerOptions struct { + metav1.GetOptions + + Name string `json:"name"` + Namespace string `json:"namespace"` + Wait bool `json:"wait"` +} diff --git a/modules/devstar_devcontainer/k8s_agent/dto/ListDevcontainersOptions.go b/modules/devstar_devcontainer/k8s_agent/dto/ListDevcontainersOptions.go new file mode 100644 index 0000000000..4bfac74f77 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/dto/ListDevcontainersOptions.go @@ -0,0 +1,11 @@ +package dto + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +type ListDevcontainersOptions struct { + metav1.ListOptions + + Namespace string `json:"namespace"` +} diff --git a/modules/devstar_devcontainer/k8s_agent/errors/ErrIllegalDevcontainerParameters.go b/modules/devstar_devcontainer/k8s_agent/errors/ErrIllegalDevcontainerParameters.go new file mode 100644 index 0000000000..0b9df61d5f --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/errors/ErrIllegalDevcontainerParameters.go @@ -0,0 +1,14 @@ +package errors + +import ( + "fmt" +) + +type ErrIllegalDevcontainerParameters struct { + FieldList []string + Message string +} + +func (err ErrIllegalDevcontainerParameters) Error() string { + return fmt.Sprintf("Illegal DevContainer parameters detected: %v (%s)", err.FieldList, err.Message) +} diff --git a/modules/devstar_devcontainer/k8s_agent/errors/ErrK8sDevcontainerNotReady.go b/modules/devstar_devcontainer/k8s_agent/errors/ErrK8sDevcontainerNotReady.go new file mode 100644 index 0000000000..0eb1e335ba --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/errors/ErrK8sDevcontainerNotReady.go @@ -0,0 +1,16 @@ +package errors + +import ( + "fmt" +) + +type ErrK8sDevcontainerNotReady struct { + Name string + Namespace string + Wait bool +} + +func (err ErrK8sDevcontainerNotReady) Error() string { + return fmt.Sprintf("Failed to open k8s Devcontainer '%s' in namespace '%s': DevContainer Not Ready (Wait = %v)", + err.Name, err.Namespace, err.Wait) +} diff --git a/modules/devstar_devcontainer/k8s_agent/errors/ErrOpenDevcontainerTimeout.go b/modules/devstar_devcontainer/k8s_agent/errors/ErrOpenDevcontainerTimeout.go new file mode 100644 index 0000000000..1d5e056849 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/errors/ErrOpenDevcontainerTimeout.go @@ -0,0 +1,18 @@ +package errors + +import ( + "fmt" +) + +// ErrOpenDevcontainerTimeout 阻塞式等待 DevContainer 超时 +type ErrOpenDevcontainerTimeout struct { + Name string + Namespace string + TimeoutSeconds int64 +} + +func (err ErrOpenDevcontainerTimeout) Error() string { + return fmt.Sprintf("Failed to open DevContainer '%s' in namespace '%s': waiting timeout limit of %d seconds has been exceeded.", + err.Name, err.Namespace, err.TimeoutSeconds, + ) +} diff --git a/modules/devstar_devcontainer/k8s_agent/errors/ErrOperateDevcontainer.go b/modules/devstar_devcontainer/k8s_agent/errors/ErrOperateDevcontainer.go new file mode 100644 index 0000000000..2391a958c6 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/errors/ErrOperateDevcontainer.go @@ -0,0 +1,14 @@ +package errors + +import ( + "fmt" +) + +type ErrOperateDevcontainer struct { + Action string + Message string +} + +func (err ErrOperateDevcontainer) Error() string { + return fmt.Sprintf("Failed to %v in DevStar DevContainer DB: %v", err.Action, err.Message) +} diff --git a/modules/devstar_devcontainer/k8s_agent/gvr.go b/modules/devstar_devcontainer/k8s_agent/gvr.go new file mode 100644 index 0000000000..ff22821da4 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/gvr.go @@ -0,0 +1,19 @@ +package k8s_agent + +import ( + devcontainer_api_v1 "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/api/v1" + "k8s.io/apimachinery/pkg/runtime/schema" +) + +// groupVersionResource 用于描述 CRD，供 dynamic Client 交互使用 +var groupVersionResource = schema.GroupVersionResource{ + Group: devcontainer_api_v1.GroupVersion.Group, + Version: devcontainer_api_v1.GroupVersion.Version, + Resource: "devcontainerapps", +} + +var groupVersionKind = schema.GroupVersionKind{ + Group: devcontainer_api_v1.GroupVersion.Group, + Version: devcontainer_api_v1.GroupVersion.Version, + Kind: "DevcontainerApp", +} diff --git a/modules/devstar_devcontainer/k8s_agent/init.go b/modules/devstar_devcontainer/k8s_agent/init.go new file mode 100644 index 0000000000..8564b38d90 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/init.go @@ -0,0 +1,34 @@ +package k8s_agent + +import ( + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "context" + + dynamicclient "k8s.io/client-go/dynamic" + clientgorest "k8s.io/client-go/rest" + "k8s.io/client-go/tools/clientcmd" + clientgocmdtools "k8s.io/client-go/tools/clientcmd" +) + +// GetKubernetesClient +func GetKubernetesClient(ctx *context.Context) (dynamicclient.Interface, error) { + // 1.0 尝试从集群外获取 kubectl 配置信息 + config, err := clientcmd.BuildConfigFromFlags("", clientgocmdtools.RecommendedHomeFile) + if err != nil { + // 1.1 集群外尝试失败，改从集群内获取 kubectl 配置信息 + log.Warn("Failed to obtain Kubernetes config outside of cluster: " + clientgocmdtools.RecommendedHomeFile) + config, err = clientgorest.InClusterConfig() + if err != nil { + log.Error("Failed to obtain Kubernetes config both inside/outside of cluster, the DevContainer is Disabled") + setting.Devstar.Devcontainer.Enabled = false + return nil, err + } + } + // 2. 根据 k8s 配置信息构建 ClientSet + dynamicClient, err := dynamicclient.NewForConfig(config) + if err != nil { + return nil, err + } + return dynamicClient, err +} diff --git a/modules/devstar_devcontainer/k8s_agent/utils/IsK8sDevcontainerStatusReady.go b/modules/devstar_devcontainer/k8s_agent/utils/IsK8sDevcontainerStatusReady.go new file mode 100644 index 0000000000..d488d3b25a --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/utils/IsK8sDevcontainerStatusReady.go @@ -0,0 +1,15 @@ +package utils + +import ( + devcontainer_api_v1 "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/api/v1" +) + +// IsK8sDevcontainerStatusReady 工具类方法，判断给定的 DevcontainerApp.Status 是否达到就绪状态 +// 1. DevcontainerApp.Status.Ready == true +// 2. DevcontainerApp.Status.NodePortAssigned 介于闭区间 [30000, 32767] +func IsK8sDevcontainerStatusReady(devcontainerAppStatus *devcontainer_api_v1.DevcontainerAppStatus) bool { + return devcontainerAppStatus != nil && + devcontainerAppStatus.Ready && + devcontainerAppStatus.NodePortAssigned >= 30000 && + devcontainerAppStatus.NodePortAssigned <= 32767 +} diff --git a/modules/devstar_devcontainer/k8s_agent/vo/DevcontainerStatusK8sAgentVO.go b/modules/devstar_devcontainer/k8s_agent/vo/DevcontainerStatusK8sAgentVO.go new file mode 100644 index 0000000000..efdd17d539 --- /dev/null +++ b/modules/devstar_devcontainer/k8s_agent/vo/DevcontainerStatusK8sAgentVO.go @@ -0,0 +1,9 @@ +package vo + +type DevcontainerStatusK8sAgentVO struct { + // CRD Controller 向 DevcontainerApp.Status.NodePortAssigned 写入了最新的 NodePort 端口值，当且仅当 Service 被调度且分配了最新的 NodePort + NodePortAssigned uint16 `json:"nodePortAssigned"` + + // CRD Controller 向 DevcontainerApp.Status.Ready 写入了 true，当且仅当 StatefulSet 控制下的 Pod 中的 Readiness Probe 返回 true + Ready bool `json:"ready"` +} diff --git a/modules/setting/devstar_devcontainer.go b/modules/setting/devstar_devcontainer.go new file mode 100644 index 0000000000..14f8410278 --- /dev/null +++ b/modules/setting/devstar_devcontainer.go @@ -0,0 +1,58 @@ +package setting + +import ( + "code.gitea.io/gitea/modules/log" +) + +const ( + DEVCONTAINER_AGENT_NAME_K8S string = "k8s" + DEVCONTAINER_AGENT_NAME_DOCKER string = "docker" +) + +// package 内部私有变量，是一个 Set 结构，标识目前系统所有支持的 DevContainer Agent 类型 +var validDevcontainerAgentSet = map[string]struct{}{ + DEVCONTAINER_AGENT_NAME_K8S: {}, + DEVCONTAINER_AGENT_NAME_DOCKER: {}, +} + +var Devstar = struct { + Devcontainer DevcontainerType `ini:"devstar.devcontainer"` +}{ + Devcontainer: DevcontainerType{ + Enabled: false, + Namespace: "default", + TimeoutSeconds: 900, // 最长等待 DevContainer 就绪时间（阻塞式），默认15分钟，可被 app.ini 指定值覆盖 + }, +} + +type DevcontainerType struct { + Enabled bool `ini:"enabled"` + Host string `ini:"host"` + Agent string `ini:"agent"` + Namespace string `ini:"namespace"` + TimeoutSeconds int64 `ini:"timeout_seconds"` +} + +// loadDevstarDevcontainerFrom 从 ini 配置文件中读取 DevStar DevContainer 配置信息，并进行检查，若数据无效，则自动禁用 DevContainer +func loadDevstarDevcontainerFrom(rootCfg ConfigProvider) { + + mustMapSetting(rootCfg, "devstar", &Devstar) + + // 检查 Host 是否为空，若为空，则自动将 DevContainer 设置为禁用 + if len(Devstar.Devcontainer.Host) == 0 { + log.Warn("INVALID config 'host' for DevStar DevContainer") + Devstar.Devcontainer.Enabled = false + } + + // 检查用户输入的 DevContainer Agent 是否存在支持列表，若不支持，则将 DevContainer 设置为禁用 + if _, exists := validDevcontainerAgentSet[Devstar.Devcontainer.Agent]; !exists { + log.Warn("INVALID config 'agent' for DevStar DevContainer") + Devstar.Devcontainer.Enabled = false + } + + if Devstar.Devcontainer.Enabled == false { + log.Warn("DevStar DevContainer Service Disabled") + } else { + log.Info("DevStar DevContainer Service Enabled") + } +} diff --git a/modules/setting/server.go b/modules/setting/server.go index 990f74f901..8473b8636d 100644 --- a/modules/setting/server.go +++ b/modules/setting/server.go @@ -38,6 +38,9 @@ const ( LandingPageExplore LandingPage = "/explore" LandingPageOrganizations LandingPage = "/explore/organizations" LandingPageLogin LandingPage = "/user/login/wechat/official-account" + + // LandingPageDevstarDevcontainerRepoLink 是特殊仓库，表示 DevcontainerApp k8s CRD 脚手架工程： devstar.cn/DevcontainerApp + LandingPageDevstarDevcontainerRepoLink LandingPage = "/devstar/devstar-devcontainer-kubebuilder-scaffold" ) // Server settings diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 8faad6b0b5..d6150f697e 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -217,6 +217,7 @@ func LoadSettings() { loadMimeTypeMapFrom(CfgProvider) loadFederationFrom(CfgProvider) loadWechatSettingsFrom(CfgProvider) + loadDevstarDevcontainerFrom(CfgProvider) } // LoadSettingsForInstall initializes the settings for install diff --git a/modules/validation/binding.go b/modules/validation/binding.go index cb0a5063e5..6a46fc424a 100644 --- a/modules/validation/binding.go +++ b/modules/validation/binding.go @@ -26,6 +26,9 @@ const ( ErrUsername = "UsernameError" // ErrInvalidGroupTeamMap is returned when a group team mapping is invalid ErrInvalidGroupTeamMap = "InvalidGroupTeamMap" + + // ErrUserIdOrRepoId 如果 int64 十进制正数规则校验失败(User ID 或者 Repo ID)，返回 ErrUserIdOrRepoId + ErrUserIdOrRepoId = "UserIdOrRepoIdError" ) // AddBindingRules adds additional binding rules @@ -38,6 +41,9 @@ func AddBindingRules() { addGlobOrRegexPatternRule() addUsernamePatternRule() addValidGroupTeamMapRule() + + // 下面是 DevStar Studio 定制化规则：校验是否是有效的 int64 十进制正数字符串（UserID 或者 RepoID） + addUserIdRepoIdPatternRule() } func addGitRefNameBindingRule() { @@ -168,6 +174,23 @@ func addUsernamePatternRule() { }) } +// 新增 用户ID 或者 Repo ID （十进制int64正数部分字符串校验规则） +func addUserIdRepoIdPatternRule() { + binding.AddRule(&binding.Rule{ + IsMatch: func(rule string) bool { + return rule == "PositiveBase10IntegerNumberRule" + }, + IsValid: func(errs binding.Errors, name string, val any) (bool, binding.Errors) { + str := fmt.Sprintf("%v", val) + if !IsValidUserIdOrRepoId(str) { + errs.Add([]string{name}, ErrUserIdOrRepoId, "invalid User ID or Repo ID") + return false, errs + } + return true, errs + }, + }) +} + func addValidGroupTeamMapRule() { binding.AddRule(&binding.Rule{ IsMatch: func(rule string) bool { diff --git a/modules/validation/helpers.go b/modules/validation/helpers.go index f6e00f3887..2b34adf409 100644 --- a/modules/validation/helpers.go +++ b/modules/validation/helpers.go @@ -119,6 +119,9 @@ func IsValidExternalTrackerURLFormat(uri string) bool { var ( validUsernamePattern = regexp.MustCompile(`^[\da-zA-Z][-.\w]*$`) invalidUsernamePattern = regexp.MustCompile(`[-._]{2,}|[-._]$`) // No consecutive or trailing non-alphanumeric chars + + // DevStar Studio 定制规则：判断是否是有效的 int64 ID 十进制正数字符串（UserID 或者 Repo ID） + validBase10PositiveNumberPattern = regexp.MustCompile(`^\d+$`) ) // IsValidUsername checks if username is valid @@ -127,3 +130,8 @@ func IsValidUsername(name string) bool { // but it's easier to use positive and negative checks. return validUsernamePattern.MatchString(name) && !invalidUsernamePattern.MatchString(name) } + +// IsValidUserIdOrRepoId 判断是否是有效的 用户ID 或者 Repo ID （十进制int64正数部分字符串校验规则） +func IsValidUserIdOrRepoId(idStr string) bool { + return validBase10PositiveNumberPattern.MatchString(idStr) +} diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go index 43e1bbc70e..91a7d29336 100644 --- a/modules/web/middleware/binding.go +++ b/modules/web/middleware/binding.go @@ -138,6 +138,9 @@ func Validate(errs binding.Errors, data map[string]any, f Form, l translation.Lo data["ErrorMsg"] = trName + l.TrString("form.username_error") case validation.ErrInvalidGroupTeamMap: data["ErrorMsg"] = trName + l.TrString("form.invalid_group_team_map_error", errs[0].Message) + case validation.ErrUserIdOrRepoId: + data["ErrorMsg"] = trName + l.TrString("form.invalid_group_team_map_error", errs[0].Message) + default: msg := errs[0].Classification if msg != "" && errs[0].Message != "" { diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f0cf6277ef..8b82bf1c8d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -630,6 +630,8 @@ target_branch_not_exist = Target branch does not exist. admin_cannot_delete_self = You cannot delete yourself when you are an admin. Please remove your admin privileges first. +invalid_user_id_or_repo_id = The User ID or Repository ID you provided is invalid. Please check again. + [user] change_avatar = Change your avatar… joined_on = Joined on %s @@ -1014,7 +1016,7 @@ visibility.private_tooltip = Visible only to members of organizations you have j [repo] dev_container = Dev Container dev_container_empty = Oops, it looks like there is no Dev Container in this repository. -dev_container_lack_of_config_prompt = Unable to create Dev Container: Please upload 'devcontainer.json' file to the default branch of the Repository. +dev_container_invalid_config_prompt = Invalid Dev Container Configuration: Please upload a valid 'devcontainer.json' file to the default branch, and ensure that this repository is NOT archived. dev_container_control.create = Create Dev Container dev_container_control.creation_success_for_user = The Dev Container has been created successfully for user '%s'. dev_container_control.creation_failed_for_user = Failed to create the Dev Container for user '%s'. @@ -1148,8 +1150,8 @@ template.issue_labels = Issue Labels template.one_item = Must select at least one template item template.invalid = Must select a template repository -archive.title = This repo is archived. You can view files and clone it, but cannot push or open issues or pull requests. -archive.title_date = This repository has been archived on %s. You can view files and clone it, but cannot push or open issues or pull requests. +archive.title = This repo is archived. You can view files and clone it, but cannot push or create Dev Container or open issues or open pull requests. +archive.title_date = This repository has been archived on %s. You can view files and clone it, but cannot push or create Dev Container or open issues or open pull requests. archive.issue.nocomment = This repo is archived. You cannot comment on issues. archive.pull.nocomment = This repo is archived. You cannot comment on pull requests. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index cc5fcccb7d..bfb293e056 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -629,6 +629,8 @@ target_branch_not_exist=目标分支不存在。 admin_cannot_delete_self=当您是管理员时，您不能删除自己。请先移除您的管理员权限 +invalid_user_id_or_repo_id = 用户ID 或 仓库ID 输入有误，请重新检查 + [user] change_avatar=修改头像 joined_on=加入于 %s @@ -1013,7 +1015,7 @@ visibility.private_tooltip=仅对您已加入的组织的成员可见。 [repo] dev_container = 开发容器 dev_container_empty = 您还没有该仓库的开发容器 -dev_container_lack_of_config_prompt = 无法创建开发容器：请上传 devcontainer.json 至当前仓库默认分支 +dev_container_invalid_config_prompt = 开发容器配置无效：请上传有效的 devcontainer.json 至默认分支，且确保仓库未处于存档状态 dev_container_control.create = 创建开发容器 dev_container_control.creation_success_for_user = 用户 '%s' 已成功创建开发容器 dev_container_control.creation_failed_for_user = 用户 '%s' 开发容器创建失败 @@ -1148,8 +1150,8 @@ template.issue_labels=工单标签 template.one_item=必须至少选择一个模板项 template.invalid=必须选择一个模板仓库 -archive.title=该仓库已被归档。您可以查看文件和克隆它，但不能推送、创建工单或合并请求。 -archive.title_date=该仓库已于 %s 归档。您可以查看文件或克隆它，但不能推送、创建工单或合并请求。 +archive.title=该仓库已被归档。您可以查看文件和克隆它，但不能推送、创建开发容器、创建工单或合并请求。 +archive.title_date=该仓库已于 %s 归档。您可以查看文件或克隆它，但不能推送、创建开发容器、创建工单或合并请求。 archive.issue.nocomment=此仓库已存档，您不能在此工单添加评论。 archive.pull.nocomment=此仓库已存档，您不能在此合并请求添加评论。 diff --git a/routers/api/devcontainer/create_repo_devcontainer.go b/routers/api/devcontainer/create_repo_devcontainer.go new file mode 100644 index 0000000000..3e95a6b2f3 --- /dev/null +++ b/routers/api/devcontainer/create_repo_devcontainer.go @@ -0,0 +1,77 @@ +package devcontainer + +import ( + gitea_web_module "code.gitea.io/gitea/modules/web" + Result "code.gitea.io/gitea/routers/entity" + gitea_web_context "code.gitea.io/gitea/services/context" + devcontainer_api_service "code.gitea.io/gitea/services/devstar_devcontainer/api_services" + devcontainer_service_dto "code.gitea.io/gitea/services/devstar_devcontainer/dto" + "code.gitea.io/gitea/services/forms" + "strconv" +) + +// CreateRepoDevcontainer 创建 某用户在某仓库的 DevContainer +// +// POST /api/devcontainer +// 请求体参数： +// -- repoId: 需要为哪个仓库创建 DevContainer +// 注意：必须携带 用户登录凭证 +func CreateRepoDevcontainer(ctx *gitea_web_context.Context) { + + // 1. 检查用户登录状态，若未登录则返回未授权错误 + if ctx == nil || ctx.Doer == nil { + Result.RespUnauthorizedFailure.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 2. 检查表单校验规则是否失败 + hasError, _ := ctx.Data["HasError"].(bool) + if hasError { + // POST Binding 表单正则表达式校验失败，返回 API 错误信息 + failedToValidateFormData := &Result.ResultType{ + Code: Result.RespFailedIllegalParams.Code, + Msg: Result.RespFailedIllegalParams.Msg, + Data: map[string]string{ + "ErrorMsg": ctx.Data["ErrorMsg"].(string), + }, + } + failedToValidateFormData.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 3. 解析 repoId + form := gitea_web_module.GetForm(ctx).(*forms.CreateRepoDevcontainerForm) + repoId, err := strconv.ParseInt(form.RepoId, 10, 64) + if err != nil || repoId <= 0 { + failedToParseRepoId := Result.ResultType{ + Code: Result.RespFailedIllegalParams.Code, + Msg: Result.RespFailedIllegalParams.Msg, + Data: map[string]string{ + "ErrorMsg": err.Error(), + }, + } + failedToParseRepoId.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 3. 调用 API Service 层创建 DevContainer + opts := &devcontainer_service_dto.CreateDevcontainerDTO{ + Actor: ctx.Doer, + RepoId: repoId, + } + err = devcontainer_api_service.CreateDevcontainerAPIService(ctx, opts) + if err != nil { + errCreateDevcontainer := Result.ResultType{ + Code: Result.RespFailedCreateDevcontainer.Code, + Msg: Result.RespFailedCreateDevcontainer.Msg, + Data: map[string]string{ + "ErrorMsg": err.Error(), + }, + } + errCreateDevcontainer.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 4. 创建 DevContainer 成功，直接返回 + Result.RespSuccess.RespondJson2HttpResponseWriter(ctx.Resp) +} diff --git a/routers/api/devcontainer/delete_repo_devcontainer.go b/routers/api/devcontainer/delete_repo_devcontainer.go new file mode 100644 index 0000000000..4e660ef691 --- /dev/null +++ b/routers/api/devcontainer/delete_repo_devcontainer.go @@ -0,0 +1,52 @@ +package devcontainer + +import ( + Result "code.gitea.io/gitea/routers/entity" + gitea_web_context "code.gitea.io/gitea/services/context" + devcontainer_api_service "code.gitea.io/gitea/services/devstar_devcontainer/api_services" + devcontainer_service_options "code.gitea.io/gitea/services/devstar_devcontainer/options" + "strconv" +) + +// DeleteRepoDevcontainer 删除某仓库的 DevContainer +// +// DELETE /api/devcontainer +// 请求体参数： +// -- repoId: 需要为哪个仓库创建 DevContainer +// 注意：必须携带 用户登录凭证 +func DeleteRepoDevcontainer(ctx *gitea_web_context.Context) { + // 1. 检查用户登录状态，若未登录则返回未授权错误 + if ctx == nil || ctx.Doer == nil { + Result.RespUnauthorizedFailure.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 2. 取得参数 repoId + repoIdStr := ctx.FormString("repoId") + repoId, err := strconv.ParseInt(repoIdStr, 10, 64) + if err != nil || repoId <= 0 { + Result.RespFailedIllegalParams.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 3. 调用 API Service 层，删除 DevContainer + opts := &devcontainer_service_options.AbstractDeleteDevcontainerOptions{ + Actor: ctx.Doer, + RepoId: repoId, + } + err = devcontainer_api_service.DeleteDevcontainerAPIService(ctx, opts) + if err != nil { + failureDeleteDevcontainer := Result.ResultType{ + Code: Result.RespFailedDeleteDevcontainer.Code, + Msg: Result.RespFailedDeleteDevcontainer.Msg, + Data: map[string]any{ + "ErrorMsg": err.Error(), + }, + } + failureDeleteDevcontainer.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 4. 删除成功，返回提示信息 + Result.RespSuccess.RespondJson2HttpResponseWriter(ctx.Resp) +} diff --git a/routers/api/devcontainer/get_repo_devcontainer.go b/routers/api/devcontainer/get_repo_devcontainer.go new file mode 100644 index 0000000000..0b5dc8259d --- /dev/null +++ b/routers/api/devcontainer/get_repo_devcontainer.go @@ -0,0 +1,60 @@ +package devcontainer + +import ( + Result "code.gitea.io/gitea/routers/entity" + gitea_web_context "code.gitea.io/gitea/services/context" + devcontainer_api_service "code.gitea.io/gitea/services/devstar_devcontainer/api_services" + "code.gitea.io/gitea/services/devstar_devcontainer/options" + "strconv" +) + +// GetDevcontainer 查找某用户在某仓库的 DevContainer +// +// GET /api/devcontainer +// 请求体参数： +// -- repoId: 需要为哪个仓库创建 DevContainer +// -- wait: 是否等待 DevContainer 就绪（默认为 false 直接返回“未就绪”，否则阻塞等待） +// 注意：必须携带 用户登录凭证 +func GetDevcontainer(ctx *gitea_web_context.Context) { + // 1. 检查用户登录状态，若未登录则返回未授权错误 + if ctx == nil || ctx.Doer == nil { + Result.RespUnauthorizedFailure.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 2. 取得参数 + wait := ctx.FormBool("wait") + repoIdStr := ctx.FormString("repoId") + repoId, err := strconv.ParseInt(repoIdStr, 10, 64) + if err != nil || repoId <= 0 { + Result.RespFailedIllegalParams.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 3. 准备调用 API Service 层，获取 DevContainer 信息 + optsAbstractOpenDevcontainer := &options.AbstractOpenDevcontainerOptions{ + Wait: wait, + RepoId: repoId, + Actor: ctx.Doer, + } + repoDevcontainerVO, err := devcontainer_api_service.OpenDevcontainerAPIService(ctx, optsAbstractOpenDevcontainer) + if err != nil { + failureGetDevcontainer := Result.ResultType{ + Code: Result.RespFailedOpenDevcontainer.Code, + Msg: Result.RespFailedOpenDevcontainer.Msg, + Data: map[string]any{ + "ErrorMsg": err.Error(), + }, + } + failureGetDevcontainer.RespondJson2HttpResponseWriter(ctx.Resp) + return + } + + // 4. 封装返回成功信息 + successGetDevContainer := Result.ResultType{ + Code: Result.RespSuccess.Code, + Msg: Result.RespSuccess.Msg, + Data: repoDevcontainerVO, + } + successGetDevContainer.RespondJson2HttpResponseWriter(ctx.Resp) +} diff --git a/routers/web/devcontainer/list_user_devcontainers.go b/routers/api/devcontainer/list_user_devcontainers.go similarity index 85% rename from routers/web/devcontainer/list_user_devcontainers.go rename to routers/api/devcontainer/list_user_devcontainers.go index 3a1f26c07b..0eaabe006b 100644 --- a/routers/web/devcontainer/list_user_devcontainers.go +++ b/routers/api/devcontainer/list_user_devcontainers.go @@ -3,19 +3,19 @@ package devcontainer import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/setting" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" Result "code.gitea.io/gitea/routers/entity" - DevcontainersVO "code.gitea.io/gitea/routers/web/devcontainer/vo" - "code.gitea.io/gitea/services/context" + gitea_web_context "code.gitea.io/gitea/services/context" devstar_devcontainer_service "code.gitea.io/gitea/services/devstar_devcontainer" ) -// ListUserDevcontainers 枚举已登录用户所有的 devContainers，但目前测试阶段只返回 mock数据 +// ListUserDevcontainers 枚举已登录用户所有的 DevContainers // // GET /api/devcontainer/user // 请求输入参数： // - page: 当前第几页（默认第1页），从1开始计数 // - pageSize: 每页记录数（默认值 setting.UI.Admin.DevContainersPagingNum） -func ListUserDevcontainers(ctx *context.Context) { +func ListUserDevcontainers(ctx *gitea_web_context.Context) { // 1. 检查用户登录状态，若未登录则返回未授权错误 if ctx.Doer == nil { diff --git a/routers/web/devcontainer/vo/ListRepoDevcontainerVO.go b/routers/api/devcontainer/vo/ListRepoDevcontainerVO.go similarity index 73% rename from routers/web/devcontainer/vo/ListRepoDevcontainerVO.go rename to routers/api/devcontainer/vo/ListRepoDevcontainerVO.go index 3817eafe64..170f3fc124 100644 --- a/routers/web/devcontainer/vo/ListRepoDevcontainerVO.go +++ b/routers/api/devcontainer/vo/ListRepoDevcontainerVO.go @@ -10,16 +10,19 @@ type RepoDevContainerVO struct { DevContainerId int64 `json:"devContainerId" xorm:"devcontainer_id"` DevContainerName string `json:"devContainerName" xorm:"devcontainer_name"` DevContainerHost string `json:"devContainerHost" xorm:"devcontainer_host"` - DevContainerPort uint16 `json:"devContainerPort" xorm:"devcontainer_port"` DevContainerUsername string `json:"devContainerUsername" xorm:"devcontainer_username"` DevContainerPassword string `json:"devContainerPassword" xorm:"devcontainer_password"` DevContainerWorkDir string `json:"devContainerWorkDir" xorm:"devcontainer_work_dir"` - RepoId int64 `json:"repoId" xorm:"repo_id"` - RepoName string `json:"repoName" xorm:"repo_name"` + RepoId int64 `json:"repoId" xorm:"repo_id"` + RepoName string `json:"repoName" xorm:"repo_name"` + //RepoOwnerID int64 `json:"repo_owner_id" xorm:"repo_owner_id"` RepoOwnerName string `json:"repo_owner_name" xorm:"repo_owner_name"` - RepoLink string `json:"repo_link,omitempty"` // 无对应 SQL结果字段，需查表结束后调用 Repo.Link() 手动写入 + RepoLink string `json:"repo_link" xorm:"repo_link"` RepoDescription string `json:"repoDescription,omitempty" xorm:"repo_description"` + + // 实时查询获取，不再从数据库获取 + DevContainerPort uint16 `json:"devContainerPort,omitempty"` } // RepoDevcontainerOptions 仓库 Dev Container 条件，注意仓库的所有者可能与当前操作用户不一致！ diff --git a/routers/web/devcontainer/vo/ListUserDevcontainersVO.go b/routers/api/devcontainer/vo/ListUserDevcontainersVO.go similarity index 100% rename from routers/web/devcontainer/vo/ListUserDevcontainersVO.go rename to routers/api/devcontainer/vo/ListUserDevcontainersVO.go diff --git a/routers/web/wechat/init-wechat-routes.go b/routers/api/wechat/init-wechat-routes.go similarity index 78% rename from routers/web/wechat/init-wechat-routes.go rename to routers/api/wechat/init-wechat-routes.go index 520bc4f4d9..75d1bf52b9 100644 --- a/routers/web/wechat/init-wechat-routes.go +++ b/routers/api/wechat/init-wechat-routes.go @@ -2,7 +2,7 @@ package wechat import ( "code.gitea.io/gitea/modules/web" - wechat_official_account_routers "code.gitea.io/gitea/routers/web/wechat/official_account" + wechat_official_account_routers "code.gitea.io/gitea/routers/api/wechat/official_account" ) /* diff --git a/routers/web/wechat/official_account/callback.go b/routers/api/wechat/official_account/callback.go similarity index 100% rename from routers/web/wechat/official_account/callback.go rename to routers/api/wechat/official_account/callback.go diff --git a/routers/web/wechat/official_account/init-wechat-official-account-routes.go b/routers/api/wechat/official_account/init-wechat-official-account-routes.go similarity index 100% rename from routers/web/wechat/official_account/init-wechat-official-account-routes.go rename to routers/api/wechat/official_account/init-wechat-official-account-routes.go diff --git a/routers/web/wechat/official_account/login-qr-handlers.go b/routers/api/wechat/official_account/login-qr-handlers.go similarity index 94% rename from routers/web/wechat/official_account/login-qr-handlers.go rename to routers/api/wechat/official_account/login-qr-handlers.go index 457aaaddee..9a3d19c872 100644 --- a/routers/web/wechat/official_account/login-qr-handlers.go +++ b/routers/api/wechat/official_account/login-qr-handlers.go @@ -30,7 +30,7 @@ func QrCheckCodeStatus(responseWriter http.ResponseWriter, request *http.Request // 从请求中提取 ticket 参数 ticket := request.URL.Query().Get("ticket") if ticket == "" { - Result.RespFailedIllegalParam.RespondJson2HttpResponseWriter(responseWriter) + Result.RespFailedIllegalWechatQrTicket.RespondJson2HttpResponseWriter(responseWriter) return } diff --git a/routers/entity/devcontainer_result_constants.go b/routers/entity/devcontainer_result_constants.go index 9b51565ddb..b8ca058590 100644 --- a/routers/entity/devcontainer_result_constants.go +++ b/routers/entity/devcontainer_result_constants.go @@ -7,3 +7,27 @@ var RespUnauthorizedFailure = ResultType{ Code: 11001, Msg: "您未授权，无法查看 devContainer 信息", } + +// RespFailedIllegalParams 仓库ID参数无效 +var RespFailedIllegalParams = ResultType{ + Code: 11002, + Msg: "无效参数", +} + +// RespFailedCreateDevcontainer 创建 DevContainer 失败 +var RespFailedCreateDevcontainer = ResultType{ + Code: 11003, + Msg: "创建 DevContainer 失败", +} + +// RespFailedOpenDevcontainer 打开 DevContainer 失败 +var RespFailedOpenDevcontainer = ResultType{ + Code: 11004, + Msg: "打开 DevContainer 失败", +} + +// RespFailedDeleteDevcontainer 删除 DevContainer 失败 +var RespFailedDeleteDevcontainer = ResultType{ + Code: 11005, + Msg: "删除 DevContainer 失败", +} diff --git a/routers/entity/wechat_qr_result_constants.go b/routers/entity/wechat_qr_result_constants.go index 6c6991ef3b..92d8faf1cd 100644 --- a/routers/entity/wechat_qr_result_constants.go +++ b/routers/entity/wechat_qr_result_constants.go @@ -8,8 +8,8 @@ var RespPendingQrNotScanned = ResultType{ Msg: "用户未扫描微信公众号带参数二维码", } -// RespFailedIllegalParam 二维码凭证Ticket参数无效 -var RespFailedIllegalParam = ResultType{ +// RespFailedIllegalWechatQrTicket 二维码凭证Ticket参数无效 +var RespFailedIllegalWechatQrTicket = ResultType{ Code: 10002, Msg: "提交的微信公众号带参数二维码凭证Ticket参数无效", } diff --git a/routers/init.go b/routers/init.go index 0e53926917..6b01f5583a 100644 --- a/routers/init.go +++ b/routers/init.go @@ -4,6 +4,7 @@ package routers import ( + wechat_routers "code.gitea.io/gitea/routers/api/wechat" "context" "net/http" "reflect" @@ -34,7 +35,6 @@ import ( "code.gitea.io/gitea/routers/common" "code.gitea.io/gitea/routers/private" web_routers "code.gitea.io/gitea/routers/web" - wechat_routers "code.gitea.io/gitea/routers/web/wechat" actions_service "code.gitea.io/gitea/services/actions" asymkey_service "code.gitea.io/gitea/services/asymkey" "code.gitea.io/gitea/services/auth" diff --git a/routers/web/devcontainer/CreateRepoDevContainer.go b/routers/web/devcontainer/CreateRepoDevContainer.go new file mode 100644 index 0000000000..929e44445e --- /dev/null +++ b/routers/web/devcontainer/CreateRepoDevContainer.go @@ -0,0 +1,57 @@ +package devcontainer + +import ( + "code.gitea.io/gitea/modules/log" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" + gitea_web_context "code.gitea.io/gitea/services/context" + DevcontainersService "code.gitea.io/gitea/services/devstar_devcontainer" +) + +// CreateRepoDevContainer 创建仓库 Dev Container +func CreateRepoDevContainer(ctx *gitea_web_context.Context) { + if !isUserDevcontainerAlreadyInRepository(ctx) { + opts := &DevcontainersVO.RepoDevcontainerOptions{ + Actor: ctx.Doer, + Repository: ctx.Repo.Repository, + } + err := DevcontainersService.CreateRepoDevcontainer(ctx, opts) + if err != nil { + log.Error("failed to create devContainer with option{%v}: %v", opts, err.Error()) + ctx.Flash.Error(ctx.Tr("repo.dev_container_control.creation_failed_for_user", ctx.Doer.Name)) + } else { + ctx.Flash.Success(ctx.Tr("repo.dev_container_control.creation_success_for_user", ctx.Doer.Name)) + } + } + + ctx.Redirect(ctx.Repo.RepoLink + "/dev-container") +} + +// isValidRepoDevcontainerJsonFile 辅助判断当前仓库的当前分支是否存在有效的 /.devcontainer/devcontainer.json +func isValidRepoDevcontainerJsonFile(ctx *gitea_web_context.Context) bool { + + // 1. 仓库非空，且非 Archived 状态 + if ctx.Repo.Repository.IsEmpty || ctx.Repo.Repository.IsArchived { + return false + } + + // 2. 当前分支的目录 .devcontainer 下存在 devcontainer.json 文件 + fileDevcontainerJsonExists, err := ctx.Repo.FileExists(".devcontainer/devcontainer.json", ctx.Repo.BranchName) + if err != nil || !fileDevcontainerJsonExists { + return false + } + + // 3. TODO: DevContainer 格式正确 + return true +} + +// isUserDevcontainerAlreadyInRepository 辅助判断当前用户在当前仓库是否已有 Dev Container +func isUserDevcontainerAlreadyInRepository(ctx *gitea_web_context.Context) bool { + + opts := &DevcontainersVO.RepoDevcontainerOptions{ + Actor: ctx.Doer, + Repository: ctx.Repo.Repository, + } + + devcontainerDetails, _ := DevcontainersService.GetRepoDevcontainerDetails(ctx, opts) + return devcontainerDetails.DevContainerId > 0 +} diff --git a/routers/web/devcontainer/DeleteRepoDevContainerForCurrentActor.go b/routers/web/devcontainer/DeleteRepoDevContainerForCurrentActor.go new file mode 100644 index 0000000000..26411bf87b --- /dev/null +++ b/routers/web/devcontainer/DeleteRepoDevContainerForCurrentActor.go @@ -0,0 +1,27 @@ +package devcontainer + +import ( + "code.gitea.io/gitea/modules/log" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" + gitea_web_context "code.gitea.io/gitea/services/context" + DevcontainersService "code.gitea.io/gitea/services/devstar_devcontainer" +) + +// DeleteRepoDevContainerForCurrentActor 删除仓库 当前用户 Dev Container +func DeleteRepoDevContainerForCurrentActor(ctx *gitea_web_context.Context) { + + if isUserDevcontainerAlreadyInRepository(ctx) { + opts := &DevcontainersVO.RepoDevcontainerOptions{ + Actor: ctx.Doer, + Repository: ctx.Repo.Repository, + } + err := DevcontainersService.DeleteRepoDevcontainer(ctx, opts) + if err != nil { + log.Warn("failed to create devContainer with option{%v}: %v", opts, err.Error()) + ctx.Flash.Error(ctx.Tr("repo.dev_container_control.deletion_failed_for_user", ctx.Doer.Name)) + } else { + ctx.Flash.Success(ctx.Tr("repo.dev_container_control.deletion_success_for_user", ctx.Doer.Name)) + } + } + ctx.JSONRedirect(ctx.Repo.RepoLink + "/dev-container") +} diff --git a/routers/web/devcontainer/GetRepoDevContainerDetails.go b/routers/web/devcontainer/GetRepoDevContainerDetails.go new file mode 100644 index 0000000000..67b49e7154 --- /dev/null +++ b/routers/web/devcontainer/GetRepoDevContainerDetails.go @@ -0,0 +1,44 @@ +package devcontainer + +import ( + "code.gitea.io/gitea/modules/base" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" + gitea_web_context "code.gitea.io/gitea/services/context" + DevcontainersService "code.gitea.io/gitea/services/devstar_devcontainer" + "net/http" +) + +const ( + tplGetRepoDevcontainerDetail base.TplName = "repo/devcontainer/details" +) + +// GetRepoDevContainerDetails 获取仓库 Dev Container 详细信息 +func GetRepoDevContainerDetails(ctx *gitea_web_context.Context) { + + // 1. 查询当前 Repo 已有的 Dev Container 信息 + opts := &DevcontainersVO.RepoDevcontainerOptions{ + Actor: ctx.Doer, + Repository: ctx.Repo.Repository, + } + //ctx.Repo.RepoLink == ctx.Repo.Repository.Link() + devContainerMetadata, err := DevcontainersService.GetRepoDevcontainerDetails(ctx, opts) + hasDevContainer := err == nil && devContainerMetadata.DevContainerId > 0 + ctx.Data["HasDevContainer"] = hasDevContainer + if hasDevContainer { + ctx.Data["DevContainer"] = devContainerMetadata + } + + // 2. 检查当前仓库的当前分支是否存在有效的 /.devcontainer/devcontainer.json + isValidRepoDevcontainerJson := isValidRepoDevcontainerJsonFile(ctx) + if !hasDevContainer && !isValidRepoDevcontainerJson { + ctx.Flash.Error(ctx.Tr("repo.dev_container_invalid_config_prompt"), true) + } + + // 3. 携带数据渲染页面，返回 + ctx.Data["Title"] = ctx.Locale.Tr("repo.dev_container") + ctx.Data["PageIsRepoDevcontainerDetails"] = true + ctx.Data["HasValidDevContainerJSON"] = isValidRepoDevcontainerJson + ctx.Data["Repository"] = ctx.Repo.Repository + ctx.Data["ContextUser"] = ctx.Doer + ctx.HTML(http.StatusOK, tplGetRepoDevcontainerDetail) +} diff --git a/routers/web/devcontainer/list_repo_devcontainer.go b/routers/web/devcontainer/list_repo_devcontainer.go deleted file mode 100644 index 4bfa6dc86c..0000000000 --- a/routers/web/devcontainer/list_repo_devcontainer.go +++ /dev/null @@ -1,113 +0,0 @@ -package devcontainer - -import ( - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - DevcontainersVO "code.gitea.io/gitea/routers/web/devcontainer/vo" - gitea_web_context "code.gitea.io/gitea/services/context" - DevcontainersService "code.gitea.io/gitea/services/devstar_devcontainer" - "net/http" -) - -const ( - tplGetRepoDevcontainerDetail base.TplName = "repo/devcontainer/details" -) - -// GetRepoDevContainerDetails 获取仓库 Dev Container 详细信息 -func GetRepoDevContainerDetails(ctx *gitea_web_context.Context) { - - // 1. 查询当前 Repo 已有的 Dev Container 信息 - opts := &DevcontainersVO.RepoDevcontainerOptions{ - Actor: ctx.Doer, - Repository: ctx.Repo.Repository, - } - //ctx.Repo.RepoLink == ctx.Repo.Repository.Link() - devContainerMetadata, err := DevcontainersService.GetRepoDevcontainerDetails(ctx, opts) - hasDevContainer := err == nil && devContainerMetadata.DevContainerId > 0 - ctx.Data["HasDevContainer"] = hasDevContainer - if hasDevContainer { - ctx.Data["DevContainer"] = devContainerMetadata - } - - // 2. 检查当前仓库的当前分支是否存在有效的 /.devcontainer/devcontainer.json - isValidRepoDevcontainerJson := isValidRepoDevcontainerJsonFile(ctx) - if !hasDevContainer && !isValidRepoDevcontainerJson { - ctx.Flash.Error(ctx.Tr("repo.dev_container_lack_of_config_prompt"), true) - } - - // 3. 携带数据渲染页面，返回 - ctx.Data["Title"] = ctx.Locale.Tr("repo.dev_container") - ctx.Data["PageIsRepoDevcontainerDetails"] = true - ctx.Data["HasValidDevContainerJSON"] = isValidRepoDevcontainerJson - ctx.Data["Repository"] = ctx.Repo.Repository - ctx.Data["ContextUser"] = ctx.Doer - ctx.HTML(http.StatusOK, tplGetRepoDevcontainerDetail) -} - -// CreateRepoDevContainer 创建仓库 Dev Container -func CreateRepoDevContainer(ctx *gitea_web_context.Context) { - if !isUserDevcontainerAlreadyInRepository(ctx) { - opts := &DevcontainersVO.RepoDevcontainerOptions{ - Actor: ctx.Doer, - Repository: ctx.Repo.Repository, - } - err := DevcontainersService.CreateRepoDevcontainer(ctx, opts) - if err != nil { - log.Warn("failed to create devContainer with option{%v}: %v", opts, err.Error()) - ctx.Flash.Error(ctx.Tr("repo.dev_container_control.creation_failed_for_user", ctx.Doer.Name)) - } else { - ctx.Flash.Success(ctx.Tr("repo.dev_container_control.creation_success_for_user", ctx.Doer.Name)) - } - } - - ctx.Redirect(ctx.Repo.RepoLink + "/dev-container") -} - -// DeleteRepoDevContainerForCurrentActor 删除仓库 当前用户 Dev Container -func DeleteRepoDevContainerForCurrentActor(ctx *gitea_web_context.Context) { - - if isUserDevcontainerAlreadyInRepository(ctx) { - opts := &DevcontainersVO.RepoDevcontainerOptions{ - Actor: ctx.Doer, - Repository: ctx.Repo.Repository, - } - err := DevcontainersService.DeleteRepoDevcontainer(ctx, opts) - if err != nil { - log.Warn("failed to create devContainer with option{%v}: %v", opts, err.Error()) - ctx.Flash.Error(ctx.Tr("repo.dev_container_control.deletion_failed_for_user", ctx.Doer.Name)) - } else { - ctx.Flash.Success(ctx.Tr("repo.dev_container_control.deletion_success_for_user", ctx.Doer.Name)) - } - } - ctx.JSONRedirect(ctx.Repo.RepoLink + "/dev-container") -} - -// isValidRepoDevcontainerJsonFile 辅助判断当前仓库的当前分支是否存在有效的 /.devcontainer/devcontainer.json -func isValidRepoDevcontainerJsonFile(ctx *gitea_web_context.Context) bool { - - // 1. 仓库非空，且非 Archived 状态 - if ctx.Repo.Repository.IsEmpty || ctx.Repo.Repository.IsArchived { - return false - } - - // 2. 当前分支的目录 .devcontainer 下存在 devcontainer.json 文件 - fileDevcontainerJsonExists, err := ctx.Repo.FileExists(".devcontainer/devcontainer.json", ctx.Repo.BranchName) - if err != nil || !fileDevcontainerJsonExists { - return false - } - - // 3. TODO: DevContainer 格式正确 - return true -} - -// isUserDevcontainerAlreadyInRepository 辅助判断当前用户在当前仓库是否已有 Dev Container -func isUserDevcontainerAlreadyInRepository(ctx *gitea_web_context.Context) bool { - - opts := &DevcontainersVO.RepoDevcontainerOptions{ - Actor: ctx.Doer, - Repository: ctx.Repo.Repository, - } - - devcontainerDetails, _ := DevcontainersService.GetRepoDevcontainerDetails(ctx, opts) - return devcontainerDetails.DevContainerId > 0 -} diff --git a/routers/web/user/setting/dev_containers_list.go b/routers/web/user/setting/dev_containers_list.go index f7d4694406..86372b47e3 100644 --- a/routers/web/user/setting/dev_containers_list.go +++ b/routers/web/user/setting/dev_containers_list.go @@ -4,7 +4,7 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/setting" - DevcontainersVO "code.gitea.io/gitea/routers/web/devcontainer/vo" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" gitea_context "code.gitea.io/gitea/services/context" devstar_devcontainer_service "code.gitea.io/gitea/services/devstar_devcontainer" "net/http" diff --git a/routers/web/web.go b/routers/web/web.go index 187254123e..b6793831ce 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -4,7 +4,8 @@ package web import ( - "code.gitea.io/gitea/routers/web/devcontainer" + devcontainer_api "code.gitea.io/gitea/routers/api/devcontainer" + devcontainer_web "code.gitea.io/gitea/routers/web/devcontainer" gocontext "context" "net/http" "strings" @@ -505,7 +506,21 @@ func registerRoutes(m *web.Router) { // ***** START: DevContainer ***** m.Group("/api/devcontainer", func() { - m.Get("/user", devcontainer.ListUserDevcontainers) + // 获取 某用户在某仓库中的 DevContainer 细节（包括SSH连接信息），默认不会等待 (wait = false) + // 请求方式： GET /api/devcontainer?repoId=${repoId}&wait=true // 无需传入 userId，直接从 token 中提取 + m.Get("", devcontainer_api.GetDevcontainer) + + // 抽象方法，创建 某用户在某仓库中的 DevContainer + // 请求方式： POST /api/devcontainer + // 请求体数据： { repoId: REPO_ID } + m.Post("", web.Bind(forms.CreateRepoDevcontainerForm{}), devcontainer_api.CreateRepoDevcontainer) + + // 删除某用户在某仓库中的 DevContainer + // 请求方法： DELETE /api/devcontainer?repoId=${repoId} + m.Delete("", devcontainer_api.DeleteRepoDevcontainer) + + // 列举某用户已创建的所有 DevContainer + m.Get("/user", devcontainer_api.ListUserDevcontainers) }) // ***** END: DevContainer ***** @@ -1318,11 +1333,11 @@ func registerRoutes(m *web.Router) { // end "/{username}/{reponame}": repo code m.Group("/{username}/{reponame}/dev-container", func() { // repo Dev Container - m.Get("", devcontainer.GetRepoDevContainerDetails) - m.Get("/create", devcontainer.CreateRepoDevContainer) - m.Post("/delete", devcontainer.DeleteRepoDevContainerForCurrentActor) + m.Get("", devcontainer_web.GetRepoDevContainerDetails) + m.Get("/create", devcontainer_web.CreateRepoDevContainer, context.RepoMustNotBeArchived()) // 仓库状态非 Archived 才可以创建 DevContainer + m.Post("/delete", devcontainer_web.DeleteRepoDevContainerForCurrentActor) }, - // 进入 Dev Container 编辑页面需要符合条件： // 更新tmpl！！！ // TODO + // 进入 Dev Container 编辑页面需要符合条件： // 1. 已登录 // 2. repo 信息已加载到 Gitea Web Context (否则无法判定当前repo是否有写入Code权限，从而返回无权访问错误码 HTTP 404) // 3. 具有code写入权限 diff --git a/services/devstar_devcontainer/OpenDevcontainerAbstractAgentService.go b/services/devstar_devcontainer/OpenDevcontainerAbstractAgentService.go new file mode 100644 index 0000000000..2425e987ee --- /dev/null +++ b/services/devstar_devcontainer/OpenDevcontainerAbstractAgentService.go @@ -0,0 +1,53 @@ +package devstar_devcontainer + +import ( + "code.gitea.io/gitea/modules/setting" + gitea_web_context "code.gitea.io/gitea/services/context" + devcontainer_service_errors "code.gitea.io/gitea/services/devstar_devcontainer/errors" + k8s_agent_services "code.gitea.io/gitea/services/devstar_devcontainer/k8s_agent" + devcontainer_service_options "code.gitea.io/gitea/services/devstar_devcontainer/options" + devcontainer_service_vo "code.gitea.io/gitea/services/devstar_devcontainer/vo" +) + +// OpenDevcontainerService 获取 DevContainer 连接信息，抽象方法，适配多种 DevContainer Agent +func OpenDevcontainerService(ctx *gitea_web_context.Context, opts *devcontainer_service_options.OpenDevcontainerAppDispatcherOptions) (*devcontainer_service_vo.OpenDevcontainerAbstractAgentVO, error) { + + // 0. 检查参数 + if ctx == nil || opts == nil || len(opts.Name) == 0 { + return nil, devcontainer_service_errors.ErrIllegalParams{ + FieldNameList: []string{"ctx", "opts.Name"}, + } + } + + // 1. 检查 DevContainer 功能是否开启 + if setting.Devstar.Devcontainer.Enabled == false { + return nil, devcontainer_service_errors.ErrOperateDevcontainer{ + Action: "check availability of DevStar DevContainer", + Message: "DevContainer is turned off globally", + } + } + + // 2. 根据 DevContainer Agent 类型分发任务 + apiRequestContext := ctx.Req.Context() + openDevcontainerAbstractAgentVO := &devcontainer_service_vo.OpenDevcontainerAbstractAgentVO{} + switch setting.Devstar.Devcontainer.Agent { + case setting.DEVCONTAINER_AGENT_NAME_K8S: + devcontainerApp, err := k8s_agent_services.AssignDevcontainerGetting2K8sOperator(&apiRequestContext, opts) + if err != nil { + return nil, devcontainer_service_errors.ErrOperateDevcontainer{ + Action: "Open DevContainer in k8s", + Message: err.Error(), + } + } + openDevcontainerAbstractAgentVO.NodePortAssigned = devcontainerApp.Status.NodePortAssigned + + default: + return nil, devcontainer_service_errors.ErrOperateDevcontainer{ + Action: "Open DevContainer", + Message: "No Valid DevContainer Agent Found", + } + } + + // 3. 封装返回结果 + return openDevcontainerAbstractAgentVO, nil +} diff --git a/services/devstar_devcontainer/RepoDevcontainerService.go b/services/devstar_devcontainer/RepoDevcontainerAbstractAgentService.go similarity index 67% rename from services/devstar_devcontainer/RepoDevcontainerService.go rename to services/devstar_devcontainer/RepoDevcontainerAbstractAgentService.go index 819d105258..38812a5c56 100644 --- a/services/devstar_devcontainer/RepoDevcontainerService.go +++ b/services/devstar_devcontainer/RepoDevcontainerAbstractAgentService.go @@ -4,7 +4,9 @@ import ( "code.gitea.io/gitea/models/db" devstar_devcontainer_models "code.gitea.io/gitea/models/devstar_devcontainer" "code.gitea.io/gitea/modules/log" - DevcontainersVO "code.gitea.io/gitea/routers/web/devcontainer/vo" + "code.gitea.io/gitea/modules/setting" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" + devcontainer_k8s_agent_service "code.gitea.io/gitea/services/devstar_devcontainer/k8s_agent" "context" "fmt" "github.com/google/uuid" @@ -86,27 +88,34 @@ func GetRepoDevcontainerDetails(ctx context.Context, opts *DevcontainersVO.RepoD - 数据库此前不存在 该用户在该repo创建的 Dev Container */ func CreateRepoDevcontainer(ctx context.Context, opts *DevcontainersVO.RepoDevcontainerOptions) error { - // TODO: 调用 k8s client 创建 - // 目前只是 mock数据 username := opts.Actor.Name repoName := opts.Repository.Name newDevcontainer := &devstar_devcontainer_models.DevstarDevcontainer{ - Name: getSanitizedDevcontainerName(username, repoName), - DevcontainerHost: "127.0.0.1", - DevcontainerPort: 10086, - DevcontainerUsername: "mock-username", - DevcontainerPassword: "mock-password", - DevcontainerWorkDir: "~/workspace/", + Name: getSanitizedDevcontainerName(username, repoName), + DevcontainerHost: setting.Devstar.Devcontainer.Host, + // DevcontainerPort: 10086, // NodePort 交由 k8s Operator 调度后更新 + DevcontainerUsername: "username", // TODO: 填入用户名 + DevcontainerPassword: "password", // TODO： 生成随机一次性密码 + DevcontainerWorkDir: "~", RepoId: opts.Repository.ID, UserId: opts.Actor.ID, } // 在数据库事务中创建 Dev Container 分配资源，出错时自动回滚相对应数据库字段，保证数据一致 dbTransactionErr := db.WithTx(ctx, func(ctx context.Context) error { + var err error + // 1. 调用 k8s Operator Agent，创建 DevContainer 资源，同时更新k8s调度器分配的 NodePort + err = claimDevcontainerResource(&ctx, newDevcontainer) + if err != nil { + return devstar_devcontainer_models.ErrFailedToOperateDevstarDevcontainerDB{ + Action: fmt.Sprintf("claim resource for Dev Container %v", newDevcontainer), + Message: err.Error(), + } + } + // 2. 根据分配的 NodePort 更新数据库字段 rowsAffect, err := db.GetEngine(ctx). Table("devstar_devcontainer"). Insert(newDevcontainer) - if err != nil { return devstar_devcontainer_models.ErrFailedToOperateDevstarDevcontainerDB{ Action: fmt.Sprintf("insert new DevContainer for user '%s' in repo '%s'", username, repoName), @@ -118,14 +127,6 @@ func CreateRepoDevcontainer(ctx context.Context, opts *DevcontainersVO.RepoDevco Message: "expected 1 row to be inserted, but got 0", } } - - err = claimDevcontainerResource(newDevcontainer) - if err != nil { - return devstar_devcontainer_models.ErrFailedToOperateDevstarDevcontainerDB{ - Action: fmt.Sprintf("Failed to claim resource for Dev Container devstar_devcontainer.DevstarDevcontainer %v", newDevcontainer), - Message: err.Error(), - } - } return nil }) @@ -166,7 +167,15 @@ func DeleteRepoDevcontainer(ctx context.Context, opts *DevcontainersVO.RepoDevco } } - // 2.2 条件删除： user_id 和/或 repo_id + // 2.2 空列表，直接结束事务（由于前一个操作只是查询，所以回滚事务不会导致数据不一致问题） + if len(devcontainersList) == 0 { + return devstar_devcontainer_models.ErrFailedToOperateDevstarDevcontainerDB{ + Action: fmt.Sprintf("find devcontainer(s) with condition '%v'", sqlDevcontainerCondition), + Message: "No DevContainer found", + } + } + + // 2.3 条件删除： user_id 和/或 repo_id _, err = db.GetEngine(ctx). Table("devstar_devcontainer"). Where(sqlDevcontainerCondition). @@ -187,7 +196,12 @@ func DeleteRepoDevcontainer(ctx context.Context, opts *DevcontainersVO.RepoDevco // 3. 后台启动一个goroutine慢慢回收 Dev Container 资源 (如果回收失败，将会产生孤儿 Dev Container，只能管理员手动识别、删除) go func() { - _ = purgeDevcontainersResource(devcontainersList) + // 注意：由于执行删除 k8s 资源 与 数据库交互和Web页面更新是异步的，因此在 goroutine 中必须重新创建 context，否则报错： + // Delete "https://192.168.49.2:8443/apis/devcontainer.devstar.cn/v1/...": context canceled + isolatedContextToPurgeK8sResource, cancelFunc := context.WithCancel(context.Background()) + defer cancelFunc() + + _ = purgeDevcontainersResource(&isolatedContextToPurgeK8sResource, &devcontainersList) }() return dbTransactionErr @@ -211,16 +225,47 @@ func getSanitizedDevcontainerName(username, repoName string) string { return fmt.Sprintf("%s-%s-%s", sanitizedUsername, sanitizedRepoName, uuidStr) } -// purgeDevcontainersResource 辅助函数，用于goroutine后台执行，回收DevContainer资源 // TODO -func purgeDevcontainersResource(devcontainersList []devstar_devcontainer_models.DevstarDevcontainer) error { - for _, devContainer := range devcontainersList { - log.Info("[Goroutine purgeDevcontainersResource]: 正在装模做样地回收资源： devstar_devcontainer_models.DevstarDevcontainer %v", devContainer) +// purgeDevcontainersResource 辅助函数，用于goroutine后台执行，回收DevContainer资源 +func purgeDevcontainersResource(ctx *context.Context, devcontainersList *[]devstar_devcontainer_models.DevstarDevcontainer) error { + // 1. 检查 DevContainer 功能是否启用，若禁用，则直接结束，不会真正执行删除操作 + if setting.Devstar.Devcontainer.Enabled == false { + // 如果用户设置禁用 DevContainer，无法删除资源，会直接忽略，而数据库相关记录会继续清空、不会发生回滚 + log.Warn("Orphan DevContainers in namespace `%s` left undeleted: %v", setting.Devstar.Devcontainer.Namespace, devcontainersList) + return nil + } + // 2. 根据配置文件中指定的 DevContainer Agent 派遣创建任务 + switch setting.Devstar.Devcontainer.Agent { + case setting.DEVCONTAINER_AGENT_NAME_K8S: + return devcontainer_k8s_agent_service.AssignDevcontainerDeletion2K8sOperator(ctx, devcontainersList) + default: + // 未知 Agent，直接报错 + return devstar_devcontainer_models.ErrFailedToOperateDevstarDevcontainerDB{ + Action: "dispatch DevContainer deletion", + Message: fmt.Sprintf("unknown DevContainer agent `%s`, please check your config files", setting.Devstar.Devcontainer.Agent), + } } - return nil } -// claimDevcontainerResource -func claimDevcontainerResource(newDevContainer *devstar_devcontainer_models.DevstarDevcontainer) error { - log.Info("[claimDevcontainerResource]: 正在装模做样地分配资源： devstar_devcontainer_models.DevstarDevcontainer %v", newDevContainer) - return nil +// claimDevcontainerResource 分发创建 DevContainer 任务到配置文件指定的执行器 +func claimDevcontainerResource(ctx *context.Context, newDevContainer *devstar_devcontainer_models.DevstarDevcontainer) error { + // 1. 检查 DevContainer 功能是否启用，若禁用，则直接结束 + if setting.Devstar.Devcontainer.Enabled == false { + return devstar_devcontainer_models.ErrFailedToOperateDevstarDevcontainerDB{ + Action: "Check for DevContainer functionality switch", + Message: "DevContainer is disabled globally, please check your configuration files", + } + } + + // 2. 根据配置文件中指定的 DevContainer Agent 派遣创建任务 + switch setting.Devstar.Devcontainer.Agent { + case setting.DEVCONTAINER_AGENT_NAME_K8S: + // k8s Operator + return devcontainer_k8s_agent_service.AssignDevcontainerCreation2K8sOperator(ctx, newDevContainer) + default: + // 未知 Agent，直接报错 + return devstar_devcontainer_models.ErrFailedToOperateDevstarDevcontainerDB{ + Action: "dispatch DevContainer creation", + Message: fmt.Sprintf("unknown DevContainer agent `%s`, please check your config files", setting.Devstar.Devcontainer.Agent), + } + } } diff --git a/services/devstar_devcontainer/UserDevcontainerService.go b/services/devstar_devcontainer/UserDevcontainerService.go index 2ac92f1ef2..0051948288 100644 --- a/services/devstar_devcontainer/UserDevcontainerService.go +++ b/services/devstar_devcontainer/UserDevcontainerService.go @@ -4,22 +4,22 @@ import ( "code.gitea.io/gitea/models/db" devstar_devcontainer_models "code.gitea.io/gitea/models/devstar_devcontainer" "code.gitea.io/gitea/modules/setting" - DevcontainersVO "code.gitea.io/gitea/routers/web/devcontainer/vo" + "code.gitea.io/gitea/routers/api/devcontainer/vo" "context" "fmt" "xorm.io/builder" ) // GetUserDevcontainersList 根据 userId 查询名下 devContainer 列表 -func GetUserDevcontainersList(ctx context.Context, opts *DevcontainersVO.SearchUserDevcontainerListItemVoOptions) (DevcontainersVO.ListUserDevcontainersVO, error) { +func GetUserDevcontainersList(ctx context.Context, opts *vo.SearchUserDevcontainerListItemVoOptions) (vo.ListUserDevcontainersVO, error) { // 0. 构造异常返回时的空数据 - var resultDevContainerListVO = DevcontainersVO.ListUserDevcontainersVO{ + var resultDevContainerListVO = vo.ListUserDevcontainersVO{ Page: 0, PageSize: setting.UI.Admin.DevContainersPagingNum, PageTotalNum: 0, ItemTotalNum: 0, - DevContainers: []DevcontainersVO.RepoDevContainerVO{}, + DevContainers: []vo.RepoDevContainerVO{}, } // 1. 查询参数预处理 @@ -81,13 +81,12 @@ func GetUserDevcontainersList(ctx context.Context, opts *DevcontainersVO.SearchU } // 2.3 数据库带条件分页查询 - resultDevContainerListVO.DevContainers = make([]DevcontainersVO.RepoDevContainerVO, 0, opts.PaginationOptions.PageSize) + resultDevContainerListVO.DevContainers = make([]vo.RepoDevContainerVO, 0, opts.PaginationOptions.PageSize) /* SELECT devstar_devcontainer.id AS devcontainer_id, devstar_devcontainer.name AS devcontainer_name, devstar_devcontainer.devcontainer_host AS devcontainer_host, - devstar_devcontainer.devcontainer_port AS devcontainer_port, devstar_devcontainer.devcontainer_username AS devcontainer_username, devstar_devcontainer.devcontainer_password AS devcontainer_password, devstar_devcontainer.devcontainer_work_dir AS devcontainer_work_dir, @@ -109,7 +108,6 @@ func GetUserDevcontainersList(ctx context.Context, opts *DevcontainersVO.SearchU "devstar_devcontainer.id AS devcontainer_id,"+ "devstar_devcontainer.name AS devcontainer_name,"+ "devstar_devcontainer.devcontainer_host AS devcontainer_host,"+ - "devstar_devcontainer.devcontainer_port AS devcontainer_port,"+ "devstar_devcontainer.devcontainer_username AS devcontainer_username,"+ "devstar_devcontainer.devcontainer_password AS devcontainer_password,"+ "devstar_devcontainer.devcontainer_work_dir AS devcontainer_work_dir,"+ diff --git a/services/devstar_devcontainer/api_services/CreateDevcontainerAPIService.go b/services/devstar_devcontainer/api_services/CreateDevcontainerAPIService.go new file mode 100644 index 0000000000..8544a26cf5 --- /dev/null +++ b/services/devstar_devcontainer/api_services/CreateDevcontainerAPIService.go @@ -0,0 +1,56 @@ +package api_services + +import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/repo" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" + gitea_web_context "code.gitea.io/gitea/services/context" + DevcontainersService "code.gitea.io/gitea/services/devstar_devcontainer" + devcontainer_service_dto "code.gitea.io/gitea/services/devstar_devcontainer/dto" + devcontainer_service_errors "code.gitea.io/gitea/services/devstar_devcontainer/errors" + "context" +) + +// CreateDevcontainerAPIService API专用创建 DevContainer Service +func CreateDevcontainerAPIService(ctx *gitea_web_context.Context, opts *devcontainer_service_dto.CreateDevcontainerDTO) error { + // 0. 检查用户传入参数 + if ctx == nil || opts == nil || opts.Actor == nil || opts.RepoId <= 0 { + return devcontainer_service_errors.ErrIllegalParams{ + FieldNameList: []string{"ctx", "opts", "opts.Actor", "opts.RepoId"}, + } + } + + // 1. 开启事务 + errTxn := db.WithTx(ctx, func(ctx context.Context) error { + + // 1.1 调用 model层，查询数据库，将 repoId 变换为 Repository 对象 + repositoryInDB, err := repo.GetRepositoryByID(ctx, opts.RepoId) + if err != nil || repositoryInDB == nil { + return devcontainer_service_errors.ErrIllegalParams{ + FieldNameList: []string{"opts.RepoId"}, + } + } + + // 1.2 检查该用户在该仓库 是否已经创建过 DevContainer + optsRepoDevcontainer := &DevcontainersVO.RepoDevcontainerOptions{ + Actor: opts.Actor, + Repository: repositoryInDB, + } + devcontainerDetails, err := DevcontainersService.GetRepoDevcontainerDetails(ctx, optsRepoDevcontainer) + if err != nil || devcontainerDetails.DevContainerId > 0 { + return devcontainer_service_errors.ErrDevcontainerAlreadyCreated{ + Actor: opts.Actor, + Repository: repositoryInDB, + } + } + + // 1.3 调用 k8s Agent 创建 DevContainer + optsCreateDevcontainer := &DevcontainersVO.RepoDevcontainerOptions{ + Actor: opts.Actor, + Repository: repositoryInDB, + } + return DevcontainersService.CreateRepoDevcontainer(ctx, optsCreateDevcontainer) + }) + + return errTxn +} diff --git a/services/devstar_devcontainer/api_services/DeleteDevcontainerAPIService.go b/services/devstar_devcontainer/api_services/DeleteDevcontainerAPIService.go new file mode 100644 index 0000000000..5f7f6a1c06 --- /dev/null +++ b/services/devstar_devcontainer/api_services/DeleteDevcontainerAPIService.go @@ -0,0 +1,52 @@ +package api_services + +import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/repo" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" + gitea_web_context "code.gitea.io/gitea/services/context" + DevcontainersService "code.gitea.io/gitea/services/devstar_devcontainer" + devcontainer_service_errors "code.gitea.io/gitea/services/devstar_devcontainer/errors" + devcontainer_service_options "code.gitea.io/gitea/services/devstar_devcontainer/options" + "context" +) + +// DeleteDevcontainerAPIService API 专用删除 DevContainer Service +func DeleteDevcontainerAPIService(ctx *gitea_web_context.Context, opts *devcontainer_service_options.AbstractDeleteDevcontainerOptions) error { + // 0. 检查用户传入参数 + if ctx == nil || opts == nil || opts.Actor == nil || opts.RepoId <= 0 { + return devcontainer_service_errors.ErrIllegalParams{ + FieldNameList: []string{"ctx", "opts", "opts.Actor", "opts.RepoId"}, + } + } + + // 1. 开启数据库事务，查询 某用户在某仓库的 DevContainer + errTxn := db.WithTx(ctx, func(ctx context.Context) error { + // 1.1 调用 model层，查询数据库，将 repoId 变换为 Repository 对象 + repositoryInDB, err := repo.GetRepositoryByID(ctx, opts.RepoId) + if err != nil || repositoryInDB == nil { + return devcontainer_service_errors.ErrIllegalParams{ + FieldNameList: []string{"opts.RepoId"}, + } + } + + // 1.2 直接尝试删除 DevContainer，若报错，则说明不存在 DevContainer + optsRepoDevcontainer := &DevcontainersVO.RepoDevcontainerOptions{ + Actor: opts.Actor, + Repository: repositoryInDB, + } + err = DevcontainersService.DeleteRepoDevcontainer(ctx, optsRepoDevcontainer) + if err != nil { + return devcontainer_service_errors.ErrDevcontainerNotFound{ + Actor: opts.Actor, + Repository: repositoryInDB, + } + } + + // 1.3 查询 DevContainer 成功，结束数据库事务 + return nil + }) + + // 2. 返回删除结果 + return errTxn +} diff --git a/services/devstar_devcontainer/api_services/OpenDevcontainerAPIService.go b/services/devstar_devcontainer/api_services/OpenDevcontainerAPIService.go new file mode 100644 index 0000000000..98ac8472d2 --- /dev/null +++ b/services/devstar_devcontainer/api_services/OpenDevcontainerAPIService.go @@ -0,0 +1,68 @@ +package api_services + +import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/repo" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" + gitea_web_context "code.gitea.io/gitea/services/context" + DevcontainersService "code.gitea.io/gitea/services/devstar_devcontainer" + devcontainer_service_errors "code.gitea.io/gitea/services/devstar_devcontainer/errors" + devcontainer_service_options "code.gitea.io/gitea/services/devstar_devcontainer/options" + "context" +) + +// OpenDevcontainerAPIService API 专用获取 DevContainer Service +func OpenDevcontainerAPIService(ctx *gitea_web_context.Context, opts *devcontainer_service_options.AbstractOpenDevcontainerOptions) (*DevcontainersVO.RepoDevContainerVO, error) { + // 0. 检查用户传入参数 + if ctx == nil || opts == nil || opts.Actor == nil || opts.RepoId <= 0 { + return nil, devcontainer_service_errors.ErrIllegalParams{ + FieldNameList: []string{"ctx", "opts", "opts.Actor", "opts.RepoId"}, + } + } + + var devcontainerDetails DevcontainersVO.RepoDevContainerVO + + // 1. 开启数据库事务，查询 某用户在某仓库的 DevContainer + errTxn := db.WithTx(ctx, func(ctx context.Context) error { + // 1.1 调用 model层，查询数据库，将 repoId 变换为 Repository 对象 + repositoryInDB, err := repo.GetRepositoryByID(ctx, opts.RepoId) + if err != nil || repositoryInDB == nil { + return devcontainer_service_errors.ErrIllegalParams{ + FieldNameList: []string{"opts.RepoId"}, + } + } + + // 1.2 检查该用户在该仓库 是否已经创建过 DevContainer + optsRepoDevcontainer := &DevcontainersVO.RepoDevcontainerOptions{ + Actor: opts.Actor, + Repository: repositoryInDB, + } + devcontainerDetails, err = DevcontainersService.GetRepoDevcontainerDetails(ctx, optsRepoDevcontainer) + if err != nil || devcontainerDetails.DevContainerId <= 0 { + return devcontainer_service_errors.ErrDevcontainerNotFound{ + Actor: opts.Actor, + Repository: repositoryInDB, + } + } + + // 1.3 查询 DevContainer 成功，结束数据库事务 + return nil + }) + if errTxn != nil { + return nil, errTxn + } + + // 2. 调用抽象层获取 DevContainer 最新状态（需要根据用户传入的 wait 参数决定是否要阻塞等待 DevContainer 就绪） + optsOpenDevcontainer := &devcontainer_service_options.OpenDevcontainerAppDispatcherOptions{ + Name: devcontainerDetails.DevContainerName, + Wait: opts.Wait, + } + openDevcontainerAbstractAgentVO, err := DevcontainersService.OpenDevcontainerService(ctx, optsOpenDevcontainer) + if err != nil { + return nil, err + } + + // 3. 更新VO，合并成为真正的 SSH连接信息 + devcontainerDetails.DevContainerPort = openDevcontainerAbstractAgentVO.NodePortAssigned + return &devcontainerDetails, nil +} diff --git a/services/devstar_devcontainer/dto/CreateDevcontainerDTO.go b/services/devstar_devcontainer/dto/CreateDevcontainerDTO.go new file mode 100644 index 0000000000..7fde187173 --- /dev/null +++ b/services/devstar_devcontainer/dto/CreateDevcontainerDTO.go @@ -0,0 +1,9 @@ +package dto + +import user_model "code.gitea.io/gitea/models/user" + +// CreateDevcontainerDTO 封装 API 创建 DevContainer 数据，即 router 层 POST /api/devcontainer 向下传递的数据结构 +type CreateDevcontainerDTO struct { + Actor *user_model.User + RepoId int64 +} diff --git a/services/devstar_devcontainer/errors/ErrDevcontainerAlreadyCreated.go b/services/devstar_devcontainer/errors/ErrDevcontainerAlreadyCreated.go new file mode 100644 index 0000000000..ed0be0ece8 --- /dev/null +++ b/services/devstar_devcontainer/errors/ErrDevcontainerAlreadyCreated.go @@ -0,0 +1,17 @@ +package errors + +import ( + "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/models/user" + "fmt" +) + +type ErrDevcontainerAlreadyCreated struct { + Actor *user.User + Repository *repo.Repository +} + +func (err ErrDevcontainerAlreadyCreated) Error() string { + return fmt.Sprintf("Failed to create DevContainer in repo '%s'(repoId = %d) by user '%s'(userId = %d), since it already exists.", + err.Repository.Name, err.Repository.ID, err.Actor.Name, err.Actor.ID) +} diff --git a/services/devstar_devcontainer/errors/ErrDevcontainerNotFound.go b/services/devstar_devcontainer/errors/ErrDevcontainerNotFound.go new file mode 100644 index 0000000000..56079c4997 --- /dev/null +++ b/services/devstar_devcontainer/errors/ErrDevcontainerNotFound.go @@ -0,0 +1,17 @@ +package errors + +import ( + "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/models/user" + "fmt" +) + +type ErrDevcontainerNotFound struct { + Actor *user.User + Repository *repo.Repository +} + +func (err ErrDevcontainerNotFound) Error() string { + return fmt.Sprintf("DevContainer NOT found in repo '%s'(repoId = %d) of user '%s'(userId = %d)", + err.Repository.Name, err.Repository.ID, err.Actor.Name, err.Actor.ID) +} diff --git a/services/devstar_devcontainer/errors/ErrFailedOperateDevcontainer.go b/services/devstar_devcontainer/errors/ErrFailedOperateDevcontainer.go new file mode 100644 index 0000000000..2c7139e1c0 --- /dev/null +++ b/services/devstar_devcontainer/errors/ErrFailedOperateDevcontainer.go @@ -0,0 +1,14 @@ +package errors + +import ( + "fmt" +) + +type ErrOperateDevcontainer struct { + Action string + Message string +} + +func (err ErrOperateDevcontainer) Error() string { + return fmt.Sprintf("Failed to %s in DevContainer Service: %s", err.Action, err.Message) +} diff --git a/services/devstar_devcontainer/errors/ErrIllegalParams.go b/services/devstar_devcontainer/errors/ErrIllegalParams.go new file mode 100644 index 0000000000..f8185a0488 --- /dev/null +++ b/services/devstar_devcontainer/errors/ErrIllegalParams.go @@ -0,0 +1,11 @@ +package errors + +import "fmt" + +type ErrIllegalParams struct { + FieldNameList []string +} + +func (err ErrIllegalParams) Error() string { + return fmt.Sprintf("Illegal Params: %v", err.FieldNameList) +} diff --git a/services/devstar_devcontainer/k8s_agent/AssignDevcontainerCreation2K8sOperator.go b/services/devstar_devcontainer/k8s_agent/AssignDevcontainerCreation2K8sOperator.go new file mode 100644 index 0000000000..e846b76068 --- /dev/null +++ b/services/devstar_devcontainer/k8s_agent/AssignDevcontainerCreation2K8sOperator.go @@ -0,0 +1,56 @@ +package k8s_agent + +import ( + devstar_devcontainer_models "code.gitea.io/gitea/models/devstar_devcontainer" + devcontainer_dto "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/dto" + "code.gitea.io/gitea/modules/setting" + "context" + apimachinery_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + devcontainer_k8s_agent_module "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent" +) + +// 补充笔记： modules/ 与 services/ 两个目录中的 k8s Agent 区别是什么？ +// - modules/ 与 k8s API Server 交互密切相关 +// - services/ 进行了封装，简化用户界面使用 + +// AssignDevcontainerCreation2K8sOperator 将 DevContainer 资源创建任务派遣至 k8s Operator，同时根据结果更新 NodePort +// +// 注意：本方法仍然在数据库事务中，因此不适合执行长时间操作，故需要后期异步判断 DevContainer 是否就绪 +func AssignDevcontainerCreation2K8sOperator(ctx *context.Context, newDevContainer *devstar_devcontainer_models.DevstarDevcontainer) error { + + // 1. 获取 Dynamic Client + client, err := devcontainer_k8s_agent_module.GetKubernetesClient(ctx) + if err != nil { + // 层层返回错误，结束数据库事务 + return err + } + + // 2. 调用 modules 层 k8s Agent，执行创建资源 + opts := &devcontainer_dto.CreateDevcontainerOptions{ + CreateOptions: apimachinery_meta_v1.CreateOptions{}, + Name: newDevContainer.Name, + Namespace: setting.Devstar.Devcontainer.Namespace, + // TODO: 后期根据 .devcontainer/devcontainer.json 或默认设置选项，指定 devContainer image 和 初始化命令 + Image: "mcr.microsoft.com/devcontainers/base:dev-ubuntu-20.04", + CommandList: []string{ + "/bin/bash", + "-c", + "echo 'root:root' | chpasswd && useradd -m -s /bin/bash username && echo 'username:password' | chpasswd && usermod -aG sudo username && apt-get update && apt-get install -y openssh-server && service ssh start && apt-get clean && tail -f /dev/null", + }, + ContainerPort: 22, + ServicePort: 22, + } + + // 2. 创建成功，取回集群中的 DevContainer + devcontainerInCluster, err := devcontainer_k8s_agent_module.CreateDevcontainer(ctx, client, opts) + if err != nil { + return err + } + + // 3. 将分配的 NodePort Service 写回 newDevcontainer，供写入数据库进行下一步操作 + newDevContainer.DevcontainerPort = devcontainerInCluster.Status.NodePortAssigned + + // 4. 层层返回 nil，自动提交数据库事务，完成 DevContainer 创建 + return nil +} diff --git a/services/devstar_devcontainer/k8s_agent/AssignDevcontainerDeletion2K8sOperator.go b/services/devstar_devcontainer/k8s_agent/AssignDevcontainerDeletion2K8sOperator.go new file mode 100644 index 0000000000..a9f292135b --- /dev/null +++ b/services/devstar_devcontainer/k8s_agent/AssignDevcontainerDeletion2K8sOperator.go @@ -0,0 +1,44 @@ +package k8s_agent + +import ( + devstar_devcontainer_models "code.gitea.io/gitea/models/devstar_devcontainer" + devcontainer_k8s_agent_module "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent" + devcontainer_dto "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/dto" + devcontainer_errors "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/errors" + "code.gitea.io/gitea/modules/setting" + "context" + "fmt" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// 补充笔记： modules/ 与 services/ 两个目录中的 k8s Agent 区别是什么？ +// - modules/ 与 k8s API Server 交互密切相关 +// - services/ 进行了封装，简化用户界面使用 + +func AssignDevcontainerDeletion2K8sOperator(ctx *context.Context, devcontainersList *[]devstar_devcontainer_models.DevstarDevcontainer) error { + + // 1. 获取 Dynamic Client + client, err := devcontainer_k8s_agent_module.GetKubernetesClient(ctx) + if err != nil { + // 层层返回错误，结束数据库事务 + return err + } + + // 2. 调用 modules 层 k8s Agent，执行删除资源 + opts := &devcontainer_dto.DeleteDevcontainerOptions{ + DeleteOptions: metav1.DeleteOptions{}, + Namespace: setting.Devstar.Devcontainer.Namespace, + } + if devcontainersList == nil || len(*devcontainersList) == 0 { + return devcontainer_errors.ErrOperateDevcontainer{ + Action: fmt.Sprintf("Delete DevContainer in namespace '%s'", opts.Namespace), + Message: "The DevContainer List is empty", + } + } + // 遍历列表删除 DevContainer，如果删除出错，交由 module 层打印日志，交由管理员手动处理 + for _, devcontainer := range *devcontainersList { + opts.Name = devcontainer.Name + _ = devcontainer_k8s_agent_module.DeleteDevcontainer(ctx, client, opts) + } + return nil +} diff --git a/services/devstar_devcontainer/k8s_agent/AssignDevcontainerGetting2K8sOperator.go b/services/devstar_devcontainer/k8s_agent/AssignDevcontainerGetting2K8sOperator.go new file mode 100644 index 0000000000..ca39f92196 --- /dev/null +++ b/services/devstar_devcontainer/k8s_agent/AssignDevcontainerGetting2K8sOperator.go @@ -0,0 +1,53 @@ +package k8s_agent + +import ( + devcontainer_k8s_agent_module "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent" + devcontainer_api_v1 "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/api/v1" + devcontainer_dto "code.gitea.io/gitea/modules/devstar_devcontainer/k8s_agent/dto" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/services/devstar_devcontainer/errors" + devcontainer_k8s_agent_errors "code.gitea.io/gitea/services/devstar_devcontainer/k8s_agent/errors" + devcontainer_service_options "code.gitea.io/gitea/services/devstar_devcontainer/options" + "context" + "fmt" + apimachinery_api_metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// AssignDevcontainerGetting2K8sOperator 获取 k8s CRD 资源 DevcontainerApp 最新状态（需要根据用户传入的 wait 参数决定是否要阻塞等待 DevContainer 就绪） +func AssignDevcontainerGetting2K8sOperator(ctx *context.Context, opts *devcontainer_service_options.OpenDevcontainerAppDispatcherOptions) (*devcontainer_api_v1.DevcontainerApp, error) { + + // 0. 检查参数 + if ctx == nil || opts == nil || len(opts.Name) == 0 { + return nil, devcontainer_k8s_agent_errors.ErrIllegalK8sAgentParams{ + FieldNameList: []string{"ctx", "opts", "opts.Name"}, + } + } + + // 1. 获取 Dynamic Client + client, err := devcontainer_k8s_agent_module.GetKubernetesClient(ctx) + if err != nil { + // 层层返回错误，结束数据库事务 + return nil, errors.ErrOperateDevcontainer{ + Action: "Connect to k8s API Server", + Message: err.Error(), + } + } + + // 2. 调用 modules 层 k8s Agent 获取 k8s CRD 资源 DevcontainerApp + optsGetDevcontainer := &devcontainer_dto.GetDevcontainerOptions{ + GetOptions: apimachinery_api_metav1.GetOptions{}, + Name: opts.Name, + Namespace: setting.Devstar.Devcontainer.Namespace, + Wait: opts.Wait, + } + devcontainerApp, err := devcontainer_k8s_agent_module.GetDevcontainer(ctx, client, optsGetDevcontainer) + if err != nil { + return nil, errors.ErrOperateDevcontainer{ + Action: fmt.Sprintf("Open Devcontainer '%s' (wait=%v)", opts.Name, opts.Wait), + Message: err.Error(), + } + } + + // 3. 成功获取最新的 DevcontainerApp，返回 + return devcontainerApp, nil +} diff --git a/services/devstar_devcontainer/k8s_agent/errors/ErrDeleteDevcontainers.go b/services/devstar_devcontainer/k8s_agent/errors/ErrDeleteDevcontainers.go new file mode 100644 index 0000000000..1ac7727090 --- /dev/null +++ b/services/devstar_devcontainer/k8s_agent/errors/ErrDeleteDevcontainers.go @@ -0,0 +1,14 @@ +package errors + +import ( + "fmt" +) + +type ErrDeleteDevcontainers struct { + NameList []string + Namespace string +} + +func (err ErrDeleteDevcontainers) Error() string { + return fmt.Sprintf("Failed to delete DevContainer(s) in namespace '%s': %v", err.Namespace, err.NameList) +} diff --git a/services/devstar_devcontainer/k8s_agent/errors/ErrIllegalK8sAgentParams.go b/services/devstar_devcontainer/k8s_agent/errors/ErrIllegalK8sAgentParams.go new file mode 100644 index 0000000000..8342e509e7 --- /dev/null +++ b/services/devstar_devcontainer/k8s_agent/errors/ErrIllegalK8sAgentParams.go @@ -0,0 +1,11 @@ +package errors + +import "fmt" + +type ErrIllegalK8sAgentParams struct { + FieldNameList []string +} + +func (err ErrIllegalK8sAgentParams) Error() string { + return fmt.Sprintf("Illegal Params: %v", err.FieldNameList) +} diff --git a/services/devstar_devcontainer/options/AbstractDeleteDevcontainerOptions.go b/services/devstar_devcontainer/options/AbstractDeleteDevcontainerOptions.go new file mode 100644 index 0000000000..7ad2694980 --- /dev/null +++ b/services/devstar_devcontainer/options/AbstractDeleteDevcontainerOptions.go @@ -0,0 +1,10 @@ +package options + +import ( + user_model "code.gitea.io/gitea/models/user" +) + +type AbstractDeleteDevcontainerOptions struct { + Actor *user_model.User // 当前操作用户实体 + RepoId int64 // 仓库ID，用于 API Service 层查询数据库 +} diff --git a/services/devstar_devcontainer/options/AbstractOpenDevcontainerOptions.go b/services/devstar_devcontainer/options/AbstractOpenDevcontainerOptions.go new file mode 100644 index 0000000000..e21878f3d2 --- /dev/null +++ b/services/devstar_devcontainer/options/AbstractOpenDevcontainerOptions.go @@ -0,0 +1,10 @@ +package options + +import user_model "code.gitea.io/gitea/models/user" + +// AbstractOpenDevcontainerOptions 封装 API 获取 DevContainer 数据，即 router 层 GET /api/devcontainer 向下传递的数据结构 +type AbstractOpenDevcontainerOptions struct { + Wait bool // 标记用户在API调用时候是否希望阻塞等待 DevContainer 就绪 + Actor *user_model.User // 当前操作用户实体 + RepoId int64 // 仓库ID，用于 API Service 层查询数据库 +} diff --git a/services/devstar_devcontainer/options/OpenDevcontainerAppDispatcherOptions.go b/services/devstar_devcontainer/options/OpenDevcontainerAppDispatcherOptions.go new file mode 100644 index 0000000000..dc984cf485 --- /dev/null +++ b/services/devstar_devcontainer/options/OpenDevcontainerAppDispatcherOptions.go @@ -0,0 +1,6 @@ +package options + +type OpenDevcontainerAppDispatcherOptions struct { + Name string `json:"name"` + Wait bool `json:"wait"` +} diff --git a/services/devstar_devcontainer/vo/OpenDevcontainerAbstractAgentVO.go b/services/devstar_devcontainer/vo/OpenDevcontainerAbstractAgentVO.go new file mode 100644 index 0000000000..4e476ba863 --- /dev/null +++ b/services/devstar_devcontainer/vo/OpenDevcontainerAbstractAgentVO.go @@ -0,0 +1,6 @@ +package vo + +// OpenDevcontainerAbstractAgentVO 封装查询 DevContainer 实时信息，与具体 agent 无关，返回前端 +type OpenDevcontainerAbstractAgentVO struct { + NodePortAssigned uint16 +} diff --git a/services/forms/devcontainer_form.go b/services/forms/devcontainer_form.go new file mode 100644 index 0000000000..95d30e5b21 --- /dev/null +++ b/services/forms/devcontainer_form.go @@ -0,0 +1,19 @@ +package forms + +import ( + "code.gitea.io/gitea/modules/web/middleware" + "code.gitea.io/gitea/services/context" + "gitea.com/go-chi/binding" + "net/http" +) + +// CreateRepoDevcontainerForm 用户使用 API 创建仓库 DevContainer POST 表单数据绑定与校验规则 +type CreateRepoDevcontainerForm struct { + RepoId string `json:"repoId" binding:"Required;MinSize(1);MaxSize(19);PositiveBase10IntegerNumberRule"` +} + +// Validate 用户使用 API 创建仓库 DevContainer POST 表单数据校验器 +func (f *CreateRepoDevcontainerForm) Validate(req *http.Request, errs binding.Errors) binding.Errors { + ctx := context.GetValidateContext(req) + return middleware.Validate(errs, ctx.Data, f, ctx.Locale) +} diff --git a/services/repository/repository.go b/services/repository/repository.go index 4290855cf9..0acc977dfa 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -4,7 +4,7 @@ package repository import ( - DevcontainersVO "code.gitea.io/gitea/routers/web/devcontainer/vo" + DevcontainersVO "code.gitea.io/gitea/routers/api/devcontainer/vo" DevcontainersService "code.gitea.io/gitea/services/devstar_devcontainer" "context" "fmt" diff --git a/templates/repo/devcontainer/details.tmpl b/templates/repo/devcontainer/details.tmpl index 8736cb5245..6cc5579ef9 100644 --- a/templates/repo/devcontainer/details.tmpl +++ b/templates/repo/devcontainer/details.tmpl @@ -33,14 +33,6 @@ - - Repo Name - {{.DevContainer.RepoName}} - - - Repo Description - {{.DevContainer.RepoDescription}} - DevContainer Name {{.DevContainer.DevContainerName}} @@ -49,24 +41,25 @@ Host {{.DevContainer.DevContainerHost}} - - Port - {{.DevContainer.DevContainerPort}} - Username {{.DevContainer.DevContainerUsername}} - - Password - {{.DevContainer.DevContainerPassword}} - Work Dir {{.DevContainer.DevContainerWorkDir}} + + Repo Name + {{.DevContainer.RepoName}} + + + Repo Description + {{.DevContainer.RepoDescription}} + +

*See GET /api/devcontainer with param 'repoId' and 'wait'

{{end}} @@ -87,7 +80,7 @@ {{end}} {{if not .HasValidDevContainerJSON}} -
{{svg "octicon-alert" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.dev_container_lack_of_config_prompt"}}
+
{{svg "octicon-alert" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.dev_container_invalid_config_prompt"}}
{{end}}