checkIfImageExists

gardener · Aug 18, 2022 · 193e80b · 193e80b
1 parent b50113d
commit 193e80b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/pkg/admission/mutator/shoot.go b/pkg/admission/mutator/shoot.go
@@ -190,7 +190,7 @@ func (s *shootMutator) isOwnedbyAliCloud(ctx context.Context, shoot *corev1beta1
 	if err != nil {
 		return false, err
 	}
-	if exist, err := shootECSClient.CheckIfImageExists(ctx, imageId); err != nil {
+	if exist, err := shootECSClient.CheckIfImageExists(imageId); err != nil {
 		return false, err
 	} else if exist {
 		return shootECSClient.CheckIfImageOwnedByAliCloud(imageId)

diff --git a/pkg/admission/mutator/shoot_test.go b/pkg/admission/mutator/shoot_test.go
@@ -245,7 +245,7 @@ var _ = Describe("Mutating Shoot", func() {
 				),
 
 				alicloudClientFactory.EXPECT().NewECSClient(regionId, accessKeyID, accessKeySecret).Return(ecsClient, nil),
-				ecsClient.EXPECT().CheckIfImageExists(ctx, imageId).Return(false, nil),
+				ecsClient.EXPECT().CheckIfImageExists(imageId).Return(false, nil),
 			)
 			err := mutator.Mutate(ctx, newShoot, nil)
 			Expect(err).NotTo(HaveOccurred())
@@ -290,7 +290,7 @@ var _ = Describe("Mutating Shoot", func() {
 				),
 
 				alicloudClientFactory.EXPECT().NewECSClient(regionId, accessKeyID, accessKeySecret).Return(ecsClient, nil),
-				ecsClient.EXPECT().CheckIfImageExists(ctx, imageId).Return(false, nil),
+				ecsClient.EXPECT().CheckIfImageExists(imageId).Return(false, nil),
 				//ecsClient.EXPECT().CheckIfImageOwnedByAliCloud(imageId).Return(false, nil)
 			)
 			err := mutator.Mutate(ctx, newShoot, nil)
@@ -321,7 +321,7 @@ var _ = Describe("Mutating Shoot", func() {
 				),
 
 				alicloudClientFactory.EXPECT().NewECSClient(regionId, accessKeyID, accessKeySecret).Return(ecsClient, nil),
-				ecsClient.EXPECT().CheckIfImageExists(ctx, imageId).Return(true, nil),
+				ecsClient.EXPECT().CheckIfImageExists(imageId).Return(true, nil),
 				ecsClient.EXPECT().CheckIfImageOwnedByAliCloud(imageId).Return(true, nil),
 			)
 			err := mutator.Mutate(ctx, newShoot, nil)
@@ -368,7 +368,7 @@ var _ = Describe("Mutating Shoot", func() {
 				),
 
 				alicloudClientFactory.EXPECT().NewECSClient(regionId, accessKeyID, accessKeySecret).Return(ecsClient, nil),
-				ecsClient.EXPECT().CheckIfImageExists(ctx, imageId).Return(false, nil),
+				ecsClient.EXPECT().CheckIfImageExists(imageId).Return(false, nil),
 			)
 			err := mutator.Mutate(ctx, newShoot, oldShoot)
 			Expect(err).NotTo(HaveOccurred())

diff --git a/pkg/alicloud/client/client.go b/pkg/alicloud/client/client.go
@@ -210,7 +210,7 @@ func (f *clientFactory) NewECSClient(region, accessKeyID, accessKeySecret string
 }
 
 // CheckIfImageExists checks whether given imageID can be accessed by the client.
-func (c *ecsClient) CheckIfImageExists(ctx context.Context, imageID string) (bool, error) {
+func (c *ecsClient) CheckIfImageExists(imageID string) (bool, error) {
 	request := ecs.CreateDescribeImagesRequest()
 	request.ImageId = imageID
 	request.SetScheme("HTTPS")

diff --git a/pkg/alicloud/client/types.go b/pkg/alicloud/client/types.go
@@ -58,7 +58,7 @@ type ecsClient struct {
 
 // ECS is an interface which declares ECS related methods.
 type ECS interface {
-	CheckIfImageExists(ctx context.Context, imageID string) (bool, error)
+	CheckIfImageExists(imageID string) (bool, error)
 	CheckIfImageOwnedByAliCloud(imageID string) (bool, error)
 	ShareImageToAccount(ctx context.Context, regionID, imageID, accountID string) error
 	GetSecurityGroup(name string) (*ecs.DescribeSecurityGroupsResponse, error)