endpoint and monitoring schedule - requeue on delete (#93)

Description of changes:
- add requeue on delete for endpoint and monitoring schedule
  - corresponding integ test changes
- monitoring schedule custom code refactor to use common pkg
- return the status of observed resource from sdkFind post delete


Testing:
```
pytest tests/test_monitoring_schedule.py
pytest tests/test_endpoint.py
```
PR build

Pending:
rebase on #92 for unit tests to pass

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: surajkota

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,14 +1,14 @@
 ack_generate_info:
-  build_date: "2021-09-01T01:05:16Z"
+  build_date: "2021-09-01T08:44:58Z"
   build_hash: 07d7ea755625b2cac93bbf293bf5a8cab24ecb68
   go_version: go1.16.4 linux/amd64
   version: v0.13.0
 api_directory_checksum: a0f6457435f0a16addd9cf7d0acef2830722bd78
 api_version: v1alpha1
 aws_sdk_go_version: v1.38.11
 generator_config_info:
-  file_checksum: 5431bfc09117e092ee89a98edcbad6934363dea2
+  file_checksum: 8624689ea5b08289d25ad897c5f8cf5afc96b0ea
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
-  timestamp: 2021-09-01 01:05:19.682637714 +0000 UTC
+  timestamp: 2021-09-01 08:45:01.42242216 +0000 UTC

apis/v1alpha1/generator.yaml

@@ -80,6 +80,8 @@ resources:
         code: rm.customUpdateEndpointSetOutput(ko)
       sdk_delete_pre_build_request:
         template_path: common/sdk_delete_pre_build_request.go.tpl
+      sdk_delete_post_request:
+        template_path: common/sdk_delete_post_request.go.tpl
     fields:
       EndpointStatus:
         is_read_only: true
@@ -402,16 +404,16 @@ resources:
         - InvalidParameterValue
         - MissingParameter
     hooks:
-      sdk_create_post_set_output:
-        code: rm.customSetOutput(desired, aws.String("Pending"), ko)
       sdk_read_one_post_set_output:
-        code: rm.customSetOutput(r, resp.MonitoringScheduleStatus, ko)
+        code: rm.customSetOutput(&resource{ko}, resp.MonitoringScheduleStatus)
       sdk_update_pre_build_request:
-        template_path: monitoring_schedule/sdk_update_pre_build_request.go.tpl
+        template_path: common/sdk_update_pre_build_request.go.tpl
       sdk_update_post_set_output:
-        code: rm.customSetOutput(desired, aws.String("Pending"), ko)
+        code: rm.customSetOutput(&resource{ko}, aws.String("Pending"))
       sdk_delete_pre_build_request:
-        template_path: monitoring_schedule/sdk_delete_pre_build_request.go.tpl
+        template_path: common/sdk_delete_pre_build_request.go.tpl
+      sdk_delete_post_request:
+        template_path: common/sdk_delete_post_request.go.tpl
     fields:
       MonitoringScheduleStatus:
         is_read_only: true
@@ -475,7 +477,7 @@ resources:
       sdk_read_one_post_build_request:
         template_path: model_package/set_resource_name_as_arn.go.tpl
       sdk_update_pre_build_request:
-        template_path: model_package/sdk_update_pre_build_request.go.tpl
+        template_path: common/sdk_update_pre_build_request.go.tpl
       sdk_create_post_build_request:
         template_path: model_package/sdk_create_post_build_request.go.tpl
     fields:

generator.yaml

@@ -80,6 +80,8 @@ resources:
         code: rm.customUpdateEndpointSetOutput(ko)
       sdk_delete_pre_build_request:
         template_path: common/sdk_delete_pre_build_request.go.tpl
+      sdk_delete_post_request:
+        template_path: common/sdk_delete_post_request.go.tpl
     fields:
       EndpointStatus:
         is_read_only: true
@@ -402,16 +404,16 @@ resources:
         - InvalidParameterValue
         - MissingParameter
     hooks:
-      sdk_create_post_set_output:
-        code: rm.customSetOutput(desired, aws.String("Pending"), ko)
       sdk_read_one_post_set_output:
-        code: rm.customSetOutput(r, resp.MonitoringScheduleStatus, ko)
+        code: rm.customSetOutput(&resource{ko}, resp.MonitoringScheduleStatus)
       sdk_update_pre_build_request:
-        template_path: monitoring_schedule/sdk_update_pre_build_request.go.tpl
+        template_path: common/sdk_update_pre_build_request.go.tpl
       sdk_update_post_set_output:
-        code: rm.customSetOutput(desired, aws.String("Pending"), ko)
+        code: rm.customSetOutput(&resource{ko}, aws.String("Pending"))
       sdk_delete_pre_build_request:
-        template_path: monitoring_schedule/sdk_delete_pre_build_request.go.tpl
+        template_path: common/sdk_delete_pre_build_request.go.tpl
+      sdk_delete_post_request:
+        template_path: common/sdk_delete_post_request.go.tpl
     fields:
       MonitoringScheduleStatus:
         is_read_only: true
@@ -475,7 +477,7 @@ resources:
       sdk_read_one_post_build_request:
         template_path: model_package/set_resource_name_as_arn.go.tpl
       sdk_update_pre_build_request:
-        template_path: model_package/sdk_update_pre_build_request.go.tpl
+        template_path: common/sdk_update_pre_build_request.go.tpl
       sdk_create_post_build_request:
         template_path: model_package/sdk_create_post_build_request.go.tpl
     fields:

pkg/resource/endpoint/hooks.go

@@ -15,10 +15,12 @@ package endpoint
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
 	ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare"
+	ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue"
 	svcapitypes "github.com/aws-controllers-k8s/sagemaker-controller/apis/v1alpha1"
 	svccommon "github.com/aws-controllers-k8s/sagemaker-controller/pkg/common"
 	"github.com/aws/aws-sdk-go/aws"
@@ -40,6 +42,11 @@ var (
 	lastEndpointConfigForUpdateAnnotation = fmt.Sprintf("%s/last-endpoint-config-for-update", resourceGK.Group)
 
 	FailureReasonInternalServiceErrorPrefix = "Request to service failed"
+
+	requeueWaitWhileDeleting = ackrequeue.NeededAfter(
+		errors.New(resourceName+" is Deleting."),
+		ackrequeue.DefaultRequeueAfterDuration,
+	)
 )
 
 // customDescribeEndpointSetOutput sets the resource ResourceSynced condition to False if endpoint is

pkg/resource/endpoint/sdk.go

@@ -0,0 +1,28 @@
+{
+    "CreationTime": "0001-01-01T00:00:00.109Z",
+    "DataCaptureConfig": null,
+    "EndpointArn": "arn:aws:sagemaker:us-west-2:123456789012:endpoint/xgboost-endpoint",
+    "EndpointConfigName": "xgboost-endpoint-single-variant-config",
+    "EndpointName": "xgboost-endpoint",
+    "EndpointStatus": "Deleting",
+    "FailureReason": null,
+    "LastDeploymentConfig": null,
+    "LastModifiedTime": "0001-01-01T00:00:00.109Z",
+    "ProductionVariants": [
+        {
+            "CurrentInstanceCount": 2,
+            "CurrentWeight": 1,
+            "DeployedImages": [
+            {
+                "ResolutionTime": "0001-01-01T00:00:00.109Z",
+                "ResolvedImage": "433757028032.dkr.ecr.us-west-2.amazonaws.com/xgboost@sha256:54004f910467ebf7cfa71b5523b81695d103abf21a37d38dc84d63ab8d510c35",
+                "SpecifiedImage": "433757028032.dkr.ecr.us-west-2.amazonaws.com/xgboost:latest"
+            }
+            ],
+            "DesiredInstanceCount": 2,
+            "DesiredWeight": 1,
+            "VariantName": "variant-1"
+        }
+    ]
+}
+   

pkg/resource/endpoint/testdata/sdkapi/describe/deleting.json

@@ -185,7 +185,9 @@ tests:
           desired_state: "v1alpha1/delete/desired/inservice_before_delete.yaml"
           svc_api:
             - operation: DeleteEndpointWithContext
+            - operation: DescribeEndpointWithContext
+              output_fixture: "sdkapi/describe/deleting.json"
         invoke: Delete
         expect:
-          error: nil
-      # TODO: add test for wait until deleted. Feature to be implemented in a separate PR
+          latest_state: "v1alpha1/delete/observed/deleting_no_error.yaml"
+          error: "Endpoint is Deleting."

pkg/resource/endpoint/testdata/test_suite.yaml

@@ -0,0 +1,40 @@
+apiVersion: sagemaker.services.k8s.aws/v1alpha1
+kind: Endpoint
+metadata:
+  creationTimestamp: null
+  name: xgboost-endpoint
+spec:
+  endpointConfigName: xgboost-endpoint-single-variant-config
+  endpointName: xgboost-endpoint
+  tags:
+  - key: confidentiality
+    value: public
+  - key: environment
+    value: testing
+  - key: customer
+    value: test-user
+status:
+  ackResourceMetadata:
+    arn: arn:aws:sagemaker:us-west-2:123456789012:endpoint/xgboost-endpoint
+    ownerAccountID: ""
+  conditions:
+  - lastTransitionTime: "0001-01-01T00:00:00Z"
+    message: Endpoint is in Deleting status.
+    status: "False"
+    type: ACK.ResourceSynced
+  - message: Endpoint is Deleting.
+    status: "True"
+    type: ACK.Recoverable
+  creationTime: "0001-01-01T00:00:00Z"
+  endpointStatus: Deleting
+  lastModifiedTime: "0001-01-01T00:00:00Z"
+  productionVariants:
+  - currentInstanceCount: 2
+    currentWeight: 1
+    deployedImages:
+    - resolutionTime: "0001-01-01T00:00:00Z"
+      resolvedImage: 433757028032.dkr.ecr.us-west-2.amazonaws.com/xgboost@sha256:54004f910467ebf7cfa71b5523b81695d103abf21a37d38dc84d63ab8d510c35
+      specifiedImage: 433757028032.dkr.ecr.us-west-2.amazonaws.com/xgboost:latest
+    desiredInstanceCount: 2
+    desiredWeight: 1
+    variantName: variant-1