Skip to content

Commit

Permalink
Upgrade Terraform SDK to v2.19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@lix-fortinet
lix-fortinet committed Jul 27, 2022
1 parent 76159cb commit bded513
Show file tree
Hide file tree
Showing 3,694 changed files with 109,219 additions and 392,423 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ linters:

linters-settings:
errcheck:
ignore: github.com/hashicorp/terraform-plugin-sdk/helper/schema:ForceNew|Set,fmt:.*,io:Close
ignore: github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew|Set,fmt:.*,io:Close

run:
modules-download-mode: vendor
Expand Down
2 changes: 1 addition & 1 deletion fortios/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"

"github.com/hashicorp/go-version"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func validateConvIPMask2CIDR(oNewIP, oOldIP string) string {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_DoSpolicy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallDosPolicy() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_DoSpolicy6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallDosPolicy6() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_DoSpolicy6list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallDosPolicy6List() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_DoSpolicylist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallDosPolicyList() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_address.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallAddress() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_address6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallAddress6() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_address6list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallAddress6List() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_address6template.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallAddress6Template() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_address6templatelist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallAddress6TemplateList() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_addresslist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallAddressList() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_addrgrp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallAddrgrp() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_addrgrp6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallAddrgrp6() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_addrgrp6list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallAddrgrp6List() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_addrgrplist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallAddrgrpList() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_centralsnatmap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallCentralSnatMap() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_centralsnatmaplist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallCentralSnatMapList() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_internetservice.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallInternetService() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_internetservicecustom.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallInternetServiceCustom() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_internetservicecustomgroup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallInternetServiceCustomGroup() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_internetservicecustomgrouplist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallInternetServiceCustomGroupList() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_internetservicecustomlist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallInternetServiceCustomList() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_internetservicedefinition.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallInternetServiceDefinition() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_internetservicedefinitionlist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallInternetServiceDefinitionList() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_internetserviceextension.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallInternetServiceExtension() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_internetserviceextensionlist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallInternetServiceExtensionList() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_internetservicegroup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallInternetServiceGroup() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_internetservicegrouplist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallInternetServiceGroupList() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_internetservicelist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallInternetServiceList() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_ipv6ehfilter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallIpv6EhFilter() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_multicastaddress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallMulticastAddress() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_multicastaddress6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallMulticastAddress6() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_multicastaddress6list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallMulticastAddress6List() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_multicastaddresslist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallMulticastAddressList() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallPolicy() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_policy46.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallPolicy46() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion fortios/data_source_firewall_policy46list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package fortios
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceFirewallPolicy46List() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions fortios/data_source_firewall_policy6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceFirewallPolicy6() *schema.Resource {
Expand Down
Loading

0 comments on commit bded513

Please sign in to comment.