Allow arbitary strings in sdk_version owner

Author: DavidSouther

aws_doc_sdk_examples_tools/metadata.py

@@ -33,16 +33,6 @@ class Person:
     alias: str
 
 
-@dataclass
-class FeedbackCti:
-    category: str
-    type: str
-    item: str
-
-    def __str__(self):
-        return f"{self.category} | {self.type} | {self.item}"
-
-
 @dataclass
 class Excerpt:
     description: Optional[str]

aws_doc_sdk_examples_tools/metadata_errors.py

@@ -175,6 +175,14 @@ def message(self):
         return f"missing field {self.field}"
 
 
+@dataclass
+class InvalidFieldType(FieldError):
+    reason: str = "unknown"
+
+    def message(self):
+        return f"invalid field type {self.field} ({self.reason})"
+
+
 @dataclass
 class AwsNotEntity(FieldError):
     check_err: str = ""
@@ -241,16 +249,6 @@ def message(self):
         return "lists version which is not listed in sdks.yaml."
 
 
-@dataclass
-class InvalidFeedbackCti(SdkVersionError):
-    feedback_cti: str = ""
-
-    def message(self):
-        return (
-            f"has feedback CTI that is missing at least one field: {self.feedback_cti}"
-        )
-
-
 @dataclass
 class InvalidGithubLink(SdkVersionError):
     link: str = ""

aws_doc_sdk_examples_tools/metadata_test.py

@@ -749,12 +749,12 @@ def test_verify_load_successful():
                     name="None",
                     alias="[email protected]",
                 ),
-                metadata_errors.InvalidFeedbackCti(
+                metadata_errors.InvalidFieldType(
                     file=ERRORS_METADATA_PATH,
                     id="sqs_InvalidOwner",
                     language="Java",
                     sdk_version=2,
-                    feedback_cti="AWS|Documentation|None",
+                    reason="must be string",
                 ),
             ],
             [

aws_doc_sdk_examples_tools/yaml_mapper.py

@@ -9,7 +9,6 @@
     Version,
     Excerpt,
     Person,
-    FeedbackCti,
 )
 from .sdks import Sdk
 from .services import Service
@@ -219,23 +218,6 @@ def person_from_yaml(
     return Person(name, alias)
 
 
-def feedback_cti_from_yaml(
-    yaml: Union[None, Dict[str, Optional[str]]]
-) -> Optional[Union[FeedbackCti, MetadataParseError]]:
-    if yaml is None:
-        return None
-    category = yaml.get("category")
-    type = yaml.get("type")
-    item = yaml.get("item")
-
-    if category is None or type is None or item is None:
-        return metadata_errors.InvalidFeedbackCti(
-            feedback_cti="|".join([str(category), str(type), str(item)])
-        )
-
-    return FeedbackCti(category, type, item)
-
-
 def version_from_yaml(
     yaml: Dict[str, Any],
     cross_content_blocks: Set[str],
@@ -283,18 +265,10 @@ def version_from_yaml(
         elif author is not None:
             errors.append(author)
 
-    # `owner` and `folder` are equivalent keys
-    owner_yaml = yaml.get("owner", yaml.get("folder"))
-    # use as-is for strings, otherwise try to parse them as CTI
-    if isinstance(owner_yaml, str):
-        owner = owner_yaml
-    else:
-        owner_cti = feedback_cti_from_yaml(owner_yaml)
-        if owner_cti is not None and not isinstance(owner_cti, FeedbackCti):
-            errors.append(owner_cti)
-            owner = None
-        else:
-            owner = str(owner_cti)
+    owner = yaml.get("owner")
+    if owner and not isinstance(owner, str):
+        errors.append(metadata_errors.InvalidFieldType(reason="must be string"))
+        owner = None
 
     add_services = parse_services(yaml.get("add_services", {}), errors)
     if add_services: