Add support for custom instance type for reserved capacity fleets

Author: aws-sdk-dotnet-automation

generator/ServiceModels/codebuild/codebuild-2016-10-06.api.json

@@ -1298,7 +1298,8 @@
         "vCpu":{"shape":"WrapperLong"},
         "memory":{"shape":"WrapperLong"},
         "disk":{"shape":"WrapperLong"},
-        "machineType":{"shape":"MachineType"}
+        "machineType":{"shape":"MachineType"},
+        "instanceType":{"shape":"NonEmptyString"}
       }
     },
     "ComputeType":{
@@ -1314,7 +1315,8 @@
         "BUILD_LAMBDA_4GB",
         "BUILD_LAMBDA_8GB",
         "BUILD_LAMBDA_10GB",
-        "ATTRIBUTE_BASED_COMPUTE"
+        "ATTRIBUTE_BASED_COMPUTE",
+        "CUSTOM_INSTANCE_TYPE"
       ]
     },
     "ComputeTypesAllowed":{

generator/ServiceModels/codebuild/codebuild-2016-10-06.docs.json

@@ -463,7 +463,7 @@
       }
     },
     "ComputeConfiguration": {
-      "base": "<p>Contains compute attributes. These attributes only need be specified when your project's or fleet's <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code>.</p>",
+      "base": "<p>Contains compute attributes. These attributes only need be specified when your project's or fleet's <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code> or <code>CUSTOM_INSTANCE_TYPE</code>.</p>",
       "refs": {
         "CreateFleetInput$computeConfiguration": "<p>The compute configuration of the compute fleet. This is only required if <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code>.</p>",
         "Fleet$computeConfiguration": "<p>The compute configuration of the compute fleet. This is only required if <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code>.</p>",
@@ -1194,6 +1194,7 @@
         "CommandExecution$exitCode": "<p>The exit code to return upon completion.</p>",
         "CommandExecution$sandboxArn": "<p>A <code>sandboxArn</code>.</p>",
         "CommandExecutionIds$member": null,
+        "ComputeConfiguration$instanceType": "<p>The EC2 instance type to be launched in your fleet.</p>",
         "ComputeTypesAllowed$member": null,
         "CreateFleetInput$imageId": "<p>The Amazon Machine Image (AMI) of the compute fleet.</p>",
         "CreateFleetInput$fleetServiceRole": "<p>The service role associated with the compute fleet. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/auth-and-access-control-iam-identity-based-access-control.html#customer-managed-policies-example-permission-policy-fleet-service-role.html\"> Allow a user to add a permission policy for a fleet service role</a> in the <i>CodeBuild User Guide</i>.</p>",
@@ -2391,7 +2392,7 @@
     "WebhookScopeType": {
       "base": null,
       "refs": {
-        "ScopeConfiguration$scope": "<p>The type of scope for a GitHub or GitLab webhook.</p>"
+        "ScopeConfiguration$scope": "<p>The type of scope for a GitHub or GitLab webhook. The scope default is GITHUB_ORGANIZATION.</p>"
       }
     },
     "WebhookStatus": {

generator/ServiceModels/codebuild/codebuild-2016-10-06.normal.json

@@ -1859,9 +1859,13 @@
         "machineType":{
           "shape":"MachineType",
           "documentation":"<p>The machine type of the instance type included in your fleet.</p>"
+        },
+        "instanceType":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The EC2 instance type to be launched in your fleet.</p>"
         }
       },
-      "documentation":"<p>Contains compute attributes. These attributes only need be specified when your project's or fleet's <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code>.</p>"
+      "documentation":"<p>Contains compute attributes. These attributes only need be specified when your project's or fleet's <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code> or <code>CUSTOM_INSTANCE_TYPE</code>.</p>"
     },
     "ComputeType":{
       "type":"string",
@@ -1876,7 +1880,8 @@
         "BUILD_LAMBDA_4GB",
         "BUILD_LAMBDA_8GB",
         "BUILD_LAMBDA_10GB",
-        "ATTRIBUTE_BASED_COMPUTE"
+        "ATTRIBUTE_BASED_COMPUTE",
+        "CUSTOM_INSTANCE_TYPE"
       ]
     },
     "ComputeTypesAllowed":{
@@ -4645,7 +4650,7 @@
         },
         "scope":{
           "shape":"WebhookScopeType",
-          "documentation":"<p>The type of scope for a GitHub or GitLab webhook.</p>"
+          "documentation":"<p>The type of scope for a GitHub or GitLab webhook. The scope default is GITHUB_ORGANIZATION.</p>"
         }
       },
       "documentation":"<p>Contains configuration information about the scope for a webhook. </p>"

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

@@ -569,6 +569,10 @@
     <property>Amazon.CodeBuild.Model.CommandExecution.Status</property>
     <min>1</min>
   </property-value-rule>
+  <property-value-rule>
+    <property>Amazon.CodeBuild.Model.ComputeConfiguration.InstanceType</property>
+    <min>1</min>
+  </property-value-rule>
   <property-value-rule>
     <property>Amazon.CodeBuild.Model.DebugSession.SessionTarget</property>
     <min>1</min>

sdk/src/Services/CodeBuild/Generated/Model/ComputeConfiguration.cs

@@ -31,11 +31,12 @@ namespace Amazon.CodeBuild.Model
 {
     /// <summary>
     /// Contains compute attributes. These attributes only need be specified when your project's
-    /// or fleet's <c>computeType</c> is set to <c>ATTRIBUTE_BASED_COMPUTE</c>.
+    /// or fleet's <c>computeType</c> is set to <c>ATTRIBUTE_BASED_COMPUTE</c> or <c>CUSTOM_INSTANCE_TYPE</c>.
     /// </summary>
     public partial class ComputeConfiguration
     {
         private long? _disk;
+        private string _instanceType;
         private MachineType _machineType;
         private long? _memory;
         private long? _vCpu;
@@ -58,6 +59,25 @@ internal bool IsSetDisk()
             return this._disk.HasValue; 
         }
 
+        /// <summary>
+        /// Gets and sets the property InstanceType. 
+        /// <para>
+        /// The EC2 instance type to be launched in your fleet.
+        /// </para>
+        /// </summary>
+        [AWSProperty(Min=1)]
+        public string InstanceType
+        {
+            get { return this._instanceType; }
+            set { this._instanceType = value; }
+        }
+
+        // Check to see if InstanceType property is set
+        internal bool IsSetInstanceType()
+        {
+            return this._instanceType != null;
+        }
+
         /// <summary>
         /// Gets and sets the property MachineType. 
         /// <para>

sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationMarshaller.cs

@@ -54,6 +54,12 @@ public void Marshall(ComputeConfiguration requestObject, JsonMarshallerContext c
                 context.Writer.Write(requestObject.Disk);
             }
 
+            if(requestObject.IsSetInstanceType())
+            {
+                context.Writer.WritePropertyName("instanceType");
+                context.Writer.Write(requestObject.InstanceType);
+            }
+
             if(requestObject.IsSetMachineType())
             {
                 context.Writer.WritePropertyName("machineType");

sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationUnmarshaller.cs

@@ -72,6 +72,12 @@ public ComputeConfiguration Unmarshall(JsonUnmarshallerContext context)
                     unmarshalledObject.Disk = unmarshaller.Unmarshall(context);
                     continue;
                 }
+                if (context.TestExpression("instanceType", targetDepth))
+                {
+                    var unmarshaller = StringUnmarshaller.Instance;
+                    unmarshalledObject.InstanceType = unmarshaller.Unmarshall(context);
+                    continue;
+                }
                 if (context.TestExpression("machineType", targetDepth))
                 {
                     var unmarshaller = StringUnmarshaller.Instance;

sdk/src/Services/CodeBuild/Generated/Model/ScopeConfiguration.cs

@@ -81,7 +81,7 @@ internal bool IsSetName()
         /// <summary>
         /// Gets and sets the property Scope. 
         /// <para>
-        /// The type of scope for a GitHub or GitLab webhook.
+        /// The type of scope for a GitHub or GitLab webhook. The scope default is GITHUB_ORGANIZATION.
         /// </para>
         /// </summary>
         [AWSProperty(Required=true)]

sdk/src/Services/CodeBuild/Generated/ServiceEnumerations.cs

@@ -704,6 +704,10 @@ public class ComputeType : ConstantClass
         /// Constant BUILD_LAMBDA_8GB for ComputeType
         /// </summary>
         public static readonly ComputeType BUILD_LAMBDA_8GB = new ComputeType("BUILD_LAMBDA_8GB");
+        /// <summary>
+        /// Constant CUSTOM_INSTANCE_TYPE for ComputeType
+        /// </summary>
+        public static readonly ComputeType CUSTOM_INSTANCE_TYPE = new ComputeType("CUSTOM_INSTANCE_TYPE");
 
         /// <summary>
         /// This constant constructor does not need to be called if the constant