kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert some unnecessary changes in cloudmock during aws-sdk-go-v2 migration

This commit is contained in:
Peter Rifel 2024-03-31 08:52:20 -05:00
parent 381911b2ed
commit 27af6ac0be
No known key found for this signature in database
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cloudmock/aws/mockiam/iaminstanceprofile.go
View File

@ -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)

10
cloudmock/aws/mockiam/iamrole.go
View File

@ -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)

4
cloudmock/aws/mockiam/oidcprovider.go
View File

@ -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)