Reverting S3 Definition

Author: JohnPreston

ecs-files-input.json

@@ -174,37 +174,28 @@
       }
     },
     "S3Def": {
-      "oneOf": [
-        {
-          "type": "object",
-          "required": [
-            "BucketName",
-            "Key"
-          ],
-          "properties": {
-            "BucketName": {
-              "type": "string",
-              "description": "Name of the S3 Bucket"
-            },
-            "BucketRegion": {
-              "type": "string",
-              "description": "S3 Region to use. Default will ignore or retrieve via s3:GetBucketLocation"
-            },
-            "Key": {
-              "type": "string",
-              "description": "Full path to the file to retrieve"
-            },
-            "IamOverride": {
-              "$ref": "#/definitions/IamOverrideDef"
-            }
-          }
+      "type": "object",
+      "required": [
+        "BucketName",
+        "Key"
+      ],
+      "properties": {
+        "BucketName": {
+          "type": "string",
+          "description": "Name of the S3 Bucket"
+        },
+        "BucketRegion": {
+          "type": "string",
+          "description": "S3 Region to use. Default will ignore or retrieve via s3:GetBucketLocation"
         },
-        {
+        "Key": {
           "type": "string",
-          "pattern": "^arn:aws(?:-[a-z]+)?:s3:::(\\S+)::(\\S+)$",
-          "description": "OneLiner with bucket ARN and path to key."
+          "description": "Full path to the file to retrieve"
+        },
+        "IamOverride": {
+          "$ref": "#/definitions/IamOverrideDef"
         }
-      ]
+      }
     },
     "IamOverrideDef": {
       "type": "object",

ecs_files_composer/input.py

@@ -1,11 +1,11 @@
 # generated by datamodel-codegen:
 #   filename:  ecs-files-input.json
-#   timestamp: 2022-07-28T09:27:39+00:00
+#   timestamp: 2022-07-28T10:48:50+00:00
 
 from __future__ import annotations
 
 from enum import Enum
-from typing import Dict, List, Optional, Union
+from typing import Dict, List, Optional
 
 from pydantic import AnyUrl, BaseModel, EmailStr, Extra, Field, constr
 
@@ -26,14 +26,6 @@ class UrlDef(BaseModel):
     password: Optional[str] = Field(None, alias="Password")
 
 
-class S3DefItem1(BaseModel):
-    __root__: str = Field(
-        ...,
-        description="OneLiner with bucket ARN and path to key.",
-        regex="^arn:aws(?:-[a-z]+)?:s3:::(\\S+)::(\\S+)$",
-    )
-
-
 class IamOverrideDef(BaseModel):
     role_arn: Optional[str] = Field(None, alias="RoleArn")
     session_name: Optional[str] = Field(
@@ -144,7 +136,7 @@ class SecretDef(BaseModel):
     iam_override: Optional[IamOverrideDef] = Field(None, alias="IamOverride")
 
 
-class S3DefItem(BaseModel):
+class S3Def(BaseModel):
     bucket_name: str = Field(
         ..., alias="BucketName", description="Name of the S3 Bucket"
     )
@@ -157,10 +149,6 @@ class S3DefItem(BaseModel):
     iam_override: Optional[IamOverrideDef] = Field(None, alias="IamOverride")
 
 
-class S3Def(BaseModel):
-    __root__: Union[S3DefItem, S3DefItem1]
-
-
 class SourceDef(BaseModel):
     url: Optional[UrlDef] = Field(None, alias="Url")
     ssm: Optional[SsmDef] = Field(None, alias="Ssm")