Skip to content

Commit 03bfac6

Browse files
maxjoehnkmaxjoehnk
committed
chore: improve logging of requests and responses to improve readability
1 parent 7af48d6 commit 03bfac6

File tree

5 files changed

+32
-62
lines changed

5 files changed

+32
-62
lines changed

‎iis/resource_application.go‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,12 @@ func resourceApplication() *schema.Resource {
4848
func resourceApplicationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
4949
client := m.(*iis.Client)
5050
request := createApplicationRequest(d)
51-
tflog.Debug(ctx, "Creating application", map[string]interface{}{
52-
"request": request,
53-
})
51+
tflog.Debug(ctx, "Creating application: "+toJSON(request))
5452
application, err := client.CreateApplication(ctx, request)
5553
if err != nil {
5654
return diag.FromErr(err)
5755
}
58-
tflog.Debug(ctx, "Created application", map[string]interface{}{
59-
"application": application,
60-
})
56+
tflog.Debug(ctx, "Created application: "+toJSON(application))
6157
d.SetId(application.ID)
6258
return nil
6359
}
@@ -69,9 +65,7 @@ func resourceApplicationRead(ctx context.Context, d *schema.ResourceData, m inte
6965
d.SetId("")
7066
return diag.FromErr(err)
7167
}
72-
tflog.Debug(ctx, "Read application", map[string]interface{}{
73-
"application": application,
74-
})
68+
tflog.Debug(ctx, "Read application: "+toJSON(application))
7569
if err = d.Set(WebsiteKey, application.Website.ID); err != nil {
7670
return diag.FromErr(err)
7771
}
@@ -91,16 +85,12 @@ func resourceApplicationUpdate(ctx context.Context, d *schema.ResourceData, m in
9185
func resourceApplicationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
9286
client := m.(*iis.Client)
9387
id := d.Id()
94-
tflog.Debug(ctx, "Deleting application", map[string]interface{}{
95-
"id": id,
96-
})
88+
tflog.Debug(ctx, "Deleting application: "+toJSON(id))
9789
err := client.DeleteApplication(ctx, id)
9890
if err != nil {
9991
return diag.FromErr(err)
10092
}
101-
tflog.Debug(ctx, "Deleted application", map[string]interface{}{
102-
"id": id,
103-
})
93+
tflog.Debug(ctx, "Deleted application: "+toJSON(id))
10494
return nil
10595
}
10696

‎iis/resource_application_pool.go‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,12 @@ func resourceApplicationPool() *schema.Resource {
3535
func resourceApplicationPoolCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
3636
client := m.(*iis.Client)
3737
name := d.Get(NameKey).(string)
38-
tflog.Debug(ctx, "Creating application pool", map[string]interface{}{
39-
"name": name,
40-
})
38+
tflog.Debug(ctx, "Creating application pool: "+toJSON(name))
4139
pool, err := client.CreateAppPool(ctx, name)
4240
if err != nil {
4341
return diag.FromErr(err)
4442
}
45-
tflog.Debug(ctx, "Created application pool", map[string]interface{}{
46-
"pool": pool,
47-
})
43+
tflog.Debug(ctx, "Created application pool: "+toJSON(pool))
4844
d.SetId(pool.ID)
4945
return nil
5046
}
@@ -57,9 +53,7 @@ func resourceApplicationPoolRead(ctx context.Context, d *schema.ResourceData, m
5753
d.SetId("")
5854
return diag.FromErr(err)
5955
}
60-
tflog.Debug(ctx, "Read application pool", map[string]interface{}{
61-
"appPool": appPool,
62-
})
56+
tflog.Debug(ctx, "Read application pool: "+toJSON(appPool))
6357

6458
if err = d.Set(NameKey, appPool.Name); err != nil {
6559
return diag.FromErr(err)
@@ -74,17 +68,12 @@ func resourceApplicationPoolUpdate(ctx context.Context, d *schema.ResourceData,
7468
client := m.(*iis.Client)
7569
if d.HasChange(NameKey) {
7670
name := d.Get(NameKey).(string)
77-
tflog.Debug(ctx, "Updating application pool", map[string]interface{}{
78-
"id": d.Id(),
79-
"name": name,
80-
})
71+
tflog.Debug(ctx, "Updating application pool: "+toJSON(name))
8172
applicationPool, err := client.UpdateAppPool(ctx, d.Id(), name)
8273
if err != nil {
8374
return diag.FromErr(err)
8475
}
85-
tflog.Debug(ctx, "Updated application pool", map[string]interface{}{
86-
"applicationPool": applicationPool,
87-
})
76+
tflog.Debug(ctx, "Updated application pool: "+toJSON(applicationPool))
8877
d.SetId(applicationPool.ID)
8978
}
9079
return nil
@@ -93,15 +82,11 @@ func resourceApplicationPoolUpdate(ctx context.Context, d *schema.ResourceData,
9382
func resourceApplicationPoolDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
9483
client := m.(*iis.Client)
9584
id := d.Id()
96-
tflog.Debug(ctx, "Deleting application pool", map[string]interface{}{
97-
"id": id,
98-
})
85+
tflog.Debug(ctx, "Deleting application pool: "+toJSON(id))
9986
err := client.DeleteAppPool(ctx, id)
10087
if err != nil {
10188
return diag.FromErr(err)
10289
}
103-
tflog.Debug(ctx, "Deleted application pool", map[string]interface{}{
104-
"id": id,
105-
})
90+
tflog.Debug(ctx, "Deleted application pool: "+toJSON(id))
10691
return nil
10792
}

‎iis/resource_authentication.go‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,15 @@ func resourceAuthentication() *schema.Resource {
8888
func resourceAuthenticationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
8989
client := m.(*iis.Client)
9090
application := d.Get("application").(string)
91-
tflog.Debug(ctx, "Creating authentication", map[string]interface{}{
92-
"application": application,
93-
})
91+
tflog.Debug(ctx, "Creating authentication: "+toJSON(application))
9492
auth, err := client.ReadAuthenticationFromApplication(ctx, application)
9593
if err != nil {
9694
return diag.FromErr(err)
9795
}
9896
if err := updateAuthProviders(ctx, d, client, auth); err != nil {
9997
return err
10098
}
101-
tflog.Debug(ctx, "Created authentication", map[string]interface{}{
102-
"auth": auth,
103-
})
99+
tflog.Debug(ctx, "Created authentication: "+toJSON(auth))
104100
d.SetId(auth.ID)
105101
return nil
106102
}
@@ -111,9 +107,7 @@ func resourceAuthenticationRead(ctx context.Context, d *schema.ResourceData, m i
111107
if err != nil {
112108
return diag.FromErr(err)
113109
}
114-
tflog.Debug(ctx, "Read authentication", map[string]interface{}{
115-
"auth": auth,
116-
})
110+
tflog.Debug(ctx, "Read authentication: "+toJSON(auth))
117111
if err = readAuthenticationProvider(ctx, d, "anonymous", buildAnonymousAuthProvider(client, &auth)); err != nil {
118112
return diag.FromErr(err)
119113
}
@@ -129,9 +123,7 @@ func resourceAuthenticationRead(ctx context.Context, d *schema.ResourceData, m i
129123

130124
func resourceAuthenticationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
131125
client := m.(*iis.Client)
132-
tflog.Debug(ctx, "Updating authentication", map[string]interface{}{
133-
"id": d.Id(),
134-
})
126+
tflog.Debug(ctx, "Updating authentication: "+toJSON(d.Id()))
135127
auth, err := client.ReadAuthentication(ctx, d.Id())
136128
if err != nil {
137129
return diag.FromErr(err)
@@ -158,9 +150,7 @@ func updateAuthProviders(ctx context.Context, d *schema.ResourceData, client *ii
158150
return diag.FromErr(err)
159151
}
160152

161-
tflog.Debug(ctx, "Updated authentication", map[string]interface{}{
162-
"auth": auth,
163-
})
153+
tflog.Debug(ctx, "Updated authentication: "+toJSON(auth))
164154

165155
return nil
166156
}

‎iis/resource_website.go‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,12 @@ var bindingSchema = &schema.Resource{
7575
func resourceWebsiteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
7676
client := m.(*iis.Client)
7777
request := createWebsiteRequest(d)
78-
tflog.Debug(ctx, "Creating website", map[string]interface{}{
79-
"request": request,
80-
})
78+
tflog.Debug(ctx, "Creating website: "+toJSON(request))
8179
site, err := client.CreateWebsite(ctx, request)
8280
if err != nil {
8381
return diag.FromErr(err)
8482
}
85-
tflog.Debug(ctx, "Created website", map[string]interface{}{
86-
"site": site,
87-
})
83+
tflog.Debug(ctx, "Created website: "+toJSON(site))
8884
d.SetId(site.ID)
8985
return nil
9086
}
@@ -96,9 +92,7 @@ func resourceWebsiteRead(ctx context.Context, d *schema.ResourceData, m interfac
9692
d.SetId("")
9793
return diag.FromErr(err)
9894
}
99-
tflog.Debug(ctx, "Read website", map[string]interface{}{
100-
"site": site,
101-
})
95+
tflog.Debug(ctx, "Read website:"+toJSON(site))
10296
if err = d.Set(nameKey, site.Name); err != nil {
10397
return diag.FromErr(err)
10498
}

‎iis/util.go‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package iis
22

3-
import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
3+
import (
4+
"encoding/json"
5+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
6+
)
47

58
func getList(d *schema.ResourceData, key string) []interface{} {
69
return d.Get(key).([]interface{})
@@ -13,3 +16,11 @@ func getNestedMap(d *schema.ResourceData, key string) map[string]interface{} {
1316
func hasNestedMap(d *schema.ResourceData, key string) bool {
1417
return len(getList(d, key)) == 1
1518
}
19+
20+
func toJSON(obj interface{}) string {
21+
jsonBytes, err := json.Marshal(obj)
22+
if err != nil {
23+
return ""
24+
}
25+
return string(jsonBytes)
26+
}

0 commit comments

Comments
 (0)