Skip to content

Commit

Permalink
Fixing the rebase issues
Browse files Browse the repository at this point in the history
  • Loading branch information
tombuildsstuff committed Feb 28, 2018
1 parent 2ef927e commit 48b1ca5
Showing 1 changed file with 5 additions and 149 deletions.
154 changes: 5 additions & 149 deletions azurerm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -324,62 +324,12 @@ func getArmClient(c *authentication.Config) (*ArmClient, error) {
return keyVaultSpt, nil
})

// NOTE: these declarations should be left separate for clarity should the
// clients be wished to be configured with custom Responders/PollingModes etc...
asc := compute.NewAvailabilitySetsClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&asc.Client)
asc.Authorizer = auth
asc.Sender = sender
client.availSetClient = asc

uoc := compute.NewUsageClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&uoc.Client)
uoc.Authorizer = auth
uoc.Sender = sender
client.usageOpsClient = uoc

vmeic := compute.NewVirtualMachineExtensionImagesClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&vmeic.Client)
vmeic.Authorizer = auth
vmeic.Sender = sender
client.vmExtensionImageClient = vmeic

vmec := compute.NewVirtualMachineExtensionsClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&vmec.Client)
vmec.Authorizer = auth
vmec.Sender = sender
client.vmExtensionClient = vmec

vmic := compute.NewVirtualMachineImagesClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&vmic.Client)
vmic.Authorizer = auth
vmic.Sender = sender
client.vmImageClient = vmic

vmssc := compute.NewVirtualMachineScaleSetsClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&vmssc.Client)
vmssc.Authorizer = auth
vmssc.Sender = sender
client.vmScaleSetClient = vmssc

vmc := compute.NewVirtualMachinesClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&vmc.Client)
vmc.Authorizer = auth
vmc.Sender = sender
client.vmClient = vmc

crc := containerregistry.NewRegistriesClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&crc.Client)
crc.Authorizer = auth
crc.Sender = sender
client.containerRegistryClient = crc

client.registerAppInsightsClients(endpoint, c.SubscriptionID, auth, sender)
client.registerAutomationClients(endpoint, c.SubscriptionID, auth, sender)
client.registerAuthentication(endpoint, graphEndpoint, c.SubscriptionID, c.TenantID, auth, graphAuth, sender)
client.registerCDNClients(endpoint, c.SubscriptionID, auth, sender)
client.registerComputeClients(endpoint, c.SubscriptionID, auth, sender)
client.registerContainerRegistryClients(endpoint, c.SubscriptionID, auth, sender)
client.registerContainerInstanceClients(endpoint, c.SubscriptionID, auth, sender)
client.registerContainerRegistryClients(endpoint, c.SubscriptionID, auth, sender)
client.registerContainerServicesClients(endpoint, c.SubscriptionID, auth)
client.registerCosmosDBClients(endpoint, c.SubscriptionID, auth, sender)
Expand Down Expand Up @@ -702,6 +652,10 @@ func (c *ArmClient) registerNetworkingClients(endpoint, subscriptionId string, a
c.configureClient(&applicationGatewaysClient.Client, auth)
c.applicationGatewayClient = applicationGatewaysClient

appSecurityGroupsClient := network.NewApplicationSecurityGroupsClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&appSecurityGroupsClient.Client, auth)
c.applicationSecurityGroupsClient = appSecurityGroupsClient

expressRouteCircuitsClient := network.NewExpressRouteCircuitsClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&expressRouteCircuitsClient.Client, auth)
c.expressRouteCircuitClient = expressRouteCircuitsClient
Expand Down Expand Up @@ -769,104 +723,6 @@ func (c *ArmClient) registerOperationalInsightsClients(endpoint, subscriptionId
c.workspacesClient = opwc
}

func (c *ArmClient) registerNetworkClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) {
appGatewaysClient := network.NewApplicationGatewaysClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&appGatewaysClient.Client)
appGatewaysClient.Authorizer = auth
appGatewaysClient.Sender = sender
c.applicationGatewayClient = appGatewaysClient

appSecurityGroupsClient := network.NewApplicationSecurityGroupsClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&appSecurityGroupsClient.Client)
appSecurityGroupsClient.Authorizer = auth
appSecurityGroupsClient.Sender = sender
c.applicationSecurityGroupsClient = appSecurityGroupsClient

ercClient := network.NewExpressRouteCircuitsClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&ercClient.Client)
ercClient.Authorizer = auth
ercClient.Sender = sender
c.expressRouteCircuitClient = ercClient

nicClient := network.NewInterfacesClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&nicClient.Client)
nicClient.Authorizer = auth
nicClient.Sender = sender
c.ifaceClient = nicClient

lbClient := network.NewLoadBalancersClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&lbClient.Client)
lbClient.Authorizer = auth
lbClient.Sender = sender
c.loadBalancerClient = lbClient

lngClient := network.NewLocalNetworkGatewaysClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&lngClient.Client)
lngClient.Authorizer = auth
lngClient.Sender = sender
c.localNetConnClient = lngClient

pipClient := network.NewPublicIPAddressesClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&pipClient.Client)
pipClient.Authorizer = auth
pipClient.Sender = sender
c.publicIPClient = pipClient

nsgClient := network.NewSecurityGroupsClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&nsgClient.Client)
nsgClient.Authorizer = auth
nsgClient.Sender = sender
c.secGroupClient = nsgClient

src := network.NewSecurityRulesClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&src.Client)
src.Authorizer = auth
src.Sender = sender
c.secRuleClient = src

subnetsClient := network.NewSubnetsClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&subnetsClient.Client)
subnetsClient.Authorizer = auth
subnetsClient.Sender = sender
c.subnetClient = subnetsClient

vncCClient := network.NewVirtualNetworkGatewayConnectionsClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&vncCClient.Client)
vncCClient.Authorizer = auth
vncCClient.Sender = sender
c.vnetGatewayConnectionsClient = vncCClient

vngClient := network.NewVirtualNetworkGatewaysClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&vngClient.Client)
vngClient.Authorizer = auth
vngClient.Sender = sender
c.vnetGatewayClient = vngClient

virtualNetworksClient := network.NewVirtualNetworksClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&virtualNetworksClient.Client)
virtualNetworksClient.Authorizer = auth
virtualNetworksClient.Sender = sender
c.vnetClient = virtualNetworksClient

vnetPeeringsClient := network.NewVirtualNetworkPeeringsClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&vnetPeeringsClient.Client)
vnetPeeringsClient.Authorizer = auth
vnetPeeringsClient.Sender = sender
c.vnetPeeringsClient = vnetPeeringsClient

routeTablesClient := network.NewRouteTablesClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&routeTablesClient.Client)
routeTablesClient.Authorizer = auth
routeTablesClient.Sender = sender
c.routeTablesClient = routeTablesClient

routesClient := network.NewRoutesClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&routesClient.Client)
routesClient.Authorizer = auth
routesClient.Sender = sender
c.routesClient = routesClient
}

func (c *ArmClient) registerRedisClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) {
redisClient := redis.NewClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&redisClient.Client, auth)
Expand Down

0 comments on commit 48b1ca5

Please sign in to comment.