Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update network sdk to 2020-11-01 #11627

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion azurerm/internal/azuresdkhacks/network_interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"net/http"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/Azure/go-autorest/autorest"
)

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/compute/network_interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network/parse"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-12-01/compute"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2019-12-01/containerinstance"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/firewall/client/client.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/firewall/firewall_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/firewall/validate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down Expand Up @@ -62,8 +62,8 @@ func resourceFirewallNatRuleCollection() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(network.Dnat),
string(network.Snat),
string(network.AzureFirewallNatRCActionTypeDnat),
string(network.AzureFirewallNatRCActionTypeSnat),
}, false),
},

Expand Down Expand Up @@ -120,10 +120,10 @@ func resourceFirewallNatRuleCollection() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(network.Any),
string(network.ICMP),
string(network.TCP),
string(network.UDP),
string(network.AzureFirewallNetworkRuleProtocolAny),
string(network.AzureFirewallNetworkRuleProtocolICMP),
string(network.AzureFirewallNetworkRuleProtocolTCP),
string(network.AzureFirewallNetworkRuleProtocolUDP),
}, false),
},
Set: pluginsdk.HashString,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down Expand Up @@ -124,10 +124,10 @@ func resourceFirewallNetworkRuleCollection() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(network.Any),
string(network.ICMP),
string(network.TCP),
string(network.UDP),
string(network.AzureFirewallNetworkRuleProtocolAny),
string(network.AzureFirewallNetworkRuleProtocolICMP),
string(network.AzureFirewallNetworkRuleProtocolTCP),
string(network.AzureFirewallNetworkRuleProtocolUDP),
}, false),
},
Set: pluginsdk.HashString,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
azValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
Expand Down Expand Up @@ -520,7 +520,7 @@ func expandFirewallPolicyRuleCollectionNat(input []interface{}) []network.BasicF
for _, e := range input {
rule := e.(map[string]interface{})
output := &network.FirewallPolicyNatRuleCollection{
RuleCollectionType: network.RuleCollectionTypeFirewallPolicyNatRuleCollection,
RuleCollectionType: network.RuleCollectionTypeRuleCollectionTypeFirewallPolicyNatRuleCollection,
Name: utils.String(rule["name"].(string)),
Priority: utils.Int32(int32(rule["priority"].(int))),
Action: &network.FirewallPolicyNatRuleCollectionAction{
Expand All @@ -543,7 +543,7 @@ func expandFirewallPolicyFilterRuleCollection(input []interface{}, f func(input
},
Name: utils.String(rule["name"].(string)),
Priority: utils.Int32(int32(rule["priority"].(int))),
RuleCollectionType: network.RuleCollectionTypeFirewallPolicyFilterRuleCollection,
RuleCollectionType: network.RuleCollectionTypeRuleCollectionTypeFirewallPolicyFilterRuleCollection,
Rules: f(rule["rule"].(*pluginsdk.Set).List()),
}
result = append(result, output)
Expand All @@ -565,7 +565,7 @@ func expandFirewallPolicyRuleApplication(input []interface{}) *[]network.BasicFi
}
output := &network.ApplicationRule{
Name: utils.String(condition["name"].(string)),
RuleType: network.RuleTypeApplicationRule,
RuleType: network.RuleTypeRuleTypeApplicationRule,
Protocols: &protocols,
SourceAddresses: utils.ExpandStringSlice(condition["source_addresses"].(*pluginsdk.Set).List()),
SourceIPGroups: utils.ExpandStringSlice(condition["source_ip_groups"].(*pluginsdk.Set).List()),
Expand All @@ -587,7 +587,7 @@ func expandFirewallPolicyRuleNetwork(input []interface{}) *[]network.BasicFirewa
}
output := &network.Rule{
Name: utils.String(condition["name"].(string)),
RuleType: network.RuleTypeNetworkRule,
RuleType: network.RuleTypeRuleTypeNetworkRule,
IPProtocols: &protocols,
SourceAddresses: utils.ExpandStringSlice(condition["source_addresses"].(*pluginsdk.Set).List()),
SourceIPGroups: utils.ExpandStringSlice(condition["source_ip_groups"].(*pluginsdk.Set).List()),
Expand All @@ -612,7 +612,7 @@ func expandFirewallPolicyRuleNat(input []interface{}) *[]network.BasicFirewallPo
destinationAddresses := []string{condition["destination_address"].(string)}
output := &network.NatRule{
Name: utils.String(condition["name"].(string)),
RuleType: network.RuleTypeNatRule,
RuleType: network.RuleTypeRuleTypeNatRule,
IPProtocols: &protocols,
SourceAddresses: utils.ExpandStringSlice(condition["source_addresses"].(*pluginsdk.Set).List()),
SourceIPGroups: utils.ExpandStringSlice(condition["source_ip_groups"].(*pluginsdk.Set).List()),
Expand Down
10 changes: 5 additions & 5 deletions azurerm/internal/services/firewall/firewall_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down Expand Up @@ -58,8 +58,8 @@ func resourceFirewall() *pluginsdk.Resource {
Computed: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
string(network.AZFWHub),
string(network.AZFWVNet),
string(network.AzureFirewallSkuNameAZFWHub),
string(network.AzureFirewallSkuNameAZFWVNet),
}, false),
},

Expand All @@ -70,8 +70,8 @@ func resourceFirewall() *pluginsdk.Resource {
Computed: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
string(network.Premium),
string(network.Standard),
string(network.AzureFirewallSkuTierPremium),
string(network.AzureFirewallSkuTierStandard),
}, false),
},

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/firewall/subresource.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package firewall

import (
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
)

func flattenNetworkSubResourceID(input *[]network.SubResource) []interface{} {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/sdk"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/loadbalancer/parse"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/types"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/loadbalancer/parse"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/loadbalancer/validate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/loadbalancer/client/client.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
)

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/loadbalancer/loadbalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package loadbalancer
import (
"context"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/loadbalancer/parse"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-11-01/network"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down
Loading