Merge pull request #364 from huali9/upd75396

OCPQE-27644: upd75396

Author: openshift-merge-bot[bot]

pkg/capi/aws.go

@@ -116,20 +116,16 @@ var _ = Describe("Cluster API AWS MachineSet", framework.LabelCAPI, framework.La
 	//huliu-OCP-75396 - [CAPI] Creating machines using KMS keys from AWS.
 	It("should be able to run a machine using KMS keys", framework.LabelQEOnly, func() {
 		awsMachineTemplate = newAWSMachineTemplate(mapiDefaultProviderSpec)
-		region := mapiDefaultProviderSpec.Placement.Region
-		if region != "us-east-1" && region != "us-east-2" {
-			Skip("Region is " + region + ", skip this test scenario because we only created kms key in us-east-1/us-east-2 region")
-		}
-		var key string
-		switch region {
-		case "us-east-1":
-			key = "arn:aws:kms:us-east-1:301721915996:key/c471ec83-cfaf-41a2-9241-d9e99c4da344"
-		case "us-east-2":
-			key = "arn:aws:kms:us-east-2:301721915996:key/c228ef83-df2c-4151-84c4-d9f39f39a972"
-		}
 		awskmsClient := framework.NewAwsKmsClient(framework.GetCredentialsFromCluster(oc))
-		_, err = awskmsClient.DescribeKeyByID(key)
-		Expect(err).ToNot(HaveOccurred(), "Failed to get the key")
+		key, err := awskmsClient.CreateKey(infrastructureName + " key 75396")
+		if err != nil {
+			Skip("Create key failed, skip the cases!!")
+		}
+		defer func() {
+			err := awskmsClient.DeleteKey(key)
+			Expect(err).ToNot(HaveOccurred(), "Failed to delete the key")
+		}()
+
 		encryptBool := true
 		awsMachineTemplate.Spec.Template.Spec.NonRootVolumes = []awsv1.Volume{
 			{

pkg/framework/aws_client.go

@@ -146,6 +146,31 @@ func (akms *AwsKmsClient) DescribeKeyByID(kmsKeyID string) (string, error) {
 	return result.String(), nil
 }
 
+// CreateKey create a key.
+func (akms *AwsKmsClient) CreateKey(description string) (string, error) {
+	createRes, err := akms.kmssvc.CreateKey(&kms.CreateKeyInput{
+		Description: aws.String(description),
+	})
+	if err != nil {
+		klog.Infof("Error creating key %s", err.Error())
+		return "", err
+	}
+
+	klog.Infof("key created: %s", *createRes.KeyMetadata.Arn)
+
+	return *createRes.KeyMetadata.Arn, nil
+}
+
+// DeleteKey delete a key.
+func (akms *AwsKmsClient) DeleteKey(key string) error {
+	_, err := akms.kmssvc.ScheduleKeyDeletion(&kms.ScheduleKeyDeletionInput{
+		KeyId:               aws.String(key),
+		PendingWindowInDays: aws.Int64(7),
+	})
+
+	return err
+}
+
 func timePtr(t time.Time) *time.Time {
 	return &t
 }