switching to the standalone SDK for terraform (#9)

jeremmfr · Nov 27, 2019 · 241fbda · 241fbda
1 parent 65a1d1f
commit 241fbda
Show file tree

Hide file tree

Showing 58 changed files with 81 additions and 231 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -19,6 +19,6 @@ issues:
     - text: "Use of ssh InsecureIgnoreHostKey"
       linters:
         - gosec
-    - text: "`jnpr` can be `github.com/hashicorp/terraform/terraform.ResourceProviderCloser`"
+    - text: "`jnpr` can be `github.com/hashicorp/terraform-plugin-sdk/terraform.ResourceProviderCloser`"
       linters:
         - interfacer
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module terraform-provider-junos
 go 1.13
 
 require (
-	github.com/hashicorp/terraform v0.12.11
+	github.com/hashicorp/terraform-plugin-sdk v1.4.0
 	github.com/jeremmfr/go-netconf v0.1.4
 	github.com/jeremmfr/junosdecode v0.1.0
 	golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc

diff --git a/go.sum b/go.sum
diff --git a/junos/func_common.go b/junos/func_common.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func logFile(message string, file string) {

diff --git a/junos/func_resource_bgp.go b/junos/func_resource_bgp.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/jeremmfr/junosdecode/jdecode"
 )
 

diff --git a/junos/provider.go b/junos/provider.go
@@ -3,8 +3,8 @@ package junos
 import (
 	"sync"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 const (

diff --git a/junos/provider_test.go b/junos/provider_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 var (

diff --git a/junos/resource_application.go b/junos/resource_application.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type applicationOptions struct {

diff --git a/junos/resource_application_set.go b/junos/resource_application_set.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type applicationSetOptions struct {

diff --git a/junos/resource_application_set_test.go b/junos/resource_application_set_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosApplicationSet_basic(t *testing.T) {

diff --git a/junos/resource_application_test.go b/junos/resource_application_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosApplication_basic(t *testing.T) {

diff --git a/junos/resource_bgp_group.go b/junos/resource_bgp_group.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceBgpGroup() *schema.Resource {

diff --git a/junos/resource_bgp_group_test.go b/junos/resource_bgp_group_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosBgpGroup_basic(t *testing.T) {

diff --git a/junos/resource_bgp_neighbor.go b/junos/resource_bgp_neighbor.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceBgpNeighbor() *schema.Resource {

diff --git a/junos/resource_bgp_neighbor_test.go b/junos/resource_bgp_neighbor_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosBgpNeighbor_basic(t *testing.T) {

diff --git a/junos/resource_firewall_filter.go b/junos/resource_firewall_filter.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type filterOptions struct {

diff --git a/junos/resource_firewall_filter_test.go b/junos/resource_firewall_filter_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosFirewallFilter_basic(t *testing.T) {

diff --git a/junos/resource_firewall_policer.go b/junos/resource_firewall_policer.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type policerOptions struct {

diff --git a/junos/resource_firewall_policer_test.go b/junos/resource_firewall_policer_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosFirewallPolicer_basic(t *testing.T) {

diff --git a/junos/resource_interface.go b/junos/resource_interface.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/jeremmfr/junosdecode/jdecode"
 )
 

diff --git a/junos/resource_interface_test.go b/junos/resource_interface_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 // export TESTACC_INTERFACE=<inteface> for choose interface available else it's ge-0/0/3

diff --git a/junos/resource_ospf_area.go b/junos/resource_ospf_area.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type ospfAreaOptions struct {

diff --git a/junos/resource_ospf_area_test.go b/junos/resource_ospf_area_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosOspfArea_basic(t *testing.T) {

diff --git a/junos/resource_policyoptions_as_path.go b/junos/resource_policyoptions_as_path.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type asPathOptions struct {

diff --git a/junos/resource_policyoptions_as_path_group.go b/junos/resource_policyoptions_as_path_group.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type asPathGroupOptions struct {

diff --git a/junos/resource_policyoptions_community.go b/junos/resource_policyoptions_community.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type communityOptions struct {

diff --git a/junos/resource_policyoptions_policy_statement.go b/junos/resource_policyoptions_policy_statement.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type policyStatementOptions struct {

diff --git a/junos/resource_policyoptions_prefix_list.go b/junos/resource_policyoptions_prefix_list.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type prefixListOptions struct {

diff --git a/junos/resource_policyoptions_test.go b/junos/resource_policyoptions_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosPolicyOptions_basic(t *testing.T) {

diff --git a/junos/resource_rib_group.go b/junos/resource_rib_group.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type ribGroupOptions struct {

diff --git a/junos/resource_rib_group_test.go b/junos/resource_rib_group_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosRibGroup_basic(t *testing.T) {

diff --git a/junos/resource_routing_instance.go b/junos/resource_routing_instance.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type instanceOptions struct {

diff --git a/junos/resource_routing_instance_test.go b/junos/resource_routing_instance_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosRoutingInstance_basic(t *testing.T) {

diff --git a/junos/resource_security_ike_gateway.go b/junos/resource_security_ike_gateway.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type ikeGatewayOptions struct {

diff --git a/junos/resource_security_ike_ipsec_test.go b/junos/resource_security_ike_ipsec_test.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosSecurityIkeIpsec_basic(t *testing.T) {

diff --git a/junos/resource_security_ike_policy.go b/junos/resource_security_ike_policy.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/jeremmfr/junosdecode/jdecode"
 )
 

diff --git a/junos/resource_security_ike_proposal.go b/junos/resource_security_ike_proposal.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type ikeProposalOptions struct {

diff --git a/junos/resource_security_ipsec_policy.go b/junos/resource_security_ipsec_policy.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type ipsecPolicyOptions struct {

diff --git a/junos/resource_security_ipsec_proposal.go b/junos/resource_security_ipsec_proposal.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type ipsecProposalOptions struct {

diff --git a/junos/resource_security_ipsec_vpn.go b/junos/resource_security_ipsec_vpn.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type ipsecVpnOptions struct {

diff --git a/junos/resource_security_nat_destination.go b/junos/resource_security_nat_destination.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type natDestinationOptions struct {

diff --git a/junos/resource_security_nat_destination_pool.go b/junos/resource_security_nat_destination_pool.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type natDestinationPoolOptions struct {

diff --git a/junos/resource_security_nat_destination_test.go b/junos/resource_security_nat_destination_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccJunosSecurityNatDestination_basic(t *testing.T) {

diff --git a/junos/resource_security_nat_source.go b/junos/resource_security_nat_source.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type natSourceOptions struct {

diff --git a/junos/resource_security_nat_source_pool.go b/junos/resource_security_nat_source_pool.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 type natSourcePoolOptions struct {