diff --git a/go.mod b/go.mod index bc8e0daae2..622bc9bc95 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.5 require ( github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113 - github.com/IBM-Cloud/power-go-client v1.7.0 + github.com/IBM-Cloud/power-go-client v1.8.0-beta6 github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca github.com/IBM/appconfiguration-go-admin-sdk v0.3.0 github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f @@ -214,7 +214,7 @@ require ( golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.24.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.24.0 // indirect golang.org/x/term v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect diff --git a/go.sum b/go.sum index 560b2c77a1..3bcbb620e7 100644 --- a/go.sum +++ b/go.sum @@ -118,8 +118,8 @@ github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be/go.mod h1:/7h github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113 h1:f2Erqfea1dKpaTFagTJM6W/wnD3JGq/Vn9URh8nuRwk= github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113/go.mod h1:xUQL9SGAjoZFd4GNjrjjtEpjpkgU7RFXRyHesbKTjiY= github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.5.3/go.mod h1:RiUvKuHKTBmBApDMUQzBL14pQUGKcx/IioKQPIcRQjs= -github.com/IBM-Cloud/power-go-client v1.7.0 h1:/GuGwPMTKoCZACfnwt7b6wKr4v32q1VO1AMFGNETRN4= -github.com/IBM-Cloud/power-go-client v1.7.0/go.mod h1:9izycYAmNQ+NAdVPXDC3fHYxqWLjlR2YiwqKYveMv5Y= +github.com/IBM-Cloud/power-go-client v1.8.0-beta6 h1:c01r8V5fVhWweDyJXImGHwrzL1nkMceXfX+PIhJa2Bc= +github.com/IBM-Cloud/power-go-client v1.8.0-beta6/go.mod h1:oAkZiHX25cmr2Yun5V0q6CpnUemegvSrpcEy/oQcjzU= github.com/IBM-Cloud/softlayer-go v1.0.5-tf h1:koUAyF9b6X78lLLruGYPSOmrfY2YcGYKOj/Ug9nbKNw= github.com/IBM-Cloud/softlayer-go v1.0.5-tf/go.mod h1:6HepcfAXROz0Rf63krk5hPZyHT6qyx2MNvYyHof7ik4= github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca h1:crniVcf+YcmgF03NmmfonXwSQ73oJF+IohFYBwknMxs= @@ -2035,8 +2035,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/ibm/acctest/acctest.go b/ibm/acctest/acctest.go index 0301b1d3e9..696bfab7bb 100644 --- a/ibm/acctest/acctest.go +++ b/ibm/acctest/acctest.go @@ -212,6 +212,7 @@ var ( Pi_image_bucket_secret_key string Pi_instance_name string Pi_key_name string + Pi_network_address_group_id string Pi_network_name string Pi_placement_group_name string Pi_replication_volume_name string @@ -1202,6 +1203,12 @@ func init() { Pi_host_id = "" fmt.Println("[WARN] Set the environment variable PI_HOST_ID for testing ibm_pi_host resource else it is set to default value ''") } + Pi_network_address_group_id = os.Getenv("PI_NETWORK_ADDRESS_GROUP_ID") + if Pi_network_address_group_id == "" { + Pi_network_address_group_id = "terraform-test-power" + fmt.Println("[INFO] Set the environment variable PI_NETWORK_ADDRESS_GROUP_ID for testing ibm_pi_network_address_group data source else it is set to default value 'terraform-test-power'") + } + WorkspaceID = os.Getenv("SCHEMATICS_WORKSPACE_ID") if WorkspaceID == "" { WorkspaceID = "us-south.workspace.tf-acc-test-schematics-state-test.392cd99f" diff --git a/ibm/provider/provider.go b/ibm/provider/provider.go index 56c33901e0..839f54ba79 100644 --- a/ibm/provider/provider.go +++ b/ibm/provider/provider.go @@ -649,6 +649,8 @@ func Provider() *schema.Provider { "ibm_pi_instances": power.DataSourceIBMPIInstances(), "ibm_pi_key": power.DataSourceIBMPIKey(), "ibm_pi_keys": power.DataSourceIBMPIKeys(), + "ibm_pi_network_address_group": power.DataSourceIBMPINetworkAddressGroup(), + "ibm_pi_network_address_groups": power.DataSourceIBMPINetworkAddressGroups(), "ibm_pi_network_port": power.DataSourceIBMPINetworkPort(), "ibm_pi_network": power.DataSourceIBMPINetwork(), "ibm_pi_networks": power.DataSourceIBMPINetworks(), diff --git a/ibm/service/power/data_source_ibm_pi_network_address_group.go b/ibm/service/power/data_source_ibm_pi_network_address_group.go new file mode 100644 index 0000000000..3504b047bb --- /dev/null +++ b/ibm/service/power/data_source_ibm_pi_network_address_group.go @@ -0,0 +1,109 @@ +// Copyright IBM Corp. 2024 All Rights Reserved. +// Licensed under the Mozilla Public License v2.0 + +package power + +import ( + "context" + + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + + "github.com/IBM-Cloud/power-go-client/clients/instance" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" +) + +func DataSourceIBMPINetworkAddressGroup() *schema.Resource { + return &schema.Resource{ + ReadContext: dataSourceIBMPINetworkAddressGroupRead, + + Schema: map[string]*schema.Schema{ + // Arguments + Arg_CloudInstanceID: { + Description: "The GUID of the service instance associated with an account.", + Required: true, + Type: schema.TypeString, + ValidateFunc: validation.NoZeroValues, + }, + Arg_NetworkAddressGroupID: { + Description: "Network Address Group ID.", + Required: true, + Type: schema.TypeString, + }, + // Attributes + Attr_CRN: { + Computed: true, + Description: "The Network Address Group's crn.", + Type: schema.TypeString, + }, + Attr_Members: { + Computed: true, + Description: "The list of IP addresses in CIDR notation (for example 192.168.66.2/32) in the Network Address Group.", + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + Attr_CIDR: { + Computed: true, + Description: "The IP addresses in CIDR notation for example 192.168.1.5/32.", + Type: schema.TypeString, + }, + Attr_ID: { + Computed: true, + Description: "The id of the Network Address Group member IP addresses.", + Type: schema.TypeString, + }, + }, + }, + Type: schema.TypeList, + }, + Attr_Name: { + Computed: true, + Description: "The name of the Network Address Group.", + Type: schema.TypeString, + }, + Attr_UserTags: { + Computed: true, + Description: "The user tags associated with this resource.", + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + Type: schema.TypeList, + }, + }, + } +} + +func dataSourceIBMPINetworkAddressGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + sess, err := meta.(conns.ClientSession).IBMPISession() + if err != nil { + return diag.FromErr(err) + } + + cloudInstanceID := d.Get(Arg_CloudInstanceID).(string) + nagID := d.Get(Arg_NetworkAddressGroupID).(string) + nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, cloudInstanceID) + networkAddressGroup, err := nagC.Get(nagID) + if err != nil { + return diag.FromErr(err) + } + + d.SetId(*networkAddressGroup.ID) + + d.Set(Attr_CRN, networkAddressGroup.Crn) + + members := []map[string]interface{}{} + if networkAddressGroup.Members != nil { + for _, mbr := range networkAddressGroup.Members { + member := memberToMap(mbr) + members = append(members, member) + } + d.Set(Attr_Members, members) + } + + d.Set(Attr_Name, networkAddressGroup.Name) + if len(networkAddressGroup.UserTags) > 0 { + d.Set(Attr_UserTags, networkAddressGroup.UserTags) + } + + return nil +} diff --git a/ibm/service/power/data_source_ibm_pi_network_address_group_test.go b/ibm/service/power/data_source_ibm_pi_network_address_group_test.go new file mode 100644 index 0000000000..d076aa5100 --- /dev/null +++ b/ibm/service/power/data_source_ibm_pi_network_address_group_test.go @@ -0,0 +1,36 @@ +// Copyright IBM Corp. 2024 All Rights Reserved. +// Licensed under the Mozilla Public License v2.0 + +package power_test + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + + acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest" +) + +func TestAccIBMPINetworkAddressGroupDataSourceBasic(t *testing.T) { + resource.Test(t, resource.TestCase{ + PreCheck: func() { acc.TestAccPreCheck(t) }, + Providers: acc.TestAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccCheckIBMPINetworkAddressGroupDataSourceConfigBasic(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet("data.ibm_pi_network_address_group.network_address_group", "id"), + ), + }, + }, + }) +} + +func testAccCheckIBMPINetworkAddressGroupDataSourceConfigBasic() string { + return fmt.Sprintf(` + data "ibm_pi_network_address_group" "network_address_group" { + pi_cloud_instance_id = "%s" + pi_network_address_group_id = "%s" + }`, acc.Pi_cloud_instance_id, acc.Pi_network_address_group_id) +} diff --git a/ibm/service/power/data_source_ibm_pi_network_address_groups.go b/ibm/service/power/data_source_ibm_pi_network_address_groups.go new file mode 100644 index 0000000000..a3ebfabd0d --- /dev/null +++ b/ibm/service/power/data_source_ibm_pi_network_address_groups.go @@ -0,0 +1,139 @@ +// Copyright IBM Corp. 2024 All Rights Reserved. +// Licensed under the Mozilla Public License v2.0 + +package power + +import ( + "context" + + "github.com/IBM-Cloud/power-go-client/clients/instance" + "github.com/IBM-Cloud/power-go-client/power/models" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/hashicorp/go-uuid" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" +) + +func DataSourceIBMPINetworkAddressGroups() *schema.Resource { + return &schema.Resource{ + ReadContext: dataSourceIBMPINetworkAddressGroupsRead, + + Schema: map[string]*schema.Schema{ + // Arguments + Arg_CloudInstanceID: { + Description: "The GUID of the service instance associated with an account.", + Required: true, + Type: schema.TypeString, + ValidateFunc: validation.NoZeroValues, + }, + + // Attributes + Attr_NetworkAddressGroups: { + Computed: true, + Description: "list of Network Address Groups.", + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + Attr_CRN: { + Computed: true, + Description: "The Network Address Group's crn.", + Type: schema.TypeString, + }, + Attr_ID: { + Computed: true, + Description: "The id of the Network Address Group.", + Type: schema.TypeString, + }, + Attr_Members: { + Computed: true, + Description: "The list of IP addresses in CIDR notation (for example 192.168.66.2/32) in the Network Address Group.", + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + Attr_CIDR: { + Computed: true, + Description: "The IP addresses in CIDR notation for example 192.168.1.5/32.", + Type: schema.TypeString, + }, + Attr_ID: { + Computed: true, + Description: "The id of the Network Address Group member IP addresses.", + Type: schema.TypeString, + }, + }, + }, + Type: schema.TypeList, + }, + Attr_Name: { + Computed: true, + Description: "The name of the Network Address Group.", + Type: schema.TypeString, + }, + Attr_UserTags: { + Computed: true, + Description: "The user tags associated with this resource.", + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + Type: schema.TypeList, + }, + }, + }, + Type: schema.TypeList, + }, + }, + } +} + +func dataSourceIBMPINetworkAddressGroupsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + sess, err := meta.(conns.ClientSession).IBMPISession() + if err != nil { + return diag.FromErr(err) + } + + cloudInstanceID := d.Get(Arg_CloudInstanceID).(string) + nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, cloudInstanceID) + networkAddressGroups, err := nagC.GetAll() + if err != nil { + return diag.FromErr(err) + } + + var genID, _ = uuid.GenerateUUID() + d.SetId(genID) + + nags := []map[string]interface{}{} + if networkAddressGroups.NetworkAddressGroups != nil { + for _, nag := range networkAddressGroups.NetworkAddressGroups { + modelMap := networkAddressGroupsNetworkAddressGroupToMap(nag) + nags = append(nags, modelMap) + } + } + d.Set(Attr_NetworkAddressGroups, nags) + + return nil +} + +func networkAddressGroupsNetworkAddressGroupToMap(networkAddressGroup *models.NetworkAddressGroup) map[string]interface{} { + nag := make(map[string]interface{}) + nag[Attr_CRN] = networkAddressGroup.Crn + nag[Attr_ID] = networkAddressGroup.ID + if networkAddressGroup.Members != nil { + members := []map[string]interface{}{} + for _, membersItem := range networkAddressGroup.Members { + member := memberToMap(membersItem) + members = append(members, member) + } + nag[Attr_Members] = members + } + nag[Attr_Name] = networkAddressGroup.Name + if len(networkAddressGroup.UserTags) > 0 { + nag[Attr_UserTags] = networkAddressGroup.UserTags + } + return nag +} + +func memberToMap(mbr *models.NetworkAddressGroupMember) map[string]interface{} { + member := make(map[string]interface{}) + member[Attr_CIDR] = mbr.Cidr + member[Attr_ID] = mbr.ID + return member +} diff --git a/ibm/service/power/data_source_ibm_pi_network_address_groups_test.go b/ibm/service/power/data_source_ibm_pi_network_address_groups_test.go new file mode 100644 index 0000000000..fdb1f2c34f --- /dev/null +++ b/ibm/service/power/data_source_ibm_pi_network_address_groups_test.go @@ -0,0 +1,35 @@ +// Copyright IBM Corp. 2024 All Rights Reserved. +// Licensed under the Mozilla Public License v2.0 + +package power_test + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + + acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest" +) + +func TestAccIBMPINetworkAddressGroupsDataSourceBasic(t *testing.T) { + resource.Test(t, resource.TestCase{ + PreCheck: func() { acc.TestAccPreCheck(t) }, + Providers: acc.TestAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccCheckIBMPINetworkAddressGroupsDataSourceConfigBasic(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet("data.ibm_pi_network_address_groups.network_address_groups", "id"), + ), + }, + }, + }) +} + +func testAccCheckIBMPINetworkAddressGroupsDataSourceConfigBasic() string { + return fmt.Sprintf(` + data "ibm_pi_network_address_groups" "network_address_groups" { + pi_cloud_instance_id = "%s" + }`, acc.Pi_cloud_instance_id) +} diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index 224a3e6338..d0933b7aca 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/ibm/service/power/ibm_pi_constants.go @@ -44,6 +44,8 @@ const ( Arg_Memory = "pi_memory" Arg_Name = "pi_name" Arg_Network = "pi_network" + Arg_NetworkAddressGroupID = "pi_network_address_group_id" + Arg_NetworkAddressGroupMemberID = "pi_network_address_group_member_id" Arg_NetworkName = "pi_network_name" Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool" Arg_PinPolicy = "pi_pin_policy" @@ -85,6 +87,7 @@ const ( Arg_SysType = "pi_sys_type" Arg_TargetStorageTier = "pi_target_storage_tier" Arg_UserData = "pi_user_data" + Arg_UserTags = "pi_user_tags" Arg_VirtualCoresAssigned = "pi_virtual_cores_assigned" Arg_VirtualOpticalDevice = "pi_virtual_optical_device" Arg_VolumeCloneName = "pi_volume_clone_name" @@ -248,6 +251,8 @@ const ( Attr_MirroringState = "mirroring_state" Attr_MTU = "mtu" Attr_Name = "name" + Attr_NetworkAddressGroupID = "network_address_group_id" + Attr_NetworkAddressGroups = "network_address_groups" Attr_NetworkID = "network_id" Attr_NetworkName = "network_name" Attr_NetworkPorts = "network_ports" @@ -366,6 +371,7 @@ const ( Attr_UsedIPPercent = "used_ip_percent" Attr_UsedMemory = "used_memory" Attr_UserIPAddress = "user_ip_address" + Attr_UserTags = "user_tags" Attr_VCPUs = "vcpus" Attr_Vendor = "vendor" Attr_VirtualCoresAssigned = "virtual_cores_assigned" diff --git a/ibm/service/power/resource_ibm_pi_network_address_group.go b/ibm/service/power/resource_ibm_pi_network_address_group.go new file mode 100644 index 0000000000..6448da0f94 --- /dev/null +++ b/ibm/service/power/resource_ibm_pi_network_address_group.go @@ -0,0 +1,191 @@ +// Copyright IBM Corp. 2024 All Rights Reserved. +// Licensed under the Mozilla Public License v2.0 + +package power + +import ( + "context" + "fmt" + + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + + "github.com/IBM-Cloud/power-go-client/clients/instance" + "github.com/IBM-Cloud/power-go-client/power/models" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" +) + +func ResourceIBMPINetworkAddressGroup() *schema.Resource { + return &schema.Resource{ + CreateContext: resourceIBMPINetworkAddressGroupCreate, + ReadContext: resourceIBMPINetworkAddressGroupRead, + UpdateContext: resourceIBMPINetworkAddressGroupUpdate, + DeleteContext: resourceIBMPINetworkAddressGroupDelete, + Importer: &schema.ResourceImporter{}, + + Schema: map[string]*schema.Schema{ + // Arguments + Arg_CloudInstanceID: { + Description: "The GUID of the service instance associated with an account.", + ForceNew: true, + Required: true, + Type: schema.TypeString, + ValidateFunc: validation.NoZeroValues, + }, + Arg_Name: { + Description: "The name of the Network Address Group.", + Required: true, + Type: schema.TypeString, + ValidateFunc: validation.NoZeroValues, + }, + Arg_UserTags: { + Description: "The user tags associated with this resource.", + Elem: &schema.Schema{Type: schema.TypeString}, + ForceNew: true, + Optional: true, + Type: schema.TypeList, + }, + // Attributes + Attr_CRN: { + Computed: true, + Description: "The Network Address Group's crn.", + Type: schema.TypeString, + }, + Attr_NetworkAddressGroupID: { + Computed: true, + Description: "The unique identifier of the network address group.", + Type: schema.TypeString, + }, + Attr_Members: { + Computed: true, + Description: "The list of IP addresses in CIDR notation (for example 192.168.66.2/32) in the Network Address Group.", + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + Attr_CIDR: { + Computed: true, + Description: "The IP addresses in CIDR notation for example 192.168.1.5/32.", + Type: schema.TypeString, + }, + Attr_ID: { + Computed: true, + Description: "The id of the Network Address Group member IP addresses.", + Type: schema.TypeString, + }, + }, + }, + Type: schema.TypeList, + }, + }, + } +} + +func resourceIBMPINetworkAddressGroupCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + sess, err := meta.(conns.ClientSession).IBMPISession() + if err != nil { + return diag.FromErr(err) + } + + cloudInstanceID := d.Get(Arg_CloudInstanceID).(string) + name := d.Get(Arg_Name).(string) + nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, cloudInstanceID) + var body = &models.NetworkAddressGroupCreate{ + Name: &name, + } + + if _, ok := d.GetOk(Arg_UserTags); ok { + var userTags []string + for _, v := range d.Get(Arg_UserTags).([]interface{}) { + userTagsItem := v.(string) + userTags = append(userTags, userTagsItem) + } + body.UserTags = userTags + } + + networkAddressGroup, err := nagC.Create(body) + if err != nil { + return diag.FromErr(err) + } + + d.SetId(fmt.Sprintf("%s/%s", cloudInstanceID, *networkAddressGroup.ID)) + + return resourceIBMPINetworkAddressGroupRead(ctx, d, meta) +} + +func resourceIBMPINetworkAddressGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + sess, err := meta.(conns.ClientSession).IBMPISession() + if err != nil { + return diag.FromErr(err) + } + + cloudInstanceID, nagID, err := splitID(d.Id()) + if err != nil { + return diag.FromErr(err) + } + nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, cloudInstanceID) + networkAddressGroup, err := nagC.Get(nagID) + if err != nil { + return diag.FromErr(err) + } + d.Set(Arg_Name, networkAddressGroup.Name) + d.Set(Attr_CRN, networkAddressGroup.Crn) + d.Set(Attr_NetworkAddressGroupID, networkAddressGroup.ID) + members := []map[string]interface{}{} + if networkAddressGroup.Members != nil { + for _, mbr := range networkAddressGroup.Members { + member := memberToMap(mbr) + members = append(members, member) + } + d.Set(Attr_Members, members) + } + + return nil +} + +func resourceIBMPINetworkAddressGroupUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + sess, err := meta.(conns.ClientSession).IBMPISession() + if err != nil { + return diag.FromErr(err) + } + + cloudInstanceID, nagID, err := splitID(d.Id()) + if err != nil { + return diag.FromErr(err) + } + hasChange := false + body := &models.NetworkAddressGroupUpdate{} + if d.HasChange(Arg_Name) { + body.Name = d.Get(Arg_Name).(string) + hasChange = true + } + nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, cloudInstanceID) + if hasChange { + _, err := nagC.Update(nagID, body) + if err != nil { + return diag.FromErr(err) + } + } + + return resourceIBMPINetworkAddressGroupRead(ctx, d, meta) +} + +func resourceIBMPINetworkAddressGroupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + sess, err := meta.(conns.ClientSession).IBMPISession() + if err != nil { + return diag.FromErr(err) + } + + cloudInstanceID, nagID, err := splitID(d.Id()) + if err != nil { + return diag.FromErr(err) + } + nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, cloudInstanceID) + err = nagC.Delete(nagID) + if err != nil { + return diag.FromErr(err) + } + + d.SetId("") + + return nil +} diff --git a/ibm/service/power/resource_ibm_pi_network_address_group_member.go b/ibm/service/power/resource_ibm_pi_network_address_group_member.go new file mode 100644 index 0000000000..d56185327c --- /dev/null +++ b/ibm/service/power/resource_ibm_pi_network_address_group_member.go @@ -0,0 +1,246 @@ +// Copyright IBM Corp. 2024 All Rights Reserved. +// Licensed under the Mozilla Public License v2.0 + +package power + +import ( + "context" + "fmt" + "time" + + "github.com/IBM-Cloud/power-go-client/clients/instance" + "github.com/IBM-Cloud/power-go-client/power/models" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" +) + +func ResourceIBMPINetworkAddressGroupMember() *schema.Resource { + return &schema.Resource{ + CreateContext: resourceIBMPINetworkAddressGroupMemberCreate, + ReadContext: resourceIBMPINetworkAddressGroupMemberRead, + DeleteContext: resourceIBMPINetworkAddressGroupMemberDelete, + Importer: &schema.ResourceImporter{}, + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(60 * time.Minute), + Delete: schema.DefaultTimeout(60 * time.Minute), + }, + Schema: map[string]*schema.Schema{ + // Arguments + Arg_CloudInstanceID: { + Description: "The GUID of the service instance associated with an account.", + Required: true, + Type: schema.TypeString, + ValidateFunc: validation.NoZeroValues, + }, + Arg_Cidr: { + Description: "The member to add in CIDR format.", + ExactlyOneOf: []string{Arg_Cidr, Arg_NetworkAddressGroupMemberID}, + Optional: true, + Type: schema.TypeString, + }, + Arg_NetworkAddressGroupID: { + Description: "Network Address Group ID.", + ForceNew: true, + Optional: true, + Type: schema.TypeString, + }, + Arg_NetworkAddressGroupMemberID: { + Description: "The network address group member id to remove.", + ExactlyOneOf: []string{Arg_Cidr, Arg_NetworkAddressGroupMemberID}, + Optional: true, + Type: schema.TypeString, + }, + // Attributes + Attr_CRN: { + Computed: true, + Description: "The network address group's crn.", + Type: schema.TypeString, + }, + Attr_Members: { + Computed: true, + Description: "The list of IP addresses in CIDR notation (for example 192.168.66.2/32) in the Network Address Group.", + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + Attr_CIDR: { + Computed: true, + Description: "The IP addresses in CIDR notation for example 192.168.1.5/32.", + Type: schema.TypeString, + }, + Attr_ID: { + Computed: true, + Description: "The id of the Network Address Group member IP addresses.", + Type: schema.TypeString, + }, + }, + }, + Type: schema.TypeList, + }, + Attr_Name: { + Computed: true, + Description: "The name of the Network Address Group.", + Type: schema.TypeString, + }, + Attr_NetworkAddressGroupID: { + Computed: true, + Description: "The id of the network address group member IP addresses.", + Type: schema.TypeString, + }, + Attr_UserTags: { + Computed: true, + Description: "The user tags associated with this resource.", + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + Type: schema.TypeList, + }, + }, + } +} +func resourceIBMPINetworkAddressGroupMemberCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + sess, err := meta.(conns.ClientSession).IBMPISession() + if err != nil { + return diag.FromErr(err) + } + cloudInstanceID := d.Get(Arg_CloudInstanceID).(string) + nagID := d.Get(Arg_NetworkAddressGroupID).(string) + nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, cloudInstanceID) + var body = &models.NetworkAddressGroupAddMember{} + if v, ok := d.GetOk(Arg_Cidr); ok { + cidr := v.(string) + body.Cidr = &cidr + networkAddressGroup, err := nagC.AddMember(nagID, body) + if err != nil { + return diag.FromErr(err) + } + _, err = isWaitForIBMPINetworkAddressGroupMemberAdd(ctx, nagC, nagID, *networkAddressGroup.ID, d.Timeout(schema.TimeoutCreate)) + if err != nil { + return diag.FromErr(err) + } + d.SetId(fmt.Sprintf("%s/%s/%s", cloudInstanceID, nagID, *networkAddressGroup.ID)) + } + if v, ok := d.GetOk(Arg_NetworkAddressGroupMemberID); ok { + memberID := v.(string) + _, err := nagC.DeleteMember(nagID, memberID) + if err != nil { + return diag.FromErr(err) + } + _, err = isWaitForIBMPINetworkAddressGroupMemberRemove(ctx, nagC, nagID, memberID, d.Timeout(schema.TimeoutDelete)) + if err != nil { + return diag.FromErr(err) + } + d.SetId(fmt.Sprintf("%s/%s", cloudInstanceID, nagID)) + } + + return resourceIBMPINetworkAddressGroupMemberRead(ctx, d, meta) +} +func resourceIBMPINetworkAddressGroupMemberRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + sess, err := meta.(conns.ClientSession).IBMPISession() + if err != nil { + return diag.FromErr(err) + } + + parts, err := flex.SepIdParts(d.Id(), "/") + if err != nil { + return diag.FromErr(err) + } + nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, parts[0]) + networkAddressGroup, err := nagC.Get(parts[1]) + if err != nil { + return diag.FromErr(err) + } + + d.Set(Attr_CRN, networkAddressGroup.Crn) + members := []map[string]interface{}{} + if networkAddressGroup.Members != nil { + for _, mbr := range networkAddressGroup.Members { + member := memberToMap(mbr) + members = append(members, member) + } + d.Set(Attr_Members, members) + } + d.Set(Arg_Name, networkAddressGroup.Name) + d.Set(Attr_NetworkAddressGroupID, networkAddressGroup.ID) + if len(networkAddressGroup.UserTags) > 0 { + d.Set(Attr_UserTags, networkAddressGroup.UserTags) + } + + return nil +} +func resourceIBMPINetworkAddressGroupMemberDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + + d.SetId("") + + return nil +} +func isWaitForIBMPINetworkAddressGroupMemberAdd(ctx context.Context, client *instance.IBMPINetworkAddressGroupClient, id, memberID string, timeout time.Duration) (interface{}, error) { + + stateConf := &retry.StateChangeConf{ + Pending: []string{State_Pending}, + Target: []string{State_Available}, + Refresh: isIBMPINetworkAddressGroupMemberAddRefreshFunc(client, id, memberID), + Timeout: timeout, + Delay: 10 * time.Second, + MinTimeout: 10 * time.Minute, + } + + return stateConf.WaitForStateContext(ctx) +} +func isIBMPINetworkAddressGroupMemberAddRefreshFunc(client *instance.IBMPINetworkAddressGroupClient, id, memberID string) retry.StateRefreshFunc { + + return func() (interface{}, string, error) { + networkAddressGroup, err := client.Get(id) + if err != nil { + return nil, "", err + } + + if networkAddressGroup.Members != nil { + for _, mbr := range networkAddressGroup.Members { + if *mbr.ID == memberID { + return networkAddressGroup, State_Available, nil + } + + } + } + return networkAddressGroup, State_Pending, nil + } +} +func isWaitForIBMPINetworkAddressGroupMemberRemove(ctx context.Context, client *instance.IBMPINetworkAddressGroupClient, id, memberID string, timeout time.Duration) (interface{}, error) { + + stateConf := &retry.StateChangeConf{ + Pending: []string{State_Pending}, + Target: []string{State_Removed}, + Refresh: isIBMPINetworkAddressGroupMemberRemoveRefreshFunc(client, id, memberID), + Timeout: timeout, + Delay: 10 * time.Second, + MinTimeout: 10 * time.Minute, + } + + return stateConf.WaitForStateContext(ctx) +} +func isIBMPINetworkAddressGroupMemberRemoveRefreshFunc(client *instance.IBMPINetworkAddressGroupClient, id, memberID string) retry.StateRefreshFunc { + + return func() (interface{}, string, error) { + networkAddressGroup, err := client.Get(id) + if err != nil { + return nil, "", err + } + + if networkAddressGroup.Members != nil { + isMember := false + for _, mbr := range networkAddressGroup.Members { + if *mbr.ID == memberID { + isMember = true + return networkAddressGroup, State_Pending, nil + } + } + if !isMember { + return networkAddressGroup, State_Removed, nil + } + } + return networkAddressGroup, State_Pending, nil + } +} diff --git a/ibm/service/power/resource_ibm_pi_network_address_group_test.go b/ibm/service/power/resource_ibm_pi_network_address_group_test.go new file mode 100644 index 0000000000..9f332c4c7f --- /dev/null +++ b/ibm/service/power/resource_ibm_pi_network_address_group_test.go @@ -0,0 +1,114 @@ +// Copyright IBM Corp. 2024 All Rights Reserved. +// Licensed under the Mozilla Public License v2.0 + +package power_test + +import ( + "context" + "errors" + "fmt" + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + + "github.com/IBM-Cloud/power-go-client/clients/instance" + acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/power" +) + +func TestAccIBMPINetworkAddressGroupBasic(t *testing.T) { + name := fmt.Sprintf("tf-nag-name_%d", acctest.RandIntRange(10, 100)) + nameUpdate := fmt.Sprintf("tf-nag-name-%d", acctest.RandIntRange(10, 100)) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acc.TestAccPreCheck(t) }, + Providers: acc.TestAccProviders, + CheckDestroy: testAccCheckIBMPINetworkAddressGroupDestroy, + Steps: []resource.TestStep{ + { + Config: testAccCheckIBMPINetworkAddressGroupConfigBasic(name), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIBMPINetworkAddressGroupExists("ibm_pi_network_address_group.network_address_group"), + resource.TestCheckResourceAttrSet("ibm_pi_network_address_group.network_address_group", power.Attr_ID), + resource.TestCheckResourceAttrSet("ibm_pi_network_address_group.network_address_group", power.Attr_CRN), + resource.TestCheckResourceAttrSet("ibm_pi_network_address_group.network_address_group", power.Attr_NetworkAddressGroupID), + resource.TestCheckResourceAttr("ibm_pi_network_address_group.network_address_group", "name", name), + ), + }, + { + Config: testAccCheckIBMPINetworkAddressGroupConfigBasic(nameUpdate), + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr("ibm_pi_network_address_group.network_address_group", "name", nameUpdate), + resource.TestCheckResourceAttrSet("ibm_pi_network_address_group.network_address_group", power.Attr_ID), + resource.TestCheckResourceAttrSet("ibm_pi_network_address_group.network_address_group", power.Attr_CRN), + resource.TestCheckResourceAttrSet("ibm_pi_network_address_group.network_address_group", power.Attr_NetworkAddressGroupID), + ), + }, + }, + }) +} + +func testAccCheckIBMPINetworkAddressGroupConfigBasic(name string) string { + return fmt.Sprintf(` + resource "ibm_pi_network_address_group" "network_address_group" { + pi_cloud_instance_id = "%s" + pi_name = "%s" + } + `, acc.Pi_cloud_instance_id, name) +} + +func testAccCheckIBMPINetworkAddressGroupExists(n string) resource.TestCheckFunc { + + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return errors.New("No Record ID is set") + } + + sess, err := acc.TestAccProvider.Meta().(conns.ClientSession).IBMPISession() + if err != nil { + return err + } + cloudInstanceID, nagID, err := splitID(rs.Primary.ID) + if err != nil { + return err + } + nagC := instance.NewIBMPINetworkAddressGroupClient(context.Background(), sess, cloudInstanceID) + _, err = nagC.Get(nagID) + if err != nil { + return err + } + + return nil + } +} + +func testAccCheckIBMPINetworkAddressGroupDestroy(s *terraform.State) error { + sess, err := acc.TestAccProvider.Meta().(conns.ClientSession).IBMPISession() + if err != nil { + return err + } + for _, rs := range s.RootModule().Resources { + if rs.Type != "ibm_pi_network_address_group" { + continue + } + + cloudInstanceID, nagID, err := splitID(rs.Primary.ID) + if err != nil { + return err + } + nagC := instance.NewIBMPINetworkAddressGroupClient(context.Background(), sess, cloudInstanceID) + _, err = nagC.Get(nagID) + if err != nil { + return fmt.Errorf("network addess group still exists: %s", rs.Primary.ID) + } + } + return nil +} diff --git a/website/docs/d/pi_network_address_group.html.markdown b/website/docs/d/pi_network_address_group.html.markdown new file mode 100644 index 0000000000..72e740cf61 --- /dev/null +++ b/website/docs/d/pi_network_address_group.html.markdown @@ -0,0 +1,57 @@ +--- +layout: "ibm" +page_title: "IBM : ibm_pi_network_address_group" +description: |- + Get information about pi_network_address_group +subcategory: "Power Systems" +--- + +# ibm_pi_network_address_group + +Retrieves information about a network address group. + +## Example Usage + +```terraform + data "ibm_pi_network_address_group" "network_address_group" { + pi_cloud_instance_id = "" + pi_network_address_group_id = "" + } +``` + +### Notes + +- Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints. +- If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows: + - `region` - `lon` + - `zone` - `lon04` + +Example usage: + + ```terraform + provider "ibm" { + region = "lon" + zone = "lon04" + } + ``` + +## Argument Reference + +You can specify the following arguments for this data source. + +- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account. +- `pi_network_address_group_id` - (Required, String) network address group id or name. + +## Attribute Reference + +In addition to all argument reference list, you can access the following attribute references after your data source is created. + +- `id` - The unique identifier of the pi_network_address_group. +- `crn` - (String) The network address group's crn. + +- `members` - (List) The list of IP addresses in CIDR notation in the network address group. +Nested schema for `members`: + - `cidr` - (String) The IP addresses in CIDR notation, for example 192.168.1.5/32. + - `id` - (String) The id of the network address group member IP addresses. + +- `name` - (String) The name of the network address group. diff --git a/website/docs/d/pi_network_address_group_member.html.markdown b/website/docs/d/pi_network_address_group_member.html.markdown new file mode 100644 index 0000000000..c9f9f42075 --- /dev/null +++ b/website/docs/d/pi_network_address_group_member.html.markdown @@ -0,0 +1,61 @@ +--- +layout: "ibm" +page_title: "IBM : ibm_pi_network_address_group_member" +description: |- + Manages pi_network_address_group_member. +subcategory: "Power Systems" +--- + +# ibm_pi_network_address_group_member + +Add or remove a network address group member. + +## Example Usage + +```terraform + resource "ibm_pi_network_address_group_member" "network_address_group_member" { + pi_cloud_instance_id = "" + pi_cidr = "cidr" + pi_network_address_group_id = "network_address_group_id" + } +``` + +### Notes + +- Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints. +- If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows: + - `region` - `lon` + - `zone` - `lon04` + +Example usage: + + ```terraform + provider "ibm" { + region = "lon" + zone = "lon04" + } + ``` + +## Argument Reference + +Review the argument references that you can specify for your resource. + +- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account. +- `pi_cidr` - (Optional, String) The member to add in CIDR format. Required if `pi_network_address_group_member_id` not provided. +- `pi_network_address_group_id` - (Required, String) network address group id or name. +- `pi_network_address_group_member_id` - (Optional, String) The network address group member id to remove. Required if `pi_cidr` not provided. + +## Attribute Reference + +In addition to all argument reference list, you can access the following attribute reference after your resource is created. + +- `crn` - (String) The network address group's crn. +- `network_address_group_id` - (String) The id of the network address group. +- `members` - (List) The list of IP addresses in CIDR notation in the network address group. + + Nested schema for `members`: + - `cidr` - (String) The IP addresses in CIDR notation, for example 192.168.1.5/32. + - `id` - (String) The id of the network address group member IP addresses. + +- `name` - (String) The name of the network address group. +- `userTags` - (String) The user tags associated with this resource. diff --git a/website/docs/d/pi_network_address_groups.html.markdown b/website/docs/d/pi_network_address_groups.html.markdown new file mode 100644 index 0000000000..7a8aad9fef --- /dev/null +++ b/website/docs/d/pi_network_address_groups.html.markdown @@ -0,0 +1,55 @@ +--- +layout: "ibm" +page_title: "IBM : ibm_pi_network_address_groups" +description: |- + Get information about pi_network_address_groups +subcategory: "Power Systems" +--- + +# ibm_pi_network_address_groups + +Retrieves information about a network address groups. + +## Example Usage + +```terraform + data "ibm_pi_network_address_groups" "network_address_groups" { + pi_cloud_instance_id = "" + } +``` + +### Notes + +- Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints. +- If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows: + - `region` - `lon` + - `zone` - `lon04` + +Example usage: + + ```terraform + provider "ibm" { + region = "lon" + zone = "lon04" + } + ``` + +## Argument reference + +Review the argument references that you can specify for your data source. + +- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account. + +## Attribute Reference + +In addition to all argument reference list, you can access the following attribute references after your data source is created. + +- `network_address_groups` - (List) list of network address groups. +Nested schema for **network_address_groups**: + - `crn` - (String) The network address group's crn. + - `id` - (String) The id of the network address group. + - `members` - (List) The list of IP addresses in CIDR notation (for example 192.168.66.2/32) in the network address group. + Nested schema for **members**: + - `cidr` - (String) The IP addresses in CIDR notation for example 192.168.1.5/32. + - `id` - (String) The id of the network address group member IP addresses. + - `name` - (String) The name of the network address group. diff --git a/website/docs/r/pi_network_address_group.html.markdown b/website/docs/r/pi_network_address_group.html.markdown new file mode 100644 index 0000000000..c10be09daa --- /dev/null +++ b/website/docs/r/pi_network_address_group.html.markdown @@ -0,0 +1,57 @@ +--- +layout: "ibm" +page_title: "IBM : ibm_pi_network_address_group" +description: |- + Manages network address group. +subcategory: "Power Systems" +--- + +# ibm_pi_network_address_group + +Create, update, and delete a network address group. + +## Example Usage + +The following example creates a network address group. + +```terraform + resource "ibm_pi_network_address_group" "network_address_group_instance" { + pi_cloud_instance_id = "" + pi_name = "name" + } +``` + +### Notes + +- Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints. +- If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows: + - `region` - `lon` + - `zone` - `lon04` + +Example usage: + + ```terraform + provider "ibm" { + region = "lon" + zone = "lon04" + } + ``` + +## Argument Reference + +Review the argument references that you can specify for your resource. + +- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account. +- `pi_name` - (Required, String) The name of the Network Address Group. +- `pi_user_tags` - (Optional, List) A list of tags. + +## Attribute Reference + +In addition to all argument reference list, you can access the following attribute reference after your resource is created. + +- `crn` - (String) The network address group's crn. +- `network_address_group_id` - (String) The unique identifier of the network address group. +- `members` - (List) The list of IP addresses in CIDR notation in the network address group. +Nested schema for `members`: + - `cidr` - (String) The IP addresses in CIDR notation, for example 192.168.1.5/32. + - `id` - (String) The id of the network address group member IP addresses.