Enable adoption and versioned model package (#90)

Description of changes:

1. Re-enables versioned model-package as using updated runtime and deploying to canary did not see test failure for versioned model package. Updated runtime fixes issue of multiple reconciliation loops which appears to have caused multiple creations of model-package.
2. Latest runtime/codegen can now correctly adopt and retrieve status for versioned model-package, thus adoption is now enabled for model-package.

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

Author: ryansteakley

apis/v1alpha1/generator.yaml

@@ -13,6 +13,7 @@ operations:
       RetainAllVariantProperties: true
   DescribeModelPackage:
     custom_check_required_fields_missing_method: customCheckRequiredFieldsMissingMethod
+    primary_identifier_field_name: ARN
   StopHyperParameterTuningJob:
     operation_type: Delete
     resource_name: HyperParameterTuningJob
@@ -460,9 +461,6 @@ resources:
         - InvalidParameterValue
         - MissingParameter
         - ConflictException
-        # Custom error to disable support for Versioned
-        # Model Package
-        - VersionedModelPackageNotSupported
     hooks:
       delta_pre_compare:
         code: customSetDefaults(a, b)
@@ -478,8 +476,6 @@ resources:
         template_path: model_package/set_resource_name_as_arn.go.tpl
       sdk_update_pre_build_request:
         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:
       ModelPackageStatus:
         is_read_only: true
@@ -515,11 +511,6 @@ resources:
       Tags:
         compare:
           is_ignored: true
-    # TODO: Can adopt unversioned Model Packages however versioned ModelPackages 
-    # cannot be adopted properly. Their spec will show in describe 
-    # kubecetl describe modelpackages however it cannot be deleted or updated
-    # Since this is not expected behavior adoption is disabled
-    is_adoptable: false
   FeatureGroup:
     update_conditions_custom_method_name: CustomUpdateConditions
     exceptions:

generator.yaml

@@ -13,6 +13,7 @@ operations:
       RetainAllVariantProperties: true
   DescribeModelPackage:
     custom_check_required_fields_missing_method: customCheckRequiredFieldsMissingMethod
+    primary_identifier_field_name: ARN
   StopHyperParameterTuningJob:
     operation_type: Delete
     resource_name: HyperParameterTuningJob
@@ -460,9 +461,6 @@ resources:
         - InvalidParameterValue
         - MissingParameter
         - ConflictException
-        # Custom error to disable support for Versioned
-        # Model Package
-        - VersionedModelPackageNotSupported
     hooks:
       delta_pre_compare:
         code: customSetDefaults(a, b)
@@ -478,8 +476,6 @@ resources:
         template_path: model_package/set_resource_name_as_arn.go.tpl
       sdk_update_pre_build_request:
         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:
       ModelPackageStatus:
         is_read_only: true
@@ -515,11 +511,6 @@ resources:
       Tags:
         compare:
           is_ignored: true
-    # TODO: Can adopt unversioned Model Packages however versioned ModelPackages 
-    # cannot be adopted properly. Their spec will show in describe 
-    # kubecetl describe modelpackages however it cannot be deleted or updated
-    # Since this is not expected behavior adoption is disabled
-    is_adoptable: false
   FeatureGroup:
     update_conditions_custom_method_name: CustomUpdateConditions
     exceptions:

pkg/resource/model_package/hooks.go

@@ -19,7 +19,6 @@ import (
 
 	ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue"
 	svccommon "github.com/aws-controllers-k8s/sagemaker-controller/pkg/common"
-	"github.com/aws/aws-sdk-go/aws/awserr"
 	svcsdk "github.com/aws/aws-sdk-go/service/sagemaker"
 )
 
@@ -34,9 +33,6 @@ var (
 		errors.New(resourceName+" is deleting."),
 		ackrequeue.DefaultRequeueAfterDuration,
 	)
-
-	VersionedModelPackageNotSupported = awserr.New("VersionedModelPackageNotSupported",
-		"unable to create modelpackage, versioned model package not supported", nil)
 )
 
 // customSetOutput sets ConditionTypeResourceSynced condition to True or False
@@ -66,6 +62,5 @@ func (rm *resourceManager) requeueUntilCanModify(
 func (rm *resourceManager) customCheckRequiredFieldsMissingMethod(
 	r *resource,
 ) bool {
-	return r.ko.Spec.ModelPackageName == nil && r.ko.Spec.ModelPackageGroupName == nil
-
+	return r.ko.Spec.ModelPackageName == nil && r.ko.Spec.ModelPackageGroupName == nil && r.ko.Status.ACKResourceMetadata.ARN == nil
 }

pkg/resource/model_package/manager_factory.go

@@ -13,6 +13,7 @@
 
 import pytest
 import logging
+import botocore
 import time
 import boto3
 from pathlib import Path
@@ -70,7 +71,9 @@ def create_sagemaker_resource(
     return reference, spec, resource
 
 
-def create_adopted_resource(replacements, namespace="default"):
+def create_adopted_resource(
+    replacements, namespace="default", spec_file="adopted_resource_base"
+):
     """
     Wrapper around k8s.load_and_create_resource to create a Adopoted resource
     """
@@ -81,7 +84,7 @@ def create_adopted_resource(replacements, namespace="default"):
         CRD_VERSION,
         "adoptedresources",
         replacements["ADOPTED_RESOURCE_NAME"],
-        "adopted_resource_base",
+        spec_file,
         replacements,
         namespace,
     )
@@ -159,6 +162,82 @@ def assert_endpoint_status_in_sync(endpoint_name, reference, expected_status):
     )
 
 
+def get_model_package_sagemaker_status(model_package_arn):
+    response = sagemaker_client().describe_model_package(
+        ModelPackageName=model_package_arn
+    )
+    return response["ModelPackageStatus"]
+
+
+def get_model_package_resource_status(reference: k8s.CustomResourceReference):
+    resource = k8s.get_resource(reference)
+    assert "modelPackageStatus" in resource["status"]
+    return resource["status"]["modelPackageStatus"]
+
+
+def wait_sagemaker_model_package_status(
+    model_package_arn,
+    expected_status: str,
+    wait_periods: int = 60,
+    period_length: int = 30,
+):
+    return wait_for_status(
+        expected_status,
+        wait_periods,
+        period_length,
+        get_model_package_sagemaker_status,
+        model_package_arn,
+    )
+
+
+def wait_resource_model_package_status(
+    reference: k8s.CustomResourceReference,
+    expected_status: str,
+    wait_periods: int = 30,
+    period_length: int = 30,
+):
+    return wait_for_status(
+        expected_status,
+        wait_periods,
+        period_length,
+        get_model_package_resource_status,
+        reference,
+    )
+
+
+def assert_model_package_status_in_sync(model_package_arn, reference, expected_status):
+    assert (
+        wait_sagemaker_model_package_status(model_package_arn, expected_status)
+        == wait_resource_model_package_status(reference, expected_status, 2)
+        == expected_status
+    )
+
+
+def get_sagemaker_model_package_group(model_package_group_name: str):
+    try:
+        return sagemaker_client().describe_model_package_group(
+            ModelPackageGroupName=model_package_group_name
+        )
+    except botocore.exceptions.ClientError as error:
+        logging.error(
+            f"SageMaker could not find a model package group with the name {model_package_group_name}. Error {error}"
+        )
+        return None
+
+
+def get_sagemaker_model_package(model_package_name: str):
+    try:
+        model_package = sagemaker_client().describe_model_package(
+            ModelPackageName=model_package_name
+        )
+        return model_package
+    except botocore.exceptions.ClientError as error:
+        logging.error(
+            f"SageMaker could not find a model package with the name {model_package_name}. Error {error}"
+        )
+        return None
+
+
 def assert_tags_in_sync(resource_arn, resource_tags):
     response = sagemaker_client().list_tags(ResourceArn=resource_arn)
     response_tags = response["Tags"]
@@ -199,18 +278,19 @@ def get_training_resource_status(reference: k8s.CustomResourceReference):
 
 
 def wait_resource_training_status(
-        reference: k8s.CustomResourceReference,
-        expected_status: str,
-        wait_periods: int = 30,
-        period_length: int = 30,
-    ):
-        return wait_for_status(
-            expected_status,
-            wait_periods,
-            period_length,
-            get_training_resource_status,
-            reference,
-        )
+    reference: k8s.CustomResourceReference,
+    expected_status: str,
+    wait_periods: int = 30,
+    period_length: int = 30,
+):
+    return wait_for_status(
+        expected_status,
+        wait_periods,
+        period_length,
+        get_training_resource_status,
+        reference,
+    )
+
 
 def wait_sagemaker_training_status(
     training_job_name,
@@ -226,11 +306,10 @@ def wait_sagemaker_training_status(
         training_job_name,
     )
 
-def assert_training_status_in_sync(
-    training_job_name, reference, expected_status
-):
+
+def assert_training_status_in_sync(training_job_name, reference, expected_status):
     assert (
         wait_sagemaker_training_status(training_job_name, expected_status)
         == wait_resource_training_status(reference, expected_status)
         == expected_status
-    )
+    )

pkg/resource/model_package/resource.go

@@ -18,6 +18,7 @@
 ENDPOINT_RESOURCE_PLURAL = "endpoints"
 DATA_QUALITY_JOB_DEFINITION_RESOURCE_PLURAL = "dataqualityjobdefinitions"
 MODEL_PACKAGE_GROUP_RESOURCE_PLURAL = "modelpackagegroups"
+MODEL_PACKAGE_RESOURCE_PLURAL = "modelpackages"
 
 # Job Type Resource Statuses
 LIST_JOB_STATUS_STOPPED = ("Stopped", "Stopping", "Completed")
@@ -33,4 +34,4 @@
 DELETE_WAIT_LENGTH = 30
 
 JOB_DELETE_WAIT_PERIODS = 8
-JOB_DELETE_WAIT_LENGTH = 30
+JOB_DELETE_WAIT_LENGTH = 30

pkg/resource/model_package/sdk.go

@@ -0,0 +1,12 @@
+apiVersion: services.k8s.aws/v1alpha1
+kind: AdoptedResource
+metadata:
+  name: $ADOPTED_RESOURCE_NAME
+spec:  
+  aws:
+    arn: $TARGET_RESOURCE_AWS
+  kubernetes:
+    group: sagemaker.services.k8s.aws
+    kind: $RESOURCE_KIND
+    metadata:
+      name: $TARGET_RESOURCE_K8S