diff --git a/go.mod b/go.mod index dc7ff9c3..f026ff57 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1065 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1065 github.com/volcengine/volc-sdk-golang v1.0.189 - golang.org/x/crypto v0.31.0 + golang.org/x/crypto v0.32.0 golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 k8s.io/api v0.32.0 k8s.io/apimachinery v0.32.0 @@ -40,6 +40,13 @@ require ( ) require ( + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns v1.2.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 // indirect + github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect github.com/alibabacloud-go/openplatform-20191219/v2 v2.0.1 // indirect github.com/alibabacloud-go/tea-fileform v1.1.1 // indirect github.com/alibabacloud-go/tea-oss-sdk v1.1.3 // indirect @@ -57,14 +64,17 @@ require ( github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt/v5 v5.2.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/josharian/intern v1.0.0 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04 // indirect + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/technoweenie/multipartstreamer v1.0.1 // indirect github.com/volcengine/ve-tos-golang-sdk/v2 v2.7.8 // indirect @@ -164,14 +174,14 @@ require ( gocloud.dev v0.40.0 // indirect golang.org/x/image v0.23.0 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.33.0 // indirect + golang.org/x/net v0.34.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/sync v0.10.0 - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/term v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.8.0 // indirect - golang.org/x/tools v0.28.0 // indirect + golang.org/x/tools v0.29.0 // indirect golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect google.golang.org/api v0.214.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect diff --git a/go.sum b/go.sum index 6ba2fe6f..7986dd2d 100644 --- a/go.sum +++ b/go.sum @@ -51,6 +51,25 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= +github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 h1:JZg6HRh6W6U4OLl6lk7BZ7BLisIzM9dG1R50zUk9C/M= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0/go.mod h1:YL1xnZ6QejvQHWJrX/AvhFl4WW4rqHVoKspWNVwFk0M= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 h1:B/dfvscEQtew9dVuoxqxrUKKv8Ih2f55PydknDamU+g= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0/go.mod h1:fiPSssYvltE08HJchL04dOy+RD4hgrjph0cwGGMntdI= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns v1.2.0 h1:lpOxwrQ919lCZoNCd69rVt8u1eLZuMORrGXqy8sNf3c= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns v1.2.0/go.mod h1:fSvRkb8d26z9dbL40Uf/OO6Vo9iExtZK3D0ulRV+8M0= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0 h1:yzrctSl9GMIQ5lHu7jc8olOsGjWDCsBpJhWqfGa/YIM= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0/go.mod h1:GE4m0rnnfwLGX0Y9A9A25Zx5N/90jneT5ABevqzhuFQ= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 h1:zLzoX5+W2l95UJoVwiyNS4dX8vHyQ6x2xRLoBBL9wMk= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0/go.mod h1:wVEOJfGTj0oPAUGA1JuRAvz/lxXQsWW16axmHPP47Bk= +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/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5gYVyhkij+RTJ/VR6QIUaCfWeaFm2ycsjQ= +github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= @@ -394,9 +413,12 @@ github.com/gojek/heimdall/v7 v7.0.3/go.mod h1:Z43HtMid7ysSjmsedPTXAki6jcdcNVnjn5 github.com/gojek/valkyrie v0.0.0-20180215180059-6aee720afcdf h1:5xRGbUdOmZKoDXkGx5evVLehuCMpuO1hl701bEQqXOM= github.com/gojek/valkyrie v0.0.0-20180215180059-6aee720afcdf/go.mod h1:QzhUKaYKJmcbTnCYCAVQrroCOY7vOOI8cSQ4NbuhYf0= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= +github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= 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= @@ -588,6 +610,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61 h1:FwuzbVh87iLiUQj1+uQUsuw9x5t9m5n5g7rG7o4svW4= github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61/go.mod h1:paQfF1YtHe+GrGg5fOgjsjoCX/UKDr9bc1DoWpZfns8= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= @@ -684,6 +708,8 @@ github.com/pavlo-v-chernykh/keystore-go/v4 v4.5.0/go.mod h1:lAVhWwbNaveeJmxrxuST github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -902,6 +928,8 @@ golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOM golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1001,6 +1029,8 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= 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= @@ -1088,6 +1118,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1101,6 +1132,8 @@ golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.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-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -1115,6 +1148,8 @@ golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= 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= @@ -1195,6 +1230,8 @@ 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.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/applicant/providers.go b/internal/applicant/providers.go index 94bd8541..795afe08 100644 --- a/internal/applicant/providers.go +++ b/internal/applicant/providers.go @@ -8,7 +8,8 @@ import ( "github.com/usual2970/certimate/internal/domain" providerACMEHttpReq "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/acmehttpreq" providerAliyun "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/aliyun" - providerAWS "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/aws" + providerAWSRoute53 "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/aws-route53" + providerAzureDNS "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/azure-dns" providerCloudflare "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/cloudflare" providerGoDaddy "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/godaddy" providerHuaweiCloud "github.com/usual2970/certimate/internal/pkg/core/applicant/acme-dns-01/lego-providers/huaweicloud" @@ -65,7 +66,7 @@ func createApplicant(options *applicantOptions) (challenge.Provider, error) { return nil, fmt.Errorf("failed to decode provider access config: %w", err) } - applicant, err := providerAWS.NewChallengeProvider(&providerAWS.AWSApplicantConfig{ + applicant, err := providerAWSRoute53.NewChallengeProvider(&providerAWSRoute53.AWSRoute53ApplicantConfig{ AccessKeyId: access.AccessKeyId, SecretAccessKey: access.SecretAccessKey, Region: maps.GetValueAsString(options.ProviderApplyConfig, "region"), @@ -75,6 +76,23 @@ func createApplicant(options *applicantOptions) (challenge.Provider, error) { return applicant, err } + case domain.ApplyDNSProviderTypeAzureDNS: + { + access := domain.AccessConfigForAzure{} + if err := maps.Decode(options.ProviderAccessConfig, &access); err != nil { + return nil, fmt.Errorf("failed to decode provider access config: %w", err) + } + + applicant, err := providerAzureDNS.NewChallengeProvider(&providerAzureDNS.AzureDNSApplicantConfig{ + TenantId: access.TenantId, + ClientId: access.ClientId, + ClientSecret: access.ClientSecret, + CloudName: access.CloudName, + PropagationTimeout: options.PropagationTimeout, + }) + return applicant, err + } + case domain.ApplyDNSProviderTypeCloudflare: { access := domain.AccessConfigForCloudflare{} diff --git a/internal/domain/access.go b/internal/domain/access.go index b90405e6..a0eeb3df 100644 --- a/internal/domain/access.go +++ b/internal/domain/access.go @@ -40,6 +40,13 @@ type AccessConfigForAWS struct { SecretAccessKey string `json:"secretAccessKey"` } +type AccessConfigForAzure struct { + TenantId string `json:"tenantId"` + ClientId string `json:"clientId"` + ClientSecret string `json:"clientSecret"` + CloudName string `json:"cloudName,omitempty"` +} + type AccessConfigForBaiduCloud struct { AccessKeyId string `json:"accessKeyId"` SecretAccessKey string `json:"secretAccessKey"` diff --git a/internal/domain/provider.go b/internal/domain/provider.go index a6b254ec..5f60d861 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -12,6 +12,7 @@ const ( AccessProviderTypeACMEHttpReq = AccessProviderType("acmehttpreq") AccessProviderTypeAliyun = AccessProviderType("aliyun") AccessProviderTypeAWS = AccessProviderType("aws") + AccessProviderTypeAzure = AccessProviderType("azure") AccessProviderTypeBaiduCloud = AccessProviderType("baiducloud") AccessProviderTypeBytePlus = AccessProviderType("byteplus") AccessProviderTypeCloudflare = AccessProviderType("cloudflare") @@ -45,6 +46,7 @@ const ( ApplyDNSProviderTypeAliyunDNS = ApplyDNSProviderType("aliyun-dns") ApplyDNSProviderTypeAWS = ApplyDNSProviderType("aws") // 兼容旧值，等同于 [ApplyDNSProviderTypeAWSRoute53] ApplyDNSProviderTypeAWSRoute53 = ApplyDNSProviderType("aws-route53") + ApplyDNSProviderTypeAzureDNS = ApplyDNSProviderType("azure-dns") ApplyDNSProviderTypeCloudflare = ApplyDNSProviderType("cloudflare") ApplyDNSProviderTypeGoDaddy = ApplyDNSProviderType("godaddy") ApplyDNSProviderTypeHuaweiCloud = ApplyDNSProviderType("huaweicloud") // 兼容旧值，等同于 [ApplyDNSProviderTypeHuaweiCloudDNS] diff --git a/internal/pkg/core/applicant/acme-dns-01/lego-providers/aws/aws.go b/internal/pkg/core/applicant/acme-dns-01/lego-providers/aws-route53/aws-route53.go similarity index 86% rename from internal/pkg/core/applicant/acme-dns-01/lego-providers/aws/aws.go rename to internal/pkg/core/applicant/acme-dns-01/lego-providers/aws-route53/aws-route53.go index 1a207eee..bbd5a190 100644 --- a/internal/pkg/core/applicant/acme-dns-01/lego-providers/aws/aws.go +++ b/internal/pkg/core/applicant/acme-dns-01/lego-providers/aws-route53/aws-route53.go @@ -1,4 +1,4 @@ -package aws +package awsroute53 import ( "errors" @@ -8,7 +8,7 @@ import ( "github.com/go-acme/lego/v4/providers/dns/route53" ) -type AWSApplicantConfig struct { +type AWSRoute53ApplicantConfig struct { AccessKeyId string `json:"accessKeyId"` SecretAccessKey string `json:"secretAccessKey"` Region string `json:"region"` @@ -16,7 +16,7 @@ type AWSApplicantConfig struct { PropagationTimeout int32 `json:"propagationTimeout,omitempty"` } -func NewChallengeProvider(config *AWSApplicantConfig) (challenge.Provider, error) { +func NewChallengeProvider(config *AWSRoute53ApplicantConfig) (challenge.Provider, error) { if config == nil { return nil, errors.New("config is nil") } diff --git a/internal/pkg/core/applicant/acme-dns-01/lego-providers/azure-dns/azure-dns.go b/internal/pkg/core/applicant/acme-dns-01/lego-providers/azure-dns/azure-dns.go new file mode 100644 index 00000000..76389e8e --- /dev/null +++ b/internal/pkg/core/applicant/acme-dns-01/lego-providers/azure-dns/azure-dns.go @@ -0,0 +1,53 @@ +package azuredns + +import ( + "errors" + "fmt" + "strings" + "time" + + "github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud" + "github.com/go-acme/lego/v4/challenge" + "github.com/go-acme/lego/v4/providers/dns/azuredns" +) + +type AzureDNSApplicantConfig struct { + TenantId string `json:"tenantId"` + ClientId string `json:"clientId"` + ClientSecret string `json:"clientSecret"` + CloudName string `json:"cloudName,omitempty"` + PropagationTimeout int32 `json:"propagationTimeout,omitempty"` +} + +func NewChallengeProvider(config *AzureDNSApplicantConfig) (challenge.Provider, error) { + if config == nil { + return nil, errors.New("config is nil") + } + + providerConfig := azuredns.NewDefaultConfig() + providerConfig.TenantID = config.TenantId + providerConfig.ClientID = config.ClientId + providerConfig.ClientSecret = config.ClientSecret + if config.CloudName != "" { + switch strings.ToLower(config.CloudName) { + case "default", "public", "cloud", "azurecloud": + providerConfig.Environment = cloud.AzurePublic + case "usgovernment", "azureusgovernment": + providerConfig.Environment = cloud.AzureGovernment + case "china", "chinacloud", "azurechina", "azurechinacloud": + providerConfig.Environment = cloud.AzureChina + default: + return nil, fmt.Errorf("azuredns: unknown environment %s", config.CloudName) + } + } + if config.PropagationTimeout != 0 { + providerConfig.PropagationTimeout = time.Duration(config.PropagationTimeout) * time.Second + } + + provider, err := azuredns.NewDNSProviderConfig(providerConfig) + if err != nil { + return nil, err + } + + return provider, nil +} diff --git a/migrations/1736685828_updated_access.go b/migrations/1736685828_updated_access.go new file mode 100644 index 00000000..dc0fe496 --- /dev/null +++ b/migrations/1736685828_updated_access.go @@ -0,0 +1,111 @@ +package migrations + +import ( + "encoding/json" + + "github.com/pocketbase/dbx" + "github.com/pocketbase/pocketbase/daos" + m "github.com/pocketbase/pocketbase/migrations" + "github.com/pocketbase/pocketbase/models/schema" +) + +func init() { + m.Register(func(db dbx.Builder) error { + dao := daos.New(db); + + collection, err := dao.FindCollectionByNameOrId("4yzbv8urny5ja1e") + if err != nil { + return err + } + + // update + edit_provider := &schema.SchemaField{} + if err := json.Unmarshal([]byte(`{ + "system": false, + "id": "hwy7m03o", + "name": "provider", + "type": "select", + "required": false, + "presentable": false, + "unique": false, + "options": { + "maxSelect": 1, + "values": [ + "acmehttpreq", + "aliyun", + "aws", + "azure", + "baiducloud", + "byteplus", + "cloudflare", + "dogecloud", + "godaddy", + "huaweicloud", + "k8s", + "local", + "namedotcom", + "namesilo", + "powerdns", + "qiniu", + "ssh", + "tencentcloud", + "volcengine", + "webhook" + ] + } + }`), edit_provider); err != nil { + return err + } + collection.Schema.AddField(edit_provider) + + return dao.SaveCollection(collection) + }, func(db dbx.Builder) error { + dao := daos.New(db); + + collection, err := dao.FindCollectionByNameOrId("4yzbv8urny5ja1e") + if err != nil { + return err + } + + // update + edit_provider := &schema.SchemaField{} + if err := json.Unmarshal([]byte(`{ + "system": false, + "id": "hwy7m03o", + "name": "provider", + "type": "select", + "required": false, + "presentable": false, + "unique": false, + "options": { + "maxSelect": 1, + "values": [ + "acmehttpreq", + "aliyun", + "aws", + "baiducloud", + "byteplus", + "cloudflare", + "dogecloud", + "godaddy", + "huaweicloud", + "k8s", + "local", + "namedotcom", + "namesilo", + "powerdns", + "qiniu", + "ssh", + "tencentcloud", + "volcengine", + "webhook" + ] + } + }`), edit_provider); err != nil { + return err + } + collection.Schema.AddField(edit_provider) + + return dao.SaveCollection(collection) + }) +} diff --git a/ui/public/imgs/providers/azure.svg b/ui/public/imgs/providers/azure.svg new file mode 100644 index 00000000..01b62bc9 --- /dev/null +++ b/ui/public/imgs/providers/azure.svg @@ -0,0 +1 @@ + diff --git a/ui/src/components/access/AccessForm.tsx b/ui/src/components/access/AccessForm.tsx index 1c1e99c8..96f804ed 100644 --- a/ui/src/components/access/AccessForm.tsx +++ b/ui/src/components/access/AccessForm.tsx @@ -12,6 +12,7 @@ import { useAntdForm, useAntdFormName } from "@/hooks"; import AccessFormACMEHttpReqConfig from "./AccessFormACMEHttpReqConfig"; import AccessFormAWSConfig from "./AccessFormAWSConfig"; import AccessFormAliyunConfig from "./AccessFormAliyunConfig"; +import AccessFormAzureConfig from "./AccessFormAzureConfig"; import AccessFormBaiduCloudConfig from "./AccessFormBaiduCloudConfig"; import AccessFormBytePlusConfig from "./AccessFormBytePlusConfig"; import AccessFormCloudflareConfig from "./AccessFormCloudflareConfig"; @@ -87,6 +88,8 @@ const AccessForm = forwardRef(({ className, return ; case ACCESS_PROVIDERS.AWS: return ; + case ACCESS_PROVIDERS.AZURE: + return ; case ACCESS_PROVIDERS.BAIDUCLOUD: return ; case ACCESS_PROVIDERS.BYTEPLUS: diff --git a/ui/src/components/access/AccessFormAzureConfig.tsx b/ui/src/components/access/AccessFormAzureConfig.tsx new file mode 100644 index 00000000..954d47aa --- /dev/null +++ b/ui/src/components/access/AccessFormAzureConfig.tsx @@ -0,0 +1,101 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +import { type AccessConfigForAzure } from "@/domain/access"; + +type AccessFormAzureConfigFieldValues = Nullish; + +export type AccessFormAzureConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: AccessFormAzureConfigFieldValues; + onValuesChange?: (values: AccessFormAzureConfigFieldValues) => void; +}; + +const initFormModel = (): AccessFormAzureConfigFieldValues => { + return { + tenantId: "", + clientId: "", + clientSecret: "", + }; +}; + +const AccessFormAzureConfig = ({ form: formInst, formName, disabled, initialValues, onValuesChange }: AccessFormAzureConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + tenantId: z + .string() + .min(1, t("access.form.azure_tenant_id.placeholder")) + .max(64, t("common.errmsg.string_max", { max: 64 })) + .trim(), + clientId: z + .string() + .min(1, t("access.form.azure_client_id.placeholder")) + .max(64, t("common.errmsg.string_max", { max: 64 })) + .trim(), + clientSecret: z + .string() + .min(1, t("access.form.azure_client_secret.placeholder")) + .max(64, t("common.errmsg.string_max", { max: 64 })) + .trim(), + cloudName: z.string().nullish(), + }); + const formRule = createSchemaFieldRule(formSchema); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ } + > + + + + } + > + + + + } + > + + + + } + > + + +
+ ); +}; + +export default AccessFormAzureConfig; diff --git a/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx b/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx index 672d8621..67db24d2 100644 --- a/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx @@ -11,7 +11,7 @@ import MultipleInput from "@/components/MultipleInput"; import AccessEditModal from "@/components/access/AccessEditModal"; import AccessSelect from "@/components/access/AccessSelect"; import ApplyDNSProviderSelect from "@/components/provider/ApplyDNSProviderSelect"; -import { ACCESS_PROVIDERS, ACCESS_USAGES, APPLY_DNS_PROVIDERS, accessProvidersMap, applyDNSProvidersMap } from "@/domain/provider"; +import { ACCESS_USAGES, APPLY_DNS_PROVIDERS, accessProvidersMap, applyDNSProvidersMap } from "@/domain/provider"; import { type WorkflowNodeConfigForApply } from "@/domain/workflow"; import { useAntdForm, useAntdFormName, useZustandShallowSelector } from "@/hooks"; import { useAccessesStore } from "@/stores/access"; @@ -111,10 +111,10 @@ const ApplyNodeConfigForm = forwardRef; - case ACCESS_PROVIDERS.HUAWEICLOUD: + case APPLY_DNS_PROVIDERS.HUAWEICLOUD: case APPLY_DNS_PROVIDERS.HUAWEICLOUD_DNS: return ; } diff --git a/ui/src/domain/access.ts b/ui/src/domain/access.ts index 9cd7ad19..33002d83 100644 --- a/ui/src/domain/access.ts +++ b/ui/src/domain/access.ts @@ -11,6 +11,7 @@ export interface AccessModel extends BaseModel { | AccessConfigForACMEHttpReq | AccessConfigForAliyun | AccessConfigForAWS + | AccessConfigForAzure | AccessConfigForBaiduCloud | AccessConfigForBytePlus | AccessConfigForCloudflare @@ -47,8 +48,13 @@ export type AccessConfigForAliyun = { export type AccessConfigForAWS = { accessKeyId: string; secretAccessKey: string; - region?: string; - hostedZoneId?: string; +}; + +export type AccessConfigForAzure = { + tenantId: string; + clientId: string; + clientSecret: string; + environment?: string; }; export type AccessConfigForBaiduCloud = { @@ -78,7 +84,6 @@ export type AccessConfigForGoDaddy = { export type AccessConfigForHuaweiCloud = { accessKeyId: string; secretAccessKey: string; - region?: string; }; export type AccessConfigForKubernetes = { diff --git a/ui/src/domain/provider.ts b/ui/src/domain/provider.ts index d861d358..82eaeaa1 100644 --- a/ui/src/domain/provider.ts +++ b/ui/src/domain/provider.ts @@ -7,6 +7,7 @@ export const ACCESS_PROVIDERS = Object.freeze({ ACMEHTTPREQ: "acmehttpreq", ALIYUN: "aliyun", AWS: "aws", + AZURE: "azure", BAIDUCLOUD: "baiducloud", BYTEPLUS: "byteplus", CLOUDFLARE: "cloudflare", @@ -61,6 +62,7 @@ export const accessProvidersMap: Maphttps://go-acme.github.io/lego/dns/httpreq/", - "access.form.aliyun_access_key_id.label": "Aliyun AccessKeyID", - "access.form.aliyun_access_key_id.placeholder": "Please enter Aliyun AccessKeyID", + "access.form.aliyun_access_key_id.label": "Aliyun AccessKeyId", + "access.form.aliyun_access_key_id.placeholder": "Please enter Aliyun AccessKeyId", "access.form.aliyun_access_key_id.tooltip": "For more information, see https://www.alibabacloud.com/help/en/acr/create-and-obtain-an-accesskey-pair", "access.form.aliyun_access_key_secret.label": "Aliyun AccessKey Secret", "access.form.aliyun_access_key_secret.placeholder": "Please enter Aliyun AccessKey Secret", "access.form.aliyun_access_key_secret.tooltip": "For more information, see https://www.alibabacloud.com/help/en/acr/create-and-obtain-an-accesskey-pair", - "access.form.aws_access_key_id.label": "AWS AccessKeyID", - "access.form.aws_access_key_id.placeholder": "Please enter AWS AccessKeyID", + "access.form.aws_access_key_id.label": "AWS AccessKeyId", + "access.form.aws_access_key_id.placeholder": "Please enter AWS AccessKeyId", "access.form.aws_access_key_id.tooltip": "For more information, see https://docs.aws.amazon.com/en_us/IAM/latest/UserGuide/id_credentials_access-keys.html", "access.form.aws_secret_access_key.label": "AWS SecretAccessKey", "access.form.aws_secret_access_key.placeholder": "Please enter AWS SecretAccessKey", "access.form.aws_secret_access_key.tooltip": "For more information, see https://docs.aws.amazon.com/en_us/IAM/latest/UserGuide/id_credentials_access-keys.html", - "access.form.baiducloud_access_key_id.label": "Baidu Cloud AccessKeyID", - "access.form.baiducloud_access_key_id.placeholder": "Please enter Baidu Cloud AccessKeyID", + "access.form.azure_tenant_id.label": "Azure TenantId", + "access.form.azure_tenant_id.placeholder": "Please enter Azure TenantId", + "access.form.azure_tenant_id.tooltip": "For more information, see https://learn.microsoft.com/en-us/azure/azure-portal/get-subscription-tenant-id", + "access.form.azure_client_id.label": "Azure ClientId", + "access.form.azure_client_id.placeholder": "Please enter Azure ClientId", + "access.form.azure_client_id.tooltip": "For more information, see https://learn.microsoft.com/en-us/azure/azure-monitor/logs/api/register-app-for-token", + "access.form.azure_client_secret.label": "Azure ClientSecret", + "access.form.azure_client_secret.placeholder": "Please enter Azure ClientSecret", + "access.form.azure_client_secret.tooltip": "For more information, see https://learn.microsoft.com/en-us/azure/azure-monitor/logs/api/register-app-for-token", + "access.form.azure_cloud_name.label": "Azure sovereign cloud name (Optional)", + "access.form.azure_cloud_name.placeholder": "Please enter Azure sovereign cloud name (e.g. public)", + "access.form.azure_cloud_name.tooltip": "For more information, see https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/sovereign-clouds", + "access.form.baiducloud_access_key_id.label": "Baidu Cloud AccessKeyId", + "access.form.baiducloud_access_key_id.placeholder": "Please enter Baidu Cloud AccessKeyId", "access.form.baiducloud_access_key_id.tooltip": "For more information, see https://intl.cloud.baidu.com/doc/Reference/s/jjwvz2e3p-en", "access.form.baiducloud_secret_access_key.label": "Baidu Cloud SecretAccessKey", "access.form.baiducloud_secret_access_key.placeholder": "Please enter Baidu Cloud SecretAccessKey", @@ -72,8 +84,8 @@ "access.form.godaddy_api_secret.label": "GoDaddy API secret", "access.form.godaddy_api_secret.placeholder": "Please enter GoDaddy API secret", "access.form.godaddy_api_secret.tooltip": "For more information, see https://developer.godaddy.com/", - "access.form.huaweicloud_access_key_id.label": "Huawei Cloud AccessKeyID", - "access.form.huaweicloud_access_key_id.placeholder": "Please enter Huawei Cloud AccessKeyID", + "access.form.huaweicloud_access_key_id.label": "Huawei Cloud AccessKeyId", + "access.form.huaweicloud_access_key_id.placeholder": "Please enter Huawei Cloud AccessKeyId", "access.form.huaweicloud_access_key_id.tooltip": "For more information, see https://support.huaweicloud.com/intl/en-us/usermanual-ca/ca_01_0003.html", "access.form.huaweicloud_secret_access_key.label": "Huawei Cloud SecretAccessKey", "access.form.huaweicloud_secret_access_key.placeholder": "Please enter Huawei Cloud SecretAccessKey", @@ -109,8 +121,8 @@ "access.form.tencentcloud_secret_key.label": "Tencent Cloud SecretKey", "access.form.tencentcloud_secret_key.placeholder": "Please enter Tencent Cloud SecretKey", "access.form.tencentcloud_secret_key.tooltip": "For more information, see https://cloud.tencent.com/document/product/598/40488?lang=en", - "access.form.volcengine_access_key_id.label": "VolcEngine AccessKeyID", - "access.form.volcengine_access_key_id.placeholder": "Please enter VolcEngine AccessKeyID", + "access.form.volcengine_access_key_id.label": "VolcEngine AccessKeyId", + "access.form.volcengine_access_key_id.placeholder": "Please enter VolcEngine AccessKeyId", "access.form.volcengine_access_key_id.tooltip": "For more information, see https://www.volcengine.com/docs/6291/216571", "access.form.volcengine_secret_access_key.label": "VolcEngine SecretAccessKey", "access.form.volcengine_secret_access_key.placeholder": "Please enter VolcEngine SecretAccessKey", diff --git a/ui/src/i18n/locales/en/nls.common.json b/ui/src/i18n/locales/en/nls.common.json index 4f58723d..bdd8af47 100644 --- a/ui/src/i18n/locales/en/nls.common.json +++ b/ui/src/i18n/locales/en/nls.common.json @@ -46,6 +46,8 @@ "common.provider.aliyun.oss": "Alibaba Cloud - OSS", "common.provider.aws": "AWS", "common.provider.aws.route53": "AWS - Route53", + "common.provider.azure": "Azure", + "common.provider.azure.dns": "Azure - DNS", "common.provider.baiducloud": "Baidu Cloud", "common.provider.baiducloud.cdn": "Baidu Cloud - CDN", "common.provider.byteplus": "BytePlus", diff --git a/ui/src/i18n/locales/zh/nls.access.json b/ui/src/i18n/locales/zh/nls.access.json index b908f33e..342610af 100644 --- a/ui/src/i18n/locales/zh/nls.access.json +++ b/ui/src/i18n/locales/zh/nls.access.json @@ -33,20 +33,32 @@ "access.form.acmehttpreq_password.label": "HTTP 基本认证密码", "access.form.acmehttpreq_password.placeholder": "请输入 HTTP 基本认证密码", "access.form.acmehttpreq_password.tooltip": "这是什么？请参阅 https://go-acme.github.io/lego/dns/httpreq/", - "access.form.aliyun_access_key_id.label": "阿里云 AccessKeyID", - "access.form.aliyun_access_key_id.placeholder": "请输入阿里云 AccessKeyID", + "access.form.aliyun_access_key_id.label": "阿里云 AccessKeyId", + "access.form.aliyun_access_key_id.placeholder": "请输入阿里云 AccessKeyId", "access.form.aliyun_access_key_id.tooltip": "这是什么？请参阅 https://help.aliyun.com/zh/ram/user-guide/create-an-accesskey-pair", "access.form.aliyun_access_key_secret.label": "阿里云 AccessKey Secret", "access.form.aliyun_access_key_secret.placeholder": "请输入阿里云 AccessKey Secret", "access.form.aliyun_access_key_secret.tooltip": "这是什么？请参阅 https://help.aliyun.com/zh/ram/user-guide/create-an-accesskey-pair", - "access.form.aws_access_key_id.label": "AWS AccessKeyID", - "access.form.aws_access_key_id.placeholder": "请输入 AWS AccessKeyID", + "access.form.aws_access_key_id.label": "AWS AccessKeyId", + "access.form.aws_access_key_id.placeholder": "请输入 AWS AccessKeyId", "access.form.aws_access_key_id.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/IAM/latest/UserGuide/id_credentials_access-keys.html", "access.form.aws_secret_access_key.label": "AWS SecretAccessKey", "access.form.aws_secret_access_key.placeholder": "请输入 AWS SecretAccessKey", "access.form.aws_secret_access_key.tooltip": "这是什么？请参阅 https://docs.aws.amazon.com/zh_cn/IAM/latest/UserGuide/id_credentials_access-keys.html", - "access.form.baiducloud_access_key_id.label": "百度智能云 AccessKeyID", - "access.form.baiducloud_access_key_id.placeholder": "请输入百度智能云 AccessKeyID", + "access.form.azure_tenant_id.label": "Azure TenantId", + "access.form.azure_tenant_id.placeholder": "请输入 Azure TenantId", + "access.form.azure_tenant_id.tooltip": "这是什么？请参阅 https://learn.microsoft.com/zh-cn/azure/azure-portal/get-subscription-tenant-id", + "access.form.azure_client_id.label": "Azure ClientId", + "access.form.azure_client_id.placeholder": "请输入 Azure ClientId", + "access.form.azure_client_id.tooltip": "这是什么？请参阅 https://learn.microsoft.com/zh-cn/azure/azure-monitor/logs/api/register-app-for-token", + "access.form.azure_client_secret.label": "Azure ClientSecret", + "access.form.azure_client_secret.placeholder": "请输入 Azure ClientSecret", + "access.form.azure_client_secret.tooltip": "这是什么？请参阅 https://learn.microsoft.com/zh-cn/azure/azure-monitor/logs/api/register-app-for-token", + "access.form.azure_cloud_name.label": "Azure 主权云环境（可选）", + "access.form.azure_cloud_name.placeholder": "请输入 Azure 主权云环境（例如：public）", + "access.form.azure_cloud_name.tooltip": "这是什么？请参阅 https://learn.microsoft.com/zh-cn/azure/developer/azure-developer-cli/sovereign-clouds", + "access.form.baiducloud_access_key_id.label": "百度智能云 AccessKeyId", + "access.form.baiducloud_access_key_id.placeholder": "请输入百度智能云 AccessKeyId", "access.form.baiducloud_access_key_id.tooltip": "这是什么？请参阅 https://cloud.baidu.com/doc/Reference/s/jjwvz2e3p", "access.form.baiducloud_secret_access_key.label": "百度智能云 SecretAccessKey", "access.form.baiducloud_secret_access_key.placeholder": "请输入百度智能云 SecretAccessKey", @@ -72,8 +84,8 @@ "access.form.godaddy_api_secret.label": "GoDaddy API Secret", "access.form.godaddy_api_secret.placeholder": "请输入 GoDaddy API Secret", "access.form.godaddy_api_secret.tooltip": "这是什么？请参阅 https://developer.godaddy.com/", - "access.form.huaweicloud_access_key_id.label": "华为云 AccessKeyID", - "access.form.huaweicloud_access_key_id.placeholder": "请输入华为云 AccessKeyID", + "access.form.huaweicloud_access_key_id.label": "华为云 AccessKeyId", + "access.form.huaweicloud_access_key_id.placeholder": "请输入华为云 AccessKeyId", "access.form.huaweicloud_access_key_id.tooltip": "这是什么？请参阅 https://support.huaweicloud.com/usermanual-ca/ca_01_0003.html", "access.form.huaweicloud_secret_access_key.label": "华为云 SecretAccessKey", "access.form.huaweicloud_secret_access_key.placeholder": "请输入华为云 SecretAccessKey", @@ -109,8 +121,8 @@ "access.form.tencentcloud_secret_key.label": "腾讯云 SecretKey", "access.form.tencentcloud_secret_key.placeholder": "请输入腾讯云 SecretKey", "access.form.tencentcloud_secret_key.tooltip": "这是什么？请参阅 https://cloud.tencent.com/document/product/598/40488", - "access.form.volcengine_access_key_id.label": "火山引擎 AccessKeyID", - "access.form.volcengine_access_key_id.placeholder": "请输入火山引擎 AccessKeyID", + "access.form.volcengine_access_key_id.label": "火山引擎 AccessKeyId", + "access.form.volcengine_access_key_id.placeholder": "请输入火山引擎 AccessKeyId", "access.form.volcengine_access_key_id.tooltip": "这是什么？请参阅 https://www.volcengine.com/docs/6291/216571", "access.form.volcengine_secret_access_key.label": "火山引擎 SecretAccessKey", "access.form.volcengine_secret_access_key.placeholder": "请输入火山引擎 SecretAccessKey", diff --git a/ui/src/i18n/locales/zh/nls.common.json b/ui/src/i18n/locales/zh/nls.common.json index 7a5f3df2..7ad4c681 100644 --- a/ui/src/i18n/locales/zh/nls.common.json +++ b/ui/src/i18n/locales/zh/nls.common.json @@ -46,6 +46,8 @@ "common.provider.aliyun.oss": "阿里云 - 对象存储 OSS", "common.provider.aws": "AWS", "common.provider.aws.route53": "AWS - Route53", + "common.provider.azure": "Azure", + "common.provider.azure.dns": "Azure - DNS", "common.provider.baiducloud": "百度智能云", "common.provider.baiducloud.cdn": "百度智能云 - 内容分发网络 CDN", "common.provider.byteplus": "BytePlus",