Switch to beta

Author: alexwilcox9

internal/services/applications/application_federated_identity_credential_resource.go

@@ -11,9 +11,9 @@ import (
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/stable/application"
-	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/stable/federatedidentitycredential"
-	"github.com/hashicorp/go-azure-sdk/microsoft-graph/common-types/stable"
+	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/beta/application"
+	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/beta/federatedidentitycredential"
+	"github.com/hashicorp/go-azure-sdk/microsoft-graph/common-types/beta"
 	"github.com/hashicorp/go-azure-sdk/sdk/nullable"
 	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
 	"github.com/hashicorp/terraform-provider-azuread/internal/helpers/consistency"
@@ -48,7 +48,7 @@ func applicationFederatedIdentityCredentialResource() *pluginsdk.Resource {
 				Type:         pluginsdk.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: stable.ValidateApplicationID,
+				ValidateFunc: beta.ValidateApplicationID,
 			},
 
 			"audiences": {
@@ -99,10 +99,10 @@ func applicationFederatedIdentityCredentialResource() *pluginsdk.Resource {
 }
 
 func applicationFederatedIdentityCredentialResourceCreate(ctx context.Context, d *pluginsdk.ResourceData, meta interface{}) pluginsdk.Diagnostics { //nolint
-	client := meta.(*clients.Client).Applications.ApplicationClient
+	client := meta.(*clients.Client).Applications.ApplicationClientBeta
 	federatedIdentityCredentialClient := meta.(*clients.Client).Applications.ApplicationFederatedIdentityCredential
 
-	applicationId, err := stable.ParseApplicationID(d.Get("application_id").(string))
+	applicationId, err := beta.ParseApplicationID(d.Get("application_id").(string))
 	if err != nil {
 		return tf.ErrorDiagPathF(err, "application_id", "Parsing `application_id`")
 	}
@@ -120,12 +120,12 @@ func applicationFederatedIdentityCredentialResourceCreate(ctx context.Context, d
 		return tf.ErrorDiagF(errors.New("model was nil"), "retrieving %s", applicationId)
 	}
 
-	credential := stable.FederatedIdentityCredential{
+	credential := beta.FederatedIdentityCredential{
 		Audiences:   tf.ExpandStringSlice(d.Get("audiences").([]interface{})),
 		Description: nullable.Value(d.Get("description").(string)),
 		Issuer:      d.Get("issuer").(string),
 		Name:        d.Get("display_name").(string),
-		Subject:     d.Get("subject").(string),
+		Subject:     nullable.Value(d.Get("subject").(string)),
 	}
 
 	federatedIdentityCredentialResp, err := federatedIdentityCredentialClient.CreateFederatedIdentityCredential(ctx, *applicationId, credential, federatedidentitycredential.DefaultCreateFederatedIdentityCredentialOperationOptions())
@@ -141,7 +141,7 @@ func applicationFederatedIdentityCredentialResourceCreate(ctx context.Context, d
 		return tf.ErrorDiagF(errors.New("nil or empty ID received"), "API error adding federated identity credential for %s", applicationId)
 	}
 
-	id := stable.NewApplicationIdFederatedIdentityCredentialID(applicationId.ApplicationId, *newCredential.Id)
+	id := beta.NewApplicationIdFederatedIdentityCredentialID(applicationId.ApplicationId, *newCredential.Id)
 
 	// Wait for the credential to replicate
 	timeout, _ := ctx.Deadline()
@@ -192,18 +192,18 @@ func applicationFederatedIdentityCredentialResourceUpdate(ctx context.Context, d
 	tf.LockByName(applicationResourceName, id.ObjectId)
 	defer tf.UnlockByName(applicationResourceName, id.ObjectId)
 
-	credential := stable.FederatedIdentityCredential{
+	credential := beta.FederatedIdentityCredential{
 		Id:          pointer.To(id.KeyId),
 		Audiences:   tf.ExpandStringSlice(d.Get("audiences").([]interface{})),
 		Description: nullable.Value(d.Get("description").(string)),
 		Issuer:      d.Get("issuer").(string),
-		Subject:     d.Get("subject").(string),
+		Subject:     nullable.Value(d.Get("subject").(string)),
 
 		// Name is immutable but must be specified as it is a required field
 		Name: d.Get("display_name").(string),
 	}
 
-	credentialId := stable.NewApplicationIdFederatedIdentityCredentialID(id.ObjectId, id.KeyId)
+	credentialId := beta.NewApplicationIdFederatedIdentityCredentialID(id.ObjectId, id.KeyId)
 
 	if _, err = federatedIdentityCredentialClient.UpdateFederatedIdentityCredential(ctx, credentialId, credential, federatedidentitycredential.DefaultUpdateFederatedIdentityCredentialOperationOptions()); err != nil {
 		return tf.ErrorDiagF(err, "Updating federated identity credential with ID %q for application with object ID %q", id.KeyId, id.ObjectId)
@@ -220,8 +220,8 @@ func applicationFederatedIdentityCredentialResourceRead(ctx context.Context, d *
 		return tf.ErrorDiagPathF(err, "id", "Parsing federated identity credential with ID %q", d.Id())
 	}
 
-	applicationId := stable.NewApplicationID(id.ObjectId)
-	credentialId := stable.NewApplicationIdFederatedIdentityCredentialID(id.ObjectId, id.KeyId)
+	applicationId := beta.NewApplicationID(id.ObjectId)
+	credentialId := beta.NewApplicationIdFederatedIdentityCredentialID(id.ObjectId, id.KeyId)
 
 	resp, err := federatedIdentityCredentialClient.GetFederatedIdentityCredential(ctx, credentialId, federatedidentitycredential.DefaultGetFederatedIdentityCredentialOperationOptions())
 	if err != nil {
@@ -258,7 +258,7 @@ func applicationFederatedIdentityCredentialResourceDelete(ctx context.Context, d
 		return tf.ErrorDiagPathF(err, "id", "Parsing federated identity credential with ID %q", d.Id())
 	}
 
-	credentialId := stable.NewApplicationIdFederatedIdentityCredentialID(id.ObjectId, id.KeyId)
+	credentialId := beta.NewApplicationIdFederatedIdentityCredentialID(id.ObjectId, id.KeyId)
 
 	tf.LockByName(applicationResourceName, id.ObjectId)
 	defer tf.UnlockByName(applicationResourceName, id.ObjectId)

internal/services/applications/application_federated_identity_credential_resource_test.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/stable/federatedidentitycredential"
-	"github.com/hashicorp/go-azure-sdk/microsoft-graph/common-types/stable"
+	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/beta/federatedidentitycredential"
+	"github.com/hashicorp/go-azure-sdk/microsoft-graph/common-types/beta"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance/check"
@@ -93,7 +93,7 @@ func (r ApplicationFederatedIdentityCredentialResource) Exists(ctx context.Conte
 		return nil, fmt.Errorf("parsing Application Federated Identity Credential ID: %v", err)
 	}
 
-	credentialId := stable.NewApplicationIdFederatedIdentityCredentialID(id.ObjectId, id.KeyId)
+	credentialId := beta.NewApplicationIdFederatedIdentityCredentialID(id.ObjectId, id.KeyId)
 
 	resp, err := client.GetFederatedIdentityCredential(ctx, credentialId, federatedidentitycredential.DefaultGetFederatedIdentityCredentialOperationOptions())
 	if err != nil {

internal/services/applications/client/client.go

@@ -5,8 +5,8 @@ package client
 
 import (
 	applicationBeta "github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/beta/application"
+	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/beta/federatedidentitycredential"
 	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/stable/application"
-	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/stable/federatedidentitycredential"
 	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/stable/logo"
 	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applications/stable/owner"
 	"github.com/hashicorp/go-azure-sdk/microsoft-graph/applicationtemplates/stable/applicationtemplate"