Skip to content

Commit 9046567

Browse files
mgajdamgajda
authored
Merge branch 'main' into feat/billing-summary
2 parents e72720d + f947f16 commit 9046567

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+261
-285
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
with:
3636
go-version-file: go.mod
3737
if: matrix.language == 'go'
38-
- uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
38+
- uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
3939
with:
4040
languages: ${{ matrix.language }}
4141
build-mode: ${{ matrix.language == 'go' && 'manual' || 'none' }}
4242
- run: make build install-docs-tools md-docs
4343
if: matrix.language == 'go'
44-
- uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
44+
- uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
4545
with:
4646
category: /language:${{ matrix.language }}

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
- name: Generate documentation
3535
run: make docs
3636
- name: Store generated MkDocs site
37-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
37+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
3838
with:
3939
name: mkdocs-site
4040
path: site
4141
retention-days: 7
4242
- name: Deploy to pages
4343
if: ${{ github.ref_name == 'main' || github.event_name == 'release'}}
44-
uses: JamesIves/github-pages-deploy-action@4a3abc783e1a24aeb44c16e869ad83caf6b4cc23 # 4.7.4
44+
uses: JamesIves/github-pages-deploy-action@9d877eea73427180ae43cf98e8914934fe157a1a # 4.7.6
4545
with:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4747
BRANCH: gh-pages

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
with:
2121
go-version-file: 'go.mod'
2222
- name: Run golangci-lint-action
23-
uses: golangci/golangci-lint-action@e7fa5ac41e1cf5b7d48e45e42232ce7ada589601 # v9.1.0
23+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
2424
with:
2525
args: --timeout=2m

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
id: release_notes
4747
run: make release-notes > .release_notes
4848
- name: Set up Syft
49-
uses: anchore/sbom-action/download-syft@8e94d75ddd33f69f691467e42275782e4bfefe84 # v0.20.9
49+
uses: anchore/sbom-action/download-syft@43a17d6e7add2b5535efe4dcae9952337c479a93 # v0.20.11
5050
- name: Run goreleaser-action
5151
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
5252
with:

‎.golangci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ linters:
1818
- ineffassign
1919
- makezero
2020
- misspell
21+
- modernize
2122
- nakedret
2223
- nilnil
2324
- nolintlint

‎Dockerfile.goreleaser‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.22.2@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412
1+
FROM alpine:3.23.2@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62
22

33
RUN apk add --update --no-cache ca-certificates jq
44
COPY upctl /bin/upctl

‎docs/index.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,16 @@ On bash, the completions depend on `bash-completion` package. Install and config
223223

224224
To be able to manage your UpCloud resources, you need to configure credentials for `upctl` and enable API access for these credentials.
225225

226-
Define the credentials either by setting `UPCLOUD_USERNAME` and `UPCLOUD_PASSWORD` environmental variables or `UPCLOUD_TOKEN` environment variable,
227-
or in the `upctl` config file (default `~/.config/upctl.yaml`, overridable with `--config /path/to/upctl.yaml`):
226+
We recommend using API tokens for authentication. Configure credentials by using `upctl account login --with-token` command to save a token to system keyring, in the `upctl` config file (default `~/.config/upctl.yaml`, overridable with `--config /path/to/upctl.yaml`) or by setting the `UPCLOUD_TOKEN` environment variable. Alternatively, you can use `UPCLOUD_USERNAME` and `UPCLOUD_PASSWORD` environment variables:
228227

229228
```yaml
229+
# recommended: use API token
230+
token: "your-token"
231+
232+
# alternatively, use username and password
230233
username: "your-username"
231234
password: "your-password"
232-
# alternatively, you can use token
233-
token: "your-token"
235+
```
234236
235237
API access can be configured in the UpCloud Hub on [Account page](https://hub.upcloud.com/account/overview) for the main-account and on the [Permissions tab](https://hub.upcloud.com/people/permissions) of the People page for sub-accounts. We recommend you to set up a sub-account specifically for the API usage with its own username and password, as it allows you to assign specific permissions for increased security.
236238

‎go.mod‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@ require (
66
dario.cat/mergo v1.0.2
77
github.com/UpCloudLtd/progress v1.0.3
88
github.com/UpCloudLtd/upcloud-go-api/credentials v0.1.1
9-
github.com/UpCloudLtd/upcloud-go-api/v8 v8.31.1
9+
github.com/UpCloudLtd/upcloud-go-api/v8 v8.32.0
1010
github.com/adrg/xdg v0.5.3
1111
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1212
github.com/gemalto/flume v1.0.0
13-
github.com/jedib0t/go-pretty/v6 v6.7.5
13+
github.com/jedib0t/go-pretty/v6 v6.7.7
1414
github.com/joho/godotenv v1.5.1
1515
github.com/m7shapan/cidr v0.0.0-20200427124835-7eba0889a5d2
1616
github.com/mattn/go-isatty v0.0.20
17-
github.com/spf13/cobra v1.10.1
17+
github.com/spf13/cobra v1.10.2
1818
github.com/spf13/pflag v1.0.10
1919
github.com/spf13/viper v1.21.0
2020
github.com/stretchr/testify v1.11.1
2121
github.com/zalando/go-keyring v0.2.6
22+
go.yaml.in/yaml/v3 v3.0.4
2223
golang.org/x/crypto v0.46.0
2324
golang.org/x/sync v0.19.0
2425
golang.org/x/term v0.38.0
25-
gopkg.in/yaml.v3 v3.0.1
26-
helm.sh/helm/v3 v3.19.2
27-
k8s.io/api v0.34.2
28-
k8s.io/apimachinery v0.34.2
29-
k8s.io/client-go v0.34.2
26+
helm.sh/helm/v3 v3.19.4
27+
k8s.io/api v0.35.0
28+
k8s.io/apimachinery v0.35.0
29+
k8s.io/client-go v0.35.0
3030
k8s.io/helm v2.17.0+incompatible
31-
k8s.io/kubectl v0.34.2
31+
k8s.io/kubectl v0.35.0
3232
sigs.k8s.io/kustomize/api v0.21.0
3333
sigs.k8s.io/kustomize/kyaml v0.21.0
3434
)
@@ -51,7 +51,7 @@ require (
5151
github.com/containerd/errdefs v0.3.0 // indirect
5252
github.com/containerd/log v0.1.0 // indirect
5353
github.com/containerd/platforms v0.2.1 // indirect
54-
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
54+
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
5555
github.com/danieljoos/wincred v1.2.2 // indirect
5656
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5757
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
@@ -63,7 +63,7 @@ require (
6363
github.com/ghodss/yaml v1.0.0 // indirect
6464
github.com/go-errors/errors v1.4.2 // indirect
6565
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
66-
github.com/go-logr/logr v1.4.2 // indirect
66+
github.com/go-logr/logr v1.4.3 // indirect
6767
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6868
github.com/go-openapi/jsonreference v0.20.2 // indirect
6969
github.com/go-openapi/swag v0.23.0 // indirect
@@ -127,28 +127,28 @@ require (
127127
github.com/xlab/treeprint v1.2.0 // indirect
128128
go.uber.org/multierr v1.11.0 // indirect
129129
go.uber.org/zap v1.27.0 // indirect
130-
go.yaml.in/yaml/v2 v2.4.2 // indirect
131-
go.yaml.in/yaml/v3 v3.0.4 // indirect
130+
go.yaml.in/yaml/v2 v2.4.3 // indirect
132131
golang.org/x/net v0.47.0 // indirect
133132
golang.org/x/oauth2 v0.30.0 // indirect
134133
golang.org/x/sys v0.39.0 // indirect
135134
golang.org/x/text v0.32.0 // indirect
136135
golang.org/x/time v0.12.0 // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
138-
google.golang.org/grpc v1.72.1 // indirect
139-
google.golang.org/protobuf v1.36.5 // indirect
140-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
136+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
137+
google.golang.org/grpc v1.72.2 // indirect
138+
google.golang.org/protobuf v1.36.8 // indirect
139+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
141140
gopkg.in/inf.v0 v0.9.1 // indirect
142141
gopkg.in/yaml.v2 v2.4.0 // indirect
143-
k8s.io/apiextensions-apiserver v0.34.0 // indirect
144-
k8s.io/apiserver v0.34.0 // indirect
145-
k8s.io/cli-runtime v0.34.2 // indirect
146-
k8s.io/component-base v0.34.2 // indirect
142+
gopkg.in/yaml.v3 v3.0.1 // indirect
143+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
144+
k8s.io/apiserver v0.34.2 // indirect
145+
k8s.io/cli-runtime v0.35.0 // indirect
146+
k8s.io/component-base v0.35.0 // indirect
147147
k8s.io/klog/v2 v2.130.1 // indirect
148-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
149-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
148+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
149+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
150150
oras.land/oras-go/v2 v2.6.0 // indirect
151-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
151+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
152152
sigs.k8s.io/randfill v1.0.0 // indirect
153153
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
154154
sigs.k8s.io/yaml v1.6.0 // indirect

0 commit comments

Comments
 (0)