From c79404b11e872d473e90437f8ee49271086bc956 Mon Sep 17 00:00:00 2001 From: michaelkad <45772690+michaelkad@users.noreply.github.com> Date: Mon, 22 Apr 2024 07:58:42 -0500 Subject: [PATCH] Sort constants and Provider (#5264) * Sort constants and Provider * Fix conflicts --- ibm/provider/provider.go | 48 ++++++------ ibm/service/power/ibm_pi_constants.go | 105 +++++++++++--------------- 2 files changed, 70 insertions(+), 83 deletions(-) diff --git a/ibm/provider/provider.go b/ibm/provider/provider.go index d992bbd2d4..779691e630 100644 --- a/ibm/provider/provider.go +++ b/ibm/provider/provider.go @@ -610,16 +610,16 @@ func Provider() *schema.Provider { "ibm_pi_disaster_recovery_locations": power.DataSourceIBMPIDisasterRecoveryLocations(), "ibm_pi_image": power.DataSourceIBMPIImage(), "ibm_pi_images": power.DataSourceIBMPIImages(), - "ibm_pi_instance": power.DataSourceIBMPIInstance(), "ibm_pi_instance_ip": power.DataSourceIBMPIInstanceIP(), "ibm_pi_instance_snapshot": power.DataSourceIBMPIInstanceSnapshot(), "ibm_pi_instance_snapshots": power.DataSourceIBMPIInstanceSnapshots(), "ibm_pi_instance_volumes": power.DataSourceIBMPIInstanceVolumes(), + "ibm_pi_instance": power.DataSourceIBMPIInstance(), "ibm_pi_instances": power.DataSourceIBMPIInstances(), "ibm_pi_key": power.DataSourceIBMPIKey(), "ibm_pi_keys": power.DataSourceIBMPIKeys(), - "ibm_pi_network": power.DataSourceIBMPINetwork(), "ibm_pi_network_port": power.DataSourceIBMPINetworkPort(), + "ibm_pi_network": power.DataSourceIBMPINetwork(), "ibm_pi_placement_group": power.DataSourceIBMPIPlacementGroup(), "ibm_pi_placement_groups": power.DataSourceIBMPIPlacementGroups(), "ibm_pi_public_network": power.DataSourceIBMPIPublicNetwork(), @@ -636,18 +636,18 @@ func Provider() *schema.Provider { "ibm_pi_storage_types_capacity": power.DataSourceIBMPIStorageTypesCapacity(), "ibm_pi_system_pools": power.DataSourceIBMPISystemPools(), "ibm_pi_tenant": power.DataSourceIBMPITenant(), - "ibm_pi_volume": power.DataSourceIBMPIVolume(), "ibm_pi_volume_clone": power.DataSourceIBMPIVolumeClone(), "ibm_pi_volume_flash_copy_mappings": power.DataSourceIBMPIVolumeFlashCopyMappings(), - "ibm_pi_volume_group": power.DataSourceIBMPIVolumeGroup(), "ibm_pi_volume_group_details": power.DataSourceIBMPIVolumeGroupDetails(), "ibm_pi_volume_group_remote_copy_relationships": power.DataSourceIBMPIVolumeGroupRemoteCopyRelationships(), "ibm_pi_volume_group_storage_details": power.DataSourceIBMPIVolumeGroupStorageDetails(), - "ibm_pi_volume_groups": power.DataSourceIBMPIVolumeGroups(), + "ibm_pi_volume_group": power.DataSourceIBMPIVolumeGroup(), "ibm_pi_volume_groups_details": power.DataSourceIBMPIVolumeGroupsDetails(), + "ibm_pi_volume_groups": power.DataSourceIBMPIVolumeGroups(), "ibm_pi_volume_onboarding": power.DataSourceIBMPIVolumeOnboarding(), "ibm_pi_volume_onboardings": power.DataSourceIBMPIVolumeOnboardings(), "ibm_pi_volume_remote_copy_relationship": power.DataSourceIBMPIVolumeRemoteCopyRelationship(), + "ibm_pi_volume": power.DataSourceIBMPIVolume(), "ibm_pi_workspace": power.DatasourceIBMPIWorkspace(), "ibm_pi_workspaces": power.DatasourceIBMPIWorkspaces(), @@ -1190,31 +1190,31 @@ func Provider() *schema.Provider { "ibm_hardware_firewall_shared": classicinfrastructure.ResourceIBMFirewallShared(), // Added for Power Colo - "ibm_pi_key": power.ResourceIBMPIKey(), - "ibm_pi_volume": power.ResourceIBMPIVolume(), - "ibm_pi_volume_onboarding": power.ResourceIBMPIVolumeOnboarding(), - "ibm_pi_volume_group": power.ResourceIBMPIVolumeGroup(), - "ibm_pi_volume_clone": power.ResourceIBMPIVolumeClone(), - "ibm_pi_volume_group_action": power.ResourceIBMPIVolumeGroupAction(), - "ibm_pi_network": power.ResourceIBMPINetwork(), - "ibm_pi_instance": power.ResourceIBMPIInstance(), - "ibm_pi_instance_action": power.ResourceIBMPIInstanceAction(), - "ibm_pi_volume_attach": power.ResourceIBMPIVolumeAttach(), "ibm_pi_capture": power.ResourceIBMPICapture(), - "ibm_pi_image": power.ResourceIBMPIImage(), - "ibm_pi_image_export": power.ResourceIBMPIImageExport(), - "ibm_pi_snapshot": power.ResourceIBMPISnapshot(), - "ibm_pi_network_port_attach": power.ResourceIBMPINetworkPortAttach(), - "ibm_pi_dhcp": power.ResourceIBMPIDhcp(), - "ibm_pi_cloud_connection": power.ResourceIBMPICloudConnection(), "ibm_pi_cloud_connection_network_attach": power.ResourceIBMPICloudConnectionNetworkAttach(), + "ibm_pi_cloud_connection": power.ResourceIBMPICloudConnection(), + "ibm_pi_console_language": power.ResourceIBMPIInstanceConsoleLanguage(), + "ibm_pi_dhcp": power.ResourceIBMPIDhcp(), "ibm_pi_ike_policy": power.ResourceIBMPIIKEPolicy(), + "ibm_pi_image_export": power.ResourceIBMPIImageExport(), + "ibm_pi_image": power.ResourceIBMPIImage(), + "ibm_pi_instance_action": power.ResourceIBMPIInstanceAction(), + "ibm_pi_instance": power.ResourceIBMPIInstance(), "ibm_pi_ipsec_policy": power.ResourceIBMPIIPSecPolicy(), - "ibm_pi_vpn_connection": power.ResourceIBMPIVPNConnection(), - "ibm_pi_console_language": power.ResourceIBMPIInstanceConsoleLanguage(), + "ibm_pi_key": power.ResourceIBMPIKey(), + "ibm_pi_network_port_attach": power.ResourceIBMPINetworkPortAttach(), + "ibm_pi_network": power.ResourceIBMPINetwork(), "ibm_pi_placement_group": power.ResourceIBMPIPlacementGroup(), - "ibm_pi_spp_placement_group": power.ResourceIBMPISPPPlacementGroup(), "ibm_pi_shared_processor_pool": power.ResourceIBMPISharedProcessorPool(), + "ibm_pi_snapshot": power.ResourceIBMPISnapshot(), + "ibm_pi_spp_placement_group": power.ResourceIBMPISPPPlacementGroup(), + "ibm_pi_volume_attach": power.ResourceIBMPIVolumeAttach(), + "ibm_pi_volume_clone": power.ResourceIBMPIVolumeClone(), + "ibm_pi_volume_group_action": power.ResourceIBMPIVolumeGroupAction(), + "ibm_pi_volume_group": power.ResourceIBMPIVolumeGroup(), + "ibm_pi_volume_onboarding": power.ResourceIBMPIVolumeOnboarding(), + "ibm_pi_volume": power.ResourceIBMPIVolume(), + "ibm_pi_vpn_connection": power.ResourceIBMPIVPNConnection(), "ibm_pi_workspace": power.ResourceIBMPIWorkspace(), // Private DNS related resources diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index 85ba00d787..c3f0fba922 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/ibm/service/power/ibm_pi_constants.go @@ -6,11 +6,25 @@ const ( // Arguments Arg_CloudConnectionName = "pi_cloud_connection_name" Arg_CloudInstanceID = "pi_cloud_instance_id" + Arg_DatacenterZone = "pi_datacenter_zone" + Arg_DhcpCidr = "pi_cidr" + Arg_DhcpCloudConnectionID = "pi_cloud_connection_id" + Arg_DhcpDnsServer = "pi_dns_server" + Arg_DhcpID = "pi_dhcp_id" + Arg_DhcpName = "pi_dhcp_name" + Arg_DhcpSnatEnabled = "pi_dhcp_snat_enabled" + Arg_IBMiCSS = "pi_ibmi_css" + Arg_IBMiPHA = "pi_ibmi_pha" + Arg_IBMiRDSUsers = "pi_ibmi_rds_users" Arg_ImageName = "pi_image_name" Arg_InstanceName = "pi_instance_name" Arg_KeyName = "pi_key_name" Arg_NetworkName = "pi_network_name" + Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool" Arg_PlacementGroupName = "pi_placement_group_name" + Arg_PVMInstanceActionType = "pi_action" + Arg_PVMInstanceHealthStatus = "pi_health_status" + Arg_PVMInstanceId = "pi_instance_id" Arg_SAP = "sap" Arg_SAPProfileID = "pi_sap_profile_id" Arg_SharedProcessorPoolHostGroup = "pi_shared_processor_pool_host_group" @@ -69,10 +83,24 @@ const ( Attr_CRN = "crn" Attr_CyclePeriodSeconds = "cycle_period_seconds" Attr_CyclingMode = "cycling_mode" + Attr_DatacenterCapabilities = "pi_datacenter_capabilities" + Attr_DatacenterHref = "pi_datacenter_href" + Attr_DatacenterLocation = "pi_datacenter_location" Attr_Datacenters = "datacenters" + Attr_DatacenterStatus = "pi_datacenter_status" + Attr_DatacenterType = "pi_datacenter_type" Attr_Default = "default" Attr_DeploymentType = "deployment_type" Attr_Description = "description" + Attr_DhcpID = "dhcp_id" + Attr_DhcpLeaseInstanceIP = "instance_ip" + Attr_DhcpLeaseInstanceMac = "instance_mac" + Attr_DhcpLeases = "leases" + Attr_DhcpNetworkDeprecated = "network" // to deprecate + Attr_DhcpNetworkID = "network_id" + Attr_DhcpNetworkName = "network_name" + Attr_DhcpServers = "servers" + Attr_DhcpStatus = "status" Attr_DisasterRecoveryLocations = "disaster_recovery_locations" Attr_DiskFormat = "disk_format" Attr_DiskType = "disk_type" @@ -94,7 +122,11 @@ const ( Attr_Href = "href" Attr_Hypervisor = "hypervisor" Attr_HypervisorType = "hypervisor_type" + Attr_IBMiCSS = "ibmi_css" Attr_IBMIPAddress = "ibm_ip_address" + Attr_IBMiPHA = "ibmi_pha" + Attr_IBMiRDS = "ibmi_rds" + Attr_IBMiRDSUsers = "ibmi_rds_users" Attr_ID = "id" Attr_ImageID = "image_id" Attr_ImageInfo = "image_info" @@ -153,6 +185,8 @@ const ( Attr_Onboardings = "onboardings" Attr_OperatingSystem = "operating_system" Attr_PercentComplete = "percent_complete" + Attr_PIInstanceSharedProcessorPool = "shared_processor_pool" + Attr_PIInstanceSharedProcessorPoolID = "shared_processor_pool_id" Attr_PinPolicy = "pin_policy" Attr_PlacementGroupID = "placement_group_id" Attr_PlacementGroups = "placement_groups" @@ -209,6 +243,10 @@ const ( Attr_Size = "size" Attr_SourceVolumeName = "source_volume_name" Attr_Speed = "speed" + Attr_SPPPlacementGroupID = "spp_placement_group_id" + Attr_SPPPlacementGroupMembers = "members" + Attr_SPPPlacementGroupName = "name" + Attr_SPPPlacementGroupPolicy = "policy" Attr_SPPPlacementGroups = "spp_placement_groups" Attr_SSHKey = "ssh_key" Attr_StartTime = "start_time" @@ -252,8 +290,16 @@ const ( Attr_VolumeSnapshots = "volume_snapshots" Attr_VPCCRNs = "vpc_crns" Attr_VPCEnabled = "vpc_enabled" + Attr_WorkspaceCapabilities = "pi_workspace_capabilities" + Attr_WorkspaceDetails = "pi_workspace_details" + Attr_WorkspaceID = "pi_workspace_id" + Attr_WorkspaceLocation = "pi_workspace_location" + Attr_WorkspaceName = "pi_workspace_name" Attr_Workspaces = "workspaces" + Attr_WorkspaceStatus = "pi_workspace_status" + Attr_WorkspaceType = "pi_workspace_type" Attr_WWN = "wwn" + OS_IBMI = "ibmi" // TODO: Second Half Cleanup, remove extra variables @@ -265,37 +311,6 @@ const ( PISAPProfileID = "profile_id" PISAPProfileType = "type" - // DHCP - Arg_DhcpCidr = "pi_cidr" - Arg_DhcpID = "pi_dhcp_id" - Arg_DhcpCloudConnectionID = "pi_cloud_connection_id" - Arg_DhcpDnsServer = "pi_dns_server" - Arg_DhcpName = "pi_dhcp_name" - Arg_DhcpSnatEnabled = "pi_dhcp_snat_enabled" - - Attr_DhcpServers = "servers" - Attr_DhcpID = "dhcp_id" - Attr_DhcpLeases = "leases" - Attr_DhcpLeaseInstanceIP = "instance_ip" - Attr_DhcpLeaseInstanceMac = "instance_mac" - Attr_DhcpNetworkDeprecated = "network" // to deprecate - Attr_DhcpNetworkID = "network_id" - Attr_DhcpNetworkName = "network_name" - Attr_DhcpStatus = "status" - - // Instance - Arg_PVMInstanceId = "pi_instance_id" - Arg_PVMInstanceActionType = "pi_action" - Arg_PVMInstanceHealthStatus = "pi_health_status" - Arg_IBMiCSS = "pi_ibmi_css" - Arg_IBMiPHA = "pi_ibmi_pha" - Arg_IBMiRDSUsers = "pi_ibmi_rds_users" - Attr_IBMiCSS = "ibmi_css" - Attr_IBMiPHA = "ibmi_pha" - Attr_IBMiRDS = "ibmi_rds" - Attr_IBMiRDSUsers = "ibmi_rds_users" - OS_IBMI = "ibmi" - PVMInstanceHealthOk = "OK" PVMInstanceHealthWarning = "WARNING" @@ -328,10 +343,6 @@ const ( PIInstanceUserData = "pi_user_data" PIInstanceVolumeIds = "pi_volume_ids" - Attr_PIInstanceSharedProcessorPool = "shared_processor_pool" - Attr_PIInstanceSharedProcessorPoolID = "shared_processor_pool_id" - Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool" - // Placement Group PIPlacementGroupID = "placement_group_id" PIPlacementGroupMembers = "members" @@ -372,13 +383,6 @@ const ( // Cloud Connections PICloudConnectionTransitEnabled = "pi_cloud_connection_transit_enabled" - // SPP Placement Group - - Attr_SPPPlacementGroupID = "spp_placement_group_id" - Attr_SPPPlacementGroupMembers = "members" - Attr_SPPPlacementGroupPolicy = "policy" - Attr_SPPPlacementGroupName = "name" - // status // common status states StatusShutoff = "SHUTOFF" @@ -394,23 +398,6 @@ const ( VolumeCloneCompleted = "completed" VolumeCloneRunning = "running" - // Workspaces - Attr_WorkspaceCapabilities = "pi_workspace_capabilities" - Attr_WorkspaceDetails = "pi_workspace_details" - Attr_WorkspaceID = "pi_workspace_id" - Attr_WorkspaceLocation = "pi_workspace_location" - Attr_WorkspaceName = "pi_workspace_name" - Attr_WorkspaceStatus = "pi_workspace_status" - Attr_WorkspaceType = "pi_workspace_type" - - // Datacenter - Arg_DatacenterZone = "pi_datacenter_zone" - Attr_DatacenterCapabilities = "pi_datacenter_capabilities" - Attr_DatacenterLocation = "pi_datacenter_location" - Attr_DatacenterStatus = "pi_datacenter_status" - Attr_DatacenterType = "pi_datacenter_type" - Attr_DatacenterHref = "pi_datacenter_href" - // IBM PI Workspace PIWorkspaceName = "pi_name" PIWorkspaceDatacenter = "pi_datacenter"