Skip to content

Commit

Permalink
add access_tier attribute to storage_share resource
Browse files Browse the repository at this point in the history
  • Loading branch information
Kyriakos Oikonomakos committed Apr 20, 2022
1 parent 9fa39f4 commit f2516e5
Show file tree
Hide file tree
Showing 3 changed files with 107 additions and 8 deletions.
31 changes: 31 additions & 0 deletions internal/services/storage/storage_share_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,17 @@ func resourceStorageShare() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Computed: true,
},

"access_tier": {
Type: pluginsdk.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice(
[]string{string(shares.HotAccessTier),
string(shares.CoolAccessTier),
string(shares.PremiumAccessTier),
string(shares.TransactionOptimizedAccessTier)}, false),
},
},
}
}
Expand Down Expand Up @@ -169,6 +180,11 @@ func resourceStorageShareCreate(d *pluginsdk.ResourceData, meta interface{}) err
EnabledProtocol: shares.ShareProtocol(d.Get("enabled_protocol").(string)),
}

if accessTier := d.Get("access_tier").(string); accessTier != "" {
tier := shares.AccessTier(accessTier)
input.AccessTier = &tier
}

if err := client.Create(ctx, account.ResourceGroup, accountName, shareName, input); err != nil {
return fmt.Errorf("creating Share %q (Account %q / Resource Group %q): %+v", shareName, accountName, account.ResourceGroup, err)
}
Expand Down Expand Up @@ -222,6 +238,10 @@ func resourceStorageShareRead(d *pluginsdk.ResourceData, meta interface{}) error
d.Set("url", id.ID())
d.Set("enabled_protocol", string(props.EnabledProtocol))

if accessTier := props.AccessTier; accessTier != nil {
d.Set("access_tier", string(*accessTier))
}

if err := d.Set("acl", flattenStorageShareACLs(props.ACLs)); err != nil {
return fmt.Errorf("flattening `acl`: %+v", err)
}
Expand Down Expand Up @@ -296,6 +316,17 @@ func resourceStorageShareUpdate(d *pluginsdk.ResourceData, meta interface{}) err
log.Printf("[DEBUG] Updated the ACL's for File Share %q (Storage Account %q)", id.Name, id.AccountName)
}

if d.HasChange("access_tier") {
log.Printf("[DEBUG] Updating the Access Tier for File Share %q (Storage Account %q)", id.Name, id.AccountName)

tier := shares.AccessTier(d.Get("access_tier").(string))
if err := client.UpdateTier(ctx, account.ResourceGroup, id.AccountName, id.Name, tier); err != nil {
return fmt.Errorf("updating Access Tier for File Share %q (Storage Account %q): %s", id.Name, id.AccountName, err)
}

log.Printf("[DEBUG] Updated the Access Tier for File Share %q (Storage Account %q)", id.Name, id.AccountName)
}

return resourceStorageShareRead(d, meta)
}

Expand Down
82 changes: 74 additions & 8 deletions internal/services/storage/storage_share_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/parse"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/giovanni/storage/2020-08-04/file/shares"
)

type StorageShareResource struct{}
Expand Down Expand Up @@ -185,6 +186,42 @@ func TestAccStorageShare_largeQuota(t *testing.T) {
})
}

func TestAccStorageShare_accessTier(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_storage_share", "test")
r := StorageShareResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.accessTier(data, string(shares.CoolAccessTier)),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.accessTier(data, string(shares.HotAccessTier)),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.accessTier(data, string(shares.PremiumAccessTier)),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.accessTier(data, string(shares.TransactionOptimizedAccessTier)),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccStorageShare_nfsProtocol(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_storage_share", "test")
r := StorageShareResource{}
Expand Down Expand Up @@ -281,7 +318,7 @@ func (r StorageShareResource) basic(data acceptance.TestData) string {
resource "azurerm_storage_share" "test" {
name = "testshare%s"
storage_account_name = azurerm_storage_account.test.name
quota = 1
quota = 5
}
`, template, data.RandomString)
}
Expand All @@ -294,7 +331,7 @@ func (r StorageShareResource) metaData(data acceptance.TestData) string {
resource "azurerm_storage_share" "test" {
name = "testshare%s"
storage_account_name = azurerm_storage_account.test.name
quota = 1
quota = 5
metadata = {
hello = "world"
Expand All @@ -311,7 +348,7 @@ func (r StorageShareResource) metaDataUpdated(data acceptance.TestData) string {
resource "azurerm_storage_share" "test" {
name = "testshare%s"
storage_account_name = azurerm_storage_account.test.name
quota = 1
quota = 5
metadata = {
hello = "world"
Expand All @@ -329,7 +366,7 @@ func (r StorageShareResource) acl(data acceptance.TestData) string {
resource "azurerm_storage_share" "test" {
name = "testshare%s"
storage_account_name = azurerm_storage_account.test.name
quota = 1
quota = 5
acl {
id = "MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI"
Expand All @@ -352,7 +389,7 @@ func (r StorageShareResource) aclGhostedRecall(data acceptance.TestData) string
resource "azurerm_storage_share" "test" {
name = "testshare%s"
storage_account_name = azurerm_storage_account.test.name
quota = 1
quota = 5
acl {
id = "GhostedRecall"
Expand All @@ -372,7 +409,7 @@ func (r StorageShareResource) aclUpdated(data acceptance.TestData) string {
resource "azurerm_storage_share" "test" {
name = "testshare%s"
storage_account_name = azurerm_storage_account.test.name
quota = 1
quota = 5
acl {
id = "AAAANDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI"
Expand Down Expand Up @@ -404,7 +441,7 @@ func (r StorageShareResource) requiresImport(data acceptance.TestData) string {
resource "azurerm_storage_share" "import" {
name = azurerm_storage_share.test.name
storage_account_name = azurerm_storage_share.test.storage_account_name
quota = 1
quota = 5
}
`, template)
}
Expand Down Expand Up @@ -486,6 +523,35 @@ resource "azurerm_storage_share" "test" {
`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString)
}

func (r StorageShareResource) accessTier(data acceptance.TestData, tier string) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "%s"
}
resource "azurerm_storage_account" "test" {
name = "acctestacc%s"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
account_tier = "Premium"
account_replication_type = "LRS"
}
resource "azurerm_storage_share" "test" {
name = "testshare%s"
storage_account_name = azurerm_storage_account.test.name
quota = 100
enabled_protocol = "NFS"
access_tier = "%s"
}
`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString, tier)
}

func (r StorageShareResource) protocol(data acceptance.TestData, protocol string) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand All @@ -510,7 +576,7 @@ resource "azurerm_storage_share" "test" {
name = "testshare%s"
storage_account_name = azurerm_storage_account.test.name
enabled_protocol = "%s"
quota = 1
quota = 100
}
`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString, protocol)
}
Expand Down
2 changes: 2 additions & 0 deletions website/docs/d/storage_share.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ The following arguments are supported:

* `quota` - The quota of the File Share in GB.

* `access_tier` - The tier of the File Share. Can be one of `Hot`, `Cool`, `TransactionOptimized`, or `Premium`.

* `metadata` - A map of custom file share metadata.

* `acl` - One or more acl blocks as defined below.
Expand Down

0 comments on commit f2516e5

Please sign in to comment.