Skip to content

Commit

Permalink
Merge pull request #19537 from myc2h6o/ppg_2022-03-01
Browse files Browse the repository at this point in the history
`dependencies` - update `proximityplacementgroups` to `2022-03-01`
  • Loading branch information
tombuildsstuff authored Dec 7, 2022
2 parents e9d2672 + 63feeae commit 744f7ed
Show file tree
Hide file tree
Showing 68 changed files with 179 additions and 165 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.1.2
github.com/hashicorp/go-azure-helpers v0.47.0
github.com/hashicorp/go-azure-sdk v0.20221129.1175354
github.com/hashicorp/go-azure-sdk v0.20221130.1102501
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/go-version v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg=
github.com/hashicorp/go-azure-helpers v0.47.0 h1:E90ZN2hqMtzI+tfGWCnNtyLZYG4csoKSs+hWZZ8ywSM=
github.com/hashicorp/go-azure-helpers v0.47.0/go.mod h1:WiJNl0fD6PoM/MYuGTZ8yuzIaXQR3m2H2g6+EJ8nSwc=
github.com/hashicorp/go-azure-sdk v0.20221129.1175354 h1:UvpHyCG2n9CVUebV78LOKDRYnsGyGG/tVhzDLfy632A=
github.com/hashicorp/go-azure-sdk v0.20221129.1175354/go.mod h1:BEjoURzcFwd+K3MqkbOt9jArIIrsqpBQ2Gz6DdemFIs=
github.com/hashicorp/go-azure-sdk v0.20221130.1102501 h1:7SEIIXQC9gPK+v4ZyQl46dE6XC87ie4BYt92WGPJNGI=
github.com/hashicorp/go-azure-sdk v0.20221130.1102501/go.mod h1:BEjoURzcFwd+K3MqkbOt9jArIIrsqpBQ2Gz6DdemFIs=
github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (m HybridRunbookWorkerResource) Create() sdk.ResourceFunc {

req := hybridrunbookworker.HybridRunbookWorkerCreateParameters{}
if model.VmResourceId != "" {
req.Properties.VmResourceId = utils.String(model.VmResourceId)
req.Properties.VMResourceId = utils.String(model.VmResourceId)
}

future, err := client.Create(ctx, id, req)
Expand Down Expand Up @@ -170,7 +170,7 @@ func (m HybridRunbookWorkerResource) Read() sdk.ResourceFunc {
output.ResourceGroupName = id.ResourceGroupName
output.WorkerGroupName = id.HybridRunbookWorkerGroupName
if prop := result.Model.Properties; prop != nil {
output.VmResourceId = utils.NormalizeNilableString(prop.VmResourceId)
output.VmResourceId = utils.NormalizeNilableString(prop.VMResourceId)
output.WorkerType = utils.NormalizeNilableString((*string)(prop.WorkerType))
output.LastSeenDateTime = utils.NormalizeNilableString(prop.LastSeenDateTime)
output.RegisteredDateTime = utils.NormalizeNilableString(prop.RegisteredDateTime)
Expand Down
2 changes: 1 addition & 1 deletion internal/services/compute/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/availabilitysets"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhostgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhosts"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/sshpublickeys"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/virtualmachines"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-02/diskencryptionsets"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-02/disks"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-02/snapshots"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/compute/disk_encryption_set_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func resourceDiskEncryptionSet() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(diskencryptionsets.DiskEncryptionSetTypeEncryptionAtRestWithCustomerKey),
string(diskencryptionsets.DiskEncryptionSetTypeEncryptionAtRestWithPlatformAndCustomerKeys),
string(diskencryptionsets.DiskEncryptionSetTypeConfidentialVmEncryptedWithCustomerKey),
string(diskencryptionsets.DiskEncryptionSetTypeConfidentialVMEncryptedWithCustomerKey),
}, false),
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/availabilitysets"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhostgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhosts"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-02/disks"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/zones"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-01/proximityplacementgroups"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/compute/no_downtime_resize.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ func determineIfVirtualMachineSkuSupportsNoDowntimeResize(ctx context.Context, v
}

vmSku := ""
if model := virtualMachine.Model; model != nil && model.Properties != nil && model.Properties.HardwareProfile != nil && model.Properties.HardwareProfile.VmSize != nil {
vmSku = string(*model.Properties.HardwareProfile.VmSize)
if model := virtualMachine.Model; model != nil && model.Properties != nil && model.Properties.HardwareProfile != nil && model.Properties.HardwareProfile.VMSize != nil {
vmSku = string(*model.Properties.HardwareProfile.VMSize)
}
if vmSku == "" {
return pointer.To(false), nil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-01/proximityplacementgroups"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-01/proximityplacementgroups"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-01/proximityplacementgroups"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/availabilitysets"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhostgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhosts"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-02/disks"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@ func flattenKubernetesClusterDataSourceAgentPoolProfiles(input *[]managedcluster
nodeTaints = *profile.NodeTaints
}

vmSize := profile.VmSize
vmSize := profile.VMSize

out := map[string]interface{}{
"count": count,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ func dataSourceKubernetesClusterNodePoolRead(d *pluginsdk.ResourceData, meta int
}

d.Set("vnet_subnet_id", props.VnetSubnetID)
d.Set("vm_size", props.VmSize)
d.Set("vm_size", props.VMSize)

d.Set("tags", tags.Flatten(props.Tags))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-helpers/resourcemanager/zones"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/containerservice/2022-09-02-preview/agentpools"
"github.com/hashicorp/go-azure-sdk/resource-manager/containerservice/2022-09-02-preview/managedclusters"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -407,7 +407,7 @@ func resourceKubernetesClusterNodePoolCreate(d *pluginsdk.ResourceData, meta int
ScaleSetPriority: utils.ToPtr(agentpools.ScaleSetPriority(d.Get("priority").(string))),
Tags: tags.Expand(t),
Type: utils.ToPtr(agentpools.AgentPoolTypeVirtualMachineScaleSets),
VmSize: utils.String(d.Get("vm_size").(string)),
VMSize: utils.String(d.Get("vm_size").(string)),
UpgradeSettings: expandAgentPoolUpgradeSettings(d.Get("upgrade_settings").([]interface{})),

// this must always be sent during creation, but is optional for auto-scaled clusters during update
Expand Down Expand Up @@ -897,7 +897,7 @@ func resourceKubernetesClusterNodePoolRead(d *pluginsdk.ResourceData, meta inter
d.Set("spot_max_price", spotMaxPrice)

d.Set("vnet_subnet_id", props.VnetSubnetID)
d.Set("vm_size", props.VmSize)
d.Set("vm_size", props.VMSize)
d.Set("host_group_id", props.HostGroupID)
d.Set("capacity_reservation_group_id", props.CapacityReservationGroupID)

Expand Down Expand Up @@ -1158,13 +1158,13 @@ func expandAgentPoolSysctlConfig(input []interface{}) (*agentpools.SysctlConfig,
result.KernelThreadsMax = utils.Int64(int64(v))
}
if v := raw["vm_max_map_count"].(int); v != 0 {
result.VmMaxMapCount = utils.Int64(int64(v))
result.VMMaxMapCount = utils.Int64(int64(v))
}
if v := raw["vm_swappiness"].(int); v != 0 {
result.VmSwappiness = utils.Int64(int64(v))
result.VMSwappiness = utils.Int64(int64(v))
}
if v := raw["vm_vfs_cache_pressure"].(int); v != 0 {
result.VmVfsCachePressure = utils.Int64(int64(v))
result.VMVfsCachePressure = utils.Int64(int64(v))
}
return result, nil
}
Expand Down Expand Up @@ -1318,16 +1318,16 @@ func flattenAgentPoolSysctlConfig(input *agentpools.SysctlConfig) ([]interface{}
netNetfilterNfConntrackMax = int(*input.NetNetfilterNfConntrackMax)
}
var vmMaxMapCount int
if input.VmMaxMapCount != nil {
vmMaxMapCount = int(*input.VmMaxMapCount)
if input.VMMaxMapCount != nil {
vmMaxMapCount = int(*input.VMMaxMapCount)
}
var vmSwappiness int
if input.VmSwappiness != nil {
vmSwappiness = int(*input.VmSwappiness)
if input.VMSwappiness != nil {
vmSwappiness = int(*input.VMSwappiness)
}
var vmVfsCachePressure int
if input.VmVfsCachePressure != nil {
vmVfsCachePressure = int(*input.VmVfsCachePressure)
if input.VMVfsCachePressure != nil {
vmVfsCachePressure = int(*input.VMVfsCachePressure)
}
return []interface{}{
map[string]interface{}{
Expand Down
28 changes: 14 additions & 14 deletions internal/services/containers/kubernetes_nodepool.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-helpers/resourcemanager/zones"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-01/proximityplacementgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/containerservice/2022-09-02-preview/agentpools"
"github.com/hashicorp/go-azure-sdk/resource-manager/containerservice/2022-09-02-preview/managedclusters"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -628,7 +628,7 @@ func ConvertDefaultNodePoolToAgentPool(input *[]managedclusters.ManagedClusterAg
Name: &defaultCluster.Name,
Properties: &agentpools.ManagedClusterAgentPoolProfileProperties{
Count: defaultCluster.Count,
VmSize: defaultCluster.VmSize,
VMSize: defaultCluster.VMSize,
OsDiskSizeGB: defaultCluster.OsDiskSizeGB,
VnetSubnetID: defaultCluster.VnetSubnetID,
MaxPods: defaultCluster.MaxPods,
Expand Down Expand Up @@ -744,7 +744,7 @@ func ExpandDefaultNodePool(d *pluginsdk.ResourceData) (*[]managedclusters.Manage
NodeTaints: nodeTaints,
Tags: tags.Expand(t),
Type: utils.ToPtr(managedclusters.AgentPoolType(raw["type"].(string))),
VmSize: utils.String(raw["vm_size"].(string)),
VMSize: utils.String(raw["vm_size"].(string)),

// at this time the default node pool has to be Linux or the AKS cluster fails to provision with:
// Pods not in Running status: coredns-7fc597cc45-v5z7x,coredns-autoscaler-7ccc76bfbd-djl7j,metrics-server-cbd95f966-5rl97,tunnelfront-7d9884977b-wpbvn
Expand Down Expand Up @@ -1051,13 +1051,13 @@ func expandClusterNodePoolSysctlConfig(input []interface{}) (*managedclusters.Sy
result.KernelThreadsMax = utils.Int64(int64(v))
}
if v := raw["vm_max_map_count"].(int); v != 0 {
result.VmMaxMapCount = utils.Int64(int64(v))
result.VMMaxMapCount = utils.Int64(int64(v))
}
if v := raw["vm_swappiness"].(int); v != 0 {
result.VmSwappiness = utils.Int64(int64(v))
result.VMSwappiness = utils.Int64(int64(v))
}
if v := raw["vm_vfs_cache_pressure"].(int); v != 0 {
result.VmVfsCachePressure = utils.Int64(int64(v))
result.VMVfsCachePressure = utils.Int64(int64(v))
}
return result, nil
}
Expand Down Expand Up @@ -1194,8 +1194,8 @@ func FlattenDefaultNodePool(input *[]managedclusters.ManagedClusterAgentPoolProf
}

vmSize := ""
if agentPool.VmSize != nil {
vmSize = *agentPool.VmSize
if agentPool.VMSize != nil {
vmSize = *agentPool.VMSize
}
capacityReservationGroupId := ""
if agentPool.CapacityReservationGroupID != nil {
Expand Down Expand Up @@ -1542,16 +1542,16 @@ func flattenClusterNodePoolSysctlConfig(input *managedclusters.SysctlConfig) ([]
netNetfilterNfConntrackMax = int(*input.NetNetfilterNfConntrackMax)
}
var vmMaxMapCount int
if input.VmMaxMapCount != nil {
vmMaxMapCount = int(*input.VmMaxMapCount)
if input.VMMaxMapCount != nil {
vmMaxMapCount = int(*input.VMMaxMapCount)
}
var vmSwappiness int
if input.VmSwappiness != nil {
vmSwappiness = int(*input.VmSwappiness)
if input.VMSwappiness != nil {
vmSwappiness = int(*input.VMSwappiness)
}
var vmVfsCachePressure int
if input.VmVfsCachePressure != nil {
vmVfsCachePressure = int(*input.VmVfsCachePressure)
if input.VMVfsCachePressure != nil {
vmVfsCachePressure = int(*input.VMVfsCachePressure)
}
return []interface{}{
map[string]interface{}{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func resourceComputeCluster() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{string(machinelearningcomputes.VmPriorityDedicated), string(machinelearningcomputes.VmPriorityLowPriority)}, false),
ValidateFunc: validation.StringInSlice([]string{string(machinelearningcomputes.VMPriorityDedicated), string(machinelearningcomputes.VMPriorityLowPriority)}, false),
},

"identity": commonschema.SystemAssignedUserAssignedIdentityOptionalForceNew(),
Expand Down Expand Up @@ -174,10 +174,10 @@ func resourceComputeClusterCreate(d *pluginsdk.ResourceData, meta interface{}) e
return tf.ImportAsExistsError("azurerm_machine_learning_compute_cluster", id.ID())
}

vmPriority := machinelearningcomputes.VmPriority(d.Get("vm_priority").(string))
vmPriority := machinelearningcomputes.VMPriority(d.Get("vm_priority").(string))
computeClusterAmlComputeProperties := machinelearningcomputes.AmlComputeProperties{
VmSize: utils.String(d.Get("vm_size").(string)),
VmPriority: &vmPriority,
VMSize: utils.String(d.Get("vm_size").(string)),
VMPriority: &vmPriority,
ScaleSettings: expandScaleSettings(d.Get("scale_settings").([]interface{})),
UserAccountCredentials: expandUserAccountCredentials(d.Get("ssh").([]interface{})),
}
Expand Down Expand Up @@ -265,8 +265,8 @@ func resourceComputeClusterRead(d *pluginsdk.ResourceData, meta interface{}) err
}
d.Set("description", computeCluster.Description)
if props := computeCluster.Properties; props != nil {
d.Set("vm_size", props.VmSize)
d.Set("vm_priority", props.VmPriority)
d.Set("vm_size", props.VMSize)
d.Set("vm_priority", props.VMPriority)
d.Set("scale_settings", flattenScaleSettings(props.ScaleSettings))
d.Set("ssh", flattenUserAccountCredentials(props.UserAccountCredentials))
if props.Subnet != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func resourceComputeInstanceCreate(d *pluginsdk.ResourceData, meta interface{})

computeInstance := &machinelearningcomputes.ComputeInstance{
Properties: &machinelearningcomputes.ComputeInstanceProperties{
VmSize: utils.String(d.Get("virtual_machine_size").(string)),
VMSize: utils.String(d.Get("virtual_machine_size").(string)),
Subnet: subnet,
SshSettings: expandComputeSSHSetting(d.Get("ssh").([]interface{})),
PersonalComputeInstanceSettings: expandComputePersonalComputeInstanceSetting(d.Get("assign_to_user").([]interface{})),
Expand Down Expand Up @@ -266,7 +266,7 @@ func resourceComputeInstanceRead(d *pluginsdk.ResourceData, meta interface{}) er
}
d.Set("description", props.Description)
if props.Properties != nil {
d.Set("virtual_machine_size", props.Properties.VmSize)
d.Set("virtual_machine_size", props.Properties.VMSize)
if props.Properties.Subnet != nil {
d.Set("subnet_resource_id", props.Properties.Subnet.Id)
}
Expand Down
Loading

0 comments on commit 744f7ed

Please sign in to comment.