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.

Sign up for GitHub

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

[MS] Added default caching value as expected by API - fixing #224 #259

Merged
merged 2 commits into from
Aug 21, 2017
Merged

[MS] Added default caching value as expected by API - fixing #224 #259

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
868dff6
Added default caching value as expected by API
echuvyrov Aug 19, 2017
9e668cd
Slight modification for make compiler happy :)
echuvyrov Aug 19, 2017
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/resource_arm_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func resourceArmImage() *schema.Resource {
"caching": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Default: compute.None,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be string(compute.None) or compilation will fail?

ValidateFunc: validation.StringInSlice([]string{
string(compute.None),
string(compute.ReadOnly),
Expand Down Expand Up @@ -301,7 +301,7 @@ func flattenAzureRmStorageProfileOsDisk(d *schema.ResourceData, storageProfile *
result["managed_disk_id"] = *osDisk.ManagedDisk.ID
}
result["blob_uri"] = *osDisk.BlobURI
result["caching"] = osDisk.Caching
result["caching"] = string(osDisk.Caching)
if osDisk.DiskSizeGB != nil {
result["size_gb"] = *osDisk.DiskSizeGB
}
Expand Down