Updating to latest separate Terraform SDK

Update vendor directory

Update vendor

go.sum

@@ -57,6 +57,7 @@ github.com/articulate/okta-sdk-golang v1.1.1 h1:ymEGt5P/Ckqygz7TtyUINRp7oP7fAhS0
 github.com/articulate/okta-sdk-golang v1.1.1/go.mod h1:6ymIhzFQtMyBnwqkEHc/reQUMalObOjgyOSbf3w21PM=
 github.com/articulate/oktasdk-go v1.0.1 h1:UuvJSY5yUqT0w9+hdACq1bcmIKAqh25bnVHWWQtsvYQ=
 github.com/articulate/oktasdk-go v1.0.1/go.mod h1:UTdWnHE/nQNjDvbmLBwxIHjJ3L8r3XlZZaqVDIUtu1I=
+github.com/articulate/terraform-provider-okta v2.21.0+incompatible h1:gjQodD//ZD9SrTDXQL9/96MtveG7nwGSXyq5IjbNQd4=
 github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
 github.com/aws/aws-sdk-go v1.16.36/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=

main.go

@@ -2,8 +2,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/plugin"
 	"github.com/terraform-providers/terraform-provider-okta/okta"
+	"github.com/hashicorp/terraform-plugin-sdk/plugin"
 )
 
 func main() {

okta/app_filter.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/articulate/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/okta/okta-sdk-golang/okta"
 	"github.com/okta/okta-sdk-golang/okta/query"

okta/data_source_okta_app_saml_metadata.go

@@ -0,0 +1,77 @@
+package okta
+
+import (
+	"encoding/xml"
+	"fmt"
+
+	"github.com/crewjam/saml"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+func dataSourceAppMetadataSaml() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceAppMetadataSamlRead,
+
+		Schema: map[string]*schema.Schema{
+			"app_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"key_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"metadata": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"http_post_binding": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Post location from the SAML metadata.",
+			},
+			"http_redirect_binding": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect location from the SAML metadata.",
+			},
+			"certificate": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"want_authn_requests_signed": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"entity_id": {
+				Type:        schema.TypeString,
+				Description: "Entity URL for instance https://www.okta.com/saml2/service-provider/sposcfdmlybtwkdcgtuf",
+				Computed:    true,
+			},
+		},
+	}
+}
+
+func dataSourceAppMetadataSamlRead(d *schema.ResourceData, m interface{}) error {
+	id := d.Get("app_id").(string)
+	kid := d.Get("key_id").(string)
+	metadata, _, err := getSupplementFromMetadata(m).GetSAMLMetdata(id, kid)
+	if err != nil {
+		return err
+	}
+	d.SetId(fmt.Sprintf("%s/%s_metadata", id, kid))
+
+	d.Set("metadata", string(metadata))
+	metadataRoot := &saml.EntityDescriptor{}
+	err = xml.Unmarshal(metadata, metadataRoot)
+	if err != nil {
+		return fmt.Errorf("Could not parse SAML app metadata, error: %s", err)
+	}
+
+	desc := metadataRoot.IDPSSODescriptors[0]
+	syncSamlEndpointBinding(d, desc.SingleSignOnServices)
+	d.Set("entity_id", metadataRoot.EntityID)
+	d.Set("want_authn_requests_signed", desc.WantAuthnRequestsSigned)
+	d.Set("certificate", desc.KeyDescriptors[0].KeyInfo.Certificate)
+	return nil
+}

okta/data_source_okta_app_saml_metadata_test.go

@@ -0,0 +1,33 @@
+package okta
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+)
+
+func TestAccOktaDataSourceAppMetadataSaml_read(t *testing.T) {
+	ri := acctest.RandInt()
+	mgr := newFixtureManager("okta_app_metadata_saml")
+	config := mgr.GetFixtures("datasource.tf", ri, t)
+	resourceName := "data.okta_app_metadata_saml.test"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "certificate"),
+					resource.TestCheckResourceAttrSet(resourceName, "http_post_binding"),
+					resource.TestCheckResourceAttrSet(resourceName, "metadata"),
+					resource.TestCheckResourceAttrSet(resourceName, "entity_id"),
+				),
+			},
+		},
+	})
+}

okta/data_source_okta_idp_saml.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/okta/okta-sdk-golang/okta/query"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )

okta/data_source_okta_user.go

@@ -9,7 +9,6 @@ import (
 	"github.com/okta/okta-sdk-golang/okta/query"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 func dataSourceUser() *schema.Resource {

okta/data_source_okta_users.go

@@ -3,7 +3,7 @@ package okta
 import (
 	"fmt"
 
-	"github.com/articulate/terraform-provider-okta/sdk"
+	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"

okta/provider_sweeper_test.go

@@ -8,7 +8,6 @@ import (
 
 	articulateOkta "github.com/articulate/oktasdk-go/okta"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	sdk "github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/okta/okta-sdk-golang/okta"
 	sdk "github.com/terraform-providers/terraform-provider-okta/sdk"
 )

okta/resource_okta_app_oauth.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/articulate/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/okta/okta-sdk-golang/okta"

okta/resource_okta_app_oauth_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"github.com/okta/okta-sdk-golang/okta"
 	"github.com/okta/okta-sdk-golang/okta/query"
 )

okta/resource_okta_app_user_base_schema.go

@@ -3,8 +3,8 @@ package okta
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceAppUserBaseSchema() *schema.Resource {

okta/resource_okta_app_user_schema.go

@@ -3,8 +3,8 @@ package okta
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceAppUserSchema() *schema.Resource {

okta/resource_okta_auth_server_claim.go

@@ -3,9 +3,9 @@ package okta
 import (
 	"net/http"
 
+	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )
 
 func resourceAuthServerClaim() *schema.Resource {

okta/resource_okta_auth_server_policy.go

@@ -3,8 +3,8 @@ package okta
 import (
 	"net/http"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceAuthServerPolicy() *schema.Resource {

okta/resource_okta_auth_server_policy_rule.go

@@ -3,9 +3,9 @@ package okta
 import (
 	"net/http"
 
+	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )
 
 func resourceAuthServerPolicyRule() *schema.Resource {

okta/resource_okta_auth_server_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/okta/okta-sdk-golang/okta/query"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )

okta/resource_okta_group_roles.go

@@ -3,8 +3,8 @@ package okta
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceGroupRoles() *schema.Resource {

okta/resource_okta_idp_oidc.go

@@ -3,7 +3,6 @@ package okta
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/okta/okta-sdk-golang/okta"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )

okta/resource_okta_idp_oidc_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )
 
 func TestAccOktaIdpOidc_crud(t *testing.T) {

okta/resource_okta_idp_saml.go

@@ -3,7 +3,6 @@ package okta
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/okta/okta-sdk-golang/okta"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )

okta/resource_okta_idp_saml_signing_key.go

@@ -3,8 +3,8 @@ package okta
 import (
 	"net/http"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceIdpSigningKey() *schema.Resource {

okta/resource_okta_idp_saml_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )
 
 func TestAccOktaIdpSaml_crud(t *testing.T) {

okta/resource_okta_idp_social.go

@@ -3,7 +3,6 @@ package okta
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/okta/okta-sdk-golang/okta"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )

okta/resource_okta_idp_social_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )
 
 func TestAccOktaIdpSocial_crud(t *testing.T) {

okta/resource_okta_policy_rule_idp_discovery.go

@@ -1,9 +1,9 @@
 package okta
 
 import (
+	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )
 
 var platformIncludeResource = &schema.Resource{

okta/resource_okta_profile_mapping.go

@@ -3,7 +3,7 @@ package okta
 import (
 	"fmt"
 
-	"github.com/articulate/terraform-provider-okta/sdk"
+	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )

okta/resource_okta_template_email.go

@@ -1,8 +1,8 @@
 package okta
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 var translationResource = &schema.Resource{

okta/resource_okta_user_base_schema.go

@@ -1,8 +1,8 @@
 package okta
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 const baseSchema = "base"

okta/resource_okta_user_schema.go

@@ -1,8 +1,8 @@
 package okta
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 const customSchema = "custom"

okta/user.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/okta/okta-sdk-golang/okta"
 	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"log"

okta/user_schema.go

@@ -1,9 +1,9 @@
 package okta
 
 import (
+	"github.com/terraform-providers/terraform-provider-okta/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/terraform-providers/terraform-provider-okta/sdk"
 )
 
 var (