Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(hosting_privatedatabase_whitelist): Add default netmask when user do not define it #703

Merged
merged 1 commit into from
Aug 20, 2024
Merged

fix(hosting_privatedatabase_whitelist): Add default netmask when user do not define it #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ovh/data_hosting_privatedatabase_whitelist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func dataSourceHostingPrivateDatabaseWhitelist() *schema.Resource {
func dataSourceHostingPrivateDatabaseWhitelistRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
serviceName := d.Get("service_name").(string)
ip := d.Get("ip").(string)
ip := HostingPrivateDatabaseWhitelistefaultNetmask(d.Get("ip").(string))

ds := &HostingPrivateDatabaseWhitelist{}
err := config.OVHClient.Get(
Expand Down
8 changes: 4 additions & 4 deletions ovh/resource_hosting_privatedatabase_whitelist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func resourceHostingPrivateDatabaseWhitelist() *schema.Resource {
func resourceHostingPrivateDatabaseWhitelistCreate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
serviceName := d.Get("service_name").(string)
ip := d.Get("ip").(string)
ip := HostingPrivateDatabaseWhitelistefaultNetmask(d.Get("ip").(string))

opts := (&HostingPrivateDatabaseWhitelistCreateOpts{}).FromResource(d)
ds := &HostingPrivateDatabaseWhitelist{}
Expand All @@ -80,7 +80,7 @@ func resourceHostingPrivateDatabaseWhitelistCreate(d *schema.ResourceData, meta
func resourceHostingPrivateDatabaseWhitelistUpdate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
serviceName := d.Get("service_name").(string)
ip := d.Get("ip").(string)
ip := HostingPrivateDatabaseWhitelistefaultNetmask(d.Get("ip").(string))

opts := (&HostingPrivateDatabaseWhitelistUpdateOpts{}).FromResource(d)

Expand All @@ -98,7 +98,7 @@ func resourceHostingPrivateDatabaseWhitelistUpdate(d *schema.ResourceData, meta
func resourceHostingPrivateDatabaseWhitelistRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
serviceName := d.Get("service_name").(string)
ip := d.Get("ip").(string)
ip := HostingPrivateDatabaseWhitelistefaultNetmask(d.Get("ip").(string))

ds := &HostingPrivateDatabaseWhitelist{}

Expand All @@ -119,7 +119,7 @@ func resourceHostingPrivateDatabaseWhitelistRead(d *schema.ResourceData, meta in
func resourceHostingPrivateDatabaseWhitelistDelete(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
serviceName := d.Get("service_name").(string)
ip := d.Get("ip").(string)
ip := HostingPrivateDatabaseWhitelistefaultNetmask(d.Get("ip").(string))

ds := &HostingPrivateDatabaseWhitelist{}

Expand Down
8 changes: 8 additions & 0 deletions ovh/types_hostingPrivatedatabase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package ovh
import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/ovh/terraform-provider-ovh/ovh/helpers"
"strings"
)

type HostingPrivateDatabase struct {
Expand Down Expand Up @@ -286,3 +287,10 @@ func (opts *HostingPrivateDatabaseWhitelistUpdateOpts) FromResource(d *schema.Re

return opts
}

func HostingPrivateDatabaseWhitelistefaultNetmask(ip string) string {
if !strings.Contains(ip, "/") {
ip = ip + "/32"
}
return ip
}