Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some pointer references #1791

Merged
merged 2 commits into from
Aug 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azurerm/data_source_key_vault.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ func dataSourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error {
d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption)
d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment)
if err := d.Set("sku", flattenKeyVaultDataSourceSku(props.Sku)); err != nil {
return fmt.Errorf("Error flattening `sku` for KeyVault %q: %+v", resp.Name, err)
return fmt.Errorf("Error flattening `sku` for KeyVault %q: %+v", *resp.Name, err)
}

flattenedPolicies := azure.FlattenKeyVaultAccessPolicies(props.AccessPolicies)
if err := d.Set("access_policy", flattenedPolicies); err != nil {
return fmt.Errorf("Error flattening `access_policy` for KeyVault %q: %+v", resp.Name, err)
return fmt.Errorf("Error flattening `access_policy` for KeyVault %q: %+v", *resp.Name, err)
}
d.Set("vault_uri", props.VaultURI)
}
Expand Down
2 changes: 1 addition & 1 deletion azurerm/data_source_scheduler_job_collection.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func dataSourceArmSchedulerJobCollectionRead(d *schema.ResourceData, meta interf
d.Set("state", string(properties.State))

if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota)); err != nil {
return fmt.Errorf("Error flattening quota for Job Collection %q (Resource Group %q): %+v", collection.Name, resourceGroup, err)
return fmt.Errorf("Error flattening quota for Job Collection %q (Resource Group %q): %+v", *collection.Name, resourceGroup, err)
}
}

Expand Down
6 changes: 3 additions & 3 deletions azurerm/resource_arm_autoscale_setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -716,23 +716,23 @@ func flattenAzureRmAutoScaleSettingCapacity(input *insights.ScaleCapacity) ([]in
if minStr := input.Minimum; minStr != nil {
min, err := strconv.Atoi(*minStr)
if err != nil {
return nil, fmt.Errorf("Error converting Minimum Scale Capacity %q to an int: %+v", minStr, err)
return nil, fmt.Errorf("Error converting Minimum Scale Capacity %q to an int: %+v", *minStr, err)
}
result["minimum"] = min
}

if maxStr := input.Maximum; maxStr != nil {
max, err := strconv.Atoi(*maxStr)
if err != nil {
return nil, fmt.Errorf("Error converting Maximum Scale Capacity %q to an int: %+v", maxStr, err)
return nil, fmt.Errorf("Error converting Maximum Scale Capacity %q to an int: %+v", *maxStr, err)
}
result["maximum"] = max
}

if defaultCapacityStr := input.Default; defaultCapacityStr != nil {
defaultCapacity, err := strconv.Atoi(*defaultCapacityStr)
if err != nil {
return nil, fmt.Errorf("Error converting Default Scale Capacity %q to an int: %+v", defaultCapacityStr, err)
return nil, fmt.Errorf("Error converting Default Scale Capacity %q to an int: %+v", *defaultCapacityStr, err)
}
result["default"] = defaultCapacity
}
Expand Down
4 changes: 2 additions & 2 deletions azurerm/resource_arm_key_vault.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,12 @@ func resourceArmKeyVaultRead(d *schema.ResourceData, meta interface{}) error {
d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption)
d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment)
if err := d.Set("sku", flattenKeyVaultSku(props.Sku)); err != nil {
return fmt.Errorf("Error flattening `sku` for KeyVault %q: %+v", resp.Name, err)
return fmt.Errorf("Error flattening `sku` for KeyVault %s: %+v", *resp.Name, err)
}

flattenedPolicies := azure.FlattenKeyVaultAccessPolicies(props.AccessPolicies)
if err := d.Set("access_policy", flattenedPolicies); err != nil {
return fmt.Errorf("Error flattening `access_policy` for KeyVault %q: %+v", resp.Name, err)
return fmt.Errorf("Error flattening `access_policy` for KeyVault %s: %+v", *resp.Name, err)
}
d.Set("vault_uri", props.VaultURI)
}
Expand Down
4 changes: 2 additions & 2 deletions azurerm/resource_arm_loadbalancer_rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,12 @@ func testCheckAzureRMLoadBalancerRuleDisappears(ruleName string, lb *network.Loa

future, err := client.CreateOrUpdate(ctx, id.ResourceGroup, *lb.Name, *lb)
if err != nil {
return fmt.Errorf("Error Creating/Updating Load Balancer %q (Resource Group %q): %+v", lb.Name, id.ResourceGroup, err)
return fmt.Errorf("Error Creating/Updating Load Balancer %q (Resource Group %q): %+v", *lb.Name, id.ResourceGroup, err)
}

err = future.WaitForCompletionRef(ctx, client.Client)
if err != nil {
return fmt.Errorf("Error waiting for completion of Load Balancer %q (Resource Group %q): %+v", lb.Name, id.ResourceGroup, err)
return fmt.Errorf("Error waiting for completion of Load Balancer %q (Resource Group %q): %+v", *lb.Name, id.ResourceGroup, err)
}

_, err = client.Get(ctx, id.ResourceGroup, *lb.Name, "")
Expand Down
12 changes: 6 additions & 6 deletions azurerm/resource_arm_redis_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -590,21 +590,21 @@ func flattenRedisConfiguration(input map[string]*string) ([]interface{}, error)
if v := input["maxclients"]; v != nil {
i, err := strconv.Atoi(*v)
if err != nil {
return nil, fmt.Errorf("Error parsing `maxclients` %q: %+v", v, err)
return nil, fmt.Errorf("Error parsing `maxclients` %q: %+v", *v, err)
}
outputs["maxclients"] = i
}
if v := input["maxmemory-delta"]; v != nil {
i, err := strconv.Atoi(*v)
if err != nil {
return nil, fmt.Errorf("Error parsing `maxmemory-delta` %q: %+v", v, err)
return nil, fmt.Errorf("Error parsing `maxmemory-delta` %q: %+v", *v, err)
}
outputs["maxmemory_delta"] = i
}
if v := input["maxmemory-reserved"]; v != nil {
i, err := strconv.Atoi(*v)
if err != nil {
return nil, fmt.Errorf("Error parsing `maxmemory-reserved` %q: %+v", v, err)
return nil, fmt.Errorf("Error parsing `maxmemory-reserved` %q: %+v", *v, err)
}
outputs["maxmemory_reserved"] = i
}
Expand All @@ -616,21 +616,21 @@ func flattenRedisConfiguration(input map[string]*string) ([]interface{}, error)
if v := input["rdb-backup-enabled"]; v != nil {
b, err := strconv.ParseBool(*v)
if err != nil {
return nil, fmt.Errorf("Error parsing `rdb-backup-enabled` %q: %+v", v, err)
return nil, fmt.Errorf("Error parsing `rdb-backup-enabled` %q: %+v", *v, err)
}
outputs["rdb_backup_enabled"] = b
}
if v := input["rdb-backup-frequency"]; v != nil {
i, err := strconv.Atoi(*v)
if err != nil {
return nil, fmt.Errorf("Error parsing `rdb-backup-frequency` %q: %+v", v, err)
return nil, fmt.Errorf("Error parsing `rdb-backup-frequency` %q: %+v", *v, err)
}
outputs["rdb_backup_frequency"] = i
}
if v := input["rdb-backup-max-snapshot-count"]; v != nil {
i, err := strconv.Atoi(*v)
if err != nil {
return nil, fmt.Errorf("Error parsing `rdb-backup-max-snapshot-count` %q: %+v", v, err)
return nil, fmt.Errorf("Error parsing `rdb-backup-max-snapshot-count` %q: %+v", *v, err)
}
outputs["rdb_backup_max_snapshot_count"] = i
}
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_scheduler_job_collection.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func resourceArmSchedulerJobCollectionRead(d *schema.ResourceData, meta interfac
d.Set("state", string(properties.State))

if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota)); err != nil {
return fmt.Errorf("Error flattening quota for Job Collection %q (Resource Group %q): %+v", collection.Name, resourceGroup, err)
return fmt.Errorf("Error flattening quota for Job Collection %q (Resource Group %q): %+v", *collection.Name, resourceGroup, err)
}
}

Expand Down
2 changes: 1 addition & 1 deletion azurerm/tags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func TestExpandARMTags(t *testing.T) {
}

if *expanded[k] != strVal {
t.Fatalf("Expanded value %q incorrect: expected %q, got %q", k, strVal, expanded[k])
t.Fatalf("Expanded value %q incorrect: expected %q, got %q", k, strVal, *expanded[k])
}
}
}
Expand Down