diff --git a/.github/actions/e2e-test/action.yaml b/.github/actions/e2e-test/action.yaml index 6d153be34..eb5ac8a0b 100644 --- a/.github/actions/e2e-test/action.yaml +++ b/.github/actions/e2e-test/action.yaml @@ -92,10 +92,9 @@ runs: - name: Setup Test infra id: starship-action - uses: cosmology-tech/starship-action@0.5.1 + uses: cosmology-tech/starship-action@0.5.5 with: config: ${{ env.CONFIG_FILE }} - version: 0.0.0 chart: ./starship/charts/devnet kubeconfig: ${{ steps.kubeconfig.outputs.content }} cli-version: 0.0.0 diff --git a/.github/workflows/pr-tests.yaml b/.github/workflows/pr-tests.yaml index c47e6ee08..dd448682b 100644 --- a/.github/workflows/pr-tests.yaml +++ b/.github/workflows/pr-tests.yaml @@ -10,6 +10,7 @@ on: - "!starship/docker/**" - ".github/workflows/pr-tests.yaml" types: [opened, reopened, synchronize, ready_for_review] + workflow_dispatch: {} concurrency: group: ${{ github.workflow }}-${{ github.ref }}-pr-tests @@ -75,10 +76,9 @@ jobs: - name: Setup Test infra id: starship-action - uses: cosmology-tech/starship-action@0.5.1 + uses: cosmology-tech/starship-action@0.5.5 with: config: ${{ env.CONFIG_FILE }} - version: 0.0.0 chart: ./starship/charts/devnet cli-version: 0.0.0 diff --git a/.github/workflows/smoke-tests.yaml b/.github/workflows/smoke-tests.yaml index 2651add79..078ea2505 100644 --- a/.github/workflows/smoke-tests.yaml +++ b/.github/workflows/smoke-tests.yaml @@ -54,10 +54,9 @@ jobs: - name: Setup Test infra id: starship-action - uses: cosmology-tech/starship-action@0.5.1 + uses: cosmology-tech/starship-action@0.5.5 with: config: ${{ env.CONFIG_FILE }} - version: 0.0.0 chart: ./starship/charts/devnet cli-version: 0.0.0 @@ -115,10 +114,9 @@ jobs: - name: Setup Test infra id: starship-action - uses: cosmology-tech/starship-action@0.5.1 + uses: cosmology-tech/starship-action@0.5.5 with: config: ${{ env.CONFIG_FILE }} - version: 0.0.0 chart: ./starship/charts/devnet cli-version: 0.0.0 @@ -176,10 +174,9 @@ jobs: - name: Setup Test infra id: starship-action - uses: cosmology-tech/starship-action@0.5.1 + uses: cosmology-tech/starship-action@0.5.5 with: config: ${{ env.CONFIG_FILE }} - version: 0.0.0 chart: ./starship/charts/devnet cli-version: 0.0.0 diff --git a/clients/go/client/go.mod b/clients/go/client/go.mod index b18d4406a..92c9cc9dd 100644 --- a/clients/go/client/go.mod +++ b/clients/go/client/go.mod @@ -70,6 +70,8 @@ require ( github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -153,17 +155,21 @@ require ( github.com/zondax/ledger-go v0.14.1 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.10.0 // indirect golang.org/x/crypto v0.24.0 // indirect golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect - golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/term v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect + golang.org/x/time v0.5.0 // indirect google.golang.org/api v0.169.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect diff --git a/clients/go/client/go.sum b/clients/go/client/go.sum index a89dc73d7..5eb44ade7 100644 --- a/clients/go/client/go.sum +++ b/clients/go/client/go.sum @@ -32,8 +32,7 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.9 h1:e7ITSqGFFk4rbz/JFIqZh3G4VEHguhAL4BQcFlWtU68= -cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM= +cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= @@ -71,8 +70,7 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers= -cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns= +cloud.google.com/go/compute v1.25.1 h1:ZRpHJedLtTpKgr3RV1Fx23NuaAEN1Zfx9hw1u4aJdjU= cloud.google.com/go/compute v1.25.1/go.mod h1:oopOIR53ly6viBYxaDhBfJwzUAxf1zE//uf3IB011ls= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= @@ -113,8 +111,7 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v1.1.4 h1:K6n/GZHFTtEoKT5aUG3l9diPi0VduZNQ1PfdnpkkIFk= -cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8= +cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= @@ -177,8 +174,7 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= -cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= +cloud.google.com/go/storage v1.38.0 h1:Az68ZRGlnNTpIBbLjSMIV2BDcwwXYlRlQzis0llkpJg= cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= @@ -415,8 +411,7 @@ github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpm github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= -github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= @@ -450,6 +445,11 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.2/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-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= @@ -482,8 +482,7 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= -github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -519,8 +518,7 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw 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.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/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= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -582,14 +580,12 @@ github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8 github.com/google/uuid v1.0.0/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.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/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/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= -github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= -github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= 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= @@ -600,8 +596,7 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= -github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= @@ -719,8 +714,7 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= -github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -877,8 +871,7 @@ github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1: github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +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.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -937,8 +930,7 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= @@ -1028,6 +1020,18 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= +go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw= +go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -1056,10 +1060,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/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= @@ -1100,8 +1102,7 @@ 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.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.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= @@ -1164,8 +1165,7 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +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= @@ -1192,8 +1192,7 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -1209,8 +1208,7 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +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-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1308,14 +1306,12 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/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-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/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= @@ -1328,13 +1324,14 @@ 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.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -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-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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.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-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1398,8 +1395,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg= -golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= 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= @@ -1407,8 +1404,8 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -1459,8 +1456,7 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.139.0 h1:A1TrCPgMmOiYu0AiNkvQIpIx+D8blHTDcJ5EogkP7LI= -google.golang.org/api v0.139.0/go.mod h1:CVagp6Eekz9CjGZ718Z+sloknzkDJE7Vc1Ckj9+viBk= +google.golang.org/api v0.169.0 h1:QwWPy71FgMWqJN/l6jVlFHUa29a7dcUy02I8o799nPY= google.golang.org/api v0.169.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1469,8 +1465,8 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 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 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -1580,14 +1576,11 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= -google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= -google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= +google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 h1:RFiFrvy37/mpSpdySBDrUdipW/dHwsRwh3J3+A9VgT4= google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 h1:Di6ANFilr+S60a4S61ZM00vLdw0IrQOSMS2/6mrnOU0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1630,8 +1623,7 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -1649,8 +1641,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/clients/js/.eslintignore b/clients/js/.eslintignore new file mode 100644 index 000000000..f497e718f --- /dev/null +++ b/clients/js/.eslintignore @@ -0,0 +1,10 @@ +*.json +*.md +*.css +*.d.ts + +node_modules/ +dist/ +main/ +module/ +coverage/ diff --git a/clients/js/README.md b/clients/js/README.md index 09683a600..87204a937 100644 --- a/clients/js/README.md +++ b/clients/js/README.md @@ -146,15 +146,15 @@ npm install @starship-ci/client First, you need to import and initialize the `StarshipClient` with your Helm configuration: ```js -import { StarshipClient } from '@starship-ci/client'; +import {StarshipClient} from '@starship-ci/client'; const client = new StarshipClient({ - helmName: 'osmojs', - helmFile: 'path/to/config.yaml', - helmRepo: 'starship', - helmRepoUrl: 'https://cosmology-tech.github.io/starship/', - helmChart: 'devnet', - helmVersion: 'v0.2.3' + name: 'osmojs', + config: 'path/to/config.yaml', + repo: 'starship', + repoUrl: 'https://cosmology-tech.github.io/starship/', + chart: 'devnet', + version: 'v0.2.3' }); ``` diff --git a/clients/js/__fixtures__/config.yaml b/clients/js/__fixtures__/config.yaml index 2ff154edb..e388ff41e 100644 --- a/clients/js/__fixtures__/config.yaml +++ b/clients/js/__fixtures__/config.yaml @@ -1,3 +1,6 @@ +name: starship +version: v0.2.3 + chains: - id: osmosis-1 name: osmosis diff --git a/clients/js/__fixtures__/local-config.yaml b/clients/js/__fixtures__/local-config.yaml index d7239a0c3..eb7358b02 100644 --- a/clients/js/__fixtures__/local-config.yaml +++ b/clients/js/__fixtures__/local-config.yaml @@ -1,3 +1,6 @@ +name: starship +version: v0.2.3 + chains: - id: osmosis-1 name: osmosis diff --git a/clients/js/__fixtures__/starship-context-config.yaml b/clients/js/__fixtures__/starship-context-config.yaml deleted file mode 100644 index fb22b92a7..000000000 --- a/clients/js/__fixtures__/starship-context-config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -helmFile: ./config.yaml -helmVersion: v0.2.3 diff --git a/clients/js/package.json b/clients/js/package.json index cfb9f36bf..e2cb8cdb5 100644 --- a/clients/js/package.json +++ b/clients/js/package.json @@ -18,6 +18,8 @@ "clean": "lerna run clean", "build": "lerna run build --stream", "symlink": "symlink-workspace --logLevel error", + "lint": "lerna run lint", + "format": "lerna run format", "postinstall": "yarn symlink", "publish": "yarn build; yarn lerna publish --no-private", "publish:minor": "yarn build; yarn lerna publish minor --no-private" diff --git a/clients/js/packages/cli/.eslintignore b/clients/js/packages/cli/.eslintignore new file mode 100644 index 000000000..a887998fc --- /dev/null +++ b/clients/js/packages/cli/.eslintignore @@ -0,0 +1,6 @@ +node_modules/ +dist/ +main/ +module/ +coverage/ +prompt.js diff --git a/clients/js/packages/cli/CHANGELOG.md b/clients/js/packages/cli/CHANGELOG.md index 108f8048d..3334ac2d6 100644 --- a/clients/js/packages/cli/CHANGELOG.md +++ b/clients/js/packages/cli/CHANGELOG.md @@ -3,6 +3,26 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.9.0](https://github.com/cosmology-tech/starship/compare/@starship-ci/cli@2.8.1...@starship-ci/cli@2.9.0) (2024-06-24) + +**Note:** Version bump only for package @starship-ci/cli + +## [2.8.1](https://github.com/cosmology-tech/starship/compare/@starship-ci/cli@2.8.0...@starship-ci/cli@2.8.1) (2024-06-21) + +**Note:** Version bump only for package @starship-ci/cli + +# [2.8.0](https://github.com/cosmology-tech/starship/compare/@starship-ci/cli@2.7.2...@starship-ci/cli@2.8.0) (2024-06-21) + +**Note:** Version bump only for package @starship-ci/cli + +## [2.7.2](https://github.com/cosmology-tech/starship/compare/@starship-ci/cli@2.7.1...@starship-ci/cli@2.7.2) (2024-06-21) + +**Note:** Version bump only for package @starship-ci/cli + +## [2.7.1](https://github.com/cosmology-tech/starship/compare/@starship-ci/cli@2.7.0...@starship-ci/cli@2.7.1) (2024-06-21) + +**Note:** Version bump only for package @starship-ci/cli + # [2.7.0](https://github.com/cosmology-tech/starship/compare/@starship-ci/cli@2.6.1...@starship-ci/cli@2.7.0) (2024-06-19) **Note:** Version bump only for package @starship-ci/cli diff --git a/clients/js/packages/cli/package.json b/clients/js/packages/cli/package.json index 2c8969dbd..06ba9dd3a 100644 --- a/clients/js/packages/cli/package.json +++ b/clients/js/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@starship-ci/cli", - "version": "2.7.0", + "version": "2.9.0", "author": "Dan Lynch ", "description": "Starship CLI", "main": "index.js", @@ -29,6 +29,8 @@ "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy; npm run chmod", "chmod": "chmod +x dist/index.js", "dev": "ts-node src/index", + "lint": "eslint .", + "format": "eslint . --fix", "test": "jest", "test:watch": "jest --watch" }, @@ -53,7 +55,7 @@ "@types/js-yaml": "^4.0.9" }, "dependencies": { - "@starship-ci/client": "^2.7.0", + "@starship-ci/client": "^2.8.0", "chalk": "^4.1.0", "deepmerge": "^4.3.1", "inquirerer": "^1.9.0", diff --git a/clients/js/packages/cli/src/index.ts b/clients/js/packages/cli/src/index.ts index 7c51f2a57..3e5920bb5 100755 --- a/clients/js/packages/cli/src/index.ts +++ b/clients/js/packages/cli/src/index.ts @@ -3,7 +3,7 @@ import { StarshipClient, StarshipInstaller } from '@starship-ci/client'; // Adju import { Inquirerer, type Question } from 'inquirerer'; import minimist from 'minimist'; -import { displayUsage, displayVersion, loadConfig, usageText, params } from './utils'; +import { displayUsage, displayVersion, loadConfig, params,usageText } from './utils'; const argv = minimist(process.argv.slice(2), { alias: { @@ -28,11 +28,11 @@ const questions: Question[] = params.map(name => ({ name, type: 'text' })); // Filter questions based on the command function getQuestionsForCommand(command: string): Question[] { - const commonQuestions = questions.filter(q => q.name !== 'helmFile'); + const commonQuestions = questions.filter(q => q.name !== 'config'); if (['start', 'deploy', 'start-ports', 'wait-for-pods'].includes(command)) { - return questions; // Include all questions, including helmFile + return questions; // Include all questions, including config } else { - return commonQuestions; // Exclude helmFile + return commonQuestions; // Exclude config } } diff --git a/clients/js/packages/cli/src/utils.ts b/clients/js/packages/cli/src/utils.ts index a43b2ddcc..c31ce62f7 100644 --- a/clients/js/packages/cli/src/utils.ts +++ b/clients/js/packages/cli/src/utils.ts @@ -1,12 +1,10 @@ import {defaultStarshipContext, StarshipConfig, StarshipContext} from '@starship-ci/client'; // Adjust the import path as necessary -import { type Question } from 'inquirerer'; import chalk from 'chalk'; import {readFileSync} from 'fs'; import * as yaml from 'js-yaml'; -import {dirname, resolve} from 'path'; +import { resolve} from 'path'; import {readAndParsePackageJson} from './package'; -import deepmerge from 'deepmerge'; // Function to display the version information export function displayVersion() { @@ -32,25 +30,20 @@ export interface Config { } export const params: string[] = [ - 'helmName', - 'helmFile', - 'helmRepo', - 'helmRepoUrl', - 'helmChart', - 'helmVersion', - 'helmNamespace', + 'config', + 'name', + 'version', + 'repo', + 'repoUrl', + 'chart', + 'namespace', ] export const loadConfig = (argv: any): Config => { console.log("argv: ", argv); - console.log("argv.config: ", argv.config); let context: StarshipContext = { ...defaultStarshipContext } as StarshipContext; let starship: StarshipConfig = {} as StarshipConfig; - if (argv.config) { - context = deepmerge(defaultStarshipContext, loadYaml(argv.config)) as StarshipContext - } - console.log("context", context); // Override context with command-line arguments dynamically based on StarshipContext keys @@ -62,10 +55,9 @@ export const loadConfig = (argv: any): Config => { } }); - if (context.helmFile) { - const dir = argv.config ? dirname(argv.config) : process.cwd(); - context.helmFile = resolve(resolvePath(dir), context.helmFile); - starship = loadYaml(context.helmFile) as StarshipConfig + if (context.config) { + context.config = resolvePath(context.config); + starship = loadYaml(context.config) as StarshipConfig } console.log("starship: ", starship); @@ -89,19 +81,24 @@ Commands: version, -v Display the version of the Starship Client. Configuration File: - --config Specify the path to the JSON configuration file containing all settings. + --config Specify the path to the configuration file containing the actual config file. Required. Command-line options will override settings from this file if both are provided. Command-line Options: - --helmFile Specify the path to the Helm file, the actual config file. Required. - --helmName Specify the Helm release name, default: starship. - --helmVersion Specify the version of the Helm chart, default: v0.2.0. + --name Specify the Helm release name, default: starship. + Will overide config file settings for name. + --version Specify the version of the Helm chart, default: v0.2.6. + Will overide config file settings for version. Examples: - $ starship setup - $ starship deploy --helmFile ./config/helm.yaml --helmName my-release - $ starship start-ports --config ./config/settings.json - $ starship stop --config ./config/settings.json + $ starship start --config ./config/two-chain.yaml + $ starship stop --config ./config/two-chain.yaml + +If you want to run the deployment step by step + $ starship deploy --config ./config/two-chain.yaml + $ starship start-ports --config ./config/two-chain.yaml + $ starship stop-ports --config ./config/two-chain.yaml + $ starship stop --config ./config/two-chain.yaml Additional Help: $ starship help Display this help information. diff --git a/clients/js/packages/client/.eslintignore b/clients/js/packages/client/.eslintignore new file mode 100644 index 000000000..a887998fc --- /dev/null +++ b/clients/js/packages/client/.eslintignore @@ -0,0 +1,6 @@ +node_modules/ +dist/ +main/ +module/ +coverage/ +prompt.js diff --git a/clients/js/packages/client/CHANGELOG.md b/clients/js/packages/client/CHANGELOG.md index 2dd257939..110fa5939 100644 --- a/clients/js/packages/client/CHANGELOG.md +++ b/clients/js/packages/client/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.8.0](https://github.com/cosmology-tech/starship/compare/@starship-ci/client@2.7.2...@starship-ci/client@2.8.0) (2024-06-24) + +**Note:** Version bump only for package @starship-ci/client + +## [2.7.2](https://github.com/cosmology-tech/starship/compare/@starship-ci/client@2.7.1...@starship-ci/client@2.7.2) (2024-06-21) + +**Note:** Version bump only for package @starship-ci/client + +## [2.7.1](https://github.com/cosmology-tech/starship/compare/@starship-ci/client@2.7.0...@starship-ci/client@2.7.1) (2024-06-21) + +**Note:** Version bump only for package @starship-ci/client + # [2.7.0](https://github.com/cosmology-tech/starship/compare/@starship-ci/client@2.6.1...@starship-ci/client@2.7.0) (2024-06-19) **Note:** Version bump only for package @starship-ci/client diff --git a/clients/js/packages/client/README.md b/clients/js/packages/client/README.md index 7fe3e5540..babd43e67 100644 --- a/clients/js/packages/client/README.md +++ b/clients/js/packages/client/README.md @@ -120,15 +120,15 @@ The `StarshipClient` simplifies managing Kubernetes resources, specifically tail First, you need to import and initialize the `StarshipClient` with your Helm configuration: ```js -import { StarshipClient } from '@starship-ci/client'; +import {StarshipClient} from '@starship-ci/client'; const client = new StarshipClient({ - helmName: 'osmojs', - helmFile: 'path/to/config.yaml', - helmRepo: 'starship', - helmRepoUrl: 'https://cosmology-tech.github.io/starship/', - helmChart: 'devnet', - helmVersion: 'v0.2.3' + name: 'osmojs', + config: 'path/to/config.yaml', + repo: 'starship', + repoUrl: 'https://cosmology-tech.github.io/starship/', + chart: 'devnet', + version: 'v0.2.3' }); ``` diff --git a/clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap b/clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap index 42a3a5487..d5ee54152 100644 --- a/clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap +++ b/clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap @@ -1,16 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`StarshipClient setup 1`] = ` -"Call: setConfig({"chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}}) +"Call: setConfig({"name":"starship","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}}) +Log: config again: [object Object] Call: saveConfig() Call: savePodPorts("../../__output__/default-pod-ports.yaml") Call: setup() helm repo add starship https://cosmology-tech.github.io/starship/ helm repo update -helm search repo starship/devnet --version v0.2.4 +helm search repo starship/devnet --version v0.2.3 Call: deploy() Log: Installing the helm chart. This is going to take a while..... -helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.4 +helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 Log: Run "starship get-pods" to check the status of the cluster Call: startPortForward() Log: Attempting to stop any existing port-forwards... @@ -44,8 +45,8 @@ helm delete osmojs" exports[`StarshipClient setup 2`] = ` "helm repo add starship https://cosmology-tech.github.io/starship/ helm repo update -helm search repo starship/devnet --version v0.2.4 -helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.4 +helm search repo starship/devnet --version v0.2.3 +helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}' sleep 2 kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 & diff --git a/clients/js/packages/client/__tests__/__snapshots__/client.ports.test.ts.snap b/clients/js/packages/client/__tests__/__snapshots__/client.ports.test.ts.snap index 88773a663..aed92e67b 100644 --- a/clients/js/packages/client/__tests__/__snapshots__/client.ports.test.ts.snap +++ b/clients/js/packages/client/__tests__/__snapshots__/client.ports.test.ts.snap @@ -1,16 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`StarshipClient setup 1`] = ` -"Call: setConfig({"chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}}) +"Call: setConfig({"name":"starship","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}}) +Log: config again: [object Object] Call: setPodPorts({"chains":{"osmosis":{"exposer":98988,"faucet":1000000,"grpc":909090,"rest":6767676}}}) Call: savePodPorts("../../__output__/custom-pod-ports.yaml") Call: setup() helm repo add starship https://cosmology-tech.github.io/starship/ helm repo update -helm search repo starship/devnet --version v0.2.4 +helm search repo starship/devnet --version v0.2.3 Call: deploy() Log: Installing the helm chart. This is going to take a while..... -helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.4 +helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 Log: Run "starship get-pods" to check the status of the cluster Call: startPortForward() Log: Attempting to stop any existing port-forwards... @@ -42,8 +43,8 @@ helm delete osmojs" exports[`StarshipClient setup 2`] = ` "helm repo add starship https://cosmology-tech.github.io/starship/ helm repo update -helm search repo starship/devnet --version v0.2.4 -helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.4 +helm search repo starship/devnet --version v0.2.3 +helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}' sleep 2 kubectl port-forward pods/osmosis-1-genesis-0 1317:6767676 > /dev/null 2>&1 & diff --git a/clients/js/packages/client/__tests__/__snapshots__/client.test.ts.snap b/clients/js/packages/client/__tests__/__snapshots__/client.test.ts.snap index 989bd460a..9e314ecaa 100644 --- a/clients/js/packages/client/__tests__/__snapshots__/client.test.ts.snap +++ b/clients/js/packages/client/__tests__/__snapshots__/client.test.ts.snap @@ -1,14 +1,15 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`StarshipClient setup 1`] = ` -"Call: setConfig({"chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}}) +"Call: setConfig({"name":"starship","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}}) +Log: config again: [object Object] Call: setup() helm repo add starship https://cosmology-tech.github.io/starship/ helm repo update -helm search repo starship/devnet --version v0.2.4 +helm search repo starship/devnet --version v0.2.3 Call: deploy() Log: Installing the helm chart. This is going to take a while..... -helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.4 +helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 Log: Run "starship get-pods" to check the status of the cluster Call: startPortForward() Log: Attempting to stop any existing port-forwards... @@ -42,8 +43,8 @@ helm delete osmojs" exports[`StarshipClient setup 2`] = ` "helm repo add starship https://cosmology-tech.github.io/starship/ helm repo update -helm search repo starship/devnet --version v0.2.4 -helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.4 +helm search repo starship/devnet --version v0.2.3 +helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}' sleep 2 kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 & diff --git a/clients/js/packages/client/__tests__/client.config.test.ts b/clients/js/packages/client/__tests__/client.config.test.ts index 57a2b5468..a2c128840 100644 --- a/clients/js/packages/client/__tests__/client.config.test.ts +++ b/clients/js/packages/client/__tests__/client.config.test.ts @@ -10,13 +10,13 @@ describe('StarshipClient', () => { client.dependencies.forEach(dep => dep.installed = true); client.setConfig(config.config); - const helmFile = client.ctx.helmFile; - client.ctx.helmFile = join(outputDir, 'my-config.yaml'); - client.ctx.helmFile = relative(process.cwd(), client.ctx.helmChart) + const helmFile = client.ctx.config; + client.ctx.config = join(outputDir, 'my-config.yaml'); + client.ctx.config = relative(process.cwd(), client.ctx.chart) // @ts-ignore client.saveYaml = () => {}; client.saveConfig(); - client.ctx.helmFile = helmFile; + client.ctx.config = helmFile; const portYaml = join(outputDir, 'default-pod-ports.yaml'); const relativePortYaml = relative(process.cwd(), portYaml); diff --git a/clients/js/packages/client/package.json b/clients/js/packages/client/package.json index 176a05570..5c6c7a2f3 100644 --- a/clients/js/packages/client/package.json +++ b/clients/js/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@starship-ci/client", - "version": "2.7.0", + "version": "2.8.0", "author": "Dan Lynch ", "description": "Starship CI Client", "main": "index.js", @@ -24,6 +24,8 @@ "clean": "del dist/**", "prepare": "npm run build", "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy", + "lint": "eslint .", + "format": "eslint . --fix", "test": "jest", "test:watch": "jest --watch" }, diff --git a/clients/js/packages/client/src/client.ts b/clients/js/packages/client/src/client.ts index f72d511f7..0d7186f49 100644 --- a/clients/js/packages/client/src/client.ts +++ b/clients/js/packages/client/src/client.ts @@ -7,30 +7,30 @@ import * as os from 'os'; import { dirname, resolve } from 'path'; import * as shell from 'shelljs'; -import {Chain, Relayer, Script, StarshipConfig} from './config'; +import {Chain, Relayer, StarshipConfig} from './config'; import { Ports } from './config'; import { dependencies as defaultDependencies, Dependency } from "./deps"; import { readAndParsePackageJson } from './package'; export interface StarshipContext { - helmName?: string; - helmFile?: string; - helmRepo?: string; - helmRepoUrl?: string; - helmChart?: string; - helmVersion?: string; - helmNamespace?: string; + name?: string; + config?: string; + repo?: string; + repoUrl?: string; + chart?: string; + version?: string; + namespace?: string; verbose?: boolean; curdir?: string; }; export const defaultStarshipContext: Partial = { - helmName: 'starship', - helmRepo: 'starship', - helmRepoUrl: 'https://cosmology-tech.github.io/starship/', - helmChart: 'starship/devnet', - helmVersion: 'v0.2.4', - helmNamespace: '', + name: '', + repo: 'starship', + repoUrl: 'https://cosmology-tech.github.io/starship/', + chart: 'starship/devnet', + namespace: '', + version: '', }; export interface PodPorts { @@ -46,6 +46,9 @@ export interface PodPorts { }, } +const defaultName: string = "starship" +const defaultVersion: string = "v0.2.6" + // TODO talk to Anmol about moving these into yaml, if not already possible? const defaultPorts: PodPorts = { explorer: { @@ -203,12 +206,13 @@ export class StarshipClient implements StarshipClientI { } public loadConfig(): void { - this.ensureFileExists(this.ctx.helmFile); - this.config = this.loadYaml(this.ctx.helmFile) as StarshipConfig; + this.ensureFileExists(this.ctx.config); + this.config = this.loadYaml(this.ctx.config) as StarshipConfig; + this.overrideNameAndVersion(); } public saveConfig(): void { - this.saveYaml(this.ctx.helmFile, this.config); + this.saveYaml(this.ctx.config, this.config); } public savePodPorts(filename: string): void { @@ -222,6 +226,7 @@ export class StarshipClient implements StarshipClientI { public setConfig(config: StarshipConfig): void { this.config = config; + this.overrideNameAndVersion(); } public setContext(ctx: StarshipContext): void { @@ -232,17 +237,43 @@ export class StarshipClient implements StarshipClientI { this.podPorts = deepmerge(defaultPorts, ports); } + private overrideNameAndVersion(): void { + if (!this.config) { + throw new Error('no config!'); + } + + // Override config name and version if provided in context + if (this.ctx.name) { + this.config.name = this.ctx.name; + } + if (this.ctx.version) { + this.config.version = this.ctx.version; + } + + // Use default name and version if not provided + if (!this.config.name) { + this.log(chalk.yellow("No name specified, using default name: " + defaultName)); + this.config.name = defaultName; + } + if (!this.config.version) { + this.log(chalk.yellow("No version specified, using default version: " + defaultVersion)); + this.config.version = defaultVersion; + } + + this.log('config again: ' + this.config); + } + public getArgs(): string[] { const args = []; - if (this.ctx.helmNamespace) { - args.push('--namespace', this.ctx.helmNamespace); + if (this.ctx.namespace) { + args.push('--namespace', this.ctx.namespace); } return args; } public getDeployArgs(): string[] { const args = this.getArgs(); - if (this.ctx.helmNamespace) { + if (this.ctx.namespace) { args.push('--create-namespace'); } return args; @@ -254,7 +285,7 @@ export class StarshipClient implements StarshipClientI { 'yarn', 'run', 'jest', - `--testPathPattern=../${this.ctx.helmRepo}`, + `--testPathPattern=../${this.ctx.repo}`, '--verbose', '--bail' ]); @@ -277,17 +308,17 @@ export class StarshipClient implements StarshipClientI { 'helm', 'repo', 'add', - this.ctx.helmRepo, - this.ctx.helmRepoUrl + this.ctx.repo, + this.ctx.repoUrl ]); this.exec(['helm', 'repo', 'update']); this.exec([ 'helm', 'search', 'repo', - this.ctx.helmChart, + this.ctx.chart, '--version', - this.ctx.helmVersion + this.config.version ]); } @@ -299,24 +330,24 @@ export class StarshipClient implements StarshipClientI { } public deploy(options: string[] = []): void { - this.ensureFileExists(this.ctx.helmFile); + this.ensureFileExists(this.ctx.config); this.log("Installing the helm chart. This is going to take a while....."); const cmd: string[] = [ 'helm', 'install', '-f', - this.ctx.helmFile, - this.ctx.helmName, - this.ctx.helmChart, + this.ctx.config, + this.config.name, + this.ctx.chart, '--version', - this.ctx.helmVersion, + this.config.version, ...this.getDeployArgs(), ...options, ]; // Determine the data directory of the config file - const datadir = resolve(dirname(this.ctx.helmFile!)); + const datadir = resolve(dirname(this.ctx.config!)); // Iterate through each chain to add script arguments this.config.chains.forEach((chain, chainIndex) => { @@ -336,12 +367,12 @@ export class StarshipClient implements StarshipClientI { } public debug(): void { - this.ensureFileExists(this.ctx.helmFile); + this.ensureFileExists(this.ctx.config); this.deploy(['--dry-run', '--debug']); } public deleteHelm(): void { - this.exec(['helm', 'delete', this.ctx.helmName]); + this.exec(['helm', 'delete', this.config.name]); } public getPods(): void { diff --git a/clients/js/packages/client/src/config.ts b/clients/js/packages/client/src/config.ts index 50c7a99c0..9ea3e3f78 100644 --- a/clients/js/packages/client/src/config.ts +++ b/clients/js/packages/client/src/config.ts @@ -145,6 +145,8 @@ export interface Images { } export interface StarshipConfig { + name: string, + version: string, chains: Chain[]; relayers?: Relayer[]; explorer?: Explorer; diff --git a/clients/js/packages/client/test-utils/client.ts b/clients/js/packages/client/test-utils/client.ts index 5b534064b..18d84aba2 100644 --- a/clients/js/packages/client/test-utils/client.ts +++ b/clients/js/packages/client/test-utils/client.ts @@ -18,8 +18,8 @@ export const createClient = () => { }; const client = new StarshipClient({ - helmName: 'osmojs', - helmFile: relative(process.cwd(), config.configPath), + name: 'osmojs', + config: relative(process.cwd(), config.configPath), }); const handler = { diff --git a/clients/js/packages/starshipjs/.eslintignore b/clients/js/packages/starshipjs/.eslintignore new file mode 100644 index 000000000..a887998fc --- /dev/null +++ b/clients/js/packages/starshipjs/.eslintignore @@ -0,0 +1,6 @@ +node_modules/ +dist/ +main/ +module/ +coverage/ +prompt.js diff --git a/clients/js/packages/starshipjs/CHANGELOG.md b/clients/js/packages/starshipjs/CHANGELOG.md index ecff2eece..e21769231 100644 --- a/clients/js/packages/starshipjs/CHANGELOG.md +++ b/clients/js/packages/starshipjs/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.4.0](https://github.com/cosmology-tech/starship/compare/starshipjs@2.3.0...starshipjs@2.4.0) (2024-06-24) + +**Note:** Version bump only for package starshipjs + # [2.3.0](https://github.com/cosmology-tech/starship/compare/starshipjs@2.2.0...starshipjs@2.3.0) (2024-06-13) **Note:** Version bump only for package starshipjs diff --git a/clients/js/packages/starshipjs/__tests__/config.test.ts b/clients/js/packages/starshipjs/__tests__/config.test.ts index 5508c2291..669b32a65 100644 --- a/clients/js/packages/starshipjs/__tests__/config.test.ts +++ b/clients/js/packages/starshipjs/__tests__/config.test.ts @@ -1,7 +1,7 @@ +import { ChainRegistryFetcher } from "@chain-registry/client"; import path from "path"; import { Config, ConfigContext } from "../src/config"; -import { ChainRegistryFetcher } from "@chain-registry/client"; // it's more recommended to use ConfigContext.init to set the config file and registry. it("1. throws without init;\n 2. init the setup and gets config;\n 3. throws when double init;\n", async () => { diff --git a/clients/js/packages/starshipjs/__tests__/legacy.test.ts b/clients/js/packages/starshipjs/__tests__/legacy.test.ts index e2eafee49..6ce477f6e 100644 --- a/clients/js/packages/starshipjs/__tests__/legacy.test.ts +++ b/clients/js/packages/starshipjs/__tests__/legacy.test.ts @@ -1,7 +1,7 @@ +import { ChainRegistryFetcher } from "@chain-registry/client"; import path from "path"; -import { Config, ConfigContext } from "../src/config"; -import { ChainRegistryFetcher } from "@chain-registry/client"; +import { ConfigContext } from "../src/config"; // people can still use legacy ConfigContext to set the config file and registry. it("1. throws without init;\n 2. throws only init partially;\n 3. init the setup and gets config;\n 4. throws when double init;\n", async () => { diff --git a/clients/js/packages/starshipjs/package.json b/clients/js/packages/starshipjs/package.json index 33de205cd..2db880bda 100644 --- a/clients/js/packages/starshipjs/package.json +++ b/clients/js/packages/starshipjs/package.json @@ -1,6 +1,6 @@ { "name": "starshipjs", - "version": "2.3.0", + "version": "2.4.0", "author": "Dan Lynch ", "description": "JS utilities for Starship", "main": "index.js", @@ -24,6 +24,8 @@ "clean": "del dist/**", "prepare": "npm run build", "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy", + "lint": "eslint .", + "format": "eslint . --fix", "test": "jest", "test:watch": "jest --watch" }, diff --git a/docs/pages/cli/index.mdx b/docs/pages/cli/index.mdx index f72b59334..d24fea8c5 100644 --- a/docs/pages/cli/index.mdx +++ b/docs/pages/cli/index.mdx @@ -14,16 +14,16 @@ starship install ### Run starship ```sh -starship setup --config ./config/settings.json -starship deploy --config ./config/settings.json -starship start-ports --config ./config/settings.json +starship setup --config ./config/config.yaml +starship deploy --config ./config/config.yaml +starship start-ports --config ./config/config.yaml ``` ### Teardown starship ```sh -starship undeploy --config ./config/settings.json -starship teardown --config ./config/settings.json +starship undeploy --config ./config/config.yaml +starship teardown --config ./config/config.yaml ``` diff --git a/docs/pages/config/index.mdx b/docs/pages/config/index.mdx index 2df9641cc..34bfc4e0b 100644 --- a/docs/pages/config/index.mdx +++ b/docs/pages/config/index.mdx @@ -11,6 +11,9 @@ Here is a basic example that will spin up: * Registry service: Analogous to cosmos/chain-registry, following the same schemas ```yaml +name: starship +version: v0.2.6 + chains: - id: osmosis-1 name: osmosis diff --git a/docs/pages/get-started/step-3.mdx b/docs/pages/get-started/step-3.mdx index 180759891..2895a4756 100644 --- a/docs/pages/get-started/step-3.mdx +++ b/docs/pages/get-started/step-3.mdx @@ -4,15 +4,7 @@ In this step, we will spin up couple of cosmos chains and relayers between them. By the end of this tutorial you should be able to have osmosis and gaia chain running on your machine. -## 3.1) Setup Starship Helm charts -We use helm as the package manager for starship. - -Run -```bash -starship setup -``` - -## 3.2) Define the desired infrastructure +## 3.1) Define the desired infrastructure We will now define the infrastructure for our starship, specify the chains and relayers run between them. @@ -32,6 +24,8 @@ touch config.yaml Add following content to `starship.yaml` with the following content ```yaml +name: starship-getting-started + chains: - id: osmosis-1 name: osmosis @@ -69,7 +63,7 @@ For the tutorial we will keep it simple. ## 3.3) Spin up the infrastructure Spin up the infrastructure with ```bash -starship start --helmFile config.yaml +starship start --config config.yaml ``` This command will: diff --git a/docs/pages/get-started/step-4.mdx b/docs/pages/get-started/step-4.mdx index a452a3947..358b86064 100644 --- a/docs/pages/get-started/step-4.mdx +++ b/docs/pages/get-started/step-4.mdx @@ -66,7 +66,7 @@ Once you are done with playing around, cleanup the resources with ```bash # delete helm chart -starship stop +starship stop --config config.yaml # cleanup port forwarding pkill -f "port-forward" diff --git a/starship/charts/devnet/Chart.yaml b/starship/charts/devnet/Chart.yaml index bdddac348..9994307d0 100644 --- a/starship/charts/devnet/Chart.yaml +++ b/starship/charts/devnet/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.5 +version: 0.2.6 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/starship/charts/devnet/values.schema.json b/starship/charts/devnet/values.schema.json index d04a81258..523eb7e02 100644 --- a/starship/charts/devnet/values.schema.json +++ b/starship/charts/devnet/values.schema.json @@ -3,6 +3,12 @@ "title": "Generated schema for Root", "type": "object", "properties": { + "name": { + "type": "string" + }, + "version": { + "type": "string" + }, "resources": { "type": "object", "properties": {