Regenerating based on aws-cloudformation-user-guide @ 19dc52cd3f2007d…

…6d268b65b739ffb5ebf8c1e76
pulumi · Jan 17, 2025 · b5f842c · b5f842c
1 parent 112e354
commit b5f842c
Show file tree

Hide file tree

Showing 23 changed files with 1,717 additions and 114 deletions.
diff --git a/.docs.version b/.docs.version
@@ -1 +1 @@
-2bd0dbd05c1fb10774e9f755d87cede090b46e19
+2441d48fd37e6c4558d960fe7237fd97aee0183e
diff --git a/aws-cloudformation-schema/aws-bedrock-promptversion.json b/aws-cloudformation-schema/aws-bedrock-promptversion.json
@@ -6,7 +6,7 @@
     "PromptTemplateType" : {
       "type" : "string",
       "description" : "Prompt template type",
-      "enum" : [ "TEXT" ]
+      "enum" : [ "TEXT", "CHAT" ]
     },
     "PromptVariant" : {
       "type" : "object",
@@ -32,6 +32,9 @@
         },
         "InferenceConfiguration" : {
           "$ref" : "#/definitions/PromptInferenceConfiguration"
+        },
+        "GenAiResource" : {
+          "$ref" : "#/definitions/PromptGenAiResource"
         }
       },
       "required" : [ "Name", "TemplateType", "TemplateConfiguration" ],
@@ -61,6 +64,45 @@
       "required" : [ "Text" ],
       "additionalProperties" : false
     },
+    "ChatPromptTemplateConfiguration" : {
+      "type" : "object",
+      "description" : "Configuration for chat prompt template",
+      "properties" : {
+        "Messages" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Message"
+          },
+          "minItems" : 0,
+          "description" : "List of messages for chat prompt template",
+          "insertionOrder" : true
+        },
+        "System" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/SystemContentBlock"
+          },
+          "minItems" : 0,
+          "description" : "Configuration for chat prompt template",
+          "insertionOrder" : true
+        },
+        "ToolConfiguration" : {
+          "$ref" : "#/definitions/ToolConfiguration"
+        },
+        "InputVariables" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PromptInputVariable"
+          },
+          "maxItems" : 5,
+          "minItems" : 0,
+          "description" : "List of input variables",
+          "insertionOrder" : true
+        }
+      },
+      "required" : [ "Messages" ],
+      "additionalProperties" : false
+    },
     "PromptTemplateConfiguration" : {
       "description" : "Prompt template configuration",
       "oneOf" : [ {
@@ -73,8 +115,205 @@
         },
         "required" : [ "Text" ],
         "additionalProperties" : false
+      }, {
+        "type" : "object",
+        "title" : "Chat",
+        "properties" : {
+          "Chat" : {
+            "$ref" : "#/definitions/ChatPromptTemplateConfiguration"
+          }
+        },
+        "required" : [ "Chat" ],
+        "additionalProperties" : false
       } ]
     },
+    "ConversationRole" : {
+      "type" : "string",
+      "description" : "Conversation roles for the chat prompt",
+      "enum" : [ "user", "assistant" ]
+    },
+    "ContentBlock" : {
+      "description" : "Configuration for chat prompt template",
+      "oneOf" : [ {
+        "title" : "Text",
+        "type" : "object",
+        "properties" : {
+          "Text" : {
+            "type" : "string",
+            "minLength" : 1,
+            "description" : "Configuration for chat prompt template"
+          }
+        },
+        "required" : [ "Text" ],
+        "additionalProperties" : false
+      } ]
+    },
+    "SystemContentBlock" : {
+      "description" : "Configuration for chat prompt template",
+      "oneOf" : [ {
+        "title" : "Text",
+        "type" : "object",
+        "properties" : {
+          "Text" : {
+            "type" : "string",
+            "minLength" : 1,
+            "description" : "Configuration for chat prompt template"
+          }
+        },
+        "required" : [ "Text" ],
+        "additionalProperties" : false
+      } ]
+    },
+    "Message" : {
+      "type" : "object",
+      "description" : "Chat prompt Message",
+      "properties" : {
+        "Role" : {
+          "$ref" : "#/definitions/ConversationRole"
+        },
+        "Content" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ContentBlock"
+          },
+          "minItems" : 1,
+          "description" : "List of Content Blocks",
+          "insertionOrder" : true
+        }
+      },
+      "required" : [ "Role", "Content" ],
+      "additionalProperties" : false
+    },
+    "ToolInputSchema" : {
+      "description" : "Tool input schema",
+      "oneOf" : [ {
+        "type" : "object",
+        "title" : "Json",
+        "properties" : {
+          "Json" : {
+            "type" : "object"
+          }
+        },
+        "description" : "Tool input schema json",
+        "required" : [ "Json" ],
+        "additionalProperties" : false
+      } ]
+    },
+    "ToolSpecification" : {
+      "type" : "object",
+      "description" : "Tool specification",
+      "properties" : {
+        "Name" : {
+          "type" : "string",
+          "pattern" : "^[a-zA-Z][a-zA-Z0-9_]*$",
+          "minLength" : 1,
+          "maxLength" : 64,
+          "description" : "Tool name"
+        },
+        "Description" : {
+          "type" : "string",
+          "minLength" : 1
+        },
+        "InputSchema" : {
+          "$ref" : "#/definitions/ToolInputSchema"
+        }
+      },
+      "required" : [ "Name", "InputSchema" ],
+      "additionalProperties" : false
+    },
+    "Tool" : {
+      "description" : "Tool details",
+      "oneOf" : [ {
+        "type" : "object",
+        "title" : "ToolSpec",
+        "properties" : {
+          "ToolSpec" : {
+            "$ref" : "#/definitions/ToolSpecification"
+          }
+        },
+        "required" : [ "ToolSpec" ],
+        "additionalProperties" : false
+      } ]
+    },
+    "AutoToolChoice" : {
+      "type" : "object",
+      "description" : "Auto Tool choice",
+      "additionalProperties" : false
+    },
+    "AnyToolChoice" : {
+      "type" : "object",
+      "description" : "Any Tool choice",
+      "additionalProperties" : false
+    },
+    "SpecificToolChoice" : {
+      "type" : "object",
+      "description" : "Specific Tool choice",
+      "properties" : {
+        "Name" : {
+          "type" : "string",
+          "pattern" : "^[a-zA-Z][a-zA-Z0-9_]*$",
+          "minLength" : 1,
+          "maxLength" : 64,
+          "description" : "Tool name"
+        }
+      },
+      "required" : [ "Name" ],
+      "additionalProperties" : false
+    },
+    "ToolChoice" : {
+      "description" : "Tool choice",
+      "oneOf" : [ {
+        "title" : "Auto",
+        "type" : "object",
+        "properties" : {
+          "Auto" : {
+            "$ref" : "#/definitions/AutoToolChoice"
+          }
+        },
+        "required" : [ "Auto" ],
+        "additionalProperties" : false
+      }, {
+        "title" : "Any",
+        "type" : "object",
+        "properties" : {
+          "Any" : {
+            "$ref" : "#/definitions/AnyToolChoice"
+          }
+        },
+        "required" : [ "Any" ],
+        "additionalProperties" : false
+      }, {
+        "title" : "Tool",
+        "type" : "object",
+        "properties" : {
+          "Tool" : {
+            "$ref" : "#/definitions/SpecificToolChoice"
+          }
+        },
+        "required" : [ "Tool" ],
+        "additionalProperties" : false
+      } ]
+    },
+    "ToolConfiguration" : {
+      "type" : "object",
+      "description" : "Tool configuration",
+      "properties" : {
+        "Tools" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Tool"
+          },
+          "minItems" : 1,
+          "description" : "List of Tools",
+          "insertionOrder" : true
+        },
+        "ToolChoice" : {
+          "$ref" : "#/definitions/ToolChoice"
+        }
+      },
+      "required" : [ "Tools" ],
+      "additionalProperties" : false
+    },
     "PromptModelInferenceConfiguration" : {
       "type" : "object",
       "description" : "Prompt model inference configuration",
@@ -149,6 +388,34 @@
         }
       },
       "additionalProperties" : false
+    },
+    "PromptAgentResource" : {
+      "description" : "Target Agent to invoke with Prompt",
+      "type" : "object",
+      "properties" : {
+        "AgentIdentifier" : {
+          "type" : "string",
+          "maxLength" : 2048,
+          "pattern" : "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:agent-alias/[0-9a-zA-Z]{10}/[0-9a-zA-Z]{10}$",
+          "description" : "Arn representation of the Agent Alias."
+        }
+      },
+      "required" : [ "AgentIdentifier" ],
+      "additionalProperties" : false
+    },
+    "PromptGenAiResource" : {
+      "description" : "Target resource to invoke with Prompt",
+      "oneOf" : [ {
+        "type" : "object",
+        "title" : "Agent",
+        "properties" : {
+          "Agent" : {
+            "$ref" : "#/definitions/PromptAgentResource"
+          }
+        },
+        "required" : [ "Agent" ],
+        "additionalProperties" : false
+      } ]
     }
   },
   "properties" : {

diff --git a/aws-cloudformation-schema/aws-connect-instance.json b/aws-cloudformation-schema/aws-connect-instance.json
@@ -148,7 +148,8 @@
     "tagOnCreate" : true,
     "tagUpdatable" : true,
     "cloudFormationSystemTags" : true,
-    "tagProperty" : "/properties/Tags"
+    "tagProperty" : "/properties/Tags",
+    "permissions" : [ "connect:ListTagsForResource", "connect:UntagResource", "connect:TagResource" ]
   },
   "handlers" : {
     "create" : {

diff --git a/aws-cloudformation-schema/aws-connect-routingprofile.json b/aws-cloudformation-schema/aws-connect-routingprofile.json
@@ -6,7 +6,7 @@
     "Channel" : {
       "description" : "The channels that agents can handle in the Contact Control Panel (CCP).",
       "type" : "string",
-      "enum" : [ "VOICE", "CHAT", "TASK" ]
+      "enum" : [ "VOICE", "CHAT", "TASK", "EMAIL" ]
     },
     "Concurrency" : {
       "description" : "The number of contacts an agent can have on a channel simultaneously.",

diff --git a/aws-cloudformation-schema/aws-emrserverless-application.json b/aws-cloudformation-schema/aws-emrserverless-application.json
@@ -78,6 +78,10 @@
         "CloudWatchLoggingConfiguration" : {
           "description" : "CloudWatch logging configurations for a JobRun.",
           "$ref" : "#/definitions/CloudWatchLoggingConfiguration"
+        },
+        "PrometheusMonitoringConfiguration" : {
+          "description" : "Prometheus monitoring configurations for a JobRun.",
+          "$ref" : "#/definitions/PrometheusMonitoringConfiguration"
         }
       }
     },
@@ -138,6 +142,15 @@
         }
       }
     },
+    "PrometheusMonitoringConfiguration" : {
+      "additionalProperties" : false,
+      "properties" : {
+        "RemoteWriteUrl" : {
+          "description" : "The remote write URL in the Amazon Managed Service for Prometheus workspace to send metrics to.",
+          "$ref" : "#/definitions/RemoteWriteUrl"
+        }
+      }
+    },
     "LogTypeMapKeyValuePair" : {
       "type" : "object",
       "additionalProperties" : false,
@@ -325,6 +338,12 @@
       "minLength" : 1,
       "pattern" : "[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDBFF-\\uDC00\\uDFFF\\r\\n\\t]*"
     },
+    "RemoteWriteUrl" : {
+      "type" : "string",
+      "maxLength" : 10280,
+      "minLength" : 1,
+      "pattern" : "^https://aps-workspaces.([a-z]{2}-[a-z-]{1,20}-[1-9]).amazonaws(.[0-9A-Za-z]{2,4})+/workspaces/[-_.0-9A-Za-z]{1,100}/api/v1/remote_write$"
+    },
     "EncryptionKeyArn" : {
       "type" : "string",
       "maxLength" : 2048,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2bd0dbd05c1fb10774e9f755d87cede090b46e19
		2441d48fd37e6c4558d960fe7237fd97aee0183e