Copilot commented on code in PR #201: URL: https://github.com/apache/cloudstack-terraform-provider/pull/201#discussion_r2300824681
########## cloudstack/resource_cloudstack_traffic_type.go: ########## @@ -0,0 +1,282 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +package cloudstack + +import ( + "fmt" + "log" + "strings" + + "github.com/apache/cloudstack-go/v2/cloudstack" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" +) + +func resourceCloudStackTrafficType() *schema.Resource { + return &schema.Resource{ + Create: resourceCloudStackTrafficTypeCreate, + Read: resourceCloudStackTrafficTypeRead, + Update: resourceCloudStackTrafficTypeUpdate, + Delete: resourceCloudStackTrafficTypeDelete, + Importer: &schema.ResourceImporter{ + State: resourceCloudStackTrafficTypeImport, + }, + + Schema: map[string]*schema.Schema{ + "physical_network_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "type": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "kvm_network_label": { + Type: schema.TypeString, + Optional: true, + }, + + "vlan": { + Type: schema.TypeString, + Optional: true, + }, + + "xen_network_label": { + Type: schema.TypeString, + Optional: true, + }, + + "vmware_network_label": { + Type: schema.TypeString, + Optional: true, + }, + + "hyperv_network_label": { + Type: schema.TypeString, + Optional: true, + }, + + "ovm3_network_label": { + Type: schema.TypeString, + Optional: true, + }, + }, + } +} + +func resourceCloudStackTrafficTypeCreate(d *schema.ResourceData, meta interface{}) error { + cs := meta.(*cloudstack.CloudStackClient) + + physicalNetworkID := d.Get("physical_network_id").(string) + trafficType := d.Get("type").(string) + + // Create a new parameter struct + p := cs.Usage.NewAddTrafficTypeParams(physicalNetworkID, trafficType) + + // Set optional parameters + if kvmNetworkLabel, ok := d.GetOk("kvm_network_label"); ok { + p.SetKvmnetworklabel(kvmNetworkLabel.(string)) + } + + if vlan, ok := d.GetOk("vlan"); ok { + p.SetVlan(vlan.(string)) + } + + if xenNetworkLabel, ok := d.GetOk("xen_network_label"); ok { + p.SetXennetworklabel(xenNetworkLabel.(string)) + } + + if vmwareNetworkLabel, ok := d.GetOk("vmware_network_label"); ok { + p.SetVmwarenetworklabel(vmwareNetworkLabel.(string)) + } + + if hypervNetworkLabel, ok := d.GetOk("hyperv_network_label"); ok { + p.SetHypervnetworklabel(hypervNetworkLabel.(string)) + } + + if ovm3NetworkLabel, ok := d.GetOk("ovm3_network_label"); ok { + p.SetOvm3networklabel(ovm3NetworkLabel.(string)) + } + + // Create the traffic type + r, err := cs.Usage.AddTrafficType(p) + if err != nil { + return fmt.Errorf("Error creating traffic type %s: %s", trafficType, err) + } + + d.SetId(r.Id) + + return resourceCloudStackTrafficTypeRead(d, meta) +} + +func resourceCloudStackTrafficTypeRead(d *schema.ResourceData, meta interface{}) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Get the traffic type details + p := cs.Usage.NewListTrafficTypesParams(d.Get("physical_network_id").(string)) + + l, err := cs.Usage.ListTrafficTypes(p) + if err != nil { + return err + } + + // Find the traffic type with the matching ID + var trafficType *cloudstack.TrafficType + for _, t := range l.TrafficTypes { + if t.Id == d.Id() { + trafficType = t + break + } + } + + if trafficType == nil { + log.Printf("[DEBUG] Traffic type %s does no longer exist", d.Get("type").(string)) + d.SetId("") + return nil + } + + // The TrafficType struct has a Name field which contains the traffic type + // But in some cases it might be empty, so we'll keep the original value from the state + if trafficType.Name != "" { + d.Set("type", trafficType.Name) + } + + // Note: The TrafficType struct doesn't have fields for network labels or VLAN + // We'll need to rely on what we store in the state + + return nil +} + +func resourceCloudStackTrafficTypeUpdate(d *schema.ResourceData, meta interface{}) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Create a new parameter struct + p := cs.Usage.NewUpdateTrafficTypeParams(d.Id()) + + // Only set the parameters that have changed and are supported by the API + if d.HasChange("kvm_network_label") { + p.SetKvmnetworklabel(d.Get("kvm_network_label").(string)) + } + + if d.HasChange("xen_network_label") { + p.SetXennetworklabel(d.Get("xen_network_label").(string)) + } + + if d.HasChange("vmware_network_label") { + p.SetVmwarenetworklabel(d.Get("vmware_network_label").(string)) + } + + if d.HasChange("hyperv_network_label") { + p.SetHypervnetworklabel(d.Get("hyperv_network_label").(string)) + } + + if d.HasChange("ovm3_network_label") { + p.SetOvm3networklabel(d.Get("ovm3_network_label").(string)) + } + + // Note: The UpdateTrafficTypeParams struct doesn't have a SetVlan method + // so we can't update the VLAN + + // Update the traffic type + _, err := cs.Usage.UpdateTrafficType(p) + if err != nil { + return fmt.Errorf("Error updating traffic type %s: %s", d.Get("type").(string), err) + } + + return resourceCloudStackTrafficTypeRead(d, meta) +} + +func resourceCloudStackTrafficTypeDelete(d *schema.ResourceData, meta interface{}) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Create a new parameter struct + p := cs.Usage.NewDeleteTrafficTypeParams(d.Id()) + + // Delete the traffic type + _, err := cs.Usage.DeleteTrafficType(p) + if err != nil { + // This is a very poor way to be told the ID does no longer exist :( + if strings.Contains(err.Error(), fmt.Sprintf( + "Invalid parameter id value=%s due to incorrect long value format, "+ + "or entity does not exist", d.Id())) { + return nil + } + + return fmt.Errorf("Error deleting traffic type %s: %s", d.Get("type").(string), err) + } + + return nil +} + +func resourceCloudStackTrafficTypeImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + // Import is expected to receive the traffic type ID + cs := meta.(*cloudstack.CloudStackClient) + + // We need to determine the physical_network_id by listing all physical networks and their traffic types + p := cs.Network.NewListPhysicalNetworksParams() + physicalNetworks, err := cs.Network.ListPhysicalNetworks(p) + if err != nil { + return nil, err + } + + // For each physical network, list its traffic types + for _, pn := range physicalNetworks.PhysicalNetworks { + tp := cs.Usage.NewListTrafficTypesParams(pn.Id) + trafficTypes, err := cs.Usage.ListTrafficTypes(tp) + if err != nil { + continue + } + + // Check if our traffic type ID is in this physical network + for _, tt := range trafficTypes.TrafficTypes { + if tt.Id == d.Id() { + // Found the physical network that contains our traffic type + d.Set("physical_network_id", pn.Id) + + // Set the type attribute - use the original value from the API call + // If the Name field is empty, use a default value based on the traffic type ID + if tt.Name != "" { + d.Set("type", tt.Name) + } else { + // Use a default value based on common traffic types + // This is a fallback and might not be accurate + d.Set("type", "Management") + } + + // For import to work correctly, we need to set default values for network labels + // These will be overridden by the user if needed + if d.Get("kvm_network_label") == "" { + d.Set("kvm_network_label", "cloudbr0") + } + + if d.Get("xen_network_label") == "" { + d.Set("xen_network_label", "xenbr0") + } + Review Comment: Setting default values during import can cause configuration drift. These hardcoded defaults may not match the actual CloudStack configuration and will cause Terraform to detect changes on subsequent plans. Consider removing these default assignments or making them optional. ```suggestion // Do not set hardcoded defaults for kvm_network_label or xen_network_label during import. // If the API provides these values, set them; otherwise, leave them unset. ``` ########## cloudstack/resource_cloudstack_network_service_provider.go: ########## @@ -0,0 +1,305 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +package cloudstack + +import ( + "fmt" + "log" + "strings" + + "github.com/apache/cloudstack-go/v2/cloudstack" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" +) + +func resourceCloudStackNetworkServiceProvider() *schema.Resource { + return &schema.Resource{ + Create: resourceCloudStackNetworkServiceProviderCreate, + Read: resourceCloudStackNetworkServiceProviderRead, + Update: resourceCloudStackNetworkServiceProviderUpdate, + Delete: resourceCloudStackNetworkServiceProviderDelete, + Importer: &schema.ResourceImporter{ + State: resourceCloudStackNetworkServiceProviderImport, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "physical_network_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "destination_physical_network_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "service_list": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: func(val any, key string) (warns []string, errs []error) { + v := val.(string) + if v != "Enabled" && v != "Disabled" { + errs = append(errs, fmt.Errorf("%q must be either 'Enabled' or 'Disabled', got: %s", key, v)) + } + return + }, + }, + }, + } +} + +func resourceCloudStackNetworkServiceProviderCreate(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + name := d.Get("name").(string) + physicalNetworkID := d.Get("physical_network_id").(string) + + // Check if the provider already exists + p := cs.Network.NewListNetworkServiceProvidersParams() + p.SetPhysicalnetworkid(physicalNetworkID) + p.SetName(name) + + l, err := cs.Network.ListNetworkServiceProviders(p) + if err != nil { + return fmt.Errorf("Error checking for existing network service provider %s: %s", name, err) + } + + if l.Count > 0 { + // Provider already exists, use its ID + d.SetId(l.NetworkServiceProviders[0].Id) + + // Update the provider if needed + needsUpdate := false + up := cs.Network.NewUpdateNetworkServiceProviderParams(d.Id()) + + // Update service list if provided and not SecurityGroupProvider + if serviceList, ok := d.GetOk("service_list"); ok && name != "SecurityGroupProvider" { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + up.SetServicelist(services) + needsUpdate = true + } + + // Update state if provided + if state, ok := d.GetOk("state"); ok { + up.SetState(state.(string)) + needsUpdate = true + } + + // Perform the update if needed + if needsUpdate { + _, err := cs.Network.UpdateNetworkServiceProvider(up) + if err != nil { + return fmt.Errorf("Error updating network service provider %s: %s", name, err) + } + } + } else { + // Provider doesn't exist, create a new one + cp := cs.Network.NewAddNetworkServiceProviderParams(name, physicalNetworkID) + + // Set optional parameters + if destinationPhysicalNetworkID, ok := d.GetOk("destination_physical_network_id"); ok { + cp.SetDestinationphysicalnetworkid(destinationPhysicalNetworkID.(string)) + } + + if serviceList, ok := d.GetOk("service_list"); ok { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + cp.SetServicelist(services) + } + + // Create the network service provider + r, err := cs.Network.AddNetworkServiceProvider(cp) + if err != nil { + return fmt.Errorf("Error creating network service provider %s: %s", name, err) + } + + d.SetId(r.Id) + } + + return resourceCloudStackNetworkServiceProviderRead(d, meta) +} + +func resourceCloudStackNetworkServiceProviderRead(d *schema.ResourceData, meta any) error { Review Comment: The parameter type should be `interface{}` instead of `any` for consistency with other functions in the codebase. ```suggestion func resourceCloudStackNetworkServiceProviderRead(d *schema.ResourceData, meta interface{}) error { ``` ########## cloudstack/provider.go: ########## @@ -90,54 +90,58 @@ func Provider() *schema.Provider { "cloudstack_user": dataSourceCloudstackUser(), "cloudstack_vpn_connection": dataSourceCloudstackVPNConnection(), "cloudstack_pod": dataSourceCloudstackPod(), + "cloudstack_physicalnetwork": dataSourceCloudStackPhysicalNetwork(), }, ResourcesMap: map[string]*schema.Resource{ - "cloudstack_affinity_group": resourceCloudStackAffinityGroup(), - "cloudstack_attach_volume": resourceCloudStackAttachVolume(), - "cloudstack_autoscale_vm_profile": resourceCloudStackAutoScaleVMProfile(), - "cloudstack_configuration": resourceCloudStackConfiguration(), - "cloudstack_disk": resourceCloudStackDisk(), - "cloudstack_egress_firewall": resourceCloudStackEgressFirewall(), - "cloudstack_firewall": resourceCloudStackFirewall(), - "cloudstack_host": resourceCloudStackHost(), - "cloudstack_instance": resourceCloudStackInstance(), - "cloudstack_ipaddress": resourceCloudStackIPAddress(), - "cloudstack_kubernetes_cluster": resourceCloudStackKubernetesCluster(), - "cloudstack_kubernetes_version": resourceCloudStackKubernetesVersion(), - "cloudstack_loadbalancer_rule": resourceCloudStackLoadBalancerRule(), - "cloudstack_network": resourceCloudStackNetwork(), - "cloudstack_network_acl": resourceCloudStackNetworkACL(), - "cloudstack_network_acl_rule": resourceCloudStackNetworkACLRule(), - "cloudstack_nic": resourceCloudStackNIC(), - "cloudstack_port_forward": resourceCloudStackPortForward(), - "cloudstack_private_gateway": resourceCloudStackPrivateGateway(), - "cloudstack_secondary_ipaddress": resourceCloudStackSecondaryIPAddress(), - "cloudstack_security_group": resourceCloudStackSecurityGroup(), - "cloudstack_security_group_rule": resourceCloudStackSecurityGroupRule(), - "cloudstack_ssh_keypair": resourceCloudStackSSHKeyPair(), - "cloudstack_static_nat": resourceCloudStackStaticNAT(), - "cloudstack_static_route": resourceCloudStackStaticRoute(), - "cloudstack_template": resourceCloudStackTemplate(), - "cloudstack_vpc": resourceCloudStackVPC(), - "cloudstack_vpn_connection": resourceCloudStackVPNConnection(), - "cloudstack_vpn_customer_gateway": resourceCloudStackVPNCustomerGateway(), - "cloudstack_vpn_gateway": resourceCloudStackVPNGateway(), - "cloudstack_network_offering": resourceCloudStackNetworkOffering(), - "cloudstack_disk_offering": resourceCloudStackDiskOffering(), - "cloudstack_volume": resourceCloudStackVolume(), - "cloudstack_zone": resourceCloudStackZone(), - "cloudstack_service_offering": resourceCloudStackServiceOffering(), - "cloudstack_account": resourceCloudStackAccount(), - "cloudstack_user": resourceCloudStackUser(), - "cloudstack_domain": resourceCloudStackDomain(), + "cloudstack_affinity_group": resourceCloudStackAffinityGroup(), + "cloudstack_attach_volume": resourceCloudStackAttachVolume(), + "cloudstack_autoscale_vm_profile": resourceCloudStackAutoScaleVMProfile(), + "cloudstack_configuration": resourceCloudStackConfiguration(), + "cloudstack_disk": resourceCloudStackDisk(), + "cloudstack_egress_firewall": resourceCloudStackEgressFirewall(), + "cloudstack_firewall": resourceCloudStackFirewall(), + "cloudstack_host": resourceCloudStackHost(), + "cloudstack_instance": resourceCloudStackInstance(), + "cloudstack_ipaddress": resourceCloudStackIPAddress(), + "cloudstack_kubernetes_cluster": resourceCloudStackKubernetesCluster(), + "cloudstack_kubernetes_version": resourceCloudStackKubernetesVersion(), + "cloudstack_loadbalancer_rule": resourceCloudStackLoadBalancerRule(), + "cloudstack_network": resourceCloudStackNetwork(), + "cloudstack_network_acl": resourceCloudStackNetworkACL(), + "cloudstack_network_acl_rule": resourceCloudStackNetworkACLRule(), + "cloudstack_nic": resourceCloudStackNIC(), + "cloudstack_port_forward": resourceCloudStackPortForward(), + "cloudstack_private_gateway": resourceCloudStackPrivateGateway(), + "cloudstack_secondary_ipaddress": resourceCloudStackSecondaryIPAddress(), + "cloudstack_security_group": resourceCloudStackSecurityGroup(), + "cloudstack_security_group_rule": resourceCloudStackSecurityGroupRule(), + "cloudstack_ssh_keypair": resourceCloudStackSSHKeyPair(), + "cloudstack_static_nat": resourceCloudStackStaticNAT(), + "cloudstack_static_route": resourceCloudStackStaticRoute(), + "cloudstack_template": resourceCloudStackTemplate(), + "cloudstack_vpc": resourceCloudStackVPC(), + "cloudstack_vpn_connection": resourceCloudStackVPNConnection(), + "cloudstack_vpn_customer_gateway": resourceCloudStackVPNCustomerGateway(), + "cloudstack_vpn_gateway": resourceCloudStackVPNGateway(), + "cloudstack_network_offering": resourceCloudStackNetworkOffering(), + "cloudstack_disk_offering": resourceCloudStackDiskOffering(), + "cloudstack_volume": resourceCloudStackVolume(), + "cloudstack_zone": resourceCloudStackZone(), + "cloudstack_service_offering": resourceCloudStackServiceOffering(), + "cloudstack_account": resourceCloudStackAccount(), + "cloudstack_user": resourceCloudStackUser(), + "cloudstack_domain": resourceCloudStackDomain(), + "cloudstack_physicalnetwork": resourceCloudStackPhysicalNetwork(), + "cloudstack_traffic_type": resourceCloudStackTrafficType(), + "cloudstack_network_service_provider": resourceCloudStackNetworkServiceProvider(), }, ConfigureFunc: providerConfigure, } } -func providerConfigure(d *schema.ResourceData) (interface{}, error) { +func providerConfigure(d *schema.ResourceData) (any, error) { Review Comment: The return type should be `interface{}` instead of `any` for consistency with the existing codebase pattern. This change appears unrelated to the main purpose of this PR and should be reverted. ```suggestion func providerConfigure(d *schema.ResourceData) (interface{}, error) { ``` ########## cloudstack/resource_cloudstack_network_service_provider.go: ########## @@ -0,0 +1,305 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +package cloudstack + +import ( + "fmt" + "log" + "strings" + + "github.com/apache/cloudstack-go/v2/cloudstack" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" +) + +func resourceCloudStackNetworkServiceProvider() *schema.Resource { + return &schema.Resource{ + Create: resourceCloudStackNetworkServiceProviderCreate, + Read: resourceCloudStackNetworkServiceProviderRead, + Update: resourceCloudStackNetworkServiceProviderUpdate, + Delete: resourceCloudStackNetworkServiceProviderDelete, + Importer: &schema.ResourceImporter{ + State: resourceCloudStackNetworkServiceProviderImport, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "physical_network_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "destination_physical_network_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "service_list": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: func(val any, key string) (warns []string, errs []error) { + v := val.(string) + if v != "Enabled" && v != "Disabled" { + errs = append(errs, fmt.Errorf("%q must be either 'Enabled' or 'Disabled', got: %s", key, v)) + } + return + }, + }, + }, + } +} + +func resourceCloudStackNetworkServiceProviderCreate(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + name := d.Get("name").(string) + physicalNetworkID := d.Get("physical_network_id").(string) + + // Check if the provider already exists + p := cs.Network.NewListNetworkServiceProvidersParams() + p.SetPhysicalnetworkid(physicalNetworkID) + p.SetName(name) + + l, err := cs.Network.ListNetworkServiceProviders(p) + if err != nil { + return fmt.Errorf("Error checking for existing network service provider %s: %s", name, err) + } + + if l.Count > 0 { + // Provider already exists, use its ID + d.SetId(l.NetworkServiceProviders[0].Id) + + // Update the provider if needed + needsUpdate := false + up := cs.Network.NewUpdateNetworkServiceProviderParams(d.Id()) + + // Update service list if provided and not SecurityGroupProvider + if serviceList, ok := d.GetOk("service_list"); ok && name != "SecurityGroupProvider" { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + up.SetServicelist(services) + needsUpdate = true + } + + // Update state if provided + if state, ok := d.GetOk("state"); ok { + up.SetState(state.(string)) + needsUpdate = true + } + + // Perform the update if needed + if needsUpdate { + _, err := cs.Network.UpdateNetworkServiceProvider(up) + if err != nil { + return fmt.Errorf("Error updating network service provider %s: %s", name, err) + } + } + } else { + // Provider doesn't exist, create a new one + cp := cs.Network.NewAddNetworkServiceProviderParams(name, physicalNetworkID) + + // Set optional parameters + if destinationPhysicalNetworkID, ok := d.GetOk("destination_physical_network_id"); ok { + cp.SetDestinationphysicalnetworkid(destinationPhysicalNetworkID.(string)) + } + + if serviceList, ok := d.GetOk("service_list"); ok { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + cp.SetServicelist(services) + } + + // Create the network service provider + r, err := cs.Network.AddNetworkServiceProvider(cp) + if err != nil { + return fmt.Errorf("Error creating network service provider %s: %s", name, err) + } + + d.SetId(r.Id) + } + + return resourceCloudStackNetworkServiceProviderRead(d, meta) +} + +func resourceCloudStackNetworkServiceProviderRead(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Get the network service provider details + p := cs.Network.NewListNetworkServiceProvidersParams() + p.SetPhysicalnetworkid(d.Get("physical_network_id").(string)) + + l, err := cs.Network.ListNetworkServiceProviders(p) + if err != nil { + return err + } + + // Find the network service provider with the matching ID + var provider *cloudstack.NetworkServiceProvider + for _, p := range l.NetworkServiceProviders { + if p.Id == d.Id() { + provider = p + break + } + } + + if provider == nil { + log.Printf("[DEBUG] Network service provider %s does no longer exist", d.Get("name").(string)) + d.SetId("") + return nil + } + + d.Set("name", provider.Name) + d.Set("physical_network_id", provider.Physicalnetworkid) + d.Set("state", provider.State) + + // Special handling for SecurityGroupProvider - don't set service_list to avoid drift + if provider.Name == "SecurityGroupProvider" { + // For SecurityGroupProvider, we don't manage the service list + // as it's predefined and can't be modified + if _, ok := d.GetOk("service_list"); ok { + // If service_list was explicitly set in config, keep it for consistency + // but don't update it from the API response + } else { + // If service_list wasn't in config, don't set it to avoid drift + } + } else { + // For other providers, set service list if available + if len(provider.Servicelist) > 0 { + d.Set("service_list", provider.Servicelist) + } + } + + return nil +} + +func resourceCloudStackNetworkServiceProviderUpdate(d *schema.ResourceData, meta any) error { Review Comment: The parameter type should be `interface{}` instead of `any` for consistency with other functions in the codebase. ```suggestion func resourceCloudStackNetworkServiceProviderUpdate(d *schema.ResourceData, meta interface{}) error { ``` ########## cloudstack/resource_cloudstack_network_service_provider.go: ########## @@ -0,0 +1,305 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +package cloudstack + +import ( + "fmt" + "log" + "strings" + + "github.com/apache/cloudstack-go/v2/cloudstack" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" +) + +func resourceCloudStackNetworkServiceProvider() *schema.Resource { + return &schema.Resource{ + Create: resourceCloudStackNetworkServiceProviderCreate, + Read: resourceCloudStackNetworkServiceProviderRead, + Update: resourceCloudStackNetworkServiceProviderUpdate, + Delete: resourceCloudStackNetworkServiceProviderDelete, + Importer: &schema.ResourceImporter{ + State: resourceCloudStackNetworkServiceProviderImport, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "physical_network_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "destination_physical_network_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "service_list": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: func(val any, key string) (warns []string, errs []error) { + v := val.(string) + if v != "Enabled" && v != "Disabled" { + errs = append(errs, fmt.Errorf("%q must be either 'Enabled' or 'Disabled', got: %s", key, v)) + } + return + }, + }, + }, + } +} + +func resourceCloudStackNetworkServiceProviderCreate(d *schema.ResourceData, meta any) error { Review Comment: The parameter type should be `interface{}` instead of `any` for consistency with other functions in the codebase. The `any` type is an alias for `interface{}` introduced in Go 1.18, but the codebase appears to use `interface{}` consistently elsewhere. ```suggestion func resourceCloudStackNetworkServiceProviderCreate(d *schema.ResourceData, meta interface{}) error { ``` ########## cloudstack/resource_cloudstack_network_service_provider.go: ########## @@ -0,0 +1,305 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +package cloudstack + +import ( + "fmt" + "log" + "strings" + + "github.com/apache/cloudstack-go/v2/cloudstack" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" +) + +func resourceCloudStackNetworkServiceProvider() *schema.Resource { + return &schema.Resource{ + Create: resourceCloudStackNetworkServiceProviderCreate, + Read: resourceCloudStackNetworkServiceProviderRead, + Update: resourceCloudStackNetworkServiceProviderUpdate, + Delete: resourceCloudStackNetworkServiceProviderDelete, + Importer: &schema.ResourceImporter{ + State: resourceCloudStackNetworkServiceProviderImport, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "physical_network_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "destination_physical_network_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "service_list": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: func(val any, key string) (warns []string, errs []error) { + v := val.(string) + if v != "Enabled" && v != "Disabled" { + errs = append(errs, fmt.Errorf("%q must be either 'Enabled' or 'Disabled', got: %s", key, v)) + } + return + }, + }, + }, + } +} + +func resourceCloudStackNetworkServiceProviderCreate(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + name := d.Get("name").(string) + physicalNetworkID := d.Get("physical_network_id").(string) + + // Check if the provider already exists + p := cs.Network.NewListNetworkServiceProvidersParams() + p.SetPhysicalnetworkid(physicalNetworkID) + p.SetName(name) + + l, err := cs.Network.ListNetworkServiceProviders(p) + if err != nil { + return fmt.Errorf("Error checking for existing network service provider %s: %s", name, err) + } + + if l.Count > 0 { + // Provider already exists, use its ID + d.SetId(l.NetworkServiceProviders[0].Id) + + // Update the provider if needed + needsUpdate := false + up := cs.Network.NewUpdateNetworkServiceProviderParams(d.Id()) + + // Update service list if provided and not SecurityGroupProvider + if serviceList, ok := d.GetOk("service_list"); ok && name != "SecurityGroupProvider" { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + up.SetServicelist(services) + needsUpdate = true + } + + // Update state if provided + if state, ok := d.GetOk("state"); ok { + up.SetState(state.(string)) + needsUpdate = true + } + + // Perform the update if needed + if needsUpdate { + _, err := cs.Network.UpdateNetworkServiceProvider(up) + if err != nil { + return fmt.Errorf("Error updating network service provider %s: %s", name, err) + } + } + } else { + // Provider doesn't exist, create a new one + cp := cs.Network.NewAddNetworkServiceProviderParams(name, physicalNetworkID) + + // Set optional parameters + if destinationPhysicalNetworkID, ok := d.GetOk("destination_physical_network_id"); ok { + cp.SetDestinationphysicalnetworkid(destinationPhysicalNetworkID.(string)) + } + + if serviceList, ok := d.GetOk("service_list"); ok { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + cp.SetServicelist(services) + } + + // Create the network service provider + r, err := cs.Network.AddNetworkServiceProvider(cp) + if err != nil { + return fmt.Errorf("Error creating network service provider %s: %s", name, err) + } + + d.SetId(r.Id) + } + + return resourceCloudStackNetworkServiceProviderRead(d, meta) +} + +func resourceCloudStackNetworkServiceProviderRead(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Get the network service provider details + p := cs.Network.NewListNetworkServiceProvidersParams() + p.SetPhysicalnetworkid(d.Get("physical_network_id").(string)) + + l, err := cs.Network.ListNetworkServiceProviders(p) + if err != nil { + return err + } + + // Find the network service provider with the matching ID + var provider *cloudstack.NetworkServiceProvider + for _, p := range l.NetworkServiceProviders { + if p.Id == d.Id() { + provider = p + break + } + } + + if provider == nil { + log.Printf("[DEBUG] Network service provider %s does no longer exist", d.Get("name").(string)) + d.SetId("") + return nil + } + + d.Set("name", provider.Name) + d.Set("physical_network_id", provider.Physicalnetworkid) + d.Set("state", provider.State) + + // Special handling for SecurityGroupProvider - don't set service_list to avoid drift + if provider.Name == "SecurityGroupProvider" { + // For SecurityGroupProvider, we don't manage the service list + // as it's predefined and can't be modified + if _, ok := d.GetOk("service_list"); ok { + // If service_list was explicitly set in config, keep it for consistency + // but don't update it from the API response + } else { + // If service_list wasn't in config, don't set it to avoid drift + } + } else { + // For other providers, set service list if available + if len(provider.Servicelist) > 0 { + d.Set("service_list", provider.Servicelist) + } + } + + return nil +} + +func resourceCloudStackNetworkServiceProviderUpdate(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Check if we need to update the provider + if d.HasChange("service_list") || d.HasChange("state") { + // Create a new parameter struct + p := cs.Network.NewUpdateNetworkServiceProviderParams(d.Id()) + + // Update service list if changed and not SecurityGroupProvider + if d.HasChange("service_list") && d.Get("name").(string) != "SecurityGroupProvider" { + if serviceList, ok := d.GetOk("service_list"); ok { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + p.SetServicelist(services) + } + } + + // Update state if changed + if d.HasChange("state") { + state := d.Get("state").(string) + p.SetState(state) + } + + // Update the network service provider + _, err := cs.Network.UpdateNetworkServiceProvider(p) + if err != nil { + return fmt.Errorf("Error updating network service provider %s: %s", d.Get("name").(string), err) + } + } + + return resourceCloudStackNetworkServiceProviderRead(d, meta) +} + +func resourceCloudStackNetworkServiceProviderDelete(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Create a new parameter struct + p := cs.Network.NewDeleteNetworkServiceProviderParams(d.Id()) + + // Delete the network service provider + _, err := cs.Network.DeleteNetworkServiceProvider(p) + if err != nil { + // This is a very poor way to be told the ID does no longer exist :( + if strings.Contains(err.Error(), fmt.Sprintf( + "Invalid parameter id value=%s due to incorrect long value format, "+ + "or entity does not exist", d.Id())) { + return nil + } + + return fmt.Errorf("Error deleting network service provider %s: %s", d.Get("name").(string), err) + } + + return nil +} + +func resourceCloudStackNetworkServiceProviderImport(d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { Review Comment: The parameter type should be `interface{}` instead of `any` for consistency with other functions in the codebase. ```suggestion func resourceCloudStackNetworkServiceProviderImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { ``` ########## cloudstack/resource_cloudstack_network_service_provider.go: ########## @@ -0,0 +1,305 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +package cloudstack + +import ( + "fmt" + "log" + "strings" + + "github.com/apache/cloudstack-go/v2/cloudstack" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" +) + +func resourceCloudStackNetworkServiceProvider() *schema.Resource { + return &schema.Resource{ + Create: resourceCloudStackNetworkServiceProviderCreate, + Read: resourceCloudStackNetworkServiceProviderRead, + Update: resourceCloudStackNetworkServiceProviderUpdate, + Delete: resourceCloudStackNetworkServiceProviderDelete, + Importer: &schema.ResourceImporter{ + State: resourceCloudStackNetworkServiceProviderImport, + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "physical_network_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "destination_physical_network_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "service_list": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: func(val any, key string) (warns []string, errs []error) { + v := val.(string) + if v != "Enabled" && v != "Disabled" { + errs = append(errs, fmt.Errorf("%q must be either 'Enabled' or 'Disabled', got: %s", key, v)) + } + return + }, + }, + }, + } +} + +func resourceCloudStackNetworkServiceProviderCreate(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + name := d.Get("name").(string) + physicalNetworkID := d.Get("physical_network_id").(string) + + // Check if the provider already exists + p := cs.Network.NewListNetworkServiceProvidersParams() + p.SetPhysicalnetworkid(physicalNetworkID) + p.SetName(name) + + l, err := cs.Network.ListNetworkServiceProviders(p) + if err != nil { + return fmt.Errorf("Error checking for existing network service provider %s: %s", name, err) + } + + if l.Count > 0 { + // Provider already exists, use its ID + d.SetId(l.NetworkServiceProviders[0].Id) + + // Update the provider if needed + needsUpdate := false + up := cs.Network.NewUpdateNetworkServiceProviderParams(d.Id()) + + // Update service list if provided and not SecurityGroupProvider + if serviceList, ok := d.GetOk("service_list"); ok && name != "SecurityGroupProvider" { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + up.SetServicelist(services) + needsUpdate = true + } + + // Update state if provided + if state, ok := d.GetOk("state"); ok { + up.SetState(state.(string)) + needsUpdate = true + } + + // Perform the update if needed + if needsUpdate { + _, err := cs.Network.UpdateNetworkServiceProvider(up) + if err != nil { + return fmt.Errorf("Error updating network service provider %s: %s", name, err) + } + } + } else { + // Provider doesn't exist, create a new one + cp := cs.Network.NewAddNetworkServiceProviderParams(name, physicalNetworkID) + + // Set optional parameters + if destinationPhysicalNetworkID, ok := d.GetOk("destination_physical_network_id"); ok { + cp.SetDestinationphysicalnetworkid(destinationPhysicalNetworkID.(string)) + } + + if serviceList, ok := d.GetOk("service_list"); ok { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + cp.SetServicelist(services) + } + + // Create the network service provider + r, err := cs.Network.AddNetworkServiceProvider(cp) + if err != nil { + return fmt.Errorf("Error creating network service provider %s: %s", name, err) + } + + d.SetId(r.Id) + } + + return resourceCloudStackNetworkServiceProviderRead(d, meta) +} + +func resourceCloudStackNetworkServiceProviderRead(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Get the network service provider details + p := cs.Network.NewListNetworkServiceProvidersParams() + p.SetPhysicalnetworkid(d.Get("physical_network_id").(string)) + + l, err := cs.Network.ListNetworkServiceProviders(p) + if err != nil { + return err + } + + // Find the network service provider with the matching ID + var provider *cloudstack.NetworkServiceProvider + for _, p := range l.NetworkServiceProviders { + if p.Id == d.Id() { + provider = p + break + } + } + + if provider == nil { + log.Printf("[DEBUG] Network service provider %s does no longer exist", d.Get("name").(string)) + d.SetId("") + return nil + } + + d.Set("name", provider.Name) + d.Set("physical_network_id", provider.Physicalnetworkid) + d.Set("state", provider.State) + + // Special handling for SecurityGroupProvider - don't set service_list to avoid drift + if provider.Name == "SecurityGroupProvider" { + // For SecurityGroupProvider, we don't manage the service list + // as it's predefined and can't be modified + if _, ok := d.GetOk("service_list"); ok { + // If service_list was explicitly set in config, keep it for consistency + // but don't update it from the API response + } else { + // If service_list wasn't in config, don't set it to avoid drift + } + } else { + // For other providers, set service list if available + if len(provider.Servicelist) > 0 { + d.Set("service_list", provider.Servicelist) + } + } + + return nil +} + +func resourceCloudStackNetworkServiceProviderUpdate(d *schema.ResourceData, meta any) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Check if we need to update the provider + if d.HasChange("service_list") || d.HasChange("state") { + // Create a new parameter struct + p := cs.Network.NewUpdateNetworkServiceProviderParams(d.Id()) + + // Update service list if changed and not SecurityGroupProvider + if d.HasChange("service_list") && d.Get("name").(string) != "SecurityGroupProvider" { + if serviceList, ok := d.GetOk("service_list"); ok { + services := make([]string, len(serviceList.([]any))) + for i, v := range serviceList.([]any) { + services[i] = v.(string) + } + p.SetServicelist(services) + } + } + + // Update state if changed + if d.HasChange("state") { + state := d.Get("state").(string) + p.SetState(state) + } + + // Update the network service provider + _, err := cs.Network.UpdateNetworkServiceProvider(p) + if err != nil { + return fmt.Errorf("Error updating network service provider %s: %s", d.Get("name").(string), err) + } + } + + return resourceCloudStackNetworkServiceProviderRead(d, meta) +} + +func resourceCloudStackNetworkServiceProviderDelete(d *schema.ResourceData, meta any) error { Review Comment: The parameter type should be `interface{}` instead of `any` for consistency with other functions in the codebase. ```suggestion func resourceCloudStackNetworkServiceProviderDelete(d *schema.ResourceData, meta interface{}) error { ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@cloudstack.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
