From 27af6ac0beeeba27c9c2fed7bb0ce02e100e625e Mon Sep 17 00:00:00 2001
From: Peter Rifel <pgrifel@gmail.com>
Date: Sun, 31 Mar 2024 08:52:20 -0500
Subject: [PATCH] Revert some unnecessary changes in cloudmock during
 aws-sdk-go-v2 migration

---
 cloudmock/aws/mockiam/iaminstanceprofile.go | 32 ++++++++++-----------
 cloudmock/aws/mockiam/iamrole.go            | 10 +++----
 cloudmock/aws/mockiam/oidcprovider.go       |  4 +--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/cloudmock/aws/mockiam/iaminstanceprofile.go b/cloudmock/aws/mockiam/iaminstanceprofile.go
index c88a62c91f..4ae303cde6 100644
--- a/cloudmock/aws/mockiam/iaminstanceprofile.go
+++ b/cloudmock/aws/mockiam/iaminstanceprofile.go
@@ -31,8 +31,8 @@ func (m *MockIAM) GetInstanceProfile(ctx context.Context, request *iam.GetInstan
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
 
-	ip, ok := m.InstanceProfiles[aws.ToString(request.InstanceProfileName)]
-	if !ok || strings.Contains(aws.ToString(ip.InstanceProfileName), "__no_entity__") {
+	ip := m.InstanceProfiles[aws.ToString(request.InstanceProfileName)]
+	if ip == nil || strings.Contains(aws.ToString(ip.InstanceProfileName), "__no_entity__") {
 		return nil, &iamtypes.NoSuchEntityException{}
 	}
 	response := &iam.GetInstanceProfileOutput{
@@ -83,8 +83,8 @@ func (m *MockIAM) TagInstanceProfile(ctx context.Context, request *iam.TagInstan
 
 	klog.Infof("CreateInstanceProfile: %v", request)
 
-	ip, ok := m.InstanceProfiles[aws.ToString(request.InstanceProfileName)]
-	if !ok {
+	ip := m.InstanceProfiles[aws.ToString(request.InstanceProfileName)]
+	if ip == nil {
 		return nil, fmt.Errorf("InstanceProfile not found")
 	}
 
@@ -111,13 +111,13 @@ func (m *MockIAM) AddRoleToInstanceProfile(ctx context.Context, request *iam.Add
 
 	klog.Infof("AddRoleToInstanceProfile: %v", request)
 
-	ip, ok := m.InstanceProfiles[aws.ToString(request.InstanceProfileName)]
-	if !ok {
-		return nil, fmt.Errorf("InstanceProfile not found")
+	ip := m.InstanceProfiles[aws.ToString(request.InstanceProfileName)]
+	if ip == nil {
+		return nil, fmt.Errorf("instance profile not found")
 	}
-	r, ok := m.Roles[aws.ToString(request.RoleName)]
-	if !ok {
-		return nil, fmt.Errorf("Role not found")
+	r := m.Roles[aws.ToString(request.RoleName)]
+	if r == nil {
+		return nil, fmt.Errorf("role not found")
 	}
 
 	ip.Roles = append(ip.Roles, *r)
@@ -131,9 +131,9 @@ func (m *MockIAM) RemoveRoleFromInstanceProfile(ctx context.Context, request *ia
 
 	klog.Infof("RemoveRoleFromInstanceProfile: %v", request)
 
-	ip, ok := m.InstanceProfiles[aws.ToString(request.InstanceProfileName)]
-	if !ok {
-		return nil, fmt.Errorf("InstanceProfile not found")
+	ip := m.InstanceProfiles[aws.ToString(request.InstanceProfileName)]
+	if ip == nil {
+		return nil, fmt.Errorf("instance profile not found")
 	}
 
 	found := false
@@ -147,7 +147,7 @@ func (m *MockIAM) RemoveRoleFromInstanceProfile(ctx context.Context, request *ia
 	}
 
 	if !found {
-		return nil, fmt.Errorf("Role not found")
+		return nil, fmt.Errorf("role not found")
 	}
 	ip.Roles = newRoles
 
@@ -185,8 +185,8 @@ func (m *MockIAM) DeleteInstanceProfile(ctx context.Context, request *iam.Delete
 	klog.Infof("DeleteInstanceProfile: %v", request)
 
 	id := aws.ToString(request.InstanceProfileName)
-	_, ok := m.InstanceProfiles[id]
-	if !ok {
+	o := m.InstanceProfiles[id]
+	if o == nil {
 		return nil, fmt.Errorf("InstanceProfile %q not found", id)
 	}
 	delete(m.InstanceProfiles, id)
diff --git a/cloudmock/aws/mockiam/iamrole.go b/cloudmock/aws/mockiam/iamrole.go
index f8143b6211..ca584f04df 100644
--- a/cloudmock/aws/mockiam/iamrole.go
+++ b/cloudmock/aws/mockiam/iamrole.go
@@ -30,8 +30,8 @@ func (m *MockIAM) GetRole(ctx context.Context, request *iam.GetRoleInput, optFns
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
 
-	role, ok := m.Roles[aws.ToString(request.RoleName)]
-	if !ok {
+	role := m.Roles[aws.ToString(request.RoleName)]
+	if role == nil {
 		return nil, &iamtypes.NoSuchEntityException{}
 	}
 	response := &iam.GetRoleOutput{
@@ -97,9 +97,9 @@ func (m *MockIAM) DeleteRole(ctx context.Context, request *iam.DeleteRoleInput,
 	klog.Infof("DeleteRole: %v", request)
 
 	id := aws.ToString(request.RoleName)
-	_, ok := m.Roles[id]
-	if !ok {
-		return nil, fmt.Errorf("Role %q not found", id)
+	o := m.Roles[id]
+	if o == nil {
+		return nil, fmt.Errorf("role %q not found", id)
 	}
 	delete(m.Roles, id)
 
diff --git a/cloudmock/aws/mockiam/oidcprovider.go b/cloudmock/aws/mockiam/oidcprovider.go
index 1a43822b7b..e0cd5c1ef5 100644
--- a/cloudmock/aws/mockiam/oidcprovider.go
+++ b/cloudmock/aws/mockiam/oidcprovider.go
@@ -93,8 +93,8 @@ func (m *MockIAM) DeleteOpenIDConnectProvider(ctx context.Context, request *iam.
 	klog.Infof("DeleteOpenIDConnectProvider: %v", request)
 
 	arn := aws.ToString(request.OpenIDConnectProviderArn)
-	_, ok := m.OIDCProviders[arn]
-	if !ok {
+	provider := m.OIDCProviders[arn]
+	if provider == nil {
 		return nil, fmt.Errorf("OIDCProvider %q not found", arn)
 	}
 	delete(m.OIDCProviders, arn)