From 0af1d87dbc1583b40e4b01ee2740d2bc81f71ea9 Mon Sep 17 00:00:00 2001 From: Joseph Mcallister Date: Wed, 2 Jun 2021 11:13:08 -0700 Subject: [PATCH 1/4] GitHub bring your own app swagger changes for ADF/Synapse --- .../stable/2018-06-01/datafactory.json | 27 +++++++++++++++++++ .../2019-06-01-preview/gitintegration.json | 18 +++++++++++++ .../preview/2019-06-01-preview/workspace.json | 22 +++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json index 074c69297192..c36ab08b1b70 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json @@ -5012,6 +5012,29 @@ "hostName": { "description": "GitHub Enterprise host name. For example: https://github.mydomain.com", "type": "string" + }, + "clientId": { + "description": "GitHub bring your own app client id.", + "type": "string" + }, + "clientSecret": { + "$ref": "#/definitions/GitHubClientSecret", + "description": "GitHub bring your own app client secret information." + } + } + }, + "GitHubClientSecret": { + "x-ms-discriminator-value": "GitHubClientSecret", + "description": "Client secret information for factory's bring your own app repository configuration.", + "type": "object", + "properties": { + "byoaSecretAkvUrl": { + "description": "Bring your own app client secret AKV URL.", + "type": "string" + }, + "byoaSecretName": { + "description": "Bring your own app client secret name in AKV.", + "type": "string" } } }, @@ -5039,6 +5062,10 @@ "description": "GitHub application client ID.", "type": "string" }, + "gitHubClientSecret": { + "$ref": "#/definitions/GitHubClientSecret", + "description": "GitHub bring your own app client secret information." + }, "gitHubAccessTokenBaseUrl": { "description": "GitHub access token base URL.", "type": "string" diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/gitintegration.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/gitintegration.json index 010f6e11d9f2..1cdfab165519 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/gitintegration.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/gitintegration.json @@ -71,6 +71,20 @@ } }, "definitions": { + "GitHubClientSecret": { + "description": "Client secret information for factory's bring your own app repository configuration", + "type": "object", + "properties": { + "byoaSecretAkvUrl": { + "description": "Bring your own app client secret AKV URL", + "type": "string" + }, + "byoaSecretName": { + "description": "Bring your own app client secret name in AKV", + "type": "string" + } + } + }, "GitHubAccessTokenRequest": { "type": "object", "properties": { @@ -78,6 +92,10 @@ "description": "The GitHub Client Id.", "type": "string" }, + "gitHubClientSecret": { + "$ref": "#/definitions/GitHubClientSecret", + "description": "GitHub bring your own app client secret information." + }, "gitHubAccessCode": { "description": "The GitHub Access code.", "type": "string" diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 589d37a2954b..de2e80114951 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -1050,6 +1050,20 @@ } } }, + "GitHubClientSecret": { + "description": "Client secret information for factory's bring your own app repo configuration", + "type": "object", + "properties": { + "byoaSecretAkvUrl": { + "description": "Bring your own app client secret AKV URL", + "type": "string" + }, + "byoaSecretName": { + "description": "Bring your own app client secret name in AKV", + "type": "string" + } + } + }, "WorkspaceRepositoryConfiguration": { "description": "Git integration settings", "type": "object", @@ -1090,6 +1104,14 @@ "description": "The VSTS tenant ID", "type": "string", "format": "uuid" + }, + "clientId": { + "description": "GitHub bring your own app client id", + "type": "string" + }, + "clientSecret": { + "$ref": "#/definitions/GitHubClientSecret", + "description": "GitHub bring your own app client secret information." } } }, From b8799cc63082754a93a58ec6a4e799eeec9a61e2 Mon Sep 17 00:00:00 2001 From: Joseph Mcallister Date: Wed, 2 Jun 2021 13:08:01 -0700 Subject: [PATCH 2/4] fix different githubclientsecret description lint error --- .../Microsoft.Synapse/preview/2019-06-01-preview/workspace.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index de2e80114951..0f5c7ab4bc34 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -1051,7 +1051,7 @@ } }, "GitHubClientSecret": { - "description": "Client secret information for factory's bring your own app repo configuration", + "description": "Client secret information for factory's bring your own app repository configuration", "type": "object", "properties": { "byoaSecretAkvUrl": { From cb36d26727acc0214329b3eafdb07f07fd6a50ca Mon Sep 17 00:00:00 2001 From: Joseph Mcallister Date: Fri, 4 Jun 2021 18:25:06 -0700 Subject: [PATCH 3/4] Separate dataplane changes to support GitHub BYOA in ADF/Synapse --- .../stable/2018-06-01/datafactory.json | 8 ------- .../preview/2019-06-01-preview/workspace.json | 22 ------------------- 2 files changed, 30 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json index c36ab08b1b70..7bdc871a533a 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json @@ -5012,14 +5012,6 @@ "hostName": { "description": "GitHub Enterprise host name. For example: https://github.mydomain.com", "type": "string" - }, - "clientId": { - "description": "GitHub bring your own app client id.", - "type": "string" - }, - "clientSecret": { - "$ref": "#/definitions/GitHubClientSecret", - "description": "GitHub bring your own app client secret information." } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 0f5c7ab4bc34..589d37a2954b 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -1050,20 +1050,6 @@ } } }, - "GitHubClientSecret": { - "description": "Client secret information for factory's bring your own app repository configuration", - "type": "object", - "properties": { - "byoaSecretAkvUrl": { - "description": "Bring your own app client secret AKV URL", - "type": "string" - }, - "byoaSecretName": { - "description": "Bring your own app client secret name in AKV", - "type": "string" - } - } - }, "WorkspaceRepositoryConfiguration": { "description": "Git integration settings", "type": "object", @@ -1104,14 +1090,6 @@ "description": "The VSTS tenant ID", "type": "string", "format": "uuid" - }, - "clientId": { - "description": "GitHub bring your own app client id", - "type": "string" - }, - "clientSecret": { - "$ref": "#/definitions/GitHubClientSecret", - "description": "GitHub bring your own app client secret information." } } }, From 054d81745d028787f56b0587af2cb088d72d2a06 Mon Sep 17 00:00:00 2001 From: Joseph Mcallister Date: Mon, 7 Jun 2021 15:49:12 -0700 Subject: [PATCH 4/4] remove unnecessary discriminator --- .../Microsoft.DataFactory/stable/2018-06-01/datafactory.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json index 7bdc871a533a..8bbf519ec657 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json @@ -5016,7 +5016,6 @@ } }, "GitHubClientSecret": { - "x-ms-discriminator-value": "GitHubClientSecret", "description": "Client secret information for factory's bring your own app repository configuration.", "type": "object", "properties": {