Skip to content

Commit

Permalink
Dev hybridconnectivity microsoft.hybrid connectivity 2023 03 15 (Draf…
Browse files Browse the repository at this point in the history
…t PR, please review it, but do not merge it yet) (#21631)

* Adds base for updating Microsoft.HybridConnectivity from version preview/2022-05-01-preview to version 2023-03-15

* Updates readme

* Updates API version in new specs and examples

* Adding upcoming changes for GA

* Adding service configuration

* Adding serviceConfigurationToken

* Changing service configuration type
  • Loading branch information
apmehrotra authored Dec 22, 2022
1 parent 8bbdaa1 commit f9e2721
Show file tree
Hide file tree
Showing 13 changed files with 1,120 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine",
"api-version": "2023-03-15",
"endpointName": "default"
},
"responses": {
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine",
"api-version": "2023-03-15",
"endpointName": "custom"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/custom",
"name": "custom",
"type": "Microsoft.HybridConnectivity/endpoints",
"properties": {
"type": "custom",
"resourceId": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.Relay/namespaces/custom-relay-namespace"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine",
"api-version": "2023-03-15",
"endpointName": "default"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/default",
"name": "default",
"type": "Microsoft.HybridConnectivity/endpoints",
"properties": {
"type": "default"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine",
"api-version": "2023-03-15"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/default",
"name": "default",
"type": "Microsoft.HybridConnectivity/endpoints",
"properties": {
"type": "default"
}
},
{
"id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/custom",
"name": "custom",
"type": "Microsoft.HybridConnectivity/endpoints",
"properties": {
"type": "custom",
"resourceId": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.Relay/namespaces/custom-relay-namespace"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine",
"api-version": "2023-03-15",
"endpointName": "default",
"EndpointResource": {
"properties": {
"type": "default"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/default",
"name": "default",
"type": "Microsoft.HybridConnectivity/endpoints",
"properties": {
"type": "default",
"provisioningState": "Succeeded"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine",
"api-version": "2023-03-15",
"endpointName": "default",
"expiresin": 10800,
"ListCredentialsRequest": {
"serviceName": "SSH"
}
},
"responses": {
"200": {
"body": {
"relay": {
"namespaceName": "azgnrelay-eastus-l1",
"namespaceNameSuffix": "servicebus.windows.net",
"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/-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
@@ -0,0 +1,20 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/arcGroup/providers/Microsoft.Compute/virtualMachines/vm00006",
"api-version": "2023-03-15",
"endpointName": "default",
"ManagedProxyRequest": {
"service": "127.0.0.1:65035",
"hostname": "r.proxy.arc.com",
"serviceName": "WAC"
}
},
"responses": {
"200": {
"body": {
"proxy": "uid.r.proxy.arc.com",
"expiresOn": 1620000256
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine",
"api-version": "2023-03-15",
"endpointName": "custom",
"EndpointResource": {
"properties": {
"type": "custom",
"resourceId": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.Relay/namespaces/custom-relay-namespace"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/custom",
"name": "custom",
"type": "Microsoft.HybridConnectivity/endpoints",
"properties": {
"type": "custom",
"resourceId": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.Relay/namespaces/custom-relay-namespace",
"provisioningState": "Succeeded"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters": {
"resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine",
"api-version": "2023-03-15",
"endpointName": "default",
"EndpointResource": {
"properties": {
"type": "default",
"serviceConfigurations": [
{
"serviceName": "SSH",
"port": "22"
},
{
"serviceName": "WAC",
"port": "80"
}
]
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/default",
"name": "default",
"type": "Microsoft.HybridConnectivity/endpoints",
"properties": {
"type": "default",
"serviceConfigurations": [
{
"serviceName": "SSH",
"port": "22"
},
{
"serviceName": "WAC",
"port": "80"
}
],
"provisioningState": "Succeeded"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"parameters": {
"api-version": "2023-03-15"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "Microsoft.HybridConnectivity/operations/read",
"isDataAction": false,
"display": {
"provider": "Microsoft.HybridConnectivity",
"resource": "Operations",
"operation": "Get operations",
"description": "Get the list of Operations"
}
},
{
"name": "Microsoft.HybridConnectivity/endpoints/read",
"isDataAction": false,
"display": {
"provider": "Microsoft.HybridConnectivity",
"resource": "endpoints",
"operation": "Get/List endpoints",
"description": "Get or list of endpoints to the target resource."
}
},
{
"name": "Microsoft.HybridConnectivity/endpoints/write",
"isDataAction": false,
"display": {
"provider": "Microsoft.HybridConnectivity",
"resource": "endpoints",
"operation": "Create/Update endpoint",
"description": "Create or update the endpoint to the target resource."
}
},
{
"name": "Microsoft.HybridConnectivity/endpoints/delete",
"isDataAction": false,
"display": {
"provider": "Microsoft.HybridConnectivity",
"resource": "endpoints",
"operation": "Delete endpoint",
"description": "Deletes the endpoint access to the target resource."
}
},
{
"name": "Microsoft.HybridConnectivity/endpoints/listCredentials/action",
"isDataAction": false,
"display": {
"provider": "Microsoft.HybridConnectivity",
"resource": "endpoints",
"operation": "List credentials for endpoint access",
"description": "List the endpoint access credentials to the resource."
}
},
{
"name": "Microsoft.HybridConnectivity/endpoints/listIngressGatewayCredentials/action",
"isDataAction": false,
"display": {
"provider": "Microsoft.HybridConnectivity",
"resource": "endpoints",
"operation": "List credentials for ingress gateway",
"description": "List the ingress gateway credentials to the resource."
}
},
{
"name": "Microsoft.HybridConnectivity/register/action",
"isDataAction": false,
"display": {
"provider": "Microsoft.HybridConnectivity",
"resource": "Microsoft.HybridConnectivity",
"operation": "Register the Microsoft.HybridConnectivity",
"description": "Register the subscription for Microsoft.HybridConnectivity"
}
},
{
"name": "Microsoft.HybridConnectivity/unregister/action",
"isDataAction": false,
"display": {
"provider": "Microsoft.HybridConnectivity",
"resource": "Microsoft.HybridConnectivity",
"operation": "Unregister the Microsoft.HybridConnectivity",
"description": "Unregister the subscription for Microsoft.HybridConnectivity"
}
}
]
}
}
}
}
Loading

0 comments on commit f9e2721

Please sign in to comment.