stackit-dev-tools/terraform-provider-stackitprivatepreview
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: exclude zero address as for inadmissable cases (#650)

Browse source 
* fix: exclude zero address as for inadmissable cases

* fix: review finding
This commit is contained in:
Rüdiger Schmitz 2025-01-27 12:17:34 +01:00 • committed by GitHub
parent 0912ca0246
commit 2ec95dc20f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 61 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
stackit/internal/services/iaas/network/resource.go
View file

@ -200,7 +200,7 @@ func (r *networkResource) Schema(_ context.Context, _ resource.SchemaRequest, re
Optional: true,
Computed: true,
Validators: []validator.String{
validate.IP(),
validate.IP(false),
},
},
"ipv4_nameservers": schema.ListAttribute{
@ -252,7 +252,7 @@ func (r *networkResource) Schema(_ context.Context, _ resource.SchemaRequest, re
Optional: true,
Computed: true,
Validators: []validator.String{
validate.IP(),
validate.IP(false),
},
},
"ipv6_nameservers": schema.ListAttribute{

2
stackit/internal/services/iaas/networkarearoute/resource.go
View file

@ -161,7 +161,7 @@ func (r *networkAreaRouteResource) Schema(_ context.Context, _ resource.SchemaRe
stringplanmodifier.RequiresReplace(),
},
Validators: []validator.String{
validate.IP(),
validate.IP(false),
},
},
"prefix": schema.StringAttribute{

2
stackit/internal/services/iaas/networkinterface/resource.go
View file

@ -200,7 +200,7 @@ func (r *networkInterfaceResource) Schema(_ context.Context, _ resource.SchemaRe
Optional: true,
Computed: true,
Validators: []validator.String{
validate.IP(),
validate.IP(false),
},
PlanModifiers: []planmodifier.String{
stringplanmodifier.RequiresReplace(),

2
stackit/internal/services/iaas/publicip/resource.go
View file

@ -147,7 +147,7 @@ func (r *publicIpResource) Schema(_ context.Context, _ resource.SchemaRequest, r
stringplanmodifier.UseStateForUnknown(),
},
Validators: []validator.String{
validate.IP(),
validate.IP(false),
},
},
"network_interface_id": schema.StringAttribute{

2
stackit/internal/services/iaas/publicipassociate/resource.go
View file

@ -155,7 +155,7 @@ func (r *publicIpAssociateResource) Schema(_ context.Context, _ resource.SchemaR
stringplanmodifier.UseStateForUnknown(),
},
Validators: []validator.String{
validate.IP(),
validate.IP(false),
},
},
"network_interface_id": schema.StringAttribute{

8
stackit/internal/validate/validate.go
View file

@ -67,13 +67,17 @@ func UUID() *Validator {
}
}
func IP() *Validator {
// IP returns a validator that checks, if the given string is a valid IP address.
// The allowZeroAddress parameter defines, if 0.0.0.0, resp. [::] should be considered valid.
func IP(allowZeroAddress bool) *Validator {
description := "value must be an IP address"
return &Validator{
description: description,
validate: func(_ context.Context, req validator.StringRequest, resp *validator.StringResponse) {
if net.ParseIP(req.ConfigValue.ValueString()) == nil {
ip := net.ParseIP(req.ConfigValue.ValueString())
invalidZeroAddress := !allowZeroAddress && (net.IPv4zero.Equal(ip) || net.IPv6zero.Equal(ip))
if ip == nil || invalidZeroAddress {
resp.Diagnostics.Append(validatordiag.InvalidAttributeValueDiagnostic(
req.Path,
description,

50
stackit/internal/validate/validate_test.go
View file

@ -58,39 +58,87 @@ func TestUUID(t *testing.T) {
func TestIP(t *testing.T) {
tests := []struct {
description string
invalidZero bool
input string
isValid bool
}{
{
"ok IP4",
false,
"111.222.111.222",
true,
},
{
"ok IP6",
false,
"2001:0db8:85a3:08d3::0370:7344",
true,
},
{
"too short",
false,
"0.1.2",
false,
},
{
"Empty",
false,
"",
false,
},
{
"Not an IP",
false,
"for-sure-not-an-IP",
false,
},
{
"valid ipv4 zero",
true,
"0.0.0.0",
true,
},
{
"invalid ipv4 zero",
false,
"0.0.0.0",
false,
},
{
"valid ipv6 zero",
true,
"::",
true,
},
{
"valid ipv6 zero short notation",
true,
"::0",
true,
},
{
"valid ipv6 zero long notation",
true,
"0000:0000:0000:0000:0000:0000:0000:0000",
true,
},
{
"invalid ipv6 zero short notation",
false,
"::",
false,
},
{
"invalid ipv6 zero long notation",
false,
"0000:0000:0000:0000:0000:0000:0000:0000",
false,
},
}
for _, tt := range tests {
t.Run(tt.description, func(t *testing.T) {
r := validator.StringResponse{}
IP().ValidateString(context.Background(), validator.StringRequest{
IP(tt.invalidZero).ValidateString(context.Background(), validator.StringRequest{
ConfigValue: types.StringValue(tt.input),
}, &r)