Skip to content

Commit

Permalink
Adding serviceConfigurationToken
Browse files Browse the repository at this point in the history
  • Loading branch information
apmehrotra committed Nov 23, 2022
1 parent 45bdaea commit 1e2703b
Showing 6 changed files with 129 additions and 45 deletions.
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"endpointName": "default",
"expiresin": 10800,
"ListCredentialsRequest": {
"service": "127.0.0.1:65035"
"serviceName": "SSH"
}
},
"responses": {
@@ -17,7 +17,7 @@
"hybridConnectionName": "microsoft.kubernetes/connectedclusters/a0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498/1619989456957411072",
"accessKey": "SharedAccessSignature sr=http%3A%2F%2Fazgnrelay-eastus-l1.servicebus.windows.net%2Fmicrosoft.kubernetes%2Fconnectedclusters%2Fa0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498%2F1619989456957411072%2F&sig=WxDwPF6AmmODaMHNnBGDSm773UG%2B%2Be",
"expiresOn": 1620000256,
"serviceConfigurationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsIjL?inCN2zkG"
"serviceConfigurationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsinCN2zkG"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/arcGroup/providers/Microsoft.ArcPlaceHolder/ProvisionedClusters/cluster0",
"api-version": "2023-03-15",
"endpointName": "default",
"expiresin": 10800
},
"responses": {
"200": {
"body": {
"relay": {
"namespaceName": "relaynamespace",
"namespaceNameSuffix": "servicebus.windows.net",
"hybridConnectionName": "microsoft.arcplaceholder/provisionedclusters/000/1619989456957411072",
"accessKey": "SharedAccessSignature sr=http%3A%2F%2Fazgnrelay-eastus-l1.servicebus.windows.net%2Fmicrosoft.provisionedcluster%hci",
"expiresOn": 1620000256
},
"ingress": {
"hostname": "clusterhostname",
"aadProfile": {
"serverId": "6256c85f-0aad-4d50-b960-e6e9b21efe35",
"tenantId": "hy657tgh-8d16-42db-81b7-1234hygt67hy5"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -5,15 +5,15 @@
"endpointName": "default",
"ManagedProxyRequest": {
"service": "127.0.0.1:65035",
"hostname": "r.proxy.arc.com"
"hostname": "r.proxy.arc.com",
"serviceName": "WAC"
}
},
"responses": {
"200": {
"body": {
"proxy": "uid.r.proxy.arc.com",
"expiresOn": 1620000256,
"serviceConfigurationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsIjL?inCN2zkG"
"expiresOn": 1620000256
}
}
}
Original file line number Diff line number Diff line change
@@ -6,12 +6,14 @@
"EndpointResource": {
"properties": {
"type": "default",
"serviceConfigurations": [
{
"name": "SSH",
"serviceConfigurations": {
"ssh": {
"port": "22"
},
"wac": {
"port": "80"
}
]
}
}
}
},
@@ -23,12 +25,14 @@
"type": "Microsoft.HybridConnectivity/endpoints",
"properties": {
"type": "default",
"serviceConfigurations": [
{
"name": "SSH",
"serviceConfigurations": {
"ssh": {
"port": "22"
},
"wac": {
"port": "80"
}
],
},
"provisioningState": "Succeeded"
}
}
Original file line number Diff line number Diff line change
@@ -359,6 +359,52 @@
"deprecated": false
}
},
"/{resourceUri}/providers/Microsoft.HybridConnectivity/endpoints/{endpointName}/listIngressGatewayCredentials": {
"post": {
"tags": [
"Endpoints"
],
"description": "Gets the ingress gateway endpoint credentials ",
"operationId": "Endpoints_ListIngressGatewayCredentials",
"produces": [
"application/json"
],
"x-ms-examples": {
"HybridConnectivityEndpointsPostListIngressGatewayCredentials": {
"$ref": "./examples/EndpointsPostListIngressGatewayCredentials.json"
}
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/ResourceUriParameter"
},
{
"$ref": "#/parameters/EndpointNameParameter"
},
{
"$ref": "#/parameters/AccessTokenExpirationParameter"
}
],
"responses": {
"200": {
"description": "Ingress gateway access",
"schema": {
"$ref": "#/definitions/IngressGatewayResource"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
},
"deprecated": false
}
},
"/{resourceUri}/providers/Microsoft.HybridConnectivity/endpoints/{endpointName}/listManagedProxyDetails": {
"post": {
"tags": [
@@ -543,8 +589,7 @@
"description": "The resource provisioning state."
},
"serviceConfigurations": {
"type": "array",
"readOnly": false,
"type": "object",
"description": "The enabled service configurations.",
"items": {
"$ref": "#/definitions/ServiceConfigurations"
@@ -553,25 +598,24 @@
}
},
"ServiceConfigurations": {
"type": "object",
"description": "The service configuration object definition where each key's value is additional property dictionary.",
"properties": {
"name": {
"type": "string",
"description": "The type of service enabled.",
"enum": [
"SSH",
"WAC"
],
"x-ms-enum": {
"name": "ServiceNameType",
"modelAsString": true
"ssh": {
"type": "object",
"description": "Details for SSH service configuration.",
"additionalProperties": {
"type": "string"
}
},
"port": {
"type": "string",
"description": "The port on which service is enabled."
"wac": {
"type": "object",
"description": "Details for WAC service configuration.",
"additionalProperties": {
"type": "string"
}
}
},
"type": "object"
}
},
"EndpointResource": {
"description": "The endpoint for the target resource.",
@@ -627,11 +671,6 @@
"type": "integer",
"format": "int64",
"description": "The expiration time of short lived proxy name in unix epoch."
},
"serviceConfigurationToken": {
"type": "integer",
"format": "int64",
"description": "The expiration time of short lived proxy name in unix epoch."
}
}
},
@@ -649,19 +688,37 @@
"hostname": {
"type": "string",
"description": "The target host name."
},
"serviceName": {
"type": "string",
"description": "The name of the service.",
"enum": [
"SSH",
"WAC"
],
"x-ms-enum": {
"name": "ServiceName"
}
}
}
},
"ListCredentialsRequest": {
"type": "object",
"description": "Represent ListCredentials Request object.",
"required": [
"service"
"serviceName"
],
"properties": {
"service": {
"serviceName": {
"type": "string",
"description": "The name of the service."
"description": "The name of the service.",
"enum": [
"SSH",
"WAC"
],
"x-ms-enum": {
"name": "ServiceName"
}
}
}
}
9 changes: 2 additions & 7 deletions specification/hybridconnectivity/resource-manager/readme.md
Original file line number Diff line number Diff line change
@@ -24,16 +24,11 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor

These are the global settings for the hybridconnectivity.

``` yaml
openapi-type: arm
openapi-subtype: rpaas
tag: package-2021-10-06-preview
```

``` yaml
openapi-type: arm
openapi-subtype: rpaas
tag: package-2023-03
tag: package-2023-03-15
```
### Tag: package-2021-10-06-preview
@@ -60,7 +55,7 @@ These settings apply only when `--tag=package-2023-03-15` is specified on the co

``` yaml $(tag) == 'package-2023-03-15'
input-file:
- Microsoft.HybridConnectivity/preview/2023-03-15/hybridconnectivity.json
- Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json
```
---

0 comments on commit 1e2703b

Please sign in to comment.