Skip to content

Commit c8a455e

Browse files
authored
Merge branch 'main' into feat/STACKITCLI-410-mariadb-region-adjustments
2 parents e046b7f + 4578838 commit c8a455e

5 files changed

Lines changed: 32 additions & 13 deletions

File tree

.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
timeout-minutes: 10
2525
steps:
2626
- name: "Mark old PRs as stale"
27-
uses: actions/stale@v10.4.0
27+
uses: actions/stale@v11.0.0
2828
with:
2929
repo-token: ${{ secrets.GITHUB_TOKEN }}
3030
stale-pr-message: "This PR was marked as stale after ${{ env.DAYS_BEFORE_PR_STALE }} days of inactivity and will be closed after another ${{ env.DAYS_BEFORE_PR_CLOSE }} days of further inactivity. If this PR should be kept open, just add a comment, remove the stale label or push new commits to it."

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ go.work.sum
1616
# Test coverage reports
1717
coverage.out
1818
coverage.html
19+
20+
# Shell completions
21+
completions/

.goreleaser.yaml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ version: 2
33
before:
44
hooks:
55
- go mod tidy
6+
# Shell completion files
7+
- mkdir -p ./completions
8+
- sh -c 'go run ./main.go completion zsh > ./completions/stackit.zsh'
9+
- sh -c 'go run ./main.go completion bash > ./completions/stackit.bash'
10+
- sh -c 'go run ./main.go completion fish > ./completions/stackit.fish'
611

712
builds:
813
- id: linux-builds
@@ -47,11 +52,6 @@ builds:
4752
output: true
4853
- cmd: spctl -a -t open --context context:primary-signature -v dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg
4954
output: true
50-
# Completion files
51-
- cmd: mkdir -p dist/completions
52-
- cmd: sh -c 'go run main.go completion zsh > ./dist/completions/stackit.zsh'
53-
- cmd: sh -c 'go run main.go completion bash > ./dist/completions/stackit.bash'
54-
- cmd: sh -c 'go run main.go completion fish > ./dist/completions/stackit.fish'
5555

5656
- id: freebsd-builds
5757
env:
@@ -74,7 +74,7 @@ archives:
7474
- freebsd-builds
7575
formats: [ 'tar.gz' ]
7676
files:
77-
- src: ./dist/completions/*
77+
- src: ./completions/*
7878
dst: completions
7979
- LICENSE.md
8080
- README.md
@@ -108,6 +108,18 @@ nfpms:
108108
dst: /usr/share/doc/stackit/copyright
109109
file_info:
110110
mode: 0644
111+
- src: ./completions/stackit.bash
112+
dst: /usr/share/bash-completion/completions/stackit
113+
file_info:
114+
mode: 0644
115+
- src: ./completions/stackit.zsh
116+
dst: /usr/share/zsh/vendor-completions/_stackit
117+
file_info:
118+
mode: 0644
119+
- src: ./completions/stackit.fish
120+
dst: /usr/share/fish/vendor_completions.d/stackit.fish
121+
file_info:
122+
mode: 0644
111123
formats:
112124
- deb
113125
- rpm
@@ -155,3 +167,7 @@ snapcrafts:
155167
grade: stable
156168
# Whether to publish the Snap to the store
157169
publish: true
170+
apps:
171+
stackit:
172+
command: stackit
173+
completer: completions/stackit.bash

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.1
4040
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0
4141
github.com/zalando/go-keyring v0.2.8
42-
golang.org/x/mod v0.37.0
42+
golang.org/x/mod v0.38.0
4343
golang.org/x/oauth2 v0.36.0
4444
golang.org/x/term v0.44.0
4545
golang.org/x/text v0.40.0
@@ -265,7 +265,7 @@ require (
265265
github.com/spf13/afero v1.15.0 // indirect
266266
github.com/spf13/cast v1.10.0 // indirect
267267
github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0
268-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0
268+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.15.0
269269
github.com/stackitcloud/stackit-sdk-go/services/logme v1.0.1
270270
github.com/stackitcloud/stackit-sdk-go/services/mariadb v1.1.0
271271
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.9.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,8 @@ github.com/stackitcloud/stackit-sdk-go/services/intake v0.7.1 h1:7ZSrwps/zI41rl+
610610
github.com/stackitcloud/stackit-sdk-go/services/intake v0.7.1/go.mod h1:ZIvwBZwEMFO+YfJLCNXqabslI0Fp9zxV7ZBwlZjk7uE=
611611
github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0 h1:OrUaDypQNr1nOXZfVQXCwUpN4YhR5y0vtvYi9/Ogoi4=
612612
github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0/go.mod h1:pVaCmb1ZHAPGVRlSlBlVOjThp9Tb2sX9+nRX0M+d1KU=
613-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0 h1:1dvL7tX91ziklayQmOupniE3jM4D5Nbtc0auNcx2p18=
614-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0/go.mod h1:+Ld3dn648I+YKcBV3fEkYpDSr3fel421+LurJGywSBs=
613+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.15.0 h1:YWpy3VDKrTKVgvnHgbLFYRZ4qUKiNxzCejUNdWIYZ6Q=
614+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.15.0/go.mod h1:+Ld3dn648I+YKcBV3fEkYpDSr3fel421+LurJGywSBs=
615615
github.com/stackitcloud/stackit-sdk-go/services/logme v1.0.1 h1:iteL61eMMPWT6872nF4Ko/tBU1IXemvS++XR09pj6NA=
616616
github.com/stackitcloud/stackit-sdk-go/services/logme v1.0.1/go.mod h1:JDOOYaGgcBts2x52nKPRMFgSZe7qqOFmfz1xIXCQgRY=
617617
github.com/stackitcloud/stackit-sdk-go/services/logs v0.10.0 h1:g7zpfQFFq3UhAWrMK9rPaZY6dLMAuMJf5g6+r7VRTXc=
@@ -789,8 +789,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
789789
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
790790
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
791791
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
792-
golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
793-
golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
792+
golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk=
793+
golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40=
794794
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
795795
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
796796
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

0 commit comments

Comments
 (0)