Update docgen and tests.

Author: rlhagerm

aws_doc_sdk_examples_tools/doc_gen_cli_test.py

@@ -55,6 +55,7 @@ def mock_doc_gen(mock_example):
             short="&AHI;",
             sort="HealthImaging",
             version="medical-imaging-2023-07-19",
+            sdk_id="Medical Imaging"
         )
     }
     doc_gen.sdks = {

aws_doc_sdk_examples_tools/doc_gen_test.py

@@ -36,7 +36,7 @@
                     ),
                 },
                 services={
-                    "x": Service(long="AWS X", short="X", sort="aws x", version=1)
+                    "x": Service(long="AWS X", short="X", sort="aws x", version=1, sdk_id="AWSx")
                 },
             ),
             DocGen(
@@ -53,7 +53,7 @@
                     ),
                 },
                 services={
-                    "y": Service(long="AWS Y", short="Y", sort="aws y", version=1)
+                    "y": Service(long="AWS Y", short="Y", sort="aws y", version=1, sdk_id="AWSy")
                 },
             ),
             DocGen(
@@ -78,8 +78,8 @@
                     ),
                 },
                 services={
-                    "x": Service(long="AWS X", short="X", sort="aws x", version=1),
-                    "y": Service(long="AWS Y", short="Y", sort="aws y", version=1),
+                    "x": Service(long="AWS X", short="X", sort="aws x", version=1, sdk_id="AWSx"),
+                    "y": Service(long="AWS Y", short="Y", sort="aws y", version=1, sdk_id="AWSy"),
                 },
             ),
         )
@@ -135,6 +135,7 @@ def sample_doc_gen() -> DocGen:
                 ),
                 sort="Amazon S3",
                 version="2006-03-01",
+                sdk_id="S3"
             )
         },
         snippets={

aws_doc_sdk_examples_tools/metadata_test.py

@@ -52,6 +52,7 @@ def load(
         ),
         sort="api-gateway",
         version=1,
+        sdk_id="apigateway"
     ),
     "medical-imaging": Service(
         long="&AHIlong;",
@@ -61,6 +62,7 @@ def load(
         ),
         sort="HealthImaging",
         version=1,
+        sdk_id="Medical Imaging"
     ),
     "sqs": Service(
         long="&SQSlong;",
@@ -70,6 +72,7 @@ def load(
         ),
         sort="sqs",
         version=1,
+        sdk_id="SQS"
     ),
     "s3": Service(
         long="&S3long;",
@@ -79,13 +82,15 @@ def load(
         ),
         sort="s3",
         version=1,
+        sdk_id="S3"
     ),
     "autogluon": Service(
         long="AutoGluon Test",
         short="AG Test",
         expanded=ServiceExpanded(long="AutoGluon Test", short="AutoGluon Test"),
         sort="autogluon",
         version=1,
+        sdk_id=""
     ),
 }
 SDKS = {
@@ -1025,8 +1030,8 @@ def test_no_duplicate_title_abbrev():
             ),
         },
         services={
-            "svc": Service(long="Service", short="svc", version="1", sort="svc"),
-            "cvs": Service(long="CVS", short="cvs", version="2", sort="cvs"),
+            "svc": Service(long="Service", short="svc", version="1", sort="svc", sdk_id="SVC"),
+            "cvs": Service(long="CVS", short="cvs", version="2", sort="cvs", sdk_id="CVS"),
         },
     )
     doc_gen.validate()

aws_doc_sdk_examples_tools/services.py

@@ -51,7 +51,7 @@ def from_yaml(
         sort = yaml.get("sort")
         version = yaml.get("version")
         api_ref = yaml.get("api_ref")
-        sdk_id = yaml.get("sdk_id"
+        sdk_id = yaml.get("sdk_id")
 
         if isinstance(long, metadata_errors.MetadataParseError):
             errors.append(long)

aws_doc_sdk_examples_tools/test_resources/entityusage_services.yaml

@@ -4,4 +4,5 @@ medical-imaging:
   expanded:
     long: AWS HealthImaging
     short: HealthImaging
+  sdk_id: Medical Imaging
   sort: HealthImaging 

aws_doc_sdk_examples_tools/test_resources/services.yaml

@@ -1,6 +1,7 @@
 s3:
   short: "&S3;"
   long: "&S3long;"
+  sdk_id: "S3"
   expanded:
     long: Amazon Simple Storage Service (Amazon S3)
     short: Amazon S3
@@ -16,6 +17,7 @@ s3:
 medical-imaging:
   short: "&AHI;"
   long: "&AHIlong;"
+  sdk_id: "Medical Imaging"
   expanded:
     long: AWS HealthImaging
     short: HealthImaging
@@ -24,6 +26,7 @@ medical-imaging:
 sqs:
   short: "&SQS;"
   long: "&SQSlong;"
+  sdk_id: "SQS"
   expanded:
     long: Amazon Simple Queue Service (Amazon SQS)
     short: Amazon SQS
@@ -35,6 +38,7 @@ sqs:
 textract:
   short: "&TEXTRACT;"
   long: "&TEXTRACTlong;"
+  sdk_id: "Textract"
   expanded:
     long: Amazon Textract
     short: Amazon Textract