mirror of
https://github.com/opentofu/opentofu.git
synced 2025-02-25 18:45:20 -06:00
Merge pull request #2562 from aznashwan/b-azure-non-existent-netconfig
Fixed void Azure network config bug.
This commit is contained in:
commit
ece4430188
@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
"github.com/Azure/azure-sdk-for-go/management"
|
||||
"github.com/Azure/azure-sdk-for-go/management/virtualnetwork"
|
||||
"github.com/hashicorp/terraform/helper/schema"
|
||||
)
|
||||
@ -46,7 +47,12 @@ func resourceAzureDnsServerCreate(d *schema.ResourceData, meta interface{}) erro
|
||||
defer azureClient.mutex.Unlock()
|
||||
netConf, err := vnetClient.GetVirtualNetworkConfiguration()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Failed to get the current network configuration from Azure: %s", err)
|
||||
if management.IsResourceNotFoundError(err) {
|
||||
// if no network configuration exists yet; create one now:
|
||||
netConf = virtualnetwork.NetworkConfiguration{}
|
||||
} else {
|
||||
return fmt.Errorf("Failed to get the current network configuration from Azure: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
log.Println("[DEBUG] Adding new DNS server definition to Azure.")
|
||||
|
@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
"github.com/Azure/azure-sdk-for-go/management"
|
||||
"github.com/Azure/azure-sdk-for-go/management/virtualnetwork"
|
||||
"github.com/hashicorp/terraform/helper/schema"
|
||||
)
|
||||
@ -54,7 +55,12 @@ func resourceAzureLocalNetworkConnectionCreate(d *schema.ResourceData, meta inte
|
||||
defer azureClient.mutex.Unlock()
|
||||
netConf, err := vnetClient.GetVirtualNetworkConfiguration()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Failed to get the current network configuration from Azure: %s", err)
|
||||
if management.IsResourceNotFoundError(err) {
|
||||
// if no network config exists yet; create a new one now:
|
||||
netConf = virtualnetwork.NetworkConfiguration{}
|
||||
} else {
|
||||
return fmt.Errorf("Failed to get the current network configuration from Azure: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
// get provided configuration:
|
||||
|
@ -3,7 +3,6 @@ package azure
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"strings"
|
||||
|
||||
"github.com/Azure/azure-sdk-for-go/management"
|
||||
"github.com/Azure/azure-sdk-for-go/management/virtualnetwork"
|
||||
@ -88,7 +87,8 @@ func resourceAzureVirtualNetworkCreate(d *schema.ResourceData, meta interface{})
|
||||
|
||||
nc, err := vnetClient.GetVirtualNetworkConfiguration()
|
||||
if err != nil {
|
||||
if strings.Contains(err.Error(), "ResourceNotFound") {
|
||||
if management.IsResourceNotFoundError(err) {
|
||||
// if no network config exists yet; create a new one now:
|
||||
nc = virtualnetwork.NetworkConfiguration{}
|
||||
} else {
|
||||
return fmt.Errorf(virtualNetworkRetrievalError, err)
|
||||
|
Loading…
Reference in New Issue
Block a user