Skip to content

Commit d2c51af

Browse files
stackit-pipelinerenovate-botFyusel
authored
fix(deps): update stackit sdk modules (#894)
* fix(deps): update stackit sdk modules * Adjust opensearch regarding breaking change tls_protocol parameter is now a string array instead of a single string Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de> --------- Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de> Co-authored-by: Renovate Bot <renovate@whitesourcesoftware.com> Co-authored-by: Alexander Dahmen <alexander.dahmen@inovex.de>
1 parent 04a3436 commit d2c51af

5 files changed

Lines changed: 41 additions & 33 deletions

File tree

‎docs/resources/opensearch_instance.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ Optional:
6767
- `sgw_acl` (String) Comma separated list of IP networks in CIDR notation which are allowed to access this instance.
6868
- `syslog` (List of String) List of syslog servers to send logs to.
6969
- `tls_ciphers` (List of String) List of TLS ciphers to use.
70-
- `tls_protocols` (String) The TLS protocol to use.
70+
- `tls_protocols` (List of String) The TLS protocol to use.

‎go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,29 @@ require (
1212
github.com/hashicorp/terraform-plugin-log v0.9.0
1313
github.com/hashicorp/terraform-plugin-testing v1.13.2
1414
github.com/stackitcloud/stackit-sdk-go/core v0.17.2
15-
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.2.1
16-
github.com/stackitcloud/stackit-sdk-go/services/dns v0.16.0
15+
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.3.0
16+
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.0
1717
github.com/stackitcloud/stackit-sdk-go/services/git v0.6.0
18-
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.25.0
18+
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.26.0
1919
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.4.0
2020
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.0
2121
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.0
2222
github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.5.0
2323
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.1
2424
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.3.0
2525
github.com/stackitcloud/stackit-sdk-go/services/observability v0.8.0
26-
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.23.1
27-
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.1.0
28-
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.24.1
29-
github.com/stackitcloud/stackit-sdk-go/services/redis v0.24.1
26+
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.0
27+
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.2.0
28+
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.25.0
29+
github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.0
3030
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.17.0
3131
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.13.0
3232
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.0
3333
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.2.0
3434
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.9.0
3535
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.1
3636
github.com/stackitcloud/stackit-sdk-go/services/ske v0.27.0
37-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.2.0
37+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.3.0
3838
github.com/teambition/rrule-go v1.8.2
3939
golang.org/x/mod v0.25.0
4040
)

‎go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ github.com/stackitcloud/stackit-sdk-go/core v0.17.2 h1:jPyn+i8rkp2hM80+hOg0B/1EV
154154
github.com/stackitcloud/stackit-sdk-go/core v0.17.2/go.mod h1:8KIw3czdNJ9sdil9QQimxjR6vHjeINFrRv0iZ67wfn0=
155155
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.8.0 h1:KXMiTBV4KcOEQRFddtOUFspL+KRvjDQNDIs73bdiey0=
156156
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.8.0/go.mod h1:+2mx2MclJFMQ4Y6b20jspYAnIeFJP3/yvO6Gfvcvf6Q=
157-
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.2.1 h1:u1cLLpnuReJb+bRc6FONX0rMJiPpAT66HjpqxvNfjGU=
158-
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.2.1/go.mod h1:yTZjDrpVbEuDMRcCK7PpXR1yz+O6NcNFAgxydT6eBYc=
159-
github.com/stackitcloud/stackit-sdk-go/services/dns v0.16.0 h1:86F0qHx2YOzxoGkcFX1tT20+Yz1mwaPPS2aFODxuMpY=
160-
github.com/stackitcloud/stackit-sdk-go/services/dns v0.16.0/go.mod h1:xhAdw016dY/hVsLerlExSMocqCc872+S0y1CdV3jAjU=
157+
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.3.0 h1:MaHdLZNI8LqHZPzHgBTf5gqgaDiN7em2QultgG9GGWg=
158+
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.3.0/go.mod h1:yTZjDrpVbEuDMRcCK7PpXR1yz+O6NcNFAgxydT6eBYc=
159+
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.0 h1:x5mx/C2bdtpOH974RofXD0Y8YOyJtYXwIyaCyWOXMwU=
160+
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.0/go.mod h1:xhAdw016dY/hVsLerlExSMocqCc872+S0y1CdV3jAjU=
161161
github.com/stackitcloud/stackit-sdk-go/services/git v0.6.0 h1:C+8z3MdvnTngcH9L72VHLXRKNWHHYp+7FO/F6imKmB4=
162162
github.com/stackitcloud/stackit-sdk-go/services/git v0.6.0/go.mod h1:agI7SONeLR/IZL3TOgn1tDzfS63O2rWKQE8+huRjEzU=
163-
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.25.0 h1:K9RjMPlEK1XQegZBMIrI/KHAorzRdOt5YpftsT7pMEk=
164-
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.25.0/go.mod h1:lUGkcbyMkd4nRBDFmKohIwlgtOZqQo4Ek5S5ajw90Xg=
163+
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.26.0 h1:7qm/Tft79wFlHomPdgjUJ9uJU8kEk+k9ficMGRoHtf0=
164+
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.26.0/go.mod h1:lUGkcbyMkd4nRBDFmKohIwlgtOZqQo4Ek5S5ajw90Xg=
165165
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.4.0 h1:Ef4SyTBjIkfwaws4mssa6AoK+OokHFtr7ZIflUpoXVE=
166166
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.4.0/go.mod h1:FiVhDlw9+yuTiUmnyGLn2qpsLW26w9OC4TS1y78czvg=
167167
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.0 h1:QKOfaB7EcuJmBCxpFXN2K7g2ih0gQM6cyZ1VhTmtQfI=
@@ -176,14 +176,14 @@ github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.3.0 h1:bK5FDpSG
176176
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.3.0/go.mod h1:Q2SJXlZTksvNAb1QnpGNfDSw/OMPN9uopaKuptUGhO8=
177177
github.com/stackitcloud/stackit-sdk-go/services/observability v0.8.0 h1:8v9Iupkc3meXcVPMpteXDz07YzY2M5jud50vEtAvbs8=
178178
github.com/stackitcloud/stackit-sdk-go/services/observability v0.8.0/go.mod h1:+eNo7SEeVRuW7hgujSabSketScSUKGuC88UznPS+UTE=
179-
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.23.1 h1:E6vCqPn1NiPHnbnvqLNQNz6a/cmeyRb5iA9cDUPtP58=
180-
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.23.1/go.mod h1:ifKKKCWL1U435fXGQ375SPX+burtfg1I7EGZ58COzRA=
181-
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.1.0 h1:r29a9GoBLVw2VZSzdPftlIsE5t7shdxobwoT6NVUIjU=
182-
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.1.0/go.mod h1:4g/L5PHfz1xk3udEhvPy2nXiH4UgRO5Cj6iwUa7k5VQ=
183-
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.24.1 h1:2rDFwJtZOFYFUiJqJ9uIwM+mu+BbtuVaUHARRJtrZPU=
184-
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.24.1/go.mod h1:YL0l9l9xzJy2BmV+U9XkcXlQaHbE2KyA37GpGvBXIJ4=
185-
github.com/stackitcloud/stackit-sdk-go/services/redis v0.24.1 h1:4H+GL4eLEO116Vlh0pe+udGGYnMohA8YhLW9KYGdEOc=
186-
github.com/stackitcloud/stackit-sdk-go/services/redis v0.24.1/go.mod h1:PAQH8+1DDGc6uibvC3nDtfRLu8uxutIr25mPJvrCOy8=
179+
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.0 h1:+qFjzDDv/0ZHGdVuW2HzAphRBmlc1+abw7k1RaAqmQo=
180+
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.0/go.mod h1:ifKKKCWL1U435fXGQ375SPX+burtfg1I7EGZ58COzRA=
181+
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.2.0 h1:DGgKKCh3AmUBqDG0DrsWVcclxSaG82TVEf18A29w+J0=
182+
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.2.0/go.mod h1:I67K+QjPAIMrW/r/0GOdX2WSmA8J72LNzpe8rElfxFI=
183+
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.25.0 h1:Xhgo0Di6NDjkg0Bf3f6LHlQ09u0Dj/3WdDb0xd47vEU=
184+
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.25.0/go.mod h1:YL0l9l9xzJy2BmV+U9XkcXlQaHbE2KyA37GpGvBXIJ4=
185+
github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.0 h1:wdQoQ9RUkpX80twtG9xUghW9Xn1ka9zOjIxJDLbtwSo=
186+
github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.0/go.mod h1:PAQH8+1DDGc6uibvC3nDtfRLu8uxutIr25mPJvrCOy8=
187187
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.17.0 h1:lxI0LnHcTpnF8g0tHTCQ1UIVLlNHk1W1WAclp3Ut0fw=
188188
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.17.0/go.mod h1:TBvZpbCju0Zmq8GoS4CEtUg2MqtdqWrGeEAOXwkJNQo=
189189
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.13.0 h1:CtCaG8nycfviq/QgNM7OoBWs/Ap9IQvOmvI0tZhYdPI=
@@ -198,8 +198,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.1 h1:h1Ts
198198
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.1/go.mod h1:M4xZ2BnmROvLV2MrAP6A8o9BnyT0CkvpEcP8lBOfRs8=
199199
github.com/stackitcloud/stackit-sdk-go/services/ske v0.27.0 h1:bwLmLXvtCl1XkPRP+YrXwfz+lBMaGWH/crlNbYtxeqE=
200200
github.com/stackitcloud/stackit-sdk-go/services/ske v0.27.0/go.mod h1:V09NmPahuUiuZEogVPgxuVqqti0th5B7TVAjuiM09mE=
201-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.2.0 h1:WvPLO1c7oT/MWmCRTt7jRyxus2g3DIluIW5iAsUpSFM=
202-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.2.0/go.mod h1:CyYJqR0tZWs2r5bGz69j4bmvhxdsd4QLCm1Uf+LouB0=
201+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.3.0 h1:pUl/981oAXPnZd7++69NfEWv6JwW9UpxER16XxQUdOk=
202+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.3.0/go.mod h1:S04/QsQrB2EgYGjl62BO+9QUswrlRBoBosigrhdmccM=
203203
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
204204
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
205205
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=

‎stackit/internal/services/opensearch/instance/resource.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ type parametersModel struct {
6969
Plugins types.List `tfsdk:"plugins"`
7070
Syslog types.List `tfsdk:"syslog"`
7171
TlsCiphers types.List `tfsdk:"tls_ciphers"`
72-
TlsProtocols types.String `tfsdk:"tls_protocols"`
72+
TlsProtocols types.List `tfsdk:"tls_protocols"`
7373
}
7474

7575
// Types corresponding to parametersModel
@@ -87,7 +87,7 @@ var parametersTypes = map[string]attr.Type{
8787
"plugins": basetypes.ListType{ElemType: types.StringType},
8888
"syslog": basetypes.ListType{ElemType: types.StringType},
8989
"tls_ciphers": basetypes.ListType{ElemType: types.StringType},
90-
"tls_protocols": basetypes.StringType{},
90+
"tls_protocols": basetypes.ListType{ElemType: types.StringType},
9191
}
9292

9393
// NewInstanceResource is a helper function to simplify the provider implementation.
@@ -278,7 +278,8 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
278278
Optional: true,
279279
Computed: true,
280280
},
281-
"tls_protocols": schema.StringAttribute{
281+
"tls_protocols": schema.ListAttribute{
282+
ElementType: types.StringType,
282283
Description: parametersDescriptions["tls_protocols"],
283284
Optional: true,
284285
Computed: true,
@@ -733,7 +734,6 @@ func toInstanceParams(parameters *parametersModel) (*opensearch.InstanceParamete
733734
payloadParams.MetricsFrequency = conversion.Int64ValueToPointer(parameters.MetricsFrequency)
734735
payloadParams.MetricsPrefix = conversion.StringValueToPointer(parameters.MetricsPrefix)
735736
payloadParams.MonitoringInstanceId = conversion.StringValueToPointer(parameters.MonitoringInstanceId)
736-
payloadParams.TlsProtocols = opensearch.InstanceParametersGetTlsProtocolsAttributeType(conversion.StringValueToPointer(parameters.TlsProtocols))
737737

738738
var err error
739739
payloadParams.Plugins, err = conversion.StringListToPointer(parameters.Plugins)
@@ -751,6 +751,11 @@ func toInstanceParams(parameters *parametersModel) (*opensearch.InstanceParamete
751751
return nil, fmt.Errorf("convert tls_ciphers: %w", err)
752752
}
753753

754+
payloadParams.TlsProtocols, err = conversion.StringListToPointer(parameters.TlsProtocols)
755+
if err != nil {
756+
return nil, fmt.Errorf("convert tls_protocols: %w", err)
757+
}
758+
754759
return payloadParams, nil
755760
}
756761

‎stackit/internal/services/opensearch/instance/resource_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ var fixtureModelParameters = types.ObjectValueMust(parametersTypes, map[string]a
3535
types.StringValue("cipher"),
3636
types.StringValue("cipher2"),
3737
}),
38-
"tls_protocols": types.StringValue(string(opensearch.INSTANCEPARAMETERSTLS_PROTOCOLS__2)),
38+
"tls_protocols": types.ListValueMust(types.StringType, []attr.Value{
39+
types.StringValue("TLSv1.2"),
40+
types.StringValue("TLSv1.3"),
41+
}),
3942
})
4043

4144
var fixtureNullModelParameters = types.ObjectValueMust(parametersTypes, map[string]attr.Value{
@@ -52,7 +55,7 @@ var fixtureNullModelParameters = types.ObjectValueMust(parametersTypes, map[stri
5255
"plugins": types.ListNull(types.StringType),
5356
"syslog": types.ListNull(types.StringType),
5457
"tls_ciphers": types.ListNull(types.StringType),
55-
"tls_protocols": types.StringNull(),
58+
"tls_protocols": types.ListNull(types.StringType),
5659
})
5760

5861
var fixtureInstanceParameters = opensearch.InstanceParameters{
@@ -69,7 +72,7 @@ var fixtureInstanceParameters = opensearch.InstanceParameters{
6972
Plugins: &[]string{"plugin", "plugin2"},
7073
Syslog: &[]string{"syslog", "syslog2"},
7174
TlsCiphers: &[]string{"cipher", "cipher2"},
72-
TlsProtocols: opensearch.INSTANCEPARAMETERSTLS_PROTOCOLS__2.Ptr(),
75+
TlsProtocols: &[]string{"TLSv1.2", "TLSv1.3"},
7376
}
7477

7578
func TestMapFields(t *testing.T) {
@@ -123,7 +126,7 @@ func TestMapFields(t *testing.T) {
123126
"plugins": []string{"plugin", "plugin2"},
124127
"syslog": []string{"syslog", "syslog2"},
125128
"tls-ciphers": []string{"cipher", "cipher2"},
126-
"tls-protocols": string(opensearch.INSTANCEPARAMETERSTLS_PROTOCOLS__2),
129+
"tls-protocols": []string{"TLSv1.2", "TLSv1.3"},
127130
},
128131
},
129132
Model{

0 commit comments

Comments
 (0)