Apply suggestions from code review

Co-authored-by: Tom Harvey <tombuildsstuff@users.noreply.github.com>
hashicorp · Mar 15, 2024 · b1dcfc8 · b1dcfc8
1 parent 2c9bd6a
commit b1dcfc8
Showing 1 changed file with 28 additions and 28 deletions.
diff --git a/internal/services/apimanagement/api_management_policy_fragment_resource.go b/internal/services/apimanagement/api_management_policy_fragment_resource.go
@@ -28,12 +28,12 @@ func resourceApiManagementPolicyFragment() *pluginsdk.Resource {
 		Update: resourceApiManagementPolicyFragmentUpdate,
 		Delete: resourceApiManagementPolicyFragmentDelete,
 		Importer: pluginsdk.ImporterValidatingResourceIdThen(func(id string) error {
-			_, err := policyfragment.ParsePolicyFragmentIDInsensitively(id)
+			_, err := policyfragment.ParsePolicyFragmentID(id)
 			return err
 		}, func(ctx context.Context, d *pluginsdk.ResourceData, meta interface{}) ([]*pluginsdk.ResourceData, error) {
 			client := meta.(*clients.Client).ApiManagement.PolicyFragmentClient
 
-			id, err := policyfragment.ParsePolicyFragmentIDInsensitively(d.Id())
+			id, err := policyfragment.ParsePolicyFragmentID(d.Id())
 			if err != nil {
 				return nil, err
 			}
@@ -49,7 +49,7 @@ func resourceApiManagementPolicyFragment() *pluginsdk.Resource {
 				return nil, fmt.Errorf("retrieving Api Management Policy Fragment %q (Api Management: %q, Resource Group %q): %+v", id.PolicyFragmentName, id.ServiceName, id.ResourceGroupName, err)
 			}
 
-			d.Set("format", policyfragment.PolicyFragmentContentFormatXml)
+			d.Set("format", string(policyfragment.PolicyFragmentContentFormatXml))
 
 			return []*pluginsdk.ResourceData{d}, nil
 		}),
@@ -64,9 +64,7 @@ func resourceApiManagementPolicyFragment() *pluginsdk.Resource {
 		Schema: map[string]*pluginsdk.Schema{
 			"name": schemaz.SchemaApiManagementChildName(),
 
-			"resource_group_name": commonschema.ResourceGroupName(),
-
-			"api_management_name": schemaz.SchemaApiManagementName(),
+			"api_management_id": commonschema.ResourceIDReferenceRequiredForceNew(&apimanagementservice.ServiceId{}),
 
 			"format": {
 				Type:     pluginsdk.TypeString,
@@ -95,16 +93,20 @@ func resourceApiManagementPolicyFragment() *pluginsdk.Resource {
 
 func resourceApiManagementPolicyFragmentCreate(d *pluginsdk.ResourceData, meta interface{}) error {
 	client := meta.(*clients.Client).ApiManagement.PolicyFragmentClient
-	ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
+	ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
 	subscriptionId := meta.(*clients.Client).Account.SubscriptionId
 	defer cancel()
 
-	id := policyfragment.NewPolicyFragmentID(subscriptionId, d.Get("resource_group_name").(string), d.Get("api_management_name").(string), d.Get("name").(string))
+	apiManagementId, err := apimanagementservice.ParseServiceID(d.Get("api_management_id").(string))
+	if err != nil {
+		return err
+	}
+	id := policyfragment.NewPolicyFragmentID(apiManagementId.SubscriptionID, apiManagementId.ResourceGroupName, apiManagementId.ServiceName, d.Get("name").(string))
 	format := policyfragment.PolicyFragmentContentFormat(d.Get("format").(string))
 	if d.IsNewResource() {
-		existing, err := client.Get(ctx, id, policyfragment.GetOperationOptions{
-			Format: &format,
-		})
+		opts := policyfragment.DefaultGetOperationOptions
+		opts.Format = &format
+		existing, err := client.Get(ctx, id, opts)
 		if err != nil {
 			if !response.WasNotFound(existing.HttpResponse) {
 				return fmt.Errorf("checking for presence of existing %s: %s", id, err)
@@ -138,10 +140,10 @@ func resourceApiManagementPolicyFragmentCreate(d *pluginsdk.ResourceData, meta i
 
 func resourceApiManagementPolicyFragmentUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
 	client := meta.(*clients.Client).ApiManagement.PolicyFragmentClient
-	ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
+	ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := policyfragment.ParsePolicyFragmentIDInsensitively(d.Get("id").(string))
+	id, err := policyfragment.ParsePolicyFragmentID(d.ID())
 	if err != nil {
 		return err
 	}
@@ -173,15 +175,15 @@ func resourceApiManagementPolicyFragmentRead(d *pluginsdk.ResourceData, meta int
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := policyfragment.ParsePolicyFragmentIDInsensitively(d.Id())
+	id, err := policyfragment.ParsePolicyFragmentID(d.Id())
 	if err != nil {
 		return err
 	}
 
 	format := policyfragment.PolicyFragmentContentFormat(d.Get("format").(string))
-	resp, err := client.Get(ctx, *id, policyfragment.GetOperationOptions{
-		Format: &format,
-	})
+	opts := policyfragment.DefaultGetOperationOptions()
+	opts.Format = &format
+	resp, err := client.Get(ctx, *id, opts)
 	if err != nil {
 		if response.WasNotFound(resp.HttpResponse) {
 			log.Printf("[DEBUG] %s does not exist - removing from state!", *id)
@@ -193,19 +195,19 @@ func resourceApiManagementPolicyFragmentRead(d *pluginsdk.ResourceData, meta int
 	}
 
 	d.Set("name", id.PolicyFragmentName)
-	d.Set("resource_group_name", id.ResourceGroupName)
-	d.Set("api_management_name", id.ServiceName)
+	apiManagementId := apimanagementservice.NewServiceID(id.SubscriptionID, id.ResourceGroupName, id.ServiceName)
+	d.Set("api_management_id", apiManagementId.ID())
 
 	if model := resp.Model; model != nil {
 		if props := model.Properties; props != nil {
 			d.Set("description", pointer.From(props.Description))
 			d.Set("value", props.Value)
 			// the api only returns a format field when it's requested in the GET request as param '?format=rawxml' and only does so when it's not 'xml'
-			if props.Format == nil {
-				d.Set("format", "xml")
-			} else {
-				d.Set("format", string(pointer.From(props.Format)))
+			format := policyfragment.PolicyFragmentContentFormatXml
+			if props.Format != nil{
+				format = *props.Format
 			}
+			d.Set("format", string(format))
 		}
 	}
 
@@ -217,15 +219,13 @@ func resourceApiManagementPolicyFragmentDelete(d *pluginsdk.ResourceData, meta i
 	ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := policyfragment.ParsePolicyFragmentIDInsensitively(d.Id())
+	id, err := policyfragment.ParsePolicyFragmentID(d.Id())
 	if err != nil {
 		return err
 	}
 
-	if resp, err := client.Delete(ctx, *id, policyfragment.DeleteOperationOptions{}); err != nil {
-		if !response.WasNotFound(resp.HttpResponse) {
-			return fmt.Errorf("deleting %s: %s", id, err)
-		}
+	if err := client.Delete(ctx, *id, policyfragment.DefaultDeleteOperationOptions()); err != nil {
+		return fmt.Errorf("deleting %s: %s", *id, err)
 	}
 
 	return nil