From 4c15e679833fd0259664d577739a99e82909f025 Mon Sep 17 00:00:00 2001 From: "Yun Liu (from Dev Box)" Date: Fri, 20 Sep 2024 12:30:02 +0800 Subject: [PATCH] remove deprecated datasource `azurerm_hybrid_compute_machine` --- .../hybrid_compute_machine_data_source.go | 972 ------------------ ...hybrid_compute_machine_data_source_test.go | 192 ---- .../services/hybridcompute/registration.go | 9 +- 3 files changed, 1 insertion(+), 1172 deletions(-) delete mode 100644 internal/services/hybridcompute/hybrid_compute_machine_data_source.go delete mode 100644 internal/services/hybridcompute/hybrid_compute_machine_data_source_test.go diff --git a/internal/services/hybridcompute/hybrid_compute_machine_data_source.go b/internal/services/hybridcompute/hybrid_compute_machine_data_source.go deleted file mode 100644 index c462f30ff122..000000000000 --- a/internal/services/hybridcompute/hybrid_compute_machine_data_source.go +++ /dev/null @@ -1,972 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package hybridcompute - -import ( - "context" - "encoding/json" - "fmt" - "strconv" - "time" - - "github.com/hashicorp/go-azure-helpers/lang/response" - "github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema" - "github.com/hashicorp/go-azure-helpers/resourcemanager/identity" - "github.com/hashicorp/go-azure-helpers/resourcemanager/location" - "github.com/hashicorp/go-azure-sdk/resource-manager/hybridcompute/2022-11-10/machines" - "github.com/hashicorp/terraform-provider-azurerm/internal/sdk" - "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" - "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" -) - -// HybridComputeMachineModel is deprecated and will be removed after 4.0 version. -// Please add new features to azurerm_arc_machine instead. - -type HybridComputeMachineModel struct { - Name string `tfschema:"name"` - ResourceGroupName string `tfschema:"resource_group_name"` - AgentConfiguration []DeprecatedAgentConfigurationModel `tfschema:"agent_configuration"` - ClientPublicKey string `tfschema:"client_public_key"` - CloudMetadata []DeprecatedCloudMetadataModel `tfschema:"cloud_metadata"` - DetectedProperties map[string]string `tfschema:"detected_properties"` - Location string `tfschema:"location"` - LocationData []DeprecatedLocationDataModel `tfschema:"location_data"` - MssqlDiscovered bool `tfschema:"mssql_discovered"` - OsProfile []DeprecatedOSProfileModel `tfschema:"os_profile"` - OsType string `tfschema:"os_type"` - ParentClusterResourceId string `tfschema:"parent_cluster_resource_id"` - PrivateLinkScopeResourceId string `tfschema:"private_link_scope_resource_id"` - ServiceStatuses []DeprecatedServiceStatusesModel `tfschema:"service_status"` - Tags map[string]string `tfschema:"tags"` - VmId string `tfschema:"vm_id"` - AdFqdn string `tfschema:"ad_fqdn"` - AgentVersion string `tfschema:"agent_version"` - DisplayName string `tfschema:"display_name"` - DnsFqdn string `tfschema:"dns_fqdn"` - DomainName string `tfschema:"domain_name"` - ErrorDetails []DeprecatedErrorDetailModel `tfschema:"error_details"` - LastStatusChange string `tfschema:"last_status_change"` - MachineFqdn string `tfschema:"machine_fqdn"` - OsName string `tfschema:"os_name"` - OsSku string `tfschema:"os_sku"` - OsVersion string `tfschema:"os_version"` - Status machines.StatusTypes `tfschema:"status"` - VmUuid string `tfschema:"vm_uuid"` -} - -type DeprecatedAgentConfigurationModel struct { - ExtensionsAllowList []DeprecatedConfigurationExtensionModel `tfschema:"extensions_allow_list"` - ExtensionsBlockList []DeprecatedConfigurationExtensionModel `tfschema:"extensions_block_list"` - ExtensionsEnabled bool `tfschema:"extensions_enabled"` - GuestConfigurationEnabled bool `tfschema:"guest_configuration_enabled"` - IncomingConnectionsPorts []string `tfschema:"incoming_connections_ports"` - ProxyBypass []string `tfschema:"proxy_bypass"` - ProxyUrl string `tfschema:"proxy_url"` -} - -type DeprecatedConfigurationExtensionModel struct { - Publisher string `tfschema:"publisher"` - Type string `tfschema:"type"` -} - -type DeprecatedCloudMetadataModel struct { - Provider string `tfschema:"provider"` -} - -type DeprecatedLocationDataModel struct { - City string `tfschema:"city"` - CountryOrRegion string `tfschema:"country_or_region"` - District string `tfschema:"district"` - Name string `tfschema:"name"` -} - -type DeprecatedOSProfileModel struct { - ComputerName string `tfschema:"computer_name"` - LinuxConfiguration []DeprecatedOSProfileLinuxConfigurationModel `tfschema:"linux_configuration"` - WindowsConfiguration []DeprecatedOSProfileWindowsConfigurationModel `tfschema:"windows_configuration"` -} - -type DeprecatedOSProfileLinuxConfigurationModel struct { - PatchSettings []DeprecatedPatchSettingsModel `tfschema:"patch_settings"` -} - -type DeprecatedPatchSettingsModel struct { - AssessmentMode machines.AssessmentModeTypes `tfschema:"assessment_mode"` - PatchMode machines.PatchModeTypes `tfschema:"patch_mode"` -} - -type DeprecatedOSProfileWindowsConfigurationModel struct { - PatchSettings []DeprecatedPatchSettingsModel `tfschema:"patch_settings"` -} - -type DeprecatedServiceStatusesModel struct { - ExtensionService []DeprecatedServiceStatusModel `tfschema:"extension_service"` - GuestConfigurationService []DeprecatedServiceStatusModel `tfschema:"guest_configuration_service"` -} - -type DeprecatedServiceStatusModel struct { - StartupType string `tfschema:"startup_type"` - Status string `tfschema:"status"` -} - -type DeprecatedErrorDetailModel struct { - AdditionalInfo []DeprecatedErrorAdditionalInfoModel `tfschema:"additional_info"` - Code string `tfschema:"code"` - Message string `tfschema:"message"` - Target string `tfschema:"target"` -} - -type DeprecatedErrorAdditionalInfoModel struct { - Info string `tfschema:"info"` - Type string `tfschema:"type"` -} - -type HybridComputeMachineDataSource struct{} - -func (r HybridComputeMachineDataSource) DeprecatedInFavourOfDataSource() string { - return "azurerm_arc_machine" -} - -var _ sdk.DataSourceWithDeprecationReplacedBy = HybridComputeMachineDataSource{} - -func (r HybridComputeMachineDataSource) ResourceType() string { - return "azurerm_hybrid_compute_machine" -} - -func (r HybridComputeMachineDataSource) ModelObject() interface{} { - return &HybridComputeMachineModel{} -} - -func (r HybridComputeMachineDataSource) IDValidationFunc() pluginsdk.SchemaValidateFunc { - return machines.ValidateMachineID -} - -func (r HybridComputeMachineDataSource) Arguments() map[string]*pluginsdk.Schema { - return map[string]*pluginsdk.Schema{ - "name": { - Type: pluginsdk.TypeString, - Required: true, - ValidateFunc: validation.StringIsNotEmpty, - }, - - "resource_group_name": commonschema.ResourceGroupNameForDataSource(), - } -} - -func (r HybridComputeMachineDataSource) Attributes() map[string]*pluginsdk.Schema { - return map[string]*pluginsdk.Schema{ - "agent_configuration": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "extensions_allow_list": { - Type: pluginsdk.TypeList, - Computed: true, - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "publisher": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "type": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - - "extensions_block_list": { - Type: pluginsdk.TypeList, - Computed: true, - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "publisher": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "type": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - - "extensions_enabled": { - Type: pluginsdk.TypeBool, - Computed: true, - }, - - "guest_configuration_enabled": { - Type: pluginsdk.TypeBool, - Computed: true, - }, - - "incoming_connections_ports": { - Type: pluginsdk.TypeList, - Computed: true, - Elem: &pluginsdk.Schema{ - Type: pluginsdk.TypeString, - }, - }, - - "proxy_bypass": { - Type: pluginsdk.TypeList, - Computed: true, - Elem: &pluginsdk.Schema{ - Type: pluginsdk.TypeString, - }, - }, - - "proxy_url": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - - "ad_fqdn": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "agent_version": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "client_public_key": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "cloud_metadata": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "provider": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - - "detected_properties": { - Type: pluginsdk.TypeMap, - Computed: true, - Elem: &pluginsdk.Schema{ - Type: pluginsdk.TypeString, - }, - }, - - "display_name": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "dns_fqdn": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "domain_name": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "error_details": { - Type: pluginsdk.TypeList, - Computed: true, - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "additional_info": { - Type: pluginsdk.TypeList, - Computed: true, - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "info": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "type": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - - "code": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "message": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "target": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - - "identity": commonschema.SystemAssignedIdentityComputed(), - - "last_status_change": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "location": commonschema.LocationComputed(), - - "location_data": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "city": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "country_or_region": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "district": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "name": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - - "machine_fqdn": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "mssql_discovered": { - Type: pluginsdk.TypeBool, - Computed: true, - }, - - "os_name": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "os_profile": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "computer_name": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "linux_configuration": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "patch_settings": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "assessment_mode": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "patch_mode": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - }, - }, - }, - - "windows_configuration": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "patch_settings": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "assessment_mode": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "patch_mode": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - }, - }, - }, - }, - }, - }, - - "os_sku": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "os_type": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "os_version": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "parent_cluster_resource_id": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "private_link_scope_resource_id": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "service_status": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "extension_service": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "startup_type": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "status": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - - "guest_configuration_service": { - Type: pluginsdk.TypeList, - Computed: true, - - Elem: &pluginsdk.Resource{ - Schema: map[string]*pluginsdk.Schema{ - "startup_type": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "status": { - Type: pluginsdk.TypeString, - Computed: true, - }, - }, - }, - }, - }, - }, - }, - - "status": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "vm_id": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "vm_uuid": { - Type: pluginsdk.TypeString, - Computed: true, - }, - - "tags": commonschema.TagsDataSource(), - } -} - -func (r HybridComputeMachineDataSource) Read() sdk.ResourceFunc { - return sdk.ResourceFunc{ - Timeout: 5 * time.Minute, - Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error { - client := metadata.Client.HybridCompute.MachinesClient - subscriptionId := metadata.Client.Account.SubscriptionId - - var hybridComputeMachineModel HybridComputeMachineModel - if err := metadata.Decode(&hybridComputeMachineModel); err != nil { - return err - } - - id := machines.NewMachineID(subscriptionId, hybridComputeMachineModel.ResourceGroupName, hybridComputeMachineModel.Name) - - resp, err := client.Get(ctx, id, machines.GetOperationOptions{}) - if err != nil { - if response.WasNotFound(resp.HttpResponse) { - return fmt.Errorf("%s was not found", id) - } - - return fmt.Errorf("retrieving %s: %+v", id, err) - } - - model := resp.Model - if model == nil { - return fmt.Errorf("retrieving %s: model was nil", id) - } - - state := HybridComputeMachineModel{ - Name: id.MachineName, - ResourceGroupName: id.ResourceGroupName, - Location: location.Normalize(model.Location), - } - - identityValue := identity.FlattenSystemAssigned(model.Identity) - - if err := metadata.ResourceData.Set("identity", identityValue); err != nil { - return fmt.Errorf("setting `identity`: %+v", err) - } - - if properties := model.Properties; properties != nil { - if properties.AdFqdn != nil { - state.AdFqdn = *properties.AdFqdn - } - - agentConfigurationValue, err := deprecatedFlattenAgentConfigurationModel(properties.AgentConfiguration) - if err != nil { - return err - } - - state.AgentConfiguration = agentConfigurationValue - - if properties.AgentVersion != nil { - state.AgentVersion = *properties.AgentVersion - } - - if properties.ClientPublicKey != nil { - state.ClientPublicKey = *properties.ClientPublicKey - } - - cloudMetadataValue := deprecatedFlattenCloudMetadataModel(properties.CloudMetadata) - - state.CloudMetadata = cloudMetadataValue - - if properties.DetectedProperties != nil { - state.DetectedProperties = *properties.DetectedProperties - } - - if properties.DisplayName != nil { - state.DisplayName = *properties.DisplayName - } - - if properties.DnsFqdn != nil { - state.DnsFqdn = *properties.DnsFqdn - } - - if properties.DomainName != nil { - state.DomainName = *properties.DomainName - } - - errorDetailsValue := deprecatedFlattenErrorDetailModel(properties.ErrorDetails) - - state.ErrorDetails = errorDetailsValue - - if properties.LastStatusChange != nil { - state.LastStatusChange = *properties.LastStatusChange - } - - locationDataValue := deprecatedFlattenLocationDataModel(properties.LocationData) - - state.LocationData = locationDataValue - - if properties.MachineFqdn != nil { - state.MachineFqdn = *properties.MachineFqdn - } - - if properties.MssqlDiscovered != nil { - state.MssqlDiscovered, err = strconv.ParseBool(*properties.MssqlDiscovered) - if err != nil { - return err - } - } - - if properties.OsName != nil { - state.OsName = *properties.OsName - } - - osProfileValue := deprecatedFlattenOSProfileModel(properties.OsProfile) - - state.OsProfile = osProfileValue - - if properties.OsSku != nil { - state.OsSku = *properties.OsSku - } - - if properties.OsType != nil { - state.OsType = *properties.OsType - } - - if properties.OsVersion != nil { - state.OsVersion = *properties.OsVersion - } - - if properties.ParentClusterResourceId != nil { - state.ParentClusterResourceId = *properties.ParentClusterResourceId - } - - if properties.PrivateLinkScopeResourceId != nil { - state.PrivateLinkScopeResourceId = *properties.PrivateLinkScopeResourceId - } - - serviceStatusesValue := deprecatedFlattenServiceStatusesModel(properties.ServiceStatuses) - - state.ServiceStatuses = serviceStatusesValue - - if properties.Status != nil { - state.Status = *properties.Status - } - - if properties.VMId != nil { - state.VmId = *properties.VMId - } - - if properties.VMUuid != nil { - state.VmUuid = *properties.VMUuid - } - } - if model.Tags != nil { - state.Tags = *model.Tags - } - - metadata.SetID(id) - return metadata.Encode(&state) - }, - } -} - -func deprecatedFlattenAgentConfigurationModel(input *machines.AgentConfiguration) ([]DeprecatedAgentConfigurationModel, error) { - var outputList []DeprecatedAgentConfigurationModel - if input == nil { - return outputList, nil - } - - output := DeprecatedAgentConfigurationModel{} - - extensionsAllowListValue := deprecatedFlattenConfigurationExtensionModel(input.ExtensionsAllowList) - - output.ExtensionsAllowList = extensionsAllowListValue - - extensionsBlockListValue := deprecatedFlattenConfigurationExtensionModel(input.ExtensionsBlockList) - - output.ExtensionsBlockList = extensionsBlockListValue - - if input.ExtensionsEnabled != nil { - parsedBool, err := strconv.ParseBool(*input.ExtensionsEnabled) - if err != nil { - return nil, err - } - output.ExtensionsEnabled = parsedBool - } - - if input.GuestConfigurationEnabled != nil { - parsedBool, err := strconv.ParseBool(*input.GuestConfigurationEnabled) - if err != nil { - return nil, err - } - output.GuestConfigurationEnabled = parsedBool - } - - if input.IncomingConnectionsPorts != nil { - output.IncomingConnectionsPorts = *input.IncomingConnectionsPorts - } - - if input.ProxyBypass != nil { - output.ProxyBypass = *input.ProxyBypass - } - - if input.ProxyUrl != nil { - output.ProxyUrl = *input.ProxyUrl - } - - return append(outputList, output), nil -} - -func deprecatedFlattenConfigurationExtensionModel(inputList *[]machines.ConfigurationExtension) []DeprecatedConfigurationExtensionModel { - var outputList []DeprecatedConfigurationExtensionModel - if inputList == nil { - return outputList - } - - for _, input := range *inputList { - output := DeprecatedConfigurationExtensionModel{} - - if input.Publisher != nil { - output.Publisher = *input.Publisher - } - - if input.Type != nil { - output.Type = *input.Type - } - - outputList = append(outputList, output) - } - - return outputList -} - -func deprecatedFlattenCloudMetadataModel(input *machines.CloudMetadata) []DeprecatedCloudMetadataModel { - var outputList []DeprecatedCloudMetadataModel - if input == nil { - return outputList - } - - output := DeprecatedCloudMetadataModel{} - - if input.Provider != nil { - output.Provider = *input.Provider - } - - return append(outputList, output) -} - -func deprecatedFlattenErrorDetailModel(inputList *[]machines.ErrorDetail) []DeprecatedErrorDetailModel { - var outputList []DeprecatedErrorDetailModel - if inputList == nil { - return outputList - } - - for _, input := range *inputList { - output := DeprecatedErrorDetailModel{} - - additionalInfoValue := deprecatedFlattenErrorAdditionalInfoModel(input.AdditionalInfo) - - output.AdditionalInfo = additionalInfoValue - - if input.Code != nil { - output.Code = *input.Code - } - - if input.Message != nil { - output.Message = *input.Message - } - - if input.Target != nil { - output.Target = *input.Target - } - - outputList = append(outputList, output) - } - - return outputList -} - -func deprecatedFlattenErrorAdditionalInfoModel(inputList *[]machines.ErrorAdditionalInfo) []DeprecatedErrorAdditionalInfoModel { - var outputList []DeprecatedErrorAdditionalInfoModel - if inputList == nil { - return outputList - } - - for _, input := range *inputList { - output := DeprecatedErrorAdditionalInfoModel{} - - if input.Info != nil && *input.Info != nil { - - infoValue, err := json.Marshal(*input.Info) - if err != nil { - return nil - } - - output.Info = string(infoValue) - } - - if input.Type != nil { - output.Type = *input.Type - } - - outputList = append(outputList, output) - } - - return outputList -} - -func deprecatedFlattenLocationDataModel(input *machines.LocationData) []DeprecatedLocationDataModel { - var outputList []DeprecatedLocationDataModel - if input == nil { - return outputList - } - - output := DeprecatedLocationDataModel{ - Name: input.Name, - } - - if input.City != nil { - output.City = *input.City - } - - if input.CountryOrRegion != nil { - output.CountryOrRegion = *input.CountryOrRegion - } - - if input.District != nil { - output.District = *input.District - } - - return append(outputList, output) -} - -func deprecatedFlattenOSProfileModel(input *machines.OSProfile) []DeprecatedOSProfileModel { - var outputList []DeprecatedOSProfileModel - if input == nil { - return outputList - } - - output := DeprecatedOSProfileModel{} - - if input.ComputerName != nil { - output.ComputerName = *input.ComputerName - } - - linuxConfigurationValue := deprecatedFlattenOSProfileLinuxConfigurationModel(input.LinuxConfiguration) - - output.LinuxConfiguration = linuxConfigurationValue - - windowsConfigurationValue := deprecatedFlattenOSProfileWindowsConfigurationModel(input.WindowsConfiguration) - output.WindowsConfiguration = windowsConfigurationValue - - return append(outputList, output) -} - -func deprecatedFlattenOSProfileLinuxConfigurationModel(input *machines.OSProfileLinuxConfiguration) []DeprecatedOSProfileLinuxConfigurationModel { - var outputList []DeprecatedOSProfileLinuxConfigurationModel - if input == nil { - return outputList - } - - output := DeprecatedOSProfileLinuxConfigurationModel{} - - patchSettingsValue := deprecatedFlattenPatchSettingsModel(input.PatchSettings) - - output.PatchSettings = patchSettingsValue - - return append(outputList, output) -} - -func deprecatedFlattenPatchSettingsModel(input *machines.PatchSettings) []DeprecatedPatchSettingsModel { - var outputList []DeprecatedPatchSettingsModel - if input == nil { - return outputList - } - - output := DeprecatedPatchSettingsModel{} - - if input.AssessmentMode != nil { - output.AssessmentMode = *input.AssessmentMode - } - - if input.PatchMode != nil { - output.PatchMode = *input.PatchMode - } - - return append(outputList, output) -} - -func deprecatedFlattenOSProfileWindowsConfigurationModel(input *machines.OSProfileWindowsConfiguration) []DeprecatedOSProfileWindowsConfigurationModel { - var outputList []DeprecatedOSProfileWindowsConfigurationModel - if input == nil { - return outputList - } - - output := DeprecatedOSProfileWindowsConfigurationModel{} - patchSettingsValue := deprecatedFlattenPatchSettingsModel(input.PatchSettings) - output.PatchSettings = patchSettingsValue - - return append(outputList, output) -} - -func deprecatedFlattenServiceStatusesModel(input *machines.ServiceStatuses) []DeprecatedServiceStatusesModel { - var outputList []DeprecatedServiceStatusesModel - if input == nil { - return outputList - } - - output := DeprecatedServiceStatusesModel{} - - extensionServiceValue := deprecatedFlattenServiceStatusModel(input.ExtensionService) - output.ExtensionService = extensionServiceValue - - guestConfigurationServiceValue := deprecatedFlattenServiceStatusModel(input.GuestConfigurationService) - output.GuestConfigurationService = guestConfigurationServiceValue - - return append(outputList, output) -} - -func deprecatedFlattenServiceStatusModel(input *machines.ServiceStatus) []DeprecatedServiceStatusModel { - var outputList []DeprecatedServiceStatusModel - if input == nil { - return outputList - } - - output := DeprecatedServiceStatusModel{} - - if input.StartupType != nil { - output.StartupType = *input.StartupType - } - - if input.Status != nil { - output.Status = *input.Status - } - - return append(outputList, output) -} diff --git a/internal/services/hybridcompute/hybrid_compute_machine_data_source_test.go b/internal/services/hybridcompute/hybrid_compute_machine_data_source_test.go deleted file mode 100644 index b8719421a676..000000000000 --- a/internal/services/hybridcompute/hybrid_compute_machine_data_source_test.go +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package hybridcompute_test - -import ( - "fmt" - "os" - "testing" - - "github.com/hashicorp/go-uuid" - "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" - "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" - "github.com/hashicorp/terraform-provider-azurerm/internal/features" -) - -type HybridComputeMachineDataSource struct{} - -func TestAccHybridComputeMachine_basic(t *testing.T) { - if features.FourPointOhBeta() { - t.Skip("Data source has been removed in 4.0") - } - - data := acceptance.BuildTestData(t, "data.azurerm_hybrid_compute_machine", "test") - d := HybridComputeMachineDataSource{} - clientSecret := os.Getenv("ARM_CLIENT_SECRET") - randomUUID, _ := uuid.GenerateUUID() - password := generateRandomPassword(10) - data.DataSourceTest(t, []acceptance.TestStep{ - { - Config: d.basic(data, clientSecret, randomUUID, password), - Check: acceptance.ComposeTestCheckFunc( - check.That(data.ResourceName).Key("agent_configuration.#").HasValue("1"), - check.That(data.ResourceName).Key("mssql_discovered").HasValue("false"), - check.That(data.ResourceName).Key("os_name").HasValue("linux"), - check.That(data.ResourceName).Key("os_profile.#").HasValue("1"), - ), - }, - }) -} - -func (r HybridComputeMachineDataSource) template(data acceptance.TestData, secret string, randomUUID string, password string) string { - return fmt.Sprintf(` -provider "azurerm" { - features { - resource_group { - prevent_deletion_if_contains_resources = false - } - } -} - -data "azurerm_client_config" "current" {} - -# note: real-life usage prefer random_uuid resource in registry.terraform.io/hashicorp/random -locals { - random_uuid = "%s" -} - -resource "azurerm_resource_group" "test" { - name = "acctestRG-%d" - location = "%s" -} - -resource "azurerm_virtual_network" "test" { - name = "acctestnw-%d" - address_space = ["10.0.0.0/16"] - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name -} - -resource "azurerm_subnet" "test" { - name = "internal" - resource_group_name = azurerm_resource_group.test.name - virtual_network_name = azurerm_virtual_network.test.name - address_prefixes = ["10.0.2.0/24"] -} - -resource "azurerm_network_interface" "test" { - name = "acctestnic-%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - - ip_configuration { - name = "internal" - subnet_id = azurerm_subnet.test.id - private_ip_address_allocation = "Dynamic" - public_ip_address_id = azurerm_public_ip.test.id - } -} - -resource "azurerm_network_security_group" "my_terraform_nsg" { - name = "myNetworkSecurityGroup" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - - security_rule { - name = "SSH" - priority = 1001 - direction = "Inbound" - access = "Allow" - protocol = "Tcp" - source_port_range = "*" - destination_port_range = "22" - source_address_prefix = "*" - destination_address_prefix = "*" - } -} - -resource "azurerm_network_interface_security_group_association" "example" { - network_interface_id = azurerm_network_interface.test.id - network_security_group_id = azurerm_network_security_group.my_terraform_nsg.id -} - -resource "azurerm_public_ip" "test" { - name = "acctestpip-%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - allocation_method = "Static" -} - -resource "azurerm_linux_virtual_machine" "test" { - name = "acctestVM-%d" - resource_group_name = azurerm_resource_group.test.name - location = azurerm_resource_group.test.location - size = "Standard_F2" - admin_username = "adminuser" - admin_password = "%s" - provision_vm_agent = false - allow_extension_operations = false - disable_password_authentication = false - network_interface_ids = [ - azurerm_network_interface.test.id, - ] - - os_disk { - caching = "ReadWrite" - storage_account_type = "Standard_LRS" - } - - source_image_reference { - publisher = "Canonical" - offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts" - version = "latest" - } - - connection { - type = "ssh" - host = azurerm_public_ip.test.ip_address - user = "adminuser" - password = "%s" - } - - provisioner "file" { - content = templatefile("scripts/install_arc.sh.tftpl", { - resource_group_name = azurerm_resource_group.test.name - uuid = local.random_uuid - location = azurerm_resource_group.test.location - tenant_id = data.azurerm_client_config.current.tenant_id - client_id = data.azurerm_client_config.current.client_id - client_secret = "%s" - subscription_id = data.azurerm_client_config.current.subscription_id - }) - destination = "/home/adminuser/install_arc_agent.sh" - } - - provisioner "remote-exec" { - inline = [ - "sudo apt-get install -y python-ctypes", - "sudo sed -i 's/\r$//' /home/adminuser/install_arc_agent.sh", - "sudo chmod +x /home/adminuser/install_arc_agent.sh", - "bash /home/adminuser/install_arc_agent.sh", - ] - } -} -`, randomUUID, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, password, password, secret) -} - -func (r HybridComputeMachineDataSource) basic(data acceptance.TestData, secret string, randomUUID string, password string) string { - template := r.template(data, secret, randomUUID, password) - return fmt.Sprintf(` - %s - -data "azurerm_hybrid_compute_machine" "test" { - name = azurerm_linux_virtual_machine.test.name - resource_group_name = azurerm_resource_group.test.name - depends_on = [ - azurerm_linux_virtual_machine.test - ] -} -`, template) -} diff --git a/internal/services/hybridcompute/registration.go b/internal/services/hybridcompute/registration.go index 9a1c18f599f7..085e9309ef1a 100644 --- a/internal/services/hybridcompute/registration.go +++ b/internal/services/hybridcompute/registration.go @@ -4,7 +4,6 @@ package hybridcompute import ( - "github.com/hashicorp/terraform-provider-azurerm/internal/features" "github.com/hashicorp/terraform-provider-azurerm/internal/sdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" ) @@ -44,15 +43,9 @@ func (r Registration) SupportedResources() map[string]*pluginsdk.Resource { // DataSources returns a list of Data Sources supported by this Service func (r Registration) DataSources() []sdk.DataSource { - dataSources := []sdk.DataSource{ + return []sdk.DataSource{ ArcMachineDataSource{}, } - - if !features.FourPointOhBeta() { - dataSources = append(dataSources, HybridComputeMachineDataSource{}) - } - - return dataSources } // Resources returns a list of Resources supported by this Service