From 8b0e09ed20c95f75c03468f084d78d72febe4555 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Fri, 2 Aug 2024 14:17:01 +0200
Subject: [PATCH] internal/weldr: adapt to aws sdk v2

---
 internal/weldr/api_test.go | 4 ++--
 internal/weldr/upload.go   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/weldr/api_test.go b/internal/weldr/api_test.go
index 2239fc5ec..6967eea4f 100644
--- a/internal/weldr/api_test.go
+++ b/internal/weldr/api_test.go
@@ -17,7 +17,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/service/ec2"
+	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/osbuild/images/pkg/container"
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/test_distro"
@@ -1086,7 +1086,7 @@ func TestCompose(t *testing.T) {
 						SecretAccessKey: "secretkey",
 						Bucket:          "clay",
 						Key:             "imagekey",
-						BootMode:        common.ToPtr(ec2.BootModeValuesUefiPreferred),
+						BootMode:        common.ToPtr(string(ec2types.BootModeValuesUefiPreferred)),
 					},
 				},
 			},
diff --git a/internal/weldr/upload.go b/internal/weldr/upload.go
index 81090467a..461f83c4a 100644
--- a/internal/weldr/upload.go
+++ b/internal/weldr/upload.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/aws/aws-sdk-go/service/ec2"
+	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/osbuild-composer/internal/common"
 	"github.com/sirupsen/logrus"
@@ -283,11 +283,11 @@ func uploadRequestToTarget(u uploadRequest, imageType distro.ImageType) *target.
 		var amiBootMode *string
 		switch imageType.BootMode() {
 		case distro.BOOT_HYBRID:
-			amiBootMode = common.ToPtr(ec2.BootModeValuesUefiPreferred)
+			amiBootMode = common.ToPtr(string(ec2types.BootModeValuesUefiPreferred))
 		case distro.BOOT_UEFI:
-			amiBootMode = common.ToPtr(ec2.BootModeValuesUefi)
+			amiBootMode = common.ToPtr(string(ec2types.BootModeValuesUefi))
 		case distro.BOOT_LEGACY:
-			amiBootMode = common.ToPtr(ec2.BootModeValuesLegacyBios)
+			amiBootMode = common.ToPtr(string(ec2types.BootModeValuesLegacyBios))
 		}
 
 		t.Options = &target.AWSTargetOptions{