From b06aacd9ef31d5997bd1ae6b56a7a7a0e741328f Mon Sep 17 00:00:00 2001 From: Srinivas Alluri Date: Wed, 28 Oct 2020 16:06:43 +0530 Subject: [PATCH 01/11] added agreement terms api --- .../preview/2020-03-01-preview/confluent.json | 161 +++++++++++++++++- .../examples/MarketplaceAgreements_List.json | 45 +++++ .../examples/MarketplaceAgreements_Set.json | 42 +++++ 3 files changed, 246 insertions(+), 2 deletions(-) create mode 100644 specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_List.json create mode 100644 specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json index ac78123f302a..29de80277305 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json @@ -33,6 +33,84 @@ } }, "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements": { + "get": { + "tags": [ + "Agreements" + ], + "summary": "List Confluent marketplace agreements in the subscription.", + "operationId": "MarketplaceAgreements_List", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/AgreementTermsListResponse" + } + }, + "default": { + "description": "Default error response.", + "schema": { + "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "MarketplaceAgreements_List": { + "$ref": "./examples/MarketplaceAgreements_List.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/all/setTerms": { + "post": { + "tags": [ + "Agreements" + ], + "summary": "Set marketplace terms.", + "operationId": "MarketplaceAgreements_Set", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/AgreementTermsListResponse" + } + }, + "default": { + "description": "Default error response.", + "schema": { + "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "MarketplaceAgreements_Set": { + "$ref": "./examples/MarketplaceAgreements_Set.json" + } + } + } + }, "/providers/Microsoft.Confluent/operations": { "get": { "tags": [ @@ -351,7 +429,7 @@ "202": { "description": "Accepted" }, - "204": { + "204": { "description": "The specified confluent resource does not exist in the subscription." }, "default": { @@ -374,6 +452,85 @@ } }, "definitions": { + "AgreementProperties": { + "description": "Terms properties for Marketplace and Confluent.", + "type": "object", + "properties": { + "publisher": { + "description": "Publisher identifier string.", + "type": "string" + }, + "product": { + "description": "Product identifier string.", + "type": "string" + }, + "plan": { + "description": "Plan identifier string.", + "type": "string" + }, + "licenseTextLink": { + "description": "Link to HTML with Microsoft and Publisher terms.", + "type": "string" + }, + "privacyPolicyLink": { + "description": "Link to the privacy policy of the publisher.", + "type": "string" + }, + "retrieveDatetime": { + "format": "date-time", + "description": "Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.", + "type": "string" + }, + "signature": { + "description": "Terms signature.", + "type": "string" + }, + "accepted": { + "description": "If any version of the terms have been accepted, otherwise false.", + "type": "boolean" + } + } + }, + "AgreementTerms": { + "description": "Agreement Terms definition", + "type": "object", + "properties": { + "id": { + "description": "The id of agreement resource.", + "type": "string" + }, + "name": { + "description": "The name of the agreement.", + "type": "string" + }, + "type": { + "description": "The type of the agreement.", + "type": "string" + }, + "properties": { + "$ref": "#/definitions/AgreementProperties", + "description": "Represents the properties of the resource.", + "x-ms-client-flatten": true + } + } + }, + "AgreementTermsListResponse": { + "description": "Response of a list operation.", + "type": "object", + "properties": { + "value": { + "description": "Results of a list operation.", + "type": "array", + "items": { + "$ref": "#/definitions/AgreementTerms" + } + }, + "nextLink": { + "description": "Link to the next set of results, if any.", + "type": "string" + } + } + }, "OperationDisplay": { "description": "The object that represents the operation.", "type": "object", @@ -561,7 +718,7 @@ }, "emailAddress": { "description": "Email address", - "pattern": "^[\\w\\.\\-+!%\"\\s]+@[a-zA-Z0-9_\\-]+?\\.[a-zA-Z0-9]{2,7}$", + "pattern": "\\S+@\\S+\\.\\S+", "type": "string" } } diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_List.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_List.json new file mode 100644 index 000000000000..6b1c3bbb93a3 --- /dev/null +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_List.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "api-version": "2020-02-01-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "id1", + "name": "planid1", + "type": "Microsoft.MarketplaceOrdering/offertypes", + "properties": { + "publisher": "pubid1", + "product": "offid1", + "plan": "planid1", + "licenseTextLink": "test.licenseLink1", + "privacyPolicyLink": "test.privacyPolicyLink1", + "retrieveDatetime": "2017-08-15T11:33:07.12132Z", + "signature": "ASDFSDAFWEFASDGWERLWER", + "accepted": true + } + }, + { + "id": "id2", + "name": "planid2", + "type": "Microsoft.MarketplaceOrdering/offertypes", + "properties": { + "publisher": "pubid2", + "product": "offid2", + "plan": "planid2", + "licenseTextLink": "test.licenseLin2k", + "privacyPolicyLink": "test.privacyPolicyLink2", + "retrieveDatetime": "2017-08-14T11:33:07.12132Z", + "signature": "ASDFSDAFWEFASDGWERLWER", + "accepted": true + } + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json new file mode 100644 index 000000000000..9a95c422d3ee --- /dev/null +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "api-version": "2020-02-01-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": [ + { + "id": "id1", + "name": "planid1", + "type": "Microsoft.MarketplaceOrdering/offertypes", + "properties": { + "publisher": "pubid1", + "product": "offid1", + "plan": "planid1", + "licenseTextLink": "test.licenseLink1", + "privacyPolicyLink": "test.privacyPolicyLink1", + "retrieveDatetime": "2017-08-15T11:33:07.12132Z", + "signature": "ASDFSDAFWEFASDGWERLWER", + "accepted": true + } + }, + { + "id": "id2", + "name": "planid2", + "type": "Microsoft.MarketplaceOrdering/offertypes", + "properties": { + "publisher": "pubid2", + "product": "offid2", + "plan": "planid2", + "licenseTextLink": "test.licenseLin2k", + "privacyPolicyLink": "test.privacyPolicyLink2", + "retrieveDatetime": "2017-08-14T11:33:07.12132Z", + "signature": "ASDFSDAFWEFASDGWERLWER", + "accepted": true + } + } + ] + } + } +} \ No newline at end of file From fb1fce1955a4e3ba97579a7ba6ead301b12a9fce Mon Sep 17 00:00:00 2001 From: Srinivas Alluri Date: Wed, 28 Oct 2020 17:02:19 +0530 Subject: [PATCH 02/11] fix validation issues --- .../preview/2020-03-01-preview/confluent.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json index 29de80277305..a9625cc59a20 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json @@ -78,7 +78,7 @@ "Agreements" ], "summary": "Set marketplace terms.", - "operationId": "MarketplaceAgreements_Set", + "operationId": "MarketplaceAgreementsSetTerms_List", "produces": [ "application/json" ], @@ -515,7 +515,7 @@ } }, "AgreementTermsListResponse": { - "description": "Response of a list operation.", + "description": "Response of a agreements operation.", "type": "object", "properties": { "value": { From 9372431bed072a461d7a3028540e98997e477ded Mon Sep 17 00:00:00 2001 From: Srinivas Alluri Date: Wed, 28 Oct 2020 17:58:40 +0530 Subject: [PATCH 03/11] fix validation errors --- .../preview/2020-03-01-preview/confluent.json | 71 +++++++++---------- .../examples/MarketplaceAgreements_Set.json | 13 ++-- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json index a9625cc59a20..90bd21a781b8 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json @@ -73,43 +73,40 @@ } }, "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/all/setTerms": { - "post": { - "tags": [ - "Agreements" - ], - "summary": "Set marketplace terms.", - "operationId": "MarketplaceAgreementsSetTerms_List", - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/AgreementTermsListResponse" - } - }, - "default": { - "description": "Default error response.", - "schema": { - "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "MarketplaceAgreements_Set": { - "$ref": "./examples/MarketplaceAgreements_Set.json" - } - } - } + "post": { + "tags": [ + "Agreements" + ], + "summary": "Set marketplace terms.", + "operationId": "MarketplaceAgreements_SetTerms", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/AgreementTermsListResponse" + } + }, + "default": { + "description": "Default error response.", + "schema": { + "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "MarketplaceAgreements_Set": { + "$ref": "./examples/MarketplaceAgreements_Set.json" + } + } + } }, "/providers/Microsoft.Confluent/operations": { "get": { diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json index 9a95c422d3ee..60fccb49fa79 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json @@ -5,8 +5,9 @@ }, "responses": { "200": { - "body": [ - { + "body": { + "value":[ + { "id": "id1", "name": "planid1", "type": "Microsoft.MarketplaceOrdering/offertypes", @@ -21,7 +22,7 @@ "accepted": true } }, - { + { "id": "id2", "name": "planid2", "type": "Microsoft.MarketplaceOrdering/offertypes", @@ -36,7 +37,9 @@ "accepted": true } } - ] - } + ], + "nextLink": null + } + } } } \ No newline at end of file From 379f92a774438774c40552b90c6700ed3b99dddb Mon Sep 17 00:00:00 2001 From: Srinivas Alluri Date: Thu, 29 Oct 2020 01:08:44 +0530 Subject: [PATCH 04/11] renamed api to accept terms --- .../preview/2020-03-01-preview/confluent.json | 67 +++++++++---------- .../examples/MarketplaceAgreements_Set.json | 38 +---------- 2 files changed, 33 insertions(+), 72 deletions(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json index 90bd21a781b8..eb1e739d1cf4 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json @@ -72,41 +72,38 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/all/setTerms": { - "post": { - "tags": [ - "Agreements" - ], - "summary": "Set marketplace terms.", - "operationId": "MarketplaceAgreements_SetTerms", - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/AgreementTermsListResponse" - } - }, - "default": { - "description": "Default error response.", - "schema": { - "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" - } - } - }, - "x-ms-examples": { - "MarketplaceAgreements_Set": { - "$ref": "./examples/MarketplaceAgreements_Set.json" - } - } - } + "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/all/acceptTerms": { + "post": { + "tags": [ + "Agreements" + ], + "summary": "Accept marketplace terms.", + "operationId": "MarketplaceAgreements_AcceptTerms", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Success" + }, + "default": { + "description": "Default error response.", + "schema": { + "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "MarketplaceAgreements_Set": { + "$ref": "./examples/MarketplaceAgreements_Set.json" + } + } + } }, "/providers/Microsoft.Confluent/operations": { "get": { diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json index 60fccb49fa79..52e1e8f6d2b1 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json @@ -4,42 +4,6 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { - "200": { - "body": { - "value":[ - { - "id": "id1", - "name": "planid1", - "type": "Microsoft.MarketplaceOrdering/offertypes", - "properties": { - "publisher": "pubid1", - "product": "offid1", - "plan": "planid1", - "licenseTextLink": "test.licenseLink1", - "privacyPolicyLink": "test.privacyPolicyLink1", - "retrieveDatetime": "2017-08-15T11:33:07.12132Z", - "signature": "ASDFSDAFWEFASDGWERLWER", - "accepted": true - } - }, - { - "id": "id2", - "name": "planid2", - "type": "Microsoft.MarketplaceOrdering/offertypes", - "properties": { - "publisher": "pubid2", - "product": "offid2", - "plan": "planid2", - "licenseTextLink": "test.licenseLin2k", - "privacyPolicyLink": "test.privacyPolicyLink2", - "retrieveDatetime": "2017-08-14T11:33:07.12132Z", - "signature": "ASDFSDAFWEFASDGWERLWER", - "accepted": true - } - } - ], - "nextLink": null - } - } + "200": {} } } \ No newline at end of file From 7c6234e76446cf8ea0d0229d306e724006fc1afd Mon Sep 17 00:00:00 2001 From: Srinivas Date: Thu, 5 Nov 2020 21:21:04 +0530 Subject: [PATCH 05/11] Updated confluent swagger spec --- .../preview/2020-03-01-preview/confluent.json | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json index 83b961c95479..37e969c8ad95 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json @@ -52,7 +52,7 @@ "200": { "description": "Success", "schema": { - "$ref": "#/definitions/AgreementTermsListResponse" + "$ref": "#/definitions/ConfluentAgreementResourceListResponse" } }, "default": { @@ -72,7 +72,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/all/acceptTerms": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/default": { "post": { "tags": [ "Agreements" @@ -85,11 +85,21 @@ "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "in": "body", + "name": "body", + "schema": { + "$ref": "#/definitions/ConfluentAgreementResource" + } } ], "responses": { "200": { - "description": "Success" + "description": "Success", + "schema": { + "$ref": "#/definitions/ConfluentAgreementResource" + } }, "default": { "description": "Default error response.", @@ -446,7 +456,7 @@ } }, "definitions": { - "AgreementProperties": { + "ConfluentAgreementProperties": { "description": "Terms properties for Marketplace and Confluent.", "type": "object", "properties": { @@ -485,7 +495,7 @@ } } }, - "AgreementTerms": { + "ConfluentAgreementResource": { "description": "Agreement Terms definition", "type": "object", "properties": { @@ -502,13 +512,13 @@ "type": "string" }, "properties": { - "$ref": "#/definitions/AgreementProperties", + "$ref": "#/definitions/ConfluentAgreementProperties", "description": "Represents the properties of the resource.", "x-ms-client-flatten": true } } }, - "AgreementTermsListResponse": { + "ConfluentAgreementResourceListResponse": { "description": "Response of a agreements operation.", "type": "object", "properties": { @@ -516,7 +526,7 @@ "description": "Results of a list operation.", "type": "array", "items": { - "$ref": "#/definitions/AgreementTerms" + "$ref": "#/definitions/ConfluentAgreementResource" } }, "nextLink": { From 9feed0de5d5e35e8c44c44ff757885e02bf6cbdc Mon Sep 17 00:00:00 2001 From: Srinivas Date: Thu, 5 Nov 2020 21:22:13 +0530 Subject: [PATCH 06/11] Updated the response examples --- .../examples/MarketplaceAgreements_Set.json | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json index 52e1e8f6d2b1..7ae461e9df31 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json @@ -1,9 +1,30 @@ { "parameters": { - "api-version": "2020-02-01-preview", - "subscriptionId": "00000000-0000-0000-0000-000000000000" + "api-version": "2020-03-01-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "requestBody": { + "properties": { + "accepted": true + } + } }, "responses": { - "200": {} + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Confluent/agreements/default", + "name": "default", + "type": "Microsoft.Confluent/agreements", + "properties": { + "publisher": "pubid1", + "product": "offid1", + "plan": "planid1", + "licenseTextLink": "test.licenseLink1", + "privacyPolicyLink": "test.privacyPolicyLink1", + "retrieveDatetime": "2020-11-05T17:33:07.12132Z", + "signature": "YKWOQOKH2BCKZ46O7SCKHANWEENRFRU5WB4LXDFUYWCBWTS4AG4SGQXCOZYIR5ZJCZTXRMZKYZMO2BJSL5YKPLAR4LBFRUNS6CRYE7A", + "accepted": true + } + } + } } -} \ No newline at end of file +} From 5ca951c3e85a11ad76de61b51e2995849dcc3b17 Mon Sep 17 00:00:00 2001 From: Srinivas Date: Fri, 6 Nov 2020 00:34:59 +0530 Subject: [PATCH 07/11] lint --- .../preview/2020-03-01-preview/confluent.json | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json index 37e969c8ad95..d61ecde144b5 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json @@ -77,8 +77,8 @@ "tags": [ "Agreements" ], - "summary": "Accept marketplace terms.", - "operationId": "MarketplaceAgreements_AcceptTerms", + "summary": "Create Confluent Marketplace agreement in the subscription.", + "operationId": "MarketplaceAgreements_Create", "produces": [ "application/json" ], @@ -109,8 +109,8 @@ } }, "x-ms-examples": { - "MarketplaceAgreements_Set": { - "$ref": "./examples/MarketplaceAgreements_Set.json" + "MarketplaceAgreements_Create": { + "$ref": "./examples/MarketplaceAgreements_Create.json" } } } @@ -498,23 +498,26 @@ "ConfluentAgreementResource": { "description": "Agreement Terms definition", "type": "object", + "x-ms-azure-resource": true, "properties": { "id": { - "description": "The id of agreement resource.", - "type": "string" + "description": "The ARM id of the resource.", + "type": "string", + "readOnly": true }, "name": { "description": "The name of the agreement.", - "type": "string" + "type": "string", + "readOnly": true }, "type": { "description": "The type of the agreement.", - "type": "string" + "type": "string", + "readOnly": true }, "properties": { "$ref": "#/definitions/ConfluentAgreementProperties", - "description": "Represents the properties of the resource.", - "x-ms-client-flatten": true + "description": "Represents the properties of the resource." } } }, From 993f018ce5aebebae953bf89e75b9300235f0853 Mon Sep 17 00:00:00 2001 From: Srinivas Date: Fri, 6 Nov 2020 00:35:35 +0530 Subject: [PATCH 08/11] rename --- ...placeAgreements_Set.json => MarketplaceAgreements_Create.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/{MarketplaceAgreements_Set.json => MarketplaceAgreements_Create.json} (100%) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Create.json similarity index 100% rename from specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Set.json rename to specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_Create.json From ea544ca8cf76552129b76baaa0b49812531c2056 Mon Sep 17 00:00:00 2001 From: Srinivas Date: Fri, 6 Nov 2020 07:11:25 +0530 Subject: [PATCH 09/11] Updated Post to Put Missed this change --- .../preview/2020-03-01-preview/confluent.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json index d61ecde144b5..3faf9b39863c 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json @@ -73,7 +73,7 @@ } }, "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/default": { - "post": { + "put": { "tags": [ "Agreements" ], From 08e652573486b93bfa84b9d6687314657ff6773c Mon Sep 17 00:00:00 2001 From: Srinivas Date: Fri, 6 Nov 2020 23:09:00 +0530 Subject: [PATCH 10/11] updated version --- .../examples/MarketplaceAgreements_List.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_List.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_List.json index 6b1c3bbb93a3..a436d71482aa 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_List.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/examples/MarketplaceAgreements_List.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-02-01-preview", + "api-version": "2020-03-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { @@ -42,4 +42,4 @@ } } } -} \ No newline at end of file +} From 87e036b27c4b443292cadc3270fc886a2ec2127c Mon Sep 17 00:00:00 2001 From: Srinivas Alluri Date: Mon, 9 Nov 2020 09:07:17 +0530 Subject: [PATCH 11/11] prettier check fix --- .../preview/2020-03-01-preview/confluent.json | 300 +++++++++--------- 1 file changed, 150 insertions(+), 150 deletions(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json index 3faf9b39863c..f08e586fac81 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json @@ -34,86 +34,86 @@ }, "paths": { "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements": { - "get": { - "tags": [ - "Agreements" - ], - "summary": "List Confluent marketplace agreements in the subscription.", - "operationId": "MarketplaceAgreements_List", - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/ConfluentAgreementResourceListResponse" - } - }, - "default": { - "description": "Default error response.", - "schema": { - "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" - } + "get": { + "tags": [ + "Agreements" + ], + "summary": "List Confluent marketplace agreements in the subscription.", + "operationId": "MarketplaceAgreements_List", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/ConfluentAgreementResourceListResponse" + } + }, + "default": { + "description": "Default error response.", + "schema": { + "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "MarketplaceAgreements_List": { + "$ref": "./examples/MarketplaceAgreements_List.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/default": { + "put": { + "tags": [ + "Agreements" + ], + "summary": "Create Confluent Marketplace agreement in the subscription.", + "operationId": "MarketplaceAgreements_Create", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" }, - "x-ms-pageable": { - "nextLinkName": "nextLink" + { + "in": "body", + "name": "body", + "schema": { + "$ref": "#/definitions/ConfluentAgreementResource" + } + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/ConfluentAgreementResource" + } }, - "x-ms-examples": { - "MarketplaceAgreements_List": { - "$ref": "./examples/MarketplaceAgreements_List.json" + "default": { + "description": "Default error response.", + "schema": { + "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" } } + }, + "x-ms-examples": { + "MarketplaceAgreements_Create": { + "$ref": "./examples/MarketplaceAgreements_Create.json" + } } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/default": { - "put": { - "tags": [ - "Agreements" - ], - "summary": "Create Confluent Marketplace agreement in the subscription.", - "operationId": "MarketplaceAgreements_Create", - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "in": "body", - "name": "body", - "schema": { - "$ref": "#/definitions/ConfluentAgreementResource" - } - } - ], - "responses": { - "200": { - "description": "Success", - "schema": { - "$ref": "#/definitions/ConfluentAgreementResource" - } - }, - "default": { - "description": "Default error response.", - "schema": { - "$ref": "#/definitions/ResourceProviderDefaultErrorResponse" - } - } - }, - "x-ms-examples": { - "MarketplaceAgreements_Create": { - "$ref": "./examples/MarketplaceAgreements_Create.json" - } - } - } + } }, "/providers/Microsoft.Confluent/operations": { "get": { @@ -433,7 +433,7 @@ "202": { "description": "Accepted" }, - "204": { + "204": { "description": "The specified confluent resource does not exist in the subscription." }, "default": { @@ -457,86 +457,86 @@ }, "definitions": { "ConfluentAgreementProperties": { - "description": "Terms properties for Marketplace and Confluent.", - "type": "object", - "properties": { - "publisher": { - "description": "Publisher identifier string.", - "type": "string" - }, - "product": { - "description": "Product identifier string.", - "type": "string" - }, - "plan": { - "description": "Plan identifier string.", - "type": "string" - }, - "licenseTextLink": { - "description": "Link to HTML with Microsoft and Publisher terms.", - "type": "string" - }, - "privacyPolicyLink": { - "description": "Link to the privacy policy of the publisher.", - "type": "string" - }, - "retrieveDatetime": { - "format": "date-time", - "description": "Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.", - "type": "string" - }, - "signature": { - "description": "Terms signature.", - "type": "string" - }, - "accepted": { - "description": "If any version of the terms have been accepted, otherwise false.", - "type": "boolean" - } + "description": "Terms properties for Marketplace and Confluent.", + "type": "object", + "properties": { + "publisher": { + "description": "Publisher identifier string.", + "type": "string" + }, + "product": { + "description": "Product identifier string.", + "type": "string" + }, + "plan": { + "description": "Plan identifier string.", + "type": "string" + }, + "licenseTextLink": { + "description": "Link to HTML with Microsoft and Publisher terms.", + "type": "string" + }, + "privacyPolicyLink": { + "description": "Link to the privacy policy of the publisher.", + "type": "string" + }, + "retrieveDatetime": { + "format": "date-time", + "description": "Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.", + "type": "string" + }, + "signature": { + "description": "Terms signature.", + "type": "string" + }, + "accepted": { + "description": "If any version of the terms have been accepted, otherwise false.", + "type": "boolean" } - }, - "ConfluentAgreementResource": { - "description": "Agreement Terms definition", - "type": "object", - "x-ms-azure-resource": true, + } + }, + "ConfluentAgreementResource": { + "description": "Agreement Terms definition", + "type": "object", + "x-ms-azure-resource": true, + "properties": { + "id": { + "description": "The ARM id of the resource.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "The name of the agreement.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "The type of the agreement.", + "type": "string", + "readOnly": true + }, "properties": { - "id": { - "description": "The ARM id of the resource.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "The name of the agreement.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "The type of the agreement.", - "type": "string", - "readOnly": true - }, - "properties": { - "$ref": "#/definitions/ConfluentAgreementProperties", - "description": "Represents the properties of the resource." - } + "$ref": "#/definitions/ConfluentAgreementProperties", + "description": "Represents the properties of the resource." } - }, - "ConfluentAgreementResourceListResponse": { - "description": "Response of a agreements operation.", - "type": "object", - "properties": { - "value": { - "description": "Results of a list operation.", - "type": "array", - "items": { - "$ref": "#/definitions/ConfluentAgreementResource" - } - }, - "nextLink": { - "description": "Link to the next set of results, if any.", - "type": "string" + } + }, + "ConfluentAgreementResourceListResponse": { + "description": "Response of a agreements operation.", + "type": "object", + "properties": { + "value": { + "description": "Results of a list operation.", + "type": "array", + "items": { + "$ref": "#/definitions/ConfluentAgreementResource" } + }, + "nextLink": { + "description": "Link to the next set of results, if any.", + "type": "string" } + } }, "OperationDisplay": { "description": "The object that represents the operation.",