Update budget Management API's to list/create/update RI_UTILIZATION t…

…ype budget. Update budget Management API's to support DAILY timeUnit for RI_UTILIZATION type budget.
PavelSafronov · Jul 19, 2017 · fd82543 · fd82543
1 parent 4845f21
commit fd82543
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 17 deletions.
diff --git a/generator/ServiceModels/budgets/budgets-2016-10-20.examples.json b/generator/ServiceModels/budgets/budgets-2016-10-20.examples.json
@@ -0,0 +1,5 @@
+{
+  "version": "1.0",
+  "examples": {
+  }
+}
diff --git a/generator/ServiceModels/budgets/budgets-2016-10-20.normal.json b/generator/ServiceModels/budgets/budgets-2016-10-20.normal.json
@@ -250,16 +250,17 @@
     },
     "BudgetName":{
       "type":"string",
-      "documentation":"A string represents the budget name. No \":\" character is allowed.",
+      "documentation":"A string represents the budget name. No \":\" and \"\\\" character is allowed.",
       "max":100,
-      "pattern":"[^:]+"
+      "pattern":"[^:\\\\]+"
     },
     "BudgetType":{
       "type":"string",
-      "documentation":"The type of a budget. Can be COST or USAGE.",
+      "documentation":"The type of a budget. It should be COST, USAGE, or RI_UTILIZATION.",
       "enum":[
         "USAGE",
-        "COST"
+        "COST",
+        "RI_UTILIZATION"
       ]
     },
     "Budgets":{
@@ -654,7 +655,7 @@
       ],
       "members":{
         "Amount":{"shape":"NumericValue"},
-        "Unit":{"shape":"GenericString"}
+        "Unit":{"shape":"UnitValue"}
       },
       "documentation":"A structure represent either a cost spend or usage spend. Contains an amount and a unit."
     },
@@ -699,13 +700,19 @@
     },
     "TimeUnit":{
       "type":"string",
-      "documentation":"The time unit of the budget. e.g. weekly, monthly, etc.",
+      "documentation":"The time unit of the budget. e.g. MONTHLY, QUARTERLY, etc.",
       "enum":[
+        "DAILY",
         "MONTHLY",
         "QUARTERLY",
         "ANNUALLY"
       ]
     },
+    "UnitValue":{
+      "type":"string",
+      "documentation":"A string to represent budget spend unit. It should be not null and not empty.",
+      "min":1
+    },
     "UpdateBudgetRequest":{
       "type":"structure",
       "required":[

diff --git a/sdk/code-analysis/ServiceAnalysis/Budgets/Generated/PropertyValueRules.xml b/sdk/code-analysis/ServiceAnalysis/Budgets/Generated/PropertyValueRules.xml
@@ -13,7 +13,7 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.CreateNotificationRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.CreateSubscriberRequest.AccountId</property>
@@ -23,7 +23,7 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.CreateSubscriberRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.DeleteBudgetRequest.AccountId</property>
@@ -33,7 +33,7 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.DeleteBudgetRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.DeleteNotificationRequest.AccountId</property>
@@ -43,7 +43,7 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.DeleteNotificationRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.DeleteSubscriberRequest.AccountId</property>
@@ -53,7 +53,7 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.DeleteSubscriberRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.DescribeBudgetRequest.AccountId</property>
@@ -63,7 +63,7 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.DescribeBudgetRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.DescribeBudgetsRequest.AccountId</property>
@@ -83,7 +83,7 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.DescribeNotificationsForBudgetRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.DescribeNotificationsForBudgetRequest.MaxResults</property>
@@ -98,7 +98,7 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.DescribeSubscribersForNotificationRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.DescribeSubscribersForNotificationRequest.MaxResults</property>
@@ -118,7 +118,7 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.UpdateNotificationRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.UpdateSubscriberRequest.AccountId</property>
@@ -128,12 +128,12 @@
   <property-value-rule>
     <property>Amazon.Budgets.Model.UpdateSubscriberRequest.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.Budget.BudgetName</property>
     <max>100</max>
-    <pattern>[^:]+</pattern>
+    <pattern>[^:\\]+</pattern>
   </property-value-rule>
   <property-value-rule>
     <property>Amazon.Budgets.Model.Notification.Threshold</property>
@@ -143,4 +143,8 @@
     <property>Amazon.Budgets.Model.Spend.Amount</property>
     <pattern>[0-9]*(\.)?[0-9]+</pattern>
   </property-value-rule>
+  <property-value-rule>
+    <property>Amazon.Budgets.Model.Spend.Unit</property>
+    <min>1</min>
+  </property-value-rule>
 </property-value-rules>
diff --git a/sdk/src/Services/Budgets/Generated/ServiceEnumerations.cs b/sdk/src/Services/Budgets/Generated/ServiceEnumerations.cs
@@ -35,6 +35,10 @@ public class BudgetType : ConstantClass
         /// </summary>
         public static readonly BudgetType COST = new BudgetType("COST");
         /// <summary>
+        /// Constant RI_UTILIZATION for BudgetType
+        /// </summary>
+        public static readonly BudgetType RI_UTILIZATION = new BudgetType("RI_UTILIZATION");
+        /// <summary>
         /// Constant USAGE for BudgetType
         /// </summary>
         public static readonly BudgetType USAGE = new BudgetType("USAGE");
@@ -239,6 +243,10 @@ public class TimeUnit : ConstantClass
         /// </summary>
         public static readonly TimeUnit ANNUALLY = new TimeUnit("ANNUALLY");
         /// <summary>
+        /// Constant DAILY for TimeUnit
+        /// </summary>
+        public static readonly TimeUnit DAILY = new TimeUnit("DAILY");
+        /// <summary>
         /// Constant MONTHLY for TimeUnit
         /// </summary>
         public static readonly TimeUnit MONTHLY = new TimeUnit("MONTHLY");