Merge branch 'release-1.36.12'

* release-1.36.12:
  Bumping version to 1.36.12
  Update to latest models
  Bump actions/setup-python from 5.3.0 to 5.4.0
  Bump aws-actions/closed-issue-message
  Bump aws-actions/stale-issue-cleanup

.changes/1.36.12.json

@@ -0,0 +1,7 @@
+[
+  {
+    "category": "``mediatailor``",
+    "description": "Add support for CloudWatch Vended Logs which allows for delivery of customer logs to CloudWatch Logs, S3, or Firehose.",
+    "type": "api-change"
+  }
+]

.github/workflows/closed-issue-message.yml

@@ -12,7 +12,7 @@ jobs:
         permissions:
             issues: write
         steps:
-        - uses: aws-actions/closed-issue-message@37548691e7cc75ba58f85c9f873f9eee43590449
+        - uses: aws-actions/closed-issue-message@10aaf6366131b673a7c8b7742f8b3849f1d44f18
           with:
             # These inputs are both required
             repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
     - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
     - name: Set up Python 3.9
-      uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
+      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38
       with:
         python-version: 3.9
     - name: Run pre-commit

.github/workflows/run-crt-test.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       - name: 'Set up Python ${{ matrix.python-version }}'
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38
         with:
           python-version: '${{ matrix.python-version }}'
           cache: 'pip'

.github/workflows/run-tests.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       - name: 'Set up Python ${{ matrix.python-version }}'
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38
         with:
           python-version: '${{ matrix.python-version }}'
           cache: 'pip'
@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       - name: 'Set up Python 3.10'
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38
         with:
           python-version: '3.10'
       - name: Install dependencies

.github/workflows/stale_issue.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Stale issue job
     steps:
-    - uses: aws-actions/stale-issue-cleanup@119dcadf8036efef52409d94132c9441c346285c
+    - uses: aws-actions/stale-issue-cleanup@58eca62c897621a4ad524b1612a982d02d6b0d3c
       with:
         issue-types: issues
         stale-issue-message: Greetings! It looks like this issue hasn’t been 

CHANGELOG.rst

@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+1.36.12
+=======
+
+* api-change:``mediatailor``: Add support for CloudWatch Vended Logs which allows for delivery of customer logs to CloudWatch Logs, S3, or Firehose.
+
+
 1.36.11
 =======
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.36.11'
+__version__ = '1.36.12'
 
 
 class NullHandler(logging.Handler):

botocore/data/mediatailor/2018-04-23/service-2.json

@@ -611,7 +611,7 @@
       "members":{
         "StreamingMediaFileConditioning":{
           "shape":"StreamingMediaFileConditioning",
-          "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>"
+          "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. <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>"
         }
       },
       "documentation":"<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns.</p>"
@@ -957,6 +957,10 @@
         "PlaybackConfigurationName":{
           "shape":"__string",
           "documentation":"<p>The name of the playback configuration.</p>"
+        },
+        "EnabledLoggingStrategies":{
+          "shape":"__listOfLoggingStrategies",
+          "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 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> <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>"
         }
       },
       "documentation":"<p>Configures Amazon CloudWatch log settings for a playback configuration.</p>"
@@ -972,6 +976,10 @@
         "PlaybackConfigurationName":{
           "shape":"__string",
           "documentation":"<p>The name of the playback configuration.</p>"
+        },
+        "EnabledLoggingStrategies":{
+          "shape":"__listOfLoggingStrategies",
+          "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>"
         }
       }
     },
@@ -2170,7 +2178,7 @@
         },
         "AdConditioningConfiguration":{
           "shape":"AdConditioningConfiguration",
-          "documentation":"<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns. </p>"
+          "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>"
         }
       }
     },
@@ -2639,6 +2647,10 @@
         "PercentEnabled":{
           "shape":"__integer",
           "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> <p>Valid values: <code>0</code> - <code>100</code> </p>"
+        },
+        "EnabledLoggingStrategies":{
+          "shape":"__listOfLoggingStrategies",
+          "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>"
         }
       },
       "documentation":"<p>Defines where AWS Elemental MediaTailor sends logs for the playback configuration.</p>"
@@ -2661,6 +2673,13 @@
       "type":"list",
       "member":{"shape":"LogType"}
     },
+    "LoggingStrategy":{
+      "type":"string",
+      "enum":[
+        "VENDED_LOGS",
+        "LEGACY_CLOUDWATCH"
+      ]
+    },
     "Long":{
       "type":"long",
       "box":true
@@ -2793,7 +2812,7 @@
         },
         "AdConditioningConfiguration":{
           "shape":"AdConditioningConfiguration",
-          "documentation":"<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns.</p>"
+          "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>"
         }
       },
       "documentation":"<p>A playback configuration. For information about MediaTailor configurations, see <a href=\"https://docs.aws.amazon.com/mediatailor/latest/ug/configurations.html\">Working with configurations in AWS Elemental MediaTailor</a>.</p>"
@@ -2971,7 +2990,7 @@
         },
         "AdConditioningConfiguration":{
           "shape":"AdConditioningConfiguration",
-          "documentation":"<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns.</p>"
+          "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>"
         }
       }
     },
@@ -3061,7 +3080,7 @@
         },
         "AdConditioningConfiguration":{
           "shape":"AdConditioningConfiguration",
-          "documentation":"<p>The setting that indicates what conditioning MediaTailor will perform on ads that the ad decision server (ADS) returns.</p>"
+          "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>"
         }
       }
     },
@@ -4026,6 +4045,10 @@
       "type":"list",
       "member":{"shape":"LiveSource"}
     },
+    "__listOfLoggingStrategies":{
+      "type":"list",
+      "member":{"shape":"LoggingStrategy"}
+    },
     "__listOfPlaybackConfiguration":{
       "type":"list",
       "member":{"shape":"PlaybackConfiguration"}

docs/source/conf.py

@@ -59,7 +59,7 @@
 # The short X.Y version.
 version = '1.36.'
 # The full version, including alpha/beta/rc tags.
-release = '1.36.11'
+release = '1.36.12'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.