Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CPA tests #1079

Merged
merged 1 commit into from
Aug 10, 2023
Merged

Fix CPA tests #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/s2a-go v0.1.4 // indirect
Expand Down
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ github.com/aws/aws-sdk-go v1.44.318 h1:Yl66rpbQHFUbxe9JBKLcvOvRivhVgP6+zH0b9KzAR
github.com/aws/aws-sdk-go v1.44.318/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
Expand Down
18 changes: 9 additions & 9 deletions pkg/controller/atlasproject/cloud_provider_access_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ func (c *cloudProviderAccessClient) ListRoles(_ context.Context, projectID strin
return c.ListRolesFunc(projectID)
}

func (c *cloudProviderAccessClient) GetRole(_ context.Context, _ string, _ string) (*mongodbatlas.AWSIAMRole, *mongodbatlas.Response, error) {
func (c *cloudProviderAccessClient) GetRole(_ context.Context, _ string, _ string) (*mongodbatlas.CloudProviderAccessRole, *mongodbatlas.Response, error) {
return nil, nil, nil
}

func (c *cloudProviderAccessClient) CreateRole(_ context.Context, _ string, _ *mongodbatlas.CloudProviderAccessRoleRequest) (*mongodbatlas.AWSIAMRole, *mongodbatlas.Response, error) {
func (c *cloudProviderAccessClient) CreateRole(_ context.Context, _ string, _ *mongodbatlas.CloudProviderAccessRoleRequest) (*mongodbatlas.CloudProviderAccessRole, *mongodbatlas.Response, error) {
return nil, nil, nil
}

func (c *cloudProviderAccessClient) AuthorizeRole(_ context.Context, _ string, _ string, _ *mongodbatlas.CloudProviderAuthorizationRequest) (*mongodbatlas.AWSIAMRole, *mongodbatlas.Response, error) {
func (c *cloudProviderAccessClient) AuthorizeRole(_ context.Context, _ string, _ string, _ *mongodbatlas.CloudProviderAccessRoleRequest) (*mongodbatlas.CloudProviderAccessRole, *mongodbatlas.Response, error) {
return nil, nil, nil
}
func (c *cloudProviderAccessClient) DeauthorizeRole(_ context.Context, _ *mongodbatlas.CloudProviderDeauthorizationRequest) (*mongodbatlas.Response, error) {
Expand Down Expand Up @@ -73,7 +73,7 @@ func TestCanCloudProviderAccessReconcile(t *testing.T) {
CloudProviderAccess: &cloudProviderAccessClient{
ListRolesFunc: func(projectID string) (*mongodbatlas.CloudProviderAccessRoles, *mongodbatlas.Response, error) {
return &mongodbatlas.CloudProviderAccessRoles{
AWSIAMRoles: []mongodbatlas.AWSIAMRole{},
AWSIAMRoles: []mongodbatlas.CloudProviderAccessRole{},
}, nil, nil
},
},
Expand All @@ -91,7 +91,7 @@ func TestCanCloudProviderAccessReconcile(t *testing.T) {
CloudProviderAccess: &cloudProviderAccessClient{
ListRolesFunc: func(projectID string) (*mongodbatlas.CloudProviderAccessRoles, *mongodbatlas.Response, error) {
return &mongodbatlas.CloudProviderAccessRoles{
AWSIAMRoles: []mongodbatlas.AWSIAMRole{
AWSIAMRoles: []mongodbatlas.CloudProviderAccessRole{
{
ProviderName: "AWS",
IAMAssumedRoleARN: "arn1",
Expand Down Expand Up @@ -123,7 +123,7 @@ func TestCanCloudProviderAccessReconcile(t *testing.T) {
CloudProviderAccess: &cloudProviderAccessClient{
ListRolesFunc: func(projectID string) (*mongodbatlas.CloudProviderAccessRoles, *mongodbatlas.Response, error) {
return &mongodbatlas.CloudProviderAccessRoles{
AWSIAMRoles: []mongodbatlas.AWSIAMRole{
AWSIAMRoles: []mongodbatlas.CloudProviderAccessRole{
{
ProviderName: "AWS",
IAMAssumedRoleARN: "arn1",
Expand Down Expand Up @@ -163,7 +163,7 @@ func TestCanCloudProviderAccessReconcile(t *testing.T) {
CloudProviderAccess: &cloudProviderAccessClient{
ListRolesFunc: func(projectID string) (*mongodbatlas.CloudProviderAccessRoles, *mongodbatlas.Response, error) {
return &mongodbatlas.CloudProviderAccessRoles{
AWSIAMRoles: []mongodbatlas.AWSIAMRole{
AWSIAMRoles: []mongodbatlas.CloudProviderAccessRole{
{
ProviderName: "AWS",
},
Expand Down Expand Up @@ -194,7 +194,7 @@ func TestCanCloudProviderAccessReconcile(t *testing.T) {
CloudProviderAccess: &cloudProviderAccessClient{
ListRolesFunc: func(projectID string) (*mongodbatlas.CloudProviderAccessRoles, *mongodbatlas.Response, error) {
return &mongodbatlas.CloudProviderAccessRoles{
AWSIAMRoles: []mongodbatlas.AWSIAMRole{
AWSIAMRoles: []mongodbatlas.CloudProviderAccessRole{
{
ProviderName: "AWS",
IAMAssumedRoleARN: "arn1",
Expand Down Expand Up @@ -254,7 +254,7 @@ func TestEnsureCloudProviderAccess(t *testing.T) {
CloudProviderAccess: &cloudProviderAccessClient{
ListRolesFunc: func(projectID string) (*mongodbatlas.CloudProviderAccessRoles, *mongodbatlas.Response, error) {
return &mongodbatlas.CloudProviderAccessRoles{
AWSIAMRoles: []mongodbatlas.AWSIAMRole{
AWSIAMRoles: []mongodbatlas.CloudProviderAccessRole{
{
ProviderName: "AWS",
IAMAssumedRoleARN: "arn1",
Expand Down
5 changes: 3 additions & 2 deletions test/e2e/project_deletion_protection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret"
"github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow"
"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil"
"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr"
"github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions"
"github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloud"
"github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloudaccess"
Expand Down Expand Up @@ -122,9 +123,9 @@ var _ = Describe("Project Deletion Protection", Label("project", "deletion-prote
ctx,
projectID,
cloudProvider.RoleID,
&mongodbatlas.CloudProviderAuthorizationRequest{
&mongodbatlas.CloudProviderAccessRoleRequest{
ProviderName: "AWS",
IAMAssumedRoleARN: assumedRoleArn,
IAMAssumedRoleARN: toptr.MakePtr(assumedRoleArn),
},
)
g.Expect(err).ToNot(HaveOccurred())
Expand Down
Loading