Skip to content

Commit 5482d8c

Browse files
magodomagodo
committed
Get rid of other POST calls in Read()
1 parent 8395b0b commit 5482d8c

11 files changed

Lines changed: 121 additions & 126 deletions

‎internal/services/appconfiguration/app_configuration_resource.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -612,10 +612,10 @@ func resourceAppConfigurationRead(d *pluginsdk.ResourceData, meta interface{}) e
612612
return fmt.Errorf("retrieving %s: %+v", *id, err)
613613
}
614614

615-
resultPage, err := client.ListKeysComplete(ctx, *id)
616-
if err != nil {
617-
return fmt.Errorf("retrieving access keys for %s: %+v", *id, err)
618-
}
615+
// resultPage, err := client.ListKeysComplete(ctx, *id)
616+
// if err != nil {
617+
// return fmt.Errorf("retrieving access keys for %s: %+v", *id, err)
618+
// }
619619

620620
d.Set("name", id.ConfigurationStoreName)
621621
d.Set("resource_group_name", id.ResourceGroupName)
@@ -654,11 +654,11 @@ func resourceAppConfigurationRead(d *pluginsdk.ResourceData, meta interface{}) e
654654
d.Set("soft_delete_retention_days", softDeleteRetentionDays)
655655
}
656656

657-
accessKeys := flattenAppConfigurationAccessKeys(resultPage.Items)
658-
d.Set("primary_read_key", accessKeys.primaryReadKey)
659-
d.Set("primary_write_key", accessKeys.primaryWriteKey)
660-
d.Set("secondary_read_key", accessKeys.secondaryReadKey)
661-
d.Set("secondary_write_key", accessKeys.secondaryWriteKey)
657+
// accessKeys := flattenAppConfigurationAccessKeys(resultPage.Items)
658+
// d.Set("primary_read_key", accessKeys.primaryReadKey)
659+
// d.Set("primary_write_key", accessKeys.primaryWriteKey)
660+
// d.Set("secondary_read_key", accessKeys.secondaryReadKey)
661+
// d.Set("secondary_write_key", accessKeys.secondaryWriteKey)
662662

663663
flattenedIdentity, err := identity.FlattenSystemAndUserAssignedMap(model.Identity)
664664
if err != nil {

‎internal/services/loganalytics/log_analytics_workspace_resource.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ func resourceLogAnalyticsWorkspaceUpdate(d *pluginsdk.ResourceData, meta interfa
549549
}
550550

551551
func resourceLogAnalyticsWorkspaceRead(d *pluginsdk.ResourceData, meta interface{}) error {
552-
sharedKeyClient := meta.(*clients.Client).LogAnalytics.SharedKeyWorkspacesClient
552+
//sharedKeyClient := meta.(*clients.Client).LogAnalytics.SharedKeyWorkspacesClient
553553
client := meta.(*clients.Client).LogAnalytics.WorkspaceClient
554554
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
555555
defer cancel()
@@ -643,16 +643,16 @@ func resourceLogAnalyticsWorkspaceRead(d *pluginsdk.ResourceData, meta interface
643643
}
644644
d.Set("data_collection_rule_id", defaultDataCollectionRuleResourceId)
645645

646-
sharedKeyId := sharedKeyWorkspaces.NewWorkspaceID(id.SubscriptionId, id.ResourceGroupName, id.WorkspaceName)
647-
sharedKeysResp, err := sharedKeyClient.SharedKeysGetSharedKeys(ctx, sharedKeyId)
648-
if err != nil {
649-
log.Printf("[ERROR] Unable to List Shared keys for Log Analytics workspaces %s: %+v", id.WorkspaceName, err)
650-
} else {
651-
if sharedKeysModel := sharedKeysResp.Model; sharedKeysModel != nil {
652-
d.Set("primary_shared_key", pointer.From(sharedKeysModel.PrimarySharedKey))
653-
d.Set("secondary_shared_key", pointer.From(sharedKeysModel.SecondarySharedKey))
654-
}
655-
}
646+
//sharedKeyId := sharedKeyWorkspaces.NewWorkspaceID(id.SubscriptionId, id.ResourceGroupName, id.WorkspaceName)
647+
// sharedKeysResp, err := sharedKeyClient.SharedKeysGetSharedKeys(ctx, sharedKeyId)
648+
// if err != nil {
649+
// log.Printf("[ERROR] Unable to List Shared keys for Log Analytics workspaces %s: %+v", id.WorkspaceName, err)
650+
// } else {
651+
// if sharedKeysModel := sharedKeysResp.Model; sharedKeysModel != nil {
652+
// d.Set("primary_shared_key", pointer.From(sharedKeysModel.PrimarySharedKey))
653+
// d.Set("secondary_shared_key", pointer.From(sharedKeysModel.SecondarySharedKey))
654+
// }
655+
// }
656656
}
657657

658658
d.Set("location", location.Normalize(model.Location))

‎internal/services/resource/management_group_template_deployment_resource.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,10 @@ func managementGroupTemplateDeploymentResourceRead(d *pluginsdk.ResourceData, me
298298
return fmt.Errorf("retrieving Management Group Template Deployment %q: %+v", id.DeploymentName, err)
299299
}
300300

301-
templateContents, err := client.ExportTemplateAtManagementGroupScope(ctx, id.ManagementGroupName, id.DeploymentName)
302-
if err != nil {
303-
return fmt.Errorf("retrieving Template Content for Management Group Template Deployment %q: %+v", id.DeploymentName, err)
304-
}
301+
// templateContents, err := client.ExportTemplateAtManagementGroupScope(ctx, id.ManagementGroupName, id.DeploymentName)
302+
// if err != nil {
303+
// return fmt.Errorf("retrieving Template Content for Management Group Template Deployment %q: %+v", id.DeploymentName, err)
304+
// }
305305

306306
d.Set("name", id.DeploymentName)
307307
managementGroupId := mgParse.NewManagementGroupId(id.ManagementGroupName)
@@ -333,11 +333,11 @@ func managementGroupTemplateDeploymentResourceRead(d *pluginsdk.ResourceData, me
333333
d.Set("template_spec_version_id", templateLinkId)
334334
}
335335

336-
flattenedTemplate, err := flattenTemplateDeploymentBody(templateContents.Template)
337-
if err != nil {
338-
return fmt.Errorf("flattening `template_content`: %+v", err)
339-
}
340-
d.Set("template_content", flattenedTemplate)
336+
// flattenedTemplate, err := flattenTemplateDeploymentBody(templateContents.Template)
337+
// if err != nil {
338+
// return fmt.Errorf("flattening `template_content`: %+v", err)
339+
// }
340+
// d.Set("template_content", flattenedTemplate)
341341

342342
return tags.FlattenAndSet(d, resp.Tags)
343343
}

‎internal/services/resource/resource_group_template_deployment_resource.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ func resourceGroupTemplateDeploymentResourceRead(d *pluginsdk.ResourceData, meta
319319
return fmt.Errorf("retrieving Template Deployment %q (Resource Group %q): %+v", id.DeploymentName, id.ResourceGroup, err)
320320
}
321321

322-
templateContents, err := client.ExportTemplate(ctx, id.ResourceGroup, id.DeploymentName)
323-
if err != nil {
324-
return fmt.Errorf("retrieving Template Content for Template Deployment %q (Resource Group %q): %+v", id.DeploymentName, id.ResourceGroup, err)
325-
}
322+
// templateContents, err := client.ExportTemplate(ctx, id.ResourceGroup, id.DeploymentName)
323+
// if err != nil {
324+
// return fmt.Errorf("retrieving Template Content for Template Deployment %q (Resource Group %q): %+v", id.DeploymentName, id.ResourceGroup, err)
325+
// }
326326

327327
d.Set("name", id.DeploymentName)
328328
d.Set("resource_group_name", id.ResourceGroup)
@@ -353,11 +353,11 @@ func resourceGroupTemplateDeploymentResourceRead(d *pluginsdk.ResourceData, meta
353353
d.Set("template_spec_version_id", templateLinkId)
354354
}
355355

356-
flattenedTemplate, err := flattenTemplateDeploymentBody(templateContents.Template)
357-
if err != nil {
358-
return fmt.Errorf("flattening `template_content`: %+v", err)
359-
}
360-
d.Set("template_content", flattenedTemplate)
356+
// flattenedTemplate, err := flattenTemplateDeploymentBody(templateContents.Template)
357+
// if err != nil {
358+
// return fmt.Errorf("flattening `template_content`: %+v", err)
359+
// }
360+
// d.Set("template_content", flattenedTemplate)
361361

362362
return tags.FlattenAndSet(d, resp.Tags)
363363
}

‎internal/services/resource/subscription_template_deployment_resource.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,10 @@ func subscriptionTemplateDeploymentResourceRead(d *pluginsdk.ResourceData, meta
283283
return fmt.Errorf("retrieving Subscription Template Deployment %q: %+v", id.DeploymentName, err)
284284
}
285285

286-
templateContents, err := client.ExportTemplateAtSubscriptionScope(ctx, id.DeploymentName)
287-
if err != nil {
288-
return fmt.Errorf("retrieving Template Content for Subscription Template Deployment %q: %+v", id.DeploymentName, err)
289-
}
286+
// templateContents, err := client.ExportTemplateAtSubscriptionScope(ctx, id.DeploymentName)
287+
// if err != nil {
288+
// return fmt.Errorf("retrieving Template Content for Subscription Template Deployment %q: %+v", id.DeploymentName, err)
289+
// }
290290

291291
d.Set("name", id.DeploymentName)
292292
d.Set("location", location.NormalizeNilable(resp.Location))
@@ -316,11 +316,11 @@ func subscriptionTemplateDeploymentResourceRead(d *pluginsdk.ResourceData, meta
316316
d.Set("template_spec_version_id", templateLinkId)
317317
}
318318

319-
flattenedTemplate, err := flattenTemplateDeploymentBody(templateContents.Template)
320-
if err != nil {
321-
return fmt.Errorf("flattening `template_content`: %+v", err)
322-
}
323-
d.Set("template_content", flattenedTemplate)
319+
// flattenedTemplate, err := flattenTemplateDeploymentBody(templateContents.Template)
320+
// if err != nil {
321+
// return fmt.Errorf("flattening `template_content`: %+v", err)
322+
// }
323+
// d.Set("template_content", flattenedTemplate)
324324

325325
return tags.FlattenAndSet(d, resp.Tags)
326326
}

‎internal/services/resource/tenant_template_deployment_resource.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,10 @@ func tenantTemplateDeploymentResourceRead(d *pluginsdk.ResourceData, meta interf
284284
return fmt.Errorf("retrieving Tenant Template Deployment %q: %+v", id.DeploymentName, err)
285285
}
286286

287-
templateContents, err := client.ExportTemplateAtTenantScope(ctx, id.DeploymentName)
288-
if err != nil {
289-
return fmt.Errorf("retrieving Template Content for Tenant Template Deployment %q: %+v", id.DeploymentName, err)
290-
}
287+
// templateContents, err := client.ExportTemplateAtTenantScope(ctx, id.DeploymentName)
288+
// if err != nil {
289+
// return fmt.Errorf("retrieving Template Content for Tenant Template Deployment %q: %+v", id.DeploymentName, err)
290+
// }
291291

292292
d.Set("name", id.DeploymentName)
293293
d.Set("location", location.NormalizeNilable(resp.Location))
@@ -317,11 +317,11 @@ func tenantTemplateDeploymentResourceRead(d *pluginsdk.ResourceData, meta interf
317317
d.Set("template_spec_version_id", templateLinkId)
318318
}
319319

320-
flattenedTemplate, err := flattenTemplateDeploymentBody(templateContents.Template)
321-
if err != nil {
322-
return fmt.Errorf("flattening `template_content`: %+v", err)
323-
}
324-
d.Set("template_content", flattenedTemplate)
320+
// flattenedTemplate, err := flattenTemplateDeploymentBody(templateContents.Template)
321+
// if err != nil {
322+
// return fmt.Errorf("flattening `template_content`: %+v", err)
323+
// }
324+
// d.Set("template_content", flattenedTemplate)
325325

326326
return tags.FlattenAndSet(d, resp.Tags)
327327
}

‎internal/services/springcloud/spring_cloud_app_dynamics_application_performance_monitoring_resource.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/hashicorp/go-azure-helpers/lang/response"
1414
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
1515
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
16-
"github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids"
1716
"github.com/hashicorp/go-azure-sdk/resource-manager/appplatform/2024-01-01-preview/appplatform"
1817
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
1918
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
@@ -321,20 +320,20 @@ func (s SpringCloudAppDynamicsApplicationPerformanceMonitoringResource) Read() s
321320
}
322321

323322
springId := commonids.NewSpringCloudServiceID(id.SubscriptionId, id.ResourceGroupName, id.SpringName)
324-
result, err := client.ServicesListGloballyEnabledApms(ctx, springId)
325-
if err != nil {
326-
return fmt.Errorf("listing globally enabled apms: %+v", err)
327-
}
323+
// result, err := client.ServicesListGloballyEnabledApms(ctx, springId)
324+
// if err != nil {
325+
// return fmt.Errorf("listing globally enabled apms: %+v", err)
326+
// }
328327
globallyEnabled := false
329-
if result.Model != nil && result.Model.Value != nil {
330-
for _, value := range *result.Model.Value {
331-
apmId, err := appplatform.ParseApmIDInsensitively(value)
332-
if err == nil && resourceids.Match(apmId, id) {
333-
globallyEnabled = true
334-
break
335-
}
336-
}
337-
}
328+
// if result.Model != nil && result.Model.Value != nil {
329+
// for _, value := range *result.Model.Value {
330+
// apmId, err := appplatform.ParseApmIDInsensitively(value)
331+
// if err == nil && resourceids.Match(apmId, id) {
332+
// globallyEnabled = true
333+
// break
334+
// }
335+
// }
336+
// }
338337

339338
var model SpringCloudAppDynamicsApplicationPerformanceMonitoringModel
340339
if err := metadata.Decode(&model); err != nil {

‎internal/services/springcloud/spring_cloud_application_insights_application_performance_monitoring_resource.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/hashicorp/go-azure-helpers/lang/pointer"
1313
"github.com/hashicorp/go-azure-helpers/lang/response"
1414
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
15-
"github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids"
1615
"github.com/hashicorp/go-azure-sdk/resource-manager/appplatform/2024-01-01-preview/appplatform"
1716
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1817
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
@@ -269,20 +268,20 @@ func (s SpringCloudApplicationInsightsApplicationPerformanceMonitoringResource)
269268
}
270269

271270
springId := commonids.NewSpringCloudServiceID(id.SubscriptionId, id.ResourceGroupName, id.SpringName)
272-
result, err := client.ServicesListGloballyEnabledApms(ctx, springId)
273-
if err != nil {
274-
return fmt.Errorf("listing globally enabled apms: %+v", err)
275-
}
271+
// result, err := client.ServicesListGloballyEnabledApms(ctx, springId)
272+
// if err != nil {
273+
// return fmt.Errorf("listing globally enabled apms: %+v", err)
274+
// }
276275
globallyEnabled := false
277-
if result.Model != nil && result.Model.Value != nil {
278-
for _, value := range *result.Model.Value {
279-
apmId, err := appplatform.ParseApmIDInsensitively(value)
280-
if err == nil && resourceids.Match(apmId, id) {
281-
globallyEnabled = true
282-
break
283-
}
284-
}
285-
}
276+
// if result.Model != nil && result.Model.Value != nil {
277+
// for _, value := range *result.Model.Value {
278+
// apmId, err := appplatform.ParseApmIDInsensitively(value)
279+
// if err == nil && resourceids.Match(apmId, id) {
280+
// globallyEnabled = true
281+
// break
282+
// }
283+
// }
284+
// }
286285

287286
var model SpringCloudApplicationInsightsApplicationPerformanceMonitoringModel
288287
if err := metadata.Decode(&model); err != nil {

‎internal/services/springcloud/spring_cloud_dynatrace_application_performance_monitoring_resource.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/hashicorp/go-azure-helpers/lang/response"
1313
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
1414
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
15-
"github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids"
1615
"github.com/hashicorp/go-azure-sdk/resource-manager/appplatform/2024-01-01-preview/appplatform"
1716
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
1817
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
@@ -287,20 +286,20 @@ func (s SpringCloudDynatraceApplicationPerformanceMonitoringResource) Read() sdk
287286
}
288287

289288
springId := commonids.NewSpringCloudServiceID(id.SubscriptionId, id.ResourceGroupName, id.SpringName)
290-
result, err := client.ServicesListGloballyEnabledApms(ctx, springId)
291-
if err != nil {
292-
return fmt.Errorf("listing globally enabled apms: %+v", err)
293-
}
289+
// result, err := client.ServicesListGloballyEnabledApms(ctx, springId)
290+
// if err != nil {
291+
// return fmt.Errorf("listing globally enabled apms: %+v", err)
292+
// }
294293
globallyEnabled := false
295-
if result.Model != nil && result.Model.Value != nil {
296-
for _, value := range *result.Model.Value {
297-
apmId, err := appplatform.ParseApmIDInsensitively(value)
298-
if err == nil && resourceids.Match(apmId, id) {
299-
globallyEnabled = true
300-
break
301-
}
302-
}
303-
}
294+
// if result.Model != nil && result.Model.Value != nil {
295+
// for _, value := range *result.Model.Value {
296+
// apmId, err := appplatform.ParseApmIDInsensitively(value)
297+
// if err == nil && resourceids.Match(apmId, id) {
298+
// globallyEnabled = true
299+
// break
300+
// }
301+
// }
302+
// }
304303

305304
var model SpringCloudDynatraceApplicationPerformanceMonitoringModel
306305
if err := metadata.Decode(&model); err != nil {

‎internal/services/springcloud/spring_cloud_elastic_application_performance_monitoring_resource.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/hashicorp/go-azure-helpers/lang/response"
1414
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
1515
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
16-
"github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids"
1716
"github.com/hashicorp/go-azure-sdk/resource-manager/appplatform/2024-01-01-preview/appplatform"
1817
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
1918
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
@@ -252,20 +251,20 @@ func (s SpringCloudElasticApplicationPerformanceMonitoringResource) Read() sdk.R
252251
}
253252

254253
springId := commonids.NewSpringCloudServiceID(id.SubscriptionId, id.ResourceGroupName, id.SpringName)
255-
result, err := client.ServicesListGloballyEnabledApms(ctx, springId)
256-
if err != nil {
257-
return fmt.Errorf("listing globally enabled apms: %+v", err)
258-
}
254+
// result, err := client.ServicesListGloballyEnabledApms(ctx, springId)
255+
// if err != nil {
256+
// return fmt.Errorf("listing globally enabled apms: %+v", err)
257+
// }
259258
globallyEnabled := false
260-
if result.Model != nil && result.Model.Value != nil {
261-
for _, value := range *result.Model.Value {
262-
apmId, err := appplatform.ParseApmIDInsensitively(value)
263-
if err == nil && resourceids.Match(apmId, id) {
264-
globallyEnabled = true
265-
break
266-
}
267-
}
268-
}
259+
// if result.Model != nil && result.Model.Value != nil {
260+
// for _, value := range *result.Model.Value {
261+
// apmId, err := appplatform.ParseApmIDInsensitively(value)
262+
// if err == nil && resourceids.Match(apmId, id) {
263+
// globallyEnabled = true
264+
// break
265+
// }
266+
// }
267+
// }
269268

270269
var model SpringCloudElasticApplicationPerformanceMonitoringModel
271270
if err := metadata.Decode(&model); err != nil {

0 commit comments

Comments
 (0)