Merged latest upstream master.

Azure · Oct 29, 2020 · 2455878 · 2455878
2 parents 25525a2 + a582577
commit 2455878
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 29 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1988,4 +1988,5 @@ msixpackage
 xml
 Creds
 ssoadfs
+Idempotence
 privatelinkhub
diff --git a/package-lock.json b/package-lock.json
diff --git a/...ion/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/Marketplace.json b/...ion/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-01-01/Marketplace.json
@@ -313,6 +313,12 @@
             "schema": {
               "$ref": "#/definitions/PrivateStoreList"
             }
+          },
+          "default": {
+            "description": "Microsoft.Marketplace error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
           }
         },
         "x-ms-pageable": {
@@ -575,6 +581,37 @@
         "eTag": {
           "description": "Identifier for purposes of race condition",
           "type": "string"
+        },
+        "privateStoreName": {
+          "description": "Private Store Name",
+          "type": "string"
+        },
+        "tenantTag": {
+          "description": "Tenant Tag",
+          "type": "string"
+        },
+        "tenantIds": {
+          "description": "Tenant ids",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "customerTag": {
+          "description": "Customer tag",
+          "type": "string"
+        },
+        "hasCommercialAssociation": {
+          "description": "Indicating whether private store has association with Commercial's Billing Account (through billing account's customer tag retrieved from GSM for a subscription",
+          "type": "boolean"
+        },
+        "hasMultiTenantAssociation": {
+          "description": "Indicating whether private store has association with multiple tenants (through tenant's tag retrieved from AAD",
+          "type": "boolean"
+        },
+        "isGov": {
+          "description": "Is government",
+          "type": "boolean"
         }
       }
     },
@@ -636,14 +673,14 @@
           "description": "Private store unique id",
           "type": "string"
         },
-        "createdBy": {
+        "createdAt": {
           "readOnly": true,
-          "description": "Private store offer creator name",
+          "description": "Private store offer creation date",
           "type": "string"
         },
-        "createdDate": {
+        "modifiedAt": {
           "readOnly": true,
-          "description": "Private store offer created date",
+          "description": "Private store offer modification date",
           "type": "string"
         },
         "specificPlanIdsLimitation": {
@@ -652,6 +689,42 @@
           "items": {
             "type": "string"
           }
+        },
+        "updateSuppressedDueIdempotence": {
+          "description": "Indicating whether the offer was not updated to db (true = not updated). If the allow list is identical to the existed one in db, the offer would not be updated.",
+          "type": "string"
+        },
+        "iconFileUris": {
+          "description": "",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/icon"
+          }
+        }
+      }
+    },
+    "icon": {
+      "type": "object",
+      "properties": {
+        "iconKind": {
+          "description": "Icon size",
+          "type": "string",
+          "enum": [
+            "Small",
+            "Medium",
+            "Large",
+            "Wide",
+            "Hero"
+          ],
+          "x-ms-enum": {
+            "name": "IconKind",
+            "modelAsString": true
+          }
+        },
+        "uri": {
+          "description": "Icon uri",
+          "type": "string"
         }
       }
     },

diff --git a/...source-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffer.json b/...source-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffer.json
@@ -21,8 +21,8 @@
             "0002",
             "0003"
           ],
-          "createdDate": "05/29/2015 5:50",
-          "createdBy": "[email protected]"
+          "modifiedAt": "05/29/2015 5:50",
+          "createdAt": "05/28/2015 5:50"
         }
       }
     }

diff --git a/...ource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffers.json b/...ource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStoreOffers.json
@@ -23,8 +23,8 @@
                 "0002",
                 "0003"
               ],
-              "createdDate": "05/29/2015 5:50",
-              "createdBy": "[email protected]"
+              "modifiedAt": "05/29/2015 5:50",
+              "createdAt": "05/28/2015 5:50"
             }
           },
           {
@@ -41,8 +41,8 @@
                 "0001",
                 "0002"
               ],
-              "createdDate": "05/29/2015 5:50",
-              "createdBy": "[email protected]"
+              "modifiedAt": "05/29/2015 5:50",
+              "createdAt": "05/28/2015 5:50"
             }
           }
         ]

diff --git a/...manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffer.json b/...manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffer.json
@@ -22,8 +22,8 @@
             "0002",
             "0003"
           ],
-          "createdDate": "05/29/2015 5:50",
-          "createdBy": "[email protected]"
+          "modifiedAt": "05/29/2015 5:50",
+          "createdAt": "05/28/2015 5:50"
         }
       }
     }

diff --git a/...anager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffers.json b/...anager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStorePrivateOffers.json
@@ -24,8 +24,8 @@
                 "0002",
                 "0003"
               ],
-              "createdDate": "05/29/2015 5:50",
-              "createdBy": "[email protected]"
+              "modifiedAt": "05/29/2015 5:50",
+              "createdAt": "05/28/2015 5:50"
             }
           },
           {
@@ -42,8 +42,8 @@
                 "0001",
                 "0002"
               ],
-              "createdDate": "05/29/2015 5:50",
-              "createdBy": "[email protected]"
+              "modifiedAt": "05/29/2015 5:50",
+              "createdAt": "05/28/2015 5:50"
             }
           }
         ]

diff --git a/...e/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStores.json b/...e/resource-manager/Microsoft.Marketplace/stable/2020-01-01/examples/GetPrivateStores.json
@@ -14,7 +14,13 @@
             "properties": {
               "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
               "availability": "enabled",
-              "eTag": "\"9301f4fd-0000-0100-0000-5e248b350332\""
+              "eTag": "\"9301f4fd-0000-0100-0000-5e248b350332\"",
+              "tenantIds": [],
+              "tenantTag": "a02807d4-c5de-4593-b3c1-c46d4a3a56c7",
+              "customerTag": "",
+              "hasCommercialAssociation": false,
+              "hasMultiTenantAssociation": true,
+              "isGov": false
             }
           },
           {
@@ -24,7 +30,15 @@
             "properties": {
               "privateStoreId": "f4528e55-98c4-4328-8e34-bb7ef7775345",
               "availability": "disabled",
-              "eTag": "\"9301f4fd-0000-0100-0000-5e234b350345\""
+              "eTag": "\"9301f4fd-0000-0100-0000-5e234b350345\"",
+              "tenantIds": [
+                "f686d426-123a-42db-81b7-ab578e110ccd"
+              ],
+              "tenantTag": "",
+              "customerTag": "ABC",
+              "hasCommercialAssociation": true,
+              "hasMultiTenantAssociation": false,
+              "isGov": false
             }
           }
         ]

diff --git a/...rce-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStoreOffer.json b/...rce-manager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStoreOffer.json
@@ -31,8 +31,8 @@
             "0001",
             "0002"
           ],
-          "createdDate": "05/29/2015 5:50",
-          "createdBy": "[email protected]"
+          "modifiedAt": "05/29/2015 5:50",
+          "createdAt": "05/28/2015 5:50"
         }
       }
     }

diff --git a/...ager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStorePrivateOffer.json b/...ager/Microsoft.Marketplace/stable/2020-01-01/examples/UpdatePrivateStorePrivateOffer.json
@@ -32,8 +32,8 @@
             "0001",
             "0002"
           ],
-          "createdDate": "05/29/2015 5:50",
-          "createdBy": "[email protected]"
+          "modifiedAt": "05/29/2015 5:50",
+          "createdAt": "05/28/2015 5:50"
         }
       }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1988,4 +1988,5 @@ msixpackage @@
     xml
     Creds
     ssoadfs
+    Idempotence
     privatelinkhub