Merging v1.4.12 release

awslabs · Feb 3, 2025 · 4749cdd · 4749cdd
2 parents d6d8411 + 5cc6a76
commit 4749cdd
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.12] - 02/03/2025
+
+### Features
+* (**mediatailor**) Add support for CloudWatch Vended Logs which allows for delivery of customer logs to CloudWatch Logs, S3, or Firehose.
+
 ## [1.4.11] - 01/31/2025
 
 ### Features

diff --git a/codegen/sdk/aws-models/mediatailor.json b/codegen/sdk/aws-models/mediatailor.json
@@ -127,7 +127,7 @@
                 "StreamingMediaFileConditioning": {
                     "target": "com.amazonaws.mediatailor#StreamingMediaFileConditioning",
                     "traits": {
-                        "smithy.api#documentation": "<p>For ads that have media files with streaming delivery, indicates what transcoding action MediaTailor it first receives these ads from the ADS. <code>TRANSCODE</code> indicates that MediaTailor must transcode the ads. <code>NONE</code> indicates that you have already transcoded the ads outside of MediaTailor and don't need them transcoded as part of the ad insertion workflow. For more information about ad conditioning see <a href=\"https://docs.aws.amazon.com/precondition-ads.html\">https://docs.aws.amazon.com/precondition-ads.html</a>.</p>",
+                        "smithy.api#documentation": "<p>For ads that have media files with streaming delivery and supported file extensions, indicates what transcoding action MediaTailor takes when it first receives these ads from the ADS. \n            <code>TRANSCODE</code> indicates that MediaTailor must transcode the ads. \n            <code>NONE</code> indicates that you have already transcoded the ads outside of MediaTailor and don't need them transcoded as part of the ad insertion workflow. \n            For more information about ad conditioning see <a href=\"https://docs.aws.amazon.com/precondition-ads.html\">https://docs.aws.amazon.com/precondition-ads.html</a>.</p>",
                         "smithy.api#required": {}
                     }
                 }
@@ -754,6 +754,12 @@
                         "smithy.api#documentation": "<p>The name of the playback configuration.</p>",
                         "smithy.api#required": {}
                     }
+                },
+                "EnabledLoggingStrategies": {
+                    "target": "com.amazonaws.mediatailor#__listOfLoggingStrategies",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The method used for collecting logs from AWS Elemental MediaTailor. To configure MediaTailor to send logs directly to Amazon CloudWatch Logs, choose <code>LEGACY_CLOUDWATCH</code>. To configure MediaTailor to \n            send logs to CloudWatch, which then vends the logs to your destination of choice, choose <code>VENDED_LOGS</code>. Supported destinations are CloudWatch Logs log group, Amazon S3 bucket, and Amazon Data Firehose stream.</p>\n         <p>To use vended logs, you must configure the delivery destination in Amazon CloudWatch, as described in <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AWS-logs-and-resource-policy.html#AWS-vended-logs-permissions-V2\">Enable logging from AWS services, Logging that requires additional permissions [V2]</a>.</p>"
+                    }
                 }
             },
             "traits": {
@@ -776,6 +782,12 @@
                     "traits": {
                         "smithy.api#documentation": "<p>The name of the playback configuration.</p>"
                     }
+                },
+                "EnabledLoggingStrategies": {
+                    "target": "com.amazonaws.mediatailor#__listOfLoggingStrategies",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The method used for collecting logs from AWS Elemental MediaTailor. <code>LEGACY_CLOUDWATCH</code> indicates that MediaTailor is sending logs directly to Amazon CloudWatch Logs. <code>VENDED_LOGS</code> indicates that MediaTailor is sending logs to CloudWatch, which then vends the logs to your destination of choice. Supported destinations are CloudWatch Logs log group, Amazon S3 bucket, and Amazon Data Firehose stream. </p>"
+                    }
                 }
             }
         },
@@ -2731,7 +2743,7 @@
                 "AdConditioningConfiguration": {
                     "target": "com.amazonaws.mediatailor#AdConditioningConfiguration",
                     "traits": {
-                        "smithy.api#documentation": "<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns. </p>"
+                        "smithy.api#documentation": "<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns, and what priority MediaTailor uses when inserting ads. </p>"
                     }
                 }
             }
@@ -3577,6 +3589,12 @@
                         "smithy.api#documentation": "<p>The percentage of session logs that MediaTailor sends to your configured log destination. For example, if your playback configuration has 1000 sessions and <code>percentEnabled</code> is set to <code>60</code>, MediaTailor sends logs for 600 of the sessions to CloudWatch Logs. MediaTailor decides at random which of the playback configuration sessions to send logs for. If you want to view logs for a specific session, you can use the <a href=\"https://docs.aws.amazon.com/mediatailor/latest/ug/debug-log-mode.html\">debug log mode</a>.</p>\n         <p>Valid values: <code>0</code> - <code>100</code>\n         </p>",
                         "smithy.api#required": {}
                     }
+                },
+                "EnabledLoggingStrategies": {
+                    "target": "com.amazonaws.mediatailor#__listOfLoggingStrategies",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The method used for collecting logs from AWS Elemental MediaTailor. <code>LEGACY_CLOUDWATCH</code> indicates that MediaTailor is sending logs directly to Amazon CloudWatch Logs. <code>VENDED_LOGS</code> indicates that MediaTailor is sending logs to CloudWatch, which then vends the logs to your destination of choice. Supported destinations are CloudWatch Logs log group, Amazon S3 bucket, and Amazon Data Firehose stream. </p>"
+                    }
                 }
             },
             "traits": {
@@ -3614,6 +3632,23 @@
                 "target": "com.amazonaws.mediatailor#LogType"
             }
         },
+        "com.amazonaws.mediatailor#LoggingStrategy": {
+            "type": "enum",
+            "members": {
+                "VENDED_LOGS": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "VENDED_LOGS"
+                    }
+                },
+                "LEGACY_CLOUDWATCH": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "LEGACY_CLOUDWATCH"
+                    }
+                }
+            }
+        },
         "com.amazonaws.mediatailor#ManifestProcessingRules": {
             "type": "structure",
             "members": {
@@ -4619,7 +4654,7 @@
                 "AdConditioningConfiguration": {
                     "target": "com.amazonaws.mediatailor#AdConditioningConfiguration",
                     "traits": {
-                        "smithy.api#documentation": "<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns.</p>"
+                        "smithy.api#documentation": "<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns, and what priority MediaTailor uses when inserting ads.</p>"
                     }
                 }
             },
@@ -4999,7 +5034,7 @@
                 "AdConditioningConfiguration": {
                     "target": "com.amazonaws.mediatailor#AdConditioningConfiguration",
                     "traits": {
-                        "smithy.api#documentation": "<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns.</p>"
+                        "smithy.api#documentation": "<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns, and what priority MediaTailor uses when inserting ads. </p>"
                     }
                 }
             }
@@ -5132,7 +5167,7 @@
                 "AdConditioningConfiguration": {
                     "target": "com.amazonaws.mediatailor#AdConditioningConfiguration",
                     "traits": {
-                        "smithy.api#documentation": "<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns.</p>"
+                        "smithy.api#documentation": "<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns, and what priority MediaTailor uses when inserting ads. </p>"
                     }
                 }
             }
@@ -6719,6 +6754,12 @@
                 "target": "com.amazonaws.mediatailor#LiveSource"
             }
         },
+        "com.amazonaws.mediatailor#__listOfLoggingStrategies": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.mediatailor#LoggingStrategy"
+            }
+        },
         "com.amazonaws.mediatailor#__listOfPlaybackConfiguration": {
             "type": "list",
             "member": {

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2G
 
 # sdk
-sdkVersion=1.4.12-SNAPSHOT
+sdkVersion=1.4.13-SNAPSHOT
 
 # dokka config (values specified at build-time as needed)
 smithyKotlinDocBaseUrl=https://sdk.amazonaws.com/kotlin/api/smithy-kotlin/api/$smithyKotlinRuntimeVersion/