From 0d27f1ef2eb896f87df4a9d6a060651858afd19f Mon Sep 17 00:00:00 2001 From: allanice001 Date: Sat, 28 Feb 2026 00:56:48 +0000 Subject: [PATCH] ui stuff and sdk allignment --- .gitignore | 7 ++- Makefile | 2 +- go.mod | 14 ++--- go.sum | 110 +++++----------------------------- ui/src/api/actions.ts | 4 +- ui/src/api/annotations.ts | 4 +- ui/src/api/archer_admin.ts | 2 +- ui/src/api/clusters.ts | 36 +++++------ ui/src/api/credentials.ts | 4 +- ui/src/api/dns.ts | 8 +-- ui/src/api/labels.ts | 4 +- ui/src/api/loadbalancers.ts | 4 +- ui/src/api/me.ts | 24 ++++---- ui/src/api/node_pools.ts | 12 ++-- ui/src/api/servers.ts | 4 +- ui/src/api/ssh.ts | 2 +- ui/src/api/taints.ts | 4 +- ui/src/auth/logout.ts | 2 +- ui/src/pages/me-page.tsx | 2 +- ui/src/pages/org/api-keys.tsx | 2 +- ui/src/pages/org/members.tsx | 62 ++++++++----------- ui/src/pages/org/settings.tsx | 2 +- 22 files changed, 110 insertions(+), 205 deletions(-) diff --git a/.gitignore b/.gitignore index 8b8f720..4c20b3a 100644 --- a/.gitignore +++ b/.gitignore @@ -139,4 +139,9 @@ notes.txt .terraform.lock* terraform.tfstate* -ui/src/sdk \ No newline at end of file +ui/src/sdk +sdk/ts/**/* +internal/web/dist +docs/docs.go +docs/openapi.json +docs/openapi.yaml \ No newline at end of file diff --git a/Makefile b/Makefile index a1b39e3..9cb4f20 100644 --- a/Makefile +++ b/Makefile @@ -204,7 +204,7 @@ swagger: $(DOCS_JSON) ## Generate Swagger docs if stale # --- build --- build: prepare ui swagger sdk-all ## Build everything: Go hygiene, UI, Swagger, SDKs, then Go binary @echo ">> Building Go binary: $(BIN)" - @$(GOCMD) get github.com/swaggo/swag/v2@v2.0.0-rc4 + @$(GOCMD) get github.com/swaggo/swag/v2@v2.0.0-rc5 @$(GOCMD) build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN) $(MAIN) # Handy: print resolved version metadata diff --git a/go.mod b/go.mod index 3e7d59c..415a626 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.19.10 github.com/aws/aws-sdk-go-v2/service/route53 v1.62.2 github.com/aws/aws-sdk-go-v2/service/s3 v1.96.2 - github.com/aws/smithy-go v1.24.1 + github.com/aws/smithy-go v1.24.2 github.com/coreos/go-oidc/v3 v3.17.0 github.com/dyaksa/archer v1.1.5 github.com/fergusstrange/embedded-postgres v1.33.0 @@ -35,7 +35,7 @@ require ( ) require ( - filippo.io/edwards25519 v1.1.0 // indirect + filippo.io/edwards25519 v1.1.1 // indirect github.com/BurntSushi/toml v1.1.0 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5 // indirect @@ -56,9 +56,8 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bytedance/sonic v1.14.0 // indirect github.com/bytedance/sonic/loader v0.3.0 // indirect - github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/gabriel-vasile/mimetype v1.4.12 // indirect @@ -91,20 +90,17 @@ require ( github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-sqlite3 v1.14.28 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mr-tron/base58 v1.2.0 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.1 // indirect - github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/quic-go v0.54.0 // indirect - github.com/rogpeppe/go-internal v1.13.1 // indirect github.com/sagikazarmark/locafero v0.11.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect @@ -128,5 +124,5 @@ require ( golang.org/x/text v0.34.0 // indirect golang.org/x/tools v0.41.0 // indirect google.golang.org/protobuf v1.36.9 // indirect - gorm.io/driver/mysql v1.5.7 // indirect + gorm.io/driver/mysql v1.5.6 // indirect ) diff --git a/go.sum b/go.sum index 105969e..30cc865 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= -filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw= +filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= @@ -10,130 +10,54 @@ github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5 h1:VauE2GcJNZFun2O github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5/go.mod h1:gxOHeajFfvGQh/fxlC8oOKBe23xnnJTif00IFFbiT+o= github.com/alexedwards/argon2id v1.0.0 h1:wJzDx66hqWX7siL/SRUmgz3F8YMrd/nfX/xHHcQQP0w= github.com/alexedwards/argon2id v1.0.0/go.mod h1:tYKkqIjzXvZdzPvADMWOEZ+l6+BD6CtBXMj5fnJppiw= -github.com/aws/aws-sdk-go-v2 v1.41.1 h1:ABlyEARCDLN034NhxlRUSZr4l71mh+T5KAeGh6cerhU= -github.com/aws/aws-sdk-go-v2 v1.41.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0= github.com/aws/aws-sdk-go-v2 v1.41.2 h1:LuT2rzqNQsauaGkPK/7813XxcZ3o3yePY0Iy891T2ls= github.com/aws/aws-sdk-go-v2 v1.41.2/go.mod h1:IvvlAZQXvTXznUPfRVfryiG1fbzE2NGK6m9u39YQ+S4= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5 h1:zWFmPmgw4sveAYi1mRqG+E/g0461cJ5M4bJ8/nc6d3Q= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5/go.mod h1:nVUlMLVV8ycXSb7mSkcNu9e3v/1TJq2RTlrPwhYWr5c= -github.com/aws/aws-sdk-go-v2/config v1.32.6 h1:hFLBGUKjmLAekvi1evLi5hVvFQtSo3GYwi+Bx4lpJf8= -github.com/aws/aws-sdk-go-v2/config v1.32.6/go.mod h1:lcUL/gcd8WyjCrMnxez5OXkO3/rwcNmvfno62tnXNcI= -github.com/aws/aws-sdk-go-v2/config v1.32.7 h1:vxUyWGUwmkQ2g19n7JY/9YL8MfAIl7bTesIUykECXmY= -github.com/aws/aws-sdk-go-v2/config v1.32.7/go.mod h1:2/Qm5vKUU/r7Y+zUk/Ptt2MDAEKAfUtKc1+3U1Mo3oY= -github.com/aws/aws-sdk-go-v2/config v1.32.9 h1:ktda/mtAydeObvJXlHzyGpK1xcsLaP16zfUPDGoW90A= -github.com/aws/aws-sdk-go-v2/config v1.32.9/go.mod h1:U+fCQ+9QKsLW786BCfEjYRj34VVTbPdsLP3CHSYXMOI= github.com/aws/aws-sdk-go-v2/config v1.32.10 h1:9DMthfO6XWZYLfzZglAgW5Fyou2nRI5CuV44sTedKBI= github.com/aws/aws-sdk-go-v2/config v1.32.10/go.mod h1:2rUIOnA2JaiqYmSKYmRJlcMWy6qTj1vuRFscppSBMcw= -github.com/aws/aws-sdk-go-v2/credentials v1.19.6 h1:F9vWao2TwjV2MyiyVS+duza0NIRtAslgLUM0vTA1ZaE= -github.com/aws/aws-sdk-go-v2/credentials v1.19.6/go.mod h1:SgHzKjEVsdQr6Opor0ihgWtkWdfRAIwxYzSJ8O85VHY= -github.com/aws/aws-sdk-go-v2/credentials v1.19.7 h1:tHK47VqqtJxOymRrNtUXN5SP/zUTvZKeLx4tH6PGQc8= -github.com/aws/aws-sdk-go-v2/credentials v1.19.7/go.mod h1:qOZk8sPDrxhf+4Wf4oT2urYJrYt3RejHSzgAquYeppw= -github.com/aws/aws-sdk-go-v2/credentials v1.19.9 h1:sWvTKsyrMlJGEuj/WgrwilpoJ6Xa1+KhIpGdzw7mMU8= -github.com/aws/aws-sdk-go-v2/credentials v1.19.9/go.mod h1:+J44MBhmfVY/lETFiKI+klz0Vym2aCmIjqgClMmW82w= github.com/aws/aws-sdk-go-v2/credentials v1.19.10 h1:EEhmEUFCE1Yhl7vDhNOI5OCL/iKMdkkYFTRpZXNw7m8= github.com/aws/aws-sdk-go-v2/credentials v1.19.10/go.mod h1:RnnlFCAlxQCkN2Q379B67USkBMu1PipEEiibzYN5UTE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 h1:80+uETIWS1BqjnN9uJ0dBUaETh+P1XwFy5vwHwK5r9k= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16/go.mod h1:wOOsYuxYuB/7FlnVtzeBYRcjSRtQpAW0hCP7tIULMwo= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 h1:I0GyV8wiYrP8XpA70g1HBcQO1JlQxCMTW9npl5UbDHY= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17/go.mod h1:tyw7BOl5bBe/oqvoIeECFJjMdzXoa/dfVz3QQ5lgHGA= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18 h1:Ii4s+Sq3yDfaMLpjrJsqD6SmG/Wq/P5L/hw2qa78UAY= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18/go.mod h1:6x81qnY++ovptLE6nWQeWrpXxbnlIex+4H4eYYGcqfc= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 h1:rgGwPzb82iBYSvHMHXc8h9mRoOUBZIGFgKb9qniaZZc= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16/go.mod h1:L/UxsGeKpGoIj6DxfhOWHWQ/kGKcd4I1VncE4++IyKA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 h1:xOLELNKGp2vsiteLsvLPwxC+mYmO6OZ8PYgiuPJzF8U= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17/go.mod h1:5M5CI3D12dNOtH3/mk6minaRwI2/37ifCURZISxA/IQ= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.18 h1:F43zk1vemYIqPAwhjTjYIz0irU2EY7sOb/F5eJ3HuyM= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.18/go.mod h1:w1jdlZXrGKaJcNoL+Nnrj+k5wlpGXqnNrKoP22HvAug= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 h1:1jtGzuV7c82xnqOVfx2F0xmJcOw5374L7N6juGW6x6U= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16/go.mod h1:M2E5OQf+XLe+SZGmmpaI2yy+J326aFf6/+54PoxSANc= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 h1:WWLqlh79iO48yLkj1v3ISRNiv+3KdQoZ6JWyfcsyQik= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17/go.mod h1:EhG22vHRrvF8oXSTYStZhJc1aUgKtnJe+aOiFEV90cM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.18 h1:xCeWVjj0ki0l3nruoyP2slHsGArMxeiiaoPN5QZH6YQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.18/go.mod h1:r/eLGuGCBw6l36ZRWiw6PaZwPXb6YOj+i/7MizNl5/k= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17 h1:JqcdRG//czea7Ppjb+g/n4o8i/R50aTBHkA7vu0lK+k= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17/go.mod h1:CO+WeGmIdj/MlPel2KwID9Gt7CNq4M65HUfBW97liM0= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.18 h1:eZioDaZGJ0tMM4gzmkNIO2aAoQd+je7Ug7TkvAzlmkU= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.18/go.mod h1:CCXwUKAJdoWr6/NcxZ+zsiPr6oH/Q5aTooRGYieAyj4= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5 h1:CeY9LUdur+Dxoeldqoun6y4WtJ3RQtzk0JMP2gfUay0= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5/go.mod h1:AZLZf2fMaahW5s/wMRciu1sYbdsikT/UHwbUjOdEVTc= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 h1:DIBqIrJ7hv+e4CmIk2z3pyKT+3B6qVMgRsawHiR3qso= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7/go.mod h1:vLm00xmBke75UmpNvOcZQ/Q30ZFjbczeLFqGx5urmGo= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8 h1:Z5EiPIzXKewUQK0QTMkutjiaPVeVYXX7KIqhXu/0fXs= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8/go.mod h1:FsTpJtvC4U1fyDXk7c71XoDv3HlRm8V3NiYLeYLh5YE= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.10 h1:fJvQ5mIBVfKtiyx0AHY6HeWcRX5LGANLpq8SVR+Uazs= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.10/go.mod h1:Kzm5e6OmNH8VMkgK9t+ry5jEih4Y8whqs+1hrkxim1I= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 h1:oHjJHeUy0ImIV0bsrX0X91GkV5nJAyv1l1CC9lnO0TI= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16/go.mod h1:iRSNGgOYmiYwSCXxXaKb9HfOEj40+oTKn8pTxMlYkRM= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 h1:RuNSMoozM8oXlgLG/n6WLaFGoea7/CddrCfIiSA+xdY= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17/go.mod h1:F2xxQ9TZz5gDWsclCtPQscGpP0VUOc8RqgFM3vDENmU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18 h1:LTRCYFlnnKFlKsyIQxKhJuDuA3ZkrDQMRYm6rXiHlLY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18/go.mod h1:XhwkgGG6bHSd00nO/mexWTcTjgd6PjuvWQMqSn2UaEk= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 h1:NSbvS17MlI2lurYgXnCOLvCFX38sBW4eiVER7+kkgsU= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16/go.mod h1:SwT8Tmqd4sA6G1qaGdzWCJN99bUmPGHfRwwq3G5Qb+A= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17 h1:bGeHBsGZx0Dvu/eJC0Lh9adJa3M1xREcndxLNZlve2U= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17/go.mod h1:dcW24lbU0CzHusTE8LLHhRLI42ejmINN8Lcr22bwh/g= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.18 h1:/A/xDuZAVD2BpsS2fftFRo/NoEKQJ8YTnJDEHBy2Gtg= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.18/go.mod h1:hWe9b4f+djUQGmyiGEeOnZv69dtMSgpDRIvNMvuvzvY= -github.com/aws/aws-sdk-go-v2/service/route53 v1.62.0 h1:80pDB3Tpmb2RCSZORrK9/3iQxsd+w6vSzVqpT1FGiwE= -github.com/aws/aws-sdk-go-v2/service/route53 v1.62.0/go.mod h1:6EZUGGNLPLh5Unt30uEoA+KQcByERfXIkax9qrc80nA= -github.com/aws/aws-sdk-go-v2/service/route53 v1.62.1 h1:1jIdwWOulae7bBLIgB36OZ0DINACb1wxM6wdGlx4eHE= -github.com/aws/aws-sdk-go-v2/service/route53 v1.62.1/go.mod h1:tE2zGlMIlxWv+7Otap7ctRp3qeKqtnja7DZguj3Vu/Y= github.com/aws/aws-sdk-go-v2/service/route53 v1.62.2 h1:zoD/SoiVQi8l8tuQn//VexrXS2yorg/+717JNA4Ble8= github.com/aws/aws-sdk-go-v2/service/route53 v1.62.2/go.mod h1:Ll1DCasPTBFtHK5t/U5WIwGIyRuY3xY+x8/LmqIlqpM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.95.0 h1:MIWra+MSq53CFaXXAywB2qg9YvVZifkk6vEGl/1Qor0= -github.com/aws/aws-sdk-go-v2/service/s3 v1.95.0/go.mod h1:79S2BdqCJpScXZA2y+cpZuocWsjGjJINyXnOsf5DTz8= -github.com/aws/aws-sdk-go-v2/service/s3 v1.95.1 h1:C2dUPSnEpy4voWFIq3JNd8gN0Y5vYGDo44eUE58a/p8= -github.com/aws/aws-sdk-go-v2/service/s3 v1.95.1/go.mod h1:5jggDlZ2CLQhwJBiZJb4vfk4f0GxWdEDruWKEJ1xOdo= -github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0 h1:oeu8VPlOre74lBA/PMhxa5vewaMIMmILM+RraSyB8KA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0/go.mod h1:5jggDlZ2CLQhwJBiZJb4vfk4f0GxWdEDruWKEJ1xOdo= github.com/aws/aws-sdk-go-v2/service/s3 v1.96.2 h1:M1A9AjcFwlxTLuf0Faj88L8Iqw0n/AJHjpZTQzMMsSc= github.com/aws/aws-sdk-go-v2/service/s3 v1.96.2/go.mod h1:KsdTV6Q9WKUZm2mNJnUFmIoXfZux91M3sr/a4REX8e0= -github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 h1:HpI7aMmJ+mm1wkSHIA2t5EaFFv5EFYXePW30p1EIrbQ= -github.com/aws/aws-sdk-go-v2/service/signin v1.0.4/go.mod h1:C5RdGMYGlfM0gYq/tifqgn4EbyX99V15P2V3R+VHbQU= -github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 h1:VrhDvQib/i0lxvr3zqlUwLwJP4fpmpyD9wYG1vfSu+Y= -github.com/aws/aws-sdk-go-v2/service/signin v1.0.5/go.mod h1:k029+U8SY30/3/ras4G/Fnv/b88N4mAfliNn08Dem4M= github.com/aws/aws-sdk-go-v2/service/signin v1.0.6 h1:MzORe+J94I+hYu2a6XmV5yC9huoTv8NRcCrUNedDypQ= github.com/aws/aws-sdk-go-v2/service/signin v1.0.6/go.mod h1:hXzcHLARD7GeWnifd8j9RWqtfIgxj4/cAtIVIK7hg8g= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 h1:aM/Q24rIlS3bRAhTyFurowU8A0SMyGDtEOY/l/s/1Uw= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.8/go.mod h1:+fWt2UHSb4kS7Pu8y+BMBvJF0EWx+4H0hzNwtDNRTrg= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 h1:v6EiMvhEYBoHABfbGB4alOYmCIrcgyPPiBE1wZAEbqk= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.9/go.mod h1:yifAsgBxgJWn3ggx70A3urX2AN49Y5sJTD1UQFlfqBw= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.10 h1:+VTRawC4iVY58pS/lzpo0lnoa/SYNGF4/B/3/U5ro8Y= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.10/go.mod h1:yifAsgBxgJWn3ggx70A3urX2AN49Y5sJTD1UQFlfqBw= github.com/aws/aws-sdk-go-v2/service/sso v1.30.11 h1:7oGD8KPfBOJGXiCoRKrrrQkbvCp8N++u36hrLMPey6o= github.com/aws/aws-sdk-go-v2/service/sso v1.30.11/go.mod h1:0DO9B5EUJQlIDif+XJRWCljZRKsAFKh3gpFz7UnDtOo= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 h1:AHDr0DaHIAo8c9t1emrzAlVDFp+iMMKnPdYy6XO4MCE= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12/go.mod h1:GQ73XawFFiWxyWXMHWfhiomvP3tXtdNar/fi8z18sx0= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 h1:gd84Omyu9JLriJVCbGApcLzVR3XtmC4ZDPcAI6Ftvds= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13/go.mod h1:sTGThjphYE4Ohw8vJiRStAcu3rbjtXRsdNB0TvZ5wwo= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.14 h1:0jbJeuEHlwKJ9PfXtpSFc4MF+WIWORdhN1n30ITZGFM= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.14/go.mod h1:sTGThjphYE4Ohw8vJiRStAcu3rbjtXRsdNB0TvZ5wwo= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15 h1:edCcNp9eGIUDUCrzoCu1jWAXLGFIizeqkdkKgRlJwWc= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15/go.mod h1:lyRQKED9xWfgkYC/wmmYfv7iVIM68Z5OQ88ZdcV1QbU= -github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 h1:SciGFVNZ4mHdm7gpD1dgZYnCuVdX1s+lFTg4+4DOy70= -github.com/aws/aws-sdk-go-v2/service/sts v1.41.5/go.mod h1:iW40X4QBmUxdP+fZNOpfmkdMZqsovezbAeO+Ubiv2pk= -github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 h1:5fFjR/ToSOzB2OQ/XqWpZBmNvmP/pJ1jOWYlFDJTjRQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.41.6/go.mod h1:qgFDZQSD/Kys7nJnVqYlWKnh0SSdMjAi0uSwON4wgYQ= github.com/aws/aws-sdk-go-v2/service/sts v1.41.7 h1:NITQpgo9A5NrDZ57uOWj+abvXSb83BbyggcUBVksN7c= github.com/aws/aws-sdk-go-v2/service/sts v1.41.7/go.mod h1:sks5UWBhEuWYDPdwlnRFn1w7xWdH29Jcpe+/PJQefEs= -github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk= -github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0= -github.com/aws/smithy-go v1.24.1 h1:VbyeNfmYkWoxMVpGUAbQumkODcYmfMRfZ8yQiH30SK0= -github.com/aws/smithy-go v1.24.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0= +github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng= +github.com/aws/smithy-go v1.24.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ= github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA= github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA= github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= -github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= -github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= github.com/coreos/go-oidc/v3 v3.17.0 h1:hWBGaQfbi0iVviX4ibC7bk8OKT5qNr4klBaCHVNvehc= @@ -142,9 +66,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a h1:saTgr5tMLFnmy/yg3qDTft4rE5DY2uJ/cCxCe3q0XTU= github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a/go.mod h1:Bw9BbhOJVNR+t0jCqx2GC6zv0TGBsShs56Y3gfSCvl0= github.com/dyaksa/archer v1.1.5 h1:e9ZrR8PnMYEax19Fd+QbvQqDL5cbi78luMEtaSAIHxU= @@ -263,8 +186,8 @@ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A= -github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/microsoft/go-mssqldb v1.7.2 h1:CHkFJiObW7ItKTJfHo1QX7QBBD1iV+mn1eOyRP3b/PA= github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -280,13 +203,12 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= -github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= @@ -295,8 +217,8 @@ github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg= github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ= @@ -441,8 +363,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/datatypes v1.2.7 h1:ww9GAhF1aGXZY3EB3cJPJ7//JiuQo7DlQA7NNlVaTdk= gorm.io/datatypes v1.2.7/go.mod h1:M2iO+6S3hhi4nAyYe444Pcb0dcIiOMJ7QHaUXxyiNZY= -gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo= -gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM= +gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8= +gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM= gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= diff --git a/ui/src/api/actions.ts b/ui/src/api/actions.ts index 40a55b0..1d88b20 100644 --- a/ui/src/api/actions.ts +++ b/ui/src/api/actions.ts @@ -11,14 +11,14 @@ export const actionsApi = { createAction: (body: DtoCreateActionRequest) => withRefresh(async () => { return await actions.createAction({ - dtoCreateActionRequest: body, + createActionRequest: body, }) }), updateAction: (id: string, body: DtoUpdateActionRequest) => withRefresh(async () => { return await actions.updateAction({ actionID: id, - dtoUpdateActionRequest: body, + updateActionRequest: body, }) }), deleteAction: (id: string) => diff --git a/ui/src/api/annotations.ts b/ui/src/api/annotations.ts index 9041a89..25b2698 100644 --- a/ui/src/api/annotations.ts +++ b/ui/src/api/annotations.ts @@ -11,7 +11,7 @@ export const annotationsApi = { createAnnotation: (body: DtoCreateAnnotationRequest) => withRefresh(async () => { return await annotations.createAnnotation({ - dtoCreateAnnotationRequest: body, + createAnnotationRequest: body, }) }), getAnnotation: (id: string) => @@ -26,7 +26,7 @@ export const annotationsApi = { withRefresh(async () => { return await annotations.updateAnnotation({ id, - dtoUpdateAnnotationRequest: body, + updateAnnotationRequest: body, }) }), } diff --git a/ui/src/api/archer_admin.ts b/ui/src/api/archer_admin.ts index 363a35d..b1dbbcf 100644 --- a/ui/src/api/archer_admin.ts +++ b/ui/src/api/archer_admin.ts @@ -17,7 +17,7 @@ export const archerAdminApi = { run_at?: string }) => { return withRefresh(async () => { - return await archerAdmin.adminEnqueueArcherJob({ dtoEnqueueRequest: body }) + return await archerAdmin.adminEnqueueArcherJob({ adminEnqueueArcherJobRequest: body }) }) }, retryJob: (id: string) => { diff --git a/ui/src/api/clusters.ts b/ui/src/api/clusters.ts index a6713b4..8bab5d8 100644 --- a/ui/src/api/clusters.ts +++ b/ui/src/api/clusters.ts @@ -1,14 +1,10 @@ -import { withRefresh } from "@/api/with-refresh" -import type { - DtoAttachBastionRequest, - DtoAttachCaptainDomainRequest, - DtoAttachLoadBalancerRequest, - DtoAttachRecordSetRequest, - DtoCreateClusterRequest, - DtoSetKubeconfigRequest, - DtoUpdateClusterRequest, -} from "@/sdk" -import { makeClusterApi, makeClusterRunsApi } from "@/sdkClient" +import { withRefresh } from "@/api/with-refresh"; +import type { DtoAttachBastionRequest, DtoAttachCaptainDomainRequest, DtoAttachLoadBalancerRequest, DtoAttachRecordSetRequest, DtoCreateClusterRequest, DtoSetKubeconfigRequest, DtoUpdateClusterRequest } from "@/sdk"; +import { makeClusterApi, makeClusterRunsApi } from "@/sdkClient"; + + + + const clusters = makeClusterApi() const clusterRuns = makeClusterRunsApi() @@ -29,7 +25,7 @@ export const clustersApi = { createCluster: (body: DtoCreateClusterRequest) => withRefresh(async () => { return await clusters.createCluster({ - dtoCreateClusterRequest: body, + createClusterRequest: body, }) }), @@ -37,7 +33,7 @@ export const clustersApi = { withRefresh(async () => { return await clusters.updateCluster({ clusterID: id, - dtoUpdateClusterRequest: body, + updateClusterRequest: body, }) }), @@ -52,7 +48,7 @@ export const clustersApi = { withRefresh(async () => { return await clusters.setClusterKubeconfig({ clusterID, - dtoSetKubeconfigRequest: body, + setClusterKubeconfigRequest: body, }) }), @@ -67,7 +63,7 @@ export const clustersApi = { withRefresh(async () => { return await clusters.attachCaptainDomain({ clusterID, - dtoAttachCaptainDomainRequest: body, + attachCaptainDomainRequest: body, }) }), @@ -82,7 +78,7 @@ export const clustersApi = { withRefresh(async () => { return await clusters.attachControlPlaneRecordSet({ clusterID, - dtoAttachRecordSetRequest: body, + attachControlPlaneRecordSetRequest: body, }) }), @@ -97,7 +93,7 @@ export const clustersApi = { withRefresh(async () => { return await clusters.attachAppsLoadBalancer({ clusterID, - dtoAttachLoadBalancerRequest: body, + attachAppsLoadBalancerRequest: body, }) }), @@ -110,7 +106,7 @@ export const clustersApi = { withRefresh(async () => { return await clusters.attachGlueOpsLoadBalancer({ clusterID, - dtoAttachLoadBalancerRequest: body, + attachAppsLoadBalancerRequest: body, }) }), @@ -125,7 +121,7 @@ export const clustersApi = { withRefresh(async () => { return await clusters.attachBastionServer({ clusterID, - dtoAttachBastionRequest: body, + attachBastionServerRequest: body, }) }), @@ -140,7 +136,7 @@ export const clustersApi = { withRefresh(async () => { return await clusters.attachNodePool({ clusterID, - dtoAttachNodePoolRequest: { node_pool_id: nodePoolID }, + attachNodePoolRequest: { node_pool_id: nodePoolID }, }) }), diff --git a/ui/src/api/credentials.ts b/ui/src/api/credentials.ts index 92221e7..169fc31 100644 --- a/ui/src/api/credentials.ts +++ b/ui/src/api/credentials.ts @@ -11,7 +11,7 @@ export const credentialsApi = { }), createCredential: async (body: DtoCreateCredentialRequest) => withRefresh(async () => { - return await credentials.createCredential({ dtoCreateCredentialRequest: body }) + return await credentials.createCredential({ createCredentialRequest: body }) }), getCredential: async (id: string) => withRefresh(async () => { @@ -23,7 +23,7 @@ export const credentialsApi = { }), updateCredential: async (id: string, body: DtoUpdateCredentialRequest) => withRefresh(async () => { - return await credentials.updateCredential({ id, dtoUpdateCredentialRequest: body }) + return await credentials.updateCredential({ id, updateCredentialRequest: body }) }), revealCredential: async (id: string) => withRefresh(async () => { diff --git a/ui/src/api/dns.ts b/ui/src/api/dns.ts index a92ea6e..5008ceb 100644 --- a/ui/src/api/dns.ts +++ b/ui/src/api/dns.ts @@ -20,11 +20,11 @@ export const dnsApi = { }), createDomain: async (body: DtoCreateDomainRequest) => withRefresh(async () => { - return await dns.createDomain({ dtoCreateDomainRequest: body }) + return await dns.createDomain({ createDomainRequest: body }) }), updateDomain: async (id: string, body: DtoUpdateDomainRequest) => withRefresh(async () => { - return await dns.updateDomain({ id, dtoUpdateDomainRequest: body }) + return await dns.updateDomain({ id, updateDomainRequest: body }) }), deleteDomain: async (id: string) => withRefresh(async () => { @@ -36,11 +36,11 @@ export const dnsApi = { }), createRecordSetsByDomain: async (domainId: string, body: DtoCreateRecordSetRequest) => withRefresh(async () => { - return await dns.createRecordSet({ domainId, dtoCreateRecordSetRequest: body }) + return await dns.createRecordSet({ domainId, createRecordSetRequest: body }) }), updateRecordSetsByDomain: async (id: string, body: DtoUpdateRecordSetRequest) => withRefresh(async () => { - return await dns.updateRecordSet({ id, dtoUpdateRecordSetRequest: body }) + return await dns.updateRecordSet({ id, updateRecordSetRequest: body }) }), deleteRecordSetsByDomain: async (id: string) => withRefresh(async () => { diff --git a/ui/src/api/labels.ts b/ui/src/api/labels.ts index 37708ec..538e8a0 100644 --- a/ui/src/api/labels.ts +++ b/ui/src/api/labels.ts @@ -11,7 +11,7 @@ export const labelsApi = { }), createLabel: (body: DtoCreateLabelRequest) => withRefresh(async () => { - return await labels.createLabel({ dtoCreateLabelRequest: body }) + return await labels.createLabel({ createLabelRequest: body }) }), getLabel: (id: string) => withRefresh(async () => { @@ -23,6 +23,6 @@ export const labelsApi = { }), updateLabel: (id: string, body: DtoUpdateLabelRequest) => withRefresh(async () => { - return await labels.updateLabel({ id, dtoUpdateLabelRequest: body }) + return await labels.updateLabel({ id, updateLabelRequest: body }) }), } diff --git a/ui/src/api/loadbalancers.ts b/ui/src/api/loadbalancers.ts index 0259820..26b89b6 100644 --- a/ui/src/api/loadbalancers.ts +++ b/ui/src/api/loadbalancers.ts @@ -15,14 +15,14 @@ export const loadBalancersApi = { createLoadBalancer: (body: DtoCreateLoadBalancerRequest) => withRefresh(async () => { return await loadBalancers.createLoadBalancer({ - dtoCreateLoadBalancerRequest: body, + createLoadBalancerRequest: body, }) }), updateLoadBalancer: (id: string, body: DtoUpdateLoadBalancerRequest) => withRefresh(async () => { return await loadBalancers.updateLoadBalancer({ id, - dtoUpdateLoadBalancerRequest: body, + updateLoadBalancerRequest: body, }) }), deleteLoadBalancer: (id: string) => diff --git a/ui/src/api/me.ts b/ui/src/api/me.ts index 85e18c3..a0a4a1a 100644 --- a/ui/src/api/me.ts +++ b/ui/src/api/me.ts @@ -1,25 +1,25 @@ -import { withRefresh } from "@/api/with-refresh.ts" -import type { - HandlersCreateUserKeyRequest, - HandlersMeResponse, - HandlersUpdateMeRequest, - HandlersUserAPIKeyOut, - ModelsUser, -} from "@/sdk" -import { makeMeApi, makeMeKeysApi } from "@/sdkClient.ts" +import { withRefresh } from "@/api/with-refresh.ts"; +import type { HandlersCreateUserKeyRequest, HandlersMeResponse, HandlersUpdateMeRequest, HandlersUserAPIKeyOut, ModelsUser } from "@/sdk"; +import { makeMeApi, makeMeKeysApi } from "@/sdkClient.ts"; + + + + const me = makeMeApi() const keys = makeMeKeysApi() +export type MeResponse = HandlersMeResponse & ModelsUser + export const meApi = { getMe: () => - withRefresh(async (): Promise => { + withRefresh(async (): Promise => { return await me.getMe() }), updateMe: (body: HandlersUpdateMeRequest) => withRefresh(async (): Promise => { - return await me.updateMe({ handlersUpdateMeRequest: body }) + return await me.updateMe({ updateMeRequest: body }) }), listKeys: () => @@ -29,7 +29,7 @@ export const meApi = { createKey: (body: HandlersCreateUserKeyRequest) => withRefresh(async (): Promise => { - return await keys.createUserAPIKey({ handlersCreateUserKeyRequest: body }) + return await keys.createUserAPIKey({ createUserAPIKeyRequest: body }) }), deleteKey: (id: string) => diff --git a/ui/src/api/node_pools.ts b/ui/src/api/node_pools.ts index b273fcc..a2b8fdc 100644 --- a/ui/src/api/node_pools.ts +++ b/ui/src/api/node_pools.ts @@ -22,7 +22,7 @@ export const nodePoolsApi = { }), createNodePool: (body: DtoCreateNodePoolRequest) => withRefresh(async () => { - return await nodePools.createNodePool({ dtoCreateNodePoolRequest: body }) + return await nodePools.createNodePool({ createNodePoolRequest: body }) }), getNodePool: (id: string) => withRefresh(async () => { @@ -34,7 +34,7 @@ export const nodePoolsApi = { }), updateNodePool: (id: string, body: DtoUpdateNodePoolRequest) => withRefresh(async () => { - return await nodePools.updateNodePool({ id, dtoUpdateNodePoolRequest: body }) + return await nodePools.updateNodePool({ id, updateNodePoolRequest: body }) }), // Servers listNodePoolServers: (id: string) => @@ -43,7 +43,7 @@ export const nodePoolsApi = { }), attachNodePoolServer: (id: string, body: DtoAttachServersRequest) => withRefresh(async () => { - return await nodePools.attachNodePoolServers({ id, dtoAttachServersRequest: body }) + return await nodePools.attachNodePoolServers({ id, attachNodePoolServersRequest: body }) }), detachNodePoolServers: (id: string, serverId: string) => withRefresh(async () => { @@ -56,7 +56,7 @@ export const nodePoolsApi = { }), attachNodePoolTaints: (id: string, body: DtoAttachTaintsRequest) => withRefresh(async () => { - return await nodePools.attachNodePoolTaints({ id, dtoAttachTaintsRequest: body }) + return await nodePools.attachNodePoolTaints({ id, attachNodePoolTaintsRequest: body }) }), detachNodePoolTaints: (id: string, taintId: string) => withRefresh(async () => { @@ -69,7 +69,7 @@ export const nodePoolsApi = { }), attachNodePoolLabels: (id: string, body: DtoAttachLabelsRequest) => withRefresh(async () => { - return await nodePools.attachNodePoolLabels({ id, dtoAttachLabelsRequest: body }) + return await nodePools.attachNodePoolLabels({ id, attachNodePoolLabelsRequest: body }) }), detachNodePoolLabels: (id: string, labelId: string) => withRefresh(async () => { @@ -82,7 +82,7 @@ export const nodePoolsApi = { }), attachNodePoolAnnotations: (id: string, body: DtoAttachAnnotationsRequest) => withRefresh(async () => { - return await nodePools.attachNodePoolAnnotations({ id, dtoAttachAnnotationsRequest: body }) + return await nodePools.attachNodePoolAnnotations({ id, attachNodePoolAnnotationsRequest: body }) }), detachNodePoolAnnotations: (id: string, annotationId: string) => withRefresh(async () => { diff --git a/ui/src/api/servers.ts b/ui/src/api/servers.ts index eba6872..dfabf8e 100644 --- a/ui/src/api/servers.ts +++ b/ui/src/api/servers.ts @@ -11,7 +11,7 @@ export const serversApi = { }), createServer: (body: DtoCreateServerRequest) => withRefresh(async () => { - return await servers.createServer({ dtoCreateServerRequest: body }) + return await servers.createServer({ createServerRequest: body }) }), getServer: (id: string) => withRefresh(async () => { @@ -19,7 +19,7 @@ export const serversApi = { }), updateServer: (id: string, body: DtoUpdateServerRequest) => withRefresh(async () => { - return await servers.updateServer({ id, dtoUpdateServerRequest: body }) + return await servers.updateServer({ id, updateServerRequest: body }) }), deleteServer: (id: string) => withRefresh(async () => { diff --git a/ui/src/api/ssh.ts b/ui/src/api/ssh.ts index e8459ab..989f0d8 100644 --- a/ui/src/api/ssh.ts +++ b/ui/src/api/ssh.ts @@ -33,7 +33,7 @@ export const sshApi = { createSshKey: (body: DtoCreateSSHRequest) => withRefresh(async (): Promise => { // SDK expects { body } - return await ssh.createSSHKey({ dtoCreateSSHRequest: body }) + return await ssh.createSSHKey({ createSSHKeyRequest: body }) }), getSshKeyById: (id: string) => diff --git a/ui/src/api/taints.ts b/ui/src/api/taints.ts index c76d074..c773f2d 100644 --- a/ui/src/api/taints.ts +++ b/ui/src/api/taints.ts @@ -10,7 +10,7 @@ export const taintsApi = { }), createTaint: (body: DtoCreateTaintRequest) => withRefresh(async () => { - return await taints.createTaint({ dtoCreateTaintRequest: body }) + return await taints.createTaint({ createTaintRequest: body }) }), getTaint: (id: string) => withRefresh(async () => { @@ -22,6 +22,6 @@ export const taintsApi = { }), updateTaint: (id: string, body: DtoUpdateTaintRequest) => withRefresh(async () => { - return await taints.updateTaint({ id, dtoUpdateTaintRequest: body }) + return await taints.updateTaint({ id, updateTaintRequest: body }) }), } diff --git a/ui/src/auth/logout.ts b/ui/src/auth/logout.ts index a68fd88..3525b14 100644 --- a/ui/src/auth/logout.ts +++ b/ui/src/auth/logout.ts @@ -12,7 +12,7 @@ export async function logoutEverywhere(): Promise { try { const body: DtoLogoutRequest = { refresh_token: tokens.refresh_token } as DtoLogoutRequest - await makeAuthApi().logout({ dtoLogoutRequest: body }) + await makeAuthApi().logout({ logoutRequest: body }) } catch (err) { console.warn("Logout API failed; clearing local state anyway", err) } finally { diff --git a/ui/src/pages/me-page.tsx b/ui/src/pages/me-page.tsx index 8e63cec..6fd2549 100644 --- a/ui/src/pages/me-page.tsx +++ b/ui/src/pages/me-page.tsx @@ -56,7 +56,7 @@ const orgsApi = makeOrgsApi() const orgApi = { create: (body: { name: string; domain?: string }) => - withRefresh(async () => orgsApi.createOrg({ handlersOrgCreateReq: body })), // POST /orgs + withRefresh(async () => orgsApi.createOrg({ createOrgRequest: body })), // POST /orgs } const profileSchema = z.object({ diff --git a/ui/src/pages/org/api-keys.tsx b/ui/src/pages/org/api-keys.tsx index 34fe17d..db8c506 100644 --- a/ui/src/pages/org/api-keys.tsx +++ b/ui/src/pages/org/api-keys.tsx @@ -70,7 +70,7 @@ export const OrgApiKeys = () => { } | null>(null) const createMut = useMutation({ - mutationFn: (v: CreateValues) => api.createOrgKey({ id: orgId!, handlersOrgKeyCreateReq: v }), + mutationFn: (v: CreateValues) => api.createOrgKey({ id: orgId!, createOrgKeyRequest: v }), onSuccess: (resp) => { void qc.invalidateQueries({ queryKey: ["org:keys", orgId] }) setShowSecret({ key: resp.org_key, secret: resp.org_secret }) diff --git a/ui/src/pages/org/members.tsx b/ui/src/pages/org/members.tsx index 9d343d8..1008042 100644 --- a/ui/src/pages/org/members.tsx +++ b/ui/src/pages/org/members.tsx @@ -1,40 +1,26 @@ -import { useMemo, useState } from "react" -import { withRefresh } from "@/api/with-refresh.ts" -import { orgStore } from "@/auth/org.ts" -import { makeOrgsApi } from "@/sdkClient.ts" -import { zodResolver } from "@hookform/resolvers/zod" -import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query" -import { Loader2 } from "lucide-react" -import { useForm } from "react-hook-form" -import { toast } from "sonner" -import { z } from "zod" +import { useMemo, useState } from "react"; +import { withRefresh } from "@/api/with-refresh.ts"; +import { orgStore } from "@/auth/org.ts"; +import { makeOrgsApi } from "@/sdkClient.ts"; +import { zodResolver } from "@hookform/resolvers/zod"; +import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; +import { Loader2 } from "lucide-react"; +import { useForm } from "react-hook-form"; +import { toast } from "sonner"; +import { z } from "zod"; + + + +import { Button } from "@/components/ui/button.tsx"; +import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card.tsx"; +import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form.tsx"; +import { Input } from "@/components/ui/input.tsx"; +import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select.tsx"; +import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table.tsx"; + + + -import { Button } from "@/components/ui/button.tsx" -import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card.tsx" -import { - Form, - FormControl, - FormField, - FormItem, - FormLabel, - FormMessage, -} from "@/components/ui/form.tsx" -import { Input } from "@/components/ui/input.tsx" -import { - Select, - SelectContent, - SelectItem, - SelectTrigger, - SelectValue, -} from "@/components/ui/select.tsx" -import { - Table, - TableBody, - TableCell, - TableHead, - TableHeader, - TableRow, -} from "@/components/ui/table.tsx" const addSchema = z.object({ user_id: z.uuid("Invalid UUID"), @@ -68,7 +54,7 @@ export const OrgMembers = () => { }) const addMut = useMutation({ - mutationFn: (v: AddValues) => api.addOrUpdateMember({ id: orgId!, handlersMemberUpsertReq: v }), + mutationFn: (v: AddValues) => api.addOrUpdateMember({ id: orgId!, addOrUpdateMemberRequest: v }), onSuccess: () => { toast.success("Member added/updated") void qc.invalidateQueries({ queryKey: ["org:members", orgId] }) @@ -88,7 +74,7 @@ export const OrgMembers = () => { const roleMut = useMutation({ mutationFn: ({ userId, role }: { userId: string; role: "owner" | "admin" | "member" }) => - api.addOrUpdateMember({ id: orgId!, handlersMemberUpsertReq: { user_id: userId, role } }), + api.addOrUpdateMember({ id: orgId!, addOrUpdateMemberRequest: { user_id: userId, role } }), onMutate: async ({ userId, role }) => { setUpdatingId(userId) // cancel queries and snapshot previous diff --git a/ui/src/pages/org/settings.tsx b/ui/src/pages/org/settings.tsx index b28ec90..1ffbc2a 100644 --- a/ui/src/pages/org/settings.tsx +++ b/ui/src/pages/org/settings.tsx @@ -80,7 +80,7 @@ export const OrgSettings = () => { }, [q.data, form]) const updateMut = useMutation({ - mutationFn: (v: Partial) => api.updateOrg({ id: orgId!, handlersOrgUpdateReq: v }), + mutationFn: (v: Partial) => api.updateOrg({ id: orgId!, updateOrgRequest: v }), onSuccess: () => { void qc.invalidateQueries({ queryKey: ["org", orgId] }) toast.success("Organization updated")