Skip to content

Commit eca638f

Browse files
Merge branch 'main' into feat/STACKITTPR-388_store_ids_opensearch
2 parents 7267364 + 530dbbe commit eca638f

6 files changed

Lines changed: 14 additions & 8 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
uses: actions/checkout@v6
5858

5959
- name: Check GoReleaser
60-
uses: goreleaser/goreleaser-action@v6
60+
uses: goreleaser/goreleaser-action@v7
6161
with:
6262
args: check
6363

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
3434
- name: Run GoReleaser
35-
uses: goreleaser/goreleaser-action@v6
35+
uses: goreleaser/goreleaser-action@v7
3636
with:
3737
args: release --clean
3838
env:

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/stackitcloud/stackit-sdk-go/services/git v0.10.3
1919
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5
2020
github.com/stackitcloud/stackit-sdk-go/services/kms v1.3.2
21-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.7.3
21+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0
2222
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6
2323
github.com/stackitcloud/stackit-sdk-go/services/logs v0.5.2
2424
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.6
@@ -37,7 +37,7 @@ require (
3737
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.2.6
3838
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
3939
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7
40-
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.3.0
40+
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.4.0
4141
github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0
4242
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.3
4343
github.com/teambition/rrule-go v1.8.2

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5 h1:W57+XRa8wTLsi5CV9
165165
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5/go.mod h1:lTWjW57eAq1bwfM6nsNinhoBr3MHFW/GaFasdAsYfDM=
166166
github.com/stackitcloud/stackit-sdk-go/services/kms v1.3.2 h1:2ulSL2IkIAKND59eAjbEhVkOoBMyvm48ojwz1a3t0U0=
167167
github.com/stackitcloud/stackit-sdk-go/services/kms v1.3.2/go.mod h1:cuIaMMiHeHQsbvy7BOFMutoV3QtN+ZBx7Tg3GmYUw7s=
168-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.7.3 h1:d/qIj+XNaqByVbLvwpWoA0Ekv0yrONWyNswg4/jGX7Y=
169-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.7.3/go.mod h1:ClPE4TOM1FeaJiwTXvApq4gWaSgTLq6nU3PPHAIQDN4=
168+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0 h1:DxrN85V738CRLynu6MULQHO+OXyYnkhVPgoZKULfFIs=
169+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0/go.mod h1:ClPE4TOM1FeaJiwTXvApq4gWaSgTLq6nU3PPHAIQDN4=
170170
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6 h1:4x30lC+YBmo7XpsAzTn0W+C/oP5flnLVgIh5u3O/P0o=
171171
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6/go.mod h1:ewaYUiZcBTSS6urE5zEJBPCqxu70w2IjnBHCvnKdFKE=
172172
github.com/stackitcloud/stackit-sdk-go/services/logs v0.5.2 h1:vr4atxFRT+EL+DqONMT5R44f7AzEMbePa9U7PEE0THU=
@@ -203,8 +203,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 h1:l1EDIl
203203
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0/go.mod h1:EXq8/J7t9p8zPmdIq+atuxyAbnQwxrQT18fI+Qpv98k=
204204
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7 h1:M2PYLF8k3zmAwYWSKfUiCTNTXr7ROGuJganVVEQA3YI=
205205
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7/go.mod h1:jitkQuP2K/SH63Qor0C4pcqz1GDCy/lK2H4t8/VDse4=
206-
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.3.0 h1:4567q2dFp3Hw+5Kx+NLDKDcMWsRHMazTlh5aBrhlkXs=
207-
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.3.0/go.mod h1:r5lBwzJpJe2xBIYctkVIIpaZ41Y6vUEpkmsWR2VoQJs=
206+
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.4.0 h1:ofdGO2dGH6ywKbIVxaxRVal3jWX9WlcHSm5BTud5bC4=
207+
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.4.0/go.mod h1:r5lBwzJpJe2xBIYctkVIIpaZ41Y6vUEpkmsWR2VoQJs=
208208
github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0 h1:l1QjxW7sdE/6B6BZtHxbmus8XJdI9KDuXX3fwUa5fog=
209209
github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0/go.mod h1:1Jr+ImrmPERxbYnlTy6O2aSZYNnREf2qQyysv6YC1RY=
210210
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.3 h1:AQrcr+qeIuZob+3TT2q1L4WOPtpsu5SEpkTnOUHDqfE=

stackit/internal/services/observability/alertgroup/resource.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ func (a *alertGroupResource) ValidateConfig(ctx context.Context, req resource.Va
117117
return
118118
}
119119

120+
if resourceModel.Rules.IsUnknown() || resourceModel.Rules.IsNull() {
121+
return
122+
}
123+
120124
rules := &[]rule{}
121125
diags := resourceModel.Rules.ElementsAs(ctx, rules, false)
122126
resp.Diagnostics.Append(diags...)

stackit/internal/services/ske/cluster/resource.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,10 +552,12 @@ func (r *clusterResource) Schema(_ context.Context, _ resource.SchemaRequest, re
552552
"network": schema.SingleNestedAttribute{
553553
Description: "Network block as defined below.",
554554
Optional: true,
555+
Computed: true,
555556
Attributes: map[string]schema.Attribute{
556557
"id": schema.StringAttribute{
557558
Description: "ID of the STACKIT Network Area (SNA) network into which the cluster will be deployed.",
558559
Optional: true,
560+
Computed: true,
559561
Validators: []validator.String{
560562
validate.UUID(),
561563
},

0 commit comments

Comments
 (0)