From d0b508483a69f057e2ae85aea5598b44ff01b45f Mon Sep 17 00:00:00 2001
From: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:45:21 -0500
Subject: [PATCH] Remove legacy aws sdk from azure installer (#49771)

Replaces calls to aws.StringValue from the legacy aws sdk with
a similar function already defined in the imported cloud/azure
package.
---
 lib/srv/server/azure_installer.go | 3 +--
 lib/srv/server/azure_watcher.go   | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/srv/server/azure_installer.go b/lib/srv/server/azure_installer.go
index a724288ad1585..4d7e17e9c6c5c 100644
--- a/lib/srv/server/azure_installer.go
+++ b/lib/srv/server/azure_installer.go
@@ -25,7 +25,6 @@ import (
 	"net/url"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v3"
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/gravitational/trace"
 	"golang.org/x/sync/errgroup"
 
@@ -70,7 +69,7 @@ func (ai *AzureInstaller) Run(ctx context.Context, req AzureRunRequest) error {
 			runRequest := azure.RunCommandRequest{
 				Region:        req.Region,
 				ResourceGroup: req.ResourceGroup,
-				VMName:        aws.StringValue(inst.Name),
+				VMName:        azure.StringVal(inst.Name),
 				Parameters:    req.Params,
 				Script:        script,
 			}
diff --git a/lib/srv/server/azure_watcher.go b/lib/srv/server/azure_watcher.go
index 4339bfc713713..645658e8f77fe 100644
--- a/lib/srv/server/azure_watcher.go
+++ b/lib/srv/server/azure_watcher.go
@@ -24,7 +24,6 @@ import (
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v3"
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/gravitational/trace"
 
 	usageeventsv1 "github.com/gravitational/teleport/api/gen/proto/go/usageevents/v1"
@@ -66,7 +65,7 @@ func (instances *AzureInstances) MakeEvents() map[string]*usageeventsv1.Resource
 	}
 	events := make(map[string]*usageeventsv1.ResourceCreateEvent, len(instances.Instances))
 	for _, inst := range instances.Instances {
-		events[azureEventPrefix+aws.StringValue(inst.ID)] = &usageeventsv1.ResourceCreateEvent{
+		events[azureEventPrefix+azure.StringVal(inst.ID)] = &usageeventsv1.ResourceCreateEvent{
 			ResourceType:   resourceType,
 			ResourceOrigin: types.OriginCloud,
 			CloudProvider:  types.CloudAzure,
@@ -177,13 +176,13 @@ func (f *azureInstanceFetcher) GetInstances(ctx context.Context, _ bool) ([]Inst
 	}
 
 	for _, vm := range vms {
-		location := aws.StringValue(vm.Location)
+		location := azure.StringVal(vm.Location)
 		if _, ok := instancesByRegion[location]; !ok && !allowAllRegions {
 			continue
 		}
 		vmTags := make(map[string]string, len(vm.Tags))
 		for key, value := range vm.Tags {
-			vmTags[key] = aws.StringValue(value)
+			vmTags[key] = azure.StringVal(value)
 		}
 		if match, _, _ := services.MatchLabels(f.Labels, vmTags); !match {
 			continue