This release adds support for ARN inputs in the Kantar credentials secrets name field and the MSPR field to the manifests for PlayReady DRM protected outputs.

Author: aws-sdk-dotnet-automation

generator/ServiceModels/mediaconvert/mediaconvert-2017-08-29.api.json

@@ -7135,7 +7135,7 @@
           "locationName": "contentReference"
         },
         "CredentialsSecretName": {
-          "shape": "__stringMin1Max512PatternAZAZ09",
+          "shape": "__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09",
           "locationName": "credentialsSecretName"
         },
         "FileOffset": {
@@ -12439,6 +12439,12 @@
       "min": 1,
       "max": 20
     },
+    "__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09": {
+      "type": "string",
+      "min": 1,
+      "max": 2048,
+      "pattern": "^(arn:(aws|aws-us-gov|aws-cn):secretsmanager:(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-\\d:\\d{12}:secret:)?[a-zA-Z0-9_\\/_+=.@-]*$"
+    },
     "__stringMin1Max256": {
       "type": "string",
       "min": 1,
@@ -12455,12 +12461,6 @@
       "max": 50,
       "pattern": "^[a-zA-Z0-9_\\/_+=.@-]*$"
     },
-    "__stringMin1Max512PatternAZAZ09": {
-      "type": "string",
-      "min": 1,
-      "max": 512,
-      "pattern": "^[a-zA-Z0-9_\\/_+=.@-]*$"
-    },
     "__stringMin24Max512PatternAZaZ0902": {
       "type": "string",
       "min": 24,

generator/ServiceModels/mediaconvert/mediaconvert-2017-08-29.docs.json

@@ -3035,10 +3035,10 @@
       }
     },
     "NielsenNonLinearWatermarkSettings": {
-      "base": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 5.2.1 Nielsen NLM Watermark Engine Version 1.2.7 Nielsen Watermark Authenticator [SID_TIC] Version [5.0.0]",
+      "base": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 6.0.13 Nielsen NLM Watermark Engine Version 1.3.3 Nielsen Watermark Authenticator [SID_TIC] Version [7.0.0]",
       "refs": {
-        "JobSettings$NielsenNonLinearWatermark": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 5.2.1 Nielsen NLM Watermark Engine Version 1.2.7 Nielsen Watermark Authenticator [SID_TIC] Version [5.0.0]",
-        "JobTemplateSettings$NielsenNonLinearWatermark": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 5.2.1 Nielsen NLM Watermark Engine Version 1.2.7 Nielsen Watermark Authenticator [SID_TIC] Version [5.0.0]"
+        "JobSettings$NielsenNonLinearWatermark": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 6.0.13 Nielsen NLM Watermark Engine Version 1.3.3 Nielsen Watermark Authenticator [SID_TIC] Version [7.0.0]",
+        "JobTemplateSettings$NielsenNonLinearWatermark": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 6.0.13 Nielsen NLM Watermark Engine Version 1.3.3 Nielsen Watermark Authenticator [SID_TIC] Version [7.0.0]"
       }
     },
     "NielsenSourceWatermarkStatusType": {
@@ -5612,6 +5612,12 @@
         "NielsenNonLinearWatermarkSettings$EpisodeId": "Optional. If this asset uses an episode ID with Nielsen, provide it here."
       }
     },
+    "__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09": {
+      "base": null,
+      "refs": {
+        "KantarWatermarkSettings$CredentialsSecretName": "Provide the name of the AWS Secrets Manager secret where your Kantar credentials are stored. Note that your MediaConvert service role must provide access to this secret. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/granting-permissions-for-mediaconvert-to-access-secrets-manager-secret.html. For instructions on creating a secret, see https://docs.aws.amazon.com/secretsmanager/latest/userguide/tutorials_basic.html, in the AWS Secrets Manager User Guide."
+      }
+    },
     "__stringMin1Max256": {
       "base": null,
       "refs": {
@@ -5642,12 +5648,6 @@
         "KantarWatermarkSettings$ContentReference": "Specify a unique identifier for Kantar to use for this piece of content."
       }
     },
-    "__stringMin1Max512PatternAZAZ09": {
-      "base": null,
-      "refs": {
-        "KantarWatermarkSettings$CredentialsSecretName": "Provide the name of the AWS Secrets Manager secret where your Kantar credentials are stored. Note that your MediaConvert service role must provide access to this secret. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/granting-permissions-for-mediaconvert-to-access-secrets-manager-secret.html. For instructions on creating a secret, see https://docs.aws.amazon.com/secretsmanager/latest/userguide/tutorials_basic.html, in the AWS Secrets Manager User Guide."
-      }
-    },
     "__stringMin24Max512PatternAZaZ0902": {
       "base": null,
       "refs": {

generator/ServiceModels/mediaconvert/mediaconvert-2017-08-29.normal.json

@@ -8296,7 +8296,7 @@
         "NielsenNonLinearWatermark": {
           "shape": "NielsenNonLinearWatermarkSettings",
           "locationName": "nielsenNonLinearWatermark",
-          "documentation": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 5.2.1 Nielsen NLM Watermark Engine Version 1.2.7 Nielsen Watermark Authenticator [SID_TIC] Version [5.0.0]"
+          "documentation": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 6.0.13 Nielsen NLM Watermark Engine Version 1.3.3 Nielsen Watermark Authenticator [SID_TIC] Version [7.0.0]"
         },
         "OutputGroups": {
           "shape": "__listOfOutputGroup",
@@ -8467,7 +8467,7 @@
         "NielsenNonLinearWatermark": {
           "shape": "NielsenNonLinearWatermarkSettings",
           "locationName": "nielsenNonLinearWatermark",
-          "documentation": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 5.2.1 Nielsen NLM Watermark Engine Version 1.2.7 Nielsen Watermark Authenticator [SID_TIC] Version [5.0.0]"
+          "documentation": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 6.0.13 Nielsen NLM Watermark Engine Version 1.3.3 Nielsen Watermark Authenticator [SID_TIC] Version [7.0.0]"
         },
         "OutputGroups": {
           "shape": "__listOfOutputGroup",
@@ -8501,7 +8501,7 @@
           "documentation": "Specify a unique identifier for Kantar to use for this piece of content."
         },
         "CredentialsSecretName": {
-          "shape": "__stringMin1Max512PatternAZAZ09",
+          "shape": "__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09",
           "locationName": "credentialsSecretName",
           "documentation": "Provide the name of the AWS Secrets Manager secret where your Kantar credentials are stored. Note that your MediaConvert service role must provide access to this secret. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/granting-permissions-for-mediaconvert-to-access-secrets-manager-secret.html. For instructions on creating a secret, see https://docs.aws.amazon.com/secretsmanager/latest/userguide/tutorials_basic.html, in the AWS Secrets Manager User Guide."
         },
@@ -10563,7 +10563,7 @@
           "documentation": "To create assets that have the same TIC values in each audio track, keep the default value Share TICs. To create assets that have unique TIC values for each audio track, choose Use unique TICs."
         }
       },
-      "documentation": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 5.2.1 Nielsen NLM Watermark Engine Version 1.2.7 Nielsen Watermark Authenticator [SID_TIC] Version [5.0.0]"
+      "documentation": "Ignore these settings unless you are using Nielsen non-linear watermarking. Specify the values that MediaConvert uses to generate and place Nielsen watermarks in your output audio. In addition to specifying these values, you also need to set up your cloud TIC server. These settings apply to every output in your job. The MediaConvert implementation is currently with the following Nielsen versions: Nielsen Watermark SDK Version 6.0.13 Nielsen NLM Watermark Engine Version 1.3.3 Nielsen Watermark Authenticator [SID_TIC] Version [7.0.0]"
     },
     "NielsenSourceWatermarkStatusType": {
       "type": "string",
@@ -14619,6 +14619,12 @@
       "min": 1,
       "max": 20
     },
+    "__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09": {
+      "type": "string",
+      "min": 1,
+      "max": 2048,
+      "pattern": "^(arn:(aws|aws-us-gov|aws-cn):secretsmanager:(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-\\d:\\d{12}:secret:)?[a-zA-Z0-9_\\/_+=.@-]*$"
+    },
     "__stringMin1Max256": {
       "type": "string",
       "min": 1,
@@ -14635,12 +14641,6 @@
       "max": 50,
       "pattern": "^[a-zA-Z0-9_\\/_+=.@-]*$"
     },
-    "__stringMin1Max512PatternAZAZ09": {
-      "type": "string",
-      "min": 1,
-      "max": 512,
-      "pattern": "^[a-zA-Z0-9_\\/_+=.@-]*$"
-    },
     "__stringMin24Max512PatternAZaZ0902": {
       "type": "string",
       "min": 24,

sdk/code-analysis/ServiceAnalysis/MediaConvert/Generated/PropertyValueRules.xml

@@ -1256,8 +1256,8 @@
   <property-value-rule>
     <property>Amazon.MediaConvert.Model.KantarWatermarkSettings.CredentialsSecretName</property>
     <min>1</min>
-    <max>512</max>
-    <pattern>^[a-zA-Z0-9_\/_+=.@-]*$</pattern>
+    <max>2048</max>
+    <pattern>^(arn:(aws|aws-us-gov|aws-cn):secretsmanager:(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-\d:\d{12}:secret:)?[a-zA-Z0-9_\/_+=.@-]*$</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.MediaConvert.Model.KantarWatermarkSettings.KantarLicenseId</property>

sdk/src/Services/MediaConvert/Generated/Model/JobSettings.cs

@@ -235,8 +235,8 @@ internal bool IsSetNielsenConfiguration()
         /// uses to generate and place Nielsen watermarks in your output audio. In addition to
         /// specifying these values, you also need to set up your cloud TIC server. These settings
         /// apply to every output in your job. The MediaConvert implementation is currently with
-        /// the following Nielsen versions: Nielsen Watermark SDK Version 5.2.1 Nielsen NLM Watermark
-        /// Engine Version 1.2.7 Nielsen Watermark Authenticator [SID_TIC] Version [5.0.0]
+        /// the following Nielsen versions: Nielsen Watermark SDK Version 6.0.13 Nielsen NLM Watermark
+        /// Engine Version 1.3.3 Nielsen Watermark Authenticator [SID_TIC] Version [7.0.0]
         /// </summary>
         public NielsenNonLinearWatermarkSettings NielsenNonLinearWatermark
         {

sdk/src/Services/MediaConvert/Generated/Model/JobTemplateSettings.cs

@@ -236,8 +236,8 @@ internal bool IsSetNielsenConfiguration()
         /// uses to generate and place Nielsen watermarks in your output audio. In addition to
         /// specifying these values, you also need to set up your cloud TIC server. These settings
         /// apply to every output in your job. The MediaConvert implementation is currently with
-        /// the following Nielsen versions: Nielsen Watermark SDK Version 5.2.1 Nielsen NLM Watermark
-        /// Engine Version 1.2.7 Nielsen Watermark Authenticator [SID_TIC] Version [5.0.0]
+        /// the following Nielsen versions: Nielsen Watermark SDK Version 6.0.13 Nielsen NLM Watermark
+        /// Engine Version 1.3.3 Nielsen Watermark Authenticator [SID_TIC] Version [7.0.0]
         /// </summary>
         public NielsenNonLinearWatermarkSettings NielsenNonLinearWatermark
         {

sdk/src/Services/MediaConvert/Generated/Model/KantarWatermarkSettings.cs

@@ -93,7 +93,7 @@ internal bool IsSetContentReference()
         /// For instructions on creating a secret, see https://docs.aws.amazon.com/secretsmanager/latest/userguide/tutorials_basic.html,
         /// in the AWS Secrets Manager User Guide.
         /// </summary>
-        [AWSProperty(Min=1, Max=512)]
+        [AWSProperty(Min=1, Max=2048)]
         public string CredentialsSecretName
         {
             get { return this._credentialsSecretName; }

sdk/src/Services/MediaConvert/Generated/Model/NielsenNonLinearWatermarkSettings.cs

@@ -35,8 +35,8 @@ namespace Amazon.MediaConvert.Model
     /// output audio. In addition to specifying these values, you also need to set up your
     /// cloud TIC server. These settings apply to every output in your job. The MediaConvert
     /// implementation is currently with the following Nielsen versions: Nielsen Watermark
-    /// SDK Version 5.2.1 Nielsen NLM Watermark Engine Version 1.2.7 Nielsen Watermark Authenticator
-    /// [SID_TIC] Version [5.0.0]
+    /// SDK Version 6.0.13 Nielsen NLM Watermark Engine Version 1.3.3 Nielsen Watermark Authenticator
+    /// [SID_TIC] Version [7.0.0]
     /// </summary>
     public partial class NielsenNonLinearWatermarkSettings
     {